Date: Mon, 9 May 2016 12:50:38 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414843 - in head: Mk/Uses lang lang/perl5-devel lang/perl5.24 Message-ID: <201605091250.u49CocSQ067790@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon May 9 12:50:38 2016 New Revision: 414843 URL: https://svnweb.freebsd.org/changeset/ports/414843 Log: Introduce Perl 5.24 and update perl5-devel to v5.25.0-8-g51f69a2. Changes: https://metacpan.org/pod/release/RJBS/perl-5.24.0/pod/perldelta.pod Changes: https://github.com/Perl/perl5/compare/v5.24.0...v5.25.0-8-g51f69a2 Sponsored by: Absolight Added: head/lang/perl5.24/ - copied from r414839, head/lang/perl5-devel/ Modified: head/Mk/Uses/perl5.mk head/lang/Makefile head/lang/perl5-devel/Makefile head/lang/perl5-devel/distinfo head/lang/perl5-devel/pkg-plist head/lang/perl5-devel/version.mk head/lang/perl5.24/Makefile head/lang/perl5.24/distinfo head/lang/perl5.24/pkg-plist head/lang/perl5.24/version.mk Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Mon May 9 12:39:15 2016 (r414842) +++ head/Mk/Uses/perl5.mk Mon May 9 12:50:38 2016 (r414843) @@ -58,6 +58,8 @@ THIS_IS_OLD_PERL= yes .include "${PORTSDIR}/lang/perl5.20/version.mk" .elif ${PERL5_DEFAULT} == 5.22 .include "${PORTSDIR}/lang/perl5.22/version.mk" +.elif ${PERL5_DEFAULT} == 5.24 +.include "${PORTSDIR}/lang/perl5.24/version.mk" .elif ${PERL5_DEFAULT} == devel .include "${PORTSDIR}/lang/perl5-devel/version.mk" # Force PERL_PORT here in case two identical PERL_VERSION. @@ -92,7 +94,9 @@ PERL_ARCH?= mach # perl5_default file, or up there in the default versions selection. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -.if ${PERL_LEVEL} >= 502200 +.if ${PERL_LEVEL} >= 502400 +PERL_PORT?= perl5.24 +.elif ${PERL_LEVEL} >= 502200 PERL_PORT?= perl5.22 .elif ${PERL_LEVEL} >= 502000 PERL_PORT?= perl5.20 Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Mon May 9 12:39:15 2016 (r414842) +++ head/lang/Makefile Mon May 9 12:50:38 2016 (r414843) @@ -240,6 +240,7 @@ SUBDIR += perl5.18 SUBDIR += perl5.20 SUBDIR += perl5.22 + SUBDIR += perl5.24 SUBDIR += petite-chez SUBDIR += pfe SUBDIR += phantomjs Modified: head/lang/perl5-devel/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Mon May 9 12:39:15 2016 (r414842) +++ head/lang/perl5-devel/Makefile Mon May 9 12:50:38 2016 (r414843) @@ -30,7 +30,7 @@ TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_J USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.24.0-RC5-2-gfac0c35 +GH_TAGNAME= v5.25.0-8-g51f69a2 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE Modified: head/lang/perl5-devel/distinfo ============================================================================== --- head/lang/perl5-devel/distinfo Mon May 9 12:39:15 2016 (r414842) +++ head/lang/perl5-devel/distinfo Mon May 9 12:50:38 2016 (r414843) @@ -1,2 +1,2 @@ -SHA256 (perl/perl-5.24.0-RC5-2_GH0.tar.gz) = a721b4b9ec09c3abfa3540cfd48110d3b60bba5bff273d838d6e061f2be8b266 -SIZE (perl/perl-5.24.0-RC5-2_GH0.tar.gz) = 17860282 +SHA256 (perl/perl-5.25.0-8_GH0.tar.gz) = 58d67fbe92d69874856a55c2941eed6404e1e4139cc241216f96bbb1fe2936bd +SIZE (perl/perl-5.25.0-8_GH0.tar.gz) = 17863375 Modified: head/lang/perl5-devel/pkg-plist ============================================================================== --- head/lang/perl5-devel/pkg-plist Mon May 9 12:39:15 2016 (r414842) +++ head/lang/perl5-devel/pkg-plist Mon May 9 12:50:38 2016 (r414843) @@ -1449,6 +1449,8 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5221delta.pod %%PRIV_LIB%%/pod/perl5222delta.pod %%PRIV_LIB%%/pod/perl5240delta.pod +%%PRIV_LIB%%/pod/perl5250delta.pod +%%PRIV_LIB%%/pod/perl5251delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod %%PRIV_LIB%%/pod/perl581delta.pod @@ -2118,6 +2120,8 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5221delta.1.gz %%MAN1%%/perl5222delta.1.gz %%MAN1%%/perl5240delta.1.gz +%%MAN1%%/perl5250delta.1.gz +%%MAN1%%/perl5251delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz %%MAN1%%/perl581delta.1.gz Modified: head/lang/perl5-devel/version.mk ============================================================================== --- head/lang/perl5-devel/version.mk Mon May 9 12:39:15 2016 (r414842) +++ head/lang/perl5-devel/version.mk Mon May 9 12:50:38 2016 (r414843) @@ -1,2 +1,2 @@ -PERL_VERSION= 5.24.0 -PERL5_DEPEND= perl5>=5.23<5.24 +PERL_VERSION= 5.25.1 +PERL5_DEPEND= perl5>=5.25<5.26 Modified: head/lang/perl5.24/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Mon May 9 11:12:22 2016 (r414839) +++ head/lang/perl5.24/Makefile Mon May 9 12:50:38 2016 (r414843) @@ -3,18 +3,12 @@ PORTNAME= perl PORTREVISION= 0 -# XXX Remove second line, uncomment first -#DISTVERSION= ${PERL_VERSION} -DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} +DISTVERSION= ${PERL_VERSION} CATEGORIES= lang devel perl5 -# XXX Leave only CPAN. -MASTER_SITES= LOCAL/mat/perl GH CPAN/../../src/5.0 -# XXX Remove DISTNAME -DISTNAME= ${PORTNAME}-${DISTVERSION} +MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl -# XXX -> perl@ -MAINTAINER= mat@FreeBSD.org +MAINTAINER= perl@FreeBSD.org COMMENT= Practical Extraction and Report Language LICENSE= ART10 GPLv1 @@ -26,12 +20,6 @@ TEST_TARGET= test_harness TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ LD_LIBRARY_PATH=${WRKSRC} -# XXX Remove github things. -USE_GITHUB= yes -GH_ACCOUNT= Perl -GH_PROJECT= perl5 -GH_TAGNAME= v5.24.0-RC5-2-gfac0c35 - OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE # it seems perl malloc has problems with threaded perl on FreeBSD @@ -63,9 +51,8 @@ THREADS_CONFIGURE_OFF= -Dusethreads=n PERL_MALLOC_CONFIGURE_ON= -Dusemymalloc=y PERL_MALLOC_CONFIGURE_OFF= -Dusemymalloc=n -# XXX uncomment PORTSCOUT line # For the "release" Perl ports, this should be: -#PORTSCOUT= limit:^${PERL_VER}. +PORTSCOUT= limit:^${PERL_VER}. .include "version.mk" PERL_VER= ${PERL_VERSION:C/\.[0-9]+$//} @@ -83,8 +70,7 @@ SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL} _PRIV_LIB= lib/perl5/${PERL_VER} _ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH} -# XXX releases are .tar.xz, add: tar:xz -USES= cpe +USES= cpe tar:xz LIBPERL_VER= ${PORTVERSION:C/[^0-9.]//} @@ -107,17 +93,13 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} # Keep the following two in sync. # lddlflags is used for all .so linking # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags. -# XXX change the soname to $$(LIBPERL:R) CONFIGURE_ARGS+= \ -Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \ - -Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL)' + -Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)' # Give a hint of where libperl.so can be found. USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE -# XXX Remove -CONFIGURE_ARGS+= -Dusedevel -Uversiononly - LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \ LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \ LC_TIME="" @@ -169,7 +151,6 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} PRIV_LIB=${_PRIV_LIB} \ PKGNAMESUFFIX=${PKGNAMESUFFIX} \ ARCH_LIB=${_ARCH_LIB} -PLIST_SUB+= LIBPERL_VER=${LIBPERL_VER} # XXX Remove _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT @@ -181,17 +162,13 @@ _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT # if this port is default due PERL5_DEFAULT # change PKGNAME to reflect this -.if ${PERL_VER} == ${PERL5_DEFAULT} || ${PERL5_DEFAULT} == devel # XXX Remove devel case +.if ${PERL_VER} == ${PERL5_DEFAULT} PKGNAMESUFFIX= 5 IAMDEFAULTPERL= yes .else # make PKGNAME unique among other lang/perl5.x -.if defined(GH_TAGNAME) # XXX remove if, leave only the else. -PKGNAMESUFFIX= 5-devel -.else PKGNAMESUFFIX= ${PERL_VER} .endif -.endif # Am I building the default Perl ? .if defined(IAMDEFAULTPERL) @@ -226,26 +203,6 @@ pre-everything:: . endif .endif -# XXX Remove this -pre-everything:: - @${ECHO_MSG} "########################################" - @${ECHO_MSG} "" - @${ECHO_MSG} "This is a DEVELOPER only version of Perl" - @${ECHO_MSG} "" - @${ECHO_MSG} " DO NOT USE IT" - @${ECHO_MSG} "" - @${ECHO_MSG} "" - @${ECHO_MSG} " Things ARE going to be broken with it" - @${ECHO_MSG} " and it WILL eat your data" - @${ECHO_MSG} "" - @${ECHO_MSG} " You have been warned !" - @${ECHO_MSG} "" - @${ECHO_MSG} "########################################" -# No need to make me, or the package builders, wait -.if !(defined(PACKAGE_BUILDING) || defined(PERL_DEV_SHUT_UP) || defined(BATCH)) - @sleep 30 -.endif - # Put a symlink to the future libperl.so.x.yy so that -lperl works. # Also, save PERL5_DEFAULT in case someone is not using the default Perl # version whilst not having set DEFAULT_VERSIONS=perl5=blah. While upgrading, @@ -297,8 +254,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.24/distinfo ============================================================================== --- head/lang/perl5-devel/distinfo Mon May 9 11:12:22 2016 (r414839) +++ head/lang/perl5.24/distinfo Mon May 9 12:50:38 2016 (r414843) @@ -1,2 +1,2 @@ -SHA256 (perl/perl-5.24.0-RC5-2_GH0.tar.gz) = a721b4b9ec09c3abfa3540cfd48110d3b60bba5bff273d838d6e061f2be8b266 -SIZE (perl/perl-5.24.0-RC5-2_GH0.tar.gz) = 17860282 +SHA256 (perl/perl-5.24.0.tar.xz) = a9a37c0860380ecd7b23aa06d61c20fc5bc6d95198029f3684c44a9d7e2952f2 +SIZE (perl/perl-5.24.0.tar.xz) = 11483228 Modified: head/lang/perl5.24/pkg-plist ============================================================================== --- head/lang/perl5-devel/pkg-plist Mon May 9 11:12:22 2016 (r414839) +++ head/lang/perl5.24/pkg-plist Mon May 9 12:50:38 2016 (r414843) @@ -670,7 +670,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%ARCH_LIB%%/CORE/l1_char_class_tab.h %%ARCH_LIB%%/CORE/libperl.so %%ARCH_LIB%%/CORE/libperl.so.%%PERL_VER%% -%%ARCH_LIB%%/CORE/libperl.so.%%LIBPERL_VER%% +%%ARCH_LIB%%/CORE/libperl.so.%%PERL_VERSION%% %%ARCH_LIB%%/CORE/malloc_ctl.h %%ARCH_LIB%%/CORE/metaconfig.h %%ARCH_LIB%%/CORE/mg.h Modified: head/lang/perl5.24/version.mk ============================================================================== --- head/lang/perl5-devel/version.mk Mon May 9 11:12:22 2016 (r414839) +++ head/lang/perl5.24/version.mk Mon May 9 12:50:38 2016 (r414843) @@ -1,2 +1,2 @@ PERL_VERSION= 5.24.0 -PERL5_DEPEND= perl5>=5.23<5.24 +PERL5_DEPEND= perl5>=5.24<5.25
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605091250.u49CocSQ067790>