Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk

automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.

34 files changed, 34 insertions, 68 deletions

diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index c389dcdd9ac..dc7d4d16c3f 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:06 jlam Exp $
 
 DISTNAME=	LPRng-3.8.28
 PKGNAME=	LPRng-core-3.8.28
@@ -45,7 +45,6 @@ MAKE_ENV+=		POSTINSTALL="NO"
 EXAMPLESDIR=	 	${PREFIX}/share/examples/LPRng
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
-USE_PKGINSTALL=		YES
 RCD_SCRIPTS=		LPRng
 
 FILES_SUBST+=		CAT=${CAT:Q}
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 8192ae9ca05..b0d3c77c534 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2005/12/29 06:22:06 jlam Exp $
 
 DISTNAME=		a2ps-4.13b
 PKGNAME=		a2ps-4.13.0.2
@@ -25,7 +25,6 @@ CFLAGS.Darwin+=		-flat_namespace
 USE_TOOLS+=		file:run gmake mktemp:run perl:run
 CONFIGURE_ENV+=		file_prog=${FILE_CMD:Q}
 
-USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		LPR=lpr
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index f4692c16cdf..81e2cc9c9ee 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/29 06:22:06 jlam Exp $
 #
 
 DISTNAME=	apsfilter-7.2.5
@@ -21,7 +21,6 @@ DEPENDS+=	psutils-[0-9]*:../../print/psutils
 WRKSRC=		${WRKDIR}/apsfilter
 HAS_CONFIGURE=	YES
 USE_BZIP2=	YES
-USE_PKGINSTALL=	YES
 USE_TOOLS+=	awk gs:run
 
 CONFIGURE_ARGS+=--prefix=${PREFIX:Q}
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 4e487e45a92..7ca271736d8 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:52 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/29 06:22:06 jlam Exp $
 
 DISTNAME=		auctex-11.81
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -13,7 +13,6 @@ COMMENT=		Enhanced LaTeX mode for Emacs
 .include "../../mk/emacs.mk"
 
 USE_TOOLS+=		gmake
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		YES
 
 TEX_PREFIX_DEFAULT=	${LOCALBASE}
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index 91bb28d28cc..ce593a4fb9f 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:52 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/29 06:22:06 jlam Exp $
 #
 
 DISTNAME=	chktex-1.6.3
@@ -11,7 +11,6 @@ COMMENT=	LaTeX semantic checker
 
 DEPENDS+=	lynx-[0-9]*:../../www/lynx
 
-USE_PKGINSTALL=yes
 EGDIR=      ${PREFIX}/share/examples/chktex
 CONF_FILES=   ${EGDIR}/chktexrc ${PKG_SYSCONFDIR}/chktexrc
 
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 8dfd26eae8a..92725f88be1 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2005/12/19 16:04:48 joerg Exp $
+# $NetBSD: Makefile,v 1.104 2005/12/29 06:22:06 jlam Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -31,7 +31,6 @@ CONFLICTS+=	LPRng-[0-9]* LPRng-core-[0-9]*
 WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
 UNLIMIT_RESOURCES=	datasize memorysize
 USE_LANGUAGES=		c c++	# pdftops is a C++ application
-USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		autoconf gmake
 USE_LIBTOOL=		yes
diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk
index 356cd8d35fe..0c39add7436 100644
--- a/print/dvipdfmx/map.mk
+++ b/print/dvipdfmx/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.3 2005/12/05 20:50:52 rillig Exp $
+# $NetBSD: map.mk,v 1.4 2005/12/29 06:22:06 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.
@@ -18,7 +18,6 @@ DVIPDFMX_FONTMAPS?=	# empty
 DEPENDS+=		dvipdfmx>=0.0.0.20050627:../../print/dvipdfmx
 .endif
 
-USE_PKGINSTALL=		yes
 FILES_SUBST+=		DVIPDFMX_FONTMAPS=${DVIPDFMX_FONTMAPS:Q}
 FILES_SUBST+=		DVIPDFMX_CONFIG_DIR="${PKG_LOCALTEXMFPREFIX}/dvipdfm/config"
 INSTALL_EXTRA_TMPL+=	../../print/dvipdfmx/files/map.tmpl
diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index ef879a9021f..38a7b309dae 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/29 06:22:07 jlam Exp $
 #
 
 DISTNAME=		enscript-1.6.3
@@ -14,7 +14,6 @@ DEPENDS+=		papersize-[0-9]*:../../print/papersize
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/print/foomatic-filters-cups/Makefile b/print/foomatic-filters-cups/Makefile
index 0a3bb0262e9..dc58cebff5c 100644
--- a/print/foomatic-filters-cups/Makefile
+++ b/print/foomatic-filters-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/17 18:26:15 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/29 06:22:07 jlam Exp $
 
 .include "../../print/foomatic-filters/Makefile.common"
 
@@ -21,7 +21,6 @@ EVAL_PREFIX+=		CUPS_PREFIX=cups
 CUPS_FILTERDIR=		${CUPS_PREFIX:Q}/libexec/cups/filter
 FILES_SUBST+=		CUPS_FILTERDIR=${CUPS_FILTERDIR}
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 260f7aa02d7..d8b8e5a47de 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/17 18:35:10 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/29 06:22:07 jlam Exp $
 
 .include "Makefile.common"
 
@@ -36,7 +36,6 @@ DEPENDS+=	{cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
 DEPENDS+=	${TEXTTOPS_DEPENDS}:../../print/mpage
 .endif
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
 INSTALL_EXTRA_TMPL=	${DEINSTALL_EXTRA_TMPL}
 
diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile
index f49746c6fb9..404d6b9b528 100644
--- a/print/foomatic-ppds-cups/Makefile
+++ b/print/foomatic-ppds-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/17 18:41:43 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/29 06:22:07 jlam Exp $
 
 .include "../../print/foomatic-ppds/Makefile.common"
 
@@ -21,7 +21,6 @@ EVAL_PREFIX+=		CUPS_PREFIX=cups
 CUPS_DATADIR=		${CUPS_PREFIX:Q}/share/cups/model
 FILES_SUBST+=		CUPS_DATADIR=${CUPS_DATADIR}
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 
diff --git a/print/foomatic-ppds/Makefile b/print/foomatic-ppds/Makefile
index 3b97a5092f2..ec122278c41 100644
--- a/print/foomatic-ppds/Makefile
+++ b/print/foomatic-ppds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/17 18:39:24 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/29 06:22:07 jlam Exp $
 
 .include "Makefile.common"
 
@@ -19,7 +19,6 @@ COMMENT=	Foomatic PPDs collection
 
 DEPENDS=	foomatic-filters>=3.0.2:../../print/foomatic-filters
 
-USE_PKGINSTALL=	yes
 REQD_DIRS=	share/foomatic
 PLIST_SRC=	${WRKDIR}/PLIST_SRC
 
diff --git a/print/ghostscript-esp/Makefile b/print/ghostscript-esp/Makefile
index 069a3a4c4d0..b1b35192625 100644
--- a/print/ghostscript-esp/Makefile
+++ b/print/ghostscript-esp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/17 05:20:23 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:07 jlam Exp $
 
 DISTNAME=	espgs-${GS_VERS}-source
 PKGNAME=	ghostscript-esp-${GS_VERS}
@@ -29,7 +29,6 @@ CONFLICTS+=	ghostscript-gnu{,-nox11,-x11}-[0-9]*
 DEPENDS+=	ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-cups
diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index 84d5b0142cf..a7dc47cd88d 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/29 06:22:07 jlam Exp $
 
 DISTNAME=	gimp-print-4.2.7
 PKGNAME=	gimp-print-cups-4.2.7
@@ -12,7 +12,6 @@ COMMENT=	GIMP print plugin
 
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-escputil=no --enable-libgimpprint=no
 CONFIGURE_ARGS+=	--with-cups=${PREFIX:Q}
diff --git a/print/ja-jsclasses/Makefile b/print/ja-jsclasses/Makefile
index b07abac3973..115b6b427fd 100644
--- a/print/ja-jsclasses/Makefile
+++ b/print/ja-jsclasses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/29 06:22:07 jlam Exp $
 
 DISTNAME=	jsclasses-030624
 PKGNAME=	ja-${DISTNAME}
@@ -14,7 +14,6 @@ COMMENT=	New document class files for pLaTeX
 DEPENDS+=	ja-ptex-bin>=2.1.3:../../print/ja-ptex-bin
 
 WRKSRC=			${WRKDIR}/jsclasses
-USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
diff --git a/print/papersize/Makefile b/print/papersize/Makefile
index 05cd7ee8e04..7a7ded0a74d 100644
--- a/print/papersize/Makefile
+++ b/print/papersize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/27 23:51:51 reed Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:07 jlam Exp $
 #
 
 DISTNAME=	papersize-1.0.8
@@ -14,7 +14,6 @@ EXTRACT_ONLY=	# empty
 USE_LANGUAGES=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
-USE_PKGINSTALL=	yes
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 203784967a0..7ff631eb8bc 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/11/08 18:04:02 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/29 06:22:07 jlam Exp $
 #
 
 DISTNAME=	pnm2ppa-1.12
@@ -9,7 +9,6 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://pnm2ppa.sourceforge.net/
 COMMENT=	Filter to convert PNM file to PPA used by some HP DJ printer
 
-USE_PKGINSTALL=	yes
 CONF_FILES=	${PREFIX}/share/examples/pnm2ppa/pnm2ppa.conf \
 		${PKG_SYSCONFDIR}/pnm2ppa.conf
 
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 6a43984d789..eedf85d9031 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:53 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/29 06:22:07 jlam Exp $
 
 DISTNAME=	psutils-p17
 PKGNAME=	psutils-1.17
@@ -14,7 +14,6 @@ DEPENDS+=	papersize-[0-9]*:../../print/papersize
 
 WRKSRC=		${WRKDIR}/psutils
 USE_TOOLS+=	perl:run
-USE_PKGINSTALL=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/print/teTeX-bin/Makefile.common b/print/teTeX-bin/Makefile.common
index 2f34f73eb1b..ae0fc6750bd 100644
--- a/print/teTeX-bin/Makefile.common
+++ b/print/teTeX-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:54 rillig Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/12/29 06:22:07 jlam Exp $
 
 TETEX_BIN_VERS=		2.0.2
 DIST_SUBDIR=		teTeX
@@ -7,7 +7,6 @@ INSTALL_TARGET=		install strip
 
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
-USE_PKGINSTALL=		yes
 CFLAGS+=		-Dunix
 
 GNU_CONFIGURE=		yes
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk
index 20633c5f935..e3514c2f02d 100644
--- a/print/teTeX/module.mk
+++ b/print/teTeX/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.6 2005/12/05 20:50:54 rillig Exp $
+# $NetBSD: module.mk,v 1.7 2005/12/29 06:22:07 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
@@ -22,7 +22,6 @@ TEX_FONTMAPS?=		# empty
 BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb4
 .endif
 
-USE_PKGINSTALL=		yes
 FILES_SUBST+=		MKTEXLSR="${LOCALBASE}/bin/mktexlsr"
 FILES_SUBST+=		TEXMFDIRS=${TEXMFDIRS:Q}
 FILES_SUBST+=		UPDMAP_SYS="${LOCALBASE}/bin/updmap-sys"
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index 966f1d4fe5a..903d8c13ca8 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:54 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/29 06:22:08 jlam Exp $
 
 DISTNAME=	teTeX-src-1.0.7
 PKGNAME=	teTeX-bin-1.0.7
@@ -22,7 +22,6 @@ DIST_SUBDIR=		teTeX
 BUILD_TARGET=		all
 INSTALL_TARGET=		install strip
 
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 CFLAGS+=		-Dunix
diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common
index 400bf8a7a40..e9eed6653eb 100644
--- a/print/teTeX3-bin/Makefile.common
+++ b/print/teTeX3-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:54 rillig Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/12/29 06:22:08 jlam Exp $
 
 TETEX_BIN_VERS=		3.0
 DIST_SUBDIR=		teTeX
@@ -7,7 +7,6 @@ INSTALL_TARGET=		install strip
 
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
-USE_PKGINSTALL=		yes
 CFLAGS+=		-Dunix
 
 GNU_CONFIGURE=		yes
diff --git a/print/xpdf-arabic/Makefile b/print/xpdf-arabic/Makefile
index c10156fcdb9..19fead3e019 100644
--- a/print/xpdf-arabic/Makefile
+++ b/print/xpdf-arabic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/28 11:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-arabic-2003-feb-16
@@ -13,7 +13,6 @@ COMMENT=	Xpdf support files for Arabic
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-arabic
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-chinese-simplified/Makefile b/print/xpdf-chinese-simplified/Makefile
index 35d2f17af48..551249cbfd7 100644
--- a/print/xpdf-chinese-simplified/Makefile
+++ b/print/xpdf-chinese-simplified/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/07/28 11:55:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-chinese-simplified-2004-jul-27
@@ -13,7 +13,6 @@ COMMENT=	Xpdf support files for Chinese (Simplified)
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-chinese-simplified
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-chinese-traditional/Makefile b/print/xpdf-chinese-traditional/Makefile
index 571d155badc..1eebaff1bd6 100644
--- a/print/xpdf-chinese-traditional/Makefile
+++ b/print/xpdf-chinese-traditional/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/07/28 11:55:08 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-chinese-traditional-2004-jul-27
@@ -13,7 +13,6 @@ COMMENT=	Xpdf support files for Chinese (Traditional)
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-chinese-traditional
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-cyrillic/Makefile b/print/xpdf-cyrillic/Makefile
index 350b8c77a7e..fea776ee907 100644
--- a/print/xpdf-cyrillic/Makefile
+++ b/print/xpdf-cyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/07/28 11:06:43 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-cyrillic-2003-jun-28
@@ -13,7 +13,6 @@ COMMENT=	Xpdf support files for Cyrillic
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-cyrillic
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-greek/Makefile b/print/xpdf-greek/Makefile
index fa05a3dbece..cda596fac58 100644
--- a/print/xpdf-greek/Makefile
+++ b/print/xpdf-greek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/07/28 11:06:43 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-greek-2003-jun-28
@@ -13,7 +13,6 @@ COMMENT=	Xpdf support files for Greek
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-greek
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-hebrew/Makefile b/print/xpdf-hebrew/Makefile
index d19c1bfacbb..86e92d5ce16 100644
--- a/print/xpdf-hebrew/Makefile
+++ b/print/xpdf-hebrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/28 11:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-hebrew-2003-feb-16
@@ -13,7 +13,6 @@ COMMENT=	Xpdf support files for Hebrew
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-hebrew
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-japanese/Makefile b/print/xpdf-japanese/Makefile
index 76a31620c89..50bb0d9ffb3 100644
--- a/print/xpdf-japanese/Makefile
+++ b/print/xpdf-japanese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/07/28 11:55:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-japanese-2004-jul-27
@@ -13,7 +13,6 @@ COMMENT=	Xpdf support files for Japanese
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-japanese
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index f904b2a1ecf..5697c25640a 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/10/12 11:39:12 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-korean-2005-jul-07
@@ -14,7 +14,6 @@ COMMENT=	Xpdf support files for Korean
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 DEPENDS+=	baekmuk-ttf>=1.0:../../fonts/baekmuk-ttf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-korean
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-latin2/Makefile b/print/xpdf-latin2/Makefile
index 7ef182c05ce..7ef60a70330 100644
--- a/print/xpdf-latin2/Makefile
+++ b/print/xpdf-latin2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/10/28 11:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-latin2-2002-oct-22
@@ -14,7 +14,6 @@ COMMENT=	Xpdf support files for Latin-2
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-latin2
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-thai/Makefile b/print/xpdf-thai/Makefile
index f9e272f827e..404a43e43c4 100644
--- a/print/xpdf-thai/Makefile
+++ b/print/xpdf-thai/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/10/28 11:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-thai-2002-jan-16
@@ -13,7 +13,6 @@ COMMENT=	Xpdf support files for Thai
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-thai
 NO_CONFIGURE=	yes
diff --git a/print/xpdf-turkish/Makefile b/print/xpdf-turkish/Makefile
index b57fb1238a1..5ee0a02783c 100644
--- a/print/xpdf-turkish/Makefile
+++ b/print/xpdf-turkish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/10/28 11:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:22:08 jlam Exp $
 #
 
 DISTNAME=	xpdf-turkish-2002-apr-10
@@ -13,7 +13,6 @@ COMMENT=	Xpdf support files for Turkish
 
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_PKGINSTALL=	yes
 
 WRKSRC=		${WRKDIR}/xpdf-turkish
 NO_CONFIGURE=	yes
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index ecf776c9adf..4cfc8404438 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/12/20 16:00:16 ghen Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/29 06:22:08 jlam Exp $
 
 DISTNAME=	xpdf-3.01
 PKGNAME=	${DISTNAME}pl1
@@ -20,7 +20,6 @@ DEPENDS+=	ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
 
 CONFLICTS=	xpdf-crypto-[0-9]*
 
-USE_PKGINSTALL=		yes
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}