Add DESTDIR support.

36 files changed, 208 insertions, 114 deletions

diff --git a/print/LPRng-doc/Makefile b/print/LPRng-doc/Makefile
index d41bfa8eaf2..b706856f2dc 100644
--- a/print/LPRng-doc/Makefile
+++ b/print/LPRng-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:23 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/06/12 02:14:42 joerg Exp $
 
 DISTNAME=	LPRng_DOC-3.6.13
 PKGNAME=	LPRng-doc-3.6.13
@@ -10,17 +10,20 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.lprng.com/
 COMMENT=	LPRng documentation in dvi, text, html and ps formats
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 USE_TOOLS+=	pax
 
+INSTALLATION_DIRS=	share/doc/LPRng
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/LPRng
 	cd ${WRKDIR:Q} && \
 	    pax -O -zrf ${DISTDIR:Q}/${DISTNAME:Q}${EXTRACT_SUFX:Q}
 	cd ${WRKSRC:Q} && \
-	    pax -rw *.dvi *.gif *.html *.ps *.txt ${PREFIX:Q}/share/doc/LPRng
+	    pax -rw *.dvi *.gif *.html *.ps *.txt ${DESTDIR}${PREFIX}/share/doc/LPRng
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/LPRng/Makefile b/print/LPRng/Makefile
index 4880d5a6067..cb39549d1ce 100644
--- a/print/LPRng/Makefile
+++ b/print/LPRng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/10/25 22:01:03 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2008/06/12 02:14:42 joerg Exp $
 
 DISTNAME=	LPRng-3.6.28
 PKGREVISION=	2
@@ -13,6 +13,8 @@ COMMENT=	"meta-package" for LPRng, Enhanced Printer Spooler
 DEPENDS+=	LPRng-core-3.8.28{,nb*}:../../print/LPRng-core
 DEPENDS+=	LPRng-doc-3.6.13:../../print/LPRng-doc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		yes
 NO_CONFIGURE=		yes
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index fa0fdbfb7fb..ded89ff7da6 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2007/03/18 22:07:52 rillig Exp $
+# $NetBSD: Makefile,v 1.67 2008/06/12 02:14:42 joerg Exp $
 
 DISTNAME=		a2ps-4.13b
 PKGNAME=		a2ps-4.13.0.2
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www-inf.enst.fr/~demaille/a2ps/
 COMMENT=		Formats an ascii file for printing on a postscript printer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		psutils>=1.17:../../print/psutils
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/print/abc2ps/Makefile b/print/abc2ps/Makefile
index 5ceaf31dec7..82ede01ec39 100644
--- a/print/abc2ps/Makefile
+++ b/print/abc2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/12/15 14:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=	ABC2PS-${ABC2PSVER}
@@ -12,21 +12,23 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ihp-ffo.de/~msm/
 COMMENT=	Music typesetting program for abc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 ABC2PSVER=	1.3.3
 
+INSTALLATION_DIRS=	bin share/doc/abc2ps share/examples/abc2ps
+
 do-build:
 	cd ${WRKSRC} && ${CC} -o abc2ps abc2ps.c
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/abc2ps
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/abc2ps
-	${INSTALL_PROGRAM} ${WRKSRC}/abc2ps ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/abc2ps ${DESTDIR}${PREFIX}/bin
 	cd ${WRKSRC} && ${INSTALL_DATA} Changes License New.Features \
-		ReadMe.abc2ps layout.txt ${PREFIX}/share/doc/abc2ps/
+		ReadMe.abc2ps layout.txt ${DESTDIR}${PREFIX}/share/doc/abc2ps/
 	cd ${WRKSRC} && ${INSTALL_DATA} bach.abc blue_boy_bass.abc \
 		bran5.abc celloprelude.abc desafinado.abc fbook.fmt \
 		fonts.fmt journey.abc landscape.fmt mtunes1.abc \
 		newfeatures.abc sample.abc scotland.abc trio.abc \
-		voices.abc ${PREFIX}/share/examples/abc2ps/
+		voices.abc ${DESTDIR}${PREFIX}/share/examples/abc2ps/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/abcm2ps/Makefile b/print/abcm2ps/Makefile
index 3d3468b9686..026f5adf38f 100644
--- a/print/abcm2ps/Makefile
+++ b/print/abcm2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/08/30 20:47:02 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/12 02:14:43 joerg Exp $
 
 DISTNAME=	abcm2ps-4.12.25
 CATEGORIES=	print
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://moinejf.free.fr/
 COMMENT=	Converts ABC to music sheet in PostScript format
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	${PKGBASE}
 
diff --git a/print/abcm2ps/distinfo b/print/abcm2ps/distinfo
index 275c2da001c..cb9ac68e405 100644
--- a/print/abcm2ps/distinfo
+++ b/print/abcm2ps/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/08/30 20:47:02 minskim Exp $
+$NetBSD: distinfo,v 1.5 2008/06/12 02:14:43 joerg Exp $
 
 SHA1 (abcm2ps-4.12.25.tar.gz) = 454074aa8f54e9a68eb93cb9b1ff15443022114b
 RMD160 (abcm2ps-4.12.25.tar.gz) = 3a27cfb539a94ae07840f74cb7bd3ad386c3be63
 Size (abcm2ps-4.12.25.tar.gz) = 214245 bytes
-SHA1 (patch-aa) = 01d44b33f560834148fa39d0982873bb6d2f695f
+SHA1 (patch-aa) = 5ffcbbe9d1dfe48ead377d5d25d27dad53d40f48
diff --git a/print/abcm2ps/patches/patch-aa b/print/abcm2ps/patches/patch-aa
index 84b4eba02af..728ab80c134 100644
--- a/print/abcm2ps/patches/patch-aa
+++ b/print/abcm2ps/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2006/06/18 03:01:21 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2008/06/12 02:14:43 joerg Exp $
 
---- Makefile.in.orig	2005-06-25 03:15:28.000000000 -0700
+--- Makefile.in.orig	2005-06-25 10:15:28.000000000 +0000
 +++ Makefile.in
 @@ -19,7 +19,7 @@ VPATH = @srcdir@
  bindir = @bindir@
@@ -11,3 +11,25 @@ $NetBSD: patch-aa,v 1.1 2006/06/18 03:01:21 minskim Exp $
  
  # unix
  OBJECTS=abc2ps.o \
+@@ -32,15 +32,15 @@ $(OBJECTS): abcparse.h abc2ps.h config.h
+ DOCFILES=Changes License README *.abc *.eps *.txt
+ 
+ install: abcm2ps
+-	mkdir -p $(bindir); \
+-	mkdir -p $(datadir)/abcm2ps; \
+-	mkdir -p $(docdir)/abcm2ps; \
+-	$(INSTALL_PROGRAM) abcm2ps $(bindir)
++	mkdir -p $(DESTDIR)$(bindir); \
++	mkdir -p $(DESTDIR)$(datadir)/abcm2ps; \
++	mkdir -p $(DESTDIR)$(docdir)/abcm2ps; \
++	$(INSTALL_PROGRAM) abcm2ps $(DESTDIR)$(bindir)
+ 	for f in *.fmt; do \
+-		$(INSTALL_DATA) $$f $(datadir)/abcm2ps; \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/abcm2ps; \
+ 	done
+ 	for f in $(DOCFILES); do \
+-		$(INSTALL_DATA) $$f $(docdir)/abcm2ps; \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/abcm2ps; \
+ 	done
+ 
+ uninstall:
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index d5e23f5025a..03e7afd59ed 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/09/13 20:19:09 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/06/12 02:14:43 joerg Exp $
 
 DISTNAME=	acroread7	# overridden below
 PKGNAME=	acroread7-7.0.9
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
 COMMENT=	View, distribute and print PDF documents
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	acroread-5.*
 # conflict with acroread5 due to bin/acroread
 # maybe should do ALTERNATIVES?
@@ -46,25 +48,25 @@ BIN_PATCH=	${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
 BUILD_DEFS+=		ACROREAD_FONTPATH
 ACROREAD_FONTPATH?=	${PREFIX}/lib/X11/fonts/TTF
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin Acrobat7
 
 do-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/Acrobat7
-	@( ${ECHO} n; ${ECHO} n ) | InstallDir=${PREFIX}/Acrobat7 ${WRKSRC}/INSTALL
+	( ${ECHO} n; ${ECHO} n ) | InstallDir=${DESTDIR}${PREFIX}/Acrobat7 ${WRKSRC}/INSTALL
 
 post-install:
-	@cd ${PREFIX}/Acrobat7/bin && \
+	cd ${DESTDIR}${PREFIX}/Acrobat7/bin && \
 	  ${BIN_PATCH} <${FILESDIR}/acroread.diff && \
 	  ${SED} -e 's:@PREFIX@:${PREFIX}:' \
 	    -e 's|@ACROREAD_FONTPATH@|${ACROREAD_FONTPATH}|' \
 		<acroread >acroread.tmp && \
 	  ${MV} acroread.tmp acroread && \
-	  ${INSTALL_SCRIPT} ${PREFIX}/Acrobat7/bin/acroread \
-	     ${PREFIX}/bin/acroread7 && ${RM} -f acroread.orig acroread.tmp
-	${CHMOD} +x ${PREFIX}/bin/acroread7
+	  ${RM} -f acroread.orig acroread.tmp
+	${INSTALL_SCRIPT} ${DESTDIR}${PREFIX}/Acrobat7/bin/acroread \
+	     ${DESTDIR}${PREFIX}/bin/acroread7
+	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/acroread7
 	@${ECHO_MSG} "Be sure to read the license agreement in"
-	@${ECHO_MSG} "${PREFIX}/Acrobat7/Reader/Legal/ENU/License.html"
-	${LN} -sf ${PREFIX}/bin/acroread7 ${PREFIX}/bin/acroread
-	${RM} ${PREFIX}/Acrobat7/Reader/${PLATFORM}/plug_ins/PPKLite.api
+	@${ECHO_MSG} "${DESTDIR}${PREFIX}/Acrobat7/Reader/Legal/ENU/License.html"
+	${LN} -sf ${PREFIX}/bin/acroread7 ${DESTDIR}${PREFIX}/bin/acroread
+	${RM} ${DESTDIR}${PREFIX}/Acrobat7/Reader/${PLATFORM}/plug_ins/PPKLite.api
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile
index 438bd9051eb..d684472bcc2 100644
--- a/print/acroread8/Makefile
+++ b/print/acroread8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/06 01:43:32 toshii Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/12 02:14:43 joerg Exp $
 
 DISTNAME=	acroread8	# overridden below
 PKGNAME=	acroread8-8.1.2
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
 COMMENT=	View, distribute and print PDF documents
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	acroread-5.*
 # conflict with acroread5 due to bin/acroread
 # maybe should do ALTERNATIVES?
@@ -46,24 +48,24 @@ BIN_PATCH=	${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
 BUILD_DEFS+=		ACROREAD_FONTPATH
 ACROREAD_FONTPATH?=	${PREFIX}/lib/X11/fonts/TTF
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	Acrobat8 bin
 
 do-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/Acrobat8
-	@( ${ECHO} n; ${ECHO} n ) | InstallDir=${PREFIX}/Acrobat8 ${WRKSRC}/INSTALL
+	( ${ECHO} n; ${ECHO} n ) | InstallDir=${DESTDIR}${PREFIX}/Acrobat8 ${WRKSRC}/INSTALL
 
 post-install:
-	@cd ${PREFIX}/Acrobat8/Adobe/Reader8/bin && \
+	cd ${DESTDIR}${PREFIX}/Acrobat8/Adobe/Reader8/bin && \
 	  ${BIN_PATCH} <${FILESDIR}/acroread.diff && \
 	  ${SED} -e 's:@PREFIX@:${PREFIX}:' \
 	    -e 's|@ACROREAD_FONTPATH@|${ACROREAD_FONTPATH}|' \
 		<acroread >acroread.tmp && \
 	  ${MV} acroread.tmp acroread && \
-	  ${LN} -sf ${PREFIX}/Acrobat8/Adobe/Reader8/bin/acroread \
-	     ${PREFIX}/bin/acroread8 && ${RM} -f acroread.orig acroread.tmp
-	${CHMOD} +x ${PREFIX}/bin/acroread8
+	  ${RM} -f acroread.orig acroread.tmp
+	${LN} -sf ${DESTDIR}${PREFIX}/Acrobat8/Adobe/Reader8/bin/acroread \
+	     ${DESTDIR}${PREFIX}/bin/acroread8
+	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/acroread8
 	@${ECHO_MSG} "Be sure to read the license agreement in"
-	@${ECHO_MSG} "${PREFIX}/Acrobat8/Reader/Legal/ENU/License.html"
-	${LN} -sf ${PREFIX}/bin/acroread8 ${PREFIX}/bin/acroread
+	@${ECHO_MSG} "${DESTDIR}${PREFIX}/Acrobat8/Reader/Legal/ENU/License.html"
+	${LN} -sf acroread8 ${DESTDIR}${PREFIX}/bin/acroread
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/adobeps-win/Makefile b/print/adobeps-win/Makefile
index 33ea43e387c..051a170c875 100644
--- a/print/adobeps-win/Makefile
+++ b/print/adobeps-win/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/14 16:00:41 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/12 02:14:43 joerg Exp $
 
 DISTNAME=	winsteng
 PKGNAME=	adobeps-win-1.0.6
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/products/printerdrivers/windows.html
 COMMENT=	Adobe PostScript MS Windows drivers for CUPS/Samba
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEPENDS+=	cabextract-[0-9]*:../../archivers/cabextract
 DEPENDS+=	cups>=1.1.15:../../print/cups
 
@@ -24,6 +26,8 @@ NTFILES=	ADOBEPS5.DLL ADOBEPSU.DLL ADOBEPSU.HLP DEFPRTR2.PPD
 9XFILES=	ADFONTS.MFM ADOBEPS4.DRV ADOBEPS4.HLP ICONLIB.DLL PSMON.DLL
 DRIVERDIR=	${PREFIX}/share/cups/drivers
 
+INSTALLATION_DIRS=	${DRIVERDIR}
+
 post-extract:
 	cd ${WRKSRC}; for dir in WinNT Windows; do			\
 		( cd $$dir; for file in *; do				\
@@ -35,12 +39,11 @@ post-extract:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${DRIVERDIR}
 	for file in ${NTFILES}; do					\
-		${INSTALL_DATA} ${WRKSRC}/WinNT/$$file ${DRIVERDIR};	\
+		${INSTALL_DATA} ${WRKSRC}/WinNT/$$file ${DESTDIR}${DRIVERDIR};	\
 	done
 	for file in ${9XFILES}; do					\
-		${INSTALL_DATA} ${WRKSRC}/Windows/$$file ${DRIVERDIR};	\
+		${INSTALL_DATA} ${WRKSRC}/Windows/$$file ${DESTDIR}${DRIVERDIR};	\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 016388b0a62..a4e2ec37d46 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/06/15 20:40:16 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=	apsfilter-7.2.6
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.apsfilter.org/
 COMMENT=	Flexible magic filter for printing under Unix environment
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	recode-[0-9]*:../../converters/recode
 #DEPENDS+=	html2ps-[0-9]*:../../print/html2ps
 DEPENDS+=	transfig-[0-9]*:../../print/transfig
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index e08ad6d394e..34eb9bc38ee 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/10/29 04:44:04 uebayasi Exp $
+# $NetBSD: Makefile,v 1.34 2008/06/12 02:14:43 joerg Exp $
 
 DISTNAME=		auctex-11.84
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/auctex/
 COMMENT=		Enhanced LaTeX mode for Emacs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EMACS_MODULES=		base
 
 USE_TOOLS+=		gmake
diff --git a/print/bibtool/Makefile b/print/bibtool/Makefile
index d491cb7e7e4..a51ac089f4f 100644
--- a/print/bibtool/Makefile
+++ b/print/bibtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/12 02:14:43 joerg Exp $
 DISTNAME=	BibTool-2.48
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=biblio/bibtex/utils/bibtool/}
@@ -7,6 +7,8 @@ MAINTAINER=	smb@NetBSD.org
 HOMEPAGE=	http://www.gerd-neugebauer.de/software/TeX/BibTool.en.html
 COMMENT=	Tool to manipulate BibTeX databases
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 MAKE_FILE=	makefile
 #CONFIGURE_DIRS=	${WRKSRC} ${WRKSRC}/BibTcl
@@ -20,6 +22,11 @@ REPLACE_PERL+=		Perl/bibtool.pl
 DOCDIR=		${LOCALBASE}/share/doc/BibTool
 EXAMPLEDIR=	${LOCALBASE}/share/examples/BibTool
 
+INSTALL_MAKE_FLAGS=	prefix=${DESTDIR}${PREFIX} \
+			MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALL_TARGET=	install install.man
+INSTALLATION_DIRS=	${DOCDIR} ${EXAMPLEDIR}
+
 TEX_ACCEPTED=	teTeX3
 TEX_DEPMETHOD=	build
 .include "../../mk/tex.buildlink3.mk"
@@ -33,12 +40,9 @@ post-build:
 #	cd ${WRKSRC:Q}/BibTcl && make
 
 post-install:
-	cd ${WRKSRC:Q} && make install.man
-	${MKDIR} ${DOCDIR}
-	for i in ${WRKSRC:Q}/Doc/*.dvi; do ${INSTALL_DATA} $$i ${DOCDIR}; done
-	${MKDIR} ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC:Q}/Perl/bibtool.pl ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC:Q}/Tcl/bibtool.tcl ${EXAMPLEDIR}
+	for i in ${WRKSRC:Q}/Doc/*.dvi; do ${INSTALL_DATA} $$i ${DESTDIR}${DOCDIR}; done
+	${INSTALL_DATA} ${WRKSRC:Q}/Perl/bibtool.pl ${DESTDIR}${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC:Q}/Tcl/bibtool.tcl ${DESTDIR}${EXAMPLEDIR}
 #	cd ${WRKSRC:Q}/BibTcl && make install
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index aaee5fb2069..4553110608a 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2008/04/15 18:30:23 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2008/06/12 02:14:43 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../print/evince/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/evince/evince-nautilus/}
diff --git a/print/evince/Makefile b/print/evince/Makefile
index 1e1f680dc04..c002c5ca60b 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2008/04/15 18:30:23 drochner Exp $
+# $NetBSD: Makefile,v 1.42 2008/06/12 02:14:43 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../print/evince/Makefile.common"
 
diff --git a/print/foomatic-filters-cups/Makefile b/print/foomatic-filters-cups/Makefile
index 6ff1504d356..cb89110b488 100644
--- a/print/foomatic-filters-cups/Makefile
+++ b/print/foomatic-filters-cups/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2007/10/25 22:01:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:43 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../print/foomatic-filters/Makefile.common"
 
@@ -15,15 +17,14 @@ DEPENDS+=	foomatic-filters-${FOOMATIC_FILTERS_VERSION}{,nb[0-9]*}:../../print/fo
 
 EXTRACT_ONLY=	# empty
 WRKSRC=		${WRKDIR}
+NO_BUILD=	yes
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
+NO_INSTALL=	yes
 PLIST_SRC=	# empty
 
 EVAL_PREFIX+=		CUPS_PREFIX=cups
 CUPS_FILTERDIR=		${CUPS_PREFIX:Q}/libexec/cups/filter
 FILES_SUBST+=		CUPS_FILTERDIR=${CUPS_FILTERDIR}
 
-do-build:	# empty
-do-install:	# empty
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile
index ada9565324a..9d683c0521c 100644
--- a/print/foomatic-ppds-cups/Makefile
+++ b/print/foomatic-ppds-cups/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2007/10/25 22:01:04 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:43 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../print/foomatic-ppds/Makefile.common"
 
@@ -16,13 +18,12 @@ EXTRACT_ONLY=	# empty
 WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
+NO_BUILD=	yes
+NO_INSTALL=	yes
 PLIST_SRC=	# empty
 
 EVAL_PREFIX+=		CUPS_PREFIX=cups
 CUPS_DATADIR=		${CUPS_PREFIX:Q}/share/cups/model
 FILES_SUBST+=		CUPS_DATADIR=${CUPS_DATADIR}
 
-do-build:	# empty
-do-install:	# empty
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/p5-PostScript-MailLabels/Makefile b/print/p5-PostScript-MailLabels/Makefile
index 49731b2dd92..14dc3673934 100644
--- a/print/p5-PostScript-MailLabels/Makefile
+++ b/print/p5-PostScript-MailLabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/11/15 20:39:22 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/06/12 02:14:43 joerg Exp $
 
 DISTNAME=	PostScript-MailLabels-2.25
 PKGNAME=	p5-${DISTNAME}
@@ -11,15 +11,18 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://oplnk.net/~ajackson/software/maillabels/
 COMMENT=	Create PostScript for printing on mailing label stock
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/PostScript/MailLabels/.packlist
 
 REPLACE_PERL=		${WRKSRC}/demo/*.pl
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
+INSTALLATION_DIRS=	${EGDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 	for file in ${REPLACE_PERL}; do					\
-		${INSTALL_SCRIPT} $$file ${EGDIR};			\
+		${INSTALL_SCRIPT} $$file ${DESTDIR}${EGDIR};		\
 	done
 
 .include "../../lang/perl5/module.mk"
diff --git a/print/papersize/Makefile b/print/papersize/Makefile
index e2249690492..c876ffdc2ff 100644
--- a/print/papersize/Makefile
+++ b/print/papersize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/07/22 06:52:13 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=	papersize-1.0.8
@@ -9,6 +9,8 @@ DISTFILES=	# empty
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Manipulate the default papersize in certain packages
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none
 NO_CHECKSUM=	yes
diff --git a/print/pcps/Makefile b/print/pcps/Makefile
index 6c92462e647..4c20c65df85 100644
--- a/print/pcps/Makefile
+++ b/print/pcps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:03 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=	pcps840
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.swreg.org/soft_shop/695/shopscr3.shtml
 COMMENT=	Converts text files to PostScript(tm)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 MAKE_FILE=	makefile
 BUILD_TARGET=
@@ -22,7 +24,7 @@ RESTRICTED=	This is shareware for your evaluation and subsequent payment
 NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/pcps share/examples/pcps
 
 CONF_FILES+=	${PREFIX}/share/examples/pcps/pcps.cfg ${PREFIX}/bin/pcps.cfg
 
@@ -30,13 +32,11 @@ post-patch:
 	${SED} "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/pcps.1 > ${WRKDIR}/pcps.1
 
 do-install:
-	@${INSTALL_PROGRAM}  ${WRKSRC}/pcps ${PREFIX}/bin/pcps
-	@${INSTALL_MAN}      ${WRKDIR}/pcps.1 ${PREFIX}/${PKGMANDIR}/man1
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pcps
-	@${INSTALL_DATA}     ${WRKSRC}/license.doc ${PREFIX}/share/doc/pcps
-	@${INSTALL_DATA}     ${WRKSRC}/register.doc ${PREFIX}/share/doc/pcps
-	@${INSTALL_DATA}     ${WRKSRC}/pcps.man ${PREFIX}/share/doc/pcps
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pcps
-	@${INSTALL_DATA}     ${FILESDIR}/pcps.cfg ${PREFIX}/share/examples/pcps/pcps.cfg
+	@${INSTALL_PROGRAM}  ${WRKSRC}/pcps ${DESTDIR}${PREFIX}/bin/pcps
+	@${INSTALL_MAN}      ${WRKDIR}/pcps.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	@${INSTALL_DATA}     ${WRKSRC}/license.doc ${DESTDIR}${PREFIX}/share/doc/pcps
+	@${INSTALL_DATA}     ${WRKSRC}/register.doc ${DESTDIR}${PREFIX}/share/doc/pcps
+	@${INSTALL_DATA}     ${WRKSRC}/pcps.man ${DESTDIR}${PREFIX}/share/doc/pcps
+	@${INSTALL_DATA}     ${FILESDIR}/pcps.cfg ${DESTDIR}${PREFIX}/share/examples/pcps/pcps.cfg
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/pdfjam/Makefile b/print/pdfjam/Makefile
index f645773f56e..87115734603 100644
--- a/print/pdfjam/Makefile
+++ b/print/pdfjam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:09 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=	pdfjam_1.20
@@ -12,16 +12,20 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/
 COMMENT=	Small collection of PDF utilities
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/pdfjam
 
 UTILS=		pdf90 pdfjoin pdfnup
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 do-install:
 .for _util in ${UTILS}
-		${INSTALL_SCRIPT} ${WRKSRC}/scripts/${_util} ${PREFIX}/bin/${_util}
-		${INSTALL_MAN} ${WRKSRC}/man1/${_util}.1 ${PREFIX}/${PKGMANDIR}/man1/${_util}.1
+		${INSTALL_SCRIPT} ${WRKSRC}/scripts/${_util} ${DESTDIR}${PREFIX}/bin/${_util}
+		${INSTALL_MAN} ${WRKSRC}/man1/${_util}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${_util}.1
 .endfor
 .undef ${_util}
 
diff --git a/print/pdflib-lite/Makefile b/print/pdflib-lite/Makefile
index f70f10c0a5c..7db545f0d10 100644
--- a/print/pdflib-lite/Makefile
+++ b/print/pdflib-lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/05/15 20:06:03 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=	PDFlib-Lite-7.0.3
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pdflib.com/
 COMMENT=	C library to produce PDF files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	pdflib-[0-9]*
 
 GNU_CONFIGURE=	yes
@@ -19,13 +21,14 @@ CONFIGURE_ARGS+=	--with-tcl=no
 
 DOCDIR=		${PREFIX}/share/doc/pdflib
 
+INSTALLATION_DIRS=	${DOCDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}/doc/pdflib; for file in				\
 		PDFlib-Lite-license.pdf					\
 		PDFlib-API-reference.pdf;				\
 	do								\
-		${INSTALL_DATA} $${file} ${DOCDIR};			\
+		${INSTALL_DATA} $${file} ${DESTDIR}${DOCDIR};		\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 9b138f357ef..b354414b120 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2006/04/17 14:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2008/06/12 02:14:43 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
@@ -11,14 +13,15 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 BUILD_TARGET=		pdflib
 DOCDIR=			${PREFIX}/share/doc/pdflib
 
+INSTALLATION_DIRS+=	${DOCDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}/doc; for file in					\
 		PDFlib-license.pdf					\
 		PDFlib-manual.pdf					\
 		aladdin-license.pdf;					\
 	do								\
-		${INSTALL_DATA} $${file} ${DOCDIR};			\
+		${INSTALL_DATA} $${file} ${DESTDIR}${DOCDIR};		\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common
index b9c63ef4fdf..908fcd0e1a0 100644
--- a/print/pdflib/Makefile.common
+++ b/print/pdflib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2008/01/16 04:48:07 tnn Exp $
+# $NetBSD: Makefile.common,v 1.21 2008/06/12 02:14:43 joerg Exp $
 
 DISTNAME=		pdflib-${PDFLIB_DIST_VERS}
 CATEGORIES=		print
@@ -41,5 +41,7 @@ SUBST_FILES.sed=	configure pdflib-config.in
 SUBST_SED.sed=		-e "s|^sed |${SED} |g"
 SUBST_SED.sed+=		-e "s| sed | ${SED} |g"
 
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
+
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/print/php-pdflib/Makefile b/print/php-pdflib/Makefile
index 29b4e23b7ac..ace3d1dc5b4 100644
--- a/print/php-pdflib/Makefile
+++ b/print/php-pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/04 16:26:55 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/12 02:14:43 joerg Exp $
 
 MODNAME=		pdflib
 PKGMODNAME=		pdf
@@ -6,6 +6,8 @@ PECL_VERSION=		2.0.3
 CATEGORIES+=		print
 COMMENT=		PHP extension for PDFlib on-the-fly PDF generation
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	php-pdf-[0-9]*
 
 CONFIGURE_ARGS+=	--with-pdflib=shared,${BUILDLINK_PREFIX.pdflib}
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 7ff631eb8bc..e7a1203b443 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/29 06:22:07 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=	pnm2ppa-1.12
@@ -9,9 +9,13 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://pnm2ppa.sourceforge.net/
 COMMENT=	Filter to convert PNM file to PPA used by some HP DJ printer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONF_FILES=	${PREFIX}/share/examples/pnm2ppa/pnm2ppa.conf \
 		${PKG_SYSCONFDIR}/pnm2ppa.conf
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/pnm2ppa
+
 post-build:
 	for f in				\
 	${WRKSRC}/docs/en/CALIBRATION.txt	\
@@ -24,10 +28,9 @@ post-build:
 	done
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pnm2ppa
 	cd ${WRKSRC} &&	\
 	${INSTALL_DATA} docs/en/CALIBRATION.txt	docs/en/COLOR.txt	\
-		${PREFIX}/share/doc/pnm2ppa
+		${DESTDIR}${PREFIX}/share/doc/pnm2ppa
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/pnm2ppa/distinfo b/print/pnm2ppa/distinfo
index 11e999bb089..07d130b4c7a 100644
--- a/print/pnm2ppa/distinfo
+++ b/print/pnm2ppa/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:51:44 agc Exp $
+$NetBSD: distinfo,v 1.6 2008/06/12 02:14:43 joerg Exp $
 
 SHA1 (pnm2ppa-1.12.tar.gz) = a4a8915cb9e3d01dd55bd5958b00a9d19b1d747d
 RMD160 (pnm2ppa-1.12.tar.gz) = 915aff8a84fd0740e6af62c1ca488a2faa511f2b
 Size (pnm2ppa-1.12.tar.gz) = 191113 bytes
-SHA1 (patch-aa) = d31f9f5a79649568062549264458965d78abe597
+SHA1 (patch-aa) = 3360ab4a23ca564097be604f3e2ddbb255c62c48
 SHA1 (patch-ab) = 2e343bcaaca3e37dd0d393688bbc8cc37b70b4dc
 SHA1 (patch-ac) = 24d15229f9d81839c4b9e145ff554b12748c2153
 SHA1 (patch-ad) = e6bfdcedd053a683c2c91f6a23c1270bc6f6aecb
diff --git a/print/pnm2ppa/patches/patch-aa b/print/pnm2ppa/patches/patch-aa
index 0fc3d82ad3f..75dcb784322 100644
--- a/print/pnm2ppa/patches/patch-aa
+++ b/print/pnm2ppa/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2003/09/17 18:40:48 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2008/06/12 02:14:43 joerg Exp $
 
 --- Makefile.orig	2002-11-16 00:29:29.000000000 +0100
 +++ Makefile
@@ -31,15 +31,15 @@ $NetBSD: patch-aa,v 1.3 2003/09/17 18:40:48 jmmv Exp $
 -	$(INSTALLD) $(MANDIR)
 -	$(INSTALL) -m 755 pnm2ppa  $(BINDIR)
 -	$(INSTALL) -m 644 docs/en/pnm2ppa.1 $(MANDIR)
-+	$(BSD_INSTALL_PROGRAM) -m 755 pnm2ppa  $(BINDIR)
-+	$(BSD_INSTALL_MAN) -m 644 docs/en/pnm2ppa.1 $(MANDIR)
++	$(BSD_INSTALL_PROGRAM) -m 755 pnm2ppa  ${DESTDIR}$(BINDIR)
++	$(BSD_INSTALL_MAN) -m 644 docs/en/pnm2ppa.1 ${DESTDIR}$(MANDIR)
  # development only - allows root to edit
 -	$(INSTALL) -m 644 pnm2ppa.conf  $(CONFDIR)
-+	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/examples/pnm2ppa
-+	$(BSD_INSTALL_DATA) -m 644 pnm2ppa.conf  $(PREFIX)/share/examples/pnm2ppa
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(PREFIX)/share/examples/pnm2ppa
++	$(BSD_INSTALL_DATA) -m 644 pnm2ppa.conf  ${DESTDIR}$(PREFIX)/share/examples/pnm2ppa
  # calibration tool
 -	$(INSTALL) -m 755 calibrate_ppa $(BINDIR) 
-+	$(BSD_INSTALL_PROGRAM) -m 755 calibrate_ppa $(BINDIR) 
++	$(BSD_INSTALL_PROGRAM) -m 755 calibrate_ppa ${DESTDIR}$(BINDIR) 
  # final production - much tighter
  #	$(INSTALL) -m 444 pnm2ppa.conf $(CONFDIR)
 -	@@echo 
diff --git a/print/pscal/Makefile b/print/pscal/Makefile
index 2e27249b9c1..84df87d0936 100644
--- a/print/pscal/Makefile
+++ b/print/pscal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:31 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=	pscal-1.16
@@ -9,13 +9,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.panix.com/~mbh/projects.html
 COMMENT=	Produces simple, nice-looking PostScript calendars
 
-INSTALLATION_DIRS=	bin
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-do-build:
+INSTALLATION_DIRS=	bin share/doc/pscal
+
+NO_BUILD=	yes
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/pscal ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pscal
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pscal
+	${INSTALL_SCRIPT} ${WRKSRC}/pscal ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/pscal
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/psify/Makefile b/print/psify/Makefile
index 33b13de11d7..70b36fb3d74 100644
--- a/print/psify/Makefile
+++ b/print/psify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:22:25 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=	psify-19980216
@@ -10,6 +10,8 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://mit.edu/~mkgray/jik/sipbsrc/src/psify/
 COMMENT=	Pretty print C, CLU, SCHEME, Java and ARGUS source files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	psify
 EXTRACT_ONLY=	#empty
@@ -17,7 +19,8 @@ EXTRACT_ONLY=	#empty
 NO_CONFIGURE=	yes
 USE_TOOLS+=	lex
 
-INSTALL_TARGET=	install prefix=${PREFIX}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALL_MAKE_FLAGS=	prefix=${DESTDIR}${PREFIX}
 
 post-extract:
 	@for i in ${DISTFILES}; \
diff --git a/print/psjoin/Makefile b/print/psjoin/Makefile
index 85aa643c922..95aacdc83f6 100644
--- a/print/psjoin/Makefile
+++ b/print/psjoin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/02/22 19:27:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=		psjoin
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://homepage3.nifty.com/tsato/tools/psjoin.html
 COMMENT=		Concatenate PostScript files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=		${PKGNAME_NOREV}
 NO_BUILD=		yes
 REPLACE_PERL=		psjoin
@@ -20,6 +22,6 @@ WRKSRC=			${WRKDIR}
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/psjoin ${PREFIX}/bin/psjoin
+	${INSTALL_SCRIPT} ${WRKDIR}/psjoin ${DESTDIR}${PREFIX}/bin/psjoin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index 40bd8e15836..788516dc2cd 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/13 18:23:37 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=		pslib-0.2.6
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pslib.sourceforge.net/
 COMMENT=		C-library to create PostScript files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEPENDS+=		p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
 USE_PKGLOCALEDIR=	yes
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index a369ba2e52f..f412c163b29 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/12/02 13:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2008/06/12 02:14:43 joerg Exp $
 
 DISTNAME=	psutils-p17
 PKGNAME=	psutils-1.17
@@ -10,6 +10,8 @@ MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://www.go.dlr.de/wt/dv/ig/pdinfo_dv/psutils.html
 COMMENT=	Utilities for manipulating PostScript documents
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/psutils
 USE_TOOLS+=	perl:run
 
@@ -26,7 +28,7 @@ PKG_FAIL_REASON+=	"Invalid PAPERSIZE (${PAPERSIZE}). Choose one of A4 or Letter.
 
 MAKE_ENV+=	PERL5=${PERL5:Q}
 MAKE_FLAGS+=	PAPER=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`
-MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}/man1
+MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 MAKE_FILE=	Makefile.unix
 
 EGDIR=		${PREFIX}/share/examples/psutils
@@ -38,9 +40,11 @@ SUBST_MESSAGE.psu=	Adjusting the installation prefix.
 SUBST_FILES.psu=	psutil.c
 SUBST_SED.psu=		-e "s|@prefix@|${PREFIX}|g"
 
+INSTALLATION_DIRS=	${EGDIR}
+INSTALL_MAKE_FLAGS=	PREFIX=${DESTDIR}${PREFIX}
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 	low=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`		\
-	&& ${ECHO} "PAPERSIZE=$$low" > ${EGDIR}/psutils.cfg
+	&& ${ECHO} "PAPERSIZE=$$low" > ${DESTDIR}${EGDIR}/psutils.cfg
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-pslib/Makefile b/print/py-pslib/Makefile
index 8eb786d7793..06587dc759f 100644
--- a/print/py-pslib/Makefile
+++ b/print/py-pslib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:11 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:43 joerg Exp $
 #
 
 DISTNAME=		python-pslib_0.2.0.orig
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pslib.sourceforge.net/
 COMMENT=		Python bindings for pslib
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/python-pslib-0.2.0
 PYDISTUTILSPKG=	yes
 
diff --git a/print/py-reportlab-renderPM/Makefile b/print/py-reportlab-renderPM/Makefile
index c1e610eaa61..1993fd0c891 100644
--- a/print/py-reportlab-renderPM/Makefile
+++ b/print/py-reportlab-renderPM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/04/25 19:50:11 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/12 02:14:44 joerg Exp $
 #
 
 DISTNAME=	renderPM-0-9
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.reportlab.com/rl_addons.html
 COMMENT=	Pixmap rendering for reportlab
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 
 WRKSRC=		${WRKDIR}
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 1540ab1a7c7..062c75f2dd0 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/04/25 19:50:11 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2008/06/12 02:14:44 joerg Exp $
 #
 
 DISTNAME=	ReportLab_1_21_2
@@ -11,6 +11,8 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.reportlab.com/
 COMMENT=	Powerful PDF-generating toolkit for Python
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 
 WRKSRC=		${WRKDIR}/reportlab_1_21_2/reportlab