Fri Aug 29 08:32:41 2008 UTC ()
Add fix to properly detect socklen_t on various system. Fixes PR 39421.
(tonnerre)
diff -r1.24 -r1.25 pkgsrc/net/mtr/distinfo
diff -r0 -r1.9 pkgsrc/net/mtr/patches/patch-aa
--- pkgsrc/net/mtr/distinfo 2008/08/24 12:36:34 1.24
+++ pkgsrc/net/mtr/distinfo 2008/08/29 08:32:41 1.25
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.24 2008/08/24 12:36:34 tron Exp $ | | 1 | $NetBSD: distinfo,v 1.25 2008/08/29 08:32:41 tonnerre Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (mtr-0.74.tar.gz) = 33038f02872827ac0f3f10d4b7a86d02c76459a5 | | 3 | SHA1 (mtr-0.74.tar.gz) = 33038f02872827ac0f3f10d4b7a86d02c76459a5 |
| 4 | RMD160 (mtr-0.74.tar.gz) = 38bba2bee80f2ae5180354e18f025d71506f3739 | | 4 | RMD160 (mtr-0.74.tar.gz) = 38bba2bee80f2ae5180354e18f025d71506f3739 |
| 5 | Size (mtr-0.74.tar.gz) = 178587 bytes | | 5 | Size (mtr-0.74.tar.gz) = 178587 bytes |
| | | 6 | SHA1 (patch-aa) = 844cfa989ee103f3dbc3c1c96a7d631496a251a9 |
| 6 | SHA1 (patch-ab) = 6736da4136b3a4483330973b5cd05668542fe268 | | 7 | SHA1 (patch-ab) = 6736da4136b3a4483330973b5cd05668542fe268 |
$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 ;;