diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2003-12-30 10:09:57 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2003-12-30 10:09:57 +0000 |
| commit | 701937e31582c5dc0d25c7e93664236c0f1dfe5c (patch) | |
| tree | e56a77f2119ed0fab85bd690d9a869376dddc680 /databases | |
| parent | Add mailnull to TRUSTED_IDS (diff) | |
Build, link and install the plugins properly so they can actually work.
Reviewed by: maintainer
Notes
Notes:
svn path=/head/; revision=96935
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/qt-mysql-plugin/Makefile.dbplugin | 6 | ||||
| -rw-r--r-- | databases/qt-mysql-plugin/files/Makefile.bsd | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/databases/qt-mysql-plugin/Makefile.dbplugin b/databases/qt-mysql-plugin/Makefile.dbplugin index 914cd40e3e29..f22055a93d1b 100644 --- a/databases/qt-mysql-plugin/Makefile.dbplugin +++ b/databases/qt-mysql-plugin/Makefile.dbplugin @@ -1,5 +1,6 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.2.3 +PORTREVISION= 1 CATEGORIES= databases DISTNAME= qt-x11-free-${PORTVERSION} MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ @@ -16,9 +17,12 @@ DRIVER= src/sql/drivers/${DB} EXTRACT_AFTER_ARGS?=| ${TAR} -xf - ${DISTNAME}/${PLUGIN} \ ${DISTNAME}/${DRIVER} MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV+= DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" +MAKE_ENV+= 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} diff --git a/databases/qt-mysql-plugin/files/Makefile.bsd b/databases/qt-mysql-plugin/files/Makefile.bsd index 2f6cd74f5939..d6661dea829f 100644 --- a/databases/qt-mysql-plugin/files/Makefile.bsd +++ b/databases/qt-mysql-plugin/files/Makefile.bsd @@ -6,7 +6,13 @@ VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ -I${LOCALBASE}/include/mysql \ -I${LOCALBASE}/include/postgresql/server \ - -I${LOCALBASE}/include -I${X11BASE}/include + -I${LOCALBASE}/include -I${X11BASE}/include \ + ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT +.if ${DB}==mysql +LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lqt-mt -lmysqlclient +.else +LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lpq +.endif SRCS= qsql_${DB}.cpp main.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers |