Date: Thu, 13 Mar 2014 02:10:52 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348020 - head/devel/tevent Message-ID: <201403130210.s2D2AqtZ024079@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Thu Mar 13 02:10:51 2014 New Revision: 348020 URL: http://svnweb.freebsd.org/changeset/ports/348020 QAT: https://qat.redports.org/buildarchive/r348020/ Log: Convert port to support STAGE Modified: head/devel/tevent/Makefile Modified: head/devel/tevent/Makefile ============================================================================== --- head/devel/tevent/Makefile Thu Mar 13 01:12:42 2014 (r348019) +++ head/devel/tevent/Makefile Thu Mar 13 02:10:51 2014 (r348020) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tevent -PORTVERSION= 0.9.18 +PORTVERSION= 0.9.21 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= devel @@ -15,14 +15,11 @@ LICENSE= LGPL3 CONFLICTS= +USES= compiler pkgconfig USE_PYTHON_BUILD= 2 USE_LDCONFIG= yes -HAS_CONFIGURE= yes WAF_TOOL= buildtools/bin/waf -CONFIGURE_SCRIPT= ${WAF_TOOL} configure CONFIGURE_LOG= bin/config.log -USES= pkgconfig - PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} @@ -30,33 +27,42 @@ PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR CONFIGURE_ARGS+= --prefix=${PREFIX} \ --mandir=${MANPREFIX}/man \ --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} +# Support staging +DESTDIRNAME= --destdir -OPTIONS_DEFINE= PYTHON -OPTIONS_DEFAULT= PYTHON - -NO_STAGE= yes .include <bsd.port.options.mk> +.include <bsd.port.pre.mk> + +.if ! ${PORT_OPTIONS:MMANPAGES} +CONFIGURE_ENV+= XSLTPROC="true" +.else +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + xsltproc:${PORTSDIR}/textproc/libxslt +.endif + PLIST_FILES= include/tevent.h \ lib/libtevent.so \ lib/libtevent.so.0 \ %%PKGCONFIGDIR%%/tevent.pc -CONFIGURE_ENV+= XSLTPROC="/usr/bin/true" -CONFIGURE_ENV+= NOCOLOR=yes -MAKE_ENV+= NOCOLOR=yes - -BUILD_DEPENDS+= talloc>=2.0.8:${PORTSDIR}/devel/talloc +BUILD_DEPENDS+= talloc>=2.1.0:${PORTSDIR}/devel/talloc RUN_DEPENDS:= ${BUILD_DEPENDS} CONFIGURE_ARGS+= --bundled-libraries=!talloc +# No fancy color error messages +.if ${COMPILER_TYPE} == "clang" +CFLAGS+= -fno-color-diagnostics +.endif +CONFIGURE_ENV+= NOCOLOR=yes +MAKE_ENV+= NOCOLOR=yes + .if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE) CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER} -_MAKE_JOBS= --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 \ @@ -64,19 +70,14 @@ PLIST_FILES+= %%PYTHON_SITELIBDIR%%/_te %%PYTHON_SITELIBDIR%%/tevent.pyo PLIST_DIRSTRY+= %%PYTHON_SITELIBDIR%% \ %%PYTHON_LIBDIR%% -.else -CONFIGURE_ARGS+= --disable-python -.endif +CONFIGURE_TARGET= configure 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 @@ -89,6 +90,23 @@ pre-configure: ${FALSE}; \ fi +do-configure: + @(cd ${CONFIGURE_WRKSRC} && \ + ${SET_LATE_CONFIGURE_ARGS} \ + if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_LIB="${INSTALL_LIB}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + ${CONFIGURE_ENV} ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/${WAF_TOOL} ${CONFIGURE_ARGS} ${CONFIGURE_TARGET}; then \ + ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ + (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + ${FALSE}; \ + fi) + do-build: @(cd ${BUILD_WRKSRC}; \ if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ @@ -100,10 +118,8 @@ do-build: 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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403130210.s2D2AqtZ024079>