[pkgsrc/trunk]: pkgsrc/print Fix CONFLICTS with omega to only conflict with o...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/857a7eb58810
branches:  trunk
changeset: 465669:857a7eb58810
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jan 04 17:52:50 2004 +0000

description:
Fix CONFLICTS with omega to only conflict with older omega;
current omega package does not conflict.
Closes PR 23975 by Richard Rauch.

diffstat:

 print/teTeX-bin/Makefile  |  7 +++----
 print/teTeX1-bin/Makefile |  5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 9c046e3fd24a -r 857a7eb58810 print/teTeX-bin/Makefile
--- a/print/teTeX-bin/Makefile  Sun Jan 04 17:30:55 2004 +0000
+++ b/print/teTeX-bin/Makefile  Sun Jan 04 17:52:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/12/24 12:51:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.52 2004/01/04 17:52:50 wiz Exp $
 
 DISTNAME=      tetex-src-${TETEX_BIN_VERS}
 PKGNAME=       teTeX-bin-${TETEX_BIN_VERS}
@@ -9,14 +9,13 @@
 HOMEPAGE=      http://www.tug.org/tetex/
 COMMENT=       TeX distribution for UNIX compatible systems - executables, version 2
 
-CONFLICTS+=    teTeX2-bin-[0-9]*
+# games/omega previously installed an omega executable too
+CONFLICTS+=    teTeX2-bin-[0-9]* omega<0.90.4nb1
 
 BUILD_DEPENDS+=        bison-[0-9]*:../../devel/bison
 DEPENDS+=      teTeX-share>=2.0.2:../teTeX-share
 DEPENDS+=      dialog-0.6z*:../../misc/dialog
 
-CONFLICTS+=    omega-[0-9]*
-
 INFO_FILES=    latex.info dvips.info web2c.info kpathsea.info
 
 REPLACE_PERL=  texk/xdvik/t1mapper \
diff -r 9c046e3fd24a -r 857a7eb58810 print/teTeX1-bin/Makefile
--- a/print/teTeX1-bin/Makefile Sun Jan 04 17:30:55 2004 +0000
+++ b/print/teTeX1-bin/Makefile Sun Jan 04 17:52:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/24 12:57:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/04 17:52:50 wiz Exp $
 
 DISTNAME=      teTeX-src-1.0.7
 PKGNAME=       teTeX-bin-1.0.7
@@ -15,7 +15,8 @@
 DEPENDS+=      teTeX-share-1.0.[2-9]*:../teTeX1-share
 DEPENDS+=      dialog-0.6z*:../../misc/dialog
 
-CONFLICTS+=    omega-[0-9]*
+# games/omega previously installed an omega executable too
+CONFLICTS+=    omega<0.90.4nb1
 
 DIST_SUBDIR=           teTeX
 ALL_TARGET=            all