From 94115a1f1bae2e5343b98b15f272ed54e6b13b16 Mon Sep 17 00:00:00 2001 From: fredb Date: Sun, 2 Jan 2000 21:05:01 +0000 Subject: Update checksum--new tarfile, same name. Builds now with full support, by default, for dtr/cts and dtr/cd flow-control. Also, remove -DSUNX25 (Frank da Cruz pointed out that it's a no-op), and install the man page, which is again included in the distro. --- comms/kermit/Makefile | 30 ++++++++++++++++++------------ comms/kermit/files/Makefile.sed | 36 ------------------------------------ comms/kermit/files/md5 | 4 ++-- comms/kermit/files/patch-sum | 3 +-- comms/kermit/patches/patch-aa | 19 ------------------- 5 files changed, 21 insertions(+), 71 deletions(-) delete mode 100644 comms/kermit/files/Makefile.sed delete mode 100644 comms/kermit/patches/patch-aa (limited to 'comms/kermit') diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile index dd1bf616076..8f826fe987b 100644 --- a/comms/kermit/Makefile +++ b/comms/kermit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1999/12/20 12:33:45 fredb Exp $ +# $NetBSD: Makefile,v 1.18 2000/01/02 21:05:01 fredb Exp $ # $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp # @@ -23,7 +23,7 @@ MAKEFILE= makefile NO_WRKSUBDIR= yes KFLAGS+= -DCK_PCT_BAR -DNODEBUG -DNOOLDMODEMS -KFLAGS+= -DDYNAMIC -DSUNX25 +KFLAGS+= -DDYNAMIC # XXX This needs to be tested. XXX # @@ -40,19 +40,25 @@ LIBS+= -lsocks .endif .endif -# XXX The man page currently doesn't build for NetBSD XXX -#MANCOMPRESSED_IF_MANZ= yes -#PLIST_SRC= ${WRKDIR}/PLIST +MANCOMPRESSED_IF_MANZ= yes +PLIST_SRC= ${WRKDIR}/PLIST do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wermit ${PREFIX}/bin/kermit -# @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} -# @for OPT in ${MANINSTALL} x; do \ -# case $$OPT in \ -# catinstall) ${ECHO} man/cat1/kermit.0 >>${PLIST_SRC};; \ -# maninstall) ${ECHO} man/man1/kermit.1 >>${PLIST_SRC};; \ -# esac; \ -# done + @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} + for OPT in ${MANINSTALL} x; do \ + case $$OPT in \ + catinstall) \ + nroff -man ${WRKSRC}/ckuker.nr > ${WRKSRC}/kermit.0; \ + ${INSTALL_MAN} ${WRKSRC}/kermit.0 ${PREFIX}/man/cat1/kermit.0; \ + ${ECHO} man/cat1/kermit.0 >>${PLIST_SRC}; \ + ;; \ + maninstall) \ + ${INSTALL_MAN} ${WRKSRC}/ckuker.nr ${PREFIX}/man/man1/kermit.1; \ + ${ECHO} man/man1/kermit.1 >>${PLIST_SRC}; \ + ;; \ + esac; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/comms/kermit/files/Makefile.sed b/comms/kermit/files/Makefile.sed deleted file mode 100644 index 3dae1aa7113..00000000000 --- a/comms/kermit/files/Makefile.sed +++ /dev/null @@ -1,36 +0,0 @@ -# $NetBSD: Makefile.sed,v 1.4 1998/08/07 10:36:39 agc Exp $ - -PROG= kermit -CFLAGS+= -I${.CURDIR} -DBSD44 -DCK_CURSES -DDYNAMIC -DTCPSOCKET \ - -DNOCOTFMC -DSETREUID -DSAVEDUID -DNDSYSERRLIST -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 ckucon.c ckutio.c ckufio.c ckudia.c ckuscr.c \ - ckcnet.c ckusig.c - -BINDIR=%%PREFIX%%/bin -MANDIR=%%PREFIX%%/man - -MANINSTALL= maninstall catinstall - -CLEANFILES+= ckcpro.c ckcwart.o wart kermit.1 - -DPADD= ${LIBCURSES} ${LIBTERM} -LDADD= -lcurses -ltermcap - -.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.cpp - $(CPP) ckuker.cpp | grep -v ^$$ | grep -v ^\# > kermit.1 || \ - rm -f kermit.1 - -.include diff --git a/comms/kermit/files/md5 b/comms/kermit/files/md5 index 7228291bf93..645b5173b02 100644 --- a/comms/kermit/files/md5 +++ b/comms/kermit/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1999/12/20 12:33:47 fredb Exp $ +$NetBSD: md5,v 1.4 2000/01/02 21:05:02 fredb Exp $ -MD5 (cku196src.tar.gz) = b9fcd420fed48792a7a8aab85c0e6133 +MD5 (cku196src.tar.gz) = 53bfbb483a094813b2298e2ce6808011 diff --git a/comms/kermit/files/patch-sum b/comms/kermit/files/patch-sum index 72197c22573..ba097879187 100644 --- a/comms/kermit/files/patch-sum +++ b/comms/kermit/files/patch-sum @@ -1,4 +1,3 @@ -$NetBSD: patch-sum,v 1.3 1999/12/20 12:33:47 fredb Exp $ +$NetBSD: patch-sum,v 1.4 2000/01/02 21:05:02 fredb Exp $ -MD5 (patch-aa) = afd665666940f0695cc074c9fa5528fa MD5 (patch-ad) = 44b8a1a548e15c6682474224d47b8fd8 diff --git a/comms/kermit/patches/patch-aa b/comms/kermit/patches/patch-aa deleted file mode 100644 index e76d220987d..00000000000 --- a/comms/kermit/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.4 1999/12/20 12:33:47 fredb Exp $ - ---- makefile.orig Tue Dec 7 18:58:08 1999 -+++ makefile Fri Dec 17 07:16:10 1999 -@@ -732,10 +732,10 @@ - # - WERMIT = makewhat - DESTDIR = --BINDIR = /usr/local/bin --MANDIR = /usr/man/manl --INFODIR = /usr/local/doc/kermit --MANEXT = l -+BINDIR = /usr/${PREFIX}/bin -+MANDIR = /usr/man/man1 -+INFODIR = /usr/${PREFIX}/share/doc/kermit -+MANEXT = 1 - ALL = $(WERMIT) - - all: $(ALL) -- cgit v1.2.3