From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 3 10:50:19 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AB0A37B404 for ; Thu, 3 Jul 2003 10:50:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DFD643FF2 for ; Thu, 3 Jul 2003 10:50:18 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h63HoIUp074324 for ; Thu, 3 Jul 2003 10:50:18 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h63HoIvA074323; Thu, 3 Jul 2003 10:50:18 -0700 (PDT) Resent-Date: Thu, 3 Jul 2003 10:50:18 -0700 (PDT) Resent-Message-Id: <200307031750.h63HoIvA074323@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF1A237B404 for ; 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 ; 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" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/54069: [fix] net/ns: update to 2.26 unbreaks it X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2003 17:50:19 -0000 >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: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jul 03 10:50:17 PDT 2003 >Closed-Date: >Last-Modified: >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 - -.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 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; iRelease-Note: >Audit-Trail: >Unformatted: