diff options
| author | jlam <jlam> | 2006-03-14 01:14:26 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-03-14 01:14:26 +0000 |
| commit | 16bf253b1b8893b5c99da550141b8aff3f02e074 (patch) | |
| tree | 2d76c0a00d07e0939789aa971b834f332c4820c3 /www/firefox | |
| parent | 9cc802b6466cf4c6418f08cf067a4d91f1000a98 (diff) | |
| download | pkgsrc-16bf253b1b8893b5c99da550141b8aff3f02e074.tar.gz | |
Modify the pkginstall framework so that it manages all aspects of
INSTALL/DEINSTALL script creation within pkgsrc.
If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts. If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:
INSTALL_SRC= ${PKGDIR}/INSTALL
DEINSTALL_SRC= # emtpy
As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts. By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).
In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework. The only public variables relating to the templates are:
INSTALL_SRC INSTALL_TEMPLATE
DEINSTALL_SRC DEINSTALL_TEMPLATE
HEADER_TEMPLATE
The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/Makefile-firefox.common | 4 | ||||
| -rw-r--r-- | www/firefox/Makefile.common | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common index 0d8a3ecb211..e80663b49a0 100644 --- a/www/firefox/Makefile-firefox.common +++ b/www/firefox/Makefile-firefox.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile-firefox.common,v 1.27 2006/02/06 00:37:54 ghen Exp $ +# $NetBSD: Makefile-firefox.common,v 1.28 2006/03/14 01:14:34 jlam Exp $ MOZILLA_BIN= firefox-bin MOZ_VER= 1.5.0.1 @@ -34,4 +34,4 @@ MESSAGE= ${.CURDIR}/../../www/firefox/MESSAGE .include "../../www/firefox/Makefile.common" -INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../www/firefox/INSTALL +INSTALL_TEMPLATE+= ${.CURDIR}/../../www/firefox/INSTALL diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index 1463b029263..7b0124d20e4 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2006/02/07 09:21:38 rillig Exp $ +# $NetBSD: Makefile.common,v 1.8 2006/03/14 01:14:34 jlam Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -18,7 +18,7 @@ USE_LANGUAGES= c c++ USE_TOOLS+= autoconf213 gmake perl pkg-config GNU_CONFIGURE= yes -INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../www/mozilla/INSTALL +INSTALL_TEMPLATE+= ${.CURDIR}/../../www/mozilla/INSTALL CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess CONFIG_GUESS_OVERRIDE+= nsprpub/build/autoconf/config.guess |