summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authortonnerre <tonnerre@pkgsrc.org>2008-08-29 08:32:41 +0000
committertonnerre <tonnerre@pkgsrc.org>2008-08-29 08:32:41 +0000
commitc7038ad24b2e1ba56b969f8ed19792e599345786 (patch)
treed3c4fa716c4033402f862f9f563a96ee57b34141 /net
parent381c49462e79cd6df7cf2c2d14da43586d724ab9 (diff)
downloadpkgsrc-c7038ad24b2e1ba56b969f8ed19792e599345786.tar.gz
Add fix to properly detect socklen_t on various system. Fixes PR 39421.
Diffstat (limited to 'net')
-rw-r--r--net/mtr/distinfo3
-rw-r--r--net/mtr/patches/patch-aa36
2 files changed, 38 insertions, 1 deletions
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 89eed11dc27..b789d92242a 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.24 2008/08/24 12:36:34 tron Exp $
+$NetBSD: distinfo,v 1.25 2008/08/29 08:32:41 tonnerre Exp $
SHA1 (mtr-0.74.tar.gz) = 33038f02872827ac0f3f10d4b7a86d02c76459a5
RMD160 (mtr-0.74.tar.gz) = 38bba2bee80f2ae5180354e18f025d71506f3739
Size (mtr-0.74.tar.gz) = 178587 bytes
+SHA1 (patch-aa) = 844cfa989ee103f3dbc3c1c96a7d631496a251a9
SHA1 (patch-ab) = 6736da4136b3a4483330973b5cd05668542fe268
diff --git a/net/mtr/patches/patch-aa b/net/mtr/patches/patch-aa
new file mode 100644
index 00000000000..64dfcf50ac3
--- /dev/null
+++ b/net/mtr/patches/patch-aa
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.9 2008/08/29 08:32:41 tonnerre Exp $
+
+--- configure.orig 2008-08-19 20:11:50.000000000 +0200
++++ configure
+@@ -6176,7 +6176,7 @@ fi
+ done
+
+
+-for ac_header in sys/xti.h
++for ac_header in socket.h sys/socket.h sys/xti.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -7834,7 +7834,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ #include <netinet/in.h>
+-
++#ifdef HAVE_SOCKET_H
++#include <socket.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
+
+ typedef socklen_t ac__type_new_;
+ int
+@@ -8570,6 +8575,8 @@ do
+ case $ac_option in
+ # Handling of the options.
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++ : Avoid regenerating within pkgsrc
++ exit 0
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ echo "$ac_cs_version"; exit ;;