summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-14 01:14:26 +0000
committerjlam <jlam@pkgsrc.org>2006-03-14 01:14:26 +0000
commitdaad0f3d6ce8b344ce91e35e98ea05abf8e03f2d (patch)
tree2d76c0a00d07e0939789aa971b834f332c4820c3 /pkgtools
parentb1472309671a67b16cab03410ae83bb9d6007baa (diff)
downloadpkgsrc-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 'pkgtools')
-rw-r--r--pkgtools/libkver/Makefile5
-rw-r--r--pkgtools/pkg_alternatives/Makefile4
-rw-r--r--pkgtools/pkg_install/Makefile4
-rw-r--r--pkgtools/xpkgwedge/Makefile4
4 files changed, 5 insertions, 12 deletions
diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile
index d405714dd2b..5bccf71e6db 100644
--- a/pkgtools/libkver/Makefile
+++ b/pkgtools/libkver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:27 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/14 01:14:32 jlam Exp $
DISTNAME= libkver-${VERSION}
CATEGORIES= pkgtools
@@ -34,9 +34,6 @@ PLIST_SUBST+= HAS_SYSCTL="@comment "
FILES_SUBST+= HAS_SYSCTL=false
.endif
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-
INSTALLATION_DIRS+= lib man/man3 man/cat3
.if empty(LDD_SYSCTL:M*libc*)
INSTALLATION_DIRS+= sbin
diff --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile
index 6cd9c4803e2..6fa183927c7 100644
--- a/pkgtools/pkg_alternatives/Makefile
+++ b/pkgtools/pkg_alternatives/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:06 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/14 01:14:32 jlam Exp $
#
DISTNAME= pkg_alternatives-1.3
@@ -21,8 +21,6 @@ DATADIR= ${PREFIX}/share/pkg_alternatives
DBDIR= ${PREFIX}/libdata/pkg_alternatives
EGDIR= ${PREFIX}/share/examples/pkg_alternatives
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= PKG_ALTERNATIVES=${PREFIX}/sbin/pkg_alternatives
REQD_DIRS= ${DBDIR}
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 48956bca17d..dc6b8ee596e 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2006/03/10 22:38:30 jlam Exp $
+# $NetBSD: Makefile,v 1.125 2006/03/14 01:14:32 jlam Exp $
# Notes to package maintainers:
#
@@ -60,8 +60,8 @@ PKG_ADMIN= PKG_DBDIR=${PKG_DBDIR:Q} ${PKG_ADMIN_CMD}
PLIST_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q}
-INSTALL_SRC= ${PKGDIR}/INSTALL
DEINSTALL_SRC= # empty
+INSTALL_SRC= ${PKGDIR}/INSTALL
FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q} \
PKG_TOOLS_BIN=${PKG_TOOLS_BIN:Q} \
MKDIR=${MKDIR:Q}
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 7e03812874f..d6580ede00d 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2006/01/12 19:02:34 joerg Exp $
+# $NetBSD: Makefile,v 1.65 2006/03/14 01:14:32 jlam Exp $
DISTNAME= xpkgwedge-1.15
CATEGORIES= pkgtools devel x11
@@ -30,8 +30,6 @@ PKG_SKIP_REASON+= "xpkgwedge is not needed when X11BASE is LOCALBASE"
CONFLICTS+= mkfontscale-[0-9]*
.endif
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
INSTALLATION_DIRS= bin lib/X11/config
# FONT_PROGS are symlinked from ${X11BASE}/bin to ${PREFIX}/bin to allow