make qt1 install in its own directory instead of renaming its installed

components.  This allows users of Qt to specify QTDIR=/path/to/qt instead
of having to patch all configure scripts and makefiles to look for alternate
names.  This is the recommended approach from Troll Tech (Qt authors).

update pkgs which use qt1 to reflect this.

3 files changed, 25 insertions, 24 deletions

diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 701ee051b8e..02755b2b04f 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/03/23 21:34:20 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/28 00:09:20 dmcmahill Exp $
 
 DISTNAME=	musicbox-1.01p2
 CATEGORIES=	audio
@@ -14,6 +14,8 @@ USE_X11=	yes
 
 WRKSRC=		${WRKDIR}/musicbox-1.01
 
+PATH=	${X11BASE}/qt1/bin:$$PATH
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/share/doc/musicbox
diff --git a/audio/musicbox/files/patch-sum b/audio/musicbox/files/patch-sum
index 452f2705db1..ce737ff0322 100644
--- a/audio/musicbox/files/patch-sum
+++ b/audio/musicbox/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/03/23 21:34:21 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
 
-MD5 (patch-aa) = 8cbf3f832ebda9a18652d96307147ecc
+MD5 (patch-aa) = 32bfeca94d688734b1b9ef9ac9ae4d35
 MD5 (patch-ab) = 67daa6701175e11d0e772cbe43676f4d
 MD5 (patch-ac) = c85da557cf69d463f19b213ca774cac1
 MD5 (patch-ad) = d88bfc82b85f2615b1feb2fbe6701140
diff --git a/audio/musicbox/patches/patch-aa b/audio/musicbox/patches/patch-aa
index 4005dd4b96d..d40d7228c38 100644
--- a/audio/musicbox/patches/patch-aa
+++ b/audio/musicbox/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2000/03/23 21:34:21 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2000/03/28 00:09:21 dmcmahill Exp $
 
 --- Makefile.orig	Wed Nov 12 14:01:58 1997
-+++ Makefile	Wed Mar 22 18:32:06 2000
++++ Makefile	Sun Mar 26 11:00:40 2000
 @@ -1,13 +1,17 @@
  # change following for your environment
 -INC = /usr/X11R6/include/X11/qt
 -LIB = /usr/X11R6/lib
--MOC = moc
 +#INC = /usr/X11R6/include/X11/qt
-+INC = ${X11BASE}/include/qt1
-+LIB = ${X11BASE}/lib
-+MOC = moc1
++INC = -I${X11BASE}/include -I${X11BASE}/qt1/include
++LIB = -L${X11BASE}/qt1/lib -Wl,-R${X11BASE}/qt1/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
+ MOC = moc
  
  # if you use freebsd
 -CFLAGS = -DFreeBSD
@@ -28,83 +27,83 @@ $NetBSD: patch-aa,v 1.3 2000/03/23 21:34:21 dmcmahill Exp $
  
  all:	${ALL}
 -	${GCC} ${ALL} -o ${PKG} -L${LIB} -I${INC} -lqt
-+	${GCC} ${ALL} -o ${PKG} -L${LIB} -Wl,-R${LIB} -lqt1 -lX11 -lXext -lossaudio
++	${GCC} ${ALL} -o ${PKG} ${LIB}  -lqt -lX11 -lXext -lossaudio
  
 -player.o:
 -	${GCC} -c player.cpp -o player.o ${CFLAGS} -L${LIB} -I${INC}
 +player.o: player.cpp
-+	${GCC} -c player.cpp -o player.o ${CFLAGS} -I${INC}
++	${GCC} -c player.cpp -o player.o ${CFLAGS} ${INC}
  
  mplayer.o: mplayer.cpp
 -	${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} -L${LIB} -I${INC}
-+	${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} -I${INC}
++	${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} ${INC}
  
  mplayer.cpp:
 @@ -31,13 +35,13 @@
  
  ListView.o:
 -	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -L${LIB} -I${INC} 
-+	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -I${INC} 
++	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} ${INC} 
  
  mListView.o: mListView.cpp
 -	${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} -L${LIB} -I${INC}
-+	${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} -I${INC}
++	${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} ${INC}
  
  mListView.cpp:
  	${MOC} ListView.h -o mListView.cpp
  clock.o:
 -	${GCC} -c clock.cpp -o clock.o -L${LIB} -I${INC}
-+	${GCC} -c clock.cpp -o clock.o -I${INC}
++	${GCC} -c clock.cpp -o clock.o ${INC}
  
  mclock.cpp:
 @@ -45,5 +49,5 @@
  
  mclock.o: mclock.cpp
 -	${GCC} -c mclock.cpp -o mclock.o -L${LIB} -I${INC}
-+	${GCC} -c mclock.cpp -o mclock.o -I${INC}
++	${GCC} -c mclock.cpp -o mclock.o ${INC}
  
  mfilebrowse.cpp: 
 @@ -51,14 +55,14 @@
  
  filebrowse.o :
 -	${GCC} -c filebrowse.cpp -o filebrowse.o -L${LIB} -I${INC}
-+	${GCC} -c filebrowse.cpp -o filebrowse.o -I${INC}
++	${GCC} -c filebrowse.cpp -o filebrowse.o ${INC}
  
  mfilebrowse.o: mfilebrowse.cpp
 -	${GCC} -c mfilebrowse.cpp -o mfilebrowse.o -L${LIB} -I${INC}
-+	${GCC} -c mfilebrowse.cpp -o mfilebrowse.o -I${INC}
++	${GCC} -c mfilebrowse.cpp -o mfilebrowse.o ${INC}
  
  diskbrowse.o:
 -	${GCC} -c diskbrowse.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c diskbrowse.cpp -o $@ -I${INC}
++	${GCC} -c diskbrowse.cpp -o $@ ${INC}
  
  mdiskbrowse.o: mdiskbrowse.cpp
 -	${GCC} -c mdiskbrowse.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c mdiskbrowse.cpp -o $@ -I${INC}
++	${GCC} -c mdiskbrowse.cpp -o $@ ${INC}
  
  mdiskbrowse.cpp:
 @@ -66,8 +70,8 @@
  
  qktstreelist.o:
 -	${GCC} -c qktstreelist.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c qktstreelist.cpp -o $@ -I${INC}
++	${GCC} -c qktstreelist.cpp -o $@ ${INC}
  
  mqktstreelist.o: mqktstreelist.cpp
 -	${GCC} -c mqktstreelist.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c mqktstreelist.cpp -o $@ -I${INC}
++	${GCC} -c mqktstreelist.cpp -o $@ ${INC}
  
  mqktstreelist.cpp:
 @@ -75,5 +79,5 @@
  
  MultiListBox.o:
 -	${GCC} -c MultiListBox.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c MultiListBox.cpp -o $@ -I${INC}
++	${GCC} -c MultiListBox.cpp -o $@ ${INC}
  	
  mMultiListBox.cpp:
 @@ -81,5 +85,5 @@
  
  mMultiListBox.o: mMultiListBox.cpp
 -	${GCC} -c mMultiListBox.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c mMultiListBox.cpp -o $@ -I${INC}
++	${GCC} -c mMultiListBox.cpp -o $@ ${INC}
  
  clean: