Update dvipdfmx to 20050627.

Major changes since 20031116:
- bug fixes in subfont scheme or TrueType fonts with CIDType2 format.
- embedded ICC profile support for JPEG and PNG.
- Accept "unicode" encoding keyword in fontmap files for TrueType and
  Type1 fonts.

7 files changed, 61 insertions, 50 deletions

diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index fa9e1f5246e..7175c021190 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/11/14 17:01:36 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/20 18:51:53 minskim Exp $
 
-DISTNAME=	dvipdfmx-20031116
+DISTNAME=	dvipdfmx-20050627
 PKGNAME=	${DISTNAME:S/-/-0.0.0./}
-PKGREVISION=	4
 CATEGORIES=	print converters
 MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/release/
 
@@ -18,14 +17,18 @@ CONFLICTS+=	ja-dvipdfm-[0-9]*
 GNU_CONFIGURE=		YES
 MAKE_ENV+=		PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX}
 
+.include "../../graphics/png/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/ghostscript.mk"
+.include "../../wip-kr/dvipdfmx/map.mk"
+.include "../../print/teTeX/module.mk"
+
 post-install:
 	cd ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap; \
 	for file in ../../../Adobe/Resource/CMap/*; do \
 		${LN} -s $$file `${BASENAME} $$file`; \
 	done
+	${MV} ${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/dvipdfmx.cfg \
+		${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/dvipdfmx-base.cfg
 
-.include "../../graphics/png/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
-.include "../../print/teTeX/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipdfmx/PLIST b/print/dvipdfmx/PLIST
index 2130d623e54..eeee060f793 100644
--- a/print/dvipdfmx/PLIST
+++ b/print/dvipdfmx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/11/14 17:01:36 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/11/20 18:51:53 minskim Exp $
 bin/dvipdfmx
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/78-EUC-H
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/78-EUC-V
@@ -35,7 +35,6 @@ ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/Adobe-GB1-2
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/Adobe-GB1-3
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/Adobe-GB1-4
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/Adobe-GB1-UCS2
-${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/Adobe-Identity-UCS2
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/Adobe-Japan1-0
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/Adobe-Japan1-1
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/Adobe-Japan1-2
@@ -203,5 +202,7 @@ ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/UniKSCms-UCS2-V
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/V
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/WP-Symbol
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/cid-x.map
-${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/dvipdfmx.cfg
+${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/dvipdfmx-base.cfg
+${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/glyphlist.txt
+@unexec ${RM} -f %D/${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/dvipdfmx.cfg
 @dirrm ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap
diff --git a/print/dvipdfmx/distinfo b/print/dvipdfmx/distinfo
index 24ed5a16316..64b82aaefb1 100644
--- a/print/dvipdfmx/distinfo
+++ b/print/dvipdfmx/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/11/09 00:22:39 tonio Exp $
+$NetBSD: distinfo,v 1.5 2005/11/20 18:51:54 minskim Exp $
 
-SHA1 (dvipdfmx-20031116.tar.gz) = 8ad9c9a2a7a7ac7e7430e7f678d1cc49ba604b6e
-RMD160 (dvipdfmx-20031116.tar.gz) = 14920d6db6bf714b308735fca573aa12e17b94e4
-Size (dvipdfmx-20031116.tar.gz) = 325457 bytes
-SHA1 (patch-aa) = eac64f0d6608ee238839a84a1daa92d8812aaa0a
-SHA1 (patch-ab) = adb3e2e6f920764e7f5ecf19c9940cf25ed0694a
+SHA1 (dvipdfmx-20050627.tar.gz) = ab4a86565f8082d22c26e76724e704cc980c7343
+RMD160 (dvipdfmx-20050627.tar.gz) = ef6d28f0e16a243d31f07d8d9d6f21e4f1a95d6b
+Size (dvipdfmx-20050627.tar.gz) = 539785 bytes
+SHA1 (patch-ab) = 48c575e90d6298584669f2557c22465b9dfaee19
diff --git a/print/dvipdfmx/files/map.tmpl b/print/dvipdfmx/files/map.tmpl
index 11ae0c612c6..ca9cad657ce 100644
--- a/print/dvipdfmx/files/map.tmpl
+++ b/print/dvipdfmx/files/map.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: map.tmpl,v 1.1 2005/11/20 18:46:22 minskim Exp $
+# $NetBSD: map.tmpl,v 1.2 2005/11/20 18:51:54 minskim Exp $
 #
 # Update dvipdfmx.cfg.
 #
@@ -29,7 +29,7 @@ eof
 case ${STAGE} in
 POST-INSTALL)
 	if ${TEST} ! -f @DVIPDFMX_CONFIG_DIR@/dvipdfmx.cfg; then
-		@CP@ @DVIPDFMX_CONFIG_DIR@/sample.dvipdfmx.cfg \
+		@CP@ @DVIPDFMX_CONFIG_DIR@/dvipdfmx-base.cfg \
 		     @DVIPDFMX_CONFIG_DIR@/dvipdfmx.cfg
 	fi
 	for map in @DVIPDFMX_FONTMAPS@; do
diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk
new file mode 100644
index 00000000000..849f96a681c
--- /dev/null
+++ b/print/dvipdfmx/map.mk
@@ -0,0 +1,30 @@
+# $NetBSD: map.mk,v 1.1 2005/11/20 18:51:54 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.
+#
+# The following variable can be defined:
+#
+#     DVIPDFMX_FONTMAPS - A list of font map files to be included in
+#	dvipdfmx.cnf.
+#
+
+.if !defined(DVIPDFMX_MAP_MK)
+DVIPDFMX_MAP_MK=	# defined
+
+DVIPDFMX_FONTMAPS?=	# empty
+
+.if empty(DISTNAME:Mdvipdfmx-[0-9]*)
+DEPENDS+=		dvipdfmx>=0.0.0.20050627:../../wip-kr/dvipdfmx
+.endif
+
+USE_PKGINSTALL=		yes
+FILES_SUBST+=		DVIPDFMX_FONTMAPS="${DVIPDFMX_FONTMAPS}"
+FILES_SUBST+=		DVIPDFMX_CONFIG_DIR="${PKG_LOCALTEXMFPREFIX}/dvipdfm/config"
+INSTALL_EXTRA_TMPL+=	../../wip-kr/dvipdfmx/files/map.tmpl
+DEINSTALL_EXTRA_TMPL+=	../../wip-kr/dvipdfmx/files/map.tmpl
+
+PRINT_PLIST_AWK+=	/^${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}\/dvidpfm\/config\/dvipdfmx.cfg$$/ \
+			{ next; }
+
+.endif			# DVIPDFMX_MAP_MK
diff --git a/print/dvipdfmx/patches/patch-aa b/print/dvipdfmx/patches/patch-aa
deleted file mode 100644
index 5d6a337fd46..00000000000
--- a/print/dvipdfmx/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/02/07 04:59:43 minskim Exp $
-
---- src/type0.c.orig	2002-12-30 00:12:42.000000000 -0600
-+++ src/type0.c
-@@ -102,7 +102,7 @@ static void load_tounicode_cmap_identity
-   MFCLOSE (fp);
- 
-   stream = pdf_new_stream(STREAM_COMPRESS);
--  tounicode_cmap_identity = pdf_link_obj(pdf_ref_obj(stream));
-+  tounicode_cmap_identity = pdf_ref_obj(stream);
- 
-   pdf_add_dict(pdf_stream_dict(stream),
- 	       pdf_new_name("Length"), pdf_new_number(length));
-@@ -398,7 +398,7 @@ int type0_font (const char *map_name, in
-     if (tounicode_cmap_identity == NULL)
-       load_tounicode_cmap_identity();
-     pdf_add_dict (font_resource, pdf_new_name("ToUnicode"),
--		  tounicode_cmap_identity);
-+		  pdf_link_obj(tounicode_cmap_identity));
-   }
- 
-   /* finaly write Encoding */
diff --git a/print/dvipdfmx/patches/patch-ab b/print/dvipdfmx/patches/patch-ab
index 2330eb34fe2..f55cf6551c8 100644
--- a/print/dvipdfmx/patches/patch-ab
+++ b/print/dvipdfmx/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2005/11/09 00:24:03 tonio Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/20 18:51:54 minskim Exp $
 
---- data/Makefile.in.orig	2002-10-25 07:42:10.000000000 +0200
+--- data/Makefile.in.orig	2005-06-27 04:57:15.000000000 -0700
 +++ data/Makefile.in
-@@ -61,7 +61,7 @@ MAKEINFO = @MAKEINFO@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- 
+@@ -57,7 +57,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
+ pkgdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pkgdata_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 -pkgdatadir = $(datadir)/texmf/dvipdfm
-+pkgdatadir = ${PKG_LOCALTEXMFPREFIX}/dvipdfm
- pkgdata_DATA = CMap config
- DIST_COMMON = Makefile.in $(pkgdata_DATA)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++pkgdatadir = $(PKG_LOCALTEXMFPREFIX)/dvipdfm
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@