Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1465
Modified Files: mozilla.info mozilla.patch Log Message: Last Mozilla ever on 10.3 as well. Index: mozilla.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/mozilla.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mozilla.patch 17 Jan 2006 16:03:52 -0000 1.6 +++ mozilla.patch 14 Sep 2006 02:48:19 -0000 1.7 @@ -1,7 +1,7 @@ diff -Naur mozilla-1.7.2.old/.mozconfig mozilla-1.7.2.new/.mozconfig --- mozilla-1.7.2.old/.mozconfig Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/.mozconfig Sat Aug 21 02:12:35 2004 -@@ -0,0 +1,23 @@ +@@ -0,0 +1,24 @@ +ac_add_options --enable-macos-target=10.3 +ac_add_options --enable-prebinding +ac_add_options --enable-default-toolkit=gtk2 @@ -22,6 +22,7 @@ +ac_add_options --enable-mathml +ac_add_options --enable-extensions=all +ac_add_options --enable-xinerama ++ac_add_options --enable-postscript +ac_add_options [EMAIL PROTECTED]@/lib/mozilla +mk_add_options MOZ_MAKE_FLAGS=-j4 + @@ -62,7 +63,7 @@ diff -Naur mozilla-1.7.2.old/config/config.mk mozilla-1.7.2.new/config/config.mk --- mozilla-1.7.2.old/config/config.mk Sun Apr 11 07:51:37 2004 +++ mozilla-1.7.2.new/config/config.mk Fri Aug 20 20:36:42 2004 -@@ -702,7 +702,7 @@ +@@ -712,7 +712,7 @@ ifeq ($(OS_ARCH),Darwin) ifdef USE_PREBINDING export LD_PREBIND=1 @@ -71,7 +72,7 @@ endif ifdef MACOS_SDK_DIR export NEXT_ROOT=$(MACOS_SDK_DIR) -@@ -747,7 +747,7 @@ +@@ -765,7 +765,7 @@ # Tell the linker where NSS is, if we're building crypto ifeq ($(OS_ARCH),Darwin) ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS))) @@ -95,7 +96,7 @@ diff -Naur mozilla-1.7.2.old/configure mozilla-1.7.2.new/configure --- mozilla-1.7.2.old/configure Sun Jun 6 03:44:52 2004 +++ mozilla-1.7.2.new/configure Sat Aug 21 03:41:21 2004 -@@ -4976,7 +4976,7 @@ +@@ -4980,7 +4980,7 @@ ;; *-darwin*) @@ -104,7 +105,7 @@ HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ;; -@@ -5207,8 +5207,8 @@ +@@ -5211,8 +5117,8 @@ *-darwin*) _PEDANTIC= @@ -387,7 +388,7 @@ diff -Naur mozilla-1.7.2.old/fink/update-mozilla-chrome mozilla-1.7.2.new/fink/update-mozilla-chrome --- mozilla-1.7.2.old/fink/update-mozilla-chrome Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/update-mozilla-chrome Tue Jan 17 04:34:03 2006 -@@ -0,0 +1,31 @@ +@@ -0,0 +1,33 @@ +#!/bin/sh -e + +if [ "$UID" -ne "0" ]; then @@ -403,6 +404,7 @@ + +export DYLD_LIBRARY_PATH=$MOZILLA_FIVE_HOME + ++cd ${MOZILLA_FIVE_HOME} +TMPFILE=`tempfile` +cat ${CHROME_DIR}/* >>${TMPFILE} +mv ${TMPFILE} ${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt @@ -414,9 +416,10 @@ +rm -f ${MOZILLA_FIVE_HOME}/components/*.dat + +export HOME=~root -+${MOZILLA_FIVE_HOME}/regxpcom || true -+${MOZILLA_FIVE_HOME}/regchrome || true ++sudo -H ./run-mozilla.sh ${MOZILLA_FIVE_HOME}/regxpcom || true ++sudo -H ./run-mozilla.sh ${MOZILLA_FIVE_HOME}/regchrome || true + ++echo "Done registering components" +exit 0 + diff -Naur mozilla-1.7.2.old/modules/libpref/src/nsPrefService.cpp mozilla-1.7.2.new/modules/libpref/src/nsPrefService.cpp @@ -460,7 +463,7 @@ - ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 - echo "configure:4845: checking for dlopen in -ldl" >&5 + echo "configure:4853: checking for dlopen in -ldl" >&5 diff -Naur mozilla-1.7.2.old/nsprpub/pr/include/md/_darwin.h mozilla-1.7.2.new/nsprpub/pr/include/md/_darwin.h --- mozilla-1.7.2.old/nsprpub/pr/include/md/_darwin.h Thu Nov 27 10:30:44 2003 +++ mozilla-1.7.2.new/nsprpub/pr/include/md/_darwin.h Fri Aug 20 20:07:49 2004 @@ -506,7 +509,7 @@ diff -Naur mozilla-1.7.2.old/security/coreconf/Darwin.mk mozilla-1.7.2.new/security/coreconf/Darwin.mk --- mozilla-1.7.2.old/security/coreconf/Darwin.mk Thu Nov 13 10:59:22 2003 +++ mozilla-1.7.2.new/security/coreconf/Darwin.mk Fri Aug 20 20:18:08 2004 -@@ -68,7 +68,7 @@ +@@ -80,7 +80,7 @@ ARCH = darwin # May override this with -bundle to create a loadable module. @@ -518,7 +521,7 @@ diff -Naur mozilla-1.7.2.old/security/nss/cmd/platlibs.mk mozilla-1.7.2.new/security/nss/cmd/platlibs.mk --- mozilla-1.7.2.old/security/nss/cmd/platlibs.mk Sun Apr 20 13:23:14 2003 +++ mozilla-1.7.2.new/security/nss/cmd/platlibs.mk Fri Aug 20 20:07:54 2004 -@@ -195,7 +195,7 @@ +@@ -207,7 +207,7 @@ endif ifeq ($(OS_ARCH), Darwin) @@ -550,7 +553,7 @@ +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif - endif + ifeq ($(OS_TARGET),SunOS) diff -Naur mozilla-1.7.2.old/themes/Makefile.in mozilla-1.7.2.new/themes/Makefile.in --- mozilla-1.7.2.old/themes/Makefile.in Thu Sep 25 21:48:58 2003 +++ mozilla-1.7.2.new/themes/Makefile.in Fri Aug 20 20:07:54 2004 @@ -559,20 +562,22 @@ # select classic as the default skin libs:: - echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt -+# fix lator ++# fix later +# echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt install:: - echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt -+# fix lator ++# fix later +# echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt diff -ur mozilla.bak/dist/private/nss/oiddata.h mozilla/dist/private/nss/oiddata.h --- mozilla.bak/security/nss/lib/pki1/oiddata.h 2002-01-03 21:22:07.000000000 -0800 +++ mozilla/security/nss/lib/pki1/oiddata.h 2005-06-13 15:47:27.000000000 -0700 -@@ -39,6 +39,7 @@ +@@ -39,6 +39,9 @@ static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$"; #endif /* DEBUG */ ++/* added to fix building on Tiger/gcc4 (bug 284386) */ ++/* fixed for mozilla1.8, so remove this block from the patch for 1.8 */ +#include "pki1t.h" #ifndef NSSPKI1T_H #include "nsspki1t.h" Index: mozilla.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/mozilla.info,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- mozilla.info 20 Jul 2006 02:49:19 -0000 1.20 +++ mozilla.info 14 Sep 2006 02:48:19 -0000 1.21 @@ -1,12 +1,11 @@ Package: mozilla -Version: 1.7.5 -Revision: 7 -# when new %v or %r released, fix nspr.m4 for automake1.9 +Version: 1.7.13 +Revision: 1112 GCC: 3.3 -Source: mirror:custom:mozilla/releases/%n%v/source/%n-source-%v.tar.bz2 -Source-MD5: e5994f3e801cd834966367c6a12f8aeb +Source: mirror:custom:mozilla/releases/%n%v/source/%n-%v-source.tar.bz2 +Source-MD5: eb0683207f7668319c65e403d04bfc41 CustomMirror: << Primary: http://ftp.mozilla.org/pub/mozilla.org/ nam-US: ftp://ftp.spnet.net/mozilla/ @@ -14,83 +13,115 @@ asi-JP: http://core.ring.gr.jp/pub/net/www/mozilla/ << SourceDirectory: mozilla -Depends: %N-psm (>= %v-%r), %N-mailnews (>= %v-%r), %N-chatzilla (>= %v-%r), %N-js-debugger (>= %v-%r), %N-dom-inspector (>= %v-%r), %N-browser (>= %v-%r), %N-shlibs (>= %v-%r) -BuildDepends: freetype2-hinting-dev | freetype2-dev, libpng3, libmng2, libjpeg, glib2-dev, atk1, pango1-xft2-dev, gtk+2-dev, orbit2-dev, libbonobo2-dev, dbus-dev (>= 0.60-1), libhowl-dev, gnome-vfs2-ssl-dev | gnome-vfs2-dev, libidl2, x11-dev, xft2-dev, gettext-dev, gettext-bin, gettext-tools, libiconv-dev, pkgconfig +Depends: << + %N-psm (= %v-%r), + %N-mailnews (= %v-%r), + %N-chatzilla (= %v-%r), + %N-js-debugger (= %v-%r), + %N-dom-inspector (= %v-%r), + %N-browser (= %v-%r), + %N-shlibs (= %v-%r) +<< +BuildDepends: << + atk1, + freetype2-hinting-dev | freetype2-dev, + glib2-dev (>= 2.12.0-1), + gnome-vfs2-unified-dev, + gtk+2-dev, + libbonobo2-dev, + libgettext3-dev, + libiconv-dev, + libidl2 (>= 0.8.7-1), + libjpeg, + libpng3 (>= 1.2.8-1), + orbit2-dev, + pango1-xft2-dev, + pkgconfig, + x11-dev, + xft2-dev +<< +## libhowl-dev and dbus-dev don't seem to be needed. +# libhowl-dev, +# dbus-dev (>= 0.60-1), NoSetLDFLAGS: true SetLDFLAGS: -L%p/lib/freetype2/lib NoSetCPPFLAGS: true SetCC: gcc -I%p/lib/freetype2/include -I%p/lib/freetype2/include/freetype2 SetCXX: g++ -I%p/lib/freetype2/include -I%p/lib/freetype2/include/freetype2 -PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 +PatchScript: << +/usr/bin/sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 +### Fix for automake1.9 +/usr/bin/perl -pi -e 's/(AC_DEFUN\()([^[,]+)(,)/\1\[\2]\3/' {{build,directory/c-sdk/config}/autoconf,nsprpub/config}/nspr.m4 +<< CompileScript: << #!/bin/sh -ev export PATH="%p/lib/freetype2/bin:${PATH}" ./configure %c make -w -# Devide installed-chrome.txt for each split-off. -sed -e '/pipnss/d' -e '/pippki/d' -e '/messenger/d' -e '/chatzilla/d' \ +# Divide installed-chrome.txt for each split-off. +/usr/bin/sed -e '/pipnss/d' -e '/pippki/d' -e '/messenger/d' -e '/chatzilla/d' \ -e '/venkman/d' -e '/inspector/d' \ dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00browser -grep 'pip[nss|pki]' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00psm -grep 'messenger' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00mailnews -grep 'chatzilla' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00chatzilla -grep 'venkman' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00js-debugger -grep 'inspector' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00dom-inspector +/usr/bin/grep 'pip[nss|pki]' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00psm +/usr/bin/grep 'messenger' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00mailnews +/usr/bin/grep 'chatzilla' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00chatzilla +/usr/bin/grep 'venkman' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00js-debugger +/usr/bin/grep 'inspector' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00dom-inspector << InstallScript: << #!/bin/sh -ev -make install DESTDIR=%d +make -w install DESTDIR=%d # Install NSS headers. -/bin/cp -R -L dist/public/nss %i/include/mozilla/nss +/bin/cp -R -L dist/public/nss %i/include/%n/nss # These files are reduntant. -for f in %i/lib/mozilla/chrome/*.jar; do - rm -rf ${f/.jar/} +for f in %i/lib/%n/chrome/*.jar; do + /bin/rm -rf ${f/.jar/} done # These files are created dynamically. -rm -rf %i/lib/mozilla/chrome/overlayinfo -rm -f %i/lib/mozilla/chrome/*.rdf -rm -f %i/lib/mozilla/component.reg -rm -f %i/lib/mozilla/components/*.dat +/bin/rm -rf %i/lib/%n/chrome/overlayinfo +/bin/rm -f %i/lib/%n/chrome/*.rdf +/bin/rm -f %i/lib/%n/component.reg +/bin/rm -f %i/lib/%n/components/*.dat # Multi user setting. -touch %i/lib/mozilla/chrome/user-skins.rdf -touch %i/lib/mozilla/chrome/user-locales.rdf +/usr/bin/touch %i/lib/%n/chrome/user-skins.rdf +/usr/bin/touch %i/lib/%n/chrome/user-locales.rdf # Empty installed-chrome.txt. -rm %i/lib/mozilla/chrome/installed-chrome.txt -touch %i/lib/mozilla/chrome/installed-chrome.txt +/bin/rm %i/lib/%n/chrome/installed-chrome.txt +/usr/bin/touch %i/lib/%n/chrome/installed-chrome.txt # Install fink specific files. -install -d -m 755 %i/bin %i/sbin %i/var/lib/mozilla/chrome.d -install -c -m 755 fink/mozilla %i/bin/ -install -c -m 755 fink/update-mozilla-chrome %i/sbin/ -install -c -m 644 fink/chrome.d/* %i/var/lib/mozilla/chrome.d/ +/usr/bin/install -d -m 755 %i/bin %i/sbin %i/var/lib/%n/chrome.d +/usr/bin/install -c -m 755 fink/mozilla %i/bin/ +/usr/bin/install -c -m 755 fink/update-mozilla-chrome %i/sbin/ +/usr/bin/install -c -m 644 fink/chrome.d/* %i/var/lib/%n/chrome.d/ # Move config file into %p/etc. -install -d -m 755 %i/etc/mozilla -install -c -m 644 fink/prefs.js %i/etc/mozilla/ -ln -sf %p/etc/mozilla/prefs.js %i/lib/mozilla/defaults/pref/fink.js +/usr/bin/install -d -m 755 %i/etc/%n +/usr/bin/install -c -m 644 fink/prefs.js %i/etc/%n/ +/bin/ln -sf %p/etc/%n/prefs.js %i/lib/%n/defaults/pref/fink.js # Install gnome .desktop files. -install -d -m 755 %i/share/applications -install -c -m 644 fink/applications/* %i/share/applications/ +/usr/bin/install -d -m 755 %i/share/applications +/usr/bin/install -c -m 644 fink/applications/* %i/share/applications/ -install -d -m 755 %i/share/pixmaps -install -c -m 644 dist/bin/chrome/icons/default/main-window.xpm %i/share/pixmaps/mozilla.xpm -install -c -m 644 dist/bin/chrome/icons/default/addressbookWindow.xpm %i/share/pixmaps/mozilla-addressbook.xpm -install -c -m 644 dist/bin/chrome/icons/default/chatzilla-window.xpm %i/share/pixmaps/mozilla-chatzilla.xpm -install -c -m 644 dist/bin/chrome/icons/default/editorWindow.xpm %i/share/pixmaps/mozilla-editor.xpm -install -c -m 644 dist/bin/chrome/icons/default/msgcomposeWindow.xpm %i/share/pixmaps/mozilla-mail-composer.xpm -install -c -m 644 dist/bin/chrome/icons/default/messengerWindow.xpm %i/share/pixmaps/mozilla-mailnews.xpm +/usr/bin/install -d -m 755 %i/share/pixmaps +/usr/bin/install -c -m 644 dist/bin/chrome/icons/default/main-window.xpm %i/share/pixmaps/mozilla.xpm +/usr/bin/install -c -m 644 dist/bin/chrome/icons/default/addressbookWindow.xpm %i/share/pixmaps/mozilla-addressbook.xpm +/usr/bin/install -c -m 644 dist/bin/chrome/icons/default/chatzilla-window.xpm %i/share/pixmaps/mozilla-chatzilla.xpm +/usr/bin/install -c -m 644 dist/bin/chrome/icons/default/editorWindow.xpm %i/share/pixmaps/mozilla-editor.xpm +/usr/bin/install -c -m 644 dist/bin/chrome/icons/default/msgcomposeWindow.xpm %i/share/pixmaps/mozilla-mail-composer.xpm +/usr/bin/install -c -m 644 dist/bin/chrome/icons/default/messengerWindow.xpm %i/share/pixmaps/mozilla-mailnews.xpm << SplitOff: << Package: %N-psm - Depends: %N-browser (>= %v-%r) + Depends: %N-browser (= %v-%r) Replaces: %N (<< 1.1.0-4) Description: Mozilla - personal security manager DocFiles: LEGAL LICENSE @@ -105,20 +136,20 @@ fi << Files: << - lib/mozilla/chrome/pipnss.jar - lib/mozilla/chrome/pippki.jar - lib/mozilla/components/libpipboot.dylib - lib/mozilla/components/libpipnss.dylib - lib/mozilla/components/libpippki.dylib - lib/mozilla/components/pipboot.xpt - lib/mozilla/components/pipnss.xpt - lib/mozilla/components/pippki.xpt - var/lib/mozilla/chrome.d/00psm + lib/%N/chrome/pipnss.jar + lib/%N/chrome/pippki.jar + lib/%N/components/libpipboot.dylib + lib/%N/components/libpipnss.dylib + lib/%N/components/libpippki.dylib + lib/%N/components/pipboot.xpt + lib/%N/components/pipnss.xpt + lib/%N/components/pippki.xpt + var/lib/%N/chrome.d/00psm << << SplitOff2: << Package: %N-mailnews - Depends: %N-browser (>= %v-%r) + Depends: %N-browser (= %v-%r) Replaces: %N (<< 1.1.0-4), %N-chatzilla (<< 1.7.2-1) Description: Mozilla - mail and news support DocFiles: LEGAL LICENSE @@ -133,61 +164,61 @@ fi << Files: << - lib/mozilla/chrome/messenger.jar - lib/mozilla/components/addrbook.xpt - lib/mozilla/components/impComm4xMail.xpt - lib/mozilla/components/import.xpt - lib/mozilla/components/libaddrbook.dylib - lib/mozilla/components/libimpComm4xMail.dylib - lib/mozilla/components/libimpText.dylib - lib/mozilla/components/libimport.dylib - lib/mozilla/components/liblocalmail.dylib - lib/mozilla/components/libmailnews.dylib - lib/mozilla/components/libmailview.dylib - lib/mozilla/components/libmime.dylib - lib/mozilla/components/libmimeemitter.dylib - lib/mozilla/components/libmozldap.dylib - lib/mozilla/components/libmsgcompose.dylib - lib/mozilla/components/libmsgdb.dylib - lib/mozilla/components/libmsgimap.dylib - lib/mozilla/components/libmsgmdn.dylib - lib/mozilla/components/libmsgnews.dylib - lib/mozilla/components/libmsgsmime.dylib - lib/mozilla/components/libvcard.dylib - lib/mozilla/components/mailnews.xpt - lib/mozilla/components/mailview.xpt - lib/mozilla/components/mdn-service.js - lib/mozilla/components/mime.xpt - lib/mozilla/components/msgbase.xpt - lib/mozilla/components/msgcompose.xpt - lib/mozilla/components/msgdb.xpt - lib/mozilla/components/msgimap.xpt - lib/mozilla/components/msglocal.xpt - lib/mozilla/components/msgnews.xpt - lib/mozilla/components/msgsearch.xpt - lib/mozilla/components/msgsmime.xpt - lib/mozilla/components/nsLDAPPrefsService.js - lib/mozilla/components/smime-service.js - lib/mozilla/libldap50.dylib - lib/mozilla/libprldap50.dylib - lib/mozilla/defaults/pref/mailnews.js - lib/mozilla/defaults/pref/mdn.js - lib/mozilla/defaults/pref/smime.js + lib/%N/chrome/messenger.jar + lib/%N/components/addrbook.xpt + lib/%N/components/impComm4xMail.xpt + lib/%N/components/import.xpt + lib/%N/components/libaddrbook.dylib + lib/%N/components/libimpComm4xMail.dylib + lib/%N/components/libimpText.dylib + lib/%N/components/libimport.dylib + lib/%N/components/liblocalmail.dylib + lib/%N/components/libmailnews.dylib + lib/%N/components/libmailview.dylib + lib/%N/components/libmime.dylib + lib/%N/components/libmimeemitter.dylib + lib/%N/components/libmozldap.dylib + lib/%N/components/libmsgcompose.dylib + lib/%N/components/libmsgdb.dylib + lib/%N/components/libmsgimap.dylib + lib/%N/components/libmsgmdn.dylib + lib/%N/components/libmsgnews.dylib + lib/%N/components/libmsgsmime.dylib + lib/%N/components/libvcard.dylib + lib/%N/components/mailnews.xpt + lib/%N/components/mailview.xpt + lib/%N/components/mdn-service.js + lib/%N/components/mime.xpt + lib/%N/components/msgbase.xpt + lib/%N/components/msgcompose.xpt + lib/%N/components/msgdb.xpt + lib/%N/components/msgimap.xpt + lib/%N/components/msglocal.xpt + lib/%N/components/msgnews.xpt + lib/%N/components/msgsearch.xpt + lib/%N/components/msgsmime.xpt + lib/%N/components/nsLDAPPrefsService.js + lib/%N/components/smime-service.js + lib/%N/libldap50.dylib + lib/%N/libprldap50.dylib + lib/%N/defaults/pref/mailnews.js + lib/%N/defaults/pref/mdn.js + lib/%N/defaults/pref/smime.js share/applications/Mozilla-mail-composer.desktop share/applications/Mozilla-mail.desktop share/applications/Mozilla-news.desktop share/pixmaps/mozilla-mail-composer.xpm share/pixmaps/mozilla-mailnews.xpm - var/lib/mozilla/chrome.d/00mailnews + var/lib/%N/chrome.d/00mailnews << Shlibs: << - %p/lib/mozilla/libldap50.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libprldap50.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libldap50.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libprldap50.dylib 1.0.0 %n (>= 1.1.0-4) << << SplitOff3: << Package: %N-chatzilla - Depends: %N-browser (>= %v-%r) + Depends: %N-browser (= %v-%r) Replaces: %N (<< 1.1.0-4) Description: Mozilla - irc client DocFiles: LEGAL LICENSE @@ -202,16 +233,16 @@ fi << Files: << - lib/mozilla/chrome/chatzilla.jar - lib/mozilla/chrome/icons/default/chatzilla* - lib/mozilla/components/chatzilla-service.js + lib/%N/chrome/chatzilla.jar + lib/%N/chrome/icons/default/chatzilla* + lib/%N/components/chatzilla-service.js share/applications/Mozilla-chatzilla.desktop - var/lib/mozilla/chrome.d/00chatzilla + var/lib/%N/chrome.d/00chatzilla << << SplitOff4: << Package: %N-js-debugger - Depends: %N-browser (>= %v-%r) + Depends: %N-browser (= %v-%r) Replaces: %N (<< 1.1.0-4) Description: Mozilla - java script debugger DocFiles: LEGAL LICENSE @@ -226,15 +257,15 @@ fi << Files: << - lib/mozilla/chrome/venkman.jar - lib/mozilla/chrome/icons/default/venkman* - lib/mozilla/components/venkman-service.js - var/lib/mozilla/chrome.d/00js-debugger + lib/%N/chrome/venkman.jar + lib/%N/chrome/icons/default/venkman* + lib/%N/components/venkman-service.js + var/lib/%N/chrome.d/00js-debugger << << SplitOff5: << Package: %N-dom-inspector - Depends: %N-browser (>= %v-%r) + Depends: %N-browser (= %v-%r), %N-shlibs (= %v-%r) Replaces: %N (<< 1.1.0-4) Description: Mozilla - DOM inspector DocFiles: LEGAL LICENSE @@ -249,45 +280,62 @@ fi << Files: << - lib/mozilla/chrome/inspector.jar - lib/mozilla/components/inspector.xpt - lib/mozilla/components/libinspector.dylib - lib/mozilla/defaults/pref/inspector.js - lib/mozilla/res/inspector - var/lib/mozilla/chrome.d/00dom-inspector + lib/%N/chrome/inspector.jar + lib/%N/components/inspector.xpt + lib/%N/components/libinspector.dylib + lib/%N/defaults/pref/inspector.js + lib/%N/res/inspector + var/lib/%N/chrome.d/00dom-inspector << << SplitOff6: << Package: %N-shlibs Replaces: %N (<< 1.1.0-4), %N-mailnews (<< 1.3-1) - Depends: atk1-shlibs, freetype2-hinting-shlibs | freetype2-shlibs, gettext, glib2-shlibs, gtk+2-shlibs, libiconv, pango1-xft2-shlibs, x11-shlibs + Depends: << + atk1-shlibs, + freetype2-hinting-shlibs | freetype2-shlibs, + glib2-shlibs (>= 2.12.0-1), + gtk+2-shlibs, + libgettext3-shlibs, + libiconv, + pango1-xft2-shlibs, + x11-shlibs + << DocFiles: LEGAL LICENSE Description: Mozilla - shared libraries - Files: lib/mozilla/lib*.dylib + Files: << + lib/%N/lib*.dylib + << Shlibs: << - %p/lib/mozilla/libgkgfx.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libgtkembedmoz.dylib 1.0.0 %n (>= 1.3-1) - %p/lib/mozilla/libgtkxtbin.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libjsj.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libmozjs.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libmsgbaseutil.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libnspr4.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libnss3.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libnssckbi.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libplc4.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libplds4.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libsmime3.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libsoftokn3.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libssl3.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libxlibrgb.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libxpcom.dylib 1.0.0 %n (>= 1.1.0-4) - %p/lib/mozilla/libxpcom_compat.dylib 1.0.0 %n (>= 1.5.1-4) - %p/lib/mozilla/libxpistub.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libgkgfx.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libgtkembedmoz.dylib 1.0.0 %n (>= 1.3-1) + %p/lib/%N/libgtkxtbin.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libjsj.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libmozjs.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libmsgbaseutil.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libnspr4.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libnss3.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libnssckbi.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libplc4.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libplds4.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libsmime3.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libsoftokn3.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libssl3.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libxlibrgb.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libxpcom.dylib 1.0.0 %n (>= 1.1.0-4) + %p/lib/%N/libxpcom_compat.dylib 1.0.0 %n (>= 1.5.1-4) + %p/lib/%N/libxpistub.dylib 1.0.0 %n (>= 1.1.0-4) << << SplitOff7: << Package: %N-dev - Depends: %N-shlibs (>= %v-%r), gettext, glib2-shlibs, libiconv, libidl2-shlibs, pkgconfig + Depends: << + %N-shlibs (= %v-%r), + glib2-shlibs (>= 2.12.0-1), + libgettext3-shlibs, + libiconv, + libidl2-shlibs (>= 0.8.7-1) + << Conflicts: << mozilla-dev, firefox-dev, @@ -304,14 +352,30 @@ BuildDependsOnly: True Description: Mozilla - development headers and libraries DocFiles: LEGAL LICENSE - Files: bin/mozilla-config include lib/pkgconfig lib/mozilla/xp* share/aclocal share/idl + Files: bin/mozilla-config include lib/pkgconfig lib/%N/xp* share/aclocal share/idl << SplitOff8: << Package: %N-browser - Depends: %N-shlibs (>= %v-%r), atk1-shlibs, freetype2-hinting-shlibs | freetype2-shlibs, gettext, glib2-shlibs, gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs, gtk+2-shlibs, libbonobo2-shlibs, libiconv, libjpeg-shlibs, libpng3-shlibs, orbit2-shlibs, pango1-xft2-shlibs, x11-shlibs, libmng2-shlibs + Depends: << + %N-shlibs (= %v-%r), + atk1-shlibs, + freetype2-hinting-shlibs | freetype2-shlibs, + gconf2-shlibs, + glib2-shlibs (>= 2.12.0-1), + gnome-vfs2-unified-shlibs, + gtk+2-shlibs, + libbonobo2-shlibs, + libgettext3-shlibs, + libiconv, + libjpeg-shlibs, + libpng3-shlibs (>= 1.2.8-1), + orbit2-shlibs, + pango1-xft2-shlibs, + x11-shlibs + << Replaces: %N (<< 1.1.0-4) Conflicts: %N-browser-xft2 - ConfFiles: %p/etc/mozilla/prefs.js + ConfFiles: %p/etc/%N/prefs.js Description: Mozilla - web browser DocFiles: LEGAL LICENSE PostInstScript: << @@ -319,15 +383,13 @@ update-mozilla-chrome || true fi << - PostRmScript: << - case "$1" in - purge) - rm -rf %p/lib/mozilla/chrome/overlayinfo - rm -f %p/lib/mozilla/chrome/*.rdf - rm -f %p/lib/mozilla/component.reg - rm -f %p/lib/mozilla/components/*.dat - ;; - esac + PreRmScript: << + # clear out those leftovers that were created by registering + /bin/rm -rf %p/lib/%N/chrome/overlayinfo + /bin/rm -f %p/lib/%N/chrome/*.rdf + /bin/rm -f %p/lib/%N/components/*.dat +# /bin/rm -f %p/lib/%N/components.ini +# /bin/rm -rf %p/lib/%N/extensions << Files: bin etc lib sbin share/applications share/man share/pixmaps var << @@ -335,7 +397,8 @@ Description: Mozilla - full install DescDetail: << Mozilla is an open-source web browser, designed for standards -compliance, performance and portability. +compliance, performance and portability. Package includes the full +software suite (browser, mailnews, IRC, DOMi, JS debugger, etc). << DescPort: << If you feel your configuration is not saved, check permission of ~/.mozilla @@ -346,6 +409,9 @@ - uses gtk+2 toolkit. - pass exact install directory to the linker - forces to see local ldap headers. + +Not functional on intel. See: +https://sourceforge.net/tracker/index.php?func=detail&aid=1459616&group_id=17203&atid=117203 << License: OSI-Approved Maintainer: None <fink-devel@lists.sourceforge.net> @@ -353,6 +419,9 @@ Originally packaged by Masanori Sekino. Using fink's freetype2 _ has to wait till version 1.8 to use freetype2 >> 2.1.7 Using SetCC and SetCXX rather than SetCPPFLAGS to build correctly in presence of freetype1 - Have no trace of a dep on libmng2 _ leaving it or the moment till explanation found + + No dep needed on libmng2 since mng support was removed from the mozilla code a while back. + + mozilla-1.7.13 is the last official released build. The Mozilla suite was EOL'd after this version, and all attention was put on Firefox/Thunderbird. If you want a newer version of the suite, install the package seamonkey. << Homepage: http://www.mozilla.org ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits