diff -ru -x *~ -x *.orig ../.orig.perl-5.6.1/cflags.SH ./cflags.SH
--- ../.orig.perl-5.6.1/cflags.SH	Thu Feb 22 18:57:53 2001
+++ ./cflags.SH	Mon Apr  1 11:51:56 2002
@@ -84,8 +84,8 @@
     : or customize here
 
     case "$file" in
-    DB_File) ;;
-    GDBM_File) ;;
+    DB_File) ccflags="$ccflags -I${ROOT}/usr/freeware/include/db3";;
+    GDBM_File) ccflags="$ccflags -I${ROOT}/usr/freeware/include";;
     NDBM_File) ;;
     ODBM_File) ;;
     POSIX) ;;
@@ -104,6 +104,7 @@
     mg) ;;
     miniperlmain) ;;
     op) ;;
+    opmini) optimize="-g";;
     perl) ;;
     perlapi) ;;
     perlmain) ;;
diff -ru -x *~ -x *.orig ../.orig.perl-5.6.1/ext/DB_File/Makefile.PL ./ext/DB_File/Makefile.PL
--- ../.orig.perl-5.6.1/ext/DB_File/Makefile.PL	Thu Feb 22 18:57:54 2001
+++ ./ext/DB_File/Makefile.PL	Mon Apr  1 17:51:48 2002
@@ -10,14 +10,16 @@
 
 WriteMakefile(
 	NAME 		=> 'DB_File',
-	LIBS 		=> ["-L/usr/local/lib $LIB"],
+	LIBS 		=> [' -ldb-3'],
         MAN3PODS        => {},         # Pods will be built by installman.
-	#INC		=> '-I/usr/local/include',
+	INC		=> "-I/usr/freeware/include/db3",
 	VERSION_FROM	=> 'DB_File.pm',
 	OBJECT		=> 'version$(OBJ_EXT) DB_File$(OBJ_EXT)',
+#	LDFROM		=> 'version$(OBJ_EXT) DB_File$(OBJ_EXT) ${ROOT}/usr/freeware/lib32/libdb.a',
+	dynamic_lib	=> { OTHERLDFLAGS => ' -Wl,-rpath,/usr/freeware/lib32 -ldb-3'},
 	XSPROTOARG	=> '-noprototypes',
 	DEFINE		=> $OS2 || "",
-	INC => ($^O eq "MacOS" ? "-i ::::db:include" : "")
+#	INC => ($^O eq "MacOS" ? "-i ::::db:include" : "")
 	);
 
 sub MY::postamble {
diff -ru -x *~ -x *.orig ../.orig.perl-5.6.1/ext/GDBM_File/Makefile.PL ./ext/GDBM_File/Makefile.PL
--- ../.orig.perl-5.6.1/ext/GDBM_File/Makefile.PL	Thu Feb 22 18:57:54 2001
+++ ./ext/GDBM_File/Makefile.PL	Mon Apr  1 11:51:56 2002
@@ -1,7 +1,10 @@
 use ExtUtils::MakeMaker;
 WriteMakefile(
     NAME => 'GDBM_File',
-    LIBS => ["-L/usr/local/lib -lgdbm", "-ldbm"],
+    LIBS => [' -lgdbm'],
+    LDFROM => 'GDBM_File$(OBJ_EXT) ${ROOT}/usr/freeware/lib32/libgdbm.a',
+    INC  => "-I/usr/freeware/include",
+    dynamic_lib => { OTHERLDFLAGS => ' -Wl,-rpath,/usr/freeware/lib32' },
     MAN3PODS 	=> {}, 	# Pods will be built by installman.
     XSPROTOARG => '-noprototypes', 		# XXX remove later?
     VERSION_FROM => 'GDBM_File.pm',
diff -ru -x *~ -x *.orig ../.orig.perl-5.6.1/hints/irix_6.sh ./hints/irix_6.sh
--- ../.orig.perl-5.6.1/hints/irix_6.sh	Thu Feb 22 18:57:55 2001
+++ ./hints/irix_6.sh	Mon Apr  1 11:51:56 2002
@@ -71,20 +71,20 @@
 	    ;;
 esac
 
-case "$use64bitall" in
-"$define"|true|[yY]*)
-  case "`uname -s`" in
-  IRIX)
-            cat >&4 <<EOM
-You cannot use -Duse64bitall in 32-bit IRIX, sorry.
-
-Cannot continue, aborting.
-EOM
-            exit 1
-	;;
-  esac
-  ;;
-esac
+#case "$use64bitall" in
+#"$define"|true|[yY]*)
+#  case "`uname -s`" in
+#  IRIX)
+#            cat >&4 <<EOM
+#You cannot use -Duse64bitall in 32-bit IRIX, sorry.
+#
+#Cannot continue, aborting.
+#EOM
+#            exit 1
+#	;;
+#  esac
+#  ;;
+#esac
 
 # Check for which compiler we're using
 
@@ -287,7 +287,7 @@
 # after it has prompted the user for whether to use threads.
 case "$usethreads" in
 $define|true|[yY]*)
-        if test ! -f ${TOOLROOT}/usr/include/pthread.h -o ! -f /usr/lib/libpthread.so; then
+        if test ! -f /usr/include/pthread.h -o ! -f /usr/lib/libpthread.so; then
             case "`uname -r`" in
             [1-5].*|6.[01])
  	        cat >&4 <<EOM
diff -ru -x *~ -x *.orig ../.orig.perl-5.6.1/installman ./installman
--- ../.orig.perl-5.6.1/installman	Thu Feb 22 18:57:55 2001
+++ ./installman	Mon Apr  1 11:51:56 2002
@@ -23,6 +23,7 @@
 my $usage =
 "Usage:  installman --man1dir=/usr/wherever --man1ext=1
                    --man3dir=/usr/wherever --man3ext=3
+                   --packdir=/usr/whatever
 		   --batchlimit=40
 	           --notify --verbose --silent --help
 	Defaults are:
@@ -30,6 +31,7 @@
 	man1ext = $Config{'man1ext'};
 	man3dir = $Config{'installman3dir'};
 	man3ext = $Config{'man3ext'};
+        packdir = $Config{'installarchlib'};
         batchlimit is maximum number of pod files per invocation of pod2man
 	--notify  (or -n) just lists commands that would be executed.
         --verbose (or -V) report all progress.
@@ -38,7 +40,7 @@
 my %opts;
 GetOptions( \%opts,
             qw( man1dir=s man1ext=s man3dir=s man3ext=s batchlimit=i
-                notify n help silent S verbose V)) 
+                packdir=s notify n help silent S verbose V)) 
 	|| die $usage;
 die $usage if $opts{help};
 
@@ -50,6 +52,8 @@
     unless defined($opts{man3dir}); 
 $opts{man3ext} = $Config{'man3ext'}
     unless defined($opts{man3ext}); 
+$opts{packdir} = $Config{'installarchlib'}
+    unless defined($opts{packdir});
 $opts{batchlimit} ||= 40;
 $opts{silent} ||= $opts{S};
 $opts{notify} ||= $opts{n};
@@ -65,7 +69,7 @@
 -x "t/perl$Config{exe_ext}"		|| warn "WARNING: You've never run 'make test'!!!",
 	"  (Installing anyway.)\n";
 
-$packlist = ExtUtils::Packlist->new("$Config{installarchlib}/.packlist");
+$packlist = ExtUtils::Packlist->new("$opts{packdir}/.packlist");
 
 # Install the main pod pages.
 runpod2man('pod', $opts{man1dir}, $opts{man1ext});
Only in .: patch.log
diff -ru -x *~ -x *.orig ../.orig.perl-5.6.1/perl.h ./perl.h
--- ../.orig.perl-5.6.1/perl.h	Wed Mar 21 21:05:02 2001
+++ ./perl.h	Mon Apr  1 11:51:56 2002
@@ -1488,8 +1488,9 @@
 typedef struct loop LOOP;
 
 typedef struct interpreter PerlInterpreter;
-#ifdef UTS
+#if defined(UTS) || defined(__sgi)
 #   define STRUCT_SV perl_sv /* Amdahl's <ksync.h> has struct sv */
+                             /* IRIX's <sys/sema.h> has struct sv */
 #else
 #   define STRUCT_SV sv
 #endif