- Update to 20050831.

- Use TEXMFDIR instead of TEXMFLOCALDIR because teTeX-3 has
  share/texmf-dist for files in the original distribution
  and uses share/texmf directory, not share/texmf-local,
  for other additional files now.

- Add cid-x.map which has been removed from the original distribution.

Approved by:	matusita (maintainer)

6 files changed, 191 insertions, 46 deletions

diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 58fd5cac26ab..2ff8fa15cd8b 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -6,49 +6,46 @@
 #
 
 PORTNAME=	dvipdfmx
-PORTVERSION=	20050201
-PORTREVISION=	2
+PORTVERSION=	20050831
+PORTREVISION=	0
 CATEGORIES=	print
-MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/release/
+MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/current/
 DIST_SUBDIR=	dvipdfmx
 
-PATCH_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/patch/
-PATCHFILES=	mpost-c-20050201.diff tfm-c-20050201.diff
-
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=	Dvipdfm with Asian languages by CID-keyed font technology support
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
 		paper:${PORTSDIR}/print/libpaper
-RUN_DEPENDS=	${LOCALBASE}/${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
-		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
+RUN_DEPENDS=	${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
 		kpsepath:${PORTSDIR}/print/teTeX-base
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${LOCALBASE}/${TEXMFLOCALDIR}
+CONFIGURE_ARGS=	--datadir=${LOCALBASE}/${TEXMFDIR}
 PLIST_SUB=	DVIPDFMDIR=${DVIPDFMDIR} \
 		FONTMAPDIR=${FONTMAPDIR} \
 		FONTCMAPDIR=${FONTCMAPDIR} \
 		MKTEXLSR=${MKTEXLSR} \
 		ADOBECMAPDIR=${ADOBECMAPDIR}
 
-TEXMFLOCALDIR=	share/texmf-local
-TEXMFLOCAL_LSR=	${TEXMFLOCALDIR}/ls-R
-DVIPDFMDIR=	${TEXMFLOCALDIR}/dvipdfm
-FONTMAPDIR=	${TEXMFLOCALDIR}/fonts/map/dvipdfm
-FONTCMAPDIR=	${TEXMFLOCALDIR}/fonts/cmap/dvipdfm
-ADOBECMAPDIR=	${LOCALBASE}/share/ghostscript/Resource
+TEXMFDIR=	share/texmf
+DVIPDFMDIR=	${TEXMFDIR}/dvipdfm
+FONTMAPDIR=	${TEXMFDIR}/fonts/map/dvipdfm
+FONTCMAPDIR=	${TEXMFDIR}/fonts/cmap/dvipdfm
+ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
+pre-install:
+	${RM} -f ${WRKSRC}/data/config/dvipdfmx.cfg.orig \
+		${WRKSRC}/data/config/cid-x.map
+
 post-install:
+	${MV} ${PREFIX}/${TEXMFDIR}/dvipdfm/config/glyphlist.txt \
+		${LOCALBASE}/${FONTMAPDIR}/glyphlist.txt
 	${MKDIR} ${LOCALBASE}/${FONTCMAPDIR}
-	${MV} ${LOCALBASE}/${DVIPDFMDIR}/config/cid-x.map \
+	${INSTALL_DATA} ${FILESDIR}/cid-x.map.in \
 		${LOCALBASE}/${FONTMAPDIR}/cid-x.map
-	${MV} ${LOCALBASE}/${DVIPDFMDIR}/CMap/glyphlist.txt \
-		${LOCALBASE}/${DVIPDFMDIR}/config/glyphlist.txt
-	${MV} ${LOCALBASE}/${DVIPDFMDIR}/CMap \
-		${LOCALBASE}/${FONTCMAPDIR}/CMap
 	${LN} -s -f ${ADOBECMAPDIR} \
 		${LOCALBASE}/${FONTCMAPDIR}/adobe-cmaps
 	${MKTEXLSR}
diff --git a/print/dvipdfmx/distinfo b/print/dvipdfmx/distinfo
index af248a8c73f4..6997da7dd229 100644
--- a/print/dvipdfmx/distinfo
+++ b/print/dvipdfmx/distinfo
@@ -1,9 +1,3 @@
-MD5 (dvipdfmx/dvipdfmx-20050201.tar.gz) = d6b69f30f9ad1ee52853e9ed3cd984f8
-SHA256 (dvipdfmx/dvipdfmx-20050201.tar.gz) = 057bc23e516437b1ef58e7fd4603648263cfe7f54e4eb1bdffa6fb8c9908e4bf
-SIZE (dvipdfmx/dvipdfmx-20050201.tar.gz) = 1341032
-MD5 (dvipdfmx/mpost-c-20050201.diff) = 1011f527b9e22f089549a42ef2c8f9d7
-SHA256 (dvipdfmx/mpost-c-20050201.diff) = 7349627282f0fe3b526efd9f0bb9b0d9cf717b8316a8f3b0bd086525934955b5
-SIZE (dvipdfmx/mpost-c-20050201.diff) = 859
-MD5 (dvipdfmx/tfm-c-20050201.diff) = c6eace6fd926e2fd890e52049c5c275f
-SHA256 (dvipdfmx/tfm-c-20050201.diff) = 6ffb72a789242ea20e97547410edfbd3f84ff01a4da31e7eeba0328bc33534c6
-SIZE (dvipdfmx/tfm-c-20050201.diff) = 459
+MD5 (dvipdfmx/dvipdfmx-20050831.tar.gz) = 23659eff85cc515666f528f16e1a0876
+SHA256 (dvipdfmx/dvipdfmx-20050831.tar.gz) = 40d235d4f888bc5438c29f7007cebb36e3480669a87746d54e64a2f5cfe19475
+SIZE (dvipdfmx/dvipdfmx-20050831.tar.gz) = 553761
diff --git a/print/dvipdfmx/files/cid-x.map.in b/print/dvipdfmx/files/cid-x.map.in
new file mode 100644
index 000000000000..5972c1a73344
--- /dev/null
+++ b/print/dvipdfmx/files/cid-x.map.in
@@ -0,0 +1,140 @@
+%% $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
index 9bb881d1f5a5..efb0710d204d 100644
--- a/print/dvipdfmx/files/patch-data-Makefile.in
+++ b/print/dvipdfmx/files/patch-data-Makefile.in
@@ -1,11 +1,20 @@
---- data/Makefile.in.orig	Mon Jun  7 21:31:01 2004
-+++ data/Makefile.in	Mon Jun  7 21:31:24 2004
-@@ -61,7 +61,7 @@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- 
+--- data/Makefile.in.orig	Mon Jun 27 20:57:15 2005
++++ data/Makefile.in	Mon Nov 28 23:59:39 2005
+@@ -57,7 +57,7 @@
+ pkgdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pkgdata_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 -pkgdatadir = $(datadir)/texmf/dvipdfm
 +pkgdatadir = $(datadir)/dvipdfm
- pkgdata_DATA = CMap config
- DIST_COMMON = Makefile.in $(pkgdata_DATA)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -135,7 +135,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-pkgdata_DATA = CMap config
++pkgdata_DATA = config
+ EXTRA_DIST = $(pkgdata_DATA)
+ all: all-am
+ 
diff --git a/print/dvipdfmx/files/patch-data-config-dvipdfmx.cfg b/print/dvipdfmx/files/patch-data-config-dvipdfmx.cfg
new file mode 100644
index 000000000000..c52bcee4469e
--- /dev/null
+++ b/print/dvipdfmx/files/patch-data-config-dvipdfmx.cfg
@@ -0,0 +1,11 @@
+--- 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 01c5ec665024..0d32cb3f8c92 100644
--- a/print/dvipdfmx/pkg-plist
+++ b/print/dvipdfmx/pkg-plist
@@ -1,15 +1,9 @@
 @comment $FreeBSD$
 bin/dvipdfmx
-%%FONTCMAPDIR%%/CMap/Adobe-Identity-UCS2
-%%FONTCMAPDIR%%/CMap/EUC-UCS2
-%%FONTCMAPDIR%%/CMap/UniKSCms-UCS2-H
-%%FONTCMAPDIR%%/CMap/UniKSCms-UCS2-V
 %%FONTMAPDIR%%/cid-x.map
 %%DVIPDFMDIR%%/config/dvipdfmx.cfg
-%%DVIPDFMDIR%%/config/glyphlist.txt
-@exec ln -s -f %%ADOBECMAPDIR%% %D/%%FONTCMAPDIR%%/adobe-cmaps
-@unexec rm -f %D/%%FONTCMAPDIR%%/adobe-cmaps
-@dirrm %%FONTCMAPDIR%%/CMap
+%%FONTMAPDIR%%/glyphlist.txt
+%%FONTCMAPDIR%%/adobe-cmaps
 @dirrm %%FONTCMAPDIR%%
 @exec %%MKTEXLSR%%
 @unexec %%MKTEXLSR%%