Defer modification of xpdfrc to real package install time. Bump

revisions. Add DESTDIR support.

33 files changed, 232 insertions, 128 deletions

diff --git a/print/xpdf-arabic/INSTALL b/print/xpdf-arabic/INSTALL
new file mode 100644
index 00000000000..ba22227352e
--- /dev/null
+++ b/print/xpdf-arabic/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:00 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/arabic/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-arabic/Makefile b/print/xpdf-arabic/Makefile
index 0933e34faca..840d7a51592 100644
--- a/print/xpdf-arabic/Makefile
+++ b/print/xpdf-arabic/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2010/01/27 15:14:00 joerg Exp $
 #
 
 DISTNAME=	xpdf-arabic-2003-feb-16
 PKGNAME=	xpdf-arabic-20030216
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Arabic
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 
@@ -19,16 +21,14 @@ WRKSRC=		${WRKDIR}/xpdf-arabic
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/arabic
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/arabic
-	${INSTALL_DATA} ${WRKSRC}/ISO-8859-6.unicodeMap \
-		${PREFIX}/share/xpdf/arabic
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	${INSTALL_DATA} ${WRKSRC}/ISO-8859-6.unicodeMap ${WRKSRC}/add-to-xpdfrc \
+		${DESTDIR}${PREFIX}/share/xpdf/arabic
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-arabic/PLIST b/print/xpdf-arabic/PLIST
index 48282ea4b88..cfadf5a669d 100644
--- a/print/xpdf-arabic/PLIST
+++ b/print/xpdf-arabic/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:12:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/01/27 15:14:00 joerg Exp $
 share/xpdf/arabic/ISO-8859-6.unicodeMap
+share/xpdf/arabic/add-to-xpdfrc
diff --git a/print/xpdf-chinese-simplified/INSTALL b/print/xpdf-chinese-simplified/INSTALL
new file mode 100644
index 00000000000..95b7228564b
--- /dev/null
+++ b/print/xpdf-chinese-simplified/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:00 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/chinese-simplified/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-chinese-simplified/Makefile b/print/xpdf-chinese-simplified/Makefile
index ad8035c02b1..8323f1a2abf 100644
--- a/print/xpdf-chinese-simplified/Makefile
+++ b/print/xpdf-chinese-simplified/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2010/01/27 15:14:00 joerg Exp $
 #
 
 DISTNAME=	xpdf-chinese-simplified-2004-jul-27
 PKGNAME=	xpdf-chinese-simplified-20040727
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,31 +12,32 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Chinese (Simplified)
 
-DEPENDS+=	xpdf>=2.02:../../print/xpdf
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 WRKSRC=		${WRKDIR}/xpdf-chinese-simplified
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/chinese-simplified/CMap
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/chinese-simplified
 	${INSTALL_DATA} ${WRKSRC}/Adobe-GB1.cidToUnicode \
-		${PREFIX}/share/xpdf/chinese-simplified
+	    ${DESTDIR}${PREFIX}/share/xpdf/chinese-simplified
 	${INSTALL_DATA} ${WRKSRC}/EUC-CN.unicodeMap \
-		${PREFIX}/share/xpdf/chinese-simplified
+	    ${DESTDIR}${PREFIX}/share/xpdf/chinese-simplified
 	${INSTALL_DATA} ${WRKSRC}/GBK.unicodeMap \
-		${PREFIX}/share/xpdf/chinese-simplified
+	    ${DESTDIR}${PREFIX}/share/xpdf/chinese-simplified
 	${INSTALL_DATA} ${WRKSRC}/ISO-2022-CN.unicodeMap \
-		${PREFIX}/share/xpdf/chinese-simplified
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/chinese-simplified/CMap
-	${INSTALL_DATA} ${WRKSRC}/CMap/* ${PREFIX}/share/xpdf/chinese-simplified/CMap
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	    ${DESTDIR}${PREFIX}/share/xpdf/chinese-simplified
+	${INSTALL_DATA} ${WRKSRC}/CMap/* \
+	    ${DESTDIR}${PREFIX}/share/xpdf/chinese-simplified/CMap
+	${INSTALL_DATA} ${WRKSRC}/add-to-xpdfrc \
+	    ${DESTDIR}${PREFIX}/share/xpdf/chinese-simplified
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-chinese-simplified/PLIST b/print/xpdf-chinese-simplified/PLIST
index 9bcf7fb425e..3a8bbde7777 100644
--- a/print/xpdf-chinese-simplified/PLIST
+++ b/print/xpdf-chinese-simplified/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:12:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/01/27 15:14:00 joerg Exp $
 share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
 share/xpdf/chinese-simplified/CMap/Adobe-GB1-0
 share/xpdf/chinese-simplified/CMap/Adobe-GB1-1
@@ -36,3 +36,4 @@ share/xpdf/chinese-simplified/CMap/UniGB-UTF8-V
 share/xpdf/chinese-simplified/EUC-CN.unicodeMap
 share/xpdf/chinese-simplified/GBK.unicodeMap
 share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
+share/xpdf/chinese-simplified/add-to-xpdfrc
diff --git a/print/xpdf-chinese-traditional/INSTALL b/print/xpdf-chinese-traditional/INSTALL
new file mode 100644
index 00000000000..9ba9057e96f
--- /dev/null
+++ b/print/xpdf-chinese-traditional/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:00 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/chinese-traditional/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-chinese-traditional/Makefile b/print/xpdf-chinese-traditional/Makefile
index 9bfa322d0ae..24b21363bae 100644
--- a/print/xpdf-chinese-traditional/Makefile
+++ b/print/xpdf-chinese-traditional/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2010/01/27 15:14:00 joerg Exp $
 #
 
 DISTNAME=	xpdf-chinese-traditional-2004-jul-27
 PKGNAME=	xpdf-chinese-traditional-20040727
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Chinese (Traditional)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 
@@ -19,20 +21,17 @@ WRKSRC=		${WRKDIR}/xpdf-chinese-traditional
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/chinese-traditional/CMap
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/chinese-traditional
 	${INSTALL_DATA} ${WRKSRC}/Adobe-CNS1.cidToUnicode \
-		${PREFIX}/share/xpdf/chinese-traditional
-	${INSTALL_DATA} ${WRKSRC}/Big5.unicodeMap \
-		${PREFIX}/share/xpdf/chinese-traditional
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/chinese-traditional/CMap
-	${INSTALL_DATA} ${WRKSRC}/CMap/* ${PREFIX}/share/xpdf/chinese-traditional/CMap
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	    ${WRKSRC}/Big5.unicodeMap ${WRKSRC}/add-to-xpdfrc \
+	    ${DESTDIR}${PREFIX}/share/xpdf/chinese-traditional
+	${INSTALL_DATA} ${WRKSRC}/CMap/* \
+	    ${DESTDIR}${PREFIX}/share/xpdf/chinese-traditional/CMap
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-chinese-traditional/PLIST b/print/xpdf-chinese-traditional/PLIST
index 7f3ede5d11f..62469484591 100644
--- a/print/xpdf-chinese-traditional/PLIST
+++ b/print/xpdf-chinese-traditional/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:12:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/01/27 15:14:00 joerg Exp $
 share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
 share/xpdf/chinese-traditional/Big5.unicodeMap
 share/xpdf/chinese-traditional/CMap/Adobe-CNS1-0
@@ -43,3 +43,4 @@ share/xpdf/chinese-traditional/CMap/UniCNS-UTF16-H
 share/xpdf/chinese-traditional/CMap/UniCNS-UTF16-V
 share/xpdf/chinese-traditional/CMap/UniCNS-UTF8-H
 share/xpdf/chinese-traditional/CMap/UniCNS-UTF8-V
+share/xpdf/chinese-traditional/add-to-xpdfrc
diff --git a/print/xpdf-cyrillic/INSTALL b/print/xpdf-cyrillic/INSTALL
new file mode 100644
index 00000000000..1d78f5774c8
--- /dev/null
+++ b/print/xpdf-cyrillic/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:00 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/cyrillic/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-cyrillic/Makefile b/print/xpdf-cyrillic/Makefile
index 3497dc5a688..cc041e96496 100644
--- a/print/xpdf-cyrillic/Makefile
+++ b/print/xpdf-cyrillic/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2010/01/27 15:14:00 joerg Exp $
 #
 
 DISTNAME=	xpdf-cyrillic-2003-jun-28
 PKGNAME=	xpdf-cyrillic-20030628
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,25 +12,23 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Cyrillic
 
-DEPENDS+=	xpdf>=2.02:../../print/xpdf
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 WRKSRC=		${WRKDIR}/xpdf-cyrillic
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/cyrillic
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/cyrillic
 	${INSTALL_DATA} ${WRKSRC}/Bulgarian.nameToUnicode \
-		${PREFIX}/share/xpdf/cyrillic
-	${INSTALL_DATA} ${WRKSRC}/KOI8-R.unicodeMap \
-		${PREFIX}/share/xpdf/cyrillic
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	    ${WRKSRC}/KOI8-R.unicodeMap ${WRKSRC}/add-to-xpdfrc \
+	    ${DESTDIR}${PREFIX}/share/xpdf/cyrillic
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-cyrillic/PLIST b/print/xpdf-cyrillic/PLIST
index 2a8bcc9bc14..e9dc7c334d4 100644
--- a/print/xpdf-cyrillic/PLIST
+++ b/print/xpdf-cyrillic/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:12:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/01/27 15:14:00 joerg Exp $
 share/xpdf/cyrillic/Bulgarian.nameToUnicode
 share/xpdf/cyrillic/KOI8-R.unicodeMap
+share/xpdf/cyrillic/add-to-xpdfrc
diff --git a/print/xpdf-greek/INSTALL b/print/xpdf-greek/INSTALL
new file mode 100644
index 00000000000..1a201b7c595
--- /dev/null
+++ b/print/xpdf-greek/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:00 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/greek/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-greek/Makefile b/print/xpdf-greek/Makefile
index 46bf8eb8239..c9763e91ea2 100644
--- a/print/xpdf-greek/Makefile
+++ b/print/xpdf-greek/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2010/01/27 15:14:00 joerg Exp $
 #
 
 DISTNAME=	xpdf-greek-2003-jun-28
 PKGNAME=	xpdf-greek-20020628
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,25 +12,23 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Greek
 
-DEPENDS+=	xpdf>=2.02:../../print/xpdf
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 WRKSRC=		${WRKDIR}/xpdf-greek
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/greek
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/greek
 	${INSTALL_DATA} ${WRKSRC}/Greek.nameToUnicode \
-		${PREFIX}/share/xpdf/greek
-	${INSTALL_DATA} ${WRKSRC}/ISO-8859-7.unicodeMap \
-		${PREFIX}/share/xpdf/greek
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	    ${WRKSRC}/ISO-8859-7.unicodeMap ${WRKSRC}/add-to-xpdfrc \
+	    ${DESTDIR}${PREFIX}/share/xpdf/greek
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-greek/PLIST b/print/xpdf-greek/PLIST
index de2fda3dccf..896e100d40a 100644
--- a/print/xpdf-greek/PLIST
+++ b/print/xpdf-greek/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:16:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/01/27 15:14:00 joerg Exp $
 share/xpdf/greek/Greek.nameToUnicode
 share/xpdf/greek/ISO-8859-7.unicodeMap
+share/xpdf/greek/add-to-xpdfrc
diff --git a/print/xpdf-hebrew/INSTALL b/print/xpdf-hebrew/INSTALL
new file mode 100644
index 00000000000..dcb6294994d
--- /dev/null
+++ b/print/xpdf-hebrew/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:00 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/hebrew/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-hebrew/Makefile b/print/xpdf-hebrew/Makefile
index f1c845ebba4..7f88ec1b192 100644
--- a/print/xpdf-hebrew/Makefile
+++ b/print/xpdf-hebrew/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2010/01/27 15:14:00 joerg Exp $
 #
 
 DISTNAME=	xpdf-hebrew-2003-feb-16
 PKGNAME=	xpdf-hebrew-20030216
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,23 +12,22 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Hebrew
 
-DEPENDS+=	xpdf>=2.02:../../print/xpdf
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 WRKSRC=		${WRKDIR}/xpdf-hebrew
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/hebrew
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/hebrew
-	${INSTALL_DATA} ${WRKSRC}/ISO-8859-8.unicodeMap \
-		${PREFIX}/share/xpdf/hebrew
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	${INSTALL_DATA} ${WRKSRC}/ISO-8859-8.unicodeMap ${WRKSRC}/add-to-xpdfrc \
+		${DESTDIR}${PREFIX}/share/xpdf/hebrew
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-hebrew/PLIST b/print/xpdf-hebrew/PLIST
index 33d389eab23..5898bf4dd28 100644
--- a/print/xpdf-hebrew/PLIST
+++ b/print/xpdf-hebrew/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:12:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/01/27 15:14:00 joerg Exp $
 share/xpdf/hebrew/ISO-8859-8.unicodeMap
+share/xpdf/hebrew/add-to-xpdfrc
diff --git a/print/xpdf-japanese/INSTALL b/print/xpdf-japanese/INSTALL
new file mode 100644
index 00000000000..ce6b9cc0e7a
--- /dev/null
+++ b/print/xpdf-japanese/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:00 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/japanese/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-japanese/Makefile b/print/xpdf-japanese/Makefile
index 8ef52ba4a0a..f6e70b801c8 100644
--- a/print/xpdf-japanese/Makefile
+++ b/print/xpdf-japanese/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2010/01/27 15:14:00 joerg Exp $
 #
 
 DISTNAME=	xpdf-japanese-2004-jul-27
 PKGNAME=	xpdf-japanese-20040727
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,31 +12,25 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Japanese
 
-DEPENDS+=	xpdf>=2.02:../../print/xpdf
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 WRKSRC=		${WRKDIR}/xpdf-japanese
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/japanese/CMap
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/japanese
 	${INSTALL_DATA} ${WRKSRC}/Adobe-Japan1.cidToUnicode \
-		${PREFIX}/share/xpdf/japanese
-	${INSTALL_DATA} ${WRKSRC}/EUC-JP.unicodeMap \
-		${PREFIX}/share/xpdf/japanese
-	${INSTALL_DATA} ${WRKSRC}/ISO-2022-JP.unicodeMap \
-		${PREFIX}/share/xpdf/japanese
-	${INSTALL_DATA} ${WRKSRC}/Shift-JIS.unicodeMap \
-		${PREFIX}/share/xpdf/japanese
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/japanese/CMap
-	${INSTALL_DATA} ${WRKSRC}/CMap/* ${PREFIX}/share/xpdf/japanese/CMap
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	    ${WRKSRC}/EUC-JP.unicodeMap ${WRKSRC}/ISO-2022-JP.unicodeMap \
+	    ${WRKSRC}/Shift-JIS.unicodeMap ${WRKSRC}/add-to-xpdfrc \
+	    ${DESTDIR}${PREFIX}/share/xpdf/japanese
+	${INSTALL_DATA} ${WRKSRC}/CMap/* ${DESTDIR}${PREFIX}/share/xpdf/japanese/CMap
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-japanese/PLIST b/print/xpdf-japanese/PLIST
index bd67aa52080..9d536df491d 100644
--- a/print/xpdf-japanese/PLIST
+++ b/print/xpdf-japanese/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:12:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/01/27 15:14:00 joerg Exp $
 share/xpdf/japanese/Adobe-Japan1.cidToUnicode
 share/xpdf/japanese/CMap/78-EUC-H
 share/xpdf/japanese/CMap/78-EUC-V
@@ -59,3 +59,4 @@ share/xpdf/japanese/CMap/WP-Symbol
 share/xpdf/japanese/EUC-JP.unicodeMap
 share/xpdf/japanese/ISO-2022-JP.unicodeMap
 share/xpdf/japanese/Shift-JIS.unicodeMap
+share/xpdf/japanese/add-to-xpdfrc
diff --git a/print/xpdf-korean/INSTALL b/print/xpdf-korean/INSTALL
new file mode 100644
index 00000000000..5af137d4133
--- /dev/null
+++ b/print/xpdf-korean/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:01 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/korean/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index 0900b1faf25..e69b1a91d49 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2010/01/27 15:14:01 joerg Exp $
 #
 
 DISTNAME=	xpdf-korean-2005-jul-07
 PKGNAME=	xpdf-korean-20050707
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,14 +12,17 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Korean
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	xpdf>=2.02:../../print/xpdf
 DEPENDS+=	baekmuk-ttf>=1.0:../../fonts/baekmuk-ttf
 
-
 WRKSRC=		${WRKDIR}/xpdf-korean
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/korean/CMap
+
 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
@@ -27,15 +30,10 @@ post-patch:
 	${ECHO} "displayCIDFontTT	Unidocs-Korea1	${PREFIX}/lib/X11/fonts/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/korean
 	${INSTALL_DATA} ${WRKSRC}/Adobe-Korea1.cidToUnicode \
-		${PREFIX}/share/xpdf/korean
-	${INSTALL_DATA} ${WRKSRC}/ISO-2022-KR.unicodeMap \
-		${PREFIX}/share/xpdf/korean
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/korean/CMap
-	${INSTALL_DATA} ${WRKSRC}/CMap/* ${PREFIX}/share/xpdf/korean/CMap
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	    ${WRKSRC}/ISO-2022-KR.unicodeMap ${WRKSRC}/add-to-xpdfrc \
+	    ${DESTDIR}${PREFIX}/share/xpdf/korean
+	${INSTALL_DATA} ${WRKSRC}/CMap/* \
+	    ${DESTDIR}${PREFIX}/share/xpdf/korean/CMap
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-korean/PLIST b/print/xpdf-korean/PLIST
index dbe9d6d873a..35f80ef1cfe 100644
--- a/print/xpdf-korean/PLIST
+++ b/print/xpdf-korean/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:12:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/01/27 15:14:01 joerg Exp $
 share/xpdf/korean/Adobe-Korea1.cidToUnicode
 share/xpdf/korean/CMap/Adobe-Korea1-0
 share/xpdf/korean/CMap/Adobe-Korea1-1
@@ -26,3 +26,4 @@ share/xpdf/korean/CMap/UniKS-UTF16-V
 share/xpdf/korean/CMap/UniKS-UTF8-H
 share/xpdf/korean/CMap/UniKS-UTF8-V
 share/xpdf/korean/ISO-2022-KR.unicodeMap
+share/xpdf/korean/add-to-xpdfrc
diff --git a/print/xpdf-latin2/INSTALL b/print/xpdf-latin2/INSTALL
new file mode 100644
index 00000000000..0dad4167b8d
--- /dev/null
+++ b/print/xpdf-latin2/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:01 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/latin2/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-latin2/Makefile b/print/xpdf-latin2/Makefile
index baec55939c1..62bee359bf7 100644
--- a/print/xpdf-latin2/Makefile
+++ b/print/xpdf-latin2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2010/01/27 15:14:01 joerg Exp $
 #
 
 DISTNAME=	xpdf-latin2-2002-oct-22
 PKGNAME=	xpdf-latin2-20021022
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,23 +12,22 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Latin-2
 
-DEPENDS+=	xpdf>=2.02:../../print/xpdf
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 WRKSRC=		${WRKDIR}/xpdf-latin2
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/latin2
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/latin2
-	${INSTALL_DATA} ${WRKSRC}/Latin2.unicodeMap \
-		${PREFIX}/share/xpdf/latin2
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	${INSTALL_DATA} ${WRKSRC}/Latin2.unicodeMap ${WRKSRC}/add-to-xpdfrc \
+	    ${DESTDIR}${PREFIX}/share/xpdf/latin2
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-latin2/PLIST b/print/xpdf-latin2/PLIST
index 0efd9f55d02..650930f3a44 100644
--- a/print/xpdf-latin2/PLIST
+++ b/print/xpdf-latin2/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:12:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/01/27 15:14:01 joerg Exp $
 share/xpdf/latin2/Latin2.unicodeMap
+share/xpdf/latin2/add-to-xpdfrc
diff --git a/print/xpdf-thai/INSTALL b/print/xpdf-thai/INSTALL
new file mode 100644
index 00000000000..ff467bd7386
--- /dev/null
+++ b/print/xpdf-thai/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:01 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/thai/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-thai/Makefile b/print/xpdf-thai/Makefile
index d6049b94491..8cefcdd7af8 100644
--- a/print/xpdf-thai/Makefile
+++ b/print/xpdf-thai/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/27 15:14:01 joerg Exp $
 #
 
 DISTNAME=	xpdf-thai-2002-jan-16
 PKGNAME=	xpdf-thai-20020116
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,25 +12,23 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Thai
 
-DEPENDS+=	xpdf>=2.02:../../print/xpdf
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 WRKSRC=		${WRKDIR}/xpdf-thai
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/thai
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/thai
 	${INSTALL_DATA} ${WRKSRC}/TIS-620.unicodeMap \
-		${PREFIX}/share/xpdf/thai
-	${INSTALL_DATA} ${WRKSRC}/Thai.nameToUnicode \
-		${PREFIX}/share/xpdf/thai
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	    ${WRKSRC}/Thai.nameToUnicode ${WRKSRC}/add-to-xpdfrc \
+	    ${DESTDIR}${PREFIX}/share/xpdf/thai
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-thai/PLIST b/print/xpdf-thai/PLIST
index b4a95fe5412..b527b7079b1 100644
--- a/print/xpdf-thai/PLIST
+++ b/print/xpdf-thai/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:12:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/01/27 15:14:01 joerg Exp $
 share/xpdf/thai/TIS-620.unicodeMap
 share/xpdf/thai/Thai.nameToUnicode
+share/xpdf/thai/add-to-xpdfrc
diff --git a/print/xpdf-turkish/INSTALL b/print/xpdf-turkish/INSTALL
new file mode 100644
index 00000000000..2fbc886d99e
--- /dev/null
+++ b/print/xpdf-turkish/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2010/01/27 15:14:01 joerg Exp $
+
+XPDFRC=${PKG_SYSCONFDIR}/xpdfrc
+CAT=@CAT@
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} ${PREFIX}/share/xpdf/turkish/add-to-xpdfrc >> ${XPDFRC}
+	;;
+esac
diff --git a/print/xpdf-turkish/Makefile b/print/xpdf-turkish/Makefile
index b89925210a7..c75214edf6a 100644
--- a/print/xpdf-turkish/Makefile
+++ b/print/xpdf-turkish/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/27 15:14:01 joerg Exp $
 #
 
 DISTNAME=	xpdf-turkish-2002-apr-10
 PKGNAME=	xpdf-turkish-20020410
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -12,23 +12,22 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Xpdf support files for Turkish
 
-DEPENDS+=	xpdf>=2.02:../../print/xpdf
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
 WRKSRC=		${WRKDIR}/xpdf-turkish
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	share/xpdf/turkish
+
 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
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/turkish
-	${INSTALL_DATA} ${WRKSRC}/ISO-8859-9.unicodeMap \
-		${PREFIX}/share/xpdf/turkish
-
-post-install:
-	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
+	${INSTALL_DATA} ${WRKSRC}/ISO-8859-9.unicodeMap ${WRKSRC}/add-to-xpdfrc \
+	    ${DESTDIR}${PREFIX}/share/xpdf/turkish
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf-turkish/PLIST b/print/xpdf-turkish/PLIST
index 0f0ada4b2da..4e1555d8974 100644
--- a/print/xpdf-turkish/PLIST
+++ b/print/xpdf-turkish/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:12:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/01/27 15:14:01 joerg Exp $
 share/xpdf/turkish/ISO-8859-9.unicodeMap
+share/xpdf/turkish/add-to-xpdfrc