Sat Jun 5 14:50:13 2010 UTC ()
Remove unnecessary chunk.


(wiz)
diff -r1.28 -r1.29 pkgsrc/net/mtr/distinfo
diff -r1.9 -r1.10 pkgsrc/net/mtr/patches/patch-aa

cvs diff -r1.28 -r1.29 pkgsrc/net/mtr/distinfo (expand / switch to unified diff)

--- pkgsrc/net/mtr/distinfo 2010/06/05 14:49:51 1.28
+++ pkgsrc/net/mtr/distinfo 2010/06/05 14:50:12 1.29
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.28 2010/06/05 14:49:51 wiz Exp $ 1$NetBSD: distinfo,v 1.29 2010/06/05 14:50:12 wiz Exp $
2 2
3SHA1 (mtr-0.77.tar.gz) = 67461d021860fe5f3553ea9f00823f887a0ec389 3SHA1 (mtr-0.77.tar.gz) = 67461d021860fe5f3553ea9f00823f887a0ec389
4RMD160 (mtr-0.77.tar.gz) = 6e84bdf166861145a01a202ece0ec17c82111272 4RMD160 (mtr-0.77.tar.gz) = 6e84bdf166861145a01a202ece0ec17c82111272
5Size (mtr-0.77.tar.gz) = 272517 bytes 5Size (mtr-0.77.tar.gz) = 272517 bytes
6SHA1 (patch-aa) = 844cfa989ee103f3dbc3c1c96a7d631496a251a9 6SHA1 (patch-aa) = fcee60ebcdc1b532439aa893f5d710f95f563e1c
7SHA1 (patch-ab) = 67699e8d4a8eb6d63a918e298960e7e8e105de40 7SHA1 (patch-ab) = 67699e8d4a8eb6d63a918e298960e7e8e105de40
8SHA1 (patch-ac) = 50fcafe1a0de3f285036882c79fdf61e03fbc045 8SHA1 (patch-ac) = 50fcafe1a0de3f285036882c79fdf61e03fbc045

cvs diff -r1.9 -r1.10 pkgsrc/net/mtr/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/mtr/patches/Attic/patch-aa 2008/08/29 08:32:41 1.9
+++ pkgsrc/net/mtr/patches/Attic/patch-aa 2010/06/05 14:50:12 1.10
@@ -1,36 +1,27 @@ @@ -1,36 +1,27 @@
1$NetBSD: patch-aa,v 1.9 2008/08/29 08:32:41 tonnerre Exp $ 1$NetBSD: patch-aa,v 1.10 2010/06/05 14:50:12 wiz Exp $
2 2
3--- configure.orig 2008-08-19 20:11:50.000000000 +0200 3--- configure.orig 2008-08-19 20:11:50.000000000 +0200
4+++ configure 4+++ configure
5@@ -6176,7 +6176,7 @@ fi 5@@ -6176,7 +6176,7 @@ fi
6 done 6 done
7  7
8  8
9-for ac_header in sys/xti.h 9-for ac_header in sys/xti.h
10+for ac_header in socket.h sys/socket.h sys/xti.h 10+for ac_header in socket.h sys/socket.h sys/xti.h
11 do 11 do
12 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 12 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
13 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 13 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14@@ -7834,7 +7834,12 @@ cat >>conftest.$ac_ext <<_ACEOF 14@@ -7834,7 +7834,12 @@ cat >>conftest.$ac_ext <<_ACEOF
15 /* end confdefs.h. */ 15 /* end confdefs.h. */
16  16
17 #include <netinet/in.h> 17 #include <netinet/in.h>
18- 18-
19+#ifdef HAVE_SOCKET_H 19+#ifdef HAVE_SOCKET_H
20+#include <socket.h> 20+#include <socket.h>
21+#endif 21+#endif
22+#ifdef HAVE_SYS_SOCKET_H 22+#ifdef HAVE_SYS_SOCKET_H
23+#include <sys/socket.h> 23+#include <sys/socket.h>
24+#endif 24+#endif
25  25
26 typedef socklen_t ac__type_new_; 26 typedef socklen_t ac__type_new_;
27 int 27 int
28@@ -8570,6 +8575,8 @@ do 
29 case $ac_option in 
30 # Handling of the options. 
31 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 
32+ : Avoid regenerating within pkgsrc 
33+ exit 0 
34 ac_cs_recheck=: ;; 
35 --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) 
36 echo "$ac_cs_version"; exit ;;