diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-10-13 23:15:50 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-10-13 23:15:50 +0000 |
| commit | ecda38b0a51979110b18b1bcd5f03f5b6a55e13a (patch) | |
| tree | 6e4bc973485641dceb988b7456b64a08077dafe0 /databases/qt4-sqlite3-plugin | |
| parent | . Remove zombie directories left by nethack3*-gnome removal. (diff) | |
Update Qt to 4.8.5 and Qt Creator to 2.8.0.
Proudly brought to you by the KDE on FreeBSD team, with commits by makc@,
Schaich Alonso and yours truly.
Besides the tons of upstream fixes, we have mkspecs for GCC 4.9 and clang33
(from ports), staging support in the Makefiles and dependency fixes related
to pkg-config.
Many thanks to the people who helped test the ports using our area51
repository, and also to the people who provided patches and bug reports via
GNATS!
PR: ports/180615
ports/181921
ports/182049
Notes
Notes:
svn path=/head/; revision=330266
Diffstat (limited to 'databases/qt4-sqlite3-plugin')
| -rw-r--r-- | databases/qt4-sqlite3-plugin/Makefile | 7 | ||||
| -rw-r--r-- | databases/qt4-sqlite3-plugin/files/Makefile.bsd | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile index 67e69b849836..4b691ce5c8c2 100644 --- a/databases/qt4-sqlite3-plugin/Makefile +++ b/databases/qt4-sqlite3-plugin/Makefile @@ -31,5 +31,10 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} -NO_STAGE= yes +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> diff --git a/databases/qt4-sqlite3-plugin/files/Makefile.bsd b/databases/qt4-sqlite3-plugin/files/Makefile.bsd index 293786a04b1d..7d9dec3def7e 100644 --- a/databases/qt4-sqlite3-plugin/files/Makefile.bsd +++ b/databases/qt4-sqlite3-plugin/files/Makefile.bsd @@ -5,21 +5,14 @@ CXXFLAGS+= -I${DRIVER} -Iinclude \ -I${QT_INCDIR} \ -I${QT_INCDIR}/Qt \ -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ + -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_LIBS} -lQtSql -lsqlite3 +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lsqlite3 SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp -LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers - -${LIBDIR}: - mkdir -p ${LIBDIR} - moc_qsql_${DB}.cpp: qsql_${DB}.h $(MOC) $(.ALLSRC) -o $(.TARGET) -beforeinstall: ${LIBDIR} - .include <bsd.lib.mk> |