Thu Dec 23 04:44:41 2010 UTC ()
Adjust Thai and Japanese examples in xpdfrc(5) to realities (add-to-xpdfrc
in xpdf-thai and xpdf-japanese package).
Fixes PR#44266.

Bump PKGREVISION.


(obache)
diff -r1.73 -r1.74 pkgsrc/print/xpdf/Makefile
diff -r1.38 -r1.39 pkgsrc/print/xpdf/distinfo
diff -r1.4 -r1.5 pkgsrc/print/xpdf/patches/patch-ak
cvs diff -r1.73 -r1.74 pkgsrc/print/xpdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/xpdf/Makefile 2010/10/13 21:29:42 1.73
+++ pkgsrc/print/xpdf/Makefile 2010/12/23 04:44:41 1.74
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.73 2010/10/13 21:29:42 tez Exp $ 1# $NetBSD: Makefile,v 1.74 2010/12/23 04:44:41 obache Exp $
2 2
3DISTNAME= xpdf-3.02 3DISTNAME= xpdf-3.02
4PKGNAME= xpdf-3.02pl4 4PKGNAME= xpdf-3.02pl4
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ 7MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
8 ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \ 8 ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \
9 http://gd.tuwien.ac.at/publishing/xpdf/ 9 http://gd.tuwien.ac.at/publishing/xpdf/
10PATCH_SITES= ${MASTER_SITES} 10PATCH_SITES= ${MASTER_SITES}
11PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch xpdf-3.02pl4.patch 11PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch xpdf-3.02pl4.patch
12PATCH_DIST_STRIP= -p1 12PATCH_DIST_STRIP= -p1
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= http://www.foolabs.com/xpdf/ 15HOMEPAGE= http://www.foolabs.com/xpdf/
16COMMENT= Display tool for PDF files 16COMMENT= Display tool for PDF files
17LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
18 18
cvs diff -r1.38 -r1.39 pkgsrc/print/xpdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/xpdf/distinfo 2010/10/13 21:29:42 1.38
+++ pkgsrc/print/xpdf/distinfo 2010/12/23 04:44:41 1.39
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1$NetBSD: distinfo,v 1.38 2010/10/13 21:29:42 tez Exp $ 1$NetBSD: distinfo,v 1.39 2010/12/23 04:44:41 obache Exp $
2 2
3SHA1 (xpdf-3.02.tar.gz) = f9940698840c8a8045677e8be68ab8580903e20a 3SHA1 (xpdf-3.02.tar.gz) = f9940698840c8a8045677e8be68ab8580903e20a
4RMD160 (xpdf-3.02.tar.gz) = e900cb8670b8c430beaa45895fb474411cb1958d 4RMD160 (xpdf-3.02.tar.gz) = e900cb8670b8c430beaa45895fb474411cb1958d
5Size (xpdf-3.02.tar.gz) = 674912 bytes 5Size (xpdf-3.02.tar.gz) = 674912 bytes
6SHA1 (xpdf-3.02pl1.patch) = cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d 6SHA1 (xpdf-3.02pl1.patch) = cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d
7RMD160 (xpdf-3.02pl1.patch) = 5c310f96760f72e9c1062b00c57c2ed035ac6757 7RMD160 (xpdf-3.02pl1.patch) = 5c310f96760f72e9c1062b00c57c2ed035ac6757
8Size (xpdf-3.02pl1.patch) = 1050 bytes 8Size (xpdf-3.02pl1.patch) = 1050 bytes
9SHA1 (xpdf-3.02pl2.patch) = d082ebe0d36cad0c04603950216f5c52de1c2593 9SHA1 (xpdf-3.02pl2.patch) = d082ebe0d36cad0c04603950216f5c52de1c2593
10RMD160 (xpdf-3.02pl2.patch) = 0024e3d203d69e073a458570cec5679e260ad204 10RMD160 (xpdf-3.02pl2.patch) = 0024e3d203d69e073a458570cec5679e260ad204
11Size (xpdf-3.02pl2.patch) = 20843 bytes 11Size (xpdf-3.02pl2.patch) = 20843 bytes
12SHA1 (xpdf-3.02pl3.patch) = 23f496804802a3da530f1d0bab894bae3e938fc2 12SHA1 (xpdf-3.02pl3.patch) = 23f496804802a3da530f1d0bab894bae3e938fc2
13RMD160 (xpdf-3.02pl3.patch) = 859ec3131d3c4526a6075ee639c5eb704194211b 13RMD160 (xpdf-3.02pl3.patch) = 859ec3131d3c4526a6075ee639c5eb704194211b
14Size (xpdf-3.02pl3.patch) = 30727 bytes 14Size (xpdf-3.02pl3.patch) = 30727 bytes
15SHA1 (xpdf-3.02pl4.patch) = 1aa3087a1c7882884ae7d3a502240a55acca65fd 15SHA1 (xpdf-3.02pl4.patch) = 1aa3087a1c7882884ae7d3a502240a55acca65fd
16RMD160 (xpdf-3.02pl4.patch) = 428065e8c9639b6799705b216be603f52efb8a22 16RMD160 (xpdf-3.02pl4.patch) = 428065e8c9639b6799705b216be603f52efb8a22
17Size (xpdf-3.02pl4.patch) = 6982 bytes 17Size (xpdf-3.02pl4.patch) = 6982 bytes
18SHA1 (patch-aa) = d3694e51ec23026a3273d7a7acac1582b69f4810 18SHA1 (patch-aa) = d3694e51ec23026a3273d7a7acac1582b69f4810
19SHA1 (patch-ab) = fd4205c477ee4ac7660b8c1a707ea7b528ac4f90 19SHA1 (patch-ab) = fd4205c477ee4ac7660b8c1a707ea7b528ac4f90
20SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2 20SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2
21SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a 21SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a
22SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143 22SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143
23SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c 23SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c
24SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac 24SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac
25SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a 25SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a
26SHA1 (patch-ai) = 23bdf2b177b2f189be2bb5834c1d0bbb1e5d2b70 26SHA1 (patch-ai) = 23bdf2b177b2f189be2bb5834c1d0bbb1e5d2b70
27SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860 27SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860
28SHA1 (patch-ak) = 63ce7def09a154f2f11fd9b639393bc6ef5a2038 28SHA1 (patch-ak) = 20d48739d074ffa729b99e9ceec62cb52d8d3f48
29SHA1 (patch-al) = c79b5865432ea0519c2124e177a1dbf5b9c09024 29SHA1 (patch-al) = c79b5865432ea0519c2124e177a1dbf5b9c09024
30SHA1 (patch-am) = 1b498307ce7ffaa7a4e7c6c754c2ce373390ddd8 30SHA1 (patch-am) = 1b498307ce7ffaa7a4e7c6c754c2ce373390ddd8
31SHA1 (patch-an) = 94ea208c43f4df1ac3a9bf01cc874d488ae49a9a 31SHA1 (patch-an) = 94ea208c43f4df1ac3a9bf01cc874d488ae49a9a
32SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58 32SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58
33SHA1 (patch-aq) = 1df0efb9fdde90df0597ba2a56c6030e7446e185 33SHA1 (patch-aq) = 1df0efb9fdde90df0597ba2a56c6030e7446e185
34SHA1 (patch-ar) = 5e4719a30a0412d9d731dbef8179c38bba67db94 34SHA1 (patch-ar) = 5e4719a30a0412d9d731dbef8179c38bba67db94
35SHA1 (patch-bb) = d38757d5e4a331d49149acfff897cfe7bc0a5e3b 35SHA1 (patch-bb) = d38757d5e4a331d49149acfff897cfe7bc0a5e3b
36SHA1 (patch-bc) = 856c7012bf794135aecdb70f726ccec14aa0a7cc 36SHA1 (patch-bc) = 856c7012bf794135aecdb70f726ccec14aa0a7cc
37SHA1 (patch-bd) = 8cd3fabac230fcda0d5db39d4b777802f5a75114 37SHA1 (patch-bd) = 8cd3fabac230fcda0d5db39d4b777802f5a75114
cvs diff -r1.4 -r1.5 pkgsrc/print/xpdf/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/print/xpdf/patches/patch-ak 2010/06/13 08:56:04 1.4
+++ pkgsrc/print/xpdf/patches/patch-ak 2010/12/23 04:44:41 1.5
@@ -1,40 +1,43 @@ @@ -1,40 +1,43 @@
1$NetBSD: patch-ak,v 1.4 2010/06/13 08:56:04 spz Exp $ 1$NetBSD: patch-ak,v 1.5 2010/12/23 04:44:41 obache Exp $
2 2
3--- doc/xpdfrc.5.orig 2005-08-17 05:34:30.000000000 +0000 3--- doc/xpdfrc.5.orig 2007-02-27 22:05:51.000000000 +0000
4+++ doc/xpdfrc.5 4+++ doc/xpdfrc.5
5@@ -7,7 +7,7 @@ All of the Xpdf tools read a single conf 5@@ -7,7 +7,7 @@ All of the Xpdf tools read a single conf
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@@ -407,28 +407,28 @@ The following is a sample xpdfrc file. 14@@ -544,28 +544,31 @@ The following is a sample xpdfrc file.
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+unicodeMap TIS-620 @PREFIX@/share/xpdf/thai/TIS-620.unicodeMap
20  21
21 # from the Japanese support package 22 # from the Japanese support package
22-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode 23-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode
23-unicodeMap JISX0208 /usr/local/share/xpdf/JISX0208.unicodeMap 24-unicodeMap JISX0208 /usr/local/share/xpdf/JISX0208.unicodeMap
24-cMapDir Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1 25-cMapDir Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1
25+cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/Adobe-Japan1.cidToUnicode 26+cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
26+unicodeMap JISX0208 @PREFIX@/share/xpdf/JISX0208.unicodeMap 27+unicodeMap ISO-2022-JP @PREFIX@/share/xpdf/japanese/ISO-2022-JP.unicodeMap
27+cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/cmap/Adobe-Japan1 28+unicodeMap EUC-JP @PREFIX@/share/xpdf/japanese/EUC-JP.unicodeMap
 29+unicodeMap Shift-JIS @PREFIX@/share/xpdf/japanese/Shift-JIS.unicodeMap
 30+cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/japanese/CMap/Adobe-Japan1
28  31
29 # use the Base-14 Type 1 fonts from ghostscript 32 # use the Base-14 Type 1 fonts from ghostscript
30-displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb 33-displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb
31-displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb 34-displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb
32-displayFontT1 Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb 35-displayFontT1 Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb
33-displayFontT1 Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb 36-displayFontT1 Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb
34-displayFontT1 Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb 37-displayFontT1 Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb
35-displayFontT1 Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb 38-displayFontT1 Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb
36-displayFontT1 Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb 39-displayFontT1 Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb
37-displayFontT1 Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb 40-displayFontT1 Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb
38-displayFontT1 Courier /usr/local/share/ghostscript/fonts/n022003l.pfb 41-displayFontT1 Courier /usr/local/share/ghostscript/fonts/n022003l.pfb
39-displayFontT1 Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb 42-displayFontT1 Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb
40-displayFontT1 Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb 43-displayFontT1 Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb
@@ -48,22 +51,22 @@ $NetBSD: patch-ak,v 1.4 2010/06/13 08:56 @@ -48,22 +51,22 @@ $NetBSD: patch-ak,v 1.4 2010/06/13 08:56
48+displayFontT1 Helvetica @PREFIX@/share/fonts/urw/n019003l.pfb 51+displayFontT1 Helvetica @PREFIX@/share/fonts/urw/n019003l.pfb
49+displayFontT1 Helvetica-Oblique @PREFIX@/share/fonts/urw/n019023l.pfb 52+displayFontT1 Helvetica-Oblique @PREFIX@/share/fonts/urw/n019023l.pfb
50+displayFontT1 Helvetica-Bold @PREFIX@/share/fonts/urw/n019004l.pfb 53+displayFontT1 Helvetica-Bold @PREFIX@/share/fonts/urw/n019004l.pfb
51+displayFontT1 Helvetica-BoldOblique @PREFIX@/share/fonts/urw/n019024l.pfb 54+displayFontT1 Helvetica-BoldOblique @PREFIX@/share/fonts/urw/n019024l.pfb
52+displayFontT1 Courier @PREFIX@/share/fonts/urw/n022003l.pfb 55+displayFontT1 Courier @PREFIX@/share/fonts/urw/n022003l.pfb
53+displayFontT1 Courier-Oblique @PREFIX@/share/fonts/urw/n022023l.pfb 56+displayFontT1 Courier-Oblique @PREFIX@/share/fonts/urw/n022023l.pfb
54+displayFontT1 Courier-Bold @PREFIX@/share/fonts/urw/n022004l.pfb 57+displayFontT1 Courier-Bold @PREFIX@/share/fonts/urw/n022004l.pfb
55+displayFontT1 Courier-BoldOblique @PREFIX@/share/fonts/urw/n022024l.pfb 58+displayFontT1 Courier-BoldOblique @PREFIX@/share/fonts/urw/n022024l.pfb
56+displayFontT1 Symbol @PREFIX@/share/fonts/urw/s050000l.pfb 59+displayFontT1 Symbol @PREFIX@/share/fonts/urw/s050000l.pfb
57+displayFontT1 ZapfDingbats @PREFIX@/share/fonts/urw/d050000l.pfb 60+displayFontT1 ZapfDingbats @PREFIX@/share/fonts/urw/d050000l.pfb
58  61
59 # use the Bakoma Type 1 fonts 62 # use the Bakoma Type 1 fonts
60 # (this assumes they happen to be installed in /usr/local/fonts/bakoma) 63 # (this assumes they happen to be installed in /usr/local/fonts/bakoma)
61@@ -459,7 +459,7 @@ urlCommand "netscape -remote 'openU 64@@ -596,7 +599,7 @@ urlCommand "netscape -remote 'openU
62 .fi 65 .fi
63 .SH FILES 66 .SH FILES
64 .TP 67 .TP
65-.B /usr/local/etc/xpdfrc 68-.B /usr/local/etc/xpdfrc
66+.B @PKG_SYSCONFDIR@/xpdfrc 69+.B @PKG_SYSCONFDIR@/xpdfrc
67 This is the default location for the system-wide configuration file. 70 This is the default location for the system-wide configuration file.
68 Depending on build options, it may be placed elsewhere. 71 Depending on build options, it may be placed elsewhere.
69 .TP 72 .TP