From e0a8882f583925f8d3af109a2b5859ffe3eebb29 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 25 Nov 2006 18:35:45 +0000
Subject: [PATCH] use BUILD_PKGPATH

---
 x11/qt3/Makefile | 16 ++++------------
 x11/qt4/Makefile |  6 +++---
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index ed657c95d3e..1c99f4a3cf2 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2006/11/20 20:41:00 espie Exp $
+# $OpenBSD: Makefile,v 1.67 2006/11/25 18:35:45 espie Exp $
 # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
 
 COMMENT-main=		"C++ X11 GUI toolkit"
@@ -107,14 +107,6 @@ LIB_DEPENDS=
 BUILD_DEPENDS=::graphics/jpeg
 BUILD_DEPENDS=::print/cups
 
-e=
-.if ${FLAVOR:L:Mno_mysql}
-e:=$e,no_mysql
-.endif
-.if ${FLAVOR:L:Mno_postgresql}
-e:=$e,no_postgresql
-.endif
-
 .if !empty(FLAVOR:L:Mno_mysql)
 CONFIGURE_ARGS+=-no-sql-mysql
 .else
@@ -146,17 +138,17 @@ WANTLIB-main=		${WANTLIB} pthread stdc++ c
 
 
 LIB_DEPENDS-mysql=	${LIB_DEPENDS} \
-			qt-mt.>=3::x11/qt3$e \
+			qt-mt.>=3::${BUILD_PKGPATH} \
 			mysqlclient::databases/mysql
 
 
 LIB_DEPENDS-postgresql=	${LIB_DEPENDS} \
-			qt-mt.>=3::x11/qt3$e \
+			qt-mt.>=3::${BUILD_PKGPATH} \
 			pq.>=2:postgresql-client-*:databases/postgresql
 
 
 LIB_DEPENDS-examples=	${LIB_DEPENDS} \
-			qt-mt.>=3::x11/qt3$e
+			qt-mt.>=3::${BUILD_PKGPATH} \
 WANTLIB-examples=	${WANTLIB} pthread stdc++ c
 
 
diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile
index ecb7e6c5ad9..35529502442 100644
--- a/x11/qt4/Makefile
+++ b/x11/qt4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2006/11/21 22:40:31 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2006/11/25 18:35:45 espie Exp $
 
 COMMENT-main=		"C++ X11 GUI toolkit"
 COMMENT-examples=	"examples for qt4"
@@ -128,7 +128,7 @@ commonLIB_DEPENDS=	png.>=2::graphics/png \
 			dbus-1::x11/dbus
 
 sqlWANTLIB=		m z
-sqlLIB_DEPENDS= 	QtCore.>=4,QtSql::x11/qt4
+sqlLIB_DEPENDS= 	QtCore.>=4,QtSql::${BUILD_PKGPATH}
 
 
 LIB_DEPENDS-main=	${LIB_DEPENDS} ${commonLIB_DEPENDS} \
@@ -160,7 +160,7 @@ WANTLIB-sqlite=		${WANTLIB} ${sqlWANTLIB}
 
 
 LIB_DEPENDS-examples=	${LIB_DEPENDS} ${commonLIB_DEPENDS} \
-			QtDesigner,QtCore.>=4,QtGui,QtNetwork,QtOpenGL,QtSql,QtXml,QtSvg,QtTest,Qt3Support,QtAssistantClient,QtDBus::x11/qt4
+			QtDesigner,QtCore.>=4,QtGui,QtNetwork,QtOpenGL,QtSql,QtXml,QtSvg,QtTest,Qt3Support,QtAssistantClient,QtDBus::${BUILD_PKGPATH}
 WANTLIB-examples=	${WANTLIB} ${commonWANTLIB}