summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorwiz <wiz>2004-01-04 17:52:50 +0000
committerwiz <wiz>2004-01-04 17:52:50 +0000
commit04af3e6dd8e23273060777e96a12226811d37b5a (patch)
tree95f0befcc5ba218be4cbd061288aec544bc845ca /print
parentb6b49f41514c9bf097d4242079573e06d9df5507 (diff)
downloadpkgsrc-04af3e6dd8e23273060777e96a12226811d37b5a.tar.gz
Fix CONFLICTS with omega to only conflict with older omega;
current omega package does not conflict. Closes PR 23975 by Richard Rauch.
Diffstat (limited to 'print')
-rw-r--r--print/teTeX-bin/Makefile7
-rw-r--r--print/teTeX1-bin/Makefile5
2 files changed, 6 insertions, 6 deletions
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index 12ec02a77d8..8204ff71173 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -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 @@ MAINTAINER= kei@NetBSD.org
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 --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index 224e4cdcd2a..25dda1b784b 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -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 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
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