Add definitions for DEINSTALL_EXTRA_TMPL and INSTALL_EXTRA_TMPL if

USE_PKGINSTALL is "YES".  bsd.pkg.install.mk will no longer automatically
pick up a INSTALL/DEINSTALL script in the package directory and assume that
you want it for the corresponding *_EXTRA_TMPL variable.

14 files changed, 44 insertions, 15 deletions

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