1) Add missing mk/curses buildlink.

2) Pass BUILDLINK_CPPFLAGS and BUILDLINK_LDFLAGS to the make process.
3) Have the build variables  HAVE_LIBCURSES and HAVE_CURSES needed for the
   linux build set the by pkgsrc.

Bump PKGREVISION

3 files changed, 48 insertions, 6 deletions

diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 41d9a7d2ec4..f10d846e644 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2011/11/20 12:01:50 tron Exp $
+# $NetBSD: Makefile,v 1.79 2011/12/06 01:19:15 sbd Exp $
 
 DISTNAME=	cku302
 PKGNAME=	kermit-9.0.302
+PKGREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
 
@@ -21,6 +22,8 @@ MAKE_ENV+=	KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
 MAKE_FILE=	makefile
 
 #KFLAGS+=	-DNODEBUG -DNOOLDMODEMS
+KFLAGS+=	${BUILDLINK_CPPFLAGS}
+LIBS+=		${BUILDLINK_LDFLAGS}
 
 .include "options.mk"
 
@@ -38,6 +41,8 @@ LIBS+=		-ltermcap
 .  endif
 .endfor
 
+.include "../../mk/curses.buildlink3.mk"
+
 .if ${OPSYS} == "Darwin"
 .  if !empty(OS_VERSION:M??.*)
 BUILD_TARGET_OPSYS=	macosx10.6
@@ -52,6 +57,12 @@ BUILD_TARGET_OPSYS=	macosx10
 .  endif
 .elif ${OPSYS} == "Linux"
 BUILD_TARGET_OPSYS=	linux
+MAKE_ENV+=	HAVE_LIBCURSES=-l${BUILDLINK_LIBNAME.curses}
+.  if ${CURSES_TYPE} == "ncurses"
+MAKE_ENV+=	HAVE_CURSES=-DCK_NCURSES
+.  else
+MAKE_ENV+=	HAVE_CURSES=-DCK_NCURSES
+.  endif
 .elif ${OPSYS} == "SunOS"
 BUILD_TARGET_OPSYS=	solaris11g
 .else
diff --git a/comms/kermit/distinfo b/comms/kermit/distinfo
index 5213099fb9e..d9bb821b7c5 100644
--- a/comms/kermit/distinfo
+++ b/comms/kermit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2011/08/25 14:54:06 hans Exp $
+$NetBSD: distinfo,v 1.20 2011/12/06 01:19:15 sbd Exp $
 
 SHA1 (kermit-9.0.302/cku302.tar.gz) = d04c8b5600bc0bb0f163d294881f7a5a0d4395b5
 RMD160 (kermit-9.0.302/cku302.tar.gz) = ef3a71b5a42868c80408ac09662d00b71da0b0c8
 Size (kermit-9.0.302/cku302.tar.gz) = 3122219 bytes
-SHA1 (patch-aa) = 58b2a3d95d1671dccbd1742b18618dbc3ec1fe8e
+SHA1 (patch-aa) = fd3a613ce3cd3755a2e3b8baf33df33593713024
 SHA1 (patch-ab) = d27c998f44a1d2b53cb2e893d9ef9e8c14292d3f
 SHA1 (patch-ac) = 62cc9e92f2413a42312d9f6d168ee85664b6aab9
 SHA1 (patch-ae) = 53384e9cbfe13559d69ab95215a4575f726dc325
diff --git a/comms/kermit/patches/patch-aa b/comms/kermit/patches/patch-aa
index f13b7a4d6ce..f19baa30d79 100644
--- a/comms/kermit/patches/patch-aa
+++ b/comms/kermit/patches/patch-aa
@@ -1,7 +1,15 @@
-$NetBSD: patch-aa,v 1.9 2011/08/25 14:54:06 hans Exp $
+$NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
 
---- makefile.orig	2011-08-21 17:12:07.000000000 +0200
-+++ makefile	2011-08-25 16:36:42.000000000 +0200
+* Get K5LIB, K5INC, SSLLIB and SSLINC from pkgsrc.
+* s/-lgssapi/-lgssapi_krb5/ on netbsd+krb5* 
+* Add $(LIBS) to link command on solaris2xg+openssl+zlib+pam+shadow
+* s@$(K5INC)/krb5@$(K5INC)/kerberosv5/ on solaris9g+krb5+ssl
+* On linux get HAVE_LIBCURSES and HAVE_CURSES from pkgsrc (with the 
+  curses include and library pathes coming from BUILDLINK_*FLAGS).
+
+
+--- makefile.orig	2011-08-21 15:12:07.000000000 +0000
++++ makefile
 @@ -824,12 +824,12 @@ manroot = $(prefix)
  
  K4LIB=-L/usr/kerberos/lib
@@ -55,3 +63,26 @@ $NetBSD: patch-aa,v 1.9 2011/08/25 14:54:06 hans Exp $
  	"LIBS= $(SSLLIB) $(K5LIB) -lz -lssl -ltermlib -lsocket -lnsl -lm \
  	-lresolv -lcrypto \
  	$$GSSAPILIB -lkrb5 -lcom_err -lk5crypto $$DES_LIB $(LIBS)"
+@@ -6095,22 +6095,6 @@ linux:
+ 	if test `grep openpty /usr/include/pty.h | wc -l` -gt 0; \
+ 	then HAVE_OPENPTY='-DHAVE_OPENPTY'; \
+ 	else HAVE_OPENPTY=''; fi ; \
+-	HAVE_LIBCURSES=''; \
+-	if test -f /usr/lib64/libncurses.so || \
+-	   test -f /usr/lib/libncurses.a  || \
+-	   test -f /usr/lib/libncurses.so; then \
+-	  HAVE_LIBCURSES='-lncurses'; \
+-	else if test -f /usr/lib64/libcurses.so || \
+-	   test -f /usr/lib/libcurses.a || \
+-	   test -f /usr/lib/libcurses.so; then \
+-	     HAVE_LIBCURSES='-lcurses'; fi; fi; \
+-	HAVE_CURSES=''; \
+-	if test -n '$$HAVE_LIBCURSES'; then \
+-	  if test -f /usr/include/ncurses.h; then \
+-	    HAVE_CURSES='-DCK_NCURSES  -I/usr/include/ncurses'; \
+-	  else if test -f /usr/include/curses.h; then \
+-	    HAVE_CURSES='-DCK_CURSES'; \
+-	fi; fi; fi; \
+ 	if test -f /usr/include/baudboy.h || test -f /usr/include/ttylock.h; \
+ 	then HAVE_LOCKDEV='-DHAVE_LOCKDEV' ; \
+ 	else HAVE_LOCKDEV='' ; fi ; \