[pkgsrc/trunk]: pkgsrc/comms/kermit Switch license to modified-bsd. Move sock...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d1be5bf37fa
branches:  trunk
changeset: 644795:3d1be5bf37fa
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Jan 17 15:30:03 2015 +0000

description:
Switch license to modified-bsd. Move socks4 option over to use dante.
Patch provided by Kirk Russell in PR pkg/49546.

diffstat:

 comms/kermit/Makefile   |  9 ++++++---
 comms/kermit/options.mk |  8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r a788892d8bdb -r 3d1be5bf37fa comms/kermit/Makefile
--- a/comms/kermit/Makefile     Sat Jan 17 15:25:31 2015 +0000
+++ b/comms/kermit/Makefile     Sat Jan 17 15:30:03 2015 +0000
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.86 2014/10/05 16:27:25 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2015/01/17 15:30:03 bsiegert Exp $
 
 DISTNAME=      cku302
 PKGNAME=       kermit-9.0.302
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    comms
 MASTER_SITES=  ftp://ftp.kermitproject.org/kermit/archives/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.kermitproject.org/
 COMMENT=       Network and serial communication, file transfer, and scripting utility
-LICENSE=       kermit-license
+
+# UNIX C-Kermit 9.0 has been released with the Revised 3-Clause BSD License.
+# http://www.columbia.edu/kermit/licensing.html
+LICENSE= modified-bsd
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r a788892d8bdb -r 3d1be5bf37fa comms/kermit/options.mk
--- a/comms/kermit/options.mk   Sat Jan 17 15:25:31 2015 +0000
+++ b/comms/kermit/options.mk   Sat Jan 17 15:30:03 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2011/08/25 14:54:06 hans Exp $
+# $NetBSD: options.mk,v 1.5 2015/01/17 15:30:03 bsiegert Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.kermit
 PKG_SUPPORTED_OPTIONS=         kermit-suid-uucp ssl kerberos
@@ -22,9 +22,9 @@
 ### SOCKS firewall support.
 ###
 .if !empty(PKG_OPTIONS:Msocks4)
-KFLAGS+=       -DSOCKS
-LIBS+=         -L${BUILDLINK_PREFIX.socks4}/lib -lsocks4
-.include "../../net/socks4/buildlink3.mk"
+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