Convert aalib to options framework, adding an 'x11' option, and remove

aalib-x11 and aview-x11.
SDL dependencies change, so bump PKGREVISION (and BUILDLINK_RECOMMENDED)
for affected packages.

Addresses PR 32046 by Leonard Schmidt.

7 files changed, 137 insertions, 46 deletions

diff --git a/graphics/aalib/DESCR b/graphics/aalib/DESCR
index 8281a07bded..21c2cb6dd9a 100644
--- a/graphics/aalib/DESCR
+++ b/graphics/aalib/DESCR
@@ -4,5 +4,3 @@ video cards, low frequency monitors, crashing graphical apps...
 AA-lib IS the solution. It works on a terminal of any kind, it is
 fast and portable, it gives to you standard API.  It gives to your
 old hardware more power! "
-
-This package is built without X11 support.
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 34decf8fce8..a9e41955c2b 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,12 +1,41 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/11 09:40:44 wiz Exp $
 
-PKGNAME=	aalib-${BASE_VERS}
-CONFLICTS+=	aalib-x11<=1.4.0.4
+DISTNAME=	aalib-1.4rc5
+PKGNAME=	${DISTNAME:S/rc5/.0.5/}
+PKGREVISION=	1
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
 
+MAINTAINER=	manu@NetBSD.org
+HOMEPAGE=	http://aa-project.sourceforge.net/aalib/
 COMMENT=	ASCII Art library
 
-CONFIGURE_ARGS+=	--with-x11-driver=no
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/aalib-1.4.0
+GNU_CONFIGURE=		YES
+USE_LIBTOOL=		YES
+
+SUBST_CLASSES+=		malloc paths
+
+SUBST_STAGE.malloc=	pre-configure
+SUBST_FILES.malloc=	src/aalinux.c src/aax.c src/aaxkbd.c
+SUBST_FILES.malloc+=	src/aaxmouse.c src/aarec.c src/aalib.c
+SUBST_FILES.malloc+=	src/aaedit.c src/aaregist.c src/aakbdreg.c
+SUBST_FILES.malloc+=	src/aamoureg.c src/aados.c src/aadoskbd.c
+SUBST_SED.malloc=	-e 's|<malloc.h>|<stdlib.h>|g'
+
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	configure
+SUBST_SED.paths=	-e 's|BUILDLINK_SL|${BUILDLINK_PREFIX.libslang}|g'
+SUBST_SED.paths+=	-e 's|BUILDLINK_NC|${BUILDLINK_PREFIX.ncurses}|g'
 
 INFO_FILES=	aalib.info
 
-.include "Makefile.common"
+.include "options.mk"
+
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+=		2.95.3
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common
deleted file mode 100644
index 5183fa832ce..00000000000
--- a/graphics/aalib/Makefile.common
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile.common,v 1.20 2005/03/29 14:28:05 wiz Exp $
-
-DISTNAME=	aalib-${DIST_VERS}
-CATEGORIES+=	graphics
-MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
-
-DIST_VERS=	1.4rc5
-BASE_VERS=	1.4.0.5
-
-MAINTAINER?=	manu@NetBSD.org
-HOMEPAGE=	http://aa-project.sourceforge.net/aalib/
-
-DISTINFO_FILE=		${.CURDIR}/../../graphics/aalib/distinfo
-PATCHDIR=		${.CURDIR}/../../graphics/aalib/patches
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-WRKSRC=			${WRKDIR}/aalib-1.4.0
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-
-CONFIGURE_ARGS+=	--with-curses-driver=no
-CONFIGURE_ARGS+=	--with-slang-driver=no
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
-
-.if !target(post-patch)
-post-patch:
-	@for f in `${FIND} ${WRKSRC} -name '*.[ch]' -print`; do		\
-		${SED} -e "s|<malloc.h>|<stdlib.h>|g" $$f > $$f.patch	\
-		&& ${MV} $$f.patch $$f;					\
-	done
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 0b939a9c741..3ff755cae72 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:14:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/12/11 09:40:44 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AALIB_BUILDLINK3_MK:=	${AALIB_BUILDLINK3_MK}+
@@ -16,4 +16,24 @@ BUILDLINK_RECOMMENDED.aalib+=	aalib>=1.4.0.4nb2
 BUILDLINK_PKGSRCDIR.aalib?=	../../graphics/aalib
 .endif	# AALIB_BUILDLINK3_MK
 
+.if !defined(PKG_BUILD_OPTIONS.aalib)
+PKG_BUILD_OPTIONS.aalib!=						\
+	cd ${BUILDLINK_PKGSRCDIR.aalib} &&				\
+	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+=	PKG_BUILD_OPTIONS.aalib=${PKG_BUILD_OPTIONS.aalib:Q}
+.endif
+MAKEVARS+=	PKG_BUILD_OPTIONS.aalib
+
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mx11)
+.  include "../../mk/x11.buildlink3.mk"
+.endif
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib/distinfo b/graphics/aalib/distinfo
index 3f1b0d6f4a2..201096fd728 100644
--- a/graphics/aalib/distinfo
+++ b/graphics/aalib/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/04/27 08:58:17 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/12/11 09:40:44 wiz Exp $
 
 SHA1 (aalib-1.4rc5.tar.gz) = a23269e950a249d2ef93625837cace45ddbce03b
 RMD160 (aalib-1.4rc5.tar.gz) = a10bcab16d3aa0e60facca3e989f6a51846885f6
 Size (aalib-1.4rc5.tar.gz) = 391028 bytes
 SHA1 (patch-aa) = 927d69a8f499b99f0bd5f13cf220ce8cbb7ea591
 SHA1 (patch-ab) = 272f6f10dbe7a525c582a9b4c865f0ab9b2f9fba
+SHA1 (patch-ac) = 104d896182671e732efec445704140b361c34533
diff --git a/graphics/aalib/options.mk b/graphics/aalib/options.mk
new file mode 100644
index 00000000000..71890cb0482
--- /dev/null
+++ b/graphics/aalib/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2005/12/11 09:40:44 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.aalib
+PKG_SUPPORTED_OPTIONS=	ncurses slang x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-curses-driver=yes
+.else
+CONFIGURE_ARGS+=	--with-curses-driver=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-slang-driver=yes
+.else
+CONFIGURE_ARGS+=	--with-slang-driver=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+.  include "../../mk/x11.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x11-driver=yes
+.else
+CONFIGURE_ARGS+=	--with-x11-driver=no
+.endif
diff --git a/graphics/aalib/patches/patch-ac b/graphics/aalib/patches/patch-ac
new file mode 100644
index 00000000000..99ff087230b
--- /dev/null
+++ b/graphics/aalib/patches/patch-ac
@@ -0,0 +1,52 @@
+$NetBSD: patch-ac,v 1.1 2005/12/11 09:40:44 wiz Exp $
+
+--- configure.orig	2001-04-26 14:44:54.000000000 +0000
++++ configure
+@@ -3145,7 +3145,7 @@ EOF
+   
+     if $search_slang
+     then
+-        if test -f /usr/local/include/slang.h
++        if test -f BUILDLINK_SL/include/slang.h
+ 	then
+ 	    LIBS1="$LIBS"
+  	    LIBS="$LIBS "
+@@ -3197,10 +3197,10 @@ else
+ fi
+ 
+             if test "x$ac_cv_lib_slang_SLsmg_init_smg" = xyes; then 
+-	      echo "$ac_t""Found slang on /usr/local/include/slang.h" 1>&6
++	      echo "$ac_t""Found slang on BUILDLINK_SL/include/slang.h" 1>&6
+ 	      AALIB_LIBS="$AALIB_LIBS  -lslang"
+  	      LIBS="$LIBS "
+-	      CFLAGS="$CFLAGS -I/usr/local/include/slang "
++	      CFLAGS="$CFLAGS -IBUILDLINK_SL/include/slang "
+               slang_driver=true
+ 	      search_slang=false
+ 	      cat >> confdefs.h <<\EOF
+@@ -3453,7 +3453,7 @@ EOF
+     
+     if $search_ncurses
+     then
+-        if test -f /usr/local/include/ncurses.h
++        if test -f BUILDLINK_NC/include/ncurses.h
+ 	then
+ 	    LIBS1="$LIBS"
+  	    LIBS="$LIBS "
+@@ -3505,13 +3505,13 @@ else
+ fi
+ 
+             if test "x$ac_cv_lib_ncurses_initscr" = xyes; then 
+-	      echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
++	      echo "$ac_t""Found ncurses on BUILDLINK_NC/include/ncurses.h" 1>&6
+ 	      AALIB_LIBS="$AALIB_LIBS  -lncurses"
+  	      LIBS="$LIBS "
+-	      CFLAGS="$CFLAGS -L/usr/local/lib"
++	      CFLAGS="$CFLAGS -LBUILDLINK_NC/lib"
+ 	      search_ncurses=false
+               curses_driver=true
+-	      screen_manager=-I/usr/local/include
++	      screen_manager=-IBUILDLINK_NC/include
+ 	      cat >> confdefs.h <<\EOF
+ #define USE_NCURSES 1
+ EOF