From b6b94f0c669b1ef2a824c69854900b68ec821681 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.

---
 wm/fluxbox/Makefile         | 5 ++---
 wm/fluxbox/distinfo         | 2 +-
 wm/fluxbox/patches/patch-ab | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'wm/fluxbox')

diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 1eabd83a27a..d04a80654ec 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/04/22 18:39:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:31 jlam Exp $
 #
 
 DISTNAME=	fluxbox-0.1.8
@@ -9,7 +9,7 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://fluxbox.sourceforge.net/
 COMMENT=	Window Manager for X based on Blackbox
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 
@@ -21,5 +21,4 @@ GCC_VERSION!=		gcc --version
 .include "../../lang/gcc/Makefile.gcc"
 .endif
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 26698099613..07f7c667c42 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/08/11 04:43:14 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:51:31 jlam Exp $
 
 SHA1 (fluxbox-0.1.8.tar.gz) = 48c010631d24ed3cf9620169cd1203c2cc7cb0b3
 Size (fluxbox-0.1.8.tar.gz) = 437047 bytes
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
index 8708122d3a0..06ec5836dce 100644
--- a/wm/fluxbox/patches/patch-ab
+++ b/wm/fluxbox/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/08/11 13:15:26 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 21:51:32 jlam Exp $
 
 --- src/Makefile.in.orig	Sat Apr 20 06:11:45 2002
 +++ src/Makefile.in
-- 
cgit v1.2.3