7 files changed, 46 insertions, 72 deletions

diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index f388af07268b..472cacb3288b 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -6,44 +6,57 @@
 #
 
 PORTNAME=	kermit
-PORTVERSION=	7.0.196
+PORTVERSION=	7.0.197
 CATEGORIES=	comms
-MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
-DISTNAME=	cku196
+MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/ \
+		ftp://ftp.icm.edu.pl/pub/kermit/archives/
+DISTNAME=	cku197
 
 MAINTAINER=	joerg@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
 MAN1=		kermit.1
-MANCOMPRESSED=	yes
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/examples/kermit
-	@${MKDIR} ${PREFIX}/share/doc/kermit
-	${INSTALL_DATA} ${WRKSRC}/ckaaaa.txt ${PREFIX}/share/doc/kermit/READ.ME
+MAKEFILE=	makefile
+ALL_TARGET=	xermit
+MAKE_ARGS=	KTARGET=freebsd \
+		CFLAGS="${CFLAGS} -DBSD44 -DCK_CURSES -DCK_NEWTERM \
+		-DTCPSOCKET -DNOCOTFMC -DFNFLOAT -DUSE_STRERROR \
+		-DFREEBSD4 -DUSE_UU_LOCK" \
+		LIBS="-lncurses -lcrypt -lutil -lm"
+
+DOCDIR=		${PREFIX}/share/doc/kermit
+EXAMPLESDIR=	${PREFIX}/share/examples/kermit
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wermit ${PREFIX}/bin/kermit
+	${INSTALL_MAN} ${WRKSRC}/ckuker.nr ${PREFIX}/man/man1/kermit.1
+	@${MKDIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ckaaaa.txt ${DOCDIR}/READ.ME
 	@for file in ckuaaa.txt ckermit2.txt ckcbwr.txt ckubwr.txt \
-	  ckuins.txt telnet.txt security.txt iksd.txt ckcplm.txt \
-	  ckccfg.txt ; \
+	    ckuins.txt telnet.txt security.txt iksd.txt ckcplm.txt \
+	    ckccfg.txt ; \
 	do \
-	    echo Installing ${PREFIX}/share/doc/kermit/$${file} ... ; \
-	    ${INSTALL_DATA} ${WRKSRC}/$${file} ${PREFIX}/share/doc/kermit/; \
+	    ${ECHO} "Installing ${DOCDIR}/$${file} ..." ; \
+	    ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \
 	done
+	@${MKDIR} ${EXAMPLESDIR}
 	@set -- \
-		ckermit.ini dot.kermrc \
-		ckermod.ini dot.mykermrc \
-		ckurzsz.ini dot.rzszkermrc \
-		ckermit.kdd dot.kdd \
-		ckermit.knd dot.knd \
-		ckermit.ksd dot.ksd \
-		ckedemo.ksc ckedemo.ksc \
-		ckepage.ksc ckepage.ksc \
-		ckevt.ksc ckevt.ksc \
-		iksdpy iksdpy ; \
+	    ckermit.ini dot.kermrc \
+	    ckermod.ini dot.mykermrc \
+	    ckurzsz.ini dot.rzszkermrc \
+	    ckermit.kdd dot.kdd \
+	    ckermit.knd dot.knd \
+	    ckermit.ksd dot.ksd \
+	    ckedemo.ksc ckedemo.ksc \
+	    ckepage.ksc ckepage.ksc \
+	    ckevt.ksc ckevt.ksc \
+	    iksdpy iksdpy ; \
 	while [ $$# -gt 1 ] ; \
 	do \
 	    file=$$1; dst=$$2 ; shift ; shift ; \
-	    echo Installing $${file} as ${PREFIX}/share/examples/kermit/$${dst} ... ; \
-	    ${INSTALL_DATA} ${WRKSRC}/$${file} ${PREFIX}/share/examples/kermit/$${dst}; \
+	    ${ECHO} "Installing $${file} as ${EXAMPLESDIR}/$${dst} ..." ; \
+	    ${INSTALL_DATA} ${WRKSRC}/$${file} ${EXAMPLESDIR}/$${dst}; \
 	done
 
 .include <bsd.port.mk>
diff --git a/comms/kermit/distinfo b/comms/kermit/distinfo
index 6ba516f5f10f..43657a1444b0 100644
--- a/comms/kermit/distinfo
+++ b/comms/kermit/distinfo
@@ -1 +1 @@
-MD5 (cku196.tar.gz) = 5ab767ecc5887aef37c40a282d7bf7db
+MD5 (cku197.tar.gz) = 506e3fe0ccd9dcdce50f214713cbe13a
diff --git a/comms/kermit/files/Makefile.sed b/comms/kermit/files/Makefile.sed
deleted file mode 100644
index 717de24a39be..000000000000
--- a/comms/kermit/files/Makefile.sed
+++ /dev/null
@@ -1,33 +0,0 @@
-PROG=	kermit
-CFLAGS+= -I${.CURDIR} -DBSD44 -DCK_CURSES -DTCPSOCKET \
-	 -DNOCOTFMC -DTPUTSARGTYPE=int -DUSE_STRERROR -DFREEBSD3 \
-	 -DUSE_UU_LOCK \
-	 -funsigned-char
-SRCS=   ckcmai.c ckucmd.c ckuusr.c ckuus2.c ckuus3.c ckuus4.c ckuus5.c \
-        ckuus6.c ckuus7.c ckuusx.c ckuusy.c ckcpro.c ckcfns.c ckcfn2.c \
-        ckcfn3.c ckuxla.c ckucns.c ckutio.c ckufio.c ckudia.c ckuscr.c \
-        ckcnet.c ckusig.c ckclib.c ckctel.c ckcuni.c ckupty.c
-
-BINDIR=%%PREFIX%%/bin
-MANDIR=%%PREFIX%%/man/man
-
-CLEANFILES+= ckcpro.c ckcwart.o wart kermit.1
-
-DPADD=  ${LIBCURSES} ${LIBTERM}
-LDADD=  -lncurses -lcrypt -lutil
-
-.SUFFIXES: .w
-
-.w.c:
-	./wart ${.IMPSRC} ${.TARGET}
-
-wart: ckwart.c
-	$(CC) -o wart ${.CURDIR}/ckwart.c
-
-ckcpro.c: ckcpro.w
-ckcpro.c: wart
-
-kermit.1: ckuker.nr
-	cp ckuker.nr kermit.1
-
-.include <bsd.prog.mk>
diff --git a/comms/kermit/pkg-comment b/comms/kermit/pkg-comment
index 5dc5dbe46a8e..250b06a37de2 100644
--- a/comms/kermit/pkg-comment
+++ b/comms/kermit/pkg-comment
@@ -1 +1 @@
-File transfer and terminal emulation utility for serial lines and sockets
+Serial and network communications package
diff --git a/comms/kermit/pkg-descr b/comms/kermit/pkg-descr
index 4de4f08d8d88..64ece66fe79f 100644
--- a/comms/kermit/pkg-descr
+++ b/comms/kermit/pkg-descr
@@ -1,8 +1,7 @@
-KERMIT file transfer/terminal emulation utility
-------------------------------------------------------
+C-Kermit is a combined serial and network communication software
+package offering a consistent, medium-independent, cross-platform
+approach to connection establishment, terminal sessions, file
+transfer, character-set translation, numeric and alphanumeric paging,
+and automation of communication tasks.
 
-This is a release of C-Kermit file transfer protocol utility.
-This version supports transfer of un-escaped control characters for
-very fast file transfers with high reliability.
-
-WWW: http://www.columbia.edu/kermit/
+WWW: http://www.kermit-project.org/
diff --git a/comms/kermit/pkg-plist b/comms/kermit/pkg-plist
index c6f5bc0c95a0..ec6b09991055 100644
--- a/comms/kermit/pkg-plist
+++ b/comms/kermit/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/kermit
 share/doc/kermit/READ.ME
 share/doc/kermit/ckuaaa.txt
diff --git a/comms/kermit/scripts/configure b/comms/kermit/scripts/configure
deleted file mode 100644
index 64fa467d6535..000000000000
--- a/comms/kermit/scripts/configure
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-# shuffle things around for bmake to work right
-#
-mv ${WRKDIR}/makefile  ${WRKDIR}/makefile.dist
-sed -e "s@%%PREFIX%%@${PREFIX}@" < ${FILESDIR}/Makefile.sed > ${WRKDIR}/Makefile