From owner-svn-ports-all@FreeBSD.ORG Sat Oct 5 10:18:21 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A5D1B63D; Sat, 5 Oct 2013 10:18:21 +0000 (UTC) (envelope-from bar@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8474D284C; Sat, 5 Oct 2013 10:18:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r95AILfl001104; Sat, 5 Oct 2013 10:18:21 GMT (envelope-from bar@svn.freebsd.org) Received: (from bar@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r95AIL8B001102; Sat, 5 Oct 2013 10:18:21 GMT (envelope-from bar@svn.freebsd.org) Message-Id: <201310051018.r95AIL8B001102@svn.freebsd.org> From: Barbara Guida Date: Sat, 5 Oct 2013 10:18:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329433 - in head/net-p2p: amule amule-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Oct 2013 10:18:21 -0000 Author: bar Date: Sat Oct 5 10:18:20 2013 New Revision: 329433 URL: http://svnweb.freebsd.org/changeset/ports/329433 Log: Common changes: - Use new syntax for LIB_DEPENDS - Use shebangfix for perl files - Set perl as run dependency for XAS option - Bump PORTREVISION amule-devel changes: - Fix build after perl related changes - USES gmake Approved by: rene (mentor) Modified: head/net-p2p/amule-devel/Makefile head/net-p2p/amule/Makefile Modified: head/net-p2p/amule-devel/Makefile ============================================================================== --- head/net-p2p/amule-devel/Makefile Sat Oct 5 10:00:51 2013 (r329432) +++ head/net-p2p/amule-devel/Makefile Sat Oct 5 10:18:20 2013 (r329433) @@ -3,7 +3,7 @@ PORTNAME= amule PORTVERSION= 10802 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel @@ -23,8 +23,8 @@ BUILD_DEPENDS= ${FLEX}:${PORTSDIR}/textp CONFLICTS= amule-[0-9]* USE_BZIP2= yes -USES= bison pkgconfig -USE_GMAKE= yes +USES= bison gmake pkgconfig perl5 shebangfix +USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes @@ -63,6 +63,8 @@ PORTDOCS= ABOUT-NLS Changelog EC_Protoco FLEX?= ${LOCALBASE}/bin/flex +SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl + NO_STAGE= yes .include @@ -121,7 +123,7 @@ PLIST_SUB+= AMULEGUI="@comment " .if ${PORT_OPTIONS:MCAS} CONFIGURE_ARGS+= --enable-cas -LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd PLIST_SUB+= CAS="" .else CONFIGURE_ARGS+= --disable-cas @@ -147,7 +149,7 @@ PLIST_SUB+= FILEVIEW="@comment " .if ${PORT_OPTIONS:MGEOIP} CONFIGURE_ARGS+= --enable-geoip -LIB_DEPENDS+= GeoIP:${PORTSDIR}/net/GeoIP +LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP .else CONFIGURE_ARGS+= --disable-geoip .endif @@ -184,7 +186,7 @@ PLIST_SUB+= PLASMAMULE="@comment " .endif .if ${PORT_OPTIONS:MUPNP} -LIB_DEPENDS+= upnp:${PORTSDIR}/devel/upnp +LIB_DEPENDS+= libupnp.so:${PORTSDIR}/devel/upnp .else CONFIGURE_ARGS+= --disable-upnp .endif @@ -210,6 +212,7 @@ WX_UNICODE= yes .endif .if ${PORT_OPTIONS:MXAS} +USE_PERL5+= run CONFIGURE_ARGS+= --enable-xas PLIST_SUB+= XAS="" .else @@ -225,8 +228,6 @@ post-patch: .SILENT -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure - ${FIND} ${WRKSRC} -name \*.pl -exec ${REINPLACE_CMD} \ - 's|/usr/bin/perl|${PERL}|' {} + .if empty(PORT_OPTIONS:MDOCS) ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in Modified: head/net-p2p/amule/Makefile ============================================================================== --- head/net-p2p/amule/Makefile Sat Oct 5 10:00:51 2013 (r329432) +++ head/net-p2p/amule/Makefile Sat Oct 5 10:18:20 2013 (r329433) @@ -3,7 +3,7 @@ PORTNAME= amule PORTVERSION= 2.3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} @@ -22,7 +22,7 @@ BUILD_DEPENDS= ${FLEX}:${PORTSDIR}/textp CONFLICTS= amule-devel-[0-9]* USE_BZIP2= yes -USES= bison gmake pkgconfig perl5 +USES= bison gmake pkgconfig perl5 shebangfix USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute @@ -61,6 +61,8 @@ PORTDOCS= ABOUT-NLS Changelog EC_Protoco FLEX?= ${LOCALBASE}/bin/flex +SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl + NO_STAGE= yes .include @@ -119,7 +121,7 @@ PLIST_SUB+= AMULEGUI="@comment " .if ${PORT_OPTIONS:MCAS} CONFIGURE_ARGS+= --enable-cas -LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd PLIST_SUB+= CAS="" .else CONFIGURE_ARGS+= --disable-cas @@ -145,7 +147,7 @@ PLIST_SUB+= FILEVIEW="@comment " .if ${PORT_OPTIONS:MGEOIP} CONFIGURE_ARGS+= --enable-geoip -LIB_DEPENDS+= GeoIP:${PORTSDIR}/net/GeoIP +LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP .else CONFIGURE_ARGS+= --disable-geoip .endif @@ -178,7 +180,7 @@ PLIST_SUB+= PLASMAMULE="@comment " .endif .if ${PORT_OPTIONS:MUPNP} -LIB_DEPENDS+= upnp:${PORTSDIR}/devel/upnp +LIB_DEPENDS+= libupnp.so:${PORTSDIR}/devel/upnp .else CONFIGURE_ARGS+= --disable-upnp .endif @@ -204,6 +206,7 @@ WX_UNICODE= yes .endif .if ${PORT_OPTIONS:MXAS} +USE_PERL5+= run CONFIGURE_ARGS+= --enable-xas PLIST_SUB+= XAS="" .else @@ -219,8 +222,6 @@ post-patch: .SILENT -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure - ${FIND} ${WRKSRC} -name \*.pl -exec ${REINPLACE_CMD} \ - 's|/usr/bin/perl|${PERL}|' {} + .if empty(PORT_OPTIONS:MDOCS) ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in