update py-qt3 to 3.15

changes:
-sync with newer qscintilla
-bugfixes

10 files changed, 57 insertions, 59 deletions

diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common
index c79b377c7e4..3e1bc4ceca5 100644
--- a/x11/py-qt3-base/Makefile.common
+++ b/x11/py-qt3-base/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.1 2005/07/01 01:20:28 reed Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/10/06 17:57:49 drochner Exp $
 #
 
 # XXX: when updating version, be sure to update distinfo for both
 # XXX: PyQt-mac-gpl and PyQt-x11-gpl in py-qt3-qscintilla,
 # XXX: py-qt3-base, and py-qt3-modules.
 
-PYQT_VERSION=		3.14.1
+PYQT_VERSION=		3.15
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
 
diff --git a/x11/py-qt3-base/distinfo b/x11/py-qt3-base/distinfo
index 06bb0df5222..7f9701f0fd9 100644
--- a/x11/py-qt3-base/distinfo
+++ b/x11/py-qt3-base/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.8 2005/07/01 01:35:10 reed Exp $
+$NetBSD: distinfo,v 1.9 2005/10/06 17:57:49 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-3.14.1.tar.gz) = b29c1d319c132ba09648f70e01f7af1fa92c18b0
-RMD160 (PyQt-x11-gpl-3.14.1.tar.gz) = d8caef8513bc715f2f0e6107daa5d6d2ba883ddb
-Size (PyQt-x11-gpl-3.14.1.tar.gz) = 782274 bytes
-SHA1 (PyQt-mac-gpl-3.14.1.tar.gz) = 391edbd2a06d5a50802a44a81c95ab0aa067d928
-RMD160 (PyQt-mac-gpl-3.14.1.tar.gz) = 79e62b2775e229c325eff0c3d6f837e00f431dde
-Size (PyQt-mac-gpl-3.14.1.tar.gz) = 776559 bytes
-SHA1 (patch-aa) = f77e1969b0403e96c9445018ed71f431f32dcfb2
+SHA1 (PyQt-x11-gpl-3.15.tar.gz) = 47c2729fb423dc19eb96255a1d0791c714b88754
+RMD160 (PyQt-x11-gpl-3.15.tar.gz) = d4db0a21013ea1b5338d74441ee50c41de7f25d9
+Size (PyQt-x11-gpl-3.15.tar.gz) = 789772 bytes
+SHA1 (patch-aa) = 9dd8356bf79f2a5fdb96603ccf679abd648d3585
 SHA1 (patch-ab) = 46cf5b2eb3481a9f5a1264f11abc57421c4d47a0
 SHA1 (patch-ac) = c3cd88ef6119f224920c0b8e6852b35052e6751a
diff --git a/x11/py-qt3-base/patches/patch-aa b/x11/py-qt3-base/patches/patch-aa
index 7434db354cd..fb3d7d32262 100644
--- a/x11/py-qt3-base/patches/patch-aa
+++ b/x11/py-qt3-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
 
---- configure.py.orig	2005-02-19 16:49:33.000000000 +0100
+--- configure.py.orig	2005-08-30 19:42:52.000000000 +0200
 +++ configure.py
-@@ -732,7 +732,7 @@ def check_license():
+@@ -733,7 +733,7 @@ def check_license():
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -768,7 +768,7 @@ def create_makefiles():
+@@ -769,7 +769,7 @@ def create_makefiles():
  
          sipconfig.inform("Creating pyuic Makefile...")
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
              buildfile= "pyuic-prof.sbf"
  
              for xml in ("qdom.cpp", "qxml.cpp"):
-@@ -789,7 +789,7 @@ def create_makefiles():
+@@ -790,7 +790,7 @@ def create_makefiles():
          makefile.extra_defines.append("UIC")
          makefile.extra_defines.append("QT_INTERNAL_XML")
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
              makefile.extra_defines.append("QT_MODULE_XML")
  
          if sipcfg.qt_version < 0x030100:
-@@ -800,7 +800,7 @@ def create_makefiles():
+@@ -801,7 +801,7 @@ def create_makefiles():
  
          sipconfig.inform("Creating pylupdate Makefile...")
  
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
              buildfile= "pylupdate-prof.sbf"
  
              shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
-@@ -819,7 +819,7 @@ def create_makefiles():
+@@ -820,7 +820,7 @@ def create_makefiles():
  
          makefile.extra_defines.append("QT_INTERNAL_XML")
  
@@ -47,8 +47,8 @@ $NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
              makefile.extra_defines.append("QT_MODULE_XML")
  
          makefile.generate()
-@@ -936,26 +936,26 @@ def main(argv):
-             sipcfg.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
+@@ -937,26 +937,26 @@ def main(argv):
+             sipconfig.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
  
      # Check for QScintilla.
 -    check_qscintilla()
diff --git a/x11/py-qt3-modules/distinfo b/x11/py-qt3-modules/distinfo
index 56b9dafb114..6a915f356c5 100644
--- a/x11/py-qt3-modules/distinfo
+++ b/x11/py-qt3-modules/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/07/01 01:20:28 reed Exp $
+$NetBSD: distinfo,v 1.10 2005/10/06 17:57:49 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-3.14.1.tar.gz) = b29c1d319c132ba09648f70e01f7af1fa92c18b0
-RMD160 (PyQt-x11-gpl-3.14.1.tar.gz) = d8caef8513bc715f2f0e6107daa5d6d2ba883ddb
-Size (PyQt-x11-gpl-3.14.1.tar.gz) = 782274 bytes
-SHA1 (PyQt-mac-gpl-3.14.1.tar.gz) = 391edbd2a06d5a50802a44a81c95ab0aa067d928
-RMD160 (PyQt-mac-gpl-3.14.1.tar.gz) = 79e62b2775e229c325eff0c3d6f837e00f431dde
-Size (PyQt-mac-gpl-3.14.1.tar.gz) = 776559 bytes
-SHA1 (patch-aa) = 7119fe04aa5bb82c2775a9458238cc99590c3c1c
+SHA1 (PyQt-x11-gpl-3.15.tar.gz) = 47c2729fb423dc19eb96255a1d0791c714b88754
+RMD160 (PyQt-x11-gpl-3.15.tar.gz) = d4db0a21013ea1b5338d74441ee50c41de7f25d9
+Size (PyQt-x11-gpl-3.15.tar.gz) = 789772 bytes
+SHA1 (patch-aa) = 298f30c8e549f107b042fc59539537bac3a463f6
diff --git a/x11/py-qt3-modules/patches/patch-aa b/x11/py-qt3-modules/patches/patch-aa
index bfa4661ca0a..74fa250640d 100644
--- a/x11/py-qt3-modules/patches/patch-aa
+++ b/x11/py-qt3-modules/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
 
---- configure.py.orig	2005-02-19 16:49:33.000000000 +0100
+--- configure.py.orig	2005-08-30 19:42:52.000000000 +0200
 +++ configure.py
-@@ -38,7 +38,7 @@ pyqt_version_str = "3.14"
+@@ -38,7 +38,7 @@ pyqt_version_str = "3.15"
  sip_min_v3_version = 0x030c00
- sip_min_v4_version = 0x040200
+ sip_min_v4_version = 0x040300
  
 -pyqt_modules = ["qt"]
 +pyqt_modules = []
  qt_sip_flags = []
  qtext_sip_flags = []
  qtpe_sip_flags = []
-@@ -732,7 +732,7 @@ def check_license():
+@@ -733,7 +733,7 @@ def check_license():
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -766,64 +766,64 @@ def create_makefiles():
+@@ -767,64 +767,64 @@ def create_makefiles():
          # The Professional Edition needs special handling.
          prof = (sipcfg.qt_edition == "professional")
  
@@ -138,16 +138,16 @@ $NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
      elif sipcfg.qt_version >= 0x020000:
          sipconfig.inform("Creating pyuic Makefile...")
  
-@@ -936,7 +936,7 @@ def main(argv):
-             sipcfg.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
+@@ -937,7 +937,7 @@ def main(argv):
+             sipconfig.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
  
      # Check for QScintilla.
 -    check_qscintilla()
-+    #check_qscintilla()
++#    check_qscintilla()
  
      # Check which modules to build.
      check_module("qtcanvas", "qcanvas.h", "QCanvas()")
-@@ -954,8 +954,8 @@ def main(argv):
+@@ -955,8 +955,8 @@ def main(argv):
              if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
                  check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
  
diff --git a/x11/py-qt3-qscintilla/PLIST b/x11/py-qt3-qscintilla/PLIST
index a6d843525ef..687671771fd 100644
--- a/x11/py-qt3-qscintilla/PLIST
+++ b/x11/py-qt3-qscintilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/24 20:17:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/10/06 17:57:49 drochner Exp $
 ${PYSITELIB}/qtext.so
 share/sip${PYVERSSUFFIX}/qtext/copying.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintilla.sip
@@ -9,17 +9,24 @@ share/sip${PYVERSSUFFIX}/qtext/qextscintillacommandset.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintilladocument.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexer.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerbash.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerbatch.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexercpp.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexercsharp.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexercss.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerdiff.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerhtml.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexeridl.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerjava.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerjavascript.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerlua.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexermakefile.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerperl.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerpov.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerproperties.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerpython.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerruby.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexersql.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexertex.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillamacro.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillaprinter.sip
 share/sip${PYVERSSUFFIX}/qtext/qtextmod.sip
diff --git a/x11/py-qt3-qscintilla/distinfo b/x11/py-qt3-qscintilla/distinfo
index 652b0c1e309..91d5b431873 100644
--- a/x11/py-qt3-qscintilla/distinfo
+++ b/x11/py-qt3-qscintilla/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/07/01 01:30:21 reed Exp $
+$NetBSD: distinfo,v 1.9 2005/10/06 17:57:49 drochner Exp $
 
-SHA1 (PyQt-mac-gpl-3.14.1.tar.gz) = 391edbd2a06d5a50802a44a81c95ab0aa067d928
-RMD160 (PyQt-mac-gpl-3.14.1.tar.gz) = 79e62b2775e229c325eff0c3d6f837e00f431dde
-Size (PyQt-mac-gpl-3.14.1.tar.gz) = 776559 bytes
-SHA1 (PyQt-x11-gpl-3.14.1.tar.gz) = b29c1d319c132ba09648f70e01f7af1fa92c18b0
-RMD160 (PyQt-x11-gpl-3.14.1.tar.gz) = d8caef8513bc715f2f0e6107daa5d6d2ba883ddb
-Size (PyQt-x11-gpl-3.14.1.tar.gz) = 782274 bytes
-SHA1 (patch-aa) = 121dcbed6010852d9b3feaf6d2968d4c5e2624f6
+SHA1 (PyQt-x11-gpl-3.15.tar.gz) = 47c2729fb423dc19eb96255a1d0791c714b88754
+RMD160 (PyQt-x11-gpl-3.15.tar.gz) = d4db0a21013ea1b5338d74441ee50c41de7f25d9
+Size (PyQt-x11-gpl-3.15.tar.gz) = 789772 bytes
+SHA1 (patch-aa) = 390a4651ebc7545bb75f230addb892828a0203f8
diff --git a/x11/py-qt3-qscintilla/patches/patch-aa b/x11/py-qt3-qscintilla/patches/patch-aa
index aa9bd44107c..29f1a1d7b31 100644
--- a/x11/py-qt3-qscintilla/patches/patch-aa
+++ b/x11/py-qt3-qscintilla/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
 
---- configure.py.orig	2005-02-19 16:49:33.000000000 +0100
+--- configure.py.orig	2005-08-30 19:42:52.000000000 +0200
 +++ configure.py
-@@ -38,7 +38,7 @@ pyqt_version_str = "3.14"
+@@ -38,7 +38,7 @@ pyqt_version_str = "3.15"
  sip_min_v3_version = 0x030c00
- sip_min_v4_version = 0x040200
+ sip_min_v4_version = 0x040300
  
 -pyqt_modules = ["qt"]
 +pyqt_modules = []
  qt_sip_flags = []
  qtext_sip_flags = []
  qtpe_sip_flags = []
-@@ -732,7 +732,7 @@ def check_license():
+@@ -733,7 +733,7 @@ def check_license():
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -766,64 +766,64 @@ def create_makefiles():
+@@ -767,64 +767,64 @@ def create_makefiles():
          # The Professional Edition needs special handling.
          prof = (sipcfg.qt_edition == "professional")
  
@@ -138,7 +138,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
      elif sipcfg.qt_version >= 0x020000:
          sipconfig.inform("Creating pyuic Makefile...")
  
-@@ -939,20 +939,20 @@ def main(argv):
+@@ -940,20 +940,20 @@ def main(argv):
      check_qscintilla()
  
      # Check which modules to build.
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 70d986f62cd..fafb5484ac3 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/09/01 01:01:19 reed Exp $
+# $NetBSD: Makefile,v 1.19 2005/10/06 17:57:49 drochner Exp $
 #
 
-DISTNAME=	sip-4.2.1
+DISTNAME=	sip-4.3.1
 PKGNAME=	${PYPKGPREFIX}-qt3-${DISTNAME}
 CATEGORIES=	x11 devel python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/sip/
diff --git a/x11/py-qt3-sip/distinfo b/x11/py-qt3-sip/distinfo
index 848dab2b0fe..62b8928df34 100644
--- a/x11/py-qt3-sip/distinfo
+++ b/x11/py-qt3-sip/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/05/02 15:35:39 drochner Exp $
+$NetBSD: distinfo,v 1.7 2005/10/06 17:57:49 drochner Exp $
 
-SHA1 (sip-4.2.1.tar.gz) = 6377f969c41cb9050260c46955d52a6bce32ce85
-RMD160 (sip-4.2.1.tar.gz) = f65e3adcfbd3e2030051aba5a7c96daad39a8599
-Size (sip-4.2.1.tar.gz) = 313308 bytes
+SHA1 (sip-4.3.1.tar.gz) = c6537030407222b70d78158315bc26a25f6b892c
+RMD160 (sip-4.3.1.tar.gz) = b1ba6e515a5c1852db9d1234f38db1685ed97114
+Size (sip-4.3.1.tar.gz) = 332504 bytes
 SHA1 (patch-aa) = 23dc24a4c5f814213741af9390a86d860fa535cf
 SHA1 (patch-ab) = b16d9cb57c46bab01052896195be35a9b7b88246