- Update to version 9.0.301

- Remove no longer needed patches and inplace editing
- Define LICENSE (BSD)
- Fix pty locking on 800045 and above
- Simplify documentation installation

Tested with:	emulators/x48

4 files changed, 31 insertions, 28 deletions

diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index d94eaf7689f2..8bb4e32f4dc1 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	kermit
-PORTVERSION=	8.0.211
+PORTVERSION=	9.0.301
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/ \
 		ftp://ftp.icm.edu.pl/pub/kermit/archives/
-DISTNAME=	cku211
+DISTNAME=	cku${PORTVERSION:E}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Combined network and serial communication package
 
+LICENSE=	BSD
+
 USE_OPENSSL=	yes
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
@@ -37,21 +39,14 @@ MAKE_ARGS=	KTARGET=freebsd CC="${CC}" CC2="${CC}" \
 
 .include <bsd.port.pre.mk>
 
-# Derive correct version of our beloved OS; default routine is not robust
-# enough to handle all cases correctly.
+# Explicitly pass version of our beloved OS; upstream routine is not robust
+# enough to handle all cases correctly
 HERALD!=	${UNAME} -sr | ${CUT} -d - -f 1
 
 post-patch:
-# FreeBSD has hexdump(3) in libutil, which conflicts with local macro.
-# Prepend the latter with two underscores to avoid the clash.
-	@${REINPLACE_CMD} -E 's,([[:blank:]])(hexdump),\1__\2,' \
-		${WRKSRC}/ck_crp.c ${WRKSRC}/ckcdeb.h ${WRKSRC}/ckcftp.c \
-		${WRKSRC}/ckcnet.c ${WRKSRC}/ckctel.c ${WRKSRC}/ckuath.c \
-		${WRKSRC}/ckutio.c
 # Catch up with recent <utmp.h> replacement by <utmpx.h>
 .if ${OSVERSION} > 900006
 	@${REINPLACE_CMD} -e 's,ut\.ut_name,ut.ut_user,g' \
-		-e 's,sizeof(struct utmp),sizeof(ut),' \
 		-e 's,UNIXWARE,FREEBSD4,' ${WRKSRC}/ckufio.c
 .endif
 
@@ -60,11 +55,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/ckuker.nr ${PREFIX}/man/man1/kermit.1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ckaaaa.txt ${DOCSDIR}/READ.ME
-.for file in COPYING.TXT ckcbwr.txt ckccfg.txt ckcplm.txt ckermit70.txt \
-	ckermit80.txt ckubwr.txt ckuins.txt ckututor.txt
-		${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
+	${LN} -sf ckaaaa.txt ${DOCSDIR}/READ.ME
 .endif
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/comms/kermit/distinfo b/comms/kermit/distinfo
index a5672aeb57ec..f36dc5245c2b 100644
--- a/comms/kermit/distinfo
+++ b/comms/kermit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cku211.tar.gz) = 39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93
-SIZE (cku211.tar.gz) = 2878523
+SHA256 (cku301.tar.gz) = 9793eb125f8936b079c6d7e5c3d2ff885cfedc07f9d2dd1e7db928e3029a211a
+SIZE (cku301.tar.gz) = 3120826
diff --git a/comms/kermit/files/patch-ck_ssl.h b/comms/kermit/files/patch-ck_ssl.h
deleted file mode 100644
index a71c6a1a6729..000000000000
--- a/comms/kermit/files/patch-ck_ssl.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ck_ssl.h.orig	Sun Mar 14 18:08:23 2004
-+++ ck_ssl.h	Thu Sep 29 20:31:23 2005
-@@ -39,6 +39,7 @@
-  * definitions there is no reason to have it included by openssl/evp.h
-  */
- #define OPENSSL_NO_MDC2
-+#undef EM
- #include <openssl/des.h>
- #include <openssl/ssl.h>
- #include <openssl/x509v3.h>
diff --git a/comms/kermit/files/patch-ckutio.c b/comms/kermit/files/patch-ckutio.c
new file mode 100644
index 000000000000..8c42d0573cde
--- /dev/null
+++ b/comms/kermit/files/patch-ckutio.c
@@ -0,0 +1,21 @@
+--- ckutio.c.orig
++++ ckutio.c
+@@ -4879,8 +4879,18 @@
+ #ifdef USETTYLOCK
+     haslock = 0;                        /* Not locked yet. */
+     *flfnam = '\0';			/* Lockfile name is empty. */
++#ifdef __FreeBSD__
++    char *devname;
++    if ((devname = xxlast(ttdev,'/')) != NULL)
++#if __FreeBSD_version < 800045
++      ckstrncpy(lockname,devname+1,DEVNAMLEN);
++#else
++      ckstrncat(lockname,devname+1,DEVNAMLEN-ckstrncpy(lockname,"pts",4));
++#endif
++#else
+     if (!strncmp(ttdev,"/dev/",5) && ttdev[5])
+       ckstrncpy(lockname,ttdev+5,DEVNAMLEN);
++#endif
+     else
+       ckstrncpy(lockname,ttdev,DEVNAMLEN);
+ /*