Update to 5.005.03.

6 files changed, 88 insertions, 85 deletions

diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile
index a174db37ee43..2630545b5336 100644
--- a/japanese/perl5/Makefile
+++ b/japanese/perl5/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	ja-perl5
-# Version required:	5.005_02
+# Version required:	5.005_03
 # Date created:		7 January 1997
 # Whom:			Yoshiro MIHIRA
 #
 # $Id: Makefile,v 1.14 1999/03/01 09:38:14 shige Exp $
 #
 
-DISTNAME=	perl5.005_02
-PKGNAME=	ja-perl-5.005.02
+DISTNAME=	perl5.005_03
+PKGNAME=	ja-perl-5.005.03
 CATEGORIES=	japanese perl5
 MASTER_SITES=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
 		ftp://ftp.is.co.za/pub/packages/perl/CPAN/src/5.0/ \
@@ -32,7 +32,7 @@ PATCH_SITES=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/authors/id/WATANABE/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/authors/id/WATANABE/ \
 		ftp://ftp.delphi.com/pub/mirrors/packages/perl/CPAN/authors/id/WATANABE/ \
 		ftp://uiarchive.cso.uiuc.edu/pub/lang/perl/CPAN/authors/id/WATANABE/
-PATCHFILES=	jperl5.005_02-981225.pat.gz
+PATCHFILES=	jperl5.005_03-990503.pat.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -42,14 +42,14 @@ MAINTAINER=	shige@FreeBSD.ORG
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX} -Duseshrplib \
-			-Dlibperl=libperl.so.${JPERL_SHLIBVER}
+			-Dlibperl=libperl.so.${PERL_SHLIBVER}
 
-JPERL_VERSION=	5.00502
+JPERL_VERSION=	5.00503
 JPERL_VER=	5.005
 .if ${PORTOBJFORMAT} == "aout"
-JPERL_SHLIBVER=	1.0
+PERL_SHLIBVER=	1.0
 .else
-JPERL_SHLIBVER=	1
+PERL_SHLIBVER=	1
 .endif
 PLIST_SUB=	JPERL_VERSION=${JPERL_VERSION} JPERL_VER=${JPERL_VER}
 
@@ -123,7 +123,7 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/jperl${JPERL_VERSION}
 	@${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/suidperl
 	@${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/jsuidperl
-	@${LN} -fs ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so.${JPERL_SHLIBVER} ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so
+	@${LN} -fs ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/perl5/distinfo b/japanese/perl5/distinfo
index 1edce13e6238..984816a6b227 100644
--- a/japanese/perl5/distinfo
+++ b/japanese/perl5/distinfo
@@ -1,2 +1,2 @@
-MD5 (perl5.005_02.tar.gz) = de99ae45441f3c8c7d0749f35bdf47d5
-MD5 (jperl5.005_02-981225.pat.gz) = 00df1c9eb43074e3573720df6d16c71f
+MD5 (perl5.005_03.tar.gz) = 427890d97e32430341c1fa80f55277a7
+MD5 (jperl5.005_03-990503.pat.gz) = 2f4d2304c93e2cd7b8cce6f9e6bd58ae
diff --git a/japanese/perl5/files/patch-ad b/japanese/perl5/files/patch-ad
index be532df9909a..7532b471cc93 100644
--- a/japanese/perl5/files/patch-ad
+++ b/japanese/perl5/files/patch-ad
@@ -1,6 +1,6 @@
---- hints/freebsd.sh.orig	Fri Jul 24 13:00:19 1998
-+++ hints/freebsd.sh	Wed Feb 10 15:22:47 1999
-@@ -68,6 +68,7 @@
+--- hints/freebsd.sh.orig	Fri Feb 12 09:05:48 1999
++++ hints/freebsd.sh	Fri May  7 22:50:53 1999
+@@ -72,6 +72,7 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -8,7 +8,7 @@
  	test -r ./broken-db.msg && . ./broken-db.msg
  	;;
  #
-@@ -81,12 +82,18 @@
+@@ -85,12 +86,18 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -27,64 +27,67 @@
  	;;
  esac
  
-@@ -95,17 +102,25 @@
+@@ -99,7 +106,11 @@
  case "$osvers" in
  0.*|1.0*) ;;
  
--3.0*)   if [ -e /usr/lib/aout ]; then
--            libpth="/usr/lib/aout /usr/local/lib /usr/lib"
--            glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
--        fi
--        cccdlflags='-DPIC -fpic'
--        lddlflags='-Bshareable'
--        ;;
--
--*)	cccdlflags='-DPIC -fpic'
+-3.*|4.0*)
 +2.*)	cccdlflags='-DPIC -fpic'
- 	lddlflags="-Bshareable $lddlflags"
- 	;;
++	lddlflags="-Bshareable $lddlflags"
++	;;
 +
-+*)	objformat=`objformat`
-+	if [ x$objformat = xelf ]; then
-+	    libpth="/usr/lib /usr/local/lib"
-+	    glibpth="/usr/lib /usr/local/lib"
-+	    ldflags="-Wl,-E "
-+	    lddlflags="-shared "
-+	else
-+	    if [ -e /usr/lib/aout ]; then
-+	        libpth="/usr/lib/aout /usr/local/lib /usr/lib"
-+	        glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
-+	    fi
-+	    lddlflags='-Bshareable'
-+	fi
-+	cccdlflags='-DPIC -fpic'
-+        ;;
++*)
+         objformat=`/usr/bin/objformat`
+         if [ x$objformat = xelf ]; then
+             libpth="/usr/lib /usr/local/lib"
+@@ -115,10 +126,6 @@
+         fi
+         cccdlflags='-DPIC -fpic'
+         ;;
+-
+-*)	cccdlflags='-DPIC -fpic'
+-	lddlflags="-Bshareable $lddlflags"
+-	;;
  esac
  
  cat <<'EOM' >&4
-@@ -125,7 +140,11 @@
- case "$usethreads" in
- $define)
-     case "$osvers" in  
--        3.0*) ldflags="-pthread $ldflags"
-+         0.*|1.*|2.0*|2.1*)   cat <<'EOM' >&4
-+It is not known if FreeBSD $uname_r supports POSIX threads or not.  Consider
-+upgrading to the latest STABLE release.
-+EOM
-+              exit 1
-               ;;
-         2.2*) if [ ! -r /usr/lib/libc_r ]; then
-                 cat <<'EOM' >&4
-@@ -142,11 +161,7 @@
-               # The safest quick-fix is just to not use nm at all.
-               usenm=false
-               ;;
--         *)   cat <<'EOM' >&4
--It is not known if FreeBSD $uname_r supports POSIX threads or not.  Consider
--upgrading to the latest STABLE release.
--EOM
--              exit 1
-+        *) ldflags="-pthread $ldflags"
-               ;;
-     esac
-     ;;
+@@ -166,7 +173,7 @@
+ $define|true|[yY]*)
+         lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'`
+         case "$osvers" in  
+-	2.2.8*|3.*|4.*)
++	2.2.8*)
+ 	      if [ ! -r "$lc_r" ]; then
+ 	      cat <<EOM >&4
+ POSIX threads should be supported by FreeBSD $osvers --
+@@ -179,7 +186,7 @@
+ 	      fi
+ 	      ldflags="-pthread $ldflags"
+ 	      ;;
+-        2.2*)
++        0.*|1.*|2.0*|2.1*|2.2*)
+               cat <<EOM >&4
+ POSIX threads are not supported well by FreeBSD $osvers.
+ 
+@@ -192,12 +199,17 @@
+ EOM
+ 	      exit 1
+ 	      ;;
+-	 *)   cat <<EOM >&4
+-I did not know that FreeBSD $osvers supports POSIX threads.
++	 *)   if [ ! -r "$lc_r" ]; then
++	      cat <<EOM >&4
++POSIX threads should be supported by FreeBSD $osvers --
++but your system is missing the shared libc_r.
++(/sbin/ldconfig -r doesn't find any).
+ 
+-Feel free to tell perlbug@perl.com otherwise.
++Consider using the latest STABLE release.
+ EOM
+-	      exit 1
++		 exit 1
++	      fi
++	      ldflags="-pthread $ldflags"
+ 	      ;;
+ 	esac
+ 
diff --git a/japanese/perl5/files/patch-ag b/japanese/perl5/files/patch-ag
index c701adb3382b..b742041ff4d2 100644
--- a/japanese/perl5/files/patch-ag
+++ b/japanese/perl5/files/patch-ag
@@ -1,9 +1,9 @@
---- makedepend.SH.ORIG	Fri Jul 24 06:00:58 1998
-+++ makedepend.SH	Thu Jul 30 17:08:37 1998
-@@ -67,6 +67,7 @@
-     # to be out of date.  I don't know if OS/2 has touch, so do this:
+--- makedepend.SH.orig	Fri Jan 22 10:10:23 1999
++++ makedepend.SH	Fri May  7 22:20:42 1999
+@@ -68,6 +68,7 @@
      case "$osname" in
      os2) ;;
+     netbsd) ;;
 +    freebsd) ;;
      *) $touch $firstmakefile ;;
      esac
diff --git a/japanese/perl5/files/patch-ah b/japanese/perl5/files/patch-ah
index 176bbadb5663..0cc7667c4c51 100644
--- a/japanese/perl5/files/patch-ah
+++ b/japanese/perl5/files/patch-ah
@@ -1,17 +1,17 @@
---- Makefile.SH.orig	Wed Feb 10 19:02:00 1999
-+++ Makefile.SH	Wed Feb 10 19:13:58 1999
-@@ -46,9 +46,18 @@
- 	os2*)	# OS/2 doesn't need anything special for LD_LIBRARY_PATH.
- 		ldlibpth=''
- 		;;
--	sunos*|freebsd[23]*|netbsd*)
-+	sunos*|netbsd*)
+--- Makefile.SH.orig	Fri May  7 22:06:24 1999
++++ Makefile.SH	Fri May  7 22:26:31 1999
+@@ -51,9 +51,18 @@
+ 	sunos*)
  		linklibperl="-lperl"
  		;;
+-	netbsd*|freebsd[234]*)
++	netbsd*)
+ 		linklibperl="-L. -lperl"
+ 		;;
 +	freebsd*)
 +		linklibperl="-L. -lperl"
 +		if [ -x /usr/bin/objformat ]; then
-+			objformat=`objformat`
++			objformat=`/usr/bin/objformat`
 +		else
 +			objformat=aout
 +		fi
@@ -20,7 +20,7 @@
  	aix*)
  		shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
  		case "$osvers" in
-@@ -300,12 +309,17 @@
+@@ -305,12 +314,17 @@
  		$spitshell >>Makefile <<'!NO!SUBS!'
  	$(LD) $(SHRPLDFLAGS) -o $@ perl$(OBJ_EXT) $(obj)
  !NO!SUBS!
diff --git a/japanese/perl5/pkg-descr b/japanese/perl5/pkg-descr
index b0e80e5e3eff..e2b915d3628a 100644
--- a/japanese/perl5/pkg-descr
+++ b/japanese/perl5/pkg-descr
@@ -1,8 +1,8 @@
-* ja-perl-5.005.02
+* ja-perl-5.005.03
 	This port collection was used:
 		port collection lang/perl5
 				by markm@FreeBSD.ORG,
-	    and jperl5.005_02-981225
+	    and jperl5.005_03-990503
 				by yasushi@cs.washington.edu,
 		port collection japanese/perl5
 				by shige@FreeBSD.ORG