3 files changed, 67 insertions, 46 deletions

diff --git a/net/nam/Makefile b/net/nam/Makefile
index f3980e58a381..ffb0d03a52f2 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	nam
 PORTVERSION=	1.0a9
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
-DISTFILES=	nam-src-${PORTVERSION}.tar.gz
+DISTNAME=	nam-src-${PORTVERSION}
 
-MAINTAINER=	obonilla@fisicc-ufm.edu
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
@@ -19,20 +19,21 @@ LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 MAN1=		nam.1
 MANCOMPRESSED=	no
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.3 --with-tk-ver=8.3
 
-ALL_TARGET=
+ALL_TARGET=	# empty
 
 post-patch:
-	@${SED} -e 's,friend Queue,friend class Queue,' < ${WRKSRC}/queue.h > \
-		${WRKSRC}/queue.h.new
-	@${MV} ${WRKSRC}/queue.h.new ${WRKSRC}/queue.h
+	@${REINPLACE_CMD} -e 's,friend Queue,friend class Queue,' ${WRKSRC}/queue.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/nam.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/examples/nam
-	${INSTALL_DATA} ${WRKSRC}/ex/* ${PREFIX}/share/examples/nam
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/ex/* ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/nam/files/patch-nam_stream.cc b/net/nam/files/patch-nam_stream.cc
new file mode 100644
index 000000000000..453ec5ab60c7
--- /dev/null
+++ b/net/nam/files/patch-nam_stream.cc
@@ -0,0 +1,20 @@
+--- nam_stream.cc.orig	Thu Oct  3 11:32:39 2002
++++ nam_stream.cc	Thu Oct  3 11:33:21 2002
+@@ -23,7 +23,7 @@
+ #ifdef WIN32
+ #include <limits.h>
+ #else
+-#include <values.h>
++#include <limits.h>
+ #endif
+ 
+ #include <assert.h>
+@@ -429,7 +429,7 @@
+ 	switch(whence) {
+ 	case SEEK_SET: lim = offset; break;
+ 	case SEEK_CUR: lim = tell() + offset; break;
+-	case SEEK_END: lim = MAXLONG; break; // XXX: MAXINT may not be max(off_t)
++	case SEEK_END: lim = LONG_MAX; break; // XXX: MAXINT may not be max(off_t)
+ 	}
+ 	insure_backing(lim);
+ 	if (0 == fseek(back_, offset, whence))
diff --git a/net/nam/pkg-plist b/net/nam/pkg-plist
index f42a8d4b04ab..6a03049a52c5 100644
--- a/net/nam/pkg-plist
+++ b/net/nam/pkg-plist
@@ -1,39 +1,39 @@
 bin/nam
-share/examples/nam/9nodetree.nam
-share/examples/nam/DSR.nam
-share/examples/nam/README
-share/examples/nam/adc.README
-share/examples/nam/adc.nam.gz
-share/examples/nam/algo-out-50sub.nam
-share/examples/nam/att.README
-share/examples/nam/att.nam.gz
-share/examples/nam/dynamic-nam.conf
-share/examples/nam/dynamics-demo.nam
-share/examples/nam/dynamics-demo.txt
-share/examples/nam/flat-out-50sub.nam
-share/examples/nam/hier-out-50sub.nam
-share/examples/nam/lan.nam
-share/examples/nam/lantest2.nam
-share/examples/nam/losspatterns.README
-share/examples/nam/losspatterns.nam
-share/examples/nam/mbone96.layout.nam
-share/examples/nam/mbone96.nam
-share/examples/nam/mcache.nam
-share/examples/nam/mobigen.nam
-share/examples/nam/pktdemo.nam.gz
-share/examples/nam/rbp_demo.README
-share/examples/nam/rbp_demo.nam
-share/examples/nam/rpm-vs-srm.nam
-share/examples/nam/sample.nam.tcl
-share/examples/nam/session.README
-share/examples/nam/session.nam.gz
-share/examples/nam/simple_mcast.nam
-share/examples/nam/srm-example.nam
-share/examples/nam/tcpecn.nam.gz
-share/examples/nam/tcpsrm.nam.gz
-share/examples/nam/test.nam.gz
-share/examples/nam/ts100.layout.nam.gz
-share/examples/nam/ts100.nam.gz
-share/examples/nam/ts20.nam.gz
-share/examples/nam/webcache.nam
-@dirrm share/examples/nam
+%%PORTDOCS%%share/examples/nam/9nodetree.nam
+%%PORTDOCS%%share/examples/nam/DSR.nam
+%%PORTDOCS%%share/examples/nam/README
+%%PORTDOCS%%share/examples/nam/adc.README
+%%PORTDOCS%%share/examples/nam/adc.nam.gz
+%%PORTDOCS%%share/examples/nam/algo-out-50sub.nam
+%%PORTDOCS%%share/examples/nam/att.README
+%%PORTDOCS%%share/examples/nam/att.nam.gz
+%%PORTDOCS%%share/examples/nam/dynamic-nam.conf
+%%PORTDOCS%%share/examples/nam/dynamics-demo.nam
+%%PORTDOCS%%share/examples/nam/dynamics-demo.txt
+%%PORTDOCS%%share/examples/nam/flat-out-50sub.nam
+%%PORTDOCS%%share/examples/nam/hier-out-50sub.nam
+%%PORTDOCS%%share/examples/nam/lan.nam
+%%PORTDOCS%%share/examples/nam/lantest2.nam
+%%PORTDOCS%%share/examples/nam/losspatterns.README
+%%PORTDOCS%%share/examples/nam/losspatterns.nam
+%%PORTDOCS%%share/examples/nam/mbone96.layout.nam
+%%PORTDOCS%%share/examples/nam/mbone96.nam
+%%PORTDOCS%%share/examples/nam/mcache.nam
+%%PORTDOCS%%share/examples/nam/mobigen.nam
+%%PORTDOCS%%share/examples/nam/pktdemo.nam.gz
+%%PORTDOCS%%share/examples/nam/rbp_demo.README
+%%PORTDOCS%%share/examples/nam/rbp_demo.nam
+%%PORTDOCS%%share/examples/nam/rpm-vs-srm.nam
+%%PORTDOCS%%share/examples/nam/sample.nam.tcl
+%%PORTDOCS%%share/examples/nam/session.README
+%%PORTDOCS%%share/examples/nam/session.nam.gz
+%%PORTDOCS%%share/examples/nam/simple_mcast.nam
+%%PORTDOCS%%share/examples/nam/srm-example.nam
+%%PORTDOCS%%share/examples/nam/tcpecn.nam.gz
+%%PORTDOCS%%share/examples/nam/tcpsrm.nam.gz
+%%PORTDOCS%%share/examples/nam/test.nam.gz
+%%PORTDOCS%%share/examples/nam/ts100.layout.nam.gz
+%%PORTDOCS%%share/examples/nam/ts100.nam.gz
+%%PORTDOCS%%share/examples/nam/ts20.nam.gz
+%%PORTDOCS%%share/examples/nam/webcache.nam
+%%PORTDOCS%%@dirrm share/examples/nam