Change the man.d file to one that should be less prone to conflict.

Sponsored by:	Absolight

8 files changed, 16 insertions, 12 deletions

diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index b5c64a11be0b..de8cf4bc0206 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -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>
diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist
index b87db97e5e7c..89f195102523 100644
--- a/lang/perl5-devel/pkg-plist
+++ b/lang/perl5-devel/pkg-plist
@@ -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
diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile
index 591580102de3..515899ed90bc 100644
--- a/lang/perl5.18/Makefile
+++ b/lang/perl5.18/Makefile
@@ -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>
diff --git a/lang/perl5.18/pkg-plist b/lang/perl5.18/pkg-plist
index 28d84fe5dc89..246084a0c060 100644
--- a/lang/perl5.18/pkg-plist
+++ b/lang/perl5.18/pkg-plist
@@ -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
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index a8610e63b80e..77833932865c 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -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>
diff --git a/lang/perl5.20/pkg-plist b/lang/perl5.20/pkg-plist
index 5dad39f8e99e..5b739dac11a5 100644
--- a/lang/perl5.20/pkg-plist
+++ b/lang/perl5.20/pkg-plist
@@ -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
diff --git a/lang/perl5.22/Makefile b/lang/perl5.22/Makefile
index 9604f7df7f5c..469fd81cee59 100644
--- a/lang/perl5.22/Makefile
+++ b/lang/perl5.22/Makefile
@@ -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>
diff --git a/lang/perl5.22/pkg-plist b/lang/perl5.22/pkg-plist
index 02cdfa07d2b8..a261fe2197de 100644
--- a/lang/perl5.22/pkg-plist
+++ b/lang/perl5.22/pkg-plist
@@ -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