[pkgsrc/trunk]: pkgsrc/net/mtr Add fix to properly detect socklen_t on variou...

[tonnerre <tonnerre%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5986bb0d57a
branches:  trunk
changeset: 546353:c5986bb0d57a
user:      tonnerre <tonnerre%pkgsrc.org@localhost>
date:      Fri Aug 29 08:32:41 2008 +0000

description:
Add fix to properly detect socklen_t on various system. Fixes PR 39421.

diffstat:

 net/mtr/distinfo         |   3 ++-
 net/mtr/patches/patch-aa |  36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletions(-)

diffs (52 lines):

diff -r 9b0bdd2d1a0d -r c5986bb0d57a net/mtr/distinfo
--- a/net/mtr/distinfo  Fri Aug 29 08:10:04 2008 +0000
+++ b/net/mtr/distinfo  Fri Aug 29 08:32:41 2008 +0000
@@ -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 -r 9b0bdd2d1a0d -r c5986bb0d57a net/mtr/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/mtr/patches/patch-aa  Fri Aug 29 08:32:41 2008 +0000
@@ -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 ;;