From owner-svn-ports-head@freebsd.org Thu Nov 1 10:36:34 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37D3E10DD785; Thu, 1 Nov 2018 10:36:34 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E02C96D929; Thu, 1 Nov 2018 10:36:33 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C23DE1A7EF; Thu, 1 Nov 2018 10:36:33 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1AaXqq064164; Thu, 1 Nov 2018 10:36:33 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1AaXCU064157; Thu, 1 Nov 2018 10:36:33 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201811011036.wA1AaXCU064157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 1 Nov 2018 10:36:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483655 - in head/lang: perl5-devel perl5.24 perl5.26 perl5.28 X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/lang: perl5-devel perl5.24 perl5.26 perl5.28 X-SVN-Commit-Revision: 483655 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2018 10:36:34 -0000 Author: mat Date: Thu Nov 1 10:36:32 2018 New Revision: 483655 URL: https://svnweb.freebsd.org/changeset/ports/483655 Log: Make $^X is deterministic. Its output can vary, and not be the correct one because of hard links. So replace the hard links with symlinks so that there is only one perl. PR: 232501 Reported by: Helge Oldach Modified: head/lang/perl5-devel/Makefile (contents, props changed) head/lang/perl5.24/Makefile (contents, props changed) head/lang/perl5.26/Makefile (contents, props changed) head/lang/perl5.28/Makefile (contents, props changed) Modified: head/lang/perl5-devel/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Thu Nov 1 10:24:15 2018 (r483654) +++ head/lang/perl5-devel/Makefile Thu Nov 1 10:36:32 2018 (r483655) @@ -7,7 +7,7 @@ PORTNAME= perl DISTVERSIONPREFIX= v DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} DISTVERSIONSUFFIX= ${GH_TAGNAME:C/.*-g/-g/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 # XXX Leave only CPAN. MASTER_SITES= LOCAL/mat/perl GH @@ -303,6 +303,9 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto +.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} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} Modified: head/lang/perl5.24/Makefile ============================================================================== --- head/lang/perl5.24/Makefile Thu Nov 1 10:24:15 2018 (r483654) +++ head/lang/perl5.24/Makefile Thu Nov 1 10:36:32 2018 (r483655) @@ -3,6 +3,7 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 CPAN/../by-authors/id/S/SH/SHAY DIST_SUBDIR= perl @@ -256,7 +257,10 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 +.if defined(IAMDEFAULTPERL) + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} +.endif ${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} Modified: head/lang/perl5.26/Makefile ============================================================================== --- head/lang/perl5.26/Makefile Thu Nov 1 10:24:15 2018 (r483654) +++ head/lang/perl5.26/Makefile Thu Nov 1 10:36:32 2018 (r483655) @@ -3,6 +3,7 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0/ DIST_SUBDIR= perl @@ -254,7 +255,10 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 +.if defined(IAMDEFAULTPERL) + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} +.endif ${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} Modified: head/lang/perl5.28/Makefile ============================================================================== --- head/lang/perl5.28/Makefile Thu Nov 1 10:24:15 2018 (r483654) +++ head/lang/perl5.28/Makefile Thu Nov 1 10:36:32 2018 (r483655) @@ -3,7 +3,7 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 CPAN/../../authors/id/X/XS/XSAWYERX/ DIST_SUBDIR= perl @@ -255,7 +255,10 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 +.if defined(IAMDEFAULTPERL) + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} +.endif ${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}