The separation of p5 ports' manual pages and perl's own manual pages was

done incorrectly.  Fix that.

6 files changed, 222 insertions, 44 deletions

diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index e73677c2a5b..45a1d93c862 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
+PORTREVISION=	1
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.6/files/patch-Configure b/lang/perl5.6/files/patch-Configure
new file mode 100644
index 00000000000..0dfc95d62e2
--- /dev/null
+++ b/lang/perl5.6/files/patch-Configure
@@ -0,0 +1,110 @@
+--- Configure.orig	Wed Sep 24 00:48:53 2003
++++ Configure	Tue Feb  1 21:40:07 2005
+@@ -296,7 +296,7 @@ cppflags=''
+ ldflags=''
+ lkflags=''
+ locincpth=''
+-optimize=''
++optimize=${CFLAGS:-''}
+ cf_email=''
+ cf_by=''
+ cf_time=''
+@@ -889,6 +889,12 @@ installsitelib=''
+ sitelib=''
+ sitelib_stem=''
+ sitelibexp=''
++installsiteman1dir=''
++siteman1dir=''
++siteman1direxp=''
++installsiteman3dir=''
++siteman3dir=''
++siteman3direxp=''
+ siteprefix=''
+ siteprefixexp=''
+ sizesize=''
+@@ -1016,6 +1022,8 @@ plibpth=''
+ libswanted=''
+ : some systems want to use only the non-versioned libso:s
+ ignore_versioned_solibs=''
++siteman1dir=''
++siteman3dir=''
+ archname64=''
+ ccflags_uselargefiles=''
+ ldflags_uselargefiles=''
+@@ -7604,6 +7612,47 @@ else
+ 	installsitebin="$sitebinexp"
+ fi
+ 
++: determine where add-on manual pages go
++case "$siteman1dir" in
++'')     dflt=`echo $man1dir | $sed "s#^$prefix#$siteprefix#"` ;;
++*)      dflt=$siteman1dir ;;
++esac
++case "$dflt" in
++''|' ') dflt=none ;;
++esac
++fn=dn+~
++rp='Pathname where the site-specific manual pages should be installed?'
++. ./getfile
++siteman1dir="$ans"
++siteman1direxp="$ansexp"
++: Change installation prefix, if necessary.
++if $test X"$prefix" != X"$installprefix"; then
++        installsiteman1dir=`echo $siteman1direxp | $sed "s#^$prefix#$installprefix#"`
++else
++        installsiteman1dir="$siteman1direxp"
++fi
++
++: determine where add-on library man pages go
++case "$siteman3dir" in
++'')     dflt=`echo $man3dir | $sed "s#^$prefix#$siteprefix#"` ;;
++*)      dflt=$siteman3dir ;;
++esac
++case "$dflt" in
++''|' ') dflt=none ;;
++esac
++fn=dn+~
++rp='Pathname where the site-specific library manual pages should be installed?'
++. ./getfile
++siteman3dir="$ans"
++siteman3direxp="$ansexp"
++: Change installation prefix, if necessary.
++if $test X"$prefix" != X"$installprefix"; then
++        installsiteman3dir=`echo $siteman3direxp | $sed "s#^$prefix#$installprefix#"`
++else
++        installsiteman3dir="$siteman3direxp"
++fi
++
++
+ case "$useperlio" in
+ $define|true|[yY]*)	dflt='y';;
+ *) dflt='n';;
+@@ -14993,7 +15042,7 @@ for i in \`$cc -v -c tmp.c 2>&1 $postpro
+ do
+ 	case "\$i" in
+ 	-D*) echo "\$i" | $sed 's/^-D//';;
+-	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A\(.*\)(\(.*\))/\1=\2/';;
++	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A//' | $sed 's/\(.*\)(\(.*\))/\1=\2/';;
+ 	esac
+ done
+ $rm -f try.c
+@@ -16196,6 +16245,8 @@ installscript='$installscript'
+ installsitearch='$installsitearch'
+ installsitebin='$installsitebin'
+ installsitelib='$installsitelib'
++nstallsiteman1dir='$installsiteman1dir'
++installsiteman3dir='$installsiteman3dir'
+ installstyle='$installstyle'
+ installusrbinperl='$installusrbinperl'
+ installvendorarch='$installvendorarch'
+@@ -16365,6 +16416,10 @@ sitebinexp='$sitebinexp'
+ sitelib='$sitelib'
+ sitelib_stem='$sitelib_stem'
+ sitelibexp='$sitelibexp'
++siteman1dir='$siteman1dir'
++siteman1direxp='$siteman1direxp'
++siteman3dir='$siteman3dir'
++siteman3direxp='$siteman3direxp'
+ siteprefix='$siteprefix'
+ siteprefixexp='$siteprefixexp'
+ sizesize='$sizesize'
diff --git a/lang/perl5.6/files/patch-af b/lang/perl5.6/files/patch-af
deleted file mode 100644
index d856883bf60..00000000000
--- a/lang/perl5.6/files/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- Configure.orig	Mon Mar 19 04:03:33 2001
-+++ Configure	Fri Nov  1 14:58:06 2002
-@@ -296,7 +296,7 @@ cppflags=''
- ldflags=''
- lkflags=''
- locincpth=''
--optimize=''
-+optimize=${CFLAGS:-''}
- cf_email=''
- cf_by=''
- cf_time=''
-@@ -14940,7 +14940,7 @@ for i in \`$cc -v -c tmp.c 2>&1 $postpro
- do
- 	case "\$i" in
- 	-D*) echo "\$i" | $sed 's/^-D//';;
--	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A\(.*\)(\(.*\))/\1=\2/';;
-+	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A//' | $sed 's/\(.*\)(\(.*\))/\1=\2/';;
- 	esac
- done
- $rm -f try.c
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index e73677c2a5b..45a1d93c862 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
+PORTREVISION=	1
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5/files/patch-Configure b/lang/perl5/files/patch-Configure
new file mode 100644
index 00000000000..0dfc95d62e2
--- /dev/null
+++ b/lang/perl5/files/patch-Configure
@@ -0,0 +1,110 @@
+--- Configure.orig	Wed Sep 24 00:48:53 2003
++++ Configure	Tue Feb  1 21:40:07 2005
+@@ -296,7 +296,7 @@ cppflags=''
+ ldflags=''
+ lkflags=''
+ locincpth=''
+-optimize=''
++optimize=${CFLAGS:-''}
+ cf_email=''
+ cf_by=''
+ cf_time=''
+@@ -889,6 +889,12 @@ installsitelib=''
+ sitelib=''
+ sitelib_stem=''
+ sitelibexp=''
++installsiteman1dir=''
++siteman1dir=''
++siteman1direxp=''
++installsiteman3dir=''
++siteman3dir=''
++siteman3direxp=''
+ siteprefix=''
+ siteprefixexp=''
+ sizesize=''
+@@ -1016,6 +1022,8 @@ plibpth=''
+ libswanted=''
+ : some systems want to use only the non-versioned libso:s
+ ignore_versioned_solibs=''
++siteman1dir=''
++siteman3dir=''
+ archname64=''
+ ccflags_uselargefiles=''
+ ldflags_uselargefiles=''
+@@ -7604,6 +7612,47 @@ else
+ 	installsitebin="$sitebinexp"
+ fi
+ 
++: determine where add-on manual pages go
++case "$siteman1dir" in
++'')     dflt=`echo $man1dir | $sed "s#^$prefix#$siteprefix#"` ;;
++*)      dflt=$siteman1dir ;;
++esac
++case "$dflt" in
++''|' ') dflt=none ;;
++esac
++fn=dn+~
++rp='Pathname where the site-specific manual pages should be installed?'
++. ./getfile
++siteman1dir="$ans"
++siteman1direxp="$ansexp"
++: Change installation prefix, if necessary.
++if $test X"$prefix" != X"$installprefix"; then
++        installsiteman1dir=`echo $siteman1direxp | $sed "s#^$prefix#$installprefix#"`
++else
++        installsiteman1dir="$siteman1direxp"
++fi
++
++: determine where add-on library man pages go
++case "$siteman3dir" in
++'')     dflt=`echo $man3dir | $sed "s#^$prefix#$siteprefix#"` ;;
++*)      dflt=$siteman3dir ;;
++esac
++case "$dflt" in
++''|' ') dflt=none ;;
++esac
++fn=dn+~
++rp='Pathname where the site-specific library manual pages should be installed?'
++. ./getfile
++siteman3dir="$ans"
++siteman3direxp="$ansexp"
++: Change installation prefix, if necessary.
++if $test X"$prefix" != X"$installprefix"; then
++        installsiteman3dir=`echo $siteman3direxp | $sed "s#^$prefix#$installprefix#"`
++else
++        installsiteman3dir="$siteman3direxp"
++fi
++
++
+ case "$useperlio" in
+ $define|true|[yY]*)	dflt='y';;
+ *) dflt='n';;
+@@ -14993,7 +15042,7 @@ for i in \`$cc -v -c tmp.c 2>&1 $postpro
+ do
+ 	case "\$i" in
+ 	-D*) echo "\$i" | $sed 's/^-D//';;
+-	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A\(.*\)(\(.*\))/\1=\2/';;
++	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A//' | $sed 's/\(.*\)(\(.*\))/\1=\2/';;
+ 	esac
+ done
+ $rm -f try.c
+@@ -16196,6 +16245,8 @@ installscript='$installscript'
+ installsitearch='$installsitearch'
+ installsitebin='$installsitebin'
+ installsitelib='$installsitelib'
++nstallsiteman1dir='$installsiteman1dir'
++installsiteman3dir='$installsiteman3dir'
+ installstyle='$installstyle'
+ installusrbinperl='$installusrbinperl'
+ installvendorarch='$installvendorarch'
+@@ -16365,6 +16416,10 @@ sitebinexp='$sitebinexp'
+ sitelib='$sitelib'
+ sitelib_stem='$sitelib_stem'
+ sitelibexp='$sitelibexp'
++siteman1dir='$siteman1dir'
++siteman1direxp='$siteman1direxp'
++siteman3dir='$siteman3dir'
++siteman3direxp='$siteman3direxp'
+ siteprefix='$siteprefix'
+ siteprefixexp='$siteprefixexp'
+ sizesize='$sizesize'
diff --git a/lang/perl5/files/patch-af b/lang/perl5/files/patch-af
deleted file mode 100644
index d856883bf60..00000000000
--- a/lang/perl5/files/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- Configure.orig	Mon Mar 19 04:03:33 2001
-+++ Configure	Fri Nov  1 14:58:06 2002
-@@ -296,7 +296,7 @@ cppflags=''
- ldflags=''
- lkflags=''
- locincpth=''
--optimize=''
-+optimize=${CFLAGS:-''}
- cf_email=''
- cf_by=''
- cf_time=''
-@@ -14940,7 +14940,7 @@ for i in \`$cc -v -c tmp.c 2>&1 $postpro
- do
- 	case "\$i" in
- 	-D*) echo "\$i" | $sed 's/^-D//';;
--	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A\(.*\)(\(.*\))/\1=\2/';;
-+	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A//' | $sed 's/\(.*\)(\(.*\))/\1=\2/';;
- 	esac
- done
- $rm -f try.c