Enable OpenSSL by default to get SSL/TLS support (e.g. in TELNET and FTP).

Install the manual page again.

4 files changed, 74 insertions, 14 deletions

diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 8d4866509bf..dd35b29f2ea 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.44 2003/04/11 11:49:53 darcy Exp $
+# $NetBSD: Makefile,v 1.45 2003/07/02 20:37:34 kim Exp $
 # $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp
 #
 
 DISTNAME=	cku209
-PKGNAME=        kermit-8.0.209
+PKGNAME=	kermit-8.0.209
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
@@ -16,26 +17,24 @@ LICENSE=	kermit-license
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-ALL_TARGET=	macosx10
-.else
-ALL_TARGET=	netbsd
-.endif
-
-BUILD_DEFS+=	KFLAGS LIBS KERMIT_SUID_UUCP
+USE_BUILDLINK2=	YES
+BUILD_DEFS+=	KERMIT_SUID_UUCP KFLAGS LIBS
 MAKE_ENV+=	KFLAGS="${KFLAGS}" LIBS="${LIBS}"
+MAKE_ENV+=	SSLINC="${SSLINC}" SSLLIB="${SSLLIB}"
 MAKEFILE=	makefile
 PLIST_SRC=	${WRKDIR}/PLIST
 
 #KFLAGS+=	-DNODEBUG -DNOOLDMODEMS
 
+# Set to empty
+SSLINC=		-I${WRKDIR}/.buildlink/include
+SSLLIB=		-L${WRKDIR}/.buildlink/lib
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wermit ${PREFIX}/bin/kermit
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kermit
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/kermit
-
-no-manpage-in-beta-release:
 	for OPT in ${MANINSTALL} broken-solaris-needs-this; do \
 	  case $$OPT in \
 	    catinstall) \
@@ -68,14 +67,21 @@ LIBS+=          -ltermcap
 # Include SOCKS firewall support
 .if defined(USE_SOCKS)
 .if ${USE_SOCKS} == 4
-DEPENDS+=	socks4-2.2:../../net/socks4
 KFLAGS+=	-DSOCKS
 LIBS+=		-L${PREFIX}/lib -lsocks4
+.include "../../net/socks4/buildlink2.mk"
 .elif ${USE_SOCKS} == 5
-DEPENDS+=	socks5-1.0.2:../../net/socks5
 KFLAGS+=	-DSOCKS -DCK_SOCKS5
 LIBS+=		-L${PREFIX}/lib -lsocks5
+.include "../../net/socks5/buildlink2.mk"
+.endif
 .endif
+
+.if ${OPSYS} == "Darwin"
+ALL_TARGET=	macosx10
+.else
+ALL_TARGET=	netbsd+openssl
+.include "../../security/openssl/buildlink2.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/kermit/distinfo b/comms/kermit/distinfo
index 17c8d2b9776..eab85926432 100644
--- a/comms/kermit/distinfo
+++ b/comms/kermit/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/04/11 11:49:54 darcy Exp $
+$NetBSD: distinfo,v 1.9 2003/07/02 20:37:35 kim Exp $
 
 SHA1 (cku209.tar.gz) = f98febc545b8826ab29a8f035860c7ab428de73e
 Size (cku209.tar.gz) = 2876409 bytes
+SHA1 (patch-aa) = b0b602c2d8147a0c3c4b604e5f0c6e42f7c45348
+SHA1 (patch-ab) = 24032ad61815ce88e8638d0bbcdaf86175b9715b
diff --git a/comms/kermit/patches/patch-aa b/comms/kermit/patches/patch-aa
new file mode 100644
index 00000000000..c22149fa3f0
--- /dev/null
+++ b/comms/kermit/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.6 2003/07/02 20:37:35 kim Exp $
+
+--- makefile.orig	2003-03-30 17:04:31.000000000 -0500
++++ makefile	2003-07-02 15:55:44.000000000 -0400
+@@ -735,8 +735,8 @@
+ K5INC=-I/usr/kerberos/include
+ SRPLIB=-L/usr/local/lib
+ SRPINC=-I/usr/local/include
+-SSLLIB=-L/usr/local/ssl/lib
+-SSLINC=-I/usr/local/ssl/include
++#SSLLIB=-L/usr/local/ssl/lib
++#SSLINC=-I/usr/local/ssl/include
+ #
+ # aix41+krb5+krb4:                    IBM AIX 4.1 with Kerberos IV and V
+ # aix43gcc+krb5+krb4:                 IBM AIX 4.3 built with gcc, ditto
+@@ -1773,6 +1773,16 @@
+ 	-DCK_DTRCD -DCK_DTRCTS -DTPUTSARGTYPE=int -DFNFLOAT $(KFLAGS) -O" \
+ 	"LIBS= -lcurses -lcrypt -lm $(LIBS)"
+ 
++# For NetBSD 1.6 and later OpenSSL is included
++netbsd+openssl:
++	@echo Making C-Kermit $(CKVER) for NetBSD with curses...
++	$(MAKE) xermit KTARGET=$${KTARGET:-$(@)} \
++	"CFLAGS= -DBSD44 -DCK_CURSES -DTCPSOCKET -DUSE_STRERROR \
++	-DNETBSD15 -DNETBSD16 \
++	-DCK_AUTHENTICATION -DCK_SSL $(SSLINC) -DZLIB \
++	-DCK_DTRCD -DCK_DTRCTS -DTPUTSARGTYPE=int -DFNFLOAT $(KFLAGS) -O" \
++	"LIBS= -lcurses -lcrypt $(SSLLIB) -lssl -lcrypto -lm $(LIBS)"
++
+ #NetBSD 1.5.x in which the return type of the function pointer that is the 
+ #third argument of tputs() was changed from void to int...  The regular NetBSD
+ #target builds OK here but this one eliminates the (harmless) warning.
diff --git a/comms/kermit/patches/patch-ab b/comms/kermit/patches/patch-ab
new file mode 100644
index 00000000000..8c6fb7eb747
--- /dev/null
+++ b/comms/kermit/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.4 2003/07/02 20:37:35 kim Exp $
+
+--- ck_ssl.c.orig	2003-03-14 09:37:28.000000000 -0500
++++ ck_ssl.c	2003-07-02 15:43:07.000000000 -0400
+@@ -2728,6 +2728,7 @@
+ #ifndef HPUX1100
+ #ifndef SCO_OSR505
+ #ifndef OpenBSD
++#ifndef __NetBSD__
+ #ifndef FREEBSD4
+ #ifndef LINUX
+ #ifndef AIX41
+@@ -2764,6 +2765,7 @@
+ #endif /* AIX41 */
+ #endif /* LINUX */
+ #endif /* FREEBSD4 */
++#endif /* __NetBSD__ */
+ #endif /* OpenBSD */
+ #endif /* SCO_OSR505 */
+ #endif /* HPUX1100 */