aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-06-16 14:58:10 +0800
committermarcus <marcus@FreeBSD.org>2004-06-16 14:58:10 +0800
commit73d78e1e1bb280ef341bd39ce4b20754d7c01c80 (patch)
treef25ebfa500ffad86bbbb0112915d333c14c44e1a /www
parenta95bd833b8a7a6a2feb9f495bd4de80725e358ce (diff)
downloadfreebsd-ports-gnome-73d78e1e1bb280ef341bd39ce4b20754d7c01c80.tar.gz
freebsd-ports-gnome-73d78e1e1bb280ef341bd39ce4b20754d7c01c80.tar.zst
freebsd-ports-gnome-73d78e1e1bb280ef341bd39ce4b20754d7c01c80.zip
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.
Diffstat (limited to 'www')
-rw-r--r--www/firefox-devel/Makefile4
-rw-r--r--www/firefox-devel/pkg-install.in4
-rw-r--r--www/firefox-esr/Makefile4
-rw-r--r--www/firefox-esr/pkg-install.in4
-rw-r--r--www/firefox/Makefile4
-rw-r--r--www/firefox/pkg-install.in4
-rw-r--r--www/firefox10/Makefile4
-rw-r--r--www/firefox10/pkg-install.in4
-rw-r--r--www/firefox15/Makefile4
-rw-r--r--www/firefox15/pkg-install.in4
-rw-r--r--www/firefox3-devel/Makefile4
-rw-r--r--www/firefox3-devel/pkg-install.in4
-rw-r--r--www/firefox35/Makefile4
-rw-r--r--www/firefox35/pkg-install.in4
-rw-r--r--www/firefox36/Makefile4
-rw-r--r--www/firefox36/pkg-install.in4
-rw-r--r--www/flock/Makefile4
-rw-r--r--www/flock/pkg-install.in4
18 files changed, 54 insertions, 18 deletions
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index a05f72056f59..fe0f3114bcdb 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/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-devel/pkg-install.in b/www/firefox-devel/pkg-install.in
index e4158aae3df9..958ace50d56f 100644
--- a/www/firefox-devel/pkg-install.in
+++ b/www/firefox-devel/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
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index a05f72056f59..fe0f3114bcdb 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/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-esr/pkg-install.in b/www/firefox-esr/pkg-install.in
index e4158aae3df9..958ace50d56f 100644
--- a/www/firefox-esr/pkg-install.in
+++ b/www/firefox-esr/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
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
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index a05f72056f59..fe0f3114bcdb 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/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/firefox10/pkg-install.in b/www/firefox10/pkg-install.in
index e4158aae3df9..958ace50d56f 100644
--- a/www/firefox10/pkg-install.in
+++ b/www/firefox10/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
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index a05f72056f59..fe0f3114bcdb 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/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/firefox15/pkg-install.in b/www/firefox15/pkg-install.in
index e4158aae3df9..958ace50d56f 100644
--- a/www/firefox15/pkg-install.in
+++ b/www/firefox15/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
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index a05f72056f59..fe0f3114bcdb 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/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/firefox3-devel/pkg-install.in b/www/firefox3-devel/pkg-install.in
index e4158aae3df9..958ace50d56f 100644
--- a/www/firefox3-devel/pkg-install.in
+++ b/www/firefox3-devel/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
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index a05f72056f59..fe0f3114bcdb 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/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/firefox35/pkg-install.in b/www/firefox35/pkg-install.in
index e4158aae3df9..958ace50d56f 100644
--- a/www/firefox35/pkg-install.in
+++ b/www/firefox35/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
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index a05f72056f59..fe0f3114bcdb 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/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/firefox36/pkg-install.in b/www/firefox36/pkg-install.in
index e4158aae3df9..958ace50d56f 100644
--- a/www/firefox36/pkg-install.in
+++ b/www/firefox36/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
diff --git a/www/flock/Makefile b/www/flock/Makefile
index a05f72056f59..fe0f3114bcdb 100644
--- a/www/flock/Makefile
+++ b/www/flock/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/flock/pkg-install.in b/www/flock/pkg-install.in
index e4158aae3df9..958ace50d56f 100644
--- a/www/flock/pkg-install.in
+++ b/www/flock/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