diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-14 01:14:26 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-14 01:14:26 +0000 |
| commit | daad0f3d6ce8b344ce91e35e98ea05abf8e03f2d (patch) | |
| tree | 2d76c0a00d07e0939789aa971b834f332c4820c3 /comms | |
| parent | b1472309671a67b16cab03410ae83bb9d6007baa (diff) | |
| download | pkgsrc-daad0f3d6ce8b344ce91e35e98ea05abf8e03f2d.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 'comms')
| -rw-r--r-- | comms/efax/Makefile | 6 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/Makefile | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/comms/efax/Makefile b/comms/efax/Makefile index 217764a4c45..149e7868cbd 100644 --- a/comms/efax/Makefile +++ b/comms/efax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:04 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:27 jlam Exp $ DISTNAME= efax-0.9 CATEGORIES= comms @@ -10,10 +10,6 @@ COMMENT= Collection of small programs for sending and receiving faxes CONFLICTS= kdeutils<3.1 - -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - post-patch: ${SED} -e 's:@PREFIX@:${PREFIX}:g; \ s:@LOCALBASE@:${LOCALBASE}:g; \ diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index fcc0e831c39..cd2debf8dac 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2006/03/05 16:27:23 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2006/03/14 01:14:27 jlam Exp $ DISTNAME= mgetty1.1.31-Jul24 PKGNAME= mgetty-1.1.31 @@ -17,9 +17,6 @@ CONFLICTS= hylafax-[0-9]* WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - MAKE_ENV+= MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q} USE_TOOLS+= makeinfo |