-Deal with the iconv(3) mess a bit differently: allow NetBSD'd imake(3)

 to be recognized as non-gnu, otherwise the make system tries to pull
 in an additional libiconv which for some unknown reason does not break
 the standard build but leads to trouble with addon components.
 Specialcase NetBSD (which has different const'ification than what they
 consider classical iconv) in the code calling iconv(3) instead.
-Don't build TIFF support which was using an internal copy of libtiff.
 I'll commit a plugin for TIFF support in a minute.
-bump PKGREVISION

4 files changed, 62 insertions, 5 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 7c8339ac8fe..217188f9348 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2007/10/13 12:02:14 adam Exp $
+# $NetBSD: Makefile,v 1.15 2007/11/22 18:51:24 drochner Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
+PKGREVISION=	1
+
 PKGNAME=	qt4-libs-${QTVERSION}
 COMMENT=	C++ X GUI toolkit
 
@@ -14,7 +16,9 @@ BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
 
 PLIST_SRC=		${WRKDIR}/PLIST ${PKGDIR}/PLIST
 
+# built as plugins
 CONFIGURE_ARGS+=	-no-sql-sqlite
+CONFIGURE_ARGS+=	-no-libtiff
 
 do-install:
 	${INSTALL_DATA_DIR} ${QTPREFIX}
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index e6ab97c0225..53a62239dec 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2007/10/13 12:02:14 adam Exp $
+$NetBSD: distinfo,v 1.15 2007/11/22 18:51:24 drochner Exp $
 
 SHA1 (qt-x11-opensource-src-4.3.2.tar.gz) = 265fb56ded2e7ff101ebd722bd2bc1638f96057d
 RMD160 (qt-x11-opensource-src-4.3.2.tar.gz) = b73a3d7a1edd11987544291cce80b56f5a499969
@@ -16,4 +16,5 @@ SHA1 (patch-aj) = ed19733b78d40a98be3c2b11bb3c5ced7b022ff1
 SHA1 (patch-ak) = bd5d0f766a6ddcd801b94b4387d19b62edc8e4e1
 SHA1 (patch-al) = 606610ee684836d14e5893d295c0b131beeb9605
 SHA1 (patch-an) = 338d0cf6cdf38689c9f3770222802206dd8035a3
-SHA1 (patch-ao) = dd0c6e9fdb0c204f494d5ca4d49be2f0a20a1c81
+SHA1 (patch-ao) = 04361d820325b1b8a0bc66ecaf47bab5f92e7825
+SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
diff --git a/x11/qt4-libs/patches/patch-ao b/x11/qt4-libs/patches/patch-ao
index 9855239f52f..111135086ef 100644
--- a/x11/qt4-libs/patches/patch-ao
+++ b/x11/qt4-libs/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.1 2007/09/03 09:35:17 drochner Exp $
+$NetBSD: patch-ao,v 1.2 2007/11/22 18:51:25 drochner Exp $
 
---- ./src/corelib/codecs/qiconvcodec.cpp.orig	2007-08-07 15:08:39.000000000 +0200
+--- ./src/corelib/codecs/qiconvcodec.cpp.orig	2007-10-01 15:06:02.000000000 +0200
 +++ ./src/corelib/codecs/qiconvcodec.cpp
 @@ -44,7 +44,7 @@
  
@@ -11,6 +11,42 @@ $NetBSD: patch-ao,v 1.1 2007/09/03 09:35:17 drochner Exp $
  #  include <langinfo.h>
  #endif
  
+@@ -95,7 +95,7 @@ QString QIconvCodec::convertToUnicode(co
+     QByteArray ba;
+     size_t outBytesLeft = len * 2 + 2;
+     ba.resize(outBytesLeft);
+-#ifdef GNU_LIBICONV
++#if defined(GNU_LIBICONV) || defined(__NetBSD__)
+     // GNU doesn't disagree with POSIX :/
+     const char *inBytes = chars;
+ #else
+@@ -155,7 +155,7 @@ QByteArray QIconvCodec::convertFromUnico
+     ba.resize(outBytesLeft);
+     char *outBytes = ba.data();
+ 
+-#if defined(GNU_LIBICONV)
++#if defined(GNU_LIBICONV) || defined(__NetBSD__)
+     const char *inBytes;
+ #else
+     char *inBytes;
+@@ -165,7 +165,7 @@ QByteArray QIconvCodec::convertFromUnico
+ #if !defined(NO_BOM)
+     // give iconv() a BOM
+     QChar bom[] = { QChar(QChar::ByteOrderMark) };
+-#ifdef GNU_LIBICONV
++#if defined(GNU_LIBICONV) || defined(__NetBSD__)
+     // GNU doesn't disagree with POSIX :/
+     inBytes = reinterpret_cast<const char *>(bom);
+ #else
+@@ -179,7 +179,7 @@ QByteArray QIconvCodec::convertFromUnico
+ #endif // NO_BOM
+ 
+     // now feed iconv() the real data
+-#ifdef GNU_LIBICONV
++#if defined(GNU_LIBICONV) || defined(__NetBSD__)
+     // GNU doesn't disagree with POSIX :/
+     inBytes = reinterpret_cast<const char *>(uc);
+ #else
 @@ -244,7 +244,7 @@ iconv_t QIconvCodec::createIconv_t(const
      char *codeset = 0;
  #endif
diff --git a/x11/qt4-libs/patches/patch-ap b/x11/qt4-libs/patches/patch-ap
new file mode 100644
index 00000000000..bde3c0bc46f
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-ap
@@ -0,0 +1,16 @@
+$NetBSD: patch-ap,v 1.1 2007/11/22 18:51:25 drochner Exp $
+
+--- config.tests/unix/iconv/iconv.cpp.orig	2007-11-21 18:28:36.000000000 +0100
++++ config.tests/unix/iconv/iconv.cpp
+@@ -7,7 +7,11 @@ int main(int, char **)
+ {
+     iconv_t x = iconv_open("", "");
+ 
++#if defined(__NetBSD__)
++    const char *inp;
++#else
+     char *inp;
++#endif
+     char *outp;
+     size_t inbytes, outbytes;
+     iconv(x, &inp, &inbytes, &outp, &outbytes);