From b517a6632f666e9f8886ed1cf076a66fa699ffa3 Mon Sep 17 00:00:00 2001 From: skrll Date: Mon, 28 Oct 2002 08:46:43 +0000 Subject: Update to Qt 3.0.6, change PKGLIBTOOL to LIBTOOL in one place and do a bit of PLIST sorting. Qt 3.0.6 is a bugfix release. It maintains both forward and backward compatibility (source and binary) with Qt 3.0.5 Binary compatibility warning: Qt 3.0.6 is backward and forward binary compatible with Qt 3.0.5, and is planned to be binary compatible with Qt 3.1. Unfortunately Qt 3.0.5 is not 100% backward binary compatible with Qt 3.0.3 (a class got a few bytes smaller), meaning executables compiled with 3.0.5 may not run properly when linked dynamically to 3.0.3. at runtime. Note that this is not a problem on MS-Windows. Due to its wide distributed in various GNU/Linux distributions, we have decided to stick with 3.0.5's ABI. If you ship dynamically linked executables, we suggest putting a QT_REQUIRE_VERSION macro at the beginning of your main function: ... #include ... int main( int argc, char**argv ) { QT_REQUIRE_VERSION( argc, argv, "3.0.5" ) ... } The macro will show a message box with a warning message and then abort the application gracefully with exit(1). For a full buglist see the Trolltech web site. --- doc/CHANGES | 6 ++- x11/qt3-docs/PLIST | 43 +++++++--------- x11/qt3-libs/Makefile | 4 +- x11/qt3-libs/PLIST | 3 +- x11/qt3-libs/distinfo | 8 +-- x11/qt3-libs/patches/patch-ac | 10 ++-- x11/qt3-tools/Makefile | 3 +- x11/qt3-tools/PLIST | 117 ++++++++++++++++++++++-------------------- x11/qt3/Makefile | 5 +- x11/qt3/Makefile.common | 4 +- 10 files changed, 100 insertions(+), 103 deletions(-) diff --git a/doc/CHANGES b/doc/CHANGES index ddcc96e8642..9deb77e07ed 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.382 2002/10/27 21:56:46 tron Exp $ +$NetBSD: CHANGES,v 1.383 2002/10/28 08:46:43 skrll Exp $ Changes to the packages collection and infrastructure in 2002: @@ -3411,3 +3411,7 @@ Changes to the packages collection and infrastructure in 2002: Added cyrus-sasl-2.1.9 [chris 2002-10-27] Added cyrus-imapd-2.1.9 [chris 2002-10-27] Updated bidwatcher to 1.3.6 [tron 2002-10-27] + Updated qt3-libs to 3.0.6 [skrll 2002-10-28] + Updated qt3-docs to 3.0.6 [skrll 2002-10-28] + Updated qt3-tools to 3.0.6 [skrll 2002-10-28] + Updated qt3 to 3.0.6 [skrll 2002-10-28] diff --git a/x11/qt3-docs/PLIST b/x11/qt3-docs/PLIST index b055ddd53cc..74329ac781f 100644 --- a/x11/qt3-docs/PLIST +++ b/x11/qt3-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/08/27 09:13:51 skrll Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/10/28 08:46:45 skrll Exp $ qt3/doc/html/README qt3/doc/html/README.QT qt3/doc/html/aboutqt.html @@ -6,8 +6,6 @@ qt3/doc/html/abstract-connections.png qt3/doc/html/abstractwidgets.html qt3/doc/html/accelerators.html qt3/doc/html/aclock-example.html -qt3/doc/html/actiongroup-example.html -qt3/doc/html/actiongroup.html qt3/doc/html/addressbook-example.html qt3/doc/html/advanced.html qt3/doc/html/annotated.html @@ -19,7 +17,6 @@ qt3/doc/html/assistant-2.html qt3/doc/html/assistant-3.html qt3/doc/html/assistant-4.html qt3/doc/html/assistant.html -qt3/doc/html/assistant.xml qt3/doc/html/basic.html qt3/doc/html/bearings.png qt3/doc/html/biff-example.html @@ -36,11 +33,26 @@ qt3/doc/html/callbacks.png qt3/doc/html/canvas-chart-example.html qt3/doc/html/canvas-example.html qt3/doc/html/canvas.html +qt3/doc/html/chart-canvastext-h.html +qt3/doc/html/chart-canvasview-cpp.html +qt3/doc/html/chart-canvasview-h.html +qt3/doc/html/chart-chart-pro.html +qt3/doc/html/chart-chartform-cpp.html +qt3/doc/html/chart-chartform-h.html +qt3/doc/html/chart-chartform_canvas-cpp.html +qt3/doc/html/chart-chartform_files-cpp.html +qt3/doc/html/chart-element-cpp.html +qt3/doc/html/chart-element-h.html qt3/doc/html/chart-forms.png +qt3/doc/html/chart-main-cpp.html qt3/doc/html/chart-main.png qt3/doc/html/chart-main2.png qt3/doc/html/chart-options.png +qt3/doc/html/chart-optionsform-cpp.html +qt3/doc/html/chart-optionsform-h.html qt3/doc/html/chart-setdata.png +qt3/doc/html/chart-setdataform-cpp.html +qt3/doc/html/chart-setdataform-h.html qt3/doc/html/checklists-example.html qt3/doc/html/classchart.html qt3/doc/html/classes.html @@ -80,7 +92,6 @@ qt3/doc/html/designer-manual-8.html qt3/doc/html/designer-manual-9.html qt3/doc/html/designer-manual.html qt3/doc/html/designer.png -qt3/doc/html/designer.xml qt3/doc/html/designer1.jpg qt3/doc/html/designer2.jpg qt3/doc/html/designer3.jpg @@ -121,21 +132,6 @@ qt3/doc/html/embedporting.html qt3/doc/html/environment.html qt3/doc/html/events.html qt3/doc/html/eventsandfilters.html -qt3/doc/html/examples-chart-canvastext-h.html -qt3/doc/html/examples-chart-canvasview-cpp.html -qt3/doc/html/examples-chart-canvasview-h.html -qt3/doc/html/examples-chart-chart-pro.html -qt3/doc/html/examples-chart-chartform-cpp.html -qt3/doc/html/examples-chart-chartform-h.html -qt3/doc/html/examples-chart-chartform_canvas-cpp.html -qt3/doc/html/examples-chart-chartform_files-cpp.html -qt3/doc/html/examples-chart-element-cpp.html -qt3/doc/html/examples-chart-element-h.html -qt3/doc/html/examples-chart-main-cpp.html -qt3/doc/html/examples-chart-optionsform-cpp.html -qt3/doc/html/examples-chart-optionsform-h.html -qt3/doc/html/examples-chart-setdataform-cpp.html -qt3/doc/html/examples-chart-setdataform-h.html qt3/doc/html/examples.html qt3/doc/html/face.jpg qt3/doc/html/filechooser.png @@ -198,11 +194,11 @@ qt3/doc/html/linguist-manual-3.html qt3/doc/html/linguist-manual-4.html qt3/doc/html/linguist-manual.html qt3/doc/html/linguist.png -qt3/doc/html/linguist.xml qt3/doc/html/listbox-example.html qt3/doc/html/listboxcombo-example.html qt3/doc/html/listviews-example.html qt3/doc/html/logo32.png +qt3/doc/html/mac-differences.html qt3/doc/html/mail-example.html qt3/doc/html/mailinglists.html qt3/doc/html/mainclasses.html @@ -952,7 +948,6 @@ qt3/doc/html/qmake-manual-5.html qt3/doc/html/qmake-manual-6.html qt3/doc/html/qmake-manual-7.html qt3/doc/html/qmake-manual.html -qt3/doc/html/qmake.xml qt3/doc/html/qmap-h.html qt3/doc/html/qmap-members.html qt3/doc/html/qmap.html @@ -1330,7 +1325,6 @@ qt3/doc/html/qt-colors.png qt3/doc/html/qt-members.html qt3/doc/html/qt-template-lib.html qt3/doc/html/qt.html -qt3/doc/html/qt.xml qt3/doc/html/qt30-class-chart.png qt3/doc/html/qtab-members.html qt3/doc/html/qtab.html @@ -1575,6 +1569,7 @@ qt3/doc/html/rot-example.html qt3/doc/html/rsubtract.png qt3/doc/html/runion.png qt3/doc/html/rxor.png +qt3/doc/html/scaling.png qt3/doc/html/scribble-example.html qt3/doc/html/scripts.html qt3/doc/html/scrollview-example.html @@ -1585,11 +1580,9 @@ qt3/doc/html/shclass.html qt3/doc/html/showimg-example.html qt3/doc/html/signals-and-slots.png qt3/doc/html/signalsandslots.html -qt3/doc/html/simple-application-action.html 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 diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 52d9bc47813..dfd789f9b98 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/08/27 09:13:48 skrll Exp $ +# $NetBSD: Makefile,v 1.11 2002/10/28 08:46:44 skrll Exp $ # .include "../qt3-libs/Makefile.common" @@ -24,7 +24,7 @@ do-install: ${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin ${INSTALL_DATA_DIR} ${QTPREFIX}/lib - ${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib + ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib ${INSTALL_DATA_DIR} ${QTPREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/*.h ${QTPREFIX}/include ${INSTALL_DATA_DIR} ${QTPREFIX}/include/private diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST index 023a528bfa8..4fc2258fd2e 100644 --- a/x11/qt3-libs/PLIST +++ b/x11/qt3-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2002/08/27 09:13:49 skrll Exp $ +@comment $NetBSD: PLIST,v 1.7 2002/10/28 08:46:44 skrll Exp $ qt3/bin/moc qt3/include/jri.h qt3/include/jri_md.h @@ -124,7 +124,6 @@ qt3/include/qfocusdata.h qt3/include/qfont.h qt3/include/qfontdatabase.h qt3/include/qfontdialog.h -qt3/include/qfontdta.h qt3/include/qfontinf.h qt3/include/qfontinfo.h qt3/include/qfontmet.h diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 2fbbd3feaeb..3663b8bbfe9 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.8 2002/08/27 09:13:49 skrll Exp $ +$NetBSD: distinfo,v 1.9 2002/10/28 08:46:44 skrll Exp $ -SHA1 (qt-x11-free-3.0.5.tar.gz) = 8d6c3c5b17da2a32f1b4ff60a61998d0822c3e41 -Size (qt-x11-free-3.0.5.tar.gz) = 16057928 bytes +SHA1 (qt-x11-free-3.0.6.tar.gz) = 7fb6a9d17091d9a60dd18fb3235098a17f142542 +Size (qt-x11-free-3.0.6.tar.gz) = 16062069 bytes SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d SHA1 (patch-ab) = 8842f4ef5d3464d3a588c20d0ef5b0bb40d48180 -SHA1 (patch-ac) = da32dd8596f36238fec30fb7b8a444d36e13ed92 +SHA1 (patch-ac) = e68231282b24674498de446f1dc4e4f052fe1196 SHA1 (patch-ad) = 197ba1f217635ad0b25d4709d0be9786ade079cc diff --git a/x11/qt3-libs/patches/patch-ac b/x11/qt3-libs/patches/patch-ac index 1b3ea8d0fc7..8e9cd05fdfc 100644 --- a/x11/qt3-libs/patches/patch-ac +++ b/x11/qt3-libs/patches/patch-ac @@ -1,12 +1,12 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/01/07 08:07:59 skrll Exp $ +$NetBSD: patch-ac,v 1.2 2002/10/28 08:46:44 skrll Exp $ ---- src/tools/qdir_unix.cpp.orig Wed Dec 12 06:58:31 2001 +--- src/tools/qdir_unix.cpp.orig Thu Oct 17 15:08:58 2002 +++ src/tools/qdir_unix.cpp -@@ -81,10 +81,19 @@ +@@ -82,10 +82,19 @@ QString QDir::canonicalPath() const bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const { --#ifdef Q_OS_MACX // Mac X doesn't support trailing /'s +-#if defined(Q_OS_MACX) // Mac X doesn't support trailing /'s +#ifdef Q_TRAILING_DIR_SEP // Some OSes doesn't support trailing /'s QString name = dirName; - if (dirName[dirName.length() - 1] == "/") @@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/01/07 08:07:59 skrll Exp $ return QT_MKDIR( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 ) == 0; #else -@@ -95,7 +104,24 @@ +@@ -96,7 +105,24 @@ bool QDir::mkdir( const QString &dirName bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const { diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile index 5ef55013ec1..1e433529982 100644 --- a/x11/qt3-tools/Makefile +++ b/x11/qt3-tools/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2002/10/09 21:01:08 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/10/28 08:46:45 skrll Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-tools-${QTVERSION} -PKGREVISION= 1 COMMENT= QT GUI (WYSIWYG) builder and other tools CONFIGURE_ARGS+= -I${QTDIR}/include \ diff --git a/x11/qt3-tools/PLIST b/x11/qt3-tools/PLIST index c2fc946cfd0..ef68292d213 100644 --- a/x11/qt3-tools/PLIST +++ b/x11/qt3-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/08/27 09:13:50 skrll Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/10/28 08:46:45 skrll Exp $ qt3/bin/assistant qt3/bin/designer qt3/bin/linguist @@ -16,14 +16,16 @@ qt3/lib/libqui.la qt3/lib/libqui.so qt3/lib/libqui.so.1 qt3/lib/libqui.so.1.0 -qt3/mkspecs/netbsd-g++/qmake.conf -qt3/mkspecs/netbsd-g++/qplatformdefs.h +qt3/mkspecs/aix-64/qmake.conf +qt3/mkspecs/aix-64/qplatformdefs.h qt3/mkspecs/aix-g++/qmake.conf qt3/mkspecs/aix-g++/qplatformdefs.h qt3/mkspecs/aix-xlc/qmake.conf qt3/mkspecs/aix-xlc/qplatformdefs.h qt3/mkspecs/bsdi-g++/qmake.conf qt3/mkspecs/bsdi-g++/qplatformdefs.h +qt3/mkspecs/cygwin-g++/qmake.conf +qt3/mkspecs/cygwin-g++/qplatformdefs.h qt3/mkspecs/darwin-g++/qmake.conf qt3/mkspecs/darwin-g++/qplatformdefs.h qt3/mkspecs/default @@ -74,8 +76,8 @@ qt3/mkspecs/macx-mwerks/qplatformdefs.h qt3/mkspecs/macx-pbuilder/Info.plist.app qt3/mkspecs/macx-pbuilder/qmake.conf qt3/mkspecs/macx-pbuilder/qplatformdefs.h -qt3/mkspecs/aix-64/qmake.conf -qt3/mkspecs/aix-64/qplatformdefs.h +qt3/mkspecs/netbsd-g++/qmake.conf +qt3/mkspecs/netbsd-g++/qplatformdefs.h qt3/mkspecs/openbsd-g++/qmake.conf qt3/mkspecs/openbsd-g++/qplatformdefs.h qt3/mkspecs/openunix-cc/qmake.conf @@ -96,10 +98,10 @@ qt3/mkspecs/solaris-64/qmake.conf qt3/mkspecs/solaris-64/qplatformdefs.h qt3/mkspecs/solaris-cc/qmake.conf qt3/mkspecs/solaris-cc/qplatformdefs.h +qt3/mkspecs/solaris-g++-64/qmake.conf +qt3/mkspecs/solaris-g++-64/qplatformdefs.h qt3/mkspecs/solaris-g++/qmake.conf qt3/mkspecs/solaris-g++/qplatformdefs.h -qt3/mkspecs/solaris-g++-64/qplatformdefs.h -qt3/mkspecs/solaris-g++-64/qmake.conf qt3/mkspecs/solaris-kcc/qmake.conf qt3/mkspecs/solaris-kcc/qplatformdefs.h qt3/mkspecs/sunos-g++/qmake.conf @@ -141,57 +143,58 @@ qt3/plugins/designer/libwizards.a qt3/plugins/designer/libwizards.la qt3/plugins/designer/libwizards.so @dirrm qt3/plugins/designer +@dirrm qt3/mkspecs/win32-watcom +@dirrm qt3/mkspecs/win32-visage +@dirrm qt3/mkspecs/win32-msvc +@dirrm qt3/mkspecs/win32-icc +@dirrm qt3/mkspecs/win32-g++ +@dirrm qt3/mkspecs/win32-borland +@dirrm qt3/mkspecs/unixware7-g++ +@dirrm qt3/mkspecs/unixware7-cc +@dirrm qt3/mkspecs/unixware-g++ +@dirrm qt3/mkspecs/ultrix-g++ +@dirrm qt3/mkspecs/tru64-g++ +@dirrm qt3/mkspecs/tru64-cxx +@dirrm qt3/mkspecs/sunos-g++ +@dirrm qt3/mkspecs/solaris-kcc +@dirrm qt3/mkspecs/solaris-g++-64 +@dirrm qt3/mkspecs/solaris-g++ +@dirrm qt3/mkspecs/solaris-cc +@dirrm qt3/mkspecs/solaris-64 +@dirrm qt3/mkspecs/sco-g++ +@dirrm qt3/mkspecs/sco-cc +@dirrm qt3/mkspecs/reliant-cds +@dirrm qt3/mkspecs/reliant-64 +@dirrm qt3/mkspecs/qnx-g++ +@dirrm qt3/mkspecs/openunix-g++ +@dirrm qt3/mkspecs/openunix-cc +@dirrm qt3/mkspecs/openbsd-g++ @dirrm qt3/mkspecs/netbsd-g++ -@dirrm qt3/mkspecs/aix-g++ -@dirrm qt3/mkspecs/aix-xlc -@dirrm qt3/mkspecs/bsdi-g++ -@dirrm qt3/mkspecs/darwin-g++ -@dirrm qt3/mkspecs/dgux-g++ -@dirrm qt3/mkspecs/freebsd-g++ -@dirrm qt3/mkspecs/hpux-acc -@dirrm qt3/mkspecs/hpux-cc -@dirrm qt3/mkspecs/hpux-g++ -@dirrm qt3/mkspecs/hpux-n64 -@dirrm qt3/mkspecs/hpux-o64 -@dirrm qt3/mkspecs/hurd-g++ -@dirrm qt3/mkspecs/irix-64 -@dirrm qt3/mkspecs/irix-g++ -@dirrm qt3/mkspecs/irix-n32 -@dirrm qt3/mkspecs/irix-o32 -@dirrm qt3/mkspecs/linux-cxx -@dirrm qt3/mkspecs/linux-g++ -@dirrm qt3/mkspecs/linux-icc -@dirrm qt3/mkspecs/linux-kcc -@dirrm qt3/mkspecs/linux-pgcc -@dirrm qt3/mkspecs/mac9-mwerks -@dirrm qt3/mkspecs/macx-g++ -@dirrm qt3/mkspecs/macx-mwerks @dirrm qt3/mkspecs/macx-pbuilder +@dirrm qt3/mkspecs/macx-mwerks +@dirrm qt3/mkspecs/macx-g++ +@dirrm qt3/mkspecs/mac9-mwerks +@dirrm qt3/mkspecs/linux-pgcc +@dirrm qt3/mkspecs/linux-kcc +@dirrm qt3/mkspecs/linux-icc +@dirrm qt3/mkspecs/linux-g++ +@dirrm qt3/mkspecs/linux-cxx +@dirrm qt3/mkspecs/irix-o32 +@dirrm qt3/mkspecs/irix-n32 +@dirrm qt3/mkspecs/irix-g++ +@dirrm qt3/mkspecs/irix-64 +@dirrm qt3/mkspecs/hurd-g++ +@dirrm qt3/mkspecs/hpux-o64 +@dirrm qt3/mkspecs/hpux-n64 +@dirrm qt3/mkspecs/hpux-g++ +@dirrm qt3/mkspecs/hpux-cc +@dirrm qt3/mkspecs/hpux-acc +@dirrm qt3/mkspecs/freebsd-g++ +@dirrm qt3/mkspecs/dgux-g++ +@dirrm qt3/mkspecs/darwin-g++ +@dirrm qt3/mkspecs/cygwin-g++ +@dirrm qt3/mkspecs/bsdi-g++ +@dirrm qt3/mkspecs/aix-xlc +@dirrm qt3/mkspecs/aix-g++ @dirrm qt3/mkspecs/aix-64 -@dirrm qt3/mkspecs/openbsd-g++ -@dirrm qt3/mkspecs/openunix-cc -@dirrm qt3/mkspecs/openunix-g++ -@dirrm qt3/mkspecs/qnx-g++ -@dirrm qt3/mkspecs/reliant-64 -@dirrm qt3/mkspecs/reliant-cds -@dirrm qt3/mkspecs/sco-cc -@dirrm qt3/mkspecs/sco-g++ -@dirrm qt3/mkspecs/solaris-64 -@dirrm qt3/mkspecs/solaris-cc -@dirrm qt3/mkspecs/solaris-g++ -@dirrm qt3/mkspecs/solaris-g++-64 -@dirrm qt3/mkspecs/solaris-kcc -@dirrm qt3/mkspecs/sunos-g++ -@dirrm qt3/mkspecs/tru64-cxx -@dirrm qt3/mkspecs/tru64-g++ -@dirrm qt3/mkspecs/ultrix-g++ -@dirrm qt3/mkspecs/unixware-g++ -@dirrm qt3/mkspecs/unixware7-cc -@dirrm qt3/mkspecs/unixware7-g++ -@dirrm qt3/mkspecs/win32-borland -@dirrm qt3/mkspecs/win32-g++ -@dirrm qt3/mkspecs/win32-icc -@dirrm qt3/mkspecs/win32-msvc -@dirrm qt3/mkspecs/win32-visage -@dirrm qt3/mkspecs/win32-watcom @dirrm qt3/mkspecs diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index 0266b5e1174..b7494e410aa 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2002/10/12 18:04:34 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2002/10/28 08:46:45 skrll Exp $ # DISTNAME= qt3-${QTVERSION} -PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= # empty DISTFILES= # empty @@ -12,7 +11,7 @@ COMMENT= "meta-package" for the QT GUI C++ toolkit .include "./Makefile.common" DEPENDS+= qt3-libs-${QTVERSION}:../../x11/qt3-libs -DEPENDS+= qt3-tools-${QTVERSION}nb1:../../x11/qt3-tools +DEPENDS+= qt3-tools-${QTVERSION}:../../x11/qt3-tools DEPENDS+= qt3-docs-${QTVERSION}:../../x11/qt3-docs USE_BUILDLINK2= yes diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common index 87aa72d4536..8c40289b6cd 100644 --- a/x11/qt3/Makefile.common +++ b/x11/qt3/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.5 2002/08/27 14:56:18 skrll Exp $ +# $NetBSD: Makefile.common,v 1.6 2002/10/28 08:46:45 skrll Exp $ # -QTVERSION= 3.0.5 +QTVERSION= 3.0.6 MAINTAINER= skrll@netbsd.org HOMEPAGE= http://www.trolltech.com/products/qt.html -- cgit v1.2.3