Date: Sat, 19 Jan 2019 18:09:12 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490730 - in head/net-p2p: amule amule-devel Message-ID: <201901191809.x0JI9Cnq090254@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sat Jan 19 18:09:11 2019 New Revision: 490730 URL: https://svnweb.freebsd.org/changeset/ports/490730 Log: - Move LICENSE_FILE and SHEBANG_FILES out of unrelated options section - Switch to USES=localbase - Add missing USES=readline (for amulecmd and webserver) - Switch to options helpers - Fix WWW and license for amule-devel - Fix plists for WITHOUT=NLS case: manpages are not built when NLS is disabled PR: 234829 Submitted by: amdmi3 Approved by: bar (maintainer, via private email) Modified: head/net-p2p/amule-devel/Makefile head/net-p2p/amule-devel/pkg-descr head/net-p2p/amule-devel/pkg-plist head/net-p2p/amule/Makefile head/net-p2p/amule/pkg-plist Modified: head/net-p2p/amule-devel/Makefile ============================================================================== --- head/net-p2p/amule-devel/Makefile Sat Jan 19 17:55:45 2019 (r490729) +++ head/net-p2p/amule-devel/Makefile Sat Jan 19 18:09:11 2019 (r490730) @@ -12,28 +12,29 @@ DISTNAME= aMule-SVN-r${PORTVERSION} MAINTAINER= bar@FreeBSD.org COMMENT= All-platform eMule p2p client -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/docs/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp CONFLICTS= amule-[0-9]* -USES= bison desktop-file-utils gmake perl5 pkgconfig shebangfix \ - tar:bzip2 +USES= bison desktop-file-utils desktop-file-utils gmake \ + localbase:ldflags perl5 pkgconfig shebangfix tar:bzip2 USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute +SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-denoise-level=0 CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \ docdir='$${prefix}/${DOCSDIR_REL}' -CPPFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` -LDFLAGS+= -lpthread -L${LOCALBASE}/lib +LDFLAGS+= -lpthread OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS UPNP \ @@ -55,10 +56,6 @@ OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI OPTIONS_SUB= yes -SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl - -LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING - DEBUG_CONFIGURE_ON= --enable-debug NLS_USES= gettext @@ -69,6 +66,7 @@ ALC_CONFIGURE_ON= --enable-alc ALCC_CONFIGURE_ON= --enable-alcc AMULECMD_CONFIGURE_ON= --enable-amulecmd +AMULECMD_USES= readline AMULEDAEMON_CONFIGURE_ON= --enable-amule-daemon AMULEDAEMON_USE= RC_SUBR=amuled @@ -79,6 +77,7 @@ CAS_CONFIGURE_ON= --enable-cas CAS_LIB_DEPENDS= libgd.so:graphics/gd ED2K_CONFIGURE_OFF= --disable-ed2k +ED2K_CONFLICTS= ed2k-hash* FILEVIEW_CONFIGURE_ON= --enable-fileview @@ -91,34 +90,25 @@ UPNP_CONFIGURE_OFF= --disable-upnp WEBSERVER_CONFIGURE_ON= --enable-webserver WEBSERVER_LIB_DEPENDS= libpng.so:graphics/png +WEBSERVER_USES= readline WXCAS_CONFIGURE_ON= --enable-wxcas XAS_CONFIGURE_ON= --enable-xas XAS_USE= PERL5+=run -.include <bsd.port.options.mk> +OPTIMIZED_CFLAGS_CONFIGURE_ON= --enable-optimize -.if ${PORT_OPTIONS:MED2K} -CONFLICTS+= ed2k-hash* -.endif - -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CONFIGURE_ARGS+= --enable-optimize -.endif - -post-patch: .SILENT - ${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ +post-patch: + @${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure -.if ! ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ + +post-patch-DOCS-off: + @${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in -.endif -post-install: -.if ${PORT_OPTIONS:MFILEVIEW} +post-install-FILEVIEW-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin -.endif .include <bsd.port.mk> Modified: head/net-p2p/amule-devel/pkg-descr ============================================================================== --- head/net-p2p/amule-devel/pkg-descr Sat Jan 19 17:55:45 2019 (r490729) +++ head/net-p2p/amule-devel/pkg-descr Sat Jan 19 18:09:11 2019 (r490730) @@ -3,4 +3,4 @@ aMule, the all-platform eMule p2p client aMule is a multiplatform fork of xMule client using wxWindows class library. -WWW: http://www.amule.org +WWW: http://www.amule.org/ Modified: head/net-p2p/amule-devel/pkg-plist ============================================================================== --- head/net-p2p/amule-devel/pkg-plist Sat Jan 19 17:55:45 2019 (r490729) +++ head/net-p2p/amule-devel/pkg-plist Sat Jan 19 18:09:11 2019 (r490730) @@ -66,17 +66,17 @@ %%NLS%%%%ED2K%%man/it/man1/ed2k.1.gz %%NLS%%%%WXCAS%%man/it/man1/wxcas.1.gz %%NLS%%%%XAS%%man/it/man1/xas.1.gz -%%ALC%%man/man1/alc.1.gz -%%ALCC%%man/man1/alcc.1.gz -%%MONOLITHIC%%man/man1/amule.1.gz -%%AMULECMD%%man/man1/amulecmd.1.gz -%%AMULEDAEMON%%man/man1/amuled.1.gz -%%AMULEGUI%%man/man1/amulegui.1.gz -%%WEBSERVER%%man/man1/amuleweb.1.gz -%%CAS%%man/man1/cas.1.gz -%%ED2K%%man/man1/ed2k.1.gz -%%WXCAS%%man/man1/wxcas.1.gz -%%XAS%%man/man1/xas.1.gz +%%NLS%%%%ALC%%man/man1/alc.1.gz +%%NLS%%%%ALCC%%man/man1/alcc.1.gz +%%NLS%%%%MONOLITHIC%%man/man1/amule.1.gz +%%NLS%%%%AMULECMD%%man/man1/amulecmd.1.gz +%%NLS%%%%AMULEDAEMON%%man/man1/amuled.1.gz +%%NLS%%%%AMULEGUI%%man/man1/amulegui.1.gz +%%NLS%%%%WEBSERVER%%man/man1/amuleweb.1.gz +%%NLS%%%%CAS%%man/man1/cas.1.gz +%%NLS%%%%ED2K%%man/man1/ed2k.1.gz +%%NLS%%%%WXCAS%%man/man1/wxcas.1.gz +%%NLS%%%%XAS%%man/man1/xas.1.gz %%NLS%%%%ALC%%man/ro/man1/alc.1.gz %%NLS%%%%ALCC%%man/ro/man1/alcc.1.gz %%NLS%%%%MONOLITHIC%%man/ro/man1/amule.1.gz Modified: head/net-p2p/amule/Makefile ============================================================================== --- head/net-p2p/amule/Makefile Sat Jan 19 17:55:45 2019 (r490729) +++ head/net-p2p/amule/Makefile Sat Jan 19 18:09:11 2019 (r490730) @@ -12,13 +12,14 @@ MAINTAINER= bar@FreeBSD.org COMMENT= All-platform eMule p2p client LICENSE= GPLv2+ +LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp CONFLICTS= amule-devel-[0-9]* -USES= bison compiler:c++11-lang desktop-file-utils gmake perl5 \ - pkgconfig shebangfix tar:xz +USES= bison compiler:c++11-lang desktop-file-utils gmake \ + localbase:ldflags perl5 pkgconfig shebangfix tar:xz USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute @@ -28,10 +29,11 @@ CONFIGURE_ARGS= --with-denoise-level=0 CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \ docdir='$${prefix}/${DOCSDIR_REL}' -CPPFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` -LDFLAGS+= -lpthread -L${LOCALBASE}/lib +LDFLAGS+= -lpthread +SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl + OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW MMAP MONOLITHIC NLS UPNP \ WEBSERVER WXCAS XAS @@ -52,10 +54,6 @@ OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI OPTIONS_SUB= yes -SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl - -LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING - DEBUG_CONFIGURE_ON= --enable-debug NLS_USES= gettext @@ -66,6 +64,7 @@ ALC_CONFIGURE_ON= --enable-alc ALCC_CONFIGURE_ON= --enable-alcc AMULECMD_CONFIGURE_ON= --enable-amulecmd +AMULECMD_USES= readline AMULEDAEMON_CONFIGURE_ON= --enable-amule-daemon AMULEDAEMON_USE= RC_SUBR=amuled @@ -76,6 +75,7 @@ CAS_CONFIGURE_ON= --enable-cas CAS_LIB_DEPENDS= libgd.so:graphics/gd ED2K_CONFIGURE_OFF= --disable-ed2k +ED2K_CONFLICTS= ed2k-hash* FILEVIEW_CONFIGURE_ON= --enable-fileview @@ -87,6 +87,7 @@ UPNP_LIB_DEPENDS= libupnp.so:devel/upnp UPNP_CONFIGURE_OFF= --disable-upnp WEBSERVER_CONFIGURE_ON= --enable-webserver +WEBSERVER_USES= readline WXCAS_CONFIGURE_ON= --enable-wxcas @@ -94,10 +95,6 @@ XAS_CONFIGURE_ON= --enable-xas XAS_USE= PERL5+=run .include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MED2K} -CONFLICTS+= ed2k-hash* -.endif post-patch: @${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ Modified: head/net-p2p/amule/pkg-plist ============================================================================== --- head/net-p2p/amule/pkg-plist Sat Jan 19 17:55:45 2019 (r490729) +++ head/net-p2p/amule/pkg-plist Sat Jan 19 18:09:11 2019 (r490730) @@ -66,17 +66,17 @@ %%NLS%%%%ED2K%%man/it/man1/ed2k.1.gz %%NLS%%%%WXCAS%%man/it/man1/wxcas.1.gz %%NLS%%%%XAS%%man/it/man1/xas.1.gz -%%ALC%%man/man1/alc.1.gz -%%ALCC%%man/man1/alcc.1.gz -%%MONOLITHIC%%man/man1/amule.1.gz -%%AMULECMD%%man/man1/amulecmd.1.gz -%%AMULEDAEMON%%man/man1/amuled.1.gz -%%AMULEGUI%%man/man1/amulegui.1.gz -%%WEBSERVER%%man/man1/amuleweb.1.gz -%%CAS%%man/man1/cas.1.gz -%%ED2K%%man/man1/ed2k.1.gz -%%WXCAS%%man/man1/wxcas.1.gz -%%XAS%%man/man1/xas.1.gz +%%NLS%%%%ALC%%man/man1/alc.1.gz +%%NLS%%%%ALCC%%man/man1/alcc.1.gz +%%NLS%%%%MONOLITHIC%%man/man1/amule.1.gz +%%NLS%%%%AMULECMD%%man/man1/amulecmd.1.gz +%%NLS%%%%AMULEDAEMON%%man/man1/amuled.1.gz +%%NLS%%%%AMULEGUI%%man/man1/amulegui.1.gz +%%NLS%%%%WEBSERVER%%man/man1/amuleweb.1.gz +%%NLS%%%%CAS%%man/man1/cas.1.gz +%%NLS%%%%ED2K%%man/man1/ed2k.1.gz +%%NLS%%%%WXCAS%%man/man1/wxcas.1.gz +%%NLS%%%%XAS%%man/man1/xas.1.gz %%NLS%%%%ALC%%man/ro/man1/alc.1.gz %%NLS%%%%ALCC%%man/ro/man1/alcc.1.gz %%NLS%%%%MONOLITHIC%%man/ro/man1/amule.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901191809.x0JI9Cnq090254>