From 380c7ff92e83771ee7e7470e10da1554e61c3e80 Mon Sep 17 00:00:00 2001
From: roy <roy>
Date: Thu, 17 Oct 2013 15:32:22 +0000
Subject: Works fine with system curses

---
 graphics/aalib/Makefile      | 12 ++++++------
 graphics/aalib/buildlink3.mk |  8 ++++----
 graphics/aalib/options.mk    | 11 ++++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'graphics/aalib')

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 1af421c4b46..cccd962819c 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2013/04/06 20:27:21 rodent Exp $
+# $NetBSD: Makefile,v 1.25 2013/10/17 15:32:22 roy Exp $
 
 DISTNAME=	aalib-1.4rc5
 PKGNAME=	${DISTNAME:S/rc5/.0.5/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
 
@@ -14,12 +14,12 @@ LICENSE=	gnu-lgpl-v2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/aalib-1.4.0
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-INFO_FILES=	yes
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+INFO_FILES=		yes
 
 CONFIGURE_ENV+=		SLANG_PREFIX=${BUILDLINK_PREFIX.libslang:Q}
-CONFIGURE_ENV+=		NCURSES_PREFIX=${BUILDLINK_PREFIX.ncurses:Q}
+CONFIGURE_ENV+=		NCURSES_PREFIX=${BUILDLINK_PREFIX.curses:Q}
 
 SUBST_CLASSES+=		malloc
 SUBST_STAGE.malloc=	pre-configure
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 3989e38275e..c3afb432999 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2013/10/17 15:32:22 roy Exp $
 
 BUILDLINK_TREE+=	aalib
 
@@ -6,14 +6,14 @@ BUILDLINK_TREE+=	aalib
 AALIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.aalib+=	aalib>=1.4.0.4
-BUILDLINK_ABI_DEPENDS.aalib+=	aalib>=1.4.0.5nb2
+BUILDLINK_ABI_DEPENDS.aalib+=	aalib>=1.4.0.5nb3
 BUILDLINK_PKGSRCDIR.aalib?=	../../graphics/aalib
 
 pkgbase := aalib
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.aalib:Mncurses)
-.  include "../../devel/ncurses/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mcurses)
+.  include "../../mk/curses/buildlink3.mk"
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.aalib:Mslang)
diff --git a/graphics/aalib/options.mk b/graphics/aalib/options.mk
index 61434538f4e..5730959ef69 100644
--- a/graphics/aalib/options.mk
+++ b/graphics/aalib/options.mk
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.2 2006/11/06 11:26:31 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2013/10/17 15:32:22 roy Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.aalib
-PKG_SUPPORTED_OPTIONS=	ncurses slang x11
-PKG_SUGGESTED_OPTIONS=	x11
+PKG_SUPPORTED_OPTIONS=	curses slang x11
+PKG_SUGGESTED_OPTIONS=	curses x11
+PKG_OPTIONS_LEGACY_OPTS+=	ncurses:curses
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mncurses)
-.  include "../../devel/ncurses/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mcurses)
+.  include "../../mk/curses.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-curses-driver=yes
 .else
 CONFIGURE_ARGS+=	--with-curses-driver=no
-- 
cgit v1.2.3