From owner-svn-ports-head@freebsd.org Mon May 9 16:03:42 2016 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 3D412B34FF7; Mon, 9 May 2016 16:03:42 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 174A2180A; Mon, 9 May 2016 16:03:42 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u49G3fB6030590; Mon, 9 May 2016 16:03:41 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u49G3eJG030585; Mon, 9 May 2016 16:03:40 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201605091603.u49G3eJG030585@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 9 May 2016 16:03:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414862 - in head/lang: perl5-devel perl5.18 perl5.20 perl5.22 perl5.24 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.22 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: Mon, 09 May 2016 16:03:42 -0000 Author: mat Date: Mon May 9 16:03:40 2016 New Revision: 414862 URL: https://svnweb.freebsd.org/changeset/ports/414862 Log: A new release was done, so resync all the Perl 5 Makefiles a bit more, and adjust the perl5-devel Makefile a bit for the couple of new tasks that need doing. Sponsored by: Absolight Modified: head/lang/perl5-devel/Makefile head/lang/perl5.18/Makefile head/lang/perl5.20/Makefile head/lang/perl5.22/Makefile head/lang/perl5.24/Makefile Modified: head/lang/perl5-devel/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Mon May 9 15:48:43 2016 (r414861) +++ head/lang/perl5-devel/Makefile Mon May 9 16:03:40 2016 (r414862) @@ -64,7 +64,6 @@ PERL_MALLOC_CONFIGURE_ON= -Dusemymalloc= PERL_MALLOC_CONFIGURE_OFF= -Dusemymalloc=n # XXX uncomment PORTSCOUT line -# For the "release" Perl ports, this should be: #PORTSCOUT= limit:^${PERL_VER}. .include "version.mk" @@ -86,6 +85,7 @@ _ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH} # XXX releases are .tar.xz, add: tar:xz USES= cpe +# XXX replace all LIBPERL_VER occurences with PERL_VERSION LIBPERL_VER= ${PORTVERSION:C/[^0-9.]//} HAS_CONFIGURE= yes @@ -169,7 +169,8 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} PRIV_LIB=${_PRIV_LIB} \ PKGNAMESUFFIX=${PKGNAMESUFFIX} \ ARCH_LIB=${_ARCH_LIB} -PLIST_SUB+= LIBPERL_VER=${LIBPERL_VER} # XXX Remove +# XXX Remove and change to PERL_VERSION in the plist. +PLIST_SUB+= LIBPERL_VER=${LIBPERL_VER} _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT @@ -221,7 +222,7 @@ pre-everything:: @${ECHO_MSG} "DEFAULT_VERSIONS+=perl5=${PERL_VER}" @${ECHO_MSG} "" @${ECHO_MSG} "##################################################" -.if !(defined(PACKAGE_BUILDING) || defined(BATCH)) +. if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 30 . endif .endif @@ -297,8 +298,6 @@ post-install: ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} - # XXX Remove the ECHO_CMD - # Force PERL_PORT in case the devel has the same version as the latest release ${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine ${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys # h2ph needs perl, but perl is not installed, it's only Modified: head/lang/perl5.18/Makefile ============================================================================== --- head/lang/perl5.18/Makefile Mon May 9 15:48:43 2016 (r414861) +++ head/lang/perl5.18/Makefile Mon May 9 16:03:40 2016 (r414862) @@ -76,7 +76,8 @@ SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL} _PRIV_LIB= lib/perl5/${PERL_VER} _ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH} -USES= tar:bzip2 cpe +USES= cpe tar:bzip2 + HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ @@ -135,7 +136,7 @@ _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT # if this port is default due PERL5_DEFAULT # change PKGNAME to reflect this .if ${PERL_VER} == ${PERL5_DEFAULT} -PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} +PKGNAMESUFFIX= 5 IAMDEFAULTPERL= yes .else # make PKGNAME unique among other lang/perl5.x @@ -226,8 +227,6 @@ post-clean: @${RM} ${_PERL5_DEFAULT_FILE} .endif -.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 @@ -242,7 +241,6 @@ post-patch-PTHREAD-on: post-patch-PTHREAD-off: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ ${WRKSRC}/hints/freebsd.sh -.endif post-build: @${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \ Modified: head/lang/perl5.20/Makefile ============================================================================== --- head/lang/perl5.20/Makefile Mon May 9 15:48:43 2016 (r414861) +++ head/lang/perl5.20/Makefile Mon May 9 16:03:40 2016 (r414862) @@ -51,7 +51,6 @@ THREADS_CONFIGURE_OFF= -Dusethreads=n PERL_MALLOC_CONFIGURE_ON= -Dusemymalloc=y PERL_MALLOC_CONFIGURE_OFF= -Dusemymalloc=n -# For the older Perl ports, this should be: PORTSCOUT= limit:^${PERL_VER}. .include "version.mk" @@ -70,7 +69,8 @@ SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL} _PRIV_LIB= lib/perl5/${PERL_VER} _ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH} -USES= tar:bzip2 cpe +USES= cpe tar:bzip2 + HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ @@ -161,7 +161,7 @@ _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT # if this port is default due PERL5_DEFAULT # change PKGNAME to reflect this .if ${PERL_VER} == ${PERL5_DEFAULT} -PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} +PKGNAMESUFFIX= 5 IAMDEFAULTPERL= yes .else # make PKGNAME unique among other lang/perl5.x @@ -218,8 +218,6 @@ post-clean: @${RM} ${_PERL5_DEFAULT_FILE} .endif -.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 @@ -234,7 +232,6 @@ post-patch-PTHREAD-on: post-patch-PTHREAD-off: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ ${WRKSRC}/hints/freebsd.sh -.endif post-build: @${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \ Modified: head/lang/perl5.22/Makefile ============================================================================== --- head/lang/perl5.22/Makefile Mon May 9 15:48:43 2016 (r414861) +++ head/lang/perl5.22/Makefile Mon May 9 16:03:40 2016 (r414862) @@ -113,7 +113,6 @@ SUB_LIST+= PERL_VERSION=${PERL_VERSION} SUB_FILES= perl-man.conf - INSTALL_TARGET= install-strip .if defined(PERL_VENDOR_PREFIX) @@ -218,8 +217,6 @@ post-clean: @${RM} ${_PERL5_DEFAULT_FILE} .endif -.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 @@ -234,7 +231,6 @@ post-patch-PTHREAD-on: post-patch-PTHREAD-off: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ ${WRKSRC}/hints/freebsd.sh -.endif post-build: @${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \ Modified: head/lang/perl5.24/Makefile ============================================================================== --- head/lang/perl5.24/Makefile Mon May 9 15:48:43 2016 (r414861) +++ head/lang/perl5.24/Makefile Mon May 9 16:03:40 2016 (r414862) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= perl -PORTREVISION= 0 DISTVERSION= ${PERL_VERSION} +PORTREVISION= 0 CATEGORIES= lang devel perl5 -MASTER_SITES= CPAN/../../src/5.0 +MASTER_SITES= CPAN/../../src/5.0 CPAN/../by-authors/id/R/RJ/RJBS DIST_SUBDIR= perl MAINTAINER= perl@FreeBSD.org @@ -51,7 +51,6 @@ THREADS_CONFIGURE_OFF= -Dusethreads=n PERL_MALLOC_CONFIGURE_ON= -Dusemymalloc=y PERL_MALLOC_CONFIGURE_OFF= -Dusemymalloc=n -# For the "release" Perl ports, this should be: PORTSCOUT= limit:^${PERL_VER}. .include "version.mk" @@ -72,12 +71,10 @@ _ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH} USES= cpe tar:xz -LIBPERL_VER= ${PORTVERSION:C/[^0-9.]//} - HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ - -Dlibperl=libperl.so.${LIBPERL_VER} \ + -Dlibperl=libperl.so.${PERL_VERSION} \ -Darchlib=${PREFIX}/${_ARCH_LIB} \ -Dprivlib=${PREFIX}/${_PRIV_LIB} \ -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \ @@ -198,7 +195,7 @@ pre-everything:: @${ECHO_MSG} "DEFAULT_VERSIONS+=perl5=${PERL_VER}" @${ECHO_MSG} "" @${ECHO_MSG} "##################################################" -.if !(defined(PACKAGE_BUILDING) || defined(BATCH)) +. if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 30 . endif .endif @@ -209,8 +206,8 @@ pre-everything:: # portmaster/portupgrade will remove the installed Perl version, and it will # remove any way to guess what the default Perl version is needed. post-extract: - ${LN} -s libperl.so.${LIBPERL_VER} ${WRKSRC}/libperl.so - ${LN} -s libperl.so.${LIBPERL_VER} ${WRKSRC}/libperl.so.${PERL_VER} + ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so + ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER} .if !defined(PACKAGE_BUILDING) @${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE} .endif @@ -251,8 +248,8 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 - ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so - ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} + ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so + ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine ${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys