summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authormycroft <mycroft@pkgsrc.org>2000-10-30 00:01:17 +0000
committermycroft <mycroft@pkgsrc.org>2000-10-30 00:01:17 +0000
commit2ca08fc716e9259450409cb28386b5bbf0e5f0af (patch)
tree76c9d61d60704a50f4c34f7cd19e54146b57d167 /www
parentb2608af88c619726b642af493e566f3f360b23ae (diff)
downloadpkgsrc-2ca08fc716e9259450409cb28386b5bbf0e5f0af.tar.gz
Changes from taya:
* Run regxpcom and regchrome at package install time. (Otherwise time stamp changes can cause the registry to be regenerated the first time Mozilla is started up anyway.) * Arrange to have user-{locale,skins}.rdf generated automatically.
Diffstat (limited to 'www')
-rw-r--r--www/mozilla/Makefile10
-rw-r--r--www/mozilla/pkg/PLIST-ELF49
-rw-r--r--www/mozilla/pkg/PLIST-a.out49
-rwxr-xr-xwww/mozilla/scripts/moz-install13
4 files changed, 64 insertions, 57 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index f5db1a7c489..a486fc84966 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2000/10/28 18:55:24 mycroft Exp $
+# $NetBSD: Makefile,v 1.46 2000/10/30 00:01:17 mycroft Exp $
DISTNAME= mozilla-source-M18
-PKGNAME= mozilla-0.m18
+PKGNAME= mozilla-0.m18nb1
WRKSRC= ${WRKDIR}/mozilla
CATEGORIES= www
MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/releases/m18/src/
@@ -45,6 +45,7 @@ SCRIPTS_ENV+= CHMOD=${CHMOD}
SCRIPTS_ENV+= BINOWN=${BINOWN}
SCRIPTS_ENV+= BINGRP=${BINGRP}
SCRIPTS_ENV+= BINMODE=${BINMODE}
+SCRIPTS_ENV+= SETENV=${SETENV}
SHAREMODE?= 644
XPTCFILES+= xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
@@ -62,9 +63,8 @@ pre-configure:
(cd ${WRKSRC} && autoconf)
post-build:
- (cd ${WRKSRC}/dist/bin && \
- ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom && \
- ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome )
+ ${ECHO} skin,install,select,classic/1.0 >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
+ ${ECHO} locale,install,select,en-US >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
do-install:
${SETENV} ${SCRIPTS_ENV} ${SCRIPTDIR}/moz-install
diff --git a/www/mozilla/pkg/PLIST-ELF b/www/mozilla/pkg/PLIST-ELF
index d3c8777387f..009fecd8eaf 100644
--- a/www/mozilla/pkg/PLIST-ELF
+++ b/www/mozilla/pkg/PLIST-ELF
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST-ELF,v 1.5 2000/10/29 09:14:25 mycroft Exp $
-@option extract-in-place
+@comment $NetBSD: PLIST-ELF,v 1.6 2000/10/30 00:01:17 mycroft Exp $
bin/mozilla
-lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
@comment begin PROGRAMS
lib/mozilla/mozilla-bin
lib/mozilla/nsTestSample
@@ -116,9 +113,6 @@ lib/mozilla/plugins/libnullplugin.so
@comment end DSO
@comment begin DATA
lib/mozilla/bloaturls.txt
-lib/mozilla/chrome/all-locales.rdf
-lib/mozilla/chrome/all-packages.rdf
-lib/mozilla/chrome/all-skins.rdf
lib/mozilla/chrome/blue.jar
lib/mozilla/chrome/classic.jar
lib/mozilla/chrome/comm.jar
@@ -127,12 +121,7 @@ lib/mozilla/chrome/en-US.jar
lib/mozilla/chrome/installed-chrome.txt
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
-lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
-lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
lib/mozilla/chrome/toolkit.jar
-lib/mozilla/component.reg
lib/mozilla/components/absync.xpt
lib/mozilla/components/addrbook.xpt
lib/mozilla/components/appshell.xpt
@@ -229,8 +218,6 @@ lib/mozilla/components/xpcom_threads.xpt
lib/mozilla/components/xpcom_xpti.xpt
lib/mozilla/components/xpconnect.xpt
lib/mozilla/components/xpinstall.xpt
-lib/mozilla/components/xpti.dat
-lib/mozilla/components/xptitemp.dat
lib/mozilla/defaults/pref/all.js
lib/mozilla/defaults/pref/config.js
lib/mozilla/defaults/pref/editor.js
@@ -337,6 +324,30 @@ lib/mozilla/searchplugins/google.src
lib/mozilla/splash.xpm
lib/mozilla/xpcshell
@comment end DATA
+@exec env MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
+@exec env MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
+@unexec rm %D/lib/mozilla/component.reg
+@unexec rm %D/lib/mozilla/chrome/user-locales.rdf
+@unexec rm %D/lib/mozilla/chrome/user-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/all-locales.rdf
+@unexec rm %D/lib/mozilla/chrome/all-packages.rdf
+@unexec rm %D/lib/mozilla/chrome/all-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
+@unexec rm %D/lib/mozilla/components/xpti.dat
+@unexec rm %D/lib/mozilla/components/xptitemp.dat
+@dirrm lib/mozilla/chrome/overlayinfo/navigator/content
+@dirrm lib/mozilla/chrome/overlayinfo/navigator
+@dirrm lib/mozilla/chrome/overlayinfo/messenger/content
+@dirrm lib/mozilla/chrome/overlayinfo/messenger
+@dirrm lib/mozilla/chrome/overlayinfo/editor/content
+@dirrm lib/mozilla/chrome/overlayinfo/editor
+@dirrm lib/mozilla/chrome/overlayinfo/communicator/content
+@dirrm lib/mozilla/chrome/overlayinfo/communicator
+@dirrm lib/mozilla/chrome/overlayinfo
+@comment begin DIRS
@dirrm lib/mozilla/searchplugins
@dirrm lib/mozilla/res/samples/sampleimages
@dirrm lib/mozilla/res/samples
@@ -353,14 +364,6 @@ lib/mozilla/xpcshell
@dirrm lib/mozilla/defaults/pref
@dirrm lib/mozilla/defaults
@dirrm lib/mozilla/components
-@dirrm lib/mozilla/chrome/overlayinfo/navigator/content
-@dirrm lib/mozilla/chrome/overlayinfo/navigator
-@dirrm lib/mozilla/chrome/overlayinfo/messenger/content
-@dirrm lib/mozilla/chrome/overlayinfo/messenger
-@dirrm lib/mozilla/chrome/overlayinfo/editor/content
-@dirrm lib/mozilla/chrome/overlayinfo/editor
-@dirrm lib/mozilla/chrome/overlayinfo/communicator/content
-@dirrm lib/mozilla/chrome/overlayinfo/communicator
-@dirrm lib/mozilla/chrome/overlayinfo
@dirrm lib/mozilla/chrome
@dirrm lib/mozilla
+@comment end DIRS
diff --git a/www/mozilla/pkg/PLIST-a.out b/www/mozilla/pkg/PLIST-a.out
index 5fbf088f402..324235ed789 100644
--- a/www/mozilla/pkg/PLIST-a.out
+++ b/www/mozilla/pkg/PLIST-a.out
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST-a.out,v 1.5 2000/10/29 09:14:25 mycroft Exp $
-@option extract-in-place
+@comment $NetBSD: PLIST-a.out,v 1.6 2000/10/30 00:01:17 mycroft Exp $
bin/mozilla
-lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
@comment begin PROGRAMS
lib/mozilla/mozilla-bin
lib/mozilla/nsTestSample
@@ -116,9 +113,6 @@ lib/mozilla/plugins/libnullplugin.so.1.0
@comment end DSO
@comment begin DATA
lib/mozilla/bloaturls.txt
-lib/mozilla/chrome/all-locales.rdf
-lib/mozilla/chrome/all-packages.rdf
-lib/mozilla/chrome/all-skins.rdf
lib/mozilla/chrome/blue.jar
lib/mozilla/chrome/classic.jar
lib/mozilla/chrome/comm.jar
@@ -127,12 +121,7 @@ lib/mozilla/chrome/en-US.jar
lib/mozilla/chrome/installed-chrome.txt
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
-lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
-lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
lib/mozilla/chrome/toolkit.jar
-lib/mozilla/component.reg
lib/mozilla/components/absync.xpt
lib/mozilla/components/addrbook.xpt
lib/mozilla/components/appshell.xpt
@@ -229,8 +218,6 @@ lib/mozilla/components/xpcom_threads.xpt
lib/mozilla/components/xpcom_xpti.xpt
lib/mozilla/components/xpconnect.xpt
lib/mozilla/components/xpinstall.xpt
-lib/mozilla/components/xpti.dat
-lib/mozilla/components/xptitemp.dat
lib/mozilla/defaults/pref/all.js
lib/mozilla/defaults/pref/config.js
lib/mozilla/defaults/pref/editor.js
@@ -337,6 +324,30 @@ lib/mozilla/searchplugins/google.src
lib/mozilla/splash.xpm
lib/mozilla/xpcshell
@comment end DATA
+@exec env MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
+@exec env MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
+@unexec rm %D/lib/mozilla/component.reg
+@unexec rm %D/lib/mozilla/chrome/user-locales.rdf
+@unexec rm %D/lib/mozilla/chrome/user-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/all-locales.rdf
+@unexec rm %D/lib/mozilla/chrome/all-packages.rdf
+@unexec rm %D/lib/mozilla/chrome/all-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
+@unexec rm %D/lib/mozilla/components/xpti.dat
+@unexec rm %D/lib/mozilla/components/xptitemp.dat
+@dirrm lib/mozilla/chrome/overlayinfo/navigator/content
+@dirrm lib/mozilla/chrome/overlayinfo/navigator
+@dirrm lib/mozilla/chrome/overlayinfo/messenger/content
+@dirrm lib/mozilla/chrome/overlayinfo/messenger
+@dirrm lib/mozilla/chrome/overlayinfo/editor/content
+@dirrm lib/mozilla/chrome/overlayinfo/editor
+@dirrm lib/mozilla/chrome/overlayinfo/communicator/content
+@dirrm lib/mozilla/chrome/overlayinfo/communicator
+@dirrm lib/mozilla/chrome/overlayinfo
+@comment begin DIRS
@dirrm lib/mozilla/searchplugins
@dirrm lib/mozilla/res/samples/sampleimages
@dirrm lib/mozilla/res/samples
@@ -353,14 +364,6 @@ lib/mozilla/xpcshell
@dirrm lib/mozilla/defaults/pref
@dirrm lib/mozilla/defaults
@dirrm lib/mozilla/components
-@dirrm lib/mozilla/chrome/overlayinfo/navigator/content
-@dirrm lib/mozilla/chrome/overlayinfo/navigator
-@dirrm lib/mozilla/chrome/overlayinfo/messenger/content
-@dirrm lib/mozilla/chrome/overlayinfo/messenger
-@dirrm lib/mozilla/chrome/overlayinfo/editor/content
-@dirrm lib/mozilla/chrome/overlayinfo/editor
-@dirrm lib/mozilla/chrome/overlayinfo/communicator/content
-@dirrm lib/mozilla/chrome/overlayinfo/communicator
-@dirrm lib/mozilla/chrome/overlayinfo
@dirrm lib/mozilla/chrome
@dirrm lib/mozilla
+@comment end DIRS
diff --git a/www/mozilla/scripts/moz-install b/www/mozilla/scripts/moz-install
index 2bf0be59a28..673f31ad6e3 100755
--- a/www/mozilla/scripts/moz-install
+++ b/www/mozilla/scripts/moz-install
@@ -6,7 +6,7 @@ ${CHGRP} ${BINGRP} ${PREFIX}/bin/mozilla
${CHMOD} ${BINMODE} ${PREFIX}/bin/mozilla
# make directories
-for i in `${EGREP} ^@dirrm ${PLIST_SRC} | ${SED} -e 's/^@dirrm//'` ; do
+for i in `${SED} -n -e '/^@comment begin DIRS$/,/^@comment end DIRS$/p' ${PLIST_SRC} | ${EGREP} -v ^@comment | ${SED} -e 's/^@dirrm//'` ; do
${BSD_INSTALL_DATA_DIR} ${PREFIX}/$i
done
@@ -34,8 +34,9 @@ for i in `${SED} -n -e '/^@comment begin DATA$/,/^@comment end DATA$/p' ${PLIST_
${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
done
-# install missing data.
-# those files are generated automatically at first startup
-# without root privilege, those could not be generated and mozilla could not be started
-${BSD_INSTALL_DATA} ${FILESDIR}/user-locales.rdf ${PREFIX}/lib/mozilla/chrome
-${BSD_INSTALL_DATA} ${FILESDIR}/user-skins.rdf ${PREFIX}/lib/mozilla/chrome
+#
+#
+#
+cd ${PREFIX}/lib/mozilla
+${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom
+${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome