diff options
| author | taya <taya@pkgsrc.org> | 2004-06-02 14:32:22 +0000 |
|---|---|---|
| committer | taya <taya@pkgsrc.org> | 2004-06-02 14:32:22 +0000 |
| commit | 0245c8cc7e88a16408bde9ceab24b8050feb8fb8 (patch) | |
| tree | 064661c2cb63048fc7626a5be267bc94ec117611 /www/mozilla | |
| parent | 844526decd28eedc3e9369dfd9ce3493e054ddbc (diff) | |
| download | pkgsrc-0245c8cc7e88a16408bde9ceab24b8050feb8fb8.tar.gz | |
regxpcom creates same user config directory ".mozilla"
even if it's main app creates another user config directory.
e.g. firefox creates .phoenix, thunderbird creates .thunderbird
so no need to define user config directory for each package based on mozilla.
simply remove ${WRKDIR}/.mozilla is enough
Diffstat (limited to 'www/mozilla')
| -rw-r--r-- | www/mozilla/Makefile | 3 | ||||
| -rw-r--r-- | www/mozilla/Makefile.common | 5 | ||||
| -rwxr-xr-x | www/mozilla/files/moz-install | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 691224fde36..afc960112eb 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.130 2004/06/01 15:01:17 taya Exp $ +# $NetBSD: Makefile,v 1.131 2004/06/02 14:32:22 taya Exp $ MOZILLA= mozilla MOZILLA_BIN= mozilla-bin -MOZCONFDIR= .mozilla MOZ_VER= 1.6 PKGREVISION= 2 EXTRACT_SUFX= .tar.bz2 diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 82f342719df..6aafaf98b67 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2004/06/01 22:41:21 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.41 2004/06/02 14:32:22 taya Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-source-${MOZ_DIST_VER} @@ -88,9 +88,6 @@ CONFIGURE_ARGS+= --enable-xinerama # avoid creating a .mozilla directory in the users home # directory SCRIPTS_ENV+= HOME="${WRKDIR}" -.if !empty(MOZCONFDIR) -SCRIPTS_ENV+= TMPMOZCONFDIR="${WRKDIR}/${MOZCONFDIR}" -.endif PLIST_SUBST+= MOZILLA=${MOZILLA} PLIST_SUBST+= MOZILLA_BIN=${MOZILLA_BIN} diff --git a/www/mozilla/files/moz-install b/www/mozilla/files/moz-install index 7c57c33694e..6f331d617d0 100755 --- a/www/mozilla/files/moz-install +++ b/www/mozilla/files/moz-install @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: moz-install,v 1.9 2004/06/01 15:01:17 taya Exp $ +# $NetBSD: moz-install,v 1.10 2004/06/02 14:32:22 taya 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} @@ -65,8 +65,6 @@ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome # -# remove generated user conf directory (e.g. ${WRKSRC}/.mozilla) +# remove generated user conf directory ${WRKDIR}/.mozilla # -if [ x"${TMPMOZCONFDIR}" != x ] ; then - ${RM} -rf ${TMPMOZCONFDIR} -fi +${RM} -rf ${WRKDIR}/.mozilla |