diff options
author | miwi <miwi@FreeBSD.org> | 2009-08-05 04:04:38 +0800 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2009-08-05 04:04:38 +0800 |
commit | 5153f40d24ec33479bb3f8c06e1c33f0c9e052d1 (patch) | |
tree | 2781cac7d68b8246efd7f5d5bf764de05aee8338 /databases/qt4-pgsql-plugin | |
parent | 32198db977429daaf8bbf3ef8312d29a0e17083d (diff) | |
download | freebsd-ports-gnome-5153f40d24ec33479bb3f8c06e1c33f0c9e052d1.tar.gz freebsd-ports-gnome-5153f40d24ec33479bb3f8c06e1c33f0c9e052d1.tar.zst freebsd-ports-gnome-5153f40d24ec33479bb3f8c06e1c33f0c9e052d1.zip |
- Update Qt4 to 4.5.2
The KDE FreeBSD team would like to say thanks to all the helpers
and submitters.
Tested by: pointyhat-exp-run (pav/miwi)
Diffstat (limited to 'databases/qt4-pgsql-plugin')
-rw-r--r-- | databases/qt4-pgsql-plugin/Makefile | 5 | ||||
-rw-r--r-- | databases/qt4-pgsql-plugin/distinfo | 6 | ||||
-rw-r--r-- | databases/qt4-pgsql-plugin/files/Makefile.bsd | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile index b2acc142aa20..3126f98522c2 100644 --- a/databases/qt4-pgsql-plugin/Makefile +++ b/databases/qt4-pgsql-plugin/Makefile @@ -21,6 +21,7 @@ DB= psql USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +MAKE_JOBS_SAFE= yes USE_PGSQL= yes DRIVER= src/sql/drivers/${DB} @@ -32,7 +33,9 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + QT_INCDIR="${QT_INCDIR}" \ + QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} .include <bsd.port.mk> diff --git a/databases/qt4-pgsql-plugin/distinfo b/databases/qt4-pgsql-plugin/distinfo index 1756af8b04d9..27b0949354e8 100644 --- a/databases/qt4-pgsql-plugin/distinfo +++ b/databases/qt4-pgsql-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 diff --git a/databases/qt4-pgsql-plugin/files/Makefile.bsd b/databases/qt4-pgsql-plugin/files/Makefile.bsd index 545a2eee5ad1..9506edf39bec 100644 --- a/databases/qt4-pgsql-plugin/files/Makefile.bsd +++ b/databases/qt4-pgsql-plugin/files/Makefile.bsd @@ -2,15 +2,15 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} \ - -I${PREFIX}/include/qt4 \ - -I${PREFIX}/include/qt4/Qt \ + -I${QT_INCDIR} \ + -I${QT_INCDIR}/Qt \ -I${LOCALBASE}/include/postgresql/server \ -I${LOCALBASE}/include -I${X11BASE}/include \ ${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${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers |