Index: head/net/click/Makefile
===================================================================
--- head/net/click/Makefile	(revision 119074)
+++ head/net/click/Makefile	(revision 119075)
@@ -1,109 +1,107 @@
-# Updated ports collection makefile for:   click
+# Ports collection makefile for:	click
 # Date created:        3 Nov 2001
 # Whom:                gnn
 #
 # $FreeBSD$
 #
 
 PORTNAME=	click
 PORTVERSION=	1.2.3
 PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.pdos.lcs.mit.edu/click/
 
 MAINTAINER=	gnn@neville-neil.com
 COMMENT=	The Click Modular Router
 
 GNU_CONFIGURE=	yes
 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
 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 \
 	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 \
 	BandwidthMeter.n BandwidthShaper.n Burster.n BandwidthRatedSplitter.n \
 	BandwidthRatedUnqueue.n CheckCRC32.n CheckLength.n CheckPaint.n \
 	Classifier.n CompareBlock.n Counter.n DelayShaper.n DelayUnqueue.n \
 	Discard.n DiscardNoFree.n DriverManager.n DropBroadcasts.n DRRSched.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 \
 	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 \
 	StaticSwitch.n StrideSched.n StrideSwitch.n Strip.n Suppressor.n \
 	Switch.n Tee.n PullTee.n TimedSink.n TimedSource.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 \
 	FromDump.n KernelTap.n KernelHandlerProxy.n PrintOld.n \
 	ToDevice.u.n ToDump.n elements.n AdaptiveRED.n IPReassembler.n \
 	IPRouteTable.n StaticIPLookup.n LinuxIPLookup.n RadixIPLookup.n \
 	RandomSample.n SetPacketType.n StripToNetworkHeader.n ProgressBar.n
 
 CONFDIR=	${PREFIX}/etc/click/conf
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha"
 BROKEN=		"Does not compile on alpha 4.x"
 .endif
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.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
 	@${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
-	@echo "----------------------------------------------------"
-	@echo "Install complete, to try it out do the following:"
-	@echo "cd ${PREFIX}/etc/click/conf"
-	@echo "click test.click"
-	@echo "You should see some output.  Now go read the papers and manual."
-	@echo "----------------------------------------------------"
-	@echo
+	@${ECHO_CMD}
+	@${ECHO_CMD} "----------------------------------------------------"
+	@${ECHO_CMD} "Install complete, to try it out do the following:"
+	@${ECHO_CMD} "cd ${PREFIX}/etc/click/conf"
+	@${ECHO_CMD} "click test.click"
+	@${ECHO_CMD} "You should see some output.  Now go read the papers and manual."
+	@${ECHO_CMD} "----------------------------------------------------"
+	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>

Property changes on: head/net/click/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/net/click/pkg-plist
===================================================================
--- head/net/click/pkg-plist	(revision 119074)
+++ head/net/click/pkg-plist	(revision 119075)
@@ -1,114 +1,106 @@
 bin/click
 bin/click-align
 bin/click-check
 bin/click-combine
 bin/click-uncombine
 bin/click-devirtualize
 bin/click-fastclassifier
 bin/click-flatten
 bin/click-mkmindriver
 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
 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
 include/click/ewma64.hh
 include/click/error.hh
 include/click/etheraddress.hh
 include/click/ewma.cc
 include/click/ewma.hh
 include/click/gaprate.hh
 include/click/glue.hh
 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
 include/click/userutils.hh
 include/click/variableenv.hh
 include/click/vector.cc
 include/click/vector.hh
 include/clicktool/elementt.hh
 include/clicktool/lexert.hh
 include/clicktool/lexertinfo.hh
 include/clicktool/processingt.hh
 include/clicktool/routert.hh
 include/clicktool/toolutils.hh
-@unexec install-info --delete %D/info/click.info %D/info/dir
-info/click.info
-info/click.info-1
-info/click.info-2
-info/click.info-3
-info/click.info-4
-info/click.info-5
-@exec install-info --section="Click Modular Router" --entry="* click: (click).        Click Modular Router" %D/info/click.info %D/info/dir
-@unexec rm -rf %D/etc/click
+@unexec rm -rf %D/etc/click 2>&1 >/dev/null || true
 lib/libclick.a
 lib/libclicktool.a
-share/click/elementmap
-share/click/srcdir
-share/click/src
+%%DATADIR%%/elementmap
+%%DATADIR%%/srcdir
+%%DATADIR%%/src
 @dirrm include/click/standard
 @dirrm include/click
 @dirrm include/clicktool
-@dirrm share/click
+@dirrm %%DATADIR%%

Property changes on: head/net/click/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property