svn commit: r413036 - in head/lang: perl5-devel perl5.18 perl5.20 perl5.22
Mathieu Arnold
mat at FreeBSD.org
Mon Apr 11 15:05:11 UTC 2016
Author: mat
Date: Mon Apr 11 15:05:09 2016
New Revision: 413036
URL: https://svnweb.freebsd.org/changeset/ports/413036
Log:
Change the man.d file to one that should be less prone to conflict.
Sponsored by: Absolight
Modified:
head/lang/perl5-devel/Makefile (contents, props changed)
head/lang/perl5-devel/pkg-plist (contents, props changed)
head/lang/perl5.18/Makefile (contents, props changed)
head/lang/perl5.18/pkg-plist (contents, props changed)
head/lang/perl5.20/Makefile (contents, props changed)
head/lang/perl5.20/pkg-plist (contents, props changed)
head/lang/perl5.22/Makefile (contents, props changed)
head/lang/perl5.22/pkg-plist (contents, props changed)
Modified: head/lang/perl5-devel/Makefile
==============================================================================
--- head/lang/perl5-devel/Makefile Mon Apr 11 14:46:12 2016 (r413035)
+++ head/lang/perl5-devel/Makefile Mon Apr 11 15:05:09 2016 (r413036)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= perl
-PORTREVISION= 1
+PORTREVISION= 2
# XXX Remove second line, uncomment first
#DISTVERSION= ${PERL_VERSION}
DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//}
@@ -161,6 +161,7 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION}
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
PRIV_LIB=${_PRIV_LIB} \
+ PKGNAMESUFFIX=${PKGNAMESUFFIX} \
ARCH_LIB=${_ARCH_LIB}
PLIST_SUB+= PORTVERSION=${PORTVERSION} # XXX Remove
@@ -306,6 +307,6 @@ post-install:
${STRIP_CMD} $$f; \
${CHMOD} 444 $$f; \
done
- ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
+ ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf
.include <bsd.port.mk>
Modified: head/lang/perl5-devel/pkg-plist
==============================================================================
--- head/lang/perl5-devel/pkg-plist Mon Apr 11 14:46:12 2016 (r413035)
+++ head/lang/perl5-devel/pkg-plist Mon Apr 11 15:05:09 2016 (r413036)
@@ -32,7 +32,7 @@ bin/shasum%%BINSUFFIX%%
bin/splain%%BINSUFFIX%%
bin/xsubpp%%BINSUFFIX%%
bin/zipdetails%%BINSUFFIX%%
-etc/man.d/perl%%PERL_VER%%.conf
+etc/man.d/perl%%PKGNAMESUFFIX%%.conf
%%PRIV_LIB%%/AnyDBM_File.pm
%%PRIV_LIB%%/App/Cpan.pm
%%PRIV_LIB%%/App/Prove.pm
Modified: head/lang/perl5.18/Makefile
==============================================================================
--- head/lang/perl5.18/Makefile Mon Apr 11 14:46:12 2016 (r413035)
+++ head/lang/perl5.18/Makefile Mon Apr 11 15:05:09 2016 (r413036)
@@ -3,7 +3,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0
DIST_SUBDIR= perl
@@ -201,6 +201,7 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION}
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
PRIV_LIB=${_PRIV_LIB} \
+ PKGNAMESUFFIX=${PKGNAMESUFFIX} \
ARCH_LIB=${_ARCH_LIB}
# Put a symlink to the future libperl.so.x.yy so that -lperl works.
@@ -272,6 +273,6 @@ post-install:
${STRIP_CMD} $$f; \
${CHMOD} 444 $$f; \
done
- ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
+ ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf
.include <bsd.port.mk>
Modified: head/lang/perl5.18/pkg-plist
==============================================================================
--- head/lang/perl5.18/pkg-plist Mon Apr 11 14:46:12 2016 (r413035)
+++ head/lang/perl5.18/pkg-plist Mon Apr 11 15:05:09 2016 (r413036)
@@ -40,7 +40,7 @@ bin/shasum%%BINSUFFIX%%
bin/splain%%BINSUFFIX%%
bin/xsubpp%%BINSUFFIX%%
bin/zipdetails%%BINSUFFIX%%
-etc/man.d/perl%%PERL_VER%%.conf
+etc/man.d/perl%%PKGNAMESUFFIX%%.conf
%%PRIV_LIB%%/AnyDBM_File.pm
%%PRIV_LIB%%/App/Cpan.pm
%%PRIV_LIB%%/App/Prove.pm
Modified: head/lang/perl5.20/Makefile
==============================================================================
--- head/lang/perl5.20/Makefile Mon Apr 11 14:46:12 2016 (r413035)
+++ head/lang/perl5.20/Makefile Mon Apr 11 15:05:09 2016 (r413036)
@@ -3,7 +3,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0
DIST_SUBDIR= perl
@@ -145,6 +145,7 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION}
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
PRIV_LIB=${_PRIV_LIB} \
+ PKGNAMESUFFIX=${PKGNAMESUFFIX} \
ARCH_LIB=${_ARCH_LIB}
_PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT
@@ -266,6 +267,6 @@ post-install:
${STRIP_CMD} $$f; \
${CHMOD} 444 $$f; \
done
- ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
+ ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf
.include <bsd.port.mk>
Modified: head/lang/perl5.20/pkg-plist
==============================================================================
--- head/lang/perl5.20/pkg-plist Mon Apr 11 14:46:12 2016 (r413035)
+++ head/lang/perl5.20/pkg-plist Mon Apr 11 15:05:09 2016 (r413036)
@@ -36,7 +36,7 @@ bin/shasum%%BINSUFFIX%%
bin/splain%%BINSUFFIX%%
bin/xsubpp%%BINSUFFIX%%
bin/zipdetails%%BINSUFFIX%%
-etc/man.d/perl%%PERL_VER%%.conf
+etc/man.d/perl%%PKGNAMESUFFIX%%.conf
%%PRIV_LIB%%/AnyDBM_File.pm
%%PRIV_LIB%%/App/Cpan.pm
%%PRIV_LIB%%/App/Prove.pm
Modified: head/lang/perl5.22/Makefile
==============================================================================
--- head/lang/perl5.22/Makefile Mon Apr 11 14:46:12 2016 (r413035)
+++ head/lang/perl5.22/Makefile Mon Apr 11 15:05:09 2016 (r413036)
@@ -3,7 +3,7 @@
PORTNAME= perl
DISTVERSION= ${PERL_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0 CPAN/../by-authors/id/S/SH/SHAY
DIST_SUBDIR= perl
@@ -143,6 +143,7 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION}
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
PRIV_LIB=${_PRIV_LIB} \
+ PKGNAMESUFFIX=${PKGNAMESUFFIX} \
ARCH_LIB=${_ARCH_LIB}
_PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT
@@ -264,6 +265,6 @@ post-install:
${STRIP_CMD} $$f; \
${CHMOD} 444 $$f; \
done
- ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
+ ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf
.include <bsd.port.mk>
Modified: head/lang/perl5.22/pkg-plist
==============================================================================
--- head/lang/perl5.22/pkg-plist Mon Apr 11 14:46:12 2016 (r413035)
+++ head/lang/perl5.22/pkg-plist Mon Apr 11 15:05:09 2016 (r413036)
@@ -32,7 +32,7 @@ bin/shasum%%BINSUFFIX%%
bin/splain%%BINSUFFIX%%
bin/xsubpp%%BINSUFFIX%%
bin/zipdetails%%BINSUFFIX%%
-etc/man.d/perl%%PERL_VER%%.conf
+etc/man.d/perl%%PKGNAMESUFFIX%%.conf
%%PRIV_LIB%%/AnyDBM_File.pm
%%PRIV_LIB%%/App/Cpan.pm
%%PRIV_LIB%%/App/Prove.pm
More information about the svn-ports-all
mailing list