summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/qt2-designer/Makefile7
-rw-r--r--x11/qt2-designer/files/md53
-rw-r--r--x11/qt2-designer/files/patch-sum6
-rw-r--r--x11/qt2-docs/files/md53
-rw-r--r--x11/qt2-docs/pkg/PLIST25
-rw-r--r--x11/qt2-examples/Makefile7
-rw-r--r--x11/qt2-examples/files/md53
-rw-r--r--x11/qt2-examples/pkg/PLIST17
-rw-r--r--x11/qt2-libs/Makefile.common5
-rw-r--r--x11/qt2-libs/files/md54
-rw-r--r--x11/qt2-libs/files/patch-sum10
-rw-r--r--x11/qt2-libs/patches/patch-aa6
-rw-r--r--x11/qt2-libs/patches/patch-ae10
-rw-r--r--x11/qt2-libs/patches/patch-ag8
-rw-r--r--x11/qt2-libs/patches/patch-ah8
-rw-r--r--x11/qt2/Makefile4
-rw-r--r--x11/qt2/Makefile.common4
17 files changed, 74 insertions, 56 deletions
diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index 2ebad21b093..dddc7ab91af 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,17 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2000/12/09 17:21:49 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/06 09:26:11 skrll Exp $
#
.include "../qt2-libs/Makefile.common"
PKGNAME= qt2-designer-${QTVERSION}
-DEPENDS+= qt2-libs-*:../../x11/qt2-libs
+DEPENDS+= qt2-libs-${QTVERSION}:../../x11/qt2-libs
ALL_TARGET= sub-tools
-PATCHFILES+= ${PKGSRCDIR}/x11/qt2-libs/patches/patch-??
-ALLFILES= ${DISTFILES} # don't checksum shared patches
-
CONFIGURE_ENV+= QTDIR=${QTPREFIX}
MAKE_ENV+= QTDIR=${QTPREFIX}
diff --git a/x11/qt2-designer/files/md5 b/x11/qt2-designer/files/md5
deleted file mode 100644
index f6ebe97c4ff..00000000000
--- a/x11/qt2-designer/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.3 2000/12/26 13:00:14 skrll Exp $
-
-MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
diff --git a/x11/qt2-designer/files/patch-sum b/x11/qt2-designer/files/patch-sum
deleted file mode 100644
index 6d190b8a5ad..00000000000
--- a/x11/qt2-designer/files/patch-sum
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/10/19 07:45:12 skrll Exp $
-
-This placeholder file is generated by the ``makepatchsum'' target
-whenever the patches directory is empty or missing. Its purpose
-is to ensure that the presence of any obsolete patches will cause
-the proper error to be emitted at build time.
diff --git a/x11/qt2-docs/files/md5 b/x11/qt2-docs/files/md5
deleted file mode 100644
index f6ebe97c4ff..00000000000
--- a/x11/qt2-docs/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.3 2000/12/26 13:00:14 skrll Exp $
-
-MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
diff --git a/x11/qt2-docs/pkg/PLIST b/x11/qt2-docs/pkg/PLIST
index e4a5036370a..3d756cd2281 100644
--- a/x11/qt2-docs/pkg/PLIST
+++ b/x11/qt2-docs/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/01/11 17:55:56 skrll Exp $
-
+@comment $NetBSD: PLIST,v 1.5 2001/02/06 09:26:14 skrll Exp $
qt2/doc/README
qt2/doc/README.QT
qt2/doc/html/HOWTO-framebuffer.html
@@ -7,6 +6,7 @@ qt2/doc/html/README
qt2/doc/html/README.QT
qt2/doc/html/aboutqt.html
qt2/doc/html/abstractwidgets.html
+qt2/doc/html/accel.html
qt2/doc/html/accelerators.html
qt2/doc/html/aclock-main-cpp.html
qt2/doc/html/action-main-cpp.html
@@ -212,13 +212,16 @@ qt2/doc/html/drawing.html
qt2/doc/html/drawlines-connect-cpp.html
qt2/doc/html/easteregg.html
qt2/doc/html/easteregg2.html
+qt2/doc/html/embedclasses.html
qt2/doc/html/environment.html
+qt2/doc/html/envvars.html
qt2/doc/html/eventsandfilters.html
qt2/doc/html/examples.html
qt2/doc/html/face.png
qt2/doc/html/features.html
qt2/doc/html/fileiconview-main-cpp.html
qt2/doc/html/focus.html
+qt2/doc/html/fontdir.html
qt2/doc/html/fonts-qws.html
qt2/doc/html/forever-forever-cpp.html
qt2/doc/html/frames.png
@@ -580,6 +583,8 @@ qt2/doc/html/qfontdlg-w.png
qt2/doc/html/qfontinfo-h.html
qt2/doc/html/qfontinfo-members.html
qt2/doc/html/qfontinfo.html
+qt2/doc/html/qfontmanager-members.html
+qt2/doc/html/qfontmanager_qws-h.html
qt2/doc/html/qfontmetrics-h.html
qt2/doc/html/qfontmetrics-members.html
qt2/doc/html/qfontmetrics.html
@@ -605,6 +610,9 @@ qt2/doc/html/qgdict-members.html
qt2/doc/html/qgdict.html
qt2/doc/html/qgdictiterator-members.html
qt2/doc/html/qgdictiterator.html
+qt2/doc/html/qgfx_qws-h.html
+qt2/doc/html/qgfxraster_qws-h.html
+qt2/doc/html/qgfxrasterbase-members.html
qt2/doc/html/qgl-h.html
qt2/doc/html/qgl-members.html
qt2/doc/html/qgl.html
@@ -774,6 +782,8 @@ qt2/doc/html/qlnode.html
qt2/doc/html/qlocalfs-h.html
qt2/doc/html/qlocalfs-members.html
qt2/doc/html/qlocalfs.html
+qt2/doc/html/qlock-members.html
+qt2/doc/html/qlock_qws-h.html
qt2/doc/html/qmag-qmag-cpp.html
qt2/doc/html/qmainwindow-h.html
qt2/doc/html/qmainwindow-m.png
@@ -943,10 +953,14 @@ qt2/doc/html/qregexp.html
qt2/doc/html/qregion-h.html
qt2/doc/html/qregion-members.html
qt2/doc/html/qregion.html
+qt2/doc/html/qrenderedfont-members.html
qt2/doc/html/qresizeevent-members.html
qt2/doc/html/qresizeevent.html
qt2/doc/html/qscrbar-m.png
qt2/doc/html/qscrbar-w.png
+qt2/doc/html/qscreen-members.html
+qt2/doc/html/qscreencursor-members.html
+qt2/doc/html/qscreencursor.html
qt2/doc/html/qscrollbar-h.html
qt2/doc/html/qscrollbar-members.html
qt2/doc/html/qscrollbar.html
@@ -1385,13 +1399,18 @@ qt2/doc/html/tutorial.png
qt2/doc/html/unicode.html
qt2/doc/html/unsmooth.png
qt2/doc/html/validator-main-cpp.html
+qt2/doc/html/walkthroughs.html
qt2/doc/html/whatsthis
qt2/doc/html/whatsthis.png
qt2/doc/html/winsystem.html
qt2/doc/html/wizard-main-cpp.html
qt2/doc/html/workspace.html
qt2/doc/html/xform-xform-cpp.html
+qt2/doc/html/xml-dom.html
+qt2/doc/html/xml-sax-walkthrough.html
qt2/doc/html/xml-sax.html
+qt2/doc/html/xml-tagreader-tagreader-cpp.html
+qt2/doc/html/xml-tagreader-with-features-tagreader-cpp.html
qt2/doc/html/xml.html
qt2/doc/html/xt.html
qt2/doc/html/y2k.html
@@ -1620,6 +1639,7 @@ qt2/man/man3/QRegExp.3
qt2/man/man3/QRegion.3
qt2/man/man3/QResizeEvent.3
qt2/man/man3/QSGIStyle.3
+qt2/man/man3/QScreenCursor.3
qt2/man/man3/QScrollBar.3
qt2/man/man3/QScrollView.3
qt2/man/man3/QSemaphore.3
@@ -1948,6 +1968,7 @@ qt2/man/man3/qrect.3
qt2/man/man3/qregexp.3
qt2/man/man3/qregion.3
qt2/man/man3/qresizeevent.3
+qt2/man/man3/qscreencursor.3
qt2/man/man3/qscrollbar.3
qt2/man/man3/qscrollview.3
qt2/man/man3/qsemaphore.3
diff --git a/x11/qt2-examples/Makefile b/x11/qt2-examples/Makefile
index 45b036fab63..dfa7e705c03 100644
--- a/x11/qt2-examples/Makefile
+++ b/x11/qt2-examples/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/01/13 12:37:21 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/06 09:26:15 skrll Exp $
#
PKGNAME= qt2-examples-${QTVERSION}
.include "../qt2-libs/Makefile.common"
-DEPENDS+= qt2-libs-*:../../x11/qt2-libs
-
-PATCHFILES+= ${PKGSRCDIR}/x11/qt2-libs/patches/patch-??
-ALLFILES= ${DISTFILES} # don't checksum shared patches
+DEPENDS+= qt2-libs-${QTVERSION}:../../x11/qt2-libs
CONFIGURE_ENV+= QTDIR=${QTPREFIX}
diff --git a/x11/qt2-examples/files/md5 b/x11/qt2-examples/files/md5
deleted file mode 100644
index 77fa79f6e59..00000000000
--- a/x11/qt2-examples/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.1.1.1 2001/01/13 12:37:27 skrll Exp $
-
-MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
diff --git a/x11/qt2-examples/pkg/PLIST b/x11/qt2-examples/pkg/PLIST
index d9a809b7a96..6eb0db7e20b 100644
--- a/x11/qt2-examples/pkg/PLIST
+++ b/x11/qt2-examples/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/13 12:37:27 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/06 09:26:16 skrll Exp $
qt2/examples/Makefile
qt2/examples/README
qt2/examples/aclock/Makefile
@@ -488,6 +488,18 @@ qt2/examples/xform/image.any
qt2/examples/xform/picture.any
qt2/examples/xform/xform.cpp
qt2/examples/xform/xform.pro
+qt2/examples/xml/tagreader-with-features/Makefile
+qt2/examples/xml/tagreader-with-features/fnord.xml
+qt2/examples/xml/tagreader-with-features/structureparser.cpp
+qt2/examples/xml/tagreader-with-features/structureparser.h
+qt2/examples/xml/tagreader-with-features/tagreader.cpp
+qt2/examples/xml/tagreader-with-features/tagreader.pro
+qt2/examples/xml/tagreader/Makefile
+qt2/examples/xml/tagreader/animals.xml
+qt2/examples/xml/tagreader/structureparser.cpp
+qt2/examples/xml/tagreader/structureparser.h
+qt2/examples/xml/tagreader/tagreader.cpp
+qt2/examples/xml/tagreader/tagreader.pro
qt2/examples/xmlquotes/Makefile
qt2/examples/xmlquotes/README
qt2/examples/xmlquotes/main.cpp
@@ -592,6 +604,9 @@ qt2/tutorial/tutorial.pro
@dirrm qt2/tutorial/t1
@dirrm qt2/tutorial
@dirrm qt2/examples/xmlquotes
+@dirrm qt2/examples/xml/tagreader-with-features
+@dirrm qt2/examples/xml/tagreader
+@dirrm qt2/examples/xml
@dirrm qt2/examples/xform
@dirrm qt2/examples/wizard
@dirrm qt2/examples/widgets
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index 3d34c04c565..3c16f17b883 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2000/12/11 23:02:36 skrll Exp $
+# $NetBSD: Makefile.common,v 1.5 2001/02/06 09:26:16 skrll Exp $
#
DISTNAME= qt-x11-${QTVERSION}
@@ -24,6 +24,9 @@ QTPREFIX= ${PREFIX}/qt2
MAKE_ENV+= QTPREFIX=${QTPREFIX}
+FILESDIR= ${PKGSRCDIR}/x11/qt2-libs/files
+PATCHDIR= ${PKGSRCDIR}/x11/qt2-libs/patches
+
.include "../../mk/bsd.prefs.mk"
.if defined(USE_GIF)
diff --git a/x11/qt2-libs/files/md5 b/x11/qt2-libs/files/md5
index b66998da571..ba7f81c6416 100644
--- a/x11/qt2-libs/files/md5
+++ b/x11/qt2-libs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/12/26 13:00:15 skrll Exp $
+$NetBSD: md5,v 1.4 2001/02/06 09:26:16 skrll Exp $
-MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
+MD5 (qt-x11-2.2.4.tar.gz) = 0a5cb173ded05c6b6ea620396d16889d
diff --git a/x11/qt2-libs/files/patch-sum b/x11/qt2-libs/files/patch-sum
index 35c0033cb4c..3caa5cb9213 100644
--- a/x11/qt2-libs/files/patch-sum
+++ b/x11/qt2-libs/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.7 2000/12/26 13:00:15 skrll Exp $
+$NetBSD: patch-sum,v 1.8 2001/02/06 09:26:16 skrll Exp $
-MD5 (patch-aa) = 58526c496bb5ff5ada2279c6c1b67bf0
+MD5 (patch-aa) = f6bc4ea34dfacad75eef177acf72ce2d
MD5 (patch-ab) = aa1df5b080b35d1d26f89ea8d593b571
MD5 (patch-ac) = 04de629d6d27a0030c190b175940d9ef
MD5 (patch-ad) = 6bb4068dfa73008cefd6a860391caaf9
-MD5 (patch-ae) = be8dc17040a8c0acb8d8fb793cf2513d
+MD5 (patch-ae) = ccc502865ed75424a3949b5105e940db
MD5 (patch-af) = eabc3b9b2a37d3b278ef9781305d4c93
-MD5 (patch-ag) = e37a1c2177d634a10cd13e3831317be6
-MD5 (patch-ah) = 17097e2d1020179a52b1df16bf69fdd1
+MD5 (patch-ag) = 8020cf4ecf96d264a35f3dd6cd0ab7a2
+MD5 (patch-ah) = 9ee8e4d6970cce23a80a816b0ff7afd2
MD5 (patch-ai) = 36d97df8c8ba47f7303403b267f0ebc6
diff --git a/x11/qt2-libs/patches/patch-aa b/x11/qt2-libs/patches/patch-aa
index c12b03b350a..e23af98666d 100644
--- a/x11/qt2-libs/patches/patch-aa
+++ b/x11/qt2-libs/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2000/12/09 17:21:50 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2001/02/06 09:26:17 skrll Exp $
---- Makefile.orig Wed Nov 8 17:06:41 2000
+--- Makefile.orig Thu Feb 1 02:29:35 2001
+++ Makefile
@@ -25,8 +25,14 @@
-rm -f bin/moc
@@ -17,4 +17,4 @@ $NetBSD: patch-aa,v 1.2 2000/12/09 17:21:50 skrll Exp $
+ cd tools; $(MAKE) designer-utils
symlinks: .buildopts
- @cd include; rm -f q*.h; ln -s ../src/*/q*.h .; ln -s ../extensions/*/src/q*.h .; rm -f q*_p.h
+ @cd include; rm -f q*.h; ln -s $(QTDIR)/src/*/q*.h .; ln -s $(QTDIR)/extensions/*/src/q*.h .; rm -f q*_p.h
diff --git a/x11/qt2-libs/patches/patch-ae b/x11/qt2-libs/patches/patch-ae
index 8841182a51c..4fe89f57fad 100644
--- a/x11/qt2-libs/patches/patch-ae
+++ b/x11/qt2-libs/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2000/12/26 13:00:15 skrll Exp $
+$NetBSD: patch-ae,v 1.6 2001/02/06 09:26:17 skrll Exp $
---- src/Makefile.in.orig Tue Dec 12 11:16:33 2000
+--- src/Makefile.in.orig Thu Feb 1 02:29:46 2001
+++ src/Makefile.in
@@ -2,7 +2,7 @@
@@ -19,8 +19,8 @@ $NetBSD: patch-ae,v 1.5 2000/12/26 13:00:15 skrll Exp $
+DESTDIR =
VER_MAJ = 2
VER_MIN = 2
- VER_PATCH = 3
-@@ -369,19 +369,7 @@
+ VER_PATCH = 4
+@@ -377,19 +377,7 @@
.SUFFIXES: .cpp .cxx .cc .C .c
.cpp.o:
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.5 2000/12/26 13:00:15 skrll Exp $
####### Build rules
-@@ -390,7 +378,7 @@
+@@ -397,7 +385,7 @@
all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
diff --git a/x11/qt2-libs/patches/patch-ag b/x11/qt2-libs/patches/patch-ag
index 85d2c70e5ca..5e0ef82c8f1 100644
--- a/x11/qt2-libs/patches/patch-ag
+++ b/x11/qt2-libs/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
+$NetBSD: patch-ag,v 1.2 2001/02/06 09:26:17 skrll Exp $
---- tools/designer/designer/Makefile.in.orig Wed Oct 4 10:56:06 2000
+--- tools/designer/designer/Makefile.in.orig Thu Feb 1 02:29:50 2001
+++ tools/designer/designer/Makefile.in
@@ -6,15 +6,15 @@
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DDESIGNER
@@ -8,8 +8,8 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
CFLAGS = $(SYSCONF_CFLAGS) -DDESIGNER
-INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
--LIBS = $(SUBLIBS) -lqutil -L$(QTDIR)/lib -lqutil -L$(QTDIR)/lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
-+INCPATH = -I../shared -I../util #-I../../../src/3rdparty/zlib
+-LIBS = $(SUBLIBS) -lqutil -L$(QTDIR)/lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
++INCPATH = -I../shared -I../util
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
+LIBS = $(SUBLIBS) ../util/libqutil.la $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
MOC = $(SYSCONF_MOC)
diff --git a/x11/qt2-libs/patches/patch-ah b/x11/qt2-libs/patches/patch-ah
index 71aed378bfb..1caa55b834d 100644
--- a/x11/qt2-libs/patches/patch-ah
+++ b/x11/qt2-libs/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
+$NetBSD: patch-ah,v 1.2 2001/02/06 09:26:17 skrll Exp $
---- tools/designer/uic/Makefile.in.orig Tue Oct 17 13:27:55 2000
+--- tools/designer/uic/Makefile.in.orig Thu Feb 1 02:29:51 2001
+++ tools/designer/uic/Makefile.in
@@ -6,15 +6,15 @@
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DUIC
@@ -8,8 +8,8 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
CFLAGS = $(SYSCONF_CFLAGS) -DUIC
-INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
--LIBS = $(SUBLIBS) -lqutil -L../lib -lqutil -L../lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
-+INCPATH = -I../shared -I../util #-I../../../src/3rdparty/zlib
+-LIBS = $(SUBLIBS) -lqutil -L../lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
++INCPATH = -I../shared -I../util
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
+LIBS = $(SUBLIBS) ../util/libqutil.la $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
MOC = $(SYSCONF_MOC)
diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile
index 6662ba922d7..fc973151740 100644
--- a/x11/qt2/Makefile
+++ b/x11/qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/01/13 12:41:38 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/06 09:26:11 skrll Exp $
#
DISTNAME= qt2-${QTVERSION}
@@ -9,9 +9,9 @@ DISTFILES= # empty
.include "Makefile.common"
DEPENDS+= qt2-libs-${QTVERSION}:../../x11/qt2-libs
+DEPENDS+= qt2-designer-${QTVERSION}:../../x11/qt2-designer
DEPENDS+= qt2-docs-${QTVERSION}:../../x11/qt2-docs
DEPENDS+= qt2-examples-${QTVERSION}:../../x11/qt2-examples
-DEPENDS+= qt2-designer-${QTVERSION}:../../x11/qt2-designer
USE_X11BASE= yes
EXTRACT_ONLY= # empty
diff --git a/x11/qt2/Makefile.common b/x11/qt2/Makefile.common
index c6701d6389b..fc4e9f1256b 100644
--- a/x11/qt2/Makefile.common
+++ b/x11/qt2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2000/12/26 13:00:13 skrll Exp $
+# $NetBSD: Makefile.common,v 1.3 2001/02/06 09:26:11 skrll Exp $
#
-QTVERSION= 2.2.3
+QTVERSION= 2.2.4
MAINTAINER= skrll@netbsd.org
HOMEPAGE= http://www.trolltech.com/products/qt.html