diff options
| -rw-r--r-- | net-analyzer/ns/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/ns/Manifest | 13 | ||||
| -rw-r--r-- | net-analyzer/ns/files/digest-ns-2.28 | 1 | ||||
| -rw-r--r-- | net-analyzer/ns/files/ns-2.28-gentoo.diff | 58 | ||||
| -rw-r--r-- | net-analyzer/ns/ns-2.28.ebuild | 109 |
5 files changed, 177 insertions, 12 deletions
diff --git a/net-analyzer/ns/ChangeLog b/net-analyzer/ns/ChangeLog index 3c00d15584df..1308b7a1941d 100644 --- a/net-analyzer/ns/ChangeLog +++ b/net-analyzer/ns/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/ns # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.14 2005/02/13 22:25:49 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.15 2005/02/22 02:11:18 robbat2 Exp $ + +*ns-2.28 (21 Feb 2005) + + 21 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> + +files/ns-2.28-gentoo.diff, +ns-2.28.ebuild: + Bug #82770, version bump. 13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> metadata.xml: Add myself to metadata. diff --git a/net-analyzer/ns/Manifest b/net-analyzer/ns/Manifest index c1943e0ca601..67fd714b7b5b 100644 --- a/net-analyzer/ns/Manifest +++ b/net-analyzer/ns/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 144de4bbceec78fa613208feee423e12 ns-2.27-r1.ebuild 2527 MD5 28b5af55cc2d7a1f31b37b8798b187f0 ChangeLog 1844 MD5 289416ac6a7266e340817717927762a8 metadata.xml 279 +MD5 9dea65cee973204989e3f2bd74da9b00 ns-2.28.ebuild 2526 MD5 f7b94c91182a6e9cf19719c8abd4dfda files/ns-2.27-gentoo.diff 11242 MD5 cbd46edc227114c8538b564b0bdf1ae6 files/digest-ns-2.27-r1 65 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) -Comment: Robbat2 @ Orbis-Terrarum Networks - -iD8DBQFCD9P6PpIsIjIzwiwRAoz9AJ9dYBmDd142f5K+oSYDIZXsVg4t5QCgujBM -80TQYOYI2sVosOOfVwK5JdM= -=BzHb ------END PGP SIGNATURE----- +MD5 5ac49b26502a59b51f8df54099af4e25 files/digest-ns-2.28 65 diff --git a/net-analyzer/ns/files/digest-ns-2.28 b/net-analyzer/ns/files/digest-ns-2.28 new file mode 100644 index 000000000000..0459d41cf277 --- /dev/null +++ b/net-analyzer/ns/files/digest-ns-2.28 @@ -0,0 +1 @@ +MD5 45ed7d066236aa981fd6cef6f9f44117 ns-src-2.28.tar.gz 46599585 diff --git a/net-analyzer/ns/files/ns-2.28-gentoo.diff b/net-analyzer/ns/files/ns-2.28-gentoo.diff new file mode 100644 index 000000000000..05a193925499 --- /dev/null +++ b/net-analyzer/ns/files/ns-2.28-gentoo.diff @@ -0,0 +1,58 @@ +diff -urN ns-2.27.orig/diffusion/diff_rate.cc ns-2.27/diffusion/diff_rate.cc +--- ns-2.27.orig/diffusion/diff_rate.cc 2004-01-12 19:57:58.000000000 -0500 ++++ ns-2.27/diffusion/diff_rate.cc 2005-01-22 21:41:36.578976416 -0500 +@@ -370,7 +370,7 @@ + INTF_INSERT(routing_table[dtype].active, OutPtr); + routing_table[dtype].num_active ++; + } else { +- GRAD_TMOUT(RetVal.cur) = max(GRAD_TMOUT(RetVal.cur), ++ GRAD_TMOUT(RetVal.cur) = MAX(GRAD_TMOUT(RetVal.cur), + dfh->ts_ + INTEREST_TIMEOUT); + } + +@@ -789,7 +789,7 @@ + if (RetVal.cur != NULL) { + cur_out = (Out_List *)(RetVal.cur); + GRADIENT(cur_out) = ORIGINAL; +- GRAD_TMOUT(RetVal.cur) = max(GRAD_TMOUT(RetVal.cur), ++ GRAD_TMOUT(RetVal.cur) = MAX(GRAD_TMOUT(RetVal.cur), + dfh->ts_ + INTEREST_TIMEOUT); + NUM_POS_RECV(cur_out)++; + } else { +diff -urN ns-2.27.orig/diffusion/diffusion.h ns-2.27/diffusion/diffusion.h +--- ns-2.27.orig/diffusion/diffusion.h 2004-01-12 19:57:58.000000000 -0500 ++++ ns-2.27/diffusion/diffusion.h 2005-01-22 21:41:36.578976416 -0500 +@@ -75,7 +75,7 @@ + + + #define SEND_MESSAGE(x,y,z) send_to_dmux(prepare_message(x,y,z), 0) +-#define max(a,b) (((a)<(b))?(b):(a)) ++#define MAX(a,b) (((a)<(b))?(b):(a)) + + class DiffusionAgent; + +diff -urN ns-2.27.orig/diffusion/routing_table.cc ns-2.27/diffusion/routing_table.cc +--- ns-2.27.orig/diffusion/routing_table.cc 2004-01-12 19:57:59.000000000 -0500 ++++ ns-2.27/diffusion/routing_table.cc 2005-01-22 21:41:36.579976264 -0500 +@@ -129,7 +129,7 @@ + int most = 0; + + for (cur=iif; cur!=NULL; cur = IN_NEXT(cur)) { +- most = max(most,NEW_ORG_RECV(cur)); ++ most = MAX(most,NEW_ORG_RECV(cur)); + } + return most; + } +diff -urN ns-2.27.orig/diffusion3/lib/nr/nr.hh ns-2.27/diffusion3/lib/nr/nr.hh +--- ns-2.27.orig/diffusion3/lib/nr/nr.hh 2004-01-12 19:58:05.000000000 -0500 ++++ ns-2.27/diffusion3/lib/nr/nr.hh 2005-01-22 21:41:36.579976264 -0500 +@@ -43,7 +43,8 @@ + typedef signed int int32_t; + #endif + typedef signed short int16_t; +-#if defined (sparc) ++// #if defined (sparc) ++#if defined (__SVR4) && defined (__sun) + typedef char int8_t; + #else + // Conflicts with system declaration of int8_t in Solaris diff --git a/net-analyzer/ns/ns-2.28.ebuild b/net-analyzer/ns/ns-2.28.ebuild new file mode 100644 index 000000000000..84c778ba27f8 --- /dev/null +++ b/net-analyzer/ns/ns-2.28.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.28.ebuild,v 1.1 2005/02/22 02:11:18 robbat2 Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="Network Simulator" +HOMEPAGE="http://www.isi.edu/nsnam/ns/" +SRC_URI="http://www.isi.edu/nsnam/dist/${PN}-src-${PV}.tar.gz" + +LICENSE="BSD as-is" +SLOT="0" +KEYWORDS="~x86 ~sparc" +IUSE="doc debug" + +RDEPEND=">=dev-lang/tcl-8.4.4 + >=dev-lang/tk-8.4.4 + >=dev-tcltk/otcl-1.0.8a + >=dev-tcltk/tclcl-1.0.13b + virtual/libpcap + debug? ( =dev-lang/perl-5* + >=media-gfx/xgraph-12.1 + >=dev-libs/dmalloc-4.8.2 + >=dev-tcltk/tcl-debug-2.0 )" +DEPEND="${RDEPEND} + doc? ( virtual/tetex + virtual/ghostscript + dev-tex/latex2html )" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.diff +} + +src_compile() { + local myconf + local mytclver="" + local i + + tc-export CC CXX + + use debug \ + && myconf="${myconf} --with-tcldebug=/usr/lib/tcldbg2.0" \ + || myconf="${myconf} --with-tcldebug=no" + myconf="${myconf} $(use_with debug dmalloc)" + + for i in 8.4 8.3; do + einfo "Testing TCL ${i}" + has_version "=dev-lang/tcl-${i}*" && mytclver=${i} + [ "${#mytclver}" -gt 2 ] && break + done + einfo "Using TCL ${mytclver}" + myconf="${myconf} --with-tcl-ver=${mytclver} --with-tk-ver=${mytclver}" + + econf \ + ${myconf} \ + --mandir=/usr/share/man \ + --enable-stl \ + --enable-release || die "./configure failed" + emake CCOPT="${CFLAGS}" || die + + cd ${S}/indep-utils/dosdbell + emake DFLAGS="${CFLAGS}" || die + cd ${S}/indep-utils/dosreduce + ${CC} ${CFLAGS} dosreduce.c -o dosreduce + cd ${S}/indep-utils/propagation + ${CXX} ${CXXFLAGS} threshold.cc -o threshold + + if useq doc; then + einfo "Generating extra docs" + cd ${S}/doc + emake all + fi +} + +src_install() { + dodir /usr/bin /usr/share/man/man1 /usr/share/doc/${PF} /usr/share/ns + make DESTDIR="${D}" MANDEST=/usr/share/man install \ + || die "make install failed" + dobin nse + + dodoc BASE-VERSION COPYRIGHTS FILES HOWTO-CONTRIBUTE README VERSION + dohtml CHANGES.html TODO.html + + cd "${S}" + insinto /usr/share/doc/${PF} + doins -r ns-tutorial + insinto /usr/share/ns + doins -r tcl + + cd "${S}/indep-utils/dosdbell" + dobin dosdbell dosdbellasim + newdoc README README.dosdbell + cd "${S}/indep-utils/dosreduce" + dobin dosreduce + newdoc README README.dosreduce + cd "${S}/indep-utils/cmu-scen-gen" + dobin cbrgen.tcl + newdoc README README.cbrgen + cd "${S}/indep-utils/propagation" + dobin threshold + + if use doc; then + cd ${S}/doc + docinto doc + dodoc everything.dvi everything.ps.gz everything.html everything.pdf + fi +} |