Fix MASTER_SITES; use USE_AUTOMAKE; add WWW.

PR:		19926
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

4 files changed, 21 insertions, 21 deletions

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 055180fb3dae..1cb333fdd16c 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -8,29 +8,24 @@
 PORTNAME=	aalib
 PORTVERSION=	1.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ta.jcu.cz/pub/aa/
+MASTER_SITES=	ftp://horac.ta.jcu.cz/pub/aa/
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_AUTOCONF=	yes
+USE_AUTOMAKE=	yes
+AUTOMAKE=	automake -a -i
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
-#
-# Support for X11 is compiled in by default only if X11 is installed.
-#
-.if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \
-    && !defined(WITHOUT_X11))
+.if defined(WITH_X11)
 USE_XLIB=	yes
-CONFIGURE_ARGS= --with-x --x-includes="${X11BASE}/include" \
+CONFIGURE_ARGS=	--x-includes="${X11BASE}/include" \
 		--x-libraries="${X11BASE}/lib"
 .else
-CONFIGURE_ARGS= --with-x11-driver=no
+CONFIGURE_ARGS=	--with-x=no
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s:/usr/local:${LOCALBASE}:g;" ${WRKSRC}/configure.in
+	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/configure.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/aalib/files/patch-ac b/graphics/aalib/files/patch-ac
index cf0a1cae56eb..cf4425042b3f 100644
--- a/graphics/aalib/files/patch-ac
+++ b/graphics/aalib/files/patch-ac
@@ -1,6 +1,6 @@
 --- configure.in.orig	Wed Oct 29 06:48:40 1997
-+++ configure.in	Tue Dec  7 02:22:17 1999
-@@ -243,9 +243,9 @@
++++ configure.in	Wed Jul 12 00:56:59 2000
+@@ -243,10 +243,10 @@
  	fi
       fi
    ])
@@ -8,10 +8,12 @@
 +  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.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")
+-  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")
@@ -19,13 +21,14 @@
 -    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(/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(%%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(/usr/local/include/ncurses, curses.h, -L/usr/local/lib, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/include/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")
diff --git a/graphics/aalib/pkg-descr b/graphics/aalib/pkg-descr
index eecf7efa90f4..281c448d1dac 100644
--- a/graphics/aalib/pkg-descr
+++ b/graphics/aalib/pkg-descr
@@ -5,3 +5,5 @@ 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/
diff --git a/graphics/aalib/pkg-plist b/graphics/aalib/pkg-plist
index 270b851ec984..38e1af3ea5b4 100644
--- a/graphics/aalib/pkg-plist
+++ b/graphics/aalib/pkg-plist
@@ -5,7 +5,7 @@ bin/aatest
 include/aalib.h
 lib/libaa.a
 lib/libaa.so
-lib/libaa.so.1.3
+lib/libaa.so.1
 @unexec install-info --delete %D/info/aalib.info %D/info/dir
 info/aalib.info
 @exec install-info %D/info/aalib.info %D/info/dir