Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 05 Mar 2005 01:56:08 +0800
From:      gnn@freebsd.org
To:        Volker Stolz <vs@freebsd.org>
Cc:        freebsd-ports-bugs@freebsd.org
Subject:   Re: ports/78142: [PATCH] net/click: Updated port
Message-ID:  <m2oedz2t3b.wl%gnn@neville-neil.com>
In-Reply-To: <200503010958.j219wYwd021519@freefall.freebsd.org>
References:  <200503010958.j219wYwd021519@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Hi,

I hope this is the right place.  Included please find a diff that can
be applied to /usr/ports/net/click directory to update the port to the
latest version.

Sorry about the shar file.

Later,
George

*** ../click/Makefile	Thu Nov 18 22:01:32 2004
--- Makefile	Fri Mar  4 07:05:37 2005
***************
*** 6,12 ****
  #
  
  PORTNAME=	click
! PORTVERSION=	1.2.3
  PORTREVISION=	1
  CATEGORIES=	net
  MASTER_SITES=	http://www.pdos.lcs.mit.edu/click/
--- 6,12 ----
  #
  
  PORTNAME=	click
! PORTVERSION=	1.4.3
  PORTREVISION=	1
  CATEGORIES=	net
  MASTER_SITES=	http://www.pdos.lcs.mit.edu/click/
***************
*** 16,22 ****
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
- USE_GCC=	2.95
  
  MANCOMPRESSED=	no
  INFO=	click
--- 16,21 ----
***************
*** 30,41 ****
  MANN=	FTPPortMapper.n ARPFaker.n ARPQuerier.n ARPResponder.n \
  	EnsureEther.n EtherEncap.n EtherMirror.n HostEtherFilter.n \
  	CheckICMPHeader.n ICMPError.n ICMPPingResponder.n ICMPPingRewriter.n \
! 	ICMPRewriter.n ICMPSendPings.n CheckIPHeader.n CheckIPHeader2.n \
  	DecIPTTL.n FixIPSrc.n GetIPAddress.n IPAddrRewriter.n IPClassifier.n \
  	IPEncap.n IPFilter.n IPFragmenter.n IPGWOptions.n IPInputCombo.n \
  	IPMirror.n IPOutputCombo.n IPPrint.n IPRateMonitor.n \
! 	IPRewriterPatterns.n LookupIPRoute.n LookupIPRoute2.n \
! 	LookupIPRouteLinux.n MarkIPCE.n MarkIPHeader.n RIPSend.n \
  	RoundRobinIPMapper.n SetIPAddress.n SetIPChecksum.n SetIPDSCP.n \
  	SetRandIPAddress.n StoreIPAddress.n StripIPHeader.n UnstripIPHeader.n \
  	AddressInfo.n Align.n AlignmentInfo.n AverageCounter.n \
--- 29,40 ----
  MANN=	FTPPortMapper.n ARPFaker.n ARPQuerier.n ARPResponder.n \
  	EnsureEther.n EtherEncap.n EtherMirror.n HostEtherFilter.n \
  	CheckICMPHeader.n ICMPError.n ICMPPingResponder.n ICMPPingRewriter.n \
! 	ICMPRewriter.n CheckIPHeader.n CheckIPHeader2.n \
  	DecIPTTL.n FixIPSrc.n GetIPAddress.n IPAddrRewriter.n IPClassifier.n \
  	IPEncap.n IPFilter.n IPFragmenter.n IPGWOptions.n IPInputCombo.n \
  	IPMirror.n IPOutputCombo.n IPPrint.n IPRateMonitor.n \
! 	IPRewriterPatterns.n LookupIPRoute2.n \
! 	MarkIPCE.n MarkIPHeader.n RIPSend.n \
  	RoundRobinIPMapper.n SetIPAddress.n SetIPChecksum.n SetIPDSCP.n \
  	SetRandIPAddress.n StoreIPAddress.n StripIPHeader.n UnstripIPHeader.n \
  	AddressInfo.n Align.n AlignmentInfo.n AverageCounter.n \
***************
*** 46,54 ****
  	Error.n FrontDropQueue.n HashSwitch.n Idle.n \
  	InfiniteSource.n Meter.n MSQueue.n Null.n PushNull.n PullNull.n \
  	Null1.n Null2.n Null3.n Null4.n Null5.n Null6.n Null7.n Null8.n \
! 	Paint.n PaintTee.n PeekHandlers.n PokeHandlers.n Print.n PrioSched.n \
! 	ProbSplitter.n PullSwitch.n Queue.n QuitWatcher.n \
! 	RandomBitErrors.n RandomLossage.n RandomSource.n RatedSource.n \
  	RatedSplitter.n RatedUnqueue.n RED.n RoundRobinSched.n \
  	RoundRobinSwitch.n ScheduleInfo.n SetCRC32.n SetTimestamp.n Shaper.n \
  	SpinlockAcquire.n SpinlockInfo.n SpinlockRelease.n StaticPullSwitch.n \
--- 45,53 ----
  	Error.n FrontDropQueue.n HashSwitch.n Idle.n \
  	InfiniteSource.n Meter.n MSQueue.n Null.n PushNull.n PullNull.n \
  	Null1.n Null2.n Null3.n Null4.n Null5.n Null6.n Null7.n Null8.n \
! 	Paint.n PaintTee.n PokeHandlers.n Print.n PrioSched.n \
! 	PullSwitch.n Queue.n QuitWatcher.n \
! 	RandomBitErrors.n RandomSource.n RatedSource.n \
  	RatedSplitter.n RatedUnqueue.n RED.n RoundRobinSched.n \
  	RoundRobinSwitch.n ScheduleInfo.n SetCRC32.n SetTimestamp.n Shaper.n \
  	SpinlockAcquire.n SpinlockInfo.n SpinlockRelease.n StaticPullSwitch.n \
***************
*** 70,79 ****
  BROKEN=		"Does not compile on alpha 4.x"
  .endif
  
- .if ${OSVERSION} >= 503001
- BROKEN=		"Does not compile on FreeBSD >= 5.x"
- .endif
- 
  post-install:
  	@${STRIP_CMD} ${PREFIX}/bin/click
  	@${STRIP_CMD} ${PREFIX}/bin/click-align
--- 69,74 ----
***************
*** 86,104 ****
  	@${STRIP_CMD} ${PREFIX}/bin/click-mkmindriver
  	@${STRIP_CMD} ${PREFIX}/bin/click-undead
  	@${STRIP_CMD} ${PREFIX}/bin/click-xform
  	@${MKDIR} ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/fake-iprouter.click ${CONFDIR}
! 	${INSTALL_DATA} ${WRKSRC}/conf/ip.clickpat ${CONFDIR}
! 	${INSTALL_DATA} ${WRKSRC}/conf/ip6ndadvertiser.click ${CONFDIR}
! 	${INSTALL_DATA} ${WRKSRC}/conf/ip6ndsolicitor.click ${CONFDIR}
! 	${INSTALL_DATA} ${WRKSRC}/conf/kernel.clickpat ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/mazu-nat.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/test-device.click ${CONFDIR}
! 	${INSTALL_DATA} ${WRKSRC}/conf/test-tap.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/test.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/test2.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/test3.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/udpgen.click ${CONFDIR}
  	@${ECHO_CMD}
  	@${ECHO_CMD} "----------------------------------------------------"
  	@${ECHO_CMD} "Install complete, to try it out do the following:"
--- 81,112 ----
  	@${STRIP_CMD} ${PREFIX}/bin/click-mkmindriver
  	@${STRIP_CMD} ${PREFIX}/bin/click-undead
  	@${STRIP_CMD} ${PREFIX}/bin/click-xform
+ 	@${STRIP_CMD} ${PREFIX}/bin/click2xml
  	@${MKDIR} ${CONFDIR}
+ 	${INSTALL_DATA} ${WRKSRC}/conf/dnsproxy.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/fake-iprouter.click ${CONFDIR}
! 	${INSTALL_DATA} ${WRKSRC}/conf/fromhost-tunnel.click ${CONFDIR}
! 	${INSTALL_DATA} ${WRKSRC}/conf/grid.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/mazu-nat.click ${CONFDIR}
+ 	${INSTALL_DATA} ${WRKSRC}/conf/print-pings.click ${CONFDIR}
+ 	${INSTALL_DATA} ${WRKSRC}/conf/sampler.click ${CONFDIR}
+ 	${INSTALL_DATA} ${WRKSRC}/conf/simple-dsdv-userlevel.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/test-device.click ${CONFDIR}
! 	${INSTALL_DATA} ${WRKSRC}/conf/test-tun.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/test.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/test2.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/test3.click ${CONFDIR}
+ 	${INSTALL_DATA} ${WRKSRC}/conf/thomer-nat.click ${CONFDIR}
+ 	${INSTALL_DATA} ${WRKSRC}/conf/udpcount.click ${CONFDIR}
  	${INSTALL_DATA} ${WRKSRC}/conf/udpgen.click ${CONFDIR}
+ 	@${MKDIR} ${CONFDIR}/roofnet
+ 	${INSTALL_DATA} ${WRKSRC}/conf/roofnet/etx.click ${CONFDIR}/roofnet
+ 	${INSTALL_DATA} ${WRKSRC}/conf/roofnet/srcr.click ${CONFDIR}/roofnet
+ 	@${MKDIR} ${CONFDIR}/wifi
+ 	${INSTALL_DATA} ${WRKSRC}/conf/wifi/access-point.click ${CONFDIR}/wifi
+ 	${INSTALL_DATA} ${WRKSRC}/conf/wifi/dump.click ${CONFDIR}/wifi
+ 	${INSTALL_DATA} ${WRKSRC}/conf/wifi/pseudo-ibss.click ${CONFDIR}/wifi
+ 	${INSTALL_DATA} ${WRKSRC}/conf/wifi/station.click ${CONFDIR}/wifi
  	@${ECHO_CMD}
  	@${ECHO_CMD} "----------------------------------------------------"
  	@${ECHO_CMD} "Install complete, to try it out do the following:"
*** ../click/distinfo	Wed Mar 31 03:09:56 2004
--- distinfo	Fri Mar  4 07:02:08 2005
***************
*** 1,2 ****
! MD5 (click-1.2.3.tar.gz) = 8cc28dd7e8c4ef4cb98023213605707e
! SIZE (click-1.2.3.tar.gz) = 1229086
--- 1,2 ----
! MD5 (click-1.4.3.tar.gz) = f719412d7baf4ff874af826a66e3254c
! SIZE (click-1.4.3.tar.gz) = 2561724
*** ../click/pkg-plist	Tue Oct 12 17:53:22 2004
--- pkg-plist	Fri Mar  4 07:02:08 2005
***************
*** 13,46 ****
  bin/click-compile
  bin/click-mkelemmap
  bin/click-elem2man
! include/click/elementt.hh
! include/click/lexert.hh
! include/click/processingt.hh
! include/click/routert.hh
! include/click/toolutils.hh
  include/click/archive.hh
  include/click/atomic.hh
  include/click/bighashmap.cc
  include/click/bighashmap.hh
  include/click/bighashmap_arena.hh
  include/click/bitvector.hh
- include/click/click_ether.h
- include/click/click_icmp.h
- include/click/click_icmp6.h
- include/click/click_ip.h
- include/click/click_ip6.h
- include/click/click_fddi.h
- include/click/click_tcp.h
- include/click/click_udp.h
  include/click/clp.h
  include/click/config-bsdmodule.h
  include/click/config-linuxmodule.h
  include/click/config-userlevel.h
  include/click/config.h
  include/click/confparse.hh
  include/click/crc32.h
  include/click/cxxprotect.h
  include/click/cxxunprotect.h
  include/click/driver.hh
  include/click/element.hh
  include/click/elemfilter.hh
--- 13,58 ----
  bin/click-compile
  bin/click-mkelemmap
  bin/click-elem2man
! etc/click/conf/dnsproxy.click 
! etc/click/conf/fake-iprouter.click 
! etc/click/conf/fromhost-tunnel.click 
! etc/click/conf/grid.click 
! etc/click/conf/mazu-nat.click 
! etc/click/conf/print-pings.click 
! etc/click/conf/sampler.click 
! etc/click/conf/simple-dsdv-userlevel.click 
! etc/click/conf/test-device.click 
! etc/click/conf/test-tun.click 
! etc/click/conf/test.click 
! etc/click/conf/test2.click 
! etc/click/conf/test3.click 
! etc/click/conf/thomer-nat.click 
! etc/click/conf/udpcount.click 
! etc/click/conf/udpgen.click 
! etc/click/conf/roofnet/etx.click 
! etc/click/conf/roofnet/srcr.click 
! etc/click/conf/wifi/access-point.click 
! etc/click/conf/wifi/dump.click 
! etc/click/conf/wifi/pseudo-ibss.click 
! etc/click/conf/wifi/station.click 
  include/click/archive.hh
  include/click/atomic.hh
  include/click/bighashmap.cc
  include/click/bighashmap.hh
  include/click/bighashmap_arena.hh
  include/click/bitvector.hh
  include/click/clp.h
  include/click/config-bsdmodule.h
  include/click/config-linuxmodule.h
+ include/click/config-ns.h
  include/click/config-userlevel.h
  include/click/config.h
  include/click/confparse.hh
  include/click/crc32.h
  include/click/cxxprotect.h
  include/click/cxxunprotect.h
+ include/click/dequeue.cc
+ include/click/dequeue.hh
  include/click/driver.hh
  include/click/element.hh
  include/click/elemfilter.hh
***************
*** 54,86 ****
  include/click/handlercall.hh
  include/click/hashmap.cc
  include/click/hashmap.hh
  include/click/integers.hh
  include/click/ip6address.hh
  include/click/ip6flowid.hh
  include/click/ip6table.hh
  include/click/ipaddress.hh
- include/click/ipaddressset.hh
  include/click/ipflowid.hh
  include/click/iptable.hh
  include/click/lexer.hh
- include/click/lexertinfo.hh
  include/click/llrpc.h
  include/click/package.hh
  include/click/packet.hh
  include/click/packet_anno.hh
  include/click/pathvars.h
  include/click/perfctr-i586.hh
  include/click/router.hh
  include/click/routerthread.hh
  include/click/skbmgr.hh
  include/click/standard/addressinfo.hh
  include/click/standard/alignmentinfo.hh
  include/click/standard/drivermanager.hh
  include/click/standard/errorelement.hh
  include/click/standard/scheduleinfo.hh
  include/click/straccum.hh
  include/click/string.hh
- include/click/subvector.hh
  include/click/sync.hh
  include/click/task.hh
  include/click/timer.hh
--- 66,104 ----
  include/click/handlercall.hh
  include/click/hashmap.cc
  include/click/hashmap.hh
+ include/click/ino.hh
  include/click/integers.hh
+ include/click/ipaddresslist.hh
  include/click/ip6address.hh
  include/click/ip6flowid.hh
  include/click/ip6table.hh
  include/click/ipaddress.hh
  include/click/ipflowid.hh
  include/click/iptable.hh
  include/click/lexer.hh
  include/click/llrpc.h
+ include/click/master.hh
+ include/click/notifier.hh
  include/click/package.hh
  include/click/packet.hh
  include/click/packet_anno.hh
+ include/click/pair.hh
  include/click/pathvars.h
  include/click/perfctr-i586.hh
  include/click/router.hh
  include/click/routerthread.hh
+ include/click/simclick.h
  include/click/skbmgr.hh
  include/click/standard/addressinfo.hh
  include/click/standard/alignmentinfo.hh
  include/click/standard/drivermanager.hh
  include/click/standard/errorelement.hh
+ include/click/standard/portinfo.hh
+ include/click/standard/storage.hh
  include/click/standard/scheduleinfo.hh
+ include/click/standard/threadsched.hh
  include/click/straccum.hh
  include/click/string.hh
  include/click/sync.hh
  include/click/task.hh
  include/click/timer.hh
***************
*** 88,93 ****
--- 106,115 ----
  include/click/variableenv.hh
  include/click/vector.cc
  include/click/vector.hh
+ include/clicktool/eclasst.hh
+ include/clicktool/elementmap.hh
+ include/clicktool/etraits.hh
+ include/clicktool/runparse.hh
  include/clicktool/elementt.hh
  include/clicktool/lexert.hh
  include/clicktool/lexertinfo.hh
***************
*** 97,103 ****
  @unexec rm -rf %D/etc/click 2>&1 >/dev/null || true
  lib/libclick.a
  lib/libclicktool.a
! %%DATADIR%%/elementmap
  %%DATADIR%%/srcdir
  %%DATADIR%%/src
  @dirrm include/click/standard
--- 119,125 ----
  @unexec rm -rf %D/etc/click 2>&1 >/dev/null || true
  lib/libclick.a
  lib/libclicktool.a
! %%DATADIR%%/elementmap.xml
  %%DATADIR%%/srcdir
  %%DATADIR%%/src
  @dirrm include/click/standard



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?m2oedz2t3b.wl%gnn>