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.

3 files changed, 8 insertions, 26 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 7f33c6db4f1..b989b7c68b3 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		qemu-0.7.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		emulators
 MASTER_SITES=		http://fabrice.bellard.free.fr/qemu/
 
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 30d49c7e2ce..f0e98d116e3 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/11/04 21:10:42 dbj Exp $
+$NetBSD: distinfo,v 1.15 2005/12/11 09:40:39 wiz Exp $
 
 SHA1 (qemu-0.7.2.tar.gz) = 4daeccb57448eacc444152f30b5d84dfcca89dfe
 RMD160 (qemu-0.7.2.tar.gz) = 1d2dcc8f43ff4b4b9aa045c64e38c9a10140b13e
@@ -6,7 +6,7 @@ Size (qemu-0.7.2.tar.gz) = 1341993 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
 SHA1 (patch-ac) = fa190b38658ad487a6ddf6d78cc3cbb262c67702
 SHA1 (patch-af) = 221d6d85aa898cb27462806faab58ee2a9871a1c
-SHA1 (patch-ag) = 4bb7ae18fd0f0c5ecfa2ab2594d1de5b33660495
+SHA1 (patch-ag) = 86df0bb94e71d87cf61d19404b53e3572384874e
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
 SHA1 (patch-aj) = d050b84489e74036994c19e982a363d74df797ab
diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag
index 6a0fd5ba2ad..dd55f0b3a45 100644
--- a/emulators/qemu/patches/patch-ag
+++ b/emulators/qemu/patches/patch-ag
@@ -1,17 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2004/12/14 01:02:19 dbj Exp $
+$NetBSD: patch-ag,v 1.4 2005/12/11 09:40:39 wiz Exp $
 
---- configure.orig	Sun Nov 14 15:51:33 2004
+--- configure.orig	2005-09-04 17:11:31.000000000 +0000
 +++ configure
-@@ -259,7 +259,7 @@ aa="no"
- `$sdl_config --static-libs | grep \\\-laa > /dev/null` && aa="yes"
- sdl_static_libs=`$sdl_config --static-libs`
- if [ "$aa" = "yes" ] ; then
--  sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
-+  sdl_static_libs="$sdl_static_libs `aalib-x11-config --static-libs`"
- fi
- 
- if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
-@@ -314,7 +314,7 @@ else
+@@ -366,7 +366,7 @@ else
  if test -z "$prefix" ; then
      prefix="/usr/local"
  fi
@@ -20,7 +11,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/14 01:02:19 dbj Exp $
  datadir="$prefix/share/qemu"
  docdir="$prefix/share/doc/qemu"
  bindir="$prefix/bin"
-@@ -423,6 +423,8 @@ if test "$mingw32" = "yes" ; then
+@@ -539,6 +539,8 @@ if test "$mingw32" = "yes" ; then
    echo "#define CONFIG_WIN32 1" >> $config_h
  elif test -f "/usr/include/byteswap.h" ; then
    echo "#define HAVE_BYTESWAP_H 1" >> $config_h
@@ -29,12 +20,3 @@ $NetBSD: patch-ag,v 1.3 2004/12/14 01:02:19 dbj Exp $
  fi
  if test "$darwin" = "yes" ; then
    echo "CONFIG_DARWIN=yes" >> $config_mak
-@@ -566,7 +568,7 @@ if test "$target_user_only" = "no"; then
-         fi
-         echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
-         if [ "${aa}" = "yes" ] ; then
--            echo -n " `aalib-config --cflags`" >> $config_mak ;
-+            echo -n " `aalib-x11-config --cflags`" >> $config_mak ;
-         fi
-         echo "" >> $config_mak
-     fi