From 268cfded3bc182621a3f19d2f31e9c34ee6880ba Mon Sep 17 00:00:00 2001 From: fredb Date: Thu, 6 Jan 2000 16:31:06 +0000 Subject: Add -ltermcap for NetBSD-1.3*. Move test for USE_SOCKS= to _after_ include of bsd.pkg.mk, where it has a fighting chance to actually work. Minor clean-ups. --- comms/kermit/Makefile | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) (limited to 'comms/kermit') diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile index dc0f897bfba..9432e04b8a6 100644 --- a/comms/kermit/Makefile +++ b/comms/kermit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2000/01/05 23:13:36 tron Exp $ +# $NetBSD: Makefile,v 1.22 2000/01/06 16:31:06 fredb Exp $ # $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp # @@ -18,27 +18,11 @@ ALL_TARGET= netbsd BUILD_DEFS+= KFLAGS LIBS KERMIT_SUID_UUCP MAKE_ENV+= KFLAGS="${KFLAGS}" LIBS="${LIBS}" MAKEFILE= makefile -NO_WRKSUBDIR= yes +NO_WRKSUBDIR= YES +PLIST_SRC= ${WRKDIR}/PLIST #KFLAGS+= -DNODEBUG -DNOOLDMODEMS -# XXX This needs to be tested. XXX -# -# Include SOCKS firewall support -.if defined(USE_SOCKS) -.if ${USE_SOCKS} == 4 -DEPENDS+= socks4-2.2:../../net/socks4 -KFLAGS+= -DSOCKS -LIBS+= -lsocks -.elif ${USE_SOCKS} == 5 -DEPENDS+= socks5-1.0.2:../../net/socks5 -KFLAGS+= -DSOCKS -DCK_SOCKS5 -LIBS+= -lsocks -.endif -.endif - -PLIST_SRC= ${WRKDIR}/PLIST - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wermit ${PREFIX}/bin/kermit @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} @@ -60,7 +44,28 @@ do-install: .if defined(KERMIT_SUID_UUCP) .if ${KERMIT_SUID_UUCP} == "yes" || ${KERMIT_SUID_UUCP} == "YES" -BINOWN= uucp -BINMODE= 4555 +BINOWN= uucp +BINMODE= 4555 +.endif +.endif + +.for __tmp__ in NetBSD-1.3* +.if ${MACHINE_PLATFORM:M${__tmp__}} != "" +LIBS+= -ltermcap +.endif +.endfor + +# XXX This needs to be tested. XXX +# +# Include SOCKS firewall support +.if defined(USE_SOCKS) +.if ${USE_SOCKS} == 4 +DEPENDS+= socks4-2.2:../../net/socks4 +KFLAGS+= -DSOCKS +LIBS+= -lsocks +.elif ${USE_SOCKS} == 5 +DEPENDS+= socks5-1.0.2:../../net/socks5 +KFLAGS+= -DSOCKS -DCK_SOCKS5 +LIBS+= -lsocks .endif .endif -- cgit v1.2.3