svn commit: r387481 - in head: Mk/Uses lang lang/perl5.22

Mathieu Arnold mat at FreeBSD.org
Tue May 26 14:44:08 UTC 2015 

Author: mat
Date: Tue May 26 14:44:06 2015
New Revision: 387481
URL: https://svnweb.freebsd.org/changeset/ports/387481

Log:
  Welcome lang/perl5.22 to te tree, currently at 5.22.0-RC2
  
  Changes:	https://metacpan.org/pod/release/RJBS/perl-5.22.0-RC2/pod/perldelta.pod
  Sponsored by:	Absolight

Added:
  head/lang/perl5.22/
     - copied from r387469, head/lang/perl5-devel/
Modified:
  head/Mk/Uses/perl5.mk
  head/lang/Makefile
  head/lang/perl5.22/Makefile
  head/lang/perl5.22/distinfo

Modified: head/Mk/Uses/perl5.mk
==============================================================================
--- head/Mk/Uses/perl5.mk	Tue May 26 14:33:23 2015	(r387480)
+++ head/Mk/Uses/perl5.mk	Tue May 26 14:44:06 2015	(r387481)
@@ -55,6 +55,8 @@ PERL_VERSION=	5.16.3
 PERL_VERSION=	5.18.4
 .elif ${PERL5_DEFAULT} == 5.20
 PERL_VERSION=	5.20.2
+.elif ${PERL5_DEFAULT} == 5.22
+PERL_VERSION=	5.22.0
 .elif ${PERL5_DEFAULT} == 5.21 || ${PERL5_DEFAULT} == devel
 PERL_VERSION=	5.22.0
 # Force PERL_PORT here in case two identical PERL_VERSION.
@@ -86,8 +88,8 @@ PERL_ARCH?=	mach
 
 # there must always be a default to prevent dependency failures such
 # as "ports/lang: not found"
-.if   ${PERL_LEVEL} >= 502100
-PERL_PORT?=	perl5-devel
+.if   ${PERL_LEVEL} >= 502200
+PERL_PORT?=	perl5.22
 .elif   ${PERL_LEVEL} >= 502000
 PERL_PORT?=	perl5.20
 .elif ${PERL_LEVEL} >= 501800

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Tue May 26 14:33:23 2015	(r387480)
+++ head/lang/Makefile	Tue May 26 14:44:06 2015	(r387481)
@@ -222,6 +222,7 @@
     SUBDIR += perl5.16
     SUBDIR += perl5.18
     SUBDIR += perl5.20
+    SUBDIR += perl5.22
     SUBDIR += petite-chez
     SUBDIR += pfe
     SUBDIR += phantomjs

Modified: head/lang/perl5.22/Makefile
==============================================================================
--- head/lang/perl5-devel/Makefile	Tue May 26 12:41:18 2015	(r387469)
+++ head/lang/perl5.22/Makefile	Tue May 26 14:44:06 2015	(r387481)
@@ -2,18 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	perl
-#PORTVERSION=	${PERL_VERSION} # XXX
-DISTVERSION=	${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//}
-PORTREVISION=	1
+DISTVERSION=	${PERL_VERSION}-RC2
 CATEGORIES=	lang devel perl5
-# XXX
-MASTER_SITES=	LOCAL/mat/perl GH CPAN/../../src/5.0
-# XXX Use this naming so that portscout works a bit
-DISTNAME=	${PORTNAME}-${DISTVERSION}
+MASTER_SITES=	CPAN/../../src/5.0
 DIST_SUBDIR=	perl
 
-# XXX
-MAINTAINER=	mat at FreeBSD.org
+MAINTAINER=	perl at FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
 LICENSE=	ART10 GPLv1
@@ -23,12 +17,6 @@ LICENSE_FILE_GPLv1=	${WRKSRC}/Copying
 
 CONFLICTS_INSTALL=	perl5.*-*
 
-# XXX
-USE_GITHUB=	yes
-GH_ACCOUNT=	Perl
-GH_PROJECT=	perl5
-GH_TAGNAME=	v5.22.0-RC2-1-gdfd03a6
-
 OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT PTHREAD \
 		MULTIPLICITY SITECUSTOMIZE
 # it seems perl malloc has problems with threaded perl on FreeBSD
@@ -60,9 +48,7 @@ THREADS_CONFIGURE_OFF=	-Dusethreads=n
 PERL_MALLOC_CONFIGURE_ON=	-Dusemymalloc=y
 PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
 
-# XXX
-# For the "release" Perl ports, this should be:
-#PORTSCOUT=	limit:^${PERL_VER}.
+PORTSCOUT=	limit:^${PERL_VER}.
 
 # Remember to update Mk/Uses/perl5.mk too.
 PERL_VERSION=	5.22.0
@@ -79,8 +65,7 @@ SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 _PRIV_LIB=	lib/perl5/${PERL_VER}
 _ARCH_LIB=	${_PRIV_LIB}/${PERL_ARCH}
 
-# XXX releases use tar:bzip2 tar:xz
-USES=	cpe
+USES=	cpe tar:xz
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
@@ -105,9 +90,6 @@ CONFIGURE_ARGS+= \
 	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
 	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
 
-# XXX
-CONFIGURE_ARGS+=	-Dusedevel -Uversiononly
-
 LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
 		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
 		LC_TIME=""
@@ -163,15 +145,11 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION}
 
 # if this port is default due PERL5_DEFAULT
 # change PKGNAME to reflect this
-.if ${PERL_VER} == ${PERL5_DEFAULT} || ${PERL5_DEFAULT} == devel # XXX
+.if ${PERL_VER} == ${PERL5_DEFAULT}
 PKGNAMESUFFIX=	5
 .else
 # make PKGNAME unique among other lang/perl5.x
-.if defined(GH_TAGNAME) # XXX
-PKGNAMESUFFIX=	5-devel
-.else
 PKGNAMESUFFIX=	${PERL_VER}
-.endif
 # always add default perl5 pkgname to conflicts
 CONFLICTS_INSTALL+=	perl5-*
 .endif
@@ -192,26 +170,6 @@ STRIP=
 STRIP_CMD=	${TRUE}
 .endif
 
-# XXX
-# No need to spam logs, or make me wait
-.if !defined(PACKAGE_BUILDING) && !defined(PERL_DEV_SHUT_UP)
-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} "########################################"
-	@sleep 30
-.endif
-
 # Put a symlink to the future libperl.so.x.yy so that -lperl works.
 post-extract:
 	${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so
@@ -236,9 +194,6 @@ post-install:
 	${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}
-	# XXX Force PERL_PORT in case the devel has the same version as the
-	# latest release
-	${ECHO_CMD} "PERL_PORT=	perl5-devel" >> ${WRKDIR}/perl5_version
 	${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys

Modified: head/lang/perl5.22/distinfo
==============================================================================
--- head/lang/perl5-devel/distinfo	Tue May 26 12:41:18 2015	(r387469)
+++ head/lang/perl5.22/distinfo	Tue May 26 14:44:06 2015	(r387481)
@@ -1,2 +1,2 @@
-SHA256 (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 0570ad3a5f5e53cc309210eceb4d9719ef2f0fd4800e958ce5166bfc63e7a028
-SIZE (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 17416825
+SHA256 (perl/perl-5.22.0-RC2.tar.xz) = aa198a9a8a92eb02dc43c81d5080e12c26b97349703ec9f5619d9e34389d6b0e
+SIZE (perl/perl-5.22.0-RC2.tar.xz) = 11152036

More information about the svn-ports-head mailing list