From 73d78e1e1bb280ef341bd39ce4b20754d7c01c80 Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Wed, 16 Jun 2004 06:58:10 +0000
Subject: Fix a typo in the pkg-install script, and add a hack so that firefox
 does not need to be run as root before running it as other users.

---
 www/firefox/Makefile       | 4 +++-
 www/firefox/pkg-install.in | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'www/firefox')

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index a05f72056f59..fe0f3114bcdb 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -177,7 +177,9 @@ do-install:
 	cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX}
 
 post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor
diff --git a/www/firefox/pkg-install.in b/www/firefox/pkg-install.in
index e4158aae3df9..958ace50d56f 100644
--- a/www/firefox/pkg-install.in
+++ b/www/firefox/pkg-install.in
@@ -21,9 +21,11 @@ rm -rf ${MOZDIR}/chrome/overlayinfo
 rm -f ${MOZDIR}/chrome/*.rdf
 mkdir -p ${MOZDIR}/chrome/overlayinfo
 rm -f ${MOZDIR}/component.reg
+rm -rf ${MOZDIR}/extensions
 
 LD_LIBRARY_PATH=${MOZDIR} MOZILLA_FIVE_HOME=${MOZDIR} ${REGXPCOM} || true
-LD_LIBRARY_PATH=${MOZDIR} MOZILLA_FIVE_HOME=${MOZDIR} ${REGXPCHROME} || true
+LD_LIBRARY_PATH=${MOZDIR} MOZILLA_FIVE_HOME=${MOZDIR} ${REGCHROME} || true
 touch ${MOZDIR}/chrome/user-skins.rdf ${MOZDIR}/chrome/user-locales.rdf
+cp -rp ${MOZDIR}/defaults/profile/extensions ${MOZDIR}
 
 exit 0
-- 
cgit