* do not configure X11 driver when NO_X11 is defined.

* declare USE_XLIB when XFree86 is installed and NO_X11 is not defined.
* fix configure.in more to use built-in ncurses if exist, and turn on USE_AUTOCONF.
* remove patches already obsoleted by USE_LIBTOOL.

PR:		17004
Submitted by:	OKAZAKI Tetsurou <okazaki@be.to>

2 files changed, 45 insertions, 4 deletions

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 14b1eb62f854..730da0933496 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -12,8 +12,26 @@ MASTER_SITES=	ftp://ftp.ta.jcu.cz/pub/aa/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 
+#
+# Support for X11 is compiled in by default only if X11 is installed.
+#
+.if !exists(${X11BASE})
+NO_X11?=       yes
+.endif
+.if !defined(NO_X11)
+USE_XLIB=YES
+CONFIGURE_ARGS= --with-x --x-includes="${X11BASE}/include" \
+		--x-libraries="${X11BASE}/lib"
+.else
+CONFIGURE_ARGS= --with-x11-driver=no
+.endif
+
+post-patch:
+	@${PERL} -pi -e "s:/usr/local:${LOCALBASE}:g;" ${WRKSRC}/configure.in
+
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/graphics/aalib/files/patch-ac b/graphics/aalib/files/patch-ac
index a69d35eb5dc3..cf0a1cae56eb 100644
--- a/graphics/aalib/files/patch-ac
+++ b/graphics/aalib/files/patch-ac
@@ -1,11 +1,34 @@
---- configure.in.orig	Tue Oct 28 22:48:40 1997
-+++ configure.in	Sun Apr 19 12:18:10 1998
-@@ -245,7 +245,7 @@
+--- configure.in.orig	Wed Oct 29 06:48:40 1997
++++ configure.in	Tue Dec  7 02:22:17 1999
+@@ -243,9 +243,9 @@
+ 	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 , "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.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
+@@ -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/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(/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(/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