9 files changed, 87 insertions, 8 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 0f3421da7c36..45c41b773286 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
 	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
-	-Ui_gdbm -Ui_malloc -Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
+	-Ui_gdbm -Ui_malloc -Ui_iconv -Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
 INSTALLS_SHLIB=	yes
 
 INCLUDEDIR=	/usr/include
diff --git a/lang/perl5/files/patch-ab b/lang/perl5/files/patch-ab
index 5945ef412853..3cb0692940b6 100644
--- a/lang/perl5/files/patch-ab
+++ b/lang/perl5/files/patch-ab
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- installperl.ORIG	Thu Jul 30 15:58:50 1998
 +++ installperl	Thu Jul 30 16:02:16 1998
 @@ -269,7 +269,7 @@
diff --git a/lang/perl5/files/patch-ac b/lang/perl5/files/patch-ac
index aa988cdd7394..3a0c07565832 100644
--- a/lang/perl5/files/patch-ac
+++ b/lang/perl5/files/patch-ac
@@ -1,5 +1,7 @@
---- hints/freebsd.sh.ORIG	Tue Apr 10 20:24:51 2001
-+++ hints/freebsd.sh	Tue Apr 10 20:27:45 2001
+$FreeBSD$
+
+--- hints/freebsd.sh.orig	Sun Apr  8 06:09:16 2001
++++ hints/freebsd.sh	Sat Jun  1 23:41:18 2002
 @@ -85,10 +85,16 @@
  	d_setreuid='define'
  	d_setegid='undef'
@@ -17,3 +19,12 @@
  	;;
  esac
  
+@@ -115,7 +121,8 @@
+             fi
+             lddlflags='-Bshareable'
+         fi
+-        cccdlflags='-DPIC -fpic'
++        cccdlflags='-DPIC -fPIC'
++        libswanted=`echo $libswanted | sed 's/ iconv / /'`
+         ;;
+ esac
diff --git a/lang/perl5/files/patch-ad b/lang/perl5/files/patch-ad
index a31ff2d16466..fa9bf3ebfc2e 100644
--- a/lang/perl5/files/patch-ad
+++ b/lang/perl5/files/patch-ad
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- perl.h.ORIG	Thu Mar 22 07:05:02 2001
 +++ perl.h	Tue Apr 10 20:29:46 2001
 @@ -151,6 +151,15 @@
diff --git a/lang/perl5/files/patch-ae b/lang/perl5/files/patch-ae
index 24dfa020a53b..27c3d9b7bd94 100644
--- a/lang/perl5/files/patch-ae
+++ b/lang/perl5/files/patch-ae
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- makedepend.SH.ORIG	Fri Jul 24 06:00:58 1998
 +++ makedepend.SH	Thu Jul 30 17:08:37 1998
 @@ -68,6 +68,7 @@
diff --git a/lang/perl5/files/patch-af b/lang/perl5/files/patch-af
index cd4d3cdb7584..2c7b3f729d7c 100644
--- a/lang/perl5/files/patch-af
+++ b/lang/perl5/files/patch-af
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- Configure.ORIG	Mon Mar 19 05:03:33 2001
 +++ Configure	Tue Apr 10 20:31:56 2001
 @@ -296,7 +296,7 @@
diff --git a/lang/perl5/files/patch-makedepend b/lang/perl5/files/patch-makedepend
index 9cfd396bbb62..39d99bc3ee42 100644
--- a/lang/perl5/files/patch-makedepend
+++ b/lang/perl5/files/patch-makedepend
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 --- makedepend.SH.orig	Wed May 29 19:29:05 2002
 +++ makedepend.SH	Wed May 29 19:31:31 2002
diff --git a/lang/perl5/files/patch-perl.c b/lang/perl5/files/patch-perl.c
new file mode 100644
index 000000000000..b9b348bef069
--- /dev/null
+++ b/lang/perl5/files/patch-perl.c
@@ -0,0 +1,58 @@
+$FreeBSD$
+
+--- perl.c.orig	Sun Jun  2 12:29:01 2002
++++ perl.c	Sun Jun  2 12:30:14 2002
+@@ -3407,6 +3407,26 @@
+ #endif /* VMS */
+     }
+ 
++#ifdef SITEARCH_EXP
++    /* sitearch is always relative to sitelib on Windows for
++     * DLL-based path intuition to work correctly */
++#  if !defined(WIN32)
++    incpush(SITEARCH_EXP, FALSE, FALSE);
++#  endif
++#endif
++
++#ifdef SITELIB_EXP
++#  if defined(WIN32)
++    incpush(SITELIB_EXP, TRUE, FALSE);	/* this picks up sitearch as well */
++#  else
++    incpush(SITELIB_EXP, FALSE, FALSE);
++#  endif
++#endif
++
++#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
++    incpush(SITELIB_STEM, FALSE, TRUE);
++#endif
++
+ /* Use the ~-expanded versions of APPLLIB (undocumented),
+     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
+ */
+@@ -3445,26 +3465,6 @@
+     incpush(PRIVLIB_EXP, TRUE, FALSE);
+ #else
+     incpush(PRIVLIB_EXP, FALSE, FALSE);
+-#endif
+-
+-#ifdef SITEARCH_EXP
+-    /* sitearch is always relative to sitelib on Windows for
+-     * DLL-based path intuition to work correctly */
+-#  if !defined(WIN32)
+-    incpush(SITEARCH_EXP, FALSE, FALSE);
+-#  endif
+-#endif
+-
+-#ifdef SITELIB_EXP
+-#  if defined(WIN32)
+-    incpush(SITELIB_EXP, TRUE, FALSE);	/* this picks up sitearch as well */
+-#  else
+-    incpush(SITELIB_EXP, FALSE, FALSE);
+-#  endif
+-#endif
+-
+-#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
+-    incpush(SITELIB_STEM, FALSE, TRUE);
+ #endif
+ 
+ #ifdef PERL_VENDORARCH_EXP
diff --git a/lang/perl5/pkg-descr b/lang/perl5/pkg-descr
index 8493844a09da..53b03153b032 100644
--- a/lang/perl5/pkg-descr
+++ b/lang/perl5/pkg-descr
@@ -1,6 +1,8 @@
-Perl is a language that combines some of the features of C, sed,
-awk and shell.  See the manual page for more hype.  There are also
-many published by O'Reilly & Assoc.  See pod/perlbook.pod for more
+Perl is a language that combines some of the features of C, sed, awk and
+shell.  See the manual page for more hype.  There are also many books
+published by O'Reilly & Assoc.  See pod/perlbook.pod for more
 information.
 
+WWW: http://perl.com/
+
 - MarkM