mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00
Code Issues Releases Activity

- Update net/nam to 1.15

Browse Source 
- Checked on Redports.org[1]

[1] http://redports.org/buildarchive/20120606014524-1994/

PR:		ports/168732
Submitted by:	Masaki TAGAWA <masaki@club.kyutech.ac.jp> (maintainer)
This commit is contained in:
Sylvio Cesar Teixeira 2012-06-07 00:38:50 +00:00
parent 412b8a0435
commit 3b6b744bf4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=298647
7 changed files with 55 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/nam/Makefile
View File

@ -6,11 +6,10 @@
#
PORTNAME= nam
PORTVERSION= 1.12
PORTREVISION= 4
PORTVERSION= 1.15
CATEGORIES= net
MASTER_SITES= http://www.isi.edu/nsnam/dist/
DISTNAME= nam-src-${PORTVERSION}
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
@ -30,9 +29,8 @@ ALL_TARGET= ${PORTNAME}
MAN1= nam.1
post-patch:
@${REINPLACE_CMD} -e 's|/usr/src/local/Tcl-1.0|${LOCALBASE}/include/tclcl|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|const = NULL|const = 0|g' ${WRKSRC}/agent.h
@${REINPLACE_CMD} -e 's|friend Queue|friend class Queue|g' ${WRKSRC}/queue.h
@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
${WRKSRC}/configure
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin

4
net/nam/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nam-src-1.12.tar.gz) = 6c0b099e6b6adc7c5133321d149c8acc27af0b49921d0a88b8dd90d6a24768cf
SIZE (nam-src-1.12.tar.gz) = 4357479
SHA256 (nam-src-1.15.tar.gz) = 12ed547b3a5f8903890889d40cfea4d9bd66bb9ba6be99a0c753a9763cad8882
SIZE (nam-src-1.15.tar.gz) = 4365554

48
net/nam/files/patch-configure Normal file
View File

@ -0,0 +1,48 @@
--- 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 \

20
net/nam/files/patch-editview.cc
View File

@ -1,20 +0,0 @@
--- 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;

11
net/nam/files/patch-group.cc
View File

@ -1,11 +0,0 @@
--- group.cc.orig 2007-08-02 14:51:34.000000000 +0200
+++ group.cc 2007-08-02 14:51:56.000000000 +0200
@@ -81,7 +81,7 @@
for (he = Tcl_FirstHashEntry(nodeHash_, &hs);
he != NULL;
he = Tcl_NextHashEntry(&hs), i++)
- mbrs[i] = (int) Tcl_GetHashValue(he);
+ mbrs[i] = (intptr_t) Tcl_GetHashValue(he);
}
void Group::draw(View * nv, double now) {

20
net/nam/files/patch-netmodel.cc
View File

@ -1,20 +0,0 @@
--- 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
}

14
net/nam/files/patch-random.cc
View File

@ -1,14 +0,0 @@
--- 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 */