diff options
author | adam <adam@pkgsrc.org> | 2006-08-05 12:20:34 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2006-08-05 12:20:34 +0000 |
commit | 492a14b56195a0b937e3c5d7041cc8e82d1925f5 (patch) | |
tree | cc8e6a3256ef268666e977529f7f116d01119d23 /net/etherape | |
parent | 3e77ddc3002ed4487e30eb81cc30cd56f3c05929 (diff) | |
download | pkgsrc-492a14b56195a0b937e3c5d7041cc8e82d1925f5.tar.gz |
Changes 0.9.6:
* On newer distros (like FC5) the linker was called without --export-dynamic,
making EtherApe unusable.
* Fixed bug 1488215, "cancel" button on preferences dialog doesn't work.
* Updated .desktop and .spec files
* Updated debian files
Diffstat (limited to 'net/etherape')
-rw-r--r-- | net/etherape/Makefile | 9 | ||||
-rw-r--r-- | net/etherape/PLIST | 25 | ||||
-rw-r--r-- | net/etherape/distinfo | 12 | ||||
-rw-r--r-- | net/etherape/patches/patch-aa | 12 | ||||
-rw-r--r-- | net/etherape/patches/patch-ab | 37 |
5 files changed, 51 insertions, 44 deletions
diff --git a/net/etherape/Makefile b/net/etherape/Makefile index b829950f8e0..92583eebd2c 100644 --- a/net/etherape/Makefile +++ b/net/etherape/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.36 2006/04/17 13:46:43 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2006/08/05 12:20:34 adam Exp $ -DISTNAME= etherape-0.9.1 -PKGREVISION= 6 +DISTNAME= etherape-0.9.6 CATEGORIES= gnome net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/} @@ -11,8 +10,8 @@ COMMENT= Graphical network monitor USE_TOOLS+= gmake pkg-config USE_DIRS+= xdg-1.1 -USE_PKGLOCALEDIR= YES -GNU_CONFIGURE= YES +USE_PKGLOCALEDIR= yes +GNU_CONFIGURE= yes PKG_SYSCONFSUBDIR= etherape diff --git a/net/etherape/PLIST b/net/etherape/PLIST index 8596aa7f0ae..bb3de32ddc4 100644 --- a/net/etherape/PLIST +++ b/net/etherape/PLIST @@ -1,23 +1,34 @@ -@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:30 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/08/05 12:20:34 adam Exp $ bin/etherape man/man1/etherape.1 +share/applications/etherape.desktop +share/etherape/doc/etherape/C/etherape.xml +share/etherape/doc/etherape/C/figures/appmain.png +share/etherape/doc/etherape/C/figures/capture_file_dlg.png +share/etherape/doc/etherape/C/figures/color_select_dlg.png +share/etherape/doc/etherape/C/figures/eth_toolbar.png +share/etherape/doc/etherape/C/figures/link_info.png +share/etherape/doc/etherape/C/figures/node_info.png +share/etherape/doc/etherape/C/figures/pref_colors_dlg.png +share/etherape/doc/etherape/C/figures/pref_diagram_dlg.png +share/etherape/doc/etherape/C/figures/pref_timings_dlg.png +share/etherape/doc/etherape/C/figures/proto_info.png +share/etherape/doc/etherape/C/figures/protocol_edit_dlg.png share/etherape/glade/etherape.glade2 share/etherape/glade/etherape.png share/etherape/glade/pause.xpm share/etherape/glade/play.xpm share/etherape/glade/stop.xpm -@exec ${MKDIR} %D/share/examples/etherape share/examples/etherape/services -share/gnome/apps/Applications/etherape.desktop -share/gnome/help/etherape/C/topic.dat share/locale/es/LC_MESSAGES/etherape.mo share/locale/fr/LC_MESSAGES/etherape.mo share/locale/nl/LC_MESSAGES/etherape.mo share/locale/tr/LC_MESSAGES/etherape.mo share/pixmaps/etherape.png -@dirrm share/gnome/help/etherape/C/stylesheet-images -@dirrm share/gnome/help/etherape/C -@dirrm share/gnome/help/etherape @dirrm share/examples/etherape @dirrm share/etherape/glade +@dirrm share/etherape/doc/etherape/C/figures +@dirrm share/etherape/doc/etherape/C +@dirrm share/etherape/doc/etherape +@dirrm share/etherape/doc @dirrm share/etherape diff --git a/net/etherape/distinfo b/net/etherape/distinfo index 28e157407b4..f48fc54f7df 100644 --- a/net/etherape/distinfo +++ b/net/etherape/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2006/06/21 21:27:29 joerg Exp $ +$NetBSD: distinfo,v 1.7 2006/08/05 12:20:34 adam Exp $ -SHA1 (etherape-0.9.1.tar.gz) = d9eb267e1ff5992bf120f8bbefc974660a203909 -RMD160 (etherape-0.9.1.tar.gz) = f9ca91b43ff9c324518cd3ef7aec3612f52dcd48 -Size (etherape-0.9.1.tar.gz) = 447092 bytes -SHA1 (patch-aa) = e6b41ead7de0a0ce5f293f742e3e79cfe2d65021 -SHA1 (patch-ab) = 8673a2e9fb9ae26ee0bab7bd76a2157f5c1623a6 +SHA1 (etherape-0.9.6.tar.gz) = 214dddb82d768a1ac41b483cd749ccc22ce20779 +RMD160 (etherape-0.9.6.tar.gz) = a672d3ee19aa1040014a653d440fb7b4e700c753 +Size (etherape-0.9.6.tar.gz) = 860413 bytes +SHA1 (patch-aa) = 3a8f8260fb1d9d410d40d452e242e240a4750d14 +SHA1 (patch-ab) = c3638bd0fb154b1f95be7253bb2f0fb944e8b8fb diff --git a/net/etherape/patches/patch-aa b/net/etherape/patches/patch-aa index 8cdc3df16d0..85af01ac943 100644 --- a/net/etherape/patches/patch-aa +++ b/net/etherape/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.2 2004/11/22 15:27:53 adam Exp $ +$NetBSD: patch-aa,v 1.3 2006/08/05 12:20:34 adam Exp $ ---- Makefile.in.orig 2004-08-10 19:14:06.000000000 +0000 +--- Makefile.in.orig 2006-05-14 19:18:18.000000000 +0200 +++ Makefile.in -@@ -143,7 +143,7 @@ DATADIR = . - +@@ -218,7 +218,7 @@ DATADIR = . + # ignore bogus distcheck errors caused by scrollkeeper lazyness + distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' man_MANS = etherape.1 - -confdir = $(sysconfdir)/etherape +confdir = $(sysconfdir) conf_DATA = \ services -@@ -652,7 +652,7 @@ info: info-recursive +@@ -740,7 +740,7 @@ info: info-recursive info-am: diff --git a/net/etherape/patches/patch-ab b/net/etherape/patches/patch-ab index 3cbe89d67b2..d9f9ab494a8 100644 --- a/net/etherape/patches/patch-ab +++ b/net/etherape/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2006/06/21 21:27:30 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2006/08/05 12:20:34 adam Exp $ ---- src/dns.c.orig 2003-04-06 13:45:41.000000000 +0000 -+++ src/dns.c -@@ -38,7 +38,6 @@ +--- src/direct_resolve.c.orig 2006-04-29 09:58:35.000000000 +0200 ++++ src/direct_resolve.c +@@ -42,7 +42,6 @@ #include <sys/time.h> #include <sys/select.h> #include <sys/stat.h> @@ -10,31 +10,28 @@ $NetBSD: patch-ab,v 1.2 2006/06/21 21:27:30 joerg Exp $ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -@@ -60,11 +59,19 @@ extern char *sys_errlist[]; +@@ -72,8 +71,17 @@ extern char *sys_errlist[]; #define strerror(errno) (((errno) >= 0 && (errno) < sys_nerr) ? sys_errlist[errno] : "unlisted error") #endif +-/* Hmm, it seems Irix requires this */ +-extern int errno; +#ifdef res_ninit +#define RES_INIT() res_ninit(&myres); +#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \ -+ res_nmkquery(&myres, a, b, c, d, e, f, g, h, i) ++ res_nmkquery(&myres, a, b, c, d, e, f, g, h, i) +struct __res_state myres; +#else +#define myres _res +#define RES_INIT() res_init(); +#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \ -+ res_mkquery(a, b, c, d, e, f, g, h, i) ++ res_mkquery(a, b, c, d, e, f, g, h, i) +#endif - --/* Hmm, it seems Irix requires this */ --extern int errno; -- - /* Defined in main.c - non zero if you want to activate DNS resolving, zero to disable*/ - extern int dns; - -@@ -432,15 +439,15 @@ void - dns_open (void) + /* Defines */ + #define HostnameLength 255 /* From RFC */ +@@ -254,15 +262,15 @@ void + direct_open (void) { int option, i; - res_init (); @@ -54,16 +51,16 @@ $NetBSD: patch-ab,v 1.2 2006/06/21 21:27:30 joerg Exp $ resfd = socket (AF_INET, SOCK_DGRAM, 0); if (resfd == -1) { -@@ -755,7 +762,7 @@ dorequest (char *s, int type, word id) - int r, i; +@@ -320,7 +328,7 @@ dorequest (char *s, int type, word id) int buf[(MaxPacketsize / sizeof (int)) + 1]; + restell ("dorequest()."); - r = res_mkquery (QUERY, s, C_IN, type, NULL, 0, NULL, (u_char *) buf, + r = RES_MKQUERY (QUERY, s, C_IN, type, NULL, 0, NULL, (u_char *) buf, MaxPacketsize); if (r == -1) { -@@ -764,9 +771,9 @@ dorequest (char *s, int type, word id) +@@ -329,9 +337,9 @@ dorequest (char *s, int type, word id) } hp = (packetheader *) buf; hp->id = id; /* htons() deliberately left out (redundant) */ @@ -75,7 +72,7 @@ $NetBSD: patch-ab,v 1.2 2006/06/21 21:27:30 joerg Exp $ sizeof (struct sockaddr)); } -@@ -1279,15 +1286,15 @@ dns_ack () +@@ -735,15 +743,15 @@ direct_ack () /* Check to see if this server is actually one we sent to */ if (from.sin_addr.s_addr == localhost) { |