From b61a012292970cd0bc8dd9a6f135f22684c91e61 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 17 Sep 2005 02:35:19 +0000
Subject: 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.
---
 www/firefox-gtk1/Makefile | 5 +++--
 www/firefox-gtk1/PLIST    | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'www/firefox-gtk1')

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
-- 
cgit v1.2.3