Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

5 files changed, 31 insertions, 4 deletions

diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 964f099b3d3..8305b9a920b 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/07/12 23:38:44 mycroft Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 19:22:27 jlam Exp $
 
 DISTNAME=		gal-0.19.3
 CATEGORIES=		gnome devel
diff --git a/devel/gal/PLIST b/devel/gal/PLIST
index c531b0b3167..a6250b98c27 100644
--- a/devel/gal/PLIST
+++ b/devel/gal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/07/12 23:38:44 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 19:22:27 jlam Exp $
 include/gal/util/e-util.h
 include/gal/util/e-xml-utils.h
 include/gal/util/e-cache.h
diff --git a/devel/gal/buildlink2.mk b/devel/gal/buildlink2.mk
new file mode 100644
index 00000000000..7f06d3b3a8b
--- /dev/null
+++ b/devel/gal/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:27 jlam Exp $
+
+.if !defined(GAL_BUILDLINK2_MK)
+GAL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		gal
+BUILDLINK_DEPENDS.gal?=		gal>=0.19nb1
+BUILDLINK_PKGSRCDIR.gal?=	../../devel/gal
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gal=gal
+BUILDLINK_PREFIX.gal_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gal+=		include/gal/*
+BUILDLINK_FILES.gal+=		include/gal/*/*
+BUILDLINK_FILES.gal+=		lib/libgal.*
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/bonobo/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libglade/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
+.include "../../sysutils/gnome-vfs/buildlink2.mk"
+
+BUILDLINK_TARGETS+=		gal-buildlink
+
+gal-buildlink: _BUILDLINK_USE
+
+.endif	# GAL_BUILDLINK2_MK
diff --git a/devel/gal/distinfo b/devel/gal/distinfo
index 19727bc47c3..3738d1b911e 100644
--- a/devel/gal/distinfo
+++ b/devel/gal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/07/12 23:38:44 mycroft Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 19:22:27 jlam Exp $
 
 SHA1 (gal-0.19.3.tar.bz2) = db4a09f01f5d2d1f3c2c3466988f3c42cc0d2073
 Size (gal-0.19.3.tar.bz2) = 903527 bytes
diff --git a/devel/gal/patches/patch-aa b/devel/gal/patches/patch-aa
index 7b6ffc6c922..5a310e89220 100644
--- a/devel/gal/patches/patch-aa
+++ b/devel/gal/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2002/07/12 23:38:45 mycroft Exp $
+$NetBSD: patch-aa,v 1.9 2002/08/25 19:22:28 jlam Exp $
 
 --- configure.orig	Thu Jun 20 04:40:53 2002
 +++ configure	Wed Jul 10 22:54:42 2002