From 960cc4414b09d2ef6c0359ac6b77d032fa4aa3fc Mon Sep 17 00:00:00 2001 From: reg Date: Mon, 22 Jan 2001 01:23:18 +0000 Subject: Add PSM support. Submitted by: nsayer Remove use of libgcc_r, since it was so uncerimoniously removed. If this doesn't work on -stable, then -stable is broken, and someone needs to fix it... Submitted by: Roman Shterenzon Use sched_getpriority_max(), instead of hard coded value. Submitted by: Peter Haight , dufault Revise pkg-comment and pkg-descr. PR: 24296 Submitted by: roam Enable SVG support, and disable C++ exceptions (since they will only slow things down). --- www/mozilla/Makefile | 12 ++++++---- www/mozilla/files/patch-an | 11 --------- www/mozilla/files/patch-ao | 10 ++++++++ www/mozilla/files/patch-ap | 58 ++++++++++++++++++++++++++++++++++++++++++++++ www/mozilla/files/patch-aq | 20 ++++++++++++++++ www/mozilla/files/patch-mi | 2 +- www/mozilla/files/patch-qt | 2 +- www/mozilla/pkg-comment | 2 +- www/mozilla/pkg-descr | 20 +++++++++++++--- www/mozilla/pkg-plist | 26 +++++++++++++++++++++ 10 files changed, 141 insertions(+), 22 deletions(-) delete mode 100644 www/mozilla/files/patch-an create mode 100644 www/mozilla/files/patch-ao create mode 100644 www/mozilla/files/patch-ap create mode 100644 www/mozilla/files/patch-aq (limited to 'www/mozilla') diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index cd8650d3b5f8..bd1332f0669e 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -8,6 +8,7 @@ PORTNAME= mozilla PORTVERSION= 0.7 PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/M/m/}/src @@ -29,6 +30,7 @@ USE_NEWGCC= yes USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --disable-cpp-exceptions \ --disable-cpp-rtti \ --disable-debug \ --disable-idltool \ @@ -36,23 +38,23 @@ CONFIGURE_ARGS= \ --disable-md \ --disable-pedantic \ --disable-xterm-updates \ - --enable-cpp-exceptions \ --enable-double-buffer \ --enable-editor \ --enable-mailnews \ --enable-mathml \ --enable-optimize \ --enable-pics \ + --enable-svg \ --enable-tests \ --enable-toolkit=gtk \ --enable-x11-shm \ - --with-pthreads \ --with-jpeg=${LOCALBASE} \ - --with-png=${LOCALBASE} -MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \ - CC_ONLY_FLAGS="${CFLAGS}" CCC_ONLY_FLAGS="${CXXFLAGS}" + --with-png=${LOCALBASE} \ + --with-pthreads +MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin post-build: + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} BUILD_MODULES=psm @${SED} -e "s;@PREFIX@;${PREFIX};g" \ ${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla @${CHMOD} 555 ${WRKSRC}/mozilla diff --git a/www/mozilla/files/patch-an b/www/mozilla/files/patch-an deleted file mode 100644 index 2904080e1e35..000000000000 --- a/www/mozilla/files/patch-an +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig Thu Dec 21 01:23:12 2000 -+++ js/src/Makefile.in Thu Dec 21 01:23:22 2000 -@@ -218,7 +218,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --LDFLAGS += -pthread -+LDFLAGS += -pthread -lgcc_r - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 diff --git a/www/mozilla/files/patch-ao b/www/mozilla/files/patch-ao new file mode 100644 index 000000000000..29a1b3ecbad7 --- /dev/null +++ b/www/mozilla/files/patch-ao @@ -0,0 +1,10 @@ +--- nsprpub/pr/src/misc/prnetdb.c.orig Wed Mar 8 08:27:18 2000 ++++ nsprpub/pr/src/misc/prnetdb.c Thu Jan 18 17:52:51 2001 +@@ -924,6 +924,7 @@ + PRStatus rv = PR_SUCCESS; + if (!_pr_initialized) _PR_ImplicitInitialization(); + ++ bzero(&(addr->inet),sizeof(addr->inet)); + addr->inet.family = AF_INET; + addr->inet.port = htons(port); + switch (val) diff --git a/www/mozilla/files/patch-ap b/www/mozilla/files/patch-ap new file mode 100644 index 000000000000..beef296a4102 --- /dev/null +++ b/www/mozilla/files/patch-ap @@ -0,0 +1,58 @@ +--- security/coreconf/config.mk.orig Thu Jan 18 21:58:30 2001 ++++ security/coreconf/config.mk Thu Jan 18 21:58:41 2001 +@@ -56,7 +56,7 @@ + # each OS release. # + ####################################################################### + +-ifeq (,$(filter-out NetBSD,$(OS_TARGET))) ++ifeq (,$(filter-out FreeBSD,$(OS_TARGET))) + include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk + else + include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk +--- security/psm/Makefile.in.orig Thu Jan 18 22:00:05 2001 ++++ security/psm/Makefile.in Thu Jan 18 22:00:19 2001 +@@ -28,7 +28,7 @@ + CORE_DEPTH=$(topsrcdir)/security + + include $(CORE_DEPTH)/coreconf/arch.mk +-ifeq (,$(filter-out NetBSD,$(OS_TARGET))) ++ifeq (,$(filter-out FreeBSD,$(OS_TARGET))) + include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk + else + include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk +--- security/psm/server/Makefile.orig Tue Dec 19 17:24:58 2000 ++++ security/psm/server/Makefile Fri Jan 19 03:49:36 2001 +@@ -37,7 +37,7 @@ + endif + + ifneq ($(OS_ARCH), WINNT) +-ifeq ($(OS_ARCH), Linux) ++ifeq ($(OS_ARCH), FreeBSD) + # On linux, we link with libstdc++ (we're always using egcs on linux, right?) + CPLUSPLUSRUNTIME = -L /usr/lib -lstdc++ -lm + else +@@ -57,11 +57,11 @@ + endif + endif + +-ifeq ($(OS_ARCH), Linux) ++ifeq ($(OS_ARCH), FreeBSD) + ifdef USE_PTHREADS + # Replace OS_LIBS, because the order of libpthread, libdl, and libc are + # very important. Otherwise you get horrible crashes. +-OS_LIBS = -lpthread -ldl -lc ++OS_LIBS = -pthread + endif + endif + +@@ -158,8 +158,8 @@ + XPCOM_LINK_LIBS = -lxpcom + XPCOM_LIBS += $(DIST)/lib/libz.$(DLL_SUFFIX) + else +-NSPR_LINK_LIBS = $(NSPR_LIBS) +-XPCOM_LINK_LIBS = $(XPCOM_LIBS) ++NSPR_LINK_LIBS = -L$(DIST)/lib -lnspr4 -lplc4 -lplds4 ++XPCOM_LINK_LIBS = -lxpcom + endif + + ifndef MOZ_DIST diff --git a/www/mozilla/files/patch-aq b/www/mozilla/files/patch-aq new file mode 100644 index 000000000000..0418737cfcf3 --- /dev/null +++ b/www/mozilla/files/patch-aq @@ -0,0 +1,20 @@ +--- nsprpub/pr/include/md/_pth.h.orig Sat Jan 20 17:28:34 2001 ++++ nsprpub/pr/include/md/_pth.h Sat Jan 20 17:29:04 2001 +@@ -183,7 +183,7 @@ + #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) + #endif /* defined(_PR_DCETHREADS) */ + +-#elif defined(LINUX) ++#elif defined(LINUX) || defined(FREEBSD) + #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER) + #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) + #elif defined(NTO) +@@ -203,7 +203,7 @@ + */ + #define PT_PRIO_MIN 1 + #define PT_PRIO_MAX 127 +-#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ ++#elif defined(NETBSD) || defined(OPENBSD) \ + || defined(BSDI) || defined(RHAPSODY) /* XXX */ + #define PT_PRIO_MIN 0 + #define PT_PRIO_MAX 126 diff --git a/www/mozilla/files/patch-mi b/www/mozilla/files/patch-mi index b9b9c146c953..dd87c2a150a5 100644 --- a/www/mozilla/files/patch-mi +++ b/www/mozilla/files/patch-mi @@ -29,7 +29,7 @@ -DEFINES += -D_THREAD_SAFE -THREAD_FLAG += -pthread +DEFINES += -D_THREAD_SAFE -D_REENTRANT -+DSO_LDOPTS += -pthread -lgcc_r ++DSO_LDOPTS += -pthread else IMPL_STRATEGY = _EMU DEFINES += -D_PR_LOCAL_THREADS_ONLY diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt index 361bf6cbdd5d..76dc15b78237 100644 --- a/www/mozilla/files/patch-qt +++ b/www/mozilla/files/patch-qt @@ -33,7 +33,7 @@ if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="" -+ _PTHREAD_LDFLAGS="-pthread -lgcc_r" ++ _PTHREAD_LDFLAGS="-pthread" else _PTHREAD_LDFLAGS="-lc_r" fi diff --git a/www/mozilla/pkg-comment b/www/mozilla/pkg-comment index 8c8d8c1f088d..72ee27d1f037 100644 --- a/www/mozilla/pkg-comment +++ b/www/mozilla/pkg-comment @@ -1 +1 @@ -The mozilla ver 0.0 communicator web-surfboard +The open source, standards compliant web browser diff --git a/www/mozilla/pkg-descr b/www/mozilla/pkg-descr index ea15c853bf80..de3c7588cc3e 100644 --- a/www/mozilla/pkg-descr +++ b/www/mozilla/pkg-descr @@ -1,3 +1,17 @@ -This is the source code that Netscape released and will be used for -its next generation of browsers. It is intended for use by developers -and testers only. +This is the open source web browser, which forms the basis for +Netscape Navigator 6. It should be fully compliant with all W3C +standards, including HTML, CSS, XML, XSL, JavaScript, MathML, +SVG and RDF. This version also supports SSL encryption, but +does not yet support Java. + +While the code is officially still in pre-release, the browser +is mostly stable, and does a good job displaying most pages on +the web. Mail and News also work, and provide some interesting +features, such as the ability to check multiple POP3 servers. + +Testers are most welcome, but should submit bug reports about +the browser itself to mozilla.org (http://bugzilla.mozilla.org/) +rather than via FreeBSD. + + +WWW: http://www.mozilla.org diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist index d8bcfede1292..324fa371997f 100644 --- a/www/mozilla/pkg-plist +++ b/www/mozilla/pkg-plist @@ -2846,6 +2846,7 @@ lib/mozilla/components/libnsprefm.so lib/mozilla/components/liboji.so lib/mozilla/components/libpref.so lib/mozilla/components/libprofile.so +lib/mozilla/components/libpsmglue.so lib/mozilla/components/librdf.so lib/mozilla/components/librdfdomds.so lib/mozilla/components/libregviewer.so @@ -2919,6 +2920,7 @@ lib/mozilla/components/prefmigr.xpt lib/mozilla/components/profile.xpt lib/mozilla/components/proxyObjInst.xpt lib/mozilla/components/proxytest.xpt +lib/mozilla/components/psmglue.xpt lib/mozilla/components/rdf.xpt lib/mozilla/components/rdfdomds.xpt lib/mozilla/components/regviewer.xpt @@ -2988,6 +2990,7 @@ lib/mozilla/htmlrobot lib/mozilla/icons/mozicon16.xpm lib/mozilla/icons/mozicon50.xpm lib/mozilla/libDebugRobot.so +lib/mozilla/libcmt.so lib/mozilla/libgkgfx.so lib/mozilla/libgtkembedmoz.so lib/mozilla/libgtksuperwin.so @@ -2997,9 +3000,11 @@ lib/mozilla/libjsj.so lib/mozilla/libmozjs.so lib/mozilla/libmsgbaseutil.so lib/mozilla/libnspr4.so +lib/mozilla/libnssckbi.so lib/mozilla/libnullplugin.so lib/mozilla/libplc4.so lib/mozilla/libplds4.so +lib/mozilla/libprotocol.so lib/mozilla/libxpcom.so lib/mozilla/libxpistub.so lib/mozilla/lots @@ -3015,6 +3020,23 @@ lib/mozilla/nsinstall lib/mozilla/plugins/libnullplugin.so lib/mozilla/pop3Test lib/mozilla/proxytests +lib/mozilla/psm +lib/mozilla/psmdata/doc/04digsgn.gif +lib/mozilla/psmdata/doc/06pcrypt.gif +lib/mozilla/psmdata/doc/bannerrn.gif +lib/mozilla/psmdata/doc/cartbanner.gif +lib/mozilla/psmdata/doc/cmcjavascriptapi.html +lib/mozilla/psmdata/doc/contents.htm +lib/mozilla/psmdata/doc/glossary.htm +lib/mozilla/psmdata/doc/help.htm +lib/mozilla/psmdata/doc/next.gif +lib/mozilla/psmdata/doc/prev.gif +lib/mozilla/psmdata/doc/psmtest.html +lib/mozilla/psmdata/doc/release_notes.html +lib/mozilla/psmdata/ui/psm_bin.properties +lib/mozilla/psmdata/ui/psm_doc.properties +lib/mozilla/psmdata/ui/psm_text.properties +lib/mozilla/psmdata/ui/psm_ui.properties lib/mozilla/rdfcat lib/mozilla/rdfpoll lib/mozilla/regExport @@ -3194,6 +3216,7 @@ lib/mozilla/searchplugins/mozilla.src lib/mozilla/sendlatertest lib/mozilla/sendpage lib/mozilla/splash.xpm +lib/mozilla/start-psm lib/mozilla/testimap lib/mozilla/testmailnews lib/mozilla/timebombgen @@ -3217,6 +3240,9 @@ lib/mozilla/xpt_link @dirrm lib/mozilla/res/entityTables @dirrm lib/mozilla/res/builtin @dirrm lib/mozilla/res +@dirrm lib/mozilla/psmdata/ui +@dirrm lib/mozilla/psmdata/doc +@dirrm lib/mozilla/psmdata @dirrm lib/mozilla/plugins @dirrm lib/mozilla/icons @dirrm lib/mozilla/dtd -- cgit