* NetBSD's (and most likely Linux's) indent program is sufficient for ORBit,

  so don't depend on devel/gindent on these two platforms.

* USE_BUILDLINK2 implies AUTOMAKE_OVERRIDE=NO.

* Don't use the hackish test for libwrap supplied in the configure script.
  Instead, just specify the necessary variables to link against libwrap
  in the package Makefile.

This closes PR 18712 by Greg A. Woods.

2 files changed, 47 insertions, 11 deletions

diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac
index cce201f4f1f..acf8264b156 100644
--- a/net/ORBit/patches/patch-ac
+++ b/net/ORBit/patches/patch-ac
@@ -1,15 +1,31 @@
-$NetBSD: patch-ac,v 1.11 2002/08/25 18:39:31 jlam Exp $
+$NetBSD: patch-ac,v 1.12 2002/11/25 21:20:06 jlam Exp $
 
---- configure.orig	Wed Mar 20 14:45:48 2002
-+++ configure	Thu Apr 25 12:42:56 2002
-@@ -8636,6 +8636,10 @@
- 	THEFILE="`echo $I | sed -e 's,^-L,,'`"
- 	echo "From $I, checking in dir $THEFILE for libwrap.so" 1>&5
- 	if test -f $THEFILE/libwrap.so; then
-+		LIB_WRAP=-lwrap
-+		echo "Found $THEFILE/libwrap.so" 1>&5
-+		break
-+	elif test -f `set $THEFILE/libwrap.so.*.*; echo $1`; then
+--- configure.orig	Wed Mar 20 06:45:48 2002
++++ configure
+@@ -8628,6 +8628,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
+ 
+ echo "$as_me:8629: checking \"whether to use TCP wrappers\"" >&5
+ echo $ECHO_N "checking \"whether to use TCP wrappers\"... $ECHO_C" >&6
++if test -z "$LIBWRAP_PATH" && test -z "$LIB_WRAP"; then
+ LIBWRAP_PATH=""
+ LIB_WRAP=""
+ for I in $LDFLAGS $LIBS -L/usr/lib; do
+@@ -8639,6 +8640,10 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
  		LIB_WRAP=-lwrap
  		echo "Found $THEFILE/libwrap.so" 1>&5
  		break
++	elif test -f `set $THEFILE/libwrap.so.*.*; echo $1`; then
++		LIB_WRAP=-lwrap
++		echo "Found $THEFILE/libwrap.so" 1>&5
++		break
+ 	else
+ 		echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5
+ 		if test -f $THEFILE/libwrap.a; then
+@@ -8649,6 +8654,7 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
+ 	fi
+ 	esac
+ done
++fi
+ if test -n "$LIBWRAP_PATH" || test -n "$LIB_WRAP"; then
+ 	echo "$as_me:8653: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
diff --git a/net/ORBit/patches/patch-ao b/net/ORBit/patches/patch-ao
new file mode 100644
index 00000000000..c4173ee0ad8
--- /dev/null
+++ b/net/ORBit/patches/patch-ao
@@ -0,0 +1,20 @@
+$NetBSD: patch-ao,v 1.1 2002/11/25 21:20:06 jlam Exp $
+
+--- configure.in.orig	Wed Mar 20 06:44:16 2002
++++ configure.in
+@@ -154,6 +154,7 @@ AC_TRY_COMPILE(
+ # Modified to prefer shared libwrap by Adam Powell
+ 
+ AC_MSG_CHECKING("whether to use TCP wrappers")
++if test -z "$LIBWRAP_PATH" && test -z "$LIB_WRAP"; then
+ LIBWRAP_PATH=""
+ LIB_WRAP=""
+ for I in $LDFLAGS $LIBS -L/usr/lib; do
+@@ -175,6 +176,7 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
+ 	fi
+ 	esac
+ done
++fi
+ if test -n "$LIBWRAP_PATH" || test -n "$LIB_WRAP"; then
+ 	AC_MSG_RESULT(yes)
+ else