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/pwm/Makefile         | 6 +++---
 wm/pwm/distinfo         | 4 ++--
 wm/pwm/patches/patch-ag | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'wm/pwm')

diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index 2f04fa99fdd..b5c11b3e9a3 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/01/31 04:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:36 jlam Exp $
 #
 
 DISTNAME=	pwm-1.0
@@ -9,7 +9,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.students.tut.fi/~tuomov/pwm/
 COMMENT=	Window manager that frames multiple client windows in a single frame
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 USE_GMAKE=		YES
 MAKE_ENV+=		SYSCONFDIR="${PKG_SYSCONFDIR}"
 
@@ -29,6 +30,5 @@ SUPPORT_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
 post-install:
 	${RM} -f ${EGDIR}/sample.conf
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/pwm/distinfo b/wm/pwm/distinfo
index a31ec421cdd..188cb9cf0b8 100644
--- a/wm/pwm/distinfo
+++ b/wm/pwm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/01/31 04:07:59 jlam Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 21:51:36 jlam Exp $
 
 SHA1 (pwm-1.0.tar.gz) = 79c708a2a6260a06bc8dc586110578bf23aa01e7
 Size (pwm-1.0.tar.gz) = 93239 bytes
@@ -8,5 +8,5 @@ SHA1 (patch-ac) = 53b2d849539a533ba03ad18ec2f1831177a8c892
 SHA1 (patch-ad) = ce5e61f7c4011366708b4a7f0b7f2f575def1867
 SHA1 (patch-ae) = 66aab44974a3076fdf72cdbf7b32c9281ff6b04b
 SHA1 (patch-af) = 58d7a96776487f0356120775084fc7d616187fde
-SHA1 (patch-ag) = f60d81c0f92fdff44e50c73b3e7bed57071cfd8c
+SHA1 (patch-ag) = c2f75054ac2d1daffb5ab40a8f4448d72e5bc5ea
 SHA1 (patch-ah) = a2ad468be06120abf44790e237aba8c003e61557
diff --git a/wm/pwm/patches/patch-ag b/wm/pwm/patches/patch-ag
index b8943876709..5bec063fb62 100644
--- a/wm/pwm/patches/patch-ag
+++ b/wm/pwm/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2001/09/09 03:10:08 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2002/08/25 21:51:36 jlam Exp $
 
 --- system.mk.orig	Sat Jul  1 12:37:50 2000
 +++ system.mk
@@ -16,7 +16,7 @@ $NetBSD: patch-ag,v 1.2 2001/09/09 03:10:08 jlam Exp $
  ##
  
 -X11_PREFIX=/usr/X11R6
-+X11_PREFIX=${BUILDLINK_X11_DIR}
++X11_PREFIX=${X11BASE}
  
  # SunOS/Solaris
  #X11_PREFIX=/usr/openwin
-- 
cgit v1.2.3