3 files changed, 91 insertions, 67 deletions

diff --git a/net/click/Makefile b/net/click/Makefile
index 13a83b68e5e8..e9cbd1c7b90d 100644
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -6,38 +6,41 @@
 #
 
 PORTNAME=	click
-PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTVERSION=	1.4.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.pdos.lcs.mit.edu/click/
 
 MAINTAINER=	gnn@neville-neil.com
 COMMENT=	The Click Modular Router
 
+USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--disable-linuxmodule
 USE_GMAKE=	yes
-USE_GCC=	2.95
 
 MANCOMPRESSED=	no
 INFO=	click
 MAN1=	click.1 click-align.1 click-combine.1 click-devirtualize.1 \
 	click-fastclassifier.1 click-flatten.1 click-install.1 \
-	click-mkmindriver.1 click-uncombine.1 click-undead.1 \
-	click-uninstall.1 click-xform.1
+	click-mkmindriver.1 click-pretty.1 click-uncombine.1 click-undead.1 \
+	click-uninstall.1 click-xform.1 testie.1
 MAN5=	click.5
 MAN7=	elementdoc.7
 MAN8=	click.o.8
 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 \
+	ICMPRewriter.n CheckIPHeader.n CheckIPHeader2.n \
+	DecIPTTL.n FixIPSrc.n FromSocket.n GetIPAddress.n ICMPPingEncap.n \
+	ICMPPingSource.n IPAddrRewriter.n IPAddrPairRewriter.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 \
+	IPMirror.n IPOutputCombo.n IPPrint.n IPRateMonitor.n IPRewriterPatterns.n \
+	KernelTun.n LinearIPLookup.n LinkUnqueue.n LookupIPRoute2.n \
+	MarkIPCE.n MarkIPHeader.n Message.n MixedQueue.n NotifierQueue.n \
+	PaintSwitch.n PortInfo.n RIPSend.n RandomSwitch.n \
+	RoundRobinIPMapper.n SetAnnoByte.n SetIPAddress.n SetIPChecksum.n SetIPDSCP.n \
+	SetRandIPAddress.n SetUDPChecksum.n SimpleQueue.n StoreData.n \
+	StoreIPAddress.n StripIPHeader.n ToSocket.n UnstripIPHeader.n \
 	AddressInfo.n Align.n AlignmentInfo.n AverageCounter.n \
 	BandwidthMeter.n BandwidthShaper.n Burster.n BandwidthRatedSplitter.n \
 	BandwidthRatedUnqueue.n CheckCRC32.n CheckLength.n CheckPaint.n \
@@ -46,14 +49,15 @@ MANN=	FTPPortMapper.n ARPFaker.n ARPQuerier.n ARPResponder.n \
 	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 \
+	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 \
+	SourceIPHashMapper.n SortedIPLookup.n \
 	SpinlockAcquire.n SpinlockInfo.n SpinlockRelease.n StaticPullSwitch.n \
 	StaticSwitch.n StrideSched.n StrideSwitch.n Strip.n Suppressor.n \
-	Switch.n Tee.n PullTee.n TimedSink.n TimedSource.n Unqueue.n \
+	Switch.n Tee.n PullTee.n TimedSink.n TimedSource.n TrieIPLookup.n Unqueue.n \
 	Unqueue2.n Unstrip.n CheckTCPHeader.n CheckUDPHeader.n \
 	DynamicUDPIPEncap.n IPRewriter.n SetTCPChecksum.n TCPRewriter.n \
 	UDPIPEncap.n ChatterSocket.n ControlSocket.n FromDevice.u.n \
@@ -70,35 +74,17 @@ CONFDIR=	${PREFIX}/etc/click/conf
 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
-	@${STRIP_CMD} ${PREFIX}/bin/click-check
-	@${STRIP_CMD} ${PREFIX}/bin/click-combine
-	@${STRIP_CMD} ${PREFIX}/bin/click-uncombine
-	@${STRIP_CMD} ${PREFIX}/bin/click-devirtualize
-	@${STRIP_CMD} ${PREFIX}/bin/click-fastclassifier
-	@${STRIP_CMD} ${PREFIX}/bin/click-flatten
-	@${STRIP_CMD} ${PREFIX}/bin/click-mkmindriver
-	@${STRIP_CMD} ${PREFIX}/bin/click-undead
-	@${STRIP_CMD} ${PREFIX}/bin/click-xform
+	cd ${PREFIX}/bin && ${STRIP_CMD} click click-align click-check \
+	  click-combine click-uncombine click-devirtualize click-fastclassifier \
+	  click-flatten click-mkmindriver click-undead 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}
+	${INSTALL_DATA} ${WRKSRC}/conf/*.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/*.click ${CONFDIR}/wifi
 	@${ECHO_CMD}
 	@${ECHO_CMD} "----------------------------------------------------"
 	@${ECHO_CMD} "Install complete, to try it out do the following:"
diff --git a/net/click/distinfo b/net/click/distinfo
index 621e0f5e4c7d..9b62233a1d4c 100644
--- a/net/click/distinfo
+++ b/net/click/distinfo
@@ -1,2 +1,2 @@
-MD5 (click-1.2.3.tar.gz) = 8cc28dd7e8c4ef4cb98023213605707e
-SIZE (click-1.2.3.tar.gz) = 1229086
+MD5 (click-1.4.3.tar.gz) = f719412d7baf4ff874af826a66e3254c
+SIZE (click-1.4.3.tar.gz) = 2561724
diff --git a/net/click/pkg-plist b/net/click/pkg-plist
index cb6145f64472..7312bbf0708a 100644
--- a/net/click/pkg-plist
+++ b/net/click/pkg-plist
@@ -1,46 +1,61 @@
 bin/click
 bin/click-align
+bin/click-buildtool
 bin/click-check
 bin/click-combine
-bin/click-uncombine
+bin/click-compile
 bin/click-devirtualize
+bin/click-elem2man
 bin/click-fastclassifier
 bin/click-flatten
+bin/click-mkelemmap
 bin/click-mkmindriver
+bin/click-pretty
+bin/click-uncombine
 bin/click-undead
 bin/click-xform
-bin/click-buildtool
-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
+bin/click2xml
+bin/testie
+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/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-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,33 +69,39 @@ include/click/glue.hh
 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/ipaddressset.hh
 include/click/ipflowid.hh
 include/click/iptable.hh
 include/click/lexer.hh
-include/click/lexertinfo.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/subvector.hh
 include/click/sync.hh
 include/click/task.hh
 include/click/timer.hh
@@ -88,16 +109,33 @@ include/click/userutils.hh
 include/click/variableenv.hh
 include/click/vector.cc
 include/click/vector.hh
+include/clicknet/ether.h
+include/clicknet/fddi.h
+include/clicknet/icmp.h
+include/clicknet/icmp6.h
+include/clicknet/ip.h
+include/clicknet/ip6.h
+include/clicknet/llc.h
+include/clicknet/ppp.h
+include/clicknet/rfc1483.h
+include/clicknet/tcp.h
+include/clicknet/udp.h
+include/clicknet/wifi.h
+@dirrm include/clicknet
+include/clicktool/eclasst.hh
+include/clicktool/elementmap.hh
 include/clicktool/elementt.hh
+include/clicktool/etraits.hh
 include/clicktool/lexert.hh
 include/clicktool/lexertinfo.hh
 include/clicktool/processingt.hh
 include/clicktool/routert.hh
+include/clicktool/runparse.hh
 include/clicktool/toolutils.hh
 @unexec rm -rf %D/etc/click 2>&1 >/dev/null || true
 lib/libclick.a
 lib/libclicktool.a
-%%DATADIR%%/elementmap
+%%DATADIR%%/elementmap.xml
 %%DATADIR%%/srcdir
 %%DATADIR%%/src
 @dirrm include/click/standard