From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 19 Apr 2008 17:56:05 +0000
Subject: - Remove unneeded dependency from gtk12/gtk20 [1] - Remove
 USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support
 in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB
 - Remove unneeded USE_GCC 3.4+

Thanks to all Helpers:
	Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
	ehaupt, nox, itetcu, flz, pav

PR:		116263
Tested on:	pointyhat
Approved by:	portmgr (pav)
---
 databases/qt-sqlite-plugin/Makefile           | 3 +--
 databases/qt-sqlite-plugin/files/Makefile.bsd | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'databases/qt-sqlite-plugin')

diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile
index d61bf2ba7082..5e57c5b8f57e 100644
--- a/databases/qt-sqlite-plugin/Makefile
+++ b/databases/qt-sqlite-plugin/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qt-${DB}-plugin
 PORTVERSION=	3.3.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
@@ -33,7 +33,6 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
-USE_X_PREFIX=	yes
 PLIST_SUB=	DB=${DB}
 
 .include <bsd.port.mk>
diff --git a/databases/qt-sqlite-plugin/files/Makefile.bsd b/databases/qt-sqlite-plugin/files/Makefile.bsd
index c1c9ad04a198..cddbeca8c4fb 100644
--- a/databases/qt-sqlite-plugin/files/Makefile.bsd
+++ b/databases/qt-sqlite-plugin/files/Makefile.bsd
@@ -2,9 +2,9 @@ SHLIB_NAME=	libqsql${DB}.so
 
 VPATH=		${PLUGIN}:${DRIVER}
 CXXFLAGS+=	-I${PLUGIN} -I${DRIVER} \
-		-I${LOCALBASE}/include -I${X11BASE}/include \
+		-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
-LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lsqlite
+LDADD=		-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lsqlite
 SRCS=		qsql_${DB}.cpp smain.cpp
 
 LIBDIR=		${PREFIX}/lib/plugins/sqldrivers
-- 
cgit v1.2.3