From 7e1cc12742a398ae777fa9fa7f656efa7533e60e Mon Sep 17 00:00:00 2001 From: salo Date: Tue, 30 Nov 2004 23:29:14 +0000 Subject: Pullup ticket 139 - requested by Thomas Klausner security fixes for mozilla and firefox Module Name: pkgsrc Committed By: grant Date: Mon Oct 4 11:52:09 UTC 2004 Modified Files: pkgsrc/www/mozilla: distinfo Log Message: bring across a patch in Firefox for using thread-safe resolver library functions on NetBSD >=2.0F. --- Module Name: pkgsrc Committed By: grant Date: Mon Oct 4 11:52:45 UTC 2004 Modified Files: pkgsrc/www/mozilla/patches: patch-br Log Message: bring across a patch in Firefox for using thread-safe resolver library functions on NetBSD >=2.0F. --- Module Name: pkgsrc Committed By: sekiya Date: Mon Oct 25 13:02:15 UTC 2004 Modified Files: pkgsrc/www/mozilla: Makefile.common distinfo pkgsrc/www/mozilla/patches: patch-bt Log Message: Force gcc34 and use the right varargs macro for amd64. Mozilla (and its derivatives) now appears to work properly on amd64. Patches from Nicholas Joly. --- Module Name: pkgsrc Committed By: jmmv Date: Mon Oct 25 18:06:26 UTC 2004 Modified Files: pkgsrc/www/mozilla: Makefile Makefile.common PLIST pkgsrc/www/mozilla-gtk2: Makefile PLIST pkgsrc/www/mozilla/files: moz-install Log Message: Modify mozilla and mozilla-gtk2 to install several additional headers. More specifically, this lets Mozilla NSS be used by other programs. Also make the pkgconfig substitutions happen at post-build time, so that the right rpaths are added to the mozilla-nspr.pc file (which is filled in during the build). Bump PKGREVISION to 1 for both packages. Ok'ed by taya@, the maintainer. --- Module Name: pkgsrc Committed By: wiz Date: Fri Nov 12 02:11:22 UTC 2004 Modified Files: pkgsrc/www/mozilla: Makefile distinfo pkgsrc/www/mozilla-gtk2: Makefile Added Files: pkgsrc/www/mozilla/patches: patch-bj Log Message: Update mozilla and mozilla-gtk2 to 1.7.3nb2 with a security fix from mozilla CVS. --- Module Name: pkgsrc Committed By: kristerw Date: Mon Nov 1 18:07:24 UTC 2004 Modified Files: pkgsrc/www/firefox: distinfo pkgsrc/www/firefox/patches: patch-bt Log Message: Use __va_copy instead of va_copy for NetBSD. This is needed on gcc 3.4 since the build use -ansi that in turn makes gcc 3.4 modify its predefined symbols in such a way that va_copy is not defined. --- Module Name: pkgsrc Committed By: xtraeme Date: Tue Nov 9 20:10:14 UTC 2004 Modified Files: pkgsrc/www/firefox: Makefile-firefox.common PLIST distinfo pkgsrc/www/firefox-gtk2: PLIST Log Message: Update firefox and firefox-gtk2 to 1.0. This is a bugfix release, to fix the problems reported in Preview Releases, etc. --- Module Name: pkgsrc Committed By: taya Date: Wed Nov 10 14:38:45 UTC 2004 Modified Files: pkgsrc/www/firefox: Makefile-firefox.common PLIST Log Message: - correct path of mirror site - add some missing files to PLIST --- Module Name: pkgsrc Committed By: taya Date: Wed Nov 10 14:40:24 UTC 2004 Modified Files: pkgsrc/www/firefox-gtk2: PLIST Log Message: add some missing files to PLIST --- Module Name: pkgsrc Committed By: taya Date: Sat Nov 13 07:03:08 UTC 2004 Modified Files: pkgsrc/www/firefox: Makefile-firefox.common PLIST Log Message: remove typeahead extension that confilicts with buildin typeahead component. fix pkg/28164. bump PKGREVISION --- Module Name: pkgsrc Committed By: taya Date: Sat Nov 13 08:57:54 UTC 2004 Modified Files: pkgsrc/www/firefox-gtk2: PLIST Log Message: remove typeahead extension --- www/firefox-gtk2/PLIST | 24 ++-- www/firefox/Makefile-firefox.common | 17 +-- www/firefox/PLIST | 19 +-- www/firefox/distinfo | 8 +- www/firefox/patches/patch-bt | 4 +- www/mozilla-gtk2/Makefile | 3 +- www/mozilla-gtk2/PLIST | 249 +++++++++++++++++++++++++++++++++++- www/mozilla/Makefile | 3 +- www/mozilla/Makefile.common | 23 +++- www/mozilla/PLIST | 249 +++++++++++++++++++++++++++++++++++- www/mozilla/distinfo | 7 +- www/mozilla/files/moz-install | 8 +- www/mozilla/patches/patch-bj | 24 ++++ www/mozilla/patches/patch-br | 18 ++- www/mozilla/patches/patch-bt | 4 +- 15 files changed, 601 insertions(+), 59 deletions(-) create mode 100644 www/mozilla/patches/patch-bj diff --git a/www/firefox-gtk2/PLIST b/www/firefox-gtk2/PLIST index 04d8765e768..0ccd20a0ec3 100644 --- a/www/firefox-gtk2/PLIST +++ b/www/firefox-gtk2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/09/20 08:03:42 taya Exp $ +@comment $NetBSD: PLIST,v 1.7.2.1 2004/11/30 23:29:15 salo Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -63,7 +63,6 @@ lib/${MOZILLA}/components/libsystem-pref.${SO_SUFFIX} lib/${MOZILLA}/components/libtoolkitcomps.${SO_SUFFIX} lib/${MOZILLA}/components/libtransformiix.${SO_SUFFIX} lib/${MOZILLA}/components/libtxmgr.${SO_SUFFIX} -lib/${MOZILLA}/components/libtypeaheadfind.${SO_SUFFIX} lib/${MOZILLA}/components/libuconv.${SO_SUFFIX} lib/${MOZILLA}/components/libucvmath.${SO_SUFFIX} lib/${MOZILLA}/components/libuniversalchardet.${SO_SUFFIX} @@ -106,7 +105,7 @@ ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX} lib/${MOZILLA}/LICENSE lib/${MOZILLA}/README.txt lib/${MOZILLA}/bloaturls.txt -lib/${MOZILLA}/chrome/US.jar +lib/${MOZILLA}/browserconfig.properties lib/${MOZILLA}/chrome/browser.jar lib/${MOZILLA}/chrome/chromelist.txt lib/${MOZILLA}/chrome/classic.jar @@ -122,7 +121,6 @@ lib/${MOZILLA}/chrome/modern.jar lib/${MOZILLA}/chrome/pipnss.jar lib/${MOZILLA}/chrome/pippki.jar lib/${MOZILLA}/chrome/toolkit.jar -lib/${MOZILLA}/chrome/venkman.jar lib/${MOZILLA}/components/accessibility-atk.xpt lib/${MOZILLA}/components/accessibility.xpt lib/${MOZILLA}/components/appshell.xpt @@ -242,12 +240,10 @@ lib/${MOZILLA}/components/spellchecker.xpt lib/${MOZILLA}/components/toolkitprofile.xpt lib/${MOZILLA}/components/txmgr.xpt lib/${MOZILLA}/components/txtsvc.xpt -lib/${MOZILLA}/components/typeaheadfind.xpt lib/${MOZILLA}/components/uconv.xpt lib/${MOZILLA}/components/unicharutil.xpt lib/${MOZILLA}/components/update.xpt lib/${MOZILLA}/components/uriloader.xpt -lib/${MOZILLA}/components/venkman-service.js lib/${MOZILLA}/components/wallet.xpt lib/${MOZILLA}/components/walleteditor.xpt lib/${MOZILLA}/components/walletpreview.xpt @@ -274,6 +270,7 @@ lib/${MOZILLA}/components/xuldoc.xpt lib/${MOZILLA}/components/xultmpl.xpt lib/${MOZILLA}/defaults/autoconfig/platform.js lib/${MOZILLA}/defaults/autoconfig/prefcalls.js +lib/${MOZILLA}/defaults/pref/firefox-l10n.js lib/${MOZILLA}/defaults/pref/firefox.js lib/${MOZILLA}/defaults/pref/inspector.js lib/${MOZILLA}/defaults/profile/bookmarks.html @@ -293,9 +290,6 @@ lib/${MOZILLA}/defaults/wallet/SchemaConcat.tbl lib/${MOZILLA}/defaults/wallet/SchemaStrings.tbl lib/${MOZILLA}/defaults/wallet/StateSchema.tbl lib/${MOZILLA}/defaults/wallet/VcardSchema.tbl -lib/${MOZILLA}/extensions/Extensions.rdf -lib/${MOZILLA}/extensions/installed-extensions-processed.txt -lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf lib/${MOZILLA}/greprefs/all.js lib/${MOZILLA}/greprefs/non-shared.txt lib/${MOZILLA}/greprefs/security-prefs.js @@ -468,6 +462,8 @@ lib/${MOZILLA}/res/viewer.properties lib/${MOZILLA}/res/viewsource.css lib/${MOZILLA}/searchplugins/amazondotcom.png lib/${MOZILLA}/searchplugins/amazondotcom.src +lib/${MOZILLA}/searchplugins/creativecommons.png +lib/${MOZILLA}/searchplugins/creativecommons.src lib/${MOZILLA}/searchplugins/dictionary.png lib/${MOZILLA}/searchplugins/dictionary.src lib/${MOZILLA}/searchplugins/eBay.gif @@ -540,7 +536,9 @@ include/${MOZILLA}/browser/nsIBrowserInstance.h include/${MOZILLA}/browser/nsIXULBrowserWindow.h include/${MOZILLA}/browsercomps/nsBrowserCompsCID.h include/${MOZILLA}/caps/nsIPrincipal.h +include/${MOZILLA}/caps/nsIPrincipalObsolete.h include/${MOZILLA}/caps/nsIScriptSecurityManager.h +include/${MOZILLA}/caps/nsIScriptSecurityManagerObsolete.h include/${MOZILLA}/caps/nsISecurityCheckedComponent.h include/${MOZILLA}/caps/nsISignatureVerifier.h include/${MOZILLA}/caps/nsJSPrincipals.h @@ -744,6 +742,7 @@ include/${MOZILLA}/dom/nsDOMCID.h include/${MOZILLA}/dom/nsDOMError.h include/${MOZILLA}/dom/nsDOMString.h include/${MOZILLA}/dom/nsIBaseDOMException.h +include/${MOZILLA}/dom/nsIBrowserDOMWindow.h include/${MOZILLA}/dom/nsIDOM3Document.h include/${MOZILLA}/dom/nsIDOM3DocumentEvent.h include/${MOZILLA}/dom/nsIDOM3EventTarget.h @@ -942,6 +941,7 @@ include/${MOZILLA}/dom/nsIDOMWindow.h include/${MOZILLA}/dom/nsIDOMWindow2.h include/${MOZILLA}/dom/nsIDOMWindowCollection.h include/${MOZILLA}/dom/nsIDOMWindowInternal.h +include/${MOZILLA}/dom/nsIDOMWindowUtils.h include/${MOZILLA}/dom/nsIDOMXMLDocument.h include/${MOZILLA}/dom/nsIDOMXPathEvaluator.h include/${MOZILLA}/dom/nsIDOMXPathException.h @@ -1085,6 +1085,7 @@ include/${MOZILLA}/htmlparser/nsIParserNode.h include/${MOZILLA}/htmlparser/nsIParserService.h include/${MOZILLA}/htmlparser/nsITokenizer.h include/${MOZILLA}/htmlparser/nsParserCIID.h +include/${MOZILLA}/htmlparser/nsParserDataListener.h include/${MOZILLA}/htmlparser/nsParserError.h include/${MOZILLA}/htmlparser/nsScannerString.h include/${MOZILLA}/htmlparser/nsToken.h @@ -1446,6 +1447,7 @@ include/${MOZILLA}/necko/nsIURI.h include/${MOZILLA}/necko/nsIURIChecker.h include/${MOZILLA}/necko/nsIURL.h include/${MOZILLA}/necko/nsIURLParser.h +include/${MOZILLA}/necko/nsIUnicharStreamListener.h include/${MOZILLA}/necko/nsIUnicharStreamLoader.h include/${MOZILLA}/necko/nsIUploadChannel.h include/${MOZILLA}/necko/nsNetCID.h @@ -1798,7 +1800,6 @@ include/${MOZILLA}/txtsvc/nsITextService.h include/${MOZILLA}/txtsvc/nsITextServicesDocument.h include/${MOZILLA}/txtsvc/nsITextServicesFilter.h include/${MOZILLA}/txtsvc/nsTextServicesCID.h -include/${MOZILLA}/typeaheadfind/nsITypeAheadFind.h include/${MOZILLA}/uconv/nsEncoderDecoderUtils.h include/${MOZILLA}/uconv/nsICharRepresentable.h include/${MOZILLA}/uconv/nsICharsetAlias.h @@ -2266,8 +2267,6 @@ include/${MOZILLA}/zlib/zlib.h @dirrm lib/${MOZILLA}/init.d @dirrm lib/${MOZILLA}/icons @dirrm lib/${MOZILLA}/greprefs -@dirrm lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -@dirrm lib/${MOZILLA}/extensions @dirrm lib/${MOZILLA}/defaults/wallet @dirrm lib/${MOZILLA}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} @dirrm lib/${MOZILLA}/defaults/profile/extensions @@ -2318,7 +2317,6 @@ include/${MOZILLA}/zlib/zlib.h @dirrm include/${MOZILLA}/ucvibm @dirrm include/${MOZILLA}/ucvcn @dirrm include/${MOZILLA}/uconv -@dirrm include/${MOZILLA}/typeaheadfind @dirrm include/${MOZILLA}/txtsvc @dirrm include/${MOZILLA}/txmgr @dirrm include/${MOZILLA}/toolkitcomps diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common index 0f3dee37e41..b4a23eebd6c 100644 --- a/www/firefox/Makefile-firefox.common +++ b/www/firefox/Makefile-firefox.common @@ -1,16 +1,17 @@ -# $NetBSD: Makefile-firefox.common,v 1.3.2.1 2004/10/26 11:09:16 agc Exp $ +# $NetBSD: Makefile-firefox.common,v 1.3.2.2 2004/11/30 23:29:15 salo Exp $ MOZILLA_BIN= firefox-bin -MOZ_VER= 0.10.1 +MOZ_VER= 1.0 +PKGREVISION= 1 EXTRACT_SUFX= .tar.bz2 -DISTNAME= firefox-1.0PR-source +DISTNAME= firefox-${MOZ_VER}-source DIST_SUBDIR= firefox-${MOZ_VER} -MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \ - ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \ - http://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/ \ - ftp://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/ +MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/source/ \ + ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/source/ \ + http://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/source/ \ + ftp://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/source/ HOMEPAGE= http://www.mozilla.org/projects/firefox/ @@ -23,7 +24,7 @@ MAKE_ENV+= MOZ_PHOENIX=1 CONFIGURE_ARGS+= --disable-mailnews CONFIGURE_ARGS+= --disable-composer CONFIGURE_ARGS+= --enable-single-profile -CONFIGURE_ARGS+= --enable-extensions=default,-irc +CONFIGURE_ARGS+= --enable-extensions=default,-irc,-typeaheadfind USE_LANGUAGES+= c++ BUILD_MATHML= # defined diff --git a/www/firefox/PLIST b/www/firefox/PLIST index 9f7be850f72..d62d99fc393 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/09/20 08:03:42 taya Exp $ +@comment $NetBSD: PLIST,v 1.7.2.1 2004/11/30 23:29:15 salo Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -62,7 +62,6 @@ lib/${MOZILLA}/components/libspellchecker.${SO_SUFFIX} lib/${MOZILLA}/components/libtoolkitcomps.${SO_SUFFIX} lib/${MOZILLA}/components/libtransformiix.${SO_SUFFIX} lib/${MOZILLA}/components/libtxmgr.${SO_SUFFIX} -lib/${MOZILLA}/components/libtypeaheadfind.${SO_SUFFIX} lib/${MOZILLA}/components/libuconv.${SO_SUFFIX} lib/${MOZILLA}/components/libucvmath.${SO_SUFFIX} lib/${MOZILLA}/components/libuniversalchardet.${SO_SUFFIX} @@ -106,7 +105,7 @@ ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX} lib/${MOZILLA}/LICENSE lib/${MOZILLA}/README.txt lib/${MOZILLA}/bloaturls.txt -lib/${MOZILLA}/chrome/US.jar +lib/${MOZILLA}/browserconfig.properties lib/${MOZILLA}/chrome/browser.jar lib/${MOZILLA}/chrome/chromelist.txt lib/${MOZILLA}/chrome/classic.jar @@ -121,7 +120,6 @@ lib/${MOZILLA}/chrome/modern.jar lib/${MOZILLA}/chrome/pipnss.jar lib/${MOZILLA}/chrome/pippki.jar lib/${MOZILLA}/chrome/toolkit.jar -lib/${MOZILLA}/chrome/venkman.jar lib/${MOZILLA}/components/accessibility.xpt lib/${MOZILLA}/components/appshell.xpt lib/${MOZILLA}/components/autocomplete.xpt @@ -239,12 +237,10 @@ lib/${MOZILLA}/components/spellchecker.xpt lib/${MOZILLA}/components/toolkitprofile.xpt lib/${MOZILLA}/components/txmgr.xpt lib/${MOZILLA}/components/txtsvc.xpt -lib/${MOZILLA}/components/typeaheadfind.xpt lib/${MOZILLA}/components/uconv.xpt lib/${MOZILLA}/components/unicharutil.xpt lib/${MOZILLA}/components/update.xpt lib/${MOZILLA}/components/uriloader.xpt -lib/${MOZILLA}/components/venkman-service.js lib/${MOZILLA}/components/wallet.xpt lib/${MOZILLA}/components/walleteditor.xpt lib/${MOZILLA}/components/walletpreview.xpt @@ -271,6 +267,7 @@ lib/${MOZILLA}/components/xuldoc.xpt lib/${MOZILLA}/components/xultmpl.xpt lib/${MOZILLA}/defaults/autoconfig/platform.js lib/${MOZILLA}/defaults/autoconfig/prefcalls.js +lib/${MOZILLA}/defaults/pref/firefox-l10n.js lib/${MOZILLA}/defaults/pref/firefox.js lib/${MOZILLA}/defaults/pref/inspector.js lib/${MOZILLA}/defaults/profile/bookmarks.html @@ -461,6 +458,8 @@ lib/${MOZILLA}/res/viewer.properties lib/${MOZILLA}/res/viewsource.css lib/${MOZILLA}/searchplugins/amazondotcom.png lib/${MOZILLA}/searchplugins/amazondotcom.src +lib/${MOZILLA}/searchplugins/creativecommons.png +lib/${MOZILLA}/searchplugins/creativecommons.src lib/${MOZILLA}/searchplugins/dictionary.png lib/${MOZILLA}/searchplugins/dictionary.src lib/${MOZILLA}/searchplugins/eBay.gif @@ -525,7 +524,9 @@ include/${MOZILLA}/browser/nsIBrowserInstance.h include/${MOZILLA}/browser/nsIXULBrowserWindow.h include/${MOZILLA}/browsercomps/nsBrowserCompsCID.h include/${MOZILLA}/caps/nsIPrincipal.h +include/${MOZILLA}/caps/nsIPrincipalObsolete.h include/${MOZILLA}/caps/nsIScriptSecurityManager.h +include/${MOZILLA}/caps/nsIScriptSecurityManagerObsolete.h include/${MOZILLA}/caps/nsISecurityCheckedComponent.h include/${MOZILLA}/caps/nsISignatureVerifier.h include/${MOZILLA}/caps/nsJSPrincipals.h @@ -729,6 +730,7 @@ include/${MOZILLA}/dom/nsDOMCID.h include/${MOZILLA}/dom/nsDOMError.h include/${MOZILLA}/dom/nsDOMString.h include/${MOZILLA}/dom/nsIBaseDOMException.h +include/${MOZILLA}/dom/nsIBrowserDOMWindow.h include/${MOZILLA}/dom/nsIDOM3Document.h include/${MOZILLA}/dom/nsIDOM3DocumentEvent.h include/${MOZILLA}/dom/nsIDOM3EventTarget.h @@ -927,6 +929,7 @@ include/${MOZILLA}/dom/nsIDOMWindow.h include/${MOZILLA}/dom/nsIDOMWindow2.h include/${MOZILLA}/dom/nsIDOMWindowCollection.h include/${MOZILLA}/dom/nsIDOMWindowInternal.h +include/${MOZILLA}/dom/nsIDOMWindowUtils.h include/${MOZILLA}/dom/nsIDOMXMLDocument.h include/${MOZILLA}/dom/nsIDOMXPathEvaluator.h include/${MOZILLA}/dom/nsIDOMXPathException.h @@ -1070,6 +1073,7 @@ include/${MOZILLA}/htmlparser/nsIParserNode.h include/${MOZILLA}/htmlparser/nsIParserService.h include/${MOZILLA}/htmlparser/nsITokenizer.h include/${MOZILLA}/htmlparser/nsParserCIID.h +include/${MOZILLA}/htmlparser/nsParserDataListener.h include/${MOZILLA}/htmlparser/nsParserError.h include/${MOZILLA}/htmlparser/nsScannerString.h include/${MOZILLA}/htmlparser/nsToken.h @@ -1429,6 +1433,7 @@ include/${MOZILLA}/necko/nsIURI.h include/${MOZILLA}/necko/nsIURIChecker.h include/${MOZILLA}/necko/nsIURL.h include/${MOZILLA}/necko/nsIURLParser.h +include/${MOZILLA}/necko/nsIUnicharStreamListener.h include/${MOZILLA}/necko/nsIUnicharStreamLoader.h include/${MOZILLA}/necko/nsIUploadChannel.h include/${MOZILLA}/necko/nsNetCID.h @@ -1779,7 +1784,6 @@ include/${MOZILLA}/txtsvc/nsITextService.h include/${MOZILLA}/txtsvc/nsITextServicesDocument.h include/${MOZILLA}/txtsvc/nsITextServicesFilter.h include/${MOZILLA}/txtsvc/nsTextServicesCID.h -include/${MOZILLA}/typeaheadfind/nsITypeAheadFind.h include/${MOZILLA}/uconv/nsEncoderDecoderUtils.h include/${MOZILLA}/uconv/nsICharRepresentable.h include/${MOZILLA}/uconv/nsICharsetAlias.h @@ -2296,7 +2300,6 @@ include/${MOZILLA}/zlib/zlib.h @dirrm include/${MOZILLA}/ucvibm @dirrm include/${MOZILLA}/ucvcn @dirrm include/${MOZILLA}/uconv -@dirrm include/${MOZILLA}/typeaheadfind @dirrm include/${MOZILLA}/txtsvc @dirrm include/${MOZILLA}/txmgr @dirrm include/${MOZILLA}/toolkitcomps diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 42f753b0cca..3f6e29feeb4 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.16.2.1 2004/10/26 11:09:16 agc Exp $ +$NetBSD: distinfo,v 1.16.2.2 2004/11/30 23:29:15 salo Exp $ -SHA1 (firefox-0.10.1/firefox-1.0PR-source.tar.bz2) = e12f861c8e55fe591053f30e9c9259fa8e662c41 -Size (firefox-0.10.1/firefox-1.0PR-source.tar.bz2) = 32380173 bytes +SHA1 (firefox-1.0/firefox-1.0-source.tar.bz2) = a115c28f53d093da7832f6b80c982acb5b469f83 +Size (firefox-1.0/firefox-1.0-source.tar.bz2) = 32686249 bytes SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9 SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369 SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642 @@ -25,7 +25,7 @@ SHA1 (patch-bo) = 357c4cacdc179191d6fe263b4eb62cc56b7ec25f SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae SHA1 (patch-br) = 6311da23ec126fe0959cb19502a22c106f8f975c SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb -SHA1 (patch-bt) = 8ee09dd2acbbc0c002283b15eafbafb4f324948a +SHA1 (patch-bt) = 6e3ceb31866dfb0dba81c93446db2b21e1df9baa SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860 SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8 diff --git a/www/firefox/patches/patch-bt b/www/firefox/patches/patch-bt index 5c828e99f52..ff0a5783d65 100644 --- a/www/firefox/patches/patch-bt +++ b/www/firefox/patches/patch-bt @@ -1,4 +1,4 @@ -$NetBSD: patch-bt,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-bt,v 1.2.2.1 2004/11/30 23:29:15 salo Exp $ diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c --- ../Orig/mozilla/nsprpub/pr/src/io/prprf.c 2004-03-09 12:18:19.000000000 +0900 @@ -11,7 +11,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c + (defined(__amd64__) || \ + (defined(__powerpc__) && __NetBSD_Version__ >= 105000000))) +#include -+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar)) ++#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) #elif (defined(LINUX) && defined(__powerpc__)) || \ (defined(LINUX) && defined(__s390__)) || \ (defined(LINUX) && defined(__s390x__)) || \ diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile index 8b0e1ba5b22..45155aa5fa4 100644 --- a/www/mozilla-gtk2/Makefile +++ b/www/mozilla-gtk2/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2004/09/17 14:01:45 taya Exp $ +# $NetBSD: Makefile,v 1.12.2.1 2004/11/30 23:29:15 salo Exp $ +PKGREVISION= 2 MOZILLA= mozilla-gtk2 MOZILLA_BIN= mozilla-bin MOZ_VER= 1.7.3 diff --git a/www/mozilla-gtk2/PLIST b/www/mozilla-gtk2/PLIST index 1f481d38d4e..067dabac940 100644 --- a/www/mozilla-gtk2/PLIST +++ b/www/mozilla-gtk2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2004/06/21 14:15:12 taya Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2004/11/30 23:29:15 salo Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -2808,6 +2808,245 @@ include/${MOZILLA}/xultmpl/nsIXULTemplateBuilder.h include/${MOZILLA}/zlib/zconf.h include/${MOZILLA}/zlib/zlib.h @comment end INCLUDE +@comment begin INCLUDE-PUBLIC +include/${MOZILLA}/ldap/ldap-standard.h +include/${MOZILLA}/ldap/disptmpl.h +include/${MOZILLA}/ldap/lber.h +include/${MOZILLA}/ldap/ldap.h +include/${MOZILLA}/ldap/ldap-extension.h +include/${MOZILLA}/ldap/ldap-platform.h +include/${MOZILLA}/ldap/ldap-to-be-deprecated.h +include/${MOZILLA}/ldap/ldap-deprecated.h +include/${MOZILLA}/ldap/ldap_ssl.h +include/${MOZILLA}/ldap/ldappr.h +include/${MOZILLA}/ldap/iutil.h +include/${MOZILLA}/ldap/srchpref.h +include/${MOZILLA}/ldap-private/ldap-int.h +include/${MOZILLA}/ldap-private/lber-int.h +include/${MOZILLA}/ldap-private/portable.h +include/${MOZILLA}/ldap-private/ldaprot.h +include/${MOZILLA}/ldap-private/ldaplog.h +include/${MOZILLA}/ldap-nspr/obsolete/pralarm.h +include/${MOZILLA}/ldap-nspr/obsolete/probslet.h +include/${MOZILLA}/ldap-nspr/obsolete/protypes.h +include/${MOZILLA}/ldap-nspr/obsolete/prsem.h +include/${MOZILLA}/ldap-nspr/private/pprio.h +include/${MOZILLA}/ldap-nspr/private/pprthred.h +include/${MOZILLA}/ldap-nspr/private/prpriv.h +include/${MOZILLA}/ldap-nspr/md/sunos4.h +include/${MOZILLA}/ldap-nspr/md/_aix64.cfg +include/${MOZILLA}/ldap-nspr/md/_beos.cfg +include/${MOZILLA}/ldap-nspr/md/_bsdi.cfg +include/${MOZILLA}/ldap-nspr/md/_darwin.cfg +include/${MOZILLA}/ldap-nspr/md/_dgux.cfg +include/${MOZILLA}/ldap-nspr/md/_freebsd.cfg +include/${MOZILLA}/ldap-nspr/md/_hpux32.cfg +include/${MOZILLA}/ldap-nspr/md/_hpux64.cfg +include/${MOZILLA}/ldap-nspr/md/_irix32.cfg +include/${MOZILLA}/ldap-nspr/md/_irix64.cfg +include/${MOZILLA}/ldap-nspr/md/_linux.cfg +include/${MOZILLA}/ldap-nspr/md/_ncr.cfg +include/${MOZILLA}/ldap-nspr/md/_nec.cfg +include/${MOZILLA}/ldap-nspr/md/_netbsd.cfg +include/${MOZILLA}/ldap-nspr/md/_nextstep.cfg +include/${MOZILLA}/ldap-nspr/md/_nto.cfg +include/${MOZILLA}/ldap-nspr/md/_openbsd.cfg +include/${MOZILLA}/ldap-nspr/md/_openvms.cfg +include/${MOZILLA}/ldap-nspr/md/_os2.cfg +include/${MOZILLA}/ldap-nspr/md/_osf1.cfg +include/${MOZILLA}/ldap-nspr/md/_qnx.cfg +include/${MOZILLA}/ldap-nspr/md/_reliantunix.cfg +include/${MOZILLA}/ldap-nspr/md/_rhapsody.cfg +include/${MOZILLA}/ldap-nspr/md/_scoos.cfg +include/${MOZILLA}/ldap-nspr/md/_solaris32.cfg +include/${MOZILLA}/ldap-nspr/md/_solaris64.cfg +include/${MOZILLA}/ldap-nspr/md/_sony.cfg +include/${MOZILLA}/ldap-nspr/md/_sunos4.cfg +include/${MOZILLA}/ldap-nspr/md/_unixware.cfg +include/${MOZILLA}/ldap-nspr/md/_unixware7.cfg +include/${MOZILLA}/ldap-nspr/md/_win16.cfg +include/${MOZILLA}/ldap-nspr/md/_win95.cfg +include/${MOZILLA}/ldap-nspr/md/_winnt.cfg +include/${MOZILLA}/ldap-nspr/md/_aix.h +include/${MOZILLA}/ldap-nspr/md/_beos.h +include/${MOZILLA}/ldap-nspr/md/_bsdi.h +include/${MOZILLA}/ldap-nspr/md/_darwin.h +include/${MOZILLA}/ldap-nspr/md/_dgux.h +include/${MOZILLA}/ldap-nspr/md/_freebsd.h +include/${MOZILLA}/ldap-nspr/md/_hpux.h +include/${MOZILLA}/ldap-nspr/md/_irix.h +include/${MOZILLA}/ldap-nspr/md/_linux.h +include/${MOZILLA}/ldap-nspr/md/_macos.h +include/${MOZILLA}/ldap-nspr/md/_ncr.h +include/${MOZILLA}/ldap-nspr/md/_nec.h +include/${MOZILLA}/ldap-nspr/md/_netbsd.h +include/${MOZILLA}/ldap-nspr/md/_nextstep.h +include/${MOZILLA}/ldap-nspr/md/_nspr_pthread.h +include/${MOZILLA}/ldap-nspr/md/_nto.h +include/${MOZILLA}/ldap-nspr/md/_openbsd.h +include/${MOZILLA}/ldap-nspr/md/_openvms.h +include/${MOZILLA}/ldap-nspr/md/_os2.h +include/${MOZILLA}/ldap-nspr/md/_os2_errors.h +include/${MOZILLA}/ldap-nspr/md/_osf1.h +include/${MOZILLA}/ldap-nspr/md/_pcos.h +include/${MOZILLA}/ldap-nspr/md/_pth.h +include/${MOZILLA}/ldap-nspr/md/_qnx.h +include/${MOZILLA}/ldap-nspr/md/_reliantunix.h +include/${MOZILLA}/ldap-nspr/md/_rhapsody.h +include/${MOZILLA}/ldap-nspr/md/_scoos.h +include/${MOZILLA}/ldap-nspr/md/_solaris.h +include/${MOZILLA}/ldap-nspr/md/_sony.h +include/${MOZILLA}/ldap-nspr/md/_sunos4.h +include/${MOZILLA}/ldap-nspr/md/_unix_errors.h +include/${MOZILLA}/ldap-nspr/md/_unixos.h +include/${MOZILLA}/ldap-nspr/md/_unixware.h +include/${MOZILLA}/ldap-nspr/md/_win16.h +include/${MOZILLA}/ldap-nspr/md/_win32_errors.h +include/${MOZILLA}/ldap-nspr/md/_win95.h +include/${MOZILLA}/ldap-nspr/md/_winnt.h +include/${MOZILLA}/ldap-nspr/md/prosdep.h +include/${MOZILLA}/ldap-nspr/md/_aix32.cfg +include/${MOZILLA}/ldap-nspr/prtrace.h +include/${MOZILLA}/ldap-nspr/prtpool.h +include/${MOZILLA}/ldap-nspr/prtime.h +include/${MOZILLA}/ldap-nspr/prthread.h +include/${MOZILLA}/ldap-nspr/prsystem.h +include/${MOZILLA}/ldap-nspr/prshma.h +include/${MOZILLA}/ldap-nspr/prshm.h +include/${MOZILLA}/ldap-nspr/prrwlock.h +include/${MOZILLA}/ldap-nspr/prrng.h +include/${MOZILLA}/ldap-nspr/prproces.h +include/${MOZILLA}/ldap-nspr/prprf.h +include/${MOZILLA}/ldap-nspr/prpdce.h +include/${MOZILLA}/ldap-nspr/prolock.h +include/${MOZILLA}/ldap-nspr/prnetdb.h +include/${MOZILLA}/ldap-nspr/prmwait.h +include/${MOZILLA}/ldap-nspr/prmon.h +include/${MOZILLA}/ldap-nspr/prmem.h +include/${MOZILLA}/ldap-nspr/prlong.h +include/${MOZILLA}/ldap-nspr/prlog.h +include/${MOZILLA}/ldap-nspr/prlock.h +include/${MOZILLA}/ldap-nspr/prlink.h +include/${MOZILLA}/ldap-nspr/pripcsem.h +include/${MOZILLA}/ldap-nspr/prio.h +include/${MOZILLA}/ldap-nspr/prinrval.h +include/${MOZILLA}/ldap-nspr/prinit.h +include/${MOZILLA}/ldap-nspr/prinet.h +include/${MOZILLA}/ldap-nspr/prerror.h +include/${MOZILLA}/ldap-nspr/prerr.h +include/${MOZILLA}/ldap-nspr/prenv.h +include/${MOZILLA}/ldap-nspr/prdtoa.h +include/${MOZILLA}/ldap-nspr/prcvar.h +include/${MOZILLA}/ldap-nspr/prcpucfg.h +include/${MOZILLA}/ldap-nspr/prcountr.h +include/${MOZILLA}/ldap-nspr/prcmon.h +include/${MOZILLA}/ldap-nspr/prclist.h +include/${MOZILLA}/ldap-nspr/prbit.h +include/${MOZILLA}/ldap-nspr/pratom.h +include/${MOZILLA}/ldap-nspr/plstr.h +include/${MOZILLA}/ldap-nspr/plresolv.h +include/${MOZILLA}/ldap-nspr/plhash.h +include/${MOZILLA}/ldap-nspr/plgetopt.h +include/${MOZILLA}/ldap-nspr/prwin16.h +include/${MOZILLA}/ldap-nspr/plbase64.h +include/${MOZILLA}/ldap-nspr/plarenas.h +include/${MOZILLA}/ldap-nspr/plarena.h +include/${MOZILLA}/ldap-nspr/nspr.h +include/${MOZILLA}/ldap-nspr/plerror.h +include/${MOZILLA}/ldap-nspr/prvrsion.h +include/${MOZILLA}/ldap-nspr/prtypes.h +include/${MOZILLA}/nss/base64.h +include/${MOZILLA}/nss/ciferfam.h +include/${MOZILLA}/nss/nssb64.h +include/${MOZILLA}/nss/nssb64t.h +include/${MOZILLA}/nss/nsslocks.h +include/${MOZILLA}/nss/nssilock.h +include/${MOZILLA}/nss/nssilckt.h +include/${MOZILLA}/nss/nssrwlk.h +include/${MOZILLA}/nss/nssrwlkt.h +include/${MOZILLA}/nss/portreg.h +include/${MOZILLA}/nss/secasn1.h +include/${MOZILLA}/nss/secasn1t.h +include/${MOZILLA}/nss/seccomon.h +include/${MOZILLA}/nss/secder.h +include/${MOZILLA}/nss/secdert.h +include/${MOZILLA}/nss/secdig.h +include/${MOZILLA}/nss/secdigt.h +include/${MOZILLA}/nss/secitem.h +include/${MOZILLA}/nss/secoid.h +include/${MOZILLA}/nss/secoidt.h +include/${MOZILLA}/nss/secport.h +include/${MOZILLA}/nss/secerr.h +include/${MOZILLA}/nss/watcomfx.h +include/${MOZILLA}/nss/blapit.h +include/${MOZILLA}/nss/shsign.h +include/${MOZILLA}/nss/ecl-exp.h +include/${MOZILLA}/nss/pkcs11.h +include/${MOZILLA}/nss/pkcs11f.h +include/${MOZILLA}/nss/pkcs11p.h +include/${MOZILLA}/nss/pkcs11t.h +include/${MOZILLA}/nss/pkcs11n.h +include/${MOZILLA}/nss/pkcs11u.h +include/${MOZILLA}/nss/nssbaset.h +include/${MOZILLA}/nss/nssbase.h +include/${MOZILLA}/nss/cert.h +include/${MOZILLA}/nss/certt.h +include/${MOZILLA}/nss/certdb.h +include/${MOZILLA}/nss/ocsp.h +include/${MOZILLA}/nss/ocspt.h +include/${MOZILLA}/nss/secmod.h +include/${MOZILLA}/nss/secmodt.h +include/${MOZILLA}/nss/secpkcs5.h +include/${MOZILLA}/nss/pk11func.h +include/${MOZILLA}/nss/pk11sdr.h +include/${MOZILLA}/nss/pk11pqg.h +include/${MOZILLA}/nss/cryptohi.h +include/${MOZILLA}/nss/cryptoht.h +include/${MOZILLA}/nss/hasht.h +include/${MOZILLA}/nss/key.h +include/${MOZILLA}/nss/keyhi.h +include/${MOZILLA}/nss/keyt.h +include/${MOZILLA}/nss/keythi.h +include/${MOZILLA}/nss/sechash.h +include/${MOZILLA}/nss/nss.h +include/${MOZILLA}/nss/ssl.h +include/${MOZILLA}/nss/sslt.h +include/${MOZILLA}/nss/sslerr.h +include/${MOZILLA}/nss/sslproto.h +include/${MOZILLA}/nss/preenc.h +include/${MOZILLA}/nss/pkcs12t.h +include/${MOZILLA}/nss/pkcs12.h +include/${MOZILLA}/nss/p12plcy.h +include/${MOZILLA}/nss/p12.h +include/${MOZILLA}/nss/p12t.h +include/${MOZILLA}/nss/secmime.h +include/${MOZILLA}/nss/secpkcs7.h +include/${MOZILLA}/nss/pkcs7t.h +include/${MOZILLA}/nss/cms.h +include/${MOZILLA}/nss/cmst.h +include/${MOZILLA}/nss/smime.h +include/${MOZILLA}/nss/cmsreclist.h +include/${MOZILLA}/nss/crmf.h +include/${MOZILLA}/nss/crmft.h +include/${MOZILLA}/nss/cmmf.h +include/${MOZILLA}/nss/cmmft.h +include/${MOZILLA}/nss/jar.h +include/${MOZILLA}/nss/jar-ds.h +include/${MOZILLA}/nss/jarfile.h +include/${MOZILLA}/nss/nssckbi.h +include/${MOZILLA}/nss/nssck.api +include/${MOZILLA}/nss/nssckepv.h +include/${MOZILLA}/nss/nssckft.h +include/${MOZILLA}/nss/nssckfw.h +include/${MOZILLA}/nss/nssckfwc.h +include/${MOZILLA}/nss/nssckfwt.h +include/${MOZILLA}/nss/nssckg.h +include/${MOZILLA}/nss/nssckmdt.h +include/${MOZILLA}/nss/nssckt.h +include/${MOZILLA}/nss/swfort.h +include/${MOZILLA}/nss/swfortt.h +include/${MOZILLA}/seccmd/secutil.h +@comment end INCLUDE-PUBLIC @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf @@ -2918,6 +3157,7 @@ include/${MOZILLA}/zlib/zlib.h @dirrm include/${MOZILLA}/spellchecker @dirrm include/${MOZILLA}/sidebar @dirrm include/${MOZILLA}/shistory +@dirrm include/${MOZILLA}/seccmd @dirrm include/${MOZILLA}/rdfutil @dirrm include/${MOZILLA}/rdf @dirrm include/${MOZILLA}/progressDlg @@ -2933,6 +3173,7 @@ include/${MOZILLA}/zlib/zlib.h @dirrm include/${MOZILLA}/pipboot @dirrm include/${MOZILLA}/p3p @dirrm include/${MOZILLA}/oji +@dirrm include/${MOZILLA}/nss @dirrm include/${MOZILLA}/nspr/private @dirrm include/${MOZILLA}/nspr/obsolete @dirrm include/${MOZILLA}/nspr/md @@ -2961,6 +3202,12 @@ include/${MOZILLA}/zlib/zlib.h @dirrm include/${MOZILLA}/liveconnect @dirrm include/${MOZILLA}/libreg @dirrm include/${MOZILLA}/libart_lgpl +@dirrm include/${MOZILLA}/ldap-nspr/md +@dirrm include/${MOZILLA}/ldap-nspr/private +@dirrm include/${MOZILLA}/ldap-nspr/obsolete +@dirrm include/${MOZILLA}/ldap-nspr +@dirrm include/${MOZILLA}/ldap-private +@dirrm include/${MOZILLA}/ldap @dirrm include/${MOZILLA}/layout @dirrm include/${MOZILLA}/jsurl @dirrm include/${MOZILLA}/jsdebug diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 8e611a1570b..4df22d6b6d0 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.137 2004/09/17 14:01:44 taya Exp $ +# $NetBSD: Makefile,v 1.137.2.1 2004/11/30 23:29:14 salo Exp $ +PKGREVISION= 2 MOZILLA= mozilla MOZILLA_BIN= mozilla-bin MOZ_VER= 1.7.3 diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 8bf157e7a15..70db3fc94db 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.44 2004/08/31 02:37:57 danw Exp $ +# $NetBSD: Makefile.common,v 1.44.2.1 2004/11/30 23:29:14 salo Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-source-${MOZ_DIST_VER} @@ -21,12 +21,17 @@ USE_PERL5= build USE_GNU_TOOLS+= make USE_X11= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= build/unix/mozilla-gtkmozembed.pc.in -PKGCONFIG_OVERRIDE+= build/unix/mozilla-js.pc.in -PKGCONFIG_OVERRIDE+= build/unix/mozilla-nspr.pc.in -PKGCONFIG_OVERRIDE+= build/unix/mozilla-nss.pc.in -PKGCONFIG_OVERRIDE+= build/unix/mozilla-plugin.pc.in -PKGCONFIG_OVERRIDE+= build/unix/mozilla-xpcom.pc.in + +PKGCONFIG_OVERRIDE+= build/unix/mozilla-gtkmozembed.pc +PKGCONFIG_OVERRIDE+= build/unix/mozilla-js.pc +PKGCONFIG_OVERRIDE+= build/unix/mozilla-nspr.pc +PKGCONFIG_OVERRIDE+= build/unix/mozilla-nss.pc +PKGCONFIG_OVERRIDE+= build/unix/mozilla-plugin.pc +PKGCONFIG_OVERRIDE+= build/unix/mozilla-xpcom.pc +# Some .pc files are filled in by the build process, so we can't fix the +# rpaths until this has happened. +PKGCONFIG_OVERRIDE_STAGE= post-build + CONFIGURE_ARGS+= --disable-tests \ --disable-debug \ --disable-pedantic \ @@ -130,6 +135,10 @@ SCRIPTS_ENV+= SUNOSLIB=${SUNOSLIB} PTHREAD_OPTS+= native optional +.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64") +GCC_REQD+= 3.4 +.endif + .include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc*) COPTS?= -O2 diff --git a/www/mozilla/PLIST b/www/mozilla/PLIST index e60e7081b01..d49764bfe93 100644 --- a/www/mozilla/PLIST +++ b/www/mozilla/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2004/06/21 14:14:00 taya Exp $ +@comment $NetBSD: PLIST,v 1.13.2.1 2004/11/30 23:29:14 salo Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -2792,6 +2792,245 @@ include/${MOZILLA}/xultmpl/nsIXULTemplateBuilder.h include/${MOZILLA}/zlib/zconf.h include/${MOZILLA}/zlib/zlib.h @comment end INCLUDE +@comment begin INCLUDE-PUBLIC +include/${MOZILLA}/ldap/ldap-standard.h +include/${MOZILLA}/ldap/disptmpl.h +include/${MOZILLA}/ldap/lber.h +include/${MOZILLA}/ldap/ldap.h +include/${MOZILLA}/ldap/ldap-extension.h +include/${MOZILLA}/ldap/ldap-platform.h +include/${MOZILLA}/ldap/ldap-to-be-deprecated.h +include/${MOZILLA}/ldap/ldap-deprecated.h +include/${MOZILLA}/ldap/ldap_ssl.h +include/${MOZILLA}/ldap/ldappr.h +include/${MOZILLA}/ldap/iutil.h +include/${MOZILLA}/ldap/srchpref.h +include/${MOZILLA}/ldap-private/ldap-int.h +include/${MOZILLA}/ldap-private/lber-int.h +include/${MOZILLA}/ldap-private/portable.h +include/${MOZILLA}/ldap-private/ldaprot.h +include/${MOZILLA}/ldap-private/ldaplog.h +include/${MOZILLA}/ldap-nspr/obsolete/pralarm.h +include/${MOZILLA}/ldap-nspr/obsolete/probslet.h +include/${MOZILLA}/ldap-nspr/obsolete/protypes.h +include/${MOZILLA}/ldap-nspr/obsolete/prsem.h +include/${MOZILLA}/ldap-nspr/private/pprio.h +include/${MOZILLA}/ldap-nspr/private/pprthred.h +include/${MOZILLA}/ldap-nspr/private/prpriv.h +include/${MOZILLA}/ldap-nspr/md/sunos4.h +include/${MOZILLA}/ldap-nspr/md/_aix64.cfg +include/${MOZILLA}/ldap-nspr/md/_beos.cfg +include/${MOZILLA}/ldap-nspr/md/_bsdi.cfg +include/${MOZILLA}/ldap-nspr/md/_darwin.cfg +include/${MOZILLA}/ldap-nspr/md/_dgux.cfg +include/${MOZILLA}/ldap-nspr/md/_freebsd.cfg +include/${MOZILLA}/ldap-nspr/md/_hpux32.cfg +include/${MOZILLA}/ldap-nspr/md/_hpux64.cfg +include/${MOZILLA}/ldap-nspr/md/_irix32.cfg +include/${MOZILLA}/ldap-nspr/md/_irix64.cfg +include/${MOZILLA}/ldap-nspr/md/_linux.cfg +include/${MOZILLA}/ldap-nspr/md/_ncr.cfg +include/${MOZILLA}/ldap-nspr/md/_nec.cfg +include/${MOZILLA}/ldap-nspr/md/_netbsd.cfg +include/${MOZILLA}/ldap-nspr/md/_nextstep.cfg +include/${MOZILLA}/ldap-nspr/md/_nto.cfg +include/${MOZILLA}/ldap-nspr/md/_openbsd.cfg +include/${MOZILLA}/ldap-nspr/md/_openvms.cfg +include/${MOZILLA}/ldap-nspr/md/_os2.cfg +include/${MOZILLA}/ldap-nspr/md/_osf1.cfg +include/${MOZILLA}/ldap-nspr/md/_qnx.cfg +include/${MOZILLA}/ldap-nspr/md/_reliantunix.cfg +include/${MOZILLA}/ldap-nspr/md/_rhapsody.cfg +include/${MOZILLA}/ldap-nspr/md/_scoos.cfg +include/${MOZILLA}/ldap-nspr/md/_solaris32.cfg +include/${MOZILLA}/ldap-nspr/md/_solaris64.cfg +include/${MOZILLA}/ldap-nspr/md/_sony.cfg +include/${MOZILLA}/ldap-nspr/md/_sunos4.cfg +include/${MOZILLA}/ldap-nspr/md/_unixware.cfg +include/${MOZILLA}/ldap-nspr/md/_unixware7.cfg +include/${MOZILLA}/ldap-nspr/md/_win16.cfg +include/${MOZILLA}/ldap-nspr/md/_win95.cfg +include/${MOZILLA}/ldap-nspr/md/_winnt.cfg +include/${MOZILLA}/ldap-nspr/md/_aix.h +include/${MOZILLA}/ldap-nspr/md/_beos.h +include/${MOZILLA}/ldap-nspr/md/_bsdi.h +include/${MOZILLA}/ldap-nspr/md/_darwin.h +include/${MOZILLA}/ldap-nspr/md/_dgux.h +include/${MOZILLA}/ldap-nspr/md/_freebsd.h +include/${MOZILLA}/ldap-nspr/md/_hpux.h +include/${MOZILLA}/ldap-nspr/md/_irix.h +include/${MOZILLA}/ldap-nspr/md/_linux.h +include/${MOZILLA}/ldap-nspr/md/_macos.h +include/${MOZILLA}/ldap-nspr/md/_ncr.h +include/${MOZILLA}/ldap-nspr/md/_nec.h +include/${MOZILLA}/ldap-nspr/md/_netbsd.h +include/${MOZILLA}/ldap-nspr/md/_nextstep.h +include/${MOZILLA}/ldap-nspr/md/_nspr_pthread.h +include/${MOZILLA}/ldap-nspr/md/_nto.h +include/${MOZILLA}/ldap-nspr/md/_openbsd.h +include/${MOZILLA}/ldap-nspr/md/_openvms.h +include/${MOZILLA}/ldap-nspr/md/_os2.h +include/${MOZILLA}/ldap-nspr/md/_os2_errors.h +include/${MOZILLA}/ldap-nspr/md/_osf1.h +include/${MOZILLA}/ldap-nspr/md/_pcos.h +include/${MOZILLA}/ldap-nspr/md/_pth.h +include/${MOZILLA}/ldap-nspr/md/_qnx.h +include/${MOZILLA}/ldap-nspr/md/_reliantunix.h +include/${MOZILLA}/ldap-nspr/md/_rhapsody.h +include/${MOZILLA}/ldap-nspr/md/_scoos.h +include/${MOZILLA}/ldap-nspr/md/_solaris.h +include/${MOZILLA}/ldap-nspr/md/_sony.h +include/${MOZILLA}/ldap-nspr/md/_sunos4.h +include/${MOZILLA}/ldap-nspr/md/_unix_errors.h +include/${MOZILLA}/ldap-nspr/md/_unixos.h +include/${MOZILLA}/ldap-nspr/md/_unixware.h +include/${MOZILLA}/ldap-nspr/md/_win16.h +include/${MOZILLA}/ldap-nspr/md/_win32_errors.h +include/${MOZILLA}/ldap-nspr/md/_win95.h +include/${MOZILLA}/ldap-nspr/md/_winnt.h +include/${MOZILLA}/ldap-nspr/md/prosdep.h +include/${MOZILLA}/ldap-nspr/md/_aix32.cfg +include/${MOZILLA}/ldap-nspr/prtrace.h +include/${MOZILLA}/ldap-nspr/prtpool.h +include/${MOZILLA}/ldap-nspr/prtime.h +include/${MOZILLA}/ldap-nspr/prthread.h +include/${MOZILLA}/ldap-nspr/prsystem.h +include/${MOZILLA}/ldap-nspr/prshma.h +include/${MOZILLA}/ldap-nspr/prshm.h +include/${MOZILLA}/ldap-nspr/prrwlock.h +include/${MOZILLA}/ldap-nspr/prrng.h +include/${MOZILLA}/ldap-nspr/prproces.h +include/${MOZILLA}/ldap-nspr/prprf.h +include/${MOZILLA}/ldap-nspr/prpdce.h +include/${MOZILLA}/ldap-nspr/prolock.h +include/${MOZILLA}/ldap-nspr/prnetdb.h +include/${MOZILLA}/ldap-nspr/prmwait.h +include/${MOZILLA}/ldap-nspr/prmon.h +include/${MOZILLA}/ldap-nspr/prmem.h +include/${MOZILLA}/ldap-nspr/prlong.h +include/${MOZILLA}/ldap-nspr/prlog.h +include/${MOZILLA}/ldap-nspr/prlock.h +include/${MOZILLA}/ldap-nspr/prlink.h +include/${MOZILLA}/ldap-nspr/pripcsem.h +include/${MOZILLA}/ldap-nspr/prio.h +include/${MOZILLA}/ldap-nspr/prinrval.h +include/${MOZILLA}/ldap-nspr/prinit.h +include/${MOZILLA}/ldap-nspr/prinet.h +include/${MOZILLA}/ldap-nspr/prerror.h +include/${MOZILLA}/ldap-nspr/prerr.h +include/${MOZILLA}/ldap-nspr/prenv.h +include/${MOZILLA}/ldap-nspr/prdtoa.h +include/${MOZILLA}/ldap-nspr/prcvar.h +include/${MOZILLA}/ldap-nspr/prcpucfg.h +include/${MOZILLA}/ldap-nspr/prcountr.h +include/${MOZILLA}/ldap-nspr/prcmon.h +include/${MOZILLA}/ldap-nspr/prclist.h +include/${MOZILLA}/ldap-nspr/prbit.h +include/${MOZILLA}/ldap-nspr/pratom.h +include/${MOZILLA}/ldap-nspr/plstr.h +include/${MOZILLA}/ldap-nspr/plresolv.h +include/${MOZILLA}/ldap-nspr/plhash.h +include/${MOZILLA}/ldap-nspr/plgetopt.h +include/${MOZILLA}/ldap-nspr/prwin16.h +include/${MOZILLA}/ldap-nspr/plbase64.h +include/${MOZILLA}/ldap-nspr/plarenas.h +include/${MOZILLA}/ldap-nspr/plarena.h +include/${MOZILLA}/ldap-nspr/nspr.h +include/${MOZILLA}/ldap-nspr/plerror.h +include/${MOZILLA}/ldap-nspr/prvrsion.h +include/${MOZILLA}/ldap-nspr/prtypes.h +include/${MOZILLA}/nss/base64.h +include/${MOZILLA}/nss/ciferfam.h +include/${MOZILLA}/nss/nssb64.h +include/${MOZILLA}/nss/nssb64t.h +include/${MOZILLA}/nss/nsslocks.h +include/${MOZILLA}/nss/nssilock.h +include/${MOZILLA}/nss/nssilckt.h +include/${MOZILLA}/nss/nssrwlk.h +include/${MOZILLA}/nss/nssrwlkt.h +include/${MOZILLA}/nss/portreg.h +include/${MOZILLA}/nss/secasn1.h +include/${MOZILLA}/nss/secasn1t.h +include/${MOZILLA}/nss/seccomon.h +include/${MOZILLA}/nss/secder.h +include/${MOZILLA}/nss/secdert.h +include/${MOZILLA}/nss/secdig.h +include/${MOZILLA}/nss/secdigt.h +include/${MOZILLA}/nss/secitem.h +include/${MOZILLA}/nss/secoid.h +include/${MOZILLA}/nss/secoidt.h +include/${MOZILLA}/nss/secport.h +include/${MOZILLA}/nss/secerr.h +include/${MOZILLA}/nss/watcomfx.h +include/${MOZILLA}/nss/blapit.h +include/${MOZILLA}/nss/shsign.h +include/${MOZILLA}/nss/ecl-exp.h +include/${MOZILLA}/nss/pkcs11.h +include/${MOZILLA}/nss/pkcs11f.h +include/${MOZILLA}/nss/pkcs11p.h +include/${MOZILLA}/nss/pkcs11t.h +include/${MOZILLA}/nss/pkcs11n.h +include/${MOZILLA}/nss/pkcs11u.h +include/${MOZILLA}/nss/nssbaset.h +include/${MOZILLA}/nss/nssbase.h +include/${MOZILLA}/nss/cert.h +include/${MOZILLA}/nss/certt.h +include/${MOZILLA}/nss/certdb.h +include/${MOZILLA}/nss/ocsp.h +include/${MOZILLA}/nss/ocspt.h +include/${MOZILLA}/nss/secmod.h +include/${MOZILLA}/nss/secmodt.h +include/${MOZILLA}/nss/secpkcs5.h +include/${MOZILLA}/nss/pk11func.h +include/${MOZILLA}/nss/pk11sdr.h +include/${MOZILLA}/nss/pk11pqg.h +include/${MOZILLA}/nss/cryptohi.h +include/${MOZILLA}/nss/cryptoht.h +include/${MOZILLA}/nss/hasht.h +include/${MOZILLA}/nss/key.h +include/${MOZILLA}/nss/keyhi.h +include/${MOZILLA}/nss/keyt.h +include/${MOZILLA}/nss/keythi.h +include/${MOZILLA}/nss/sechash.h +include/${MOZILLA}/nss/nss.h +include/${MOZILLA}/nss/ssl.h +include/${MOZILLA}/nss/sslt.h +include/${MOZILLA}/nss/sslerr.h +include/${MOZILLA}/nss/sslproto.h +include/${MOZILLA}/nss/preenc.h +include/${MOZILLA}/nss/pkcs12t.h +include/${MOZILLA}/nss/pkcs12.h +include/${MOZILLA}/nss/p12plcy.h +include/${MOZILLA}/nss/p12.h +include/${MOZILLA}/nss/p12t.h +include/${MOZILLA}/nss/secmime.h +include/${MOZILLA}/nss/secpkcs7.h +include/${MOZILLA}/nss/pkcs7t.h +include/${MOZILLA}/nss/cms.h +include/${MOZILLA}/nss/cmst.h +include/${MOZILLA}/nss/smime.h +include/${MOZILLA}/nss/cmsreclist.h +include/${MOZILLA}/nss/crmf.h +include/${MOZILLA}/nss/crmft.h +include/${MOZILLA}/nss/cmmf.h +include/${MOZILLA}/nss/cmmft.h +include/${MOZILLA}/nss/jar.h +include/${MOZILLA}/nss/jar-ds.h +include/${MOZILLA}/nss/jarfile.h +include/${MOZILLA}/nss/nssckbi.h +include/${MOZILLA}/nss/nssck.api +include/${MOZILLA}/nss/nssckepv.h +include/${MOZILLA}/nss/nssckft.h +include/${MOZILLA}/nss/nssckfw.h +include/${MOZILLA}/nss/nssckfwc.h +include/${MOZILLA}/nss/nssckfwt.h +include/${MOZILLA}/nss/nssckg.h +include/${MOZILLA}/nss/nssckmdt.h +include/${MOZILLA}/nss/nssckt.h +include/${MOZILLA}/nss/swfort.h +include/${MOZILLA}/nss/swfortt.h +include/${MOZILLA}/seccmd/secutil.h +@comment end INCLUDE-PUBLIC @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf @@ -2902,6 +3141,7 @@ include/${MOZILLA}/zlib/zlib.h @dirrm include/${MOZILLA}/spellchecker @dirrm include/${MOZILLA}/sidebar @dirrm include/${MOZILLA}/shistory +@dirrm include/${MOZILLA}/seccmd @dirrm include/${MOZILLA}/rdfutil @dirrm include/${MOZILLA}/rdf @dirrm include/${MOZILLA}/progressDlg @@ -2917,6 +3157,7 @@ include/${MOZILLA}/zlib/zlib.h @dirrm include/${MOZILLA}/pipboot @dirrm include/${MOZILLA}/p3p @dirrm include/${MOZILLA}/oji +@dirrm include/${MOZILLA}/nss @dirrm include/${MOZILLA}/nspr/private @dirrm include/${MOZILLA}/nspr/obsolete @dirrm include/${MOZILLA}/nspr/md @@ -2945,6 +3186,12 @@ include/${MOZILLA}/zlib/zlib.h @dirrm include/${MOZILLA}/liveconnect @dirrm include/${MOZILLA}/libreg @dirrm include/${MOZILLA}/libart_lgpl +@dirrm include/${MOZILLA}/ldap-nspr/md +@dirrm include/${MOZILLA}/ldap-nspr/private +@dirrm include/${MOZILLA}/ldap-nspr/obsolete +@dirrm include/${MOZILLA}/ldap-nspr +@dirrm include/${MOZILLA}/ldap-private +@dirrm include/${MOZILLA}/ldap @dirrm include/${MOZILLA}/layout @dirrm include/${MOZILLA}/jsurl @dirrm include/${MOZILLA}/jsdebug diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index 86978ac95a7..beb89258f0d 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.66 2004/09/17 14:01:45 taya Exp $ +$NetBSD: distinfo,v 1.66.2.1 2004/11/30 23:29:14 salo Exp $ SHA1 (mozilla-source-1.7.3.tar.bz2) = ca588b12d944d478ebe193a76d4b487f8db1e38c Size (mozilla-source-1.7.3.tar.bz2) = 29716200 bytes @@ -22,12 +22,13 @@ SHA1 (patch-aw) = b42ddb3075fe9eb84334aec27f1c8e4ab3714b9b SHA1 (patch-ax) = 480094894cb53dee8d51c15b24dc03502c52071b SHA1 (patch-ba) = f5b7bf6356ecc373e1d201ca58fa24b34d7e122a SHA1 (patch-bb) = 4e222846e2aba9ea7c3f8ac4b5c9c4164223b44b +SHA1 (patch-bj) = 84c564a2a32c0bdbdb57b2afff5ad82c2b73cf45 SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7 SHA1 (patch-bo) = 7d6e0353666810992ab0b09d804f9f48ef90b984 SHA1 (patch-bq) = 2a08f3eb1b6a8ea00e712d08b4bcafad3b766a81 -SHA1 (patch-br) = 215990af167a1aa1f2d1107e74edfd13395ed356 +SHA1 (patch-br) = 52d5b595f1e25ac5d6664864ab0cbe5e14012168 SHA1 (patch-bs) = fb9f8f13ce481c04a0f7ecfd0ad4d8016cddc2e4 -SHA1 (patch-bt) = 02c84d908156e42b2d60f0c680eab1a89eb5b330 +SHA1 (patch-bt) = 70746626648624b38cc6e8795eb9c061be992342 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860 SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8 diff --git a/www/mozilla/files/moz-install b/www/mozilla/files/moz-install index 8138e8eaaaf..7e8a37ad2c9 100755 --- a/www/mozilla/files/moz-install +++ b/www/mozilla/files/moz-install @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: moz-install,v 1.11 2004/08/31 02:37:57 danw Exp $ +# $NetBSD: moz-install,v 1.11.2.1 2004/11/30 23:29:15 salo Exp $ ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${PREFIX}/bin/${MOZILLA} ${CHOWN} ${BINOWN} ${PREFIX}/bin/${MOZILLA} @@ -56,6 +56,12 @@ for i in `${SED} -n -e '/^@comment begin INCLUDE$/,/^@comment end INCLUDE$/p' ${ ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i done +# install INCLUDE-PUBLIC +for i in `${SED} -n -e '/^@comment begin INCLUDE-PUBLIC$/,/^@comment end INCLUDE-PUBLIC$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do + src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/public@"`; + ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i +done + ${RM} -f ${TMP_PLIST} # # diff --git a/www/mozilla/patches/patch-bj b/www/mozilla/patches/patch-bj new file mode 100644 index 00000000000..1cc713acc64 --- /dev/null +++ b/www/mozilla/patches/patch-bj @@ -0,0 +1,24 @@ +$NetBSD: patch-bj,v 1.7.8.1 2004/11/30 23:29:15 salo Exp $ + +--- uriloader/exthandler/nsExternalHelperAppService.cpp.orig 2004-11-11 15:56:52.000000000 +0100 ++++ uriloader/exthandler/nsExternalHelperAppService.cpp +@@ -1747,6 +1747,11 @@ nsresult nsExternalAppHandler::ExecuteDe + // XXX Put progress dialog in barber-pole mode + // and change text to say "Copying from:". + rv = MoveFile(mFinalFileDestination); ++ if (NS_SUCCEEDED(rv) && action == nsIMIMEInfo::saveToDisk) ++ { ++ nsCOMPtr destfile(do_QueryInterface(mFinalFileDestination)); ++ sSrv->FixFilePermissions(destfile); ++ } + } + + // Notify dialog that download is complete. +@@ -1913,7 +1918,6 @@ nsresult nsExternalAppHandler::MoveFile( + if (directoryLocation) + { + rv = mTempFile->MoveToNative(directoryLocation, fileName); +- sSrv->FixFilePermissions(fileToUse); + } + if (NS_FAILED(rv)) + { diff --git a/www/mozilla/patches/patch-br b/www/mozilla/patches/patch-br index 2f2ea5e357e..d36e15675bf 100644 --- a/www/mozilla/patches/patch-br +++ b/www/mozilla/patches/patch-br @@ -1,17 +1,21 @@ -$NetBSD: patch-br,v 1.4 2004/06/21 14:14:01 taya Exp $ +$NetBSD: patch-br,v 1.4.2.1 2004/11/30 23:29:15 salo Exp $ -diff -ru ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c ---- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2004-01-23 07:22:37.000000000 +0900 -+++ ./nsprpub/pr/src/misc/prnetdb.c 2004-06-10 23:07:42.000000000 +0900 -@@ -2094,7 +2094,12 @@ +--- nsprpub/pr/src/misc/prnetdb.c.orig 2004-04-28 22:00:17.000000000 +1000 ++++ nsprpub/pr/src/misc/prnetdb.c +@@ -2097,7 +2097,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf */ hints.ai_socktype = SOCK_STREAM; -+ LOCK_DNS(); ++/* NetBSD 2.0F */ ++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000 ++ LOCK_DNS(); ++#endif + rv = GETADDRINFO(hostname, NULL, &hints, &res); + -+ UNLOCK_DNS(); ++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000 ++ UNLOCK_DNS(); ++#endif + if (rv == 0) return (PRAddrInfo *) res; diff --git a/www/mozilla/patches/patch-bt b/www/mozilla/patches/patch-bt index 6f53d8e4508..cc5ca5f9a29 100644 --- a/www/mozilla/patches/patch-bt +++ b/www/mozilla/patches/patch-bt @@ -1,4 +1,4 @@ -$NetBSD: patch-bt,v 1.2 2004/06/21 14:14:01 taya Exp $ +$NetBSD: patch-bt,v 1.2.2.1 2004/11/30 23:29:15 salo Exp $ diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c --- ../Orig/mozilla/nsprpub/pr/src/io/prprf.c 2004-03-09 12:18:19.000000000 +0900 @@ -11,7 +11,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c + (defined(__amd64__) || \ + (defined(__powerpc__) && __NetBSD_Version__ >= 105000000))) +#include -+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar)) ++#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) #elif (defined(LINUX) && defined(__powerpc__)) || \ (defined(LINUX) && defined(__s390__)) || \ (defined(LINUX) && defined(__s390x__)) || \ -- cgit v1.2.3