diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/mozilla-gtk2/Makefile | 3 | ||||
| -rw-r--r-- | www/mozilla/Makefile | 3 | ||||
| -rw-r--r-- | www/mozilla/Makefile.common | 5 | ||||
| -rwxr-xr-x | www/mozilla/files/moz-install | 8 |
4 files changed, 6 insertions, 13 deletions
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile index c697247c676..ed14adb309e 100644 --- a/www/mozilla-gtk2/Makefile +++ b/www/mozilla-gtk2/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2004/06/01 15:02:55 taya Exp $ +# $NetBSD: Makefile,v 1.8 2004/06/02 14:32:58 taya Exp $ MOZILLA= mozilla-gtk2 MOZILLA_BIN= mozilla-bin -MOZCONFDIR= .mozilla MOZ_VER= 1.6 PKGREVISION= 4 EXTRACT_SUFX= .tar.bz2 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 |