summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/mozilla/Makefile8
-rw-r--r--www/mozilla/patches/patch-ab49
-rw-r--r--www/mozilla/patches/patch-ac32
-rw-r--r--www/mozilla/patches/patch-ad17
-rw-r--r--www/mozilla/patches/patch-ae17
-rw-r--r--www/mozilla/patches/patch-af36
-rw-r--r--www/mozilla/patches/patch-ag17
-rw-r--r--www/mozilla/patches/patch-ah16
-rw-r--r--www/mozilla/patches/patch-ai35
-rw-r--r--www/mozilla/patches/patch-aj40
-rw-r--r--www/mozilla/patches/patch-ak15
11 files changed, 277 insertions, 5 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 46b596b5a24..156775045e5 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1999/01/30 23:18:54 agc Exp $
+# $NetBSD: Makefile,v 1.21 1999/02/01 11:39:45 frueauf Exp $
#
DISTNAME= mozilla-19981008
@@ -16,9 +16,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_MOTIF= yes
-CONFLICTS= mozilla-19980429 mozilla-19980603 mozilla-19980728
-
-NOT_FOR_ARCHS= mips
+CONFLICTS= mozilla-*
MOZ_OBJDIR= ${OPSYS}${OS_VERSION}_OPT.OBJ
MOZ_LIBDIR= ${PREFIX}/lib/mozilla
@@ -30,6 +28,6 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/mozilla-export ${PREFIX}/bin
${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}/bin/*.so.?.? ${MOZ_LIBDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
new file mode 100644
index 00000000000..e0acb8dde1f
--- /dev/null
+++ b/www/mozilla/patches/patch-ab
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.5 1999/02/01 11:39:46 frueauf Exp $
+
+--- nsprpub/pr/include/md/_netbsd.h-patch Fri Jan 29 16:42:39 1999
++++ nsprpub/pr/include/md/_netbsd.h Fri Jan 29 17:10:57 1999
+@@ -35,6 +35,8 @@
+ #define _PR_SI_ARCHITECTURE "sparc"
+ #elif defined(__arm32__)
+ #define _PR_SI_ARCHITECTURE "arm32"
++#elif defined(__mips__)
++#define _PR_SI_ARCHITECTURE "mips"
+ #endif
+
+ #define PR_DLL_SUFFIX ".so.1.0"
+@@ -73,6 +75,8 @@
+ #else
+ #define JB_SP_INDEX _JB_REG_R13
+ #endif
++#elif defined(__mips__)
++#define JB_SP_INDEX 32 /* XXX simonb - * 4 for bytes, this is longs */
+ #else
+ #error "Need to define SP index in jmp_buf here"
+ #endif
+@@ -83,6 +87,18 @@
+ /*
+ ** Initialize a thread context to run "_main()" when started
+ */
++#if defined(__mips__)
++#define JB_PC_INDEX 2
++#define JB_T9_INDEX 28
++#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
++{ \
++ *status = PR_TRUE; \
++ sigsetjmp(CONTEXT(_thread), 1); \
++ _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \
++ _thread->md.context[JB_PC_INDEX] = _main; \
++ _thread->md.context[JB_T9_INDEX] = _main; \
++}
++#else
+ #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
+ { \
+ *status = PR_TRUE; \
+@@ -91,6 +107,7 @@
+ } \
+ _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \
+ }
++#endif
+
+ #define _MD_SWITCH_CONTEXT(_thread) \
+ if (!sigsetjmp(CONTEXT(_thread), 1)) { \
diff --git a/www/mozilla/patches/patch-ac b/www/mozilla/patches/patch-ac
new file mode 100644
index 00000000000..9a74d8deb61
--- /dev/null
+++ b/www/mozilla/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.5 1999/02/01 11:39:47 frueauf Exp $
+
+--- nsprpub/config/NetBSD.mk-patch Fri Jan 29 16:42:39 1999
++++ nsprpub/config/NetBSD.mk Fri Jan 29 16:53:50 1999
+@@ -29,8 +29,12 @@
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPU_ARCH = x86
+ else
++ifeq ($(OS_TEST),pmax)
++CPU_ARCH = mips
++else
+ CPU_ARCH = $(OS_TEST)
+ endif
++endif
+
+ OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DNETBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+
+@@ -53,10 +57,12 @@
+ DSO_LDOPTS = -shared
+ endif
+ ifeq ($(OS_TEST),mips)
+-DSO_LDOPTS = -shared
++DSO_LDOPTS = -shared -soname $(DSO_NAME)
+ endif
+ ifeq ($(OS_TEST),pmax)
+-DSO_LDOPTS = -shared
++DSO_LDOPTS = -soname lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1 -shared -rpath /usr/X11R6/lib/mozilla
++# supposed to be so.1.0 --- temp until links working??
++DLL_SUFFIX = so.1.0
+ endif
+
+ ifdef LIBRUNPATH
diff --git a/www/mozilla/patches/patch-ad b/www/mozilla/patches/patch-ad
new file mode 100644
index 00000000000..4b767ca7d7c
--- /dev/null
+++ b/www/mozilla/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.3 1999/02/01 11:39:47 frueauf Exp $
+
+--- nsprpub/lib/ds/Makefile-patch Thu Oct 8 22:24:52 1998
++++ nsprpub/lib/ds/Makefile Fri Jan 29 16:57:36 1999
+@@ -108,6 +108,12 @@
+ $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
+ ifdef SHARED_LIBRARY
+ $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
++ifeq ($(OS_ARCH),NetBSD)
++ifeq ($(CPU_ARCH),mips)
++ (cd $(DIST)/bin;ln -s -f lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1.0 lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1)
++ (cd $(DIST)/bin;ln -s -f lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1.0 lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so)
++endif
++endif
+ endif
+ ifeq ($(MOZ_BITS),16)
+ $(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
diff --git a/www/mozilla/patches/patch-ae b/www/mozilla/patches/patch-ae
new file mode 100644
index 00000000000..8cf28ed4e28
--- /dev/null
+++ b/www/mozilla/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 1999/02/01 11:39:48 frueauf Exp $
+
+--- nsprpub/lib/libc/src/Makefile-patch Thu Oct 8 22:24:52 1998
++++ nsprpub/lib/libc/src/Makefile Fri Jan 29 16:59:36 1999
+@@ -142,6 +142,12 @@
+ $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
+ ifdef SHARED_LIBRARY
+ $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
++ifeq ($(OS_ARCH),NetBSD)
++ifeq ($(CPU_ARCH),mips)
++ (cd $(DIST)/bin;ln -s -f lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1.0 lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1)
++ (cd $(DIST)/bin;ln -s -f lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1.0 lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so)
++endif
++endif
+ endif
+ ifeq ($(MOZ_BITS),16)
+ $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
diff --git a/www/mozilla/patches/patch-af b/www/mozilla/patches/patch-af
new file mode 100644
index 00000000000..158a1fa888d
--- /dev/null
+++ b/www/mozilla/patches/patch-af
@@ -0,0 +1,36 @@
+$NetBSD: patch-af,v 1.1 1999/02/01 11:39:49 frueauf Exp $
+
+--- nsprpub/pr/include/md/_netbsd.cfg-patch Thu Oct 8 22:25:16 1998
++++ nsprpub/pr/include/md/_netbsd.cfg Fri Jan 29 17:13:29 1999
+@@ -27,11 +27,12 @@
+ #define NETBSD
+ #endif
+
+-#if defined(__i386__) || defined(__arm32__)
++#define HAVE_LONG_LONG
++
++#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
+
+ #define IS_LITTLE_ENDIAN 1
+ #undef IS_BIG_ENDIAN
+-#define HAVE_LONG_LONG
+ #undef HAVE_ALIGNED_DOUBLES
+ #undef HAVE_ALIGNED_LONGLONGS
+
+@@ -77,7 +78,6 @@
+
+ #undef IS_LITTLE_ENDIAN 1
+ #define IS_BIG_ENDIAN 1
+-#define HAVE_LONG_LONG
+ #define HAVE_ALIGNED_DOUBLES
+ #define HAVE_ALIGNED_LONGLONGS
+
+@@ -163,7 +163,7 @@
+ #define PR_BYTES_PER_WORD_LOG2 3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
+-#elif defined(__powerpc__) || defined(__m68k__)
++#elif defined(__powerpc__) || defined(__m68k__) || defined(__MIPSEB__)
+
+ #undef IS_LITTLE_ENDIAN
+ #define IS_BIG_ENDIAN 1
diff --git a/www/mozilla/patches/patch-ag b/www/mozilla/patches/patch-ag
new file mode 100644
index 00000000000..b426c69b3ae
--- /dev/null
+++ b/www/mozilla/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 1999/02/01 11:39:49 frueauf Exp $
+
+--- nsprpub/pr/src/Makefile-patch Thu Oct 8 22:25:18 1998
++++ nsprpub/pr/src/Makefile Fri Jan 29 17:15:18 1999
+@@ -354,6 +354,12 @@
+ $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
+ ifdef SHARED_LIBRARY
+ $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
++ifeq ($(OS_ARCH),NetBSD)
++ifeq ($(CPU_ARCH),mips)
++ (cd $(DIST)/bin; ln -s -f lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1.0 lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1)
++ (cd $(DIST)/bin; ln -s -f lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so.1.0 lib$(LIBRARY_NAME)$(LIBRARY_VERSION).so)
++endif
++endif
+ endif
+ ifeq ($(MOZ_BITS),16)
+ $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
diff --git a/www/mozilla/patches/patch-ah b/www/mozilla/patches/patch-ah
new file mode 100644
index 00000000000..9cb34e4677d
--- /dev/null
+++ b/www/mozilla/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 1999/02/01 11:39:50 frueauf Exp $
+
+--- cmd/xfe/Makefile-patch Fri Jan 29 16:42:39 1999
++++ cmd/xfe/Makefile Fri Jan 29 17:30:01 1999
+@@ -753,7 +753,11 @@
+ DSO_EX_LIBS = $(FOOL_GMAKE:-lutil=$(DIST)/lib/libutil.a)
+
+ ifdef LIBRUNPATH
++ifeq ($(OS_TEST),pmax)
++OS_LIBS += -Wl,-rpath,/usr/X11R6/lib,-rpath,$(LIBRUNPATH)
++else
+ OS_LIBS += -R$(LIBRUNPATH)
++endif
+ endif
+
+ OTHER_LIBS = -L/usr/X11R6/lib -lXm -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
diff --git a/www/mozilla/patches/patch-ai b/www/mozilla/patches/patch-ai
new file mode 100644
index 00000000000..33aae3b21db
--- /dev/null
+++ b/www/mozilla/patches/patch-ai
@@ -0,0 +1,35 @@
+$NetBSD: patch-ai,v 1.1 1999/02/01 11:39:51 frueauf Exp $
+
+--- config/NetBSD.mk-patch Fri Jan 29 16:42:40 1999
++++ config/NetBSD.mk Fri Jan 29 17:34:40 1999
+@@ -27,8 +27,12 @@
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPU_ARCH := x86
+ else
++ifeq ($(OS_TEST),pmax)
++CPU_ARCH := mips
++else
+ CPU_ARCH := $(OS_TEST)
+ endif
++endif
+ GFX_ARCH := x
+
+ OS_INCLUDES = -I/usr/X11R6/include
+@@ -98,7 +102,16 @@
+ # For NetBSD > 1.3, this can all be -shared.
+ #
+ ifneq (,$(filter alpha mips pmax,$(CPU_ARCH)))
+-DSO_LDOPTS = -shared
++### 1.3.3 g++ on mips loses
++ifeq ($(CPU_ARCH),mips)
++CCC = c++
++endif
++DSO_LDOPTS = -shared -soname lib$(LIBRARY_NAME).so.1
++#DSO_LDOPTS = -shared
++### temp until links working
++DLL_SUFFIX = so.1.0
++OS_LIBS =
++LD_FLAGS += -Wl,-rpath,/usr/X11R6/lib:/usr/X11R6/lib/mozilla
+ else
+ DSO_LDOPTS = -Bshareable
+ endif
diff --git a/www/mozilla/patches/patch-aj b/www/mozilla/patches/patch-aj
new file mode 100644
index 00000000000..0c4e63c022a
--- /dev/null
+++ b/www/mozilla/patches/patch-aj
@@ -0,0 +1,40 @@
+$NetBSD: patch-aj,v 1.1 1999/02/01 11:39:51 frueauf Exp $
+
+--- config/rules.mk-patch Thu Oct 8 22:28:28 1998
++++ config/rules.mk Fri Jan 29 17:38:59 1999
+@@ -112,6 +112,12 @@
+ ifeq ($(OS_ARCH),HP-UX)
+ SHARED_LIBRARY := $(LIBRARY:.a=.sl)
+ else
++ifeq ($(OS_ARCH),NetBSD)
++## HACK for mips libraries
++SHARED_LIBRARY := $(LIBRARY:.a=.so.1.0)
++## HACK for mips g++
++CCC = c++
++else
+ ifneq (,$(filter FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
+ SHARED_LIBRARY := $(LIBRARY:.a=.so.1.0)
+ else
+@@ -131,6 +137,7 @@
+ endif
+ endif
+ endif
++endif
+
+ ifdef NO_STATIC_LIB
+ LIBRARY = $(NULL)
+@@ -308,6 +315,14 @@
+ endif
+ ifdef SHARED_LIBRARY
+ $(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin
++ifeq ($(OS_ARCH),NetBSD)
++ifeq ($(CPU_ARCH),mips)
++ rm -f $(DIST)/bin/lib$(LIBRARY_NAME).so.1
++ rm -f $(DIST)/bin/lib$(LIBRARY_NAME).so
++ (cd $(DIST)/bin;ln -s lib$(LIBRARY_NAME).so.1.0 lib$(LIBRARY_NAME).so.1)
++ (cd $(DIST)/bin;ln -s lib$(LIBRARY_NAME).so.1.0 lib$(LIBRARY_NAME).so)
++endif
++endif
+ endif
+ ifdef PROGRAM
+ $(INSTALL) -m 444 $(PROGRAM) $(DIST)/bin
diff --git a/www/mozilla/patches/patch-ak b/www/mozilla/patches/patch-ak
new file mode 100644
index 00000000000..4211f2184ad
--- /dev/null
+++ b/www/mozilla/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 1999/02/01 11:39:52 frueauf Exp $
+
+--- modules/schedulr/src/Makefile-patch Thu Oct 8 22:23:43 1998
++++ modules/schedulr/src/Makefile Fri Jan 29 20:58:20 1999
+@@ -17,8 +17,8 @@
+
+ DEPTH = ../../..
+
+-MODULE = schedulr
+-LIBRARY_NAME = sched
++MODULE = schedulr
++LIBRARY_NAME = sched
+
+ REQUIRES = nspr util
+