[Midnightbsd-cvs] mports [15901] trunk/devel/tevent: update to 0.9.18
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Feb 26 08:54:31 EST 2014
Revision: 15901
http://svnweb.midnightbsd.org/mports/?rev=15901
Author: laffer1
Date: 2014-02-26 08:54:30 -0500 (Wed, 26 Feb 2014)
Log Message:
-----------
update to 0.9.18
Modified Paths:
--------------
trunk/devel/tevent/Makefile
trunk/devel/tevent/distinfo
Removed Paths:
-------------
trunk/devel/tevent/files/patch-tevent.mk
Modified: trunk/devel/tevent/Makefile
===================================================================
--- trunk/devel/tevent/Makefile 2014-02-25 21:50:33 UTC (rev 15900)
+++ trunk/devel/tevent/Makefile 2014-02-26 13:54:30 UTC (rev 15901)
@@ -1,7 +1,8 @@
# $MidnightBSD$
PORTNAME= tevent
-PORTVERSION= 0.9.8
+PORTVERSION= 0.9.18
+PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SAMBA}
@@ -12,30 +13,98 @@
LICENSE= lgpl3
-LIB_DEPENDS= talloc.2:${PORTSDIR}/devel/talloc
-
-CONFLICTS=
-
-USE_GMAKE= yes
+USE_PYTHON_BUILD= -2.7
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-USE_GNOME= pkgconfig
-USE_AUTOTOOLS= autoconf autoheader
+HAS_CONFIGURE= yes
+WAF_TOOL= buildtools/bin/waf
+CONFIGURE_SCRIPT= ${WAF_TOOL} configure
+CONFIGURE_LOG= bin/config.log
+USES= pkgconfig
-IPATHS= -I${WRKSRC}/libreplace
-AUTOHEADER_ARGS= ${IPATHS}
-AUTOCONF_ARGS= ${IPATHS}
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
-PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||}
+PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
+CONFIGURE_ARGS+= --destdir=${FAKE_DESTDIR} \
+ --prefix=${PREFIX} \
+ --mandir=${MANPREFIX}/man \
+ --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}
+MAKE_ARGS+= ${CONFIGURE_ARGS}
+
+OPTIONS_DEFINE= PYTHON
+OPTIONS_DEFAULT= PYTHON
+
+.include <bsd.mport.options.mk>
+
PLIST_FILES= include/tevent.h \
- lib/libtevent.a \
lib/libtevent.so \
lib/libtevent.so.0 \
- ${PKGCONFIGDIR_REL}/tevent.pc
+ %%PKGCONFIGDIR%%/tevent.pc
-post-install:
- ${LN} -sf libtevent.so.0 ${PREFIX}/lib/libtevent.so
+CONFIGURE_ENV+= XSLTPROC="/usr/bin/true"
+CONFIGURE_ENV+= NOCOLOR=yes
+MAKE_ENV+= NOCOLOR=yes
-.include <bsd.port.mk>
+BUILD_DEPENDS+= talloc>=2.0.8:${PORTSDIR}/devel/talloc
+RUN_DEPENDS:= ${BUILD_DEPENDS}
+
+CONFIGURE_ARGS+= --bundled-libraries=!talloc
+
+.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
+CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER}
+_MAKE_JOBS= --jobs=${MAKE_JOBS_NUMBER}
+.endif
+
+.if ${PORT_OPTIONS:MPYTHON}
+USE_PYTHON_RUN= yes
+PLIST_FILES+= %%PYTHON_SITELIBDIR%%/_tevent.so \
+ %%PYTHON_SITELIBDIR%%/tevent.py \
+ %%PYTHON_SITELIBDIR%%/tevent.pyc \
+ %%PYTHON_SITELIBDIR%%/tevent.pyo
+PLIST_DIRSTRY+= %%PYTHON_SITELIBDIR%% \
+ %%PYTHON_LIBDIR%%
+.else
+CONFIGURE_ARGS+= --disable-python
+.endif
+
+ALL_TARGET= build
+INSTALL_TARGET= install
+
+.include <bsd.port.pre.mk>
+
+IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|python|python${PYTHON_VER}|' ${BUILD_WRKSRC}/${WAF_TOOL}
+ @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
+ ${BUILD_WRKSRC}/wscript
+
+# Use threading (or multiprocessing) but not thread (renamed in python 3+).
+pre-configure:
+ @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
+ ${ECHO_CMD}; \
+ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
+ ${ECHO_CMD}; \
+ ${FALSE}; \
+ fi
+
+do-build:
+ @(cd ${BUILD_WRKSRC}; \
+ if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; 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-build:
+.if ${PORT_OPTIONS:MPYTHON}
+ ${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py
+ ${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py
+.endif
+
+do-install:
+ @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+.include <bsd.port.post.mk>
Modified: trunk/devel/tevent/distinfo
===================================================================
--- trunk/devel/tevent/distinfo 2014-02-25 21:50:33 UTC (rev 15900)
+++ trunk/devel/tevent/distinfo 2014-02-26 13:54:30 UTC (rev 15901)
@@ -1,4 +1,2 @@
-MD5 (tevent-0.9.8.tar.gz) = edc29f20fb508b6b860d70f0f07ccd3f
-SHA256 (tevent-0.9.8.tar.gz) = b004153b6ec7be3084d5d5cb75d3d4e10628c24f903bc05a634de1d1be280598
-RMD160 (tevent-0.9.8.tar.gz) = e561c9caea73c6fa5a72941ef2209dafe32e6f7c
-SIZE (tevent-0.9.8.tar.gz) = 236284
+SHA256 (tevent-0.9.18.tar.gz) = 5c636a0c55a7b59745bae0d8ae3900b5ea8c09bfff6001dcd95f1db9cd06ea4f
+SIZE (tevent-0.9.18.tar.gz) = 505276
Deleted: trunk/devel/tevent/files/patch-tevent.mk
===================================================================
--- trunk/devel/tevent/files/patch-tevent.mk 2014-02-25 21:50:33 UTC (rev 15900)
+++ trunk/devel/tevent/files/patch-tevent.mk 2014-02-26 13:54:30 UTC (rev 15901)
@@ -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)
More information about the Midnightbsd-cvs
mailing list