From owner-ports-jp@jp.FreeBSD.org Thu Feb 10 06:00:14 2005
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id j19L0EH84116;
	Thu, 10 Feb 2005 06:00:14 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from ksta.ms.u-tokyo.ac.jp (ksta.ms.u-tokyo.ac.jp [157.82.17.219])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id j19L0C884103
	for <ports-jp@jp.FreeBSD.org>; Thu, 10 Feb 2005 06:00:13 +0900 (JST)
	(envelope-from koma2@ms.u-tokyo.ac.jp)
Received: by ksta.ms.u-tokyo.ac.jp (Postfix, from userid 1003)
	id 8E3465650C; Thu, 10 Feb 2005 06:00:12 +0900 (JST)
From: KOMATSU Shinichiro <koma2@ms.u-tokyo.ac.jp>
To: ports-jp@jp.FreeBSD.org
Cc: nork@freebsd.org, mita@freebsd.org
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="Q68bSM7Ycu6FN28Q"
Content-Disposition: inline
User-Agent: Mutt/1.5.6i
Message-Id: <20050209210012.8E3465650C@ksta.ms.u-tokyo.ac.jp>
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
Date: Thu, 10 Feb 2005 06:00:12 +0900
X-Sequence: ports-jp 15508
Subject: [ports-jp 15508] xpdf jumbo patch
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: koma2@ms.u-tokyo.ac.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+041223


--Q68bSM7Ycu6FN28Q
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: inline

$B>.>>$G$9!#(B

graphics/xpdf $B$H(B japanese/xpdf $B$K?'!9<j$rF~$l$F$_$^$7$?!#(B
$B<j$rF~$l$?$N$O$[$H$s$I(B($BF|K\8l4X78$N(B)$B@_Dj%U%!%$%kItJ,$G$9!#(B
2$BG/A0$K(B ports-jp $B$KEj$2$F(B ([ports-jp 13487])$B!"(B
$B$$$D$N4V$K$+K:$l$i$l$F$7$^$C$?$b$N$b4^$s$G$$$^$9$N$G!"(B
$B>\$7$$5DO@$J$I$O$=$A$i$b;2>H$7$F2<$5$$!#(B

$B$+$J$jD9$$$G$9$,!"JQ99E@$r=q$-$^$9!#(B

graphics/xpdf:

(1) xpdfrc $B$r(B xpdfrc.sample $B$H$7$F%$%s%9%H!<%k$9$k$h$&$KJQ99(B
(xpdfrc $B$,B8:_$7$J$1$l$P!"(Bxpdfrc.sample $B$r%3%T!<(B)$B!#(B

(2) default $B$N(B textEncoding $B$r(B (Latin1 $B$G$J$/(B) UTF-8 $B$KJQ99!#(B

textEncoding $B$H$$$&$N$O!"(BPDF $B$+$i%F%-%9%H$KJQ49$9$k;~!"(B
$B$D$^$j!"(Bpdftotext $B$G%F%-%9%H$KJQ49$9$k;~$d!"(B
xpdf $B$G%5!<%A!"%3%T%Z$J$I$r$9$k;~$N(B
$BJQ498e$N%F%-%9%H$N(B encoding $B$r;XDj$9$k$b$N$G$9!#(B
default $B$G$O(B Latin1 $B$J$N$G$9$,!"$3$l$@$HF|K\8l$,=P$J$/$F(B
$B4r$7$/$J$$$7!"$+$H$$$C$F(B default $B$r(B EUC-JP $B$K$9$k$N$b(B
$B%^%:$+$m$&$H$$$&$3$H$G!"(BUTF-8 $B$K$7$F$_$^$7$?!#(B

(3) xpdfrc $B$N(B man $B$K$h$k$H!"(Bt1libControl $B$H(B freetypeControl $B$O(B obsolete $B$G!"(B
$BBe$o$j$K(B antialias, enableT1lib, enableFreeType $B$r;H$($H$"$j$^$9!#(B
$B<B:]!"(B{t1lib,freetype}Control $B$r;H$&$H(B warning $B$,=P$^$9!#(B
$B$7$+$7!"(Bxpdfrc $B$NJ}$O$=$l$KDI=>$7$F$$$J$$$N$G!"=$@5$7$F$_$^$7$?(B
(default $B$G$O%3%a%s%H%"%&%H$J$N$G!"$"$^$j4X78$J$$$H$$$($P4X78$J$$$N$G$9$,(B)$B!#(B


graphics/xpdf, japanese/xpdf $B$NN>J}$K4X78$9$k$b$N(B:

(4) $B:#$^$G$N(B japanese/xpdf $B$G$O!"F|K\8l4X78$N@_Dj$O(B
xpdfrc $B$KDI5-$9$k$H$$$&7A$r<h$C$F$$$^$7$?$,!"(B
$B$3$l$@$H(B graphics/xpdf $B$NJ}$r99?7$7$?;~$K(B
$BF|K\8l4X78$N@_Dj$,>C$($F$7$^$&$H$$$&LdBj$,$"$j$^$7$?!#(B

$B$=$3$G!"F|K\8l4X78$N@_Dj$O(B xpdfrc $B$K4^$a$k$N$G$O$J$/!"(B
xpdfrc.japan $B$H$$$&JL%U%!%$%k$K0\$7!"(B
$B$=$l$r(B xpdfrc $B$+$i(B include $B$9$k$h$&$KJQ99$7$F$_$^$7$?!#(B
$B$?$@$7!"(Bjapanese/xpdf $B$r%$%s%9%H!<%k$7$J$$>l9g$b9M$(!"(B
include $B9T$O(B default $B$G$O%3%a%s%H%"%&%H$H$7$F$"$j$^$9!#(B

$B!t(B japanese/xpdf $B$G!"$3$N%3%a%s%H$r30$9$h$&$K$7$?J}$,$$$$$N$+$J!#!#!#!)(B


japanese/xpdf:

(5) MASTER_SITE $B$K$"$k(B xpdf-japanese.tar.gz $B$NCf?H$,99?7$5$l$F$$$?$N$G!"(B
$B$=$l$KDI=>$7$^$7$?!#(B

(6) MASTER_SITE $B$K$O(B xpdf-japanese-2004-jul-27.tar.gz $B$H$$$&(B
$B%P!<%8%g%s(B($BF|IU(B)$BIU$-$N%U%!%$%k$,$"$k$N$G!"(B
DISTFILES $B$K$O$3$C$A$r;H$&$h$&$K$7$^$7$?!#(B
PORTVERSION $B$b!"(B20040727 $B$H$$$&46$8$G!"F|IU$r;H$&$h$&$KJQ99$7$F$$$^$9!#!#(B

(7) $BElIw%U%)%s%HBeBX%U%)%s%H$G$J$/!"$5$6$J$_%U%)%s%H$r;H$&$h$&$KJQ99!#(B

$B$5$6$J$_%U%)%s%H$N%Z!<%8(B(http://wiki.fdiary.net/font/?sazanami)
$B$r8+$k$H!"ElIwBeBX%U%)%s%H$N%P!<%8%g%s%"%C%WHG(B(?) $B$_$?$$$J46$8$G$9$7!"(B
$BF|K\$N(B Linux distribution $B$J$I$r8+$k$H(B
$B$5$6$J$_$r(B default $B$K$7$F$$$k$h$&$J$N$G!"$3$&$7$F$_$^$7$?!#(B

(8) displayCIDFontTT $B$rDj5A$7$^$7$?!#(B
displayNamedCIDFontTT $B$G(B match $B$9$k%U%)%s%HL>$,$J$+$C$?;~$N(B
default $B$NF|K\8l%U%)%s%H$,$3$l$GDj5A$5$l$^$9!#(B

(9) PDF -> PS $B$X$NJQ49$,$A$c$s$H$G$-$k$h$&$K!"(B
psFont16, psNamedFont16 $B$rDj5A$7$^$7$?!#(B

-- 
$B(.(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(/(B
                $B>.>>(B  $B?80lO/(B            
            koma2@ms.u-tokyo.ac.jp
            koma2@momonga-linux.org
     http://straycat.ms.u-tokyo.ac.jp/~koma2/
$B(1(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(0(B

--Q68bSM7Ycu6FN28Q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="xpdf.patch"

diff -urN --exclude=work --exclude=*.log* --exclude=CVS graphics/xpdf.orig/Makefile graphics/xpdf/Makefile
--- graphics/xpdf.orig/Makefile	Tue Jan 25 00:38:07 2005
+++ graphics/xpdf/Makefile	Tue Feb  8 05:18:41 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.00
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -47,7 +47,14 @@
 		xpdf.1
 MAN5=		xpdfrc.5
 
+post-patch:
+	${ECHO_CMD} "" >> ${WRKSRC}/doc/sample-xpdfrc
+	${ECHO_CMD} "#include ${PREFIX}/etc/xpdfrc.japan" >> ${WRKSRC}/doc/sample-xpdfrc
+
 post-install:
+	if [ ! -f ${PREFIX}/etc/xpdfrc ]; then \
+		${CP} -p ${PREFIX}/etc/xpdfrc.sample ${PREFIX}/etc/xpdfrc; \
+	fi
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ANNOUNCE CHANGES INSTALL README misc/hello.pdf
diff -urN --exclude=work --exclude=*.log* --exclude=CVS graphics/xpdf.orig/files/patch-Makefile.in graphics/xpdf/files/patch-Makefile.in
--- graphics/xpdf.orig/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
+++ graphics/xpdf/files/patch-Makefile.in	Tue Feb  8 04:33:52 2005
@@ -0,0 +1,16 @@
+--- Makefile.in.orig	Thu Jan 22 10:26:44 2004
++++ Makefile.in	Tue Feb  8 04:32:56 2005
+@@ -96,12 +96,7 @@
+ 	-mkdir -p $(DESTDIR)@mandir@/man5
+ 	$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5
+ 	-mkdir -p $(DESTDIR)@sysconfdir@
+-	@if test ! -f $(DESTDIR)@sysconfdir@/xpdfrc; then \
+-		echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc"; \
+-		$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc; \
+-	else \
+-		echo "# not overwriting the existing $(DESTDIR)@sysconfdir@/xpdfrc"; \
+-	fi
++	$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc.sample
+ 
+ clean:
+ 	-cd goo; $(MAKE) clean
diff -urN --exclude=work --exclude=*.log* --exclude=CVS graphics/xpdf.orig/files/patch-sample-xpdfrc graphics/xpdf/files/patch-sample-xpdfrc
--- graphics/xpdf.orig/files/patch-sample-xpdfrc	Thu Jan  1 09:00:00 1970
+++ graphics/xpdf/files/patch-sample-xpdfrc	Tue Feb  8 05:24:26 2005
@@ -0,0 +1,29 @@
+--- doc/sample-xpdfrc.orig	Thu Jan 22 10:26:44 2004
++++ doc/sample-xpdfrc	Tue Feb  8 05:23:00 2005
+@@ -87,7 +87,7 @@
+ # The Latin1, ASCII7, and UTF-8 encodings are built into Xpdf.  Other
+ # encodings are available in the language support packages.
+ 
+-#textEncoding		UTF-8
++textEncoding		UTF-8
+ 
+ # Choose the end-of-line convention for multi-line copy-and-past and
+ # for pdftotext output.  The available options are unix, mac, and dos.
+@@ -96,12 +96,12 @@
+ 
+ #----- misc settings
+ 
+-# Set the anti-aliasing mode for t1lib and FreeType.  These can be low
+-# or high (anti-aliasing), plain (no anti-aliasing), or none (disable
+-# the rasterizer entirely).
++# Set the anti-aliasing mode for t1lib and FreeType.  These can be 
++# "yes" or "no".
+ 
+-#t1libControl		low
+-#freetypeControl	low
++#antialias		yes
++#enableT1lib		yes
++#enableFreeType		yes
+ 
+ # Set the command used to run a web browser when a URL hyperlink is
+ # clicked.
diff -urN --exclude=work --exclude=*.log* --exclude=CVS graphics/xpdf.orig/pkg-plist graphics/xpdf/pkg-plist
--- graphics/xpdf.orig/pkg-plist	Sun Feb  8 14:26:19 2004
+++ graphics/xpdf/pkg-plist	Tue Feb  8 05:08:37 2005
@@ -5,10 +5,12 @@
 bin/pdftops
 bin/pdftotext
 bin/xpdf
-etc/xpdfrc
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/hello.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec if cmp -s %D/etc/xpdfrc.sample %D/etc/xpdfrc; then rm -f %D/etc/xpdfrc; fi
+etc/xpdfrc.sample
+@exec if [ ! -f %D/etc/xpdfrc ]; then cp -p %D/etc/xpdfrc.sample %D/etc/xpdfrc; fi

--Q68bSM7Ycu6FN28Q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ja-xpdf.patch"

diff -urN --exclude=*.log* --exclude=CVS japanese/xpdf.orig/Makefile japanese/xpdf/Makefile
--- japanese/xpdf.orig/Makefile	Mon Dec 27 09:20:05 2004
+++ japanese/xpdf/Makefile	Thu Feb 10 03:10:32 2005
@@ -6,23 +6,29 @@
 #
 
 PORTNAME=	xpdf
-PORTVERSION=	3.00
-PORTREVISION=	1
+PORTVERSION=	20040727
+PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
-DISTNAME=	xpdf-japanese
+DISTNAME=	xpdf-japanese-${SRCVERSION}
 
 MAINTAINER=	mita@FreeBSD.org
 COMMENT=	Japanese xpdf font support
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
 		${LOCALBASE}/share/ghostscript/Resource/CMap/Adobe-Japan1-0:${PORTSDIR}/print/adobe-cmaps \
-		${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
+		${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
 
 USE_X_PREFIX=	yes
+WRKSRC=		${WRKDIR}/xpdf-japanese
 INSTALL_FILES=	Adobe-Japan1.cidToUnicode ISO-2022-JP.unicodeMap \
 		EUC-JP.unicodeMap Shift-JIS.unicodeMap \
-		README dot.xpdfrc
+		README
+
+.include <bsd.port.pre.mk>
+
+SRCVERSION!=	LANG=C /bin/date -j ${PORTVERSION}0000 '+%Y-%b-%d' |\
+		${TR} A-Z a-z
 
 do-build:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -35,6 +41,9 @@
 .for i in ${INSTALL_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/xpdf/japanese
 .endfor
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${INSTALL_DATA} ${WRKSRC}/dot.xpdfrc ${PREFIX}/etc/xpdfrc.japan.sample
+	if [ ! -f ${PREFIX}/etc/xpdfrc.japan ]; then \
+		${CP} -p ${PREFIX}/etc/xpdfrc.japan.sample ${PREFIX}/etc/xpdfrc.japan; \
+	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN --exclude=*.log* --exclude=CVS japanese/xpdf.orig/distinfo japanese/xpdf/distinfo
--- japanese/xpdf.orig/distinfo	Mon Apr 19 19:55:30 2004
+++ japanese/xpdf/distinfo	Thu Feb 10 03:07:11 2005
@@ -1,2 +1,2 @@
-MD5 (xpdf-japanese.tar.gz) = 2fe6d4701482af0d69084c574fe14d90
-SIZE (xpdf-japanese.tar.gz) = 494624
+MD5 (xpdf-japanese-2004-jul-27.tar.gz) = a11ee6476d0f381983664fc614f7a95e
+SIZE (xpdf-japanese-2004-jul-27.tar.gz) = 494803
diff -urN --exclude=*.log* --exclude=CVS japanese/xpdf.orig/files/dot.xpdfrc japanese/xpdf/files/dot.xpdfrc
--- japanese/xpdf.orig/files/dot.xpdfrc	Wed Jun 23 01:49:08 2004
+++ japanese/xpdf/files/dot.xpdfrc	Wed Feb  9 02:30:24 2005
@@ -5,24 +5,55 @@
 unicodeMap	Shift-JIS	%%PREFIX%%/share/xpdf/japanese/Shift-JIS.unicodeMap
 cMapDir		Adobe-Japan1	%%LOCALBASE%%/share/ghostscript/Resource/CMap
 toUnicodeDir			%%LOCALBASE%%/share/ghostscript/Resource/CMap
-displayNamedCIDFontTT	Ryumin-Light			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-H			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-V			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity-V		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	HeiseiMin-W3H			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold-V		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-V		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-H	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-V	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	HeiseiKakuGo-W5H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold-V		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+
+### use Sazanami Mincho by default
+displayCIDFontTT	Adobe-Japan1			"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+#   use Sazanami Gothic if gothic font is required
+displayNamedCIDFontTT	Ryumin-Light			"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	Ryumin-Light-H			"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	Ryumin-Light-V			"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	Ryumin-Light-Identity		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	Ryumin-Light-Identity-H		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	Ryumin-Light-Identity-V		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	HeiseiMin-W3H			"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	FutoMinA101-Bold		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	FutoMinA101-Bold-H		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	FutoMinA101-Bold-V		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-H		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-V		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-Identity	"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-Identity-H	"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-Identity-V	"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+displayNamedCIDFontTT	HeiseiKakuGo-W5H		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+displayNamedCIDFontTT	FutoGoB101-Bold			"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+displayNamedCIDFontTT	FutoGoB101-Bold-H		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+displayNamedCIDFontTT	FutoGoB101-Bold-V		"%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf"
+
+### make default font name to "Ryumin-Light" when converted to PostScript
+psFont16 Adobe-Japan1 H Ryumin-Light-H ISO-2022-JP
+psFont16 Adobe-Japan1 V Ryumin-Light-V ISO-2022-JP
+#   use "Gothic-BBB-Medium" if gothic font is required
+psNamedFont16 GothicBBB-Medium H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 GothicBBB-Medium V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 ShinGo-Bold H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 ShinGo-Bold V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 MidashiGo-MB3 H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 MidashiGo-MB3 V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 FutoGoB101-Bold H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 FutoGoB101-Bold V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 HeiseiKakuGo-W5 H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 HeiseiKakuGo-W5 V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 HeiseiKakuGo-W9 H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 HeiseiKakuGo-W9 V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 HeiseiMaruGo-W4 H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 HeiseiMaruGo-W4 V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 MS-Gothic H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 MS-Gothic V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 HG-GothicB H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 HG-GothicB V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 Kochi-Gothic H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 Kochi-Gothic V GothicBBB-Medium-V ISO-2022-JP
+psNamedFont16 Sazanami-Gothic H GothicBBB-Medium-H ISO-2022-JP
+psNamedFont16 Sazanami-Gothic V GothicBBB-Medium-V ISO-2022-JP
 #Japanese PDF resources
diff -urN --exclude=*.log* --exclude=CVS japanese/xpdf.orig/pkg-install japanese/xpdf/pkg-install
--- japanese/xpdf.orig/pkg-install	Sun Feb  6 12:23:38 2005
+++ japanese/xpdf/pkg-install	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
-#!/bin/sh
-if [ "$2" = "PRE-INSTALL" ]; then
-  exit 0
-fi
-umask 222
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
-ADDRESOURCE=${PKG_PREFIX}/share/xpdf/japanese/dot.xpdfrc
-/usr/bin/sed '/^#Japanese PDF resources$/,/^#Japanese PDF resources$/d' ${XPDFRC} > ${XPDFRC}.nojapan
-/bin/rm -f ${XPDFRC}
-/bin/cat ${XPDFRC}.nojapan ${ADDRESOURCE} > ${XPDFRC}
-/bin/rm -f ${XPDFRC}.nojapan
diff -urN --exclude=*.log* --exclude=CVS japanese/xpdf.orig/pkg-plist japanese/xpdf/pkg-plist
--- japanese/xpdf.orig/pkg-plist	Sun Feb  6 12:23:38 2005
+++ japanese/xpdf/pkg-plist	Tue Feb  8 05:36:48 2005
@@ -3,9 +3,8 @@
 share/xpdf/japanese/ISO-2022-JP.unicodeMap
 share/xpdf/japanese/README
 share/xpdf/japanese/Shift-JIS.unicodeMap
-@unexec mv -f %D/etc/xpdfrc %D/etc/xpdfrc.japan
-@unexec (umask 222; grep -F -v --file=%D/share/xpdf/japanese/dot.xpdfrc %D/etc/xpdfrc.japan > %D/etc/xpdfrc)
-share/xpdf/japanese/dot.xpdfrc
-@unexec rm -f %D/etc/xpdfrc.japan
+@unexec if cmp -s %D/etc/xpdfrc.japan.sample %D/etc/xpdfrc.japan; then rm -f %D/etc/xpdfrc.japan; fi
+etc/xpdfrc.japan.sample
+@exec if [ ! -f %D/etc/xpdfrc.japan ]; then cp -p %D/etc/xpdfrc.japan.sample %D/etc/xpdfrc.japan; fi
 @dirrm share/xpdf/japanese
 @dirrm share/xpdf

--Q68bSM7Ycu6FN28Q--
