diff options
author | rakuco <rakuco@FreeBSD.org> | 2016-03-10 22:11:16 +0800 |
---|---|---|
committer | rakuco <rakuco@FreeBSD.org> | 2016-03-10 22:11:16 +0800 |
commit | b226d619749849bb23eb4ff59782fc27ccac19ac (patch) | |
tree | bc6a8fd1c091820dc476f64592fe9584057e8ec3 | |
parent | b1aeec55f5e3dd9164c219f524e34c8016ee801d (diff) | |
download | freebsd-ports-gnome-b226d619749849bb23eb4ff59782fc27ccac19ac.tar.gz freebsd-ports-gnome-b226d619749849bb23eb4ff59782fc27ccac19ac.tar.zst freebsd-ports-gnome-b226d619749849bb23eb4ff59782fc27ccac19ac.zip |
qt4 sqldrivers: Switch to a proper qmake build, use Makefile.sqldrivers.
We've recently started receiving pkg-fallout emails because qt4-mysql-plugin
is failing to build in HEAD. It turns out we were using some custom-made
Makefile.bsd files to drive the builds, and they did not always register all
dependencies between the files correctly.
Fix it by switching to a proper qmake build that uses the .pro files shipped
with Qt4 itself: they can be used without running the `configure' script
almost as if they were not part of the Qt distribution itself. By doing this
we can stop having our own Makefiles and also stop setting a lot of
variables in the port Makefiles.
While here, consolidate most of the variable setting into a single
Makefile.sqldrivers in devel/qt4 (like we already do for devel/qt5) so that
each of the qt4-*-plugin ports only need to set a few values such as the
plugin name and additional USES or includes that might be necessary.
Bump PORTREVISION because we now include the debug versions of the plugins
in PLIST_FILES when the ports are built with WITH_DEBUG=yes (they were
already shipped before, but not registered in the plists).
-rw-r--r-- | databases/qt4-ibase-plugin/Makefile | 32 | ||||
-rw-r--r-- | databases/qt4-ibase-plugin/files/Makefile.bsd | 19 | ||||
-rw-r--r-- | databases/qt4-ibase-plugin/pkg-plist | 1 | ||||
-rw-r--r-- | databases/qt4-mysql-plugin/Makefile | 32 | ||||
-rw-r--r-- | databases/qt4-mysql-plugin/files/Makefile.bsd | 21 | ||||
-rw-r--r-- | databases/qt4-mysql-plugin/pkg-plist | 1 | ||||
-rw-r--r-- | databases/qt4-odbc-plugin/Makefile | 35 | ||||
-rw-r--r-- | databases/qt4-odbc-plugin/files/Makefile.bsd | 20 | ||||
-rw-r--r-- | databases/qt4-odbc-plugin/pkg-plist | 1 | ||||
-rw-r--r-- | databases/qt4-pgsql-plugin/Makefile | 33 | ||||
-rw-r--r-- | databases/qt4-pgsql-plugin/files/Makefile.bsd | 19 | ||||
-rw-r--r-- | databases/qt4-pgsql-plugin/pkg-plist | 1 | ||||
-rw-r--r-- | databases/qt4-sqlite-plugin/Makefile | 32 | ||||
-rw-r--r-- | databases/qt4-sqlite-plugin/files/Makefile.bsd | 18 | ||||
-rw-r--r-- | databases/qt4-sqlite-plugin/pkg-plist | 1 | ||||
-rw-r--r-- | databases/qt4-sqlite3-plugin/Makefile | 32 | ||||
-rw-r--r-- | databases/qt4-sqlite3-plugin/files/Makefile.bsd | 18 | ||||
-rw-r--r-- | databases/qt4-sqlite3-plugin/pkg-plist | 1 | ||||
-rw-r--r-- | devel/qt4/Makefile.sqldrivers | 27 |
19 files changed, 44 insertions, 300 deletions
diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile index f442021c41d1..8bd8e63b986a 100644 --- a/databases/qt4-ibase-plugin/Makefile +++ b/databases/qt4-ibase-plugin/Makefile @@ -1,38 +1,10 @@ # Created by: Michael Nottebrock <lofi@FreeBSD.org> # $FreeBSD$ -PORTNAME= qt4-${DB}-plugin -DISTVERSION= ${QT4_VERSION} -CATEGORIES= databases +PORTREVISION= 1 -MAINTAINER= kde@FreeBSD.org COMMENT= Qt InterBase/Firebird database plugin - DB= ibase - USE_FIREBIRD= yes -USE_QT4= moc_build sql -QT_DIST= yes - -DRIVER= src/sql/drivers/${DB} -PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/include/QtSql \ - ${DISTNAME}/src/corelib \ - ${DISTNAME}/src/sql/kernel -MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ - PLUGIN="${PLUGIN}" \ - QT_INCDIR="${QT_INCDIR}" \ - QT_LIBDIR="${QT_LIBDIR}" -PLIST_SUB= DB=${DB} - -EXTRA_PATCHES= # empty - -SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers - -do-install: - @${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR} - ${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR} -.include <bsd.port.mk> +.include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" diff --git a/databases/qt4-ibase-plugin/files/Makefile.bsd b/databases/qt4-ibase-plugin/files/Makefile.bsd deleted file mode 100644 index 43ef0a068a5a..000000000000 --- a/databases/qt4-ibase-plugin/files/Makefile.bsd +++ /dev/null @@ -1,19 +0,0 @@ -SHLIB_NAME= libqsql${DB}.so - -VPATH= ${PLUGIN}:${DRIVER} -CXXFLAGS+= -I${DRIVER} -Iinclude \ - -I${QT_INCDIR} \ - -I${QT_INCDIR}/Qt \ - -I${QT_INCDIR}/QtCore \ - -I${LOCALBASE}/include \ - -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ - -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ - -D_LARGEFILE_SOURCE -DQT_SHARED -MOC?= ${LOCALBASE}/bin/moc-qt4 -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lgds -SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp - -moc_qsql_${DB}.cpp: qsql_${DB}.h - $(MOC) $(.ALLSRC) -o $(.TARGET) - -.include <bsd.lib.mk> diff --git a/databases/qt4-ibase-plugin/pkg-plist b/databases/qt4-ibase-plugin/pkg-plist deleted file mode 100644 index 4e1b7f2d6a6e..000000000000 --- a/databases/qt4-ibase-plugin/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile index bfd1ecbe0a98..0111b693c25a 100644 --- a/databases/qt4-mysql-plugin/Makefile +++ b/databases/qt4-mysql-plugin/Makefile @@ -1,37 +1,13 @@ # Created by: Kay Lehmann <kay_lehmann@web.de> # $FreeBSD$ -PORTNAME= qt4-${DB}-plugin -DISTVERSION= ${QT4_VERSION} -CATEGORIES= databases +PORTREVISION= 1 -MAINTAINER= kde@FreeBSD.org COMMENT= Qt MySQL database plugin - DB= mysql - -USE_QT4= moc_build sql -QT_DIST= yes - USE_MYSQL= yes -DRIVER= src/sql/drivers/${DB} -PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \ - ${DISTNAME}/src/corelib \ - ${DISTNAME}/${PLUGIN} -MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ - PLUGIN="${PLUGIN}" \ - QT_INCDIR="${QT_INCDIR}" \ - QT_LIBDIR="${QT_LIBDIR}" -PLIST_SUB= DB=${DB} - -EXTRA_PATCHES= # empty - -SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers -do-install: - @${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR} - ${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR} +CXXFLAGS+= -I${LOCALBASE}/include/mysql +LDFLAGS+= -L${LOCALBASE}/lib/mysql -.include <bsd.port.mk> +.include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" diff --git a/databases/qt4-mysql-plugin/files/Makefile.bsd b/databases/qt4-mysql-plugin/files/Makefile.bsd deleted file mode 100644 index e824391e425d..000000000000 --- a/databases/qt4-mysql-plugin/files/Makefile.bsd +++ /dev/null @@ -1,21 +0,0 @@ -SHLIB_NAME= libqsql${DB}.so - -VPATH= ${PLUGIN}:${DRIVER} -CXXFLAGS+= -I${DRIVER} \ - -I${QT_INCDIR} \ - -I${QT_INCDIR}/Qt \ - -I${LOCALBASE}/include/mysql \ - -I${LOCALBASE}/include \ - -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_PLUGIN \ - -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql -pthread -lQtSql -lmysqlclient_r -MOC?= ${LOCALBASE}/bin/moc-qt4 -SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp qsql_${DB}.moc - -moc_qsql_${DB}.cpp: qsql_${DB}.h - $(MOC) $(.ALLSRC) -o $(.TARGET) - -qsql_${DB}.moc: qsql_${DB}.cpp - $(MOC) $(.ALLSRC) -o ${DRIVER}/$(.TARGET) - -.include <bsd.lib.mk> diff --git a/databases/qt4-mysql-plugin/pkg-plist b/databases/qt4-mysql-plugin/pkg-plist deleted file mode 100644 index 4e1b7f2d6a6e..000000000000 --- a/databases/qt4-mysql-plugin/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile index 77b02408ab52..60e93158b782 100644 --- a/databases/qt4-odbc-plugin/Makefile +++ b/databases/qt4-odbc-plugin/Makefile @@ -1,38 +1,11 @@ # Created by: Michael Nottebrock <lofi@FreeBSD.org> # $FreeBSD$ -PORTNAME= qt4-${DB}-plugin -DISTVERSION= ${QT4_VERSION} -CATEGORIES= databases - -MAINTAINER= kde@FreeBSD.org -COMMENT= Qt Open Database Connectivity plugin +PORTREVISION= 1 DB= odbc +COMMENT= Qt Open Database Connectivity plugin -LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC - -USE_QT4= moc_build sql -QT_DIST= yes - -DRIVER= src/sql/drivers/${DB} -PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \ - ${DISTNAME}/src/corelib \ - ${DISTNAME}/${PLUGIN} -MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ - PLUGIN="${PLUGIN}" \ - QT_INCDIR="${QT_INCDIR}" \ - QT_LIBDIR="${QT_LIBDIR}" -PLIST_SUB= DB=${DB} - -EXTRA_PATCHES= # empty - -SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers - -do-install: - @${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR} - ${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR} +LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC -.include <bsd.port.mk> +.include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" diff --git a/databases/qt4-odbc-plugin/files/Makefile.bsd b/databases/qt4-odbc-plugin/files/Makefile.bsd deleted file mode 100644 index 666773b3a7d6..000000000000 --- a/databases/qt4-odbc-plugin/files/Makefile.bsd +++ /dev/null @@ -1,20 +0,0 @@ -SHLIB_NAME= libqsql${DB}.so - -VPATH= ${PLUGIN}:${DRIVER} -CXXFLAGS+= -I${DRIVER} \ - -I${QT_INCDIR} \ - -I${QT_INCDIR}/Qt \ - -I${QT_INCDIR}/QtCore \ - -I${QT_INCDIR}/QtSql \ - -I${LOCALBASE}/include \ - -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ - -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ - -D_LARGEFILE_SOURCE -DQT_SHARED -DUNICODE -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lodbc -MOC?= ${LOCALBASE}/bin/moc-qt4 -SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp - -moc_qsql_${DB}.cpp: qsql_${DB}.h - $(MOC) $(.ALLSRC) -o $(.TARGET) - -.include <bsd.lib.mk> diff --git a/databases/qt4-odbc-plugin/pkg-plist b/databases/qt4-odbc-plugin/pkg-plist deleted file mode 100644 index 4e1b7f2d6a6e..000000000000 --- a/databases/qt4-odbc-plugin/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile index 6a1e0a3e8eb5..73203fc14449 100644 --- a/databases/qt4-pgsql-plugin/Makefile +++ b/databases/qt4-pgsql-plugin/Makefile @@ -1,37 +1,10 @@ # Created by: Lauri Watts <lauri@kde.org> # $FreeBSD$ -PORTNAME= qt4-${DB}-plugin -DISTVERSION= ${QT4_VERSION} -CATEGORIES= databases +PORTREVISION= 1 -MAINTAINER= kde@FreeBSD.org COMMENT= Qt PostgreSQL database plugin - DB= psql +USES= pgsql -USE_QT4= moc_build sql -QT_DIST= yes - -USES+= pgsql -DRIVER= src/sql/drivers/${DB} -PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \ - ${DISTNAME}/src/corelib \ - ${DISTNAME}/${PLUGIN} -MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ - PLUGIN="${PLUGIN}" \ - QT_INCDIR="${QT_INCDIR}" \ - QT_LIBDIR="${QT_LIBDIR}" -PLIST_SUB= DB=${DB} - -EXTRA_PATCHES= # empty - -SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers - -do-install: - @${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR} - ${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR} - -.include <bsd.port.mk> +.include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" diff --git a/databases/qt4-pgsql-plugin/files/Makefile.bsd b/databases/qt4-pgsql-plugin/files/Makefile.bsd deleted file mode 100644 index 54056e3e32a9..000000000000 --- a/databases/qt4-pgsql-plugin/files/Makefile.bsd +++ /dev/null @@ -1,19 +0,0 @@ -SHLIB_NAME= libqsql${DB}.so - -VPATH= ${PLUGIN}:${DRIVER} -CXXFLAGS+= -I${DRIVER} \ - -I${QT_INCDIR} \ - -I${QT_INCDIR}/Qt \ - -I${LOCALBASE}/include/postgresql/server \ - -I${LOCALBASE}/include \ - -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ - -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ - -D_LARGEFILE_SOURCE -DQT_SHARED -MOC?= ${LOCALBASE}/bin/moc-qt4 -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lpq -SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp - -moc_qsql_${DB}.cpp: qsql_${DB}.h - $(MOC) $(.ALLSRC) -o $(.TARGET) - -.include <bsd.lib.mk> diff --git a/databases/qt4-pgsql-plugin/pkg-plist b/databases/qt4-pgsql-plugin/pkg-plist deleted file mode 100644 index 4e1b7f2d6a6e..000000000000 --- a/databases/qt4-pgsql-plugin/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile index dfde4a1832ab..cb52e6b04a84 100644 --- a/databases/qt4-sqlite-plugin/Makefile +++ b/databases/qt4-sqlite-plugin/Makefile @@ -1,38 +1,10 @@ # Created by: Michael Nottebrock <lofi@FreeBSD.org> # $FreeBSD$ -PORTNAME= qt4-${DB}-plugin -DISTVERSION= ${QT4_VERSION} -CATEGORIES= databases +PORTREVISION= 1 -MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQLite 2 database plugin - DB= sqlite2 - -USE_QT4= moc_build sql -QT_DIST= yes USE_SQLITE= 2 -DRIVER= src/sql/drivers/${DB} -PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/include/QtSql \ - ${DISTNAME}/src/corelib \ - ${DISTNAME}/src/sql/kernel -MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ - PLUGIN="${PLUGIN}" \ - QT_INCDIR="${QT_INCDIR}" \ - QT_LIBDIR="${QT_LIBDIR}" -PLIST_SUB= DB=${DB} - -EXTRA_PATCHES= # empty - -SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers - -do-install: - @${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR} - ${INSTALL_LIB} ${WRKSRC}/libq${DB}.so ${STAGEDIR}${SQL_PLUGINDIR} - -.include <bsd.port.mk> +.include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" diff --git a/databases/qt4-sqlite-plugin/files/Makefile.bsd b/databases/qt4-sqlite-plugin/files/Makefile.bsd deleted file mode 100644 index ae9e41bf7e8c..000000000000 --- a/databases/qt4-sqlite-plugin/files/Makefile.bsd +++ /dev/null @@ -1,18 +0,0 @@ -SHLIB_NAME= libq${DB}.so - -VPATH= ${PLUGIN}:${DRIVER} -CXXFLAGS+= -I${DRIVER} -Iinclude \ - -I${QT_INCDIR} \ - -I${QT_INCDIR}/Qt \ - -I${LOCALBASE}/include \ - -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ - -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ - -D_LARGEFILE_SOURCE -DQT_SHARED -MOC?= ${LOCALBASE}/bin/moc-qt4 -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lsqlite -SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp - -moc_qsql_${DB}.cpp: qsql_${DB}.h - $(MOC) $(.ALLSRC) -o $(.TARGET) - -.include <bsd.lib.mk> diff --git a/databases/qt4-sqlite-plugin/pkg-plist b/databases/qt4-sqlite-plugin/pkg-plist deleted file mode 100644 index bb73db4f5d5d..000000000000 --- a/databases/qt4-sqlite-plugin/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%QT_PLUGINDIR%%/sqldrivers/libq%%DB%%.so diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile index 55affe3bbb50..02dba0a693c1 100644 --- a/databases/qt4-sqlite3-plugin/Makefile +++ b/databases/qt4-sqlite3-plugin/Makefile @@ -1,38 +1,10 @@ # Created by: Michael Nottebrock <lofi@FreeBSD.org> # $FreeBSD$ -PORTNAME= qt4-${DB}-plugin -DISTVERSION= ${QT4_VERSION} -CATEGORIES= databases +PORTREVISION= 1 -MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQLite 3 database plugin - DB= sqlite - -USE_QT4= moc_build sql -QT_DIST= yes USE_SQLITE= 3 -DRIVER= src/sql/drivers/${DB} -PLUGIN= src/plugins/sqldrivers/${DB} -EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ - ${DISTNAME}/include/QtSql \ - ${DISTNAME}/src/corelib \ - ${DISTNAME}/src/sql/kernel -MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ - PLUGIN="${PLUGIN}" \ - QT_INCDIR="${QT_INCDIR}" \ - QT_LIBDIR="${QT_LIBDIR}" -PLIST_SUB= DB=${DB} - -EXTRA_PATCHES= # empty - -SQL_PLUGINDIR= ${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers - -do-install: - @${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR} - ${INSTALL_LIB} ${WRKSRC}/libq${DB}.so ${STAGEDIR}${SQL_PLUGINDIR} - -.include <bsd.port.mk> +.include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" diff --git a/databases/qt4-sqlite3-plugin/files/Makefile.bsd b/databases/qt4-sqlite3-plugin/files/Makefile.bsd deleted file mode 100644 index 7d9dec3def7e..000000000000 --- a/databases/qt4-sqlite3-plugin/files/Makefile.bsd +++ /dev/null @@ -1,18 +0,0 @@ -SHLIB_NAME= libq${DB}.so - -VPATH= ${PLUGIN}:${DRIVER} -CXXFLAGS+= -I${DRIVER} -Iinclude \ - -I${QT_INCDIR} \ - -I${QT_INCDIR}/Qt \ - -I${LOCALBASE}/include \ - -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ - -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ - -D_LARGEFILE_SOURCE -DQT_SHARED -MOC?= ${LOCALBASE}/bin/moc-qt4 -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lsqlite3 -SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp - -moc_qsql_${DB}.cpp: qsql_${DB}.h - $(MOC) $(.ALLSRC) -o $(.TARGET) - -.include <bsd.lib.mk> diff --git a/databases/qt4-sqlite3-plugin/pkg-plist b/databases/qt4-sqlite3-plugin/pkg-plist deleted file mode 100644 index bb73db4f5d5d..000000000000 --- a/databases/qt4-sqlite3-plugin/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%QT_PLUGINDIR%%/sqldrivers/libq%%DB%%.so diff --git a/devel/qt4/Makefile.sqldrivers b/devel/qt4/Makefile.sqldrivers new file mode 100644 index 000000000000..723b5ea092ff --- /dev/null +++ b/devel/qt4/Makefile.sqldrivers @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTNAME= ${DB:tl} +DISTVERSION= ${QT4_VERSION} +CATEGORIES= databases +PKGNAMEPREFIX= qt4- +PKGNAMESUFFIX= -plugin + +MAINTAINER= kde@FreeBSD.org + +EXTRA_PATCHES= # empty + +USE_QT4= corelib sql moc_build qmake_build +QT_DIST= yes +USES+= qmake:outsource + +CXXFLAGS+= -I${WRKSRC}/include # For private QtSql headers. + +EXTRACT_AFTER_ARGS= ${DISTNAME}/include/QtSql \ + ${DISTNAME}/src/corelib ${DISTNAME}/src/plugins \ + ${DISTNAME}/src/qt_targets.pri ${DISTNAME}/src/sql +QMAKE_SOURCE_PATH= ${WRKSRC}/src/plugins/sqldrivers/${DB}/${DB}.pro + +PLIST_FILES= ${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so \ + %%DEBUG%%${QT_PLUGINDIR_REL}/sqldrivers/libq${DB:tl:C/^sql//}.so.debug + +.include <bsd.port.mk> |