diff options
| -rw-r--r-- | doc/CHANGES | 4 | ||||
| -rw-r--r-- | net/ns/Makefile | 3 | ||||
| -rw-r--r-- | net/ns/distinfo | 14 | ||||
| -rw-r--r-- | net/ns/patches/patch-aa | 15 | ||||
| -rw-r--r-- | net/ns/patches/patch-al | 15 | ||||
| -rw-r--r-- | net/ns/patches/patch-am | 11 | ||||
| -rw-r--r-- | net/ns/patches/patch-an | 11 | ||||
| -rw-r--r-- | net/ns/patches/patch-ao | 11 | ||||
| -rw-r--r-- | net/ns/patches/patch-ap | 11 |
9 files changed, 78 insertions, 17 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index f561abbc501..b83e458b089 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.3658 2003/10/06 08:58:28 abs Exp $ +$NetBSD: CHANGES,v 1.3659 2003/10/06 11:02:43 jlam Exp $ Changes to the packages collection and infrastructure in 2003: @@ -4118,4 +4118,4 @@ Changes to the packages collection and infrastructure in 2003: Updated freeze to 2.5nb1 [jlam 2003-10-06] Updated pkglint to 3.64 [grant 2003-10-06] Update rconfig to 0.23 [abs 2003-10-06] - + Updated ns to 2.26nb1 [jlam 2003-10-06] diff --git a/net/ns/Makefile b/net/ns/Makefile index c7b5eae70b1..7c87a8ad63b 100644 --- a/net/ns/Makefile +++ b/net/ns/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2003/09/01 18:21:12 seb Exp $ +# $NetBSD: Makefile,v 1.9 2003/10/06 11:02:45 jlam Exp $ DISTNAME= ns-src-2.26 PKGNAME= ${DISTNAME:S/-src//} +PKGREVISION= 1 WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} CATEGORIES= net MASTER_SITES= http://www.isi.edu/nsnam/dist/ diff --git a/net/ns/distinfo b/net/ns/distinfo index ae10335453d..a13fadc82cb 100644 --- a/net/ns/distinfo +++ b/net/ns/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2003/09/03 13:42:44 seb Exp $ +$NetBSD: distinfo,v 1.4 2003/10/06 11:02:45 jlam Exp $ SHA1 (ns-src-2.26.tar.gz) = 23da69b5e23356a14e4e1825b7f434731bdc5f68 Size (ns-src-2.26.tar.gz) = 41592248 bytes -SHA1 (patch-aa) = 7acec0349ee60265655a633da659a12393b9fbc2 +SHA1 (patch-aa) = f9eae159453a3673feddc5e80c5bf2ff134b7d9c SHA1 (patch-ab) = 123d9110ac20063ffd32466dfa630bcbb76eff6d SHA1 (patch-ac) = 28cda4d9f68e031725016d2c06925394c76e5152 SHA1 (patch-ad) = 43dbf7d17c22c300ab3e9ea7057b1cd8ff805958 @@ -12,8 +12,8 @@ SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc SHA1 (patch-ak) = ea478696cdddc44ba7a76d1f31d4a6a97a88aaef -SHA1 (patch-al) = baf8543dfd598a52cb30502206b95b072a72a7c4 -SHA1 (patch-am) = d2f30afe70777f03486e606a076df95c52b18939 -SHA1 (patch-an) = 610ab5dd26a4f232af52662a373995378c12c58d -SHA1 (patch-ao) = 2c319518185002b15d9b00d46d8257be9ff47984 -SHA1 (patch-ap) = 78e14fbc682f3fc87f3812773a9e12f17ec549a5 +SHA1 (patch-al) = 9ce53b51d15f51ab7d822e9cc75f42368690dd94 +SHA1 (patch-am) = 5901c5e880b58a84ea6dcbe5dfd442d8e4bb3fd1 +SHA1 (patch-an) = c5a672c47c554cd7a1970c732f1a9da76b6c7090 +SHA1 (patch-ao) = c21054375f00e4af77dd72b2bac2a734c64573e0 +SHA1 (patch-ap) = f59ca64a44c251104cd5cec173dbaad9c4e4756b diff --git a/net/ns/patches/patch-aa b/net/ns/patches/patch-aa index a8bcfcf2fc5..f70123ca48a 100644 --- a/net/ns/patches/patch-aa +++ b/net/ns/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2003/09/01 18:21:12 seb Exp $ +$NetBSD: patch-aa,v 1.3 2003/10/06 11:02:45 jlam Exp $ --- Makefile.in.orig Thu Jun 6 22:37:57 2002 +++ Makefile.in @@ -11,3 +11,16 @@ $NetBSD: patch-aa,v 1.2 2003/09/01 18:21:12 seb Exp $ LDOUT = -o $(BLANK) DEFINE = -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ -DNS_DIFFUSION -DSMAC_NO_SYNC -DSTL_NAMESPACE=@STL_NAMESPACE@ -DUSE_SINGLE_ADDRESS_SPACE +@@ -452,10 +452,10 @@ + install: force install-ns install-man install-recursive + + install-ns: force +- $(INSTALL) -m 555 -o bin -g bin ns $(DESTDIR)$(BINDEST) ++ $(INSTALL) -m 555 ns $(DESTDIR)$(BINDEST) + + install-man: force +- $(INSTALL) -m 444 -o bin -g bin ns.1 $(DESTDIR)$(MANDEST)/man1 ++ $(INSTALL) -m 444 ns.1 $(DESTDIR)$(MANDEST)/man1 + + install-recursive: force + for i in $(SUBDIRS); do ( cd $$i; $(MAKE) install; ) done diff --git a/net/ns/patches/patch-al b/net/ns/patches/patch-al index 60e35976287..56841a15bae 100644 --- a/net/ns/patches/patch-al +++ b/net/ns/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.3 2003/09/03 13:42:45 seb Exp $ +$NetBSD: patch-al,v 1.4 2003/10/06 11:02:45 jlam Exp $ --- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig Fri Jan 11 22:06:09 2002 +++ indep-utils/cmu-scen-gen/setdest/Makefile.in -@@ -38,7 +38,7 @@ MKDEP = ../../../conf/mkdep +@@ -39,7 +39,7 @@ MKDEP = ../../../conf/mkdep # when including files from ns, we need to take care STL_NAMESPACE DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@ CFLAGS = @V_CCOPT@ @@ -11,3 +11,14 @@ $NetBSD: patch-al,v 1.3 2003/09/03 13:42:45 seb Exp $ LIBS = @V_LIB@ -lm @LIBS@ INSTALL = @INSTALL@ +@@ -46,8 +46,8 @@ + all: setdest calcdest + + install: setdest calcdest +- $(INSTALL) -m 555 -o bin -g bin setdest $(DESTDIR)$(BINDEST) ++ $(INSTALL) -m 555 setdest $(DESTDIR)$(BINDEST) +- $(INSTALL) -m 555 -o bin -g bin calcdest $(DESTDIR)$(BINDEST) ++ $(INSTALL) -m 555 calcdest $(DESTDIR)$(BINDEST) + + setdest: rng.o setdest.o + $(CCX) -o setdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \ diff --git a/net/ns/patches/patch-am b/net/ns/patches/patch-am index a4c9c613325..1f9254e7635 100644 --- a/net/ns/patches/patch-am +++ b/net/ns/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.2 2003/09/01 18:21:13 seb Exp $ +$NetBSD: patch-am,v 1.3 2003/10/06 11:02:45 jlam Exp $ --- indep-utils/webtrace-conv/dec/Makefile.in.orig Wed Feb 16 18:08:26 2000 +++ indep-utils/webtrace-conv/dec/Makefile.in @@ -11,3 +11,12 @@ $NetBSD: patch-am,v 1.2 2003/09/01 18:21:13 seb Exp $ LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@ INSTALL = @INSTALL@ +@@ -50,7 +50,7 @@ + all: dec-tr-stat + + install: dec-tr-stat +- $(INSTALL) -m 555 -o bin -g bin dec-tr-stat $(DESTDIR)$(BINDEST) ++ $(INSTALL) -m 555 dec-tr-stat $(DESTDIR)$(BINDEST) + + dec-tr-stat: $(OBJ) + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(LIBS) diff --git a/net/ns/patches/patch-an b/net/ns/patches/patch-an index e26208687aa..96da013f118 100644 --- a/net/ns/patches/patch-an +++ b/net/ns/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $ +$NetBSD: patch-an,v 1.2 2003/10/06 11:02:45 jlam Exp $ --- indep-utils/webtrace-conv/epa/Makefile.in.orig Wed Feb 16 18:08:26 2000 +++ indep-utils/webtrace-conv/epa/Makefile.in @@ -11,3 +11,12 @@ $NetBSD: patch-an,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $ LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@ INSTALL = @INSTALL@ +@@ -48,7 +48,7 @@ + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $(INCLUDE) $(OBJ) $(LIBS) + + install: epa-tr-stat +- $(INSTALL) -m 555 -o bin -g bin epa-tr-stat $(DESTDIR)$(BINDEST) ++ $(INSTALL) -m 555 epa-tr-stat $(DESTDIR)$(BINDEST) + + .SUFFIXES: .cc + diff --git a/net/ns/patches/patch-ao b/net/ns/patches/patch-ao index 1b6533a5dfa..c1b4cc0c7f5 100644 --- a/net/ns/patches/patch-ao +++ b/net/ns/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.2 2003/09/01 18:21:13 seb Exp $ +$NetBSD: patch-ao,v 1.3 2003/10/06 11:02:45 jlam Exp $ --- indep-utils/webtrace-conv/nlanr/Makefile.in.orig Wed Feb 16 18:08:27 2000 +++ indep-utils/webtrace-conv/nlanr/Makefile.in @@ -11,3 +11,12 @@ $NetBSD: patch-ao,v 1.2 2003/09/01 18:21:13 seb Exp $ LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@ INSTALL = @INSTALL@ +@@ -49,7 +49,7 @@ + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(LIBS) + + install: nlanr-tr-stat +- $(INSTALL) -m 555 -o bin -g bin nlanr-tr-stat $(DESTDIR)$(BINDEST) ++ $(INSTALL) -m 555 nlanr-tr-stat $(DESTDIR)$(BINDEST) + + .SUFFIXES: .cc + diff --git a/net/ns/patches/patch-ap b/net/ns/patches/patch-ap index fc06db2f9ec..f4a12e96579 100644 --- a/net/ns/patches/patch-ap +++ b/net/ns/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $ +$NetBSD: patch-ap,v 1.2 2003/10/06 11:02:45 jlam Exp $ --- indep-utils/webtrace-conv/ucb/Makefile.in.orig Wed Feb 16 18:08:28 2000 +++ indep-utils/webtrace-conv/ucb/Makefile.in @@ -11,3 +11,12 @@ $NetBSD: patch-ap,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $ LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@ INSTALL = @INSTALL@ +@@ -42,7 +42,7 @@ + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(LIBS) + + install: ucb-tr-stat +- $(INSTALL) -m 555 -o bin -g bin ucb-tr-stat $(DESTDIR)$(BINDEST) ++ $(INSTALL) -m 555 ucb-tr-stat $(DESTDIR)$(BINDEST) + + .SUFFIXES: .cc + |