From 38e427917b81a15848da7a6ba2a8b15a1a695c06 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 19 Mar 2002 17:54:33 +0000 Subject: update to 3.0.2 "Qt 3.0.2 is a bugfix release. It maintains both forward and backward compatibility (source and binary) with Qt 3.0.1." --- x11/qt3-docs/Makefile | 5 ++- x11/qt3-docs/PLIST | 72 +++++++++++++++++++++++++++++++++++++++++-- x11/qt3-libs/Makefile | 6 ++-- x11/qt3-libs/Makefile.common | 3 +- x11/qt3-libs/PLIST | 5 ++- x11/qt3-libs/buildlink.mk | 2 +- x11/qt3-libs/distinfo | 8 ++--- x11/qt3-libs/patches/patch-ab | 12 ++++---- x11/qt3-tools/Makefile | 7 +++-- x11/qt3-tools/buildlink.mk | 4 +-- x11/qt3/Makefile | 7 ++--- x11/qt3/Makefile.common | 4 +-- 12 files changed, 101 insertions(+), 34 deletions(-) (limited to 'x11') diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile index e36ee87d47e..71537eda977 100644 --- a/x11/qt3-docs/Makefile +++ b/x11/qt3-docs/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.2 2002/03/13 17:38:02 fredb Exp $ +# $NetBSD: Makefile,v 1.3 2002/03/19 17:54:35 drochner Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-docs-${QTVERSION} -PKGREVISION= 1 COMMENT= Documentation for the QT C++ X GUI toolkit NO_BUILDLINK_ONLY= yes -BUILDLINK_DEPENDS.qt3-libs= qt3-libs-${QTVERSION}nb1 +BUILDLINK_DEPENDS.qt3-libs= qt3-libs-${QTVERSION} NO_PATCH= yes NO_CONFIGURE= yes diff --git a/x11/qt3-docs/PLIST b/x11/qt3-docs/PLIST index 95d4c311f8c..a758f980bf6 100644 --- a/x11/qt3-docs/PLIST +++ b/x11/qt3-docs/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/07 08:10:44 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/19 17:54:35 drochner Exp $ qt3/doc/html/README qt3/doc/html/README.QT qt3/doc/html/aboutqt.html +qt3/doc/html/abstract-connections.png qt3/doc/html/abstractwidgets.html qt3/doc/html/accelerators.html qt3/doc/html/aclock-example.html @@ -31,6 +32,7 @@ qt3/doc/html/buttongroup-w.png qt3/doc/html/buttongroups-example.html qt3/doc/html/buyhowto.html qt3/doc/html/callbacks.png +qt3/doc/html/canvas-example.html qt3/doc/html/canvas.html qt3/doc/html/checklists-example.html qt3/doc/html/classchart.html @@ -38,6 +40,7 @@ qt3/doc/html/classes.html qt3/doc/html/clientserver-example.html qt3/doc/html/collection.html qt3/doc/html/commonproblems.html +qt3/doc/html/concrete-connections.png qt3/doc/html/coordsys.html qt3/doc/html/coordsys.png qt3/doc/html/credits.html @@ -52,13 +55,14 @@ qt3/doc/html/datastreamformat.html qt3/doc/html/datetimewidgets.png qt3/doc/html/dclock-example.html qt3/doc/html/debug.html -qt3/doc/html/design.html +qt3/doc/html/demo-example.html qt3/doc/html/designer-manual-1.html qt3/doc/html/designer-manual-10.html qt3/doc/html/designer-manual-11.html qt3/doc/html/designer-manual-12.html qt3/doc/html/designer-manual-13.html qt3/doc/html/designer-manual-14.html +qt3/doc/html/designer-manual-15.html qt3/doc/html/designer-manual-2.html qt3/doc/html/designer-manual-3.html qt3/doc/html/designer-manual-4.html @@ -79,6 +83,7 @@ qt3/doc/html/dnd.html qt3/doc/html/doc.png qt3/doc/html/doneandnext.png qt3/doc/html/draganddrop.html +qt3/doc/html/dragdrop-example.html qt3/doc/html/drawdemo-example.html qt3/doc/html/drawlines-example.html qt3/doc/html/edit-dbtable-dialog.png @@ -138,6 +143,7 @@ qt3/doc/html/hello-example.html qt3/doc/html/helpsystem.html qt3/doc/html/helpviewer-example.html qt3/doc/html/hierarchy.html +qt3/doc/html/how-to-learn-qt.html qt3/doc/html/httpd-example.html qt3/doc/html/i18n-example.html qt3/doc/html/i18n.html @@ -180,6 +186,7 @@ qt3/doc/html/mainlyQt-editor-example.html qt3/doc/html/mainlyXt-editor-example.html qt3/doc/html/mainwindow-m.png qt3/doc/html/mainwindow-w.png +qt3/doc/html/makeqpf.html qt3/doc/html/mdi-example.html qt3/doc/html/menu-example.html qt3/doc/html/menubar.png @@ -200,6 +207,15 @@ qt3/doc/html/nsplugin.html qt3/doc/html/object.html qt3/doc/html/objectmodel.html qt3/doc/html/objecttrees.html +qt3/doc/html/opengl-box-example.html +qt3/doc/html/opengl-examples.html +qt3/doc/html/opengl-gear-example.html +qt3/doc/html/opengl-overlay-example.html +qt3/doc/html/opengl-overlay-x11-example.html +qt3/doc/html/opengl-pixmap-example.html +qt3/doc/html/opengl-sharedbox-example.html +qt3/doc/html/opengl-texture-example.html +qt3/doc/html/opengl-x11-overlays.html qt3/doc/html/opengl.html qt3/doc/html/organizers.html qt3/doc/html/outliner-example.html @@ -399,6 +415,42 @@ qt3/doc/html/qcustomevent.html qt3/doc/html/qcustommenuitem-members.html qt3/doc/html/qcustommenuitem.html qt3/doc/html/qd-buttonstoolbuttons3.png +qt3/doc/html/qd-chapdialog-previewing2.png +qt3/doc/html/qd-chapdialog-signalsandslots.png +qt3/doc/html/qd-chapdialog-taborder.png +qt3/doc/html/qd-chapdialogs-addingwidgets.png +qt3/doc/html/qd-chapdialogs-creatingmulticlipform3.png +qt3/doc/html/qd-chapdialogs-creatingnewprojects.png +qt3/doc/html/qd-chapdialogs-layoutwidgets-part2-stepone-twogroups.png +qt3/doc/html/qd-chapdialogs-layoutwidgets-part2-steptwo-layoutform.png +qt3/doc/html/qd-chapdialogs-layoutwidgets-part3-stepfive-layoutform.png +qt3/doc/html/qd-chapdialogs-layoutwidgets-part3-steptwo-addspacer.png +qt3/doc/html/qd-chapdialogs-layoutwidgets-stepone-after.png +qt3/doc/html/qd-chapdialogs-layoutwidgets-stepthree-groupedwidgets.png +qt3/doc/html/qd-chapdialogs-layoutwidgets-stepthree-rubberband.png +qt3/doc/html/qd-chapdialogs-objectexplorer.png +qt3/doc/html/qd-chapdialogs-propertyeditor.png +qt3/doc/html/qd-chapmainwin-actioneditor1.png +qt3/doc/html/qd-chapmainwin-actioneditor2.png +qt3/doc/html/qd-chapmainwin-actiongroup.png +qt3/doc/html/qd-chapmainwin-addtextedit.png +qt3/doc/html/qd-chapmainwin-addwidg.png +qt3/doc/html/qd-chapmainwin-alignactiongroup.png +qt3/doc/html/qd-chapmainwin-connaction.png +qt3/doc/html/qd-chapmainwin-connalign1.png +qt3/doc/html/qd-chapmainwin-connfontsize.png +qt3/doc/html/qd-chapmainwin-deleteaction.png +qt3/doc/html/qd-chapmainwin-dragtomenu.png +qt3/doc/html/qd-chapmainwin-dropinmenu1.png +qt3/doc/html/qd-chapmainwin-mainwinwiz1.png +qt3/doc/html/qd-chapmainwin-mainwinwiz2.png +qt3/doc/html/qd-chapmainwin-mainwinwiz3.png +qt3/doc/html/qd-chapmainwin-namemenu.png +qt3/doc/html/qd-chapmainwin-previewing.png +qt3/doc/html/qd-chapmainwin-propeditnewact.png +qt3/doc/html/qd-chapmainwin-toolbaractiongroup1.png +qt3/doc/html/qd-chapmainwin-toolbarhandle.png +qt3/doc/html/qd-chapmainwin-toolbarhandle2.png qt3/doc/html/qd-chooseanimage.png qt3/doc/html/qd-chooseapixmap.png qt3/doc/html/qd-chooseimages.png @@ -539,6 +591,9 @@ qt3/doc/html/qdir-example.html qt3/doc/html/qdir-h.html qt3/doc/html/qdir-members.html qt3/doc/html/qdir.html +qt3/doc/html/qdirectpainter-members.html +qt3/doc/html/qdirectpainter.html +qt3/doc/html/qdirectpainter_qws-h.html qt3/doc/html/qdns-h.html qt3/doc/html/qdns-members.html qt3/doc/html/qdns.html @@ -712,6 +767,7 @@ qt3/doc/html/qhbox.html qt3/doc/html/qhbox.png qt3/doc/html/qhboxlayout-members.html qt3/doc/html/qhboxlayout.html +qt3/doc/html/qhboxlayout.png qt3/doc/html/qhbuttongroup-h.html qt3/doc/html/qhbuttongroup-members.html qt3/doc/html/qhbuttongroup.html @@ -1307,6 +1363,7 @@ qt3/doc/html/qtimer-members.html qt3/doc/html/qtimer.html qt3/doc/html/qtimerevent-members.html qt3/doc/html/qtimerevent.html +qt3/doc/html/qtl-qvaluelist-example.html qt3/doc/html/qtl.html qt3/doc/html/qtlogo.png qt3/doc/html/qtmultilineedit-h.html @@ -1491,7 +1548,10 @@ qt3/doc/html/simple-application-example.html qt3/doc/html/simple-application.html qt3/doc/html/simple-font-demo-example.html qt3/doc/html/simple-qfont-demo-walkthrough.html +qt3/doc/html/simple_dd-example.html +qt3/doc/html/small-table-example-example.html qt3/doc/html/smooth.png +qt3/doc/html/sound-example.html qt3/doc/html/splitter-example.html qt3/doc/html/splitter-views-m.png qt3/doc/html/splitter-views-w.png @@ -1532,6 +1592,7 @@ qt3/doc/html/sql-overview-table4-main-h.html qt3/doc/html/sql-overview-update-main-cpp.html qt3/doc/html/sql.html qt3/doc/html/sqltable-example.html +qt3/doc/html/statistics-example.html qt3/doc/html/step-by-step-examples.html qt3/doc/html/t1.html qt3/doc/html/t1.png @@ -1619,12 +1680,14 @@ qt3/doc/html/table-examples.html qt3/doc/html/table-small-table-demo-main-cpp.html qt3/doc/html/table-statistics-statistics-cpp.html qt3/doc/html/table.html +qt3/doc/html/tablet-example.html qt3/doc/html/tagreader-example.html qt3/doc/html/tagreader-with-features-example.html qt3/doc/html/templates.html qt3/doc/html/test.png qt3/doc/html/tetrix-example.html qt3/doc/html/text.html +qt3/doc/html/textedit-example.html qt3/doc/html/themes-example.html qt3/doc/html/thread.html qt3/doc/html/threads.html @@ -1634,6 +1697,7 @@ qt3/doc/html/timers.html qt3/doc/html/titleindex qt3/doc/html/toggleaction-example.html qt3/doc/html/toolbar.png +qt3/doc/html/tools-list.html qt3/doc/html/tools.html qt3/doc/html/tooltip-example.html qt3/doc/html/trivial-nsplugin-example.html @@ -1651,6 +1715,7 @@ qt3/doc/html/tt3_11_en.png qt3/doc/html/tt3_11_pt.png qt3/doc/html/tutorial.html qt3/doc/html/tutorial.png +qt3/doc/html/uic.html qt3/doc/html/unicode.html qt3/doc/html/unsmooth.png qt3/doc/html/validateaccelerators.png @@ -1658,6 +1723,7 @@ qt3/doc/html/validatephrases.png qt3/doc/html/validatepunctuation.png qt3/doc/html/whatsthis qt3/doc/html/whatsthis.png +qt3/doc/html/widgets-example.html qt3/doc/html/winsystem.html qt3/doc/html/wizard-example.html qt3/doc/html/wizard-wizard-cpp.html @@ -1745,6 +1811,7 @@ qt3/man/man3/QDialog.3 qt3/man/man3/QDict.3 qt3/man/man3/QDictIterator.3 qt3/man/man3/QDir.3 +qt3/man/man3/QDirectPainter.3 qt3/man/man3/QDns.3 qt3/man/man3/QDockArea.3 qt3/man/man3/QDockWindow.3 @@ -2119,6 +2186,7 @@ qt3/man/man3/qdialog.3 qt3/man/man3/qdict.3 qt3/man/man3/qdictiterator.3 qt3/man/man3/qdir.3 +qt3/man/man3/qdirectpainter.3 qt3/man/man3/qdns.3 qt3/man/man3/qdockarea.3 qt3/man/man3/qdockwindow.3 diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index fa5e31242a2..da88a4f7b55 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/03/13 17:38:02 fredb Exp $ +# $NetBSD: Makefile,v 1.3 2002/03/19 17:54:35 drochner Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 1 COMMENT= C++ X GUI toolkit USE_BUILDLINK_ONLY= yes @@ -12,6 +11,9 @@ BUILDLINK_QTDIR= ${WRKSRC} ALL_TARGET= sub-src +post-extract: + ${RM} -f ${WRKSRC}/include/qt_windows.h + do-install: ${INSTALL_DATA_DIR} ${QTPREFIX} ${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 0641da67ea9..801368c7e63 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,7 +1,6 @@ -# $NetBSD: Makefile.common,v 1.2 2002/03/13 17:38:03 fredb Exp $ +# $NetBSD: Makefile.common,v 1.3 2002/03/19 17:54:36 drochner Exp $ # DISTNAME= qt-x11-free-${QTVERSION} -PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= \ ftp://ftp.trolltech.com/qt/source/ \ diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST index 4c7326e2a38..70d11d8d23b 100644 --- a/x11/qt3-libs/PLIST +++ b/x11/qt3-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/07 08:07:58 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/19 17:54:36 drochner Exp $ qt3/bin/moc qt3/include/jri.h qt3/include/jri_md.h @@ -274,6 +274,7 @@ qt3/include/qsessionmanager.h qt3/include/qsettings.h qt3/include/qsgistyle.h qt3/include/qshared.h +qt3/include/qsharedmemory.h qt3/include/qsignal.h qt3/include/qsignalmapper.h qt3/include/qsignalslotimp.h @@ -316,7 +317,6 @@ qt3/include/qstylefactory.h qt3/include/qstyleplugin.h qt3/include/qstylesheet.h qt3/include/qt.h -qt3/include/qt_windows.h qt3/include/qt_x11.h qt3/include/qtabbar.h qt3/include/qtabdialog.h @@ -372,7 +372,6 @@ qt3/include/qwindowsstyle.h qt3/include/qwizard.h qt3/include/qwmatrix.h qt3/include/qworkspace.h -qt3/include/qwsgfx_qnx.h qt3/include/qxml.h qt3/include/qxt.h qt3/lib/libqt.a diff --git a/x11/qt3-libs/buildlink.mk b/x11/qt3-libs/buildlink.mk index 37191b13339..ec57636a779 100644 --- a/x11/qt3-libs/buildlink.mk +++ b/x11/qt3-libs/buildlink.mk @@ -17,7 +17,7 @@ QT3_LIBS_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.1nb1 +BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.2 DEPENDS+= ${BUILDLINK_DEPENDS.qt3-libs}:../../x11/qt3-libs EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-libs=qt3-libs diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 2f25580f5e1..02a4cbc3e19 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/07 08:07:57 skrll Exp $ +$NetBSD: distinfo,v 1.2 2002/03/19 17:54:36 drochner Exp $ -SHA1 (qt-x11-free-3.0.1.tar.gz) = cdb80902c129c1c991c4c87f1a21ab6fa9c0cfbf -Size (qt-x11-free-3.0.1.tar.gz) = 17818374 bytes +SHA1 (qt-x11-free-3.0.2.tar.gz) = 8694d8c9992d22e82bedf6891879a6b2f7d94e0e +Size (qt-x11-free-3.0.2.tar.gz) = 15083583 bytes SHA1 (patch-aa) = aae2cb07147fdc00b008dbb89ebddb58a9ad5010 -SHA1 (patch-ab) = 48e7e362fe66e728c4444e0cc2293a9e13e57359 +SHA1 (patch-ab) = 90e22f330cecaa3eec36bba1dac1bd202cf99287 SHA1 (patch-ac) = da32dd8596f36238fec30fb7b8a444d36e13ed92 diff --git a/x11/qt3-libs/patches/patch-ab b/x11/qt3-libs/patches/patch-ab index f604ad564e3..a233d61df36 100644 --- a/x11/qt3-libs/patches/patch-ab +++ b/x11/qt3-libs/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/01/07 08:07:59 skrll Exp $ +$NetBSD: patch-ab,v 1.2 2002/03/19 17:54:36 drochner Exp $ ---- configure.orig Fri Nov 30 15:27:49 2001 -+++ configure -@@ -121,7 +121,7 @@ - fi - +--- configure.orig Fri Feb 15 09:12:23 2002 ++++ configure Fri Mar 8 12:34:37 2002 +@@ -732,7 +732,7 @@ + # we may write in the source tree, let's take advantage of this + # to test that QTDIR is correctly set to be the source tree touch .test.qt. - if [ '!' -f ${QTDIR}/.test.qt. ] + if [ '!' -f .test.qt. ] diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile index f504c13dfa0..6b8a4544857 100644 --- a/x11/qt3-tools/Makefile +++ b/x11/qt3-tools/Makefile @@ -1,17 +1,18 @@ -# $NetBSD: Makefile,v 1.2 2002/03/13 17:38:03 fredb Exp $ +# $NetBSD: Makefile,v 1.3 2002/03/19 17:54:37 drochner Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-tools-${QTVERSION} -PKGREVISION= 1 COMMENT= QT GUI (WYSIWYG) builder and other tools CONFIGURE_ARGS+= -I${BUILDLINK_QTDIR}/include \ -L${BUILDLINK_QTDIR}/lib USE_BUILDLINK_ONLY= yes -BUILDLINK_DEPENDS.qt3-libs= qt3-libs-${QTVERSION}nb1 +BUILDLINK_DEPENDS.qt3-libs= qt3-libs-${QTVERSION} + +UNLIMIT_RESOURCES= datasize ALL_TARGET= sub-tools diff --git a/x11/qt3-tools/buildlink.mk b/x11/qt3-tools/buildlink.mk index 7204934eeb3..82aacb25496 100644 --- a/x11/qt3-tools/buildlink.mk +++ b/x11/qt3-tools/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:38:03 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.3 2002/03/19 17:54:37 drochner Exp $ # # This Makefile fragment is included by packages that use qt3-tools. # @@ -17,7 +17,7 @@ QT3_TOOLS_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.1nb1 +BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.2 DEPENDS+= ${BUILDLINK_DEPENDS.qt3-tools}:../../x11/qt3-tools EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-tools=qt3-tools diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index a57b61bb613..0883d4e71be 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -2,7 +2,6 @@ # DISTNAME= qt3-${QTVERSION} -PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= # empty DISTFILES= # empty @@ -11,9 +10,9 @@ COMMENT= "meta-package" for the QT GUI C++ toolkit .include "./Makefile.common" -DEPENDS+= qt3-libs-${QTVERSION}nb1:../../x11/qt3-libs -DEPENDS+= qt3-tools-${QTVERSION}nb1:../../x11/qt3-tools -DEPENDS+= qt3-docs-${QTVERSION}nb1:../../x11/qt3-docs +DEPENDS+= qt3-libs-${QTVERSION}:../../x11/qt3-libs +DEPENDS+= qt3-tools-${QTVERSION}:../../x11/qt3-tools +DEPENDS+= qt3-docs-${QTVERSION}:../../x11/qt3-docs USE_X11BASE= yes EXTRACT_ONLY= # empty diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common index 5b23b2ea1ac..a71be4eea57 100644 --- a/x11/qt3/Makefile.common +++ b/x11/qt3/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2002/01/07 08:11:32 skrll Exp $ +# $NetBSD: Makefile.common,v 1.2 2002/03/19 17:54:34 drochner Exp $ # -QTVERSION= 3.0.1 +QTVERSION= 3.0.2 MAINTAINER= skrll@netbsd.org HOMEPAGE= http://www.trolltech.com/products/qt.html -- cgit v1.2.3