update dependency from qt-1.44 to qt1-1.44

3 files changed, 19 insertions, 21 deletions

diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index eb486093b85..701ee051b8e 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/07/10 10:40:37 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/03/23 21:34:20 dmcmahill Exp $
 
 DISTNAME=	musicbox-1.01p2
 CATEGORIES=	audio
@@ -8,7 +8,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	rxg@ms25.url.com.tw
 
 DEPENDS+=	mpg123-0.59r:../../audio/mpg123
-DEPENDS+=	qt-1.44:../../x11/qt
+DEPENDS+=	qt1-1.44:../../x11/qt1
 
 USE_X11=	yes
 
diff --git a/audio/musicbox/files/patch-sum b/audio/musicbox/files/patch-sum
index a96fa37da6a..452f2705db1 100644
--- a/audio/musicbox/files/patch-sum
+++ b/audio/musicbox/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:13 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/03/23 21:34:21 dmcmahill Exp $
 
-MD5 (patch-aa) = fcc080d4a84682cf7f1610248ff00b80
+MD5 (patch-aa) = 8cbf3f832ebda9a18652d96307147ecc
 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 0dcee6ffc17..4005dd4b96d 100644
--- a/audio/musicbox/patches/patch-aa
+++ b/audio/musicbox/patches/patch-aa
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.2 1999/07/07 14:15:37 tron Exp $
+$NetBSD: patch-aa,v 1.3 2000/03/23 21:34:21 dmcmahill Exp $
 
---- Makefile.orig	Wed Nov 12 20:01:58 1997
-+++ Makefile	Wed Jun  9 00:47:52 1999
-@@ -1,14 +1,18 @@
+--- Makefile.orig	Wed Nov 12 14:01:58 1997
++++ Makefile	Wed Mar 22 18:32:06 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/qt
++INC = ${X11BASE}/include/qt1
 +LIB = ${X11BASE}/lib
- MOC = moc
++MOC = moc1
  
  # if you use freebsd
 -CFLAGS = -DFreeBSD
@@ -23,13 +24,11 @@ $NetBSD: patch-aa,v 1.2 1999/07/07 14:15:37 tron Exp $
 +
  GCC = gcc
  
- ALL = mplayer.o player.o ListView.o clock.o mclock.o mListView.o  \
-@@ -18,69 +22,69 @@
- PKG = musicbox
+@@ -19,11 +23,11 @@
  
  all:	${ALL}
 -	${GCC} ${ALL} -o ${PKG} -L${LIB} -I${INC} -lqt
-+	${GCC} ${ALL} -o ${PKG} -L${LIB} -Wl,-R${LIB} -lqt -lX11 -lXext -lossaudio
++	${GCC} ${ALL} -o ${PKG} -L${LIB} -Wl,-R${LIB} -lqt1 -lX11 -lXext -lossaudio
  
 -player.o:
 -	${GCC} -c player.cpp -o player.o ${CFLAGS} -L${LIB} -I${INC}
@@ -41,7 +40,7 @@ $NetBSD: patch-aa,v 1.2 1999/07/07 14:15:37 tron Exp $
 +	${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} -I${INC}
  
  mplayer.cpp:
- 	${MOC} player.h -o mplayer.cpp
+@@ -31,13 +35,13 @@
  
  ListView.o:
 -	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -L${LIB} -I${INC} 
@@ -58,14 +57,14 @@ $NetBSD: patch-aa,v 1.2 1999/07/07 14:15:37 tron Exp $
 +	${GCC} -c clock.cpp -o clock.o -I${INC}
  
  mclock.cpp:
- 	${MOC} clock.h -o 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}
  
  mfilebrowse.cpp: 
- 	${MOC} filebrowse.h -o mfilebrowse.cpp
+@@ -51,14 +55,14 @@
  
  filebrowse.o :
 -	${GCC} -c filebrowse.cpp -o filebrowse.o -L${LIB} -I${INC}
@@ -84,7 +83,7 @@ $NetBSD: patch-aa,v 1.2 1999/07/07 14:15:37 tron Exp $
 +	${GCC} -c mdiskbrowse.cpp -o $@ -I${INC}
  
  mdiskbrowse.cpp:
- 	${MOC} diskbrowse.h -o $@ 
+@@ -66,8 +70,8 @@
  
  qktstreelist.o:
 -	${GCC} -c qktstreelist.cpp -o $@ -L${LIB} -I${INC}
@@ -95,18 +94,17 @@ $NetBSD: patch-aa,v 1.2 1999/07/07 14:15:37 tron Exp $
 +	${GCC} -c mqktstreelist.cpp -o $@ -I${INC}
  
  mqktstreelist.cpp:
- 	${MOC} qktstreelist.h -o $@
+@@ -75,5 +79,5 @@
  
  MultiListBox.o:
 -	${GCC} -c MultiListBox.cpp -o $@ -L${LIB} -I${INC}
 +	${GCC} -c MultiListBox.cpp -o $@ -I${INC}
  	
  mMultiListBox.cpp:
- 	${MOC} MultiListBox.h -o $@
+@@ -81,5 +85,5 @@
  
  mMultiListBox.o: mMultiListBox.cpp
 -	${GCC} -c mMultiListBox.cpp -o $@ -L${LIB} -I${INC}
 +	${GCC} -c mMultiListBox.cpp -o $@ -I${INC}
  
  clean:
- 	rm -f player mplayer.cpp *.o mclock.cpp mListView.cpp mfilebrowse.cpp \