Import new qt-2.2.1 package.

This is the base package that includes only the qt library.

17 files changed, 708 insertions, 0 deletions

diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
new file mode 100644
index 00000000000..8bfcc52826c
--- /dev/null
+++ b/x11/qt2-libs/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/10/19 07:41:12 skrll Exp $
+#
+
+.include "../qt2-libs/Makefile.common"
+
+PKGNAME=	qt2-libs-2.2.1
+
+DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	jpeg-*:../../graphics/jpeg
+
+USE_MESA=	yes
+
+CONFIGURE_ENV+=	QTDIR=${WRKSRC}
+MAKE_ENV+=	QTDIR=${WRKSRC}
+
+ALL_TARGET=		sub-src
+
+do-install:
+	${INSTALL_DATA_DIR} ${QTPREFIX}
+	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin
+	${INSTALL_DATA_DIR} ${QTPREFIX}/lib
+	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib
+	${INSTALL_DATA_DIR} ${QTPREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
new file mode 100644
index 00000000000..9de271f47cf
--- /dev/null
+++ b/x11/qt2-libs/Makefile.common
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2000/10/19 07:41:12 skrll Exp $
+#
+
+DISTNAME=		qt-x11-2.2.1
+WRKSRC=			${WRKDIR}/qt-2.2.1
+CATEGORIES=		x11
+MASTER_SITES=	\
+	ftp://ftp.trolltech.com/qt/source/ \
+	ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/
+
+MAINTAINER=		skrll@netbsd.org
+HOMEPAGE=		http://www.trolltech.com/products/qt.html
+
+HAS_CONFIGURE=		yes
+USE_X11BASE=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
+CONFIGURE_ARGS+=	-static -sm -system-zlib \
+			-system-libpng -system-jpeg -no-thread \
+			-I${LOCALBASE}/include -L${LOCALBASE}/lib
+
+CONFIGURE_SCRIPT=	${ECHO} yes | ./configure
+
+QTPREFIX=		${PREFIX}/qt2
+
+MAKE_ENV+=		QTPREFIX=${QTPREFIX}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(USE_GIF)
+CONFIGURE_ARGS+=	-gif
+.endif
+
+.if ${OPSYS} == "SunOS"
+BUILD_DEPENDS+=	${LOCALBASE}/egcs/bin/g++:../../lang/egcs
+CONFIGURE_ENV+=	CXX=${LOCALBASE}/egcs/bin/g++
+CONFIGURE_ARGS+=-platform solaris-g++
+.endif
diff --git a/x11/qt2-libs/files/md5 b/x11/qt2-libs/files/md5
new file mode 100644
index 00000000000..5312767de20
--- /dev/null
+++ b/x11/qt2-libs/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/10/19 07:41:12 skrll Exp $
+
+MD5 (qt-x11-2.2.1.tar.gz) = c5a65c4ded0330fa6b44c24fd93b938e
diff --git a/x11/qt2-libs/files/patch-sum b/x11/qt2-libs/files/patch-sum
new file mode 100644
index 00000000000..dae285769e3
--- /dev/null
+++ b/x11/qt2-libs/files/patch-sum
@@ -0,0 +1,11 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/10/19 07:41:12 skrll Exp $
+
+MD5 (patch-aa) = 8065c4af83fe8ce8713510f6e32a7811
+MD5 (patch-ab) = 69a415930cfd5fc90d471a66f1a22fc3
+MD5 (patch-ac) = 677291030a425e5792bd242338c9ddc1
+MD5 (patch-ad) = 6bb4068dfa73008cefd6a860391caaf9
+MD5 (patch-ae) = 2c72e9e3658293f9476d4a0415f12899
+MD5 (patch-af) = eabc3b9b2a37d3b278ef9781305d4c93
+MD5 (patch-ag) = e37a1c2177d634a10cd13e3831317be6
+MD5 (patch-ah) = 17097e2d1020179a52b1df16bf69fdd1
+MD5 (patch-ai) = 36d97df8c8ba47f7303403b267f0ebc6
diff --git a/x11/qt2-libs/patches/patch-aa b/x11/qt2-libs/patches/patch-aa
new file mode 100644
index 00000000000..1215b14cd04
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/10/19 07:41:14 skrll Exp $
+
+--- Makefile.orig	Wed Oct  4 10:55:36 2000
++++ Makefile
+@@ -25,7 +25,7 @@
+ 	-rm -f bin/moc
+ 	cp src/moc/moc bin/moc
+ 
+-sub-tools: sub-src FORCE
++sub-tools: FORCE
+ 	cd tools; $(MAKE)
+ 
+ symlinks: .buildopts
diff --git a/x11/qt2-libs/patches/patch-ab b/x11/qt2-libs/patches/patch-ab
new file mode 100644
index 00000000000..8d4d329497c
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-ab
@@ -0,0 +1,92 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/10/19 07:41:15 skrll Exp $
+
+--- configs/netbsd-g++-static.orig	Wed Oct  4 10:55:23 2000
++++ configs/netbsd-g++-static
+@@ -2,19 +2,20 @@
+ INTERFACE_DECL_PATH 	= .
+ SYSCONF_CXX		= g++
+ SYSCONF_CC		= gcc
++SYSCONF_CXX_LIB		= ${LIBTOOL} --mode=compile g++
+ 
+ # Compiling with support libraries
+ SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+ SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
+-SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
++SYSCONF_CXXFLAGS_OPENGL	= -I${X11BASE}/include
+ 
+ # Compiling YACC output
+ SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
+ 
+ # Linking with support libraries
+-SYSCONF_RPATH_X11	= 
+-SYSCONF_RPATH_QT	= 
+-SYSCONF_RPATH_OPENGL	= 
++SYSCONF_RPATH_X11	= -Wl,-R/usr/X11R6/lib
++SYSCONF_RPATH_QT	= -Wl,-R$(QTDIR)/lib
++SYSCONF_RPATH_OPENGL	= -Wl,-R$(X11BASE)/lib -Wl,-R$(LOCALBASE)/lib
+ 
+ # Linking with support libraries
+ # X11
+@@ -25,19 +26,16 @@
+ SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
+ SYSCONF_LIBS_QT_OPENGL	= 
+ # OpenGL
+-SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
++SYSCONF_LFLAGS_OPENGL	= -L$(X11BASE)/lib
+ SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
+ # Yacc
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= g++
++SYSCONF_LINK		= $(LIBTOOL) --mode=link g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+-# Link flags for shared objects
+-SYSCONF_LFLAGS_SHOBJ	= -Bshareable
+-
+ # Flags for threading
+ SYSCONF_CFLAGS_THREAD	= 
+ SYSCONF_CXXFLAGS_THREAD	= 
+@@ -50,34 +48,23 @@
+ # UI compiler
+ SYSCONF_UIC		= $(QTDIR)/bin/uic
+ 
+-# Linking shared libraries
+-#   - Build the $(TARGET) library, eg. lib$(TARGET).so.2.0.1
++# Linking libtool libraries
++#   - Build the $(TARGET) library, eg. lib$(TARGET).la
+ #   - Place target in $(DESTDIR) - which has a trailing /
+ #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+ #
+-SYSCONF_LINK_SHLIB	= ld
+-SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+-SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
++SYSCONF_LINK_TARGET	= lib$(TARGET).la
++SYSCONF_LINK_LIB	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET); \
++	$(SYSCONF_LINK) -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \
++	-o $(SYSCONF_LINK_TARGET) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS)
+ 
+-# Linking static libraries
+-#   - Build the $(TARGET) library, eg. lib$(TARGET).a
+-#   - Place target in $(DESTDIR) - which has a trailing /
+-#
+-SYSCONF_AR		= ar cqs
+-SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
+-SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+-				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+ SYSCONF_CXXFLAGS	= -O2
+ SYSCONF_CFLAGS		= -O2
+-SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+-SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
+ # Compiling library source
+ SYSCONF_CXXFLAGS_LIB	=
+ SYSCONF_CFLAGS_LIB	=
+ # Compiling shared-object source
+-SYSCONF_CXXFLAGS_SHOBJ	= -fPIC
+-SYSCONF_CFLAGS_SHOBJ	= -fPIC
+ # Linking Qt
+ SYSCONF_LIBS_QTLIB	= $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
+ # Linking Qt applications
diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac
new file mode 100644
index 00000000000..a4752187512
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/10/19 07:41:15 skrll Exp $
+
+--- configs/solaris-g++-static.orig	Wed Oct  4 10:55:31 2000
++++ configs/solaris-g++-static
+@@ -2,6 +2,7 @@
+ INTERFACE_DECL_PATH 	= .
+ SYSCONF_CXX		= g++
+ SYSCONF_CC		= gcc
++SYSCONF_CXX_LIB		= $(LIBTOOL) --mode=compile g++
+ 
+ # Compiling with support libraries
+ SYSCONF_CXXFLAGS_X11	= -I/usr/openwin/include
diff --git a/x11/qt2-libs/patches/patch-ad b/x11/qt2-libs/patches/patch-ad
new file mode 100644
index 00000000000..5606b618001
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-ad
@@ -0,0 +1,30 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/10/19 07:41:15 skrll Exp $
+
+--- configure.orig	Tue Oct 17 12:27:35 2000
++++ configure
+@@ -17,25 +17,6 @@
+     HELP=yes
+ else
+ 
+-touch .test.qt.
+-if [ '!' -f ${QTDIR}/.test.qt. ];
+-then
+-    rm .test.qt.
+-    echo
+-    echo
+-    echo '   The environment variable $QTDIR is not set correctly. It is currently'
+-    echo '   set to "'$QTDIR'", but it should be set to this directory,'
+-    echo '   which is "'`pwd`'".'
+-    echo
+-    echo '   Please read the INSTALL file for instructions on how to set $QTDIR'
+-    echo '   correctly. If you have set $QTDIR in your .profile or .login, you '
+-    echo '   will need to log out and log in again to make the setting effective.'
+-    echo
+-    echo
+-    exit 1
+-fi
+-rm .test.qt.
+-
+ # Find a make command
+ if ( make /dev/null ) >/dev/null 2>/dev/null
+ then
diff --git a/x11/qt2-libs/patches/patch-ae b/x11/qt2-libs/patches/patch-ae
new file mode 100644
index 00000000000..82ffcc3673e
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-ae
@@ -0,0 +1,52 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
+
+--- src/Makefile.in.orig	Wed Oct  4 10:55:53 2000
++++ src/Makefile.in
+@@ -2,7 +2,7 @@
+ 
+ ####### Compiler, tools and options
+ 
+-CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
++CXX	=	$(SYSCONF_CXX_LIB) $(QT_CXX_MT)
+ CXXFLAGS=	$(SYSCONF_CXXFLAGS_OPENGL) $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) $(QT_CXXFLAGS_OPT)
+ CC	=	$(SYSCONF_CC) $(QT_C_MT)
+ CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT)
+@@ -14,7 +14,7 @@
+ 
+ ####### Target
+ 
+-DESTDIR = ../lib/
++DESTDIR = 
+ VER_MAJ = 2
+ VER_MIN = 2
+ VER_PATCH = 1
+@@ -358,19 +358,7 @@
+ .SUFFIXES: .cpp .cxx .cc .C .c
+ 
+ .cpp.o:
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+-
+-.cxx.o:
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+-
+-.cc.o:
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+-
+-.C.o:
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+-
+-.c.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	@cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
+ 
+ ####### Build rules
+ 
+@@ -378,7 +366,7 @@
+ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
+ 
+ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
+-	$(SYSCONF_LINK_LIB)
++	$(SYSCONF_LINK_LIB) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
+ 
+ moc: $(SRCMOC)
+ 
diff --git a/x11/qt2-libs/patches/patch-af b/x11/qt2-libs/patches/patch-af
new file mode 100644
index 00000000000..f6f130ca1c9
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
+
+--- src/moc/Makefile.in.orig	Wed Oct  4 10:55:05 2000
++++ src/moc/Makefile.in
+@@ -92,7 +92,7 @@
+ all: $(DESTDIR)$(TARGET)
+ 
+ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
+-	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
++	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC)
+ 
+ moc: $(SRCMOC)
+ 
diff --git a/x11/qt2-libs/patches/patch-ag b/x11/qt2-libs/patches/patch-ag
new file mode 100644
index 00000000000..85d2c70e5ca
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-ag
@@ -0,0 +1,25 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
+
+--- tools/designer/designer/Makefile.in.orig	Wed Oct  4 10:56:06 2000
++++ tools/designer/designer/Makefile.in
+@@ -6,15 +6,15 @@
+ CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DDESIGNER
+ CC	=	$(SYSCONF_CC) $(QT_C_MT)
+ 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
++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)
+-UIC	=	$(SYSCONF_UIC)
++UIC	=	../uic/uic
+ 
+ ####### Target
+ 
+-DESTDIR = $(QTDIR)/bin/
++DESTDIR = 
+ VER_MAJ = 1
+ VER_MIN = 0
+ VER_PATCH = 0
diff --git a/x11/qt2-libs/patches/patch-ah b/x11/qt2-libs/patches/patch-ah
new file mode 100644
index 00000000000..71aed378bfb
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-ah
@@ -0,0 +1,24 @@
+$NetBSD: patch-ah,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
+
+--- tools/designer/uic/Makefile.in.orig	Tue Oct 17 13:27:55 2000
++++ tools/designer/uic/Makefile.in
+@@ -6,15 +6,15 @@
+ CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DUIC
+ CC	=	$(SYSCONF_CC) $(QT_C_MT)
+ 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
++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)
+ UIC	=	$(SYSCONF_UIC)
+ 
+ ####### Target
+ 
+-DESTDIR = $(QTDIR)/bin/
++DESTDIR = 
+ VER_MAJ = 1
+ VER_MIN = 0
+ VER_PATCH = 0
diff --git a/x11/qt2-libs/patches/patch-ai b/x11/qt2-libs/patches/patch-ai
new file mode 100644
index 00000000000..ecbbb7ceaea
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-ai
@@ -0,0 +1,52 @@
+$NetBSD: patch-ai,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
+
+--- tools/designer/util/Makefile.in.orig	Tue Oct 17 12:36:29 2000
++++ tools/designer/util/Makefile.in
+@@ -2,7 +2,7 @@
+ 
+ ####### Compiler, tools and options
+ 
+-CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
++CXX	=	$(SYSCONF_CXX_LIB) $(QT_CXX_MT)
+ CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
+ CC	=	$(SYSCONF_CC) $(QT_C_MT)
+ CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+@@ -14,7 +14,7 @@
+ 
+ ####### Target
+ 
+-DESTDIR = $(QTDIR)/lib/
++DESTDIR = 
+ VER_MAJ = 1
+ VER_MIN = 0
+ VER_PATCH = 0
+@@ -40,19 +40,7 @@
+ .SUFFIXES: .cpp .cxx .cc .C .c
+ 
+ .cpp.o:
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+-
+-.cxx.o:
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+-
+-.cc.o:
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+-
+-.C.o:
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+-
+-.c.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	@cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
+ 
+ ####### Build rules
+ 
+@@ -60,7 +48,7 @@
+ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
+ 
+ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
+-	$(SYSCONF_LINK_LIB)
++	$(SYSCONF_LINK_LIB) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
+ 
+ moc: $(SRCMOC)
+ 
diff --git a/x11/qt2-libs/pkg/COMMENT b/x11/qt2-libs/pkg/COMMENT
new file mode 100644
index 00000000000..d0cd197e837
--- /dev/null
+++ b/x11/qt2-libs/pkg/COMMENT
@@ -0,0 +1 @@
+C++ X GUI toolkit
diff --git a/x11/qt2-libs/pkg/DESCR b/x11/qt2-libs/pkg/DESCR
new file mode 100644
index 00000000000..20d03bf3e97
--- /dev/null
+++ b/x11/qt2-libs/pkg/DESCR
@@ -0,0 +1,10 @@
+Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
+maintaining GUI (graphical user interface) applications. 
+Qt is written in C++ and is fully object-oriented. It has everything you need
+to create professional GUI applications. And it enables you to create them
+quickly. 
+Qt is a multi-platform toolkit. When developing software with Qt, you can run
+it on the X Window System (Unix/X11) or Microsoft Windows NT and Windows 95/98.
+Simply recompile your source code on the platform you want. 
+Qt cuts down the complexity in implementing large and complex systems. Its
+ingenious signal-slot technology enables true component programming.
diff --git a/x11/qt2-libs/pkg/MESSAGE b/x11/qt2-libs/pkg/MESSAGE
new file mode 100644
index 00000000000..576412bcd96
--- /dev/null
+++ b/x11/qt2-libs/pkg/MESSAGE
@@ -0,0 +1,17 @@
+$NetBSD: MESSAGE,v 1.1.1.1 2000/10/19 07:41:12 skrll Exp $
+
+To allow this package to coexist with other versions of Qt
+it has been installed in ${X11BASE}/qt2/{bin,include,lib,doc}.
+
+You should be able to select this version of Qt when compiling
+programs which use it by ensuring that
+
+1) QTDIR is set to ${X11BASE}/qt2
+
+2) Use the "configure" argument "--with-qt-dir=${X11BASE}/qt2"
+
+3) you may also have to put ${X11BASE}/qt2/bin in your PATH
+
+To access Qt-2 man pages add ${X11BASE}/qt2/doc/man to your MANPATH
+environment variable.  Note that the Qt-2 man pages are installed
+here to avoid conflicts with man pages of other Qt versions.
diff --git a/x11/qt2-libs/pkg/PLIST b/x11/qt2-libs/pkg/PLIST
new file mode 100644
index 00000000000..1e6132c0799
--- /dev/null
+++ b/x11/qt2-libs/pkg/PLIST
@@ -0,0 +1,288 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/19 07:41:14 skrll Exp $
+
+qt2/bin/moc
+qt2/include/jri.h
+qt2/include/jritypes.h
+qt2/include/npapi.h
+qt2/include/npupp.h
+qt2/include/q1xcompatibility.h
+qt2/include/qabstractlayout.h
+qt2/include/qaccel.h
+qt2/include/qaction.h
+qt2/include/qapp.h
+qt2/include/qapplication.h
+qt2/include/qarray.h
+qt2/include/qasciicache.h
+qt2/include/qasciidict.h
+qt2/include/qasyncimageio.h
+qt2/include/qasyncio.h
+qt2/include/qbig5codec.h
+qt2/include/qbitarray.h
+qt2/include/qbitarry.h
+qt2/include/qbitmap.h
+qt2/include/qbrush.h
+qt2/include/qbttngrp.h
+qt2/include/qbuffer.h
+qt2/include/qbutton.h
+qt2/include/qbuttongroup.h
+qt2/include/qcache.h
+qt2/include/qcanvas.h
+qt2/include/qcdestyle.h
+qt2/include/qcheckbox.h
+qt2/include/qchkbox.h
+qt2/include/qclipboard.h
+qt2/include/qclipbrd.h
+qt2/include/qcollect.h
+qt2/include/qcollection.h
+qt2/include/qcolor.h
+qt2/include/qcolordialog.h
+qt2/include/qcombo.h
+qt2/include/qcombobox.h
+qt2/include/qcommonstyle.h
+qt2/include/qconfig-dist.h
+qt2/include/qconfig-embedded.h
+qt2/include/qconfig-minimal.h
+qt2/include/qconfig-qpim.h
+qt2/include/qconfig.h
+qt2/include/qconnect.h
+qt2/include/qconnection.h
+qt2/include/qcstring.h
+qt2/include/qcursor.h
+qt2/include/qdatastream.h
+qt2/include/qdatetime.h
+qt2/include/qdatetm.h
+qt2/include/qdial.h
+qt2/include/qdialog.h
+qt2/include/qdict.h
+qt2/include/qdir.h
+qt2/include/qdns.h
+qt2/include/qdom.h
+qt2/include/qdragobject.h
+qt2/include/qdrawutil.h
+qt2/include/qdrawutl.h
+qt2/include/qdropsite.h
+qt2/include/qdstream.h
+qt2/include/qeucjpcodec.h
+qt2/include/qeuckrcodec.h
+qt2/include/qevent.h
+qt2/include/qfeatures.h
+qt2/include/qfile.h
+qt2/include/qfiledef.h
+qt2/include/qfiledialog.h
+qt2/include/qfiledlg.h
+qt2/include/qfileinf.h
+qt2/include/qfileinfo.h
+qt2/include/qfocusdata.h
+qt2/include/qfont.h
+qt2/include/qfontdatabase.h
+qt2/include/qfontdialog.h
+qt2/include/qfontdta.h
+qt2/include/qfontinf.h
+qt2/include/qfontinfo.h
+qt2/include/qfontmet.h
+qt2/include/qfontmetrics.h
+qt2/include/qframe.h
+qt2/include/qftp.h
+qt2/include/qgarray.h
+qt2/include/qgbkcodec.h
+qt2/include/qgcache.h
+qt2/include/qgdict.h
+qt2/include/qgeneric.h
+qt2/include/qgif.h
+qt2/include/qgl.h
+qt2/include/qglist.h
+qt2/include/qglobal.h
+qt2/include/qgrid.h
+qt2/include/qgroupbox.h
+qt2/include/qgrpbox.h
+qt2/include/qguardedptr.h
+qt2/include/qgvector.h
+qt2/include/qhbox.h
+qt2/include/qhbuttongroup.h
+qt2/include/qheader.h
+qt2/include/qhgroupbox.h
+qt2/include/qhostaddress.h
+qt2/include/qiconset.h
+qt2/include/qiconview.h
+qt2/include/qimage.h
+qt2/include/qinputdialog.h
+qt2/include/qintcach.h
+qt2/include/qintcache.h
+qt2/include/qintdict.h
+qt2/include/qiodev.h
+qt2/include/qiodevice.h
+qt2/include/qjiscodec.h
+qt2/include/qjpegio.h
+qt2/include/qjpunicode.h
+qt2/include/qkeycode.h
+qt2/include/qkoi8codec.h
+qt2/include/qlabel.h
+qt2/include/qlayout.h
+qt2/include/qlcdnum.h
+qt2/include/qlcdnumber.h
+qt2/include/qlined.h
+qt2/include/qlineedit.h
+qt2/include/qlist.h
+qt2/include/qlistbox.h
+qt2/include/qlistview.h
+qt2/include/qlocalfs.h
+qt2/include/qmainwindow.h
+qt2/include/qmap.h
+qt2/include/qmenubar.h
+qt2/include/qmenudata.h
+qt2/include/qmenudta.h
+qt2/include/qmessagebox.h
+qt2/include/qmetaobj.h
+qt2/include/qmetaobject.h
+qt2/include/qmime.h
+qt2/include/qmlined.h
+qt2/include/qmngio.h
+qt2/include/qmodules.h
+qt2/include/qmotifplusstyle.h
+qt2/include/qmotifstyle.h
+qt2/include/qmovie.h
+qt2/include/qmsgbox.h
+qt2/include/qmultilinedit.h
+qt2/include/qmultilineedit.h
+qt2/include/qnamespace.h
+qt2/include/qnetwork.h
+qt2/include/qnetworkprotocol.h
+qt2/include/qnp.h
+qt2/include/qobjcoll.h
+qt2/include/qobjdefs.h
+qt2/include/qobject.h
+qt2/include/qobjectdefs.h
+qt2/include/qobjectdict.h
+qt2/include/qobjectlist.h
+qt2/include/qpaintd.h
+qt2/include/qpaintdc.h
+qt2/include/qpaintdevice.h
+qt2/include/qpaintdevicedefs.h
+qt2/include/qpaintdevicemetrics.h
+qt2/include/qpainter.h
+qt2/include/qpalette.h
+qt2/include/qpdevmet.h
+qt2/include/qpen.h
+qt2/include/qpicture.h
+qt2/include/qpixmap.h
+qt2/include/qpixmapcache.h
+qt2/include/qplatinumstyle.h
+qt2/include/qpmcache.h
+qt2/include/qpngio.h
+qt2/include/qpntarry.h
+qt2/include/qpoint.h
+qt2/include/qpointarray.h
+qt2/include/qpolygonscanner.h
+qt2/include/qpopmenu.h
+qt2/include/qpopupmenu.h
+qt2/include/qprintdialog.h
+qt2/include/qprinter.h
+qt2/include/qprndlg.h
+qt2/include/qprogbar.h
+qt2/include/qprogdlg.h
+qt2/include/qprogressbar.h
+qt2/include/qprogressdialog.h
+qt2/include/qpsprn.h
+qt2/include/qptrdict.h
+qt2/include/qpushbt.h
+qt2/include/qpushbutton.h
+qt2/include/qqueue.h
+qt2/include/qradiobt.h
+qt2/include/qradiobutton.h
+qt2/include/qrangecontrol.h
+qt2/include/qrangect.h
+qt2/include/qrect.h
+qt2/include/qregexp.h
+qt2/include/qregion.h
+qt2/include/qrtlcodec.h
+qt2/include/qscrbar.h
+qt2/include/qscrollbar.h
+qt2/include/qscrollview.h
+qt2/include/qsemimodal.h
+qt2/include/qserversocket.h
+qt2/include/qsession.h
+qt2/include/qsessionmanager.h
+qt2/include/qsgistyle.h
+qt2/include/qshared.h
+qt2/include/qsignal.h
+qt2/include/qsignalmapper.h
+qt2/include/qsignalslotimp.h
+qt2/include/qsimplerichtext.h
+qt2/include/qsize.h
+qt2/include/qsizegrip.h
+qt2/include/qsizepolicy.h
+qt2/include/qsjiscodec.h
+qt2/include/qslider.h
+qt2/include/qsmartptr.h
+qt2/include/qsocket.h
+qt2/include/qsocketdevice.h
+qt2/include/qsocketnotifier.h
+qt2/include/qsocknot.h
+qt2/include/qsortedlist.h
+qt2/include/qsound.h
+qt2/include/qspinbox.h
+qt2/include/qsplitter.h
+qt2/include/qstack.h
+qt2/include/qstatusbar.h
+qt2/include/qstring.h
+qt2/include/qstringlist.h
+qt2/include/qstrlist.h
+qt2/include/qstrvec.h
+qt2/include/qstyle.h
+qt2/include/qstylesheet.h
+qt2/include/qt.h
+qt2/include/qt_x11.h
+qt2/include/qtabbar.h
+qt2/include/qtabdialog.h
+qt2/include/qtabdlg.h
+qt2/include/qtable.h
+qt2/include/qtableview.h
+qt2/include/qtablevw.h
+qt2/include/qtabwidget.h
+qt2/include/qtextbrowser.h
+qt2/include/qtextcodec.h
+qt2/include/qtextstream.h
+qt2/include/qtextview.h
+qt2/include/qthread.h
+qt2/include/qtimer.h
+qt2/include/qtl.h
+qt2/include/qtoolbar.h
+qt2/include/qtoolbutton.h
+qt2/include/qtooltip.h
+qt2/include/qtranslator.h
+qt2/include/qtsciicodec.h
+qt2/include/qtstream.h
+qt2/include/qurl.h
+qt2/include/qurlinfo.h
+qt2/include/qurloperator.h
+qt2/include/qutfcodec.h
+qt2/include/qvalidator.h
+qt2/include/qvaluelist.h
+qt2/include/qvaluestack.h
+qt2/include/qvariant.h
+qt2/include/qvbox.h
+qt2/include/qvbuttongroup.h
+qt2/include/qvector.h
+qt2/include/qvgroupbox.h
+qt2/include/qwhatsthis.h
+qt2/include/qwidcoll.h
+qt2/include/qwidget.h
+qt2/include/qwidgetintdict.h
+qt2/include/qwidgetlist.h
+qt2/include/qwidgetstack.h
+qt2/include/qwindefs.h
+qt2/include/qwindow.h
+qt2/include/qwindowdefs.h
+qt2/include/qwindowsstyle.h
+qt2/include/qwizard.h
+qt2/include/qwmatrix.h
+qt2/include/qworkspace.h
+qt2/include/qxml.h
+qt2/include/qxt.h
+qt2/lib/libqt.a
+qt2/lib/libqt.la
+qt2/lib/libqt.so.2.2
+@dirrm qt2/lib
+@dirrm qt2/include
+@dirrm qt2/bin
+@dirrm qt2