Update to 20080607.

Sorry for being lazy, Sato-san _o_

PR:		124155
Submitted by:	hrs

6 files changed, 20 insertions, 193 deletions

diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 0a0a16cd52bf..172e3b493db2 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	dvipdfmx
-PORTVERSION=	20070409
+PORTVERSION=	20080607
 CATEGORIES=	print
-MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/release/
+MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/latest/
 DIST_SUBDIR=	dvipdfmx
 
 MAINTAINER=	matusita@FreeBSD.org
@@ -21,30 +21,26 @@ RUN_DEPENDS=	${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
 		kpsepath:${PORTSDIR}/print/teTeX-base
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${LOCALBASE}/${TEXMFDIR}
-PLIST_SUB=	DVIPDFMDIR=${DVIPDFMDIR} \
+CONFIGURE_ARGS=	--datadir=${LOCALBASE}/share
+PLIST_SUB=	DVIPDFMXDIR=${DVIPDFMXDIR} \
 		FONTMAPDIR=${FONTMAPDIR} \
+		GLYPHMAPDIR=${GLYPHMAPDIR} \
 		FONTCMAPDIR=${FONTCMAPDIR} \
 		MKTEXLSR=${MKTEXLSR} \
 		ADOBECMAPDIR=${ADOBECMAPDIR}
 
 TEXMFDIR=	share/texmf
-DVIPDFMDIR=	${TEXMFDIR}/dvipdfm
-FONTMAPDIR=	${TEXMFDIR}/fonts/map/dvipdfm
-FONTCMAPDIR=	${TEXMFDIR}/fonts/cmap/dvipdfm
+DVIPDFMXDIR=	${TEXMFDIR}/dvipdfmx
+FONTMAPDIR=	${TEXMFDIR}/fonts/map/dvipdfmx
+GLYPHMAPDIR=	${TEXMFDIR}/fonts/map/glyphlist
+FONTCMAPDIR=	${TEXMFDIR}/fonts/cmap
 ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
 post-install:
-	${MV} ${PREFIX}/${TEXMFDIR}/dvipdfm/glyphlist.txt \
-		${LOCALBASE}/${FONTMAPDIR}/glyphlist.txt
 	${MKDIR} ${LOCALBASE}/${FONTCMAPDIR}
-	${INSTALL_DATA} ${FILESDIR}/cid-x.map.in \
-		${LOCALBASE}/${FONTMAPDIR}/cid-x.map
 	${LN} -s -f ${ADOBECMAPDIR} \
 		${LOCALBASE}/${FONTCMAPDIR}/adobe-cmaps
-	${LN} -s -f ${PREFIX}/${DVIPDFMDIR}/CMap \
-		${LOCALBASE}/${FONTCMAPDIR}/
 	${MKTEXLSR} ${PREFIX}/${TEXMFDIR}
 
 .include <bsd.port.mk>
diff --git a/print/dvipdfmx/distinfo b/print/dvipdfmx/distinfo
index d14812f119c8..79a218a37ff3 100644
--- a/print/dvipdfmx/distinfo
+++ b/print/dvipdfmx/distinfo
@@ -1,3 +1,3 @@
-MD5 (dvipdfmx/dvipdfmx-20070409.tar.gz) = 3429510a849f0736ffa78ce6a5b5a3a7
-SHA256 (dvipdfmx/dvipdfmx-20070409.tar.gz) = 5dee6c177770255e7c8e4b32c73b8e581f62987ed2f417242bcf6ea3d083e141
-SIZE (dvipdfmx/dvipdfmx-20070409.tar.gz) = 550163
+MD5 (dvipdfmx/dvipdfmx-20080607.tar.gz) = df7e8584e8de5351b733468ea2ee782e
+SHA256 (dvipdfmx/dvipdfmx-20080607.tar.gz) = 76d91278491a263dfcb93349a2511c91930675f914fd9521135a49e893b79b98
+SIZE (dvipdfmx/dvipdfmx-20080607.tar.gz) = 549165
diff --git a/print/dvipdfmx/files/cid-x.map.in b/print/dvipdfmx/files/cid-x.map.in
deleted file mode 100644
index 5972c1a73344..000000000000
--- a/print/dvipdfmx/files/cid-x.map.in
+++ /dev/null
@@ -1,140 +0,0 @@
-%% $FreeBSD$
-%% FONTMAP: CID-keyed font mapping file for dvipdfmx
-%% =================================================
-%%
-%% FORMAT
-%% ------
-%%
-%%  TFMNAME[@SFDNAME@] ENCNAME [:INDEX:][!]FONTNAME[/CSI][,VARIANT] [OPTIONS]
-%%
-%%
-%% DESCRIPTION
-%% -----------
-%%
-%% 1) TFMNAME[@SFDNAME@]
-%%
-%%    TFM name is specified in the field TFMNAME without extension (.tfm),
-%%    and the subfont definition name in the field SFDNAME without
-%%    extension (.sfd). For example, jbtm@UKS@ specifies the TFM names,
-%%    jbtm01 - jbtm35, used in the CJK package.
-%%
-%% 2) ENCNAME
-%%
-%%    CMap resource name is specified in the field ENCNAME.
-%%
-%% 3) [:INDEX:][!]FONTNAME[/CSI][,VARIANT]
-%%
-%%    Font name is specified in the field FONTNAME with or without
-%%    extension. The field INDEX is used for TrueType collections (.ttc)
-%%    to specify the font index number. The character `!' enables the
-%%    no-embedding option. The /CSI option is required for TrueType fonts
-%%    when Identity CMap is specified in the ENCNAME. The stylistic variants
-%%    (Bold, Italic, BoldItalic) are specified in the filed VARIANT.
-%%    See examples below.
-%%
-%% 4) [OPTIONS]
-%%
-%%    All options available in the original dvipdfm are also valid here.
-%%    The remap option [-r] is simply ignored.
-
-%%
-%% Omega Examples
-%%
-
-%% Chinese
-%% Arphic TrueType fonts as Adobe-{CNS1,GB1} CID-keyed font.
-%ombkai UniCNS-UCS2-H bkai00mp
-%ombsmi UniCNS-UCS2-H bsmi00lp
-%omgkai UniGB-UCS2-H  gkai00mp
-%omgbsn UniGB-UCS2-H  gbsn00lp
-
-%% Japanese
-%% Adobe-Japan1
-omrml  UniJIS-UCS2-H Ryumin-Light
-omgbm  UniJIS-UCS2-H GothicBBB-Medium
-
-%% Korean
-%omgtm  UniKS-UCS2-H  HYGoThic-Medium
-%ombtr  UniKS-UCS2-H  batang
-
-%%
-%% ASCII pTeX Examples
-%%
-
-%% Ryumin and GothicBBB found in PostScript printers:
-rml  H Ryumin-Light
-gbm  H GothicBBB-Medium
-rmlv V Ryumin-Light
-gbmv V GothicBBB-Medium
-
-%% Synthetic font used for futo* family.
-%% jun101 not available.
-%ryumin-l    H Ryumin-Light
-%gtbbb-m     H GothicBBB-Medium
-%futomin-b   H Ryumin-Light,Bold
-%futogo-b    H GothicBBB-Medium,Bold
-%ryumin-l-v  V Ryumin-Light
-%gtbbb-m-v   V GothicBBB-Medium
-%futomin-b-v V Ryumin-Light,Bold
-%futogo-b-v  V GothicBBB-Medium,Bold
-
-%% Morisawa OpenType Basic 7 Family Pack
-%%
-%ryumin-l     H A-OTF-RyuminPro-Light
-%ryumin-l-v   V A-OTF-RyuminPro-Light
-%gtbbb-m      H A-OTF-GothicBBBPro-Medium
-%gtbbb-m-v    V A-OTF-GothicBBBPro-Medium
-%futomin-b    H A-OTF-FutoMinA101Pro-Bold
-%futomin-b-v  V A-OTF-FutoMinA101Pro-Bold
-%futogo-b     H A-OTF-FutoGoB101Pro-Bold
-%futogo-b-v   V A-OTF-FutoGoB101Pro-Bold
-%jun101-l     H A-OTF-Jun101Pro-Light
-%jun101-l-v   V A-OTF-Jun101Pro-Light
-
-%% MS Mincho/Gothic 
-%msmin H msmincho
-%msgot H msgothic
-
-%% MS-Mincho with proportional latin and kana:
-%msminp H :1:msmincho
-
-%% Hojo-Kanji (JIS X 0212-1990): Adobe-Japan2
-%hmin  Hojo-H msmincho
-%hminv Hojo-V msmincho
-
-%%
-%% CJK-LaTeX/HLaTeX Examples
-%%
-
-%% Arphic Public Licence fonts:
-%%  AR PL KaitiM, AR PL Mingti2L, AR PL SungtiL
-
-%bsmi@Big5@  ETen-B5-H  bsmi00lp
-%bkai@Big5@  ETen-B5-H  bkai00mp
-%gbsn@EUC@   GB-EUC-H   gbsn00lp
-%gkai@EUC@   GB-EUC-H   gkai00mp
-%bsmir@Big5@ ETen-B5-V  bsmi00lp
-%bkair@Big5@ ETen-B5-V  bkai00mp
-%gbsnr@EUC@  GB-EUC-V   gbsn00lp
-%gkair@EUC@  GB-EUC-V   gkai00mp
-
-%% Korean MS-Windows fonts with stylistic variants
-%jbtm@UKS@  UniKS-UCS2-H !batang
-%jbtmo@UKS@ UniKS-UCS2-H !batang,Italic
-%jbtb@UKS@  UniKS-UCS2-H !batang,Bold
-%jbtbo@UKS@ UniKS-UCS2-H !batang,BoldItalic
-
-%% Baekmuk fonts (used with HLaTeX package)
-%bbtm@KS-HLaTeX@   KSCms-UHC-H  batang
-%bbtmo@UKS-HLaTeX@ UniKS-UCS2-H batang -s .167
-
-%% Heisei family of Acrobat Asian Font Packs:
-%% Not embedded.
-%mincho@UJIS@ UniJIS-UCS2-H HeiseiMin-W3-Acro
-%gothic@UJIS@ UniJIS-UCS2-H HeiseiKakuGo-W5-Acro
-
-%% Bitstream Cyberbit
-%% Available at:
-%%  http://ftp.netscape.com/pub/communicator/extras/fonts/windows/ReadMe.htm
-
-%cyberb@Unicode@ unicode cyberbit
diff --git a/print/dvipdfmx/files/patch-data-Makefile.in b/print/dvipdfmx/files/patch-data-Makefile.in
deleted file mode 100644
index c110959f5eba..000000000000
--- a/print/dvipdfmx/files/patch-data-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- data/Makefile.in.orig	Fri Dec 15 23:02:00 2006
-+++ data/Makefile.in	Wed May  2 01:21:55 2007
-@@ -62,7 +62,7 @@
- EXEEXT = @EXEEXT@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
--pkgdatadir = $(datadir)/texmf/dvipdfm
-+pkgdatadir = $(datadir)/dvipdfm
- AMTAR = @AMTAR@
- AWK = @AWK@
- CC = @CC@
-@@ -88,7 +88,6 @@
-   $(srcdir)/CMap/UniKSCms-UCS2-H \
-   $(srcdir)/CMap/UniKSCms-UCS2-V \
-   $(srcdir)/config/glyphlist.txt \
--  $(srcdir)/config/cid-x.map \
-   $(srcdir)/config/dvipdfmx.cfg
- 
- subdir = data
diff --git a/print/dvipdfmx/files/patch-data-config-dvipdfmx.cfg b/print/dvipdfmx/files/patch-data-config-dvipdfmx.cfg
deleted file mode 100644
index c52bcee4469e..000000000000
--- a/print/dvipdfmx/files/patch-data-config-dvipdfmx.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/config/dvipdfmx.cfg.orig	Wed Jul 20 19:41:54 2005
-+++ data/config/dvipdfmx.cfg	Tue Nov 29 00:32:28 2005
-@@ -135,7 +135,7 @@
- %% simply means large size paper)
- %%
- %% GhostScript (Unix/Linux):
--%D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
-+D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
- 
- %% GhostScript (Win32):
- %D  "gswin32c -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
diff --git a/print/dvipdfmx/pkg-plist b/print/dvipdfmx/pkg-plist
index 598f78569d7d..dbda7f70cbaf 100644
--- a/print/dvipdfmx/pkg-plist
+++ b/print/dvipdfmx/pkg-plist
@@ -1,13 +1,14 @@
 @comment $FreeBSD$
 bin/dvipdfmx
+bin/ebb
+bin/extractbb
+%%DVIPDFMXDIR%%/dvipdfmx.cfg
+@dirrm %%DVIPDFMXDIR%%
 %%FONTMAPDIR%%/cid-x.map
-%%DVIPDFMDIR%%/dvipdfmx.cfg
-%%DVIPDFMDIR%%/EUC-UCS2
-%%DVIPDFMDIR%%/UniKSCms-UCS2-H
-%%DVIPDFMDIR%%/UniKSCms-UCS2-V
-%%FONTMAPDIR%%/glyphlist.txt
+@dirrm %%FONTMAPDIR%%
+%%GLYPHMAPDIR%%/glyphlist.txt
+%%GLYPHMAPDIR%%/pdfglyphlist.txt
+@dirrmtry %%GLYPHMAPDIR%%
 %%FONTCMAPDIR%%/adobe-cmaps
-%%FONTCMAPDIR%%/CMap
-@dirrm %%FONTCMAPDIR%%
 @exec %%MKTEXLSR%% %D/%%TEXMFDIR%%
 @unexec %%MKTEXLSR%% %D/%%TEXMFDIR%%