Update dvipdfmx to 20130405

Changes:
    - Default is not to cache image files.
    - back to using -dEPSCrop instead of -sPAPERSIZE=a0, in conjunction with
      changes to dvipdfmx.def and xetex.def.
    - speed up inclusion of eps figures.
    - Make sure CMapName of embedded CMaps does not contain slashes.
    - support large truetype fonts which are strictly speaking out of spec,
      idx > 32767.

5 files changed, 35 insertions, 53 deletions

diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index fb9e4f7fcdd..21faefd2ad3 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2013/04/24 10:06:51 sbd Exp $
+# $NetBSD: Makefile,v 1.42 2013/11/17 17:29:18 minskim Exp $
 
-DISTNAME=	texlive-20100720-source
-PKGNAME=	dvipdfmx-20100328
-PKGREVISION=	3
+DISTNAME=	texlive-20130530-source
+PKGNAME=	dvipdfmx-20130405
 CATEGORIES=	print converters
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
@@ -15,12 +14,12 @@ CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
 DEPENDS+=	tex-dvipdfmx-[0-9]*:../../print/tex-dvipdfmx
 DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
+DEPENDS+=	tex-texlive-scripts-[0-9]*:../../print/tex-texlive-scripts
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 			${DISTNAME}/texk/dvipdfmx
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	gs:run ps2pdf:run
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dvipdfmx
 
 CONFIGURE_ARGS+=	--with-system-kpathsea \
@@ -37,7 +36,7 @@ CONFIGURE_ARGS+=	--with-paper=${BUILDLINK_PREFIX.libpaper}
 PKG_SYSCONFSUBDIR=	texmf
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/dvipdfmx
-CONF_FILES=	${PREFIX}/share/texmf/dvipdfmx/dvipdfmx.cfg \
+CONF_FILES=	${PREFIX}/share/texmf-dist/dvipdfmx/dvipdfmx.cfg \
 		${PKG_SYSCONFDIR}/dvipdfmx/dvipdfmx.cfg
 
 SUBST_CLASSES+=		paths
@@ -45,11 +44,9 @@ 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'
-SUBST_SED.paths+=	-e 's,@GS@,${TOOLS_PATH.gs},g'
-SUBST_SED.paths+=	-e 's,@PS2PDF@,${LOCALBASE}/bin/ps2pdf,g'
+SUBST_SED.paths+=	-e 's,@RUNGS@,${LOCALBASE}/bin/rungs,g'
 
 TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
-TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
 
 .include "../../graphics/png/buildlink3.mk"
diff --git a/print/dvipdfmx/PLIST b/print/dvipdfmx/PLIST
index ee7486e5191..a1669e92429 100644
--- a/print/dvipdfmx/PLIST
+++ b/print/dvipdfmx/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.14 2010/01/16 03:52:40 minskim Exp $
+@comment $NetBSD: PLIST,v 1.15 2013/11/17 17:29:18 minskim Exp $
 bin/dvipdfm
 bin/dvipdfmx
 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
+man/man1/dvipdfm.1
+man/man1/dvipdft.1
+man/man1/ebb.1
+man/man1/extractbb.1
+share/texmf-dist/dvipdfmx/dvipdfmx.cfg
diff --git a/print/dvipdfmx/distinfo b/print/dvipdfmx/distinfo
index 4d431c60040..3575230db77 100644
--- a/print/dvipdfmx/distinfo
+++ b/print/dvipdfmx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2010/09/13 04:35:43 minskim Exp $
+$NetBSD: distinfo,v 1.11 2013/11/17 17:29:18 minskim Exp $
 
-SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34
-RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5
-Size (texlive-20100720-source.tar.xz) = 33484212 bytes
-SHA1 (patch-ab) = da442d43a701e95bf8aab4288388b024ae6c7aa7
+SHA1 (texlive-20130530-source.tar.xz) = 42f0a6fa3f49435991182f14e01276b2ee3fce61
+RMD160 (texlive-20130530-source.tar.xz) = 2d779ae5de979be86a9258b224dfc15cbcd76b18
+Size (texlive-20130530-source.tar.xz) = 179963948 bytes
+SHA1 (patch-ab) = 69c25aeffb695bd16bd7e7b83f583921428dd7bd
 SHA1 (patch-ac) = 3f6ff6cb655bfefb1525d576ffda5751415e7857
-SHA1 (patch-ad) = 072e76ad8cf650d8ff98b3ce3e6b8875e82b2fa6
+SHA1 (patch-ad) = 2ad3326e8a06b2bfccbd8ae20cde70748944a02f
diff --git a/print/dvipdfmx/patches/patch-ab b/print/dvipdfmx/patches/patch-ab
index e89c53fa2d3..50d984a7714 100644
--- a/print/dvipdfmx/patches/patch-ab
+++ b/print/dvipdfmx/patches/patch-ab
@@ -1,29 +1,14 @@
-$NetBSD: patch-ab,v 1.5 2010/01/16 03:52:41 minskim Exp $
+$NetBSD: patch-ab,v 1.6 2013/11/17 17:29:18 minskim Exp $
 
---- data/Makefile.in.orig	2009-06-15 08:14:49.000000000 -0700
+--- data/Makefile.in.orig	2013-02-08 12:05:33.000000000 +0000
 +++ data/Makefile.in
-@@ -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
+@@ -480,8 +480,7 @@ info: info-am
  
--glyphlistdatadir = ${prefix}/texmf-dist/fonts/map/glyphlist
-+glyphlistdatadir = ${prefix}/share/texmf-dist/fonts/map/glyphlist
- dist_glyphlistdata_DATA = \
-   $(srcdir)/glyphlist.txt \
-   $(srcdir)/pdfglyphlist.txt
+ info-am:
  
--mapdatadir = ${prefix}/texmf/fonts/map/dvipdfm/dvipdfmx
-+mapdatadir = ${prefix}/share/texmf/fonts/map/dvipdfm/dvipdfmx
- dist_mapdata_DATA = \
-   $(srcdir)/cid-x.map
+-install-data-am: install-dist_cmapdataDATA install-dist_configdataDATA \
+-	install-dist_glyphlistdataDATA install-dist_mapdataDATA
++install-data-am: install-dist_configdataDATA
  
--cmapdatadir = ${prefix}/texmf/fonts/cmap/dvipdfmx
-+cmapdatadir = ${prefix}/share/texmf/fonts/cmap/dvipdfmx
- dist_cmapdata_DATA = \
-   $(srcdir)/EUC-UCS2
+ install-dvi: install-dvi-am
  
diff --git a/print/dvipdfmx/patches/patch-ad b/print/dvipdfmx/patches/patch-ad
index b3312b20c26..9e86d65192f 100644
--- a/print/dvipdfmx/patches/patch-ad
+++ b/print/dvipdfmx/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2010/01/16 03:52:41 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2013/11/17 17:29:18 minskim Exp $
 
---- data/dvipdfmx.cfg.orig	2009-05-18 17:42:35.000000000 -0700
+--- data/dvipdfmx.cfg.orig	2013-04-30 13:21:50.000000000 +0000
 +++ data/dvipdfmx.cfg
-@@ -134,7 +134,7 @@ P  0x003C
- %% than A0, and their llx=lly=0, you can use "-dEPSCrop" instead of
- %% "-sPAPERSIZE=a0"
+@@ -147,7 +147,7 @@ P  0x003C
+ %% kpsewhich -progname=dvipdfmx -format='other text files' dvipdfmx.cfg
+ %% and control which one is found by setting DVIPDFMXINPUTS.
  %%
--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"
+-D  "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
++D  "@RUNGS@ -q -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
  
- %% Frank Siegert's PStill:
- %D  "/usr/local/bin/pstill -c -o %o %i"
+ % pre-2013 invocation using -sPAPERSIZE instead of -dEPSCrop, no other changes:
+ %D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"