update py-qt3-{base,modules,qscintilla} to 3.11 and bl3ify

v3.11 11th March 2004
	Added the QIconDragEvent and QLocale classes from Qt v3.3.0.  Updated
	all existing classes to Qt v3.3.1.  Added the missing QSocketDevice
	class.  Added the missing QString += operators.

v3.10 16th January 2004
	Added the QFtp, QHttp, QHttpHeader, QHttpRequestHeader,
	QHttpResponseHeader, QLocalFs classes.

v3.9 7th December 2003
	This version requires SIP v3.9 (or later) or SIP v4.0rc1 (or later).
	QLayoutIterator.next() is now documented.  Added the QImageIO and
	QListViewItemIterator classes.  Added the QDockArea << and >>
	operators.  Added QSettings.readBoolEntry().  Added qInstallPath(),
	qInstallPathDocs(), qInstallPathHeaders(), qInstallPathLibs(),
	qInstallPathBins(), qInstallPathPlugins(), qInstallPathData(),
	qInstallPathTranslations(), qInstallPathSysconf().  A new
	(configure.py) build system has been added which is independent of
	tmake and qmake and installs a pyqtconfig module.  The old (build.py)
	build system remains.  Added the -r flag to the build systems to enable
	tracing.  Added the -v flag to the build systems to specify the default
	location for .sip files.

v3.8.1 6th September 2003
	Added the missing QWMatrix.mapRect() * operators.  The supported
	educational version is now Qt v3.2.0.

6 files changed, 232 insertions, 193 deletions

diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index 450ea69bf74..709a68633e0 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/09 17:06:07 recht Exp $
 #
 
-DISTNAME=		PyQt-x11-gpl-3.8
-PKGNAME=		${PYPKGPREFIX}-qt3-qscintilla-3.8
+DISTNAME=		PyQt-x11-gpl-3.11
+PKGNAME=		${PYPKGPREFIX}-qt3-qscintilla-3.11
 CATEGORIES=		x11
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
 
@@ -10,42 +10,29 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.riverbankcomputing.co.uk/pyqt/
 COMMENT=		Python binding for qt3
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
 USE_GNU_TOOLS+=		make
+USE_LANGUAGES=		c c++
 
-CONFIGURE_ARGS=		-q ${QTDIR} -m ${GMAKE} -p ${SIPBIN}
+CONFIGURE_ARGS=		-b ${PREFIX}/bin
+CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
+CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
+CONFIGURE_ARGS+=	-n ${QTDIR}/include
+CONFIGURE_ARGS+=	-o ${QTDIR}/lib
 
-PYTHON_VERSIONS_ACCEPTED=	22pth 23pth 21pth
+PYTHON_VERSIONS_ACCEPTED=	23pth 22pth 21pth
 PY_PATCHPLIST=	yes
-QTLIBDIR=	${QTDIR:S/${BUILDLINK_PREFIX.qt3-libs}\///}/lib
-PLIST_SUBST+=	QTLIBDIR=${QTLIBDIR}
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
-MAKE_ENV+=	QTPREFIX=${QTDIR}
+INSTALL_DIRS=	${WRKSRC}/qtext
 
 do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} build.py ${CONFIGURE_ARGS})
-
-PYQTMODULES=	qtext
-
-# XXX - hack. Shouldn't need the symlinks as qmake should let us build
-# proper libraries that install outside of QTDIR more easily.
-do-install:
-	(for f in ${PYQTMODULES}; do \
-		(cd ${WRKSRC}/$${f} && ( \
-			${INSTALL_DATA} $${f}.py ${PREFIX}/${PYSITELIB}; \
-			${LIBTOOL} --mode=install ${INSTALL_DATA} \
-				lib$${f}cmodule.la ${PREFIX}/${PYSITELIB} \
-			) \
-		); \
-	 done)
-	(cd ${PREFIX}/${PYSITELIB}; for i in libqtextcmodule.*; do \
-		${LN} -sf ${PREFIX}/${PYSITELIB}/$$i \
-			${PREFIX}/${QTLIBDIR}/$$i; done)
+		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
 
 .include "../../lang/python/extension.mk"
-.include "../../x11/py-qt3-base/buildlink2.mk"
-.include "../../x11/qt3-qscintilla/buildlink2.mk"
+.include "../../x11/py-qt3-base/buildlink3.mk"
+.include "../../x11/qt3-qscintilla/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-qscintilla/PLIST b/x11/py-qt3-qscintilla/PLIST
index 72a6a12156c..2a6a134465d 100644
--- a/x11/py-qt3-qscintilla/PLIST
+++ b/x11/py-qt3-qscintilla/PLIST
@@ -1,12 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:05 jmc Exp $
-${PYSITELIB}/libqtextcmodule.a
-${PYSITELIB}/libqtextcmodule.la
-${PYSITELIB}/libqtextcmodule.so
-${PYSITELIB}/libqtextcmodule.so.1
-${PYSITELIB}/libqtextcmodule.so.1.0
-${QTLIBDIR}/libqtextcmodule.a
-${QTLIBDIR}/libqtextcmodule.la
-${QTLIBDIR}/libqtextcmodule.so
-${QTLIBDIR}/libqtextcmodule.so.1
-${QTLIBDIR}/libqtextcmodule.so.1.0
-${PYSITELIB}/qtext.py
+@comment $NetBSD: PLIST,v 1.3 2004/05/09 17:06:07 recht Exp $
+${PYSITELIB}/qtext.so
+share/sip${PYVERSSUFFIX}/qtext/copying.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintilla.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillaapis.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillabase.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillacommand.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillacommandset.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexer.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexercpp.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexercsharp.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/qextscintillalexerpython.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexersql.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillamacro.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillaprinter.sip
+share/sip${PYVERSSUFFIX}/qtext/qtextmod.sip
+@dirrm share/sip${PYVERSSUFFIX}/qtext
+@comment in py-qt3-base: @dirrm share/sip${PYVERSSUFFIX}
diff --git a/x11/py-qt3-qscintilla/buildlink2.mk b/x11/py-qt3-qscintilla/buildlink2.mk
deleted file mode 100644
index 18a8c37a01e..00000000000
--- a/x11/py-qt3-qscintilla/buildlink2.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:51 jlam Exp $
-
-.if !defined(PY_QT3_SCINTILLA_BUILDLINK2_MK)
-PY_QT3_SCINTILLA_BUILDLINK2_MK=	# defined
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+=		pyqt3scintilla
-BUILDLINK_PKGBASE.pyqt3scintilla?=	${PYPKGPREFIX}-qt3-qscintilla
-BUILDLINK_DEPENDS.pyqt3scintilla?=	${PYPKGPREFIX}-qt3-qscintilla>=3.7nb1
-BUILDLINK_PKGSRCDIR.pyqt3scintilla?=	../../x11/py-qt3-qscintilla
-
-.include "../../x11/py-qt3-base/buildlink2.mk"
-
-.endif	# PY_QT3_SCINTILLA_BUILDLINK2_MK
diff --git a/x11/py-qt3-qscintilla/distinfo b/x11/py-qt3-qscintilla/distinfo
index 39e5d03ff4c..83ddd815b77 100644
--- a/x11/py-qt3-qscintilla/distinfo
+++ b/x11/py-qt3-qscintilla/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/08/23 15:02:30 drochner Exp $
+$NetBSD: distinfo,v 1.3 2004/05/09 17:06:07 recht Exp $
 
-SHA1 (PyQt-x11-gpl-3.8.tar.gz) = 626efd00304fb4a23c7af2a5248ced14c1421475
-Size (PyQt-x11-gpl-3.8.tar.gz) = 743487 bytes
-SHA1 (patch-aa) = 6dea71ea38e310e716fdbb635ab0331df500d304
-SHA1 (patch-ab) = 6a99f1d3549f5d1886d56f2ee27920561de113a0
+SHA1 (PyQt-x11-gpl-3.11.tar.gz) = 7b4949d97cdf989119681d34f8c30fede2d04e82
+Size (PyQt-x11-gpl-3.11.tar.gz) = 757652 bytes
+SHA1 (patch-aa) = fb0ba0dc3aa2b0e020a2e1ef05a04f14c0bf3242
diff --git a/x11/py-qt3-qscintilla/patches/patch-aa b/x11/py-qt3-qscintilla/patches/patch-aa
index 1731232bb2f..a38c6c5945d 100644
--- a/x11/py-qt3-qscintilla/patches/patch-aa
+++ b/x11/py-qt3-qscintilla/patches/patch-aa
@@ -1,33 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:27:05 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
 
---- build.py.orig	2003-07-05 12:52:49.000000000 +0200
-+++ build.py	2003-07-22 17:45:49.000000000 +0200
-@@ -50,7 +50,7 @@
- pyVersNr = None
- makefileGen = None
- makeBin = None
--buildModules = ["qt"]
-+buildModules = []
- proPatches = {}
- makefilePatches = {}
- tempBuildDir = None
-@@ -162,12 +162,13 @@
-     global pyFullVers, pyVersNr
- 
-     pyFullVers = string.split(sys.version)[0]
-+    pyFullVersn = string.replace(pyFullVers, 'p', '.');
- 
--    vl = string.split(re.findall("[0-9.]*",pyFullVers)[0],".")
-+    vl = string.split(re.findall("[0-9.]*",pyFullVersn)[0],".")
-     major = vl[0]
-     minor = vl[1]
- 
--    pyVers = major + "." + minor
-+    pyVers = sys.version[0:3]
-     pyVersNr = int(major) * 10 + int(minor)
- 
-     global platMake, platCopy, platMkdir, platRmdir
-@@ -717,7 +718,7 @@
+--- configure.py.orig	2004-03-11 20:23:30.000000000 +0100
++++ configure.py	2004-05-09 18:38:38.000000000 +0200
+@@ -38,7 +38,7 @@
+ sip_min_v3_version = 0x030a01
+ sip_min_v4_version = 0x040000
+ 
+-pyqt_modules = ["qt"]
++pyqt_modules = []
+ qt_sip_flags = []
+ qtext_sip_flags = []
+ qtpe_sip_flags = []
+@@ -663,7 +663,7 @@
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -36,90 +20,183 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:27:05 drochner Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -962,26 +963,26 @@
-     if qtVersion >= 0x020000:
-         inform("Checking which additional PyQt modules to build.");
- 
--        tryModule("qtcanvas","qcanvas.h","QCanvas()")
--        tryModule("qtnetwork","qsocket.h","QSocket()")
--        tryModule("qttable","qtable.h","QTable()")
--        tryModule("qtxml","qdom.h","QDomImplementation()")
-+#        tryModule("qtcanvas","qcanvas.h","QCanvas()")
-+#        tryModule("qtnetwork","qsocket.h","QSocket()")
-+#        tryModule("qttable","qtable.h","QTable()")
-+#        tryModule("qtxml","qdom.h","QDomImplementation()")
- 
--        if qtVersion >= 0x030000:
-+        if 0:
-             tryModule("qtsql","qsql.h","QSql()")
- 
-         # We need a different Makefile for the qtgl module.
--        proPatches["TOPENGL"] = [re.compile("@TEST_OPENGL@",re.M), "opengl"]
--        buildMakefile("qttest.pro")
-+#        proPatches["TOPENGL"] = [re.compile("@TEST_OPENGL@",re.M), "opengl"]
-+#        buildMakefile("qttest.pro")
- 
--        tryModule("qtgl","qgl.h","QGLWidget()")
-+#        tryModule("qtgl","qgl.h","QGLWidget()")
- 
-         # Put things back.
--        proPatches["TOPENGL"] = [re.compile("@TEST_OPENGL@",re.M), ""]
--        buildMakefile("qttest.pro")
-+#        proPatches["TOPENGL"] = [re.compile("@TEST_OPENGL@",re.M), ""]
-+#        buildMakefile("qttest.pro")
- 
-         # Check for the qui library.
--        if qtVersion >= 0x030000:
-+        if 0:
-             if sys.platform == "win32":
-                 quilib = "$(QTDIR)\\lib\\qui.lib"
-             else:
-@@ -993,8 +994,8 @@
-             tryModule("qtui","qwidgetfactory.h","QWidgetFactory()")
- 
-         # Put things back.
--        proPatches["TQUILIB"] = [re.compile("@TEST_QUILIB@",re.M), ""]
--        buildMakefile("qttest.pro")
-+#        proPatches["TQUILIB"] = [re.compile("@TEST_QUILIB@",re.M), ""]
-+#        buildMakefile("qttest.pro")
- 
-         # Check the location of the QScintilla library.
-         if sciVersion >= 0:
-@@ -1551,23 +1552,23 @@
-         subdirs = subdirs + " qtpe"
- 
-     # See which version of pyuic to build.
--    proPatches["BINDIR"] = [re.compile("@BL_BINDIR@",re.M), escape(platBinDir)]
-+#    proPatches["BINDIR"] = [re.compile("@BL_BINDIR@",re.M), escape(platBinDir)]
- 
--    if qtVersion >= 0x030000:
--        inform("Creating Makefile for pyuic3.")
--        subdirs = subdirs + " pyuic3"
--        olddir = pushDir("pyuic3")
--    elif qtVersion >= 0x020000:
--        inform("Creating Makefile for pyuic2.")
--        subdirs = subdirs + " pyuic2"
--        olddir = pushDir("pyuic2")
+@@ -697,82 +697,82 @@
+         # The Professional Edition needs special handling.
+         prof = (sipcfg.qt_edition == "professional")
+ 
+-        sipconfig.inform("Creating pyuic Makefile...")
++#        sipconfig.inform("Creating pyuic Makefile...")
+ 
+-        if prof:
+-            buildfile= "pyuic-prof.sbf"
++#        if prof:
++#            buildfile= "pyuic-prof.sbf"
+ 
+-            for xml in ("qdom.cpp", "qxml.cpp"):
+-                shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
+-        else:
+-            buildfile= "pyuic.sbf"
+-
+-        makefile = sipconfig.ProgramMakefile(
+-            configuration=sipcfg,
+-            build_file=buildfile,
+-            dir="pyuic3",
+-            install_dir=opt_pyqtbindir,
+-            console=1,
+-            qt=1,
+-            warnings=1
+-        )
+-
+-        makefile.extra_defines.append("UIC")
+-        makefile.extra_defines.append("QT_INTERNAL_XML")
+-
+-        if prof:
+-            makefile.extra_defines.append("QT_MODULE_XML")
++#            for xml in ("qdom.cpp", "qxml.cpp"):
++#                shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
++#        else:
++#            buildfile= "pyuic.sbf"
++
++#        makefile = sipconfig.ProgramMakefile(
++#            configuration=sipcfg,
++#            build_file=buildfile,
++#            dir="pyuic3",
++#            install_dir=opt_pyqtbindir,
++#            console=1,
++#            qt=1,
++#            warnings=1
++#        )
++
++#        makefile.extra_defines.append("UIC")
++#        makefile.extra_defines.append("QT_INTERNAL_XML")
++
++#        if prof:
++#            makefile.extra_defines.append("QT_MODULE_XML")
++
++#        if sipcfg.qt_version < 0x030100:
++#            makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
++
++#        makefile.generate()
++#        subdirs.append("pyuic3")
++
++#        sipconfig.inform("Creating pylupdate Makefile...")
++
++#        if prof:
++#            buildfile= "pylupdate-prof.sbf"
++
++#            shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
++#        else:
++#            buildfile= "pylupdate.sbf"
++
++#        makefile = sipconfig.ProgramMakefile(
++#            configuration=sipcfg,
++#            build_file=buildfile,
++#            dir="pylupdate3",
++#            install_dir=opt_pyqtbindir,
++#            console=1,
++#            qt=1,
++#            warnings=1
++#        )
++
++#        makefile.extra_defines.append("QT_INTERNAL_XML")
++
++#        if prof:
++#            makefile.extra_defines.append("QT_MODULE_XML")
++
++#        makefile.generate()
++#        subdirs.append("pylupdate3")
++#    elif sipcfg.qt_version >= 0x020000:
++#        sipconfig.inform("Creating pyuic Makefile...")
++
++#        makefile = sipconfig.ProgramMakefile(
++#            configuration=sipcfg,
++#            build_file="pyuic.sbf",
++#            dir="pyuic2",
++#            install_dir=opt_pyqtbindir,
++#            console=1,
++#            qt=1,
++#            warnings=1
++#        )
+ 
+-        if sipcfg.qt_version < 0x030100:
+-            makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
++#        makefile.extra_defines.append("UIC")
++#        makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
+ 
+-        makefile.generate()
+-        subdirs.append("pyuic3")
+-
+-        sipconfig.inform("Creating pylupdate Makefile...")
+-
+-        if prof:
+-            buildfile= "pylupdate-prof.sbf"
+-
+-            shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
+-        else:
+-            buildfile= "pylupdate.sbf"
+-
+-        makefile = sipconfig.ProgramMakefile(
+-            configuration=sipcfg,
+-            build_file=buildfile,
+-            dir="pylupdate3",
+-            install_dir=opt_pyqtbindir,
+-            console=1,
+-            qt=1,
+-            warnings=1
+-        )
+-
+-        makefile.extra_defines.append("QT_INTERNAL_XML")
+-
+-        if prof:
+-            makefile.extra_defines.append("QT_MODULE_XML")
+-
+-        makefile.generate()
+-        subdirs.append("pylupdate3")
+-    elif sipcfg.qt_version >= 0x020000:
+-        sipconfig.inform("Creating pyuic Makefile...")
+-
+-        makefile = sipconfig.ProgramMakefile(
+-            configuration=sipcfg,
+-            build_file="pyuic.sbf",
+-            dir="pyuic2",
+-            install_dir=opt_pyqtbindir,
+-            console=1,
+-            qt=1,
+-            warnings=1
+-        )
+-
+-        makefile.extra_defines.append("UIC")
+-        makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
+-
+-        makefile.generate()
+-        subdirs.append("pyuic2")
++#        makefile.generate()
++#        subdirs.append("pyuic2")
+ 
+     sipconfig.inform("Creating top level Makefile...")
+ 
+@@ -856,15 +856,15 @@
+     check_qscintilla()
+ 
+     # Check which modules to build.
+-    check_module("qtcanvas", "qcanvas.h", "QCanvas()")
+-    check_module("qtnetwork", "qsocket.h", "QSocket()")
+-    check_module("qttable", "qtable.h", "QTable()")
+-    check_module("qtxml", "qdom.h", "QDomImplementation()")
+-    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
 -
--    buildMakefile("pyuic.pro")
--    fixInstallTarget()
--    popDir(olddir)
-+#    if qtVersion >= 0x030000:
-+#        inform("Creating Makefile for pyuic3.")
-+#        subdirs = subdirs + " pyuic3"
-+#        olddir = pushDir("pyuic3")
-+#    elif qtVersion >= 0x020000:
-+#        inform("Creating Makefile for pyuic2.")
-+#        subdirs = subdirs + " pyuic2"
-+#        olddir = pushDir("pyuic2")
+-    if sipcfg.qt_version >= 0x030000:
+-        check_module("qtsql", "qsql.h", "QSql()")
+-        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
++#    check_module("qtcanvas", "qcanvas.h", "QCanvas()")
++#    check_module("qtnetwork", "qsocket.h", "QSocket()")
++#    check_module("qttable", "qtable.h", "QTable()")
++#    check_module("qtxml", "qdom.h", "QDomImplementation()")
++#    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
 +
-+#    buildMakefile("pyuic.pro")
-+#    fixInstallTarget()
-+#    popDir(olddir)
++#    if sipcfg.qt_version >= 0x030000:
++#        check_module("qtsql", "qsql.h", "QSql()")
++#        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
  
-     # Build pylupdate if Qt v3.0 or later.
--    if qtVersion >= 0x030000:
-+    if 0:
-         inform("Creating Makefile for pylupdate3.")
-         subdirs = subdirs + " pylupdate3"
-         olddir = pushDir("pylupdate3")
+     if qsci_version:
+         check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
diff --git a/x11/py-qt3-qscintilla/patches/patch-ab b/x11/py-qt3-qscintilla/patches/patch-ab
deleted file mode 100644
index 3ed311df3a6..00000000000
--- a/x11/py-qt3-qscintilla/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/08/23 15:02:30 drochner Exp $
-
---- sip/qtextmod.sip.orig	2003-08-17 14:27:48.000000000 +0200
-+++ sip/qtextmod.sip	2003-08-23 15:59:37.000000000 +0200
-@@ -81,12 +81,12 @@
- 
- TEMPLATE = lib
- TARGET = @BL_TARGET@
--DESTDIR = @BL_DESTDIR@
-+#DESTDIR = @BL_DESTDIR@
- CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
- INCLUDEPATH = @BL_INCLUDEPATH@
- DEFINES = QEXTSCINTILLA_DLL @BL_DEFINES@
- 
--sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip -L@BL_SCILIBDIR@ -lqscintilla
-+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip -L@BL_SCILIBDIR@ -lqscintilla
- sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ @BL_SCILIBDIR@\qscintilla.lib
- 
- sip4:unix:LIBS += -L@BL_SCILIBDIR@ -lqscintilla