1. Update PATCH_FILES to use new JPerl patch.

2. Use shared libperl (libperl.so.1) instead of static libperl.

Approved by:	maintainer
PR:		ports/9540
Submitted by:	Issei Suzuki <issei@jp.FreeBSD.ORG>

3 files changed, 92 insertions, 7 deletions

diff --git a/japanese/perl5/files/patch-ad b/japanese/perl5/files/patch-ad
index 510e8eee86e3..be532df9909a 100644
--- a/japanese/perl5/files/patch-ad
+++ b/japanese/perl5/files/patch-ad
@@ -1,5 +1,5 @@
 --- hints/freebsd.sh.orig	Fri Jul 24 13:00:19 1998
-+++ hints/freebsd.sh	Sat Oct 10 20:39:02 1998
++++ hints/freebsd.sh	Wed Feb 10 15:22:47 1999
 @@ -68,6 +68,7 @@
  	d_setreuid='define'
  	d_setegid='undef'
@@ -27,7 +27,7 @@
  	;;
  esac
  
-@@ -95,12 +102,20 @@
+@@ -95,17 +102,25 @@
  case "$osvers" in
  0.*|1.0*) ;;
  
@@ -37,7 +37,14 @@
 -        fi
 -        cccdlflags='-DPIC -fpic'
 -        lddlflags='-Bshareable'
-+3.0*)	objformat=`objformat`
+-        ;;
+-
+-*)	cccdlflags='-DPIC -fpic'
++2.*)	cccdlflags='-DPIC -fpic'
+ 	lddlflags="-Bshareable $lddlflags"
+ 	;;
++
++*)	objformat=`objformat`
 +	if [ x$objformat = xelf ]; then
 +	    libpth="/usr/lib /usr/local/lib"
 +	    glibpth="/usr/lib /usr/local/lib"
@@ -51,6 +58,33 @@
 +	    lddlflags='-Bshareable'
 +	fi
 +	cccdlflags='-DPIC -fpic'
-         ;;
++        ;;
+ esac
  
- *)	cccdlflags='-DPIC -fpic'
+ 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
+     ;;
diff --git a/japanese/perl5/files/patch-ae b/japanese/perl5/files/patch-ae
index 5945ef412853..61ea9bd39fd5 100644
--- a/japanese/perl5/files/patch-ae
+++ b/japanese/perl5/files/patch-ae
@@ -1,5 +1,14 @@
---- installperl.ORIG	Thu Jul 30 15:58:50 1998
-+++ installperl	Thu Jul 30 16:02:16 1998
+--- installperl.orig	Fri Jul 24 13:00:24 1998
++++ installperl	Sun Jan 17 04:32:45 1999
+@@ -217,7 +217,7 @@
+     @corefiles = <$coredir/*.*>;
+ }
+ else {
+-    @corefiles = <*.h libperl*.*>;
++    @corefiles = <*.h libperl.so.*>;
+     # AIX needs perl.exp installed as well.
+     push(@corefiles,'perl.exp') if $^O eq 'aix';
+     # If they have built sperl.o...
 @@ -269,7 +269,7 @@
  	      (-l $usrbinperl) &&
  	      ((readlink $usrbinperl) eq $expinstperl));
diff --git a/japanese/perl5/files/patch-ah b/japanese/perl5/files/patch-ah
new file mode 100644
index 000000000000..176bbadb5663
--- /dev/null
+++ b/japanese/perl5/files/patch-ah
@@ -0,0 +1,42 @@
+--- 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*)
+ 		linklibperl="-lperl"
+ 		;;
++	freebsd*)
++		linklibperl="-L. -lperl"
++		if [ -x /usr/bin/objformat ]; then
++			objformat=`objformat`
++		else
++			objformat=aout
++		fi
++		[ x$objformat = xelf ] && shrpldflags="${shrpldflags} -Wl,-soname,${libperl}"
++		;;
+ 	aix*)
+ 		shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
+ 		case "$osvers" in
+@@ -300,12 +309,17 @@
+ 		$spitshell >>Makefile <<'!NO!SUBS!'
+ 	$(LD) $(SHRPLDFLAGS) -o $@ perl$(OBJ_EXT) $(obj)
+ !NO!SUBS!
+-		case "$osname" in
+-		aix)
++		case "${osname}${osvers}" in
++		aix*)
+ 			$spitshell >>Makefile <<'!NO!SUBS!'
+ 	rm -f libperl$(OBJ_EXT)
+ 	mv $@ libperl$(OBJ_EXT)
+ 	$(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
++!NO!SUBS!
++			;;
++		freebsd*)
++			$spitshell >>Makefile <<'!NO!SUBS!'
++	$(LNS) $(LIBPERL) libperl.so
+ !NO!SUBS!
+ 			;;
+ 		esac