bl3ify.

4 files changed, 51 insertions, 10 deletions

diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index 1b227d5f500..24b7aed10ac 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/13 16:13:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/13 17:02:08 jmmv Exp $
 #
 
 DISTNAME=		at-spi-1.3.9
@@ -12,7 +12,7 @@ COMMENT=		Assistive Technology Service Provider Interface
 
 DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
@@ -25,11 +25,11 @@ LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/cspi-1.0.pc.in
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/libspi-1.0.pc.in
 
-.include "../../devel/atk/buildlink2.mk"
-.include "../../devel/gail/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../textproc/intltool/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gail/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
new file mode 100644
index 00000000000..9ccf1027dd3
--- /dev/null
+++ b/devel/at-spi/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/13 17:02:09 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use at-spi.
+#
+# This file was created automatically using createbuildlink-3.0.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+AT_SPI_BUILDLINK3_MK:=	${AT_SPI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	at-spi
+.endif
+
+.if !empty(AT_SPI_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			at-spi
+BUILDLINK_DEPENDS.at-spi?=		at-spi>=1.3.8nb1
+BUILDLINK_PKGSRCDIR.at-spi?=		../../devel/at-spi
+
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gail/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.endif # AT_SPI_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/at-spi/distinfo b/devel/at-spi/distinfo
index 9e8d3399a0e..6a17603fc07 100644
--- a/devel/at-spi/distinfo
+++ b/devel/at-spi/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2004/02/13 16:13:27 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/02/13 17:02:09 jmmv Exp $
 
 SHA1 (at-spi-1.3.9.tar.bz2) = cb410699bc23cbe98adcd7bf3d1ea2b6cb4ba9ed
 Size (at-spi-1.3.9.tar.bz2) = 409343 bytes
 SHA1 (patch-aa) = 8eb699cf040cd859f3af61b294cdce6b4fb97739
+SHA1 (patch-ab) = 0baa4a3cb335e912159990def28454bbc5ef1cf6
diff --git a/devel/at-spi/patches/patch-ab b/devel/at-spi/patches/patch-ab
new file mode 100644
index 00000000000..9b868db6f65
--- /dev/null
+++ b/devel/at-spi/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2004/02/13 17:02:09 jmmv Exp $
+
+--- configure.orig	2003-12-05 15:24:20.000000000 +0100
++++ configure
+@@ -20366,7 +20366,6 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variab
+ 
+ 
+ 
+-CFLAGS="$CFLAGS $X_LIBS"
+ echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5
+ echo $ECHO_N "checking for XTestFakeKeyEvent in -lXtst... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then