Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

6 files changed, 49 insertions, 23 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 804ca8c2992..dfc48b9f672 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2002/07/18 02:19:24 rh Exp $
+# $NetBSD: Makefile,v 1.78 2002/08/25 18:39:30 jlam Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -11,7 +11,6 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		high-performance CORBA ORB with support for the C language
 
 DEPENDS+=		gindent-[0-9]*:../../devel/gindent
-
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
 USE_GMAKE=		YES
@@ -21,7 +20,7 @@ LIBTOOL_OVERRIDE+=	${WRKSRC}/popt/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libIDL/libtool
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
@@ -34,8 +33,9 @@ INFO_FILES=		libIDL.info
 
 AUTOMAKE_OVERRIDE=	NO	# Otherwise breaks 1.5 arm32
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/glib/buildlink.mk"
-.include "../../security/tcp_wrappers/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
+
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ORBit/buildlink2.mk b/net/ORBit/buildlink2.mk
new file mode 100644
index 00000000000..efa78030933
--- /dev/null
+++ b/net/ORBit/buildlink2.mk
@@ -0,0 +1,38 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:30 jlam Exp $
+
+.if !defined(ORBIT_BUILDLINK2_MK)
+ORBIT_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		ORBit
+BUILDLINK_DEPENDS.ORBit?=	ORBit>=0.5.12
+BUILDLINK_PKGSRCDIR.ORBit?=	../../net/ORBit
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.ORBit=ORBit
+BUILDLINK_PREFIX.ORBit_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.ORBit+=	include/libIDL-1.0/libIDL/*
+BUILDLINK_FILES.ORBit+=	include/orbit-1.0/IIOP/*
+BUILDLINK_FILES.ORBit+=	include/orbit-1.0/ORBitservices/*
+BUILDLINK_FILES.ORBit+=	include/orbit-1.0/ORBitutil/*
+BUILDLINK_FILES.ORBit+=	include/orbit-1.0/orb/*
+BUILDLINK_FILES.ORBit+=	include/orbit-1.0/orbit-idl2.h
+BUILDLINK_FILES.ORBit+=	lib/libIDLConf.sh
+BUILDLINK_FILES.ORBit+=	lib/libIDL.*
+BUILDLINK_FILES.ORBit+=	lib/libIIOP.*
+BUILDLINK_FILES.ORBit+=	lib/libORBit.*
+BUILDLINK_FILES.ORBit+=	lib/libORBitCosNaming.*
+BUILDLINK_FILES.ORBit+=	lib/libORBitutil.*
+BUILDLINK_FILES.ORBit+=	lib/libname-server.*
+BUILDLINK_FILES.ORBit+=	lib/liborbit-c-backend.*
+
+# The ORBit headers should be found at the same location as for libxml.
+#BUILDLINK_TRANSFORM.ORBit=    -e "s|/include/orbit-1.0/|/include/|g"
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	ORBit-buildlink
+
+ORBit-buildlink: _BUILDLINK_USE
+
+.endif	# ORBIT_BUILDLINK2_MK
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index 8b293f28a50..7343fb73e27 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2002/07/18 02:19:24 rh Exp $
+$NetBSD: distinfo,v 1.12 2002/08/25 18:39:31 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) = cd1f6d8848ad11927717574dada0b164713aab23
+SHA1 (patch-ac) = cc073ac41f69671fe10be3975cb0753e163a10dd
 SHA1 (patch-ad) = 688920ba423aa2994d9e2e6540f8738305cb7fd9
 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb
 SHA1 (patch-af) = b88b26b8fe7d42f267c6761edc3e3b8250bd14fb
diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac
index ef46f983672..cce201f4f1f 100644
--- a/net/ORBit/patches/patch-ac
+++ b/net/ORBit/patches/patch-ac
@@ -1,19 +1,7 @@
-$NetBSD: patch-ac,v 1.10 2002/04/25 12:17:05 agc Exp $
+$NetBSD: patch-ac,v 1.11 2002/08/25 18:39:31 jlam Exp $
 
 --- configure.orig	Wed Mar 20 14:45:48 2002
 +++ configure	Thu Apr 25 12:42:56 2002
-@@ -7189,9 +7189,9 @@
- 
-   rm -f conf.glibtest
- 
--GMODULE_CFLAGS=`glib-config --cflags gmodule`
-+GMODULE_CFLAGS=`$GLIB_CONFIG --cflags gmodule`
- 
--GMODULE_LIBS=`glib-config --libs gmodule`
-+GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
- 
- for ac_prog in 'bison -y' byacc
- do
 @@ -8636,6 +8636,10 @@
  	THEFILE="`echo $I | sed -e 's,^-L,,'`"
  	echo "From $I, checking in dir $THEFILE for libwrap.so" 1>&5
diff --git a/net/ORBit/patches/patch-ah b/net/ORBit/patches/patch-ah
index 052cb071845..790a964b9d9 100644
--- a/net/ORBit/patches/patch-ah
+++ b/net/ORBit/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.6 2002/07/18 02:19:25 rh Exp $
+$NetBSD: patch-ah,v 1.7 2002/08/25 18:39:32 jlam Exp $
 
 --- ORBit.pc.in.orig	Sat Sep 30 12:09:43 2000
 +++ ORBit.pc.in
diff --git a/net/ORBit/patches/patch-aj b/net/ORBit/patches/patch-aj
index a95f81fdab0..b6d1608c4e8 100644
--- a/net/ORBit/patches/patch-aj
+++ b/net/ORBit/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.8 2002/07/18 02:19:25 rh Exp $
+$NetBSD: patch-aj,v 1.9 2002/08/25 18:39:32 jlam Exp $
 
 --- libIDL/libIDL.pc.in.orig	Sat Sep 30 12:09:43 2000
 +++ libIDL/libIDL.pc.in