Import of pkgsrc-2016Q3

comms/kermit/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2015/08/18 07:31:03 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2016/03/05 11:28:10 jperkin Exp $
 
 DISTNAME=	cku302
 PKGNAME=	kermit-9.0.302
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.kermitproject.org/kermit/archives/
 

comms/kermit/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.22 2014/06/23 22:24:24 christos Exp $
+$NetBSD: distinfo,v 1.24 2015/11/07 23:20:59 dholland Exp $
 
 SHA1 (kermit-9.0.302/cku302.tar.gz) = d04c8b5600bc0bb0f163d294881f7a5a0d4395b5
 RMD160 (kermit-9.0.302/cku302.tar.gz) = ef3a71b5a42868c80408ac09662d00b71da0b0c8
+SHA512 (kermit-9.0.302/cku302.tar.gz) = 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
 Size (kermit-9.0.302/cku302.tar.gz) = 3122219 bytes
 SHA1 (patch-aa) = fd3a613ce3cd3755a2e3b8baf33df33593713024
 SHA1 (patch-ab) = 2dd97608d57d7b46630bcff7ec234449e8abe472
@@ -16,3 +17,4 @@ SHA1 (patch-aj) = 6468e2139639f601de4609db8dff07b8b3a82d82
 SHA1 (patch-ak) = 9ded2d7cc3a83158edfbbe87851f892ccb09df0b
 SHA1 (patch-al) = 616ad10e65b24a04d24ff2556d6362ef3cc64b78
 SHA1 (patch-am) = 8c5acbfefe7b7d11825cc32c4449582b51f6cad9
+SHA1 (patch-ckupty.c) = fd8966627f3642550750ccd42e3add64a36dae09

comms/kermit/options.mk

@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.5 2015/01/17 15:30:03 bsiegert Exp $
+# $NetBSD: options.mk,v 1.6 2015/09/30 08:25:37 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.kermit
 PKG_SUPPORTED_OPTIONS=		kermit-suid-uucp ssl kerberos
 PKG_OPTIONS_OPTIONAL_GROUPS+=	socks
-PKG_OPTIONS_GROUP.socks=	socks4 socks5
+PKG_OPTIONS_GROUP.socks=	socks4 dante
 
 .include "../../mk/bsd.options.mk"
 
@@ -25,10 +25,10 @@ SPECIAL_PERMS+=		bin/kermit ${UUCP_USER} ${UUCP_GROUP} 4555
 KFLAGS+=	-DSOCKS -DCK_SOCKS
 LIBS+=		-L${BUILDLINK_PREFIX.dante}/lib -lsocks
 .include "../../net/dante/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Msocks5)
-KFLAGS+=	-DSOCKS -DCK_SOCKS5
-LIBS+=		-L${BUILDLINK_PREFIX.socks5}/lib -lsocks5
-.include "../../net/socks5/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mdante)
+KFLAGS+=	-DSOCKS -DCK_SOCKS
+LIBS+=		-L${BUILDLINK_PREFIX.dante}/lib -lsocks
+.include "../../net/dante/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mkerberos)

comms/kermit/patches/patch-ckupty.c

@@ -0,0 +1,40 @@
+$NetBSD: patch-ckupty.c,v 1.1 2015/11/07 23:20:59 dholland Exp $
+
+Always use termios, never sgtty.h.
+
+--- ckupty.c~	2011-06-13 15:34:13.000000000 +0000
++++ ckupty.c
+@@ -79,33 +79,7 @@ char * ptyver = "PTY support 8.0.016, 22
+ #endif	/* SUNOS41 */
+ 
+ #ifndef USE_TERMIO
+-#ifdef LINUX
+-#define USE_TERMIO
+-#else
+-#ifdef ATTSV
+-#define USE_TERMIO
+-#else
+-#ifdef HPUX
+-#define USE_TERMIO
+-#else
+-#ifdef AIX
+-#define USE_TERMIO
+-#else
+-#ifdef BSD44ORPOSIX
+ #define USE_TERMIO
+-#else
+-#ifdef IRIX60
+-#define USE_TERMIO
+-#else
+-#ifdef QNX
+-#define USE_TERMIO
+-#endif /* QNX */
+-#endif /* IRIX60 */
+-#endif /* BSD44ORPOSIX */
+-#endif /* AIX */
+-#endif /* HPUX */
+-#endif /* ATTSV */
+-#endif /* LINUX */
+ #endif /* USE_TERMIO */
+ 
+ #ifdef QNX