Date: Mon, 8 Jun 2020 14:08:29 +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: r538219 - in head: Mk Mk/Uses lang lang/perl5.32 lang/perl5.32/files Message-ID: <202006081408.058E8Tnq006002@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jun 8 14:08:29 2020 New Revision: 538219 URL: https://svnweb.freebsd.org/changeset/ports/538219 Log: Add Perl 5.32.0-RC1. Added: head/lang/perl5.32/ - copied from r538216, head/lang/perl5-devel/ Modified: head/Mk/Uses/perl5.mk head/Mk/bsd.default-versions.mk head/lang/Makefile head/lang/perl5.32/Makefile head/lang/perl5.32/distinfo head/lang/perl5.32/files/patch-perl.c head/lang/perl5.32/pkg-plist head/lang/perl5.32/version.mk Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Mon Jun 8 13:43:53 2020 (r538218) +++ head/Mk/Uses/perl5.mk Mon Jun 8 14:08:29 2020 (r538219) @@ -48,6 +48,8 @@ USE_PERL5?= run build .include "${PORTSDIR}/lang/perl5.28/version.mk" . elif ${PERL5_DEFAULT} == 5.30 .include "${PORTSDIR}/lang/perl5.30/version.mk" +. elif ${PERL5_DEFAULT} == 5.32 +.include "${PORTSDIR}/lang/perl5.32/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} >= 503000 +. if ${PERL_LEVEL} >= 503200 +PERL_PORT?= perl5.32 +. elif ${PERL_LEVEL} >= 503000 PERL_PORT?= perl5.30 . else # ${PERL_LEVEL} < 503000 PERL_PORT?= perl5.28 Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Mon Jun 8 13:43:53 2020 (r538218) +++ head/Mk/bsd.default-versions.mk Mon Jun 8 14:08:29 2020 (r538219) @@ -67,7 +67,7 @@ LLVM_DEFAULT?= 90 LUA_DEFAULT?= 5.2 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.1m, 10.2m, 10.3m, 10.4m, 5.5p, 5.6p, 5.7p, 5.6w MYSQL_DEFAULT?= 5.7 -# Possible values: 5.28, 5.30, devel +# Possible values: 5.28, 5.30, 5.32, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) PERL5_DEFAULT?= 5.30 Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Mon Jun 8 13:43:53 2020 (r538218) +++ head/lang/Makefile Mon Jun 8 14:08:29 2020 (r538219) @@ -249,6 +249,7 @@ SUBDIR += perl5-devel SUBDIR += perl5.28 SUBDIR += perl5.30 + SUBDIR += perl5.32 SUBDIR += petite-chez SUBDIR += pfe SUBDIR += pharo Modified: head/lang/perl5.32/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Mon Jun 8 13:23:04 2020 (r538216) +++ head/lang/perl5.32/Makefile Mon Jun 8 14:08:29 2020 (r538219) @@ -1,17 +1,10 @@ # $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 MAINTAINER= mat@FreeBSD.org @@ -26,15 +19,8 @@ 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 -# XXX Remove github things. -USE_GITHUB= yes -GH_ACCOUNT= Perl -GH_PROJECT= perl5 -GH_TAGNAME= v5.32.0-RC0-28-gcac6698e07 - # Give a hint of where libperl.so can be found. USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE @@ -43,8 +29,7 @@ TEST_ENV= ${MAKE_ENV} \ LD_LIBRARY_PATH=${WRKSRC} \ TEST_JOBS=${MAKE_JOBS_NUMBER} -# XXX uncomment PORTSCOUT line -#PORTSCOUT= limit:^${PERL_VER}. +PORTSCOUT= limit:^${PERL_VER}. HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure @@ -54,7 +39,7 @@ CONFIGURE_ARGS= -Darchlib=${PREFIX}/${_ARCH_LIB} \ -Dcf_email=${MAINTAINER} \ -Dcf_time="`${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`" \ -Dinc_version_list=none \ - -Dlibperl=libperl.so.${LIBPERL_VER} \ + -Dlibperl=libperl.so.${PERL_VERSION} \ -Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \ -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \ -Dprefix=${PREFIX} \ @@ -73,14 +58,9 @@ CONFIGURE_ARGS= -Darchlib=${PREFIX}/${_ARCH_LIB} \ # 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/=/ /')" @@ -117,8 +97,6 @@ PLIST_SUB= ARCH_LIB=${_ARCH_LIB} \ SITE_ARCH=${SITE_ARCH_REL} \ SITE_PERL=${SITE_PERL_REL} \ SITEMANPREFIX=${SITE_MAN_PREFIX} -# XXX Remove and change to PERL_VERSION in the plist. -PLIST_SUB+= LIBPERL_VER=${LIBPERL_VER} SUB_LIST= PERL_ARCH=${PERL_ARCH} \ PERL_VER=${PERL_VER} \ @@ -148,9 +126,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 DOT_INC DTRACE GDBM MULTIPLICITY PERL_64BITINT \ PERL_MALLOC SITECUSTOMIZE THREADS OPTIONS_DEFAULT= DTRACE MULTIPLICITY PERL_64BITINT THREADS @@ -206,13 +181,12 @@ CONFIGURE_ARGS+= -Accflags='-DUSE_THREAD_SAFE_LOCALE' # 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 ? @@ -250,34 +224,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 @@ -317,8 +271,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.32/distinfo ============================================================================== --- head/lang/perl5-devel/distinfo Mon Jun 8 13:23:04 2020 (r538216) +++ head/lang/perl5.32/distinfo Mon Jun 8 14:08:29 2020 (r538219) @@ -1,3 +1,3 @@ -TIMESTAMP = 1591099144 -SHA256 (perl/Perl-perl5-v5.32.0-RC0-28-gcac6698e07_GH0.tar.gz) = a8f9663c65c5896d394e081b04a28961c3641386f12fd36e58c22db1831c5d41 -SIZE (perl/Perl-perl5-v5.32.0-RC0-28-gcac6698e07_GH0.tar.gz) = 19673581 +TIMESTAMP = 1591622293 +SHA256 (perl/perl-5.32.0-RC1.tar.xz) = c143884149e5f924502932c75e89d664cab54578ec83ea81772de727e7338292 +SIZE (perl/perl-5.32.0-RC1.tar.xz) = 12725448 Modified: head/lang/perl5.32/files/patch-perl.c ============================================================================== --- head/lang/perl5-devel/files/patch-perl.c Mon Jun 8 13:23:04 2020 (r538216) +++ head/lang/perl5.32/files/patch-perl.c Mon Jun 8 14:08:29 2020 (r538219) @@ -1,8 +1,8 @@ Remove compile time information (reproducible builds) ---- perl.c.orig 2020-03-30 01:48:38 UTC +--- perl.c.orig 2020-06-07 22:30:49 UTC +++ perl.c -@@ -2056,23 +2056,7 @@ S_Internals_V(pTHX_ CV *cv) +@@ -2058,23 +2058,7 @@ S_Internals_V(pTHX_ CV *cv) PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options, sizeof(non_bincompat_options) - 1, SVs_TEMP)); Modified: head/lang/perl5.32/pkg-plist ============================================================================== --- head/lang/perl5-devel/pkg-plist Mon Jun 8 13:23:04 2020 (r538216) +++ head/lang/perl5.32/pkg-plist Mon Jun 8 14:08:29 2020 (r538219) @@ -680,7 +680,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.32/version.mk ============================================================================== --- head/lang/perl5-devel/version.mk Mon Jun 8 13:23:04 2020 (r538216) +++ head/lang/perl5.32/version.mk Mon Jun 8 14:08:29 2020 (r538219) @@ -1,2 +1,2 @@ PERL_VERSION= 5.32.0 -PERL5_DEPEND= perl5>=5.31<5.32 +PERL5_DEPEND= perl5>=5.32.r0<5.33
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006081408.058E8Tnq006002>