Date: Mon, 21 May 2018 13:50:40 +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: r470540 - in head: Mk Mk/Uses lang lang/perl5.28 Message-ID: <201805211350.w4LDoeLd081722@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon May 21 13:50:39 2018 New Revision: 470540 URL: https://svnweb.freebsd.org/changeset/ports/470540 Log: Add Perl 5.28.0-RC1. Sponsored by: Absolight Added: head/lang/perl5.28/ - copied from r470534, head/lang/perl5-devel/ Modified: head/Mk/Uses/perl5.mk head/Mk/bsd.default-versions.mk head/lang/Makefile head/lang/perl5.28/Makefile head/lang/perl5.28/distinfo head/lang/perl5.28/pkg-plist head/lang/perl5.28/version.mk Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Mon May 21 13:00:00 2018 (r470539) +++ head/Mk/Uses/perl5.mk Mon May 21 13:50:39 2018 (r470540) @@ -50,6 +50,8 @@ USE_PERL5?= run build .include "${PORTSDIR}/lang/perl5.24/version.mk" . elif ${PERL5_DEFAULT} == 5.26 .include "${PORTSDIR}/lang/perl5.26/version.mk" +. elif ${PERL5_DEFAULT} == 5.28 +.include "${PORTSDIR}/lang/perl5.28/version.mk" . elif ${PERL5_DEFAULT} == devel .include "${PORTSDIR}/lang/perl5-devel/version.mk" # Force PERL_PORT here in case two identical PERL_VERSION. @@ -83,7 +85,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} >= 502600 +. if ${PERL_LEVEL} >= 502800 +PERL_PORT?= perl5.28 +. elif ${PERL_LEVEL} >= 502600 PERL_PORT?= perl5.26 . elif ${PERL_LEVEL} >= 502400 PERL_PORT?= perl5.24 Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Mon May 21 13:00:00 2018 (r470539) +++ head/Mk/bsd.default-versions.mk Mon May 21 13:50:39 2018 (r470540) @@ -57,7 +57,7 @@ LINUX_DEFAULT?= c6 LUA_DEFAULT?= 5.2 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 5.5p, 5.6p, 5.7p, 5.6w MYSQL_DEFAULT?= 5.6 -# Possible values: 5.22, 5.24, 5.26, devel +# Possible values: 5.22, 5.24, 5.26, 5.28, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) PERL5_DEFAULT?= 5.26 Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Mon May 21 13:00:00 2018 (r470539) +++ head/lang/Makefile Mon May 21 13:50:39 2018 (r470540) @@ -254,6 +254,7 @@ SUBDIR += perl5.22 SUBDIR += perl5.24 SUBDIR += perl5.26 + SUBDIR += perl5.28 SUBDIR += petite-chez SUBDIR += pfe SUBDIR += phantomjs Modified: head/lang/perl5.28/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Mon May 21 12:32:59 2018 (r470534) +++ head/lang/perl5.28/Makefile Mon May 21 13:50:39 2018 (r470540) @@ -2,19 +2,12 @@ # $FreeBSD$ PORTNAME= perl -# XXX Remove second line, uncomment first -#DISTVERSION= ${PERL_VERSION} -DISTVERSIONPREFIX= v -DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} -DISTVERSIONSUFFIX= ${GH_TAGNAME:C/.*-g/-g/} +DISTVERSION= ${PERL_VERSION}-RC1 PORTREVISION= 0 CATEGORIES= lang devel perl5 -# XXX Leave only CPAN. -MASTER_SITES= LOCAL/mat/perl GH -#MASTER_SITES= CPAN/../../src/5.0 +MASTER_SITES= CPAN/../../src/5.0 CPAN/../../authors/id/X/XS/XSAWYERX/ DIST_SUBDIR= perl -# XXX -> perl@ MAINTAINER= mat@FreeBSD.org COMMENT= Practical Extraction and Report Language @@ -31,12 +24,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.27.11-44-g22806e5aea - OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \ THREADS PERL_MALLOC DTRACE DOT_INC OPTIONS_DEFAULT= PERL_64BITINT THREADS MULTIPLICITY DTRACE @@ -77,8 +64,7 @@ PERL_MALLOC_CONFIGURE_ON= -Dusemymalloc=y PERL_MALLOC_CONFIGURE_OFF= -Dusemymalloc=n DOT_INC_CONFIGURE_ON= -Ddefault_inc_excludes_dot=n -# XXX uncomment PORTSCOUT line -#PORTSCOUT= limit:^${PERL_VER}. +PORTSCOUT= limit:^${PERL_VER}. .include "version.mk" PERL_VER?= ${PERL_VERSION:C/\.[0-9]+$//} @@ -96,16 +82,12 @@ 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 -# XXX replace all LIBPERL_VER occurences with PERL_VERSION -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 \ @@ -121,17 +103,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 - CONFIGURE_ENV+= UNAME_v="$$(uname -v | sed 'y/=/ /')" SUB_LIST+= PERL_VERSION=${PERL_VERSION} \ @@ -181,8 +159,6 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PRIV_LIB=${_PRIV_LIB} \ PKGNAMESUFFIX=${PKGNAMESUFFIX} \ ARCH_LIB=${_ARCH_LIB} -# XXX Remove and change to PERL_VERSION in the plist. -PLIST_SUB+= LIBPERL_VER=${LIBPERL_VER} _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT @@ -192,17 +168,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) @@ -237,34 +209,14 @@ 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, # 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 @@ -302,8 +254,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 Modified: head/lang/perl5.28/distinfo ============================================================================== --- head/lang/perl5-devel/distinfo Mon May 21 12:32:59 2018 (r470534) +++ head/lang/perl5.28/distinfo Mon May 21 13:50:39 2018 (r470540) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526897739 -SHA256 (perl/Perl-perl5-v5.27.11-44-g22806e5aea_GH0.tar.gz) = d8d263e33c7a6d864be473d24e55a954edc4961c8d2df5d701ba112cd0235cb7 -SIZE (perl/Perl-perl5-v5.27.11-44-g22806e5aea_GH0.tar.gz) = 19368472 +TIMESTAMP = 1526909239 +SHA256 (perl/perl-5.28.0-RC1.tar.xz) = 946a107513a76dce9531609d7a88f53f20a90bc135edfe9ddfe8d5c25de21340 +SIZE (perl/perl-5.28.0-RC1.tar.xz) = 12416600 Modified: head/lang/perl5.28/pkg-plist ============================================================================== --- head/lang/perl5-devel/pkg-plist Mon May 21 12:32:59 2018 (r470534) +++ head/lang/perl5.28/pkg-plist Mon May 21 13:50:39 2018 (r470540) @@ -727,7 +727,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 @@ -1004,7 +1004,6 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5270delta.1.gz %%MAN1%%/perl52710delta.1.gz %%MAN1%%/perl52711delta.1.gz -%%MAN1%%/perl52712delta.1.gz %%MAN1%%/perl5271delta.1.gz %%MAN1%%/perl5272delta.1.gz %%MAN1%%/perl5273delta.1.gz @@ -1014,6 +1013,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5277delta.1.gz %%MAN1%%/perl5278delta.1.gz %%MAN1%%/perl5279delta.1.gz +%%MAN1%%/perl5280delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz %%MAN1%%/perl581delta.1.gz @@ -1817,7 +1817,6 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5270delta.pod %%PRIV_LIB%%/pod/perl52710delta.pod %%PRIV_LIB%%/pod/perl52711delta.pod -%%PRIV_LIB%%/pod/perl52712delta.pod %%PRIV_LIB%%/pod/perl5271delta.pod %%PRIV_LIB%%/pod/perl5272delta.pod %%PRIV_LIB%%/pod/perl5273delta.pod @@ -1827,6 +1826,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5277delta.pod %%PRIV_LIB%%/pod/perl5278delta.pod %%PRIV_LIB%%/pod/perl5279delta.pod +%%PRIV_LIB%%/pod/perl5280delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod %%PRIV_LIB%%/pod/perl581delta.pod Modified: head/lang/perl5.28/version.mk ============================================================================== --- head/lang/perl5-devel/version.mk Mon May 21 12:32:59 2018 (r470534) +++ head/lang/perl5.28/version.mk Mon May 21 13:50:39 2018 (r470540) @@ -1,2 +1,2 @@ PERL_VERSION= 5.28.0 -PERL5_DEPEND= perl5>=5.27<5.28 +PERL5_DEPEND= perl5>=5.28.r1<5.29
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805211350.w4LDoeLd081722>