The linking with libutil _still_ didn't work on a real 1.3.2 system. Fix

this the only way that works with a stock 1.3.x ld:  bump the major
numbers to 5.  Split out affected patches from the patch bundle.

5 files changed, 135 insertions, 119 deletions

diff --git a/www/mozilla/patches/patch-aa b/www/mozilla/patches/patch-aa
index aff59434bfd..cc4a30be971 100644
--- a/www/mozilla/patches/patch-aa
+++ b/www/mozilla/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 1998/08/08 20:33:59 fvdl Exp $
+$NetBSD: patch-aa,v 1.8 1998/09/15 16:47:09 tv Exp $
 
 *** cmd/stubfe/Makefile.orig	Tue Aug  4 02:37:20 1998
 --- cmd/stubfe/Makefile	Tue Aug  4 11:29:40 1998
@@ -63,31 +63,6 @@ $NetBSD: patch-aa,v 1.7 1998/08/08 20:33:59 fvdl Exp $
   #define STATFS statfs
   #else
   #include <sys/statfs.h>  /* for statfs() */
-*** cmd/xfe/Makefile.orig	Tue Aug  4 02:37:18 1998
---- cmd/xfe/Makefile	Tue Aug  4 11:29:40 1998
-***************
-*** 618,623 ****
---- 618,637 ----
-  endif
-  
-  ########################################
-+ # NetBSD
-+ # Work around linker semantics that will never find our own libutil on 1.3.x
-+ ifeq ($(OS_ARCH),NetBSD)
-+ ifeq ($(OS_MINOR),3)
-+ FOOL_GMAKE	= $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
-+ DSO_EX_LIBS	= $(FOOL_GMAKE:-lutil=$(DIST)/lib/libutil.a)
-+ endif
-+ ifdef LIBRUNPATH
-+ OS_LIBS		+= -R$(LIBRUNPATH)
-+ endif
-+ OTHER_LIBS	= -L/usr/X11R6/lib -lXm -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
-+ endif
-+ 
-+ ########################################
-  # BSDI
-  ifeq ($(OS_ARCH),BSD_OS)
-  OTHER_LIBS	= $(MOTIF)/libXm.a $(LOC_LIB_DIR)/libXt.a $(X11R6LIBS) $(LOC_LIB_DIR)/libXmu.a \
 *** cmd/xfe/mozilla.c.orig	Tue Jul 28 06:48:31 1998
 --- cmd/xfe/mozilla.c	Tue Aug  4 02:37:18 1998
 ***************
@@ -365,39 +340,3 @@ $NetBSD: patch-aa,v 1.7 1998/08/08 20:33:59 fvdl Exp $
   #else
   #error "Need to define SP index in jmp_buf here"
   #endif
-*** config/NetBSD.mk.orig	Tue Jul 28 06:44:26 1998
---- config/NetBSD.mk	Sat Aug  8 21:09:47 1998
-***************
-*** 38,44 ****
-  MOTIFLIB		=
-  OS_LIBS			=
-  
-! OS_MINOR		= $(shell echo $(OS_VERSION) | cut -f2 -d.)
-  
-  # Don't define BSD, because it's already defined in /usr/include/sys/param.h.
-  PLATFORM_FLAGS		= -DNETBSD $(DSO_CFLAGS)
---- 38,44 ----
-  MOTIFLIB		=
-  OS_LIBS			=
-  
-! OS_MINOR		= $(shell echo $(OS_RELEASE) | cut -f2 -d.)
-  
-  # Don't define BSD, because it's already defined in /usr/include/sys/param.h.
-  PLATFORM_FLAGS		= -DNETBSD $(DSO_CFLAGS)
-***************
-*** 89,95 ****
-  
-  MKSHLIB			= $(LD) $(DSO_LDOPTS)
-  
-! DSO_CFLAGS		= -fpic
-  DSO_LDFLAGS		= 
-  
-  #
---- 89,95 ----
-  
-  MKSHLIB			= $(LD) $(DSO_LDOPTS)
-  
-! DSO_CFLAGS		= -fPIC
-  DSO_LDFLAGS		= 
-  
-  #
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
new file mode 100644
index 00000000000..cf7271d8ace
--- /dev/null
+++ b/www/mozilla/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.3 1998/09/15 16:47:10 tv Exp $
+
+--- cmd/xfe/Makefile.orig	Tue Jul 28 00:48:28 1998
++++ cmd/xfe/Makefile	Wed Sep  9 19:18:30 1998
+@@ -604,6 +604,15 @@
+ endif
+ 
+ ########################################
++# NetBSD
++ifeq ($(OS_ARCH),NetBSD)
++ifdef LIBRUNPATH
++OS_LIBS		+= -R$(LIBRUNPATH)
++endif
++OTHER_LIBS	= -L/usr/X11R6/lib -lXm -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
++endif
++
++########################################
+ # BSDI
+ ifeq ($(OS_ARCH),BSD_OS)
+ OTHER_LIBS	= $(MOTIF)/libXm.a $(LOC_LIB_DIR)/libXt.a $(X11R6LIBS) $(LOC_LIB_DIR)/libXmu.a \
diff --git a/www/mozilla/patches/patch-ac b/www/mozilla/patches/patch-ac
new file mode 100644
index 00000000000..480cf0fc8d5
--- /dev/null
+++ b/www/mozilla/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.3 1998/09/15 16:47:10 tv Exp $
+
+--- config/NetBSD.mk.orig	Tue Jul 28 00:44:26 1998
++++ config/NetBSD.mk	Wed Sep  9 19:17:45 1998
+@@ -38,7 +38,7 @@
+ MOTIFLIB		=
+ OS_LIBS			=
+ 
+-OS_MINOR		= $(shell echo $(OS_VERSION) | cut -f2 -d.)
++OS_MINOR		= $(shell echo $(OS_RELEASE) | cut -f2 -d.)
+ 
+ # Don't define BSD, because it's already defined in /usr/include/sys/param.h.
+ PLATFORM_FLAGS		= -DNETBSD $(DSO_CFLAGS)
+@@ -69,7 +69,7 @@
+ # Overrides for defaults in config.mk (or wherever)
+ ######################################################################
+ 
+-DLL_SUFFIX		= so.1.0
++DLL_SUFFIX		= so.5.0
+ EMACS			= /usr/bin/true
+ JAVA_PROG		= $(JAVA_BIN)java
+ RANLIB			= /usr/bin/ranlib
+@@ -89,7 +89,7 @@
+ 
+ MKSHLIB			= $(LD) $(DSO_LDOPTS)
+ 
+-DSO_CFLAGS		= -fpic
++DSO_CFLAGS		= -fPIC
+ DSO_LDFLAGS		= 
+ 
+ #
diff --git a/www/mozilla/patches/patch-ad b/www/mozilla/patches/patch-ad
new file mode 100644
index 00000000000..7a5c07e7037
--- /dev/null
+++ b/www/mozilla/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.1 1998/09/15 16:47:10 tv Exp $
+
+--- config/rules.mk.orig	Wed Sep  9 19:16:43 1998
++++ config/rules.mk	Wed Sep  9 19:17:35 1998
+@@ -106,9 +106,12 @@
+ ifeq ($(OS_ARCH),HP-UX)
+ SHARED_LIBRARY		:= $(LIBRARY:.a=.sl)
+ else
+-ifneq (,$(filter FreeBSD NetBSD,$(OS_ARCH)))
++ifeq ($(OS_ARCH),FreeBSD)
+ SHARED_LIBRARY		:= $(LIBRARY:.a=.so.1.0)
+ else
++ifeq ($(OS_ARCH),NetBSD)
++SHARED_LIBRARY		:= $(LIBRARY:.a=.so.5.0)
++else
+ ifeq ($(OS_ARCH)$(OS_RELEASE),SunOS4.1)
+ SHARED_LIBRARY		:= $(LIBRARY:.a=.so.1.0)
+ else
+@@ -116,6 +119,7 @@
+ SHARED_LIBRARY		:= $(LIBRARY:.a=)_shr.a
+ else
+ SHARED_LIBRARY		:= $(LIBRARY:.a=.so)
++endif
+ endif
+ endif
+ endif
diff --git a/www/mozilla/pkg/PLIST b/www/mozilla/pkg/PLIST
index abdf3a42161..ac96d8b24d4 100644
--- a/www/mozilla/pkg/PLIST
+++ b/www/mozilla/pkg/PLIST
@@ -1,65 +1,65 @@
-@comment $NetBSD: PLIST,v 1.7 1998/08/04 13:09:22 fvdl Exp $
+@comment $NetBSD: PLIST,v 1.8 1998/09/15 16:47:10 tv Exp $
 bin/moz-export
 bin/mozilla-export
 bin/mozilla
-lib/mozilla/libDtWidgets.so.1.0
-lib/mozilla/libXfeBm.so.1.0
-lib/mozilla/libXfeWidgets.so.1.0
-lib/mozilla/libXmL.so.1.0
-lib/mozilla/libabouturl.so.1.0
-lib/mozilla/libcnetinit.so.1.0
-lib/mozilla/libdataurl.so.1.0
-lib/mozilla/libdbm.so.1.0
-lib/mozilla/libfileurl.so.1.0
-lib/mozilla/libfont.so.1.0
-lib/mozilla/libftpurl.so.1.0
-lib/mozilla/libgophurl.so.1.0
-lib/mozilla/libhook.so.1.0
-lib/mozilla/libhtmldlgs.so.1.0
-lib/mozilla/libhttpurl.so.1.0
-lib/mozilla/libi18n.so.1.0
-lib/mozilla/libimg.so.1.0
-lib/mozilla/libjpeg.so.1.0
-lib/mozilla/libjs.so.1.0
-lib/mozilla/libjsj.so.1.0
-lib/mozilla/libjsurl.so.1.0
-lib/mozilla/liblay.so.1.0
-lib/mozilla/liblayer.so.1.0
-lib/mozilla/libmarimurl.so.1.0
-lib/mozilla/libmariner.so.1.0
-lib/mozilla/libmimetype.so.1.0
-lib/mozilla/libmisc.so.1.0
-lib/mozilla/libmocha.so.1.0
+lib/mozilla/libDtWidgets.so.5.0
+lib/mozilla/libXfeBm.so.5.0
+lib/mozilla/libXfeWidgets.so.5.0
+lib/mozilla/libXmL.so.5.0
+lib/mozilla/libabouturl.so.5.0
+lib/mozilla/libcnetinit.so.5.0
+lib/mozilla/libdataurl.so.5.0
+lib/mozilla/libdbm.so.5.0
+lib/mozilla/libfileurl.so.5.0
+lib/mozilla/libfont.so.5.0
+lib/mozilla/libftpurl.so.5.0
+lib/mozilla/libgophurl.so.5.0
+lib/mozilla/libhook.so.5.0
+lib/mozilla/libhtmldlgs.so.5.0
+lib/mozilla/libhttpurl.so.5.0
+lib/mozilla/libi18n.so.5.0
+lib/mozilla/libimg.so.5.0
+lib/mozilla/libjpeg.so.5.0
+lib/mozilla/libjs.so.5.0
+lib/mozilla/libjsj.so.5.0
+lib/mozilla/libjsurl.so.5.0
+lib/mozilla/liblay.so.5.0
+lib/mozilla/liblayer.so.5.0
+lib/mozilla/libmarimurl.so.5.0
+lib/mozilla/libmariner.so.5.0
+lib/mozilla/libmimetype.so.5.0
+lib/mozilla/libmisc.so.5.0
+lib/mozilla/libmocha.so.5.0
 lib/mozilla/libmsgc21.so
-lib/mozilla/libnetcache.so.1.0
-lib/mozilla/libnetcnvts.so.1.0
-lib/mozilla/libnetutil.so.1.0
-lib/mozilla/libnetwork.so.1.0
+lib/mozilla/libnetcache.so.5.0
+lib/mozilla/libnetcnvts.so.5.0
+lib/mozilla/libnetutil.so.5.0
+lib/mozilla/libnetwork.so.5.0
 lib/mozilla/libnspr21.so
-lib/mozilla/libparse.so.1.0
-lib/mozilla/libpics.so.1.0
+lib/mozilla/libparse.so.5.0
+lib/mozilla/libpics.so.5.0
 lib/mozilla/libplc21.so
 lib/mozilla/libplds21.so
-lib/mozilla/libplug.so.1.0
-lib/mozilla/libpng.so.1.0
-lib/mozilla/libpref.so.1.0
-lib/mozilla/libprgrss.so.1.0
-lib/mozilla/libpwcac.so.1.0
-lib/mozilla/librdf.so.1.0
-lib/mozilla/libreg.so.1.0
-lib/mozilla/libremoturl.so.1.0
-lib/mozilla/libsched.so.1.0
-lib/mozilla/libsecfree.so.1.0
-lib/mozilla/libstubnj.so.1.0
-lib/mozilla/libstubsj.so.1.0
-lib/mozilla/libstyle.so.1.0
-lib/mozilla/libtestdynamic.so.1.0
-lib/mozilla/libutil.so.1.0
-lib/mozilla/libxfe2.so.1.0
-lib/mozilla/libxfeicons.so.1.0
-lib/mozilla/libxlate.so.1.0
-lib/mozilla/libxml.so.1.0
-lib/mozilla/libxp.so.1.0
-lib/mozilla/libxpcom.so.1.0
-lib/mozilla/libzlib.so.1.0
+lib/mozilla/libplug.so.5.0
+lib/mozilla/libpng.so.5.0
+lib/mozilla/libpref.so.5.0
+lib/mozilla/libprgrss.so.5.0
+lib/mozilla/libpwcac.so.5.0
+lib/mozilla/librdf.so.5.0
+lib/mozilla/libreg.so.5.0
+lib/mozilla/libremoturl.so.5.0
+lib/mozilla/libsched.so.5.0
+lib/mozilla/libsecfree.so.5.0
+lib/mozilla/libstubnj.so.5.0
+lib/mozilla/libstubsj.so.5.0
+lib/mozilla/libstyle.so.5.0
+lib/mozilla/libtestdynamic.so.5.0
+lib/mozilla/libutil.so.5.0
+lib/mozilla/libxfe2.so.5.0
+lib/mozilla/libxfeicons.so.5.0
+lib/mozilla/libxlate.so.5.0
+lib/mozilla/libxml.so.5.0
+lib/mozilla/libxp.so.5.0
+lib/mozilla/libxpcom.so.5.0
+lib/mozilla/libzlib.so.5.0
 @dirrm lib/mozilla