 @@ -1,63 +1,74 @@
-# $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/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.columbia.edu/kermit/
 COMMENT=	Network and serial communication, file transfer, and scripting utility
 LICENSE=	kermit-license
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/bsd.prefs.mk"
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 BUILD_DEFS+=	KFLAGS LIBS MANINSTALL
 MAKE_ENV+=	KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
 MAKE_FILE=	makefile
 #KFLAGS+=	-DNODEBUG -DNOOLDMODEMS
 KFLAGS+=	${BUILDLINK_CPPFLAGS}
 LIBS+=		${BUILDLINK_LDFLAGS}
 .include "options.mk"
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/kermit
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wermit ${DESTDIR}${PREFIX}/bin/kermit
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/kermit
 	${INSTALL_MAN} ${WRKSRC}/ckuker.nr \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kermit.1; \
 .for p in NetBSD-1.3*
 .  if ${MACHINE_PLATFORM:M${p}} != ""
 LIBS+=		-ltermcap
 .  endif
 .endfor
 .include "../../mk/curses.buildlink3.mk"
 .if ${OPSYS} == "Darwin"
 .  if !empty(OS_VERSION:M??.*)
 BUILD_TARGET_OPSYS=	macosx10.6
 .  elif !empty(OS_VERSION:M9.*)
 BUILD_TARGET_OPSYS=	macosx10.5
 .  elif !empty(OS_VERSION:M8.*)
 BUILD_TARGET_OPSYS=	macosx10.4
 .  elif empty(OS_VERSION:M7.*)
 BUILD_TARGET_OPSYS=	macosx103.9
 .  else
 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
 BUILD_TARGET_OPSYS=	netbsd
 .endif
 BUILD_TARGET=	${BUILD_TARGET_OPSYS}${BUILD_TARGET_OPTIONS:ts}
 .include "../../mk/bsd.pkg.mk"

 @@ -1,17 +1,17 @@
-$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
 SHA1 (patch-af) = 2a09f9f933d3c1e6860983d8138ac61f33306ef7
 SHA1 (patch-ag) = cae37680ea5af85f4d2c774fe230f73a1f0be48c
 SHA1 (patch-ah) = 5b2098dfd57f8bd4d107acafaabe1a2c9b97d037
 SHA1 (patch-ai) = 975a18c41b7fc031515bda5c4a9c284e80c9d1a4
 SHA1 (patch-aj) = 6468e2139639f601de4609db8dff07b8b3a82d82
 SHA1 (patch-ak) = 9ded2d7cc3a83158edfbbe87851f892ccb09df0b
 SHA1 (patch-al) = 48438352380a74e19951fe669cb176d3c62d537d
 SHA1 (patch-am) = 8c5acbfefe7b7d11825cc32c4449582b51f6cad9

 @@ -1,17 +1,25 @@
-$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
+* Get K5LIB, K5INC, SSLLIB and SSLINC from pkgsrc.
-+++ makefile	2011-08-25 16:36:42.000000000 +0200
+* 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
  K4INC=-I/usr/kerberos/include
 -K5LIB=-L/usr/kerberos/lib
 -K5INC=-I/usr/kerberos/include
 +#K5LIB=-L/usr/kerberos/lib
 +#K5INC=-I/usr/kerberos/include
  SRPLIB=-L$(srproot)/lib
  SRPINC=-I$(srproot)/include
 -SSLLIB=-L$(sslroot)/ssl/lib
 -SSLINC=-I$(sslroot)/ssl/include
 +#SSLLIB=-L$(sslroot)/ssl/lib
 @@ -45,13 +53,36 @@ $NetBSD: patch-aa,v 1.9 2011/08/25 14:54
 +	-lsocket -lnsl -lm -lresolv -lssl -lcrypto -lpam -lz $(LIBS)"
  #Ditto but with GCC 3.1 in which you have to specify 32-bit with -m32.
  #In Solaris 9 (and maybe 8) you'll also need specifiy the Library path.
 @@ -3899,7 +3899,7 @@ solaris9g+krb5+ssl solaris10g+krb5+ssl s
  	-DCK_CURSES -DCK_NEWTERM -DDIRENT -DHDBUUCP -DTCPSOCKET  -DBIGBUFOK \
  	-DCK_AUTHENTICATION -DCK_SSL -DZLIB -DCK_KERBEROS -DKRB5 \
  	-DCK_ENCRYPTION -DCK_CAST $$OPENSSLOPTION \
 -	$$HAVE_DES $(SSLINC) $(K5INC) $(K5INC)/krb5 $(KFLAGS)" \
 +	$$HAVE_DES $(SSLINC) $(K5INC) $(K5INC)/kerberosv5 $(KFLAGS)" \
  	"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 ; \