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.

13 files changed, 63 insertions, 43 deletions

diff --git a/www/firefox-gtk1/Makefile b/www/firefox-gtk1/Makefile
index baeca6d42ca..a560978a488 100644
--- a/www/firefox-gtk1/Makefile
+++ b/www/firefox-gtk1/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/09/08 22:03:45 abs Exp $
+# $NetBSD: Makefile,v 1.4 2005/09/17 02:35:19 jlam Exp $
 
 MOZILLA=	firefox-gtk1
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	Lightweight gecko-based web browser built with GTK1
 
 .include "../../www/firefox/Makefile-firefox.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-gtk1/PLIST b/www/firefox-gtk1/PLIST
index b4de04a881d..0d4e070af13 100644
--- a/www/firefox-gtk1/PLIST
+++ b/www/firefox-gtk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/07/14 16:38:42 taya Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/09/17 02:35:19 jlam Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2182,9 +2182,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}/firefox-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
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
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile
index 4bb7fce6511..fd9aa248449 100644
--- a/www/mozilla-gtk2/Makefile
+++ b/www/mozilla-gtk2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2005/09/08 22:03:45 abs Exp $
+# $NetBSD: Makefile,v 1.29 2005/09/17 02:35:20 jlam Exp $
 
 MOZILLA=	mozilla-gtk2
 MOZILLA_BIN=	mozilla-bin
 MOZ_VER=	1.7.11
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	1
+PKGREVISION=	2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 #DISTFILES+=	mozilla-source-1.7.3-libart_lgpl.tar.bz2
@@ -23,4 +23,5 @@ BUILD_CALENDAR=	# defined
 _MOZILLA_USE_GTK2=	# defined
 MOZILLA_USE_XFT=	YES
 
-.include	"../../www/mozilla/Makefile.common"
+.include "../../www/mozilla/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/mozilla-gtk2/PLIST b/www/mozilla-gtk2/PLIST
index 0878c66514e..28ff90dff40 100644
--- a/www/mozilla-gtk2/PLIST
+++ b/www/mozilla-gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/07/24 06:59:32 taya Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/09/17 02:35:20 jlam Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -3074,8 +3074,6 @@ include/${MOZILLA}/nss/swfortt.h
 include/${MOZILLA}/nss/watcomfx.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
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/skin/stylesheets.rdf
diff --git a/www/mozilla/INSTALL b/www/mozilla/INSTALL
new file mode 100644
index 00000000000..9b5d1ea13ee
--- /dev/null
+++ b/www/mozilla/INSTALL
@@ -0,0 +1,17 @@
+# $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}/regxpcom
+	LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}" HOME="./tmpdir-${PKGNAME}" \
+		${MOZILLA_FIVE_HOME}/regchrome
+	${RM} -fr "./tmpdir-${PKGNAME}"
+	;;
+esac
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 774baad2b2c..c28068b8c8c 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.150 2005/09/08 22:03:45 abs Exp $
+# $NetBSD: Makefile,v 1.151 2005/09/17 02:35:19 jlam Exp $
 
 MOZILLA=	mozilla
 MOZILLA_BIN=	mozilla-bin
 MOZ_VER=	1.7.11
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	1
+PKGREVISION=	2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 #DISTFILES+=    mozilla-source-1.7.3-libart_lgpl.tar.bz2
@@ -18,4 +18,5 @@ BUILD_SVG=	# defined
 BUILD_MATHML=	# defined
 BUILD_CALENDAR=	# defined
 
-.include	"../../www/mozilla/Makefile.common"
+.include "../../www/mozilla/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 68b88ba4d1b..5e7e557133d 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.62 2005/08/10 20:56:25 jlam Exp $
+# $NetBSD: Makefile.common,v 1.63 2005/09/17 02:35:19 jlam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-${MOZ_DIST_VER}-source
@@ -9,7 +9,7 @@ CATEGORIES=	www
 MAINTAINER=	taya@NetBSD.org
 HOMEPAGE?=	http://www.mozilla.org/
 
-FILESDIR=	"../../www/mozilla/files"
+FILESDIR=	${.CURDIR}/../../www/mozilla/files
 
 BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
 
@@ -18,6 +18,9 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	autoconf213 gmake perl pkg-config
 GNU_CONFIGURE=	yes
 
+USE_PKGINSTALL=		yes
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../www/mozilla/INSTALL
+
 CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=	nsprpub/build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=	directory/c-sdk/config/autoconf/config.guess
@@ -100,6 +103,8 @@ SCRIPTS_ENV+=	HOME="${WRKDIR}"
 
 PLIST_SUBST+=	MOZILLA=${MOZILLA}
 PLIST_SUBST+=	MOZILLA_BIN=${MOZILLA_BIN}
+FILES_SUBST+=	MOZILLA=${MOZILLA}
+FILES_SUBST+=	MOZILLA_BIN=${MOZILLA_BIN}
 .if ${OBJECT_FMT} == "ELF"
 SO_SUFFIX=	so
 SCRIPTS_ENV+=	MOZ_INSTALL_LIB="${INSTALL_PROGRAM}"
@@ -195,5 +200,3 @@ SUBST_FILES.pc=		build/unix/*.pc.in
 SUBST_SED.pc=		-e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \
 			-e "s|%libdir%|${PREFIX}/lib/${MOZILLA}|g"
 SUBST_MESSAGE.pc=	"Fixing pkgconfig files."
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/mozilla/PLIST b/www/mozilla/PLIST
index e9d9e17a6fa..72612c17c78 100644
--- a/www/mozilla/PLIST
+++ b/www/mozilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2005/07/24 06:59:31 taya Exp $
+@comment $NetBSD: PLIST,v 1.18 2005/09/17 02:35:19 jlam Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -3056,8 +3056,6 @@ include/${MOZILLA}/nss/swfortt.h
 include/${MOZILLA}/nss/watcomfx.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
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/skin/stylesheets.rdf
diff --git a/www/mozilla/files/moz-install b/www/mozilla/files/moz-install
index 9a09b13be8e..4af24b4e958 100755
--- a/www/mozilla/files/moz-install
+++ b/www/mozilla/files/moz-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: moz-install,v 1.12 2004/10/25 18:06:26 jmmv Exp $
+# $NetBSD: moz-install,v 1.13 2005/09/17 02:35:20 jlam 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}
@@ -63,12 +63,6 @@ for i in `${SED} -n -e '/^@comment begin INCLUDE-PUBLIC$/,/^@comment end INCLUDE
 done
 
 ${RM} -f ${TMP_PLIST}
-#
-#
-#
-cd ${PREFIX}/lib/${MOZILLA}
-${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom
-${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome
 
 #
 # remove generated user conf directory ${WRKDIR}/.mozilla