Update to 1.15

Released Fri Nov 4 2011
   Tcl-8.5 support, improved OS X support

nam-1.14
Released June 17 2009
   Refresh packages, some improved 64-bit support

nam-1.13
Released Sat Mar 10 2007
   Refresh packages, Sun OS compilation patch

nam-1.12
Released Sat Sep 24 2006
   Refresh packages

5 files changed, 25 insertions, 44 deletions

diff --git a/net/nam/Makefile b/net/nam/Makefile
index 9cba77ae66d..025e934162e 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2012/11/17 22:14:11 markd Exp $
+# $NetBSD: Makefile,v 1.30 2012/12/15 22:17:31 markd Exp $
 
-DISTNAME=	ns-allinone-2.29.3
-PKGNAME=	nam-1.11
-PKGREVISION=	5
+DISTNAME=	nam-src-1.15
+PKGNAME=	nam-1.15
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nsnam/}
 
@@ -12,9 +11,7 @@ COMMENT=	The UCB/LBNL Network Animator
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-NOT_FOR_PLATFORM+=	${LP64PLATFORMS}
-
-WRKSRC=		${WRKDIR}/ns-allinone-2.29/nam-1.11
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
 BUILD_TARGET=
diff --git a/net/nam/distinfo b/net/nam/distinfo
index cb73cf58590..b342dce7c85 100644
--- a/net/nam/distinfo
+++ b/net/nam/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.7 2006/08/23 10:43:50 minskim Exp $
+$NetBSD: distinfo,v 1.8 2012/12/15 22:17:31 markd Exp $
 
-SHA1 (ns-allinone-2.29.3.tar.gz) = 3a09828d08b3b43c4008b171d0b72dbc2baf8d7f
-RMD160 (ns-allinone-2.29.3.tar.gz) = 7feab9f6ab74a5207d8a7926f2fb965f263a887c
-Size (ns-allinone-2.29.3.tar.gz) = 68618537 bytes
-SHA1 (patch-aa) = 6178acca56809e546128c0b8d54db4aa6db83e4d
-SHA1 (patch-ab) = c7ecec5ce97b68a41ad9e93017e158ad8426ad45
-SHA1 (patch-ac) = dfdefa14ebe3a434ad2aa85e0b40065bc2e9a858
-SHA1 (patch-ad) = 37febda5857e59fd87ee6833db82528e1d5b4920
+SHA1 (nam-src-1.15.tar.gz) = 9059914cf537ba32f297bcd4b4a6ebf940a7ca4c
+RMD160 (nam-src-1.15.tar.gz) = 3f52ee941a24a5f26624ba75177835fee4d37920
+Size (nam-src-1.15.tar.gz) = 4365554 bytes
+SHA1 (patch-aa) = a24e3353c3e5a6ee8bcdc75d2d9cea1653847c35
+SHA1 (patch-ac) = 3daef7356606a00144117e4ea235ccab1572c0d8
diff --git a/net/nam/patches/patch-aa b/net/nam/patches/patch-aa
index 57c78169bf2..48321823e1e 100644
--- a/net/nam/patches/patch-aa
+++ b/net/nam/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/09/03 21:29:45 seb Exp $
+$NetBSD: patch-aa,v 1.3 2012/12/15 22:17:31 markd Exp $
 
---- Makefile.in.orig	2003-02-26 20:52:56.000000000 +0000
+--- Makefile.in.orig	2011-11-04 17:18:41.000000000 +0000
 +++ Makefile.in
-@@ -70,7 +70,7 @@ RANLIB = @V_RANLIB@
+@@ -72,7 +72,7 @@ RANLIB = @V_RANLIB@
  BLANK	= # make a blank space.  DO NOT add anything to this line
  AR	= ar rc $(BLANK)
  LINK	= $(CPP)
@@ -11,11 +11,11 @@ $NetBSD: patch-aa,v 1.2 2003/09/03 21:29:45 seb Exp $
  LDOUT	= -o $(BLANK)
  PERL	= perl
  RM	= rm -f
-@@ -161,7 +161,7 @@ $(GEN_DIR)version.c: VERSION
+@@ -163,7 +163,7 @@ $(GEN_DIR)version.c: VERSION
  	$(TCLSH) bin/string2c.tcl version < VERSION > $@
  
  install: force
--	$(INSTALL) -m 555 -o bin -g bin nam $(DESTDIR)$(BINDEST)
+-	$(INSTALL) -m 755 nam $(DESTDIR)$(BINDEST)
 +	${BSD_INSTALL_PROGRAM} nam $(DESTDIR)$(BINDEST)
  
  clean:
diff --git a/net/nam/patches/patch-ab b/net/nam/patches/patch-ab
deleted file mode 100644
index f0f08189bc2..00000000000
--- a/net/nam/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/02/28 15:29:22 minskim Exp $
-
---- conf/configure.in.TclCL.orig	2005-01-24 17:34:24.000000000 -0600
-+++ conf/configure.in.TclCL
-@@ -61,7 +61,7 @@ TCLCL_PROG_PLACES="\
-                 /usr/src/local/Tcl \
-                 /usr/src/local/Tcl-1.0 \
-                 "
--TCLCL_PROG_PLACES_D="$d"
-+TCLCL_PROG_PLACES_D="$d/bin"
- 
- 
- NS_BEGIN_PACKAGE(tclcl)
diff --git a/net/nam/patches/patch-ac b/net/nam/patches/patch-ac
index f09b683c18a..6be769c495b 100644
--- a/net/nam/patches/patch-ac
+++ b/net/nam/patches/patch-ac
@@ -1,13 +1,12 @@
-$NetBSD: patch-ac,v 1.4 2005/02/28 15:29:22 minskim Exp $
+$NetBSD: patch-ac,v 1.5 2012/12/15 22:17:31 markd Exp $
 
---- configure.orig	2005-01-24 17:37:03.000000000 -0600
+--- configure.orig	2012-11-29 09:45:02.000000000 +0000
 +++ configure
-@@ -6442,7 +6442,7 @@ TCLCL_PROG_PLACES="\
-                 /usr/src/local/Tcl \
-                 /usr/src/local/Tcl-1.0 \
-                 "
--TCLCL_PROG_PLACES_D="$d"
-+TCLCL_PROG_PLACES_D="$d/bin"
- 
- 
- 
+@@ -5749,6 +5749,7 @@ TCL_H_PLACES_D="$d/generic \
+ 		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include \
++		$d/include/tcl/generic \
+ 		/usr/local/include \
+ 		"
+ TCL_H_PLACES=" \