[pkgsrc/trunk]: pkgsrc Resolve conflicts between dvipng and teTeX-bin.

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2bc8c90296a3
branches:  trunk
changeset: 557128:2bc8c90296a3
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Apr 11 22:09:43 2009 +0000

description:
Resolve conflicts between dvipng and teTeX-bin.

Both packages installed bin/dvipng and bin/dvigif; now only dvipng
installs them.

diffstat:

 graphics/dvipng/Makefile  |  6 ++++--
 print/teTeX/Makefile      |  5 +++--
 print/teTeX3-bin/Makefile |  5 +++--
 print/teTeX3-bin/PLIST    |  5 +----
 4 files changed, 11 insertions(+), 10 deletions(-)

diffs (104 lines):

diff -r 3fdb6beb0d69 -r 2bc8c90296a3 graphics/dvipng/Makefile
--- a/graphics/dvipng/Makefile  Sat Apr 11 21:47:39 2009 +0000
+++ b/graphics/dvipng/Makefile  Sat Apr 11 22:09:43 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/03/15 11:34:06 hasso Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/11 22:09:43 minskim Exp $
 #
 
 DISTNAME=      dvipng-1.11
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dvipng/}
 
@@ -9,6 +10,8 @@
 HOMEPAGE=      http://savannah.nongnu.org/projects/dvipng/
 COMMENT=       Convert TeX DVI files to PNG or GIF
 
+DEPENDS+=      teTeX-bin>=3.0nb27:../../print/teTeX3-bin
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         yes
@@ -19,5 +22,4 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../print/kpathsea/buildlink3.mk"
-.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3fdb6beb0d69 -r 2bc8c90296a3 print/teTeX/Makefile
--- a/print/teTeX/Makefile      Sat Apr 11 21:47:39 2009 +0000
+++ b/print/teTeX/Makefile      Sat Apr 11 22:09:43 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2009/02/23 20:14:19 minskim Exp $
+# $NetBSD: Makefile,v 1.50 2009/04/11 22:09:43 minskim Exp $
 
 DISTNAME=      teTeX-3.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    print meta-pkgs
 MASTER_SITES=  # empty
 
@@ -9,6 +9,7 @@
 HOMEPAGE=      http://www.tug.org/tetex/
 COMMENT=       Thomas Esser's TeX distribution for UNIX compatible systems
 
+DEPENDS+=      dvipng-[0-9]*:../../graphics/dvipng
 DEPENDS+=      dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=      teTeX-bin-[0-9]*:../../print/teTeX3-bin
 DEPENDS+=      teTeX-texmf-[0-9]*:../../print/teTeX3-texmf
diff -r 3fdb6beb0d69 -r 2bc8c90296a3 print/teTeX3-bin/Makefile
--- a/print/teTeX3-bin/Makefile Sat Apr 11 21:47:39 2009 +0000
+++ b/print/teTeX3-bin/Makefile Sat Apr 11 22:09:43 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2009/03/06 20:41:03 minskim Exp $
+# $NetBSD: Makefile,v 1.41 2009/04/11 22:09:43 minskim Exp $
 
 DISTNAME=      tetex-src-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=   26
+PKGREVISION=   27
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -25,6 +25,7 @@
 USE_LIBTOOL=   yes
 
 CONFIGURE_ARGS+=       --without-texinfo --without-texi2html
+CONFIGURE_ARGS+=       --without-dvipng
 CONFIGURE_ARGS+=       --without-dvipsk --without-odvipsk
 CONFIGURE_ARGS+=       --without-xdvik --without-oxdvik
 
diff -r 3fdb6beb0d69 -r 2bc8c90296a3 print/teTeX3-bin/PLIST
--- a/print/teTeX3-bin/PLIST    Sat Apr 11 21:47:39 2009 +0000
+++ b/print/teTeX3-bin/PLIST    Sat Apr 11 22:09:43 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/02/23 20:12:19 minskim Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/04/11 22:09:43 minskim Exp $
 bin/a2ping
 bin/aleph
 bin/bibtex
@@ -7,7 +7,6 @@
 bin/cweave
 bin/dmp
 bin/dvicopy
-bin/dvigif
 bin/dvihp
 bin/dvilj
 bin/dvilj2p
@@ -16,7 +15,6 @@
 bin/dvilj6
 bin/dvipdfm
 bin/dvipdft
-bin/dvipng
 bin/dvitomp
 bin/dvitype
 bin/e2pall
@@ -99,7 +97,6 @@
 man/man1/dvilj6.1
 man/man1/dvipdfm.1
 man/man1/dvipdft.1
-man/man1/dvipng.1
 man/man1/dvitomp.1
 man/man1/dvitype.1
 man/man1/ebb.1