From 10bd7658a47ab8ce1b99bcd922b2922fa4de0225 Mon Sep 17 00:00:00 2001
From: Shigeyuki Fukushima <shige@FreeBSD.org>
Date: Mon, 2 Dec 2002 16:40:44 +0000
Subject: Update japanized perl5 patch to 20000401. PORTREVISION bump. Fix
 build error on 5-CURRENT.

---
 japanese/perl5/Makefile       |  3 ++-
 japanese/perl5/distinfo       |  2 +-
 japanese/perl5/files/patch-ad | 25 ++++++++++++++++++-------
 japanese/perl5/files/patch-ag | 13 +++++++++++--
 4 files changed, 32 insertions(+), 11 deletions(-)

(limited to 'japanese/perl5')

diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile
index bcf2a353d391..f286d35a38d3 100644
--- a/japanese/perl5/Makefile
+++ b/japanese/perl5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${JPERL_VER}.${JPERL_VER_PL}
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	ftp://ftp.cpan.org/CPAN/src/5.0/ \
 		ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
@@ -34,7 +35,7 @@ PATCH_SITES=	ftp://ftp.cpan.org/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=	j${DISTNAME}-990822.pat.gz
+PATCHFILES=	j${DISTNAME}-20000401.pat.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	shige@FreeBSD.org
diff --git a/japanese/perl5/distinfo b/japanese/perl5/distinfo
index 8ac00103962d..95625bf8d669 100644
--- a/japanese/perl5/distinfo
+++ b/japanese/perl5/distinfo
@@ -1,2 +1,2 @@
 MD5 (perl5.005_03.tar.gz) = 427890d97e32430341c1fa80f55277a7
-MD5 (jperl5.005_03-990822.pat.gz) = 65b5fcb9006241992687e475fa3ae8a8
+MD5 (jperl5.005_03-20000401.pat.gz) = 355e57c944dff5113e5963080b648b5b
diff --git a/japanese/perl5/files/patch-ad b/japanese/perl5/files/patch-ad
index 7532b471cc93..20a1f673f4be 100644
--- a/japanese/perl5/files/patch-ad
+++ b/japanese/perl5/files/patch-ad
@@ -1,5 +1,5 @@
 --- hints/freebsd.sh.orig	Fri Feb 12 09:05:48 1999
-+++ hints/freebsd.sh	Fri May  7 22:50:53 1999
++++ hints/freebsd.sh	Mon Dec  2 14:43:50 2002
 @@ -72,6 +72,7 @@
  	d_setreuid='define'
  	d_setegid='undef'
@@ -8,7 +8,7 @@
  	test -r ./broken-db.msg && . ./broken-db.msg
  	;;
  #
-@@ -85,12 +86,18 @@
+@@ -85,12 +86,29 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -24,10 +24,21 @@
 +	d_setegid='undef'
 +	d_seteuid='undef'
 +	d_dosuid='define'
++	;;
++esac
++
++#
++# /usr/include/malloc.h is deprecated after 3.0.
++case "$osvers" in
++0.*|1.*|2.*)
++	i_malloc=''
++	;;
++*)
++	i_malloc='undef'
  	;;
  esac
  
-@@ -99,7 +106,11 @@
+@@ -99,7 +117,11 @@
  case "$osvers" in
  0.*|1.0*) ;;
  
@@ -40,7 +51,7 @@
          objformat=`/usr/bin/objformat`
          if [ x$objformat = xelf ]; then
              libpth="/usr/lib /usr/local/lib"
-@@ -115,10 +126,6 @@
+@@ -115,10 +137,6 @@
          fi
          cccdlflags='-DPIC -fpic'
          ;;
@@ -51,7 +62,7 @@
  esac
  
  cat <<'EOM' >&4
-@@ -166,7 +173,7 @@
+@@ -166,7 +184,7 @@
  $define|true|[yY]*)
          lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'`
          case "$osvers" in  
@@ -60,7 +71,7 @@
  	      if [ ! -r "$lc_r" ]; then
  	      cat <<EOM >&4
  POSIX threads should be supported by FreeBSD $osvers --
-@@ -179,7 +186,7 @@
+@@ -179,7 +197,7 @@
  	      fi
  	      ldflags="-pthread $ldflags"
  	      ;;
@@ -69,7 +80,7 @@
                cat <<EOM >&4
  POSIX threads are not supported well by FreeBSD $osvers.
  
-@@ -192,12 +199,17 @@
+@@ -192,12 +210,17 @@
  EOM
  	      exit 1
  	      ;;
diff --git a/japanese/perl5/files/patch-ag b/japanese/perl5/files/patch-ag
index b742041ff4d2..7d4cc5d46407 100644
--- a/japanese/perl5/files/patch-ag
+++ b/japanese/perl5/files/patch-ag
@@ -1,5 +1,5 @@
---- makedepend.SH.orig	Fri Jan 22 10:10:23 1999
-+++ makedepend.SH	Fri May  7 22:20:42 1999
+--- makedepend.SH.orig	Fri Jan 22 01:10:23 1999
++++ makedepend.SH	Tue Dec  3 01:11:02 2002
 @@ -68,6 +68,7 @@
      case "$osname" in
      os2) ;;
@@ -8,3 +8,12 @@
      *) $touch $firstmakefile ;;
      esac
  fi
+@@ -129,6 +130,8 @@
+     $cppstdin $finc -I. $cppflags $cppminus <UU/$file.c |
+     $sed \
+ 	-e '/^#.*<stdin>/d' \
++	-e '/^#.*<built-in>/d' \
++	-e '/^#.*<command line>/d' \
+ 	-e '/^#.*"-"/d' \
+ 	-e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
+ 	-e 's/^[	 ]*#[	 ]*line/#/' \
-- 
cgit v1.2.3