[pkgsrc/trunk]: pkgsrc/x11 Adjust Qt 3.3 PostgreSQL patches to work with all ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3b7d9a09a15
branches:  trunk
changeset: 502013:a3b7d9a09a15
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Nov 01 15:20:50 2005 +0000

description:
Adjust Qt 3.3 PostgreSQL patches to work with all versions. Drop the
requirement of 7.3, it compiles fine with all versions in pkgsrc (and
should work with them). Bump the revision to annotate the possibly
changed dependency.

diffstat:

 x11/qt3-libs/distinfo         |   5 ++---
 x11/qt3-libs/patches/patch-ba |  13 -------------
 x11/qt3-libs/patches/patch-bb |   5 ++---
 x11/qt3-psql/Makefile         |   5 ++---
 4 files changed, 6 insertions(+), 22 deletions(-)

diffs (79 lines):

diff -r 6ad1d5a61c8b -r a3b7d9a09a15 x11/qt3-libs/distinfo
--- a/x11/qt3-libs/distinfo     Tue Nov 01 14:57:52 2005 +0000
+++ b/x11/qt3-libs/distinfo     Tue Nov 01 15:20:50 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2005/09/27 07:46:20 adam Exp $
+$NetBSD: distinfo,v 1.33 2005/11/01 15:20:50 joerg Exp $
 
 SHA1 (qt-x11-free-3.3.5.tar.bz2) = 8d7c7ba0b39848ef60b3cd93fc1d33e9527694ec
 RMD160 (qt-x11-free-3.3.5.tar.bz2) = 376ae3fc36c70ec864653ca78582ba29410def7f
@@ -12,8 +12,7 @@
 SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913
 SHA1 (patch-ah) = f9e0a77ea62e06b3c037921094e0eb1d50a5ffce
 SHA1 (patch-ai) = 582a02a1b697ef038cd5a8ead5dd3b0910e6297b
-SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
-SHA1 (patch-bb) = df300b77d0adb653eaa16c97f995ed2def8e7d87
+SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5
 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830
 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
diff -r 6ad1d5a61c8b -r a3b7d9a09a15 x11/qt3-libs/patches/patch-ba
--- a/x11/qt3-libs/patches/patch-ba     Tue Nov 01 14:57:52 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2002/10/28 10:46:07 drochner Exp $
-
---- src/sql/drivers/psql/qsql_psql.h.orig      Sun Oct 27 22:21:30 2002
-+++ src/sql/drivers/psql/qsql_psql.h   Sun Oct 27 22:21:51 2002
-@@ -40,7 +40,7 @@
- #include <qsqlresult.h>
- #include <qsqlfield.h>
- #include <qsqldriver.h>
--#include <libpq-fe.h>
-+#include <pgsql/libpq-fe.h>
- 
- #ifdef QT_PLUGIN
- #define Q_EXPORT_SQLDRIVER_PSQL
diff -r 6ad1d5a61c8b -r a3b7d9a09a15 x11/qt3-libs/patches/patch-bb
--- a/x11/qt3-libs/patches/patch-bb     Tue Nov 01 14:57:52 2005 +0000
+++ b/x11/qt3-libs/patches/patch-bb     Tue Nov 01 15:20:50 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.4 2004/07/06 16:59:04 wiz Exp $
+$NetBSD: patch-bb,v 1.5 2005/11/01 15:20:51 joerg Exp $
 
 --- src/sql/drivers/psql/qsql_psql.cpp.orig    2004-03-10 13:29:45.000000000 +0100
 +++ src/sql/drivers/psql/qsql_psql.cpp
@@ -7,9 +7,8 @@
  # undef DEBUG
  #endif
 -#include <postgres.h>
--#include <libpq/libpq-fs.h>
 +#include <postgresql/server/postgres.h>
-+#include <postgresql/libpq/libpq-fs.h>
+ #include <libpq/libpq-fs.h>
  // PostgreSQL header <catalog/pg_type.h> redefines errno erroneously.
  #if defined(errno)
  # undef errno
diff -r 6ad1d5a61c8b -r a3b7d9a09a15 x11/qt3-psql/Makefile
--- a/x11/qt3-psql/Makefile     Tue Nov 01 14:57:52 2005 +0000
+++ b/x11/qt3-psql/Makefile     Tue Nov 01 15:20:50 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2005/09/27 09:15:40 adam Exp $
+# $NetBSD: Makefile,v 1.21 2005/11/01 15:20:51 joerg Exp $
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=               qt3-psql-${QTVERSION}
+PKGREVISION=           1
 COMMENT=               QT postgresql driver
 
 CONFIGURE_ARGS+=       -I${QTDIR}/include \
@@ -11,8 +12,6 @@
 
 BUILD_QT3=             yes
 
-PGSQL_VERSION_REQD=    73
-
 do-build:
        (cd ${WRKSRC}/plugins/src/sqldrivers/psql; \
                ${SETENV} ${MAKE_ENV} ${GMAKE})