cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.31

Browse Source
This commit is contained in:
steven 2007-10-24 15:01:09 +00:00
parent e937a69e16
commit b6e04074db
20 changed files with 101 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net/ns/Makefile
View File

@ -1,35 +1,38 @@
# $OpenBSD: Makefile,v 1.29 2007/09/15 22:36:56 merdely Exp $
# $OpenBSD: Makefile,v 1.30 2007/10/24 15:01:09 steven Exp $
# $FreeBSD: ports/net/ns/Makefile,v 1.3 1999/11/28 18:31:26 steve Exp $
COMMENT= UCB/LBNL Network Simulator Version 2
DISTNAME= ns-2.26
PKGNAME= ${DISTNAME}p0
DISTFILES= ns-src-2.26.tar.gz
V= 2.31
DISTNAME= ns-src-$V
PKGNAME= ns-$V
CATEGORIES= net
MASTER_SITES= ftp://ftp.ee.surrey.ac.uk/pub/Mirrors/ftp.isi.edu/nsnam/ \
ftp://ftp.isi.edu/nsnam/ \
http://www.isi.edu/nsnam/dist/
HOMEPAGE= http://www.isi.edu/nsnam/ns/
# License: BSD
# BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext c m pcap stdc++ tcl83 tk83
HOMEPAGE= http://www.isi.edu/nsnam/ns/
WANTLIB= X11 Xext c m pcap stdc++ tcl84 tk84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nsnam/}
WRKDIST= ${WRKDIR}/ns-$V
LIB_DEPENDS= otcl::lang/otcl \
tclcl:tclcl->=1.0b13p0:devel/tclcl
USE_X11= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-tcl-ver=8.3 --with-tk-ver=8.3 \
CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4 \
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
pre-configure:
@perl -pi -e 's,!!X11BASE!!,${X11BASE},' ${WRKSRC}/Makefile.in
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1

10
net/ns/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ns-src-2.26.tar.gz) = x1qiBH+j4T7SpDiBxQ5MZQ==
RMD160 (ns-src-2.26.tar.gz) = OfE7W+4gCKwQlKfACKG+N5WbGX0=
SHA1 (ns-src-2.26.tar.gz) = I9ppteIzVqFOThglt/Q0cxvcX2g=
SHA256 (ns-src-2.26.tar.gz) = wPyFZB6KY+DqAeP6fpSoAb/BEKlMCgaD8cjY72B445A=
SIZE (ns-src-2.26.tar.gz) = 41592248
MD5 (ns-src-2.31.tar.gz) = Mse8MdEV0x9JHZF50hqN9Q==
RMD160 (ns-src-2.31.tar.gz) = yosXskGyUSeFnInHkRD4OZgspLA=
SHA1 (ns-src-2.31.tar.gz) = CV4LWZq7WxyXcyD0NRdejRNIe3w=
SHA256 (ns-src-2.31.tar.gz) = fOpugFkb5jMeihWKuKDWidnm8/9NnBFzmvm7W+XqoWY=
SIZE (ns-src-2.31.tar.gz) = 56719360

18
net/ns/patches/patch-Makefile_in
View File

@ -1,12 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.2 2003/11/01 20:05:01 sturm Exp $
--- Makefile.in.orig 2003-02-27 19:51:25.000000000 -0500
+++ Makefile.in 2003-08-22 07:45:17.000000000 -0400
@@ -77,7 +77,7 @@ LIB = \
-lm @LIBS@
$OpenBSD: patch-Makefile_in,v 1.3 2007/10/24 15:01:09 steven Exp $
--- Makefile.in.orig Sun Mar 11 00:49:57 2007
+++ Makefile.in Sat Oct 13 22:38:30 2007
@@ -76,10 +76,10 @@ INCLUDES = \
LIB = \
@V_LIBS@ \
@V_LIB@ \
- -lm @LIBS@
+ -lm @LIBS@ -L!!X11BASE!!/lib -lX11
# -L@libdir@ \
-CFLAGS = $(CCOPT) $(DEFINE)
+CFLAGS = @CFLAGS@ $(DEFINE)
-CFLAGS += $(CCOPT) $(DEFINE)
+CFLAGS += $(CCOPT) @CFLAGS@ $(DEFINE)
# Explicitly define compilation rules since SunOS 4's make doesn't like gcc.
# Also, gcc does not remove the .o before forking 'as', which can be a

8
net/ns/patches/patch-aodv_aodv_rtable_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-aodv_aodv_rtable_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- aodv/aodv_rtable.h.orig 2003-02-26 17:07:15.000000000 -0500
+++ aodv/aodv_rtable.h 2003-08-22 07:45:17.000000000 -0400
@@ -36,7 +36,7 @@ The AODV code developed by the CMU/MONAR
$OpenBSD: patch-aodv_aodv_rtable_h,v 1.2 2007/10/24 15:01:09 steven Exp $
--- aodv/aodv_rtable.h.orig Tue Aug 2 21:48:51 2005
+++ aodv/aodv_rtable.h Sat Oct 13 22:22:21 2007
@@ -34,7 +34,7 @@ The AODV code developed by the CMU/MONARCH group was o
#include <assert.h>
#include <sys/types.h>
#include <config.h>

8
net/ns/patches/patch-common_mobilenode_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_mobilenode_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- common/mobilenode.h.orig 2003-02-26 17:07:40.000000000 -0500
+++ common/mobilenode.h 2003-08-22 07:45:17.000000000 -0400
@@ -53,7 +53,7 @@
$OpenBSD: patch-common_mobilenode_h,v 1.2 2007/10/24 15:01:09 steven Exp $
--- common/mobilenode.h.orig Tue Feb 21 16:20:18 2006
+++ common/mobilenode.h Sat Oct 13 22:22:21 2007
@@ -55,7 +55,7 @@ class MobileNode;
#include "object.h"
#include "trace.h"

8
net/ns/patches/patch-common_net-interface_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_net-interface_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- common/net-interface.h.orig 2003-02-26 17:07:40.000000000 -0500
+++ common/net-interface.h 2003-08-22 07:45:17.000000000 -0400
@@ -27,7 +27,7 @@
$OpenBSD: patch-common_net-interface_h,v 1.2 2007/10/24 15:01:09 steven Exp $
--- common/net-interface.h.orig Thu Aug 25 20:58:02 2005
+++ common/net-interface.h Sat Oct 13 22:22:21 2007
@@ -55,7 +55,7 @@
#include "connector.h"
#include "packet.h"

8
net/ns/patches/patch-config_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- config.h.orig 2003-11-01 16:55:26.000000000 +0100
+++ config.h 2003-11-01 16:55:43.000000000 +0100
@@ -151,6 +151,7 @@ struct ns_addr_t {
$OpenBSD: patch-config_h,v 1.2 2007/10/24 15:01:09 steven Exp $
--- config.h.orig Mon Jan 1 18:38:41 2007
+++ config.h Sat Oct 13 22:22:21 2007
@@ -148,6 +148,7 @@ struct ns_addr_t {
#endif /* HAVE_TIME_H */
#ifdef HAVE_ARPA_INET_H

8
net/ns/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2006/08/09 09:46:10 bernd Exp $
--- configure.orig Tue Aug 8 15:16:00 2006
+++ configure Tue Aug 8 15:16:00 2006
@@ -2902,7 +2902,7 @@ TCLCL_H_PLACES="\
$OpenBSD: patch-configure,v 1.2 2007/10/24 15:01:09 steven Exp $
--- configure.orig Mon Feb 19 00:50:28 2007
+++ configure Sat Oct 13 22:22:22 2007
@@ -5457,7 +5457,7 @@ TCLCL_H_PLACES="\
/usr/src/local/Tcl \
/usr/src/local/Tcl-1.0 \
/import/Tcl/include \

8
net/ns/patches/patch-empweb_empftp_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-empweb_empftp_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- empweb/empftp.h.orig 2003-02-26 17:08:38.000000000 -0500
+++ empweb/empftp.h 2003-08-22 07:45:18.000000000 -0400
@@ -37,7 +37,7 @@
$OpenBSD: patch-empweb_empftp_h,v 1.2 2007/10/24 15:01:09 steven Exp $
--- empweb/empftp.h.orig Thu Aug 25 20:58:05 2005
+++ empweb/empftp.h Sat Oct 13 22:22:22 2007
@@ -58,7 +58,7 @@
#include "random.h"
#include "timer-handler.h"

8
net/ns/patches/patch-empweb_empweb_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-empweb_empweb_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- empweb/empweb.h.orig 2003-02-26 17:08:38.000000000 -0500
+++ empweb/empweb.h 2003-08-22 07:45:18.000000000 -0400
@@ -38,7 +38,7 @@
$OpenBSD: patch-empweb_empweb_h,v 1.2 2007/10/24 15:01:09 steven Exp $
--- empweb/empweb.h.orig Thu Aug 25 20:58:05 2005
+++ empweb/empweb.h Sat Oct 13 22:22:22 2007
@@ -59,7 +59,7 @@
#include "random.h"
#include "timer-handler.h"

13
net/ns/patches/patch-emulate_ether_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-emulate_ether_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- emulate/ether.cc.orig 2003-02-26 17:08:40.000000000 -0500
+++ emulate/ether.cc 2003-08-22 08:26:57.000000000 -0400
@@ -43,13 +43,33 @@ static const char rcsid[] =
$OpenBSD: patch-emulate_ether_cc,v 1.2 2007/10/24 15:01:09 steven Exp $
--- emulate/ether.cc.orig Wed Feb 9 00:35:12 2000
+++ emulate/ether.cc Sat Oct 13 22:22:22 2007
@@ -43,12 +43,32 @@ static const char rcsid[] =
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-emulate_ether_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
#include "ether.h"
char Ethernet::hex[] = "0123456789abcdef";
+
+/*
+ * Structure of a 10Mb/s Ethernet header. [ported from ether.h]
+ */
@ -32,7 +32,6 @@ $OpenBSD: patch-emulate_ether_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
+ u_char octet[ETHER_ADDR_LEN];
+};
+#endif
+
void
Ethernet::ether_print(const u_char *bp)
{

8
net/ns/patches/patch-emulate_net-pcap_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-emulate_net-pcap_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- emulate/net-pcap.cc.orig 2003-02-26 23:08:18.000000000 +0100
+++ emulate/net-pcap.cc 2003-11-01 19:29:41.000000000 +0100
@@ -341,7 +341,9 @@ PcapNetwork::phandler_callback(u_char* u
$OpenBSD: patch-emulate_net-pcap_cc,v 1.2 2007/10/24 15:01:09 steven Exp $
--- emulate/net-pcap.cc.orig Wed Sep 7 08:35:45 2005
+++ emulate/net-pcap.cc Sat Oct 13 22:22:22 2007
@@ -341,7 +341,9 @@ PcapNetwork::phandler_callback(u_char* userdata, const
int s = inst->skiphdr(); // go to IP header
memcpy(p->accessdata(), pkt + s, ph->caplen - s);

12
net/ns/patches/patch-indep-utils_cmu-scen-gen_setdest_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-indep-utils_cmu-scen-gen_setdest_Makefile_in,v 1.2 2003/11/01 20:05:01 sturm Exp $
--- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig 2003-02-26 17:08:45.000000000 -0500
+++ indep-utils/cmu-scen-gen/setdest/Makefile.in 2003-08-22 07:45:19.000000000 -0400
@@ -32,7 +32,7 @@ prefix = @prefix@
$OpenBSD: patch-indep-utils_cmu-scen-gen_setdest_Makefile_in,v 1.3 2007/10/24 15:01:09 steven Exp $
--- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig Fri Sep 16 05:05:40 2005
+++ indep-utils/cmu-scen-gen/setdest/Makefile.in Sat Oct 13 22:22:22 2007
@@ -48,7 +48,7 @@ prefix = @prefix@
# Pathname of directory to install the binary
BINDEST = @prefix@/bin
@ -10,7 +10,7 @@ $OpenBSD: patch-indep-utils_cmu-scen-gen_setdest_Makefile_in,v 1.2 2003/11/01 20
CC = @CC@
MKDEP = ../../../conf/mkdep
@@ -50,19 +50,19 @@ install: setdest calcdest
@@ -66,19 +66,19 @@ install: setdest calcdest
$(INSTALL) -m 555 -o bin -g bin calcdest $(DESTDIR)$(BINDEST)
setdest: rng.o setdest.o
@ -34,7 +34,7 @@ $OpenBSD: patch-indep-utils_cmu-scen-gen_setdest_Makefile_in,v 1.2 2003/11/01 20
clean:
@rm -f setdest setbox *.o *.core
@@ -70,5 +70,5 @@ clean:
@@ -86,5 +86,5 @@ clean:
.SUFFIXES: .cc
.cc.o:

11
net/ns/patches/patch-indep-utils_webtrace-conv_dec_proxytrace_cc
View File

@ -1,9 +1,10 @@
$OpenBSD: patch-indep-utils_webtrace-conv_dec_proxytrace_cc,v 1.2 2003/11/01 20:05:01 sturm Exp $
--- indep-utils/webtrace-conv/dec/proxytrace.cc.orig 2003-02-26 17:08:50.000000000 -0500
+++ indep-utils/webtrace-conv/dec/proxytrace.cc 2003-08-22 07:45:19.000000000 -0400
@@ -1,5 +1,6 @@
$OpenBSD: patch-indep-utils_webtrace-conv_dec_proxytrace_cc,v 1.3 2007/10/24 15:01:09 steven Exp $
--- indep-utils/webtrace-conv/dec/proxytrace.cc.orig Wed Jul 13 05:51:25 2005
+++ indep-utils/webtrace-conv/dec/proxytrace.cc Sat Oct 13 22:22:22 2007
@@ -2,6 +2,7 @@
#include <stdio.h>
#include <limits.h>
#include <assert.h>
+#include <stdlib.h>
#include "../../../autoconf.h"
#ifdef STDC_HEADERS

8
net/ns/patches/patch-mac_channel_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mac_channel_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- mac/channel.cc.orig 2003-02-26 17:08:55.000000000 -0500
+++ mac/channel.cc 2003-08-22 07:45:20.000000000 -0400
@@ -49,7 +49,7 @@ static const char rcsid[] =
$OpenBSD: patch-mac_channel_cc,v 1.2 2007/10/24 15:01:09 steven Exp $
--- mac/channel.cc.orig Thu Feb 3 21:15:00 2005
+++ mac/channel.cc Sat Oct 13 22:22:22 2007
@@ -55,7 +55,7 @@ static const char rcsid[] =
#include "packet.h"
#include "mac.h"
#include "channel.h"

8
net/ns/patches/patch-mpls_mpls-module_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mpls_mpls-module_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- mpls/mpls-module.h.orig 2003-02-26 17:09:01.000000000 -0500
+++ mpls/mpls-module.h 2003-08-22 07:45:20.000000000 -0400
@@ -26,7 +26,7 @@
$OpenBSD: patch-mpls_mpls-module_h,v 1.2 2007/10/24 15:01:09 steven Exp $
--- mpls/mpls-module.h.orig Thu Aug 25 20:58:09 2005
+++ mpls/mpls-module.h Sat Oct 13 22:22:22 2007
@@ -55,7 +55,7 @@
#include <tclcl.h>

12
net/ns/patches/patch-qs_qsagent_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-qs_qsagent_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- qs/qsagent.h.orig 2003-02-26 17:09:12.000000000 -0500
+++ qs/qsagent.h 2003-08-22 07:45:20.000000000 -0400
@@ -40,7 +40,7 @@
#include "packet.h"
#include "hdr_qs.h"
#include "timer-handler.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
class QSAgent;

8
net/ns/patches/patch-routing_rttable_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-routing_rttable_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- routing/rttable.h.orig 2003-02-26 17:09:15.000000000 -0500
+++ routing/rttable.h 2003-08-22 07:45:21.000000000 -0400
@@ -52,7 +52,7 @@ redistribute these changes without encum
$OpenBSD: patch-routing_rttable_h,v 1.2 2007/10/24 15:01:09 steven Exp $
--- routing/rttable.h.orig Tue Aug 2 21:48:52 2005
+++ routing/rttable.h Sat Oct 13 22:22:22 2007
@@ -44,7 +44,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "config.h"
#include "scheduler.h"

8
net/ns/patches/patch-webcache_webtraf_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-webcache_webtraf_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- webcache/webtraf.h.orig 2003-02-26 17:11:31.000000000 -0500
+++ webcache/webtraf.h 2003-08-22 07:45:21.000000000 -0400
@@ -39,7 +39,7 @@
$OpenBSD: patch-webcache_webtraf_h,v 1.2 2007/10/24 15:01:09 steven Exp $
--- webcache/webtraf.h.orig Thu Aug 25 20:58:13 2005
+++ webcache/webtraf.h Sat Oct 13 22:22:22 2007
@@ -60,7 +60,7 @@
#include "random.h"
#include "timer-handler.h"

6
net/ns/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:17:42 espie Exp $
@comment $OpenBSD: PLIST,v 1.5 2007/10/24 15:01:09 steven Exp $
bin/ns
@man man/man1/ns.1
share/examples/ns2/
@ -10,6 +10,7 @@ share/examples/ns2/diffusion-rate-run.tcl
share/examples/ns2/dumbbell.tcl
share/examples/ns2/example.tcl
share/examples/ns2/flooding-run.tcl
share/examples/ns2/flooding.tcl
share/examples/ns2/fq-cbr.tcl
share/examples/ns2/fq.tcl
share/examples/ns2/grid2.tcl
@ -109,6 +110,7 @@ share/examples/ns2/web-traffic.tcl
share/examples/ns2/wired-cum-wireless-sim.tcl
share/examples/ns2/wireless-demo-csci694.tcl
share/examples/ns2/wireless-dsdv-newnode.tcl
share/examples/ns2/wireless-flooding.tcl
share/examples/ns2/wireless-landmark.tcl
share/examples/ns2/wireless-mip-test.tcl
share/examples/ns2/wireless-mitf.tcl
@ -116,5 +118,7 @@ share/examples/ns2/wireless-newnode-energy.tcl
share/examples/ns2/wireless-pkt-demo.tcl
share/examples/ns2/wireless-shadowing-test.tcl
share/examples/ns2/wireless-shadowing-vis-test.tcl
share/examples/ns2/wireless-simple-mac.tcl
share/examples/ns2/wireless-test.tcl
share/examples/ns2/wireless.tcl
share/examples/ns2/worm.tcl