[pkgsrc/trunk]: pkgsrc/www regxpcom creates same user config directory ".mozi...

[taya <taya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e707bc78de1f
branches:  trunk
changeset: 476063:e707bc78de1f
user:      taya <taya%pkgsrc.org@localhost>
date:      Wed Jun 02 14:32:22 2004 +0000

description:
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:

 www/mozilla-gtk2/Makefile     |  3 +--
 www/mozilla/Makefile          |  3 +--
 www/mozilla/Makefile.common   |  5 +----
 www/mozilla/files/moz-install |  8 +++-----
 4 files changed, 6 insertions(+), 13 deletions(-)

diffs (67 lines):

diff -r 39a43e6c7c18 -r e707bc78de1f www/mozilla-gtk2/Makefile
--- a/www/mozilla-gtk2/Makefile Wed Jun 02 13:57:33 2004 +0000
+++ b/www/mozilla-gtk2/Makefile Wed Jun 02 14:32:22 2004 +0000
@@ -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 -r 39a43e6c7c18 -r e707bc78de1f www/mozilla/Makefile
--- a/www/mozilla/Makefile      Wed Jun 02 13:57:33 2004 +0000
+++ b/www/mozilla/Makefile      Wed Jun 02 14:32:22 2004 +0000
@@ -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 -r 39a43e6c7c18 -r e707bc78de1f www/mozilla/Makefile.common
--- a/www/mozilla/Makefile.common       Wed Jun 02 13:57:33 2004 +0000
+++ b/www/mozilla/Makefile.common       Wed Jun 02 14:32:22 2004 +0000
@@ -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 @@
 # 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 -r 39a43e6c7c18 -r e707bc78de1f www/mozilla/files/moz-install
--- a/www/mozilla/files/moz-install     Wed Jun 02 13:57:33 2004 +0000
+++ b/www/mozilla/files/moz-install     Wed Jun 02 14:32:22 2004 +0000
@@ -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=. ./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