summaryrefslogtreecommitdiff
path: root/emulators
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 /emulators
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 'emulators')
-rw-r--r--emulators/compat12/Makefile4
-rw-r--r--emulators/compat13/Makefile4
-rw-r--r--emulators/compat14-crypto/Makefile4
-rw-r--r--emulators/compat14/Makefile4
-rw-r--r--emulators/freebsd_lib/Makefile4
-rw-r--r--emulators/netbsd32_compat14/Makefile4
-rw-r--r--emulators/netbsd32_compat15/Makefile4
-rw-r--r--emulators/netbsd32_compat16/Makefile4
-rw-r--r--emulators/osf1_lib/Makefile4
-rw-r--r--emulators/suse100_gtk2/Makefile3
-rw-r--r--emulators/suse91_base/Makefile4
-rw-r--r--emulators/suse91_gtk2/Makefile3
-rw-r--r--emulators/suse_base/Makefile4
-rw-r--r--emulators/vmware-module/Makefile4
-rw-r--r--emulators/vmware-module3/Makefile4
15 files changed, 27 insertions, 31 deletions
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index dee7d23c9a8..a34da03361a 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:29:34 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/14 01:14:27 jlam Exp $
#
DISTNAME= compat12-${MACHINE_ARCH}
@@ -16,8 +16,6 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-ns32k \
NO_BUILD= yes
NO_MTREE= yes
SHLIB_HANDLING= NO
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index 2f738a1e10f..77b43164d67 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:29:34 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:27 jlam Exp $
#
DISTNAME= compat13-${MACHINE_ARCH}${PKGMINOR}
@@ -19,8 +19,6 @@ NOT_FOR_PLATFORM= NetBSD-1.3*-*
NO_MTREE= yes
NO_BUILD= yes
SHLIB_HANDLING= NO
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile
index 353ccec5a11..3d86b1cf952 100644
--- a/emulators/compat14-crypto/Makefile
+++ b/emulators/compat14-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:34 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:28 jlam Exp $
#
DISTNAME= compat14-crypto-${MACHINE_ARCH}-${VERSION}
@@ -23,8 +23,6 @@ CRYPTO= YES
NO_MTREE= yes
NO_BUILD= yes
SHLIB_HANDLING= NO
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile
index 18a4fb1051d..2fc10b63203 100644
--- a/emulators/compat14/Makefile
+++ b/emulators/compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:29:34 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:28 jlam Exp $
#
DISTNAME= compat14-${MACHINE_ARCH}-${VERSION}
@@ -21,8 +21,6 @@ NOT_FOR_PLATFORM= NetBSD-1.3*-* NetBSD-1.4*-*
NO_MTREE= yes
NO_BUILD= yes
SHLIB_HANDLING= NO
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index fb1b4ad4e9c..5cbc1aca1f5 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:35 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/14 01:14:28 jlam Exp $
#
DISTNAME= freebsd_lib-2.2.7
@@ -13,6 +13,8 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386
WRKSRC= ${WRKDIR}
NO_BUILD= yes
+INSTALL_SRC= ${PKGDIR}/INSTALL
+DEINSTALL_SRC= # empty
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/emul/freebsd
diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile
index 53846ee4a70..943ff88ff7c 100644
--- a/emulators/netbsd32_compat14/Makefile
+++ b/emulators/netbsd32_compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:29:35 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:28 jlam Exp $
#
DISTNAME= compat14-${MACHINE32_ARCH}-${VERSION}
@@ -29,8 +29,6 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-x86_64
NO_MTREE= yes
NO_BUILD= yes
SHLIB_HANDLING= NO
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile
index 438dfae20a6..ef41429b455 100644
--- a/emulators/netbsd32_compat15/Makefile
+++ b/emulators/netbsd32_compat15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:35 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
@@ -23,8 +23,6 @@ ONLY_FOR_PLATFORM= NetBSD-*-sparc64
NO_MTREE= yes
NO_BUILD= yes
SHLIB_HANDLING= NO
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q}
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile
index 3a0b04c7b1c..71387c927f8 100644
--- a/emulators/netbsd32_compat16/Makefile
+++ b/emulators/netbsd32_compat16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:35 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
@@ -32,8 +32,6 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-x86_64
NO_MTREE= yes
NO_BUILD= yes
SHLIB_HANDLING= NO
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR:Q}
FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile
index c3cd37d6a9e..f481657ac9a 100644
--- a/emulators/osf1_lib/Makefile
+++ b/emulators/osf1_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:02 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/14 01:14:28 jlam Exp $
DISTNAME= netscape-4.7-3.alpha
PKGNAME= osf1_lib-1.1
@@ -29,6 +29,8 @@ EMULDIR= ${PREFIX}/${EMULSUBDIR}
EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
NO_BUILD= yes
+INSTALL_SRC= ${PKGDIR}/INSTALL
+DEINSTALL_SRC= # empty
RPMARGS= -i usr/lib -i usr/bin ${DISTDIR}/${DISTFILES}
diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile
index 07beecbd236..edcfa0ed360 100644
--- a/emulators/suse100_gtk2/Makefile
+++ b/emulators/suse100_gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/09 20:38:51 tonio Exp $
+# $NetBSD: Makefile,v 1.2 2006/03/14 01:14:28 jlam Exp $
DISTNAME= suse_gtk2-${SUSE_VERSION}
CATEGORIES= emulators
@@ -23,7 +23,6 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
# Initialize gtk/pango modules.
FILES_SUBST+= EMULDIR=${EMULDIR:Q}
PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
-INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL
.if exists(Makefile.${MACHINE_ARCH})
.include "Makefile.${MACHINE_ARCH}"
diff --git a/emulators/suse91_base/Makefile b/emulators/suse91_base/Makefile
index 3d1ad6a4e78..c163f437365 100644
--- a/emulators/suse91_base/Makefile
+++ b/emulators/suse91_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/01 22:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/14 01:14:28 jlam Exp $
DISTNAME= suse_base-${SUSE_VERSION}
PKGREVISION= 9
@@ -17,6 +17,8 @@ CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/dev/.*
CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
EXTRACT_ONLY= # empty
+DEINSTALL_SRC= # empty
+INSTALL_SRC= ${PKGDIR}/INSTALL
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
diff --git a/emulators/suse91_gtk2/Makefile b/emulators/suse91_gtk2/Makefile
index d5e87d3c48b..342a34fa691 100644
--- a/emulators/suse91_gtk2/Makefile
+++ b/emulators/suse91_gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:36 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:28 jlam Exp $
DISTNAME= suse_gtk2-${SUSE_VERSION}
PKGREVISION= 5
@@ -24,7 +24,6 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
# Initialize gtk/pango modules.
FILES_SUBST+= EMULDIR=${EMULDIR:Q}
PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
-INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL
.if exists(Makefile.${MACHINE_ARCH})
.include "Makefile.${MACHINE_ARCH}"
diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile
index d3a8a4be7fa..7808553d500 100644
--- a/emulators/suse_base/Makefile
+++ b/emulators/suse_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/03/04 21:29:36 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2006/03/14 01:14:28 jlam Exp $
DISTNAME= suse_base-${SUSE_VERSION}
PKGREVISION= 8
@@ -14,6 +14,8 @@ COMMENT= Linux compatibility package
CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
EXTRACT_ONLY= # empty
+DEINSTALL_SRC= # empty
+INSTALL_SRC= ${PKGDIR}/INSTALL
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= aaa_dir.rpm gppshare.rpm ncurses.rpm \
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile
index 2a2968816a5..3cb2f447eac 100644
--- a/emulators/vmware-module/Makefile
+++ b/emulators/vmware-module/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:37 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/14 01:14:28 jlam Exp $
DISTNAME= vmware-netbsd-1.2
PKGNAME= vmware-module-1.2
@@ -18,6 +18,8 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
+DEINSTALL_SRC= # empty
+INSTALL_SRC= ${PKGDIR}/INSTALL
NO_SRC_ON_FTP= already there
diff --git a/emulators/vmware-module3/Makefile b/emulators/vmware-module3/Makefile
index 6394a6b0e17..014f77af7f3 100644
--- a/emulators/vmware-module3/Makefile
+++ b/emulators/vmware-module3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/09/28 20:52:21 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:28 jlam Exp $
DISTNAME= vmware-netbsd-3.2.1.7
PKGNAME= vmware-module-3.2.1.7
@@ -15,6 +15,8 @@ CONFLICTS= vmware-module-1.*
ONLY_FOR_PLATFORM= NetBSD-*-i386
NO_CONFIGURE= yes
+DEINSTALL_SRC= # empty
+INSTALL_SRC= ${PKGDIR}/INSTALL
NO_SRC_ON_FTP= already there
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 20:20:00 +0000