Date: Sun, 24 Mar 2002 14:31:27 -0500 From: David Magda <dmagda@magda.ca> To: Joe Marcus Clarke <marcus@marcuscom.com> Cc: gnome@freebsd.org Subject: www/mozilla patches (Re: mozilla freebsd port) Message-ID: <20020324143122.A24949@number6.magda.ca> In-Reply-To: <1016946124.259.7.camel@gyros.marcuscom.com>; from marcus@marcuscom.com on Sun, Mar 24, 2002 at 12:02:04AM -0500 References: <20020323105016.A37809@number6.magda.ca> <1016900918.3942.2.camel@shumai.marcuscom.com> <20020323200055.A54523@number6.magda.ca> <1016946124.259.7.camel@gyros.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Mar 24, 2002 at 12:02:04AM -0500, Joe Marcus Clarke wrote:
[...]
> You can use a PLIST_SUB to conditionally turn files "on and off" in
> pkg-plist. Have a look at net/netatalk (among others) for an example.
Figured out PLIST_SUB.
The new patch for the Makefile which fixes the pkg-plist problem for:
mail & news, LDAP, and Chatzilla. I've only tested it with www/mozilla,
not www/mozilla-{headers,embedded}.
----- CUT HERE -----
--- Makefile Tue Mar 19 03:41:44 2002
+++ Makefile.patched Sun Mar 24 14:18:23 2002
@@ -47,8 +47,6 @@
--enable-double-buffer \
--enable-dtd-debug \
--enable-jsd \
- --enable-ldap \
- --enable-mailnews \
--enable-mathml \
--disable-md \
--disable-optimize \
@@ -64,9 +62,31 @@
--with-system-mng=${LOCALBASE} \
--with-system-png=${LOCALBASE} \
--with-pthreads
+
+# LDAP is only used with mail and news so disable both together
+.if defined(WITHOUT_MAILNEWS)
+CONFIGURE_ARGS+= --disable-mailnews --disable-ldap
+PLIST_SUB+= MOZILLAMAILNEWS="@comment "
+PLIST_SUB+= MOZILLALDAP="@comment "
+.else
+# wants mail and news, but not LDAP
+.if defined(WITHOUT_LDAP)
+CONFIGURE_ARGS+= --disable-ldap
+PLIST_SUB+= MOZILLAMAILNEWS=""
+PLIST_SUB+= MOZILLALDAP="@comment "
+.else # WITHOUT_LDAP
+PLIST_SUB+= MOZILLAMAILNEWS=""
+PLIST_SUB+= MOZILLALDAP=""
+.endif
+.endif
+
.if !defined(WITHOUT_CHATZILLA)
CONFIGURE_ARGS+= --enable-extensions=default,irc,xmlterm
+PLIST_SUB+= MOZILLACHATZILLA=""
+.else
+PLIST_SUB+= MOZILLACHATZILLA="@comment "
.endif
+
CONFIGURE_ENV= MOZ_INTERNAL_LIBART_LGPL=1
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
MOZ_INTERNAL_LIBART_LGPL=1
@@ -91,5 +111,6 @@
${INSTALL_SCRIPT} ${WRKSRC}/mozilla ${PREFIX}/bin
${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \
${PREFIX}/lib/mozilla/plugins/libjavaplugin_oji.so
+ ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/mozilla
.include <bsd.port.mk>
----- CUT HERE -----
And here is the diff for 'pkg-plist' (quite a few lines to it):
----- CUT HERE -----
--- pkg-plist Thu Mar 14 15:21:05 2002
+++ pkg-plist.patched Sun Mar 24 14:15:26 2002
@@ -1,14 +1,14 @@
bin/mozilla
-lib/mozilla/DocStream
-lib/mozilla/HelloWorld
-lib/mozilla/INSTALL.xmlterm
+%%MOZILLACHATZILLA%%lib/mozilla/DocStream
+%%MOZILLACHATZILLA%%lib/mozilla/HelloWorld
+%%MOZILLACHATZILLA%%lib/mozilla/INSTALL.xmlterm
lib/mozilla/TestGtkEmbed
lib/mozilla/TestGtkEmbedChild
lib/mozilla/TestGtkEmbedNotebook
lib/mozilla/TestGtkEmbedSocket
lib/mozilla/bloaturls.txt
lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/chatzilla.jar
+%%MOZILLACHATZILLA%%lib/mozilla/chrome/chatzilla.jar
lib/mozilla/chrome/chrome.rdf
lib/mozilla/chrome/chromelist.txt
lib/mozilla/chrome/classic.jar
@@ -23,10 +23,10 @@
lib/mozilla/chrome/help.jar
lib/mozilla/chrome/inspector.jar
lib/mozilla/chrome/installed-chrome.txt
-lib/mozilla/chrome/messenger.jar
+%%MOZILLAMAILNEWS%%lib/mozilla/chrome/messenger.jar
lib/mozilla/chrome/modern.jar
lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
-lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+%%MOZILLAMAILNEWS%%lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
@@ -34,18 +34,18 @@
lib/mozilla/chrome/pippki.jar
lib/mozilla/chrome/toolkit.jar
lib/mozilla/chrome/venkman.jar
-lib/mozilla/chrome/xmlterm.jar
+%%MOZILLACHATZILLA%%lib/mozilla/chrome/xmlterm.jar
lib/mozilla/component.reg
-lib/mozilla/components/absync.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/absync.xpt
lib/mozilla/components/accessibility.xpt
-lib/mozilla/components/addrbook.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/addrbook.xpt
lib/mozilla/components/appshell.xpt
lib/mozilla/components/autocomplete.xpt
lib/mozilla/components/autoconfig.xpt
lib/mozilla/components/bookmarks.xpt
lib/mozilla/components/caps.xpt
lib/mozilla/components/chardet.xpt
-lib/mozilla/components/chatzilla-service.js
+%%MOZILLACHATZILLA%%lib/mozilla/components/chatzilla-service.js
lib/mozilla/components/chrome.xpt
lib/mozilla/components/commandhandler.xpt
lib/mozilla/components/composer.xpt
@@ -80,7 +80,7 @@
lib/mozilla/components/history.xpt
lib/mozilla/components/htmlparser.xpt
lib/mozilla/components/imglib2.xpt
-lib/mozilla/components/import.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/import.xpt
lib/mozilla/components/inspector.xpt
lib/mozilla/components/intl.xpt
lib/mozilla/components/jar.xpt
@@ -91,9 +91,9 @@
lib/mozilla/components/layout_base.xpt
lib/mozilla/components/layout_xul.xpt
lib/mozilla/components/layout_xul_outliner.xpt
-lib/mozilla/components/libabsyncsvc.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libabsyncsvc.so
lib/mozilla/components/libaccessibility.so
-lib/mozilla/components/libaddrbook.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libaddrbook.so
lib/mozilla/components/libappcomps.so
lib/mozilla/components/libautoconfig.so
lib/mozilla/components/libcaps.so
@@ -121,29 +121,29 @@
lib/mozilla/components/libimgmng.so
lib/mozilla/components/libimgpng.so
lib/mozilla/components/libimgppm.so
-lib/mozilla/components/libimpText.so
-lib/mozilla/components/libimport.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libimpText.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libimport.so
lib/mozilla/components/libinspector.so
lib/mozilla/components/libjar50.so
lib/mozilla/components/libjsd.so
lib/mozilla/components/libjsdom.so
lib/mozilla/components/libjsloader.so
lib/mozilla/components/libjsurl.so
-lib/mozilla/components/liblocalmail.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/liblocalmail.so
lib/mozilla/components/liblwbrk.so
-lib/mozilla/components/libmailnews.so
-lib/mozilla/components/libmime.so
-lib/mozilla/components/libmimeemitter.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libmailnews.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libmime.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libmimeemitter.so
lib/mozilla/components/libmork.so
lib/mozilla/components/libmozbrwsr.so
lib/mozilla/components/libmozfind.so
-lib/mozilla/components/libmozldap.so
+%%MOZILLALDAP%%lib/mozilla/components/libmozldap.so
lib/mozilla/components/libmozxfer.so
-lib/mozilla/components/libmsgcompose.so
-lib/mozilla/components/libmsgdb.so
-lib/mozilla/components/libmsgimap.so
-lib/mozilla/components/libmsgnews.so
-lib/mozilla/components/libmsgsmime.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgcompose.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgdb.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgimap.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgnews.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgsmime.so
lib/mozilla/components/libnecko.so
lib/mozilla/components/libnecko2.so
lib/mozilla/components/libnkcache.so
@@ -174,33 +174,33 @@
lib/mozilla/components/libucvtw2.so
lib/mozilla/components/libunicharutil.so
lib/mozilla/components/liburiloader.so
-lib/mozilla/components/libvcard.so
+%%MOZILLAMAILNEWS%%lib/mozilla/components/libvcard.so
lib/mozilla/components/libwallet.so
lib/mozilla/components/libwalletviewers.so
lib/mozilla/components/libwebbrwsr.so
lib/mozilla/components/libwidget_gtk.so
lib/mozilla/components/libxmlextras.so
-lib/mozilla/components/libxmlterm.so
+%%MOZILLACHATZILLA%%lib/mozilla/components/libxmlterm.so
lib/mozilla/components/libxpconnect.so
lib/mozilla/components/libxpinstall.so
lib/mozilla/components/libxremote_client.so
lib/mozilla/components/libxremoteservice.so
lib/mozilla/components/locale.xpt
-lib/mozilla/components/mailnews.xpt
-lib/mozilla/components/mime.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/mailnews.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/mime.xpt
lib/mozilla/components/mimetype.xpt
lib/mozilla/components/mozbrwsr.xpt
lib/mozilla/components/mozfind.xpt
-lib/mozilla/components/mozldap.xpt
+%%MOZILLALDAP%%lib/mozilla/components/mozldap.xpt
lib/mozilla/components/mozxfer.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
+%%MOZILLAMAILNEWS%%lib/mozilla/components/msgbase.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/msgcompose.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/msgdb.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/msgimap.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/msglocal.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/msgnews.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/msgsearch.xpt
+%%MOZILLAMAILNEWS%%lib/mozilla/components/msgsmime.xpt
lib/mozilla/components/necko.xpt
lib/mozilla/components/necko_about.xpt
lib/mozilla/components/necko_cache.xpt
@@ -218,7 +218,7 @@
lib/mozilla/components/nsDictionary.js
lib/mozilla/components/nsFilePicker.js
lib/mozilla/components/nsHelperAppDlg.js
-lib/mozilla/components/nsLDAPPrefsService.js
+%%MOZILLALDAP%%lib/mozilla/components/nsLDAPPrefsService.js
lib/mozilla/components/nsProgressDialog.js
lib/mozilla/components/nsProxyAutoConfig.js
lib/mozilla/components/nsSidebar.js
@@ -241,7 +241,7 @@
lib/mozilla/components/shistory.xpt
lib/mozilla/components/sidebar.xpt
lib/mozilla/components/signonviewer.xpt
-lib/mozilla/components/smime-service.js
+%%MOZILLAMAILNEWS%%lib/mozilla/components/smime-service.js
lib/mozilla/components/timebomb.xpt
lib/mozilla/components/transformiix.xpt
lib/mozilla/components/txmgr.xpt
@@ -264,8 +264,8 @@
lib/mozilla/components/xmlextras.xpt
lib/mozilla/components/xmlschema.xpt
lib/mozilla/components/xmlsoap.xpt
-lib/mozilla/components/xmlterm-service.js
-lib/mozilla/components/xmlterm.xpt
+%%MOZILLACHATZILLA%%lib/mozilla/components/xmlterm-service.js
+%%MOZILLACHATZILLA%%lib/mozilla/components/xmlterm.xpt
lib/mozilla/components/xpcom_base.xpt
lib/mozilla/components/xpcom_components.xpt
lib/mozilla/components/xpcom_ds.xpt
@@ -286,7 +286,7 @@
lib/mozilla/defaults/pref/inspector.js
lib/mozilla/defaults/pref/mailnews.js
lib/mozilla/defaults/pref/security-prefs.js
-lib/mozilla/defaults/pref/smime.js
+%%MOZILLAMAILNEWS%%lib/mozilla/defaults/pref/smime.js
lib/mozilla/defaults/pref/unix.js
lib/mozilla/defaults/pref/xpinstall.js
lib/mozilla/defaults/profile/US/bookmarks.html
@@ -310,8 +310,8 @@
lib/mozilla/defaults/wallet/SchemaStrings.tbl
lib/mozilla/defaults/wallet/StateSchema.tbl
lib/mozilla/defaults/wallet/VcardSchema.tbl
-lib/mozilla/dirver
-lib/mozilla/escape
+%%MOZILLALDAP%%lib/mozilla/dirver
+%%MOZILLACHATZILLA%%lib/mozilla/escape
lib/mozilla/icons/mozicon16.xpm
lib/mozilla/icons/mozicon50.xpm
lib/mozilla/libgkgfx.so
@@ -319,11 +319,11 @@
lib/mozilla/libgtksuperwin.so
lib/mozilla/libgtkxtbin.so
lib/mozilla/libjsj.so
-lib/mozilla/liblber40.so
-lib/mozilla/libldap40.so
+%%MOZILLALDAP%%lib/mozilla/liblber40.so
+%%MOZILLALDAP%%lib/mozilla/libldap40.so
lib/mozilla/libmoz_art_lgpl.so
lib/mozilla/libmozjs.so
-lib/mozilla/libmsgbaseutil.so
+%%MOZILLAMAILNEWS%%lib/mozilla/libmsgbaseutil.so
lib/mozilla/libnspr4.so
lib/mozilla/libnss3.so
lib/mozilla/libnssckbi.so
@@ -525,12 +525,12 @@
lib/mozilla/searchplugins/lxrmozilla.src
lib/mozilla/searchplugins/mozilla.gif
lib/mozilla/searchplugins/mozilla.src
-lib/mozilla/teststream
+%%MOZILLACHATZILLA%%lib/mozilla/teststream
lib/mozilla/timebombgen
-lib/mozilla/xcat
-lib/mozilla/xenv
-lib/mozilla/xls
-lib/mozilla/xmlterm
+%%MOZILLACHATZILLA%%lib/mozilla/xcat
+%%MOZILLACHATZILLA%%lib/mozilla/xenv
+%%MOZILLACHATZILLA%%lib/mozilla/xls
+%%MOZILLACHATZILLA%%lib/mozilla/xmlterm
lib/mozilla/xpcshell
lib/mozilla/xpicleanup
lib/mozilla/xpidl
@@ -569,8 +569,8 @@
@dirrm lib/mozilla/chrome/overlayinfo/messenger
@dirrm lib/mozilla/chrome/overlayinfo/inspector/content
@dirrm lib/mozilla/chrome/overlayinfo/inspector
-@dirrm lib/mozilla/chrome/overlayinfo/editor/content
-@dirrm lib/mozilla/chrome/overlayinfo/editor
+%%MOZILLAMAILNEWS%%@dirrm lib/mozilla/chrome/overlayinfo/editor/content
+%%MOZILLAMAILNEWS%%@dirrm lib/mozilla/chrome/overlayinfo/editor
@dirrm lib/mozilla/chrome/overlayinfo/communicator/content
@dirrm lib/mozilla/chrome/overlayinfo/communicator
@dirrm lib/mozilla/chrome/overlayinfo
----- CUT HERE -----
--
David Magda <dmagda at ee.ryerson.ca>
Because the innovator has for enemies all those who have done well under
the old conditions, and lukewarm defenders in those who may do well
under the new. -- Niccolo Machiavelli, _The Prince_, Chapter VI
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020324143122.A24949>