svn commit: r559759 - in head/devel/aml: . files

[Jan Beich]

Author: jbeich
Date: Thu Dec 31 17:53:18 2020
New Revision: 559759
URL: https://svnweb.freebsd.org/changeset/ports/559759

Log:
  devel/aml: update to 0.2.0
  
  Changes:	https://github.com/any1/aml/releases/tag/v0.2.0

Added:
  head/devel/aml/files/
  head/devel/aml/files/patch-freebsd11   (contents, props changed)
Modified:
  head/devel/aml/Makefile   (contents, props changed)
  head/devel/aml/distinfo   (contents, props changed)

Modified: head/devel/aml/Makefile
==============================================================================
--- head/devel/aml/Makefile	Thu Dec 31 17:53:09 2020	(r559758)
+++ head/devel/aml/Makefile	Thu Dec 31 17:53:18 2020	(r559759)
@@ -2,7 +2,7 @@
 
 PORTNAME=	aml
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.0
+DISTVERSION=	0.2.0
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT=	Another Main Loop
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
 USES=		compiler:c11 meson pkgconfig
 USE_GITHUB=	yes

Modified: head/devel/aml/distinfo
==============================================================================
--- head/devel/aml/distinfo	Thu Dec 31 17:53:09 2020	(r559758)
+++ head/devel/aml/distinfo	Thu Dec 31 17:53:18 2020	(r559759)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595762226
-SHA256 (any1-aml-v0.1.0_GH0.tar.gz) = 50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
-SIZE (any1-aml-v0.1.0_GH0.tar.gz) = 19267
+TIMESTAMP = 1609418238
+SHA256 (any1-aml-v0.2.0_GH0.tar.gz) = aec6b9e8d0cdccd2b8e800b997ad2743caf528b106899d8ba906308dab498042
+SIZE (any1-aml-v0.2.0_GH0.tar.gz) = 20358

Added: head/devel/aml/files/patch-freebsd11
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/aml/files/patch-freebsd11	Thu Dec 31 17:53:18 2020	(r559759)
@@ -0,0 +1,57 @@
+Drop after FreeBSD 11 EOL around 2021-09-30
+https://github.com/freebsd/freebsd-src/commit/92bb8c680916
+https://github.com/freebsd/freebsd-src/commit/2b34e8433514
+
+Header <sys/event.h> has symbol "kqueue" : NO
+meson.build:62:1: ERROR: Problem encountered: Unsupported system
+
+Compiler stderr:
+ In file included from _build/meson-private/tmp0rptdqs6/testfile.c:2:
+/usr/include/sys/event.h:75:2: error: unknown type name 'uintptr_t'
+        uintptr_t       ident;          /* identifier for this event */
+        ^
+/usr/include/sys/event.h:77:2: error: unknown type name 'u_short'; did you mean 'short'?
+        u_short         flags;          /* action flags for kqueue */
+        ^
+/usr/include/sys/event.h:78:2: error: unknown type name 'u_int'
+        u_int           fflags;         /* filter flag value */
+        ^
+/usr/include/sys/event.h:79:2: error: unknown type name 'intptr_t'
+        intptr_t        data;           /* filter data value */
+        ^
+In file included from ../src/kqueue.c:20:
+/usr/include/sys/event.h:77:2: error: unknown type name 'u_short'; did you mean 'short'?
+        u_short         flags;          /* action flags for kqueue */
+        ^
+/usr/include/sys/event.h:78:2: error: unknown type name 'u_int'
+        u_int           fflags;         /* filter flag value */
+        ^
+../src/kqueue.c:184:20: error: use of undeclared identifier 'NOTE_ABSTIME'
+                        NOTE_MSECONDS | NOTE_ABSTIME, deadline, NULL);
+                                        ^
+
+--- meson.build.orig	2020-12-31 12:37:18 UTC
++++ meson.build
+@@ -50,7 +50,7 @@ sources = [
+ ]
+ 
+ have_epoll = cc.has_header_symbol('sys/epoll.h', 'epoll_create')
+-have_kqueue = cc.has_header_symbol('sys/event.h', 'kqueue')
++have_kqueue = cc.has_header_symbol('sys/event.h', 'kqueue', prefix: '#include <sys/types.h>')
+ 
+ if have_epoll
+ 	sources += 'src/epoll.c'
+--- src/kqueue.c.orig	2020-12-31 12:37:18 UTC
++++ src/kqueue.c
+@@ -17,6 +17,11 @@
+ #include "aml.h"
+ #include "backend.h"
+ 
++#if defined(__FreeBSD__) && __FreeBSD__ < 12
++#define NOTE_ABSTIME 0
++typedef unsigned short	u_short;
++typedef unsigned int u_int;
++#endif
+ #include <sys/event.h>
+ #include <stdlib.h>
+ #include <unistd.h>