3 files changed, 18 insertions, 70 deletions

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 902231351702..3bfe61b1670f 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -3,19 +3,16 @@
 # Date created:				9 Dec 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.3 1998/03/28 19:19:25 asami Exp $
+# $Id: Makefile,v 1.4 1998/03/29 01:33:10 steve Exp $
 #
 
-DISTNAME=		aalib-1.2
-CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.ta.jcu.cz/pub/aa/
+DISTNAME=	aalib-1.2
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.ta.jcu.cz/pub/aa/
 
-MAINTAINER=		andy@icc.surw.chel.su
+MAINTAINER=	andy@icc.surw.chel.su
 
-GNU_CONFIGURE=		yes
-
-pre-configure:
-	@${RM} ${WRKSRC}/config.cache
+GNU_CONFIGURE=	yes
 
 pre-install:
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/graphics/aalib/distinfo b/graphics/aalib/distinfo
index d85324dc4f32..7009e542b1db 100644
--- a/graphics/aalib/distinfo
+++ b/graphics/aalib/distinfo
@@ -1 +1 @@
-MD5 (aalib-1.2.tar.gz) = 36c7156f33a6bb7a0fac735d8a4d1791
+MD5 (aalib-1.2.tar.gz) = 790434e0f2005fc95559ab3eab42e746
diff --git a/graphics/aalib/files/patch-ac b/graphics/aalib/files/patch-ac
index 343afa8f93e1..a69d35eb5dc3 100644
--- a/graphics/aalib/files/patch-ac
+++ b/graphics/aalib/files/patch-ac
@@ -1,60 +1,11 @@
---- configure.orig	Sat Mar 28 18:48:24 1998
-+++ configure	Sat Mar 28 18:50:43 1998
-@@ -687,57 +687,10 @@
- test "$program_transform_name" = "" && program_transform_name="s,x,x,"
- 
- missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:692: checking for working aclocal" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
--   echo "$ac_t""found" 1>&6
--else
-    ACLOCAL="$missing_dir/missing aclocal"
--   echo "$ac_t""missing" 1>&6
--fi
--
--echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:705: checking for working autoconf" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoconf --version) < /dev/null > /dev/null 2>&1; then
--   AUTOCONF=autoconf
--   echo "$ac_t""found" 1>&6
--else
-    AUTOCONF="$missing_dir/missing autoconf"
--   echo "$ac_t""missing" 1>&6
--fi
--
--echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:718: checking for working automake" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake
--   echo "$ac_t""found" 1>&6
--else
-    AUTOMAKE="$missing_dir/missing automake"
--   echo "$ac_t""missing" 1>&6
--fi
--
--echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:731: checking for working autoheader" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoheader --version) < /dev/null > /dev/null 2>&1; then
--   AUTOHEADER=autoheader
--   echo "$ac_t""found" 1>&6
--else
-    AUTOHEADER="$missing_dir/missing autoheader"
--   echo "$ac_t""missing" 1>&6
--fi
- 
- echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
- echo "configure:744: checking for working makeinfo" >&5
+--- configure.in.orig	Tue Oct 28 22:48:40 1997
++++ configure.in	Sun Apr 19 12:18:10 1998
+@@ -245,7 +245,7 @@
+   ])
+   AC_SLANG(/usr/include, slang.h, , -I/usr/include/slang , "slang on /usr/include")
+   AC_SLANG(/usr/include/slang, slang.h, , -I/usr/include/slang , "slang on /usr/include/slang")
+-  AC_SLANG(/usr/local/include, slang.h, , -I/usr/local/include/slang , "slang on /usr/local/include")
++  AC_SLANG(/usr/local/include, slang.h, , -I/usr/local/include , "slang on /usr/local/include")
+   AC_SLANG(/usr/local/include/slang, slang.h, , -I/usr/local/include/slang , "slang on /usr/local/include/slang")
+   if test "$slang_driver" = true; then
+     if test "$force_curses_driver" = false; then