Date: Tue, 11 Feb 2020 14:14:49 +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: r525821 - in head/lang/perl5-devel: . files Message-ID: <202002111414.01BEEnPH021622@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Feb 11 14:14:49 2020 New Revision: 525821 URL: https://svnweb.freebsd.org/changeset/ports/525821 Log: Update to v5.31.8-135-gd34b46d077. While there, run portfmt and portclippy a bit. Modified: head/lang/perl5-devel/Makefile (contents, props changed) head/lang/perl5-devel/distinfo (contents, props changed) head/lang/perl5-devel/files/patch-perl.c (contents, props changed) head/lang/perl5-devel/pkg-plist (contents, props changed) Modified: head/lang/perl5-devel/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Tue Feb 11 14:01:14 2020 (r525820) +++ head/lang/perl5-devel/Makefile Tue Feb 11 14:14:49 2020 (r525821) @@ -9,7 +9,8 @@ DISTVERSIONSUFFIX= ${GH_TAGNAME:C/.*-g/-g/} PORTREVISION= 0 CATEGORIES= lang devel perl5 # XXX Leave only CPAN. -MASTER_SITES= LOCAL/mat/perl GH +MASTER_SITES= LOCAL/mat/perl \ + GH #MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl @@ -26,50 +27,59 @@ LICENSE_FILE_GPLv1+ = ${WRKSRC}/Copying #EXPIRATION_DATE=<Release date of .0 + 3 years> # XXX releases are .tar.xz, add: tar:xz -USES= cpe +USES= cpe -# 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.31.8-89-g41eecd54c3 +GH_TAGNAME= v5.31.8-135-gd34b46d077 +# Give a hint of where libperl.so can be found. +USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE + TEST_TARGET= test_harness -TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ - LD_LIBRARY_PATH=${WRKSRC} +TEST_ENV= ${MAKE_ENV} \ + LD_LIBRARY_PATH=${WRKSRC} \ + TEST_JOBS=${MAKE_JOBS_NUMBER} # XXX uncomment PORTSCOUT line #PORTSCOUT= limit:^${PERL_VER}. -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT=Configure -CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ - -Dlibperl=libperl.so.${LIBPERL_VER} \ - -Darchlib=${PREFIX}/${_ARCH_LIB} \ - -Dprivlib=${PREFIX}/${_PRIV_LIB} \ - -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \ - -Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \ - -Dsitearch=${SITE_ARCH} \ - -Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \ - -Dsiteman3dir=${SITE_MAN3} \ - -Dsiteman1dir=${SITE_MAN1} \ - -Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \ - -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}`" +HAS_CONFIGURE= yes +CONFIGURE_SCRIPT= Configure +CONFIGURE_ARGS= -Darchlib=${PREFIX}/${_ARCH_LIB} \ + -Dcc="${CC}" \ + -Dcf_by=${MAINTAINER:C,@.*,,} \ + -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} \ + -Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \ + -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \ + -Dprefix=${PREFIX} \ + -Dprivlib=${PREFIX}/${_PRIV_LIB} \ + -Dscriptdir=${PREFIX}/bin \ + -Dsitearch=${SITE_ARCH} \ + -Dsitelib=${SITE_PERL} \ + -Dsiteman1dir=${SITE_MAN1} \ + -Dsiteman3dir=${SITE_MAN3} \ + -Dusenm=n \ + -Duseshrplib \ + -sde \ + -Ui_iconv \ + -Ui_malloc \ + -Uinstallusrbinperl # 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)' +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)' # XXX Remove -CONFIGURE_ARGS+= -Dusedevel -Uversiononly +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/=/ /')" @@ -79,73 +89,71 @@ SUB_FILES= perl-man.conf INSTALL_TARGET= install-strip .if defined(PERL_VENDOR_PREFIX) -CONFIGURE_ARGS+= \ - -Dvendorprefix=${PERL_VENDOR_PREFIX} \ - -Dvendorarch=${PERL_VENDOR_PREFIX}/${_ARCH_LIB} \ - -Dvendorbin=${PERL_VENDOR_PREFIX}/bin \ - -Dvendorlib=${PERL_VENDOR_PREFIX}/${_PRIV_LIB} \ - -Dvendorman3dir=${PERL_VENDOR_PREFIX}/${_PRIV_LIB}/man/man3 \ - -Dvendorman1dir=${PERL_VENDOR_PREFIX}/man/man1 +CONFIGURE_ARGS+= -Dvendorarch=${PERL_VENDOR_PREFIX}/${_ARCH_LIB} \ + -Dvendorbin=${PERL_VENDOR_PREFIX}/bin \ + -Dvendorlib=${PERL_VENDOR_PREFIX}/${_PRIV_LIB} \ + -Dvendorman1dir=${PERL_VENDOR_PREFIX}/man/man1 \ + -Dvendorman3dir=${PERL_VENDOR_PREFIX}/${_PRIV_LIB}/man/man3 \ + -Dvendorprefix=${PERL_VENDOR_PREFIX} .endif # http://perl5.git.perl.org/perl.git/commit/b83080de5c4254 # PERLIOBUF_DEFAULT_BUFSIZ size in bytes (default: 8192 bytes) .if defined(PERLIOBUF_DEFAULT_BUFSIZ) -CONFIGURE_ARGS+= \ - -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} +CONFIGURE_ARGS+= -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif -PLIST_SUB= PERL_VERSION=${PERL_VERSION} \ - PERL_VER=${PERL_VER} \ - PERL_ARCH=${PERL_ARCH} \ - PERL_ARCH_regex=\b${PERL_ARCH}\b \ +PLIST_SUB= ARCH_LIB=${_ARCH_LIB} \ MAN1=${PERLMANPREFIX_REL}/man/man1 \ MAN3=${PERLMANPREFIX_REL}/man/man3 \ + PERL_ARCH=${PERL_ARCH} \ + PERL_ARCH_regex=\b${PERL_ARCH}\b \ + PERL_VER=${PERL_VER} \ + PERL_VERSION=${PERL_VERSION} \ PERLMANPREFIX=${PERLMANPREFIX_REL} \ PERLMANPREFIX_regex=${PERLMANPREFIX_REL}\b \ - SITEMANPREFIX=${SITE_MAN_PREFIX} \ - SITE_PERL=${SITE_PERL_REL} \ - SITE_ARCH=${SITE_ARCH_REL} \ - PRIV_LIB=${_PRIV_LIB} \ PKGNAMESUFFIX=${PKGNAMESUFFIX} \ - ARCH_LIB=${_ARCH_LIB} + PRIV_LIB=${_PRIV_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_VERSION=${PERL_VERSION} \ +SUB_LIST= PERL_ARCH=${PERL_ARCH} \ PERL_VER=${PERL_VER} \ - SITE_PERL=${SITE_PERL_REL} \ - PRIV_LIB=${_PRIV_LIB} \ + PERL_VERSION=${PERL_VERSION} \ PERLMANPREFIX=${PERLMANPREFIX_REL} \ - SITEMANPREFIX=${SITE_MAN_PREFIX} \ - PERL_ARCH=${PERL_ARCH} + PRIV_LIB=${_PRIV_LIB} \ + SITE_PERL=${SITE_PERL_REL} \ + SITEMANPREFIX=${SITE_MAN_PREFIX} .include "version.mk" -PERL_VER?= ${PERL_VERSION:C/\.[0-9]+$//} -PERL_ARCH= mach -SITE_PERL_REL?= lib/perl5/site_perl -SITE_PERL?= ${PREFIX}/${SITE_PERL_REL} -SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER} -SITE_ARCH?= ${PREFIX}/${SITE_ARCH_REL} +PERL_VER?= ${PERL_VERSION:C/\.[0-9]+$//} +PERL_ARCH= mach +SITE_PERL_REL?= lib/perl5/site_perl +SITE_PERL?= ${PREFIX}/${SITE_PERL_REL} +SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER} +SITE_ARCH?= ${PREFIX}/${SITE_ARCH_REL} SITE_MAN_PREFIX= ${SITE_PERL_REL} -SITE_MAN3_REL?= ${SITE_MAN_PREFIX}/man/man3 -SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL} -SITE_MAN1_REL?= ${SITE_MAN_PREFIX}/man/man1 -SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL} +SITE_MAN3_REL?= ${SITE_MAN_PREFIX}/man/man3 +SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL} +SITE_MAN1_REL?= ${SITE_MAN_PREFIX}/man/man1 +SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL} _PRIV_LIB= lib/perl5/${PERL_VER} _ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH} PERLMANPREFIX_REL= ${_PRIV_LIB}/perl -PERLMANPREFIX= ${PREFIX}/${PERLMANPREFIX_REL} -MANDIRS= ${PERLMANPREFIX}/man +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 +OPTIONS_DEFINE= DEBUG DOT_INC DTRACE GDBM MULTIPLICITY PERL_64BITINT \ + PERL_MALLOC SITECUSTOMIZE THREADS +OPTIONS_DEFAULT= DTRACE MULTIPLICITY PERL_64BITINT THREADS .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE= DTRACE @@ -156,33 +164,33 @@ OPTIONS_EXCLUDE= DTRACE sparc64 OPTIONS_EXCLUDE_${a}= DTRACE .endfor +OPTIONS_SUB= yes -EXCLUSIVE_DESC= Exclusive OPTIONS -GDBM_DESC= GDBM_File extension -PERL_MALLOC_DESC= Use Perl malloc -PERL_64BITINT_DESC= Use 64 bit integers (on i386) -THREADS_DESC= Build threaded perl +DOT_INC_DESC= Add '.' to @INC (unsafe) +GDBM_DESC= GDBM_File extension MULTIPLICITY_DESC= Use multiplicity +PERL_64BITINT_DESC= Use 64 bit integers (on i386) +PERL_MALLOC_DESC= Use Perl malloc SITECUSTOMIZE_DESC= Run-time customization of @INC -DOT_INC_DESC= Add '.' to @INC (unsafe) +THREADS_DESC= Build threaded perl -OPTIONS_SUB= yes -DEBUG_CONFIGURE_ON= -Doptimize="-g" -DDEBUGGING -DEBUG_CONFIGURE_OFF= -Doptimize="${CFLAGS}" -DTRACE_CONFIGURE_ON= -Dusedtrace -DTRACE_CONFIGURE_OFF= -Uusedtrace -GDBM_CONFIGURE_ON= -Di_gdbm -GDBM_CONFIGURE_OFF= -Ui_gdbm -GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm -PERL_64BITINT_CONFIGURE_ON= -Duse64bitint +DEBUG_CONFIGURE_ON= -DDEBUGGING \ + -Doptimize="-g" +DEBUG_CONFIGURE_OFF= -Doptimize="${CFLAGS}" +DOT_INC_CONFIGURE_ON= -Ddefault_inc_excludes_dot=n +DTRACE_CONFIGURE_ON= -Dusedtrace +DTRACE_CONFIGURE_OFF= -Uusedtrace +GDBM_CONFIGURE_ON= -Di_gdbm +GDBM_CONFIGURE_OFF= -Ui_gdbm +GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm MULTIPLICITY_CONFIGURE_ON= -Dusemultiplicity=y MULTIPLICITY_CONFIGURE_OFF= -Dusemultiplicity=n -SITECUSTOMIZE_CONFIGURE_ON= -Dusesitecustomize -THREADS_CONFIGURE_ON= -Dusethreads=y -THREADS_CONFIGURE_OFF= -Dusethreads=n +PERL_64BITINT_CONFIGURE_ON= -Duse64bitint PERL_MALLOC_CONFIGURE_ON= -Dusemymalloc=y PERL_MALLOC_CONFIGURE_OFF= -Dusemymalloc=n -DOT_INC_CONFIGURE_ON= -Ddefault_inc_excludes_dot=n +SITECUSTOMIZE_CONFIGURE_ON= -Dusesitecustomize +THREADS_CONFIGURE_ON= -Dusethreads=y +THREADS_CONFIGURE_OFF= -Dusethreads=n # Why this is required is explained in: # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227356#c5 @@ -209,11 +217,13 @@ PKGNAMESUFFIX= 5-devel # Am I building the default Perl ? .if defined(IAMDEFAULTPERL) -PLIST_SUB+= DEFAULT="" BINSUFFIX="" +PLIST_SUB+= BINSUFFIX="" \ + DEFAULT="" .else -BINSUFFIX= ${PERL_VERSION} -PLIST_SUB+= DEFAULT="@comment " BINSUFFIX=${PERL_VERSION} -CONFIGURE_ARGS+=-Dversiononly +BINSUFFIX= ${PERL_VERSION} +PLIST_SUB+= BINSUFFIX=${PERL_VERSION} \ + DEFAULT="@comment " +CONFIGURE_ARGS+= -Dversiononly .endif .if !defined(IAMDEFAULTPERL) @@ -312,8 +322,8 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine ${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys - # h2ph needs perl, but perl is not installed, it's only - # staged, so, use the one in WRKDIR +# h2ph needs perl, but perl is not installed, it's only +# staged, so, use the one in WRKDIR (cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \ ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph${BINSUFFIX} \ -d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null) Modified: head/lang/perl5-devel/distinfo ============================================================================== --- head/lang/perl5-devel/distinfo Tue Feb 11 14:01:14 2020 (r525820) +++ head/lang/perl5-devel/distinfo Tue Feb 11 14:14:49 2020 (r525821) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580734455 -SHA256 (perl/Perl-perl5-v5.31.8-89-g41eecd54c3_GH0.tar.gz) = 6c7165a1b9cc6aae129c86e2eb450768484b389fb3c3668f31c76d4ba8322b01 -SIZE (perl/Perl-perl5-v5.31.8-89-g41eecd54c3_GH0.tar.gz) = 19527569 +TIMESTAMP = 1581426241 +SHA256 (perl/Perl-perl5-v5.31.8-135-gd34b46d077_GH0.tar.gz) = dc8d9f9a3c7936199d7706986ba95ea2bea2585186ba8f03acbb3fbd98b5d8c7 +SIZE (perl/Perl-perl5-v5.31.8-135-gd34b46d077_GH0.tar.gz) = 19605786 Modified: head/lang/perl5-devel/files/patch-perl.c ============================================================================== --- head/lang/perl5-devel/files/patch-perl.c Tue Feb 11 14:01:14 2020 (r525820) +++ head/lang/perl5-devel/files/patch-perl.c Tue Feb 11 14:14:49 2020 (r525821) @@ -1,8 +1,8 @@ Remove compile time information (reproducible builds) ---- perl.c.orig 2019-12-09 00:27:39 UTC +--- perl.c.orig 2020-02-11 03:53:00 UTC +++ perl.c -@@ -2079,23 +2079,7 @@ S_Internals_V(pTHX_ CV *cv) +@@ -2057,23 +2057,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-devel/pkg-plist ============================================================================== --- head/lang/perl5-devel/pkg-plist Tue Feb 11 14:01:14 2020 (r525820) +++ head/lang/perl5-devel/pkg-plist Tue Feb 11 14:14:49 2020 (r525821) @@ -1935,6 +1935,8 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/unicore/To/GCB.pl %%PRIV_LIB%%/unicore/To/Gc.pl %%PRIV_LIB%%/unicore/To/Hst.pl +%%PRIV_LIB%%/unicore/To/Identif2.pl +%%PRIV_LIB%%/unicore/To/Identifi.pl %%PRIV_LIB%%/unicore/To/InPC.pl %%PRIV_LIB%%/unicore/To/InSC.pl %%PRIV_LIB%%/unicore/To/Isc.pl @@ -2101,6 +2103,19 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/unicore/lib/Hyphen/T.pl %%PRIV_LIB%%/unicore/lib/IDC/Y.pl %%PRIV_LIB%%/unicore/lib/IDS/Y.pl +%%PRIV_LIB%%/unicore/lib/IdStatus/Allowed.pl +%%PRIV_LIB%%/unicore/lib/IdStatus/Restrict.pl +%%PRIV_LIB%%/unicore/lib/IdType/DefaultI.pl +%%PRIV_LIB%%/unicore/lib/IdType/Exclusio.pl +%%PRIV_LIB%%/unicore/lib/IdType/Inclusio.pl +%%PRIV_LIB%%/unicore/lib/IdType/LimitedU.pl +%%PRIV_LIB%%/unicore/lib/IdType/NotChara.pl +%%PRIV_LIB%%/unicore/lib/IdType/NotNFKC.pl +%%PRIV_LIB%%/unicore/lib/IdType/NotXID.pl +%%PRIV_LIB%%/unicore/lib/IdType/Obsolete.pl +%%PRIV_LIB%%/unicore/lib/IdType/Recommen.pl +%%PRIV_LIB%%/unicore/lib/IdType/Technica.pl +%%PRIV_LIB%%/unicore/lib/IdType/Uncommon.pl %%PRIV_LIB%%/unicore/lib/Ideo/Y.pl %%PRIV_LIB%%/unicore/lib/In/10_0.pl %%PRIV_LIB%%/unicore/lib/In/11_0.pl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002111414.01BEEnPH021622>