Import new "musicbox" package based on work contributed by Rui-Xiang Guo

in PR pkg/7022:
a X11 front-interface for mpg123

Thanks to Martin J. Laubach for his help to make this compile with egcs.

10 files changed, 274 insertions, 0 deletions

diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
new file mode 100644
index 00000000000..c5273649c80
--- /dev/null
+++ b/audio/musicbox/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1.1.1 1999/06/08 23:07:10 tron Exp $
+
+DISTNAME=	musicbox-1.01p2
+CATEGORIES=	audio
+MASTER_SITES=	ftp://freebsd.csie.nctu.edu.tw/Upload/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	rxg@ms25.url.com.tw
+
+DEPENDS+=	mpg123-0.59q:../../audio/mpg123
+DEPENDS+=	qt-1.44:../../x11/qt
+
+USE_X11=	yes
+
+WRKSRC=		${WRKDIR}/musicbox-1.01
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/share/doc/musicbox
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/musicbox/README
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicbox/files/md5 b/audio/musicbox/files/md5
new file mode 100644
index 00000000000..357cf52b657
--- /dev/null
+++ b/audio/musicbox/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 1999/06/08 23:07:10 tron Exp $
+
+MD5 (musicbox-1.01p2.tgz) = cdaad5a34c33c78af568bc6e589aa257
diff --git a/audio/musicbox/patches/patch-aa b/audio/musicbox/patches/patch-aa
new file mode 100644
index 00000000000..7839a4e5ee8
--- /dev/null
+++ b/audio/musicbox/patches/patch-aa
@@ -0,0 +1,112 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $
+
+--- Makefile.orig	Wed Nov 12 20:01:58 1997
++++ Makefile	Wed Jun  9 00:47:52 1999
+@@ -1,14 +1,18 @@
+ # change following for your environment
+-INC = /usr/X11R6/include/X11/qt
+-LIB = /usr/X11R6/lib
++#INC = /usr/X11R6/include/X11/qt
++INC = ${X11BASE}/include/qt
++LIB = ${X11BASE}/lib
+ MOC = moc
+ 
+ # if you use freebsd
+-CFLAGS = -DFreeBSD
++#CFLAGS = -DFreeBSD
+ 
+ #if you use linux
+ #CFLAGS = -DLinux
+ 
++# if you use netbsd
++CFLAGS = -DNetBSD
++
+ GCC = gcc
+ 
+ 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
++	${GCC} ${ALL} -o ${PKG} -L${LIB} -Wl,-R${LIB} -lqt -lX11 -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}
+ 
+ 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}
+ 
+ mplayer.cpp:
+ 	${MOC} player.h -o mplayer.cpp
+ 
+ ListView.o:
+-	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -L${LIB} -I${INC} 
++	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -I${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}
+ 
+ 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}
+ 
+ mclock.cpp:
+ 	${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 -I${INC}
+ 
+ mfilebrowse.cpp: 
+ 	${MOC} filebrowse.h -o mfilebrowse.cpp
+ 
+ filebrowse.o :
+-	${GCC} -c filebrowse.cpp -o filebrowse.o -L${LIB} -I${INC}
++	${GCC} -c filebrowse.cpp -o filebrowse.o -I${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}
+ 
+ diskbrowse.o:
+-	${GCC} -c diskbrowse.cpp -o $@ -L${LIB} -I${INC}
++	${GCC} -c diskbrowse.cpp -o $@ -I${INC}
+ 
+ mdiskbrowse.o: mdiskbrowse.cpp
+-	${GCC} -c mdiskbrowse.cpp -o $@ -L${LIB} -I${INC}
++	${GCC} -c mdiskbrowse.cpp -o $@ -I${INC}
+ 
+ mdiskbrowse.cpp:
+ 	${MOC} diskbrowse.h -o $@ 
+ 
+ qktstreelist.o:
+-	${GCC} -c qktstreelist.cpp -o $@ -L${LIB} -I${INC}
++	${GCC} -c qktstreelist.cpp -o $@ -I${INC}
+ 
+ mqktstreelist.o: mqktstreelist.cpp
+-	${GCC} -c mqktstreelist.cpp -o $@ -L${LIB} -I${INC}
++	${GCC} -c mqktstreelist.cpp -o $@ -I${INC}
+ 
+ mqktstreelist.cpp:
+ 	${MOC} qktstreelist.h -o $@
+ 
+ MultiListBox.o:
+-	${GCC} -c MultiListBox.cpp -o $@ -L${LIB} -I${INC}
++	${GCC} -c MultiListBox.cpp -o $@ -I${INC}
+ 	
+ mMultiListBox.cpp:
+ 	${MOC} MultiListBox.h -o $@
+ 
+ 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 \
diff --git a/audio/musicbox/patches/patch-ab b/audio/musicbox/patches/patch-ab
new file mode 100644
index 00000000000..f2d46cfd27d
--- /dev/null
+++ b/audio/musicbox/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $
+
+--- ListView.h.orig	Fri Feb 12 07:13:07 1999
++++ ListView.h	Fri Feb 12 07:34:19 1999
+@@ -18,6 +18,11 @@
+ #ifdef Linux
+ #include <sys/soundcard.h>
+ #endif
++#ifdef NetBSD
++#include <sys/ioctl.h>
++#include <soundcard.h>
++#undef _POSIX_SOURCE
++#endif
+ 
+ #define DEVICE 0
+ #define MIXER "/dev/mixer"
diff --git a/audio/musicbox/patches/patch-ac b/audio/musicbox/patches/patch-ac
new file mode 100644
index 00000000000..fed9584c889
--- /dev/null
+++ b/audio/musicbox/patches/patch-ac
@@ -0,0 +1,62 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $
+
+--- player.cpp.orig	Thu Oct  1 10:00:23 1998
++++ player.cpp	Wed Jun  9 00:56:30 1999
+@@ -72,7 +72,7 @@
+ 	options = new QPopupMenu;
+ 	AutoPlayID = options->insertItem( "&Auto Play", this, SLOT(AutoPlay()) );
+ 	options->setItemChecked( AutoPlayID, isAutoPlay );
+-	RepeatID = options->insertItem( "Re&peat", this, SLOT(RepeatPlay()) );
++	RepeatID = options->insertItem( "&Repeat", this, SLOT(RepeatPlay()) );
+ 	options->setCheckable(TRUE);
+ 	menubar->insertItem( "&Options",options );
+ 	menubar->insertSeparator();
+@@ -150,7 +150,7 @@
+ 
+ 	QLabel *label;
+ 	label = new QLabel( this );
+-	label->setText("歌星:");
++	label->setText("Artist:");
+ 	label->setGeometry(5,133,125,30);
+ 
+ 	edtName = new QLabel( this );
+@@ -158,7 +158,7 @@
+ 	edtName->setGeometry(83,136,100,25);
+ 
+ 	label = new QLabel( this );
+-	label->setText("專輯名稱:");
++	label->setText("Album:");
+ 	label->setGeometry(5,173,125,30);
+ 
+ 	edtAlbum = new QLabel( this );
+@@ -166,7 +166,7 @@
+ 	edtAlbum->setGeometry(83,176,100,25);
+ 
+ 	label = new QLabel( this );
+-	label->setText("發行公司:");
++	label->setText("Company:");
+ 	label->setGeometry(5,213,125,30);
+ 
+ 	edtPub = new QLabel( this );
+@@ -242,15 +242,13 @@
+ 		song->setText(SongBox->text(SongBox->currentItem()));
+ 		dclock->Start(SongBox->currentItem());
+ 		if ((mp3_pid = fork()) == 0 ){
+-			char **argv;
+-			int i;
+-			argv[0]=MP3_PLAYER;
+-			argv[1]="-q";
+-			argv[2]=(char *)LocBox->text(SongBox->currentItem());
+-			argv[3]=NULL;
+-			execvp(MP3_PLAYER,argv);
++			execlp(MP3_PLAYER,
++			       MP3_PLAYER,
++			       "-q",
++			       (char *)LocBox->text(SongBox->currentItem()),
++			       NULL);
+ 			QMessageBox::warning(this,"error","can't exec mpg123\n");
+-			exit(1);
++			_exit(1);
+ 		}
+ 	}
+ }
diff --git a/audio/musicbox/patches/patch-ad b/audio/musicbox/patches/patch-ad
new file mode 100644
index 00000000000..3ff0e0e18e7
--- /dev/null
+++ b/audio/musicbox/patches/patch-ad
@@ -0,0 +1,28 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $
+
+--- ListView.cpp.orig	Wed Feb 17 09:17:11 1999
++++ ListView.cpp	Wed Feb 17 09:21:00 1999
+@@ -383,11 +383,11 @@
+ 	if (item != NULL)
+ 		temp = item;
+ 
+-	lbl = new QLabel("歌星:",this);
++	lbl = new QLabel("Artist:",this);
+ 	topLayout->addWidget(lbl,0,0);
+-	lbl = new QLabel("專輯名稱:",this);
++	lbl = new QLabel("Album:",this);
+ 	topLayout->addWidget(lbl,1,0);
+-	lbl = new QLabel("發行公司:",this);
++	lbl = new QLabel("Company:",this);
+ 	topLayout->addWidget(lbl,2,0);
+ 
+ 	Title = new QLabel(this);
+@@ -412,7 +412,7 @@
+ 	connect(btn,SIGNAL(clicked()),this,SLOT(RemoveSong()));
+ 	topLayout->addWidget(btn,4,1);
+ 
+-	lbl = new QLabel("歌曲名稱:",this);
++	lbl = new QLabel("Title:",this);
+ 	topLayout->addWidget(lbl,4,2);
+ 
+ 	edtSinger = new QLineEdit(this);
diff --git a/audio/musicbox/patches/patch-ae b/audio/musicbox/patches/patch-ae
new file mode 100644
index 00000000000..d3ffcfef087
--- /dev/null
+++ b/audio/musicbox/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $
+
+--- qktstreelist.cpp.orig	Mon Nov 10 18:10:02 1997
++++ qktstreelist.cpp	Wed Jun  9 00:15:13 1999
+@@ -834,7 +834,7 @@
+   QktsItemSearchInfo searchInfo;
+   searchInfo.index = index;
+   searchInfo.count = -1;
+-  forEveryVisibleItem(QktsTreeList::findItemAt, &searchInfo);
++  forEveryVisibleItem(&QktsTreeList::findItemAt, &searchInfo);
+   return searchInfo.foundItem;
+ }
+ 
+@@ -1340,7 +1340,7 @@
+   QktsTreeListItem *item = treeRoot->getChild();
+   do {
+     while(item) {
+-      if((func)(item, user)) return;
++      if((this->*func)(item, user)) return;
+       if(item->hasChild() && item->isExpanded()) {
+         stack.push(item);
+         item = item->getChild();
diff --git a/audio/musicbox/pkg/COMMENT b/audio/musicbox/pkg/COMMENT
new file mode 100644
index 00000000000..dc73d2c4dc1
--- /dev/null
+++ b/audio/musicbox/pkg/COMMENT
@@ -0,0 +1 @@
+a X11 front-interface for mpg123
diff --git a/audio/musicbox/pkg/DESCR b/audio/musicbox/pkg/DESCR
new file mode 100644
index 00000000000..4d8b3ca0a9f
--- /dev/null
+++ b/audio/musicbox/pkg/DESCR
@@ -0,0 +1,4 @@
+Music Box is a GUI under X-window. It invokes mpg123 to play mp3 files.
+Music Box is a freeware. Please remain the original ANNOUNCEMENT when you
+distribute it. This program was developed under FreeBSD. If you have any
+problem and suggestion, mail to mills@iim.nctu.edu.tw
diff --git a/audio/musicbox/pkg/PLIST b/audio/musicbox/pkg/PLIST
new file mode 100644
index 00000000000..85757c0fbdc
--- /dev/null
+++ b/audio/musicbox/pkg/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $
+bin/musicbox
+share/doc/musicbox/README
+@dirrm share/doc/musicbox