From sheepkiller@cultdeadsheep.org  Thu Jul  3 10:48:32 2003
Return-Path: <sheepkiller@cultdeadsheep.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EF1A237B404
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Jul 2003 10:48:31 -0700 (PDT)
Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2E95C43F75
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Jul 2003 10:48:30 -0700 (PDT)
	(envelope-from sheepkiller@cultdeadsheep.org)
Received: (qmail 91736 invoked from network); 3 Jul 2003 17:48:28 -0000
Received: from unknown (HELO ?HOSTNAME?) (192.168.0.12)
  by goofy.cultdeadsheep.org with SMTP; 3 Jul 2003 17:48:28 -0000
Received: by _HOSTNAME_ (sSMTP sendmail emulation); Thu,  3 Jul 2003 19:48:18 +0200
Message-Id: <20030703174830.2E95C43F75@mx1.FreeBSD.org>
Date: Thu,  3 Jul 2003 19:48:18 +0200
From: "Clement Laforet" <sheepkiller@cultdeadsheep.org>
Reply-To: Clement Laforet <sheepkiller@cultdeadsheep.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Clement Laforet <sheepkiller@cultdeadsheep.org>
Subject: [fix] net/ns: update to 2.26 unbreaks it
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         54069
>Category:       ports
>Synopsis:       [fix] net/ns: update to 2.26 unbreaks it
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 03 10:50:17 PDT 2003
>Closed-Date:    Tue Jul 08 04:47:35 PDT 2003
>Last-Modified:  Tue Jul 08 04:47:35 PDT 2003
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD chuck.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sun Jun 22 01:48:26 CEST 2003 root@chuck.cultdeadsheep.org:/usr/obj/usr/src/sys/DARTH-VADER i386


	
>Description:
	Update net/ns to 2.26
	removed files:
	files/
	files/patch-aa
	files/patch-ab

>How-To-Repeat:
	N/A.
>Fix:

	

--- ns.diff begins here ---
diff -Nru ns.orig/Makefile ns/Makefile
--- ns.orig/Makefile	Thu Jul  3 19:43:13 2003
+++ ns/Makefile	Thu Jul  3 19:41:08 2003
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ns
-PORTVERSION=	2.1.b9
+PORTVERSION=	2.26
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
-DISTNAME=	ns-src-2.1b9
+DISTNAME=	ns-src-2.26
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The UCB/LBNL Network Simulator Version 2
@@ -20,22 +20,15 @@
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/ns-2.1b9
+WRKSRC=		${WRKDIR}/ns-2.26
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.3 --with-tk-ver=8.3
 
 ALL_TARGET=
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
 	${MKDIR} ${PREFIX}/share/examples/ns2
 	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${PREFIX}/share/examples/ns2
-.include <bsd.port.post.mk>
diff -Nru ns.orig/distinfo ns/distinfo
--- ns.orig/distinfo	Thu Jul  3 19:43:13 2003
+++ ns/distinfo	Thu Jul  3 18:41:08 2003
@@ -1 +1 @@
-MD5 (ns-src-2.1b9.tar.gz) = 77bb2c3cde1551dc6e97efb945d08ccd
+MD5 (ns-src-2.26.tar.gz) = c75aa2047fa3e13ed2a43881c50e4c65
diff -Nru ns.orig/files/patch-aa ns/files/patch-aa
--- ns.orig/files/patch-aa	Thu Jul  3 19:43:13 2003
+++ ns/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- indep-utils/webtrace-conv/ucb/utils.h.orig	Tue May 28 17:13:35 2002
-+++ indep-utils/webtrace-conv/ucb/utils.h	Tue May 28 17:13:44 2002
-@@ -107,7 +107,6 @@
- 
- /************* A really dumb implementation of strnstr and strcasestr ***********/
- char *dumb_strnstr(char *str, char *substr, int n);
--const char *strcasestr(const char *string, const char *substr);
- 
- /*
-  ***************** Socket convenience utilities ****************
diff -Nru ns.orig/files/patch-ab ns/files/patch-ab
--- ns.orig/files/patch-ab	Thu Jul  3 19:43:13 2003
+++ ns/files/patch-ab	Thu Jan  1 01:00:00 1970
@@ -1,32 +0,0 @@
---- indep-utils/webtrace-conv/ucb/utils.cc.orig	Tue May 28 17:14:30 2002
-+++ indep-utils/webtrace-conv/ucb/utils.cc	Tue May 28 17:14:39 2002
-@@ -56,29 +56,6 @@
- #include "utils.h"
- 
- /*
-- *  Case-insensitive version of strstr()
-- */
--
--
--const char *
--strcasestr(const char *string, const char *substr)
--{
--  int str_len, substr_len, cmplen, i;
--  const char *ptr;
--
--  str_len = strlen(string);
--  substr_len = strlen(substr);
--  cmplen = str_len - substr_len + 1;
--
--  for (ptr = string, i=0; i<cmplen; i++, ptr++) {
--    if (strncasecmp(ptr, substr, substr_len) == 0)
--      return ptr;
--  }
--  return NULL;
--}
--
--
--/*
-  ************* Dump out the hexification of the buffer ***********
-  */
- void dump_buf(FILE *std, char *buf, int retlen)
diff -Nru ns.orig/pkg-plist ns/pkg-plist
--- ns.orig/pkg-plist	Thu Jul  3 19:43:13 2003
+++ ns/pkg-plist	Thu Jul  3 19:44:34 2003
@@ -57,6 +57,7 @@
 share/examples/ns2/simple-plm.tcl
 share/examples/ns2/simple-rtg.tcl
 share/examples/ns2/simple-rtp.tcl
+share/examples/ns2/simple-tcp.tcl
 share/examples/ns2/simple-webcache-comp.tcl
 share/examples/ns2/simple-webcache-trace.tcl
 share/examples/ns2/simple-webcache.tcl
--- ns.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Clement Laforet <sheepkiller@cultdeadsheep.org>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/54069: [fix] net/ns: update to 2.26 unbreaks it
Date: Thu, 3 Jul 2003 19:54:21 +0200

 oups... I forgot one line...
 
 diff -Nru ns/Makefile ns.dirty/Makefile
 --- ns/Makefile	Thu Jul  3 19:52:58 2003
 +++ ns.dirty/Makefile	Thu Jul  3 19:52:26 2003
 @@ -32,5 +32,3 @@
  	${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
  	${MKDIR} ${PREFIX}/share/examples/ns2
  	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${PREFIX}/share/examples/ns2
 -
 -.include <bsd.port.mk>
 

From: Clement Laforet <sheepkiller@cultdeadsheep.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/54069: [fix] net/ns: update to 2.26 unbreaks it
Date: Thu, 3 Jul 2003 20:06:34 +0200

 arg !! 
 forgot about the latest patch :
 
 diff -Nru ns.dirty/Makefile ns/Makefile
 --- ns.dirty/Makefile	Thu Jul  3 19:52:26 2003
 +++ ns/Makefile	Thu Jul  3 19:52:58 2003
 @@ -32,3 +32,5 @@
  	${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
  	${MKDIR} ${PREFIX}/share/examples/ns2
  	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${PREFIX}/share/examples/ns2
 +
 +.include <bsd.port.mk>
 
 That's better ;)
State-Changed-From-To: open->closed 
State-Changed-By: daichi 
State-Changed-When: Tue Jul 8 04:47:21 PDT 2003 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54069 
>Unformatted:
