Fix xpkgwedge problems noted by John Darrow <John.P.Darrow@wheaton.edu> in

pkg/13224.  Changes suggested in the PR were applied, and one additional
change in the place where the CFLAGS are set was made to give this package
a better change of compiling on Linux.

3 files changed, 23 insertions, 20 deletions

diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 6cb4b271753..a902caf407f 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/25 04:17:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/14 03:34:44 jlam Exp $
 
 DISTNAME=	musicbox-1.01p2
 CATEGORIES=	audio
@@ -11,12 +11,11 @@ COMMENT=	X11 front-interface for mpg123
 DEPENDS+=	mpg123-0.59r:../../audio/mpg123
 DEPENDS+=	qt1-1.44:../../x11/qt1
 
-USE_X11=	yes
-
 WRKSRC=		${WRKDIR}/musicbox-1.01
 
+USE_X11=	yes
+CFLAGS+=	-D${OPSYS}
 EVAL_PREFIX+=	QT1DIR=qt1
-PATH=		${QT1DIR}/qt1/bin:$$PATH
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
diff --git a/audio/musicbox/distinfo b/audio/musicbox/distinfo
index 48faaf68db0..8486a422297 100644
--- a/audio/musicbox/distinfo
+++ b/audio/musicbox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:36 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/09/14 03:34:44 jlam Exp $
 
 SHA1 (musicbox-1.01p2.tgz) = 7dd8b192349783746918b0d3074bec11f3aaf9d8
 Size (musicbox-1.01p2.tgz) = 44119 bytes
-SHA1 (patch-aa) = 4620fd2be979f34bb08b4bb3cd1133ac9cd94570
+SHA1 (patch-aa) = f73afd02f35fa1a3fd6e64b3af4c96ca724d0c42
 SHA1 (patch-ab) = a59f798aebc8df7b61cfb3036add624c385a3884
 SHA1 (patch-ac) = e4dc17b497577209aa83a320413bb23456ecfd60
 SHA1 (patch-ad) = 0e7032f2d5efce2a6b0eafdb2584267b4d164c56
diff --git a/audio/musicbox/patches/patch-aa b/audio/musicbox/patches/patch-aa
index d40d7228c38..8d652e86a26 100644
--- a/audio/musicbox/patches/patch-aa
+++ b/audio/musicbox/patches/patch-aa
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.4 2000/03/28 00:09:21 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2001/09/14 03:34:45 jlam Exp $
 
 --- Makefile.orig	Wed Nov 12 14:01:58 1997
-+++ Makefile	Sun Mar 26 11:00:40 2000
-@@ -1,13 +1,17 @@
++++ Makefile	Thu Sep 13 23:26:26 2001
+@@ -1,14 +1,18 @@
  # change following for your environment
 -INC = /usr/X11R6/include/X11/qt
 -LIB = /usr/X11R6/lib
+-MOC = moc
 +#INC = /usr/X11R6/include/X11/qt
-+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
++INC = -I${X11BASE}/include -I${QT1DIR}/qt1/include
++LIB = -L${QT1DIR}/qt1/lib -Wl,-R${QT1DIR}/qt1/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
++MOC = ${QT1DIR}/qt1/bin/moc
  
  # if you use freebsd
 -CFLAGS = -DFreeBSD
@@ -19,11 +20,13 @@ $NetBSD: patch-aa,v 1.4 2000/03/28 00:09:21 dmcmahill Exp $
  #CFLAGS = -DLinux
  
 +# if you use netbsd
-+CFLAGS = -DNetBSD
++#CFLAGS = -DNetBSD
 +
  GCC = gcc
  
-@@ -19,11 +23,11 @@
+ ALL = mplayer.o player.o ListView.o clock.o mclock.o mListView.o  \
+@@ -18,69 +22,69 @@
+ PKG = musicbox
  
  all:	${ALL}
 -	${GCC} ${ALL} -o ${PKG} -L${LIB} -I${INC} -lqt
@@ -39,7 +42,7 @@ $NetBSD: patch-aa,v 1.4 2000/03/28 00:09:21 dmcmahill Exp $
 +	${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} ${INC}
  
  mplayer.cpp:
-@@ -31,13 +35,13 @@
+ 	${MOC} player.h -o mplayer.cpp
  
  ListView.o:
 -	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -L${LIB} -I${INC} 
@@ -56,14 +59,14 @@ $NetBSD: patch-aa,v 1.4 2000/03/28 00:09:21 dmcmahill Exp $
 +	${GCC} -c clock.cpp -o clock.o ${INC}
  
  mclock.cpp:
-@@ -45,5 +49,5 @@
+ 	${MOC} clock.h -o mclock.cpp
  
  mclock.o: mclock.cpp
 -	${GCC} -c mclock.cpp -o mclock.o -L${LIB} -I${INC}
 +	${GCC} -c mclock.cpp -o mclock.o ${INC}
  
  mfilebrowse.cpp: 
-@@ -51,14 +55,14 @@
+ 	${MOC} filebrowse.h -o mfilebrowse.cpp
  
  filebrowse.o :
 -	${GCC} -c filebrowse.cpp -o filebrowse.o -L${LIB} -I${INC}
@@ -82,7 +85,7 @@ $NetBSD: patch-aa,v 1.4 2000/03/28 00:09:21 dmcmahill Exp $
 +	${GCC} -c mdiskbrowse.cpp -o $@ ${INC}
  
  mdiskbrowse.cpp:
-@@ -66,8 +70,8 @@
+ 	${MOC} diskbrowse.h -o $@ 
  
  qktstreelist.o:
 -	${GCC} -c qktstreelist.cpp -o $@ -L${LIB} -I${INC}
@@ -93,17 +96,18 @@ $NetBSD: patch-aa,v 1.4 2000/03/28 00:09:21 dmcmahill Exp $
 +	${GCC} -c mqktstreelist.cpp -o $@ ${INC}
  
  mqktstreelist.cpp:
-@@ -75,5 +79,5 @@
+ 	${MOC} qktstreelist.h -o $@
  
  MultiListBox.o:
 -	${GCC} -c MultiListBox.cpp -o $@ -L${LIB} -I${INC}
 +	${GCC} -c MultiListBox.cpp -o $@ ${INC}
  	
  mMultiListBox.cpp:
-@@ -81,5 +85,5 @@
+ 	${MOC} MultiListBox.h -o $@
  
  mMultiListBox.o: mMultiListBox.cpp
 -	${GCC} -c mMultiListBox.cpp -o $@ -L${LIB} -I${INC}
 +	${GCC} -c mMultiListBox.cpp -o $@ ${INC}
  
  clean:
+ 	rm -f player mplayer.cpp *.o mclock.cpp mListView.cpp mfilebrowse.cpp \