Update tex-dvipdfmx{,-doc} to 2013.

- Files in share/texmf have been moved to share/texmf-dist.
- Merged with tex-dvipdfm{,-doc}.

6 files changed, 41 insertions, 27 deletions

diff --git a/print/tex-dvipdfmx-doc/Makefile b/print/tex-dvipdfmx-doc/Makefile
index 12a031a248f..4ad84dddd95 100644
--- a/print/tex-dvipdfmx-doc/Makefile
+++ b/print/tex-dvipdfmx-doc/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2013/11/12 10:37:09 dholland Exp $
+# $NetBSD: Makefile,v 1.6 2013/11/17 17:27:35 minskim Exp $
 
 DISTNAME=	dvipdfmx.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-2010.21369
-TEXLIVE_REV=	21369
-PKGREVISION=	1
+PKGNAME=	tex-${DISTNAME:S/./-/}-2013
+TEXLIVE_REV=	31830
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-dvipdfmx
 
+TEXLIVE_IGNORE_PATTERNS+=	texmf-dist/doc/man
+
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-dvipdfmx-doc/PLIST b/print/tex-dvipdfmx-doc/PLIST
index b048b6d20fe..97e8192d89b 100644
--- a/print/tex-dvipdfmx-doc/PLIST
+++ b/print/tex-dvipdfmx-doc/PLIST
@@ -1,4 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2013/11/12 09:48:01 dholland Exp $
-man/man1/extractbb.1
-share/texmf/doc/dvipdfmx/dvipdfmx-special.pdf
-share/texmf/doc/dvipdfmx/dvipdfmx-special.tex
+@comment $NetBSD: PLIST,v 1.3 2013/11/17 17:27:35 minskim Exp $
+share/texmf-dist/doc/dvipdfm/Makefile
+share/texmf-dist/doc/dvipdfm/dvipdfm.pdf
+share/texmf-dist/doc/dvipdfm/dvipdfm.tex
+share/texmf-dist/doc/dvipdfm/mwicks.bb
+share/texmf-dist/doc/dvipdfm/mwicks.jpeg
+share/texmf-dist/doc/dvipdfm/sample.tex
+share/texmf-dist/doc/dvipdfm/something.bb
+share/texmf-dist/doc/dvipdfm/something.eps
+share/texmf-dist/doc/dvipdfm/something.fig
+share/texmf-dist/doc/dvipdfm/something.pdf
+share/texmf-dist/doc/dvipdfm/transistor.bb
+share/texmf-dist/doc/dvipdfm/transistor.eps
+share/texmf-dist/doc/dvipdfm/transistor.fig
+share/texmf-dist/doc/dvipdfm/transistor.pdf
+share/texmf-dist/doc/dvipdfmx/dvipdfmx-special.pdf
+share/texmf-dist/doc/dvipdfmx/dvipdfmx-special.tex
diff --git a/print/tex-dvipdfmx-doc/distinfo b/print/tex-dvipdfmx-doc/distinfo
index 927718dd417..54eb44ff926 100644
--- a/print/tex-dvipdfmx-doc/distinfo
+++ b/print/tex-dvipdfmx-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2011/03/07 19:33:18 minskim Exp $
+$NetBSD: distinfo,v 1.5 2013/11/17 17:27:35 minskim Exp $
 
-SHA1 (tex-dvipdfmx-21369/dvipdfmx.doc.tar.xz) = 2e4b9fca660e70c9a28a04eec7b58a2a966e79d2
-RMD160 (tex-dvipdfmx-21369/dvipdfmx.doc.tar.xz) = 00e262354f050f6289806dc01e71508f9e2404e5
-Size (tex-dvipdfmx-21369/dvipdfmx.doc.tar.xz) = 173868 bytes
+SHA1 (tex-dvipdfmx-31830/dvipdfmx.doc.tar.xz) = e1a06aa3fbe9ce0b14b9a68b475107202630be82
+RMD160 (tex-dvipdfmx-31830/dvipdfmx.doc.tar.xz) = ffbb518384725cc2b4d8d0b405fe8a22515c63cd
+Size (tex-dvipdfmx-31830/dvipdfmx.doc.tar.xz) = 321484 bytes
diff --git a/print/tex-dvipdfmx/Makefile b/print/tex-dvipdfmx/Makefile
index 0b5d3c12a3f..7b49c6fecf4 100644
--- a/print/tex-dvipdfmx/Makefile
+++ b/print/tex-dvipdfmx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2011/03/07 19:33:18 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2013/11/17 17:27:35 minskim Exp $
 
 DISTNAME=	dvipdfmx
-PKGNAME=	tex-${DISTNAME}-2010.20279
-TEXLIVE_REV=	21369
+PKGNAME=	tex-${DISTNAME}-2013
+TEXLIVE_REV=	31830
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Supplementary files for dvipdfmx
@@ -10,11 +10,7 @@ COMMENT=	Supplementary files for dvipdfmx
 DEPENDS+=	tex-glyphlist-[0-9]*:../../fonts/tex-glyphlist
 DEPENDS+=	tex-dvipdfmx-def-[0-9]*:../../print/tex-dvipdfmx-def
 
-TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
-
-TEXLIVE_IGNORE_PATTERNS=	texmf/dvipdfmx \
-				texmf/fonts/cmap/dvipdfmx/EUC-UCS2 \
-				texmf/fonts/map
+TEXLIVE_IGNORE_PATTERNS=	texmf-dist/dvipdfmx
 
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-dvipdfmx/PLIST b/print/tex-dvipdfmx/PLIST
index d9f3b2bfa6c..a6ec8dee15c 100644
--- a/print/tex-dvipdfmx/PLIST
+++ b/print/tex-dvipdfmx/PLIST
@@ -1,3 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/06 00:54:32 minskim Exp $
-share/texmf/fonts/cmap/README
-share/texmf/fonts/cmap/dvipdfmx/README
+@comment $NetBSD: PLIST,v 1.2 2013/11/17 17:27:35 minskim Exp $
+share/texmf-dist/fonts/cmap/dvipdfmx/EUC-UCS2
+share/texmf-dist/fonts/cmap/dvipdfmx/README
+share/texmf-dist/fonts/cmap/dvipdfmx/UTF8-UCS2
+share/texmf-dist/fonts/map/dvipdfmx/cid-x.map
+share/texmf-dist/fonts/map/dvipdfmx/ckx.map
+share/texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map
diff --git a/print/tex-dvipdfmx/distinfo b/print/tex-dvipdfmx/distinfo
index 90af78fa0a5..a2f08e24cd7 100644
--- a/print/tex-dvipdfmx/distinfo
+++ b/print/tex-dvipdfmx/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2011/03/07 19:33:18 minskim Exp $
+$NetBSD: distinfo,v 1.5 2013/11/17 17:27:35 minskim Exp $
 
-SHA1 (tex-dvipdfmx-21369/dvipdfmx.tar.xz) = 21ccc59d0eee3c5b231537f64c8d07637cf3d165
-RMD160 (tex-dvipdfmx-21369/dvipdfmx.tar.xz) = 2ccc76972db2785e3c6a64e319bac1e04ea9b664
-Size (tex-dvipdfmx-21369/dvipdfmx.tar.xz) = 23456 bytes
+SHA1 (tex-dvipdfmx-31830/dvipdfmx.tar.xz) = 537dee437018e54fcbdb1749a86a65e44a6d88dc
+RMD160 (tex-dvipdfmx-31830/dvipdfmx.tar.xz) = 0fec264a0fc327e57ed1da2581a43b26da968612
+Size (tex-dvipdfmx-31830/dvipdfmx.tar.xz) = 27212 bytes