diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-07-13 00:04:21 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-07-13 00:04:21 +0000 |
| commit | ee279d859feb6202deabda725cb8c0a4ec94f21f (patch) | |
| tree | e2474571fc19a9826f4556e85411a5a38b27ca41 /databases/qt4-sqlite3-plugin | |
| parent | xorg master-site addition (diff) | |
During regression testing the WIP Qt 4.3.0 ports, I found that the sql
driver plugins were all broken - even in the current ports! :(
I am quite astonished nobody complained about this yet. Is there nobody
developing applications with database backends using Qt4 on FreeBSD? The
ports let you use the QtSql library and the database plugins without any
X11 dependencies! Using Qt for database frontends has never been so
attractive!
Anyway, this should fix the plugins.
Notes
Notes:
svn path=/head/; revision=195506
Diffstat (limited to 'databases/qt4-sqlite3-plugin')
| -rw-r--r-- | databases/qt4-sqlite3-plugin/Makefile | 6 | ||||
| -rw-r--r-- | databases/qt4-sqlite3-plugin/files/Makefile.bsd | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile index c07b2f4ea7ef..29a050ce63fa 100644 --- a/databases/qt4-sqlite3-plugin/Makefile +++ b/databases/qt4-sqlite3-plugin/Makefile @@ -8,6 +8,7 @@ PORTNAME= qt4-${DB}-plugin PORTVERSION= 4.2.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-opensource-src-${PORTVERSION} @@ -23,11 +24,14 @@ LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql \ #USE_BZIP2= yes DRIVER= src/sql/drivers/${DB} +PLUGIN= src/plugins/sqldrivers/${DB} EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \ - ${DISTNAME}/${DRIVER} ${DISTNAME}/include/QtSql \ + ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \ + ${DISTNAME}/include/QtSql \ ${DISTNAME}/src/sql/kernel MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \ + PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST_SUB= DB=${DB} diff --git a/databases/qt4-sqlite3-plugin/files/Makefile.bsd b/databases/qt4-sqlite3-plugin/files/Makefile.bsd index f2c041b96fc7..3fcb0b193e03 100644 --- a/databases/qt4-sqlite3-plugin/files/Makefile.bsd +++ b/databases/qt4-sqlite3-plugin/files/Makefile.bsd @@ -1,18 +1,24 @@ SHLIB_NAME= libqsql${DB}.so -VPATH= ${DRIVER} +VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} -Iinclude \ -I${LOCALBASE}/include/Qt \ -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT + ${PTHREAD_CFLAGS} -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${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite3 -SRCS= qsql_${DB}.cpp +SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers ${LIBDIR}: mkdir -p ${LIBDIR} +moc_qsql_${DB}.cpp: qsql_${DB}.h + $(MOC) $(.ALLSRC) -o $(.TARGET) + beforeinstall: ${LIBDIR} .include <bsd.lib.mk> |