cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to nam 1.9

Browse Source 
from some Nico <openbsd@softhome.net>
This commit is contained in:
sturm 2003-10-29 22:14:43 +00:00
parent 65f019325d
commit 0014f4a521
11 changed files with 38 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/nam/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.17 2003/10/29 22:14:43 sturm Exp $
# $FreeBSD: ports/net/nam/Makefile,v 1.3 1999/11/29 03:46:08 steve Exp $
# $OpenBSD: Makefile,v 1.16 2002/12/23 00:37:52 pvalchev Exp $
COMMENT= "UCB/LBNL Network Animator"
DISTNAME= nam-src-1.0a8
PKGNAME= nam-1.0a8
DISTNAME= nam-src-1.9
PKGNAME= nam-1.9
CATEGORIES= net
MASTER_SITES= ftp://ftp.ee.surrey.ac.uk/pub/Mirrors/ftp.isi.edu/nsnam/ \
@ -13,19 +13,18 @@ MASTER_SITES= ftp://ftp.ee.surrey.ac.uk/pub/Mirrors/ftp.isi.edu/nsnam/ \
HOMEPAGE= http://www.isi.edu/nsnam/nam/
# BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
BUILD_DEPENDS= ::devel/tclcl
LIB_DEPENDS= otcl::lang/otcl \
tcl83::lang/tcl/8.3 \
tk83::x11/tk/8.3
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= :tclcl->=1.0b13:devel/tclcl
WRKDIST= ${WRKDIR}/${PKGNAME}
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-tcl-ver=8.3 --with-tk-ver=8.3
ALL_TARGET=

6
net/nam/distinfo
View File

@ -1,3 +1,3 @@
MD5 (nam-src-1.0a8.tar.gz) = e58df7a134bd7174a122cfa183d95b90
RMD160 (nam-src-1.0a8.tar.gz) = 0628e1233ba49d011e746281f3648146b39de8dd
SHA1 (nam-src-1.0a8.tar.gz) = 6a811d8be7bbfe86afca2da4f9b7c7466f0bbd3c
MD5 (nam-src-1.9.tar.gz) = 7505017f344ab5bf5eb9632bc6091dce
RMD160 (nam-src-1.9.tar.gz) = f7d83915abd1b113eaed39d5e714209ebbcc41ce
SHA1 (nam-src-1.9.tar.gz) = 7ceb5ed011bae7d7b39c0a4acb368fc7214e6558

30
net/nam/patches/patch-configure
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2002/10/10 01:47:47 naddy Exp $
--- configure.orig Fri Jan 7 04:27:09 2000
+++ configure Thu Oct 10 03:23:13 2002
@@ -2598,7 +2598,7 @@ oldpath=$PATH
# $d/unix works if $d is the 8.0 distribution
# $d/bin is for the ns-allinone distribution (kind of hacky, isn't it?)
PATH=$d/unix:$d/bin:$PATH
-for ac_prog in tclsh$TCL_VERS tclsh$TCL_HI_VERS tclsh tclsh$TCL_OLD_VERS
+for ac_prog in tclsh$TCL_VERS tclsh$TCL_HI_VERS tclsh8.3 tclsh$TCL_OLD_VERS
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3172,7 +3172,7 @@ else
fi
-OTCL_VERS=1.0a4
+OTCL_VERS=1.0a5
OTCL_ALT_VERS=1.0
OTCL_H_PLACES_D="$d \
@@ -3360,7 +3360,7 @@ else
fi
-TclCL_VERS=1.0b8
+TclCL_VERS=1.0b9
TclCL_ALT_VERS=1.0
TclCL_H_PLACES="\

57
net/nam/patches/patch-editview_cc
View File

@ -1,57 +0,0 @@
$OpenBSD: patch-editview_cc,v 1.1 2002/10/10 01:47:47 naddy Exp $
--- editview.cc.orig Thu Oct 10 03:28:17 2002
+++ editview.cc Thu Oct 10 03:28:41 2002
@@ -597,7 +597,7 @@ void EditView::xrect(float x0, float y0,
void EditView::line(float x0, float y0, float x1, float y1, int color)
{
if (objType_ != NONE)
- View::line(x0, y0, x1, y1, Paint::instance()->xor());
+ View::line(x0, y0, x1, y1, Paint::instance()->eor());
else
View::line(x0, y0, x1, y1, color);
}
@@ -605,7 +605,7 @@ void EditView::line(float x0, float y0,
void EditView::rect(float x0, float y0, float x1, float y1, int color)
{
if (objType_ != NONE)
- View::rect(x0, y0, x1, y1, Paint::instance()->xor());
+ View::rect(x0, y0, x1, y1, Paint::instance()->eor());
else
View::rect(x0, y0, x1, y1, color);
}
@@ -613,7 +613,7 @@ void EditView::rect(float x0, float y0,
void EditView::polygon(const float* x, const float* y, int n, int color)
{
if (objType_ != NONE)
- View::polygon(x, y, n, Paint::instance()->xor());
+ View::polygon(x, y, n, Paint::instance()->eor());
else
View::polygon(x, y, n, color);
}
@@ -621,7 +621,7 @@ void EditView::polygon(const float* x, c
void EditView::fill(const float* x, const float* y, int n, int color)
{
if (objType_ != NONE)
- View::fill(x, y, n, Paint::instance()->xor());
+ View::fill(x, y, n, Paint::instance()->eor());
else
View::fill(x, y, n, color);
}
@@ -629,7 +629,7 @@ void EditView::fill(const float* x, cons
void EditView::circle(float x, float y, float r, int color)
{
if (objType_ != NONE)
- View::circle(x, y, r, Paint::instance()->xor());
+ View::circle(x, y, r, Paint::instance()->eor());
else
View::circle(x, y, r, color);
}
@@ -645,7 +645,7 @@ void EditView::render()
{
// Here we can compute the clipping box for render
Paint *paint = Paint::instance();
- GC gc = paint->paint_to_gc(paint->xor());
+ GC gc = paint->paint_to_gc(paint->eor());
switch (objType_) {
case START_RUBBERBAND:

8
net/nam/patches/patch-main_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-main_cc,v 1.1 2002/10/10 01:47:48 naddy Exp $
--- main.cc.orig Fri Jan 7 04:27:10 2000
+++ main.cc Thu Oct 10 03:23:13 2002
@@ -48,6 +48,7 @@
$OpenBSD: patch-main_cc,v 1.2 2003/10/29 22:14:43 sturm Exp $
--- main.cc.orig 2003-08-20 03:34:07.000000000 -0400
+++ main.cc 2003-08-20 03:37:18.000000000 -0400
@@ -51,6 +51,7 @@
extern "C" {
#include <tk.h>

29
net/nam/patches/patch-nam_stream_cc
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-nam_stream_cc,v 1.1 2002/10/10 01:47:48 naddy Exp $
--- nam_stream.cc.orig Fri Jan 7 04:27:10 2000
+++ nam_stream.cc Thu Oct 10 03:40:43 2002
@@ -23,14 +23,15 @@
#ifdef WIN32
#include <limits.h>
#else
+#ifndef __OpenBSD__
#include <values.h>
#endif
+#endif
#include <assert.h>
#ifndef WIN32
extern "C" off_t tell();
-extern "C" double atof();
#endif
#include <tclcl.h>
@@ -418,6 +419,8 @@ NamStreamPipe::get_char()
insure_backing(tell() + 1);
return getc(back_);
}
+
+#define MAXLONG (((off_t) 1) << ((sizeof(off_t) * 8) - 1)) - 1
off_t
NamStreamPipe::seek(off_t offset, int whence)

6
net/nam/patches/patch-paint_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-paint_cc,v 1.1 2002/10/10 01:47:48 naddy Exp $
--- paint.cc.orig Thu Oct 10 03:27:40 2002
+++ paint.cc Thu Oct 10 03:27:51 2002
$OpenBSD: patch-paint_cc,v 1.2 2003/10/29 22:14:43 sturm Exp $
--- paint.cc.orig 2003-08-20 03:37:54.000000000 -0400
+++ paint.cc 2003-08-20 03:38:15.000000000 -0400
@@ -70,7 +70,7 @@ Paint::Paint()
thick_ = lookup("black", 3);

10
net/nam/patches/patch-paint_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-paint_h,v 1.1 2002/10/10 01:47:48 naddy Exp $
--- paint.h.orig Thu Oct 10 03:26:57 2002
+++ paint.h Thu Oct 10 03:27:31 2002
$OpenBSD: patch-paint_h,v 1.2 2003/10/29 22:14:43 sturm Exp $
--- paint.h.orig 2003-08-20 03:39:48.000000000 -0400
+++ paint.h 2003-08-20 03:43:30.000000000 -0400
@@ -67,7 +67,7 @@ class Paint {
int lookupXor(const char *color, int linewidth);
inline int thick() { return (thick_); }
inline int thin() { return (thin_); }
- inline int xor() { return (xor_); }
+ inline int eor() { return (eor_); }
- inline int Xor() { return (xor_); } // ansi says "xor" is a keyword
+ inline int Xor() { return (eor_); } // ansi says "xor" is a keyword
private:
void adjust();

12
net/nam/patches/patch-queue_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-queue_h,v 1.1 2002/10/10 01:47:48 naddy Exp $
--- queue.h.orig Thu Oct 10 03:38:13 2002
+++ queue.h Thu Oct 10 03:38:23 2002
@@ -45,7 +45,7 @@ class Queue;
class Monitor;
class QueueItem : public Animation {
- friend Queue;
+ friend class Queue;
public:
QueueItem(const PacketAttr&, double, long);
~QueueItem();

2
net/nam/pkg/DESCR
View File

@ -5,5 +5,3 @@ animation, and various data inspection tools.
Nam began at LBL. It has evolved substantially over the past few years.
The nam development effort is now an ongoing collaboration with
the VINT project.
WWW: ${HOMEPAGE}

15
net/nam/pkg/PLIST
View File

@ -1,16 +1,28 @@
@comment $OpenBSD: PLIST,v 1.2 2000/07/14 06:52:04 kevlo Exp $
@comment $OpenBSD: PLIST,v 1.3 2003/10/29 22:14:43 sturm Exp $
bin/nam
man/man1/nam.1
share/examples/nam/9nodetree.nam
share/examples/nam/DSR.nam
share/examples/nam/README
share/examples/nam/adc.README
share/examples/nam/adc.nam.gz
share/examples/nam/algo-out-50sub.nam
share/examples/nam/att.README
share/examples/nam/att.nam.gz
share/examples/nam/dynamic-nam.conf
share/examples/nam/dynamics-demo.nam
share/examples/nam/dynamics-demo.txt
share/examples/nam/flat-out-50sub.nam
share/examples/nam/hier-out-50sub.nam
share/examples/nam/lan.nam
share/examples/nam/lantest2.nam
share/examples/nam/losspatterns.README
share/examples/nam/losspatterns.nam
share/examples/nam/mbone96.layout.nam
share/examples/nam/mbone96.nam
share/examples/nam/mcache.nam
share/examples/nam/mobigen.nam
share/examples/nam/pktdemo.nam.gz
share/examples/nam/rbp_demo.README
share/examples/nam/rbp_demo.nam
share/examples/nam/rpm-vs-srm.nam
@ -22,6 +34,7 @@ share/examples/nam/srm-example.nam
share/examples/nam/tcpecn.nam.gz
share/examples/nam/tcpsrm.nam.gz
share/examples/nam/test.nam.gz
share/examples/nam/ts100.layout.nam.gz
share/examples/nam/ts100.nam.gz
share/examples/nam/ts20.nam.gz
share/examples/nam/webcache.nam