head	1.20;
access;
symbols
	pkgsrc-2026Q1:1.20.0.50
	pkgsrc-2026Q1-base:1.20
	pkgsrc-2025Q4:1.20.0.48
	pkgsrc-2025Q4-base:1.20
	pkgsrc-2025Q3:1.20.0.46
	pkgsrc-2025Q3-base:1.20
	pkgsrc-2025Q2:1.20.0.44
	pkgsrc-2025Q2-base:1.20
	pkgsrc-2025Q1:1.20.0.42
	pkgsrc-2025Q1-base:1.20
	pkgsrc-2024Q4:1.20.0.40
	pkgsrc-2024Q4-base:1.20
	pkgsrc-2024Q3:1.20.0.38
	pkgsrc-2024Q3-base:1.20
	pkgsrc-2024Q2:1.20.0.36
	pkgsrc-2024Q2-base:1.20
	pkgsrc-2024Q1:1.20.0.34
	pkgsrc-2024Q1-base:1.20
	pkgsrc-2023Q4:1.20.0.32
	pkgsrc-2023Q4-base:1.20
	pkgsrc-2023Q3:1.20.0.30
	pkgsrc-2023Q3-base:1.20
	pkgsrc-2023Q2:1.20.0.28
	pkgsrc-2023Q2-base:1.20
	pkgsrc-2023Q1:1.20.0.26
	pkgsrc-2023Q1-base:1.20
	pkgsrc-2022Q4:1.20.0.24
	pkgsrc-2022Q4-base:1.20
	pkgsrc-2022Q3:1.20.0.22
	pkgsrc-2022Q3-base:1.20
	pkgsrc-2022Q2:1.20.0.20
	pkgsrc-2022Q2-base:1.20
	pkgsrc-2022Q1:1.20.0.18
	pkgsrc-2022Q1-base:1.20
	pkgsrc-2021Q4:1.20.0.16
	pkgsrc-2021Q4-base:1.20
	pkgsrc-2021Q3:1.20.0.14
	pkgsrc-2021Q3-base:1.20
	pkgsrc-2021Q2:1.20.0.12
	pkgsrc-2021Q2-base:1.20
	pkgsrc-2021Q1:1.20.0.10
	pkgsrc-2021Q1-base:1.20
	pkgsrc-2020Q4:1.20.0.8
	pkgsrc-2020Q4-base:1.20
	pkgsrc-2020Q3:1.20.0.6
	pkgsrc-2020Q3-base:1.20
	pkgsrc-2020Q2:1.20.0.4
	pkgsrc-2020Q2-base:1.20
	pkgsrc-2020Q1:1.20.0.2
	pkgsrc-2020Q1-base:1.20
	pkgsrc-2019Q4:1.19.0.18
	pkgsrc-2019Q4-base:1.19
	pkgsrc-2019Q3:1.19.0.14
	pkgsrc-2019Q3-base:1.19
	pkgsrc-2019Q2:1.19.0.12
	pkgsrc-2019Q2-base:1.19
	pkgsrc-2019Q1:1.19.0.10
	pkgsrc-2019Q1-base:1.19
	pkgsrc-2018Q4:1.19.0.8
	pkgsrc-2018Q4-base:1.19
	pkgsrc-2018Q3:1.19.0.6
	pkgsrc-2018Q3-base:1.19
	pkgsrc-2018Q2:1.19.0.4
	pkgsrc-2018Q2-base:1.19
	pkgsrc-2018Q1:1.19.0.2
	pkgsrc-2018Q1-base:1.19
	pkgsrc-2017Q4:1.18.0.8
	pkgsrc-2017Q4-base:1.18
	pkgsrc-2017Q3:1.18.0.6
	pkgsrc-2017Q3-base:1.18
	pkgsrc-2017Q2:1.18.0.2
	pkgsrc-2017Q2-base:1.18
	pkgsrc-2017Q1:1.17.0.14
	pkgsrc-2017Q1-base:1.17
	pkgsrc-2016Q4:1.17.0.12
	pkgsrc-2016Q4-base:1.17
	pkgsrc-2016Q3:1.17.0.10
	pkgsrc-2016Q3-base:1.17
	pkgsrc-2016Q2:1.17.0.8
	pkgsrc-2016Q2-base:1.17
	pkgsrc-2016Q1:1.17.0.6
	pkgsrc-2016Q1-base:1.17
	pkgsrc-2015Q4:1.17.0.4
	pkgsrc-2015Q4-base:1.17
	pkgsrc-2015Q3:1.17.0.2
	pkgsrc-2015Q3-base:1.17
	pkgsrc-2015Q2:1.14.0.16
	pkgsrc-2015Q2-base:1.14
	pkgsrc-2015Q1:1.14.0.14
	pkgsrc-2015Q1-base:1.14
	pkgsrc-2014Q4:1.14.0.12
	pkgsrc-2014Q4-base:1.14
	pkgsrc-2014Q3:1.14.0.10
	pkgsrc-2014Q3-base:1.14
	pkgsrc-2014Q2:1.14.0.8
	pkgsrc-2014Q2-base:1.14
	pkgsrc-2014Q1:1.14.0.6
	pkgsrc-2014Q1-base:1.14
	pkgsrc-2013Q4:1.14.0.4
	pkgsrc-2013Q4-base:1.14
	pkgsrc-2013Q3:1.14.0.2
	pkgsrc-2013Q3-base:1.14
	pkgsrc-2013Q2:1.13.0.6
	pkgsrc-2013Q2-base:1.13
	pkgsrc-2013Q1:1.13.0.4
	pkgsrc-2013Q1-base:1.13
	pkgsrc-2012Q4:1.13.0.2
	pkgsrc-2012Q4-base:1.13
	pkgsrc-2012Q3:1.12.0.4
	pkgsrc-2012Q3-base:1.12
	pkgsrc-2012Q2:1.12.0.2
	pkgsrc-2012Q2-base:1.12
	pkgsrc-2012Q1:1.11.0.2
	pkgsrc-2012Q1-base:1.11
	pkgsrc-2011Q4:1.10.0.4
	pkgsrc-2011Q4-base:1.10
	pkgsrc-2011Q3:1.10.0.2
	pkgsrc-2011Q3-base:1.10
	pkgsrc-2011Q2:1.9.0.4
	pkgsrc-2011Q2-base:1.9
	pkgsrc-2011Q1:1.9.0.2
	pkgsrc-2011Q1-base:1.9
	pkgsrc-2010Q4:1.8.0.2
	pkgsrc-2010Q4-base:1.8
	pkgsrc-2010Q3:1.7.0.2
	pkgsrc-2010Q3-base:1.7
	pkgsrc-2010Q2:1.6.0.4
	pkgsrc-2010Q2-base:1.6
	pkgsrc-2010Q1:1.6.0.2
	pkgsrc-2010Q1-base:1.6
	pkgsrc-2009Q4:1.5.0.2
	pkgsrc-2009Q4-base:1.5
	pkgsrc-2009Q3:1.4.0.4
	pkgsrc-2009Q3-base:1.4
	pkgsrc-2009Q2:1.4.0.2
	pkgsrc-2009Q2-base:1.4
	pkgsrc-2009Q1:1.3.0.4
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.2
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.2.0.4
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.2
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.1.0.6
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.4
	pkgsrc-2008Q1:1.1.0.2
	pkgsrc-2008Q1-base:1.1;
locks; strict;
comment	@# @;


1.20
date	2020.03.24.20.38.03;	author joerg;	state Exp;
branches;
next	1.19;
commitid	qqem8ieiqu8OaH1C;

1.19
date	2018.01.17.18.37.34;	author markd;	state Exp;
branches;
next	1.18;
commitid	q0VUPpiP65EQ7gnA;

1.18
date	2017.05.26.12.09.11;	author jperkin;	state Exp;
branches;
next	1.17;
commitid	OROz06yuMO0YyTSz;

1.17
date	2015.07.18.11.11.53;	author adam;	state Exp;
branches;
next	1.16;
commitid	TW1HLJLkTE0B2Lty;

1.16
date	2015.07.08.17.49.49;	author wiz;	state Exp;
branches;
next	1.15;
commitid	ZgHjIskQk2xFyvsy;

1.15
date	2015.06.29.21.06.14;	author markd;	state Exp;
branches;
next	1.14;
commitid	9yheXok06LyiWmry;

1.14
date	2013.07.07.18.13.56;	author adam;	state Exp;
branches;
next	1.13;
commitid	fnM5tvxHjOL3czWw;

1.13
date	2012.12.07.10.06.13;	author adam;	state Exp;
branches;
next	1.12;

1.12
date	2012.04.09.09.12.49;	author adam;	state Exp;
branches;
next	1.11;

1.11
date	2012.01.12.22.59.58;	author adam;	state Exp;
branches;
next	1.10;

1.10
date	2011.08.14.08.56.21;	author mrg;	state Exp;
branches;
next	1.9;

1.9
date	2011.03.03.05.50.04;	author adam;	state Exp;
branches;
next	1.8;

1.8
date	2010.11.15.13.05.45;	author adam;	state Exp;
branches;
next	1.7;

1.7
date	2010.07.04.06.00.14;	author adam;	state Exp;
branches;
next	1.6;

1.6
date	2010.01.29.18.19.09;	author adam;	state Exp;
branches;
next	1.5;

1.5
date	2009.10.11.09.14.52;	author adam;	state Exp;
branches;
next	1.4;

1.4
date	2009.06.13.11.55.51;	author hasso;	state Exp;
branches;
next	1.3;

1.3
date	2008.10.26.14.02.33;	author adam;	state Exp;
branches;
next	1.2;

1.2
date	2008.07.24.12.55.20;	author markd;	state Exp;
branches;
next	1.1;

1.1
date	2008.01.08.08.35.19;	author markd;	state Exp;
branches;
next	;


desc
@@


1.20
log
@Drop webkit check from GCC, we don't care about such ancient versions
here and it actually breaks with recent clang versions.
@
text
@$NetBSD: patch-aq,v 1.19 2018/01/17 18:37:34 markd Exp $

--- configure.orig	2015-05-07 14:14:56.000000000 +0000
+++ configure
@@@@ -3227,13 +3227,13 @@@@ if [ -z "${CFG_HOST_ARCH}" ]; then
             CFG_HOST_ARCH=x86_64
         fi
         ;;
-    *:*:ppc)
+    *:*:ppc|*:*:powerpc)
         if [ "$OPT_VERBOSE" = "yes" ]; then
             echo "    32-bit PowerPC (powerpc)"
         fi
         CFG_HOST_ARCH=powerpc
         ;;
-    *:*:ppc64*)
+    *:*:ppc64|*:*:powerpc64)
         if [ "$OPT_VERBOSE" = "yes" ]; then
             echo "    64-bit PowerPC (powerpc)"
         fi
@@@@ -3263,6 +3263,19 @@@@ if [ -z "${CFG_HOST_ARCH}" ]; then
         fi
         CFG_HOST_ARCH=sparc
         ;;
+    NetBSD:*:sparc)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    NetBSD on SPARC"
+        fi
+        CFG_HOST_ARCH=sparc
+        ;;
+    NetBSD:*:sparc64)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    NetBSD on SPARC64"
+        fi
+        CFG_HOST_ARCH=sparc
+        CFG_HOST_BITSIZE=64
+        ;;
     QNX:*:*)
         case "$UNAME_MACHINE" in
         x86pc)
@@@@ -3571,7 +3584,7 @@@@ fi
 if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
     # get the darwin version. 10.0.0 and up means snow leopard.
     VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
-    if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ] && [ "$PLATFORM" == "macx-g++" ]; then
+    if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` = "MacOSX10.4u.sdk" ] && [ "$PLATFORM" = "macx-g++" ]; then
         echo
         echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
         echo
@@@@ -5009,7 +5022,7 @@@@ if true; then ###[ '!' -f "$outpath/bin/
         fi
         if [ "$BUILD_ON_MAC" = "yes" ]; then
             case "$PLATFORM" in
-            *macx-clang-libc++)
+            *macx-llvm)
                 # Avoid overriding the default configuration settings when building with clang/libc++
                 ;;
             *)
@@@@ -5078,7 +5091,7 @@@@ if true; then ###[ '!' -f "$outpath/bin/
     done
 
     QMAKE_BUILD_ERROR=no
-    (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
+    (cd "$outpath/qmake"; "$MAKE" $MAKE_FLAGS) || QMAKE_BUILD_ERROR=yes
     [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
     [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
     [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
@@@@ -7203,7 +7216,7 @@@@ fi
 # select Carbon on 10.4 Tiger.
 if [ "$PLATFORM_MAC" = "yes" ]; then
     VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
-    if [ "$VERSION" == 8 ]; then
+    if [ "$VERSION" = 8 ]; then
         CFG_MAC_COCOA="no";
         CFG_MAC_CARBON="yes";
     fi
@@@@ -7225,7 +7238,7 @@@@ fi
 # set the global Mac deployment target. This is overridden on an arch-by-arch basis
 # in some cases, see code further down
 case "$PLATFORM,$CFG_MAC_COCOA" in
-*macx-clang-libc++,yes)
+*macx-llvm,yes)
     # Avoid overriding the default configuration setting when building with clang/libc++
     ;;
 macx*,yes)
@@@@ -7713,7 +7726,7 @@@@ case "$XPLATFORM" in
 
 	# Check gcc's version
 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
-	    4*)
+	    6*|5*|4*)
 		;;
 	    3.4*)
 		canBuildQtXmlPatterns="no"
@@@@ -7731,20 +7744,6 @@@@ case "$XPLATFORM" in
 	canBuildWebKit="no"
 	canBuildQtXmlPatterns="no"
 	;;
-    *-g++*)
-	# Check gcc's version
-	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
-	    5*|4*|3.4*)
-		;;
-            3.3*)
-                canBuildWebKit="no"
-                ;;
-	    *)
-		canBuildWebKit="no"
-		canBuildQtXmlPatterns="no"
-		;;
-	esac
-	;;
     solaris-cc*)
         # Check the compiler version
         case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
@@@@ -7981,7 +7980,7 @@@@ fi
 # env. variable.
 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ]; then
     case "$PLATFORM" in
-    *macx-clang-libc++)
+    *macx-llvm)
         # Avoid overriding the default settings when building clang/libc++.
         ;;
     *)
@@@@ -8050,7 +8049,7 @@@@ g++*)
     3.*)
         COMPILER_VERSION="3.*"
         ;;
-    5*|4.*)
+    6*|5*|4.*)
         COMPILER_VERSION="4"
         ;;
     *)
@@@@ -8485,7 +8484,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
 [ "$CFG_IPV6" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
 [ "$CFG_SXE" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
-[ "$CFG_DBUS" = "no" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
+#[ "$CFG_DBUS" = "no" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
 
 if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then
     [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
@@@@ -8701,6 +8700,7 @@@@ cat >>"$QTCONFIG.tmp" <<EOF
 #configuration
 CONFIG += $QTCONFIG_CONFIG
 QT_ARCH = $CFG_ARCH
+QT_HOST_BITSIZE = $CFG_HOST_BITSIZE
 QT_EDITION = $Edition
 QT_CONFIG += $QT_CONFIG
 
@


1.19
log
@qt4-libs: Compile with openssl-1.1.0
@
text
@d1 1
a1 1
$NetBSD: patch-aq,v 1.18 2017/05/26 12:09:11 jperkin Exp $
d95 7
a101 4
@@@@ -7734,7 +7747,7 @@@@ case "$XPLATFORM" in
     *-g++*)
 	# Check gcc's version
 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
d103 14
a116 5
+	    [4-9]*|3.4*)
 		;;
             3.3*)
                 canBuildWebKit="no"
@@@@ -7981,7 +7994,7 @@@@ fi
d125 1
a125 1
@@@@ -8050,7 +8063,7 @@@@ g++*)
d134 1
a134 1
@@@@ -8485,7 +8498,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
d143 1
a143 1
@@@@ -8701,6 +8714,7 @@@@ cat >>"$QTCONFIG.tmp" <<EOF
@


1.18
log
@SunOS and GCC >=6.x fixes.
@
text
@d1 1
a1 1
$NetBSD: patch-aq,v 1.17 2015/07/18 11:11:53 adam Exp $
d91 1
a91 1
+	    5*|4*)
d113 9
@


1.17
log
@On OS X, fix buiding with -stdlib=libc++
@
text
@d1 1
a1 1
$NetBSD$
d95 9
@


1.16
log
@Update qt4 to 4.8.7.

I am happy to announce release of Qt 4.8.7 today bringing over 150
improvements and bug fixes. Qt 4.8.7 provides important security
updates, better support for Mac OS X 10.10 and many requested error
corrections. As a patch release, it does not add new functionality
and maintains full compatibility with previous Qt 4.8.x releases.

Highlights of Qt 4.8.7 are:

    Security fix for DoS vulnerability in the BMP image handler
    (CVE-2015-0295) as well as security fixes for vulnerabilities
    in image handling of BMP (CVE-2015-1858), ICO (CVE-2015-1859)
    and GIF (CVE-2015-1860)
    Update 3rd party libpng to version 1.6.17 to address known
    vulnerabilities in previous version
    Update 3rd party libtiff to version 4.0.3 to address known
    vulnerabilities in previous version
    Better support for running Qt 4.8 applications on Mac OS X
    10.10 Yosemite
    Many customer requested bug fixes
@
text
@d1 1
a1 1
$NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $
d50 9
d77 9
d95 9
@


1.15
log
@Fix build with gcc 5.x
@
text
@d1 1
a1 1
$NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $
d3 1
a3 1
--- configure.orig	2014-04-10 18:37:08.000000000 +0000
d5 1
a5 1
@@@@ -3223,13 +3223,13 @@@@ if [ -z "${CFG_HOST_ARCH}" ]; then
d16 1
a16 1
-    *:*:ppc64)
d21 1
a21 1
@@@@ -3259,6 +3259,19 @@@@ if [ -z "${CFG_HOST_ARCH}" ]; then
d41 1
a41 1
@@@@ -3567,7 +3580,7 @@@@ fi
d50 1
a50 1
@@@@ -5074,7 +5087,7 @@@@ if true; then ###[ '!' -f "$outpath/bin/
d59 1
a59 1
@@@@ -7198,7 +7211,7 @@@@ fi
d68 2
a69 2
@@@@ -7729,7 +7742,7 @@@@ case "$XPLATFORM" in
     *-g++*)
d72 2
a73 2
-	    4*|3.4*)
+	    5*|4*|3.4*)
d75 3
a77 3
             3.3*)
                 canBuildWebKit="no"
@@@@ -8475,7 +8488,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
d86 1
a86 1
@@@@ -8691,6 +8704,7 @@@@ cat >>"$QTCONFIG.tmp" <<EOF
@


1.14
log
@Qt 4.8.5 provides overall close to 400 improvements, for example:
35 fixes to Qt Core module
65 fixes to Qt Gui module
21 Mac OS X specific fixes
15 Windows specific fixes
8 Linux/X11 specific fixes
Webkit upgrade to 2.2.4 (minor improvements)
Change all shmget calls to user-only memory (security)
Several important fixes for the VxWorks port in the Qt Enterprise version
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- configure.orig	2013-06-07 05:16:41.000000000 +0000
d21 1
a21 1
@@@@ -3253,6 +3253,19 @@@@ if [ -z "${CFG_HOST_ARCH}" ]; then
d41 1
a41 1
@@@@ -3561,7 +3574,7 @@@@ fi
d50 1
a50 1
@@@@ -5058,7 +5071,7 @@@@ if true; then ###[ '!' -f "$outpath/bin/
d59 1
a59 1
@@@@ -7158,7 +7171,7 @@@@ fi
d68 10
a77 1
@@@@ -8422,7 +8435,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
d86 1
a86 1
@@@@ -8638,6 +8651,7 @@@@ cat >>"$QTCONFIG.tmp" <<EOF
@


1.13
log
@Qt 4.8.4 is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.8.0, 4.8.1, 4.8.2 and 4.8.3.
For more details, refer to the online documentation included in this
distribution. The documentation is also available online:

http://qt-project.org/doc/4.8

The Qt version 4.8 series is binary compatible with the 4.7.x series.
Applications compiled for 4.7 will continue to run with 4.8.

Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Qt Bug Tracker or the Merge Request queue
of the public source repository.
@
text
@d3 1
a3 1
--- configure.orig	2012-11-23 10:11:23.000000000 +0000
d5 1
a5 1
@@@@ -3224,13 +3224,13 @@@@ if [ -z "${CFG_HOST_ARCH}" ]; then
d21 1
a21 1
@@@@ -3254,6 +3254,19 @@@@ if [ -z "${CFG_HOST_ARCH}" ]; then
d41 1
a41 1
@@@@ -3562,7 +3575,7 @@@@ fi
d45 2
a46 2
-    if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then
+    if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then
d50 1
a50 1
@@@@ -5049,7 +5062,7 @@@@ if true; then ###[ '!' -f "$outpath/bin/
d59 1
a59 1
@@@@ -7140,7 +7153,7 @@@@ fi
d68 1
a68 1
@@@@ -8402,7 +8415,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
d77 1
a77 1
@@@@ -8618,6 +8631,7 @@@@ cat >>"$QTCONFIG.tmp" <<EOF
@


1.12
log
@Changes 4.8.1:
Qt 4.8.1 is the first patch release to the 4.8 series with over 200 functional
improvements to the desktop and embedded platforms. The majority of the error
corrections, made primarily by Digia, have been on desktop and embedded
platforms with a large number of fixes with focus on QtCore, QtGUI and
QtNetwork. These fixes benefit all desktop platforms. Qt 4.8.1 also includes
Mac App Store support.
@
text
@d3 1
a3 1
--- configure.orig	2012-03-14 14:01:12.000000000 +0000
d5 1
a5 1
@@@@ -3100,13 +3100,13 @@@@ if [ -z "${CFG_HOST_ARCH}" ]; then
d21 1
a21 1
@@@@ -3130,6 +3130,19 @@@@ if [ -z "${CFG_HOST_ARCH}" ]; then
d41 1
a41 1
@@@@ -3466,7 +3479,7 @@@@ fi
d50 1
a50 1
@@@@ -4970,7 +4983,7 @@@@ if true; then ###[ '!' -f "$outpath/bin/
d59 1
a59 1
@@@@ -6994,7 +7007,7 @@@@ fi
d68 1
a68 1
@@@@ -8247,7 +8260,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
d77 1
a77 1
@@@@ -8452,6 +8465,7 @@@@ cat >>"$QTCONFIG.tmp" <<EOF
@


1.11
log
@Changes 4.8.0:
Featuring Qt Platform Abstraction, threaded OpenGL support, multithreaded HTTP
and optimized file system access.
@
text
@d3 1
a3 1
--- configure.orig	2011-12-08 05:06:02.000000000 +0000
d68 1
a68 1
@@@@ -8245,7 +8258,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
d77 1
a77 1
@@@@ -8450,6 +8463,7 @@@@ cat >>"$QTCONFIG.tmp" <<EOF
@


1.10
log
@add support for building on netbsd/sparc64 and netbsd/powerpc systems.
@
text
@d1 1
a1 1
$NetBSD: patch-aq,v 1.9 2011/03/03 05:50:04 adam Exp $
d3 3
a5 3
--- configure.orig	2011-03-29 22:16:21.000000000 -0700
+++ configure	2011-08-07 21:32:05.000000000 -0700
@@@@ -2965,13 +2965,13 @@@@
d21 1
a21 1
@@@@ -2995,6 +2995,19 @@@@
d41 1
a41 1
@@@@ -3297,7 +3310,7 @@@@
d50 1
a50 1
@@@@ -4755,7 +4768,7 @@@@
d59 1
a59 1
@@@@ -6580,7 +6593,7 @@@@
d68 1
a68 1
@@@@ -7788,7 +7801,7 @@@@
d75 1
a75 1
 if [ "$PLATFORM_QWS" != "yes" ]; then
d77 1
a77 1
@@@@ -7983,6 +7996,7 @@@@
@


1.9
log
@Changes 4.7.2:
This is a maintenance release which contains bug-fixes based on feedback and
contributions since the Qt 4.7.1 release back in November.  It also marks the
official release of Qt Quick.

Qt Quick is a new feature within Qt that makes it easy to create light-weight
apps and UIs. It contains the new QML language, the Qt Declarative module, and
new tooling in Qt Creator to easily build apps.

PkgSrc: now builds with Clang.
@
text
@d1 1
a1 1
$NetBSD$
d3 39
a41 3
--- configure.orig	2011-02-22 12:02:53.000000000 +0000
+++ configure
@@@@ -3297,7 +3297,7 @@@@ fi
d50 1
a50 1
@@@@ -4755,7 +4755,7 @@@@ if true; then ###[ '!' -f "$outpath/bin/
d59 1
a59 1
@@@@ -6580,7 +6580,7 @@@@ fi
d68 1
a68 1
@@@@ -7788,7 +7788,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
d77 8
@


1.8
log
@Changes 4.7.1:
Qt 4.7.1 is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.7.0.  For more details,
refer to the online documentation included in this distribution. The
documentation is also available online:

  http://qt.nokia.com/doc/4.7

The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.


Changes 4.7.0:
Qt 4.7 introduces many new features and improvements as well as bugfixes
over the 4.6.x series. For more details, refer to the online documentation
included in this distribution. The documentation is also available online:

  http://qt.nokia.com/doc/4.7

The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.
@
text
@d3 1
a3 1
--- configure.orig	2010-11-06 01:55:00.000000000 +0000
d5 1
a5 1
@@@@ -3272,7 +3272,7 @@@@ fi
d14 1
a14 1
@@@@ -4733,7 +4733,7 @@@@ if true; then ###[ '!' -f "$outpath/bin/
d23 1
a23 1
@@@@ -6556,7 +6556,7 @@@@ fi
d32 1
a32 1
@@@@ -7754,7 +7754,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
@


1.7
log
@Changes 4.6.3:
* Added Spectrum analyzer demo application.
* Added exit softkey to Wiggly example.
* Added close button to Anomaly demo.
* Fixed Anomaly demo controlstrip icon placement for very small screens.
* Ensure history configuration is cleared when a state machine is restarted.
For more read: http://qt.nokia.com/developer/changes/changes-4.6.3
@
text
@d3 1
a3 1
--- configure.orig	2010-06-02 02:03:10.000000000 +0000
d5 1
a5 1
@@@@ -3071,7 +3071,7 @@@@ fi
d14 19
a32 1
@@@@ -7002,7 +7002,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
@


1.6
log
@Changes 4.6.1:
* Optimized empty QUrl creation
* Improve performance of getting the canonical filename on Linux
  and Symbian by using realpath() system call.
* Avoid stat() when opening a file.
* Do not look at the Qt patch-level version embedded in plugins'
  buildkeys when trying to determine if the plugin is compatible
* Bug-fixes
* load() and loadFromData() can now support compressed GL textures
  in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics
  system is active and the appropriate extensions are present in the
  GL implementation.
* Fixed a small leak when using the new QPixmapCache::Key based API.
@
text
@d3 1
a3 1
--- configure.orig	2010-01-15 17:01:30.000000000 +0000
d5 1
a5 1
@@@@ -3069,7 +3069,7 @@@@ fi
d14 1
a14 1
@@@@ -7012,7 +7012,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
@


1.5
log
@Changes 4.5.3:
* This is a bug-fix release.
@
text
@d3 1
a3 1
--- configure.orig	2009-09-29 13:01:31.000000000 +0200
d5 10
a14 42
@@@@ -2798,7 +2798,7 @@@@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ 
 fi
 
 #auto-detect DWARF2 on the mac
-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
     if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
         CFG_MAC_DWARF2=no
     else
@@@@ -2807,7 +2807,7 @@@@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CF
 fi
 
 # auto-detect support for -Xarch on the mac
-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then
     if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
         CFG_MAC_XARCH=no
     else
@@@@ -5587,18 +5587,18 @@@@ fi
 
 # Set the default arch. Select 32-bit/carbon if nothing else has 
 # been specified on the configure line.
-if [ "$PLATFORM_MAC" = "yes" ]  && [ "$CFG_MAC_ARCHS" == "" ]; then
+if [ "$PLATFORM_MAC" = "yes" ]  && [ "$CFG_MAC_ARCHS" = "" ]; then
     source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests"
 
-    if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then
+    if [ "$QT_MAC_DEFUALT_ARCH" = "x86_64" ]; then
         CFG_MAC_ARCHS=" x86"
-    elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then
+    elif [ "$QT_MAC_DEFUALT_ARCH" = "ppc64" ]; then
         CFG_MAC_ARCHS=" ppc"
     else
         CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH"
     fi
 
-    [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS."
+    [ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS."
 fi
 
 # enable cocoa and/or carbon on Mac
@@@@ -6538,7 +6538,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
a22 9
@@@@ -6856,7 +6856,7 @@@@ EOF
 *) ;;
 esac
 
-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "no" ]  && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" == "yes" ]; then
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ]  && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
     cat <<EOF
         WARNING: DWARF2 debug symbols are not enabled. Linking webkit
         in debug mode will run out of memory on systems with 2GB or less.
@


1.4
log
@Update to 4.5.1. Most of work done by Matthias Drochner. Upstream changelog
is too massive, see http://doc.qtsoftware.com/4.5/qt4-5-intro.html as
starting point.
@
text
@d3 1
a3 1
--- configure.orig	2009-04-22 01:57:35.000000000 +0200
d5 1
a5 1
@@@@ -2745,7 +2745,7 @@@@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ 
d14 1
a14 1
@@@@ -2754,7 +2754,7 @@@@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CF
d23 1
a23 1
@@@@ -5504,18 +5504,18 @@@@ fi
d46 1
a46 1
@@@@ -6445,7 +6445,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
d55 1
a55 1
@@@@ -6762,7 +6762,7 @@@@ EOF
@


1.3
log
@Changes 4.4.3:
* Updated application icons and other graphics to reflect the look
  and feel of the new Qt brand.
* Copyright of Qt has been transferred to Nokia Corporation.
@
text
@d3 1
a3 1
--- configure.orig	2008-09-27 10:58:41.000000000 +0200
d5 43
a47 2
@@@@ -5856,7 +5856,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
 [ "$CFG_TABLET" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_TABLET"
d53 11
a63 2
 # X11/Unix/Mac only configs
 [ "$CFG_CUPS" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
@


1.2
log
@Update qt4 to 4.4.0

Qt 4.4 introduces many new features as well as many improvements and
bugfixes over the 4.3.x series. For more details, see the online
documentation which is included in this distribution. The
documentation is also available at http://doc.trolltech.com/4.4

The Qt version 4.4 series is binary compatible with the 4.3.x series.
A long list of changes can be found in the changes-4.4.0 file in the
distribution.

Update OKed (and initial work provided) by adam@@..
@
text
@d1 1
a1 1
$NetBSD: patch-aq,v 1.1 2008/01/08 08:35:19 markd Exp $
d3 1
a3 4
Dont default QT_NO_DBUS on in qconfig.h to be consistent with qt4-qdbus
package.

--- configure.orig	2008-04-29 01:11:12.000000000 +1200
d5 1
a5 1
@@@@ -5837,7 +5837,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
@


1.1
log
@Dont default QT_NO_DBUS to on in qconfig.h to be consistent with qt4-qdbus
package. (and therefore set it explicitly in qt4-tools)
Bump PKGREVISION of qt4-libs.
@
text
@d1 1
a1 1
$NetBSD$
d6 1
a6 1
--- configure.orig	2007-12-05 05:42:56.000000000 +1300
d8 1
a8 1
@@@@ -5281,7 +5281,7 @@@@ QMakeVar set sql-plugins "$SQL_PLUGINS"
d12 2
a13 2
-[ "$CFG_QDBUS" != "yes" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
+#[ "$CFG_QDBUS" != "yes" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
@