From owner-svn-ports-head@freebsd.org Tue Jul 21 12:36:11 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F5499A750C; Tue, 21 Jul 2015 12:36:11 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0EF7D1D9A; Tue, 21 Jul 2015 12:36:11 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6LCaADk044731; Tue, 21 Jul 2015 12:36:10 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6LCa9rR044724; Tue, 21 Jul 2015 12:36:09 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201507211236.t6LCa9rR044724@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 21 Jul 2015 12:36:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392626 - in head/lang: perl5-devel perl5.18 perl5.20 perl5.22 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jul 2015 12:36:11 -0000 Author: mat Date: Tue Jul 21 12:36:08 2015 New Revision: 392626 URL: https://svnweb.freebsd.org/changeset/ports/392626 Log: Convert the post-patch target to use the new target option helpers. While there, remove some DEBUG handling that is already done in bsd.port.mk. Sponsored by: Absolight Modified: head/lang/perl5-devel/Makefile head/lang/perl5.18/Makefile head/lang/perl5.20/Makefile head/lang/perl5.22/Makefile Modified: head/lang/perl5-devel/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Tue Jul 21 12:28:17 2015 (r392625) +++ head/lang/perl5-devel/Makefile Tue Jul 21 12:36:08 2015 (r392626) @@ -186,11 +186,6 @@ PKGINSTALL= ${WRKDIR}/use.perl PKGDEINSTALL= ${WRKDIR}/use.perl .endif -.if ${PORT_OPTIONS:MDEBUG} -STRIP= -STRIP_CMD= ${TRUE} -.endif - # XXX # No need to spam logs, or make me wait .if !defined(PACKAGE_BUILDING) && !defined(PERL_DEV_SHUT_UP) @@ -221,13 +216,12 @@ post-extract: post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh -.if ${PORT_OPTIONS:MPTHREAD} +post-patch-PTHREAD-on: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \ ${WRKSRC}/hints/freebsd.sh -.else +post-patch-PTHREAD-off: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ ${WRKSRC}/hints/freebsd.sh -.endif .endif # MAKING_PATCHES post-install: Modified: head/lang/perl5.18/Makefile ============================================================================== --- head/lang/perl5.18/Makefile Tue Jul 21 12:28:17 2015 (r392625) +++ head/lang/perl5.18/Makefile Tue Jul 21 12:36:08 2015 (r392626) @@ -161,11 +161,6 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} PRIV_LIB=${_PRIV_LIB} \ ARCH_LIB=${_ARCH_LIB} -.if ${PORT_OPTIONS:MDEBUG} -STRIP= -STRIP_CMD= ${TRUE} -.endif - .if ${OSVERSION} >= 900022 PLIST_SUB+= MANCONF="" .else @@ -184,13 +179,15 @@ post-extract: ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER} +.if !defined(MAKING_PATCHES) +# make clean patch makepatch MAKING_PATCHES= post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh -.if ${PORT_OPTIONS:MPTHREAD} +post-patch-PTHREAD-on: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \ ${WRKSRC}/hints/freebsd.sh -.else +post-patch-PTHREAD-off: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ ${WRKSRC}/hints/freebsd.sh .endif Modified: head/lang/perl5.20/Makefile ============================================================================== --- head/lang/perl5.20/Makefile Tue Jul 21 12:28:17 2015 (r392625) +++ head/lang/perl5.20/Makefile Tue Jul 21 12:36:08 2015 (r392626) @@ -169,23 +169,20 @@ PKGINSTALL= ${WRKDIR}/use.perl PKGDEINSTALL= ${WRKDIR}/use.perl .endif -.if ${PORT_OPTIONS:MDEBUG} -STRIP= -STRIP_CMD= ${TRUE} -.endif - # Put a symlink to the future libperl.so.x.yy so that -lperl works. post-extract: ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER} +.if !defined(MAKING_PATCHES) +# make clean patch makepatch MAKING_PATCHES= post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh -.if ${PORT_OPTIONS:MPTHREAD} +post-patch-PTHREAD-on: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \ ${WRKSRC}/hints/freebsd.sh -.else +post-patch-PTHREAD-off: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ ${WRKSRC}/hints/freebsd.sh .endif Modified: head/lang/perl5.22/Makefile ============================================================================== --- head/lang/perl5.22/Makefile Tue Jul 21 12:28:17 2015 (r392625) +++ head/lang/perl5.22/Makefile Tue Jul 21 12:36:08 2015 (r392626) @@ -166,23 +166,20 @@ PKGINSTALL= ${WRKDIR}/use.perl PKGDEINSTALL= ${WRKDIR}/use.perl .endif -.if ${PORT_OPTIONS:MDEBUG} -STRIP= -STRIP_CMD= ${TRUE} -.endif - # Put a symlink to the future libperl.so.x.yy so that -lperl works. post-extract: ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER} +.if !defined(MAKING_PATCHES) +# make clean patch makepatch MAKING_PATCHES= post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh -.if ${PORT_OPTIONS:MPTHREAD} +post-patch-PTHREAD-on: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \ ${WRKSRC}/hints/freebsd.sh -.else +post-patch-PTHREAD-off: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ ${WRKSRC}/hints/freebsd.sh .endif