aboutsummaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/qt4-ibase-plugin/Makefile6
-rw-r--r--databases/qt4-ibase-plugin/files/Makefile.bsd12
-rw-r--r--databases/qt4-mysql-plugin/Makefile5
-rw-r--r--databases/qt4-mysql-plugin/files/Makefile.bsd13
-rw-r--r--databases/qt4-odbc-plugin/Makefile5
-rw-r--r--databases/qt4-odbc-plugin/files/Makefile.bsd12
-rw-r--r--databases/qt4-pgsql-plugin/Makefile5
-rw-r--r--databases/qt4-pgsql-plugin/files/Makefile.bsd12
-rw-r--r--databases/qt4-sqlite-plugin/Makefile6
-rw-r--r--databases/qt4-sqlite-plugin/files/Makefile.bsd12
-rw-r--r--databases/qt4-sqlite3-plugin/Makefile6
-rw-r--r--databases/qt4-sqlite3-plugin/files/Makefile.bsd12
12 files changed, 81 insertions, 25 deletions
diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile
index fae46fc3f99e..fb7dd9e36dd3 100644
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-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+= gds:${PORTSDIR}/databases/firebird-client \
#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-ibase-plugin/files/Makefile.bsd b/databases/qt4-ibase-plugin/files/Makefile.bsd
index 52b750dd4b0b..3c890f0ef7ef 100644
--- a/databases/qt4-ibase-plugin/files/Makefile.bsd
+++ b/databases/qt4-ibase-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 -lgds
-SRCS= qsql_${DB}.cpp
+SRCS= main.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>
diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile
index 694008959fd4..db61dd617d45 100644
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-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,10 +24,12 @@ LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql
USE_MYSQL= yes
#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
+PLUGIN= src/plugins/sqldrivers/${DB}
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
- ${DISTNAME}/${DRIVER}
+ ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN}
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-mysql-plugin/files/Makefile.bsd b/databases/qt4-mysql-plugin/files/Makefile.bsd
index f86a2a561b76..4774f995d1fa 100644
--- a/databases/qt4-mysql-plugin/files/Makefile.bsd
+++ b/databases/qt4-mysql-plugin/files/Makefile.bsd
@@ -1,19 +1,24 @@
SHLIB_NAME= libqsql${DB}.so
-VPATH= ${DRIVER}
+VPATH= ${PLUGIN}:${DRIVER}
CXXFLAGS+= -I${DRIVER} \
-I${LOCALBASE}/include/Qt \
-I${LOCALBASE}/include/mysql \
-I${LOCALBASE}/include \
- ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
-LDADD= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient
-SRCS= qsql_${DB}.cpp
+ ${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
+LDADD= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient_r
+MOC?= ${LOCALBASE}/bin/moc-qt4
+SRCS= main.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>
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index 64e6e73c1bef..a832483b6d15 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-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,10 +24,12 @@ LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC \
#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
+PLUGIN= src/plugins/sqldrivers/${DB}
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
- ${DISTNAME}/${DRIVER}
+ ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN}
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-odbc-plugin/files/Makefile.bsd b/databases/qt4-odbc-plugin/files/Makefile.bsd
index 920b6a8d73e4..178007369e45 100644
--- a/databases/qt4-odbc-plugin/files/Makefile.bsd
+++ b/databases/qt4-odbc-plugin/files/Makefile.bsd
@@ -1,18 +1,24 @@
SHLIB_NAME= libqsql${DB}.so
-VPATH= ${DRIVER}
+VPATH= ${PLUGIN}:${DRIVER}
CXXFLAGS+= -I${DRIVER} \
-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
LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc
-SRCS= qsql_${DB}.cpp
+MOC?= ${LOCALBASE}/bin/moc-qt4
+SRCS= main.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>
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index 970ac6ed59fb..12b439eec11b 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-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,10 +24,12 @@ LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql
USE_PGSQL= yes
#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
+PLUGIN= src/plugins/sqldrivers/${DB}
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
- ${DISTNAME}/${DRIVER}
+ ${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN}
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-pgsql-plugin/files/Makefile.bsd b/databases/qt4-pgsql-plugin/files/Makefile.bsd
index 52e180ad5692..6caf331a909d 100644
--- a/databases/qt4-pgsql-plugin/files/Makefile.bsd
+++ b/databases/qt4-pgsql-plugin/files/Makefile.bsd
@@ -1,19 +1,25 @@
SHLIB_NAME= libqsql${DB}.so
-VPATH= ${DRIVER}
+VPATH= ${PLUGIN}:${DRIVER}
CXXFLAGS+= -I${DRIVER} \
-I${LOCALBASE}/include/Qt \
-I${LOCALBASE}/include/postgresql/server \
-I${LOCALBASE}/include -I${X11BASE}/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 -lpq
-SRCS= qsql_${DB}.cpp
+SRCS= main.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>
diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile
index 639442930366..9a8187aac885 100644
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-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-sqlite-plugin/files/Makefile.bsd b/databases/qt4-sqlite-plugin/files/Makefile.bsd
index 28f4d27295ab..87ab42fe9799 100644
--- a/databases/qt4-sqlite-plugin/files/Makefile.bsd
+++ b/databases/qt4-sqlite-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 -lsqlite
-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>
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>