diff options
| author | marcus <marcus@FreeBSD.org> | 2004-06-16 14:58:10 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-06-16 14:58:10 +0800 |
| commit | 73d78e1e1bb280ef341bd39ce4b20754d7c01c80 (patch) | |
| tree | f25ebfa500ffad86bbbb0112915d333c14c44e1a /www/flock | |
| parent | a95bd833b8a7a6a2feb9f495bd4de80725e358ce (diff) | |
| download | freebsd-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/flock')
| -rw-r--r-- | www/flock/Makefile | 4 | ||||
| -rw-r--r-- | www/flock/pkg-install.in | 4 |
2 files changed, 6 insertions, 2 deletions
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 |