Attachment #125109 for bug #168673

View | Details | Raw Unified | Return to bug 168673
Collapse All | Expand All




#

PORTNAME=	ns
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

MANCOMPRESSED=	no

GNU_CONFIGURE=	yes
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=		85+

post-patch:
	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e 's|/usr/src/local/Tcl-1.0\"|${LOCALBASE}/lib\"|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>

Lines 1-2 Link Here

(-)/usr/ports/net/ns/distinfo (-2 / +2 lines)
1	SHA256 (ns-2.33.tar.gz) = 2cdd803bc5afec9a60d514e619a1a9c3eaea4ae35e882891519f088ae7d2472b	1	SHA256 (ns-src-2.35.tar.gz) = 2a32e831bcec7d255042a544577559d15eae67696d0e3d30881cedc1112e2387
2	SIZE (ns-2.33.tar.gz) = 41649114	2	SIZE (ns-src-2.35.tar.gz) = 43897172

Line 0 Link Here

(-)/usr/ports/net/ns/files/patch-aomdv.cc (+10 lines)
	1	--- aomdv/aomdv.cc.org 2012-06-04 16:32:39.000000000 +0900
	2	+++ aomdv/aomdv.cc 2012-06-04 16:33:09.000000000 +0900
	3	@@ -82,6 +82,7 @@
	4
	5	//#include <ip.h>
	6
	7	+#include <sys/socket.h>
	8	#include <aomdv/aomdv.h>
	9	#include <aomdv/aomdv_packet.h>
	10	#include <random.h>




--- 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"

Line 0 Link Here

(-)/usr/ports/net/ns/files/patch-ls.h (+11 lines)
	1	--- linkstate/ls.h.org 2012-06-04 21:45:22.000000000 +0900
	2	+++ linkstate/ls.h 2012-06-04 21:45:44.000000000 +0900
	3	@@ -134,7 +134,7 @@
	4	return ib.second ? ib.first : baseMap::end();
	5	}
	6
	7	- void eraseAll() { erase(baseMap::begin(), baseMap::end()); }
	8	+ void eraseAll() { baseMap::erase(baseMap::begin(), baseMap::end()); }
	9	T* findPtr(Key key) {
	10	iterator it = baseMap::find(key);
	11	return (it == baseMap::end()) ? (T )NULL : &((it).second);




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

%%EXAMPLESDIR%%/nam-simplexlink.tcl
%%EXAMPLESDIR%%/omni-run.tcl
%%EXAMPLESDIR%%/pkts.tcl
%%EXAMPLESDIR%%/puma.tcl
%%EXAMPLESDIR%%/ranvar.tcl
%%EXAMPLESDIR%%/rbp_demo.tcl
%%EXAMPLESDIR%%/rc.tcl

Return to bug 168673

Lines 6-14 Link Here

(-)/usr/ports/net/ns/Makefile (-5 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= ns	8	PORTNAME= ns
9	PORTVERSION= 2.33	9	PORTVERSION= 2.35
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION}	11	MASTER_SITES= SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION}
		12	DISTFILES= ${PORTNAME}-src-${PORTVERSION}.tar.gz
12		13
13	MAINTAINER= lstewart@FreeBSD.org	14	MAINTAINER= lstewart@FreeBSD.org
14	COMMENT= Discrete event simulator for networking research	15	COMMENT= Discrete event simulator for networking research
Lines 19-37 Link Here
19	MANCOMPRESSED= no	20	MANCOMPRESSED= no
20		21
21	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4 --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include	23	CONFIGURE_ARGS= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
23	USE_GMAKE= yes	24	USE_GMAKE= yes
24	USE_TK= 84	25	USE_TK= 85+
25		26
26	post-patch:	27	post-patch:
27	@${REINPLACE_CMD} -e 's\|/usr/src/local/Tcl-1.0 \\\|${LOCALBASE}/include/tclcl \\\|g' \	28	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
28	-e 's\|/usr/src/local/Tcl-1.0\"\|${LOCALBASE}/lib\"\|g' \
29	${WRKSRC}/configure	29	${WRKSRC}/configure
30		30
31	do-install:	31	do-install:
32	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin	32	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
33	${INSTALL_MAN} ${WRKSRC}/ns.1 ${MANPREFIX}/man/man1	33	${INSTALL_MAN} ${WRKSRC}/ns.1 ${MANPREFIX}/man/man1
		34	.if !defined(NOPORTDOCS)
34	${MKDIR} ${EXAMPLESDIR}	35	${MKDIR} ${EXAMPLESDIR}
35	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR}	36	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR}
		37	.endif
36		38
37	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Line 0 Link Here

(-)/usr/ports/net/ns/files/patch-configure (+33 lines)
	1	--- configure.org 2012-06-04 12:03:13.000000000 +0900
	2	+++ configure 2012-06-04 16:26:34.000000000 +0900
	3	@@ -5571,8 +5571,14 @@
	4	/usr/local/lib/tcl$TCL_HI_VERS \
	5	/usr/local/lib/tcl$TCL_ALT_VERS \
	6	/usr/local/include/tcl$TCL_VERS \
	7	+ %%LOCALBASE%%/include/tcl$TCL_VERS/generic \
	8	+ %%LOCALBASE%%/include/tcl$TCL_VERS/unix \
	9	/usr/local/include/tcl$TCL_HI_VERS \
	10	+ %%LOCALBASE%%/include/tcl$TCL_HI_VERS/generic \
	11	+ %%LOCALBASE%%/include/tcl$TCL_HI_VERS/unix \
	12	/usr/local/include/tcl$TCL_ALT_VERS \
	13	+ %%LOCALBASE%%/include/tcl$TCL_ALT_VERS/generic \
	14	+ %%LOCALBASE%%/include/tcl$TCL_ALT_VERS/unix \
	15	/usr/local/include \
	16	/import/tcl/include/tcl$TCL_VERS \
	17	/import/tcl/include/tcl$TCL_HI_VERS \
	18	@@ -6645,6 +6651,7 @@
	19	../Tcl-$TCLCL_VERS \
	20	../Tcl-$TCLCL_ALT_VERS \
	21	../Tcl \
	22	+ %%LOCALBASE%%/include/tclcl \
	23	/usr/src/local/Tcl \
	24	/usr/src/local/Tcl-1.0 \
	25	/import/Tcl/include \
	26	@@ -6664,6 +6671,7 @@
	27	$x_libraries \
	28	/usr/contrib/lib \
	29	/usr/local/lib \
	30	+ %%LOCALBASE%%/lib \
	31	/usr/lib \
	32	/usr/src/local/Tcl \
	33	/usr/src/local/Tcl-1.0"

Lines 1-7 Link Here

(-)/usr/ports/net/ns/pkg-plist (+3 lines)
1	bin/ns	1	bin/ns
2	%%EXAMPLESDIR%%/agent-gen-script.tcl	2	%%EXAMPLESDIR%%/agent-gen-script.tcl
3	%%EXAMPLESDIR%%/agent-gen.tcl	3	%%EXAMPLESDIR%%/agent-gen.tcl
		4	%%EXAMPLESDIR%%/aomdv.tcl
4	%%EXAMPLESDIR%%/callback_demo.tcl	5	%%EXAMPLESDIR%%/callback_demo.tcl
		6	%%EXAMPLESDIR%%/dccp.tcl
5	%%EXAMPLESDIR%%/diffusion-prob-run.tcl	7	%%EXAMPLESDIR%%/diffusion-prob-run.tcl
6	%%EXAMPLESDIR%%/diffusion-rate-run.tcl	8	%%EXAMPLESDIR%%/diffusion-rate-run.tcl
7	%%EXAMPLESDIR%%/dumbbell.tcl	9	%%EXAMPLESDIR%%/dumbbell.tcl
Lines 31-36 Link Here
31	%%EXAMPLESDIR%%/nam-simplexlink.tcl	33	%%EXAMPLESDIR%%/nam-simplexlink.tcl
32	%%EXAMPLESDIR%%/omni-run.tcl	34	%%EXAMPLESDIR%%/omni-run.tcl
33	%%EXAMPLESDIR%%/pkts.tcl	35	%%EXAMPLESDIR%%/pkts.tcl
		36	%%EXAMPLESDIR%%/puma.tcl
34	%%EXAMPLESDIR%%/ranvar.tcl	37	%%EXAMPLESDIR%%/ranvar.tcl
35	%%EXAMPLESDIR%%/rbp_demo.tcl	38	%%EXAMPLESDIR%%/rbp_demo.tcl
36	%%EXAMPLESDIR%%/rc.tcl	39	%%EXAMPLESDIR%%/rc.tcl