- Correctly detect a.out shared library (developers should test on a.out env ;)

- Create fake libtool object (*.lo) if no shared libwrap exists.

3 files changed, 24 insertions, 10 deletions

diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index 26147a505ff..c2b5554b98d 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.8 2002/03/22 11:26:04 agc Exp $
+$NetBSD: distinfo,v 1.9 2002/04/04 08:08:24 itohy Exp $
 
 SHA1 (ORBit-0.5.13.tar.gz) = ea8d790b040356e90fd81aa98313c2c1b08f3bcf
 Size (ORBit-0.5.13.tar.gz) = 1183657 bytes
 SHA1 (patch-aa) = ecef5843b4d749ccd8b51e8c7cd5cc96bac00a98
 SHA1 (patch-ab) = 1a8d5c433941930d558a408ebfa2ba4a631bafea
-SHA1 (patch-ac) = 7fddddf08e9f35e1e506be3f71c5925d62ae760c
+SHA1 (patch-ac) = 7f5ad581e9ba1ee125c7bd626fb99122326fc679
 SHA1 (patch-ad) = 688920ba423aa2994d9e2e6540f8738305cb7fd9
 SHA1 (patch-ae) = f6e8fff6047b359ab92c38c0ae2293655394ea04
-SHA1 (patch-af) = fe927125647db3404c92abfd7a3a4ddea8e3b760
+SHA1 (patch-af) = b88b26b8fe7d42f267c6761edc3e3b8250bd14fb
 SHA1 (patch-ag) = 875e83a597ab39d57abcfd9259d8ec15707ea45c
 SHA1 (patch-ai) = a5ec30692a14fb6bef617f262b6bb1fdd8903436
 SHA1 (patch-ak) = d569014320dbea40ccdb9e369e07c984ee7bd9de
diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac
index d29a89f10d1..3f1fbc4c277 100644
--- a/net/ORBit/patches/patch-ac
+++ b/net/ORBit/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.8 2001/06/16 20:01:23 jlam Exp $
+$NetBSD: patch-ac,v 1.9 2002/04/04 08:08:26 itohy Exp $
 
---- configure.orig	Sun May 13 03:12:36 2001
-+++ configure	Sat Jun 16 00:30:29 2001
+--- configure.orig	Mon Jan  7 18:09:58 2002
++++ configure	Thu Apr  4 12:39:01 2002
 @@ -2151,9 +2151,9 @@
    rm -f conf.glibtest
  
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.8 2001/06/16 20:01:23 jlam Exp $
 +		LIB_WRAP=-lwrap
 +		echo "Found $THEFILE/libwrap.so" 1>&5
 +		break
-+	elif test -f $THEFILE/libwrap.so.*.*; then
++	elif test -f `set $THEFILE/libwrap.so.*.*; echo $1`; then
  		LIB_WRAP=-lwrap
  		echo "Found $THEFILE/libwrap.so" 1>&5
  		break
diff --git a/net/ORBit/patches/patch-af b/net/ORBit/patches/patch-af
index cae1e820b44..05a3c407e40 100644
--- a/net/ORBit/patches/patch-af
+++ b/net/ORBit/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.6 2001/10/04 19:25:26 rh Exp $
+$NetBSD: patch-af,v 1.7 2002/04/04 08:08:27 itohy Exp $
 
---- src/IIOP/Makefile.in.orig	Sun May 13 09:20:26 2001
-+++ src/IIOP/Makefile.in
+--- src/IIOP/Makefile.in.orig	Mon Jan  7 18:23:54 2002
++++ src/IIOP/Makefile.in	Thu Apr  4 12:30:24 2002
 @@ -128,7 +128,7 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  CPPFLAGS = @CPPFLAGS@
@@ -11,3 +11,17 @@ $NetBSD: patch-af,v 1.6 2001/10/04 19:25:26 rh Exp $
  @HAVE_HOSTS_ACCESS_TRUE@libIIOP_la_DEPENDENCIES =  $(addsuffix .lo, \
  @HAVE_HOSTS_ACCESS_TRUE@$(basename $(filter %.o, $(shell ar t \
  @HAVE_HOSTS_ACCESS_TRUE@$(LIBWRAP_PATH)))))
+@@ -399,8 +399,11 @@
+ 
+ make_libwrap_files: $(LIBWRAP_PATH)
+ 	ar x $(LIBWRAP_PATH)
+-	for I in $(basename $(libwrap_files)); do mv $$I.o $$I.lo; done
+-	ar x $(LIBWRAP_PATH)
++	for I in $(basename $(libwrap_files)); do \
++		( echo "# $$I.lo - a libtool object file"; \
++		echo "# Generated by ltmain.sh - GNU libtool 1.4a (fake)"; \
++		echo pic_object=none; echo non_pic_object=$$I.o ) >$$I.lo; \
++	done
+ 	touch make_libwrap_files
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.