summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjwise <jwise>2000-01-09 06:10:43 +0000
committerjwise <jwise>2000-01-09 06:10:43 +0000
commit7c4a1444e09ebcad5560cc22018e06e8f2db6708 (patch)
tree7c05bff18856ecb3c9b2c7c86ab72ef5063890b1
parent95c6035acc5657ec164882aa189a50db3b23c780 (diff)
downloadpkgsrc-7c4a1444e09ebcad5560cc22018e06e8f2db6708.tar.gz
Make these two conflict.
${PREFIX}/bin/omega is either a very nice unicode-aware TeX or a very nice rogue-like game. ``There can be only one.''
-rw-r--r--games/omega/Makefile4
-rw-r--r--print/teTeX-bin/Makefile6
2 files changed, 7 insertions, 3 deletions
diff --git a/games/omega/Makefile b/games/omega/Makefile
index 5ce727c727a..a761e03eb9e 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/01/06 01:32:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/09 06:10:43 jwise Exp $
# FreeBSD Id: ports/games/omega/Makefile,v 1.3 1999/08/25 06:04:09 obrien Exp
DISTNAME= omega-0.90-pa4
@@ -14,6 +14,8 @@ HOMEPAGE= http://www.win.tue.nl/games/roguelike/omega
DEPENDS+= ncurses-4.2:../../devel/ncurses
+CONFLICTS= teTeX-bin-*
+
ALL_TARGET=
#ncurses
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index 0bb657bc2b8..6bb0455d6d0 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/01/04 18:53:33 bouyer Exp $
+# $NetBSD: Makefile,v 1.11 2000/01/09 06:10:43 jwise Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
#
@@ -17,6 +17,8 @@ DEPENDS+= libwww-5.2.8:../../www/libwww
DEPENDS+= ncurses-4.2:../../devel/ncurses
DEPENDS+= png-1.0.3:../../graphics/png
+CONFLICTS+= omega-*
+
ALL_TARGET= all
INSTALL_TARGET= install strip
DIST_SUBDIR= teTeX
@@ -39,7 +41,7 @@ CONFIGURE_ARGS+=--without-texinfo \
--with-system-pnglib \
--with-pnglib-libdir=${LOCALBASE}/lib \
--with-pnglib-include=${LOCALBASE}/include \
- --with-system-zlib
+ --with-system-zlib
.include "../../mk/bsd.prefs.mk"
.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
CONFIGURE_ARGS+=--enable-a4