9 files changed, 0 insertions, 429 deletions

diff --git a/audio/musicbox/patches/patch-aa b/audio/musicbox/patches/patch-aa
deleted file mode 100644
index 3a84af5f812..00000000000
--- a/audio/musicbox/patches/patch-aa
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2005/12/12 15:03:45 joerg Exp $
-
---- Makefile.orig	1997-11-12 20:01:58.000000000 +0100
-+++ Makefile
-@@ -1,15 +1,19 @@
- # 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${QT1DIR}/include
-+LIB = -L${QT1DIR}/lib -Wl,-R${QT1DIR}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-+MOC = ${QT1DIR}/bin/moc
- 
- # if you use freebsd
--CFLAGS = -DFreeBSD
-+#CFLAGS = -DFreeBSD
- 
- #if you use linux
- #CFLAGS = -DLinux
- 
--GCC = gcc
-+# if you use netbsd
-+#CFLAGS = -DNetBSD
-+
-+GCC = ${CXX}
- 
- ALL = mplayer.o player.o ListView.o clock.o mclock.o mListView.o  \
- 	filebrowse.o mfilebrowse.o qktstreelist.o mqktstreelist.o \
-@@ -18,69 +22,69 @@ ALL = mplayer.o player.o ListView.o cloc
- PKG = musicbox
- 
- all:	${ALL}
--	${GCC} ${ALL} -o ${PKG} -L${LIB} -I${INC} -lqt
-+	${GCC} ${ALL} -o ${PKG} ${LIB}  -lqt -lX11 -lXext ${LIBOSSAUDIO}
- 
--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} ${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} ${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} ${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} ${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 ${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 ${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 ${INC}
- 
- mfilebrowse.o: mfilebrowse.cpp
--	${GCC} -c mfilebrowse.cpp -o mfilebrowse.o -L${LIB} -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 $@ ${INC}
- 
- mdiskbrowse.o: mdiskbrowse.cpp
--	${GCC} -c mdiskbrowse.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c mdiskbrowse.cpp -o $@ ${INC}
- 
- mdiskbrowse.cpp:
- 	${MOC} diskbrowse.h -o $@ 
- 
- qktstreelist.o:
--	${GCC} -c qktstreelist.cpp -o $@ -L${LIB} -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 $@ ${INC}
- 
- mqktstreelist.cpp:
- 	${MOC} qktstreelist.h -o $@
- 
- MultiListBox.o:
--	${GCC} -c MultiListBox.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c MultiListBox.cpp -o $@ ${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 $@ ${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
deleted file mode 100644
index 4edb1ac38f0..00000000000
--- a/audio/musicbox/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/12/12 15:03:45 joerg Exp $
-
---- ListView.h.orig	1997-11-16 13:56:31.000000000 +0000
-+++ ListView.h
-@@ -12,12 +12,16 @@
- #include <qdialog.h>
- #include "MultiListBox.h"
- 
--#ifdef FreeBSD
-+#if defined(FreeBSD) || defined(__DragonFly__)
- #include <machine/soundcard.h>
- #endif
- #ifdef Linux
- #include <sys/soundcard.h>
- #endif
-+#ifdef NetBSD
-+#include <sys/ioctl.h>
-+#include <soundcard.h>
-+#endif
- 
- #define DEVICE 0
- #define MIXER "/dev/mixer"
diff --git a/audio/musicbox/patches/patch-ac b/audio/musicbox/patches/patch-ac
deleted file mode 100644
index 145d5f96177..00000000000
--- a/audio/musicbox/patches/patch-ac
+++ /dev/null
@@ -1,148 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/01/02 11:30:03 jmmv Exp $
-
---- player.cpp.orig	1998-10-01 10:00:23.000000000 +0200
-+++ player.cpp
-@@ -72,7 +72,7 @@ PlayerWidget::PlayerWidget( QWidget *par
- 	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 @@ PlayerWidget::PlayerWidget( QWidget *par
- 
- 	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 @@ PlayerWidget::PlayerWidget( QWidget *par
- 	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 @@ PlayerWidget::PlayerWidget( QWidget *par
- 	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 @@ void PlayerWidget::GoPlay()
- 		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);
- 		}
- 	}
- }
-@@ -359,46 +357,45 @@ void PlayerWidget::OpenFiles()
- 
- void PlayerWidget::Usage()
- {
--	char help_txt[] = "
--1. Menu:\n
--1.1 File\n
--    New Album
--	Create an new Album for playing later.
--    Open Files
--	Select some mp3 files you like, and play them
--        in sequence.
--    Save
--	Save all album in the right frame to file.
--    Quit
--	Quit MusicBox.\n
--1.2 View\n
--    Small Panel
--	view controls only.
--    Normal Panel
--	view controls and song list.
--    Completed Panel
--	view all frames.\n
--1.3 Options\n
--    Auto Play
--	Auto Play songs after choosing an album or files.
--    Repeat
--	Rewind, and play them again.\n
--1.4 Help\n
--    Some information about music box\n
--2. Albums:\n
--    Album is a set of songs, you can add name of song to
--    relative file, and singer, album name, and publisher.
--    Make it more readable.\n
--    You can choose an icon to represent an album.GIF,
--    XPM,BMP is supported, The size 48x48 is prefered.\n
--    If you want to edit album information, click mouse 
--    right-button and click edit.\n
--3. Usage:\n
--    You can choose files to play or play album.\n
--*Important*\n
--    \"mpg123\" package must be installed first before using
--    MusicBox.
--";
-+	char help_txt[] =
-+"1. Menu:\n\n"
-+"1.1 File\n\n"
-+"    New Album\n"
-+"	Create an new Album for playing later.\n"
-+"    Open Files\n"
-+"	Select some mp3 files you like, and play them\n"
-+"        in sequence.\n"
-+"    Save\n"
-+"	Save all album in the right frame to file.\n"
-+"    Quit\n"
-+"	Quit MusicBox.\n\n"
-+"1.2 View\n\n"
-+"    Small Panel\n"
-+"	view controls only.\n"
-+"    Normal Panel\n"
-+"	view controls and song list.\n"
-+"    Completed Panel\n"
-+"	view all frames.\n\n"
-+"1.3 Options\n\n"
-+"    Auto Play\n"
-+"	Auto Play songs after choosing an album or files.\n"
-+"    Repeat\n"
-+"	Rewind, and play them again.\n\n"
-+"1.4 Help\n\n"
-+"    Some information about music box\n\n"
-+"2. Albums:\n\n"
-+"    Album is a set of songs, you can add name of song to\n"
-+"    relative file, and singer, album name, and publisher.\n"
-+"    Make it more readable.\n\n"
-+"    You can choose an icon to represent an album.GIF,\n"
-+"    XPM,BMP is supported, The size 48x48 is prefered.\n\n"
-+"    If you want to edit album information, click mouse\n"
-+"    right-button and click edit.\n\n"
-+"3. Usage:\n\n"
-+"    You can choose files to play or play album.\n\n"
-+"*Important*\n\n"
-+"    \"mpg123\" package must be installed first before using\n"
-+"    MusicBox.\n";
- 
- 	help = new QWidget (0,"help");
- 	QVBoxLayout *toplayout = new QVBoxLayout(help,5);
diff --git a/audio/musicbox/patches/patch-ad b/audio/musicbox/patches/patch-ad
deleted file mode 100644
index 155edb45a97..00000000000
--- a/audio/musicbox/patches/patch-ad
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/01/02 11:30:03 jmmv Exp $
-
---- ListView.cpp.orig	1997-11-16 14:58:42.000000000 +0100
-+++ ListView.cpp
-@@ -67,7 +67,7 @@ AlbumItem& AlbumItem::operator=(const Al
-         return *this;
- }
- 
--AlbumListBox::AlbumListBox(QWidget* parent=0, const char* name=0)
-+AlbumListBox::AlbumListBox(QWidget* parent, const char* name)
- 		:MultiListBox(parent,(char *)name)
- {
- 	ptr.setAutoDelete(TRUE);
-@@ -365,7 +365,7 @@ int Mixer::Set(int l)
- 	return(1);
- }
- 
--AlbumInfoView::AlbumInfoView(AlbumItem *item,int i,QWidget *parent=0)
-+AlbumInfoView::AlbumInfoView(AlbumItem *item,int i,QWidget *parent)
- 		:QDialog(parent,"Info",TRUE)
- {
- 	QLabel *lbl;
-@@ -383,11 +383,11 @@ AlbumInfoView::AlbumInfoView(AlbumItem *
- 	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 @@ AlbumInfoView::AlbumInfoView(AlbumItem *
- 	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
deleted file mode 100644
index d3ffcfef087..00000000000
--- a/audio/musicbox/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$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/patches/patch-af b/audio/musicbox/patches/patch-af
deleted file mode 100644
index 531fbd5a5cd..00000000000
--- a/audio/musicbox/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/10/15 06:59:05 tron Exp $
-
---- MultiListBox.h.orig	Wed Nov 12 19:57:00 1997
-+++ MultiListBox.h	Mon Oct 15 08:57:34 2001
-@@ -16,7 +16,7 @@
- 		Pic = i->Pic;
- 		Text = i->Text;
- 	} 
--	setPixmap(QPixmap& p) {Pic = p;}
-+	void setPixmap(QPixmap& p) {Pic = p;}
- 	int Width(MultiListBox *box);
- 	int Height(MultiListBox *box,int max_w);
- 	void Paint(QPainter *p,int w,int h,int flag=0);
diff --git a/audio/musicbox/patches/patch-ag b/audio/musicbox/patches/patch-ag
deleted file mode 100644
index 027fa224468..00000000000
--- a/audio/musicbox/patches/patch-ag
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/01/02 11:30:03 jmmv Exp $
-
---- filebrowse.cpp.orig	1998-10-01 09:51:07.000000000 +0200
-+++ filebrowse.cpp
-@@ -5,7 +5,7 @@
- #include <qtooltip.h>
- #include "filebrowse.h"
- 
--FileBrowseView::FileBrowseView(QWidget *parent=0,char *filter="*.mp3",char *name=0)
-+FileBrowseView::FileBrowseView(QWidget *parent,char *filter,char *name)
- 		:QDialog(parent,"browse",TRUE)
- {
- 	setCaption("Browse Files");
-@@ -99,12 +99,12 @@ QStrList FileBrowseView::GetSongList()
- 		return NULL;
- }
- 
--MyOpenFile::MyOpenFile(QWidget *parent=0,char *name=0)
-+MyOpenFile::MyOpenFile(QWidget *parent,char *name)
- 	:QDialog(parent,"open",TRUE)
- {
- }
- 
--QString MyOpenFile::getOpenFileName(QWidget *parent=0,char *filter="*.*")
-+QString MyOpenFile::getOpenFileName(QWidget *parent,char *filter)
- {
- 	QDialog *dg = new QDialog(parent,"open",TRUE);
- 	dg->setCaption("Open File");
diff --git a/audio/musicbox/patches/patch-ah b/audio/musicbox/patches/patch-ah
deleted file mode 100644
index 00addae00a9..00000000000
--- a/audio/musicbox/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/01/02 11:30:03 jmmv Exp $
-
---- diskbrowse.cpp.orig	1998-08-15 17:31:22.000000000 +0200
-+++ diskbrowse.cpp
-@@ -2,7 +2,7 @@
- #include "diskbrowse.res"
- 
- DiskBrowser::DiskBrowser(QWidget *parent, 
--			 const char *filter="*",
-+			 const char *filter,
- 			 const char *name,
- 			 WFlags f) :
-   QWidget(parent, name, f)
diff --git a/audio/musicbox/patches/patch-ai b/audio/musicbox/patches/patch-ai
deleted file mode 100644
index 38efdb29179..00000000000
--- a/audio/musicbox/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/01/02 11:30:03 jmmv Exp $
-
---- MultiListBox.cpp.orig	1997-11-14 06:15:56.000000000 +0100
-+++ MultiListBox.cpp
-@@ -6,7 +6,7 @@
- // MultiListBox Implement
- // written by mills
- 
--MultiListBox::MultiListBox(QWidget *parent=0,char *name=0,int numCols=4)
-+MultiListBox::MultiListBox(QWidget *parent,char *name,int numCols)
- 		:QTableView(parent,name)
- {
- 	ItemList.setAutoDelete(TRUE);
-@@ -230,7 +230,7 @@ int MultiListBoxItem::Height(MultiListBo
- 	return result + 20 ;
- }
- 
--void MultiListBoxItem::Paint(QPainter *p, int max_w, int max_h,int flag=0)
-+void MultiListBoxItem::Paint(QPainter *p, int max_w, int max_h,int flag)
- {
- 	int base_h = Pic.height();
- 	int pos_x,pos_y;