aboutsummaryrefslogtreecommitdiff
path: root/databases/qt4-pgsql-plugin
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-08-04 23:30:38 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-08-04 23:30:38 +0000
commitd56984b0567867dd57ecb27fe0c508025c2426c5 (patch)
treeeb02dac4e0d7e5129ffac4c76b935a76a7e66676 /databases/qt4-pgsql-plugin
parent98813eadd27b8cd8500044af2a49b6d861809815 (diff)
downloadports-d56984b0567867dd57ecb27fe0c508025c2426c5.tar.gz
ports-d56984b0567867dd57ecb27fe0c508025c2426c5.zip
- Update to qt 4.4.1
Note: With this update several ports specific problems have been fixed. Qt4 headers and libraries have been moved to include/qt4 and lib/qt4. bsd.qt.mk defines QT_INCDIR and QT_LIBDIR now, which could be used in qt4-dependent ports if required. Thanks to: Max Brazhnikov Danny Pansters
Notes
Notes: svn path=/head/; revision=218043
Diffstat (limited to 'databases/qt4-pgsql-plugin')
-rw-r--r--databases/qt4-pgsql-plugin/Makefile2
-rw-r--r--databases/qt4-pgsql-plugin/distinfo6
-rw-r--r--databases/qt4-pgsql-plugin/files/Makefile.bsd7
-rw-r--r--databases/qt4-pgsql-plugin/pkg-plist2
4 files changed, 8 insertions, 9 deletions
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index cdc96f619b52..b2acc142aa20 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -8,7 +8,6 @@
PORTNAME= qt4-${DB}-plugin
PORTVERSION= ${QT4_VERSION}
-PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
@@ -24,7 +23,6 @@ QT_COMPONENTS= moc_build sql
QT_NONSTANDARD= yes
USE_PGSQL= yes
-#USE_BZIP2= yes
DRIVER= src/sql/drivers/${DB}
PLUGIN= src/plugins/sqldrivers/${DB}
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
diff --git a/databases/qt4-pgsql-plugin/distinfo b/databases/qt4-pgsql-plugin/distinfo
index 9451a68b5c02..0c630f09baf6 100644
--- a/databases/qt4-pgsql-plugin/distinfo
+++ b/databases/qt4-pgsql-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93
-SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2
-SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710
+MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
+SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
+SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
diff --git a/databases/qt4-pgsql-plugin/files/Makefile.bsd b/databases/qt4-pgsql-plugin/files/Makefile.bsd
index daf1e9220551..545a2eee5ad1 100644
--- a/databases/qt4-pgsql-plugin/files/Makefile.bsd
+++ b/databases/qt4-pgsql-plugin/files/Makefile.bsd
@@ -2,14 +2,15 @@ SHLIB_NAME= libqsql${DB}.so
VPATH= ${PLUGIN}:${DRIVER}
CXXFLAGS+= -I${DRIVER} \
- -I${LOCALBASE}/include/Qt \
+ -I${PREFIX}/include/qt4 \
+ -I${PREFIX}/include/qt4/Qt \
-I${LOCALBASE}/include/postgresql/server \
- -I${LOCALBASE}/include \
+ -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${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq
+LDADD= -L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq
SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers
diff --git a/databases/qt4-pgsql-plugin/pkg-plist b/databases/qt4-pgsql-plugin/pkg-plist
index 50edd8ee885a..0a1084fe0ef5 100644
--- a/databases/qt4-pgsql-plugin/pkg-plist
+++ b/databases/qt4-pgsql-plugin/pkg-plist
@@ -1,2 +1,2 @@
lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrm lib/qt4/plugins/sqldrivers
+@dirrmtry lib/qt4/plugins/sqldrivers