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.

8 files changed, 51 insertions, 9 deletions

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 8fb5801fc3c..dbe4ac35539 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2002/08/08 16:17:07 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2002/08/25 18:38:27 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -16,7 +16,7 @@ COMMENT=		Some useful routines for C programming
 
 CONFLICTS=		gtk+-1.0.*
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -77,6 +77,6 @@ test: build
 	cd ${WRKSRC} &&  ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
 		tee ${WRKDIR}/check.log
 
-.include "../../mk/pthread.buildlink.mk"
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index a07322c99f5..eaa09d11d0f 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.17 2002/08/01 05:48:08 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.18 2002/08/25 18:38:27 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
diff --git a/devel/glib/buildlink2.mk b/devel/glib/buildlink2.mk
new file mode 100644
index 00000000000..7de4241d369
--- /dev/null
+++ b/devel/glib/buildlink2.mk
@@ -0,0 +1,42 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:28 jlam Exp $
+
+.if !defined(GLIB_BUILDLINK2_MK)
+GLIB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		glib
+BUILDLINK_DEPENDS.glib?=	glib>=1.2.8
+BUILDLINK_PKGSRCDIR.glib?=	../../devel/glib
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.glib=glib
+BUILDLINK_PREFIX.glib_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.glib=	include/glib/glib-1.2/*
+BUILDLINK_FILES.glib+=	include/glib/*
+BUILDLINK_FILES.glib+=	lib/glib/*/*
+BUILDLINK_FILES.glib+=	lib/libglib.*
+BUILDLINK_FILES.glib+=	lib/libgmodule.*
+BUILDLINK_FILES.glib+=	lib/libgthread.*
+
+USE_PTHREAD=		native pth
+
+.include "../../mk/pthread.buildlink2.mk"
+
+BUILDLINK_TARGETS+=	glib-buildlink
+BUILDLINK_TARGETS+=	glib-fix-glib-h
+
+glib-buildlink: _BUILDLINK_USE
+
+glib-fix-glib-h:
+.if exists(/usr/include/sys/null.h)
+	@cd ${BUILDLINK_DIR}/include/glib/glib-1.2;			\
+	if ${GREP} "^\#define.NULL" glib.h > /dev/null; then		\
+		${ECHO} WARNING\!;					\
+		${ECHO} The installed glib package is broken, please rebuild it from source.;\
+		${ECHO} For more information, see PR 14150.;		\
+		${SED}  -e "s|^#define.NULL.*|#include <sys/null.h>|"	\
+			glib.h > glib.h.fixed;				\
+		${RM} glib.h;						\
+		${MV} glib.h.fixed glib.h;				\
+	fi
+.endif
+
+.endif	# GLIB_BUILDLINK2_MK
diff --git a/devel/glib/distinfo b/devel/glib/distinfo
index 7a6dccd83e1..3a15affc933 100644
--- a/devel/glib/distinfo
+++ b/devel/glib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/07/19 03:48:14 mycroft Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:38:28 jlam Exp $
 
 SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa
 Size (glib-1.2.10.tar.gz) = 421480 bytes
diff --git a/devel/glib/patches/patch-af b/devel/glib/patches/patch-af
index 3da906c31eb..d6405a0d938 100644
--- a/devel/glib/patches/patch-af
+++ b/devel/glib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2002/07/18 02:19:30 rh Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 18:38:29 jlam Exp $
 
 --- glib.pc.in.orig	Thu Nov 30 11:15:33 2000
 +++ glib.pc.in
diff --git a/devel/glib/patches/patch-ag b/devel/glib/patches/patch-ag
index 95aa5e73613..60d1e9168cf 100644
--- a/devel/glib/patches/patch-ag
+++ b/devel/glib/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2002/07/18 02:19:30 rh Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/25 18:38:29 jlam Exp $
 
 --- gmodule.pc.in.orig	Thu Nov 30 11:15:33 2000
 +++ gmodule.pc.in
diff --git a/devel/glib/patches/patch-ah b/devel/glib/patches/patch-ah
index a6015873083..c58f0b7da08 100644
--- a/devel/glib/patches/patch-ah
+++ b/devel/glib/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2002/07/18 02:19:31 rh Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 18:38:29 jlam Exp $
 
 --- gthread.pc.in.orig	Thu Nov 30 11:15:33 2000
 +++ gthread.pc.in
diff --git a/devel/glib/patches/patch-ai b/devel/glib/patches/patch-ai
index 1f4e66ae51e..dfbd421cc8d 100644
--- a/devel/glib/patches/patch-ai
+++ b/devel/glib/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2002/07/19 03:48:14 mycroft Exp $
+$NetBSD: patch-ai,v 1.3 2002/08/25 18:38:30 jlam Exp $
 
 --- gthread/testgthread.c.orig	Fri Jul 19 03:43:50 2002
 +++ gthread/testgthread.c	Fri Jul 19 03:42:15 2002