* Update to cdk-4.9.8.

    * Update ncurses dependency.
    * Update MASTER_SITE and HOMEPAGE to new locations.
    * Libtoolize library build.

13 files changed, 269 insertions, 202 deletions

diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 344fceac94b..de9934b4b46 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,18 +1,41 @@
-# $NetBSD: Makefile,v 1.2 1999/01/21 20:43:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/07/06 07:57:20 jlam Exp $
 #
 
-DISTNAME=	cdk4x9x6
-PKGNAME=	cdk-4.9.6
-WRKSRC=		${WRKDIR}/${PKGNAME}
-CATEGORIES=	devel
-MASTER_SITES=	http://www.datasoft.on.ca/~cdk/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		latestCDK
+PKGNAME=		cdk-4.9.8
+WRKSRC=			${WRKDIR}/${PKGNAME}
+CATEGORIES=		devel
+MASTER_SITES=		http://www.vexus.ca/release/
+EXTRACT_SUFX=		.tgz
 
-MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://www.datasoft.on.ca/~cdk
+MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://www.vexus.ca/CDK.html
 
-DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
+BUILD_DEPENDS+=		autoconf:../../devel/autoconf
+DEPENDS+=		ncurses-4.2:../../devel/ncurses
 
-MAKE_ENV+=	WRKSRC=${WRKSRC}
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CPPFLAGS+=		-I${LOCALBASE}/include	# for ncurses.h
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+
+ALL_TARGET=		default
+
+pre-configure:
+	( cd ${WRKSRC}; autoconf )
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cdk
+	for file in \
+		alphalist_ex.c bind_ex.c buttonbox_ex.c calendar_ex.c \
+		cdkscreen_ex.c dialog_ex.c entry_ex.c fselect_ex.c \
+		graph_ex.c hello_ex.c histogram_ex.c itemlist_ex.c \
+		label_ex.c marquee_ex.c matrix_ex.c mentry_ex.c menu_ex.c \
+		position_ex.c preprocess_ex.c radio_ex.c scale_ex.c \
+		scroll_ex.c selection_ex.c slider_ex.c subwindow_ex.c \
+		swindow_ex.c template_ex.c tst.c viewer_ex.c vinstall.c; do \
+		${INSTALL_DATA} ${WRKSRC}/examples/$${file} \
+			${PREFIX}/share/examples/cdk/; \
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cdk/files/md5 b/devel/cdk/files/md5
index 36b452d1c5c..6c096529cd4 100644
--- a/devel/cdk/files/md5
+++ b/devel/cdk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1998/12/01 23:27:36 garbled Exp $
+$NetBSD: md5,v 1.2 1999/07/06 07:57:21 jlam Exp $
 
-MD5 (cdk4x9x6.tgz) = 7b331f963d2aab634149c8d1610ff2d7
+MD5 (latestCDK.tgz) = 5e5d4c41af919f58d6c1953018e3ae6d
diff --git a/devel/cdk/patches/patch-aa b/devel/cdk/patches/patch-aa
index aec57d3d270..5876aad520f 100644
--- a/devel/cdk/patches/patch-aa
+++ b/devel/cdk/patches/patch-aa
@@ -1,82 +1,67 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/12/01 23:27:36 garbled Exp $
---- Makefile.orig	Wed Jul 15 13:27:08 1998
-+++ Makefile	Tue Dec  1 14:39:56 1998
-@@ -9,14 +9,14 @@
- #	AIX, Alpha, FreeBSD, HPUX, Linux, Linux-xcurses, 
- #	Solaris, Sun, and Irix (SGI)
- #
--OS		= Solaris
-+OS		= NetBSD
- 
- #
- # These reflect where CDK will be installed from and to
- # on your system.
- #
--SRCDIR		= $(HOME)/cdk-$(VERSION)
--INST_ROOTDIR	= $(HOME)/local
-+SRCDIR		= $(WRKSRC)
-+INST_ROOTDIR	= $(PREFIX)
+$NetBSD: patch-aa,v 1.2 1999/07/06 07:57:22 jlam Exp $
+
+--- Makefile.in.orig	Thu Jan 21 11:11:06 1999
++++ Makefile.in	Tue Jul  6 01:46:36 1999
+@@ -31,18 +31,21 @@
+ #  SUCH DAMAGE.
+ # 
  
- #
- # Set some informational variables.
-@@ -51,7 +51,7 @@
- INST_LIBDIR	= ${INST_ROOTDIR}/lib
- INST_INCDIR	= ${INST_ROOTDIR}/include
- INST_MANDIR	= ${INST_ROOTDIR}/man/man3
--INST_SRCDIR	= ${INST_ROOTDIR}/src/cdk
-+INST_SRCDIR	= ${INST_ROOTDIR}/share/examples/cdk
+-CDKLIB		= libcdk.a
++CDKLIB		= libcdk.la
+ VERSION		= 4.9.8
+-CFLAGS		= -Iinclude @CFLAGS@ @DEFS@
+-CC		= @CC@
++SHLIB_MAJOR	= 4
++SHLIB_MINOR	= 9
++CFLAGS		= -Iinclude @CFLAGS@ @DEFS@ @CPPFLAGS@
++CC		= ${LIBTOOL} --mode=compile @CC@
+ LDFLAGS		= @LDFLAGS@
+ LIBS		= @LIBS@
+ RANLIB		= @RANLIB@
+-INSTALL		= @INSTALL@
++INSTALL		= ${BSD_INSTALL_DATA}
+ INSTALL_DIR	= @prefix@
+ INCLUDE_DIR	= $(INSTALL_DIR)/include/cdk
+ LIB_DIR		= $(INSTALL_DIR)/lib
+ MAN_DIR		= $(INSTALL_DIR)/man/man3
++DOC_DIR		= $(INSTALL_DIR)/share/doc/cdk
  
- #
- # Add what ever flags you need for the CFLAGS. The following lists all of 
-@@ -80,7 +80,7 @@
- # NOSTRERR	Your library does not have		Sun
- #		the library function strerr.
- # 
--EXTRA_CFLAGS = -g -Wall
-+EXTRA_CFLAGS = -Wall -I.
+ default:: cdklib
  
- ###############################################################
- #         Do Not Change Anything Below This Line
-@@ -143,9 +143,9 @@
- #
+@@ -76,8 +79,8 @@
  # Standard library directive.
  #
--cdklib $(CDKLIB): $(CDKOBJS)
--	@ar r $(CDKLIB) $(CDKOBJS)
--	@$(RANLIB)
-+#cdklib $(CDKLIB): $(CDKOBJS)
-+#	@ar r $(CDKLIB) $(CDKOBJS)
-+#	@$(RANLIB)
+ cdklib $(CDKLIB): $(CDKOBJS)
+-	$(AR) -cr $(CDKLIB) $(CDKOBJS)
+-	$(RANLIB) $(CDKLIB)
++	${LIBTOOL} --mode=link ${CC} -o ${CDKLIB} ${CDKOBJS:.o=.lo} \
++		-rpath ${LIB_DIR} -version-info ${SHLIB_MAJOR}:${SHLIB_MINOR}
  
  #
- # Shared library directive.
-@@ -214,7 +214,7 @@
- 	   mkdir -p $(INST_SRCDIR); \
- 	fi;
- 	@echo "Installing source example files...";
--	@$(RM) $(INST_SRCDIR)/Makefile;
-+	@-$(RM) $(INST_SRCDIR)/Makefile;
- 	@cp $(EXAMDIR)/examples.make $(INST_SRCDIR)/Makefile;
- 	@(cd $(EXAMDIR); for i in $(EXAMSRC); do \
- 	   echo "	$(INST_SRCDIR)/$$i" ; \
-@@ -364,13 +364,13 @@
+ # Make the examples directory.
+@@ -114,9 +117,12 @@
  #
- # Clean up after ourselves...
+ installCDKReadme::
+ 	@echo "Installing CDK Readme files..."
++	@if [ ! -d $(DOC_DIR) ]; then \
++	   mkdir -p $(DOC_DIR); \
++	fi
+ 	@for i in $(CDKREADME); do \
+-	   echo "	$(INSTALL) $$i $(INCLUDE_DIR)"; \
+-	   $(INSTALL) $$i $(INCLUDE_DIR); \
++	   echo "	$(INSTALL) $$i $(DOC_DIR)"; \
++	   $(INSTALL) $$i $(DOC_DIR); \
+ 	done
+ 
  #
--clean::
--	@echo "Cleaning files up..."
--	$(RM) *.o $(CDKLIB) $(CDKSLIB) inst/*.o
--	$(RM) core tst inst/vinstall inst/*.list
--	(cd $(EXAMDIR); make clean)
--	(cd $(CLIDIR); make clean)
--	(cd $(DEMODIR); make clean)
-+#clean::
-+#	@echo "Cleaning files up..."
-+#	$(RM) *.o $(CDKLIB) $(CDKSLIB) inst/*.o
-+#	$(RM) core tst inst/vinstall inst/*.list
-+#	(cd $(EXAMDIR); make clean)
-+#	(cd $(CLIDIR); make clean)
-+#	(cd $(DEMODIR); make clean)
+@@ -127,8 +133,8 @@
+ 	@if [ ! -d $(LIB_DIR) ]; then \
+ 	   mkdir $(LIB_DIR); \
+ 	fi
+-	@echo "	$(INSTALL) $(CDKLIB) $(LIB_DIR)"
+-	@$(INSTALL) $(CDKLIB) $(LIB_DIR)
++	@echo "	${LIBTOOL} --mode=install $(INSTALL) $(CDKLIB) $(LIB_DIR)"
++	@${LIBTOOL} --mode=install $(INSTALL) $(CDKLIB) $(LIB_DIR)
  
  #
- # This makes the test program.
+ # This installs the CDK man pages.
diff --git a/devel/cdk/patches/patch-ab b/devel/cdk/patches/patch-ab
deleted file mode 100644
index d3556adddda..00000000000
--- a/devel/cdk/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/01/21 20:43:24 frueauf Exp $
-
---- makefiles/Makefile.NetBSD.orig	Thu Jan 21 11:55:10 1999
-+++ makefiles/Makefile.NetBSD	Thu Jan 21 12:02:22 1999
-@@ -0,0 +1,21 @@
-+#
-+# BSD style makefile for Cdk.
-+#
-+
-+#
-+# Define all needed variables.
-+#
-+COMPILE_OS	= "NetBSD"
-+LIB		= cdk
-+SHLIB_MAJOR	= 4
-+SHLIB_MINOR	= 8
-+SRCS		= $(CDKSRC)
-+MAN3		= $(CDKSRC:%=man/%)
-+
-+#
-+# Include the global FreeBSD makefile def's
-+#
-+NOLINT = 1
-+LIBDIR = ${PREFIX}/lib
-+.include <bsd.lib.mk>
-+CFLAGS += -I. -DNCURSES -I${PREFIX}/include
diff --git a/devel/cdk/patches/patch-ac b/devel/cdk/patches/patch-ac
index 62332f96eef..b67284f1df0 100644
--- a/devel/cdk/patches/patch-ac
+++ b/devel/cdk/patches/patch-ac
@@ -1,21 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1998/12/02 10:59:37 frueauf Exp $
+$NetBSD: patch-ac,v 1.3 1999/07/06 07:57:22 jlam Exp $
 
---- cdk.h.orig	Tue Apr  7 09:24:54 1998
-+++ cdk.h	Tue Dec  1 16:08:34 1998
-@@ -34,11 +34,20 @@
-  * SUCH DAMAGE.
-  */
- 
-+/*#ifdef __NetBSD__
-+#define _maxx maxx
-+#define _maxy maxy
-+#define _begx begx
-+#define _begy begy
-+#define _curx curx
-+#define _cury cury
-+#endif*/
-+
- #ifdef	CDK_PERL_EXT
+--- include/cdk.h.orig	Wed Dec  9 12:13:17 1998
++++ include/cdk.h	Tue Jul  6 00:56:37 1999
+@@ -38,7 +38,7 @@
  #undef	instr
  #endif
  
diff --git a/devel/cdk/patches/patch-ad b/devel/cdk/patches/patch-ad
index 87e617b50e8..eb32c3c6185 100644
--- a/devel/cdk/patches/patch-ad
+++ b/devel/cdk/patches/patch-ad
@@ -1,7 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 1998/12/01 23:27:36 garbled Exp $
---- entry.c.orig	Tue Dec  1 14:09:46 1998
-+++ entry.c	Tue Dec  1 14:10:02 1998
-@@ -371,7 +371,7 @@
+$NetBSD: patch-ad,v 1.2 1999/07/06 07:57:22 jlam Exp $
+
+--- entry.c.orig	Mon Dec 14 15:21:54 1998
++++ entry.c	Tue Jul  6 00:57:47 1999
+@@ -376,7 +376,7 @@
                   }
                   break;
        
diff --git a/devel/cdk/patches/patch-ae b/devel/cdk/patches/patch-ae
index e58137a1bf4..b45ded55fe4 100644
--- a/devel/cdk/patches/patch-ae
+++ b/devel/cdk/patches/patch-ae
@@ -1,12 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 1998/12/01 23:27:36 garbled Exp $
---- matrix.c.orig	Tue Dec  1 14:10:31 1998
-+++ matrix.c	Tue Dec  1 14:10:45 1998
-@@ -469,7 +470,7 @@
+$NetBSD: patch-ae,v 1.2 1999/07/06 07:57:23 jlam Exp $
+
+--- matrix.c.orig	Mon Dec 14 15:45:35 1998
++++ matrix.c	Tue Jul  6 00:59:09 1999
+@@ -470,7 +470,7 @@
              case CDK_ENDOFLINE :
                   break;
  
 -            case KEY_BACKSPACE : case DELETE : case '' : case KEY_DC :
-+            case KEY_BACKSPACE : case DELETE : case '' : /*case KEY_DC : */
++            case KEY_BACKSPACE : case DELETE : case '' : /* case KEY_DC : */
                   if (matrix->colvalues[matrix->col] == vVIEWONLY)
                   {
                     Beep();
diff --git a/devel/cdk/patches/patch-af b/devel/cdk/patches/patch-af
index 7c198e73396..2d86292502d 100644
--- a/devel/cdk/patches/patch-af
+++ b/devel/cdk/patches/patch-af
@@ -1,6 +1,7 @@
-$NetBSD: patch-af,v 1.1.1.1 1998/12/01 23:27:36 garbled Exp $
---- cdk/curdefs.h.orig	Tue Dec  1 14:11:18 1998
-+++ cdk/curdefs.h	Tue Dec  1 14:11:41 1998
+$NetBSD: patch-af,v 1.2 1999/07/06 07:57:23 jlam Exp $
+
+--- include/curdefs.h.orig	Thu Dec 10 23:24:06 1998
++++ include/curdefs.h	Tue Jul  6 01:00:28 1999
 @@ -518,4 +518,7 @@
  #ifndef ACS_S2
  #define ACS_S2		'2'
diff --git a/devel/cdk/patches/patch-ag b/devel/cdk/patches/patch-ag
index 891e2544d08..ca1fa172220 100644
--- a/devel/cdk/patches/patch-ag
+++ b/devel/cdk/patches/patch-ag
@@ -1,12 +1,13 @@
-$NetBSD: patch-ag,v 1.1.1.1 1998/12/01 23:27:36 garbled Exp $
---- mentry.c.orig	Tue Dec  1 14:12:57 1998
-+++ mentry.c	Tue Dec  1 14:13:09 1998
-@@ -442,7 +442,7 @@
+$NetBSD: patch-ag,v 1.2 1999/07/06 07:57:23 jlam Exp $
+
+--- mentry.c.orig	Mon Dec 14 15:40:27 1998
++++ mentry.c	Tue Jul  6 01:01:16 1999
+@@ -447,7 +447,7 @@
                   }
                   break;
     
 -            case DELETE : case KEY_BACKSPACE : case '' : case KEY_DC :
-+            case DELETE : case KEY_BACKSPACE : case '' : /*case KEY_DC :*/
++            case DELETE : case KEY_BACKSPACE : case '' : /* case KEY_DC : */
                   if (mentry->dispType == vVIEWONLY)
                   {
                      Beep();
diff --git a/devel/cdk/patches/patch-ah b/devel/cdk/patches/patch-ah
deleted file mode 100644
index a5dcea4b5bb..00000000000
--- a/devel/cdk/patches/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1998/12/01 23:27:36 garbled Exp $
---- exam/Makefile.orig	Tue Apr  7 09:25:04 1998
-+++ exam/Makefile	Tue Dec  1 16:12:44 1998
-@@ -5,17 +5,17 @@
- #
- # Change these as needed.
- #
--ROOTDIR	= /export/local
--INCDIR	= -I/usr/include/ncurses -I$(ROOTDIR)/include
--LIBDIR	= -L$(ROOTDIR)/lib
--LIBS	= -lcdk -lcurses -lm
-+ROOTDIR	= /usr/pkg
-+INCDIR	= -I$(ROOTDIR)/include
-+LIBDIR	= -Wl,-R$(ROOTDIR)/lib -L$(ROOTDIR)/lib
-+LIBS	= -lcdk -lncurses -lm
- BINS	= alphalist_ex bind_ex calendar_ex cdkscreen_ex dialog_ex\
- 		entry_ex fselect_ex graph_ex hello_ex histogram_ex\
- 		itemlist_ex label_ex marquee_ex matrix_ex mentry_ex\
- 		menu_ex position_ex preprocess_ex radio_ex scale_ex\
- 		scroll_ex selection_ex slider_ex subwindow_ex\
- 		swindow_ex template_ex viewer_ex vinstall
--CFLAGS	= -g -Wall
-+CFLAGS	= -O -DNCURSES
- CC	= gcc
- default: all
- all: $(BINS)
diff --git a/devel/cdk/patches/patch-ai b/devel/cdk/patches/patch-ai
new file mode 100644
index 00000000000..680009d69b2
--- /dev/null
+++ b/devel/cdk/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 1999/07/06 07:57:26 jlam Exp $
+
+--- configure.orig	Fri Dec 11 11:44:04 1998
++++ configure	Tue Jun 29 21:37:18 1999
+@@ -1344,7 +1344,7 @@
+   cat > conftest.$ac_ext <<EOF
+ #line 1346 "configure"
+ #include "confdefs.h"
+-#include <ncurses>
++#include <ncurses.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:1351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -1447,7 +1447,7 @@
+ 	   value=
+ 	fi
+ 
+-	for dir in /usr/include /usr/local/include /opt/include; do
++	for dir in /usr/include /usr/local/include /opt/include ${LOCALBASE}/include/ncurses; do
+ 	   if test -f ${dir}/curses.h; then
+ 	      count=`grep 'chtype;$' ${dir}/curses.h | grep -c '^typedef'`
+ 	   fi
diff --git a/devel/cdk/patches/patch-aj b/devel/cdk/patches/patch-aj
new file mode 100644
index 00000000000..df85054545e
--- /dev/null
+++ b/devel/cdk/patches/patch-aj
@@ -0,0 +1,103 @@
+$NetBSD: patch-aj,v 1.1 1999/07/06 07:57:26 jlam Exp $
+
+--- configure.in.orig	Thu Jan 21 11:09:56 1999
++++ configure.in	Tue Jul  6 01:41:27 1999
+@@ -9,10 +9,10 @@
+ AC_DEFUN(CDK_FIND_LIB, [
+ 	eval "cdk_$2_lib=no"
+ 
+-	for dir in /usr/local/lib/ /usr/lib/ /usr/5lib/ /usr/ccs/lib/ /opt/lib/; do
++	for dir in ${LOCALBASE}/lib /usr/local/lib/ /usr/lib/ /usr/5lib/ /usr/ccs/lib/ /opt/lib/; do
+ 	   if test -f ${dir}/$1; then
+ 	      LDFLAGS="$LDFLAGS -L$dir"
+-	      eval "cdk_$2_lib=no"
++	      eval "cdk_$2_lib=yes"
+ 	   fi
+ 	done])
+ 
+@@ -29,7 +29,7 @@
+ 	   value=$3
+ 	fi
+ 
+-	for dir in /usr/include /usr/local/include /opt/include; do
++	for dir in /usr/include ${LOCALBASE}/include /usr/local/include /opt/include; do
+ 	   if test -f ${dir}/$1; then
+ 	      count=`grep '$2;$' ${dir}/$1 | grep -c '^typedef'`
+ 	   fi
+@@ -38,7 +38,6 @@
+ 	if test $count -ne 0; then
+ 	   AC_MSG_RESULT("yes")
+ 	   eval "cdk_$2_type=yes"
+-           CFLAGS="$CFLAGS -DHAVE_CHTYPE=$value"
+ 	else
+ 	   AC_MSG_RESULT("no")
+ 	   eval "cdk_$2_type=no"
+@@ -62,14 +61,32 @@
+ fi
+ 
+ dnl
++dnl Set the LDPATH values depending where the
++dnl library is installed. If we found ncurses,
++dnl look for ncurses.
++dnl
++CDK_FIND_LIB(libncurses.a, ncurses)
++if test "$cdk_ncurses_lib" != "no"; then
++   LIBS="$LIBS -lncurses"
++   CFLAGS="$CFLAGS -DHAVE_LIBNCURSES=1"
++fi
++CDK_FIND_LIB(libcurses.a, curses)
++if test "$cdk_curses_lib" != "no"; then
++   if test "$cdk_ncurses_lib" = "no"; then
++      LIBS="$LIBS -lcurses"
++      CFLAGS="$CFLAGS -DHAVE_LIBNCURSES=0"
++   fi
++fi
++
++dnl
+ dnl Checks for libraries. If we have start_color
+ dnl set the HAVE_COLOR define.
+ dnl
+-AC_CHECK_LIB(m,sin)
+-AC_CHECK_LIB(termcap,waddstr)
++AC_CHECK_LIB(m, sin)
++AC_CHECK_LIB(termcap, waddstr)
+ AC_CHECK_LIB(ncurses, start_color)
+ if test "$ac_cv_lib_ncurses_start_color" != yes; then
+-   AC_CHECK_LIB(curses,initscr)
++   AC_CHECK_LIB(curses, initscr)
+ else
+    AC_DEFINE(HAVE_COLOR)
+ fi
+@@ -86,7 +103,9 @@
+ dnl
+ AC_TYPE_MODE_T
+ AC_STRUCT_TM
+-CDK_FIND_TYPE(curses.h, chtype)
++CDK_FIND_TYPE(ncurses.h, chtype)
++if test "$cdk_chtype_type" != "no"; then CFLAGS="$CFLAGS -DHAVE_CHTYPE=$value"
++fi
+ 
+ dnl
+ dnl Checks for library functions.
+@@ -98,21 +117,5 @@
+ dnl Set pre-processor compile time variables.
+ dnl
+ AC_CHECK_FUNC(XCursesExit, AC_DEFINE(HAVE_XCURSES))
+-
+-dnl
+-dnl Set the LDPATH values depending where the
+-dnl library is installed. If we found ncurses,
+-dnl look for ncurses.
+-dnl
+-CDK_FIND_LIB(libncurses.a, cdk_ncurses_lib)
+-if test "$cdk_ncurses_lib" != "no"; then
+-   LIBS="$LIBS -lncurses"
+-   CFLAGS="$CFLAGS -DHAVE_LIBNCURSES=1"
+-fi
+-CDK_FIND_LIB(libcurses.a, cdk_curses_lib)
+-if test "$cdk_ncurses_lib" != "no"; then
+-   LIBS="$LIBS -lcurses"
+-   CFLAGS="$CFLAGS -DHAVE_LIBNCURSES=0"
+-fi
+ 
+ AC_OUTPUT(Makefile examples/Makefile demos/Makefile)
diff --git a/devel/cdk/pkg/PLIST b/devel/cdk/pkg/PLIST
index ce8a49277b3..1acea55168e 100644
--- a/devel/cdk/pkg/PLIST
+++ b/devel/cdk/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/12/01 23:27:36 garbled Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/07/06 07:57:26 jlam Exp $
 include/cdk/alphalist.h
 include/cdk/binding.h
 include/cdk/buttonbox.h
 include/cdk/calendar.h
+include/cdk/cdk.h
 include/cdk/cdk_util.h
 include/cdk/cdkscreen.h
 include/cdk/curdefs.h
@@ -18,7 +19,6 @@ include/cdk/marquee.h
 include/cdk/matrix.h
 include/cdk/mentry.h
 include/cdk/menu.h
-include/cdk/printWidget.h
 include/cdk/radio.h
 include/cdk/scale.h
 include/cdk/scroll.h
@@ -26,21 +26,19 @@ include/cdk/selection.h
 include/cdk/slider.h
 include/cdk/swindow.h
 include/cdk/template.h
-include/cdk/tab.h
 include/cdk/viewer.h
-include/cdk.h
 lib/libcdk.a
-lib/libcdk_p.a
-lib/libcdk_pic.a
-lib/libcdk.so.4.8
-man/man3/cdk.3
+lib/libcdk.so.4.9
 man/man3/cdk_alphalist.3
+man/man3/cdk_binding.3
 man/man3/cdk_buttonbox.3
 man/man3/cdk_calendar.3
+man/man3/cdk_cdk.3
 man/man3/cdk_dialog.3
+man/man3/cdk_display.3
 man/man3/cdk_entry.3
-man/man3/cdk_graph.3
 man/man3/cdk_fselect.3
+man/man3/cdk_graph.3
 man/man3/cdk_histogram.3
 man/man3/cdk_itemlist.3
 man/man3/cdk_label.3
@@ -48,27 +46,33 @@ man/man3/cdk_marquee.3
 man/man3/cdk_matrix.3
 man/man3/cdk_mentry.3
 man/man3/cdk_menu.3
-man/man3/cdk_printWidget.3
+man/man3/cdk_misc.3
 man/man3/cdk_radio.3
 man/man3/cdk_scale.3
+man/man3/cdk_screen.3
 man/man3/cdk_scroll.3
 man/man3/cdk_selection.3
 man/man3/cdk_slider.3
 man/man3/cdk_swindow.3
 man/man3/cdk_template.3
 man/man3/cdk_viewer.3
-man/man3/cdk_screen.3
-man/man3/cdk_binding.3
-man/man3/cdk_display.3
-man/man3/cdk_misc.3
-share/examples/cdk/Makefile
+share/doc/cdk/BUGS
+share/doc/cdk/COPYING
+share/doc/cdk/EXPANDING
+share/doc/cdk/INSTALL
+share/doc/cdk/NOTES
+share/doc/cdk/README
+share/doc/cdk/TODO
 share/examples/cdk/alphalist_ex.c
+share/examples/cdk/bind_ex.c
 share/examples/cdk/buttonbox_ex.c
 share/examples/cdk/calendar_ex.c
+share/examples/cdk/cdkscreen_ex.c
 share/examples/cdk/dialog_ex.c
 share/examples/cdk/entry_ex.c
-share/examples/cdk/graph_ex.c
 share/examples/cdk/fselect_ex.c
+share/examples/cdk/graph_ex.c
+share/examples/cdk/hello_ex.c
 share/examples/cdk/histogram_ex.c
 share/examples/cdk/itemlist_ex.c
 share/examples/cdk/label_ex.c
@@ -76,28 +80,19 @@ share/examples/cdk/marquee_ex.c
 share/examples/cdk/matrix_ex.c
 share/examples/cdk/mentry_ex.c
 share/examples/cdk/menu_ex.c
-share/examples/cdk/printWidget_ex.c
+share/examples/cdk/position_ex.c
+share/examples/cdk/preprocess_ex.c
 share/examples/cdk/radio_ex.c
 share/examples/cdk/scale_ex.c
 share/examples/cdk/scroll_ex.c
 share/examples/cdk/selection_ex.c
 share/examples/cdk/slider_ex.c
+share/examples/cdk/subwindow_ex.c
 share/examples/cdk/swindow_ex.c
 share/examples/cdk/template_ex.c
+share/examples/cdk/tst.c
 share/examples/cdk/viewer_ex.c
-share/examples/cdk/subwindow_ex.c
-share/examples/cdk/bind_ex.c
-share/examples/cdk/hello_ex.c
-share/examples/cdk/position_ex.c
-share/examples/cdk/cdkscreen_ex.c
-share/examples/cdk/preprocess_ex.c
-share/examples/cdk/BUGS
-share/examples/cdk/EXPANDING
-share/examples/cdk/INSTALL
-share/examples/cdk/NOTES
-share/examples/cdk/README
-share/examples/cdk/TODO
-share/examples/cdk/VERSION
-share/examples/cdk/COPYING
-@dirrm include/cdk
+share/examples/cdk/vinstall.c
 @dirrm share/examples/cdk
+@dirrm share/doc/cdk
+@dirrm include/cdk