- Update to 1.11

PR:		ports/84118
Submitted by:	Lars Eggert <lars.eggert@gmx.net>

6 files changed, 31 insertions, 49 deletions

diff --git a/net/nam/Makefile b/net/nam/Makefile
index 799ee6d9701..8810185c1f8 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	nam
-PORTVERSION=	1.10
-PORTREVISION=	1
+PORTVERSION=	1.11
+#PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
 DISTNAME=	nam-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The UCB/LBNL Network Animator
+COMMENT=	Animation tool for network simulation traces
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
diff --git a/net/nam/distinfo b/net/nam/distinfo
index 43aca530922..ae6c57aaf07 100644
--- a/net/nam/distinfo
+++ b/net/nam/distinfo
@@ -1,2 +1,2 @@
-MD5 (nam-src-1.10.tar.gz) = 35efe4a43f1cc3dd03fb744c5603fc58
-SIZE (nam-src-1.10.tar.gz) = 4324890
+MD5 (nam-src-1.11.tar.gz) = 2627e85637d7ae8caf477d4e76b6f5e0
+SIZE (nam-src-1.11.tar.gz) = 4358578
diff --git a/net/nam/files/patch-aa b/net/nam/files/patch-aa
index a5def1988d5..83abc421902 100644
--- a/net/nam/files/patch-aa
+++ b/net/nam/files/patch-aa
@@ -1,13 +1,20 @@
-$FreeBSD$
-
---- configure.orig	Sat Jun  8 23:00:16 2002
-+++ configure	Sat Jun  8 23:00:41 2002
-@@ -2041,7 +2041,7 @@
- EOF
+--- M	Tue Jul 26 12:13:26 2005
++++ Makefile.in	Tue Jul 26 12:13:47 2005
+@@ -62,7 +62,7 @@
  
+ STATIC = @V_STATIC@
+ DEFINE = -DTCL_TK @V_DEFINE@ @V_DEFINES@
+-CFLAGS = $(CCOPT) $(DEFINE) $(INCLUDE)
++CFLAGS += $(CCOPT) $(DEFINE) $(INCLUDE)
  
--		V_INCLUDES="$V_INCLUDE_ZLIB $V_INCLUDES"
-+		V_INCLUDES="$V_INCLUDES"
- 		V_DEFINES="-D$ac_tr_hdr $V_DEFINES"
- 
- 		NS_PACKAGE_zlib_UNDERWAY=true
+ INSTALL = @INSTALL@
+ RANLIB = @V_RANLIB@
+@@ -70,7 +70,7 @@
+ BLANK	= # make a blank space.  DO NOT add anything to this line
+ AR	= ar rc $(BLANK)
+ LINK	= $(CPP)
+-LDFLAGS	=
++LDFLAGS	+=
+ LDOUT	= -o $(BLANK)
+ PERL	= perl
+ RM	= rm -f
diff --git a/net/nam/files/patch-ab b/net/nam/files/patch-ab
deleted file mode 100644
index f395264509d..00000000000
--- a/net/nam/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- main.cc.orig	Sun Nov 28 17:24:15 1999
-+++ main.cc	Sun Nov 28 17:25:10 1999
-@@ -52,6 +52,7 @@
- 
- extern "C" {
- #include <tk.h>
-+extern int Tk_WmCmd (ClientData clientData, Tcl_Interp *interp, int argc, char **argv);
- }
- 
- static void
diff --git a/net/nam/files/patch-agent.h b/net/nam/files/patch-agent.h
deleted file mode 100644
index d549f1b8354..00000000000
--- a/net/nam/files/patch-agent.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- agent.h.orig
-+++ agent.h
-@@ -70,7 +70,7 @@
-   inline double width()  {return width_;}
-   inline double height() {return height_;}
-   virtual void findClosestCornertoPoint(double x, double y, 
--               double &corner_x, double &corner_y) const = NULL; 
-+               double &corner_x, double &corner_y) const = 0; 
-   virtual void place(double x, double y);
-   void label(const char* name, int anchor);
-   void color(const char* name);
diff --git a/net/nam/pkg-descr b/net/nam/pkg-descr
index 8c784700c6e..94cf8c2db68 100644
--- a/net/nam/pkg-descr
+++ b/net/nam/pkg-descr
@@ -1,11 +1,10 @@
-Nam is a Tcl/TK based animation tool for viewing network simulation traces 
-and real world packet traces. It supports topology layout, packet level 
-animation, and various data inspection tools. 
-
-Nam began at LBL. It has evolved substantially over the past few years. 
-The nam development effort is now an ongoing collaboration with 
-the VINT project.
+Nam is a Tcl/TK based animation tool for viewing network simulation
+traces and real world packet traces. It supports topology layout,
+packet level animation, and various data inspection tools.
+ 
+Nam began at LBL. It has evolved substantially over the past few
+years. The nam development effort was an ongoing collaboration with
+the VINT project. Currently, it is being developed at ISI as part of
+the SAMAN and Conser projects.
 
 WWW: http://www.isi.edu/nsnam/nam/
-
--Oscar <obonilla@fisicc-ufm.edu>