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.

20 files changed, 29 insertions, 61 deletions

diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index 341412a3254..21485d90211 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/02/18 14:22:13 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/14 01:14:32 jlam Exp $
 
 DISTNAME=	LPRng-3.8.28
 PKGNAME=	LPRng-core-3.8.28
@@ -43,8 +43,6 @@ FILTER_PATH=		${FILTER_DIR}:/sbin:/usr/sbin:/bin:/usr/bin:${PREFIX}/sbin:${PREFI
 MAKE_ENV+=		POSTINSTALL="NO"
 
 EXAMPLESDIR=		${PREFIX}/share/examples/LPRng
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 RCD_SCRIPTS=		LPRng
 
 FILES_SUBST+=		CAT=${CAT:Q}
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 41924496978..61244a669f5 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/04 21:30:28 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/14 01:14:32 jlam Exp $
 #
 
 DISTNAME=	apsfilter-7.2.6
@@ -32,8 +32,7 @@ PKG_SYSCONFSUBDIR?=	apsfilter
 CONF_FILES=	${PREFIX}/share/apsfilter/template/apsfilterrc \
 		${PKG_SYSCONFDIR}/apsfilterrc
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 
 post-patch:
 	for i in bin/apsfilter.in SETUP.in tools/prtmgmt; do		\
diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk
index 0c39add7436..cc1df24af54 100644
--- a/print/dvipdfmx/map.mk
+++ b/print/dvipdfmx/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.4 2005/12/29 06:22:06 jlam Exp $
+# $NetBSD: map.mk,v 1.5 2006/03/14 01:14:32 jlam Exp $
 # This Makefile fragment is intended to be included by packages that
 # install font maps used by dvipdfmx.  It takes care of adding and
 # removing font map entires in dvipdfmx.cfg.
@@ -20,8 +20,8 @@ DEPENDS+=		dvipdfmx>=0.0.0.20050627:../../print/dvipdfmx
 
 FILES_SUBST+=		DVIPDFMX_FONTMAPS=${DVIPDFMX_FONTMAPS:Q}
 FILES_SUBST+=		DVIPDFMX_CONFIG_DIR="${PKG_LOCALTEXMFPREFIX}/dvipdfm/config"
-INSTALL_EXTRA_TMPL+=	../../print/dvipdfmx/files/map.tmpl
-DEINSTALL_EXTRA_TMPL+=	../../print/dvipdfmx/files/map.tmpl
+INSTALL_TEMPLATE+=	../../print/dvipdfmx/files/map.tmpl
+DEINSTALL_TEMPLATE+=	../../print/dvipdfmx/files/map.tmpl
 
 PRINT_PLIST_AWK+=	/^${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}\/dvidpfm\/config\/dvipdfmx.cfg$$/ \
 			{ next; }
diff --git a/print/foomatic-filters-cups/Makefile b/print/foomatic-filters-cups/Makefile
index ffdba02b170..5a4133f8c3d 100644
--- a/print/foomatic-filters-cups/Makefile
+++ b/print/foomatic-filters-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:36 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/03/14 01:14:32 jlam Exp $
 
 .include "../../print/foomatic-filters/Makefile.common"
 
@@ -22,8 +22,7 @@ EVAL_PREFIX+=		CUPS_PREFIX=cups
 CUPS_FILTERDIR=		${CUPS_PREFIX:Q}/libexec/cups/filter
 FILES_SUBST+=		CUPS_FILTERDIR=${CUPS_FILTERDIR}
 
-DEINSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 
 do-build:	# empty
 do-install:	# empty
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index f7d1a9d8c41..a98e58b6621 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:36 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:32 jlam Exp $
 
 .include "Makefile.common"
 
@@ -36,8 +36,8 @@ DEPENDS+=	{cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
 DEPENDS+=	${TEXTTOPS_DEPENDS}:../../print/mpage
 .endif
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
-INSTALL_EXTRA_TMPL=	${DEINSTALL_EXTRA_TMPL}
+DEINSTALL_TEMPLATE+=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
+INSTALL_TEMPLATE+=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
 
 EGDIR=		${PREFIX}/share/examples/foomatic
 CONFDIR=	${PKG_SYSCONFDIR}/foomatic
diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile
index 31c52bdfc7c..56c5f9acb03 100644
--- a/print/foomatic-ppds-cups/Makefile
+++ b/print/foomatic-ppds-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:36 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/03/14 01:14:32 jlam Exp $
 
 .include "../../print/foomatic-ppds/Makefile.common"
 
@@ -22,8 +22,7 @@ EVAL_PREFIX+=		CUPS_PREFIX=cups
 CUPS_DATADIR=		${CUPS_PREFIX:Q}/share/cups/model
 FILES_SUBST+=		CUPS_DATADIR=${CUPS_DATADIR}
 
-DEINSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 
 do-build:	# empty
 do-install:	# empty
diff --git a/print/ja-jsclasses/Makefile b/print/ja-jsclasses/Makefile
index 9003399858c..bc9d8ddde30 100644
--- a/print/ja-jsclasses/Makefile
+++ b/print/ja-jsclasses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:32 jlam Exp $
 
 DISTNAME=	jsclasses-030624
 PKGNAME=	ja-${DISTNAME}
@@ -14,8 +14,6 @@ COMMENT=	New document class files for pLaTeX
 DEPENDS+=	ja-ptex-bin>=2.1.3:../../print/ja-ptex-bin
 
 WRKSRC=			${WRKDIR}/jsclasses
-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/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index 293ac70c4f1..2c1c3bca3f7 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:32 jlam Exp $
 
 DISTNAME=	ptex-src-${PTEX_VERS}
 PKGNAME=	ja-ptex-bin-${PTEX_VERS}
@@ -24,9 +24,6 @@ SITES_mendexk2.5.tar.gz= \
 
 DEPENDS+=	ja-ptex-share>=2.1:../../print/ja-ptex-share
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 .include "../../print/teTeX-bin/buildlink3.mk"
 .include "../../print/teTeX-bin/Makefile.common"
 
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk
index d18d6632d2a..2aaf3b48c5e 100644
--- a/print/teTeX/module.mk
+++ b/print/teTeX/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.11 2006/01/13 17:56:43 wiz Exp $
+# $NetBSD: module.mk,v 1.12 2006/03/14 01:14:32 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX packages.  It takes care of rebuilding the ls-R database
@@ -26,8 +26,8 @@ FILES_SUBST+=		MKTEXLSR="${LOCALBASE}/bin/mktexlsr"
 FILES_SUBST+=		TEXMFDIRS=${TEXMFDIRS:Q}
 FILES_SUBST+=		UPDMAP_SYS="${LOCALBASE}/bin/updmap-sys"
 FILES_SUBST+=		TEX_FONTMAPS=${TEX_FONTMAPS:Q}
-INSTALL_EXTRA_TMPL+=	../../print/teTeX/files/texmf.tmpl
-DEINSTALL_EXTRA_TMPL+=	../../print/teTeX/files/texmf.tmpl
+INSTALL_TEMPLATE+=	../../print/teTeX/files/texmf.tmpl
+DEINSTALL_TEMPLATE+=	../../print/teTeX/files/texmf.tmpl
 
 PRINT_PLIST_AWK+=	/^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/ls-R)?$$/ \
 			{ next; }
diff --git a/print/xpdf-arabic/Makefile b/print/xpdf-arabic/Makefile
index dd0df170824..0933e34faca 100644
--- a/print/xpdf-arabic/Makefile
+++ b/print/xpdf-arabic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:32 jlam Exp $
 #
 
 DISTNAME=	xpdf-arabic-2003-feb-16
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-arabic
 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 1584d06bcd9..ad8035c02b1 100644
--- a/print/xpdf-chinese-simplified/Makefile
+++ b/print/xpdf-chinese-simplified/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:32 jlam Exp $
 #
 
 DISTNAME=	xpdf-chinese-simplified-2004-jul-27
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-chinese-simplified
 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 eb66586eadd..9bfa322d0ae 100644
--- a/print/xpdf-chinese-traditional/Makefile
+++ b/print/xpdf-chinese-traditional/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:32 jlam Exp $
 #
 
 DISTNAME=	xpdf-chinese-traditional-2004-jul-27
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-chinese-traditional
 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 be429696548..3497dc5a688 100644
--- a/print/xpdf-cyrillic/Makefile
+++ b/print/xpdf-cyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	xpdf-cyrillic-2003-jun-28
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-cyrillic
 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 6e78677f4f4..46bf8eb8239 100644
--- a/print/xpdf-greek/Makefile
+++ b/print/xpdf-greek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	xpdf-greek-2003-jun-28
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-greek
 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 f9fd950bb8b..f1c845ebba4 100644
--- a/print/xpdf-hebrew/Makefile
+++ b/print/xpdf-hebrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	xpdf-hebrew-2003-feb-16
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-hebrew
 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 be51d6d22df..8ef52ba4a0a 100644
--- a/print/xpdf-japanese/Makefile
+++ b/print/xpdf-japanese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	xpdf-japanese-2004-jul-27
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-japanese
 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 56258566e92..0900b1faf25 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	xpdf-korean-2005-jul-07
@@ -20,8 +20,6 @@ WRKSRC=		${WRKDIR}/xpdf-korean
 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 1d828a8abcb..baec55939c1 100644
--- a/print/xpdf-latin2/Makefile
+++ b/print/xpdf-latin2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	xpdf-latin2-2002-oct-22
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-latin2
 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 413986e08fc..d6049b94491 100644
--- a/print/xpdf-thai/Makefile
+++ b/print/xpdf-thai/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	xpdf-thai-2002-jan-16
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-thai
 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 ce86c36f840..b89925210a7 100644
--- a/print/xpdf-turkish/Makefile
+++ b/print/xpdf-turkish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	xpdf-turkish-2002-apr-10
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/xpdf-turkish
 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