Update to version 0.9.13

7 files changed, 112 insertions, 52 deletions

diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index b5ed1c38e811..e7692a3aaa6e 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=		tevent
-PORTVERSION=		0.9.8
-PORTREVISION=		1
+PORTVERSION=		0.9.13
+PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.samba.org/pub/%SUBDIR%/ \
@@ -18,30 +18,71 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		Talloc based event loop library
 
-LIB_DEPENDS=		talloc.2:${PORTSDIR}/devel/talloc
-
 CONFLICTS=
 
-USE_GMAKE=		yes
+USE_PYTHON_BUILD=	yes
 USE_LDCONFIG=		yes
-GNU_CONFIGURE=		yes
+HAS_CONFIGURE=		yes
+WAF_TOOL=		buildtools/bin/waf
+CONFIGURE_SCRIPT=	${WAF_TOOL} configure
 USE_GNOME=		pkgconfig
-USE_AUTOTOOLS=		autoconf autoheader
 
-IPATHS=			-I${WRKSRC}/libreplace
-AUTOHEADER_ARGS=	${IPATHS}
-AUTOCONF_ARGS=		${IPATHS}
+LICENSE=		GPLv3
+MAKE_JOBS_SAFE=		yes
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PKGCONFIGDIR_REL?=	${PKGCONFIGDIR:S|^${PREFIX}/||}
+PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
+
+OPTIONS=		PYTHON		"Python bindings"	on
+
+.include <bsd.port.options.mk>
 
 PLIST_FILES=		include/tevent.h \
-			lib/libtevent.a \
 			lib/libtevent.so \
 			lib/libtevent.so.0 \
-			${PKGCONFIGDIR_REL}/tevent.pc
+			%%PKGCONFIGDIR%%/tevent.pc
+
+CONFIGURE_ENV+=		XSLTPROC="/usr/bin/true"
+CONFIGURE_ENV+=		NOCOLOR=yes
+MAKE_ENV+=		NOCOLOR=yes
+
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
+
+LIB_DEPENDS+=		talloc.2:${PORTSDIR}/devel/talloc
+CONFIGURE_ARGS+=	--bundled-libraries=!talloc
+
+.if !defined(DISABLE_MAKE_JOBS)
+CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
+_MAKE_JOBS=		--jobs=${MAKE_JOBS_NUMBER}
+.endif
+
+.if defined(WITH_PYTHON)
+USE_PYTHON_RUN=		yes
+PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/_tevent.so
+PLIST_DIRSTRY+=		%%PYTHON_SITELIBDIR%% \
+			%%PYTHON_LIBDIR%%
+.else
+CONFIGURE_ARGS+=	--disable-python
+.endif
+
+ALL_TARGET=		build
+INSTALL_TARGET=		install
+
+post-patch:
+			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
+				${BUILD_WRKSRC}/wscript
+
+do-build:
+			@(cd ${BUILD_WRKSRC}; \
+			if ! ${SETENV} ${MAKE_ENV} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} build; then \
+				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
+					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
+					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+				fi; \
+			${FALSE}; \
+			fi)
 
-post-install:
-			${LN} -sf libtevent.so.0 ${PREFIX}/lib/libtevent.so
+do-install:
+			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} install)
 
 .include <bsd.port.mk>
diff --git a/devel/tevent/distinfo b/devel/tevent/distinfo
index 2ffd96862e51..ddf8705b1abe 100644
--- a/devel/tevent/distinfo
+++ b/devel/tevent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tevent-0.9.8.tar.gz) = b004153b6ec7be3084d5d5cb75d3d4e10628c24f903bc05a634de1d1be280598
-SIZE (tevent-0.9.8.tar.gz) = 236284
+SHA256 (tevent-0.9.13.tar.gz) = a56255eb300c13c661c5484223ac02dc917d002a4194d8a42f5afbdc8c9d88c4
+SIZE (tevent-0.9.13.tar.gz) = 433202
diff --git a/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py b/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
new file mode 100644
index 000000000000..db564bd2376c
--- /dev/null
+++ b/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
@@ -0,0 +1,11 @@
+--- buildtools/wafsamba/samba_install.py.orig	2010-12-21 02:00:02.000000000 +0100
++++ buildtools/wafsamba/samba_install.py	2011-06-21 11:46:28.000000000 +0200
+@@ -109,7 +109,7 @@
+             inst_name    = bld.make_libname(t.target)
+     elif self.vnum:
+         vnum_base    = self.vnum.split('.')[0]
+-        install_name = bld.make_libname(target_name, version=self.vnum)
++        install_name = bld.make_libname(target_name, version=vnum_base)
+         install_link = bld.make_libname(target_name, version=vnum_base)
+         inst_name    = bld.make_libname(t.target)
+         if not self.private_library:
diff --git a/devel/tevent/files/patch-lib__replace__system__wait.h b/devel/tevent/files/patch-lib__replace__system__wait.h
new file mode 100644
index 000000000000..3cfa995371b3
--- /dev/null
+++ b/devel/tevent/files/patch-lib__replace__system__wait.h
@@ -0,0 +1,21 @@
+--- ./lib/replace/system/wait.h.orig	2010-04-01 15:26:22.000000000 +0200
++++ ./lib/replace/system/wait.h	2010-04-23 01:08:35.000000000 +0200
+@@ -32,6 +32,18 @@
+ 
+ #include <signal.h>
+ 
++#ifndef SIGRTMIN
++#	ifdef NSIG
++#		define SIGRTMIN (NSIG+1)
++#	else
++#		define SIGRTMIN 33
++#	endif
++#endif
++
++#ifndef SIGRTMAX
++#define SIGRTMAX (SIGRTMIN+64)
++#endif
++
+ #ifndef SIGCLD
+ #define SIGCLD SIGCHLD
+ #endif
diff --git a/devel/tevent/files/patch-tevent.mk b/devel/tevent/files/patch-tevent.mk
deleted file mode 100644
index c25afaba9ab6..000000000000
--- a/devel/tevent/files/patch-tevent.mk
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./tevent.mk.orig	2010-01-08 23:45:07.000000000 +0000
-+++ ./tevent.mk	2010-01-08 23:47:23.000000000 +0000
-@@ -1,6 +1,6 @@
- TEVENT_SOBASE = libtevent.$(SHLIBEXT)
- TEVENT_SONAME = $(TEVENT_SOBASE).0
--TEVENT_SOLIB = $(TEVENT_SOBASE).$(PACKAGE_VERSION)
-+TEVENT_SOLIB = $(TEVENT_SOBASE).0
- TEVENT_STLIB = libtevent.a
- 
- $(TEVENT_STLIB): $(TEVENT_OBJ)
-@@ -9,22 +9,19 @@
- $(TEVENT_SOBASE): $(TEVENT_SOLIB)
- 	ln -fs $< $@
- 
--$(TEVENT_SONAME): $(TEVENT_SOLIB)
--	ln -fs $< $@
--
- dirs::
- 	@mkdir -p lib
- 
- installdirs::
- 	mkdir -p $(DESTDIR)$(includedir)
- 	mkdir -p $(DESTDIR)$(libdir)
--	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
-+	mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
- 
- installheaders:: installdirs
- 	cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
- 
- installlibs:: installdirs
--	cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
-+	cp tevent.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
- 	cp $(TEVENT_STLIB) $(TEVENT_SOLIB) $(DESTDIR)$(libdir)
- 
- install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
diff --git a/devel/tevent/files/patch-tevent_signal.c b/devel/tevent/files/patch-tevent_signal.c
new file mode 100644
index 000000000000..f35ed12e904b
--- /dev/null
+++ b/devel/tevent/files/patch-tevent_signal.c
@@ -0,0 +1,11 @@
+--- tevent_signal.c.orig	2011-07-24 22:04:44.000000000 +0200
++++ tevent_signal.c	2011-07-30 03:36:03.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include "tevent_internal.h"
+ #include "tevent_util.h"
+ 
+-#define TEVENT_NUM_SIGNALS 64
++#define TEVENT_NUM_SIGNALS SIGRTMAX
+ 
+ /* maximum number of SA_SIGINFO signals to hold in the queue.
+   NB. This *MUST* be a power of 2, in order for the ring buffer
diff --git a/devel/tevent/files/patch-wscript b/devel/tevent/files/patch-wscript
new file mode 100644
index 000000000000..bfab3c52aa00
--- /dev/null
+++ b/devel/tevent/files/patch-wscript
@@ -0,0 +1,11 @@
+--- wscript.orig	2011-07-10 11:52:43.000000000 +0200
++++ wscript	2011-07-30 03:18:21.000000000 +0200
+@@ -69,7 +69,7 @@
+         SRC += ' tevent_epoll.c'
+ 
+     if bld.env.standalone_tevent:
+-        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
++        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
+         bld.PKG_CONFIG_FILES('tevent.pc', vnum=VERSION)
+         private_library = False
+     else: