diff options
author | jlam <jlam> | 1999-08-29 15:29:40 +0000 |
---|---|---|
committer | jlam <jlam> | 1999-08-29 15:29:40 +0000 |
commit | 160479e599ee80314c4c20574943a2f5e1223917 (patch) | |
tree | fa6c05ac3976933f0113612d35f012bb2504ce4a /devel/cdk/patches | |
parent | c4699b101e170a6bed76e0246235fef88a3340d6 (diff) | |
download | pkgsrc-160479e599ee80314c4c20574943a2f5e1223917.tar.gz |
Update cdk to 4.9.9. The 4.9.8 distfile is gone, necessitating this update.
Diffstat (limited to 'devel/cdk/patches')
-rw-r--r-- | devel/cdk/patches/patch-aa | 14 | ||||
-rw-r--r-- | devel/cdk/patches/patch-ai | 22 | ||||
-rw-r--r-- | devel/cdk/patches/patch-aj | 18 |
3 files changed, 16 insertions, 38 deletions
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 |