Update to new Tcl layout.

While there, make use of the tcl/tk modules.

OK landry@, stu@

net/ns/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2010/11/19 22:31:35 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2011/01/05 19:06:06 sebastia Exp $
 # $FreeBSD: ports/net/ns/Makefile,v 1.3 1999/11/28 18:31:26 steve Exp $
 
 COMMENT=	UCB/LBNL Network Simulator Version 2
@@ -6,7 +6,7 @@ COMMENT=	UCB/LBNL Network Simulator Version 2
 V=		2.31
 DISTNAME=	ns-src-$V
 PKGNAME=	ns-$V
-REVISION=	3
+REVISION=	4
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.isi.edu/nsnam/ns/
@@ -17,17 +17,23 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	X11 c m pcap pthread-stubs stdc++ tcl84 tk84 xcb otcl
+MODULES +=	x11/tk
+MODTK_VERSION =	8.4
+WANTLIB +=	X11 c m pcap pthread-stubs stdc++ xcb otcl
+WANTLIB +=	${MODTK_WANTLIB}
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nsnam/}
 WRKDIST=	${WRKDIR}/ns-$V
 
 BUILD_DEPENDS=	devel/tclcl>=1.0b13p0
-LIB_DEPENDS=	lang/otcl
+LIB_DEPENDS=	lang/otcl \
+		${MODTK_LIB_DEPENDS}
 
-USE_GROFF =	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4 \
+CONFIGURE_ARGS=	--with-tcl-ver=${MODTCL_VERSION} \
+		--with-tk-ver=${MODTK_VERSION} \
+		--with-tcl=${MODTCL_LIBDIR} \
+		--with-tk=${MODTK_LIBDIR} \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib
 

net/ns/patches/patch-configure

@@ -1,6 +1,42 @@
-$OpenBSD: patch-configure,v 1.2 2007/10/24 15:01:09 steven Exp $
+$OpenBSD: patch-configure,v 1.3 2011/01/05 19:06:06 sebastia Exp $
 --- configure.orig	Mon Feb 19 00:50:28 2007
-+++ configure	Sat Oct 13 22:22:22 2007
++++ configure	Thu Dec 23 14:01:23 2010
+@@ -4562,7 +4562,7 @@ else
+ echo "$as_me: error: $d is not a directory" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+-		places="$TCL_H_PLACES_D"
++		places="$TCL_H_PLACES_D $TCL_H_PLACES"
+ 	fi
+ 
+ 	V_INCLUDE_TCL=""
+@@ -4621,7 +4621,7 @@ else
+ echo "$as_me: error: $d is not a directory" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+-		places="$TCL_LIB_PLACES_D"
++		places="$TCL_LIB_PLACES_D $TCL_LIB_PLACES"
+ 	fi
+ 
+ 	V_LIB_TCL=""
+@@ -5008,7 +5008,7 @@ else
+ echo "$as_me: error: $d is not a directory" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+-		places="$TK_H_PLACES_D"
++		places="$TK_H_PLACES_D $TK_H_PLACES"
+ 	fi
+ 
+ 	V_INCLUDE_TK=""
+@@ -5067,7 +5067,7 @@ else
+ echo "$as_me: error: $d is not a directory" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+-		places="$TK_LIB_PLACES_D"
++		places="$TK_LIB_PLACES_D $TK_LIB_PLACES"
+ 	fi
+ 
+ 	V_LIB_TK=""
 @@ -5457,7 +5457,7 @@ TCLCL_H_PLACES="\
                  /usr/src/local/Tcl \
                  /usr/src/local/Tcl-1.0 \

net/ns/pkg/PLIST

@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2007/10/24 15:01:09 steven Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/01/05 19:06:06 sebastia Exp $
-bin/ns
+@bin bin/ns
 @man man/man1/ns.1
 share/examples/ns2/
 share/examples/ns2/agent-gen-script.tcl