diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cdk/Makefile | 14 | ||||
| -rw-r--r-- | devel/cdk/distinfo | 4 | ||||
| -rw-r--r-- | devel/cdk/patches/patch-aj | 99 |
3 files changed, 26 insertions, 91 deletions
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile index c29981d840d..a9103e8bc05 100644 --- a/devel/cdk/Makefile +++ b/devel/cdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/08/27 14:35:07 tron Exp $ +# $NetBSD: Makefile,v 1.16 2002/08/26 18:28:20 jlam Exp $ # DISTNAME= latestCDK @@ -14,20 +14,13 @@ COMMENT= Curses Development Kit BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf +USE_BUILDLINK2= yes +USE_NCURSES= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include # for ncurses.h ALL_TARGET= default -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -DEPENDS+= ncurses>=4.2:../../devel/ncurses -.elif ${OPSYS} == "SunOS" -MAKE_ENV+= CPPFLAGS= -.endif - pre-configure: cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf @@ -37,4 +30,5 @@ post-install: ${INSTALL_DATA} $${file} ${PREFIX}/share/examples/cdk/; \ done +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cdk/distinfo b/devel/cdk/distinfo index 93966cf7995..6130a22cafd 100644 --- a/devel/cdk/distinfo +++ b/devel/cdk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:13 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/08/26 18:28:20 jlam Exp $ SHA1 (latestCDK.tgz) = 0751eb6099d43e8d1f4e8b86d5684cc039310194 Size (latestCDK.tgz) = 267523 bytes @@ -8,4 +8,4 @@ SHA1 (patch-ad) = c21828919b4a20c21f70fd28464e67ac8d8ad13b SHA1 (patch-ae) = 92fdce7886c7ace9e97ca47921a86a2c7ed6e810 SHA1 (patch-af) = a21d7f7121d054c58830ad04264c2f74912ffab4 SHA1 (patch-ag) = 4de8de13346740c5b1a55e5f95195981c1372434 -SHA1 (patch-aj) = cb1848e70504eb69f12daa1b6bca70fa60265d0f +SHA1 (patch-aj) = 2fc8cccfa2a7da1b11c77954fbbcda6de79ce70f diff --git a/devel/cdk/patches/patch-aj b/devel/cdk/patches/patch-aj index 0e3ea96e1cf..1636a1e38af 100644 --- a/devel/cdk/patches/patch-aj +++ b/devel/cdk/patches/patch-aj @@ -1,87 +1,28 @@ -$NetBSD: patch-aj,v 1.2 1999/08/29 15:29:41 jlam Exp $ +$NetBSD: patch-aj,v 1.3 2002/08/26 18:28:21 jlam Exp $ ---- 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" +--- configure.in.orig Thu Jul 8 21:16:31 1999 ++++ configure.in +@@ -4,19 +4,6 @@ dnl + AC_INIT(include/cdk.h) + dnl +-dnl This looks for a library in several 'standard' locations. +-dnl +-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" +- 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,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" -+fi -+ - +- fi +- done]) +- +-dnl + dnl This looks for the given type in the header file. dnl - dnl Checks for library functions. -@@ -98,19 +119,5 @@ + AC_DEFUN(CDK_FIND_TYPE, [ +@@ -98,19 +85,5 @@ dnl dnl Set pre-processor compile time variables. dnl AC_CHECK_FUNC(XCursesExit, AC_DEFINE(HAVE_XCURSES)) |