Actually check for inet_pton and inet_ntop in the right header.

Don't prototype inet_pton or inet_ntop if the system already has them.

4 files changed, 81 insertions, 0 deletions

diff --git a/devel/uclmmbase/files/patch-ab b/devel/uclmmbase/files/patch-ab
new file mode 100644
index 000000000000..49ec0efe232c
--- /dev/null
+++ b/devel/uclmmbase/files/patch-ab
@@ -0,0 +1,24 @@
+--- configure.in.orig	Fri May 11 07:59:42 2001
++++ configure.in	Thu Jan 23 17:36:33 2003
+@@ -102,8 +102,8 @@
+ # declared anywhere, use egrep header to check (ugh lame, but works)
+ 
+ AC_CACHE_CHECK(for inet_pton in <arpa/inet.h>, ucl_cv_inet_pton_in_inet_h,
+-	AC_EGREP_HEADER(uint16_t,
+-			stdint.h,
++	AC_EGREP_HEADER(inet_pton,
++			arpa/inet.h,
+ 			ucl_cv_inet_pton_in_inet_h=yes,
+ 			ucl_cv_inet_pton_in_inet_h=no))
+ if test $ucl_cv_inet_pton_in_inet_h = "no"
+@@ -112,8 +112,8 @@
+ 	LIBOBJS="$LIBOBJS inet_pton.o"
+ fi
+ AC_CACHE_CHECK(for inet_ntop in <arpa/inet.h>, ucl_cv_inet_ntop_in_inet_h,
+-	AC_EGREP_HEADER(uint16_t,
+-			stdint.h,
++	AC_EGREP_HEADER(inet_ntop,
++			arpa/inet.h,
+ 			ucl_cv_inet_ntop_in_inet_h=yes,
+ 			ucl_cv_inet_ntop_in_inet_h=no))
+ if test $ucl_cv_inet_ntop_in_inet_h = "no"
diff --git a/devel/uclmmbase/files/patch-ac b/devel/uclmmbase/files/patch-ac
new file mode 100644
index 000000000000..c202fcfe3753
--- /dev/null
+++ b/devel/uclmmbase/files/patch-ac
@@ -0,0 +1,28 @@
+--- configure.orig	Fri May 11 07:59:42 2001
++++ configure	Thu Jan 23 17:29:08 2003
+@@ -1928,10 +1928,10 @@
+   cat > conftest.$ac_ext <<EOF
+ #line 1930 "configure"
+ #include "confdefs.h"
+-#include <stdint.h>
++#include <arpa/inet.h>
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "uint16_t" >/dev/null 2>&1; then
++  egrep "inet_pton" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ucl_cv_inet_pton_in_inet_h=yes
+ else
+@@ -1959,10 +1959,10 @@
+   cat > conftest.$ac_ext <<EOF
+ #line 1961 "configure"
+ #include "confdefs.h"
+-#include <stdint.h>
++#include <arpa/inet.h>
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "uint16_t" >/dev/null 2>&1; then
++  egrep "inet_ntop" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ucl_cv_inet_ntop_in_inet_h=yes
+ else
diff --git a/devel/uclmmbase/files/patch-ad b/devel/uclmmbase/files/patch-ad
new file mode 100644
index 000000000000..795bf55bcf25
--- /dev/null
+++ b/devel/uclmmbase/files/patch-ad
@@ -0,0 +1,14 @@
+--- src/inet_ntop.h.orig	Thu Jan 23 17:35:36 2003
++++ src/inet_ntop.h	Thu Jan 23 17:35:45 2003
+@@ -1,4 +1,4 @@
+-#ifndef HAVE_INET_NTOP
++#ifdef NEED_INET_NTOP
+ #if defined(__cplusplus)
+ extern "C" {
+ #endif
+@@ -8,4 +8,4 @@
+ #if defined(__cplusplus)
+ }
+ #endif
+-#endif /* HAVE_INET_NTOP */
++#endif /* NEED_INET_NTOP */
diff --git a/devel/uclmmbase/files/patch-ae b/devel/uclmmbase/files/patch-ae
new file mode 100644
index 000000000000..cf7a3c5b88dd
--- /dev/null
+++ b/devel/uclmmbase/files/patch-ae
@@ -0,0 +1,15 @@
+--- src/inet_pton.h.orig	Thu Jan 23 17:35:17 2003
++++ src/inet_pton.h	Thu Jan 23 17:35:29 2003
+@@ -1,4 +1,4 @@
+-#ifndef HAVE_INET_PTON
++#ifdef NEED_INET_PTON
+ #if defined(__cplusplus)
+ extern "C" {
+ #endif
+@@ -8,5 +8,5 @@
+ #if defined(__cplusplus)
+ }
+ #endif
+-#endif /* HAVE_INET_PTON */
++#endif /* NEED_INET_PTON */
+