Update cdk to 4.9.9. The 4.9.8 distfile is gone, necessitating this update.

8 files changed, 35 insertions, 66 deletions

diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index de9934b4b46..fe64f5d7516 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1999/07/06 07:57:20 jlam Exp $
+# $NetBSD: Makefile,v 1.4 1999/08/29 15:29:40 jlam Exp $
 #
 
 DISTNAME=		latestCDK
-PKGNAME=		cdk-4.9.8
+PKGNAME=		cdk-4.9.9
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		devel
 MASTER_SITES=		http://www.vexus.ca/release/
@@ -11,7 +11,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.vexus.ca/CDK.html
 
-BUILD_DEPENDS+=		autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
 DEPENDS+=		ncurses-4.2:../../devel/ncurses
 
 USE_LIBTOOL=		yes
@@ -22,20 +22,12 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 ALL_TARGET=		default
 
 pre-configure:
-	( cd ${WRKSRC}; autoconf )
+	cd ${WRKSRC}; ${LOCALBASE}/bin/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/; \
+	for file in ${WRKSRC}/examples/*.c ${WRKSRC}/examples/Makefile; do \
+		${INSTALL_DATA} $${file} ${PREFIX}/share/examples/cdk/; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cdk/files/md5 b/devel/cdk/files/md5
index 6c096529cd4..0dd181359e6 100644
--- a/devel/cdk/files/md5
+++ b/devel/cdk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/07/06 07:57:21 jlam Exp $
+$NetBSD: md5,v 1.3 1999/08/29 15:29:40 jlam Exp $
 
-MD5 (latestCDK.tgz) = 5e5d4c41af919f58d6c1953018e3ae6d
+MD5 (latestCDK.tgz) = 51b00c111424a4431b2295df5a69a620
diff --git a/devel/cdk/files/patch-sum b/devel/cdk/files/patch-sum
index 4ee2a98d6d1..93b0341a6ff 100644
--- a/devel/cdk/files/patch-sum
+++ b/devel/cdk/files/patch-sum
@@ -1,10 +1,9 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:33 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/29 15:29:41 jlam Exp $
 
-MD5 (patch-aa) = 8d526cd89b55ec7898c610e286651f3b
+MD5 (patch-aa) = e7f5bdff9f83ce835ff9830d0d55dc68
 MD5 (patch-ac) = 4a4f448a1b6a9eb38b6ef63b6a4ad9a2
 MD5 (patch-ad) = 0c54b362e9639c0abeefad0ab72eedec
 MD5 (patch-ae) = fefdf4bb5773fe95464e82e239fa76c1
 MD5 (patch-af) = 39cae69392eeb076420bc17062f3aaf9
 MD5 (patch-ag) = 374a714f7939fe841a946f083491ddca
-MD5 (patch-ai) = 25118c991dce7856f8e39dc6748f3d9e
-MD5 (patch-aj) = 7ff117261930610126e1b33d681f19d8
+MD5 (patch-aj) = 580627dd1bf8b0633e7e3dd741316f52
diff --git a/devel/cdk/patches/patch-aa b/devel/cdk/patches/patch-aa
index 5876aad520f..8cdcda631b0 100644
--- a/devel/cdk/patches/patch-aa
+++ b/devel/cdk/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.2 1999/07/06 07:57:22 jlam Exp $
+$NetBSD: patch-aa,v 1.3 1999/08/29 15:29:41 jlam Exp $
 
---- Makefile.in.orig	Thu Jan 21 11:11:06 1999
-+++ Makefile.in	Tue Jul  6 01:46:36 1999
+--- Makefile.in.orig	Fri Jul  9 01:24:13 1999
++++ Makefile.in	Sun Aug 29 09:59:59 1999
 @@ -31,18 +31,21 @@
  #  SUCH DAMAGE.
  # 
  
 -CDKLIB		= libcdk.a
 +CDKLIB		= libcdk.la
- VERSION		= 4.9.8
+ VERSION		= 4.9.9
 -CFLAGS		= -Iinclude @CFLAGS@ @DEFS@
 -CC		= @CC@
 +SHLIB_MAJOR	= 4
-+SHLIB_MINOR	= 9
++SHLIB_MINOR	= 10
 +CFLAGS		= -Iinclude @CFLAGS@ @DEFS@ @CPPFLAGS@
 +CC		= ${LIBTOOL} --mode=compile @CC@
  LDFLAGS		= @LDFLAGS@
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.2 1999/07/06 07:57:22 jlam Exp $
  cdklib $(CDKLIB): $(CDKOBJS)
 -	$(AR) -cr $(CDKLIB) $(CDKOBJS)
 -	$(RANLIB) $(CDKLIB)
-+	${LIBTOOL} --mode=link ${CC} -o ${CDKLIB} ${CDKOBJS:.o=.lo} \
++	${LIBTOOL} --mode=link @CC@ -o ${CDKLIB} ${CDKOBJS:.o=.lo} \
 +		-rpath ${LIB_DIR} -version-info ${SHLIB_MAJOR}:${SHLIB_MINOR}
  
  #
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.2 1999/07/06 07:57:22 jlam Exp $
  	fi
 -	@echo "	$(INSTALL) $(CDKLIB) $(LIB_DIR)"
 -	@$(INSTALL) $(CDKLIB) $(LIB_DIR)
-+	@echo "	${LIBTOOL} --mode=install $(INSTALL) $(CDKLIB) $(LIB_DIR)"
++	@echo " ${LIBTOOL} --mode=install $(INSTALL) $(CDKLIB) $(LIB_DIR)"
 +	@${LIBTOOL} --mode=install $(INSTALL) $(CDKLIB) $(LIB_DIR)
  
  #
diff --git a/devel/cdk/patches/patch-ai b/devel/cdk/patches/patch-ai
deleted file mode 100644
index 680009d69b2..00000000000
--- a/devel/cdk/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
index df85054545e..0e3ea96e1cf 100644
--- a/devel/cdk/patches/patch-aj
+++ b/devel/cdk/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 1999/07/06 07:57:26 jlam Exp $
+$NetBSD: patch-aj,v 1.2 1999/08/29 15:29:41 jlam Exp $
 
---- configure.in.orig	Thu Jan 21 11:09:56 1999
-+++ configure.in	Tue Jul  6 01:41:27 1999
+--- configure.in.orig	Fri Jul  9 00:16:31 1999
++++ configure.in	Sun Aug 29 10:25:46 1999
 @@ -9,10 +9,10 @@
  AC_DEFUN(CDK_FIND_LIB, [
  	eval "cdk_$2_lib=no"
@@ -68,18 +68,20 @@ $NetBSD: patch-aj,v 1.1 1999/07/06 07:57:26 jlam Exp $
  else
     AC_DEFINE(HAVE_COLOR)
  fi
-@@ -86,7 +103,9 @@
+@@ -86,7 +103,11 @@
  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"
++if test "$cdk_chtype_type" != "no"; then
++   CFLAGS="$CFLAGS -DHAVE_CHTYPE=$value"
 +fi
++
  
  dnl
  dnl Checks for library functions.
-@@ -98,21 +117,5 @@
+@@ -98,19 +119,5 @@
  dnl Set pre-processor compile time variables.
  dnl
  AC_CHECK_FUNC(XCursesExit, AC_DEFINE(HAVE_XCURSES))
@@ -93,9 +95,7 @@ $NetBSD: patch-aj,v 1.1 1999/07/06 07:57:26 jlam Exp $
 -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
+-else
 -   LIBS="$LIBS -lcurses"
 -   CFLAGS="$CFLAGS -DHAVE_LIBNCURSES=0"
 -fi
diff --git a/devel/cdk/pkg/DESCR b/devel/cdk/pkg/DESCR
index a5b1472ade2..6af605dfee3 100644
--- a/devel/cdk/pkg/DESCR
+++ b/devel/cdk/pkg/DESCR
@@ -1,6 +1,5 @@
-Cdk stands for 'Curses Development Kit' and it currently contains 21 ready
-to use widgets which facilitate the speedy development of full screen
-curses programs. This little project of mine started as a test to see how
-compatible my Linux machine was to other UNIX breeds. While doing this I 
-discovered Ncurses, and played with it. These widgets are the result of
-over a years worth of playing. The current complement of widgets are:
+CDK is a widget set developed on top of the basic curses
+library. It contains 21 ready to use widgets. Some which
+are a text entry field, a scrolling list, a selection list,
+a alphalist, pull-down menu, radio list, viewer widget,
+dialog box, and many more.
diff --git a/devel/cdk/pkg/PLIST b/devel/cdk/pkg/PLIST
index 1acea55168e..1edd0fa2d9e 100644
--- a/devel/cdk/pkg/PLIST
+++ b/devel/cdk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/07/06 07:57:26 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/08/29 15:29:41 jlam Exp $
 include/cdk/alphalist.h
 include/cdk/binding.h
 include/cdk/buttonbox.h
@@ -28,7 +28,7 @@ include/cdk/swindow.h
 include/cdk/template.h
 include/cdk/viewer.h
 lib/libcdk.a
-lib/libcdk.so.4.9
+lib/libcdk.so.4.10
 man/man3/cdk_alphalist.3
 man/man3/cdk_binding.3
 man/man3/cdk_buttonbox.3
@@ -63,6 +63,7 @@ share/doc/cdk/INSTALL
 share/doc/cdk/NOTES
 share/doc/cdk/README
 share/doc/cdk/TODO
+share/examples/cdk/Makefile
 share/examples/cdk/alphalist_ex.c
 share/examples/cdk/bind_ex.c
 share/examples/cdk/buttonbox_ex.c