4 files changed, 6 insertions, 56 deletions

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 4e972e4e452a..1242aaab76df 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -9,14 +9,11 @@ PORTNAME=	aalib
 PORTVERSION=	1.2
 PORTREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://horac.ta.jcu.cz/pub/aa/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	libs/graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	aa-project
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_AUTOMAKE=	yes
-AUTOMAKE=	automake -a -i
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
@@ -29,7 +26,8 @@ CONFIGURE_ARGS=	--with-x=no
 .endif
 
 post-patch:
-	@${RM} -f ${WRKSRC}/config.cache
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/configure.in
+	@${PERL} -pi -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
+		's|<malloc.h>|<stdlib.h>|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/aalib/files/patch-ac b/graphics/aalib/files/patch-ac
deleted file mode 100644
index cf4425042b3f..000000000000
--- a/graphics/aalib/files/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.in.orig	Wed Oct 29 06:48:40 1997
-+++ configure.in	Wed Jul 12 00:56:59 2000
-@@ -243,10 +243,10 @@
- 	fi
-      fi
-   ])
--  AC_SLANG(/usr/include, slang.h, , -I/usr/include/slang , "slang on /usr/include")
-+  AC_SLANG(/usr/include, slang.h, , -I/usr/include , "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, slang.h, , -I/usr/local/include/slang , "slang on /usr/local/include/slang")
-+  AC_SLANG(%%LOCALBASE%%/include, slang.h, , -I%%LOCALBASE%%/include , "slang on %%LOCALBASE%%/include")
-+  AC_SLANG(%%LOCALBASE%%/include/slang, slang.h, , -I%%LOCALBASE%%/include/slang , "slang on %%LOCALBASE%%/include/slang")
-   if test "$slang_driver" = true; then
-     if test "$force_curses_driver" = false; then
-       echo "Disabling curses driver since slang is available"
-@@ -314,14 +314,14 @@
- then
-     AC_CHECKING("location of curses")
- 
--    AC_NCURSES(/usr/include, ncurses.h, , -I/usr/include/ncurses , "ncurses on /usr/include")
--    AC_NCURSES(/usr/include/ncurses, ncurses.h, , -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
--    AC_NCURSES(/usr/local/include, ncurses.h, ,-L/usr/local/lib, -I/usr/local/include, "ncurses on /usr/local")
--    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
-+    AC_NCURSES(/usr/include, ncurses.h, -L/usr/lib, -I/usr/include , "ncurses on /usr/include")
-+    AC_NCURSES(/usr/include/ncurses, ncurses.h, -L/usr/lib, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
-+    AC_NCURSES(%%LOCALBASE%%/include, ncurses.h, -L%%LOCALBASE%%/lib, -I%%LOCALBASE%%/include, "ncurses on %%LOCALBASE%%")
-+    AC_NCURSES(%%LOCALBASE%%/include/ncurses, ncurses.h, -L%%LOCALBASE%%/lib -L%%LOCALBASE%%/lib/ncurses, -I%%LOCALBASE%%/include/ncurses, "ncurses on %%LOCALBASE%%/include/ncurses")
- 
--    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
-+    AC_NCURSES(%%LOCALBASE%%/include/ncurses, curses.h, -L%%LOCALBASE%%/lib, -I%%LOCALBASE%%/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on %%LOCALBASE%%/include/ncurses")
- 
--    AC_NCURSES(/usr/include/ncurses, curses.h, , -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-+    AC_NCURSES(/usr/include/ncurses, curses.h, -L/usr/lib, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-     AC_CURSES(/usr/include, curses.h, , , "curses on /usr/include")
- 
-     dnl
diff --git a/graphics/aalib/files/patch-ae b/graphics/aalib/files/patch-ae
deleted file mode 100644
index b80aec147566..000000000000
--- a/graphics/aalib/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Wed Nov 12 05:17:00 1997
-+++ aclocal.m4	Tue Dec  7 03:26:34 1999
-@@ -10,7 +10,7 @@
- dnl AM_INIT_AUTOMAKE(package,version, [no-define])
- 
- AC_DEFUN(AM_INIT_AUTOMAKE,
--[AC_REQUIRE([AM_PROG_INSTALL])
-+[AC_REQUIRE([AC_PROG_INSTALL])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]
diff --git a/graphics/aalib/pkg-descr b/graphics/aalib/pkg-descr
index 281c448d1dac..0434cd6d1a24 100644
--- a/graphics/aalib/pkg-descr
+++ b/graphics/aalib/pkg-descr
@@ -6,4 +6,4 @@ ascii-art renderer in place of outmoded and cumbersome graphical output.
 The AA-lib API is designed to be similar to that of other graphics
 libraries so learning its API should be simple.
 
-WWW: http://horac.ta.jcu.cz/aa/aalib/
+WWW: http://aa-project.sourceforge.net/aalib/