summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/gqmpeg/Makefile4
-rw-r--r--audio/oss/Makefile5
-rw-r--r--audio/xmcd/Makefile6
-rw-r--r--chat/silc-server/Makefile4
-rw-r--r--comms/efax/Makefile7
-rw-r--r--comms/mgetty+sendfax/Makefile5
-rw-r--r--databases/mysql-server/Makefile7
-rw-r--r--databases/postgresql-server/Makefile4
-rw-r--r--devel/isect/Makefile4
-rw-r--r--devel/w32api/Makefile6
-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/netbsd32_compat14/Makefile4
-rw-r--r--emulators/netbsd32_compat15/Makefile4
-rw-r--r--emulators/netbsd32_compat16/Makefile4
-rw-r--r--fonts/ja-kappa20/Makefile7
-rw-r--r--fonts/ja-shinonome/Makefile7
-rw-r--r--fonts/vfontcap-kochi/Makefile4
-rw-r--r--games/gnome2-games/Makefile7
-rw-r--r--inputmethod/canna-server-bin/Makefile6
-rw-r--r--inputmethod/skkserv/Makefile7
-rw-r--r--mail/courier-auth/Makefile6
-rw-r--r--mail/courier-imap/Makefile5
-rw-r--r--mail/courier-maildirmake/Makefile7
-rw-r--r--mail/cyrus-imapd/Makefile7
-rw-r--r--mail/cyrus-imapd21/Makefile7
-rw-r--r--mail/mimedefang/Makefile7
-rw-r--r--mail/popa3d/Makefile4
-rw-r--r--mail/qmail/Makefile3
-rw-r--r--mail/sqwebmail/Makefile7
-rw-r--r--misc/rpm/Makefile7
-rw-r--r--net/arla/Makefile7
-rw-r--r--net/coda5_client/Makefile7
-rw-r--r--net/coda5_server/Makefile7
-rw-r--r--net/ddclient/Makefile3
-rw-r--r--net/ja-samba/Makefile3
-rw-r--r--net/lambdamoo/Makefile5
-rw-r--r--net/net-snmp/Makefile4
-rw-r--r--net/netatalk/Makefile10
-rw-r--r--net/samba/Makefile3
-rw-r--r--net/samba20/Makefile3
-rw-r--r--net/sendfile/Makefile4
-rw-r--r--net/vtun/Makefile5
-rw-r--r--pkgtools/xpkgwedge/Makefile8
-rw-r--r--print/dvipdfmx/Makefile5
-rw-r--r--print/ja-jsclasses/Makefile6
-rw-r--r--print/teTeX2-bin/Makefile4
-rw-r--r--print/xpdf-arabic/Makefile4
-rw-r--r--print/xpdf-chinese-simplified/Makefile4
-rw-r--r--print/xpdf-chinese-traditional/Makefile4
-rw-r--r--print/xpdf-cyrillic/Makefile4
-rw-r--r--print/xpdf-greek/Makefile4
-rw-r--r--print/xpdf-hebrew/Makefile4
-rw-r--r--print/xpdf-japanese/Makefile4
-rw-r--r--print/xpdf-korean/Makefile4
-rw-r--r--print/xpdf-latin2/Makefile4
-rw-r--r--print/xpdf-thai/Makefile4
-rw-r--r--print/xpdf-turkish/Makefile4
-rw-r--r--security/cyrus-sasl/Makefile5
-rw-r--r--security/cyrus-sasl2/Makefile5
-rw-r--r--security/openssh+gssapi/Makefile4
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/uvscan/Makefile4
-rw-r--r--sysutils/xcdroast/Makefile4
-rw-r--r--x11/gdm/Makefile6
-rw-r--r--x11/openmotif/Makefile6
68 files changed, 248 insertions, 96 deletions
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 28c189c1772..d4f90afd792 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2003/08/30 20:22:50 jlam Exp $
+# $NetBSD: Makefile,v 1.75 2003/08/30 22:51:11 jlam Exp $
DISTNAME= gqmpeg-0.20.0
PKGREVISION= 2
@@ -21,6 +21,8 @@ USE_PKGLOCALEDIR= YES
USE_X11= YES
GNU_CONFIGURE= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
.include "../../mk/bsd.prefs.mk"
.if !defined(GQMPEG_NO_JAPANESE)
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 9c5a7a24ad7..512381b710e 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/23 21:52:29 jmc Exp $
+# $NetBSD: Makefile,v 1.22 2003/08/30 22:51:12 jlam Exp $
DISTNAME= oss-${OSS_VERSION} # Overridden below
PKGNAME= oss-${OSS_VERSION}
@@ -34,6 +34,9 @@ USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
NO_CONFIGURE= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.if ${OPSYS} == "NetBSD"
MODSTAT= /usr/bin/modstat
.else
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 9eb59c6499a..1d6dc81d857 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/07/17 21:23:50 grant Exp $
+# $NetBSD: Makefile,v 1.42 2003/08/30 22:51:12 jlam Exp $
DISTNAME= xmcd-3.0.2
PKGREVISION= 3
@@ -16,6 +16,10 @@ PATCH_DIST_STRIP= -p1
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
+
+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/chat/silc-server/Makefile b/chat/silc-server/Makefile
index eb2a42d6110..f6260313234 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/07/17 21:26:17 grant Exp $
+# $NetBSD: Makefile,v 1.25 2003/08/30 22:51:13 jlam Exp $
#
DISTNAME= silc-server-0.9.13
@@ -22,6 +22,8 @@ USE_GMAKE= YES
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/lib/silcmath/mpi/libtool
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
.include "../../mk/bsd.prefs.mk"
SILCD_USER?= silcd
diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index 742a89f0483..68473e15820 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/08/30 18:40:07 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:13 jlam Exp $
DISTNAME= efax-0.9
CATEGORIES= comms
@@ -11,7 +11,10 @@ COMMENT= Collection of small programs for sending and receiving faxes
CONFLICTS= kdeutils<3.1
USE_BUILDLINK2= # defined
-USE_PKGINSTALL= YES
+
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
post-patch:
${SED} -e 's:@PREFIX@:${PREFIX}:g; \
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 16099db5064..4f46f9dadce 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/08/09 10:34:47 seb Exp $
+# $NetBSD: Makefile,v 1.34 2003/08/30 22:51:13 jlam Exp $
# FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
#
@@ -19,7 +19,10 @@ BUILD_DEPENDS+= texi2roff-[0-9]*:../../textproc/texi2roff
CONFLICTS= hylafax-[0-9]*
USE_BUILDLINK2= yes
+
USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
MAKE_ENV= MGETTY_CONFDIR=${PKG_SYSCONFDIR}
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index f7f5f80f3c0..38c6903a30e 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/08/30 20:05:13 seb Exp $
+# $NetBSD: Makefile,v 1.42 2003/08/30 22:51:14 jlam Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 4
@@ -10,9 +10,12 @@ COMMENT= MySQL, a free SQL database (server)
CONFIGURE_ARGS+= --with-libwrap
CONFIGURE_ARGS+= --without-berkeley-db
USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
USE_GMAKE= YES
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
ONLY_FOR_PLATFORM= SunOS-*-sparc Linux-*-*
# on NetBSD, if native threads are not available, hardwire
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 5b8515732ae..dfe81e41fe5 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/07/16 10:35:15 abs Exp $
+# $NetBSD: Makefile,v 1.33 2003/08/30 22:51:14 jlam Exp $
PKGNAME= postgresql-server-${BASE_VERS}
SVR4_PKGNAME= pstgs
@@ -13,6 +13,8 @@ NOT_FOR_PLATFORM= *-*-mips
.include "../postgresql/Makefile.common"
USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
BUILD_DIRS= ${WRKSRC}/src/backend
BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index 9bc4d7982dc..69f0ba7bc58 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/08/30 18:46:17 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2003/08/30 22:51:14 jlam Exp $
#
DISTNAME= isect-1.6.2
@@ -21,6 +21,8 @@ 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/w32api/Makefile b/devel/w32api/Makefile
index ee98b9fb174..96c3c8862af 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/08/30 18:48:35 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/08/30 22:51:15 jlam Exp $
# $PEACE: Makefile,v 1.21 2002/08/21 02:02:27 kent Exp $
DISTNAME= w32api-1.5-src
@@ -21,7 +21,9 @@ PE_AR= ${CROSSBASE}/bin/i386-netbsdpe-ar
CRTWRKSRC= ${WRKDIR}/pe-crt-1.2
CFLAGS+= -I${WRKDIR}/include
-USE_PKGINSTALL= yes
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
# Building no import libraries but two static libraries.
do-build:
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index 9a5de26e5bc..53522d811e8 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/08/30 18:53:07 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2003/08/30 22:51:15 jlam Exp $
#
DISTNAME= compat12-${MACHINE_ARCH}
@@ -17,6 +17,8 @@ NO_BUILD= # defined
NO_MTREE= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index b1491833ff8..dc01152623c 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/30 18:57:03 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/08/30 22:51:15 jlam Exp $
#
DISTNAME= compat13-${MACHINE_ARCH}${PKGMINOR}
@@ -19,6 +19,8 @@ NO_MTREE= # defined
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile
index a83428353b7..d94e659595f 100644
--- a/emulators/compat14-crypto/Makefile
+++ b/emulators/compat14-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/30 19:00:03 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/08/30 22:51:16 jlam Exp $
#
DISTNAME= compat14-crypto-${MACHINE_ARCH}-${VERSION}
@@ -23,6 +23,8 @@ NO_MTREE= # defined
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile
index 2993d101581..3690d415e5c 100644
--- a/emulators/compat14/Makefile
+++ b/emulators/compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/30 19:02:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:16 jlam Exp $
#
DISTNAME= compat14-${MACHINE_ARCH}-${VERSION}
@@ -21,6 +21,8 @@ NO_MTREE= # defined
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile
index ad00dd97fd2..0581129b985 100644
--- a/emulators/netbsd32_compat14/Makefile
+++ b/emulators/netbsd32_compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/30 19:07:10 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:16 jlam Exp $
#
DISTNAME= compat14-${MACHINE32_ARCH}-${VERSION}
@@ -25,6 +25,8 @@ NO_MTREE= # defined
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile
index aba7d946e19..d7d87122827 100644
--- a/emulators/netbsd32_compat15/Makefile
+++ b/emulators/netbsd32_compat15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 19:09:38 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:17 jlam Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
@@ -24,6 +24,8 @@ NO_MTREE= # defined
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR}
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile
index c49f343bebd..cf4cf9442ce 100644
--- a/emulators/netbsd32_compat16/Makefile
+++ b/emulators/netbsd32_compat16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/30 19:11:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/30 22:51:17 jlam Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
@@ -25,6 +25,8 @@ NO_MTREE= # defined
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR}
FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile
index c839aa4242c..cf9b79da746 100644
--- a/fonts/ja-kappa20/Makefile
+++ b/fonts/ja-kappa20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/30 10:41:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/08/30 22:51:17 jlam Exp $
DISTNAME= Kappa20-0.394
PKGNAME= ja-kappa20-0.394
@@ -10,11 +10,14 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://kappa.allnet.ne.jp/20dot.fonts/
COMMENT= 20x20 dots X11 bitmap font for Japanese with several extra fonts
-USE_PKGINSTALL= YES
USE_X11BASE= YES
FONTDIR= ${PREFIX}/lib/X11/fonts/local
ALIAS_KAPPA= ${PREFIX}/share/examples/fonts.alias.Kappa20
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
FILES_SUBST+= FONTDIR=${FONTDIR}
FILES_SUBST+= ALIAS_KAPPA=${ALIAS_KAPPA}
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index 82716497a49..9cc1b94e63e 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/30 10:41:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/08/30 22:51:17 jlam Exp $
#
DISTNAME= shinonome-0.9.10-src
@@ -14,13 +14,16 @@ COMMENT= 12, 14, 16 dots bitmap fonts for Japanese, iso8859-1
GNU_CONFIGURE= YES
USE_PERL5= build
-USE_PKGINSTALL= YES
USE_X11BASE= YES
USE_GMAKE= YES
FONTDIR= ${PREFIX}/lib/X11/fonts/local
FOUNDRY= Misc
ALIAS_SHINONOME= ${PREFIX}/share/examples/fonts.alias.shinonome
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
FILES_SUBST+= FONTDIR=${FONTDIR}
FILES_SUBST+= ALIAS_SHINONOME=${ALIAS_SHINONOME}
diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile
index 70904c28cc8..c9d3759a4c0 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/08/20 04:49:28 kei Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/30 22:51:18 jlam Exp $
DISTNAME= vfontcap-kochi-0.0
WRKSRC= ${WRKDIR}
@@ -18,6 +18,8 @@ NO_BUILD= YES
USE_X11= YES # kochi font defines this as well.
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
VFONTCAPDIR= ${PREFIX}/share/VFlib/2.24.2
FILES_SUBST+= VFONTCAPDIR=${VFONTCAPDIR}
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 53ded648d12..774d301c7f7 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 20:22:53 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:18 jlam Exp $
DISTNAME= gnome-games-2.2.1
PKGREVISION= 4
@@ -16,7 +16,6 @@ DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs
CONFLICTS= xbill-[0-9]*
USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_GMAKE= yes
USE_X11= yes
@@ -24,6 +23,10 @@ USE_CONFIG_WRAPPER= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
CONFIGURE_ARGS+= --localstatedir=/var
diff --git a/inputmethod/canna-server-bin/Makefile b/inputmethod/canna-server-bin/Makefile
index 7bd3924aeab..0069d4ad8ff 100644
--- a/inputmethod/canna-server-bin/Makefile
+++ b/inputmethod/canna-server-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 20:22:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:18 jlam Exp $
#
.include "../canna/Makefile.common"
@@ -7,9 +7,11 @@ PKGREVISION= 1
CANNA_MODULE= server-bin
USE_BUILDLINK2= # defined
-USE_PKGINSTALL= YES
INSTALL_TARGET= instserver
+USE_PKGINSTALL= YES
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= CANNA_USER CANNA_GROUP
diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile
index c6120ab2d9f..87a3cad0c05 100644
--- a/inputmethod/skkserv/Makefile
+++ b/inputmethod/skkserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/30 20:22:55 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/30 22:51:19 jlam Exp $
DISTNAME= skk9.6
PKGNAME= skkserv-3.9.4
@@ -15,8 +15,9 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://skk.kuis.kyoto-u.ac.jp/
COMMENT= Dictionary server for Simple Kana-Kanji conversion programs
-USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
BUILD_DEFS+= USE_INET6
diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index 3b2462aa519..c203a675e0d 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:56:43 martti Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:19 jlam Exp $
PKGNAME= courier-auth-${BASE_VERS}
PKGREVISION?= 1
@@ -9,8 +9,10 @@ CONFLICTS= courier-imap<=1.4.0
CONFLICTS+= courier-imap-ldap-*
USE_PERL5= yes
-USE_PKGINSTALL= yes
REPLACE_PERL= sysconftool
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
.include "../../mail/courier-auth/Makefile.authdaemond"
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index f34b0e768c7..05c1f178aee 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/01/28 22:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/08/30 22:51:20 jlam Exp $
DISTNAME= courier-imap-1.4.2
PKGREVISION= 1
@@ -8,9 +8,10 @@ HOMEPAGE= http://www.inter7.com/courierimap/
DEPENDS+= courier-auth>=0.37.1:../../mail/courier-auth
DEPENDS+= courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
-USE_PKGINSTALL= yes
USE_PERL5= yes
REPLACE_PERL= sysconftool
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
.include "../../mail/courier-auth/Makefile.common"
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 42376bb0ae6..98975463ef2 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:30 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/08/30 22:51:20 jlam Exp $
PKGNAME= courier-maildirmake-${BASE_VERS}
PKGREVISION?= 1
@@ -6,9 +6,10 @@ COMMENT= Courier Maildir utilities
PERL5_REQD= 5.6.0
USE_PERL5= build
-USE_PKGINSTALL= yes
+REPLACE_PERL= sysconftool
-REPLACE_PERL= sysconftool
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
.include "../../mail/courier-auth/Makefile.common"
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 6aea3c261c7..4b571dd23f2 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/07/17 21:45:50 grant Exp $
+# $NetBSD: Makefile,v 1.42 2003/08/30 22:51:20 jlam Exp $
DISTNAME= cyrus-imapd-2.0.17
PKGREVISION= 1
@@ -12,11 +12,14 @@ HOMEPAGE= http://asg.web.cmu.edu/cyrus/imapd/
COMMENT= Cyrus IMAP server
USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
PERL5_CONFIGURE= NO
AUTOCONF_REQD= 2.13
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.include "../../mk/bsd.prefs.mk"
.if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES"
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 816e3436cbf..ec9587dd240 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/16 09:23:58 recht Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:21 jlam Exp $
DISTNAME= cyrus-imapd-2.1.14
SVR4_PKGNAME= cimap
@@ -11,11 +11,14 @@ HOMEPAGE= http://asg.web.cmu.edu/cyrus/imapd/
COMMENT= Cyrus IMAP server
USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
PERL5_CONFIGURE= NO
AUTOCONF_REQD= 2.13
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.include "../../mk/bsd.prefs.mk"
.if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES"
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 112cde113b8..b6e237dbf05 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/08/30 20:22:57 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:21 jlam Exp $
DISTNAME= mimedefang-2.35
CATEGORIES= mail
@@ -18,11 +18,14 @@ DEPENDS+= p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
DEPENDS+= spamassassin>=2.31:../../mail/spamassassin
USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
USE_PERL5= YES
GNU_CONFIGURE= YES
PKG_SYSCONFSUBDIR?= mimedefang
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
DEFANG_SPOOLDIR?= /var/spool/MIMEDefang
DEFANG_USER?= defang
DEFANG_GROUP?= defang
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 687ae162624..8ab0dfc932d 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/07/21 16:56:52 martti Exp $
+# $NetBSD: Makefile,v 1.32 2003/08/30 22:51:22 jlam Exp $
#
DISTNAME= popa3d-0.6.3
@@ -20,6 +20,8 @@ PKG_USERS= ${POPA3D_USER}:${POPA3D_GROUP}
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
RCD_SCRIPTS= popa3d
FILES_SUBST+= POPA3D_USER=${POPA3D_USER}
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 7027b0d2894..163776799d3 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 21:46:54 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/08/30 22:51:22 jlam Exp $
#
DISTNAME= qmail-1.03
@@ -27,6 +27,7 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_PACKAGE= "needs work to function properly as a binary package"
USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
OWN_DIRS+= ${QMAILDIR}
FILES_SUBST+= QMAILDIR=${QMAILDIR}
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 64da24e2787..94353805507 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 16:56:56 martti Exp $
+# $NetBSD: Makefile,v 1.14 2003/08/30 22:51:23 jlam Exp $
DISTNAME= sqwebmail-3.3.1
CATEGORIES= www
@@ -9,9 +9,12 @@ DEPENDS+= courier-auth>=0.37.1nb1:../../mail/courier-auth
DEPENDS+= courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
USE_PERL5= yes
-USE_PKGINSTALL= yes
REPLACE_PERL= sysconftool
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.include "../../mail/courier-auth/Makefile.common"
.if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 11be5f13cca..e30d3ff57f6 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2003/08/30 19:45:00 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2003/08/30 22:51:23 jlam Exp $
DISTNAME= rpm-2.5.4
PKGREVISION= 1
@@ -14,11 +14,14 @@ BUILD_USES_MSGFMT= yes
CONFLICTS+= rpm2cpio<1.0nb1
USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
# The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm.
CONFIGURE_ENV+= varprefix="${RPM_DB_PREFIX}"
diff --git a/net/arla/Makefile b/net/arla/Makefile
index d62f4028d78..c250f40aedc 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/08/09 11:16:17 seb Exp $
+# $NetBSD: Makefile,v 1.37 2003/08/30 22:51:23 jlam Exp $
DISTNAME= arla-0.35.12
#PKGREVISION=
@@ -16,10 +16,13 @@ OSVERSION_SPECIFIC= yes
INFO_FILES= arla.info
USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
USE_X11= yes
GNU_CONFIGURE= yes
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.if exists(/usr/lib/libroken.a)
CONFIGURE_ARGS+= --with-krb4-lib=/usr/lib
CONFIGURE_ARGS+= --with-krb4-include=/usr/include/kerberosIV
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 50ab6b2fc38..9e60f61f65a 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/07/21 17:10:28 martti Exp $
+# $NetBSD: Makefile,v 1.40 2003/08/30 22:51:24 jlam Exp $
PKGNAME= coda-client-${DIST_VERS}
COMMENT= Client programs for a replicated high-performance network file system
@@ -8,7 +8,10 @@ COMMENT= Client programs for a replicated high-performance network file system
ALL_TARGET= coda
INSTALL_TARGET= client-install
-USE_PKGINSTALL= yes
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
CONF_FILES+= ${EGDIR}/sidekick.intr.ex ${PKG_SYSCONFDIR}/sidekick.intr
CONF_FILES+= ${EGDIR}/venus.conf.ex ${PKG_SYSCONFDIR}/venus.conf
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 535f76e7a5b..a0e7785d13c 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/07/21 17:10:29 martti Exp $
+# $NetBSD: Makefile,v 1.39 2003/08/30 22:51:24 jlam Exp $
PKGNAME= coda-server-${DIST_VERS}
COMMENT= Server programs for a replicated high-performance network file system
@@ -8,7 +8,10 @@ COMMENT= Server programs for a replicated high-performance network file system
ALL_TARGET= coda
INSTALL_TARGET= server-install
-USE_PKGINSTALL= yes
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
CONF_FILES+= ${EGDIR}/server.conf.ex ${PKG_SYSCONFDIR}/server.conf
post-install:
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index fe4587b9977..a65d2bfc3db 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:51:04 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/08/30 22:51:25 jlam Exp $
DISTNAME= ddclient-3.6.2
CATEGORIES= net
@@ -10,6 +10,7 @@ COMMENT= Client to update dynamic DNS entries
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
DOCDIR= ${PREFIX}/share/doc/ddclient
EGDIR= ${PREFIX}/share/examples/ddclient
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index ec5853b0406..fc3302b1853 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/08/30 01:31:11 taca Exp $
+# $NetBSD: Makefile,v 1.20 2003/08/30 22:51:25 jlam Exp $
.include "Makefile.common"
@@ -13,6 +13,7 @@ CONFLICTS+= samba-[0-9]*
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
USE_PKGLOCALEDIR= YES
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 4410024a4cb..b4850e30ab7 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 19:49:25 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:26 jlam Exp $
DISTNAME= LambdaMOO-1.8.1
PKGNAME= lambdamoo-1.8.1
@@ -20,6 +20,9 @@ LAMBDAMOO_GROUP?= lambdamoo
LAMBDAMOO_HOME?= ${PREFIX}/share/${LAMBDAMOO_USER}
USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
PKG_GROUPS= ${LAMBDAMOO_GROUP}
PKG_USERS= ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP}
_PKG_USER_HOME= ${LAMBDAMOO_HOME}
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 7779f8b20b8..0f584314e11 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:51:26 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:27 jlam Exp $
DISTNAME= net-snmp-5.0.6
CATEGORIES= net
@@ -23,6 +23,8 @@ NET_SNMP_MIBDIRS?= \$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a4b1f4d26a6..e6909cccf4d 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/07/30 10:41:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2003/08/30 22:51:27 jlam Exp $
DISTNAME= netatalk-1.6.2
CATEGORIES= net print
@@ -13,8 +13,12 @@ GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_GMAKE= YES
USE_PERL5= YES
-USE_PKGINSTALL= YES
-USE_LIBTOOL= YES
+
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
+USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFLICTS= netatalk-asun-[0-9]* netatalk-umich-[0-9]*
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 4e1c4b45276..b8fa10eb090 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2003/07/17 22:51:48 grant Exp $
+# $NetBSD: Makefile,v 1.101 2003/08/30 22:51:27 jlam Exp $
.include "Makefile.common"
PKGREVISION= 2
@@ -9,6 +9,7 @@ COMMENT= SMB/CIFS protocol server suite for UNIX
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
CONFIGURE_ARGS+= --with-readline
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index 684873ad2cf..5f81a114704 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 22:51:49 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/08/30 22:51:28 jlam Exp $
DISTNAME= samba-2.0.10
PKGREVISION= 1
@@ -16,6 +16,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
.include "../../mk/bsd.prefs.mk"
diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index 3a397ebfedc..dc34de29d9e 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 22:51:50 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/08/30 22:51:28 jlam Exp $
#
DISTNAME= sendfile-20010216
@@ -15,6 +15,8 @@ COMMENT= Implementation of the Simple asynchronous file transfer protocol
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
PKG_SYSCONFSUBDIR= sendfile
EGDIR= ${PREFIX}/share/examples/sendfile
CONF_FILES= ${EGDIR}/sendfile.cf ${PKG_SYSCONFDIR}/sendfile.cf
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index f71d3422ffd..b0249cd26f5 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 22:52:01 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/08/30 22:51:29 jlam Exp $
DISTNAME= vtun-2.6
WRKSRC= ${WRKDIR}/vtun
@@ -11,6 +11,9 @@ COMMENT= Virtual Tunnels over TCP/IP networks with traffic shaping
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index c63d4bdac89..7e04ba6c38c 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/08/30 11:08:23 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2003/08/30 22:51:29 jlam Exp $
DISTNAME= xpkgwedge-1.7
WRKSRC= ${WRKDIR}
@@ -17,8 +17,10 @@ NO_CONFIGURE= # defined
NO_BUILDLINK= # defined
NO_CHECKSUM= # defined
-USE_PKGINSTALL= YES
-USE_X11= YES
+USE_X11= YES
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
# FONT_PROGS are symlinked from ${X11BASE}/bin to ${PREFIX}/bin to allow
# ${PREFIX}/bin/${prog} to always work.
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index dda1cd7ba76..ce76a8ebcc1 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/30 10:41:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/30 22:51:30 jlam Exp $
DISTNAME= dvipdfmx-20021230
PKGNAME= dvipdfmx-0.0.0.20021230
@@ -18,6 +18,9 @@ CONFLICTS+= ja-dvipdfm-[0-9]*
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
GNU_CONFIGURE= YES
#CONFIGURE_ARGS+= --datadir=${PREFIX}/share
diff --git a/print/ja-jsclasses/Makefile b/print/ja-jsclasses/Makefile
index 07d71592266..99ea261309a 100644
--- a/print/ja-jsclasses/Makefile
+++ b/print/ja-jsclasses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/30 10:41:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:30 jlam Exp $
DISTNAME= jsclasses-030624
PKGNAME= ja-${DISTNAME}
@@ -13,7 +13,9 @@ COMMENT= New document class files for pLaTeX
DEPENDS+= ja-ptex-bin>=2.1.3:../../print/ja-ptex-bin
-USE_PKGINSTALL= YES
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
PLATEX_DIR= ${PREFIX}/share/texmf.local/ptex/platex
NO_BUILD= YES
diff --git a/print/teTeX2-bin/Makefile b/print/teTeX2-bin/Makefile
index b9a54471c71..d884020f20e 100644
--- a/print/teTeX2-bin/Makefile
+++ b/print/teTeX2-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/30 20:02:05 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/08/30 22:51:30 jlam Exp $
DISTNAME= tetex-src-${TETEX_BIN_VERS}
PKGNAME= teTeX2-bin-${TETEX_BIN_VERS}
@@ -21,6 +21,8 @@ INFO_FILES= latex.info dvips.info web2c.info kpathsea.info
REPLACE_PERL= texk/xdvik/t1mapper \
texk/oxdvik/t1mapper
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.include "../../mk/bsd.prefs.mk"
# sysutils/coreutils installs a 'readlink' program, so conflict with it if
# GNU_PROGRAM_PREFIX == ''
diff --git a/print/xpdf-arabic/Makefile b/print/xpdf-arabic/Makefile
index 71ded49a6e7..a945db24e2c 100644
--- a/print/xpdf-arabic/Makefile
+++ b/print/xpdf-arabic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:16:29 martti Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/30 22:51:31 jlam Exp $
#
DISTNAME= xpdf-arabic
@@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-chinese-simplified/Makefile b/print/xpdf-chinese-simplified/Makefile
index 4c34e4b1bb0..3db6d534f54 100644
--- a/print/xpdf-chinese-simplified/Makefile
+++ b/print/xpdf-chinese-simplified/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:16:29 martti Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:31 jlam Exp $
#
DISTNAME= xpdf-chinese-simplified
@@ -20,6 +20,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-chinese-traditional/Makefile b/print/xpdf-chinese-traditional/Makefile
index 4f6882cc2dd..869bc8f2e52 100644
--- a/print/xpdf-chinese-traditional/Makefile
+++ b/print/xpdf-chinese-traditional/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:16:30 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:31 jlam Exp $
#
DISTNAME= xpdf-chinese-traditional
@@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' -e 's/Arhpic/Arphic/g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-cyrillic/Makefile b/print/xpdf-cyrillic/Makefile
index c98d03d8ba4..2e8610d6e69 100644
--- a/print/xpdf-cyrillic/Makefile
+++ b/print/xpdf-cyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:16:30 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:31 jlam Exp $
#
DISTNAME= xpdf-cyrillic
@@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-greek/Makefile b/print/xpdf-greek/Makefile
index 4c7f6267119..025ddb764a0 100644
--- a/print/xpdf-greek/Makefile
+++ b/print/xpdf-greek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:16:30 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:32 jlam Exp $
#
DISTNAME= xpdf-greek
@@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-hebrew/Makefile b/print/xpdf-hebrew/Makefile
index ae4bd7d07ea..fb1abeb2229 100644
--- a/print/xpdf-hebrew/Makefile
+++ b/print/xpdf-hebrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:16:31 martti Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:32 jlam Exp $
#
DISTNAME= xpdf-hebrew
@@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-japanese/Makefile b/print/xpdf-japanese/Makefile
index 81d780aa639..3ed3d90bdf1 100644
--- a/print/xpdf-japanese/Makefile
+++ b/print/xpdf-japanese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:16:32 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:32 jlam Exp $
#
DISTNAME= xpdf-japanese
@@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index a1e08f1c447..95b5bd9800a 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:16:32 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:33 jlam Exp $
#
DISTNAME= xpdf-korean
@@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-latin2/Makefile b/print/xpdf-latin2/Makefile
index cd8bc4979f2..0679dd81795 100644
--- a/print/xpdf-latin2/Makefile
+++ b/print/xpdf-latin2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:16:32 martti Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:33 jlam Exp $
#
DISTNAME= xpdf-latin2
@@ -20,6 +20,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-thai/Makefile b/print/xpdf-thai/Makefile
index f4e98d53281..abdde8a15d5 100644
--- a/print/xpdf-thai/Makefile
+++ b/print/xpdf-thai/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:16:33 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:33 jlam Exp $
#
DISTNAME= xpdf-thai
@@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/print/xpdf-turkish/Makefile b/print/xpdf-turkish/Makefile
index eba10ccd643..2af6c096387 100644
--- a/print/xpdf-turkish/Makefile
+++ b/print/xpdf-turkish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:16:34 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/30 22:51:34 jlam Exp $
#
DISTNAME= xpdf-turkish
@@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
post-patch:
${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 22c27b12443..9cef4085949 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/03/19 21:02:00 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2003/08/30 22:51:34 jlam Exp $
.include "Makefile.common"
@@ -31,6 +31,9 @@ PLIST_SRC+= ${.CURDIR}/PLIST.krb5
PLIST_SRC+= ${.CURDIR}/PLIST.plugins
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
PKG_GROUPS= ${CYRUS_GROUP}
PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
RCD_SCRIPTS= sasl_pwcheck saslauthd
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 29a9a70c3b0..cc91a1a05c5 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/16 09:06:41 recht Exp $
+# $NetBSD: Makefile,v 1.12 2003/08/30 22:51:35 jlam Exp $
.include "Makefile.common"
@@ -40,6 +40,9 @@ CPPFLAGS+= -I/usr/include/krb5
PLIST_SRC+= ${PKGDIR}/PLIST.plugins
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
PKG_GROUPS= ${CYRUS_GROUP}
PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
RCD_SCRIPTS= saslauthd
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index ea738ce0bc4..4374b015ddf 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/05 15:44:46 jwise Exp $
+# $NetBSD: Makefile,v 1.5 2003/08/30 22:51:37 jlam Exp $
# NOTE: This package is modeled on ../openssh, but does not share
# files with it as that package may update faster than the gssapi
@@ -144,6 +144,8 @@ MESSAGE_SUBST+= EGDIR=${EGDIR}
MESSAGE_SUBST+= OPENSSH_USER=${OPENSSH_USER}
MESSAGE_SUBST+= OPENSSH_GROUP=${OPENSSH_GROUP}
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.if defined(UPDATE_INTREE_OPENSSH)
. include "Makefile.intree"
.endif
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 70dce24dd49..6bbd8ea30e3 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2003/07/30 18:35:53 grant Exp $
+# $NetBSD: Makefile,v 1.107 2003/08/30 22:51:36 jlam Exp $
DISTNAME= openssh-3.6.1p2
PKGNAME= openssh-3.6.1.2
@@ -136,6 +136,8 @@ MESSAGE_SUBST+= EGDIR=${EGDIR}
MESSAGE_SUBST+= OPENSSH_USER=${OPENSSH_USER}
MESSAGE_SUBST+= OPENSSH_GROUP=${OPENSSH_GROUP}
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.if defined(UPDATE_INTREE_OPENSSH)
. include "Makefile.intree"
.endif
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 3b6a1668601..1394e7b980f 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/21 17:20:39 martti Exp $
+# $NetBSD: Makefile,v 1.22 2003/08/30 22:51:37 jlam Exp $
DISTNAME= vlnx416e
PKGNAME= uvscan-4.16.0
@@ -32,6 +32,8 @@ UVSCANDIR= ${PREFIX}/libexec/uvscan
DATFILES= clean.dat internet.dat names.dat scan.dat readme.txt
USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
FILES_SUBST+= UVSCANDIR=${UVSCANDIR:Q}
FILES_SUBST+= DATFILES=${DATFILES:Q}
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 128c99bded0..2625e80de64 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/21 17:24:46 martti Exp $
+# $NetBSD: Makefile,v 1.19 2003/08/30 22:51:38 jlam Exp $
DISTNAME= xcdroast-0.98alpha14
PKGNAME= xcdroast-0.98a14
@@ -32,6 +32,8 @@ DOCFILES= DOCUMENTATION FAQ README.nonroot
HTMLDIR= ${PREFIX}/share/doc/html/xcdroast
SUPPORT_FILES= /dev/null ${PKG_SYSCONFDIR}/xcdroast.conf
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
pre-build:
cd ${WRKSRC}/src; for file in io.c wavplay.c; do \
${SED} -e "s|@DEVOSSAUDIO@|${DEVOSSAUDIO}|g" \
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2187c58b1e7..629fda8b742 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/07/17 22:56:25 grant Exp $
+# $NetBSD: Makefile,v 1.40 2003/08/30 22:51:38 jlam Exp $
DISTNAME= gdm-2.2.0
PKGREVISION= 4
@@ -14,7 +14,11 @@ COMMENT= Gnome Display Manager - a re-implementation of the xdm program
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_BUILDLINK2= YES
+
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_X11BASE= YES
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 39d7fe108cd..9d3640ab6e8 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/08/08 09:25:16 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/08/30 22:51:38 jlam Exp $
# FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp
# OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp
@@ -29,8 +29,8 @@ USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
ALL_TARGET= World
-DEINSTALL_TMPL= ${.CURDIR}/DEINSTALL
-INSTALL_TMPL= ${.CURDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= X11BASE=${X11BASE}