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.

3 files changed, 15 insertions, 12 deletions

diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 13d14a1919a..f8f6bf5351c 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2010/10/13 21:29:42 tez Exp $
+# $NetBSD: Makefile,v 1.74 2010/12/23 04:44:41 obache Exp $
 
 DISTNAME=	xpdf-3.02
 PKGNAME=	xpdf-3.02pl4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \
diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo
index 7e2778d2ea1..51dac478019 100644
--- a/print/xpdf/distinfo
+++ b/print/xpdf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2010/10/13 21:29:42 tez Exp $
+$NetBSD: distinfo,v 1.39 2010/12/23 04:44:41 obache Exp $
 
 SHA1 (xpdf-3.02.tar.gz) = f9940698840c8a8045677e8be68ab8580903e20a
 RMD160 (xpdf-3.02.tar.gz) = e900cb8670b8c430beaa45895fb474411cb1958d
@@ -25,7 +25,7 @@ SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac
 SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a
 SHA1 (patch-ai) = 23bdf2b177b2f189be2bb5834c1d0bbb1e5d2b70
 SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860
-SHA1 (patch-ak) = 63ce7def09a154f2f11fd9b639393bc6ef5a2038
+SHA1 (patch-ak) = 20d48739d074ffa729b99e9ceec62cb52d8d3f48
 SHA1 (patch-al) = c79b5865432ea0519c2124e177a1dbf5b9c09024
 SHA1 (patch-am) = 1b498307ce7ffaa7a4e7c6c754c2ce373390ddd8
 SHA1 (patch-an) = 94ea208c43f4df1ac3a9bf01cc874d488ae49a9a
diff --git a/print/xpdf/patches/patch-ak b/print/xpdf/patches/patch-ak
index 19399f33d7a..327be6a8925 100644
--- a/print/xpdf/patches/patch-ak
+++ b/print/xpdf/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.4 2010/06/13 08:56:04 spz Exp $
+$NetBSD: patch-ak,v 1.5 2010/12/23 04:44:41 obache Exp $
 
---- doc/xpdfrc.5.orig	2005-08-17 05:34:30.000000000 +0000
+--- doc/xpdfrc.5.orig	2007-02-27 22:05:51.000000000 +0000
 +++ doc/xpdfrc.5
 @@ -7,7 +7,7 @@ All of the Xpdf tools read a single conf
  .I .xpdfrc
@@ -11,20 +11,23 @@ $NetBSD: patch-ak,v 1.4 2010/06/13 08:56:04 spz Exp $
  if it exists.  (This is its default location; depending on build
  options, it may be placed elsewhere.)  On Win32 systems, the
  .I xpdfrc
-@@ -407,28 +407,28 @@ The following is a sample xpdfrc file.
+@@ -544,28 +544,31 @@ The following is a sample xpdfrc file.
  .nf
  
  # from the Thai support package
 -nameToUnicode /usr/local/share/xpdf/Thai.nameToUnicode
-+nameToUnicode @PREFIX@/share/xpdf/Thai.nameToUnicode
++nameToUnicode @PREFIX@/share/xpdf/thai/Thai.nameToUnicode
++unicodeMap    TIS-620 @PREFIX@/share/xpdf/thai/TIS-620.unicodeMap
  
  # from the Japanese support package
 -cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode
 -unicodeMap   JISX0208     /usr/local/share/xpdf/JISX0208.unicodeMap
 -cMapDir      Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1
-+cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/Adobe-Japan1.cidToUnicode
-+unicodeMap   JISX0208     @PREFIX@/share/xpdf/JISX0208.unicodeMap
-+cMapDir      Adobe-Japan1 @PREFIX@/share/xpdf/cmap/Adobe-Japan1
++cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
++unicodeMap   ISO-2022-JP  @PREFIX@/share/xpdf/japanese/ISO-2022-JP.unicodeMap
++unicodeMap   EUC-JP       @PREFIX@/share/xpdf/japanese/EUC-JP.unicodeMap
++unicodeMap   Shift-JIS    @PREFIX@/share/xpdf/japanese/Shift-JIS.unicodeMap
++cMapDir      Adobe-Japan1 @PREFIX@/share/xpdf/japanese/CMap/Adobe-Japan1
  
  # use the Base-14 Type 1 fonts from ghostscript
 -displayFontT1 Times-Roman           /usr/local/share/ghostscript/fonts/n021003l.pfb
@@ -58,7 +61,7 @@ $NetBSD: patch-ak,v 1.4 2010/06/13 08:56:04 spz Exp $
  
  # use the Bakoma Type 1 fonts
  # (this assumes they happen to be installed in /usr/local/fonts/bakoma)
-@@ -459,7 +459,7 @@ urlCommand      "netscape -remote 'openU
+@@ -596,7 +599,7 @@ urlCommand      "netscape -remote 'openU
  .fi
  .SH FILES
  .TP