For the native firefox and mozilla packages, move the module/extension

registration out of the installation step and into the INSTALL script.
Also, remove the registration commands from the PLIST as well.  Putting
them into the INSTALL script allows for the same commands to be run
in the same way, so that there are fewer differences between installing
from source and installing from a binary package.  Also, this makes
these packages pass CHECK_FILES=yes.  Bump the PKGREVISION of firefox,
firefox-gtk1, mozilla, and mozilla-gtk2.

Also, include bsd.pkg.mk from the package Makefiles, not from within
Makefile.common.  This is a style issue and allows for appending to
variables originally defined in Makefile.common from the package
Makefile.

4 files changed, 24 insertions, 14 deletions

diff --git a/www/firefox/INSTALL b/www/firefox/INSTALL
new file mode 100644
index 00000000000..b14d7a163a5
--- /dev/null
+++ b/www/firefox/INSTALL
@@ -0,0 +1,15 @@
+# $NetBSD: INSTALL,v 1.1 2005/09/17 02:35:19 jlam Exp $
+
+MOZILLA="@MOZILLA@"
+MOZILLA_BIN="@MOZILLA_BIN@"
+MOZILLA_FIVE_HOME="${PKG_PREFIX}/lib/${MOZILLA}"
+export MOZILLA_FIVE_HOME
+
+case ${STAGE} in
+POST-INSTALL)
+	${MKDIR} -p "./tmpdir-${PKGNAME}"
+	LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}" HOME="./tmpdir-${PKGNAME}" \
+		${MOZILLA_FIVE_HOME}/${MOZILLA_BIN} -register
+	${RM} -fr "./tmpdir-${PKGNAME}"
+	;;
+esac
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 954239693a3..b02c7b6ef78 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/09/08 22:03:45 abs Exp $
+# $NetBSD: Makefile,v 1.20 2005/09/17 02:35:19 jlam Exp $
 
 MOZILLA=	firefox
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	2
+PKGREVISION=	3
 
 COMMENT=	Lightweight gecko-based web browser
 
@@ -20,3 +20,4 @@ PKGCONFIG_OVERRIDE+=	build/unix/firefox-xpcom.pc
 PKGCONFIG_OVERRIDE_STAGE=	post-build
 
 .include "../../www/firefox/Makefile-firefox.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index cc65382d5b1..f13327a2675 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.20 2005/07/20 23:33:30 taya Exp $
+# $NetBSD: Makefile-firefox.common,v 1.21 2005/09/17 02:35:19 jlam Exp $
 
 MOZILLA_BIN=	firefox-bin
 MOZ_VER=	1.0.6
@@ -32,15 +32,12 @@ USE_LANGUAGES+=		c++
 BUILD_MATHML=		# defined
 MESSAGE=		${.CURDIR}/../../www/firefox/MESSAGE
 
+.include "../../www/mozilla/Makefile.common"
+
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../www/firefox/INSTALL
+
 pre-install:
 	cd ${WRKSRC}/dist/bin/defaults/profile/ && \
 		${PAX} -Lrw extensions ${WRKSRC}/dist/bin
 	${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
 		${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
-
-post-install:
-	cd ${PREFIX}/lib/${MOZILLA} && \
-	${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. HOME=${WRKSRC} \
-				./${MOZILLA_BIN} -register
-
-.include "../../www/mozilla/Makefile.common"
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 518892a1101..b38dbb23c7d 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/07/14 16:38:41 taya Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/09/17 02:35:19 jlam Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2205,9 +2205,6 @@ include/${MOZILLA}/xultmpl/nsIXULTemplateBuilder.h
 include/${MOZILLA}/zlib/zconf.h
 include/${MOZILLA}/zlib/zlib.h
 @comment end INCLUDE
-@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
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/${MOZILLA_BIN} -register
 @unexec ${RM} %D/lib/${MOZILLA}/extensions/Extensions.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/extensions/installed-extensions-processed.txt
 @unexec ${RM} %D/lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf