dvipdfm-cjk -> dvipdfmx, and upgrade to 20030313

PR:		45787
Submitted by:	maintainer
Repo-copied by:	joe

9 files changed, 31 insertions, 279 deletions

diff --git a/print/Makefile b/print/Makefile
index 65f4e6c96f36..02ad55631509 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -46,7 +46,7 @@
     SUBDIR += detex
     SUBDIR += dvi2tty
     SUBDIR += dvi2xx
-    SUBDIR += dvipdfm-cjk
+    SUBDIR += dvipdfmx
     SUBDIR += dvips
     SUBDIR += dvips2ascii
     SUBDIR += dviselect
diff --git a/print/dvipdfm-cjk/Makefile b/print/dvipdfm-cjk/Makefile
deleted file mode 100644
index 906c32ec0dde..000000000000
--- a/print/dvipdfm-cjk/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:    zh-dvipdfm-cjk
-# Date created:		8 March 2001
-# Whom:			Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dvipdfm
-PORTVERSION=	20020605
-CATEGORIES=	print
-MASTER_SITES=	http://project.ktug.or.kr/dvipdfm-cjk/snapshot/ \
-		http://project.ktug.or.kr/dvipdfmx/snapshot/
-PKGNAMESUFFIX=	-cjk
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
-
-MAINTAINER=	statue@freebsd.sinica.edu.tw
-COMMENT=	Dvipdfm with Asian languages by CID-keyed font technology support
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX
-LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
-
-MAN1=		dvipdfm.1
-
-USE_OPENSSL=	yes
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.mk>
diff --git a/print/dvipdfm-cjk/distinfo b/print/dvipdfm-cjk/distinfo
deleted file mode 100644
index eaa435c00dfb..000000000000
--- a/print/dvipdfm-cjk/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (dvipdfm-cjk-20020605.tar.gz) = 99734880a4db46681563b863dc9e2227
diff --git a/print/dvipdfm-cjk/pkg-descr b/print/dvipdfm-cjk/pkg-descr
deleted file mode 100644
index 610be3a06be4..000000000000
--- a/print/dvipdfm-cjk/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-The dvipdfm-cjk project provides a modified version of the dvipdfm, a DVI to
-PDF translator developed by Mark A. Wicks. The primary goal of this project
-is to support multi-byte character encodings and large character sets for
-East Asian languages by CID-keyed font technology. The secondary goal is to
-support as many features as pdfTeX developed by Han The Thanh. This project
-is a combined work of the dvipdfm-jpn project by Shunsaku Hirata and its
-modified one, dvipdfm-kor by Jin-Hwan Cho. 
-
-WWW: http://project.ktug.or.kr/dvipdfm-cjk/
diff --git a/print/dvipdfm-cjk/pkg-plist b/print/dvipdfm-cjk/pkg-plist
deleted file mode 100644
index 392bc300b706..000000000000
--- a/print/dvipdfm-cjk/pkg-plist
+++ /dev/null
@@ -1,116 +0,0 @@
-bin/dvipdfm
-bin/dvipdft
-bin/ebb
-share/texmf/dvipdfm/CMap/00_ReadMe.pdf
-share/texmf/dvipdfm/CMap/83pv-RKSJ-H
-share/texmf/dvipdfm/CMap/90ms-RKSJ-H
-share/texmf/dvipdfm/CMap/90ms-RKSJ-UCS2
-share/texmf/dvipdfm/CMap/90ms-RKSJ-V
-share/texmf/dvipdfm/CMap/90msp-RKSJ-H
-share/texmf/dvipdfm/CMap/90msp-RKSJ-V
-share/texmf/dvipdfm/CMap/90pv-RKSJ-H
-share/texmf/dvipdfm/CMap/90pv-RKSJ-UCS2
-share/texmf/dvipdfm/CMap/90pv-RKSJ-UCS2C
-share/texmf/dvipdfm/CMap/Add-RKSJ-H
-share/texmf/dvipdfm/CMap/Add-RKSJ-V
-share/texmf/dvipdfm/CMap/Adobe-CNS1-3
-share/texmf/dvipdfm/CMap/Adobe-CNS1-B5pc
-share/texmf/dvipdfm/CMap/Adobe-CNS1-ETen-B5
-share/texmf/dvipdfm/CMap/Adobe-CNS1-UCS2
-share/texmf/dvipdfm/CMap/Adobe-GB1-4
-share/texmf/dvipdfm/CMap/Adobe-GB1-GBK-EUC
-share/texmf/dvipdfm/CMap/Adobe-GB1-GBpc-EUC
-share/texmf/dvipdfm/CMap/Adobe-GB1-UCS2
-share/texmf/dvipdfm/CMap/Adobe-Identity-UCS2
-share/texmf/dvipdfm/CMap/Adobe-Japan1-4
-share/texmf/dvipdfm/CMap/Adobe-Japan1-90ms-RKSJ
-share/texmf/dvipdfm/CMap/Adobe-Japan1-90pv-RKSJ
-share/texmf/dvipdfm/CMap/Adobe-Japan1-UCS2
-share/texmf/dvipdfm/CMap/Adobe-Korea1-2
-share/texmf/dvipdfm/CMap/Adobe-Korea1-KSCms-UHC
-share/texmf/dvipdfm/CMap/Adobe-Korea1-KSCpc-EUC
-share/texmf/dvipdfm/CMap/Adobe-Korea1-UCS2
-share/texmf/dvipdfm/CMap/B5pc-H
-share/texmf/dvipdfm/CMap/B5pc-UCS2
-share/texmf/dvipdfm/CMap/B5pc-UCS2C
-share/texmf/dvipdfm/CMap/B5pc-V
-share/texmf/dvipdfm/CMap/CNS-EUC-H
-share/texmf/dvipdfm/CMap/CNS-EUC-V
-share/texmf/dvipdfm/CMap/ETen-B5-H
-share/texmf/dvipdfm/CMap/ETen-B5-UCS2
-share/texmf/dvipdfm/CMap/ETen-B5-V
-share/texmf/dvipdfm/CMap/ETenms-B5-H
-share/texmf/dvipdfm/CMap/ETenms-B5-V
-share/texmf/dvipdfm/CMap/EUC-H
-share/texmf/dvipdfm/CMap/EUC-UCS2
-share/texmf/dvipdfm/CMap/EUC-V
-share/texmf/dvipdfm/CMap/Ext-RKSJ-H
-share/texmf/dvipdfm/CMap/Ext-RKSJ-V
-share/texmf/dvipdfm/CMap/GB-EUC-H
-share/texmf/dvipdfm/CMap/GB-EUC-V
-share/texmf/dvipdfm/CMap/GBK-EUC-H
-share/texmf/dvipdfm/CMap/GBK-EUC-UCS2
-share/texmf/dvipdfm/CMap/GBK-EUC-V
-share/texmf/dvipdfm/CMap/GBK2K-H
-share/texmf/dvipdfm/CMap/GBK2K-V
-share/texmf/dvipdfm/CMap/GBKp-EUC-H
-share/texmf/dvipdfm/CMap/GBKp-EUC-V
-share/texmf/dvipdfm/CMap/GBT-EUC-H
-share/texmf/dvipdfm/CMap/GBT-EUC-V
-share/texmf/dvipdfm/CMap/GBpc-EUC-H
-share/texmf/dvipdfm/CMap/GBpc-EUC-UCS2
-share/texmf/dvipdfm/CMap/GBpc-EUC-UCS2C
-share/texmf/dvipdfm/CMap/GBpc-EUC-V
-share/texmf/dvipdfm/CMap/H
-share/texmf/dvipdfm/CMap/HKscs-B5-H
-share/texmf/dvipdfm/CMap/HKscs-B5-V
-share/texmf/dvipdfm/CMap/KSC-EUC-H
-share/texmf/dvipdfm/CMap/KSC-EUC-V
-share/texmf/dvipdfm/CMap/KSCms-UHC-H
-share/texmf/dvipdfm/CMap/KSCms-UHC-HW-H
-share/texmf/dvipdfm/CMap/KSCms-UHC-HW-V
-share/texmf/dvipdfm/CMap/KSCms-UHC-UCS2
-share/texmf/dvipdfm/CMap/KSCms-UHC-V
-share/texmf/dvipdfm/CMap/KSCpc-EUC-H
-share/texmf/dvipdfm/CMap/KSCpc-EUC-UCS2
-share/texmf/dvipdfm/CMap/KSCpc-EUC-UCS2C
-share/texmf/dvipdfm/CMap/UniCNS-UCS2-H
-share/texmf/dvipdfm/CMap/UniCNS-UCS2-V
-share/texmf/dvipdfm/CMap/UniGB-UCS2-H
-share/texmf/dvipdfm/CMap/UniGB-UCS2-V
-share/texmf/dvipdfm/CMap/UniJIS-UCS2-H
-share/texmf/dvipdfm/CMap/UniJIS-UCS2-HW-H
-share/texmf/dvipdfm/CMap/UniJIS-UCS2-HW-V
-share/texmf/dvipdfm/CMap/UniJIS-UCS2-V
-share/texmf/dvipdfm/CMap/UniKS-UCS2-H
-share/texmf/dvipdfm/CMap/UniKS-UCS2-V
-share/texmf/dvipdfm/CMap/UniKSCms-UCS2-H
-share/texmf/dvipdfm/CMap/UniKSCms-UCS2-V
-share/texmf/dvipdfm/CMap/V
-share/texmf/dvipdfm/base/cid.map
-share/texmf/dvipdfm/base/cmr.map
-share/texmf/dvipdfm/base/lw35urw.map
-share/texmf/dvipdfm/base/lw35urwa.map
-share/texmf/dvipdfm/base/ot1.enc
-share/texmf/dvipdfm/base/ot1alt.enc
-share/texmf/dvipdfm/base/ot1r.enc
-share/texmf/dvipdfm/base/psbase14.map
-share/texmf/dvipdfm/base/t1fonts.map
-share/texmf/dvipdfm/config/config
-share/texmf/dvipdfm/sfd/Big5.sfd
-share/texmf/dvipdfm/sfd/EUC.sfd
-share/texmf/dvipdfm/sfd/KS-HLaTeX.sfd
-share/texmf/dvipdfm/sfd/SJIS.sfd
-share/texmf/dvipdfm/sfd/UBg5plus.sfd
-share/texmf/dvipdfm/sfd/UBig5.sfd
-share/texmf/dvipdfm/sfd/UGB.sfd
-share/texmf/dvipdfm/sfd/UGBK.sfd
-share/texmf/dvipdfm/sfd/UJIS.sfd
-share/texmf/dvipdfm/sfd/UKS-HLaTeX.sfd
-share/texmf/dvipdfm/sfd/UKS.sfd
-share/texmf/dvipdfm/sfd/Unicode.sfd
-@dirrm share/texmf/dvipdfm/CMap
-@dirrm share/texmf/dvipdfm/base
-@dirrm share/texmf/dvipdfm/config
-@dirrm share/texmf/dvipdfm/sfd
-@dirrm share/texmf/dvipdfm
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 906c32ec0dde..a5158556a5eb 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,27 +1,34 @@
-# New ports collection makefile for:    zh-dvipdfm-cjk
+# New ports collection makefile for:    dvipdfmx
 # Date created:		8 March 2001
 # Whom:			Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	dvipdfm
-PORTVERSION=	20020605
+PORTNAME=	dvipdfmx
+PORTVERSION=	20030313
 CATEGORIES=	print
-MASTER_SITES=	http://project.ktug.or.kr/dvipdfm-cjk/snapshot/ \
-		http://project.ktug.or.kr/dvipdfmx/snapshot/
-PKGNAMESUFFIX=	-cjk
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/
 
 MAINTAINER=	statue@freebsd.sinica.edu.tw
 COMMENT=	Dvipdfm with Asian languages by CID-keyed font technology support
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PO
+RTSDIR}/print/adobe-cmaps \
+		kpsepath:${PORTSDIR}/print/teTeX
 
 MAN1=		dvipdfm.1
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
+pre-install:
+	${CP} ${LOCALBASE}/bin/dvipdfm ${LOCALBASE}/bin/dvipdfm-orig || ${TRUE}
+	${MV} ${LOCALBASE}/share/texmf/dvipdfm ${LOCALBASE}/share/texmf/dvipdfm-orig || ${TRUE}
+
+post-install:
+	@${LN} -fs ${LOCALBASE}/share/ghostscript/Resource ${PREFIX}/share/texmf/dvipdfm/
+
 .include <bsd.port.mk>
diff --git a/print/dvipdfmx/distinfo b/print/dvipdfmx/distinfo
index eaa435c00dfb..aec49ece7df8 100644
--- a/print/dvipdfmx/distinfo
+++ b/print/dvipdfmx/distinfo
@@ -1 +1 @@
-MD5 (dvipdfm-cjk-20020605.tar.gz) = 99734880a4db46681563b863dc9e2227
+MD5 (dvipdfmx-20030313.tar.gz) = 8dd3bb3a707485daa42404d8c6619c01
diff --git a/print/dvipdfmx/pkg-descr b/print/dvipdfmx/pkg-descr
index 610be3a06be4..b5e8cc5f46c3 100644
--- a/print/dvipdfmx/pkg-descr
+++ b/print/dvipdfmx/pkg-descr
@@ -1,9 +1,9 @@
-The dvipdfm-cjk project provides a modified version of the dvipdfm, a DVI to
-PDF translator developed by Mark A. Wicks. The primary goal of this project
-is to support multi-byte character encodings and large character sets for
-East Asian languages by CID-keyed font technology. The secondary goal is to
-support as many features as pdfTeX developed by Han The Thanh. This project
-is a combined work of the dvipdfm-jpn project by Shunsaku Hirata and its
-modified one, dvipdfm-kor by Jin-Hwan Cho. 
+The dvipdfmx (formerly dvipdfm-cjk) project provides an eXtended version of
+the dvipdfm, a DVI to PDF translator developed by Mark A. Wicks. The primary
+goal of this project is to support multi-byte character encodings and large
+character sets for East Asian languages by CID-keyed font technology. The
+secondary goal is to support as many features as pdfTeX developed by Han The
+Thanh. This project is a combined work of the dvipdfm-jpn project by
+Shunsaku Hirata and its modified one, dvipdfm-kor, by Jin-Hwan Cho. 
 
-WWW: http://project.ktug.or.kr/dvipdfm-cjk/
+WWW: http://project.ktug.or.kr/dvipdfmx/
diff --git a/print/dvipdfmx/pkg-plist b/print/dvipdfmx/pkg-plist
index 392bc300b706..dbb2828db0d0 100644
--- a/print/dvipdfmx/pkg-plist
+++ b/print/dvipdfmx/pkg-plist
@@ -1,116 +1,14 @@
-bin/dvipdfm
-bin/dvipdft
-bin/ebb
-share/texmf/dvipdfm/CMap/00_ReadMe.pdf
-share/texmf/dvipdfm/CMap/83pv-RKSJ-H
-share/texmf/dvipdfm/CMap/90ms-RKSJ-H
-share/texmf/dvipdfm/CMap/90ms-RKSJ-UCS2
-share/texmf/dvipdfm/CMap/90ms-RKSJ-V
-share/texmf/dvipdfm/CMap/90msp-RKSJ-H
-share/texmf/dvipdfm/CMap/90msp-RKSJ-V
-share/texmf/dvipdfm/CMap/90pv-RKSJ-H
-share/texmf/dvipdfm/CMap/90pv-RKSJ-UCS2
-share/texmf/dvipdfm/CMap/90pv-RKSJ-UCS2C
-share/texmf/dvipdfm/CMap/Add-RKSJ-H
-share/texmf/dvipdfm/CMap/Add-RKSJ-V
-share/texmf/dvipdfm/CMap/Adobe-CNS1-3
-share/texmf/dvipdfm/CMap/Adobe-CNS1-B5pc
-share/texmf/dvipdfm/CMap/Adobe-CNS1-ETen-B5
-share/texmf/dvipdfm/CMap/Adobe-CNS1-UCS2
-share/texmf/dvipdfm/CMap/Adobe-GB1-4
-share/texmf/dvipdfm/CMap/Adobe-GB1-GBK-EUC
-share/texmf/dvipdfm/CMap/Adobe-GB1-GBpc-EUC
-share/texmf/dvipdfm/CMap/Adobe-GB1-UCS2
+bin/dvipdfmx
+@unexec cp %D/bin/dvipdfm-orig %D/bin/dvipdfm
+bin/dvipdfm-orig
+share/texmf/dvipdfm/Resource
 share/texmf/dvipdfm/CMap/Adobe-Identity-UCS2
-share/texmf/dvipdfm/CMap/Adobe-Japan1-4
-share/texmf/dvipdfm/CMap/Adobe-Japan1-90ms-RKSJ
-share/texmf/dvipdfm/CMap/Adobe-Japan1-90pv-RKSJ
-share/texmf/dvipdfm/CMap/Adobe-Japan1-UCS2
-share/texmf/dvipdfm/CMap/Adobe-Korea1-2
-share/texmf/dvipdfm/CMap/Adobe-Korea1-KSCms-UHC
-share/texmf/dvipdfm/CMap/Adobe-Korea1-KSCpc-EUC
-share/texmf/dvipdfm/CMap/Adobe-Korea1-UCS2
-share/texmf/dvipdfm/CMap/B5pc-H
-share/texmf/dvipdfm/CMap/B5pc-UCS2
-share/texmf/dvipdfm/CMap/B5pc-UCS2C
-share/texmf/dvipdfm/CMap/B5pc-V
-share/texmf/dvipdfm/CMap/CNS-EUC-H
-share/texmf/dvipdfm/CMap/CNS-EUC-V
-share/texmf/dvipdfm/CMap/ETen-B5-H
-share/texmf/dvipdfm/CMap/ETen-B5-UCS2
-share/texmf/dvipdfm/CMap/ETen-B5-V
-share/texmf/dvipdfm/CMap/ETenms-B5-H
-share/texmf/dvipdfm/CMap/ETenms-B5-V
-share/texmf/dvipdfm/CMap/EUC-H
 share/texmf/dvipdfm/CMap/EUC-UCS2
-share/texmf/dvipdfm/CMap/EUC-V
-share/texmf/dvipdfm/CMap/Ext-RKSJ-H
-share/texmf/dvipdfm/CMap/Ext-RKSJ-V
-share/texmf/dvipdfm/CMap/GB-EUC-H
-share/texmf/dvipdfm/CMap/GB-EUC-V
-share/texmf/dvipdfm/CMap/GBK-EUC-H
-share/texmf/dvipdfm/CMap/GBK-EUC-UCS2
-share/texmf/dvipdfm/CMap/GBK-EUC-V
-share/texmf/dvipdfm/CMap/GBK2K-H
-share/texmf/dvipdfm/CMap/GBK2K-V
-share/texmf/dvipdfm/CMap/GBKp-EUC-H
-share/texmf/dvipdfm/CMap/GBKp-EUC-V
-share/texmf/dvipdfm/CMap/GBT-EUC-H
-share/texmf/dvipdfm/CMap/GBT-EUC-V
-share/texmf/dvipdfm/CMap/GBpc-EUC-H
-share/texmf/dvipdfm/CMap/GBpc-EUC-UCS2
-share/texmf/dvipdfm/CMap/GBpc-EUC-UCS2C
-share/texmf/dvipdfm/CMap/GBpc-EUC-V
-share/texmf/dvipdfm/CMap/H
-share/texmf/dvipdfm/CMap/HKscs-B5-H
-share/texmf/dvipdfm/CMap/HKscs-B5-V
-share/texmf/dvipdfm/CMap/KSC-EUC-H
-share/texmf/dvipdfm/CMap/KSC-EUC-V
-share/texmf/dvipdfm/CMap/KSCms-UHC-H
-share/texmf/dvipdfm/CMap/KSCms-UHC-HW-H
-share/texmf/dvipdfm/CMap/KSCms-UHC-HW-V
-share/texmf/dvipdfm/CMap/KSCms-UHC-UCS2
-share/texmf/dvipdfm/CMap/KSCms-UHC-V
-share/texmf/dvipdfm/CMap/KSCpc-EUC-H
-share/texmf/dvipdfm/CMap/KSCpc-EUC-UCS2
-share/texmf/dvipdfm/CMap/KSCpc-EUC-UCS2C
-share/texmf/dvipdfm/CMap/UniCNS-UCS2-H
-share/texmf/dvipdfm/CMap/UniCNS-UCS2-V
-share/texmf/dvipdfm/CMap/UniGB-UCS2-H
-share/texmf/dvipdfm/CMap/UniGB-UCS2-V
-share/texmf/dvipdfm/CMap/UniJIS-UCS2-H
-share/texmf/dvipdfm/CMap/UniJIS-UCS2-HW-H
-share/texmf/dvipdfm/CMap/UniJIS-UCS2-HW-V
-share/texmf/dvipdfm/CMap/UniJIS-UCS2-V
-share/texmf/dvipdfm/CMap/UniKS-UCS2-H
-share/texmf/dvipdfm/CMap/UniKS-UCS2-V
 share/texmf/dvipdfm/CMap/UniKSCms-UCS2-H
 share/texmf/dvipdfm/CMap/UniKSCms-UCS2-V
-share/texmf/dvipdfm/CMap/V
-share/texmf/dvipdfm/base/cid.map
-share/texmf/dvipdfm/base/cmr.map
-share/texmf/dvipdfm/base/lw35urw.map
-share/texmf/dvipdfm/base/lw35urwa.map
-share/texmf/dvipdfm/base/ot1.enc
-share/texmf/dvipdfm/base/ot1alt.enc
-share/texmf/dvipdfm/base/ot1r.enc
-share/texmf/dvipdfm/base/psbase14.map
-share/texmf/dvipdfm/base/t1fonts.map
-share/texmf/dvipdfm/config/config
-share/texmf/dvipdfm/sfd/Big5.sfd
-share/texmf/dvipdfm/sfd/EUC.sfd
-share/texmf/dvipdfm/sfd/KS-HLaTeX.sfd
-share/texmf/dvipdfm/sfd/SJIS.sfd
-share/texmf/dvipdfm/sfd/UBg5plus.sfd
-share/texmf/dvipdfm/sfd/UBig5.sfd
-share/texmf/dvipdfm/sfd/UGB.sfd
-share/texmf/dvipdfm/sfd/UGBK.sfd
-share/texmf/dvipdfm/sfd/UJIS.sfd
-share/texmf/dvipdfm/sfd/UKS-HLaTeX.sfd
-share/texmf/dvipdfm/sfd/UKS.sfd
-share/texmf/dvipdfm/sfd/Unicode.sfd
+share/texmf/dvipdfm/config/cid-x.map
+share/texmf/dvipdfm/config/dvipdfmx.cfg
 @dirrm share/texmf/dvipdfm/CMap
-@dirrm share/texmf/dvipdfm/base
 @dirrm share/texmf/dvipdfm/config
-@dirrm share/texmf/dvipdfm/sfd
 @dirrm share/texmf/dvipdfm
+@unexec mv %D/share/texmf/dvipdfm-orig %D/share/texmf/dvipdfm