[pkgsrc/trunk]: pkgsrc/print/dvipdfm undo previous change relating to allowin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b108ae94083c
branches:  trunk
changeset: 463359:b108ae94083c
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Fri Nov 07 23:24:12 2003 +0000

description:
undo previous change relating to allowing a dependency on teTeX2 rather
than teTeX version 1.  It has been pointed out to me that teTeX2 already
ships with dvipdfm.  Add a CONFLICTS on teTeX2-bin since that package
has conflicting files.

diffstat:

 print/dvipdfm/Makefile |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r 291d045afe6a -r b108ae94083c print/dvipdfm/Makefile
--- a/print/dvipdfm/Makefile    Fri Nov 07 23:23:18 2003 +0000
+++ b/print/dvipdfm/Makefile    Fri Nov 07 23:24:12 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/11/07 13:55:02 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/07 23:24:12 dmcmahill Exp $
 
 DISTNAME=      dvipdfm-0.13.2c
 PKGREVISION=   1
@@ -12,6 +12,7 @@
 
 CONFLICTS+=    dvipdfmx-[0-9]*
 CONFLICTS+=    ja-dvipdfm-[0-9]*
+CONFLICTS+=    teTeX2-bin-[2-9]*
 
 USE_BUILDLINK2=                # defined
 GNU_CONFIGURE=         # defined
@@ -33,10 +34,6 @@
        mktexlsr
 
 .include "../../graphics/png/buildlink2.mk"
-.if defined(USE_TETEX2)
-.include "../../print/teTeX2-bin/kpathsea.buildlink2.mk"
-.else
 .include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
-.endif
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"