Attachment 125109 Details for Bug 168673 – ns-2.35.patch

[patch] ns-2.35.patch

ns-2.35.patch (text/plain), 5.23 KB, created by Masaki TAGAWA on 2012-06-04 16:00:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Masaki TAGAWA

Created: 2012-06-04 16:00:24 UTC

Size: 5.23 KB

patch

obsolete

>diff -ruN /usr/ports/net/ns.org/Makefile /usr/ports/net/ns/Makefile
>--- /usr/ports/net/ns.org/Makefile	2009-08-22 09:31:35.000000000 +0900
>+++ /usr/ports/net/ns/Makefile	2012-06-04 23:05:49.000000000 +0900
>@@ -6,9 +6,10 @@
> #
> 
> PORTNAME=	ns
>-PORTVERSION=	2.33
>+PORTVERSION=	2.35
> CATEGORIES=	net
> MASTER_SITES=	SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION}
>+DISTFILES=	${PORTNAME}-src-${PORTVERSION}.tar.gz
> 
> MAINTAINER=	lstewart@FreeBSD.org
> COMMENT=	Discrete event simulator for networking research
>@@ -19,19 +20,20 @@
> MANCOMPRESSED=	no
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4 --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
>+CONFIGURE_ARGS=	 --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
> USE_GMAKE=	yes
>-USE_TK=		84
>+USE_TK=		85+
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/src/local/Tcl-1.0 \\|${LOCALBASE}/include/tclcl \\|g' \
>-		-e 's|/usr/src/local/Tcl-1.0\"|${LOCALBASE}/lib\"|g' \
>+	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
> 		${WRKSRC}/configure
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/ns.1 ${MANPREFIX}/man/man1
>+.if !defined(NOPORTDOCS)
> 	${MKDIR} ${EXAMPLESDIR}
> 	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR}
>+.endif
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/net/ns.org/distinfo /usr/ports/net/ns/distinfo
>--- /usr/ports/net/ns.org/distinfo	2011-03-20 21:51:53.000000000 +0900
>+++ /usr/ports/net/ns/distinfo	2012-06-04 23:05:49.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (ns-2.33.tar.gz) = 2cdd803bc5afec9a60d514e619a1a9c3eaea4ae35e882891519f088ae7d2472b
>-SIZE (ns-2.33.tar.gz) = 41649114
>+SHA256 (ns-src-2.35.tar.gz) = 2a32e831bcec7d255042a544577559d15eae67696d0e3d30881cedc1112e2387
>+SIZE (ns-src-2.35.tar.gz) = 43897172
>diff -ruN /usr/ports/net/ns.org/files/patch-aomdv.cc /usr/ports/net/ns/files/patch-aomdv.cc
>--- /usr/ports/net/ns.org/files/patch-aomdv.cc	1970-01-01 09:00:00.000000000 +0900
>+++ /usr/ports/net/ns/files/patch-aomdv.cc	2012-06-04 23:05:49.000000000 +0900
>@@ -0,0 +1,10 @@
>+--- aomdv/aomdv.cc.org	2012-06-04 16:32:39.000000000 +0900
>++++ aomdv/aomdv.cc	2012-06-04 16:33:09.000000000 +0900
>+@@ -82,6 +82,7 @@
>+ 
>+ //#include <ip.h>
>+ 
>++#include <sys/socket.h>
>+ #include <aomdv/aomdv.h>
>+ #include <aomdv/aomdv_packet.h>
>+ #include <random.h>
>diff -ruN /usr/ports/net/ns.org/files/patch-configure /usr/ports/net/ns/files/patch-configure
>--- /usr/ports/net/ns.org/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
>+++ /usr/ports/net/ns/files/patch-configure	2012-06-04 23:05:49.000000000 +0900
>@@ -0,0 +1,33 @@
>+--- configure.org	2012-06-04 12:03:13.000000000 +0900
>++++ configure	2012-06-04 16:26:34.000000000 +0900
>+@@ -5571,8 +5571,14 @@
>+ 		/usr/local/lib/tcl$TCL_HI_VERS \
>+ 		/usr/local/lib/tcl$TCL_ALT_VERS \
>+ 		/usr/local/include/tcl$TCL_VERS \
>++		%%LOCALBASE%%/include/tcl$TCL_VERS/generic \
>++		%%LOCALBASE%%/include/tcl$TCL_VERS/unix \
>+ 		/usr/local/include/tcl$TCL_HI_VERS \
>++		%%LOCALBASE%%/include/tcl$TCL_HI_VERS/generic \
>++		%%LOCALBASE%%/include/tcl$TCL_HI_VERS/unix \
>+ 		/usr/local/include/tcl$TCL_ALT_VERS \
>++		%%LOCALBASE%%/include/tcl$TCL_ALT_VERS/generic \
>++		%%LOCALBASE%%/include/tcl$TCL_ALT_VERS/unix \
>+ 		/usr/local/include \
>+ 		/import/tcl/include/tcl$TCL_VERS \
>+ 		/import/tcl/include/tcl$TCL_HI_VERS \
>+@@ -6645,6 +6651,7 @@
>+ 		../Tcl-$TCLCL_VERS \
>+ 		../Tcl-$TCLCL_ALT_VERS \
>+ 		../Tcl \
>++                %%LOCALBASE%%/include/tclcl \
>+                 /usr/src/local/Tcl \
>+                 /usr/src/local/Tcl-1.0 \
>+                 /import/Tcl/include \
>+@@ -6664,6 +6671,7 @@
>+                 $x_libraries \
>+                 /usr/contrib/lib \
>+                 /usr/local/lib \
>++                %%LOCALBASE%%/lib \
>+                 /usr/lib \
>+                 /usr/src/local/Tcl \
>+                 /usr/src/local/Tcl-1.0"
>diff -ruN /usr/ports/net/ns.org/files/patch-ls.h /usr/ports/net/ns/files/patch-ls.h
>--- /usr/ports/net/ns.org/files/patch-ls.h	1970-01-01 09:00:00.000000000 +0900
>+++ /usr/ports/net/ns/files/patch-ls.h	2012-06-04 23:05:49.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- linkstate/ls.h.org	2012-06-04 21:45:22.000000000 +0900
>++++ linkstate/ls.h	2012-06-04 21:45:44.000000000 +0900
>+@@ -134,7 +134,7 @@
>+ 		return ib.second ? ib.first : baseMap::end();
>+ 	}
>+ 
>+-	void eraseAll() { erase(baseMap::begin(), baseMap::end()); }
>++	void eraseAll() { baseMap::erase(baseMap::begin(), baseMap::end()); }
>+ 	T* findPtr(Key key) {
>+ 		iterator it = baseMap::find(key);
>+ 		return (it == baseMap::end()) ? (T *)NULL : &((*it).second);
>diff -ruN /usr/ports/net/ns.org/pkg-plist /usr/ports/net/ns/pkg-plist
>--- /usr/ports/net/ns.org/pkg-plist	2005-07-27 07:25:30.000000000 +0900
>+++ /usr/ports/net/ns/pkg-plist	2012-06-04 23:05:49.000000000 +0900
>@@ -1,7 +1,9 @@
> bin/ns
> %%EXAMPLESDIR%%/agent-gen-script.tcl
> %%EXAMPLESDIR%%/agent-gen.tcl
>+%%EXAMPLESDIR%%/aomdv.tcl
> %%EXAMPLESDIR%%/callback_demo.tcl
>+%%EXAMPLESDIR%%/dccp.tcl
> %%EXAMPLESDIR%%/diffusion-prob-run.tcl
> %%EXAMPLESDIR%%/diffusion-rate-run.tcl
> %%EXAMPLESDIR%%/dumbbell.tcl
>@@ -31,6 +33,7 @@
> %%EXAMPLESDIR%%/nam-simplexlink.tcl
> %%EXAMPLESDIR%%/omni-run.tcl
> %%EXAMPLESDIR%%/pkts.tcl
>+%%EXAMPLESDIR%%/puma.tcl
> %%EXAMPLESDIR%%/ranvar.tcl
> %%EXAMPLESDIR%%/rbp_demo.tcl
> %%EXAMPLESDIR%%/rc.tcl

Actions: View | Diff

Attachments on bug 168673: 125109