[pkgsrc/trunk]: pkgsrc/www For the native firefox and mozilla packages, move ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www For the native firefox and mozilla packages, move ...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:16:39 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/845df5bded45
branches:  trunk
changeset: 499258:845df5bded45
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 17 02:35:19 2005 +0000

description:
For the native firefox and mozilla packages, move the module/extension
registration out of the installation step and into the INSTALL script.
Also, remove the registration commands from the PLIST as well.  Putting
them into the INSTALL script allows for the same commands to be run
in the same way, so that there are fewer differences between installing
from source and installing from a binary package.  Also, this makes
these packages pass CHECK_FILES=yes.  Bump the PKGREVISION of firefox,
firefox-gtk1, mozilla, and mozilla-gtk2.

Also, include bsd.pkg.mk from the package Makefiles, not from within
Makefile.common.  This is a style issue and allows for appending to
variables originally defined in Makefile.common from the package
Makefile.

diffstat:

 www/firefox-gtk1/Makefile           |   5 +++--
 www/firefox-gtk1/PLIST              |   5 +----
 www/firefox/INSTALL                 |  15 +++++++++++++++
 www/firefox/Makefile                |   5 +++--
 www/firefox/Makefile-firefox.common |  13 +++++--------
 www/firefox/PLIST                   |   5 +----
 www/mozilla-gtk2/Makefile           |   7 ++++---
 www/mozilla-gtk2/PLIST              |   4 +---
 www/mozilla/INSTALL                 |  17 +++++++++++++++++
 www/mozilla/Makefile                |   7 ++++---
 www/mozilla/Makefile.common         |  11 +++++++----
 www/mozilla/PLIST                   |   4 +---
 www/mozilla/files/moz-install       |   8 +-------
 13 files changed, 63 insertions(+), 43 deletions(-)

diffs (290 lines):

diff -r b7ecef1c2a45 -r 845df5bded45 www/firefox-gtk1/Makefile
--- a/www/firefox-gtk1/Makefile Fri Sep 16 18:16:27 2005 +0000
+++ b/www/firefox-gtk1/Makefile Sat Sep 17 02:35:19 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/09/08 22:03:45 abs Exp $
+# $NetBSD: Makefile,v 1.4 2005/09/17 02:35:19 jlam Exp $
 
 MOZILLA=       firefox-gtk1
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Lightweight gecko-based web browser built with GTK1
 
 .include "../../www/firefox/Makefile-firefox.common"
+.include "../../mk/bsd.pkg.mk"
diff -r b7ecef1c2a45 -r 845df5bded45 www/firefox-gtk1/PLIST
--- a/www/firefox-gtk1/PLIST    Fri Sep 16 18:16:27 2005 +0000
+++ b/www/firefox-gtk1/PLIST    Sat Sep 17 02:35:19 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/07/14 16:38:42 taya Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/09/17 02:35:19 jlam Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2182,9 +2182,6 @@
 include/${MOZILLA}/zlib/zconf.h
 include/${MOZILLA}/zlib/zlib.h
 @comment end INCLUDE
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/firefox-bin -register
 @unexec ${RM} %D/lib/${MOZILLA}/extensions/Extensions.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/extensions/installed-extensions-processed.txt
 @unexec ${RM} %D/lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
diff -r b7ecef1c2a45 -r 845df5bded45 www/firefox/INSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/INSTALL       Sat Sep 17 02:35:19 2005 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: INSTALL,v 1.1 2005/09/17 02:35:19 jlam Exp $
+
+MOZILLA="@MOZILLA@"
+MOZILLA_BIN="@MOZILLA_BIN@"
+MOZILLA_FIVE_HOME="${PKG_PREFIX}/lib/${MOZILLA}"
+export MOZILLA_FIVE_HOME
+
+case ${STAGE} in
+POST-INSTALL)
+       ${MKDIR} -p "./tmpdir-${PKGNAME}"
+       LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}" HOME="./tmpdir-${PKGNAME}" \
+               ${MOZILLA_FIVE_HOME}/${MOZILLA_BIN} -register
+       ${RM} -fr "./tmpdir-${PKGNAME}"
+       ;;
+esac
diff -r b7ecef1c2a45 -r 845df5bded45 www/firefox/Makefile
--- a/www/firefox/Makefile      Fri Sep 16 18:16:27 2005 +0000
+++ b/www/firefox/Makefile      Sat Sep 17 02:35:19 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/09/08 22:03:45 abs Exp $
+# $NetBSD: Makefile,v 1.20 2005/09/17 02:35:19 jlam Exp $
 
 MOZILLA=       firefox
 EXTRACT_SUFX=  .tar.bz2
-PKGREVISION=   2
+PKGREVISION=   3
 
 COMMENT=       Lightweight gecko-based web browser
 
@@ -20,3 +20,4 @@
 PKGCONFIG_OVERRIDE_STAGE=      post-build
 
 .include "../../www/firefox/Makefile-firefox.common"
+.include "../../mk/bsd.pkg.mk"
diff -r b7ecef1c2a45 -r 845df5bded45 www/firefox/Makefile-firefox.common
--- a/www/firefox/Makefile-firefox.common       Fri Sep 16 18:16:27 2005 +0000
+++ b/www/firefox/Makefile-firefox.common       Sat Sep 17 02:35:19 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.20 2005/07/20 23:33:30 taya Exp $
+# $NetBSD: Makefile-firefox.common,v 1.21 2005/09/17 02:35:19 jlam Exp $
 
 MOZILLA_BIN=   firefox-bin
 MOZ_VER=       1.0.6
@@ -32,15 +32,12 @@
 BUILD_MATHML=          # defined
 MESSAGE=               ${.CURDIR}/../../www/firefox/MESSAGE
 
+.include "../../www/mozilla/Makefile.common"
+
+INSTALL_EXTRA_TMPL+=   ${.CURDIR}/../../www/firefox/INSTALL
+
 pre-install:
        cd ${WRKSRC}/dist/bin/defaults/profile/ && \
                ${PAX} -Lrw extensions ${WRKSRC}/dist/bin
        ${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
                ${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
-
-post-install:
-       cd ${PREFIX}/lib/${MOZILLA} && \
-       ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. HOME=${WRKSRC} \
-                               ./${MOZILLA_BIN} -register
-
-.include "../../www/mozilla/Makefile.common"
diff -r b7ecef1c2a45 -r 845df5bded45 www/firefox/PLIST
--- a/www/firefox/PLIST Fri Sep 16 18:16:27 2005 +0000
+++ b/www/firefox/PLIST Sat Sep 17 02:35:19 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/07/14 16:38:41 taya Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/09/17 02:35:19 jlam Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2205,9 +2205,6 @@
 include/${MOZILLA}/zlib/zconf.h
 include/${MOZILLA}/zlib/zlib.h
 @comment end INCLUDE
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/${MOZILLA_BIN} -register
 @unexec ${RM} %D/lib/${MOZILLA}/extensions/Extensions.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/extensions/installed-extensions-processed.txt
 @unexec ${RM} %D/lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
diff -r b7ecef1c2a45 -r 845df5bded45 www/mozilla-gtk2/Makefile
--- a/www/mozilla-gtk2/Makefile Fri Sep 16 18:16:27 2005 +0000
+++ b/www/mozilla-gtk2/Makefile Sat Sep 17 02:35:19 2005 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2005/09/08 22:03:45 abs Exp $
+# $NetBSD: Makefile,v 1.29 2005/09/17 02:35:20 jlam Exp $
 
 MOZILLA=       mozilla-gtk2
 MOZILLA_BIN=   mozilla-bin
 MOZ_VER=       1.7.11
 EXTRACT_SUFX=  .tar.bz2
-PKGREVISION=   1
+PKGREVISION=   2
 
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
 #DISTFILES+=   mozilla-source-1.7.3-libart_lgpl.tar.bz2
@@ -23,4 +23,5 @@
 _MOZILLA_USE_GTK2=     # defined
 MOZILLA_USE_XFT=       YES
 
-.include       "../../www/mozilla/Makefile.common"
+.include "../../www/mozilla/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff -r b7ecef1c2a45 -r 845df5bded45 www/mozilla-gtk2/PLIST
--- a/www/mozilla-gtk2/PLIST    Fri Sep 16 18:16:27 2005 +0000
+++ b/www/mozilla-gtk2/PLIST    Sat Sep 17 02:35:19 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/07/24 06:59:32 taya Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/09/17 02:35:20 jlam Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -3074,8 +3074,6 @@
 include/${MOZILLA}/nss/watcomfx.h
 include/${MOZILLA}/seccmd/secutil.h
 @comment end INCLUDE-PUBLIC
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/skin/stylesheets.rdf
diff -r b7ecef1c2a45 -r 845df5bded45 www/mozilla/INSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla/INSTALL       Sat Sep 17 02:35:19 2005 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: INSTALL,v 1.1 2005/09/17 02:35:19 jlam Exp $
+
+MOZILLA="@MOZILLA@"
+MOZILLA_BIN="@MOZILLA_BIN@"
+MOZILLA_FIVE_HOME="${PKG_PREFIX}/lib/${MOZILLA}"
+export MOZILLA_FIVE_HOME
+
+case ${STAGE} in
+POST-INSTALL)
+       ${MKDIR} -p "./tmpdir-${PKGNAME}"
+       LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}" HOME="./tmpdir-${PKGNAME}" \
+               ${MOZILLA_FIVE_HOME}/regxpcom
+       LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}" HOME="./tmpdir-${PKGNAME}" \
+               ${MOZILLA_FIVE_HOME}/regchrome
+       ${RM} -fr "./tmpdir-${PKGNAME}"
+       ;;
+esac
diff -r b7ecef1c2a45 -r 845df5bded45 www/mozilla/Makefile
--- a/www/mozilla/Makefile      Fri Sep 16 18:16:27 2005 +0000
+++ b/www/mozilla/Makefile      Sat Sep 17 02:35:19 2005 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.150 2005/09/08 22:03:45 abs Exp $
+# $NetBSD: Makefile,v 1.151 2005/09/17 02:35:19 jlam Exp $
 
 MOZILLA=       mozilla
 MOZILLA_BIN=   mozilla-bin
 MOZ_VER=       1.7.11
 EXTRACT_SUFX=  .tar.bz2
-PKGREVISION=   1
+PKGREVISION=   2
 
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
 #DISTFILES+=    mozilla-source-1.7.3-libart_lgpl.tar.bz2
@@ -18,4 +18,5 @@
 BUILD_MATHML=  # defined
 BUILD_CALENDAR=        # defined
 
-.include       "../../www/mozilla/Makefile.common"
+.include "../../www/mozilla/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff -r b7ecef1c2a45 -r 845df5bded45 www/mozilla/Makefile.common
--- a/www/mozilla/Makefile.common       Fri Sep 16 18:16:27 2005 +0000
+++ b/www/mozilla/Makefile.common       Sat Sep 17 02:35:19 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.62 2005/08/10 20:56:25 jlam Exp $
+# $NetBSD: Makefile.common,v 1.63 2005/09/17 02:35:19 jlam Exp $
 
 MOZ_DIST_VER?= ${MOZ_VER}
 DISTNAME?=     mozilla-${MOZ_DIST_VER}-source
@@ -9,7 +9,7 @@
 MAINTAINER=    taya%NetBSD.org@localhost
 HOMEPAGE?=     http://www.mozilla.org/
 
-FILESDIR=      "../../www/mozilla/files"
+FILESDIR=      ${.CURDIR}/../../www/mozilla/files
 
 BUILD_DEPENDS+=        zip>=2.3:../../archivers/zip
 
@@ -18,6 +18,9 @@
 USE_TOOLS+=    autoconf213 gmake perl pkg-config
 GNU_CONFIGURE= yes
 
+USE_PKGINSTALL=                yes
+INSTALL_EXTRA_TMPL+=   ${.CURDIR}/../../www/mozilla/INSTALL
+
 CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=        nsprpub/build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=        directory/c-sdk/config/autoconf/config.guess
@@ -100,6 +103,8 @@
 
 PLIST_SUBST+=  MOZILLA=${MOZILLA}
 PLIST_SUBST+=  MOZILLA_BIN=${MOZILLA_BIN}
+FILES_SUBST+=  MOZILLA=${MOZILLA}
+FILES_SUBST+=  MOZILLA_BIN=${MOZILLA_BIN}
 .if ${OBJECT_FMT} == "ELF"
 SO_SUFFIX=     so
 SCRIPTS_ENV+=  MOZ_INSTALL_LIB="${INSTALL_PROGRAM}"
@@ -195,5 +200,3 @@
 SUBST_SED.pc=          -e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \
                        -e "s|%libdir%|${PREFIX}/lib/${MOZILLA}|g"
 SUBST_MESSAGE.pc=      "Fixing pkgconfig files."
-
-.include "../../mk/bsd.pkg.mk"
diff -r b7ecef1c2a45 -r 845df5bded45 www/mozilla/PLIST
--- a/www/mozilla/PLIST Fri Sep 16 18:16:27 2005 +0000
+++ b/www/mozilla/PLIST Sat Sep 17 02:35:19 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2005/07/24 06:59:31 taya Exp $
+@comment $NetBSD: PLIST,v 1.18 2005/09/17 02:35:19 jlam Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -3056,8 +3056,6 @@
 include/${MOZILLA}/nss/watcomfx.h
 include/${MOZILLA}/seccmd/secutil.h
 @comment end INCLUDE-PUBLIC
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/skin/stylesheets.rdf
diff -r b7ecef1c2a45 -r 845df5bded45 www/mozilla/files/moz-install
--- a/www/mozilla/files/moz-install     Fri Sep 16 18:16:27 2005 +0000
+++ b/www/mozilla/files/moz-install     Sat Sep 17 02:35:19 2005 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: moz-install,v 1.12 2004/10/25 18:06:26 jmmv Exp $
+# $NetBSD: moz-install,v 1.13 2005/09/17 02:35:20 jlam 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}
@@ -63,12 +63,6 @@
 done
 
 ${RM} -f ${TMP_PLIST}
-#
-#
-#
-cd ${PREFIX}/lib/${MOZILLA}
-${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom
-${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome
 
 #
 # remove generated user conf directory ${WRKDIR}/.mozilla
Prev by Date: [pkgsrc/trunk]: pkgsrc/net/partysip use the BIND4 (?) nameserver interface ra...
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/p5-Pod-Simple The checksum on the distfile ch...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net/partysip use the BIND4 (?) nameserver interface ra...
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/p5-Pod-Simple The checksum on the distfile ch...
Indexes:
Home | Main Index | Thread Index | Old Index