diff options
| author | recht <recht> | 2004-05-09 17:06:07 +0000 |
|---|---|---|
| committer | recht <recht> | 2004-05-09 17:06:07 +0000 |
| commit | b3ec181a1892fc8a8fd917b939abf68ab84068b6 (patch) | |
| tree | ccfbc9f8b284d31c135ebfabb2076fcd35dcb6c3 /x11 | |
| parent | 1bddd58b02593631e599fa1758d6bfd50255a137 (diff) | |
| download | pkgsrc-b3ec181a1892fc8a8fd917b939abf68ab84068b6.tar.gz | |
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.
Diffstat (limited to 'x11')
26 files changed, 788 insertions, 666 deletions
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile index 3233ce3984d..8051f9ed2b7 100644 --- a/x11/py-qt3-base/Makefile +++ b/x11/py-qt3-base/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-base-3.8 +DISTNAME= PyQt-x11-gpl-3.11 +PKGNAME= ${PYPKGPREFIX}-qt3-base-3.11 CATEGORIES= x11 MASTER_SITES= http://www.river-bank.demon.co.uk/download/PyQt/ @@ -10,41 +10,32 @@ 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++ BUILDLINK_DEPENDS.qt3-tools= qt3-tools>=3.1.2nb2 -CONFIGURE_ARGS= -q ${QTDIR} -m ${GMAKE} -p ${SIPBIN} -b "" +CONFIGURE_ARGS= -b ${PREFIX}/bin +CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB} +CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX} -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+= PYVERSSUFFIX=${PYVERSSUFFIX} QTLIBDIR=${QTLIBDIR} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -MAKE_ENV+= QTPREFIX=${QTDIR} +SUBST_CLASSES+= pyversfx +SUBST_STAGE.pyversfx= pre-configure +SUBST_FILES.pyversfx= pyuic3/pyuic.sbf pylupdate3/pylupdate.sbf +SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g" do-configure: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${PYTHONBIN} build.py ${CONFIGURE_ARGS}) - -# XXX - hack. Shouldn't need the symlinks as qmake should let us build -# proper libraries that install outside of QTDIR more easily. -do-install: - (cd ${WRKSRC}/qt && ${INSTALL_DATA} qt.py ${PREFIX}/${PYSITELIB}) - (cd ${WRKSRC}/qt && ${LIBTOOL} --mode=install ${INSTALL_DATA} \ - libqtcmodule.la ${PREFIX}/${PYSITELIB}) - (cd ${PREFIX}/${PYSITELIB}; for i in libqtcmodule.*; do \ - ${LN} -sf ${PREFIX}/${PYSITELIB}/$$i \ - ${PREFIX}/${QTLIBDIR}/$$i; done) - (cd ${WRKSRC}/pylupdate3 && ${INSTALL_PROGRAM} pylupdate \ - ${PREFIX}/bin/pylupdate${PYVERSSUFFIX}) - (cd ${WRKSRC}/pyuic3 && ${INSTALL_PROGRAM} pyuic \ - ${PREFIX}/bin/pyuic${PYVERSSUFFIX}) + ${PYTHONBIN} configure.py ${CONFIGURE_ARGS}) .include "../../lang/python/extension.mk" -.include "../../x11/py-qt3-sip/buildlink2.mk" -.include "../../x11/qt3-libs/buildlink2.mk" -.include "../../x11/qt3-tools/buildlink2.mk" +.include "../../x11/py-qt3-sip/buildlink3.mk" +.include "../../x11/qt3-libs/buildlink3.mk" +.include "../../x11/qt3-tools/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-qt3-base/PLIST b/x11/py-qt3-base/PLIST index 0b645003e5a..515b26cf42b 100644 --- a/x11/py-qt3-base/PLIST +++ b/x11/py-qt3-base/PLIST @@ -1,14 +1,186 @@ -@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:03 jmc Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/05/09 17:06:07 recht Exp $ bin/pylupdate${PYVERSSUFFIX} bin/pyuic${PYVERSSUFFIX} -${PYSITELIB}/libqtcmodule.a -${PYSITELIB}/libqtcmodule.la -${PYSITELIB}/libqtcmodule.so -${PYSITELIB}/libqtcmodule.so.1 -${PYSITELIB}/libqtcmodule.so.1.0 -${PYSITELIB}/qt.py -${QTLIBDIR}/libqtcmodule.a -${QTLIBDIR}/libqtcmodule.la -${QTLIBDIR}/libqtcmodule.so -${QTLIBDIR}/libqtcmodule.so.1 -${QTLIBDIR}/libqtcmodule.so.1.0 +${PYSITELIB}/pyqtconfig.py +${PYSITELIB}/qt.so +share/sip${PYVERSSUFFIX}/qt/copying.sip +share/sip${PYVERSSUFFIX}/qt/qaccel.sip +share/sip${PYVERSSUFFIX}/qt/qaction.sip +share/sip${PYVERSSUFFIX}/qt/qapplication.sip +share/sip${PYVERSSUFFIX}/qt/qarray.sip +share/sip${PYVERSSUFFIX}/qt/qassistantclient.sip +share/sip${PYVERSSUFFIX}/qt/qbitmap.sip +share/sip${PYVERSSUFFIX}/qt/qbrush.sip +share/sip${PYVERSSUFFIX}/qt/qbutton.sip +share/sip${PYVERSSUFFIX}/qt/qbuttongroup.sip +share/sip${PYVERSSUFFIX}/qt/qbytearray.sip +share/sip${PYVERSSUFFIX}/qt/qcdestyle.sip +share/sip${PYVERSSUFFIX}/qt/qcheckbox.sip +share/sip${PYVERSSUFFIX}/qt/qclipboard.sip +share/sip${PYVERSSUFFIX}/qt/qcolor.sip +share/sip${PYVERSSUFFIX}/qt/qcolordialog.sip +share/sip${PYVERSSUFFIX}/qt/qcolorgroup.sip +share/sip${PYVERSSUFFIX}/qt/qcombobox.sip +share/sip${PYVERSSUFFIX}/qt/qcommonstyle.sip +share/sip${PYVERSSUFFIX}/qt/qcstring.sip +share/sip${PYVERSSUFFIX}/qt/qcursor.sip +share/sip${PYVERSSUFFIX}/qt/qdatastream.sip +share/sip${PYVERSSUFFIX}/qt/qdatetime.sip +share/sip${PYVERSSUFFIX}/qt/qdatetimeedit.sip +share/sip${PYVERSSUFFIX}/qt/qdesktopwidget.sip +share/sip${PYVERSSUFFIX}/qt/qdial.sip +share/sip${PYVERSSUFFIX}/qt/qdialog.sip +share/sip${PYVERSSUFFIX}/qt/qdir.sip +share/sip${PYVERSSUFFIX}/qt/qdockarea.sip +share/sip${PYVERSSUFFIX}/qt/qdockwindow.sip +share/sip${PYVERSSUFFIX}/qt/qdragobject.sip +share/sip${PYVERSSUFFIX}/qt/qdrawutil.sip +share/sip${PYVERSSUFFIX}/qt/qdropsite.sip +share/sip${PYVERSSUFFIX}/qt/qerrormessage.sip +share/sip${PYVERSSUFFIX}/qt/qevent.sip +share/sip${PYVERSSUFFIX}/qt/qeventloop.sip +share/sip${PYVERSSUFFIX}/qt/qfile.sip +share/sip${PYVERSSUFFIX}/qt/qfiledialog.sip +share/sip${PYVERSSUFFIX}/qt/qfileinfo.sip +share/sip${PYVERSSUFFIX}/qt/qfont.sip +share/sip${PYVERSSUFFIX}/qt/qfontdatabase.sip +share/sip${PYVERSSUFFIX}/qt/qfontdialog.sip +share/sip${PYVERSSUFFIX}/qt/qfontinfo.sip +share/sip${PYVERSSUFFIX}/qt/qfontmetrics.sip +share/sip${PYVERSSUFFIX}/qt/qframe.sip +share/sip${PYVERSSUFFIX}/qt/qglobal.sip +share/sip${PYVERSSUFFIX}/qt/qgmanager.sip +share/sip${PYVERSSUFFIX}/qt/qgrid.sip +share/sip${PYVERSSUFFIX}/qt/qgridview.sip +share/sip${PYVERSSUFFIX}/qt/qgroupbox.sip +share/sip${PYVERSSUFFIX}/qt/qhbox.sip +share/sip${PYVERSSUFFIX}/qt/qhbuttongroup.sip +share/sip${PYVERSSUFFIX}/qt/qheader.sip +share/sip${PYVERSSUFFIX}/qt/qhgroupbox.sip +share/sip${PYVERSSUFFIX}/qt/qiconset.sip +share/sip${PYVERSSUFFIX}/qt/qiconview.sip +share/sip${PYVERSSUFFIX}/qt/qimage.sip +share/sip${PYVERSSUFFIX}/qt/qinputdialog.sip +share/sip${PYVERSSUFFIX}/qt/qinterlacestyle.sip +share/sip${PYVERSSUFFIX}/qt/qiodevice.sip +share/sip${PYVERSSUFFIX}/qt/qkeycode.sip +share/sip${PYVERSSUFFIX}/qt/qkeysequence.sip +share/sip${PYVERSSUFFIX}/qt/qlabel.sip +share/sip${PYVERSSUFFIX}/qt/qlayout.sip +share/sip${PYVERSSUFFIX}/qt/qlcdnumber.sip +share/sip${PYVERSSUFFIX}/qt/qlibrary.sip +share/sip${PYVERSSUFFIX}/qt/qlineedit.sip +share/sip${PYVERSSUFFIX}/qt/qlist.sip +share/sip${PYVERSSUFFIX}/qt/qlistbox.sip +share/sip${PYVERSSUFFIX}/qt/qlistview.sip +share/sip${PYVERSSUFFIX}/qt/qlocale.sip +share/sip${PYVERSSUFFIX}/qt/qmainwindow.sip +share/sip${PYVERSSUFFIX}/qt/qmemarray.sip +share/sip${PYVERSSUFFIX}/qt/qmenubar.sip +share/sip${PYVERSSUFFIX}/qt/qmenudata.sip +share/sip${PYVERSSUFFIX}/qt/qmessagebox.sip +share/sip${PYVERSSUFFIX}/qt/qmime.sip +share/sip${PYVERSSUFFIX}/qt/qmotifplusstyle.sip +share/sip${PYVERSSUFFIX}/qt/qmotifstyle.sip +share/sip${PYVERSSUFFIX}/qt/qmovie.sip +share/sip${PYVERSSUFFIX}/qt/qmultilinedit.sip +share/sip${PYVERSSUFFIX}/qt/qmutex.sip +share/sip${PYVERSSUFFIX}/qt/qnamespace.sip +share/sip${PYVERSSUFFIX}/qt/qnetworkprotocol.sip +share/sip${PYVERSSUFFIX}/qt/qobject.sip +share/sip${PYVERSSUFFIX}/qt/qobjectcleanuphandler.sip +share/sip${PYVERSSUFFIX}/qt/qobjectlist.sip +share/sip${PYVERSSUFFIX}/qt/qpaintdevice.sip +share/sip${PYVERSSUFFIX}/qt/qpaintdevicemetrics.sip +share/sip${PYVERSSUFFIX}/qt/qpainter.sip +share/sip${PYVERSSUFFIX}/qt/qpair.sip +share/sip${PYVERSSUFFIX}/qt/qpalette.sip +share/sip${PYVERSSUFFIX}/qt/qpen.sip +share/sip${PYVERSSUFFIX}/qt/qpicture.sip +share/sip${PYVERSSUFFIX}/qt/qpixmap.sip +share/sip${PYVERSSUFFIX}/qt/qpixmapcache.sip +share/sip${PYVERSSUFFIX}/qt/qplatinumstyle.sip +share/sip${PYVERSSUFFIX}/qt/qpoint.sip +share/sip${PYVERSSUFFIX}/qt/qpointarray.sip +share/sip${PYVERSSUFFIX}/qt/qpopupmenu.sip +share/sip${PYVERSSUFFIX}/qt/qprintdialog.sip +share/sip${PYVERSSUFFIX}/qt/qprinter.sip +share/sip${PYVERSSUFFIX}/qt/qprocess.sip +share/sip${PYVERSSUFFIX}/qt/qprogressbar.sip +share/sip${PYVERSSUFFIX}/qt/qprogressdialog.sip +share/sip${PYVERSSUFFIX}/qt/qptrlist.sip +share/sip${PYVERSSUFFIX}/qt/qpushbutton.sip +share/sip${PYVERSSUFFIX}/qt/qradiobutton.sip +share/sip${PYVERSSUFFIX}/qt/qrangecontrol.sip +share/sip${PYVERSSUFFIX}/qt/qrect.sip +share/sip${PYVERSSUFFIX}/qt/qregexp.sip +share/sip${PYVERSSUFFIX}/qt/qregion.sip +share/sip${PYVERSSUFFIX}/qt/qscrollbar.sip +share/sip${PYVERSSUFFIX}/qt/qscrollview.sip +share/sip${PYVERSSUFFIX}/qt/qsemaphore.sip +share/sip${PYVERSSUFFIX}/qt/qsemimodal.sip +share/sip${PYVERSSUFFIX}/qt/qsessionmanager.sip +share/sip${PYVERSSUFFIX}/qt/qsettings.sip +share/sip${PYVERSSUFFIX}/qt/qsgistyle.sip +share/sip${PYVERSSUFFIX}/qt/qsignalmapper.sip +share/sip${PYVERSSUFFIX}/qt/qsimplerichtext.sip +share/sip${PYVERSSUFFIX}/qt/qsize.sip +share/sip${PYVERSSUFFIX}/qt/qsizegrip.sip +share/sip${PYVERSSUFFIX}/qt/qsizepolicy.sip +share/sip${PYVERSSUFFIX}/qt/qslider.sip +share/sip${PYVERSSUFFIX}/qt/qsocketnotifier.sip +share/sip${PYVERSSUFFIX}/qt/qsound.sip +share/sip${PYVERSSUFFIX}/qt/qspinbox.sip +share/sip${PYVERSSUFFIX}/qt/qsplashscreen.sip +share/sip${PYVERSSUFFIX}/qt/qsplitter.sip +share/sip${PYVERSSUFFIX}/qt/qstatusbar.sip +share/sip${PYVERSSUFFIX}/qt/qstring.sip +share/sip${PYVERSSUFFIX}/qt/qstringlist.sip +share/sip${PYVERSSUFFIX}/qt/qstrlist.sip +share/sip${PYVERSSUFFIX}/qt/qstyle.sip +share/sip${PYVERSSUFFIX}/qt/qstylefactory.sip +share/sip${PYVERSSUFFIX}/qt/qstylesheet.sip +share/sip${PYVERSSUFFIX}/qt/qsyntaxhighlighter.sip +share/sip${PYVERSSUFFIX}/qt/qtabbar.sip +share/sip${PYVERSSUFFIX}/qt/qtabdialog.sip +share/sip${PYVERSSUFFIX}/qt/qtableview.sip +share/sip${PYVERSSUFFIX}/qt/qtabwidget.sip +share/sip${PYVERSSUFFIX}/qt/qtextbrowser.sip +share/sip${PYVERSSUFFIX}/qt/qtextcodec.sip +share/sip${PYVERSSUFFIX}/qt/qtextedit.sip +share/sip${PYVERSSUFFIX}/qt/qtextstream.sip +share/sip${PYVERSSUFFIX}/qt/qtextview.sip +share/sip${PYVERSSUFFIX}/qt/qthread.sip +share/sip${PYVERSSUFFIX}/qt/qtimer.sip +share/sip${PYVERSSUFFIX}/qt/qtmod.sip +share/sip${PYVERSSUFFIX}/qt/qtoolbar.sip +share/sip${PYVERSSUFFIX}/qt/qtoolbox.sip +share/sip${PYVERSSUFFIX}/qt/qtoolbutton.sip +share/sip${PYVERSSUFFIX}/qt/qtooltip.sip +share/sip${PYVERSSUFFIX}/qt/qtranslator.sip +share/sip${PYVERSSUFFIX}/qt/qurl.sip +share/sip${PYVERSSUFFIX}/qt/qurlinfo.sip +share/sip${PYVERSSUFFIX}/qt/qurloperator.sip +share/sip${PYVERSSUFFIX}/qt/qvalidator.sip +share/sip${PYVERSSUFFIX}/qt/qvaluelist.sip +share/sip${PYVERSSUFFIX}/qt/qvariant.sip +share/sip${PYVERSSUFFIX}/qt/qvbox.sip +share/sip${PYVERSSUFFIX}/qt/qvbuttongroup.sip +share/sip${PYVERSSUFFIX}/qt/qvgroupbox.sip +share/sip${PYVERSSUFFIX}/qt/qwaitcondition.sip +share/sip${PYVERSSUFFIX}/qt/qwhatsthis.sip +share/sip${PYVERSSUFFIX}/qt/qwidget.sip +share/sip${PYVERSSUFFIX}/qt/qwidgetlist.sip +share/sip${PYVERSSUFFIX}/qt/qwidgetstack.sip +share/sip${PYVERSSUFFIX}/qt/qwindow.sip +share/sip${PYVERSSUFFIX}/qt/qwindowdefs.sip +share/sip${PYVERSSUFFIX}/qt/qwindowdefs_qws.sip +share/sip${PYVERSSUFFIX}/qt/qwindowdefs_x11.sip +share/sip${PYVERSSUFFIX}/qt/qwindowsstyle.sip +share/sip${PYVERSSUFFIX}/qt/qwindowsxpstyle.sip +share/sip${PYVERSSUFFIX}/qt/qwizard.sip +share/sip${PYVERSSUFFIX}/qt/qwmatrix.sip +share/sip${PYVERSSUFFIX}/qt/qworkspace.sip +share/sip${PYVERSSUFFIX}/qt/versions.sip +@dirrm share/sip${PYVERSSUFFIX}/qt +@dirrm share/sip${PYVERSSUFFIX} diff --git a/x11/py-qt3-base/buildlink2.mk b/x11/py-qt3-base/buildlink2.mk deleted file mode 100644 index c8a940c2134..00000000000 --- a/x11/py-qt3-base/buildlink2.mk +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:50 jlam Exp $ - -.if !defined(PY_QT3_BASE_BUILDLINK2_MK) -PY_QT3_BASE_BUILDLINK2_MK= # defined - -.include "../../lang/python/pyversion.mk" - -BUILDLINK_PACKAGES+= pyqt3base -BUILDLINK_PKGBASE.pyqt3base?= ${PYPKGPREFIX}-qt3-base -BUILDLINK_DEPENDS.pyqt3base?= ${PYPKGPREFIX}-qt3-base>=3.7nb1 -BUILDLINK_PKGSRCDIR.pyqt3base?= ../../x11/py-qt3-base - -EVAL_PREFIX+= BUILDLINK_PREFIX.pyqt3base=pyqt3base -BUILDLINK_PREFIX.pyqt3base_DEFAULT= ${LOCALBASE} - -# LDFLAGS for this are inherited from py-qt3-sip -BUILDLINK_FILES.pyqt3base+= ${PYSITELIB}/libqtcmodule.* - -BUILDLINK_TARGETS+= pyqt3base-buildlink - -pyqt3base-buildlink: _BUILDLINK_USE - -.include "../../x11/py-qt3-sip/buildlink2.mk" -.include "../../x11/qt3-libs/buildlink2.mk" -BUILDLINK_DEPENDS.qt3-tools= qt3-tools>=3.1.2nb2 -.include "../../x11/qt3-tools/buildlink2.mk" - -.endif # PY_QT3_BASE_BUILDLINK2_MK diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk new file mode 100644 index 00000000000..94dd60d248a --- /dev/null +++ b/x11/py-qt3-base/buildlink3.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/05/09 17:06:07 recht Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +PYQT3_BASE_BUILDLINK3_MK:= ${PYQT3_BASE_BUILDLINK3_MK}+ + +.include "../../lang/python/pyversion.mk" + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= pyqt3-base +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyqt3-base} +BUILDLINK_PACKAGES+= pyqt3-base + +.if !empty(PYQT3_BASE_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.pyqt3-base+= ${PYPKGPREFIX}-qt3-base>=3.11 +BUILDLINK_PKGSRCDIR.pyqt3-base?= ../../x11/py-qt3-base + +BUILDLINK_LIBDIRS.pyqt3-base+= ${PYSITELIB} +.endif # PYQT3_BASE_BUILDLINK3_MK + +.include "../../x11/py-qt3-sip/buildlink3.mk" +.include "../../x11/qt3-libs/buildlink3.mk" +.include "../../x11/qt3-tools/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/py-qt3-base/distinfo b/x11/py-qt3-base/distinfo index b94e78d10de..e09c5ca335c 100644 --- a/x11/py-qt3-base/distinfo +++ b/x11/py-qt3-base/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2003/08/23 15:02:26 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) = 29287952965dc9d5d75fcb450f615148d6dc06cf -SHA1 (patch-ab) = 993500d8cc3d66aaa337ac7724ad79f63d8677e7 +SHA1 (PyQt-x11-gpl-3.11.tar.gz) = 7b4949d97cdf989119681d34f8c30fede2d04e82 +Size (PyQt-x11-gpl-3.11.tar.gz) = 757652 bytes +SHA1 (patch-aa) = 1d16293b66739d2d4fbfd45b4ad850c6c2842863 +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 90938b081bd..83b94ddacfb 100644 --- a/x11/py-qt3-base/patches/patch-aa +++ b/x11/py-qt3-base/patches/patch-aa @@ -1,33 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:22:48 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 11:44:51.000000000 +0200 -@@ -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 -@@ -592,7 +593,7 @@ - incdirs = incdirs + " " + escape(qtIncDir) - - # Find the QScintilla header files. -- if qtVersion >= 0x030000: -+ if 0: - global sciIncDir - - if not sciIncDir: -@@ -717,7 +718,7 @@ +--- configure.py.orig 2004-03-11 20:23:30.000000000 +0100 ++++ configure.py 2004-05-09 11:30:42.000000000 +0200 +@@ -663,7 +663,7 @@ print "Type 'no' to decline the terms of the license." print @@ -36,12 +11,37 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:22:48 drochner Exp $ try: resp = raw_input("Do you accept the terms of the license? ") except: -@@ -959,7 +960,7 @@ - tuneCompiler() - - # Check which PyQt modules will build. -- if qtVersion >= 0x020000: -+ if 0: - inform("Checking which additional PyQt modules to build."); - - tryModule("qtcanvas","qcanvas.h","QCanvas()") +@@ -853,21 +853,21 @@ + sipcfg.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv)) + + # Check for QScintilla. +- check_qscintilla() ++ #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) ++ #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) ++ ++ #if sipcfg.qt_version >= 0x030000: ++ # check_module("qtsql", "qsql.h", "QSql()") ++ # check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui") + +- if sipcfg.qt_version >= 0x030000: +- check_module("qtsql", "qsql.h", "QSql()") +- check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui") +- +- if qsci_version: +- check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla") ++ #if qsci_version: ++ # check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla") + + if opt_qtpetag: + pyqt_modules.append("qtpe") diff --git a/x11/py-qt3-base/patches/patch-ab b/x11/py-qt3-base/patches/patch-ab index 4a5802181df..97d1713c124 100644 --- a/x11/py-qt3-base/patches/patch-ab +++ b/x11/py-qt3-base/patches/patch-ab @@ -1,19 +1,12 @@ -$NetBSD: patch-ab,v 1.2 2003/08/23 15:02:27 drochner Exp $ +$NetBSD: patch-ab,v 1.3 2004/05/09 17:06:07 recht Exp $ ---- sip/qtmod.sip.orig 2003-08-17 14:27:46.000000000 +0200 -+++ sip/qtmod.sip 2003-08-22 18:32:46.000000000 +0200 -@@ -248,12 +248,12 @@ +--- pyuic3/pyuic.sbf.orig 2004-05-09 02:45:24.000000000 +0200 ++++ pyuic3/pyuic.sbf 2004-05-09 02:45:49.000000000 +0200 +@@ -19,6 +19,6 @@ + # PyQt; see the file LICENSE. If not, write to the Free Software Foundation, + # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - 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 = @BL_DEFINES@ - --sip3:unix:LIBS += @BL_QASSISTANTCLIENT@ -L@BL_SIPMODDIR@ -lsip -+sip3:unix:LIBS += @BL_QASSISTANTCLIENT@ -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip - sip3:win32:LIBS += @BL_QASSISTANTCLIENT@ @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ - - sip4:unix:LIBS += @BL_QASSISTANTCLIENT@ +-target = pyuic ++target = pyuic@PYVERSSUFFIX@ + sources = main.cpp uic.cpp form.cpp object.cpp subclassing.cpp embed.cpp widgetdatabase.cpp domtool.cpp parser.cpp + headers = domtool.h globaldefs.h parser.h uic.h widgetdatabase.h widgetinterface.h diff --git a/x11/py-qt3-base/patches/patch-ac b/x11/py-qt3-base/patches/patch-ac new file mode 100644 index 00000000000..a0a67d70a97 --- /dev/null +++ b/x11/py-qt3-base/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 2004/05/09 17:06:07 recht Exp $ + +--- pylupdate3/pylupdate.sbf.orig 2004-05-09 02:46:28.000000000 +0200 ++++ pylupdate3/pylupdate.sbf 2004-05-09 02:46:45.000000000 +0200 +@@ -19,6 +19,6 @@ + # PyQt; see the file LICENSE. If not, write to the Free Software Foundation, + # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +-target = pylupdate ++target = pylupdate@PYVERSSUFFIX@ + sources = fetchtr.cpp main.cpp merge.cpp numberh.cpp sametexth.cpp metatranslator.cpp proparser.cpp + headers = metatranslator.h proparser.h diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile index 07578571823..2f5ed387b37 100644 --- a/x11/py-qt3-modules/Makefile +++ b/x11/py-qt3-modules/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2004/03/28 20:54:49 recht Exp $ +# $NetBSD: Makefile,v 1.8 2004/05/09 17:06:07 recht Exp $ # -DISTNAME= PyQt-x11-gpl-3.8 -PKGNAME= ${PYPKGPREFIX}-qt3-modules-3.8 +DISTNAME= PyQt-x11-gpl-3.11 +PKGNAME= ${PYPKGPREFIX}-qt3-modules-3.11 CATEGORIES= x11 MASTER_SITES= http://www.river-bank.demon.co.uk/download/PyQt/ @@ -10,45 +10,28 @@ 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} -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}/qtcanvas ${WRKSRC}/qtgl ${WRKSRC}/qtnetwork +INSTALL_DIRS+= ${WRKSRC}/qtsql ${WRKSRC}/qttable ${WRKSRC}/qtui +INSTALL_DIRS+= ${WRKSRC}/qtxml do-configure: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${PYTHONBIN} build.py ${CONFIGURE_ARGS}) - -PYQTMODULES= qtcanvas qtgl qtnetwork qtsql qttable qtui qtxml - -# 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}/${QTLIBDIR} \ - ) \ - ); \ - done) - (for f in ${PYQTMODULES}; do \ - (cd ${PREFIX}/${QTLIBDIR}; for i in lib$${f}cmodule.*; do \ - ${LN} -sf ${PREFIX}/${QTLIBDIR}/$$i \ - ${PREFIX}/${PYSITELIB}/$$i; done \ - ); \ - done) + ${PYTHONBIN} configure.py ${CONFIGURE_ARGS}) .include "../../lang/python/extension.mk" -.include "../../x11/py-qt3-base/buildlink2.mk" +.include "../../x11/py-qt3-base/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-qt3-modules/PLIST b/x11/py-qt3-modules/PLIST index cb90b76a0ea..c1873a598f4 100644 --- a/x11/py-qt3-modules/PLIST +++ b/x11/py-qt3-modules/PLIST @@ -1,78 +1,63 @@ -@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:04 jmc Exp $ -${PYSITELIB}/libqtcanvascmodule.a -${PYSITELIB}/libqtcanvascmodule.la -${PYSITELIB}/libqtcanvascmodule.so -${PYSITELIB}/libqtcanvascmodule.so.1 -${PYSITELIB}/libqtcanvascmodule.so.1.0 -${PYSITELIB}/libqtglcmodule.a -${PYSITELIB}/libqtglcmodule.la -${PYSITELIB}/libqtglcmodule.so -${PYSITELIB}/libqtglcmodule.so.1 -${PYSITELIB}/libqtglcmodule.so.1.0 -${PYSITELIB}/libqtnetworkcmodule.a -${PYSITELIB}/libqtnetworkcmodule.la -${PYSITELIB}/libqtnetworkcmodule.so -${PYSITELIB}/libqtnetworkcmodule.so.1 -${PYSITELIB}/libqtnetworkcmodule.so.1.0 -${PYSITELIB}/libqtsqlcmodule.a -${PYSITELIB}/libqtsqlcmodule.la -${PYSITELIB}/libqtsqlcmodule.so -${PYSITELIB}/libqtsqlcmodule.so.1 -${PYSITELIB}/libqtsqlcmodule.so.1.0 -${PYSITELIB}/libqttablecmodule.a -${PYSITELIB}/libqttablecmodule.la -${PYSITELIB}/libqttablecmodule.so -${PYSITELIB}/libqttablecmodule.so.1 -${PYSITELIB}/libqttablecmodule.so.1.0 -${PYSITELIB}/libqtuicmodule.a -${PYSITELIB}/libqtuicmodule.la -${PYSITELIB}/libqtuicmodule.so -${PYSITELIB}/libqtuicmodule.so.1 -${PYSITELIB}/libqtuicmodule.so.1.0 -${PYSITELIB}/libqtxmlcmodule.a -${PYSITELIB}/libqtxmlcmodule.la -${PYSITELIB}/libqtxmlcmodule.so -${PYSITELIB}/libqtxmlcmodule.so.1 -${PYSITELIB}/libqtxmlcmodule.so.1.0 -${QTLIBDIR}/libqtcanvascmodule.a -${QTLIBDIR}/libqtcanvascmodule.la -${QTLIBDIR}/libqtcanvascmodule.so -${QTLIBDIR}/libqtcanvascmodule.so.1 -${QTLIBDIR}/libqtcanvascmodule.so.1.0 -${QTLIBDIR}/libqtglcmodule.a -${QTLIBDIR}/libqtglcmodule.la -${QTLIBDIR}/libqtglcmodule.so -${QTLIBDIR}/libqtglcmodule.so.1 -${QTLIBDIR}/libqtglcmodule.so.1.0 -${QTLIBDIR}/libqtnetworkcmodule.a -${QTLIBDIR}/libqtnetworkcmodule.la -${QTLIBDIR}/libqtnetworkcmodule.so -${QTLIBDIR}/libqtnetworkcmodule.so.1 -${QTLIBDIR}/libqtnetworkcmodule.so.1.0 -${QTLIBDIR}/libqtsqlcmodule.a -${QTLIBDIR}/libqtsqlcmodule.la -${QTLIBDIR}/libqtsqlcmodule.so -${QTLIBDIR}/libqtsqlcmodule.so.1 -${QTLIBDIR}/libqtsqlcmodule.so.1.0 -${QTLIBDIR}/libqttablecmodule.a -${QTLIBDIR}/libqttablecmodule.la -${QTLIBDIR}/libqttablecmodule.so -${QTLIBDIR}/libqttablecmodule.so.1 -${QTLIBDIR}/libqttablecmodule.so.1.0 -${QTLIBDIR}/libqtuicmodule.a -${QTLIBDIR}/libqtuicmodule.la -${QTLIBDIR}/libqtuicmodule.so -${QTLIBDIR}/libqtuicmodule.so.1 -${QTLIBDIR}/libqtuicmodule.so.1.0 -${QTLIBDIR}/libqtxmlcmodule.a -${QTLIBDIR}/libqtxmlcmodule.la -${QTLIBDIR}/libqtxmlcmodule.so -${QTLIBDIR}/libqtxmlcmodule.so.1 -${QTLIBDIR}/libqtxmlcmodule.so.1.0 -${PYSITELIB}/qtcanvas.py -${PYSITELIB}/qtgl.py -${PYSITELIB}/qtnetwork.py -${PYSITELIB}/qtsql.py -${PYSITELIB}/qttable.py -${PYSITELIB}/qtui.py -${PYSITELIB}/qtxml.py +@comment $NetBSD: PLIST,v 1.3 2004/05/09 17:06:07 recht Exp $ +${PYSITELIB}/qtcanvas.so +${PYSITELIB}/qtgl.so +${PYSITELIB}/qtnetwork.so +${PYSITELIB}/qtsql.so +${PYSITELIB}/qttable.so +${PYSITELIB}/qtui.so +${PYSITELIB}/qtxml.so +share/sip${PYVERSSUFFIX}/qtcanvas/copying.sip +share/sip${PYVERSSUFFIX}/qtcanvas/qcanvas.sip +share/sip${PYVERSSUFFIX}/qtcanvas/qtcanvasmod.sip +share/sip${PYVERSSUFFIX}/qtgl/copying.sip +share/sip${PYVERSSUFFIX}/qtgl/qgl.sip +share/sip${PYVERSSUFFIX}/qtgl/qglcolormap.sip +share/sip${PYVERSSUFFIX}/qtgl/qtglmod.sip +share/sip${PYVERSSUFFIX}/qtnetwork/copying.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qdns.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qftp.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qhostaddress.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qhttp.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qlocalfs.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qnetwork.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qserversocket.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qsocket.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qsocketdevice.sip +share/sip${PYVERSSUFFIX}/qtnetwork/qtnetworkmod.sip +share/sip${PYVERSSUFFIX}/qtsql/copying.sip +share/sip${PYVERSSUFFIX}/qtsql/qdatabrowser.sip +share/sip${PYVERSSUFFIX}/qtsql/qdatatable.sip +share/sip${PYVERSSUFFIX}/qtsql/qdataview.sip +share/sip${PYVERSSUFFIX}/qtsql/qeditorfactory.sip +share/sip${PYVERSSUFFIX}/qtsql/qsql.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlcursor.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqldatabase.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqldriver.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqleditorfactory.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlerror.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlfield.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlform.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlindex.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlpropertymap.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlquery.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlrecord.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlresult.sip +share/sip${PYVERSSUFFIX}/qtsql/qsqlselectcursor.sip +share/sip${PYVERSSUFFIX}/qtsql/qtsqlmod.sip +share/sip${PYVERSSUFFIX}/qttable/copying.sip +share/sip${PYVERSSUFFIX}/qttable/qtable.sip +share/sip${PYVERSSUFFIX}/qttable/qttablemod.sip +share/sip${PYVERSSUFFIX}/qtui/copying.sip +share/sip${PYVERSSUFFIX}/qtui/qtuimod.sip +share/sip${PYVERSSUFFIX}/qtui/qwidgetfactory.sip +share/sip${PYVERSSUFFIX}/qtxml/copying.sip +share/sip${PYVERSSUFFIX}/qtxml/qdom.sip +share/sip${PYVERSSUFFIX}/qtxml/qtxmlmod.sip +@dirrm share/sip${PYVERSSUFFIX}/qtxml +@dirrm share/sip${PYVERSSUFFIX}/qtui +@dirrm share/sip${PYVERSSUFFIX}/qttable +@dirrm share/sip${PYVERSSUFFIX}/qtsql +@dirrm share/sip${PYVERSSUFFIX}/qtnetwork +@dirrm share/sip${PYVERSSUFFIX}/qtgl +@dirrm share/sip${PYVERSSUFFIX}/qtcanvas +@comment in py-qt3-base: @dirrm share/sip${PYVERSSUFFIX} diff --git a/x11/py-qt3-modules/buildlink2.mk b/x11/py-qt3-modules/buildlink2.mk deleted file mode 100644 index 0842ea91e9b..00000000000 --- a/x11/py-qt3-modules/buildlink2.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:50 jlam Exp $ - -.if !defined(PY_QT3_MODULES_BUILDLINK2_MK) -PY_QT3_MODULES_BUILDLINK2_MK= # defined - -.include "../../lang/python/pyversion.mk" - -BUILDLINK_PACKAGES+= pyqt3modules -BUILDLINK_PKGBASE.pyqt3modules?= ${PYPKGPREFIX}-qt3-modules -BUILDLINK_DEPENDS.pyqt3modules?= ${PYPKGPREFIX}-qt3-modules>=3.7nb1 -BUILDLINK_PKGSRCDIR.pyqt3modules?= ../../x11/py-qt3-modules - -.include "../../x11/py-qt3-base/buildlink2.mk" - -.endif # PY_QT3_MODULES_BUILDLINK2_MK diff --git a/x11/py-qt3-modules/distinfo b/x11/py-qt3-modules/distinfo index d2a7d52008e..aae072763c6 100644 --- a/x11/py-qt3-modules/distinfo +++ b/x11/py-qt3-modules/distinfo @@ -1,12 +1,5 @@ -$NetBSD: distinfo,v 1.3 2003/08/25 17:57:54 drochner Exp $ +$NetBSD: distinfo,v 1.4 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) = 12591c485bc40951e0110e96de7ea3df1cf99827 -SHA1 (patch-ab) = df819b1cef8fa6d51ba054e2c2604aabea80040b -SHA1 (patch-ac) = 910d407bf809b8575dd7ff6899e126296ce75beb -SHA1 (patch-ad) = c24e3e0d3774637fd17337c7b736a81668101105 -SHA1 (patch-ae) = 263e7784ddd66a1d7cf473c06ae540ca31f6c30e -SHA1 (patch-af) = 0e3f558578b239c339f99cd7aca7ab5cf1b3cbc2 -SHA1 (patch-ag) = cc42028d82369b93f0ea8c49ad7a17c2ba2c7de5 -SHA1 (patch-ah) = 45ba3d3b0cf9b284af3563041fd35f8161436ef9 +SHA1 (PyQt-x11-gpl-3.11.tar.gz) = 7b4949d97cdf989119681d34f8c30fede2d04e82 +Size (PyQt-x11-gpl-3.11.tar.gz) = 757652 bytes +SHA1 (patch-aa) = cdf9fcfb3ef1c90a4864a6415edd58e42bbc6292 diff --git a/x11/py-qt3-modules/patches/patch-aa b/x11/py-qt3-modules/patches/patch-aa index 1db256c5786..60c006e56df 100644 --- a/x11/py-qt3-modules/patches/patch-aa +++ b/x11/py-qt3-modules/patches/patch-aa @@ -1,42 +1,17 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:24:50 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 15:42:01.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 +--- configure.py.orig 2004-03-11 20:23:30.000000000 +0100 ++++ configure.py 2004-05-09 17:37:45.000000000 +0200 +@@ -38,7 +38,7 @@ + sip_min_v3_version = 0x030a01 + sip_min_v4_version = 0x040000 - 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 -@@ -592,7 +593,7 @@ - incdirs = incdirs + " " + escape(qtIncDir) - - # Find the QScintilla header files. -- if qtVersion >= 0x030000: -+ if 0: - global sciIncDir - - if not sciIncDir: -@@ -717,7 +718,7 @@ +-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 @@ -45,50 +20,178 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $ try: resp = raw_input("Do you accept the terms of the license? ") except: -@@ -997,7 +998,7 @@ - buildMakefile("qttest.pro") +@@ -697,82 +697,82 @@ + # The Professional Edition needs special handling. + prof = (sipcfg.qt_edition == "professional") - # Check the location of the QScintilla library. -- if sciVersion >= 0: -+ if 0: - global sciLibDir +- sipconfig.inform("Creating pyuic Makefile...") ++# sipconfig.inform("Creating pyuic Makefile...") - if not sciLibDir: -@@ -1551,23 +1552,23 @@ - subdirs = subdirs + " qtpe" +- if prof: +- buildfile= "pyuic-prof.sbf" ++# if prof: ++# buildfile= "pyuic-prof.sbf" - # 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") +- 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") - -- 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") +- makefile.generate() +- subdirs.append("pyuic3") ++# 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 ++# ) + -+# buildMakefile("pyuic.pro") -+# fixInstallTarget() -+# popDir(olddir) ++# 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 ++# ) + +- sipconfig.inform("Creating pylupdate Makefile...") ++# makefile.extra_defines.append("UIC") ++# makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib") + +- 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...") + +@@ -853,7 +853,7 @@ + sipcfg.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv)) + + # Check for QScintilla. +- check_qscintilla() ++ #check_qscintilla() + + # Check which modules to build. + check_module("qtcanvas", "qcanvas.h", "QCanvas()") +@@ -866,8 +866,8 @@ + check_module("qtsql", "qsql.h", "QSql()") + check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui") + +- if qsci_version: +- check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla") ++ #if qsci_version: ++ # check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla") - # 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 opt_qtpetag: + pyqt_modules.append("qtpe") diff --git a/x11/py-qt3-modules/patches/patch-ab b/x11/py-qt3-modules/patches/patch-ab deleted file mode 100644 index acee16a49cf..00000000000 --- a/x11/py-qt3-modules/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2003/08/23 15:02:28 drochner Exp $ - ---- sip/qtcanvasmod.sip.orig 2003-08-17 14:27:48.000000000 +0200 -+++ sip/qtcanvasmod.sip 2003-08-22 21:06:56.000000000 +0200 -@@ -57,12 +57,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 = @BL_DEFINES@ - --sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip -+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip - sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ - - sip4:win32:LIBS += @BL_PYLIB@ diff --git a/x11/py-qt3-modules/patches/patch-ac b/x11/py-qt3-modules/patches/patch-ac deleted file mode 100644 index fb846c74b08..00000000000 --- a/x11/py-qt3-modules/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2003/08/23 15:02:28 drochner Exp $ - ---- sip/qtglmod.sip.orig 2003-08-17 14:27:48.000000000 +0200 -+++ sip/qtglmod.sip 2003-08-22 19:59:53.000000000 +0200 -@@ -58,12 +58,12 @@ - - TEMPLATE = lib - TARGET = @BL_TARGET@ --DESTDIR = @BL_DESTDIR@ -+#DESTDIR = @BL_DESTDIR@ - CONFIG += qt opengl warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@ - INCLUDEPATH = @BL_INCLUDEPATH@ - DEFINES = @BL_DEFINES@ - --sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip -+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip - sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ - - sip4:win32:LIBS += @BL_PYLIB@ diff --git a/x11/py-qt3-modules/patches/patch-ad b/x11/py-qt3-modules/patches/patch-ad deleted file mode 100644 index 30a6f8e8837..00000000000 --- a/x11/py-qt3-modules/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2003/08/23 15:02:28 drochner Exp $ - ---- sip/qtnetworkmod.sip.orig 2003-08-17 14:27:48.000000000 +0200 -+++ sip/qtnetworkmod.sip 2003-08-22 20:00:49.000000000 +0200 -@@ -61,12 +61,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 = @BL_DEFINES@ - --sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip -+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip - sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ - - sip4:win32:LIBS += @BL_PYLIB@ diff --git a/x11/py-qt3-modules/patches/patch-ae b/x11/py-qt3-modules/patches/patch-ae deleted file mode 100644 index b7963106cb6..00000000000 --- a/x11/py-qt3-modules/patches/patch-ae +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2003/08/25 17:57:54 drochner Exp $ - ---- sip/qtsqlmod.sip.orig 2003-08-17 14:27:48.000000000 +0200 -+++ sip/qtsqlmod.sip 2003-08-22 20:01:46.000000000 +0200 -@@ -75,12 +75,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 = @BL_DEFINES@ - --sip3:unix:LIBS += -L@BL_DESTDIR@ -lqttablecmodule -lqtcmodule -L@BL_SIPMODDIR@ -lsip -+sip3:unix:LIBS += -L@BL_DESTDIR@ ../qttable/libqttablecmodule.la -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip - sip3:win32:LIBS += @BL_DESTDIR@\libqttablec.lib @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ - - sip4:win32:LIBS += @BL_PYLIB@ diff --git a/x11/py-qt3-modules/patches/patch-af b/x11/py-qt3-modules/patches/patch-af deleted file mode 100644 index 14b41a3480a..00000000000 --- a/x11/py-qt3-modules/patches/patch-af +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-af,v 1.2 2003/08/23 15:02:29 drochner Exp $ - ---- sip/qttablemod.sip.orig 2003-08-17 14:27:48.000000000 +0200 -+++ sip/qttablemod.sip 2003-08-22 20:02:34.000000000 +0200 -@@ -57,12 +57,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 = @BL_DEFINES@ - --sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip -+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip - sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ - - sip4:win32:LIBS += @BL_PYLIB@ diff --git a/x11/py-qt3-modules/patches/patch-ag b/x11/py-qt3-modules/patches/patch-ag deleted file mode 100644 index 03eebe3f372..00000000000 --- a/x11/py-qt3-modules/patches/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2003/08/23 15:02:29 drochner Exp $ - ---- sip/qtuimod.sip.orig 2003-08-17 14:27:48.000000000 +0200 -+++ sip/qtuimod.sip 2003-08-22 20:03:35.000000000 +0200 -@@ -58,12 +58,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 = @BL_DEFINES@ - --sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip -lqui -+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip -lqui - sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ $$(QTDIR)\lib\qui.lib - - sip4:unix:LIBS += -lqui diff --git a/x11/py-qt3-modules/patches/patch-ah b/x11/py-qt3-modules/patches/patch-ah deleted file mode 100644 index b05869a3d4c..00000000000 --- a/x11/py-qt3-modules/patches/patch-ah +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2003/08/23 15:02:29 drochner Exp $ - ---- sip/qtxmlmod.sip.orig 2003-08-17 14:27:48.000000000 +0200 -+++ sip/qtxmlmod.sip 2003-08-22 21:02:49.000000000 +0200 -@@ -67,12 +67,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 = @BL_DEFINES@ - --sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip -+sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip - sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ - - sip4:win32:LIBS += @BL_PYLIB@ 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 |