Date: Mon, 13 May 2019 07:36:39 +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: r501523 - in head: Mk Mk/Uses lang lang/perl5.30 Message-ID: <201905130736.x4D7adK0092331@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon May 13 07:36:38 2019 New Revision: 501523 URL: https://svnweb.freebsd.org/changeset/ports/501523 Log: Welcome Perl 5.30 (now at 5.30.0-RC1) Changes: https://metacpan.org/pod/release/XSAWYERX/perl-5.30.0-RC1/pod/perldelta.pod Changes: https://metacpan.org/pod/release/XSAWYERX/perl-5.30.0-RC1/pod/perldeprecation.pod#Perl-5.30 Added: head/lang/perl5.30/ - copied from r501521, head/lang/perl5-devel/ Modified: head/Mk/Uses/perl5.mk head/Mk/bsd.default-versions.mk head/lang/Makefile head/lang/perl5.30/Makefile head/lang/perl5.30/distinfo head/lang/perl5.30/pkg-plist head/lang/perl5.30/version.mk Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Mon May 13 07:31:29 2019 (r501522) +++ head/Mk/Uses/perl5.mk Mon May 13 07:36:38 2019 (r501523) @@ -48,6 +48,8 @@ USE_PERL5?= run build .include "${PORTSDIR}/lang/perl5.26/version.mk" . elif ${PERL5_DEFAULT} == 5.28 .include "${PORTSDIR}/lang/perl5.28/version.mk" +. elif ${PERL5_DEFAULT} == 5.30 +.include "${PORTSDIR}/lang/perl5.30/version.mk" . elif ${PERL5_DEFAULT} == devel .include "${PORTSDIR}/lang/perl5-devel/version.mk" # Force PERL_PORT here in case two identical PERL_VERSION. @@ -81,7 +83,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} >= 502800 +. if ${PERL_LEVEL} >= 503000 +PERL_PORT?= perl5.30 +. elif ${PERL_LEVEL} >= 502800 PERL_PORT?= perl5.28 . else # ${PERL_LEVEL} < 502800 PERL_PORT?= perl5.26 Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Mon May 13 07:31:29 2019 (r501522) +++ head/Mk/bsd.default-versions.mk Mon May 13 07:36:38 2019 (r501523) @@ -62,7 +62,7 @@ LLVM_DEFAULT?= 80 LUA_DEFAULT?= 5.2 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 10.3m, 5.5p, 5.6p, 5.7p, 5.6w MYSQL_DEFAULT?= 5.6 -# Possible values: 5.26, 5.28, devel +# Possible values: 5.26, 5.28, 5.30, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) PERL5_DEFAULT?= 5.28 Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Mon May 13 07:31:29 2019 (r501522) +++ head/lang/Makefile Mon May 13 07:36:38 2019 (r501523) @@ -267,6 +267,7 @@ SUBDIR += perl5-devel SUBDIR += perl5.26 SUBDIR += perl5.28 + SUBDIR += perl5.30 SUBDIR += petite-chez SUBDIR += pfe SUBDIR += phantomjs Modified: head/lang/perl5.30/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Mon May 13 06:40:46 2019 (r501521) +++ head/lang/perl5.30/Makefile Mon May 13 07:36:38 2019 (r501523) @@ -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 DIST_SUBDIR= perl -# XXX -> perl@ MAINTAINER= mat@FreeBSD.org COMMENT= Practical Extraction and Report Language @@ -27,29 +20,21 @@ LICENSE_FILE_GPLv1+ = ${WRKSRC}/Copying #DEPRECATED= Support end three years after .0 release, please upgrade to a more recent version of Perl #EXPIRATION_DATE=<Release date of .0 + 3 years> -# XXX releases are .tar.xz, add: tar:xz -USES= cpe +USES= cpe tar:xz # Give a hint of where libperl.so can be found. USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE -# XXX Remove github things. -USE_GITHUB= yes -GH_ACCOUNT= Perl -GH_PROJECT= perl5 -GH_TAGNAME= v5.29.10-57-g2ede670576 - TEST_TARGET= test_harness TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ LD_LIBRARY_PATH=${WRKSRC} -# XXX uncomment PORTSCOUT line -#PORTSCOUT= limit:^${PERL_VER}. +PORTSCOUT= limit:^${PERL_VER}. 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 \ @@ -59,20 +44,17 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ -Dsiteman3dir=${SITE_MAN3} \ -Dsiteman1dir=${SITE_MAN1} \ -Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \ + -Accflags='-DUSE_THREAD_SAFE_LOCALE' \ -Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \ -Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \ -Dcf_time="`${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`" # 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)' -# XXX Remove -CONFIGURE_ARGS+= -Dusedevel -Uversiononly - # When built from a git repository, newvers.sh can put a = in the version. CONFIGURE_ENV= UNAME_v="$$(uname -v | sed 'y/=/ /')" @@ -111,8 +93,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} SUB_LIST= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ @@ -142,9 +122,6 @@ PERLMANPREFIX_REL= ${_PRIV_LIB}/perl PERLMANPREFIX= ${PREFIX}/${PERLMANPREFIX_REL} MANDIRS= ${PERLMANPREFIX}/man -# XXX replace all LIBPERL_VER occurences with PERL_VERSION -LIBPERL_VER= ${PORTVERSION:C/[^0-9.]//} - OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \ THREADS PERL_MALLOC DTRACE DOT_INC OPTIONS_DEFAULT= PERL_64BITINT THREADS MULTIPLICITY DTRACE @@ -194,13 +171,12 @@ _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 -PKGNAMESUFFIX= 5-devel -#PKGNAMESUFFIX= ${PERL_VER} # XXX remove the previous, leave only this. +PKGNAMESUFFIX= ${PERL_VER} .endif # Am I building the default Perl ? @@ -236,34 +212,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 @@ -303,8 +259,8 @@ post-install: .if defined(IAMDEFAULTPERL) ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} .endif - ${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.30/distinfo ============================================================================== --- head/lang/perl5-devel/distinfo Mon May 13 06:40:46 2019 (r501521) +++ head/lang/perl5.30/distinfo Mon May 13 07:36:38 2019 (r501523) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557147911 -SHA256 (perl/Perl-perl5-v5.29.10-57-g2ede670576_GH0.tar.gz) = e670cec2d77bfdf0ed600c5b02fbdf3d8701aec0234240b30c7b6b4e3e1992fb -SIZE (perl/Perl-perl5-v5.29.10-57-g2ede670576_GH0.tar.gz) = 19333393 +TIMESTAMP = 1557731039 +SHA256 (perl/perl-5.30.0-RC1.tar.xz) = 19d4fb0eac9dd5d36f44ce146a18dc81eac241a415bb42e58fddf75b61f585f7 +SIZE (perl/perl-5.30.0-RC1.tar.xz) = 12410500 Modified: head/lang/perl5.30/pkg-plist ============================================================================== --- head/lang/perl5-devel/pkg-plist Mon May 13 06:40:46 2019 (r501521) +++ head/lang/perl5.30/pkg-plist Mon May 13 07:36:38 2019 (r501523) @@ -685,7 +685,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 @@ -960,18 +960,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5280delta.1.gz %%MAN1%%/perl5281delta.1.gz %%MAN1%%/perl5282delta.1.gz -%%MAN1%%/perl5290delta.1.gz -%%MAN1%%/perl52910delta.1.gz -%%MAN1%%/perl52911delta.1.gz -%%MAN1%%/perl5291delta.1.gz -%%MAN1%%/perl5292delta.1.gz -%%MAN1%%/perl5293delta.1.gz -%%MAN1%%/perl5294delta.1.gz -%%MAN1%%/perl5295delta.1.gz -%%MAN1%%/perl5296delta.1.gz -%%MAN1%%/perl5297delta.1.gz -%%MAN1%%/perl5298delta.1.gz -%%MAN1%%/perl5299delta.1.gz +%%MAN1%%/perl5300delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz %%MAN1%%/perl581delta.1.gz @@ -1760,18 +1749,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5280delta.pod %%PRIV_LIB%%/pod/perl5281delta.pod %%PRIV_LIB%%/pod/perl5282delta.pod -%%PRIV_LIB%%/pod/perl5290delta.pod -%%PRIV_LIB%%/pod/perl52910delta.pod -%%PRIV_LIB%%/pod/perl52911delta.pod -%%PRIV_LIB%%/pod/perl5291delta.pod -%%PRIV_LIB%%/pod/perl5292delta.pod -%%PRIV_LIB%%/pod/perl5293delta.pod -%%PRIV_LIB%%/pod/perl5294delta.pod -%%PRIV_LIB%%/pod/perl5295delta.pod -%%PRIV_LIB%%/pod/perl5296delta.pod -%%PRIV_LIB%%/pod/perl5297delta.pod -%%PRIV_LIB%%/pod/perl5298delta.pod -%%PRIV_LIB%%/pod/perl5299delta.pod +%%PRIV_LIB%%/pod/perl5300delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod %%PRIV_LIB%%/pod/perl581delta.pod Modified: head/lang/perl5.30/version.mk ============================================================================== --- head/lang/perl5-devel/version.mk Mon May 13 06:40:46 2019 (r501521) +++ head/lang/perl5.30/version.mk Mon May 13 07:36:38 2019 (r501523) @@ -1,2 +1,2 @@ -PERL_VERSION= 5.29.10 -PERL5_DEPEND= perl5>=5.29<5.30 +PERL_VERSION= 5.30.0 +PERL5_DEPEND= perl5>=5.30.r1<5.31
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905130736.x4D7adK0092331>