Untangle the QT database plugin ports.

PR: ports/64393

19 files changed, 208 insertions, 68 deletions

diff --git a/databases/qt-ibase-plugin/Makefile b/databases/qt-ibase-plugin/Makefile
index 489ab5ceef9c..5d795c0e2590 100644
--- a/databases/qt-ibase-plugin/Makefile
+++ b/databases/qt-ibase-plugin/Makefile
@@ -6,13 +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=	kde@freebsd.org
 COMMENT=	A plugin for QT to connect to IBase/Firebird-Databases
 
-LIB_DEPENDS+=	gds:${PORTSDIR}/databases/firebird
-
 DB=		ibase
 
-DESCR=		${PORTSDIR}/databases/qt-ibase-plugin/pkg-descr
+LIB_DEPENDS+=	gds:${PORTSDIR}/databases/firebird \
+		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}"
+USE_X_PREFIX=	yes
+PLIST_SUB=	DB=${DB}
 
-.include "../qt-mysql-plugin/Makefile.dbplugin"
+.include <bsd.port.mk>
diff --git a/databases/qt-ibase-plugin/distinfo b/databases/qt-ibase-plugin/distinfo
new file mode 100644
index 000000000000..4de0a153a14c
--- /dev/null
+++ b/databases/qt-ibase-plugin/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/qt-x11-free-3.3.1.tar.bz2) = 4e599bedfcb3fe389bc7ec921c476432
+SIZE (KDE/qt-x11-free-3.3.1.tar.bz2) = 14397600
diff --git a/databases/qt-ibase-plugin/files/Makefile.bsd b/databases/qt-ibase-plugin/files/Makefile.bsd
new file mode 100644
index 000000000000..6ad2389a0275
--- /dev/null
+++ b/databases/qt-ibase-plugin/files/Makefile.bsd
@@ -0,0 +1,18 @@
+SHLIB_NAME=	libqsql${DB}.so
+
+VPATH=		${PLUGIN}:${DRIVER}
+CXXFLAGS+=	-I${PLUGIN} -I${DRIVER} \
+		-I${LOCALBASE}/firebird/include \
+		-I${LOCALBASE}/include -I${X11BASE}/include \
+		${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
+LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/firebird/lib ${PTHREAD_LIBS} -lqt-mt -lgds
+SRCS=		qsql_${DB}.cpp main.cpp
+
+LIBDIR=		${PREFIX}/lib/plugins/sqldrivers
+
+${LIBDIR}:
+	mkdir -p ${LIBDIR}
+
+beforeinstall:	${LIBDIR}
+
+.include <bsd.lib.mk>
diff --git a/databases/qt-ibase-plugin/pkg-plist b/databases/qt-ibase-plugin/pkg-plist
index c99b046904e8..482facca168e 100644
--- a/databases/qt-ibase-plugin/pkg-plist
+++ b/databases/qt-ibase-plugin/pkg-plist
@@ -1,2 +1,2 @@
-lib/plugins/sqldrivers/libqsqlibase.so
+lib/plugins/sqldrivers/libqsql%%DB%%.so
 @dirrm lib/plugins/sqldrivers
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
 
diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile
index 9ee0b0d6618e..b137074e6d12 100644
--- a/databases/qt-odbc-plugin/Makefile
+++ b/databases/qt-odbc-plugin/Makefile
@@ -6,13 +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=	kde@freebsd.org
 COMMENT=	A plugin for QT to connect to ODBC-compatible databases
 
-LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
-
 DB=		odbc
 
-DESCR=		${PORTSDIR}/databases/qt-odbc-plugin/pkg-descr
+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC \
+		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}"
+USE_X_PREFIX=	yes
+PLIST_SUB=	DB=${DB}
 
-.include "../qt-mysql-plugin/Makefile.dbplugin"
+.include <bsd.port.mk>
diff --git a/databases/qt-odbc-plugin/distinfo b/databases/qt-odbc-plugin/distinfo
new file mode 100644
index 000000000000..4de0a153a14c
--- /dev/null
+++ b/databases/qt-odbc-plugin/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/qt-x11-free-3.3.1.tar.bz2) = 4e599bedfcb3fe389bc7ec921c476432
+SIZE (KDE/qt-x11-free-3.3.1.tar.bz2) = 14397600
diff --git a/databases/qt-odbc-plugin/files/Makefile.bsd b/databases/qt-odbc-plugin/files/Makefile.bsd
new file mode 100644
index 000000000000..22ac3adf2541
--- /dev/null
+++ b/databases/qt-odbc-plugin/files/Makefile.bsd
@@ -0,0 +1,17 @@
+SHLIB_NAME=	libqsql${DB}.so
+
+VPATH=		${PLUGIN}:${DRIVER}
+CXXFLAGS+=	-I${PLUGIN} -I${DRIVER} \
+		-I${LOCALBASE}/include -I${X11BASE}/include \
+		${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
+LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lodbc
+SRCS=		qsql_${DB}.cpp main.cpp
+
+LIBDIR=		${PREFIX}/lib/plugins/sqldrivers
+
+${LIBDIR}:
+	mkdir -p ${LIBDIR}
+
+beforeinstall:	${LIBDIR}
+
+.include <bsd.lib.mk>
diff --git a/databases/qt-odbc-plugin/pkg-plist b/databases/qt-odbc-plugin/pkg-plist
index 3be6c0cb66f8..482facca168e 100644
--- a/databases/qt-odbc-plugin/pkg-plist
+++ b/databases/qt-odbc-plugin/pkg-plist
@@ -1,2 +1,2 @@
-lib/plugins/sqldrivers/libqsqlodbc.so
+lib/plugins/sqldrivers/libqsql%%DB%%.so
 @dirrm lib/plugins/sqldrivers
diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile
index a006bb410822..835ad9cf1aec 100644
--- a/databases/qt-pgsql-plugin/Makefile
+++ b/databases/qt-pgsql-plugin/Makefile
@@ -6,13 +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=	kde@freebsd.org
 COMMENT=	A plugin for QT to connect to PostgreSQL-Databases
 
-LIB_DEPENDS+=	pq:${PORTSDIR}/databases/postgresql7
-
 DB=		psql
 
-DESCR=		${PORTSDIR}/databases/qt-pgsql-plugin/pkg-descr
+LIB_DEPENDS+=	pq:${PORTSDIR}/databases/postgresql7 \
+		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}"
+USE_X_PREFIX=	yes
+PLIST_SUB=	DB=${DB}
 
-.include "../qt-mysql-plugin/Makefile.dbplugin"
+.include <bsd.port.mk>
diff --git a/databases/qt-pgsql-plugin/distinfo b/databases/qt-pgsql-plugin/distinfo
new file mode 100644
index 000000000000..4de0a153a14c
--- /dev/null
+++ b/databases/qt-pgsql-plugin/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/qt-x11-free-3.3.1.tar.bz2) = 4e599bedfcb3fe389bc7ec921c476432
+SIZE (KDE/qt-x11-free-3.3.1.tar.bz2) = 14397600
diff --git a/databases/qt-pgsql-plugin/files/Makefile.bsd b/databases/qt-pgsql-plugin/files/Makefile.bsd
new file mode 100644
index 000000000000..3f3242654fc5
--- /dev/null
+++ b/databases/qt-pgsql-plugin/files/Makefile.bsd
@@ -0,0 +1,18 @@
+SHLIB_NAME=	libqsql${DB}.so
+
+VPATH=		${PLUGIN}:${DRIVER}
+CXXFLAGS+=	-I${PLUGIN} -I${DRIVER} \
+		-I${LOCALBASE}/include/postgresql/server \
+		-I${LOCALBASE}/include -I${X11BASE}/include \
+		${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
+LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lpq
+SRCS=		qsql_${DB}.cpp main.cpp
+
+LIBDIR=		${PREFIX}/lib/plugins/sqldrivers
+
+${LIBDIR}:
+	mkdir -p ${LIBDIR}
+
+beforeinstall:	${LIBDIR}
+
+.include <bsd.lib.mk>
diff --git a/databases/qt-pgsql-plugin/pkg-plist b/databases/qt-pgsql-plugin/pkg-plist
index 7f2eaac3f6de..482facca168e 100644
--- a/databases/qt-pgsql-plugin/pkg-plist
+++ b/databases/qt-pgsql-plugin/pkg-plist
@@ -1,2 +1,2 @@
-lib/plugins/sqldrivers/libqsqlpsql.so
+lib/plugins/sqldrivers/libqsql%%DB%%.so
 @dirrm lib/plugins/sqldrivers
diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile
index e76ac8adffaf..0cef18b57d24 100644
--- a/databases/qt-sqlite-plugin/Makefile
+++ b/databases/qt-sqlite-plugin/Makefile
@@ -6,13 +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=	kde@freebsd.org
 COMMENT=	A plugin for QT to connect to SQLite-Databases
 
-LIB_DEPENDS+=	sqlite:${PORTSDIR}/databases/sqlite
-
 DB=		sqlite
 
-DESCR=		${PORTSDIR}/databases/qt-sqlite-plugin/pkg-descr
+LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33 \
+		sqlite:${PORTSDIR}/databases/sqlite
+
+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-sqlite-plugin/distinfo b/databases/qt-sqlite-plugin/distinfo
new file mode 100644
index 000000000000..4de0a153a14c
--- /dev/null
+++ b/databases/qt-sqlite-plugin/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/qt-x11-free-3.3.1.tar.bz2) = 4e599bedfcb3fe389bc7ec921c476432
+SIZE (KDE/qt-x11-free-3.3.1.tar.bz2) = 14397600
diff --git a/databases/qt-sqlite-plugin/files/Makefile.bsd b/databases/qt-sqlite-plugin/files/Makefile.bsd
new file mode 100644
index 000000000000..c1c9ad04a198
--- /dev/null
+++ b/databases/qt-sqlite-plugin/files/Makefile.bsd
@@ -0,0 +1,17 @@
+SHLIB_NAME=	libqsql${DB}.so
+
+VPATH=		${PLUGIN}:${DRIVER}
+CXXFLAGS+=	-I${PLUGIN} -I${DRIVER} \
+		-I${LOCALBASE}/include -I${X11BASE}/include \
+		${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
+LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lsqlite
+SRCS=		qsql_${DB}.cpp smain.cpp
+
+LIBDIR=		${PREFIX}/lib/plugins/sqldrivers
+
+${LIBDIR}:
+	mkdir -p ${LIBDIR}
+
+beforeinstall:	${LIBDIR}
+
+.include <bsd.lib.mk>
diff --git a/databases/qt-sqlite-plugin/pkg-plist b/databases/qt-sqlite-plugin/pkg-plist
index 530079615e7a..482facca168e 100644
--- a/databases/qt-sqlite-plugin/pkg-plist
+++ b/databases/qt-sqlite-plugin/pkg-plist
@@ -1,2 +1,2 @@
-lib/plugins/sqldrivers/libqsqlsqlite.so
+lib/plugins/sqldrivers/libqsql%%DB%%.so
 @dirrm lib/plugins/sqldrivers