* 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.

4 files changed, 63 insertions, 18 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index a54b3db934f..f7931c98815 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2002/10/30 03:09:34 rh Exp $
+# $NetBSD: Makefile,v 1.82 2002/11/25 21:20:05 jlam Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -10,19 +10,27 @@ MAINTAINER=		wiz@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		high-performance CORBA ORB with support for the C language
 
+USE_BUILDLINK2=		YES
+
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} != "NetBSD") && (${OPSYS} != "Linux")
 DEPENDS+=		gindent-[0-9]*:../../devel/gindent
+.endif
 
-AUTOMAKE_OVERRIDE=	NO	# Otherwise breaks 1.5 arm32
 USE_GMAKE=		YES
+
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/popt/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libIDL/libtool
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/ORBit.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/libIDL/libIDL.pc.in
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+CONFIGURE_ENV+=	LIBWRAP_PATH=${BUILDLINK_PREFIX.tcp_wrappers}/lib/libwrap.a
+CONFIGURE_ENV+=	LIB_WRAP="-lwrap"
+
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/ORBit.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/libIDL/libIDL.pc.in
 
 CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index f61649fa30f..9afbd309d71 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2002/10/30 03:09:35 rh Exp $
+$NetBSD: distinfo,v 1.15 2002/11/25 21:20:06 jlam Exp $
 
 SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038
 Size (ORBit-0.5.15.tar.gz) = 1335272 bytes
 SHA1 (patch-aa) = ef745d3d279d57dbdf6380053b6b4a7e63322671
 SHA1 (patch-ab) = c2b7cc5f83230035c214600bff59d4dfefd92422
-SHA1 (patch-ac) = cc073ac41f69671fe10be3975cb0753e163a10dd
+SHA1 (patch-ac) = c9331438d0b9565a77e8a6925608935ce8075d6d
 SHA1 (patch-ad) = d4f61e2fef4b862606473ced8f0b27ea3b7f22b3
 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb
 SHA1 (patch-af) = b88b26b8fe7d42f267c6761edc3e3b8250bd14fb
@@ -14,3 +14,4 @@ SHA1 (patch-ak) = d569014320dbea40ccdb9e369e07c984ee7bd9de
 SHA1 (patch-al) = 7f2992136c3f7b1badfc76a83d6fed0aa73a8873
 SHA1 (patch-am) = f52369447d04a382d6e93a6bddaf3962a3ab6677
 SHA1 (patch-an) = 7b8ead20b77dc8bad497216c958578d1b285391d
+SHA1 (patch-ao) = 4346486e6a3d947350b162088490692543dde2f3
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