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.

33 files changed, 162 insertions, 293 deletions

diff --git a/graphics/3DKit/Makefile b/graphics/3DKit/Makefile
index 7862cba1cfa..de0b503ba7f 100644
--- a/graphics/3DKit/Makefile
+++ b/graphics/3DKit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:14:47 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:44 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
-PKGREVISION=	6
+PKGREVISION=	7
 
 DISTFILES=	DevManual.pdf
 
diff --git a/graphics/GUIlib/Makefile b/graphics/GUIlib/Makefile
index f7d41695feb..c8d41b6841b 100644
--- a/graphics/GUIlib/Makefile
+++ b/graphics/GUIlib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:44 wiz Exp $
 #
 
 DISTNAME=	GUIlib-1.1.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/GUIlib/src/
 
diff --git a/graphics/GUIlib/buildlink3.mk b/graphics/GUIlib/buildlink3.mk
index b357e506424..7dc7b197d7d 100644
--- a/graphics/GUIlib/buildlink3.mk
+++ b/graphics/GUIlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:14:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/11 09:40:44 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUILIB_BUILDLINK3_MK:=	${GUILIB_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	GUIlib
 
 .if !empty(GUILIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.GUIlib+=	GUIlib>=1.1.0nb2
-BUILDLINK_RECOMMENDED.GUIlib+=	GUIlib>=1.1.0nb3
+BUILDLINK_RECOMMENDED.GUIlib+=	GUIlib>=1.1.0nb5
 BUILDLINK_PKGSRCDIR.GUIlib?=	../../graphics/GUIlib
 .endif	# GUILIB_BUILDLINK3_MK
 
diff --git a/graphics/Makefile b/graphics/Makefile
index adc4c986dea..59e2c299f55 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.404 2005/12/09 15:49:34 gdt Exp $
+# $NetBSD: Makefile,v 1.405 2005/12/11 09:40:44 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -25,12 +25,10 @@ SUBDIR+=	SDLKit
 SUBDIR+=	SDL_image
 SUBDIR+=	TiffIO
 SUBDIR+=	aalib
-SUBDIR+=	aalib-x11
 SUBDIR+=	aqsis
 SUBDIR+=	artist
 SUBDIR+=	autotrace
 SUBDIR+=	aview
-SUBDIR+=	aview-x11
 SUBDIR+=	barcode
 SUBDIR+=	bktr2jpeg
 SUBDIR+=	blender
diff --git a/graphics/SDLKit/Makefile b/graphics/SDLKit/Makefile
index 2ab846c5cd4..85ed9f21f9d 100644
--- a/graphics/SDLKit/Makefile
+++ b/graphics/SDLKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/11 09:40:44 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/3DKit/SDLKit/}
-PKGREVISION=	10
+PKGREVISION=	11
 
 COMMENT=	3DKit SDL backend
 
diff --git a/graphics/SDLKit/buildlink3.mk b/graphics/SDLKit/buildlink3.mk
index 05560ba03b9..3f4a0304379 100644
--- a/graphics/SDLKit/buildlink3.mk
+++ b/graphics/SDLKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/09/24 01:56:55 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/11 09:40:44 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDLKIT_BUILDLINK3_MK:=	${SDLKIT_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	SDLKit
 
 .if !empty(SDLKIT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDLKit+=	SDLKit>=0.3.1r2nb5
-BUILDLINK_RECOMMENDED.SDLKit?=	SDLKit>=0.3.1r2nb8
+BUILDLINK_RECOMMENDED.SDLKit?=	SDLKit>=0.3.1r2nb11
 BUILDLINK_PKGSRCDIR.SDLKit?=	../../graphics/SDLKit
 .endif	# SDLKIT_BUILDLINK3_MK
 
diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile
index c1266bd41f2..56f9dc1144e 100644
--- a/graphics/SDL_image/Makefile
+++ b/graphics/SDL_image/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:54 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/11 09:40:44 wiz Exp $
 
 DISTNAME=	SDL_image-1.2.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index d2cc35b6f47..f61e5bebeef 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/12/28 23:18:20 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/12/11 09:40:44 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	SDL_image
 
 .if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_image+=	SDL_image>=1.2.3nb1
-BUILDLINK_RECOMMENDED.SDL_image+=	SDL_image>=1.2.3nb3
+BUILDLINK_RECOMMENDED.SDL_image+=	SDL_image>=1.2.4nb2
 BUILDLINK_PKGSRCDIR.SDL_image?=	../../graphics/SDL_image
 BUILDLINK_INCDIRS.SDL_image?=	include/SDL
 .endif	# SDL_IMAGE_BUILDLINK3_MK
diff --git a/graphics/aalib-x11/DESCR b/graphics/aalib-x11/DESCR
deleted file mode 100644
index 9844004c2d0..00000000000
--- a/graphics/aalib-x11/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-AAlib is a portable ASCII Art library. From the AA project documentation:
-"There are many problems of various kinds with video cards, low frequency
-monitors, crashing graphical apps... AA-lib IS the solution. It works on a
-terminal of any kind, it is fast and portable, it gives to you standard API.
-It gives to your old hardware more power! "
diff --git a/graphics/aalib-x11/Makefile b/graphics/aalib-x11/Makefile
deleted file mode 100644
index 1d2e0b924b9..00000000000
--- a/graphics/aalib-x11/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:54 jlam Exp $
-
-PKGNAME=	aalib-x11-${BASE_VERS}
-CATEGORIES+=	x11
-
-COMMENT=	ASCII Art library with X11 support
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-
-BUILD_TARGET=		libaa-x11.la
-INSTALL_TARGET=		install-libLTLIBRARIES
-
-INSTALLATION_DIRS=	bin include lib
-
-# We need to correct the aalib-config script to return "-laa-x11" instead
-# of "-laa".
-#
-BUILDLINK_TRANSFORM+=	l:aa:aa-x11
-
-.include "../../mk/x11.buildlink3.mk"
-
-post-patch:
-	for file in ${WRKSRC}/src/Makefile.in; do			\
-		${SED}	-e "s,libaa\.la,libaa-x11.la,g"			\
-			-e "s,libaa_la,libaa_x11_la,g"			\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
-	@for f in `${FIND} ${WRKSRC} -name '*.[ch]' -print`; do		\
-		${SED} -e "s|<malloc.h>|<stdlib.h>|g" $$f > $$f.patch	\
-		&& ${MV} $$f.patch $$f;					\
-	done
-
-do-build:
-	cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV}				\
-		${MAKE_PROGRAM} -f ${MAKEFILE} ${BUILD_TARGET}
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/aalib-config ${PREFIX}/bin/aalib-x11-config
-	${INSTALL_DATA} ${WRKSRC}/src/aalib.h ${PREFIX}/include/aalib-x11.h
-	cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV}				\
-		${MAKE_PROGRAM} -f ${MAKEFILE} ${INSTALL_TARGET}
-
-.include "../../graphics/aalib/Makefile.common"
diff --git a/graphics/aalib-x11/PLIST b/graphics/aalib-x11/PLIST
deleted file mode 100644
index a1369ecca8c..00000000000
--- a/graphics/aalib-x11/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:32 jlam Exp $
-bin/aalib-x11-config
-include/aalib-x11.h
-lib/libaa-x11.la
diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk
deleted file mode 100644
index 067ceab5beb..00000000000
--- a/graphics/aalib-x11/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/12/05 20:50:19 rillig Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-AALIB_X11_BUILDLINK3_MK:=	${AALIB_X11_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=		aalib-x11
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naalib-x11}
-BUILDLINK_PACKAGES+=	aalib-x11
-
-.if !empty(AALIB_X11_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aalib-x11+=	aalib-x11>=1.4.0.4nb1
-BUILDLINK_PKGSRCDIR.aalib-x11?=	../../graphics/aalib-x11
-
-BUILDLINK_FILES.aalib-x11=	include/aalib-x11.h
-BUILDLINK_TRANSFORM.aalib-x11+=	-e "s|/aalib-x11.h|/aalib.h|g"
-BUILDLINK_TRANSFORM+=		l:aa:aa-x11
-
-AALIB_CONFIG=		${BUILDLINK_PREFIX.aalib-x11}/bin/aalib-x11-config
-CONFIGURE_ENV+=		AALIB_CONFIG=${AALIB_CONFIG:Q}
-MAKE_ENV+=		AALIB_CONFIG=${AALIB_CONFIG:Q}
-.endif	# AALIB_X11_BUILDLINK3_MK
-
-.include "../../mk/x11.buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib/DESCR b/graphics/aalib/DESCR
index 8281a07bded..21c2cb6dd9a 100644
--- a/graphics/aalib/DESCR
+++ b/graphics/aalib/DESCR
@@ -4,5 +4,3 @@ video cards, low frequency monitors, crashing graphical apps...
 AA-lib IS the solution. It works on a terminal of any kind, it is
 fast and portable, it gives to you standard API.  It gives to your
 old hardware more power! "
-
-This package is built without X11 support.
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 34decf8fce8..a9e41955c2b 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,12 +1,41 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/11 09:40:44 wiz Exp $
 
-PKGNAME=	aalib-${BASE_VERS}
-CONFLICTS+=	aalib-x11<=1.4.0.4
+DISTNAME=	aalib-1.4rc5
+PKGNAME=	${DISTNAME:S/rc5/.0.5/}
+PKGREVISION=	1
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
 
+MAINTAINER=	manu@NetBSD.org
+HOMEPAGE=	http://aa-project.sourceforge.net/aalib/
 COMMENT=	ASCII Art library
 
-CONFIGURE_ARGS+=	--with-x11-driver=no
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/aalib-1.4.0
+GNU_CONFIGURE=		YES
+USE_LIBTOOL=		YES
+
+SUBST_CLASSES+=		malloc paths
+
+SUBST_STAGE.malloc=	pre-configure
+SUBST_FILES.malloc=	src/aalinux.c src/aax.c src/aaxkbd.c
+SUBST_FILES.malloc+=	src/aaxmouse.c src/aarec.c src/aalib.c
+SUBST_FILES.malloc+=	src/aaedit.c src/aaregist.c src/aakbdreg.c
+SUBST_FILES.malloc+=	src/aamoureg.c src/aados.c src/aadoskbd.c
+SUBST_SED.malloc=	-e 's|<malloc.h>|<stdlib.h>|g'
+
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	configure
+SUBST_SED.paths=	-e 's|BUILDLINK_SL|${BUILDLINK_PREFIX.libslang}|g'
+SUBST_SED.paths+=	-e 's|BUILDLINK_NC|${BUILDLINK_PREFIX.ncurses}|g'
 
 INFO_FILES=	aalib.info
 
-.include "Makefile.common"
+.include "options.mk"
+
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+=		2.95.3
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common
deleted file mode 100644
index 5183fa832ce..00000000000
--- a/graphics/aalib/Makefile.common
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile.common,v 1.20 2005/03/29 14:28:05 wiz Exp $
-
-DISTNAME=	aalib-${DIST_VERS}
-CATEGORIES+=	graphics
-MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
-
-DIST_VERS=	1.4rc5
-BASE_VERS=	1.4.0.5
-
-MAINTAINER?=	manu@NetBSD.org
-HOMEPAGE=	http://aa-project.sourceforge.net/aalib/
-
-DISTINFO_FILE=		${.CURDIR}/../../graphics/aalib/distinfo
-PATCHDIR=		${.CURDIR}/../../graphics/aalib/patches
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-WRKSRC=			${WRKDIR}/aalib-1.4.0
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-
-CONFIGURE_ARGS+=	--with-curses-driver=no
-CONFIGURE_ARGS+=	--with-slang-driver=no
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
-
-.if !target(post-patch)
-post-patch:
-	@for f in `${FIND} ${WRKSRC} -name '*.[ch]' -print`; do		\
-		${SED} -e "s|<malloc.h>|<stdlib.h>|g" $$f > $$f.patch	\
-		&& ${MV} $$f.patch $$f;					\
-	done
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 0b939a9c741..3ff755cae72 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:14:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/12/11 09:40:44 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AALIB_BUILDLINK3_MK:=	${AALIB_BUILDLINK3_MK}+
@@ -16,4 +16,24 @@ BUILDLINK_RECOMMENDED.aalib+=	aalib>=1.4.0.4nb2
 BUILDLINK_PKGSRCDIR.aalib?=	../../graphics/aalib
 .endif	# AALIB_BUILDLINK3_MK
 
+.if !defined(PKG_BUILD_OPTIONS.aalib)
+PKG_BUILD_OPTIONS.aalib!=						\
+	cd ${BUILDLINK_PKGSRCDIR.aalib} &&				\
+	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+=	PKG_BUILD_OPTIONS.aalib=${PKG_BUILD_OPTIONS.aalib:Q}
+.endif
+MAKEVARS+=	PKG_BUILD_OPTIONS.aalib
+
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mx11)
+.  include "../../mk/x11.buildlink3.mk"
+.endif
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib/distinfo b/graphics/aalib/distinfo
index 3f1b0d6f4a2..201096fd728 100644
--- a/graphics/aalib/distinfo
+++ b/graphics/aalib/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/04/27 08:58:17 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/12/11 09:40:44 wiz Exp $
 
 SHA1 (aalib-1.4rc5.tar.gz) = a23269e950a249d2ef93625837cace45ddbce03b
 RMD160 (aalib-1.4rc5.tar.gz) = a10bcab16d3aa0e60facca3e989f6a51846885f6
 Size (aalib-1.4rc5.tar.gz) = 391028 bytes
 SHA1 (patch-aa) = 927d69a8f499b99f0bd5f13cf220ce8cbb7ea591
 SHA1 (patch-ab) = 272f6f10dbe7a525c582a9b4c865f0ab9b2f9fba
+SHA1 (patch-ac) = 104d896182671e732efec445704140b361c34533
diff --git a/graphics/aalib/options.mk b/graphics/aalib/options.mk
new file mode 100644
index 00000000000..71890cb0482
--- /dev/null
+++ b/graphics/aalib/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2005/12/11 09:40:44 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.aalib
+PKG_SUPPORTED_OPTIONS=	ncurses slang x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-curses-driver=yes
+.else
+CONFIGURE_ARGS+=	--with-curses-driver=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-slang-driver=yes
+.else
+CONFIGURE_ARGS+=	--with-slang-driver=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+.  include "../../mk/x11.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x11-driver=yes
+.else
+CONFIGURE_ARGS+=	--with-x11-driver=no
+.endif
diff --git a/graphics/aalib/patches/patch-ac b/graphics/aalib/patches/patch-ac
new file mode 100644
index 00000000000..99ff087230b
--- /dev/null
+++ b/graphics/aalib/patches/patch-ac
@@ -0,0 +1,52 @@
+$NetBSD: patch-ac,v 1.1 2005/12/11 09:40:44 wiz Exp $
+
+--- configure.orig	2001-04-26 14:44:54.000000000 +0000
++++ configure
+@@ -3145,7 +3145,7 @@ EOF
+   
+     if $search_slang
+     then
+-        if test -f /usr/local/include/slang.h
++        if test -f BUILDLINK_SL/include/slang.h
+ 	then
+ 	    LIBS1="$LIBS"
+  	    LIBS="$LIBS "
+@@ -3197,10 +3197,10 @@ else
+ fi
+ 
+             if test "x$ac_cv_lib_slang_SLsmg_init_smg" = xyes; then 
+-	      echo "$ac_t""Found slang on /usr/local/include/slang.h" 1>&6
++	      echo "$ac_t""Found slang on BUILDLINK_SL/include/slang.h" 1>&6
+ 	      AALIB_LIBS="$AALIB_LIBS  -lslang"
+  	      LIBS="$LIBS "
+-	      CFLAGS="$CFLAGS -I/usr/local/include/slang "
++	      CFLAGS="$CFLAGS -IBUILDLINK_SL/include/slang "
+               slang_driver=true
+ 	      search_slang=false
+ 	      cat >> confdefs.h <<\EOF
+@@ -3453,7 +3453,7 @@ EOF
+     
+     if $search_ncurses
+     then
+-        if test -f /usr/local/include/ncurses.h
++        if test -f BUILDLINK_NC/include/ncurses.h
+ 	then
+ 	    LIBS1="$LIBS"
+  	    LIBS="$LIBS "
+@@ -3505,13 +3505,13 @@ else
+ fi
+ 
+             if test "x$ac_cv_lib_ncurses_initscr" = xyes; then 
+-	      echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
++	      echo "$ac_t""Found ncurses on BUILDLINK_NC/include/ncurses.h" 1>&6
+ 	      AALIB_LIBS="$AALIB_LIBS  -lncurses"
+  	      LIBS="$LIBS "
+-	      CFLAGS="$CFLAGS -L/usr/local/lib"
++	      CFLAGS="$CFLAGS -LBUILDLINK_NC/lib"
+ 	      search_ncurses=false
+               curses_driver=true
+-	      screen_manager=-I/usr/local/include
++	      screen_manager=-IBUILDLINK_NC/include
+ 	      cat >> confdefs.h <<\EOF
+ #define USE_NCURSES 1
+ EOF
diff --git a/graphics/aview-x11/DESCR b/graphics/aview-x11/DESCR
deleted file mode 100644
index 9cf47d06714..00000000000
--- a/graphics/aview-x11/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-
-     dT8  8Tb       aview is a high quality ascii-art image (pnm) browser
-    dT 8  8 Tb      and animation (fli/flc) player which uses AAlib
-   dT  8  8  Tb     (a portable ASCII Art library, part of the AA-project).
-<PROJECT><PROJECT>
- dT    8  8    Tb
-dT     8  8     Tb  aview features:
-
- * High quality ascii art rendering
- * Portable
- * Save into many formats (html, text, ansi, more/less etc...)
- * Contrast, Bright, Gamma control
- * Image zooming/unzooming
- * Three dithering modes
- * Hidden "bonus" features :)
- * Inversion
- * Support for bright, dim, inverse attributes/extended character set
diff --git a/graphics/aview-x11/Makefile b/graphics/aview-x11/Makefile
deleted file mode 100644
index ee17d73fd73..00000000000
--- a/graphics/aview-x11/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:54 jlam Exp $
-#
-
-DISTNAME=	aview-1.3.0rc1
-PKGNAME=	aview-x11-1.3.0.1
-PKGREVISION=	3
-CATEGORIES=	graphics converters x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
-
-MAINTAINER=	salo@Xtrmntr.org
-HOMEPAGE=	http://aa-project.sourceforge.net/aview/
-COMMENT=	ASCII Art image viewer with X11 support
-
-CONFLICTS+=	aview-[0-9]*
-
-PLIST_SRC=	${WRKDIR}/PLIST
-
-WRKSRC=		${WRKDIR}/aview-1.3.0
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_PKGINSTALL=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${MACHINE_ARCH} == "i386")
-FILES_SUBST+= BIN_PROGRAMS="aview aaflip"
-.else
-FILES_SUBST+= BIN_PROGRAMS="aview"
-.endif
-
-pre-configure:
-	@${SED} ${FILES_SUBST_SED} ${WRKSRC}/Makefile.in > ${WRKDIR}/Makefile.in
-	@${MV} ${WRKDIR}/Makefile.in ${WRKSRC}/
-
-post-install:
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/aview/
-.if (${MACHINE_ARCH} == "i386")
-	${INSTALL_PROGRAM} ${WRKSRC}/aaflip ${PREFIX}/bin/
-	@${ECHO} bin/aaflip >>${PLIST_SRC}
-.endif
-
-.include "../../graphics/aalib-x11/buildlink3.mk"
-.include "../../graphics/netpbm/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aview-x11/PLIST b/graphics/aview-x11/PLIST
deleted file mode 100644
index a8a2ad702f3..00000000000
--- a/graphics/aview-x11/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/30 11:41:55 agc Exp $
-bin/asciiview
-bin/aview
-man/man1/asciiview.1
-man/man1/aview.1
-share/doc/aview/AUTHORS
-share/doc/aview/COPYING
-share/doc/aview/ChangeLog
-share/doc/aview/NEWS
-share/doc/aview/README
-share/doc/aview/README.flip
-share/doc/aview/TODO
-@dirrm share/doc/aview
diff --git a/graphics/aview-x11/distinfo b/graphics/aview-x11/distinfo
deleted file mode 100644
index efdc52032c0..00000000000
--- a/graphics/aview-x11/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:03 agc Exp $
-
-SHA1 (aview-1.3.0rc1.tar.gz) = d757ff9f62e6ce4d926c03ae4f4096d9fcf353fc
-RMD160 (aview-1.3.0rc1.tar.gz) = f57808dfb9efc36af3b4107bfd48ae875d709cd0
-Size (aview-1.3.0rc1.tar.gz) = 54317 bytes
-SHA1 (patch-aa) = 4fb90e608e912839a3febef1b7086909eb93d42a
-SHA1 (patch-ab) = ed1d623e8ffe18e5cdb18727a2ccbb2cf8c50b1d
-SHA1 (patch-ac) = c9a66a3e6bf97dffe7335ccb9af666250d25f370
-SHA1 (patch-ad) = 690a8af07eee1e44611b9111678ab1aff52c7bfa
diff --git a/graphics/aview-x11/patches/patch-aa b/graphics/aview-x11/patches/patch-aa
deleted file mode 100644
index e5f910209dd..00000000000
--- a/graphics/aview-x11/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/30 11:41:55 agc Exp $
-
---- Makefile.in.orig	Wed Apr 25 18:04:44 2001
-+++ Makefile.in
-@@ -65,7 +65,7 @@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- 
--bin_PROGRAMS = aview aaflip
-+bin_PROGRAMS = @BIN_PROGRAMS@
- aview_SOURCES = image.c main.c shrink.c ui.c
- aaflip_SOURCES = flip.c general.c
- bin_SCRIPTS = asciiview
diff --git a/graphics/aview-x11/patches/patch-ab b/graphics/aview-x11/patches/patch-ab
deleted file mode 100644
index de695930e2e..00000000000
--- a/graphics/aview-x11/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/30 11:41:55 agc Exp $
-
---- asciiview.orig	Wed Apr 25 17:59:22 2001
-+++ asciiview
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # asciiview - an ascii art image browser script. Front end for aview/aaflip
- clear()
- {
diff --git a/graphics/aview-x11/patches/patch-ac b/graphics/aview-x11/patches/patch-ac
deleted file mode 100644
index eda2378d4af..00000000000
--- a/graphics/aview-x11/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/05/07 02:43:51 danw Exp $
-
---- image.c.orig	Thu May  6 22:36:27 2004
-+++ image.c
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include <unistd.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "config.h"
- 
- int imgwidth, imgheight;
diff --git a/graphics/aview-x11/patches/patch-ad b/graphics/aview-x11/patches/patch-ad
deleted file mode 100644
index 6df1f9ab1e9..00000000000
--- a/graphics/aview-x11/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/05/07 02:43:51 danw Exp $
-
---- ui.c.orig	Thu May  6 22:36:30 2004
-+++ ui.c
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <aalib.h>
- #include "shrink.h"
diff --git a/graphics/aview/DESCR b/graphics/aview/DESCR
index 32c29d20cc9..9cf47d06714 100644
--- a/graphics/aview/DESCR
+++ b/graphics/aview/DESCR
@@ -15,5 +15,3 @@ dT     8  8     Tb  aview features:
  * Hidden "bonus" features :)
  * Inversion
  * Support for bright, dim, inverse attributes/extended character set
-
-This package is built without X11 support.
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index a1063760bd7..609a0ce6b1e 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:44 wiz Exp $
 #
 
 DISTNAME=	aview-1.3.0rc1
 PKGNAME=	aview-1.3.0.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
 
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 5d2f8a34c40..c0e658b04d9 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2005/08/03 11:58:14 adam Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/11 09:40:45 wiz Exp $
 
 DISTNAME=	blender-2.37a
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
 		http://download.blender.org/source/
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 9fbc36f0ca3..b504afe382f 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/11/02 06:56:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:45 wiz Exp $
 
 DISTNAME=	kipi-plugins-0.1.0-rc1
 PKGNAME=	kipi-plugins-0.1.0rc1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=digikam/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 3af10e6c162..77ddd4ff7d2 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:22 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=	tuxpaint-0.9.14
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxpaint/} \
 		ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/source/
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index d5ea637afe2..29ce0ae5c54 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=		vp-1.5
-PKGREVISION=	3
+PKGREVISION=		4
 CATEGORIES=		graphics
 MASTER_SITES=		http://math.smsu.edu/~erik/files/