aboutsummaryrefslogtreecommitdiff
path: root/net/mtr
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2004-10-29 22:31:02 +0000
committerAlex Dupre <ale@FreeBSD.org>2004-10-29 22:31:02 +0000
commitcfe573c314f6c27095853c7d5e5f8676b769ba62 (patch)
tree9409520389722e6143eabef79b3b88ba84efeaac /net/mtr
parentb0823ae396a7b32354b085a7fe82dc7fd7a0beaf (diff)
downloadports-cfe573c314f6c27095853c7d5e5f8676b769ba62.tar.gz
ports-cfe573c314f6c27095853c7d5e5f8676b769ba62.zip
Notes
Diffstat (limited to 'net/mtr')
-rw-r--r--net/mtr/Makefile41
-rw-r--r--net/mtr/distinfo6
-rw-r--r--net/mtr/files/patch-0120
-rw-r--r--net/mtr/files/patch-0213
-rw-r--r--net/mtr/files/patch-0311
-rw-r--r--net/mtr/files/patch-0610
-rw-r--r--net/mtr/files/patch-0710
-rw-r--r--net/mtr/files/patch-net.c10
8 files changed, 24 insertions, 97 deletions
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 3955640b54f8..6246fcdd0e56 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -6,9 +6,8 @@
#
PORTNAME= mtr
-PORTVERSION= 0.54
-PORTREVISION= 4
-CATEGORIES= net ipv6
+PORTVERSION= 0.65
+CATEGORIES= net
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
ftp://ftp.netsw.org/net/ip/audit/packets/ \
ftp://ftp.gw.com/mirrors/pub/unix/mtr/
@@ -18,41 +17,25 @@ COMMENT= Traceroute and ping in a single graphical network diagnostic tool
GNU_CONFIGURE= yes
USE_GMAKE= yes
-WANT_GNOME= yes
-WANT_IPV6= yes
MAN8= mtr.8
PLIST_FILES= sbin/mtr
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 400014 && defined(WANT_IPV6)
-PATCHFILES= mtr-054-v6-20040216.diff.gz
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
-PATCH_DIST_STRIP= -p1
-
-CONFIGURE_ARGS+=--enable-ipv6
+.if !defined(WITHOUT_X11)
+.if defined(WITH_GTK1)
+USE_GNOME= gtk12
+PKGNAMESUFFIX= -gtk1
.else
-CONFIGURE_ARGS+=--disable-ipv6
+USE_GNOME= gtk20
+CONFIGURE_ARGS=--enable-gtk2
.endif
-
-.if !defined(WITHOUT_GNOME) && ${HAVE_GNOME:Mgtk12}!=""
-USE_GNOME+= gtk12
-PKGNAMESUFFIX= -gtk
USE_XLIB= yes
+CONFIGURE_ARGS+=--with-gtk-prefix=${X11BASE}
.else
-CONFIGURE_ARGS+=--without-gtk --with-gtk-prefix=/nonexistant
+PKGNAMESUFFIX= -nox11
+CONFIGURE_ARGS=--without-gtk --with-gtk-prefix=/nonexistant
.endif
-post-patch:
- @${TOUCH} ${WRKSRC}/aclocal.m4
- @${TOUCH} ${WRKSRC}/stamp-h.in
- @${TOUCH} ${WRKSRC}/img/Makefile.in
-
-do-install:
- ${INSTALL} -c -s -m 4755 -o root -g wheel ${WRKSRC}/mtr ${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8
-
post-install:
@${ECHO} ""
@${ECHO} "${PREFIX}/sbin/mtr is setuid \"root\" "
@@ -61,4 +44,4 @@ post-install:
@${ECHO} "in file ${WRKSRC}/SECURITY (not installed)"
@${ECHO} ""
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 66fdc5699561..7c675897c9e7 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,4 +1,2 @@
-MD5 (mtr-0.54.tar.gz) = 7f7ecb50fc37fedb13135a5ef80fda7d
-SIZE (mtr-0.54.tar.gz) = 88751
-MD5 (mtr-054-v6-20040216.diff.gz) = a17f1d3a4ee9e587a48f2a26f004ac3c
-SIZE (mtr-054-v6-20040216.diff.gz) = 19908
+MD5 (mtr-0.65.tar.gz) = 32de3cb8f0763e352124ff4fd74690ab
+SIZE (mtr-0.65.tar.gz) = 132318
diff --git a/net/mtr/files/patch-01 b/net/mtr/files/patch-01
deleted file mode 100644
index 651add54d7a8..000000000000
--- a/net/mtr/files/patch-01
+++ /dev/null
@@ -1,20 +0,0 @@
---- net.c.orig Mon Mar 29 20:18:08 2004
-+++ net.c Mon Mar 29 20:18:34 2004
-@@ -178,7 +178,7 @@
- }
-
-
--static int BSDfix = 0;
-+static int BSDfix = 1;
-
- int new_sequence(int index) {
- static int next_sequence = 0;
-@@ -261,7 +261,7 @@
- #endif
- );
- if (rv >= 0) {
-- fprintf (stderr, "You've got a broken (FreeBSD?) system\n");
-+/* fprintf (stderr, "You've got a broken (FreeBSD?) system\n"); */
- BSDfix = 1;
- }
- }
diff --git a/net/mtr/files/patch-02 b/net/mtr/files/patch-02
deleted file mode 100644
index afb1b7d51285..000000000000
--- a/net/mtr/files/patch-02
+++ /dev/null
@@ -1,13 +0,0 @@
---- dns.c.orig Sun Feb 9 17:40:31 2003
-+++ dns.c Sun Feb 9 17:41:03 2003
-@@ -835,8 +835,8 @@
- void dorequest(char *s,int type,word id){
- packetheader *hp;
- int r,i;
-- int buf[(MaxPacketsize/sizeof (int))+1];
-- r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,(unsigned char*)buf,MaxPacketsize);
-+ unsigned char buf[MaxPacketsize];
-+ r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,buf,MaxPacketsize);
- if (r == -1){
- restell("Resolver error: Query too large.");
- return;
diff --git a/net/mtr/files/patch-03 b/net/mtr/files/patch-03
deleted file mode 100644
index 58efa5fde677..000000000000
--- a/net/mtr/files/patch-03
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old Wed Oct 27 16:49:03 1999
-+++ Makefile.in Wed Oct 27 16:49:22 1999
-@@ -210,7 +210,7 @@
-
- mtr: $(mtr_OBJECTS) $(mtr_DEPENDENCIES)
- @rm -f mtr
-- $(LINK) $(mtr_LDFLAGS) $(mtr_OBJECTS) $(mtr_LDADD) $(LIBS)
-+ $(LINK) $(mtr_LDFLAGS) $(mtr_OBJECTS) $(mtr_LDADD) -lmytinfo $(LIBS)
-
- install-man8:
- $(mkinstalldirs) $(DESTDIR)$(man8dir)
diff --git a/net/mtr/files/patch-06 b/net/mtr/files/patch-06
deleted file mode 100644
index 5ee69cdacd15..000000000000
--- a/net/mtr/files/patch-06
+++ /dev/null
@@ -1,10 +0,0 @@
---- mtr.c.orig Sun Feb 9 17:37:45 2003
-+++ mtr.c Sun Feb 9 17:38:18 2003
-@@ -25,6 +25,7 @@
- #include <string.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
-+#include <arpa/inet.h>
- #include <unistd.h>
-
- #include "mtr-curses.h"
diff --git a/net/mtr/files/patch-07 b/net/mtr/files/patch-07
deleted file mode 100644
index 9f791efee54f..000000000000
--- a/net/mtr/files/patch-07
+++ /dev/null
@@ -1,10 +0,0 @@
---- select.c.orig Sun Feb 9 17:42:32 2003
-+++ select.c Sun Feb 9 17:43:04 2003
-@@ -25,6 +25,7 @@
- #include <unistd.h>
- #include <time.h>
- #include <sys/select.h>
-+#include <sys/socket.h>
- #include <string.h>
- #include <math.h>
- #include <errno.h>
diff --git a/net/mtr/files/patch-net.c b/net/mtr/files/patch-net.c
new file mode 100644
index 000000000000..8f80e6130d7b
--- /dev/null
+++ b/net/mtr/files/patch-net.c
@@ -0,0 +1,10 @@
+--- net.c.orig Wed Aug 25 09:21:27 2004
++++ net.c Tue Oct 26 12:46:58 2004
+@@ -249,7 +249,6 @@
+ rv = sendto(sendsock, packet, abs(packetsize), 0,
+ (struct sockaddr *)&remoteaddress, sizeof(remoteaddress));
+ if (rv >= 0) {
+- fprintf (stderr, "You've got a broken (FreeBSD?) system\n");
+ BSDfix = 1;
+ }
+ }