Untangle the QT database plugin ports.

PR: ports/64393

3 files changed, 26 insertions, 48 deletions

diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile
index a66aab38c3eb..5fd5d0358f59 100644
--- a/databases/qt-mysql-plugin/Makefile
+++ b/databases/qt-mysql-plugin/Makefile
@@ -6,11 +6,34 @@
 # $FreeBSD$
 #
 
+PORTNAME=	qt-${DB}-plugin
+PORTVERSION=	3.3.1
+CATEGORIES=	databases
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/      \
+		ftp://ftp.silug.org/pub/qt/             \
+		ftp://ftp.bero.org/pub/qt/              \
+		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
+DISTNAME=	qt-x11-free-${PORTVERSION}
+DIST_SUBDIR=	KDE
+
 MAINTAINER=	kay_lehmann@web.de
 COMMENT=	A plugin for QT to connect to MySQL-Databases
 
-USE_MYSQL=	yes
+DB=		mysql
 
-DB?=		mysql
+LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
+
+USE_MYSQL=	yes
+USE_BZIP2=	yes
+PLUGIN=		plugins/src/sqldrivers/${DB}
+DRIVER=		src/sql/drivers/${DB}
+EXTRACT_AFTER_ARGS?=| ${TAR} -xf - ${DISTNAME}/${PLUGIN} \
+		${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache
+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 "../qt-mysql-plugin/Makefile.dbplugin"
+.include <bsd.port.mk>
diff --git a/databases/qt-mysql-plugin/Makefile.dbplugin b/databases/qt-mysql-plugin/Makefile.dbplugin
deleted file mode 100644
index f29303b8faab..000000000000
--- a/databases/qt-mysql-plugin/Makefile.dbplugin
+++ /dev/null
@@ -1,29 +0,0 @@
-PORTNAME=	qt-${DB}-plugin
-PORTVERSION=	3.3.1
-CATEGORIES=	databases
-DISTNAME=	qt-x11-free-${PORTVERSION}
-MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/      \
-		ftp://ftp.silug.org/pub/qt/             \
-		ftp://ftp.bero.org/pub/qt/              \
-		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
-DIST_SUBDIR=	KDE
-
-LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
-
-USE_BZIP2=	yes
-PLUGIN=		plugins/src/sqldrivers/${DB}
-DRIVER=		src/sql/drivers/${DB}
-EXTRACT_AFTER_ARGS?=| ${TAR} -xf - ${DISTNAME}/${PLUGIN} \
-		${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache
-MAKEFILE=	${FILESDIR}/Makefile.bsd
-MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-MASTERDIR=	${PORTSDIR}/databases/qt-mysql-plugin
-
-USE_X_PREFIX=	yes
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/plugins/sqldrivers
-PLIST_SUB=	DB=${DB}
-
-.include <bsd.port.mk>
diff --git a/databases/qt-mysql-plugin/files/Makefile.bsd b/databases/qt-mysql-plugin/files/Makefile.bsd
index 93b6d8ae9e75..12bc68099917 100644
--- a/databases/qt-mysql-plugin/files/Makefile.bsd
+++ b/databases/qt-mysql-plugin/files/Makefile.bsd
@@ -2,27 +2,11 @@ SHLIB_NAME=	libqsql${DB}.so
 
 VPATH=		${PLUGIN}:${DRIVER}
 CXXFLAGS+=	-I${PLUGIN} -I${DRIVER} \
-		-I${LOCALBASE}/firebird/include \
 		-I${LOCALBASE}/include/mysql \
-		-I${LOCALBASE}/include/postgresql/server \
 		-I${LOCALBASE}/include -I${X11BASE}/include \
 		${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
-.if ${DB}==ibase
-LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/firebird/lib ${PTHREAD_LIBS} -lqt-mt -lgds
-SRCS=		qsql_${DB}.cpp main.cpp
-.elif ${DB}==mysql
 LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lqt-mt -lmysqlclient 
 SRCS=		qsql_${DB}.cpp main.cpp
-.elif ${DB}==odbc
-LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lodbc
-SRCS=		qsql_${DB}.cpp main.cpp
-.elif ${DB}==psql
-LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lpq
-SRCS=		qsql_${DB}.cpp main.cpp
-.elif ${DB}==sqlite
-LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lsqlite
-SRCS=		qsql_${DB}.cpp smain.cpp
-.endif
 
 LIBDIR=		${PREFIX}/lib/plugins/sqldrivers