Replace teTeX's dvipdfm with a newer version in print/dvipdfm.

7 files changed, 12 insertions, 34 deletions

diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 53a61fd83da..2815d0b46ab 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2009/04/11 22:09:43 minskim Exp $
+# $NetBSD: Makefile,v 1.51 2009/04/12 02:44:08 minskim Exp $
 
 DISTNAME=	teTeX-3.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	print meta-pkgs
 MASTER_SITES=	# empty
 
@@ -9,6 +9,7 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Thomas Esser's TeX distribution for UNIX compatible systems
 
+DEPENDS+=	dvipdfm-[0-9]*:../../print/dvipdfm
 DEPENDS+=	dvipng-[0-9]*:../../graphics/dvipng
 DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=	teTeX-bin-[0-9]*:../../print/teTeX3-bin
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index ed35bc87d2d..638d4afb321 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2009/04/11 22:09:43 minskim Exp $
+# $NetBSD: Makefile,v 1.42 2009/04/12 02:44:08 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	27
+PKGREVISION=	28
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -25,7 +25,7 @@ USE_TOOLS+=	bison lex
 USE_LIBTOOL=	yes
 
 CONFIGURE_ARGS+=	--without-texinfo --without-texi2html
-CONFIGURE_ARGS+=	--without-dvipng
+CONFIGURE_ARGS+=	--without-dvipdfm --without-dvipng
 CONFIGURE_ARGS+=	--without-dvipsk --without-odvipsk
 CONFIGURE_ARGS+=	--without-xdvik --without-oxdvik
 
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index 8a1c93338ca..34661ea9216 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/04/11 22:09:43 minskim Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/04/12 02:44:08 minskim Exp $
 bin/a2ping
 bin/aleph
 bin/bibtex
@@ -13,12 +13,9 @@ bin/dvilj2p
 bin/dvilj4
 bin/dvilj4l
 bin/dvilj6
-bin/dvipdfm
-bin/dvipdft
 bin/dvitomp
 bin/dvitype
 bin/e2pall
-bin/ebb
 bin/epstopdf
 bin/fdf2tan
 bin/fdf2tex
@@ -95,11 +92,8 @@ man/man1/dvilj2p.1
 man/man1/dvilj4.1
 man/man1/dvilj4l.1
 man/man1/dvilj6.1
-man/man1/dvipdfm.1
-man/man1/dvipdft.1
 man/man1/dvitomp.1
 man/man1/dvitype.1
-man/man1/ebb.1
 man/man1/eplain.1
 man/man1/etex.1
 man/man1/fdf2tex.1
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 649b6b4c23e..d5bd346a62e 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2009/03/18 18:54:10 darcy Exp $
+# $NetBSD: Makefile,v 1.26 2009/04/12 02:44:07 minskim Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -23,7 +23,6 @@ EXTRACT_ELEMENTS+=	aliases
 EXTRACT_ELEMENTS+=	bibtex
 EXTRACT_ELEMENTS+=	context
 EXTRACT_ELEMENTS+=	doc
-EXTRACT_ELEMENTS+=	dvipdfm
 EXTRACT_ELEMENTS+=	dvips
 EXTRACT_ELEMENTS+=	fonts
 EXTRACT_ELEMENTS+=	makeindex
@@ -165,6 +164,7 @@ post-extract:
 	rm -f ${WRKSRC}/tex/generic/hyphen/hyphen.tex
 	rm -f ${WRKSRC}/tex/generic/hyphen/hypht1.tex
 	rm -f ${WRKSRC}/tex/generic/hyphen/zerohyph.tex
+	rm -f ${WRKSRC}/tex/latex/dvipdfm/dvipdfm.def
 	rm -f ${WRKSRC}/tex/plain/config/language.def
 
 do-install:
diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST
index 1afda96ea39..51bedd0b29e 100644
--- a/print/teTeX3-texmf/PLIST
+++ b/print/teTeX3-texmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/03/06 20:41:02 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/04/12 02:44:07 minskim Exp $
 share/texmf-dist/ChangeLog
 share/texmf-dist/LICENSE.texmf
 share/texmf-dist/aliases
@@ -3778,8 +3778,6 @@ share/texmf-dist/doc/tetex.png
 share/texmf-dist/doc/tetex/eurotex98-te.pdf
 share/texmf-dist/doc/texdoc.php
 share/texmf-dist/doc/texdoctk/README
-share/texmf-dist/dvipdfm/config/README.config
-share/texmf-dist/dvipdfm/config/config
 share/texmf-dist/dvips/antp/config.antp
 share/texmf-dist/dvips/antt/config.antt
 share/texmf-dist/dvips/bluesky/config.ams
@@ -12690,7 +12688,6 @@ share/texmf-dist/tex/latex/dvilj/cgtimes.sty
 share/texmf-dist/tex/latex/dvilj/cgunivers.sty
 share/texmf-dist/tex/latex/dvilj/graybox.sty
 share/texmf-dist/tex/latex/dvilj/hpfonts.sty
-share/texmf-dist/tex/latex/dvipdfm/dvipdfm.def
 share/texmf-dist/tex/latex/eclbip/eclbip.sty
 share/texmf-dist/tex/latex/eclbip/ecltree.sty
 share/texmf-dist/tex/latex/eepic/eepic.sty
diff --git a/print/teTeX3-texmf/distinfo b/print/teTeX3-texmf/distinfo
index 63147076188..10aca7442eb 100644
--- a/print/teTeX3-texmf/distinfo
+++ b/print/teTeX3-texmf/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2006/10/09 03:08:24 rillig Exp $
+$NetBSD: distinfo,v 1.5 2009/04/12 02:44:07 minskim Exp $
 
 SHA1 (tetex-texmf-3.0.tar.gz) = 1be97f57a26a6e9b72ebfd932e45914a959aff16
 RMD160 (tetex-texmf-3.0.tar.gz) = a1e87733fa3cbef04e39a690ed8549aeaaddb241
 Size (tetex-texmf-3.0.tar.gz) = 91402377 bytes
-SHA1 (patch-aa) = 76a18dd4903700e36048433bd7c3dcd330377163
diff --git a/print/teTeX3-texmf/patches/patch-aa b/print/teTeX3-texmf/patches/patch-aa
deleted file mode 100644
index 3240800c6a2..00000000000
--- a/print/teTeX3-texmf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/10/09 03:08:24 rillig Exp $
-
---- dvipdfm/config/config.orig	2005-02-09 01:42:24.000000000 +0000
-+++ dvipdfm/config/config	2005-02-09 01:42:31.000000000 +0000
-@@ -17,7 +17,7 @@
- 
- % PDF version stamp to use in output file and max version of files
- % allowed to be included (2 for 1.2, 3 for 1.3)
--V 2
-+V 3
- 
- % For correct searching / text extraction:
- f cm-dvipdfm-fix.map