[pkgsrc/trunk]: pkgsrc/net/libbind some more OpenBSD support (not completed y...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e310a6ee0fc
branches:  trunk
changeset: 634212:0e310a6ee0fc
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun May 11 10:16:40 2014 +0000

description:
some more OpenBSD support (not completed yet).

diffstat:

 net/libbind/distinfo                        |   10 +-
 net/libbind/patches/patch-aa                |  121 +++++++++++++++++++++++++++-
 net/libbind/patches/patch-ab                |    4 +-
 net/libbind/patches/patch-config.threads.in |   15 +++
 net/libbind/patches/patch-configure.in      |   59 +++++++++++++
 net/libbind/patches/patch-doc_Makefile.in   |    4 +-
 6 files changed, 206 insertions(+), 7 deletions(-)

diffs (254 lines):

diff -r c1af3aa8d2eb -r 0e310a6ee0fc net/libbind/distinfo
--- a/net/libbind/distinfo      Sun May 11 10:15:34 2014 +0000
+++ b/net/libbind/distinfo      Sun May 11 10:16:40 2014 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.5 2014/05/10 10:00:38 obache Exp $
+$NetBSD: distinfo,v 1.6 2014/05/11 10:16:40 obache Exp $
 
 SHA1 (libbind-6.0.tar.gz) = 4664646238cd3602df168da1e9bc9591d3f566b2
 RMD160 (libbind-6.0.tar.gz) = bfafac89a455a05202763f6e10f292978085d811
 Size (libbind-6.0.tar.gz) = 757162 bytes
-SHA1 (patch-aa) = 1c082ec200c840502f3452bfd99fde871d5082cf
-SHA1 (patch-ab) = 6a62d2605e55385fe61cd6a2dc2224883987559e
-SHA1 (patch-doc_Makefile.in) = ec7c158664cd5c8edc501a9b74ac956c06ac4df7
+SHA1 (patch-aa) = 7b781478cdc5bf5e665ee61c85d8da872298db14
+SHA1 (patch-ab) = 181cd18ed571b064e13fc83b97cb1f8cc86d5fc2
+SHA1 (patch-config.threads.in) = e6df8706b9ff3251dbf91284c4b19397a4ca05b3
+SHA1 (patch-configure.in) = 6d1549d5b5a63c51e6d47e557b59d819ecf43824
+SHA1 (patch-doc_Makefile.in) = 0ebc227322e3bd10b5b9a242073539868f440ba2
diff -r c1af3aa8d2eb -r 0e310a6ee0fc net/libbind/patches/patch-aa
--- a/net/libbind/patches/patch-aa      Sun May 11 10:15:34 2014 +0000
+++ b/net/libbind/patches/patch-aa      Sun May 11 10:16:40 2014 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2014/05/10 10:00:38 obache Exp $
+$NetBSD: patch-aa,v 1.4 2014/05/11 10:16:40 obache Exp $
+
+* regen with pkgsrc patches
 
 --- configure.orig     2009-03-05 01:37:31.000000000 +0000
 +++ configure
@@ -20,3 +22,120 @@
        *-osf*)         PORT_DIR="port/decunix";;
        *-freebsd*)     PORT_DIR="port/freebsd";;
        *-hpux9*)       PORT_DIR="port/hpux9";;
+@@ -32049,6 +32049,56 @@ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#undef _REENTRANT
++#define _REENTRANT
++#undef __USE_MISC
++#define __USE_MISC
++#include <netdb.h>
++void setprotoent_r (int, struct protoent_data *);
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++       test -z "$ac_c_werror_flag" ||
++       test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  PROTO_R_SET_RESULT="#undef PROTO_R_SET_RESULT"
++PROTO_R_SET_RETURN="#define PROTO_R_SET_RETURN void"
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+@@ -33647,6 +33697,59 @@ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#undef _REENTRANT
++#define _REENTRANT
++#undef __USE_MISC
++#define __USE_MISC
++#include <netdb.h>
++void setservent_r(int, struct servent_data *);
++
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++       test -z "$ac_c_werror_flag" ||
++       test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++
++SERV_R_SET_RESULT="#undef SERV_R_SET_RESULT"
++SERV_R_SET_RETURN="#define SERV_R_SET_RETURN void"
++
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
diff -r c1af3aa8d2eb -r 0e310a6ee0fc net/libbind/patches/patch-ab
--- a/net/libbind/patches/patch-ab      Sun May 11 10:15:34 2014 +0000
+++ b/net/libbind/patches/patch-ab      Sun May 11 10:16:40 2014 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2014/05/10 09:53:43 obache Exp $
+$NetBSD: patch-ab,v 1.3 2014/05/11 10:16:40 obache Exp $
+
+* OpenBSD support
 
 --- include/netdb.h.orig       Thu Feb 28 05:34:17 2008
 +++ include/netdb.h
diff -r c1af3aa8d2eb -r 0e310a6ee0fc net/libbind/patches/patch-config.threads.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libbind/patches/patch-config.threads.in       Sun May 11 10:16:40 2014 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-config.threads.in,v 1.1 2014/05/11 10:16:40 obache Exp $
+
+* prevent to overwrite CC
+
+--- config.threads.in.orig     2008-09-19 18:46:17.000000000 +0000
++++ config.threads.in
+@@ -100,7 +100,7 @@ then
+               # currently work with bind9, but can be chosen with
+               # the --with-ptl2 option for those who wish to
+               # experiment with it.
+-              CC="gcc"
++              # CC="gcc"
+               AC_MSG_CHECKING(which NetBSD thread library to use)
+ 
+               AC_ARG_WITH(ptl2,
diff -r c1af3aa8d2eb -r 0e310a6ee0fc net/libbind/patches/patch-configure.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libbind/patches/patch-configure.in    Sun May 11 10:16:40 2014 +0000
@@ -0,0 +1,59 @@
+$NetBSD: patch-configure.in,v 1.1 2014/05/11 10:16:40 obache Exp $
+
+* treat DragonFly BSD as FreeBSD.
+* prototype check for OpenBSD.
+
+--- configure.in.orig  2009-03-05 01:37:04.000000000 +0000
++++ configure.in
+@@ -1082,7 +1082,7 @@ case "$host" in
+                       PORT_NONBLOCK="#define PORT_NONBLOCK O_NDELAY"
+                       PORT_DIR="port/cygwin";;
+       *-darwin*)      PORT_DIR="port/darwin";;
+-      *-dragonfly*)   PORT_DIR="port/dragonfly";;
++      *-dragonfly*)   PORT_DIR="port/freebsd";;
+       *-osf*)         PORT_DIR="port/decunix";;
+       *-freebsd*)     PORT_DIR="port/freebsd";;
+       *-hpux9*)       PORT_DIR="port/hpux9";;
+@@ -2408,6 +2408,19 @@ int setprotoent_r (int, struct protoent_
+ PROTO_R_SET_RESULT="#define PROTO_R_SET_RESULT (0)"
+ PROTO_R_SET_RETURN="#define PROTO_R_SET_RETURN int"
+ ,
++AC_TRY_COMPILE(
++[
++#undef _REENTRANT
++#define _REENTRANT
++#undef __USE_MISC
++#define __USE_MISC
++#include <netdb.h>
++void setprotoent_r (int, struct protoent_data *);
++],[],
++PROTO_R_SET_RESULT="#undef PROTO_R_SET_RESULT"
++PROTO_R_SET_RETURN="#define PROTO_R_SET_RETURN void"
++,
++)
+ )
+ )
+ ,
+@@ -2692,6 +2705,22 @@ SERV_R_SET_RESULT="#define SERV_R_SET_RE
+ SERV_R_SET_RETURN="#define SERV_R_SET_RETURN int"
+ ]
+ ,
++AC_TRY_COMPILE(
++[
++#undef _REENTRANT
++#define _REENTRANT
++#undef __USE_MISC
++#define __USE_MISC
++#include <netdb.h>
++void setservent_r(int, struct servent_data *);
++]
++,,
++[
++SERV_R_SET_RESULT="#undef SERV_R_SET_RESULT"
++SERV_R_SET_RETURN="#define SERV_R_SET_RETURN void"
++]
++,
++)
+ )
+ )
+ ,
diff -r c1af3aa8d2eb -r 0e310a6ee0fc net/libbind/patches/patch-doc_Makefile.in
--- a/net/libbind/patches/patch-doc_Makefile.in Sun May 11 10:15:34 2014 +0000
+++ b/net/libbind/patches/patch-doc_Makefile.in Sun May 11 10:16:40 2014 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-doc_Makefile.in,v 1.1 2012/03/12 04:39:16 joerg Exp $
+$NetBSD: patch-doc_Makefile.in,v 1.2 2014/05/11 10:16:40 obache Exp $
+
+* prevent to install catman
 
 --- doc/Makefile.in.orig       2012-03-11 21:02:41.000000000 +0000
 +++ doc/Makefile.in