Attachment #125153 for bug #168732

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




#

PORTNAME=	nam
PORTVERSION=	1.15
PORTREVISION=	4
CATEGORIES=	net
MASTER_SITES=	SF/ns${PORTNAME}/${PORTNAME}-1/${PORTVERSION}
DISTNAME=	${PORTNAME}-src-${PORTVERSION}

MAINTAINER=	masaki@club.kyutech.ac.jp
COMMENT=	Animation tool for network simulation traces

MAN1=		nam.1

post-patch:
	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|friend Queue|friend class Queue|g' ${WRKSRC}/queue.h

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin

Lines 1-2 Link Here

(-)/usr/ports/net/nam/distinfo (-2 / +2 lines)
1	SHA256 (nam-src-1.12.tar.gz) = 6c0b099e6b6adc7c5133321d149c8acc27af0b49921d0a88b8dd90d6a24768cf	1	SHA256 (nam-src-1.15.tar.gz) = 12ed547b3a5f8903890889d40cfea4d9bd66bb9ba6be99a0c753a9763cad8882
2	SIZE (nam-src-1.12.tar.gz) = 4357479	2	SIZE (nam-src-1.15.tar.gz) = 4365554




--- configure.org	2011-11-05 02:18:42.000000000 +0900
+++ configure	2012-06-05 01:43:42.000000000 +0900
@@ -5771,9 +5771,15 @@
 		/usr/local/lib/tcl$TCL_VERS \
 		/usr/local/lib/tcl$TCL_HI_VERS \
 		/usr/local/lib/tcl$TCL_ALT_VERS \
-		/usr/local/include/tcl$TCL_VERS \
-		/usr/local/include/tcl$TCL_HI_VERS \
-		/usr/local/include/tcl$TCL_ALT_VERS \
+		%%LOCALBASE%%/include/tcl$TCL_VERS \
+		%%LOCALBASE%%/include/tcl$TCL_VERS/generic \
+		%%LOCALBASE%%/include/tcl$TCL_VERS/unix \
+		%%LOCALBASE%%/include/tcl$TCL_HI_VERS \
+		%%LOCALBASE%%/include/tcl$TCL_HI_VERS/generic \
+		%%LOCALBASE%%/include/tcl$TCL_HI_VERS/unix \
+		%%LOCALBASE%%/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 \
@@ -7005,7 +7011,7 @@
 		../Tcl-$TCLCL_ALT_VERS \
 		../Tcl \
                 /usr/src/local/Tcl \
-                /usr/src/local/Tcl-1.0 \
+                %%LOCALBASE%%/include/tclcl \
                 /import/Tcl/include \
                 /usr/local/include \
                 /usr/contrib/include \
@@ -7025,7 +7031,7 @@
                 /usr/local/lib \
                 /usr/lib \
                 /usr/src/local/Tcl \
-                /usr/src/local/Tcl-1.0"
+                %%LOCALBASE%%/include/tclcl"
 TCLCL_LIB_PLACES_D="\
         $d \
         $d/lib \
@@ -7044,7 +7050,7 @@
                 /usr/local/bin \
                 /usr/bin \
                 /usr/src/local/Tcl \
-                /usr/src/local/Tcl-1.0 \
+                %%LOCALBASE%%/include/tclcl \
                 "
 TCLCL_PROG_PLACES_D="
 	$d \




--- editview.cc.orig	2007-08-02 14:52:33.000000000 +0200
+++ editview.cc	2007-08-02 14:52:53.000000000 +0200
@@ -66,7 +66,7 @@
 	}
 	char str[256];
 	model_ = m;
-	sprintf(str, "def%-u", (int)this);
+	sprintf(str, "def%-u", (intptr_t)this);
 	defTag_ = new Tag(str);
 	model_->add_tag(defTag_);
 	editing_stage_ = NONE;
@@ -89,7 +89,7 @@
 	}
 
 	model_ = m;
-	sprintf(str, "def%-u", (int)this);
+	sprintf(str, "def%-u", (intptr_t)this);
 	defTag_ = new Tag(name);
 	model_->add_tag(defTag_);
 	editing_stage_ = NONE;

Lines 1-11 Link Here

(-)/usr/ports/net/nam/files/patch-group.cc (-11 lines)
1	--- group.cc.orig 2007-08-02 14:51:34.000000000 +0200
2	+++ group.cc 2007-08-02 14:51:56.000000000 +0200
3	@@ -81,7 +81,7 @@
4	for (he = Tcl_FirstHashEntry(nodeHash_, &hs);
5	he != NULL;
6	he = Tcl_NextHashEntry(&hs), i++)
7	- mbrs[i] = (int) Tcl_GetHashValue(he);
8	+ mbrs[i] = (intptr_t) Tcl_GetHashValue(he);
9	}
10
11	void Group::draw(View * nv, double now) {




--- netmodel.cc.orig	2007-08-02 14:44:09.000000000 +0200
+++ netmodel.cc	2007-08-02 14:47:11.000000000 +0200
@@ -308,7 +308,7 @@
 	Tcl_HashEntry *he = Tcl_FindHashEntry(addrHash_, (const char *)addr);
 	if (he == NULL)
 		return -1;
-	return (int)Tcl_GetHashValue(he);
+	return (intptr_t)Tcl_GetHashValue(he);
 }
 
 //----------------------------------------------------------------------
@@ -2761,7 +2761,7 @@
 	Tcl_HashEntry *he = Tcl_FindHashEntry(objnameHash_, n);
 	if (he == NULL)
 		return -1;
-	return (int)Tcl_GetHashValue(he);
+	return (intptr_t)Tcl_GetHashValue(he);
 #undef STATIC_NAMELEN
 }
 




--- random.cc.org	2006-09-27 04:28:19.000000000 +0900
+++ random.cc	2012-06-04 19:23:10.000000000 +0900
@@ -50,8 +50,11 @@
 RANDOM_RETURN_TYPE
 random() GCC_THROW
 {
+	return (long)Random::uniform();
+	/*
 	printf("random() called in nam.\nRandom is not portable, please use Random::uniform() instead.\n");
 	abort();
+	*/
 }
 
 #endif /* !WIN32 */

Return to bug 168732

Lines 6-16 Link Here

(-)/usr/ports/net/nam/Makefile (-7 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= nam	8	PORTNAME= nam
9	PORTVERSION= 1.12	9	PORTVERSION= 1.15
10	PORTREVISION= 4
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= http://www.isi.edu/nsnam/dist/	11	MASTER_SITES= SF/ns${PORTNAME}/${PORTNAME}-1/${PORTVERSION}
13	DISTNAME= nam-src-${PORTVERSION}	12	DISTNAME= ${PORTNAME}-src-${PORTVERSION}
14		13
15	MAINTAINER= masaki@club.kyutech.ac.jp	14	MAINTAINER= masaki@club.kyutech.ac.jp
16	COMMENT= Animation tool for network simulation traces	15	COMMENT= Animation tool for network simulation traces
Lines 30-38 Link Here
30	MAN1= nam.1	29	MAN1= nam.1
31		30
32	post-patch:	31	post-patch:
33	@${REINPLACE_CMD} -e 's\|/usr/src/local/Tcl-1.0\|${LOCALBASE}/include/tclcl\|g' ${WRKSRC}/configure	32	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
34	@${REINPLACE_CMD} -e 's\|const = NULL\|const = 0\|g' ${WRKSRC}/agent.h	33	${WRKSRC}/configure
35	@${REINPLACE_CMD} -e 's\|friend Queue\|friend class Queue\|g' ${WRKSRC}/queue.h
36		34
37	do-install:	35	do-install:
38	${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin	36	${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin

Line 0 Link Here

(-)/usr/ports/net/nam/files/patch-configure (+48 lines)
	1	--- configure.org 2011-11-05 02:18:42.000000000 +0900
	2	+++ configure 2012-06-05 01:43:42.000000000 +0900
	3	@@ -5771,9 +5771,15 @@
	4	/usr/local/lib/tcl$TCL_VERS \
	5	/usr/local/lib/tcl$TCL_HI_VERS \
	6	/usr/local/lib/tcl$TCL_ALT_VERS \
	7	- /usr/local/include/tcl$TCL_VERS \
	8	- /usr/local/include/tcl$TCL_HI_VERS \
	9	- /usr/local/include/tcl$TCL_ALT_VERS \
	10	+ %%LOCALBASE%%/include/tcl$TCL_VERS \
	11	+ %%LOCALBASE%%/include/tcl$TCL_VERS/generic \
	12	+ %%LOCALBASE%%/include/tcl$TCL_VERS/unix \
	13	+ %%LOCALBASE%%/include/tcl$TCL_HI_VERS \
	14	+ %%LOCALBASE%%/include/tcl$TCL_HI_VERS/generic \
	15	+ %%LOCALBASE%%/include/tcl$TCL_HI_VERS/unix \
	16	+ %%LOCALBASE%%/include/tcl$TCL_ALT_VERS \
	17	+ %%LOCALBASE%%/include/tcl$TCL_ALT_VERS/generic \
	18	+ %%LOCALBASE%%/include/tcl$TCL_ALT_VERS/unix \
	19	/usr/local/include \
	20	/import/tcl/include/tcl$TCL_VERS \
	21	/import/tcl/include/tcl$TCL_HI_VERS \
	22	@@ -7005,7 +7011,7 @@
	23	../Tcl-$TCLCL_ALT_VERS \
	24	../Tcl \
	25	/usr/src/local/Tcl \
	26	- /usr/src/local/Tcl-1.0 \
	27	+ %%LOCALBASE%%/include/tclcl \
	28	/import/Tcl/include \
	29	/usr/local/include \
	30	/usr/contrib/include \
	31	@@ -7025,7 +7031,7 @@
	32	/usr/local/lib \
	33	/usr/lib \
	34	/usr/src/local/Tcl \
	35	- /usr/src/local/Tcl-1.0"
	36	+ %%LOCALBASE%%/include/tclcl"
	37	TCLCL_LIB_PLACES_D="\
	38	$d \
	39	$d/lib \
	40	@@ -7044,7 +7050,7 @@
	41	/usr/local/bin \
	42	/usr/bin \
	43	/usr/src/local/Tcl \
	44	- /usr/src/local/Tcl-1.0 \
	45	+ %%LOCALBASE%%/include/tclcl \
	46	"
	47	TCLCL_PROG_PLACES_D="
	48	$d \

Lines 1-20 Link Here

(-)/usr/ports/net/nam/files/patch-editview.cc (-20 lines)
1	--- editview.cc.orig 2007-08-02 14:52:33.000000000 +0200
2	+++ editview.cc 2007-08-02 14:52:53.000000000 +0200
3	@@ -66,7 +66,7 @@
4	}
5	char str[256];
6	model_ = m;
7	- sprintf(str, "def%-u", (int)this);
8	+ sprintf(str, "def%-u", (intptr_t)this);
9	defTag_ = new Tag(str);
10	model_->add_tag(defTag_);
11	editing_stage_ = NONE;
12	@@ -89,7 +89,7 @@
13	}
14
15	model_ = m;
16	- sprintf(str, "def%-u", (int)this);
17	+ sprintf(str, "def%-u", (intptr_t)this);
18	defTag_ = new Tag(name);
19	model_->add_tag(defTag_);
20	editing_stage_ = NONE;

Lines 1-20 Link Here

(-)/usr/ports/net/nam/files/patch-netmodel.cc (-20 lines)
1	--- netmodel.cc.orig 2007-08-02 14:44:09.000000000 +0200
2	+++ netmodel.cc 2007-08-02 14:47:11.000000000 +0200
3	@@ -308,7 +308,7 @@
4	Tcl_HashEntry he = Tcl_FindHashEntry(addrHash_, (const char )addr);
5	if (he == NULL)
6	return -1;
7	- return (int)Tcl_GetHashValue(he);
8	+ return (intptr_t)Tcl_GetHashValue(he);
9	}
10
11	//----------------------------------------------------------------------
12	@@ -2761,7 +2761,7 @@
13	Tcl_HashEntry *he = Tcl_FindHashEntry(objnameHash_, n);
14	if (he == NULL)
15	return -1;
16	- return (int)Tcl_GetHashValue(he);
17	+ return (intptr_t)Tcl_GetHashValue(he);
18	#undef STATIC_NAMELEN
19	}
20

Lines 1-14 Link Here

(-)/usr/ports/net/nam/files/patch-random.cc (-14 lines)
1	--- random.cc.org 2006-09-27 04:28:19.000000000 +0900
2	+++ random.cc 2012-06-04 19:23:10.000000000 +0900
3	@@ -50,8 +50,11 @@
4	RANDOM_RETURN_TYPE
5	random() GCC_THROW
6	{
7	+ return (long)Random::uniform();
8	+ /*
9	printf("random() called in nam.\nRandom is not portable, please use Random::uniform() instead.\n");
10	abort();
11	+ */
12	}
13
14	#endif /* !WIN32 */