Update to 19981008 version. Keep the .so files at 1.0, bumping the major

(which is currently unused) to work around linker semantics isn't quite
right, since, for example, libjpeg might also conflict, not just
libutil, etc. Just always link in the mozilla libutil statically for now
(it's tiny).

Package needs to be updated to use the pkg libz and libjpeg in stead of
the private copied sometime.

Note that this version has a non-functional URL Bar, File->Open Page
must be used. This is fixed in mozilla-current, but we can't create
a package for this. Still, this version fixes a lot of other problems.

7 files changed, 177 insertions, 469 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 0c4b2fc7180..93b48ccdae7 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 1998/09/27 03:29:34 tv Exp $
+# $NetBSD: Makefile,v 1.16 1998/11/09 01:25:12 fvdl Exp $
 #
 
-DISTNAME=	mozilla-19980728
-PKGNAME=	mozilla-19980728
+DISTNAME=	mozilla-19981008
+PKGNAME=	mozilla-19981008
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mozilla.org/pub/mozilla/source/ \
 	ftp://sunsite.org.uk/Mirrors/ftp.mozilla.org/pub/mozilla/source/ \
@@ -16,9 +16,7 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_MOTIF=	yes
 
-NOT_FOR_ARCHS=	arm32	# Cause not yet known
-
-CONFLICTS=	mozilla-19980603 mozilla-19980429
+CONFLICTS=	mozilla-19980603 mozilla-19980429 mozilla-19980728
 
 WRKSRC=		${WRKDIR}/mozilla
 
@@ -34,6 +32,5 @@ do-install:
 	${LN} -sf ${PREFIX}/bin/moz-export ${PREFIX}/bin/mozilla
 	${INSTALL_PROGRAM_DIR} ${MOZ_LIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/*.so* ${MOZ_LIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/${MOZ_OBJDIR}/lib/*.so* ${MOZ_LIBDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mozilla/files/md5 b/www/mozilla/files/md5
index 19bb3e060ca..58b7ea29022 100644
--- a/www/mozilla/files/md5
+++ b/www/mozilla/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.9 1998/08/07 13:27:42 agc Exp $
+$NetBSD: md5,v 1.10 1998/11/09 01:25:13 fvdl Exp $
 
-MD5 (mozilla-19980728.tar.gz) = 657a5f1ba4d45bdfb091a90d43fccc5b
+MD5 (mozilla-19981008.tar.gz) = 0f27d4d944c498fd01a3a4aaaddbb1d2
diff --git a/www/mozilla/patches/patch-aa b/www/mozilla/patches/patch-aa
index cc4a30be971..6d718eab78c 100644
--- a/www/mozilla/patches/patch-aa
+++ b/www/mozilla/patches/patch-aa
@@ -1,342 +1,121 @@
-$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
-***************
-*** 548,553 ****
---- 548,559 ----
-  endif
-  
-  ########################################
-+ # NetBSD
-+ ifeq ($(OS_ARCH),NetBSD)
-+ OTHER_LIBS	= -lm $(OS_LIBS)
-+ endif
-+ 
-+ ########################################
-  # BSDI
-  ifeq ($(OS_ARCH),BSD_OS)
-  OTHER_LIBS	= -lm $(OS_LIBS)
-*** cmd/xfe/Microline3.0/XmL/Grid.c.orig	Tue Jul 28 06:48:32 1998
---- cmd/xfe/Microline3.0/XmL/Grid.c	Tue Aug  4 02:37:18 1998
-***************
-*** 30,35 ****
---- 30,38 ----
-  #include <Xm/Text.h>
-  #include <Xm/DrawnB.h>
-  #include <Xm/CutPaste.h>
-+ #ifndef MOTIF11
-+ #include <Xm/DropSMgr.h>
-+ #endif
-  #include <X11/StringDefs.h>
-  #include <X11/cursorfont.h>
-  #include <stdio.h>
-*** cmd/xfe/src/HTMLView.cpp.orig	Tue Jul 28 06:48:55 1998
---- cmd/xfe/src/HTMLView.cpp	Tue Aug  4 02:37:17 1998
-***************
-*** 350,356 ****
-    scroller = fe_MakeScrolledWindow (m_contextData, pane, "scroller");
-    XtVaSetValues (CONTEXT_DATA (m_contextData)->scrolled,
-  				 XmNborderWidth, 0, 
-! #if defined(__FreeBSD__)||defined(BSDI)||defined(LINUX)||defined(IRIX)
-  				 // Allow for resolutions > 1000 pixels.
-  				 // This causes the vertical scrollbar not to show
-  				 // up on Solaris 2.4, bug in Motif (77998).  
---- 350,356 ----
-    scroller = fe_MakeScrolledWindow (m_contextData, pane, "scroller");
-    XtVaSetValues (CONTEXT_DATA (m_contextData)->scrolled,
-  				 XmNborderWidth, 0, 
-! #if defined(__FreeBSD__)||defined(BSDI)||defined(LINUX)||defined(IRIX)||defined(__NetBSD__)
-  				 // Allow for resolutions > 1000 pixels.
-  				 // This causes the vertical scrollbar not to show
-  				 // up on Solaris 2.4, bug in Motif (77998).  
-*** cmd/xfe/src/context_funcs.cpp.orig	Tue Jul 28 06:49:11 1998
---- cmd/xfe/src/context_funcs.cpp	Tue Aug  4 02:37:17 1998
-***************
-*** 76,81 ****
---- 76,83 ----
-  #define STATFS statfs
-  #elif defined(BSDI)
-  #include <sys/mount.h>    /* for statfs() */
-+ #elif defined(NETBSD)
-+ #include <sys/mount.h>    /* for statfs() */
-  #define STATFS statfs
-  #else
-  #include <sys/statfs.h>  /* for statfs() */
-*** cmd/xfe/mozilla.c.orig	Tue Jul 28 06:48:31 1998
---- cmd/xfe/mozilla.c	Tue Aug  4 02:37:18 1998
-***************
-*** 1889,1894 ****
---- 1889,1896 ----
-  	strcat (buf, "IRIX");
-  #elif defined(__FreeBSD__)
-  	strcat (buf, "FreeBSD");
-+ #elif defined(__NetBSD__)
-+ 	strcat (buf, "NetBSD");
-  #elif defined(__386BSD__)
-  	strcat (buf, "BSD/386");
-  #elif defined(__osf__)
-***************
-*** 3543,3549 ****
-  
-  #else  /* !OLD_UNIX_FILES */
-  
-! #if !defined(__FreeBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-  #endif
---- 3545,3551 ----
-  
-  #else  /* !OLD_UNIX_FILES */
-  
-! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-  #endif
-*** cmd/xfe/dialogs.c.orig	Tue Jul 28 06:48:29 1998
---- cmd/xfe/dialogs.c	Tue Aug  4 02:37:19 1998
-***************
-*** 278,284 ****
-    (void) fe_dialog (parent, "error", message, FALSE, 0, FALSE, FALSE, 0);
-  }
-  
-! #if !defined(__FreeBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
-  #include <sys/errno.h>
-  extern char *sys_errlist[];
-  extern int sys_nerr;
---- 278,284 ----
-    (void) fe_dialog (parent, "error", message, FALSE, 0, FALSE, FALSE, 0);
-  }
-  
-! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
-  #include <sys/errno.h>
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-*** cmd/xfe/movemail.c.orig	Tue Jul 28 06:48:31 1998
---- cmd/xfe/movemail.c	Tue Aug  4 02:37:20 1998
-***************
-*** 40,46 ****
-  #include "xfe.h"
-  
-  #include <sys/errno.h>
-! #if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2)
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-  #endif
---- 40,46 ----
-  #include "xfe.h"
-  
-  #include <sys/errno.h>
-! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(LINUX_GLIBC_2)
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-  #endif
-*** cmd/xfe/prefdialogs.c.orig	Tue Jul 28 06:48:31 1998
---- cmd/xfe/prefdialogs.c	Tue Aug  4 02:37:20 1998
+$NetBSD: patch-aa,v 1.9 1998/11/09 01:25:13 fvdl Exp $
+*** network/main/prefetch.c.orig	Thu Oct  8 22:24:29 1998
+--- network/main/prefetch.c	Sat Nov  7 20:02:13 1998
 ***************
 *** 76,82 ****
-  
-  /* For sys_errlist and sys_nerr */
-  #include <sys/errno.h>
-! #if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2)
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-  #endif
+  /*	Returns bool to indicate if its OK to prefetch the specified URL.
+  	we don't prefetch mailto:, file:, etc. 
+  */
+! PRIVATE Bool
+  pre_OKToPrefetch(char* url)
+  {
+  	int type;
 --- 76,82 ----
-  
-  /* For sys_errlist and sys_nerr */
-  #include <sys/errno.h>
-! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(LINUX_GLIBC_2)
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-  #endif
-*** dbm/include/mcom_db.h.orig	Tue Jul 28 06:43:48 1998
---- dbm/include/mcom_db.h	Tue Aug  4 02:37:20 1998
-***************
-*** 200,206 ****
-  #define	RET_SUCCESS	 0
-  #define	RET_SPECIAL	 1
-  
-! #if defined(__386BSD__) || defined(SCO)
-  #define	__BIT_TYPES_DEFINED__
-  #endif
-  
---- 200,206 ----
-  #define	RET_SUCCESS	 0
-  #define	RET_SPECIAL	 1
-  
-! #if defined(__386BSD__) || defined(SCO) || defined(__NetBSD__)
-  #define	__BIT_TYPES_DEFINED__
-  #endif
-  
-*** js/src/prmjtime.c.orig	Tue Jul 28 06:42:20 1998
---- js/src/prmjtime.c	Tue Aug  4 02:37:17 1998
-***************
-*** 301,307 ****
-      PRInt64  maxtimet;
-      struct tm tm;
-      PRMJTime prtm;
-! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI )
-      struct tm *ptm;
-  #endif
-  
---- 301,307 ----
-      PRInt64  maxtimet;
-      struct tm tm;
-      PRMJTime prtm;
-! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI ) || defined( NETBSD )
-      struct tm *ptm;
-  #endif
-  
-***************
-*** 320,326 ****
-      }
-      LL_L2UI(local,time);
-      PRMJ_basetime(time,&prtm);
-! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI )
-      ptm = localtime(&local);
-      if(!ptm){
-        return LL_ZERO;
---- 320,326 ----
-      }
-      LL_L2UI(local,time);
-      PRMJ_basetime(time,&prtm);
-! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI ) || defined( NETBSD )
-      ptm = localtime(&local);
-      if(!ptm){
-        return LL_ZERO;
-*** modules/libreg/src/vr_stubs.h.orig	Tue Jul 28 06:43:10 1998
---- modules/libreg/src/vr_stubs.h	Tue Aug  4 02:37:21 1998
-***************
-*** 29,35 ****
-  #ifdef XP_MAC
-  #include <stat.h>
-  #else
-! #if defined(BSDI) && !defined(BSDI_2)
-  #include <sys/types.h>
-  #endif
-  #include <sys/stat.h>
---- 29,35 ----
-  #ifdef XP_MAC
-  #include <stat.h>
-  #else
-! #if (defined(BSDI) && !defined(BSDI_2)) || defined(NETBSD)
-  #include <sys/types.h>
-  #endif
-  #include <sys/stat.h>
-*** modules/schedulr/src/Makefile.orig	Tue Jul 28 06:43:18 1998
---- modules/schedulr/src/Makefile	Tue Aug  4 02:37:21 1998
-***************
-*** 17,24 ****
-  
-  DEPTH		= ../../..
-  
-! MODULE		= schedulr 
-! LIBRARY_NAME	= sched 
-  
-  REQUIRES	= nspr util
-  
---- 17,24 ----
-  
-  DEPTH		= ../../..
-  
-! MODULE		= schedulr
-! LIBRARY_NAME	= sched
-  
-  REQUIRES	= nspr util
-  
-*** network/main/mkconect.c.orig	Tue Jul 28 06:43:29 1998
---- network/main/mkconect.c	Tue Aug  4 02:37:21 1998
-***************
-*** 81,87 ****
-  
-  #include <resolv.h>
-  
-! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV)
-  #include <sys/filio.h>
-  #endif
-  
---- 81,87 ----
-  
-  #include <resolv.h>
-  
-! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(__NetBSD__)
-  #include <sys/filio.h>
-  #endif
-  
-*** network/main/mksockrw.c.orig	Tue Jul 28 06:43:29 1998
---- network/main/mksockrw.c	Tue Aug  4 02:37:21 1998
-***************
-*** 47,53 ****
-  
-  #include <resolv.h>
-  
-! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV)
-  #include <sys/filio.h>
-  #endif
-  
---- 47,53 ----
-  
-  #include <resolv.h>
-  
-! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(__NetBSD__)
-  #include <sys/filio.h>
-  #endif
-  
-*** network/main/prefetch.c.orig	Tue Jul 28 06:43:30 1998
---- network/main/prefetch.c	Tue Aug  4 02:37:21 1998
+  /*	Returns bool to indicate if its OK to prefetch the specified URL.
+  	we don't prefetch mailto:, file:, etc. 
+  */
+! MODULE_PRIVATE Bool
+  pre_OKToPrefetch(char* url)
+  {
+  	int type;
 ***************
-*** 177,183 ****
-        }
+*** 101,107 ****
+  	return FALSE;
   }
   
 ! PRIVATE void
   pre_Finished(URL_Struct* url_struct, int status, MWContext* context)
   {
   	/* this should change to update the colors of 
---- 177,183 ----
-        }
+--- 101,107 ----
+  	return FALSE;
   }
   
 ! MODULE_PRIVATE void
   pre_Finished(URL_Struct* url_struct, int status, MWContext* context)
   {
   	/* this should change to update the colors of 
-*** network/protocol/ftp/mkftp.c.orig	Tue Jul 28 06:43:31 1998
---- network/protocol/ftp/mkftp.c	Tue Aug  4 02:37:22 1998
+*** nsprpub/config/NetBSD.mk.orig	Thu Oct  8 22:24:51 1998
+--- nsprpub/config/NetBSD.mk	Mon Nov  9 01:49:34 1998
 ***************
-*** 60,66 ****
-  #endif /* XP_OS2 */
+*** 44,49 ****
+--- 44,51 ----
   
-  #ifdef XP_UNIX
-! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV)
-  #include <sys/filio.h>
-  #endif
-  #endif /* XP_UNIX */ 
---- 60,66 ----
-  #endif /* XP_OS2 */
+  ARCH			= netbsd
   
-  #ifdef XP_UNIX
-! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) || defined(__NetBSD__)
-  #include <sys/filio.h>
-  #endif
-  #endif /* XP_UNIX */ 
-*** nsprpub/pr/include/md/_netbsd.h.orig	Tue Jul 28 06:43:36 1998
---- nsprpub/pr/include/md/_netbsd.h	Tue Aug  4 11:20:59 1998
++ DLL_SUFFIX		= so.1.0
++ 
+  DSO_CFLAGS		= -fPIC
+  DSO_LDFLAGS		=
+  DSO_LDOPTS		= -Bshareable
 ***************
-*** 63,69 ****
---- 63,76 ----
-  #elif defined(__alpha__)
-  #define JB_SP_INDEX 34
-  #elif defined(__arm32__)
-+ /*
-+  * On the arm32, the jmpbuf regs underwent a namechange after NetBSD 1.3
-+  */
-+ #ifdef JMPBUF_REG_R13
-  #define JB_SP_INDEX JMPBUF_REG_R13
-+ #else
-+ #define JB_SP_INDEX _JB_REG_R13
-+ #endif
-  #else
-  #error "Need to define SP index in jmp_buf here"
-  #endif
+*** 55,60 ****
+--- 57,66 ----
+  endif
+  ifeq ($(OS_TEST),pmax)  
+  DSO_LDOPTS		= -shared
++ endif
++ 
++ ifdef LIBRUNPATH
++ DSO_LDOPTS		+= -R$(LIBRUNPATH)
+  endif
+  
+  MKSHLIB			= $(LD) $(DSO_LDOPTS)
+*** nsprpub/pr/include/md/_netbsd.h.orig	Thu Oct  8 22:25:16 1998
+--- nsprpub/pr/include/md/_netbsd.h	Sat Nov  7 20:13:58 1998
+***************
+*** 48,53 ****
+--- 48,55 ----
+  #define HAVE_DLL
+  #define USE_DLFCN
+  #define _PR_HAVE_SOCKADDR_LEN
++ #define _PR_NO_LARGE_FILES
++ #define _PR_STAT_HAS_ST_ATIMESPEC
+  
+  #define USE_SETJMP
+  
+*** cmd/xfe/Makefile.orig	Thu Oct  8 22:34:06 1998
+--- cmd/xfe/Makefile	Mon Nov  9 01:48:42 1998
+***************
+*** 749,758 ****
+  ifeq ($(OS_ARCH),NetBSD)
+  
+  # Work around linker semantics that will never find our own libutil on 1.3.x
+- ifeq ($(shell uname -r | cut -f2 -d.),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)
+--- 749,756 ----
+*** config/NetBSD.mk.orig	Thu Oct  8 22:28:25 1998
+--- config/NetBSD.mk	Mon Nov  9 01:49:13 1998
+***************
+*** 41,47 ****
+  # Don't define BSD, because it's already defined in /usr/include/sys/param.h.
+  PLATFORM_FLAGS		= -DNETBSD $(DSO_CFLAGS)
+  MOVEMAIL_FLAGS		= -DHAVE_STRERROR
+! PORT_FLAGS		= -DSW_THREADS -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_SYS_TIME_H -DNEED_UINT_T -DHAVE_BSD_FLOCK
+  PDJAVA_FLAGS		= -mx128m
+  OS_GPROF_FLAGS		= -pg
+  LD_FLAGS		= -L/usr/X11R6/lib -lXm
+--- 41,47 ----
+  # Don't define BSD, because it's already defined in /usr/include/sys/param.h.
+  PLATFORM_FLAGS		= -DNETBSD $(DSO_CFLAGS)
+  MOVEMAIL_FLAGS		= -DHAVE_STRERROR
+! PORT_FLAGS		= -DSW_THREADS -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_SYS_TIME_H -DNEED_UINT_T -DHAVE_BSD_FLOCK -DHAVE_SYSERRLIST
+  PDJAVA_FLAGS		= -mx128m
+  OS_GPROF_FLAGS		= -pg
+  LD_FLAGS		= -L/usr/X11R6/lib -lXm
+***************
+*** 101,104 ****
+--- 101,108 ----
+  DSO_LDOPTS		= -shared
+  else
+  DSO_LDOPTS		= -Bshareable
++ endif
++ 
++ ifdef LIBRUNPATH
++ DSO_LDOPTS		+= -R$(LIBRUNPATH)
+  endif
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
deleted file mode 100644
index cf7271d8ace..00000000000
--- a/www/mozilla/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$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
deleted file mode 100644
index 480cf0fc8d5..00000000000
--- a/www/mozilla/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$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
deleted file mode 100644
index 7a5c07e7037..00000000000
--- a/www/mozilla/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$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 ac96d8b24d4..cf12173a625 100644
--- a/www/mozilla/pkg/PLIST
+++ b/www/mozilla/pkg/PLIST
@@ -1,65 +1,74 @@
-@comment $NetBSD: PLIST,v 1.8 1998/09/15 16:47:10 tv Exp $
+@comment $NetBSD: PLIST,v 1.9 1998/11/09 01:25:13 fvdl Exp $
 bin/moz-export
 bin/mozilla-export
 bin/mozilla
-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.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.5.0
-lib/mozilla/libpics.so.5.0
-lib/mozilla/libplc21.so
-lib/mozilla/libplds21.so
-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
+lib/mozilla/libDtWidgets.so.1.0
+lib/mozilla/libXfeBm.so.1.0
+lib/mozilla/libXfeComboBox.so.1.0
+lib/mozilla/libXfeToolBar.so.1.0
+lib/mozilla/libXfeToolTip.so.1.0
+lib/mozilla/libXfeWidgets.so.1.0
+lib/mozilla/libXmL.so.1.0
+lib/mozilla/libabouturl.so.1.0
+lib/mozilla/libcaps.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/libgmbaseunix.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/libmailto.so.1.0
+lib/mozilla/libmarimurl.so.1.0
+lib/mozilla/libmariner.so.1.0
+lib/mozilla/libmime.so.1.0
+lib/mozilla/libmimetype.so.1.0
+lib/mozilla/libmisc.so.1.0
+lib/mozilla/libmocha.so.1.0
+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/libnspr21.so.1.0
+lib/mozilla/liboji.so.1.0
+lib/mozilla/libparse.so.1.0
+lib/mozilla/libpics.so.1.0
+lib/mozilla/libplc21.so.1.0
+lib/mozilla/libplds21.so.1.0
+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/libprivacy.so.1.0
+lib/mozilla/libpwcac.so.1.0
+lib/mozilla/libraptorbase.so.1.0
+lib/mozilla/librdf.so.1.0
+lib/mozilla/libreg.so.1.0
+lib/mozilla/libremoturl.so.1.0
+lib/mozilla/libsecfree.so.1.0
+lib/mozilla/libsmtpurl.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
 @dirrm lib/mozilla