From bb9b02b84b8c8bd96df0fabd15989b92d7f186cf Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Tue, 26 Jun 2001 21:01:59 +0000
Subject: Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.

---
 wm/bbkeys-qt/Makefile         |  9 +++++----
 wm/bbkeys-qt/distinfo         |  4 ++--
 wm/bbkeys-qt/patches/patch-aa | 17 ++++++++++-------
 3 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'wm')

diff --git a/wm/bbkeys-qt/Makefile b/wm/bbkeys-qt/Makefile
index 2c27f6a223b..4182d8a668c 100644
--- a/wm/bbkeys-qt/Makefile
+++ b/wm/bbkeys-qt/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/10 20:00:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/26 21:01:59 jlam Exp $
 #
 
-PKGNAME=	bbkeys-qt-1.2
+.include "../bbkeys/Makefile.common"
 
+PKGNAME=	bbkeys-qt-1.2
 COMMENT=	Qt-based configuration utility for bbkeys
 
-DEPENDS+=       qt2-[0-9]*:../../x11/qt2
 DEPENDS+=	bbkeys-0.3.5:../bbkeys
 
 WRKSRC=		${WRKDIR}/bbkeys-0.3.5/bbkeysconf-1.2
 
-.include "../bbkeys/Makefile.common"
+.include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbkeys-qt/distinfo b/wm/bbkeys-qt/distinfo
index 24d38691669..d4658ab79b7 100644
--- a/wm/bbkeys-qt/distinfo
+++ b/wm/bbkeys-qt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:43 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/26 21:01:59 jlam Exp $
 
 SHA1 (bbkeys-0.3.5.tar.gz) = 1c0e74db16b940e0fbcda088a11a9c9af905a1e8
 Size (bbkeys-0.3.5.tar.gz) = 102703 bytes
-SHA1 (patch-aa) = efd115508ea83d30a72fba9a5c7e1f9d583d5fd0
+SHA1 (patch-aa) = d9c6a4aa734c6405e89e0e8bd2b138fa1781e673
diff --git a/wm/bbkeys-qt/patches/patch-aa b/wm/bbkeys-qt/patches/patch-aa
index c3a100c6271..a4b42fd1638 100644
--- a/wm/bbkeys-qt/patches/patch-aa
+++ b/wm/bbkeys-qt/patches/patch-aa
@@ -1,23 +1,26 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/10 20:00:43 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/06/26 21:02:00 jlam Exp $
 
---- Makefile.orig	Thu Sep 28 22:30:22 2000
+--- Makefile.orig	Tue Jun 26 16:48:09 2001
 +++ Makefile
-@@ -1,11 +1,9 @@
+@@ -1,11 +1,11 @@
 -CXX=		/usr/bin/g++
 -QTDIR =		/usr/lib/qt2
 -MOC =		/usr/bin/moc
 -LIBS =		-L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib -lqt -lX11
-+QTDIR =		$(X11BASE)/qt2
+-CXXFLAGS =	-g -I/usr/include -I$(QTDIR)/include -I/usr/X11R6/include
++#CXX=		/usr/bin/g++
++#QTDIR =		/usr/lib/qt2
 +MOC =		$(QTDIR)/bin/moc
-+LIBS =		-L$(QTDIR)/lib -L/usr/lib -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lqt -lX11 -ljpeg -Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${QTDIR}/lib
- CXXFLAGS =	-g -I/usr/include -I$(QTDIR)/include -I/usr/X11R6/include
++LIBS =		${LDFLAGS} -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lX11 -ljpeg
++CXXFLAGS +=	-g -I$(QTDIR)/include -I${X11BASE}/include
  
  TARGET =	bbkeysconf
 -PREFIX = /usr/local/bin
++#PREFIX = /usr/local/bin
  OBJECTS =	gui.o main.o myapplication.o
  SOURCES = 	gui.cc main.cc myapplication.cc
  MOCSRC = 	gui.hh
-@@ -37,13 +35,13 @@
+@@ -37,13 +37,13 @@
      if ! test -x $(TARGET) ; then \
         exit; \
      fi; \
-- 
cgit v1.2.3