* Remove PLIST.DragonFly, now CHECK_BUILTIN.curses is used.

* Disable gdbm support explicitly.

4 files changed, 15 insertions, 5 deletions

diff --git a/shells/zsh-current/Makefile b/shells/zsh-current/Makefile
index 137af3f75a9..b2a78f3ac87 100644
--- a/shells/zsh-current/Makefile
+++ b/shells/zsh-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/04/05 13:54:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2011/04/05 15:03:44 ryoon Exp $
 
 .include "../../shells/zsh/Makefile.common"
 
@@ -7,6 +7,8 @@ ZSH_MAINTAINER=	ryoon@NetBSD.org
 
 USE_TOOLS+=	env
 
+CONFIGURE_ARGS+=	--disable-gdbm
+
 SUBST_CLASSES+=	prefix-fixup
 SUBST_STAGE.prefix-fixup=	pre-configure
 SUBST_FILES.prefix-fixup= \
diff --git a/shells/zsh-current/PLIST b/shells/zsh-current/PLIST
index ed89d1ad653..9780ce7d42e 100644
--- a/shells/zsh-current/PLIST
+++ b/shells/zsh-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2011/04/05 13:54:24 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.21 2011/04/05 15:03:44 ryoon Exp $
 bin/zsh
 bin/${PKGNAME}
 info/zsh.info
@@ -25,6 +25,7 @@ ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/sched.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/stat.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/system.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/termcap.so
+${PLIST.dynamic}${PLIST.curses}lib/zsh/${PKGVERSION}/zsh/curses.so
 ${PLIST.dynamic}${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/terminfo.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zftp.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zle.so
diff --git a/shells/zsh-current/PLIST.DragonFly b/shells/zsh-current/PLIST.DragonFly
deleted file mode 100644
index 24d9451b870..00000000000
--- a/shells/zsh-current/PLIST.DragonFly
+++ /dev/null
@@ -1 +0,0 @@
-${PLIST.dynamic}lib/zsh/4.3.11/zsh/curses.so
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 69cfbc7cbc8..86f917fdf39 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2010/02/09 00:08:50 zafer Exp $
+# $NetBSD: Makefile.common,v 1.59 2011/04/05 15:03:44 ryoon Exp $
 
 DISTNAME=	zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -33,7 +33,7 @@ BUILD_DEFS+=	ZSH_STATIC
 MAKE_JOBS_SAFE=	no
 INSTALL_TARGET=	install install.info
 PKG_SHELL=	bin/zsh
-PLIST_VARS=	dynamic terminfo
+PLIST_VARS=	dynamic terminfo curses
 
 ################################################################################
 
@@ -80,6 +80,14 @@ CHECK_BUILTIN.terminfo=	yes
 PLIST.terminfo=	yes
 .endif
 
+### curses
+CHECK_BUILTIN.curses=	yes
+.include "../../mk/curses.builtin.mk"
+.if !empty(USE_BUILTIN.curses:M[Yy][Ee][Ss])
+PLIST.curses=	yes
+.endif
+
+
 ################################################################################
 
 # XXXUEBAYASI old make(1) has problems to handle :?true_str:false_str