USE_LIBTOOL instead of PKGLIBTOOL.

3 files changed, 70 insertions, 70 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index b68f18d6fa4..524ae07a5fe 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,23 +1,25 @@
-# $NetBSD: Makefile,v 1.31 2000/06/01 11:23:36 rh Exp $
+# $NetBSD: Makefile,v 1.32 2000/06/20 22:42:38 jlam Exp $
 #
 
-DISTNAME=	ORBit-0.5.1
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/ORBit/}
+DISTNAME=		ORBit-0.5.1
+CATEGORIES=		net
+MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/ORBit/}
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=	glib-1.2.*:../../devel/glib
-DEPENDS+=	gindent-*:../../devel/gindent
-DEPENDS+=	gettext-0.10.*:../../devel/gettext
+DEPENDS+=		glib-1.2.*:../../devel/glib
+DEPENDS+=		gindent-*:../../devel/gindent
+DEPENDS+=		gettext-0.10.*:../../devel/gettext
 
-GNU_CONFIGURE=	yes
-USE_PKGLIBTOOL=	yes
-USE_GMAKE=	yes
+USE_GMAKE=		# defined
+GNU_CONFIGURE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig \
+			${WRKSRC}/popt/ltconfig \
+			${WRKSRC}/libIDL/ltconfig
 
-LIBTOOL_FLAGS=	--install-la
-INFO_FILES=	libIDL.info
+INFO_FILES=		libIDL.info
 
 # This package fails to build, with an unterminated macro definition error
 # Calling the build twice seems to workaround this.
diff --git a/net/ORBit/files/patch-sum b/net/ORBit/files/patch-sum
index 74e628298a3..f4ea9bc34e1 100644
--- a/net/ORBit/files/patch-sum
+++ b/net/ORBit/files/patch-sum
@@ -1,12 +1,9 @@
-$NetBSD: patch-sum,v 1.6 2000/05/30 19:13:17 drochner Exp $
+$NetBSD: patch-sum,v 1.7 2000/06/20 22:42:39 jlam Exp $
 
-MD5 (patch-aa) = 299365a9c51c83a29f2f1c32cb24fda9
 MD5 (patch-ab) = 39d06749d19c30d91d40e48fd4e74321
-MD5 (patch-ac) = 19cfe44d23ee91099de7431e9a3c1049
 MD5 (patch-ad) = b5a1964a714884369ba9c60790380f69
 MD5 (patch-ae) = d2ceabae3616dbd26ab87848d7046c4d
 MD5 (patch-ag) = be7d2b90edbefb47476fad9e650a26e1
-MD5 (patch-ah) = 9b949d6e0050b7ea9dc2f34b3019afe8
 MD5 (patch-ai) = c486d47127aa566b1a8280002295088e
 MD5 (patch-aj) = acab17fefe4adbd909877c56b8ceb6e1
 MD5 (patch-ak) = 9ee5d2fc433ee4e0bc86b37b7df416d0
diff --git a/net/ORBit/pkg/PLIST b/net/ORBit/pkg/PLIST
index 126e010017c..873c2a60893 100644
--- a/net/ORBit/pkg/PLIST
+++ b/net/ORBit/pkg/PLIST
@@ -1,41 +1,26 @@
-@comment $NetBSD: PLIST,v 1.10 2000/05/30 19:13:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2000/06/20 22:42:39 jlam Exp $
 bin/libIDL-config
 bin/name-client
 bin/old-name-server
-bin/orbit-idl
 bin/orbit-config
 bin/orbit-event-server
+bin/orbit-idl
 bin/orbit-ird
 bin/orbit-name-server
-lib/libIDL-0.6.so.0.0
-lib/libIDL.la
-lib/libIDL.a
-lib/libIDLConf.sh
-lib/libORBitCosNaming.so.5.1
-lib/libORBitCosNaming.la
-lib/libORBitCosNaming.a
-lib/libORBitutil.so.5.1
-lib/libORBitutil.la
-lib/libORBitutil.a
-lib/libIIOP.so.5.1
-lib/libIIOP.la
-lib/libIIOP.a
-lib/libORBit.so.5.1
-lib/libORBit.la
-lib/libORBit.a
-lib/liborbit-c-backend.a
-lib/libpopt.a
-lib/libpopt.so.0.0
-lib/libname-server.a
-include/libIDL/IDL.h
+include/IIOP/IIOP-config.h
+include/IIOP/IIOP-types.h
+include/IIOP/IIOP.h
+include/IIOP/giop-msg-buffer.h
+include/IIOP/iiop-encoders.h
+include/IIOP/iiop-endian.h
+include/ORBitservices/CosEventChannel.idl
+include/ORBitservices/CosEventComm.idl
 include/ORBitservices/CosNaming.h
-include/ORBitservices/CosNaming_impl.h
 include/ORBitservices/CosNaming.idl
-include/ORBitservices/LName.pidl
-include/ORBitservices/CosEventComm.idl
-include/ORBitservices/CosEventChannel.idl
-include/ORBitservices/CosTypedEventComm.idl
+include/ORBitservices/CosNaming_impl.h
 include/ORBitservices/CosTypedEventChannel.idl
+include/ORBitservices/CosTypedEventComm.idl
+include/ORBitservices/LName.pidl
 include/ORBitutil/basic_types.h
 include/ORBitutil/compat.h
 include/ORBitutil/orbit-os-config.h
@@ -44,35 +29,15 @@ include/ORBitutil/os-specifics.h
 include/ORBitutil/thread-safety.h
 include/ORBitutil/trace.h
 include/ORBitutil/util.h
-include/IIOP/IIOP-config.h
-include/IIOP/IIOP-types.h
-include/IIOP/IIOP.h
-include/IIOP/giop-msg-buffer.h
-include/IIOP/iiop-encoders.h
-include/IIOP/iiop-endian.h
-include/orb/corba_any_proto.h
-include/orb/orbit_typecode.h
-include/orb/interface_repository.h
+include/libIDL/IDL.h
 include/orb/allocator-defs.h
 include/orb/allocators.h
 include/orb/cdr.h
-include/orb/corba_context.h
-include/orb/dii.h
-include/orb/dynany.h
-include/orb/env.h
-include/orb/iop.h
-include/orb/ir.h
-include/orb/options.h
-include/orb/orb.h
-include/orb/orbit.h
-include/orb/orbit_config.h
-include/orb/orbit_types.h
-include/orb/poa.h
-include/orb/sequences.h
-include/orb/typecode.h
 include/orb/corba_any.h
+include/orb/corba_any_proto.h
 include/orb/corba_any_type.h
 include/orb/corba_basic_sequences_type.h
+include/orb/corba_context.h
 include/orb/corba_env.h
 include/orb/corba_env_type.h
 include/orb/corba_object.h
@@ -85,18 +50,54 @@ include/orb/corba_sequences.h
 include/orb/corba_sequences_type.h
 include/orb/corba_typecode.h
 include/orb/corba_typecode_type.h
+include/orb/dii.h
+include/orb/dynany.h
+include/orb/env.h
+include/orb/interface_repository.h
+include/orb/iop.h
+include/orb/ir.h
+include/orb/options.h
+include/orb/orb.h
+include/orb/orbit.h
+include/orb/orbit_config.h
 include/orb/orbit_object.h
 include/orb/orbit_object_type.h
 include/orb/orbit_poa.h
 include/orb/orbit_poa_type.h
+include/orb/orbit_typecode.h
+include/orb/orbit_types.h
+include/orb/poa.h
+include/orb/sequences.h
+include/orb/typecode.h
 include/orbit-idl2.h
 @unexec install-info --delete %D/info/libIDL.info %D/info/dir
 info/libIDL.info
 @exec install-info %D/info/libIDL.info %D/info/dir
+lib/libIDL-0.6.so.0.0
+lib/libIDL.a
+lib/libIDL.la
+lib/libIDLConf.sh
+lib/libIIOP.a
+lib/libIIOP.la
+lib/libIIOP.so.5.1
+lib/libORBit.a
+lib/libORBit.la
+lib/libORBit.so.5.1
+lib/libORBitCosNaming.a
+lib/libORBitCosNaming.la
+lib/libORBitCosNaming.so.5.1
+lib/libORBitutil.a
+lib/libORBitutil.la
+lib/libORBitutil.so.5.1
+lib/libname-server.a
+lib/liborbit-c-backend.a
+lib/libpopt.a
+lib/libpopt.la
+lib/libpopt.so.0.0
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
+@dirrm include/orb
 @dirrm include/libIDL
 @dirrm include/ORBitutil
 @dirrm include/ORBitservices
 @dirrm include/IIOP
-@dirrm include/orb