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 /misc | |
| 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 'misc')
| -rw-r--r-- | misc/jitterbug/Makefile | 4 | ||||
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 5 | ||||
| -rw-r--r-- | misc/rpm/Makefile | 5 |
3 files changed, 5 insertions, 9 deletions
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index 4a9eae52b8d..2fe8d6fd021 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/03/10 20:18:38 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2006/03/14 01:14:30 jlam Exp $ DISTNAME= jitterbug-1.6.2 PKGREVISION= 1 @@ -19,8 +19,8 @@ ADDGROUP= ${LOCALBASE}/sbin/groupadd .endif WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/source -INSTALL_SRC= ${PKGDIR}/INSTALL DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= ${PKGDIR}/INSTALL CONFIGDIR= ${WRKDIR}/${PKGNAME_NOREV}/config DOCSDIR= ${WRKDIR}/${PKGNAME_NOREV}/docs CGIBINDIR= libexec/cgi-bin diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index bba04668add..cad68cefded 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/11 11:15:39 ghen Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:31 jlam Exp $ PKGNAME= openoffice-bin-2.0.2 CATEGORIES= misc @@ -42,8 +42,7 @@ PLIST_SRC+= ${WRKDIR}/PLIST # ARCH= ${MACHINE_ARCH:C/i[3-6]86/i386/g} -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL .if ${OPSYS} == "NetBSD" . if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 85622aeb648..56db4035acd 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2006/02/05 23:10:14 joerg Exp $ +# $NetBSD: Makefile,v 1.58 2006/03/14 01:14:31 jlam Exp $ DISTNAME= rpm-2.5.4 PKGREVISION= 5 @@ -18,9 +18,6 @@ NOT_FOR_PLATFORM+= Interix-*-* # getmntent() is nonpublic; needs porting USE_TOOLS+= gmake GNU_CONFIGURE= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - # this is needed instead of USE_PKGLOCALEDIR CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} |