summaryrefslogtreecommitdiff
path: root/net/mtr
diff options
context:
space:
mode:
authorBill Fumerola <billf@FreeBSD.org>2003-02-10 01:44:12 +0000
committerBill Fumerola <billf@FreeBSD.org>2003-02-10 01:44:12 +0000
commitc0d2fa1238e11ddfb1ac200ba941f43752d7443b (patch)
tree276b332283d4b5f16934bb13d3633ad852309814 /net/mtr
parentupdate to 0.31 (diff)
upgrade to 0.52 (incl. ipv6 patch)
Notes
Notes: svn path=/head/; revision=75218
Diffstat (limited to 'net/mtr')
-rw-r--r--net/mtr/Makefile9
-rw-r--r--net/mtr/distinfo4
-rw-r--r--net/mtr/files/patch-0210
-rw-r--r--net/mtr/files/patch-0611
-rw-r--r--net/mtr/files/patch-0710
5 files changed, 26 insertions, 18 deletions
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 341e6541fd4a..4b36b6c72348 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mtr
-PORTVERSION= 0.49
-PORTREVISION= 2
+PORTVERSION= 0.52
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
ftp://ftp.netsw.org/net/ip/audit/packets/ \
@@ -15,7 +14,7 @@ MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
MAINTAINER= billf@FreeBSD.org
-USE_AUTOCONF= yes
+GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOMENG= yes
WANT_GNOME= yes
@@ -26,7 +25,7 @@ MAN8= mtr.8
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 400014 && defined(WANT_IPV6)
-PATCHFILES= mtr-049-v6-20020402.diff.gz
+PATCHFILES= mtr-052-v6-20030110b.diff.gz
PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
PATCH_DIST_STRIP= -p1
@@ -40,7 +39,7 @@ USE_GNOME+= gtk12
PKGNAMESUFFIX= -gtk
USE_XLIB= yes
.else
-CONFIGURE_ARGS+=--without-gtk
+CONFIGURE_ARGS+=--without-gtk --with-gtk-prefix=/nonexistant
.endif
post-patch:
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index d825c281ea22..d542dbebb17d 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,2 +1,2 @@
-MD5 (mtr-0.49.tar.gz) = 22963e1b9ca0da3b3e1ddb1810353d36
-MD5 (mtr-049-v6-20020402.diff.gz) = a515a0b75aa841e59151d21f1776ccc2
+MD5 (mtr-0.52.tar.gz) = b0b4f8b9bbb946c5e19429aa4b62bb2f
+MD5 (mtr-052-v6-20030110b.diff.gz) = f34ca3f534d9ee9e8bce8b6be0dbc9f8
diff --git a/net/mtr/files/patch-02 b/net/mtr/files/patch-02
index bcb4216cdfce..afb1b7d51285 100644
--- a/net/mtr/files/patch-02
+++ b/net/mtr/files/patch-02
@@ -1,11 +1,13 @@
---- dns.c.orig Wed Jun 9 11:09:20 1999
-+++ dns.c Tue Aug 10 01:21:12 1999
-@@ -751,7 +751,7 @@
+--- 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);
++ 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-06 b/net/mtr/files/patch-06
index 371abc28c266..5ee69cdacd15 100644
--- a/net/mtr/files/patch-06
+++ b/net/mtr/files/patch-06
@@ -1,13 +1,10 @@
---- mtr.c.orig Wed Mar 6 23:48:27 2002
-+++ mtr.c Sun Mar 10 00:28:50 2002
-@@ -22,8 +22,10 @@
- #include <stdio.h>
- #include <stdlib.h>
+--- 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 <sys/types.h>
#include <netinet/in.h>
#include <sys/socket.h>
+#include <arpa/inet.h>
+ #include <unistd.h>
#include "mtr-curses.h"
- #include "getopt.h"
diff --git a/net/mtr/files/patch-07 b/net/mtr/files/patch-07
new file mode 100644
index 000000000000..9f791efee54f
--- /dev/null
+++ b/net/mtr/files/patch-07
@@ -0,0 +1,10 @@
+--- 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>