From 4bfcc34161358d51d868f816c923eb93f927a412 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 25 Aug 2002 21:50:52 +0000
Subject: Merge packages from the buildlink2 branch back into the main trunk
 that have been converted to USE_BUILDLINK2.

---
 x11/xteddy2/Makefile         | 11 ++++++-----
 x11/xteddy2/distinfo         |  3 +--
 x11/xteddy2/patches/patch-ad | 13 -------------
 3 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 x11/xteddy2/patches/patch-ad

(limited to 'x11/xteddy2')

diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 112fe88727d..ab63bc0c53d 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/03/13 17:38:06 fredb Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/25 21:52:58 jlam Exp $
 
 DISTNAME=	xteddy-2.0.1
 PKGREVISION=	1
@@ -11,8 +11,9 @@ COMMENT=	Teddy bear for your desktop
 
 CONFLICT+=	xteddy-1.*
 
-USE_BUILDLINK_ONLY=	yes
-GNU_CONFIGURE=		yes
+USE_BUILDLINK2=	yes
+USE_X11=	yes
+GNU_CONFIGURE=	yes
 
 pre-configure:
 	files="configure xteddy_test xtoys";				\
@@ -26,6 +27,6 @@ pre-configure:
 		${RM} -f $${file}.fixme;				\
 	done
 
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/imlib/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy2/distinfo b/x11/xteddy2/distinfo
index 75c258cbfc9..b279a4caf30 100644
--- a/x11/xteddy2/distinfo
+++ b/x11/xteddy2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/08/23 04:58:04 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:52:58 jlam Exp $
 
 SHA1 (xteddy-2.0.1.tar.gz) = 371810d7a509cbf6ffd3a4d94c87412ae68022d8
 Size (xteddy-2.0.1.tar.gz) = 348055 bytes
 SHA1 (patch-aa) = 69425a7ccae41c7852c2ccfed7d029a7b93ada6c
 SHA1 (patch-ab) = af66f8f31baf8581b7b9a115eab6f513cd0c5e5e
 SHA1 (patch-ac) = e1e5f5e716f70355cb092e726b0400d15601fd96
-SHA1 (patch-ad) = 3e58077f548cfceecc673d45c8d4ae1fa1d9c171
diff --git a/x11/xteddy2/patches/patch-ad b/x11/xteddy2/patches/patch-ad
deleted file mode 100644
index d8afaabaf3f..00000000000
--- a/x11/xteddy2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/08/23 04:58:04 jlam Exp $
-
---- Makefile.in.orig	Mon Aug  2 02:11:08 1999
-+++ Makefile.in
-@@ -69,7 +69,7 @@
- bin_PROGRAMS = xteddy
- 
- xteddy_SOURCES = xteddy.c
--LIBS = `imlib-config --libs`
-+LIBS = `${IMLIB_CONFIG} --libs`
- man_MANS = xteddy.1
- bin_SCRIPTS = xtoys xteddy_test
- 
-- 
cgit v1.2.3