From masaki@sakura.mochipon.com  Wed Jun  6 01:59:54 2012
Return-Path: <masaki@sakura.mochipon.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E20E106566B;
	Wed,  6 Jun 2012 01:59:54 +0000 (UTC)
	(envelope-from masaki@sakura.mochipon.com)
Received: from sakura.mochipon.com (unknown [IPv6:2001:e41:db5e:ea20::1])
	by mx1.freebsd.org (Postfix) with ESMTP id EE59B8FC16;
	Wed,  6 Jun 2012 01:59:53 +0000 (UTC)
Received: from sakura.mochipon.com (localhost [127.0.0.1])
	by sakura.mochipon.com (8.14.5/8.14.5) with ESMTP id q561xomJ013312;
	Wed, 6 Jun 2012 10:59:50 +0900 (JST)
	(envelope-from masaki@sakura.mochipon.com)
Received: (from masaki@localhost)
	by sakura.mochipon.com (8.14.5/8.14.5/Submit) id q561xiar013311;
	Wed, 6 Jun 2012 10:59:44 +0900 (JST)
	(envelope-from masaki)
Message-Id: <201206060159.q561xiar013311@sakura.mochipon.com>
Date: Wed, 6 Jun 2012 10:59:44 +0900 (JST)
From: Masaki TAGAWA <masaki@club.kyutech.ac.jp>
Reply-To: Masaki TAGAWA <masaki@club.kyutech.ac.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc: masaki@club.kyutech.ac.jp, sylvio@freebsd.org
Subject: [maintainer update] net/nam: Update to 1.15
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         168732
>Category:       ports
>Synopsis:       [maintainer update] net/nam: Update to 1.15
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    sylvio
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 06 02:00:27 UTC 2012
>Closed-Date:    Thu Jun 07 00:39:08 UTC 2012
>Last-Modified:  Thu Jun  7 00:40:13 UTC 2012
>Originator:     Masaki TAGAWA
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
Kyushu Institute of Technology
>Environment:
System: FreeBSD sakura.mochipon.com 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
- Update net/nam to 1.15
- Checked on Redports.org[1]

[1] http://redports.org/buildarchive/20120606014524-1994/
>How-To-Repeat:
	
>Fix:

	

--- nam-1.15.patch begins here ---
diff -ruN /usr/ports/net/nam.old/Makefile /usr/ports/net/nam/Makefile
--- /usr/ports/net/nam.old/Makefile	2012-06-06 06:35:50.000000000 +0900
+++ /usr/ports/net/nam/Makefile	2012-06-06 10:43:00.000000000 +0900
@@ -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 @@
 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
diff -ruN /usr/ports/net/nam.old/distinfo /usr/ports/net/nam/distinfo
--- /usr/ports/net/nam.old/distinfo	2011-03-20 21:51:48.000000000 +0900
+++ /usr/ports/net/nam/distinfo	2012-06-06 10:42:38.000000000 +0900
@@ -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
diff -ruN /usr/ports/net/nam.old/files/patch-configure /usr/ports/net/nam/files/patch-configure
--- /usr/ports/net/nam.old/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
+++ /usr/ports/net/nam/files/patch-configure	2012-06-06 10:41:06.000000000 +0900
@@ -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 \
diff -ruN /usr/ports/net/nam.old/files/patch-editview.cc /usr/ports/net/nam/files/patch-editview.cc
--- /usr/ports/net/nam.old/files/patch-editview.cc	2007-08-02 22:00:15.000000000 +0900
+++ /usr/ports/net/nam/files/patch-editview.cc	1970-01-01 09:00:00.000000000 +0900
@@ -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;
diff -ruN /usr/ports/net/nam.old/files/patch-group.cc /usr/ports/net/nam/files/patch-group.cc
--- /usr/ports/net/nam.old/files/patch-group.cc	2007-08-02 22:00:15.000000000 +0900
+++ /usr/ports/net/nam/files/patch-group.cc	1970-01-01 09:00:00.000000000 +0900
@@ -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) {
diff -ruN /usr/ports/net/nam.old/files/patch-netmodel.cc /usr/ports/net/nam/files/patch-netmodel.cc
--- /usr/ports/net/nam.old/files/patch-netmodel.cc	2007-08-02 22:00:15.000000000 +0900
+++ /usr/ports/net/nam/files/patch-netmodel.cc	1970-01-01 09:00:00.000000000 +0900
@@ -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
- }
- 
diff -ruN /usr/ports/net/nam.old/files/patch-random.cc /usr/ports/net/nam/files/patch-random.cc
--- /usr/ports/net/nam.old/files/patch-random.cc	2012-06-06 06:35:50.000000000 +0900
+++ /usr/ports/net/nam/files/patch-random.cc	1970-01-01 09:00:00.000000000 +0900
@@ -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 */
\ No newline at end of file
--- nam-1.15.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Wed Jun 6 17:03:20 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168732 
State-Changed-From-To: open->closed 
State-Changed-By: sylvio 
State-Changed-When: Thu Jun 7 00:39:06 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168732 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168732: commit references a PR
Date: Thu,  7 Jun 2012 00:39:04 +0000 (UTC)

 sylvio      2012-06-07 00:38:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/nam              Makefile distinfo 
   Added files:
     net/nam/files        patch-configure 
   Removed files:
     net/nam/files        patch-editview.cc patch-group.cc 
                          patch-netmodel.cc patch-random.cc 
   Log:
   - Update net/nam to 1.15
   - 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)
   
   Revision  Changes    Path
   1.31      +5 -7      ports/net/nam/Makefile
   1.10      +2 -2      ports/net/nam/distinfo
   1.1       +48 -0     ports/net/nam/files/patch-configure (new)
   1.2       +0 -20     ports/net/nam/files/patch-editview.cc (dead)
   1.2       +0 -11     ports/net/nam/files/patch-group.cc (dead)
   1.2       +0 -20     ports/net/nam/files/patch-netmodel.cc (dead)
   1.2       +0 -14     ports/net/nam/files/patch-random.cc (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
