Sat Mar 7 15:30:58 2015 UTC ()
Fix print/xpdf xpdfrc(5) problem PR pkg/49718 (by fukumoto at imasy.or.jp).
The path mentioned in man page examples did not match to the actual installation.
This is the same problem as pkg/44266 (by also fukumoto).
Thank you,


(mef)
diff -r1.81 -r1.82 pkgsrc/print/xpdf/Makefile
diff -r1.42 -r1.43 pkgsrc/print/xpdf/distinfo
diff -r1.6 -r1.7 pkgsrc/print/xpdf/patches/patch-ak
cvs diff -r1.81 -r1.82 pkgsrc/print/xpdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/xpdf/Makefile 2014/08/01 12:31:27 1.81
+++ pkgsrc/print/xpdf/Makefile 2015/03/07 15:30:58 1.82
@@ -1,23 +1,21 @@ @@ -1,23 +1,21 @@
1# $NetBSD: Makefile,v 1.81 2014/08/01 12:31:27 tron Exp $ 1# $NetBSD: Makefile,v 1.82 2015/03/07 15:30:58 mef Exp $
2 2
3DISTNAME= xpdf-3.04 3DISTNAME= xpdf-3.04
4CATEGORIES= print 4CATEGORIES= print
5MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ 5MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
6 ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \ 6 ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \
7 http://gd.tuwien.ac.at/publishing/xpdf/ 7 http://gd.tuwien.ac.at/publishing/xpdf/
8#PATCH_SITES= ${MASTER_SITES} 8PKGREVISION= 1
9#PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch xpdf-3.02pl4.patch 
10#PATCH_DIST_STRIP= -p1 
11 9
12MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.foolabs.com/xpdf/ 11HOMEPAGE= http://www.foolabs.com/xpdf/
14COMMENT= Display tool for PDF files 12COMMENT= Display tool for PDF files
15LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
16 14
17MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
18 16
19DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts 17DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
20DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils 18DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
21 19
22CONFLICTS= xpdf-crypto-[0-9]* 20CONFLICTS= xpdf-crypto-[0-9]*
23 21
cvs diff -r1.42 -r1.43 pkgsrc/print/xpdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/xpdf/distinfo 2014/08/01 12:31:27 1.42
+++ pkgsrc/print/xpdf/distinfo 2015/03/07 15:30:58 1.43
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.42 2014/08/01 12:31:27 tron Exp $ 1$NetBSD: distinfo,v 1.43 2015/03/07 15:30:58 mef Exp $
2 2
3SHA1 (xpdf-3.04.tar.gz) = b9b1dbb0335742a09d0442c60fd02f4f934618bd 3SHA1 (xpdf-3.04.tar.gz) = b9b1dbb0335742a09d0442c60fd02f4f934618bd
4RMD160 (xpdf-3.04.tar.gz) = fb29aad21054d5d3b349aec4806262feeca1bd8e 4RMD160 (xpdf-3.04.tar.gz) = fb29aad21054d5d3b349aec4806262feeca1bd8e
5Size (xpdf-3.04.tar.gz) = 825519 bytes 5Size (xpdf-3.04.tar.gz) = 825519 bytes
6SHA1 (patch-aa) = ab41e35600d1e625b902076d947ec48a9c1bc59e 6SHA1 (patch-aa) = ab41e35600d1e625b902076d947ec48a9c1bc59e
7SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2 7SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2
8SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a 8SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a
9SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143 9SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143
10SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c 10SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c
11SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac 11SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac
12SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a 12SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a
13SHA1 (patch-ai) = 2ef56341ee14cfb22c9d49e659cfa2955aa18ee6 13SHA1 (patch-ai) = 2ef56341ee14cfb22c9d49e659cfa2955aa18ee6
14SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860 14SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860
15SHA1 (patch-ak) = a45747998f7c72f7db3f9199c244dc1d4962417d 15SHA1 (patch-ak) = dab4cf5d892c00ab81e685c52977fa743f4d970a
16SHA1 (patch-al) = df18fb971275f99a7e1757f65455a181bb9eb8eb 16SHA1 (patch-al) = df18fb971275f99a7e1757f65455a181bb9eb8eb
17SHA1 (patch-am) = e88ff60e7941cb7bdfdc4bf59727ca401f1a5758 17SHA1 (patch-am) = e88ff60e7941cb7bdfdc4bf59727ca401f1a5758
18SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58 18SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58
19SHA1 (patch-bc) = e3f8092c30325a3f7abf230daeadd4478a9db768 19SHA1 (patch-bc) = e3f8092c30325a3f7abf230daeadd4478a9db768
20SHA1 (patch-xpdf_XPDFViewer.cc) = 38b1f79365149b37736ecfc73fa0e920fb758d93 20SHA1 (patch-xpdf_XPDFViewer.cc) = 38b1f79365149b37736ecfc73fa0e920fb758d93
cvs diff -r1.6 -r1.7 pkgsrc/print/xpdf/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/print/xpdf/patches/patch-ak 2011/10/27 02:35:41 1.6
+++ pkgsrc/print/xpdf/patches/patch-ak 2015/03/07 15:30:58 1.7
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1$NetBSD: patch-ak,v 1.6 2011/10/27 02:35:41 tez Exp $ 1$NetBSD: patch-ak,v 1.7 2015/03/07 15:30:58 mef Exp $
2 2
3--- doc/xpdfrc.5.orig 2011-08-15 16:08:53.000000000 -0500 3--- doc/xpdfrc.5.orig 2011-08-15 16:08:53.000000000 -0500
4+++ doc/xpdfrc.5 2011-10-26 19:56:33.796211600 -0500 4+++ doc/xpdfrc.5 2011-10-26 19:56:33.796211600 -0500
5@@ -7,7 +7,7 @@ 5@@ -7,7 +7,7 @@
6 .I .xpdfrc 6 .I .xpdfrc
7 file in your home directory, it will be read. Otherwise, a 7 file in your home directory, it will be read. Otherwise, a
8 system-wide configuration file will be read from 8 system-wide configuration file will be read from
9-.IR /usr/local/etc/xpdfrc , 9-.IR /usr/local/etc/xpdfrc ,
10+.IR @PKG_SYSCONFDIR@/xpdfrc , 10+.IR @PKG_SYSCONFDIR@/xpdfrc ,
11 if it exists. (This is its default location; depending on build 11 if it exists. (This is its default location; depending on build
12 options, it may be placed elsewhere.) On Win32 systems, the 12 options, it may be placed elsewhere.) On Win32 systems, the
13 .I xpdfrc 13 .I xpdfrc
14@@ -588,32 +588,32 @@ 14@@ -588,32 +588,32 @@
15 .nf 15 .nf
16  16
17 # from the Thai support package 17 # from the Thai support package
18-nameToUnicode /usr/local/share/xpdf/Thai.nameToUnicode 18-nameToUnicode /usr/local/share/xpdf/Thai.nameToUnicode
19+nameToUnicode @PREFIX@/share/xpdf/Thai.nameToUnicode 19+nameToUnicode @PREFIX@/share/xpdf/thai/Thai.nameToUnicode
20  20
21 # from the Japanese support package 21 # from the Japanese support package
22-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode 22-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode
23-unicodeMap JISX0208 /usr/local/share/xpdf/JISX0208.unicodeMap 23-unicodeMap JISX0208 /usr/local/share/xpdf/JISX0208.unicodeMap
24-cMapDir Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1 24-cMapDir Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1
25+cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/Adobe-Japan1.cidToUnicode 25+cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
26+unicodeMap JISX0208 @PREFIX@/share/xpdf/JISX0208.unicodeMap 26+unicodeMap JISX0208 @PREFIX@/share/xpdf/japanese/JISX0208.unicodeMap
27+cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/cmap/Adobe-Japan1 27+cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/CMap/Adobe-Japan1
28  28
29 # use the Base-14 Type 1 fonts from ghostscript 29 # use the Base-14 Type 1 fonts from ghostscript
30-fontFile Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb 30-fontFile Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb
31-fontFile Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb 31-fontFile Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb
32-fontFile Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb 32-fontFile Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb
33-fontFile Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb 33-fontFile Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb
34-fontFile Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb 34-fontFile Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb
35-fontFile Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb 35-fontFile Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb
36-fontFile Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb 36-fontFile Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb
37-fontFile Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb 37-fontFile Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb
38-fontFile Courier /usr/local/share/ghostscript/fonts/n022003l.pfb 38-fontFile Courier /usr/local/share/ghostscript/fonts/n022003l.pfb
39-fontFile Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb 39-fontFile Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb
40-fontFile Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb 40-fontFile Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb