Update dvipdfmx to 20090708.

Major changes:
    - Add -E option that enables DVIPDFM emulation mode in DVIPDFMx.
    - Don't try to convert included PDF files whose version number
      is higher than output file version. (If run as dvipdfm,
      conversion still occurs.)
    - Added dvipdfm compatibility mode. This mode is triggered
      if dvipdfmx is called as "dvipdfm", and likewise extractbb
      as "ebb". (The latter mode was already present.)
    - Made predefined paper sizes match values given by libpaper.

9 files changed, 123 insertions, 284 deletions

diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 790825cf15d..a3090219a0e 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,37 +1,60 @@
-# $NetBSD: Makefile,v 1.32 2009/09/02 08:34:14 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/01/16 03:52:40 minskim Exp $
 
-DISTNAME=	dvipdfmx-20070518
-PKGNAME=	${DISTNAME:S/-/-0.0.0./}
-PKGREVISION=	2
+DISTNAME=	texlive-20091011-source
+PKGNAME=	dvipdfmx-20090708
 CATEGORIES=	print converters
-MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/release/
+MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
+EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://project.ktug.or.kr/dvipdfmx/
-COMMENT=	Dvi to pdf converter with CID-keyed font support
-
-DEPENDS+=	adobe-cmaps>=20060615:../../fonts/adobe-cmaps
+COMMENT=	DVI to PDF converter with CID-keyed font support
 
 CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
-
-USE_TOOLS+=		gs:run
-GNU_CONFIGURE=		YES
-MAKE_ENV+=		PKG_LOCALTEXMFPREFIX=${PREFIX:Q}/share/texmf-dist
+DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
+
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
+			${DISTNAME}/texk/dvipdfmx
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	gs:run ps2pdf:run
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dvipdfmx
+
+CONFIGURE_ARGS+=	--with-system-kpathsea \
+		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
+		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
+CONFIGURE_ARGS+=	--with-system-zlib \
+		--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
+		--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ARGS+=	--with-system-libpng \
+		--with-libpng-includes=${BUILDLINK_PREFIX.png}/include \
+		--with-libpng-libdir=${BUILDLINK_PREFIX.png}/lib
+CONFIGURE_ARGS+=	--with-paper=${BUILDLINK_PREFIX.libpaper}
+
+PKG_SYSCONFSUBDIR=	texmf
+
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/dvipdfmx
+CONF_FILES=	${PREFIX}/share/texmf/dvipdfmx/dvipdfmx.cfg \
+		${PKG_SYSCONFDIR}/dvipdfmx/dvipdfmx.cfg
+
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	Setting paths to commands.
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	data/dvipdfmx.cfg src/dvipdft
+SUBST_SED.paths=	-e 's,@DVIPDFM@,${PREFIX}/bin/dvipdfm,g' \
+			-e 's,@GS@,${TOOLS_PATH.gs},g' \
+			-e 's,@PS2PDF@,${LOCALBASE}/bin/ps2pdf,g'
+
+TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
+TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
+TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../print/dvipdfmx/map.mk"
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../print/kpathsea/texmf.mk"
-
-post-install:
-	cd ${PREFIX}/share/texmf-dist/dvipdfm; \
-	for file in ../../Adobe/Resource/CMap/*; do \
-		${LN} -sf $$file `${BASENAME} $$file`; \
-	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dvipdfmx
-	${MV} ${PREFIX}/share/texmf-dist/dvipdfm/dvipdfmx.cfg \
-		${PREFIX}/share/examples/dvipdfmx/
-
+.include "../../print/libpaper/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipdfmx/PLIST b/print/dvipdfmx/PLIST
index 285df992c2c..ee7486e5191 100644
--- a/print/dvipdfmx/PLIST
+++ b/print/dvipdfmx/PLIST
@@ -1,209 +1,11 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:11:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2010/01/16 03:52:40 minskim Exp $
+bin/dvipdfm
 bin/dvipdfmx
-bin/xbb
-share/examples/dvipdfmx/dvipdfmx.cfg
-share/texmf-dist/dvipdfm/78-EUC-H
-share/texmf-dist/dvipdfm/78-EUC-V
-share/texmf-dist/dvipdfm/78-H
-share/texmf-dist/dvipdfm/78-RKSJ-H
-share/texmf-dist/dvipdfm/78-RKSJ-V
-share/texmf-dist/dvipdfm/78-V
-share/texmf-dist/dvipdfm/78ms-RKSJ-H
-share/texmf-dist/dvipdfm/78ms-RKSJ-V
-share/texmf-dist/dvipdfm/83pv-RKSJ-H
-share/texmf-dist/dvipdfm/90ms-RKSJ-H
-share/texmf-dist/dvipdfm/90ms-RKSJ-UCS2
-share/texmf-dist/dvipdfm/90ms-RKSJ-V
-share/texmf-dist/dvipdfm/90msp-RKSJ-H
-share/texmf-dist/dvipdfm/90msp-RKSJ-V
-share/texmf-dist/dvipdfm/90pv-RKSJ-H
-share/texmf-dist/dvipdfm/90pv-RKSJ-UCS2
-share/texmf-dist/dvipdfm/90pv-RKSJ-UCS2C
-share/texmf-dist/dvipdfm/90pv-RKSJ-V
-share/texmf-dist/dvipdfm/Add-H
-share/texmf-dist/dvipdfm/Add-RKSJ-H
-share/texmf-dist/dvipdfm/Add-RKSJ-V
-share/texmf-dist/dvipdfm/Add-V
-share/texmf-dist/dvipdfm/Adobe-CNS1-0
-share/texmf-dist/dvipdfm/Adobe-CNS1-1
-share/texmf-dist/dvipdfm/Adobe-CNS1-2
-share/texmf-dist/dvipdfm/Adobe-CNS1-3
-share/texmf-dist/dvipdfm/Adobe-CNS1-4
-share/texmf-dist/dvipdfm/Adobe-CNS1-5
-share/texmf-dist/dvipdfm/Adobe-CNS1-UCS2
-share/texmf-dist/dvipdfm/Adobe-GB1-0
-share/texmf-dist/dvipdfm/Adobe-GB1-1
-share/texmf-dist/dvipdfm/Adobe-GB1-2
-share/texmf-dist/dvipdfm/Adobe-GB1-3
-share/texmf-dist/dvipdfm/Adobe-GB1-4
-share/texmf-dist/dvipdfm/Adobe-GB1-5
-share/texmf-dist/dvipdfm/Adobe-GB1-UCS2
-share/texmf-dist/dvipdfm/Adobe-Japan1-0
-share/texmf-dist/dvipdfm/Adobe-Japan1-1
-share/texmf-dist/dvipdfm/Adobe-Japan1-2
-share/texmf-dist/dvipdfm/Adobe-Japan1-3
-share/texmf-dist/dvipdfm/Adobe-Japan1-4
-share/texmf-dist/dvipdfm/Adobe-Japan1-5
-share/texmf-dist/dvipdfm/Adobe-Japan1-6
-share/texmf-dist/dvipdfm/Adobe-Japan1-UCS2
-share/texmf-dist/dvipdfm/Adobe-Japan2-0
-share/texmf-dist/dvipdfm/Adobe-Korea1-0
-share/texmf-dist/dvipdfm/Adobe-Korea1-1
-share/texmf-dist/dvipdfm/Adobe-Korea1-2
-share/texmf-dist/dvipdfm/Adobe-Korea1-UCS2
-share/texmf-dist/dvipdfm/B5-H
-share/texmf-dist/dvipdfm/B5-V
-share/texmf-dist/dvipdfm/B5pc-H
-share/texmf-dist/dvipdfm/B5pc-UCS2
-share/texmf-dist/dvipdfm/B5pc-UCS2C
-share/texmf-dist/dvipdfm/B5pc-V
-share/texmf-dist/dvipdfm/CNS-EUC-H
-share/texmf-dist/dvipdfm/CNS-EUC-V
-share/texmf-dist/dvipdfm/CNS01-RKSJ-H
-share/texmf-dist/dvipdfm/CNS02-RKSJ-H
-share/texmf-dist/dvipdfm/CNS03-RKSJ-H
-share/texmf-dist/dvipdfm/CNS04-RKSJ-H
-share/texmf-dist/dvipdfm/CNS05-RKSJ-H
-share/texmf-dist/dvipdfm/CNS06-RKSJ-H
-share/texmf-dist/dvipdfm/CNS07-RKSJ-H
-share/texmf-dist/dvipdfm/CNS1-H
-share/texmf-dist/dvipdfm/CNS1-V
-share/texmf-dist/dvipdfm/CNS15-RKSJ-H
-share/texmf-dist/dvipdfm/CNS2-H
-share/texmf-dist/dvipdfm/CNS2-V
-share/texmf-dist/dvipdfm/ETHK-B5-H
-share/texmf-dist/dvipdfm/ETHK-B5-V
-share/texmf-dist/dvipdfm/ETen-B5-H
-share/texmf-dist/dvipdfm/ETen-B5-UCS2
-share/texmf-dist/dvipdfm/ETen-B5-V
-share/texmf-dist/dvipdfm/EUC-H
-share/texmf-dist/dvipdfm/EUC-UCS2
-share/texmf-dist/dvipdfm/EUC-V
-share/texmf-dist/dvipdfm/Ext-H
-share/texmf-dist/dvipdfm/Ext-RKSJ-H
-share/texmf-dist/dvipdfm/Ext-RKSJ-V
-share/texmf-dist/dvipdfm/Ext-V
-share/texmf-dist/dvipdfm/GB-EUC-H
-share/texmf-dist/dvipdfm/GB-EUC-V
-share/texmf-dist/dvipdfm/GB-H
-share/texmf-dist/dvipdfm/GB-RKSJ-H
-share/texmf-dist/dvipdfm/GB-V
-share/texmf-dist/dvipdfm/GBK-EUC-H
-share/texmf-dist/dvipdfm/GBK-EUC-UCS2
-share/texmf-dist/dvipdfm/GBK-EUC-V
-share/texmf-dist/dvipdfm/GBK2K-H
-share/texmf-dist/dvipdfm/GBK2K-V
-share/texmf-dist/dvipdfm/GBKp-EUC-H
-share/texmf-dist/dvipdfm/GBKp-EUC-V
-share/texmf-dist/dvipdfm/GBT-EUC-H
-share/texmf-dist/dvipdfm/GBT-EUC-V
-share/texmf-dist/dvipdfm/GBT-H
-share/texmf-dist/dvipdfm/GBT-RKSJ-H
-share/texmf-dist/dvipdfm/GBT-V
-share/texmf-dist/dvipdfm/GBTpc-EUC-H
-share/texmf-dist/dvipdfm/GBTpc-EUC-V
-share/texmf-dist/dvipdfm/GBpc-EUC-H
-share/texmf-dist/dvipdfm/GBpc-EUC-UCS2
-share/texmf-dist/dvipdfm/GBpc-EUC-UCS2C
-share/texmf-dist/dvipdfm/GBpc-EUC-V
-share/texmf-dist/dvipdfm/H
-share/texmf-dist/dvipdfm/HK-RKSJ-H
-share/texmf-dist/dvipdfm/HKdla-B5-H
-share/texmf-dist/dvipdfm/HKdla-B5-V
-share/texmf-dist/dvipdfm/HKdlb-B5-H
-share/texmf-dist/dvipdfm/HKdlb-B5-V
-share/texmf-dist/dvipdfm/HKgccs-B5-H
-share/texmf-dist/dvipdfm/HKgccs-B5-V
-share/texmf-dist/dvipdfm/HKm314-B5-H
-share/texmf-dist/dvipdfm/HKm314-B5-V
-share/texmf-dist/dvipdfm/HKm471-B5-H
-share/texmf-dist/dvipdfm/HKm471-B5-V
-share/texmf-dist/dvipdfm/HKscs-B5-H
-share/texmf-dist/dvipdfm/HKscs-B5-V
-share/texmf-dist/dvipdfm/Hankaku
-share/texmf-dist/dvipdfm/Hiragana
-share/texmf-dist/dvipdfm/Hojo-EUC-H
-share/texmf-dist/dvipdfm/Hojo-EUC-V
-share/texmf-dist/dvipdfm/Hojo-H
-share/texmf-dist/dvipdfm/Hojo-RKSJ-H
-share/texmf-dist/dvipdfm/Hojo-V
-share/texmf-dist/dvipdfm/Identity-H
-share/texmf-dist/dvipdfm/Identity-V
-share/texmf-dist/dvipdfm/KSC-EUC-H
-share/texmf-dist/dvipdfm/KSC-EUC-V
-share/texmf-dist/dvipdfm/KSC-H
-share/texmf-dist/dvipdfm/KSC-Johab-H
-share/texmf-dist/dvipdfm/KSC-Johab-V
-share/texmf-dist/dvipdfm/KSC-RKSJ-H
-share/texmf-dist/dvipdfm/KSC-V
-share/texmf-dist/dvipdfm/KSC2-RKSJ-H
-share/texmf-dist/dvipdfm/KSCms-UHC-H
-share/texmf-dist/dvipdfm/KSCms-UHC-HW-H
-share/texmf-dist/dvipdfm/KSCms-UHC-HW-V
-share/texmf-dist/dvipdfm/KSCms-UHC-UCS2
-share/texmf-dist/dvipdfm/KSCms-UHC-V
-share/texmf-dist/dvipdfm/KSCpc-EUC-H
-share/texmf-dist/dvipdfm/KSCpc-EUC-UCS2
-share/texmf-dist/dvipdfm/KSCpc-EUC-UCS2C
-share/texmf-dist/dvipdfm/KSCpc-EUC-V
-share/texmf-dist/dvipdfm/Katakana
-share/texmf-dist/dvipdfm/NWP-H
-share/texmf-dist/dvipdfm/NWP-V
-share/texmf-dist/dvipdfm/RKSJ-H
-share/texmf-dist/dvipdfm/RKSJ-V
-share/texmf-dist/dvipdfm/Roman
-share/texmf-dist/dvipdfm/TCVN-RKSJ-H
-share/texmf-dist/dvipdfm/UniCNS-UCS2-H
-share/texmf-dist/dvipdfm/UniCNS-UCS2-V
-share/texmf-dist/dvipdfm/UniCNS-UTF16-H
-share/texmf-dist/dvipdfm/UniCNS-UTF16-V
-share/texmf-dist/dvipdfm/UniCNS-UTF32-H
-share/texmf-dist/dvipdfm/UniCNS-UTF32-V
-share/texmf-dist/dvipdfm/UniCNS-UTF8-H
-share/texmf-dist/dvipdfm/UniCNS-UTF8-V
-share/texmf-dist/dvipdfm/UniGB-UCS2-H
-share/texmf-dist/dvipdfm/UniGB-UCS2-V
-share/texmf-dist/dvipdfm/UniGB-UTF16-H
-share/texmf-dist/dvipdfm/UniGB-UTF16-V
-share/texmf-dist/dvipdfm/UniGB-UTF32-H
-share/texmf-dist/dvipdfm/UniGB-UTF32-V
-share/texmf-dist/dvipdfm/UniGB-UTF8-H
-share/texmf-dist/dvipdfm/UniGB-UTF8-V
-share/texmf-dist/dvipdfm/UniHojo-UCS2-H
-share/texmf-dist/dvipdfm/UniHojo-UCS2-V
-share/texmf-dist/dvipdfm/UniHojo-UTF16-H
-share/texmf-dist/dvipdfm/UniHojo-UTF16-V
-share/texmf-dist/dvipdfm/UniHojo-UTF32-H
-share/texmf-dist/dvipdfm/UniHojo-UTF32-V
-share/texmf-dist/dvipdfm/UniHojo-UTF8-H
-share/texmf-dist/dvipdfm/UniHojo-UTF8-V
-share/texmf-dist/dvipdfm/UniJIS-UCS2-H
-share/texmf-dist/dvipdfm/UniJIS-UCS2-HW-H
-share/texmf-dist/dvipdfm/UniJIS-UCS2-HW-V
-share/texmf-dist/dvipdfm/UniJIS-UCS2-V
-share/texmf-dist/dvipdfm/UniJIS-UTF16-H
-share/texmf-dist/dvipdfm/UniJIS-UTF16-V
-share/texmf-dist/dvipdfm/UniJIS-UTF32-H
-share/texmf-dist/dvipdfm/UniJIS-UTF32-V
-share/texmf-dist/dvipdfm/UniJIS-UTF8-H
-share/texmf-dist/dvipdfm/UniJIS-UTF8-V
-share/texmf-dist/dvipdfm/UniJISPro-UCS2-HW-V
-share/texmf-dist/dvipdfm/UniJISPro-UCS2-V
-share/texmf-dist/dvipdfm/UniJISPro-UTF8-V
-share/texmf-dist/dvipdfm/UniJISX0213-UTF32-H
-share/texmf-dist/dvipdfm/UniJISX0213-UTF32-V
-share/texmf-dist/dvipdfm/UniKS-UCS2-H
-share/texmf-dist/dvipdfm/UniKS-UCS2-V
-share/texmf-dist/dvipdfm/UniKS-UTF16-H
-share/texmf-dist/dvipdfm/UniKS-UTF16-V
-share/texmf-dist/dvipdfm/UniKS-UTF32-H
-share/texmf-dist/dvipdfm/UniKS-UTF32-V
-share/texmf-dist/dvipdfm/UniKS-UTF8-H
-share/texmf-dist/dvipdfm/UniKS-UTF8-V
-share/texmf-dist/dvipdfm/UniKSCms-UCS2-H
-share/texmf-dist/dvipdfm/UniKSCms-UCS2-V
-share/texmf-dist/dvipdfm/V
-share/texmf-dist/dvipdfm/WP-Symbol
-share/texmf-dist/dvipdfm/cid-x.map
-share/texmf-dist/dvipdfm/glyphlist.txt
-@unexec ${RM} -f %D/share/texmf-dist/dvipdfm/dvipdfmx.cfg
+bin/dvipdft
+bin/ebb
+bin/extractbb
+share/texmf-dist/fonts/map/glyphlist/glyphlist.txt
+share/texmf-dist/fonts/map/glyphlist/pdfglyphlist.txt
+share/texmf/dvipdfmx/dvipdfmx.cfg
+share/texmf/fonts/cmap/dvipdfmx/EUC-UCS2
+share/texmf/fonts/map/dvipdfm/dvipdfmx/cid-x.map
diff --git a/print/dvipdfmx/distinfo b/print/dvipdfmx/distinfo
index c0836617b1f..6b5dc34cd69 100644
--- a/print/dvipdfmx/distinfo
+++ b/print/dvipdfmx/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2007/06/06 22:16:33 minskim Exp $
+$NetBSD: distinfo,v 1.9 2010/01/16 03:52:41 minskim Exp $
 
-SHA1 (dvipdfmx-20070518.tar.gz) = 48d8a23580604e235ac93f16eb3f704888603a18
-RMD160 (dvipdfmx-20070518.tar.gz) = f17d6c4462de377854cb77504c9ddfed6119ff85
-Size (dvipdfmx-20070518.tar.gz) = 570692 bytes
-SHA1 (patch-aa) = 436aa8f8c90ac8ad044d34cc53255ba089ae834e
-SHA1 (patch-ab) = a32fe7082ee9d2da19240e7b2c0ab7d66de18424
+SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
+RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
+Size (texlive-20091011-source.tar.xz) = 29683728 bytes
+SHA1 (patch-ab) = da442d43a701e95bf8aab4288388b024ae6c7aa7
+SHA1 (patch-ac) = 3f6ff6cb655bfefb1525d576ffda5751415e7857
+SHA1 (patch-ad) = 072e76ad8cf650d8ff98b3ce3e6b8875e82b2fa6
diff --git a/print/dvipdfmx/files/map.tmpl b/print/dvipdfmx/files/map.tmpl
index f4d5b775e5e..2619d2a4215 100644
--- a/print/dvipdfmx/files/map.tmpl
+++ b/print/dvipdfmx/files/map.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: map.tmpl,v 1.3 2005/11/20 19:14:50 minskim Exp $
+# $NetBSD: map.tmpl,v 1.4 2010/01/16 03:52:41 minskim Exp $
 #
 # Update dvipdfmx.cfg.
 #
@@ -28,10 +28,6 @@ eof
 
 case ${STAGE} in
 POST-INSTALL)
-	if ${TEST} ! -f @DVIPDFMX_CONFIG_DIR@/dvipdfmx.cfg; then
-		@CP@ @LOCALBASE@/share/examples/dvipdfmx/dvipdfmx.cfg \
-		     @DVIPDFMX_CONFIG_DIR@/dvipdfmx.cfg
-	fi
 	for map in @DVIPDFMX_FONTMAPS@; do
 		replace_line "@DVIPDFMX_CONFIG_DIR@/dvipdfmx.cfg" \
 			"^%![ 	]*$map" "f $map"
diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk
index 1421acc8660..bc53f826f9d 100644
--- a/print/dvipdfmx/map.mk
+++ b/print/dvipdfmx/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.8 2009/01/14 06:35:22 minskim Exp $
+# $NetBSD: map.mk,v 1.9 2010/01/16 03:52:41 minskim Exp $
 # This Makefile fragment is intended to be included by packages that
 # install font maps used by dvipdfmx.  It takes care of adding and
 # removing font map entires in dvipdfmx.cfg.
@@ -14,12 +14,12 @@ DVIPDFMX_MAP_MK=	# defined
 
 DVIPDFMX_FONTMAPS?=	# empty
 
-.if empty(DISTNAME:Mdvipdfmx-[0-9]*)
+.if empty(PKGNAME:Mdvipdfmx-[0-9]*)
 DEPENDS+=		dvipdfmx>=0.0.0.20070518:../../print/dvipdfmx
 .endif
 
 FILES_SUBST+=		DVIPDFMX_FONTMAPS=${DVIPDFMX_FONTMAPS:Q}
-FILES_SUBST+=		DVIPDFMX_CONFIG_DIR="${LOCALBASE}/share/texmf-dist/dvipdfm"
+FILES_SUBST+=		DVIPDFMX_CONFIG_DIR="${LOCALBASE}/share/texmf/dvipdfmx"
 INSTALL_TEMPLATES+=	../../print/dvipdfmx/files/map.tmpl
 DEINSTALL_TEMPLATES+=	../../print/dvipdfmx/files/map.tmpl
 
diff --git a/print/dvipdfmx/patches/patch-aa b/print/dvipdfmx/patches/patch-aa
deleted file mode 100644
index 2ba772ddbf5..00000000000
--- a/print/dvipdfmx/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/03/06 23:02:13 joerg Exp $
-
---- src/pdfobj.c.orig	2006-03-06 22:44:45.000000000 +0000
-+++ src/pdfobj.c
-@@ -2529,14 +2529,18 @@ pdf_compare_reference (pdf_obj *ref1, pd
-   data1 = (pdf_indirect *) ref1->data;
-   data2 = (pdf_indirect *) ref2->data;
- 
-+#define COMPARE(x,y) ((x) > (y) ? 1 : -1)
-+
-   if (data1->dirty != data2->dirty)
--    return (int) (data1->dirty - data2->dirty);
-+    return COMPARE(data1->dirty, data2->dirty);
-   if (data1->dirty_file != data2->dirty_file)
--    return (int) (data1->dirty_file - data2->dirty_file);
-+    return COMPARE(data1->dirty_file, data2->dirty_file);
-   if (data1->label != data2->label)
--    return (int) (data1->label - data2->label);
-+    return COMPARE(data1->label, data2->label);
-   if (data1->generation != data2->generation)
--    return (int) (data1->generation - data2->generation);
-+    return COMPARE(data1->generation, data2->generation);
-+
-+#undef COMPARE
- 
-   return 0;
- }
diff --git a/print/dvipdfmx/patches/patch-ab b/print/dvipdfmx/patches/patch-ab
index 8a98dad60ec..e89c53fa2d3 100644
--- a/print/dvipdfmx/patches/patch-ab
+++ b/print/dvipdfmx/patches/patch-ab
@@ -1,13 +1,29 @@
-$NetBSD: patch-ab,v 1.4 2007/06/06 22:16:34 minskim Exp $
+$NetBSD: patch-ab,v 1.5 2010/01/16 03:52:41 minskim Exp $
 
---- data/Makefile.in.orig	2007-05-03 12:03:41.000000000 -0700
+--- data/Makefile.in.orig	2009-06-15 08:14:49.000000000 -0700
 +++ data/Makefile.in
-@@ -60,7 +60,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
- dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(dist_pkgdata_DATA)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--pkgdatadir = $(datadir)/texmf/dvipdfm
-+pkgdatadir = $(PKG_LOCALTEXMFPREFIX)/dvipdfm
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
+@@ -208,20 +208,20 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-configdatadir = ${prefix}/texmf/dvipdfmx
++configdatadir = ${prefix}/share/texmf/dvipdfmx
+ dist_configdata_DATA = \
+   $(srcdir)/dvipdfmx.cfg
+ 
+-glyphlistdatadir = ${prefix}/texmf-dist/fonts/map/glyphlist
++glyphlistdatadir = ${prefix}/share/texmf-dist/fonts/map/glyphlist
+ dist_glyphlistdata_DATA = \
+   $(srcdir)/glyphlist.txt \
+   $(srcdir)/pdfglyphlist.txt
+ 
+-mapdatadir = ${prefix}/texmf/fonts/map/dvipdfm/dvipdfmx
++mapdatadir = ${prefix}/share/texmf/fonts/map/dvipdfm/dvipdfmx
+ dist_mapdata_DATA = \
+   $(srcdir)/cid-x.map
+ 
+-cmapdatadir = ${prefix}/texmf/fonts/cmap/dvipdfmx
++cmapdatadir = ${prefix}/share/texmf/fonts/cmap/dvipdfmx
+ dist_cmapdata_DATA = \
+   $(srcdir)/EUC-UCS2
+ 
diff --git a/print/dvipdfmx/patches/patch-ac b/print/dvipdfmx/patches/patch-ac
new file mode 100644
index 00000000000..b3f630ab3ff
--- /dev/null
+++ b/print/dvipdfmx/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2010/01/16 03:52:41 minskim Exp $
+
+--- src/dvipdft.orig	2009-06-03 15:54:21.000000000 -0700
++++ src/dvipdft
+@@ -98,8 +98,8 @@ dvipdfm ${1+"$@"} -z0 "$dvifile"
+ 
+ # run gs
+ echo "$progname: running gs" >&2
+-gs -r10 -dNOPAUSE -dBATCH -sDEVICE=png256 -sOutputFile="$outBase.%d" "$outfile"
++@GS@ -r10 -dNOPAUSE -dBATCH -sDEVICE=png256 -sOutputFile="$outBase.%d" "$outfile"
+ 
+ # run dvipdfm with the users specified options for the last pass
+ echo "$progname: running dvipdfm -t $@ $dvifile" >&2
+-dvipdfm ${1+"$@"} -t "$dvifile"
++@DVIPDFM@ ${1+"$@"} -t "$dvifile"
diff --git a/print/dvipdfmx/patches/patch-ad b/print/dvipdfmx/patches/patch-ad
new file mode 100644
index 00000000000..b3312b20c26
--- /dev/null
+++ b/print/dvipdfmx/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/01/16 03:52:41 minskim Exp $
+
+--- data/dvipdfmx.cfg.orig	2009-05-18 17:42:35.000000000 -0700
++++ data/dvipdfmx.cfg
+@@ -134,7 +134,7 @@ P  0x003C
+ %% than A0, and their llx=lly=0, you can use "-dEPSCrop" instead of
+ %% "-sPAPERSIZE=a0"
+ %%
+-D  "ps2pdf -dCompatibilityLevel=%v -sPAPERSIZE=a0 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode %i %o"
++D  "@PS2PDF@ -dCompatibilityLevel=%v -sPAPERSIZE=a0 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode %i %o"
+ 
+ %% Frank Siegert's PStill:
+ %D  "/usr/local/bin/pstill -c -o %o %i"