USE_CURSES instead of always using ncurses.

Rename executable to 'Omega' (uppercase O) to avoid conflict with Tex.
Note this in MESSAGE.

10 files changed, 30 insertions, 111 deletions

diff --git a/games/omega/Makefile b/games/omega/Makefile
index c0d5860a466..46219737f9c 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/01/15 18:46:28 jlam Exp $
-# FreeBSD Id: ports/games/omega/Makefile,v 1.3 1999/08/25 06:04:09 obrien Exp
+# $NetBSD: Makefile,v 1.7 2001/01/07 22:31:46 wiz Exp $
 
 DISTNAME=	omega-0.90-pa4
 PKGNAME=	omega-0.90.4
@@ -12,17 +11,14 @@ MAINTAINER=	packages@netbsd.org
 #HOMEPAGE=	http://dolphin.openprojects.net/Omega/
 HOMEPAGE=	http://www.win.tue.nl/games/roguelike/omega
 
-DEPENDS+=	ncurses>=4.2:../../devel/ncurses
-
-CONFLICTS=	teTeX-bin-*
+USE_CURSES=	yes
+REPLACE_NCURSES=	Makefile
 
 ALL_TARGET=
 
-CFLAGS+=	-I${LOCALBASE}/include		# for ncurses.h
-
 do-install:
 	@ ${INSTALL_PROGRAM} -o games -g games -m 4711 ${WRKSRC}/omega \
-		 ${PREFIX}/bin
+		 ${PREFIX}/bin/Omega
 	@ ${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/man/man6
 	@ ${MKDIR} ${PREFIX}/share/omega
 	@ ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/omega
@@ -38,4 +34,17 @@ post-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/omega
 .endfor
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${NEED_NCURSES} == "YES"
+CFLAGS+=	-I${LOCALBASE}/include		# for ncurses.h
+
+post-extract:
+	cd ${WRKSRC} &&							\
+	for fn in defs.h file.c fixstr.c genclr.c inv.c scr.c; do	\
+		${SED} "s/curses.h/ncurses.h/" $$fn > $$fn.new;	\
+		${MV} $$fn.new $$fn;				\
+	done
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/omega/files/patch-sum b/games/omega/files/patch-sum
index a2994d70d2a..b04cb75ceb1 100644
--- a/games/omega/files/patch-sum
+++ b/games/omega/files/patch-sum
@@ -1,9 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/12/28 02:28:23 proff Exp $
+$NetBSD: patch-sum,v 1.2 2001/01/07 22:31:46 wiz Exp $
 
 MD5 (patch-aa) = dd312f9677b9a09889d184d8d848250d
-MD5 (patch-ab) = cae0f773bb170e1a3ccba1e20b77f7b8
-MD5 (patch-ac) = 26bbceae7e9646033f3212c286b7dbbe
-MD5 (patch-ad) = f68d6e43c9c67e730962cdeaf3a01687
-MD5 (patch-ae) = f4d098a124dd0a73cc01c8f3f4b86e29
-MD5 (patch-af) = 9d5993c69d5dfcf63a77c2d064caaa38
-MD5 (patch-ag) = b34a3b897a5dcdcc67c3e824b3f71454
+MD5 (patch-ab) = 56efc4aaccdf399f9a65bb7e6f2283e2
diff --git a/games/omega/patches/patch-ab b/games/omega/patches/patch-ab
index e7271302153..75a256fe23b 100644
--- a/games/omega/patches/patch-ab
+++ b/games/omega/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1999/12/28 02:28:23 proff Exp $
+$NetBSD: patch-ab,v 1.3 2001/01/07 22:31:46 wiz Exp $
 
 --- defs.h	Fri Jan  1 03:08:19 1999
 +++ /home/andy/tmp/wrk/defs.h	Fri May 14 20:51:11 1999
@@ -12,15 +12,3 @@ $NetBSD: patch-ab,v 1.2 1999/12/28 02:28:23 proff Exp $
  
  /* Comment the following line out if you want users to be able to override */
  /* the OMEGALIB define, above, by setting the environment variable OMEGALIB */
-@@ -570,7 +572,11 @@
- /* WDT: thank goodness for that lack of implementation. */
- 
- #else
-+#if defined(__NetBSD__) || defined (__FreeBSD__)
-+#include <ncurses.h>
-+#else
- #include <curses.h>
-+#endif
- 
- #define COL_FG_BLINK A_BLINK
- 
diff --git a/games/omega/patches/patch-ac b/games/omega/patches/patch-ac
deleted file mode 100644
index 36340d3c11e..00000000000
--- a/games/omega/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/12/28 02:28:23 proff Exp $
-
---- file.c	Fri Jan  1 03:08:26 1999
-+++ /home/andy/tmp/wrk/file.c	Fri May 14 20:28:46 1999
-@@ -9,7 +9,11 @@
- # ifdef AMIGA
- #  include <curses210.h>
- # else
--#  include <curses.h>
-+#  if defined(__NetBSD__) || defined(__FreeBSD__)
-+#   include <ncurses.h>
-+#  else
-+#   include <curses.h>
-+#  endif
- # endif
- # include <sys/types.h>
- # include <unistd.h>
diff --git a/games/omega/patches/patch-ad b/games/omega/patches/patch-ad
deleted file mode 100644
index 0725fdc19ea..00000000000
--- a/games/omega/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1999/12/28 02:28:23 proff Exp $
-
---- fixstr.c	Sat Aug  8 13:48:23 1998
-+++ /home/andy/tmp/wrk/fixstr.c	Fri May 14 20:37:59 1999
-@@ -15,7 +15,9 @@
- Thus it can be broken. */
- 
- #include <stdio.h>
-+#if defined(__NetBSD__) || defined(__FreeBSD__)
- #include <malloc.h>
-+#endif
- 
- #define TMPFILE "fixtmp.c"
- 
diff --git a/games/omega/patches/patch-ae b/games/omega/patches/patch-ae
deleted file mode 100644
index 2356d81d4e1..00000000000
--- a/games/omega/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1999/12/28 02:28:23 proff Exp $
-
---- genclr.c	Sat Aug  8 16:53:59 1998
-+++ /home/andy/tmp/wrk/genclr.c	Fri May 14 20:28:35 1999
-@@ -281,7 +281,11 @@
-      */
-     fp = emitopen (cfile, argv);
-     fprintf (fp, "\
-+#if defined(__NetBSD__) || defined(__FreeBSD__)\n\
-+#include <ncurses.h>\n\
-+#else\n\
- #include <curses.h>\n\
-+#endif\n\
- #include <stdio.h>\n\
- #include <stdlib.h>\n\
- 
diff --git a/games/omega/patches/patch-af b/games/omega/patches/patch-af
deleted file mode 100644
index a1044858ec3..00000000000
--- a/games/omega/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.2 1999/12/28 02:28:23 proff Exp $
-
---- inv.c	Fri Jan  1 03:08:33 1999
-+++ /home/andy/tmp/wrk/inv.c	Fri May 14 20:28:52 1999
-@@ -8,7 +8,11 @@
- # ifdef AMIGA
- #  include <curses210.h>
- # else
--#  include <curses.h>
-+#  if defined(__NetBSD__) || defined(__FreeBSD__)
-+#   include <ncurses.h>
-+#  else
-+#   include <curses.h>
-+#  endif
- # endif
- #endif
- 
diff --git a/games/omega/patches/patch-ag b/games/omega/patches/patch-ag
deleted file mode 100644
index f9aa19b94dc..00000000000
--- a/games/omega/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1999/12/28 02:28:23 proff Exp $
-
---- scr.c	Sat Jan  2 07:00:11 1999
-+++ /home/andy/tmp/wrk/scr.c	Fri May 14 20:28:59 1999
-@@ -10,7 +10,11 @@
- # ifdef AMIGA
- #  include <curses210.h>
- # else
--#  include <curses.h>
-+#  if defined(__NetBSD__) || defined(__FreeBSD__)
-+#   include <ncurses.h>
-+#  else
-+#   include <curses.h>
-+#  endif
- # endif
- # include <sys/types.h>
- #endif
diff --git a/games/omega/pkg/MESSAGE b/games/omega/pkg/MESSAGE
new file mode 100644
index 00000000000..52701ae482f
--- /dev/null
+++ b/games/omega/pkg/MESSAGE
@@ -0,0 +1,8 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.1 2001/01/07 22:31:47 wiz Exp $
+
+Please note:
+	The executable for the game is called 'Omega' (with an
+	uppercase 'O') to avoid conflicts with TeX.
+
+======================================================================
diff --git a/games/omega/pkg/PLIST b/games/omega/pkg/PLIST
index 20c6627734c..4c50b7229c6 100644
--- a/games/omega/pkg/PLIST
+++ b/games/omega/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2000/08/22 03:21:32 wiz Exp $
-bin/omega
+@comment $NetBSD: PLIST,v 1.7 2001/01/07 22:31:47 wiz Exp $
+bin/Omega
 man/man6/omega.6
 share/omega/omega.hi
 share/omega/omega.log