Date: Tue, 29 Apr 2014 00:52:12 +0000 (UTC) From: Barbara Guida <bar@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352562 - head/net-p2p/amule Message-ID: <201404290052.s3T0qCUZ036643@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bar Date: Tue Apr 29 00:52:11 2014 New Revision: 352562 URL: http://svnweb.freebsd.org/changeset/ports/352562 QAT: https://qat.redports.org/buildarchive/r352562/ Log: - Remove unneeded dependency from flex from ports - Use options helpers - Convert to tar:bzip2 and desktop-file-utils - Add DEBUG option - Pet portlint - Attempt to fix build with pkg_install for PLASMAMULE Modified: head/net-p2p/amule/Makefile head/net-p2p/amule/pkg-plist Modified: head/net-p2p/amule/Makefile ============================================================================== --- head/net-p2p/amule/Makefile Tue Apr 29 00:16:00 2014 (r352561) +++ head/net-p2p/amule/Makefile Tue Apr 29 00:52:11 2014 (r352562) @@ -3,7 +3,7 @@ PORTNAME= amule PORTVERSION= 2.3.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} @@ -14,15 +14,12 @@ COMMENT= The all-platform eMule p2p clie LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING - -BUILD_DEPENDS= ${FLEX}:${PORTSDIR}/textproc/flex \ - ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp +BUILD_DEPENDS= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp CONFLICTS= amule-devel-[0-9]* -USE_BZIP2= yes -USES= bison gmake pkgconfig perl5 shebangfix +USES= bison gmake pkgconfig perl5 shebangfix tar:bzip2 \ + desktop-file-utils USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute @@ -36,7 +33,7 @@ CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DOCS ED2K \ +OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW GEOIP MMAP MONOLITHIC NLS PLASMAMULE UPNP \ WEBSERVER WXCAS WXUNICODE XAS ALC_DESC= Compile aMule Link Creator for GUI @@ -56,162 +53,72 @@ XAS_DESC= Install XChat2 plugin OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ FILEVIEW MONOLITHIC WEBSERVER WXCAS WXUNICODE XAS -FLEX?= ${LOCALBASE}/bin/flex +OPTIONS_SUB= yes SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl -.include <bsd.port.options.mk> +LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING -.if ${ARCH} == "i386" && ( ${OSVERSION} >= 1000024 || ${CXX:T} == "clang++" ) -CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM -.endif +DEBUG_CONFIGURE_ON= --enable-debug -.if empty(PORT_OPTIONS:MDEBUG) -CONFIGURE_ARGS+=--disable-debug -.endif +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MALC} -CONFIGURE_ARGS+= --enable-alc -PLIST_SUB+= ALC="" -.else -CONFIGURE_ARGS+= --disable-alc -PLIST_SUB+= ALC="@comment " -.endif - -.if ${PORT_OPTIONS:MALCC} -CONFIGURE_ARGS+= --enable-alcc -PLIST_SUB+= ALCC="" -.else -CONFIGURE_ARGS+= --disable-alcc -PLIST_SUB+= ALCC="@comment " -.endif - -.if ${PORT_OPTIONS:MAMULECMD} -CONFIGURE_ARGS+= --enable-amulecmd -PLIST_SUB+= AMULECMD="" -.else -CONFIGURE_ARGS+= --disable-amulecmd -PLIST_SUB+= AMULECMD="@comment " -.endif - -.if ${PORT_OPTIONS:MAMULEDAEMON} -CONFIGURE_ARGS+= --enable-amule-daemon -PLIST_SUB+= AMULEDAEMON="" -USE_RC_SUBR= amuled -.else -CONFIGURE_ARGS+= --disable-amule-daemon -PLIST_SUB+= AMULEDAEMON="@comment " -.endif - -.if ${PORT_OPTIONS:MAMULEGUI} -CONFIGURE_ARGS+= --enable-amule-gui -PLIST_SUB+= AMULEGUI="" -.else -CONFIGURE_ARGS+= --disable-amule-gui -PLIST_SUB+= AMULEGUI="@comment " -.endif - -.if ${PORT_OPTIONS:MCAS} -CONFIGURE_ARGS+= --enable-cas -LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd -PLIST_SUB+= CAS="" -.else -CONFIGURE_ARGS+= --disable-cas -PLIST_SUB+= CAS="@comment " -.endif +ALC_CONFIGURE_ON= --enable-alc -.if ${PORT_OPTIONS:MED2K} -CONFLICTS+= ed2k-hash* -CONFIGURE_ARGS+= --enable-ed2k -PLIST_SUB+= ED2K="" -.else -CONFIGURE_ARGS+= --disable-ed2k -PLIST_SUB+= ED2K="@comment " -.endif +ALCC_CONFIGURE_ON= --enable-alcc -.if ${PORT_OPTIONS:MFILEVIEW} -CONFIGURE_ARGS+= --enable-fileview -PLIST_SUB+= FILEVIEW="" -.else -CONFIGURE_ARGS+= --disable-fileview -PLIST_SUB+= FILEVIEW="@comment " -.endif - -.if ${PORT_OPTIONS:MGEOIP} -CONFIGURE_ARGS+= --enable-geoip -LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP -.else -CONFIGURE_ARGS+= --disable-geoip -.endif - -.if ${PORT_OPTIONS:MMMAP} -CONFIGURE_ARGS+= --enable-mmap -.else -CONFIGURE_ARGS+= --disable-mmap -.endif - -.if ${PORT_OPTIONS:MMONOLITHIC} -CONFIGURE_ARGS+= --enable-monolithic -PLIST_SUB+= MONOLITHIC="" -.else -CONFIGURE_ARGS+= --disable-monolithic -PLIST_SUB+= MONOLITHIC="@comment " -.endif +AMULECMD_CONFIGURE_ON= --enable-amulecmd -.if ${PORT_OPTIONS:MPLASMAMULE} -CONFIGURE_ENV+= ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \ +AMULEDAEMON_CONFIGURE_ON= --enable-amule-daemon +AMULEDAEMON_USE= RC_SUBR=amuled + +AMULEGUI_CONFIGURE_ON= --enable-amule-gui + +CAS_CONFIGURE_ON= --enable-cas +CAS_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd + +ED2K_CONFIGURE_OFF= --disable-ed2k + +FILEVIEW_CONFIGURE_ON= --enable-fileview + +GEOIP_CONFIGURE_ON= --enable-geoip +GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP + +MMAP_CONFIGURE_ON= --enable-mmap + +MONOLITHIC_CONFIGURE_OFF= --disable-monolithic + +PLASMAMULE_CONFIGURE_ON= --enable-plasmamule +PLASMAMULE_USE= KDE4=kdelibs QT4=dbus,gui,moc_build +PLASMAMULE_CONFIGURE_ENV= \ + ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \ KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true -CONFIGURE_ARGS+= --enable-plasmamule -USE_KDE4= kdelibs -USE_QT4+= dbus gui moc_build -PLIST_SUB+= PLASMAMULE="" -.else -CONFIGURE_ARGS+= --disable-plasmamule -PLIST_SUB+= PLASMAMULE="@comment " -.endif - -.if ${PORT_OPTIONS:MUPNP} -LIB_DEPENDS+= libupnp.so:${PORTSDIR}/devel/upnp -.else -CONFIGURE_ARGS+= --disable-upnp -.endif - -.if ${PORT_OPTIONS:MWEBSERVER} -CONFIGURE_ARGS+= --enable-webserver -PLIST_SUB+= WEBSERVER="" -.else -CONFIGURE_ARGS+= --disable-webserver -PLIST_SUB+= WEBSERVER="@comment " -.endif - -.if ${PORT_OPTIONS:MWXCAS} -CONFIGURE_ARGS+= --enable-wxcas -PLIST_SUB+= WXCAS="" -.else -CONFIGURE_ARGS+= --disable-wxcas -PLIST_SUB+= WXCAS="@comment " +PLASMAMULE_PLIST_SUB+= RESETPREFIX=${PREFIX} + +UPNP_LIB_DEPENDS= libupnp.so:${PORTSDIR}/devel/upnp +UPNP_CONFIGURE_OFF= --disable-upnp + +WEBSERVER_CONFIGURE_ON= --enable-webserver + +WXCAS_CONFIGURE_ON= --enable-wxcas + +XAS_CONFIGURE_ON= --enable-xas +XAS_USE= PERL5+=run + +.include <bsd.port.options.mk> + +.if ${ARCH} == "i386" && ( ${OSVERSION} >= 1000024 || ${CXX:T} == "clang++" ) +CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM .endif -.if ${PORT_OPTIONS:MWXUNICODE} -WX_UNICODE= yes +.if ${PORT_OPTIONS:MED2K} +CONFLICTS+= ed2k-hash* .endif -.if ${PORT_OPTIONS:MXAS} -USE_PERL5+= run -CONFIGURE_ARGS+= --enable-xas -PLIST_SUB+= XAS="" -.else -CONFIGURE_ARGS+= --disable-xas -PLIST_SUB+= XAS="@comment " +.if ${PORT_OPTIONS:MWXUNICODE} +WX_UNICODE= yes .endif post-patch: .SILENT @@ -219,7 +126,7 @@ post-patch: .SILENT -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure -.if empty(PORT_OPTIONS:MDOCS) +.if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in .endif Modified: head/net-p2p/amule/pkg-plist ============================================================================== --- head/net-p2p/amule/pkg-plist Tue Apr 29 00:16:00 2014 (r352561) +++ head/net-p2p/amule/pkg-plist Tue Apr 29 00:52:11 2014 (r352562) @@ -11,7 +11,7 @@ %%PLASMAMULE%%share/mime/amule.xml %%PLASMAMULE%%@exec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true %%PLASMAMULE%%@unexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true -%%PLASMAMULE%%@cwd +%%PLASMAMULE%%@cwd %%RESETPREFIX%% %%ALC%%bin/alc %%ALCC%%bin/alcc %%MONOLITHIC%%bin/amule @@ -241,35 +241,31 @@ %%MONOLITHIC%%share/pixmaps/amule.xpm %%AMULEGUI%%share/pixmaps/amulegui.xpm %%WXCAS%%share/pixmaps/wxcas.xpm -%%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ko_KR -%%NLS%%@dirrmtry share/locale/it_CH/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/it_CH -%%NLS%%@dirrmtry share/locale/et_EE/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/et_EE -%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ast -%%PORTDOCS%%@dirrmtry %%DOCSDIR%% -%%CAS%%@dirrmtry share/cas -%%WEBSERVER%%@dirrm %%DATADIR%%/webserver/default -%%WEBSERVER%%@dirrm %%DATADIR%%/webserver -@dirrm %%DATADIR%%/skins -@dirrm %%DATADIR%% -@dirrmtry man/tr/man1 -@dirrmtry man/tr -@dirrmtry man/ru/man1 -@dirrmtry man/ru -@dirrmtry man/it/man1 -@dirrmtry man/it -@dirrmtry man/hu/man1 -@dirrmtry man/hu -@dirrmtry man/fr/man1 -@dirrmtry man/fr -@dirrmtry man/es/man1 -@dirrmtry man/es -@dirrmtry man/de/man1 -@dirrmtry man/de %%XAS%%@dirrmtry lib/xchat/plugins %%XAS%%@dirrmtry lib/xchat -@exec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true -@unexec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true +@dirrmtry man/de/man1 +@dirrmtry man/de +@dirrmtry man/es/man1 +@dirrmtry man/es +@dirrmtry man/fr/man1 +@dirrmtry man/fr +@dirrmtry man/hu/man1 +@dirrmtry man/hu +@dirrmtry man/it/man1 +@dirrmtry man/it +@dirrmtry man/ru/man1 +@dirrmtry man/ru +@dirrmtry man/tr/man1 +@dirrmtry man/tr +@dirrmtry %%DATADIR%%/skins +%%WEBSERVER%%@dirrmtry %%DATADIR%%/webserver/default +%%WEBSERVER%%@dirrmtry %%DATADIR%%/webserver +@dirrmtry %%DATADIR%% +%%CAS%%@dirrmtry share/cas +%%NLS%%@dirrmtry share/locale/et_EE/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/et_EE +%%NLS%%@dirrmtry share/locale/it_CH/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/it_CH +%%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ko_KR +%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404290052.s3T0qCUZ036643>