Date: Wed, 8 Apr 2015 15:05:49 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383571 - in head: Mk/Uses audio/abraca audio/gmidimonitor audio/lv2core audio/nekobee audio/patchage audio/raul audio/slv2 audio/xmms2 databases/ldb databases/ntdb databases/tdb deskut... Message-ID: <201504081505.t38F5neK064164@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Apr 8 15:05:48 2015 New Revision: 383571 URL: https://svnweb.freebsd.org/changeset/ports/383571 Log: Add a new USES=waf to handle the waf building system, allowing to factorise code Plug waf into MAKE_CMD and CONFIGURE_CMD so the regular defined targets can be reused Always define _MAKE_JOBS so that when bsd.port.mk will stop overwritting _MAKE_JOBS when parallel jobs are disabled we can enforce -j1 (which is needed to really disable parallelisation with waf WAF_CMD has been created to allow one to override the location of the waf script relatively to WRKSRC CONFIGURE_TARGET is by default defined to "configure" ALL_TARGET is by default defined to "build" INSTALL_TARGET is by default defined to "install" USES=waf is by default stagedir safe Added: head/Mk/Uses/waf.mk (contents, props changed) Modified: head/audio/abraca/Makefile head/audio/gmidimonitor/Makefile head/audio/lv2core/Makefile head/audio/nekobee/Makefile head/audio/patchage/Makefile head/audio/raul/Makefile head/audio/slv2/Makefile head/audio/xmms2/Makefile head/databases/ldb/Makefile head/databases/ntdb/Makefile head/databases/tdb/Makefile head/deskutils/hamster-applet/Makefile head/deskutils/kupfer/Makefile head/deskutils/semantik/Makefile head/devel/talloc/Makefile head/devel/tevent/Makefile head/graphics/electrix/Makefile head/graphics/py-cairo/Makefile head/graphics/py3-cairo/Makefile head/misc/xiphos/Makefile head/multimedia/mpv/Makefile head/net/samba4/Makefile head/net/samba41/Makefile head/security/hotssh/Makefile Added: head/Mk/Uses/waf.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/waf.mk Wed Apr 8 15:05:48 2015 (r383571) @@ -0,0 +1,49 @@ +# $FreeBSD$ +# +# Provide support to use the waf building system +# +# Feature: waf +# Usage: USES=waf +# +# It implies USES=python:build automatically is no USES=python has been +# specified yet +# +# WAF_CMD can be specified in the ports if the waf script is not +# in WRKSRC/waf +# CONFIGURE_TARGET default to 'configure' +# ALL_TARGET default to 'build' +# INSTALL_TARGET= default to 'install' + +.if !defined(_INCLUDE_USES_WAF_MK) +_INCLUDE_USES_WAF_MK= yes + +.if !empty(waf_ARGS) +IGNORE= Incorrect 'USES+= waf:${waf_ARGS}' waf takes no arguments +.endif + +.if !${USES:Mpython*} +python_ARGS= 2,build +.include "${USESDIR}/python.mk" +.endif + +MAKEFILE= # +MAKE_FLAGS= # +ALL_TARGET= # +HAS_CONFIGURE= yes +WAF_CMD?= ./waf + +CONFIGURE_TARGET?= configure +ALL_TARGET?= build +INSTALL_TARGET?= install + +CONFIGURE_CMD= ${PYTHON_CMD} ${WAF_CMD} ${CONFIGURE_TARGET} +MAKE_CMD= ${PYTHON_CMD} ${WAF_CMD} +CONFIGURE_ARGS+= --prefix=${PREFIX} \ + ${_MAKE_JOBS} + +DESTDIRNAME= --destdir + +# Set a minimal job of 1 +_MAKE_JOBS= -j${MAKE_JOBS_NUMVER} + +.endif Modified: head/audio/abraca/Makefile ============================================================================== --- head/audio/abraca/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/audio/abraca/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -15,10 +15,12 @@ LIB_DEPENDS= libxmmsclient.so:${PORTSDIR RUN_DEPENDS= gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \ gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme -USES= pkgconfig python:build tar:bzip2 +USES= pkgconfig waf tar:bzip2 USE_GNOME= gtk30 MAKE_ARGS= MANDIR=${MANPREFIX}/man +CONFIGURE_ARGS+= --prefix=${PREFIX} \ + --mandir=${PREFIX}/man OPTIONS_DEFINE= NLS OPTIONS_DEFAULT= NLS @@ -34,15 +36,7 @@ post-patch: -e '/recurse/s/ po//' ${WRKSRC}/wscript .endif -do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf configure ${_MAKE_JOBS} \ - --prefix=${PREFIX} --mandir=${PREFIX}/man - -do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf build ${_MAKE_JOBS} - -do-install: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf install --destdir=${STAGEDIR} +post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> Modified: head/audio/gmidimonitor/Makefile ============================================================================== --- head/audio/gmidimonitor/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/audio/gmidimonitor/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -13,23 +13,14 @@ COMMENT= GTK+ application that shows MID LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack \ liblash.so:${PORTSDIR}/audio/lash -USES= pkgconfig tar:bzip2 +USES= pkgconfig tar:bzip2 waf USE_GNOME= gtk20 libglade2 +CONFIGURE_ARGS= --alsa=no + LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING PLIST_FILES= bin/gmidimonitor %%DATADIR%%/gmidimonitor.ui -MAKE_JOBS_ARGS= -j${MAKE_JOBS_NUMBER} - -do-configure: - @(cd ${WRKSRC} && ./waf configure --prefix=${PREFIX} --alsa=no) - -do-build: - @(cd ${WRKSRC} && ./waf ${MAKE_JOBS_ARGS}) - -do-install: - @(cd ${WRKSRC} && ./waf --destdir=${STAGEDIR} install) - .include <bsd.port.mk> Modified: head/audio/lv2core/Makefile ============================================================================== --- head/audio/lv2core/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/audio/lv2core/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -12,16 +12,12 @@ COMMENT= LV2 Core Package LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING -USES= pkgconfig python:build tar:bzip2 - -.include <bsd.port.pre.mk> +USES= pkgconfig python:build tar:bzip2 waf .if defined(BATCH) || defined(PACKAGE_BUILDING) -WAF_VERBOSE= --verbose +MAKE_ARGS+= --verbose .endif -WAF_JOBS= --jobs=${MAKE_JOBS_NUMBER} - post-patch: @${REINPLACE_CMD} -e '/autowaf.build_pc/s|^|#|' ${WRKSRC}/wscript @(cd ${WRKSRC} && ${SED} -e \ @@ -31,15 +27,7 @@ post-patch: s|@INCLUDEDIR@|${PREFIX}/include| ; \ s|@LV2CORE_VERSION@|${PORTVERSION}|' < lv2core.pc.in > lv2core.pc) -do-configure: - @(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} --prefix=${PREFIX} configure) - -do-build: - @(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} ${WAF_JOBS} build) - -do-install: - @(cd ${WRKSRC} && ${PYTHON_CMD} waf --destdir=${STAGEDIR} \ - ${WAF_VERBOSE} install) +post-install: ${INSTALL_DATA} ${WRKSRC}/lv2core.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/nekobee/Makefile ============================================================================== --- head/audio/nekobee/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/audio/nekobee/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -21,25 +21,17 @@ USE_GITHUB= yes GH_ACCOUNT= gordonjcp GH_COMMIT= 3f4737f -USES= pkgconfig +USES= pkgconfig waf USE_GNOME= gtk20 CPPFLAGS+= -I${LOCALBASE}/include/dssi -I${LOCALBASE}/include +LDFLAGS+= -lm post-patch: @${REINPLACE_CMD} -e \ '/LINKFLAGS/s|^|#|' ${WRKSRC}/wscript -do-configure: - @(cd ${WRKSRC} && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" LINKFLAGS="-lm" \ - ./waf configure --prefix=${PREFIX}) - -do-build: - @(cd ${WRKSRC} && ./waf build -vvv -j${MAKE_JOBS_NUMBER}) - -do-install: - @(cd ${WRKSRC} && ./waf install --destdir=${STAGEDIR}) +post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dssi/nekobee.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dssi/nekobee/nekobee_gtk Modified: head/audio/patchage/Makefile ============================================================================== --- head/audio/patchage/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/audio/patchage/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -22,36 +22,25 @@ LIB_DEPENDS= libjack.so:${PORTSDIR}/audi libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \ libflowcanvas.so:${PORTSDIR}/x11-toolkits/flowcanvas -USES= pkgconfig python:build tar:bzip2 +USES= pkgconfig tar:bzip2 waf INSTALLS_ICONS= yes +CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ + --no-alsa \ + --no-lash CFLAGS+= -I${LOCALBASE}/include -.include <bsd.port.pre.mk> - .if defined(BATCH) || defined(PACKAGE_BUILDING) -WAF_VERBOSE= --verbose +MAKE_ARGS= --verbose .endif -WAF_JOBS= --jobs=${MAKE_JOBS_NUMBER} - post-patch: @${REINPLACE_CMD} -e \ "s|$$[{]LIBDIRNAME[}]/pkgconfig|libdata/pkgconfig| ; \ s|-fshow-column'|-fshow-column ${CXXFLAGS}'|" \ ${WRKSRC}/autowaf/autowaf.py -do-configure: - (cd ${WRKSRC} && ./waf ${WAF_VERBOSE} --prefix=${PREFIX} \ - --mandir=${MANPREFIX}/man --no-alsa --no-lash configure) - -do-build: - (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ./waf ${WAF_VERBOSE} ${WAF_JOBS} build) - -do-install: - (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ./waf ${WAF_VERBOSE} --destdir=${STAGEDIR} install) +post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/raul/Makefile ============================================================================== --- head/audio/raul/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/audio/raul/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -15,34 +15,20 @@ LICENSE_COMB= dual LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs -USES= pkgconfig python:build tar:bzip2 +USES= pkgconfig tar:bzip2 waf USE_GNOME= glib20 USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include -.include <bsd.port.pre.mk> - .if defined(BATCH) || defined(PACKAGE_BUILDING) -WAF_VERBOSE= --verbose +MAKE_ARGS= --verbose .endif -WAF_JOBS= --jobs=${MAKE_JOBS_NUMBER} - post-patch: @${REINPLACE_CMD} -e \ "s|$$[{]LIBDIRNAME[}]/pkgconfig|libdata/pkgconfig| ; \ s|-fshow-column'|-fshow-column ${CXXFLAGS}'|" \ ${WRKSRC}/autowaf/autowaf.py -do-configure: - @(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} --prefix=${PREFIX} configure) - -do-build: - @(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} ${WAF_JOBS} build) - -do-install: - @(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} \ - --destdir=${STAGEDIR} install) - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/slv2/Makefile ============================================================================== --- head/audio/slv2/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/audio/slv2/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -16,17 +16,13 @@ BUILD_DEPENDS= ${LOCALBASE}/include/lv2. LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack \ librdf.so:${PORTSDIR}/textproc/redland -USES= pkgconfig python:build tar:bzip2 +USES= pkgconfig tar:bzip2 waf USE_LDCONFIG= yes -.include <bsd.port.pre.mk> - .if defined(BATCH) || defined(PACKAGE_BUILDING) -WAF_VERBOSE= --verbose +MAKE_ARGS= --verbose .endif -WAF_JOBS= --jobs=${MAKE_JOBS_NUMBER} - post-patch: @${REINPLACE_CMD} -e \ '/pkgconfig/s|$${LIBDIRNAME}|libdata|' ${WRKSRC}/autowaf.py @@ -37,19 +33,9 @@ post-patch: @${REINPLACE_CMD} -e \ 's|^#define _XOPEN_SOURCE .*||' ${WRKSRC}/src/plugin.c -do-configure: - (cd ${WRKSRC} && ${PYTHON_CMD} \ - waf ${WAF_VERBOSE} --prefix=${PREFIX} configure) - -do-build: - (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ - waf ${WAF_VERBOSE} ${WAF_JOBS} build) - -do-install: - (cd ${WRKSRC} && ${PYTHON_CMD} \ - waf ${WAF_VERBOSE} --destdir=${STAGEDIR} install) +post-install: .for file in lv2_inspect lv2_jack_host lv2_list lv2_simple_jack_host ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/xmms2/Makefile ============================================================================== --- head/audio/xmms2/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/audio/xmms2/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -11,7 +11,10 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER?= madpilot@FreeBSD.org COMMENT?= Rewrite of xmms as a client/server system (developer release) -USES+= pkgconfig python:build tar:bzip2 +USES+= pkgconfig tar:bzip2 waf + +CONFIGURE_ARGS+= --conf-prefix=${LOCALBASE} \ + --mandir=${MANPREFIX}/man .if !defined(XMMS2_SLAVE) USE_GNOME= glib20 @@ -53,23 +56,23 @@ XML_DESC= Support XML based playlists (X .include <bsd.port.options.mk> .if defined(XMMS2_SLAVE) -EXCLUDE+= --without-xmms2d +CONFIGURE_ARGS+= --without-xmms2d .if ${XMMS2_SLAVE} == "python" -EXCLUDE+= --with-optionals="python" +CONFIGURE_ARGS+= --with-optionals="python" .elif ${XMMS2_SLAVE} == "ruby" -EXCLUDE+= --with-optionals="ruby" +CONFIGURE_ARGS+= --with-optionals="ruby" .elif ${XMMS2_SLAVE} == "perl" -EXCLUDE+= --with-optionals="perl" +CONFIGURE_ARGS+= --with-optionals="perl" .elif ${XMMS2_SLAVE} == "ruby-ecore" -EXCLUDE+= --with-optionals="ruby" --with-optionals="xmmsclient-ecore" +CONFIGURE_ARGS+= --with-optionals="ruby" --with-optionals="xmmsclient-ecore" .elif ${XMMS2_SLAVE} == "cpp" -EXCLUDE+= --with-optionals="xmmsclient++" \ +CONFIGURE_ARGS+= --with-optionals="xmmsclient++" \ --with-optionals="xmmsclient++-glib" .endif .else # XMMS2_SLAVE -EXCLUDE+= --without-optionals="python" \ +CONFIGURE_ARGS+= --without-optionals="python" \ --without-optionals="ruby" \ --without-optionals="xmmsclient-ecore" \ --without-optionals="xmmsclient++" \ @@ -83,7 +86,7 @@ EXCLUDE+= --without-optionals="python" \ USE_OPENSSL= yes PLIST_SUB+= AIRPLAY="" .else -EXCLUDE+= --without-plugins="airplay" +CONFIGURE_ARGS+= --without-plugins="airplay" PLIST_SUB+= AIRPLAY="@comment " .endif @@ -91,7 +94,7 @@ PLIST_SUB+= AIRPLAY="@comment " LIB_DEPENDS+= libao.so:${PORTSDIR}/audio/libao PLIST_SUB+= AO="" .else -EXCLUDE+= --without-plugins="ao" +CONFIGURE_ARGS+= --without-plugins="ao" PLIST_SUB+= AO="@comment " .endif @@ -99,7 +102,7 @@ PLIST_SUB+= AO="@comment " LIB_DEPENDS+= libmac.so:${PORTSDIR}/audio/mac PLIST_SUB+= MAC="" .else -EXCLUDE+= --without-plugins="mac" +CONFIGURE_ARGS+= --without-plugins="mac" PLIST_SUB+= MAC="@comment " .endif @@ -107,7 +110,7 @@ PLIST_SUB+= MAC="@comment " LIB_DEPENDS+= libavutil.so:${PORTSDIR}/multimedia/ffmpeg PLIST_SUB+= AVCODEC="" .else -EXCLUDE+= --without-plugins="avcodec" +CONFIGURE_ARGS+= --without-plugins="avcodec" PLIST_SUB+= AVCODEC="@comment " .endif @@ -117,7 +120,7 @@ LIB_DEPENDS+= libcdio.so:${PORTSDIR}/sys libdiscid.so:${PORTSDIR}/audio/libdiscid PLIST_SUB+= CDDA="" .else -EXCLUDE+= --without-plugins="cdda" +CONFIGURE_ARGS+= --without-plugins="cdda" PLIST_SUB+= CDDA="@comment " .endif @@ -125,7 +128,7 @@ PLIST_SUB+= CDDA="@comment " LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl PLIST_SUB+= CURL="" .else -EXCLUDE+= --without-plugins="curl" --without-plugins="icymetaint" +CONFIGURE_ARGS+= --without-plugins="curl" --without-plugins="icymetaint" PLIST_SUB+= CURL="@comment " .endif @@ -133,7 +136,7 @@ PLIST_SUB+= CURL="@comment " LIB_DEPENDS+= libfaad.so:${PORTSDIR}/audio/faad PLIST_SUB+= FAAD="" .else -EXCLUDE+= --without-plugins="faad" --without-plugins="mp4" +CONFIGURE_ARGS+= --without-plugins="faad" --without-plugins="mp4" PLIST_SUB+= FAAD="@comment " .endif @@ -141,7 +144,7 @@ PLIST_SUB+= FAAD="@comment " USES+= fam:gamin PLIST_SUB+= FAM="" .else -EXCLUDE+= --without-optionals="medialib-updater" +CONFIGURE_ARGS+= --without-optionals="medialib-updater" PLIST_SUB+= FAM="@comment " .endif @@ -149,7 +152,7 @@ PLIST_SUB+= FAM="@comment " LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac PLIST_SUB+= FLAC="" .else -EXCLUDE+= --without-plugins="flac" +CONFIGURE_ARGS+= --without-plugins="flac" PLIST_SUB+= FLAC="@comment " .endif @@ -157,7 +160,7 @@ PLIST_SUB+= FLAC="@comment " LIB_DEPENDS+= libgme.so:${PORTSDIR}/audio/libgme PLIST_SUB+= GME="" .else -EXCLUDE+= --without-plugins="gme" +CONFIGURE_ARGS+= --without-plugins="gme" PLIST_SUB+= GME="@comment " .endif @@ -165,7 +168,7 @@ PLIST_SUB+= GME="@comment " USE_GNOME+= gvfs PLIST_SUB+= GVFS="" .else -EXCLUDE+= --without-plugins="gvfs" +CONFIGURE_ARGS+= --without-plugins="gvfs" PLIST_SUB+= GVFS="@comment " .endif @@ -173,7 +176,7 @@ PLIST_SUB+= GVFS="@comment " LIB_DEPENDS+= libshout.so:${PORTSDIR}/audio/libshout PLIST_SUB+= ICES="" .else -EXCLUDE+= --without-plugins="ices" +CONFIGURE_ARGS+= --without-plugins="ices" PLIST_SUB+= ICES="@comment " .endif @@ -181,7 +184,7 @@ PLIST_SUB+= ICES="@comment " LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack PLIST_SUB+= JACK="" .else -EXCLUDE+= --without-plugins="jack" +CONFIGURE_ARGS+= --without-plugins="jack" PLIST_SUB+= JACK="@comment " .endif @@ -189,16 +192,16 @@ PLIST_SUB+= JACK="@comment " LIB_DEPENDS+= libmad.so:${PORTSDIR}/audio/libmad PLIST_SUB+= MAD="" .else -EXCLUDE+= --without-plugins="mad" +CONFIGURE_ARGS+= --without-plugins="mad" PLIST_SUB+= MAD="@comment " .endif .if empty(PORT_OPTIONS:MMDNS) -EXCLUDE+= --without-optionals="mdns" +CONFIGURE_ARGS+= --without-optionals="mdns" .endif .if ${PORT_OPTIONS:MMDNS_APPLE} -EXCLUDE+= --with-mdns-backend="dns_sd" +CONFIGURE_ARGS+= --with-mdns-backend="dns_sd" LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder PLIST_SUB+= MDNS_APPLE="" .else @@ -206,7 +209,7 @@ PLIST_SUB+= MDNS_APPLE="@comment " .endif .if ${PORT_OPTIONS:MMDNS_AVAHI} -EXCLUDE+= --with-mdns-backend="avahi" +CONFIGURE_ARGS+= --with-mdns-backend="avahi" LIB_DEPENDS+= libavahi-core.so:${PORTSDIR}/net/avahi-app PLIST_SUB+= MDNS_AVAHI="" MAN1+= xmms2-mdns-avahi.1 @@ -218,7 +221,7 @@ PLIST_SUB+= MDNS_AVAHI="@comment " LIB_DEPENDS+= libmms.so:${PORTSDIR}/net/libmms PLIST_SUB+= MMS="" .else -EXCLUDE+= --without-plugins="mms" +CONFIGURE_ARGS+= --without-plugins="mms" PLIST_SUB+= MMS="@comment " .endif @@ -226,7 +229,7 @@ PLIST_SUB+= MMS="@comment " LIB_DEPENDS+= libmodplug.so:${PORTSDIR}/audio/libmodplug PLIST_SUB+= MODPLUG="" .else -EXCLUDE+= --without-plugins="modplug" +CONFIGURE_ARGS+= --without-plugins="modplug" PLIST_SUB+= MODPLUG="@comment " .endif @@ -234,7 +237,7 @@ PLIST_SUB+= MODPLUG="@comment " LIB_DEPENDS+= libmpg123.so:${PORTSDIR}/audio/mpg123 PLIST_SUB+= MPG123="" .else -EXCLUDE+= --without-plugins="mpg123" +CONFIGURE_ARGS+= --without-plugins="mpg123" PLIST_SUB+= MPG123="@comment " .endif @@ -242,7 +245,7 @@ PLIST_SUB+= MPG123="@comment " LIB_DEPENDS+= libmpcdec.so:${PORTSDIR}/audio/musepack PLIST_SUB+= MUSEPACK="" .else -EXCLUDE+= --without-plugins="musepack" +CONFIGURE_ARGS+= --without-plugins="musepack" PLIST_SUB+= MUSEPACK="@comment " .endif @@ -250,7 +253,7 @@ PLIST_SUB+= MUSEPACK="@comment " LIB_DEPENDS+= libofa.so:${PORTSDIR}/audio/libofa PLIST_SUB+= OFA="" .else -EXCLUDE+= --without-plugins="ofa" +CONFIGURE_ARGS+= --without-plugins="ofa" PLIST_SUB+= OFA="@comment " .endif @@ -258,7 +261,7 @@ PLIST_SUB+= OFA="@comment " LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio PLIST_SUB+= PULSE="" .else -EXCLUDE+= --without-plugins="pulse" +CONFIGURE_ARGS+= --without-plugins="pulse" PLIST_SUB+= PULSE="@comment " .endif @@ -266,7 +269,7 @@ PLIST_SUB+= PULSE="@comment " LIB_DEPENDS+= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" .else -EXCLUDE+= --without-plugins="samba" +CONFIGURE_ARGS+= --without-plugins="samba" PLIST_SUB+= SAMBA="@comment " .endif @@ -274,7 +277,7 @@ PLIST_SUB+= SAMBA="@comment " LIB_DEPENDS+= libsidplay2.so:${PORTSDIR}/audio/libsidplay2 PLIST_SUB+= SID="" .else -EXCLUDE+= --without-plugins="sid" +CONFIGURE_ARGS+= --without-plugins="sid" PLIST_SUB+= SID="@comment " .endif @@ -282,7 +285,7 @@ PLIST_SUB+= SID="@comment " LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile PLIST_SUB+= SNDFILE="" .else -EXCLUDE+= --without-plugins="sndfile" +CONFIGURE_ARGS+= --without-plugins="sndfile" PLIST_SUB+= SNDFILE="@comment " .endif @@ -290,7 +293,7 @@ PLIST_SUB+= SNDFILE="@comment " LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex PLIST_SUB+= SPEEX="" .else -EXCLUDE+= --without-plugins="speex" +CONFIGURE_ARGS+= --without-plugins="speex" PLIST_SUB+= SPEEX="@comment " .endif @@ -298,7 +301,7 @@ PLIST_SUB+= SPEEX="@comment " LIB_DEPENDS+= libvorbisidec.so:${PORTSDIR}/audio/libtremor PLIST_SUB+= TREMOR="" .else -EXCLUDE+= --without-plugins="tremor" +CONFIGURE_ARGS+= --without-plugins="tremor" PLIST_SUB+= TREMOR="@comment " .endif @@ -314,10 +317,10 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- USE_SDL= yes LIB_DEPENDS+= libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04 .else -EXCLUDE+= --without-optionals="vistest" +CONFIGURE_ARGS+= --without-optionals="vistest" .endif -.if ${PORT_OPTIONS:MVISUAL} && ${EXCLUDE:M--with-vis-reference-clients} +.if ${PORT_OPTIONS:MVISUAL} && ${CONFIGURE_ARGS:M--with-vis-reference-clients} PLIST_SUB+= VISUAL="" .else PLIST_SUB+= VISUAL="@comment " @@ -328,7 +331,7 @@ LIB_DEPENDS+= libfftw3f.so:${PORTSDIR}/m libsamplerate.so:${PORTSDIR}/audio/libsamplerate PLIST_SUB+= VOCODER="" .else -EXCLUDE+= --without-plugins="vocoder" +CONFIGURE_ARGS+= --without-plugins="vocoder" PLIST_SUB+= VOCODER="@comment " .endif @@ -336,7 +339,7 @@ PLIST_SUB+= VOCODER="@comment " LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis PLIST_SUB+= VORBIS="" .else -EXCLUDE+= --without-plugins="vorbis" +CONFIGURE_ARGS+= --without-plugins="vorbis" PLIST_SUB+= VORBIS="@comment " .endif @@ -344,7 +347,7 @@ PLIST_SUB+= VORBIS="@comment " LIB_DEPENDS+= libwavpack.so:${PORTSDIR}/audio/wavpack PLIST_SUB+= WAVPACK="" .else -EXCLUDE+= --without-plugins="wavpack" +CONFIGURE_ARGS+= --without-plugins="wavpack" PLIST_SUB+= WAVPACK="@comment " .endif @@ -352,7 +355,7 @@ PLIST_SUB+= WAVPACK="@comment " USE_GNOME+= libxml2 PLIST_SUB+= XML="" .else -EXCLUDE+= --without-plugins="xml" --without-plugins="rss" \ +CONFIGURE_ARGS+= --without-plugins="xml" --without-plugins="rss" \ --without-plugins="xspf" PLIST_SUB+= XML="@comment " .endif @@ -361,7 +364,7 @@ PLIST_SUB+= XML="@comment " PLIST_SUB+= ET="" MAN1+= xmms2-et.1 .else -EXCLUDE+= --without-optionals="et" +CONFIGURE_ARGS+= --without-optionals="et" PLIST_SUB+= ET="@comment " .endif @@ -374,20 +377,9 @@ post-patch: ${WRKSRC}/src/clients/vistest/wscript .endif -do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf ${_MAKE_JOBS} configure \ - --conf-prefix=${LOCALBASE} --prefix=${PREFIX} \ - --mandir=${PREFIX}/man ${EXCLUDE} - -do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf ${_MAKE_JOBS} build - -do-install: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf install --destdir=${STAGEDIR} --without-ldconfig +post-install: .if !defined(XMMS2_SLAVE) - if [ ! -d ${STAGEDIR}${DATADIR}/scripts/startup.d ]; then \ - ${MKDIR} ${STAGEDIR}${DATADIR}/scripts/startup.d; \ - fi + ${MKDIR} ${STAGEDIR}${DATADIR}/scripts/startup.d .endif .include <bsd.port.mk> Modified: head/databases/ldb/Makefile ============================================================================== --- head/databases/ldb/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/databases/ldb/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -15,9 +15,9 @@ LICENSE= GPLv3 CONFLICTS= *samba3[0-4]-3.* -USES= compiler pkgconfig python:2 +USES= compiler pkgconfig python:2 waf USE_LDCONFIG= yes -WAF_TOOL= buildtools/bin/waf +WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log USE_OPENLDAP= yes @@ -25,11 +25,8 @@ USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --mandir=${MANPREFIX}/man \ +CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} -# Support staging -DESTDIRNAME= --destdir OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) @@ -44,8 +41,6 @@ CONFIGURE_ARGS+= --bundled-libraries=!ta --with-modulesdir=${PREFIX}/lib/shared-modules \ --with-privatelibdir=${PREFIX}/lib/ldb -.include <bsd.port.options.mk> - .include <bsd.port.pre.mk> .if ! ${PORT_OPTIONS:MMANPAGES} @@ -87,11 +82,6 @@ CFLAGS+= -fno-color-diagnostics 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} -.endif - PLIST_FILES+= include/pyldb.h \ lib/libpyldb-util.so \ lib/libpyldb-util.so.1 \ @@ -109,10 +99,6 @@ LDB_MAN3= man/man3/ldb.3.gz PLIST_FILES+= ${LDB_MAN1} ${LDB_MAN3} -CONFIGURE_TARGET= configure -ALL_TARGET= build -INSTALL_TARGET= install - IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @@ -128,23 +114,6 @@ 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) - pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man @@ -153,17 +122,4 @@ pre-build: . endfor .endif -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) - -do-install: - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET}) - .include <bsd.port.post.mk> Modified: head/databases/ntdb/Makefile ============================================================================== --- head/databases/ntdb/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/databases/ntdb/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -15,20 +15,17 @@ LICENSE= GPLv3 CONFLICTS= -USES= compiler pkgconfig +USES= compiler pkgconfig waf USE_LDCONFIG= yes -WAF_TOOL= buildtools/bin/waf +WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --mandir=${MANPREFIX}/man \ +CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \ --without-gettext -# Support staging -DESTDIRNAME= --destdir OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) @@ -37,7 +34,6 @@ MANPAGES_DESC= Build and install manpag .if defined(NO_PYTHON) CONFIGURE_ARGS+= --disable-python -USES+= python:2,build .else USES+= python:2 PLIST_FILES+= %%PYTHON_SITELIBDIR%%/ntdb.so @@ -68,11 +64,6 @@ CFLAGS+= -fno-color-diagnostics 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} -.endif - TDB_MAN3= man/man3/ntdb.3.gz TDB_MAN8= man/man8/ntdbbackup.8.gz \ @@ -82,10 +73,6 @@ TDB_MAN8= man/man8/ntdbbackup.8.gz \ PLIST_FILES+= ${TDB_MAN3} ${TDB_MAN8} -CONFIGURE_TARGET= configure -ALL_TARGET= build -INSTALL_TARGET= install - IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @@ -101,23 +88,6 @@ 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) - pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man @@ -126,17 +96,4 @@ pre-build: . endfor .endif -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) - -do-install: - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET}) - .include <bsd.port.post.mk> Modified: head/databases/tdb/Makefile ============================================================================== --- head/databases/tdb/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/databases/tdb/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -15,19 +15,16 @@ LICENSE= GPLv3 CONFLICTS= *samba3[0-4]-3.* -USES= compiler pkgconfig +USES= compiler pkgconfig waf USE_LDCONFIG= yes -WAF_TOOL= buildtools/bin/waf +WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --mandir=${MANPREFIX}/man \ +CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} -# Support staging -DESTDIRNAME= --destdir OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) @@ -36,7 +33,6 @@ MANPAGES_DESC= Build and install manpag .if defined(NO_PYTHON) CONFIGURE_ARGS+= --disable-python -USES+= python:2,build .else USES+= python:2 PLIST_FILES+= %%PYTHON_SITELIBDIR%%/tdb.so @@ -67,11 +63,6 @@ CFLAGS+= -fno-color-diagnostics 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} -.endif - TDB_MAN8= man/man8/tdbbackup.8.gz \ man/man8/tdbdump.8.gz \ man/man8/tdbrestore.8.gz \ @@ -79,10 +70,6 @@ TDB_MAN8= man/man8/tdbbackup.8.gz \ PLIST_FILES+= ${TDB_MAN8} -CONFIGURE_TARGET= configure -ALL_TARGET= build -INSTALL_TARGET= install - IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @@ -98,23 +85,6 @@ 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) - pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man @@ -123,17 +93,4 @@ pre-build: . endfor .endif -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) - -do-install: - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET}) - .include <bsd.port.post.mk> Modified: head/deskutils/hamster-applet/Makefile ============================================================================== --- head/deskutils/hamster-applet/Makefile Wed Apr 8 14:59:25 2015 (r383570) +++ head/deskutils/hamster-applet/Makefile Wed Apr 8 15:05:48 2015 (r383571) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqli ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \ ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus -USES= gettext gmake pkgconfig python tar:bzip2 +USES= gettext gmake pkgconfig python tar:bzip2 waf USE_XORG= xscrnsaver USE_GNOME= gnomeprefix intlhack pygnomedesktop \ gnomecontrolcenter2 gnomedocutils @@ -30,22 +30,10 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= hamster-applet.schemas -.include <bsd.port.pre.mk> - *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504081505.t38F5neK064164>