diff options
| author | mi <mi@FreeBSD.org> | 2001-03-12 18:50:33 +0000 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2001-03-12 18:50:33 +0000 |
| commit | 7aefd0f4c7d1adac3f8ef871a4fbe95f85f9c119 (patch) | |
| tree | 187f4b5a2c088502d508569c52b3370d07117d23 /net/scotty3/Makefile | |
| parent | 0f05889fd452e74003ca21e50023980e7fee4aed (diff) | |
| download | FreeBSD-ports-7aefd0f4c7d1adac3f8ef871a4fbe95f85f9c119.zip FreeBSD-ports-7aefd0f4c7d1adac3f8ef871a4fbe95f85f9c119.tar.gz | |
A number of changes and fixes:
. build with or without TK (triggered by the NO_X knob)
. build against TCL-8.3 -- with or without stubs
. fix some bugs in the core Scotty code -- most notably
a bug in the icmp-command implementation, where an off-by-one
error in the argument processing loop resulted in random
crashes; all this fixes are grouped into a single file
patch-fixes
. make scotty executable itself as small as it needs to be
Approved by: maintainer
Perhaps, some day the security officer will tell me what _exactly_ is
wrong with regular Scotty (this one is beta of the new version), and
I'll be able to freshen that one up too and remove the FORBIDDEN.
Diffstat (limited to 'net/scotty3/Makefile')
| -rw-r--r-- | net/scotty3/Makefile | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile index 1b03289..bb9ae82 100644 --- a/net/scotty3/Makefile +++ b/net/scotty3/Makefile @@ -7,28 +7,60 @@ PORTNAME= scotty PORTVERSION= 20000221 -CATEGORIES= net tk82 +CATEGORIES= net MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/devel/ DISTNAME= ${PORTNAME}-00-02-21 MAINTAINER= ozz@FreeBSD.org.ru -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 +.ifdef (NO_X) +PKGNAMESUFFIX= -nox11 +LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 +.else +LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 +.endif GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.2 \ - --with-tk=${PREFIX}/lib/tk8.2 +CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.3 \ + --enable-multicast + +.ifdef (NO_X) +CONFIGURE_ARGS+=--with-tk=no +.else +CONFIGURE_ARGS+=--with-tk=${PREFIX}/lib/tk8.3 +CONFIGURE_ENV+= wish=${PREFIX}/bin/wish8.3 +.endif WRKSRC= ${WRKDIR}/${DISTNAME}/unix -MAN1= tkined.1 scotty.1 +MAN1= scotty.1 MAN8= nmicmpd.8 nmtrapd.8 MANN= Tnm.n TnmDialog.n TnmDisman.n TnmEther.n TnmIetf.n\ TnmInet.n TnmMap.n TnmMib.n TnmSnmp.n TnmTerm.n\ - dns.n icmp.n ined.n job.n map.n mib.n netdb.n \ + dns.n icmp.n job.n map.n mib.n netdb.n \ ntp.n snmp.n sunrpc.n syslog.n udp.n PLIST_SUB= SCOTTY_VERSION=3.0.0 TKINED_VERSION=1.5.0 -pre-install: - @cd ${WRKSRC}; make sinstall +MAKE_ARGS+= -j2 # better than -j1 on all machines... +INSTALL_TARGET= tnm-install sinstall + +.if !defined(NO_X) +MAN1+= tkined.1 +MANN+= ined.n +PLIST_SUB+= X11='' +INSTALL_TARGET+=tki-install +.else +PLIST_SUB+= X11='@comment ' +.endif + +post-patch: + ${MV} ${WRKSRC}/scotty.c ${WRKSRC}/scotty.c.orig + ${CP} -p ${FILESDIR}/scotty.c ${WRKSRC}/scotty.c + +post-install: + ${RM} -f ${PREFIX}/bin/scotty ${PREFIX}/bin/tkined + ${LN} -s scotty3.0.0 ${PREFIX}/bin/scotty +.ifndef NO_X + ${LN} -s tkined1.5.0 ${PREFIX}/bin/tkined +.endif .include <bsd.port.mk> |
