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.
jsonn · Mar 14, 2006 · d6d702f · d6d702f
1 parent 529381d
commit d6d702f
Show file tree

Hide file tree

Showing 144 changed files with 355 additions and 519 deletions.
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:26 jlam Exp $
 
 DISTNAME=		gqmpeg-0.91.1
 PKGREVISION=		4
@@ -23,8 +23,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		GNOME_DATADIR=${PREFIX}/share
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"

diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: Makefile,v 1.89 2006/03/14 01:14:26 jlam Exp $
 
 DISTNAME=		gqmpeg-0.20.0
 PKGREVISION=		9
@@ -19,8 +19,6 @@ USE_DIRS+=		xdg-1.2
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--without-included-gettext

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2006/03/14 01:14:26 jlam Exp $
 
 DISTNAME=	xmcd-3.0.2
 PKGREVISION=    9
@@ -15,9 +15,6 @@ PATCH_DIST_STRIP=	-p1
 
 WRKSRC=			${WRKDIR}/xmcd-3.0
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 USE_IMAKE=		yes
 MAKE_ENV+=		BATCH_BINDIR=${PREFIX}/bin
 MAKE_ENV+=		BATCH_LIBDIR=${PREFIX}/lib/X11

diff --git a/audio/xmms-meta-input/Makefile b/audio/xmms-meta-input/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:18 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:26 jlam Exp $
 #
 
 DISTNAME=		xmms-meta-input-0.4
@@ -11,6 +11,8 @@ HOMEPAGE=		http://www.corbac.com/page3.html
 COMMENT=		XMMS plugin wrapper for shell scripts
 
 INSTALLATION_DIRS=	lib/xmms/Input
+DEINSTALL_SRC=		${PKGDIR}/DEINSTALL
+INSTALL_SRC=		# empty
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libmetainput.so ${PREFIX}/lib/xmms/Input

diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/02/04 15:22:06 adrianp Exp $
+# $NetBSD: Makefile,v 1.29 2006/03/14 01:14:26 jlam Exp $
 
 DISTNAME=	ircd-hybrid-7.2.0
 EXTRACT_SUFX=	.tgz
@@ -23,7 +23,6 @@ BUILD_DEFS+=	IRCD_HYBRID_SYSLOG_FACILITY IRCD_HYBRID_NICLEN \
 PKG_SYSCONFSUBDIR=	ircd-hybrid
 HYBRID_EG=		${PREFIX}/share/examples/ircd-hybrid
 HYBRID_DOC=		${PREFIX}/share/doc/ircd-hybrid
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 RCD_SCRIPTS=		ircd-hybrid
 
 CONF_FILES_PERMS=	${HYBRID_EG}/example.conf ${PKG_SYSCONFDIR}/ircd.conf \

diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/01/04 18:04:12 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/03/14 01:14:27 jlam Exp $
 #
 
 DISTNAME=		silc-server-1.0.2
@@ -18,8 +18,6 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool */*/*/libtool
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 .include "../../mk/bsd.prefs.mk"
 
 SILCD_USER?=		silcd

diff --git 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
@@ -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

diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		1
@@ -19,8 +19,6 @@ CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER:Q}
 PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--with-pthreads
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-
 PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
 RCD_SCRIPTS=		mysqld

diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		1
@@ -18,8 +18,6 @@ CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER:Q}
 PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--with-pthreads
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-
 PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
 RCD_SCRIPTS=		mysqld

diff --git a/databases/postgresql73-lib/Makefile b/databases/postgresql73-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/20 18:34:07 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		postgresql73-lib-${BASE_VERS}
 SVR4_PKGNAME=		pstgl
@@ -14,8 +14,7 @@ BUILD_DIRS+=		${WRKSRC}/src/interfaces
 BUILD_DIRS+=		${WRKSRC}/src/pl
 USE_TOOLS+=		gtar
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 
 INSTALLATION_DIRS=	man
 

diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/20 18:34:07 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		postgresql73-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
@@ -12,8 +12,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 .include "../../databases/postgresql73/Makefile.common"
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 USE_TOOLS+=		gtar
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 BUILD_DIRS=		${WRKSRC}/src/backend

diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/21 20:23:49 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		postgresql74-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
@@ -11,7 +11,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 .include "../../databases/postgresql74/Makefile.common"
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 MESSAGE_SRC=		${.CURDIR}/MESSAGE
 USE_TOOLS+=		tar
 

diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/21 19:05:07 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=	postgresql80-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -12,7 +12,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 USE_LIBTOOL=		yes
 PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 MESSAGE_SRC=		${.CURDIR}/MESSAGE
 
 CONFIGURE_ARGS+=	--with-openssl

diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:27 jlam Exp $
 #
 
 DISTNAME=	shared-mime-info-0.16
@@ -23,8 +23,7 @@ CONFIGURE_ARGS+=	--disable-update-mimedb
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 
 FILES_SUBST+=		MIMEDB_PATH="${PREFIX}/share/mime"
 FILES_SUBST+=		UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database"

diff --git a/databases/shared-mime-info/mimedb.mk b/databases/shared-mime-info/mimedb.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mimedb.mk,v 1.3 2005/12/29 06:21:36 jlam Exp $
+# $NetBSD: mimedb.mk,v 1.4 2006/03/14 01:14:27 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # mime customization files.  It takes care of registering them in the global
@@ -10,8 +10,8 @@ SHARED_MIME_INFO_MIMEDB_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
+INSTALL_TEMPLATE+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
+DEINSTALL_TEMPLATE+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
 
 FILES_SUBST+=		MIMEDB_PATH="${BUILDLINK_PREFIX.shared-mime-info}/share/mime"
 FILES_SUBST+=		UPDATE_MIMEDB="${BUILDLINK_PREFIX.shared-mime-info}/bin/update-mime-database"

diff --git a/devel/GConf2/schemas.mk b/devel/GConf2/schemas.mk
@@ -1,4 +1,4 @@
-# $NetBSD: schemas.mk,v 1.13 2005/12/29 06:21:36 jlam Exp $
+# $NetBSD: schemas.mk,v 1.14 2006/03/14 01:14:27 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GConf2 schema files.  It takes care of registering them in the GConf2
@@ -47,8 +47,8 @@ FILES_SUBST+=		GCONF2_CONFIG_SOURCE=${GCONF2_CONFIG_SOURCE:Q}
 FILES_SUBST+=		GCONF2_ENTRIES=${GCONF2_ENTRIES:Q}
 FILES_SUBST+=		GCONF2_SCHEMAS=${GCONF2_SCHEMAS:Q}
 FILES_SUBST+=		GCONF2_SCHEMAS_DIR=${GCONF2_SCHEMAS_DIR:Q}
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../devel/GConf2/files/install.tmpl
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl
+INSTALL_TEMPLATE+=	${.CURDIR}/../../devel/GConf2/files/install.tmpl
+DEINSTALL_TEMPLATE+=	${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl
 .endif
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/gconf$$/ { next; }

diff --git a/devel/isect/Makefile b/devel/isect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/03/04 21:29:16 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:27 jlam Exp $
 #
 
 DISTNAME=	isect-1.6.2
@@ -17,8 +17,6 @@ INFO_FILES=		isect.info
 
 RCD_SCRIPTS=	isect
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 DOCDIR=		${PREFIX}/share/doc/isect
 EGDIR=		${PREFIX}/share/examples/isect
 

diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.install,v 1.2 2005/12/05 20:50:07 rillig Exp $
+# $NetBSD: Makefile.install,v 1.3 2006/03/14 01:14:27 jlam Exp $
 
 RT_SHARE_DIR=		${PREFIX}/share/rt3
 RT_EXAMPLE_DIR= 	${PREFIX}/share/examples/rt3
@@ -38,7 +38,6 @@ CONF_FILES_PERMS+=	${RT_EXAMPLE_DIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
 ${ROOT_USER} ${RT_GROUP} 0500
 .endfor
 
-INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
 FILES_SUBST+=		RTVARDIR=${RT_VAR_DIR:Q} RTLOCALDIR=${RT_LOCAL_DIR:Q}
 FILES_SUBST+=		WEBUSER=${APACHE_USER:Q} WEBGROUP=${APACHE_GROUP:Q}
 

diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:27 jlam Exp $
 
 DISTNAME=	w32api-2.5-src
 PKGNAME=	w32api-2.5
@@ -22,9 +22,6 @@ CRTWRKSRC=	${WRKDIR}/pe-crt-1.2.1
 PE_CPPFLAGS+=	-I${WRKSRC}/include
 MAKE_FLAGS+=	PE_CPPFLAGS=${PE_CPPFLAGS:Q}
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 # Building no import libraries but two static libraries.
 do-build:
 	cd ${WRKSRC}/lib \

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}