Works fine with system curses

4 files changed, 21 insertions, 13 deletions

diff --git a/games/netris/Makefile b/games/netris/Makefile
index b93334c91be..a98a097db23 100644
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/06 11:54:48 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/10/17 16:11:15 roy Exp $
 #
 
 DISTNAME=		netris-0.52
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.netris.org/pub/netris/
 
@@ -32,5 +32,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/netris
 	${INSTALL_DATA} ${WRKSRC}/robot_desc ${DESTDIR}${PREFIX}/share/doc/netris
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/omega/Makefile b/games/omega/Makefile
index 1d82e31f6f8..fe74681aa67 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2012/10/06 11:54:48 asau Exp $
+# $NetBSD: Makefile,v 1.35 2013/10/17 16:19:41 roy Exp $
 
 DISTNAME=	omega-0.90.4-src
 PKGNAME=	omega-0.90.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.alcyone.com/binaries/omega/
 
@@ -40,5 +40,5 @@ do-install:
 		${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/share/doc/omega; \
 	done
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/omega/distinfo b/games/omega/distinfo
index e5ff28f8b63..bbe2705d1eb 100644
--- a/games/omega/distinfo
+++ b/games/omega/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2012/11/01 19:44:16 joerg Exp $
+$NetBSD: distinfo,v 1.7 2013/10/17 16:19:41 roy Exp $
 
 SHA1 (omega-0.90.4-src.tar.gz) = fb6e20565057aee1250154afbcdb562cf39586fd
 RMD160 (omega-0.90.4-src.tar.gz) = 04eb5dccb753da896f3cb3cce3a515a6f5699302
 Size (omega-0.90.4-src.tar.gz) = 341346 bytes
-SHA1 (patch-aa) = df5933dcc7098ba00f4b3002612b3318a9b09974
+SHA1 (patch-aa) = 270141180de5e8d360b6a22088ab63631e066f71
 SHA1 (patch-ab) = 796f6af88356b09b2e63d05948f7d3098d3a3cc5
 SHA1 (patch-ac) = 546ad6d5f6f67a9a5b7cdf4827a2256f3b948dac
 SHA1 (patch-ad) = 23fb55f159f084fdf31771ebd5452f2fd6ea2ddb
diff --git a/games/omega/patches/patch-aa b/games/omega/patches/patch-aa
index 2cbce25f7e4..b86d541517d 100644
--- a/games/omega/patches/patch-aa
+++ b/games/omega/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1999/12/28 02:28:23 proff Exp $
+$NetBSD: patch-aa,v 1.3 2013/10/17 16:19:42 roy Exp $
 
---- Makefile.orig	Fri Jan  1 20:00:06 1999
-+++ Makefile	Mon Jul  5 19:51:50 1999
+--- Makefile.orig	1999-01-02 04:00:06.000000000 +0000
++++ Makefile
 @@ -1,14 +1,14 @@
  # These two definitions are used if you 'make install'
  # the value of LIBDIR should be the same as OMEGALIB in defs.h
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 1999/12/28 02:28:23 proff Exp $
  #CFLAGS = -DSYSV -O
  # I also had to define -cckr (K&R style C) for system V
  #CFLAGS = -DMSDOS -O
-@@ -17,14 +17,14 @@
+@@ -17,21 +17,21 @@ CFLAGS = -DBSD -ggdb
  # CPP should contain the command to run the C preprocessor.
  #CPP = cc -E
  #CPP = /lib/cpp
@@ -37,7 +37,15 @@ $NetBSD: patch-aa,v 1.2 1999/12/28 02:28:23 proff Exp $
  
  # comment out one of the following two, after establishing whether your
  # machine uses termcap (most BSD machines) or terminfo (System-V)
-@@ -48,7 +48,10 @@
+ #LIBS = -lcurses -ltermcap
+ #LIBS = -lcurses -ltermlib
+ # Linux links in term?? automatically.
+-LIBS = -lncurses
++LIBS = -lcurses
+ 
+ #################### that's it for changing the Makefile ####################
+ 
+@@ -48,7 +48,10 @@ OBJ = omega.o abyss.o aux1.o aux2.o aux3
  omega: $(OBJ)
  	$(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o omega