Update font path reference. Bump PKGREVISION.

4 files changed, 13 insertions, 14 deletions

diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index d9e6570cfd6..9f69c036849 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2012/10/08 13:45:35 asau Exp $
+# $NetBSD: Makefile,v 1.26 2014/06/01 18:06:13 wiz Exp $
 
 DISTNAME=	acroread7	# overridden below
 PKGNAME=	acroread7-7.0.9
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/
 
@@ -39,7 +39,7 @@ BIN_PATCH=	${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
 
 # Additional directories to search for fonts
 BUILD_DEFS+=		ACROREAD_FONTPATH
-ACROREAD_FONTPATH?=	${PREFIX}/lib/X11/fonts/TTF
+ACROREAD_FONTPATH?=	${PREFIX}/share/fonts/X11/TTF
 
 INSTALLATION_DIRS=	bin Acrobat7
 
diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile
index a81c99a424d..60fcbd66f22 100644
--- a/print/acroread8/Makefile
+++ b/print/acroread8/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/10/08 13:45:35 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/01 18:06:14 wiz Exp $
 
 DISTNAME=	acroread8	# overridden below
 PKGNAME=	acroread8-8.1.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.7/enu/
 
@@ -45,7 +45,7 @@ BIN_PATCH=	${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
 
 # Additional directories to search for fonts
 BUILD_DEFS+=		ACROREAD_FONTPATH
-ACROREAD_FONTPATH?=	${PREFIX}/lib/X11/fonts/TTF
+ACROREAD_FONTPATH?=	${PREFIX}/share/fonts/X11/TTF
 
 INSTALLATION_DIRS=	Acrobat8 bin
 
diff --git a/print/acroread9/Makefile b/print/acroread9/Makefile
index fe085e1a584..993f4bd030c 100644
--- a/print/acroread9/Makefile
+++ b/print/acroread9/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2014/04/08 10:12:10 obache Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/01 18:06:14 wiz Exp $
 
 DISTNAME=	acroread9	# overridden below
 PKGNAME=	acroread9-9.5.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PKGVERSION_NOREV}/enu/
 
@@ -40,7 +40,7 @@ BIN_PATCH=	${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
 
 # Additional directories to search for fonts
 BUILD_DEFS+=		ACROREAD_FONTPATH
-ACROREAD_FONTPATH?=	${PREFIX}/lib/X11/fonts/TTF
+ACROREAD_FONTPATH?=	${PREFIX}/share/fonts/X11/TTF
 
 INSTALLATION_DIRS=	Acrobat9 bin ${PKGMANDIR}/man1
 
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index d9dffe07053..8864fd83a2d 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2012/10/08 13:45:49 asau Exp $
-#
+# $NetBSD: Makefile,v 1.22 2014/06/01 18:07:15 wiz Exp $
 
 DISTNAME=	xpdf-korean-2005-jul-07
 PKGNAME=	xpdf-korean-20050707
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://gd.tuwien.ac.at/publishing/xpdf/
@@ -24,8 +23,8 @@ 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
-	${ECHO} "displayCIDFontTT	Adobe-Korea1	${PREFIX}/lib/X11/fonts/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
-	${ECHO} "displayCIDFontTT	Unidocs-Korea1	${PREFIX}/lib/X11/fonts/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
+	${ECHO} "displayCIDFontTT	Adobe-Korea1	${PREFIX}/share/fonts/X11/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
+	${ECHO} "displayCIDFontTT	Unidocs-Korea1	${PREFIX}/share/fonts/X11/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/Adobe-Korea1.cidToUnicode \