Change from using qt to qt1. This clears the way to allow Qt to be upgraded

to Qt-2 without breaking KDE which still requires Qt-1.

13 files changed, 54 insertions, 64 deletions

diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile
index d2a9e575240..94e6ac6e02b 100644
--- a/audio/kdemultimedia/Makefile
+++ b/audio/kdemultimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/10/07 17:41:46 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/03/28 00:12:29 dmcmahill Exp $
 
 DISTNAME=	kdemultimedia-1.1.2
 CATEGORIES=	audio kde
@@ -15,11 +15,10 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=${PREFIX}" \
-		"--with-qt-includes=${PREFIX}/include/qt"
+		"--with-qt-dir=${PREFIX}/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
+		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 5c6abaf2fc9..0b75814910f 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 1999/10/07 17:41:48 tron Exp $
+# $NetBSD: Makefile,v 1.27 2000/03/28 00:12:30 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
 #
 
@@ -18,6 +18,7 @@ CONFIGURE_ARGS=	"--without-gnu-ld" \
 		"--without-libgif" \
 		"--without-libgdbm" \
 		"--without-libuulib" \
-		"--without-sprite-field"
+		"--without-sprite-field" \
+		"--with-qt-dir=${X11BASE}/qt1" 
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 22f14c7ca15..2f1062cde0d 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/12/14 20:03:42 tron Exp $
+# $NetBSD: Makefile,v 1.11 2000/03/28 00:12:30 dmcmahill Exp $
 
 DISTNAME=	kdevelop-1.0
 CATEGORIES=	devel kde
@@ -19,9 +19,8 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-qt-dir=${PREFIX} \
-		--with-qt-includes=${PREFIX}/include/qt
+CONFIGURE_ARGS=	--with-qt-dir=${X11BASE}/qt1 
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	KDEDIR=${PREFIX}
+CONFIGURE_ENV=	"KDEDIR=${PREFIX} QTDIR=${X11BASE}/qt1"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index 6432ce58e65..5c456e4b6b6 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 1999/10/07 17:41:53 tron Exp $
+# $NetBSD: Makefile,v 1.36 2000/03/28 00:12:30 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
 #
 
@@ -18,11 +18,10 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=${PREFIX}" \
-		"--with-qt-includes=${PREFIX}/include/qt"
+		"--with-qt-dir=${X11BASE}/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
+		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile
index 89d62024946..ccc7dc509ba 100644
--- a/graphics/kdegraphics/Makefile
+++ b/graphics/kdegraphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 1999/10/22 01:06:12 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2000/03/28 00:12:30 dmcmahill Exp $
 #
 
 DISTNAME=	kdegraphics-1.1.2
@@ -16,11 +16,10 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=${PREFIX}" \
-		"--with-qt-includes=${PREFIX}/include/qt"
+		"--with-qt-dir=${X11BASE}/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=  KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
+		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 536fa475e73..374ae9a6e8f 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2000/03/23 11:54:43 agc Exp $
+# $NetBSD: Makefile,v 1.36 2000/03/28 00:12:31 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
 #
 
@@ -16,12 +16,11 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--with-qt-dir=${PREFIX}" \
-		"--with-qt-includes=${PREFIX}/include/qt"
+CONFIGURE_ARGS=	"--with-qt-dir=${X11BASE}/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
+		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 2f4b5c771da..cb302c9ed31 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2000/03/23 11:58:32 agc Exp $
+# $NetBSD: Makefile,v 1.41 2000/03/28 00:12:31 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -24,12 +24,11 @@ USE_LIBTOOL=		yes
 LIBTOOL_FLAGS=		--cplusplus --install-la
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		"--datadir=${PREFIX}/share/kde" \
-			"--with-qt-dir=${PREFIX}" \
-			"--with-qt-includes=${PREFIX}/include/qt"
+			"--with-qt-dir=${X11BASE}/qt1" 
 CONFIGURE_ENV=  	KDEDIR=${PREFIX} \
 			CPPFLAGS="${CPPFLAGS}" \
 			CXXFLAGS="${CFLAGS}" \
-			all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
+			all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
 
 GCC_VERSION!=   	gcc --version
 .if (${GCC_VERSION:C/-.*$$//} == egcs)
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 06551bd74ea..c9e07cddde1 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2000/03/23 11:58:31 agc Exp $
+# $NetBSD: Makefile,v 1.63 2000/03/28 00:12:31 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -24,13 +24,12 @@ DEPENDS+=	libungif-*:../../graphics/libungif
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/kde \
-		--with-qt-dir=${PREFIX} \
-		--with-qt-includes=${PREFIX}/include/qt
+CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
+		"--with-qt-dir=${X11BASE}/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
+		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
 
 EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 PLIST_SRC=	${WRKDIR}/PLIST
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index eeac1948b27..d61ccfa7e63 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2000/03/21 22:40:58 tron Exp $
+# $NetBSD: Makefile,v 1.45 2000/03/28 00:12:31 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -13,7 +13,7 @@ HOMEPAGE=       http://www.kde.org/
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	png>=1.0.6:../../graphics/png
-DEPENDS+=	qt-1.44:../../x11/qt
+DEPENDS+=	qt1-1.44:../../x11/qt1
 DEPENDS+=	tiff-*:../../graphics/tiff
 
 USE_X11BASE=	yes
@@ -21,9 +21,8 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOL_FLAGS=	--cplusplus --install-la
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/kde \
-		--with-qt-dir=${PREFIX} \
-		--with-qt-includes=${PREFIX}/include/qt
+CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
+		"--with-qt-dir=${PREFIX}/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.prefs.mk"
@@ -38,6 +37,6 @@ post-install:
 
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
+		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 8c8b0adf8da..6aa850e0bcd 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/10/07 17:42:01 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/28 00:12:31 dmcmahill Exp $
 
 DISTNAME=	QwSpriteField1.6
 PKGNAME=	qwspritefield-1.6
@@ -7,7 +7,7 @@ MASTER_SITES=	ftp://ftp.troll.no/contrib/
 
 MAINTAINER=	packages@netbsd.org
 
-DEPENDS+=	qt-1.44:../../x11/qt
+DEPENDS+=	qt1-1.44:../../x11/qt1
 
 CONFLICTS=	kdesupport-1.0
 
@@ -18,11 +18,15 @@ WRKSRC=		${WRKDIR}/QwSpriteField
 
 QW_INCLUDES=	Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
 
+PATH=		${X11BASE}/qt1/bin:$$PATH
+
+MAKE_ENV+=	"QTDIR=${X11BASE}/qt1"
+
 do-install:
 	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \
 	  ${PREFIX}/lib
 .for FILE in ${QW_INCLUDES}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/include/qt
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/qt1/include
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qwspritefield/files/patch-sum b/x11/qwspritefield/files/patch-sum
index 90e031bdd90..e71e4ff8bbb 100644
--- a/x11/qwspritefield/files/patch-sum
+++ b/x11/qwspritefield/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:29 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/03/28 00:12:32 dmcmahill Exp $
 
-MD5 (patch-aa) = 0732a2c35870312baa3bffd830a7c163
+MD5 (patch-aa) = f16c0a2a4a8b01d6b4e38d477567745c
diff --git a/x11/qwspritefield/patches/patch-aa b/x11/qwspritefield/patches/patch-aa
index 47534a65d9c..fd392f6a65d 100644
--- a/x11/qwspritefield/patches/patch-aa
+++ b/x11/qwspritefield/patches/patch-aa
@@ -1,22 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/03/23 21:08:02 tron Exp $
+$NetBSD: patch-aa,v 1.2 2000/03/28 00:12:32 dmcmahill Exp $
 
---- Makefile.orig	Wed Dec  9 09:41:59 1998
-+++ Makefile	Tue Mar 23 21:45:32 1999
-@@ -1,9 +1,9 @@
+--- Makefile.orig	Wed Dec  9 03:41:59 1998
++++ Makefile	Sun Mar 26 10:55:12 2000
+@@ -1,8 +1,8 @@
  VERSION=1.6
  
 -LDFLAGS=-L/usr/X11/lib -L$(QTDIR)/lib
-+LDFLAGS=-L$(PREFIX)/lib -L$(QTDIR)/lib
++LDFLAGS=-L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib
  LDLIBS=$(LIBRARY) -lqt -lX11
 -CXXFLAGS=-Wall -g -I$(QTDIR)/include -I.
 -#CXXFLAGS=-Wall -O2 -I$(QTDIR)/include -I.
 +#CXXFLAGS=-Wall -g -I$(PREFIX)/include/qt -I.
-+CXXFLAGS=-Wall -O2 -I$(PREFIX)/include/qt -I.
++CXXFLAGS=-Wall -O2 -I$(QTDIR)/include -I.
  MOCS=moc_QwSpriteField.cpp
  SRC=QwSpriteField.cpp QwSpriteField-double.cpp QwSpriteField-int.cpp \
- 	QwSpriteField-mobdouble.cpp QwSpriteField-mobint.cpp QwCluster.cpp \
-@@ -11,12 +11,12 @@
- OBJ=QwSpriteField.o QwSpriteField-double.o QwSpriteField-int.o \
+@@ -12,10 +12,10 @@
  	QwSpriteField-mobdouble.o QwSpriteField-mobint.o QwCluster.o \
  	moc_QwSpriteField.o
 -LIBRARY=libQwSpriteField.a
@@ -27,12 +25,10 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/03/23 21:08:02 tron Exp $
  
  $(LIBRARY): $(OBJ)
 -	ar rs $(LIBRARY) $?
-+	$(LIBTOOL) --mode=link $(CXX) -rpath $(PREFIX)/lib -version-info 6:0 -o $(LIBRARY) $(OBJ:.o=.lo)
++	$(LIBTOOL) --mode=link $(CXX) -rpath $(PREFIX)/lib -rpath $(QTDIR)/lib -version-info 6:0 -o $(LIBRARY) $(OBJ:.o=.lo)
  
  example: example.o moc_example.o $(LIBRARY)
- 
-@@ -95,11 +95,8 @@
- moc_%.cpp: %.h
+@@ -96,9 +96,6 @@
  	moc $*.h -o moc_$*.cpp
  
 -QwSpriteField-%.o: QwSpriteField-%.cpp
@@ -43,13 +39,10 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/03/23 21:08:02 tron Exp $
 +	$(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) -c $<
  
  clean:
- 	-rm doc/html/*~ *~ *.o *.moc core
-@@ -112,7 +109,7 @@
- Dependencies:
+@@ -113,5 +110,5 @@
  	@echo "Making file $@ automatically."
  	touch Dependencies
 -	make depend
 +	${MAKE} depend
  
  include Dependencies
- 
diff --git a/x11/qwspritefield/pkg/PLIST b/x11/qwspritefield/pkg/PLIST
index 4cbdbcbce31..75adf585572 100644
--- a/x11/qwspritefield/pkg/PLIST
+++ b/x11/qwspritefield/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/03/23 21:08:02 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/03/28 00:12:32 dmcmahill Exp $
 lib/libQwSpriteField.a
 lib/libQwSpriteField.so.6.0
-include/qt/Pix.h
-include/qt/QwCluster.h
-include/qt/QwPublicList.h
-include/qt/QwSpriteField.h
+qt1/include/Pix.h
+qt1/include/QwCluster.h
+qt1/include/QwPublicList.h
+qt1/include/QwSpriteField.h