summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/qt4-ibase-plugin/Makefile8
-rw-r--r--databases/qt4-ibase-plugin/files/Makefile.bsd11
-rw-r--r--databases/qt4-mysql-plugin/Makefile7
-rw-r--r--databases/qt4-mysql-plugin/files/Makefile.bsd11
-rw-r--r--databases/qt4-odbc-plugin/Makefile7
-rw-r--r--databases/qt4-odbc-plugin/files/Makefile.bsd11
-rw-r--r--databases/qt4-pgsql-plugin/Makefile7
-rw-r--r--databases/qt4-pgsql-plugin/files/Makefile.bsd11
-rw-r--r--databases/qt4-sql/Makefile3
-rw-r--r--databases/qt4-sqlite-plugin/Makefile7
-rw-r--r--databases/qt4-sqlite-plugin/files/Makefile.bsd11
-rw-r--r--databases/qt4-sqlite3-plugin/Makefile7
-rw-r--r--databases/qt4-sqlite3-plugin/files/Makefile.bsd11
13 files changed, 49 insertions, 63 deletions
diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile
index f2327271389f..52c73fa18480 100644
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@@ -3,7 +3,6 @@
PORTNAME= qt4-${DB}-plugin
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= kde@FreeBSD.org
@@ -30,5 +29,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}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
+
.include <bsd.port.mk>
diff --git a/databases/qt4-ibase-plugin/files/Makefile.bsd b/databases/qt4-ibase-plugin/files/Makefile.bsd
index 4b914de42cf9..43ef0a068a5a 100644
--- a/databases/qt4-ibase-plugin/files/Makefile.bsd
+++ b/databases/qt4-ibase-plugin/files/Makefile.bsd
@@ -6,21 +6,14 @@ CXXFLAGS+= -I${DRIVER} -Iinclude \
-I${QT_INCDIR}/Qt \
-I${QT_INCDIR}/QtCore \
-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 -lgds
+LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lgds
SRCS= main.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>
diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile
index 8b5d0732b8b1..fbd2257d8c55 100644
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@@ -28,5 +28,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}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
+
.include <bsd.port.mk>
diff --git a/databases/qt4-mysql-plugin/files/Makefile.bsd b/databases/qt4-mysql-plugin/files/Makefile.bsd
index 09c2a81bab7b..13e0e8bb98f0 100644
--- a/databases/qt4-mysql-plugin/files/Makefile.bsd
+++ b/databases/qt4-mysql-plugin/files/Makefile.bsd
@@ -6,23 +6,16 @@ CXXFLAGS+= -I${DRIVER} \
-I${QT_INCDIR}/Qt \
-I${LOCALBASE}/include/mysql \
-I${LOCALBASE}/include \
- ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_PLUGIN \
+ -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_LIBS} -lQtSql -lmysqlclient_r
+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
-LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers
-
-${LIBDIR}:
- mkdir -p ${LIBDIR}
-
moc_qsql_${DB}.cpp: qsql_${DB}.h
$(MOC) $(.ALLSRC) -o $(.TARGET)
qsql_${DB}.moc: qsql_${DB}.cpp
$(MOC) $(.ALLSRC) -o ${DRIVER}/$(.TARGET)
-beforeinstall: ${LIBDIR}
-
.include <bsd.lib.mk>
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index 1da61888d838..6a4c72018ba8 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -29,5 +29,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}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
+
.include <bsd.port.mk>
diff --git a/databases/qt4-odbc-plugin/files/Makefile.bsd b/databases/qt4-odbc-plugin/files/Makefile.bsd
index d28e1142dd8e..666773b3a7d6 100644
--- a/databases/qt4-odbc-plugin/files/Makefile.bsd
+++ b/databases/qt4-odbc-plugin/files/Makefile.bsd
@@ -7,21 +7,14 @@ CXXFLAGS+= -I${DRIVER} \
-I${QT_INCDIR}/QtCore \
-I${QT_INCDIR}/QtSql \
-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 -DUNICODE
-LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc
+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
-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>
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index 0f942ec25ef8..978ad0ab7e06 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -28,5 +28,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}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
+
.include <bsd.port.mk>
diff --git a/databases/qt4-pgsql-plugin/files/Makefile.bsd b/databases/qt4-pgsql-plugin/files/Makefile.bsd
index ac76761a14c3..54056e3e32a9 100644
--- a/databases/qt4-pgsql-plugin/files/Makefile.bsd
+++ b/databases/qt4-pgsql-plugin/files/Makefile.bsd
@@ -6,21 +6,14 @@ CXXFLAGS+= -I${DRIVER} \
-I${QT_INCDIR}/Qt \
-I${LOCALBASE}/include/postgresql/server \
-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 -lpq
+LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lpq
SRCS= main.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>
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index a28436ab2838..7ec16f5c18a0 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure
+EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure
-NO_STAGE= yes
pre-configure:
${MKDIR} ${WRKSRC}/mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile
index 26c3657e86c7..db19195d1d39 100644
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@@ -30,5 +30,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-sqlite-plugin/files/Makefile.bsd b/databases/qt4-sqlite-plugin/files/Makefile.bsd
index 8ce538749a95..ae9e41bf7e8c 100644
--- a/databases/qt4-sqlite-plugin/files/Makefile.bsd
+++ b/databases/qt4-sqlite-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 -lsqlite
+LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lsqlite
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>
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>