Remove remaining qt1 and qt2 packages, as announced on pkgsrc-users

on Sep 7 2008. No complaints received.

43 files changed, 1 insertions, 1946 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 7923f7cc8db..0a700ec8000 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.380 2008/09/14 09:07:59 abs Exp $
+# $NetBSD: Makefile,v 1.381 2008/09/16 16:07:31 wiz Exp $
 #
 
 COMMENT=	Audio tools
@@ -236,7 +236,6 @@ SUBDIR+=	mserv_irman
 SUBDIR+=	mstream
 SUBDIR+=	mt-daapd
 SUBDIR+=	muse
-SUBDIR+=	musicbox
 SUBDIR+=	musicbrainz
 SUBDIR+=	musicpd
 SUBDIR+=	nas
@@ -327,7 +326,6 @@ SUBDIR+=	wmsmixer
 SUBDIR+=	wmusic
 SUBDIR+=	wsoundprefs
 SUBDIR+=	wsoundserver
-SUBDIR+=	xamp
 SUBDIR+=	xanalyser
 SUBDIR+=	xcdplayer
 SUBDIR+=	xfce4-mixer
diff --git a/audio/musicbox/DESCR b/audio/musicbox/DESCR
deleted file mode 100644
index 4d8b3ca0a9f..00000000000
--- a/audio/musicbox/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-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/Makefile b/audio/musicbox/Makefile
deleted file mode 100644
index 0a23ae033c8..00000000000
--- a/audio/musicbox/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2008/03/02 06:10:33 jlam Exp $
-
-DISTNAME=	musicbox-1.01p2
-PKGREVISION=	1
-CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	rxg@NetBSD.org
-COMMENT=	X11 front-interface for mpg123
-
-DEPENDS+=	mpg123>=0.59.18:../../audio/mpg123
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-USE_LANGUAGES=	c++
-
-WRKSRC=		${WRKDIR}/musicbox-1.01
-CFLAGS+=	-D${OPSYS}
-MAKE_ENV+=	QT1DIR=${QT1DIR:Q}
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/musicbox
-	${INSTALL_DATA} ${WRKSRC}/README \
-		${DESTDIR}${PREFIX}/share/doc/musicbox/README
-
-.include "../../x11/qt1/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicbox/PLIST b/audio/musicbox/PLIST
deleted file mode 100644
index 03be590ce50..00000000000
--- a/audio/musicbox/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:33 zuntum Exp $
-bin/musicbox
-share/doc/musicbox/README
-@dirrm share/doc/musicbox
diff --git a/audio/musicbox/distinfo b/audio/musicbox/distinfo
deleted file mode 100644
index f9c6e6f1e5d..00000000000
--- a/audio/musicbox/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/12/12 15:03:45 joerg Exp $
-
-SHA1 (musicbox-1.01p2.tgz) = 7dd8b192349783746918b0d3074bec11f3aaf9d8
-RMD160 (musicbox-1.01p2.tgz) = d203bc9ef749ad425785ce5bf667fc204dccdebd
-Size (musicbox-1.01p2.tgz) = 44119 bytes
-SHA1 (patch-aa) = f1d397ac8e83a8fd9a2da17a088c545cff1b458a
-SHA1 (patch-ab) = 7ec8774288810e824d65a910bb2794c107b5eff7
-SHA1 (patch-ac) = 3341b7bb5f265f5df000e3593a2a0493d32edec1
-SHA1 (patch-ad) = 890faa63701b85766320cf654d1d858c03227a41
-SHA1 (patch-ae) = c8c6c17dad38c705eba931f11cbbb1a515def9f0
-SHA1 (patch-af) = 70626b572bbd26e668df4d6bfe3ac05c59277328
-SHA1 (patch-ag) = 9c0ae398487111920f74a5db219f26b67658ae61
-SHA1 (patch-ah) = 0dc0f917f47379bc2d273d1604fde3376ce75989
-SHA1 (patch-ai) = c3939613576c93c011976be4d80ed76c74c56151
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;
diff --git a/audio/xamp/DESCR b/audio/xamp/DESCR
deleted file mode 100644
index bd252c389b8..00000000000
--- a/audio/xamp/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Xamp is a version of amp with graphical interface provided by
-qt toolkit. It comes with the amp-0.7.6 as the core player, as
-well as two album management tools: Playlist Editor and ID3 Tag
-Editor, and is able to change the background on the fly.
-
-Although it's not as nifty as x11amp is, hopefully it takes less
-CPU time and doesn't require OSS sound driver to run.
-
-The program pretty much speaks for itself. You may consult the
-man page or the document in the "About Xamp" panel for more
-detail.
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
deleted file mode 100644
index 2a6e1d1ff15..00000000000
--- a/audio/xamp/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2008/03/02 06:10:34 jlam Exp $
-
-DISTNAME=	xamp-0.8-10
-PKGNAME=	xamp-0.8.10
-PKGREVISION=	2
-CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SKIN_DATA}
-
-MAINTAINER=	rxg@NetBSD.org
-HOMEPAGE=	# http://andrej.co.ru/~andrej/programs/xamp/
-COMMENT=	Version of amp (stands for `Audio Mpeg Player') plus a Qt GUI
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-WRKSRC=		${WRKDIR}/xamp-0.8/xamp-0.8g
-DIST_SUBDIR=	xamp
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CXXFLAGS=${CFLAGS:M*:Q}
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
-
-CONFIGURE_ARGS+=	--with-qt-dir=${BUILDLINK_PREFIX.qt1:Q}/qt1
-
-CONFIGURE_ENV+=	QTDIR=${QT1DIR:Q}
-MAKE_ENV+=	QT1DIR=${QT1DIR:Q}
-
-SKIN_DATA=	bfamp.tar.gz chrome.tar.gz mmxamp.tar.gz
-SKIN_DIR=	${PREFIX}/lib/X11/xamp
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-post-patch:
-	for f in about.cpp aboutData.cpp readmex.h; do \
-		${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f.tmp; \
-		${SED} -e 's:/usr/X11R6:'${PREFIX}':g' < ${WRKSRC}/$$f.tmp > \
-			${WRKSRC}/$$f; \
-	done
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xamp ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xamp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	@${INSTALL_DATA_DIR} ${DESTDIR}${SKIN_DIR}/bfamp-xamp
-	${INSTALL_DATA} ${WRKDIR}/bfamp-xamp/*.bmp \
-		${DESTDIR}${SKIN_DIR}/bfamp-xamp
-	@${INSTALL_DATA_DIR} ${DESTDIR}${SKIN_DIR}/chrome-xamp
-	${INSTALL_DATA} ${WRKDIR}/chrome-xamp/*.bmp \
-		${DESTDIR}${SKIN_DIR}/chrome-xamp
-	@${INSTALL_DATA_DIR} ${DESTDIR}${SKIN_DIR}/mmxxamp-xamp
-	${INSTALL_DATA} ${WRKDIR}/mmxxamp-xamp/*.bmp \
-		${DESTDIR}${SKIN_DIR}/mmxxamp-xamp
-
-.include "../../x11/qt1/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xamp/PLIST b/audio/xamp/PLIST
deleted file mode 100644
index 60feaacfec0..00000000000
--- a/audio/xamp/PLIST
+++ /dev/null
@@ -1,70 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:13 zuntum Exp $
-bin/xamp
-man/man1/xamp.1
-lib/X11/xamp/bfamp-xamp/ff.bmp
-lib/X11/xamp/bfamp-xamp/load.bmp
-lib/X11/xamp/bfamp-xamp/main.bmp
-lib/X11/xamp/bfamp-xamp/mono.bmp
-lib/X11/xamp/bfamp-xamp/mpause.bmp
-lib/X11/xamp/bfamp-xamp/mplay.bmp
-lib/X11/xamp/bfamp-xamp/mstop.bmp
-lib/X11/xamp/bfamp-xamp/pause.bmp
-lib/X11/xamp/bfamp-xamp/pl.bmp
-lib/X11/xamp/bfamp-xamp/play.bmp
-lib/X11/xamp/bfamp-xamp/posbar.bmp
-lib/X11/xamp/bfamp-xamp/posbut.bmp
-lib/X11/xamp/bfamp-xamp/rep.bmp
-lib/X11/xamp/bfamp-xamp/repc.bmp
-lib/X11/xamp/bfamp-xamp/rew.bmp
-lib/X11/xamp/bfamp-xamp/shuffle.bmp
-lib/X11/xamp/bfamp-xamp/shufflen.bmp
-lib/X11/xamp/bfamp-xamp/stereo.bmp
-lib/X11/xamp/bfamp-xamp/stop.bmp
-lib/X11/xamp/bfamp-xamp/vol.bmp
-lib/X11/xamp/bfamp-xamp/xopy.bmp
-lib/X11/xamp/chrome-xamp/ff.bmp
-lib/X11/xamp/chrome-xamp/load.bmp
-lib/X11/xamp/chrome-xamp/main.bmp
-lib/X11/xamp/chrome-xamp/mono.bmp
-lib/X11/xamp/chrome-xamp/mpause.bmp
-lib/X11/xamp/chrome-xamp/mplay.bmp
-lib/X11/xamp/chrome-xamp/mstop.bmp
-lib/X11/xamp/chrome-xamp/pause.bmp
-lib/X11/xamp/chrome-xamp/pl.bmp
-lib/X11/xamp/chrome-xamp/play.bmp
-lib/X11/xamp/chrome-xamp/posbar.bmp
-lib/X11/xamp/chrome-xamp/posbut.bmp
-lib/X11/xamp/chrome-xamp/rep.bmp
-lib/X11/xamp/chrome-xamp/repc.bmp
-lib/X11/xamp/chrome-xamp/rew.bmp
-lib/X11/xamp/chrome-xamp/shuffle.bmp
-lib/X11/xamp/chrome-xamp/shufflen.bmp
-lib/X11/xamp/chrome-xamp/stereo.bmp
-lib/X11/xamp/chrome-xamp/stop.bmp
-lib/X11/xamp/chrome-xamp/vol.bmp
-lib/X11/xamp/chrome-xamp/xopy.bmp
-lib/X11/xamp/mmxxamp-xamp/ff.bmp
-lib/X11/xamp/mmxxamp-xamp/load.bmp
-lib/X11/xamp/mmxxamp-xamp/main.bmp
-lib/X11/xamp/mmxxamp-xamp/mono.bmp
-lib/X11/xamp/mmxxamp-xamp/mpause.bmp
-lib/X11/xamp/mmxxamp-xamp/mplay.bmp
-lib/X11/xamp/mmxxamp-xamp/mstop.bmp
-lib/X11/xamp/mmxxamp-xamp/pause.bmp
-lib/X11/xamp/mmxxamp-xamp/pl.bmp
-lib/X11/xamp/mmxxamp-xamp/play.bmp
-lib/X11/xamp/mmxxamp-xamp/posbar.bmp
-lib/X11/xamp/mmxxamp-xamp/posbut.bmp
-lib/X11/xamp/mmxxamp-xamp/rep.bmp
-lib/X11/xamp/mmxxamp-xamp/repc.bmp
-lib/X11/xamp/mmxxamp-xamp/rew.bmp
-lib/X11/xamp/mmxxamp-xamp/shuffle.bmp
-lib/X11/xamp/mmxxamp-xamp/shufflen.bmp
-lib/X11/xamp/mmxxamp-xamp/stereo.bmp
-lib/X11/xamp/mmxxamp-xamp/stop.bmp
-lib/X11/xamp/mmxxamp-xamp/vol.bmp
-lib/X11/xamp/mmxxamp-xamp/xopy.bmp
-@dirrm lib/X11/xamp/mmxxamp-xamp
-@dirrm lib/X11/xamp/chrome-xamp
-@dirrm lib/X11/xamp/bfamp-xamp
-@dirrm lib/X11/xamp
diff --git a/audio/xamp/distinfo b/audio/xamp/distinfo
deleted file mode 100644
index f18660d1d2f..00000000000
--- a/audio/xamp/distinfo
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/12/12 15:32:56 joerg Exp $
-
-SHA1 (xamp/xamp-0.8-10.tgz) = 65f83c41091184432d64baf1d74aef880733fbd5
-RMD160 (xamp/xamp-0.8-10.tgz) = 9141bbcbfae0d7ea2a04939b4fee7edfd1403d04
-Size (xamp/xamp-0.8-10.tgz) = 239024 bytes
-SHA1 (xamp/bfamp.tar.gz) = a5249fc728b7ae10bb44d363d7d30b6d31182735
-RMD160 (xamp/bfamp.tar.gz) = 71545c432020e551f820192ce3a8a0c206320d72
-Size (xamp/bfamp.tar.gz) = 23533 bytes
-SHA1 (xamp/chrome.tar.gz) = 039762b34489d8ec83c2947ca80e2ec4b5013c19
-RMD160 (xamp/chrome.tar.gz) = f06d34ed27eeda43970bda2e06226f7f047b471c
-Size (xamp/chrome.tar.gz) = 32636 bytes
-SHA1 (xamp/mmxamp.tar.gz) = f703dfe3040bd72db35bb05e26a8eb7841b54887
-RMD160 (xamp/mmxamp.tar.gz) = a4a509ecf2c36e65369e70364281486ab491b8e3
-Size (xamp/mmxamp.tar.gz) = 41405 bytes
-SHA1 (patch-aa) = 50574884e35679ad425b25c5886ef96661288964
-SHA1 (patch-ab) = 96c0e3db7637c035345cbf2df7d2ee195b538bcb
-SHA1 (patch-ac) = de83b1fd7b170438f818d76d025838f8aa07c752
-SHA1 (patch-ad) = 3595460ae4f848b60d1c829ebfecff92cd2a8e58
-SHA1 (patch-ae) = 348aff7b4cef04198359c4ea5d7e06cc2b63fd08
-SHA1 (patch-af) = 45568633714f7fbea443001b0af252e6d3310223
-SHA1 (patch-ag) = c17579b095485510bc5dc99d0c22da2f44e152b8
-SHA1 (patch-ah) = 2460dd3cc32f18847f99cdc3f5cefa87601a4c85
-SHA1 (patch-ai) = cea0ed01b293457d5660cf6ecff95e616f608eb5
-SHA1 (patch-aj) = ab841128854cdacceb54b6c7726d07e5f4fb1140
-SHA1 (patch-ak) = 0d32700aad4cdf232bc1c48376ddcbd762b41852
-SHA1 (patch-al) = 38760f05d5ca7b4557c6d8ddfb0b08cbc4b0dd9b
-SHA1 (patch-am) = 6930ab1879789ee4c762da345d5bccb862f06c8a
-SHA1 (patch-an) = 19fdd266a633afccf7ec4de18a8fc5aa7975354f
-SHA1 (patch-ao) = c3d125d0498052c1f37ce3a3597ca50827779aca
-SHA1 (patch-ap) = 4b4429e3c4a9e8324808cf7b1443db4dddc14cb9
-SHA1 (patch-aq) = f454b488a1b726318080900efd1f23f2d788022f
-SHA1 (patch-ar) = b788d9ed2c1230c37548c21180a0dcf756a93398
-SHA1 (patch-as) = 7e37cf1558ec35e1d19dee520cb6f721a20933b9
-SHA1 (patch-at) = 79ea079c5ad71a382a449879473097d8dbc81be5
-SHA1 (patch-au) = 7d149711f4ba72ab792a6336e87a641aaac931e4
-SHA1 (patch-av) = aa9541f86a3688156d6944dcf88dbc1bb59ceb33
-SHA1 (patch-aw) = 3933c2414cb6e56e1b12d4798dc08b93c4e3e98f
-SHA1 (patch-ax) = 5b4892631e770a4f433d3656384916c1dc715998
-SHA1 (patch-ay) = 18d7aa563176b92a7810a46d7365db59df336e30
diff --git a/audio/xamp/patches/patch-aa b/audio/xamp/patches/patch-aa
deleted file mode 100644
index 14c15fd39c4..00000000000
--- a/audio/xamp/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/12/12 15:32:56 joerg Exp $
-
---- ../audioIO.c.orig	1997-05-31 15:47:58.000000000 +0000
-+++ ../audioIO.c
-@@ -6,10 +6,18 @@
-   #include "audioIO_Linux.c"
- #endif
- 
-+#ifdef OS_NetBSD
-+  #include "audioIO_NetBSD.c"
-+#endif
-+
- #ifdef OS_BSD
-   #include "audioIO_Linux.c"
- #endif
- 
-+#ifdef OS_DragonFly
-+  #include "audioIO_Linux.c"
-+#endif
-+
- #if defined(OS_IRIX) || defined(OS_IRIX64)
-   #include "audioIO_IRIX.c"
- #endif
diff --git a/audio/xamp/patches/patch-ab b/audio/xamp/patches/patch-ab
deleted file mode 100644
index 2b5760454ce..00000000000
--- a/audio/xamp/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/05/11 12:18:37 wiz Exp $
-
---- ../guicontrol.c.orig	1998-02-20 20:44:16.000000000 +0100
-+++ ../guicontrol.c
-@@ -312,6 +312,14 @@ void gui_control(void)
-       if (quit_flag)
- 	{
- /* 	  fprintf(stderr, "quit_flag is true\n"); */
-+
-+	  if((flags = fcntl(STDOUT_FILENO, F_GETFL, 0)) < 0)
-+	    perror("fcntl");
-+	  flags &= ~O_NONBLOCK;
-+  
-+	  if(fcntl(STDOUT_FILENO, F_SETFL, flags) < 0)
-+	    perror("fcntl");
-+
- 	  exit(0);
- 	}
-       while(GUI_FD_TO_PLAY != -1)
-@@ -334,7 +342,7 @@ void gui_control(void)
- 	 
- 	 if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
- 	   perror("fcntl");
--	 flags ^= O_NONBLOCK;
-+	 flags &= ~O_NONBLOCK;
- 	 
- 	 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
- 	   perror("fcntl");
-@@ -395,7 +403,7 @@ int decodeMPEG_2(int inFilefd)
-                 /* Set stdin to blocking */
-                 if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-                         perror("fcntl");
--                flags ^= O_NONBLOCK;
-+                flags &= ~O_NONBLOCK;
-                 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-                         perror("fcntl");
-         }
diff --git a/audio/xamp/patches/patch-ac b/audio/xamp/patches/patch-ac
deleted file mode 100644
index 45b92d7a280..00000000000
--- a/audio/xamp/patches/patch-ac
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/10/18 11:22:44 rh Exp $
-
---- QtAMP.cpp.orig	Fri Jul 31 22:29:58 1998
-+++ QtAMP.cpp	Tue Oct 17 17:48:13 2000
-@@ -24,10 +24,12 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifndef OS_NetBSD
- #include <sched.h>
-+#include <sys/soundcard.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/ioctl.h>
--#include <sys/soundcard.h>
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <errno.h>
-@@ -89,7 +91,11 @@
- 	if ((mixer = open("/dev/mixer", O_RDWR)) < 0)
- 	    die("Error opening /dev/mixer, exiting\n");
- 	ioctl(mixer, SOUND_MIXER_READ_PCM, &v);
--#endif OS_Linux
-+#endif
-+
-+#ifdef OS_NetBSD
-+	audioSetMixer();
-+#endif
- 	
- 	/* where mine resource file is located */
- 	char home[500];
-@@ -428,6 +434,13 @@
- 	int x = (tv*256 + tvl);
- 	ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x);
- #endif
-+
-+#ifdef OS_NetBSD
-+	if (tvr == 0)
-+		audioSetVolume(vr);
-+	else
-+		audioSetBalance(vr, tvr);
-+#endif
- }
- 
- void QtAMP::bal_slider_moved(int bal)
-@@ -437,6 +450,10 @@
- 	sprintf(volum,"Balance: %d",tvr);
- 	vol_slider_moved(vr);
- 	playLabel->setText( volum );
-+
-+#ifdef OS_NetBSD
-+	audioSetBalance(vr, tvr);
-+#endif
- }
- 
- void QtAMP::bal_slider_released()
-@@ -1077,12 +1094,24 @@
- 		  int x = (tv*256 + tvl);
- 		  ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x);
- #endif
-+
-+#ifdef OS_NetBSD
-+	int vr = 0;
-+	audioSetVolume(vr);
-+#endif
- 	  }
- 	if (mute == 0)
- 	  {
- #ifdef OS_Linux
- 		  int x = (7*256 + 7);
- 		  ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x);
-+#endif
-+
-+#ifdef OS_NetBSD  
-+	if (tvr == 0)
-+		audioSetVolume(vr);
-+	else
-+		audioSetBalance(vr, tvr);
- #endif
- 	  }
- 	mute=!mute;
diff --git a/audio/xamp/patches/patch-ad b/audio/xamp/patches/patch-ad
deleted file mode 100644
index c3ca0bbda43..00000000000
--- a/audio/xamp/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
-
---- plDlg.cpp	Wed Feb 11 07:01:12 1998
-+++ plDlg.cpp	Wed Jul 29 23:59:01 1998
-@@ -87,6 +87,8 @@
- void plDlg::id3_clicked()
- {
- 	strcpy(ime,listEditor->text(listEditor->currentItem()));
-+	if(!ime[0]) //to prevent from seg-fault on id3 editor at empty playlist
-+		return;
- 	id3Dialog = new id3();
- 	id3Dialog->show();
- }
diff --git a/audio/xamp/patches/patch-ae b/audio/xamp/patches/patch-ae
deleted file mode 100644
index 233ffa4bd1d..00000000000
--- a/audio/xamp/patches/patch-ae
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2004/05/11 12:18:37 wiz Exp $
-
---- Makefile.in.orig	Fri Jul 31 01:48:02 1998
-+++ Makefile.in	Mon Oct 16 16:22:20 2000
-@@ -15,8 +15,8 @@
- DEFINES = -DOS_@OS_TYPE@ -DARCH_@ARCH_TYPE@
- CFLAGS = @CFLAGS@ ${DEFINES} ${DEBUG} ${BACK} -Wall
- LDFLAGS = @LDFLAGS@
--INSTALL= @INSTALL@
--DESTDIR= ${prefix}/bin
-+INSTALL= @INSTALL@ -s
-+DESTDIR= ${PREFIX}/bin
- 
- #
- # uncomment both of these if you want profiling support
-@@ -38,7 +38,7 @@
- 	mabout.o maboutData.o dirDlg.o mdirDlg.o dirDlgData.o mdirDlgData.o \
- 	id3.o id3Data.o QLayer.o mid3.o mid3Data.o pixmaps/pixmaps.o
- 	
--LIBS = @QT_LDFLAGS@ -lm -lqt
-+LIBS = @QT_LDFLAGS@ -lm -lqt -L${QT1DIR}/lib -Wl,-R${QT1DIR}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lXext
- 
- all: xamp
- 
-@@ -58,7 +58,7 @@
- 	cd pixmaps ; make
- 
- xamp: images $(OBJ) 
--	$(CC) -o xamp $(OBJ) $(LDFLAGS) $(LIBS) 
-+	$(CXX) -o xamp $(OBJ) $(LDFLAGS) $(LIBS)
- 	
- install:
- 	$(INSTALL) -m 755 xamp $(DESTDIR)/xamp
diff --git a/audio/xamp/patches/patch-af b/audio/xamp/patches/patch-af
deleted file mode 100644
index 0104b46e8d1..00000000000
--- a/audio/xamp/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2005/12/12 15:32:56 joerg Exp $
-
---- ../audioIO.h.orig	1997-05-31 15:47:58.000000000 +0000
-+++ ../audioIO.h
-@@ -7,7 +7,7 @@
-   #define AUSIZ 32768
- #endif
- 
--#ifdef OS_Linux
-+#if defined(OS_Linux) || defined(OS_NetBSD) || defined(OS_DragonFly)
- extern int AUSIZ;
- #endif
- 
diff --git a/audio/xamp/patches/patch-ag b/audio/xamp/patches/patch-ag
deleted file mode 100644
index 6a358130155..00000000000
--- a/audio/xamp/patches/patch-ag
+++ /dev/null
@@ -1,245 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2000/10/18 11:22:44 rh Exp $
-
---- ../audioIO_NetBSD.c.orig	Tue Oct 17 17:50:54 2000
-+++ ../audioIO_NetBSD.c	Tue Oct 17 20:01:20 2000
-@@ -0,0 +1,240 @@
-+/* this file is a part of amp software, (C) tomislav uzelac 1996,1997
-+
-+	Origional code by: tomislav uzelac
-+	Modified by:
-+	* Dan Nelson - BSD mods.
-+	* Andrew Richards - moved code from audio.c and added mixer support etc
-+        * Brett Lymn - NetBSD support & 8bit mode.
-+	* Rui-Xiang Guo - NetBSD native API support.
-+ */
-+
-+/* Support for NetBSD sound devices */
-+
-+#include "amp.h"
-+#include "audioIO.h"
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <malloc.h>
-+#include <stdlib.h>
-+#include <signal.h>
-+#include <sys/audioio.h>
-+#include <sys/param.h>
-+#include <sys/filio.h>
-+#include <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/ioctl.h>
-+
-+/* optimal fragment size - if this is set too high you will get clicks
-+ * in the audio output, below is near the upper limit for the sb sound driver
-+ * on my machine (Toshiba 400CDT laptop).
-+ */
-+
-+int AUSIZ = 20480;
-+
-+/* declare these static to effectively isolate the audio device */
-+
-+static int audio_fd;
-+static int mixer_fd;
-+
-+static char *reduce;
-+
-+/* audioOpen() */
-+/* should open the audio device, perform any special initialization */
-+/* Set the frequency, no of channels and volume. Volume is only set if */
-+/* it is not -1 */
-+
-+void
-+audioOpen(int frequency, int stereo, int volume)
-+{
-+        audio_info_t audio_dev;
-+
-+	if ((audio_fd = open ("/dev/audio", O_WRONLY, 0)) == -1)
-+		die("Unable to open the audio device\n");
-+	DB(audio, msg("Audio device opened on %d\n", audio_fd));
-+
-+	ioctl(audio_fd, AUDIO_GETINFO, &audio_dev); /* get current settings */
-+        AUDIO_INITINFO(&audio_dev);
-+        
-+	/* Set 1 or 2 channels */
-+        audio_dev.play.channels = (stereo ? 2 : 1);
-+
-+	/* Set the output frequency */
-+	DB(audio, msg("Setting freq to %d Hz\n", frequency));
-+        audio_dev.play.sample_rate = frequency;
-+
-+	if (volume != -1)
-+		audioSetVolume(volume);
-+
-+        audio_dev.blocksize = AUSIZ;
-+        audio_dev.play.encoding = AUDIO_ENCODING_SLINEAR;
-+        audio_dev.hiwat = 20;
-+        audio_dev.lowat = 1;
-+        audio_dev.mode = AUMODE_PLAY;
-+
-+        if (ioctl(audio_fd, AUDIO_SETINFO, &audio_dev) < 0)
-+                die("AUDIO_SETINFO failed\n");
-+
-+	  /* ok - try running the sound system at 16 bits, if that does not
-+	   *  work then try 8 bits, if that does not work, give up.
-+	   */
-+	reduce = NULL;
-+        audio_dev.play.precision = 16;
-+        if (ioctl(audio_fd, AUDIO_SETINFO, &audio_dev) < 0) {
-+                DB(audio,
-+		   msg("AUDIO_SETINFO for 16 bits failed, try 8 bits\n"));
-+		if ((reduce = (char *) malloc(AUSIZ * sizeof(char))) == NULL)
-+			die("Cannot malloc reduce buffer\n");
-+		audio_dev.play.precision = 8;
-+	        if (ioctl(audio_fd, AUDIO_SETINFO, &audio_dev) < 0)
-+			die("AUDIO_SETINFO failed both 16bit and 8bit\n");
-+		AUSIZ = AUSIZ * sizeof(short);
-+	}
-+}
-+
-+
-+/* audioSetVolume - only code this if your system can change the volume while playing */
-+/* sets the output volume 0-100 */
-+
-+int device_id = 3;
-+char *mixer_device;
-+mixer_ctrl_t *values;
-+mixer_devinfo_t *infos;
-+
-+void
-+audioSetMixer()
-+{
-+	int i, ndev;
-+	mixer_devinfo_t dinfo;
-+
-+	mixer_device = getenv("MIXERDEVICE");
-+	if (mixer_device == NULL)
-+		mixer_device = "/dev/mixer0";
-+
-+	if ((mixer_fd = open(mixer_device, O_RDWR)) < 0)
-+		warn("Unable to open mixer device\n");
-+	DB(audio, msg("Mixer device opened on %d\n", mixer_fd));
-+
-+	for (ndev = 0; ; ndev++) {
-+		dinfo.index = ndev;
-+		if (ioctl(mixer_fd, AUDIO_MIXER_DEVINFO, &dinfo) < 0)
-+			break;
-+	}
-+	infos = calloc(ndev, sizeof *infos);
-+	values = calloc(ndev, sizeof *values);
-+
-+	for (i = 0; i < ndev; i++) {
-+		infos[i].index = i;
-+		ioctl(mixer_fd, AUDIO_MIXER_DEVINFO, &infos[i]);
-+	}
-+
-+	for (i = 0; i < ndev; i++) {
-+		if (infos[i].type == AUDIO_MIXER_VALUE) {
-+			values[i].dev = i;
-+			values[i].type = infos[i].type;
-+		}
-+	}
-+
-+	values[device_id].un.value.num_channels = 2;
-+}
-+
-+void
-+audioSetVolume(int volume)
-+{
-+	mixer_ctrl_t *m;
-+
-+	DB(audio, msg("Setting volume to: %d\n", volume));
-+	m = &values[device_id];
-+
-+	if (ioctl(mixer_fd, AUDIO_MIXER_WRITE, m) < 0)
-+		warn("Unable to set sound volume\n");
-+
-+	m->un.value.level[0] = m->un.value.level[1] = volume * AUDIO_MAX_GAIN / 100;
-+}
-+
-+void
-+audioSetBalance(int volume, int balance)
-+{
-+	mixer_ctrl_t *m;
-+
-+	DB(audio, msg("Setting volume to: %d\n", volume));
-+	DB(audio, msg("Setting balance to: %d\n", balance));
-+	m = &values[device_id];
-+
-+	if (ioctl(mixer_fd, AUDIO_MIXER_WRITE, m) < 0)
-+		warn("Unable to set sound volume\n");
-+
-+	if (balance < 0) {
-+		m->un.value.level[0] = volume * AUDIO_MAX_GAIN / 100;
-+		m->un.value.level[1] = m->un.value.level[0] * (20 + balance) / 20;
-+	}
-+	else {
-+		m->un.value.level[1] = volume * AUDIO_MAX_GAIN / 100;
-+		m->un.value.level[0] = m->un.value.level[1] * (20 - balance) / 20;
-+	}
-+}
-+
-+/* audioFlush() */
-+/* should flush the audio device */
-+
-+inline void
-+audioFlush()
-+{
-+	DB(audio, msg("audio: flush %d\n", audio_fd));
-+}
-+
-+
-+/* audioClose() */
-+/* should close the audio device and perform any special shutdown */
-+
-+void
-+audioClose()
-+{
-+	close(audio_fd);
-+	if (mixer_fd != -1)
-+		close(mixer_fd);
-+	DB(audio, msg("audio: closed %d\n", audio_fd));
-+}
-+
-+/* audioWrite */
-+/* writes count bytes from buffer to the audio device */
-+/* returns the number of bytes actually written */
-+
-+inline int
-+audioWrite(char *buffer, int count)
-+{
-+        int i;
-+        short *cast;
-+        
-+	DB(audio, msg("audio: Writing %d bytes to audio descriptor %d\n",count,
-+		      getAudioFd()));
-+
-+	  /* if the reduce buffer is allocated we need to do 8bit writes
-+	   * so munge the data buffer appropriately.
-+	   */
-+	if (reduce != NULL) {
-+		cast = (short *) buffer;
-+        
-+		for (i=0; i < count/sizeof(short); i++) {
-+			reduce[i] = cast[i] >> 8;
-+		}
-+		return (sizeof(short) * write(audio_fd, reduce,
-+					      count/sizeof(short)));
-+	} else {
-+		return (write(audio_fd,buffer,count));
-+	}
-+}
-+
-+/* Let buffer.c have the audio descriptor so it can select on it. This means	*/
-+/* that the program is dependent on a file descriptor to work. Should really */
-+/* move the select's etc (with inlines of course) in here so that this is the */
-+/* ONLY file which has hardware dependent audio stuff in it										*/
-+
-+int
-+getAudioFd()
-+{
-+	return (audio_fd);
-+}
diff --git a/audio/xamp/patches/patch-ah b/audio/xamp/patches/patch-ah
deleted file mode 100644
index 256edeae599..00000000000
--- a/audio/xamp/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2004/05/11 12:18:37 wiz Exp $
-
---- configure.in.orig	Sun Oct  5 22:42:34 1997
-+++ configure.in	Mon Oct 16 21:08:33 2000
-@@ -71,6 +71,11 @@
-     CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
-     ;;
- 
-+  NetBSD)
-+    CC="gcc"
-+    CFLAGS="${CFLAGS} -DNO_BYTE_SWAPPING"
-+    ;;
-+
-   SunOS)
-     if test "$CC" = "gcc"; then
-        CFLAGS="-O6"
diff --git a/audio/xamp/patches/patch-ai b/audio/xamp/patches/patch-ai
deleted file mode 100644
index ea9f5b216b4..00000000000
--- a/audio/xamp/patches/patch-ai
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ai,v 1.6 2005/12/12 15:32:56 joerg Exp $
-
---- configure.orig	1997-10-26 14:55:34.000000000 +0000
-+++ configure
-@@ -970,7 +970,7 @@ fi
- #try to guess qt locations
- 
- qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt $x_includes $QTINC"
--test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
-+test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR/include/qt $QTDIR $qt_incdirs"
- 
- qt_incdir=NO
- for i in $qt_incdirs;
-@@ -1700,7 +1700,7 @@ case "$OS_TYPE" in
-     CFLAGS="-O3 -ffast-math -funroll-loops"
-     ;;
- 
--  Linux|FreeBSD)
-+  Linux|FreeBSD|DragonFly)
-     CC="gcc"
-     if test "$ARCH_TYPE" = "i486" ; then
-       CFLAGS_ARCH="-m486"
-@@ -1714,6 +1714,11 @@ case "$OS_TYPE" in
-     CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
-     ;;
- 
-+  NetBSD)
-+    CC="gcc"
-+    CFLAGS="${CFLAGS} -DNO_BYTE_SWAPPING"
-+    ;;
-+
-   SunOS)
-     if test "$CC" = "gcc"; then
-        CFLAGS="-O6"
diff --git a/audio/xamp/patches/patch-aj b/audio/xamp/patches/patch-aj
deleted file mode 100644
index f0e294595e7..00000000000
--- a/audio/xamp/patches/patch-aj
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2000/10/18 11:22:44 rh Exp $
-
---- ../amp.h.orig	Tue Aug 19 05:33:30 1997
-+++ ../amp.h	Sun Oct  1 15:47:56 2000
-@@ -13,10 +13,17 @@
- #define		MINOR		7
- #define		PATCH		6
- 
-+#ifdef OS_NetBSD
-+#include <sys/param.h>
-+#endif
-+
-+#ifndef OS_NetBSD
- #define MAX(a,b)	((a) > (b) ? (a) : (b))
-+#endif
- #define MAX3(a,b,c)	((a) > (b) ? MAX(a, c) : MAX(b, c))
-+#ifndef OS_NetBSD
- #define MIN(a,b)	((a) < (b) ? (a) : (b))
--
-+#endif
- 
- /* Debugging flags */
- 
diff --git a/audio/xamp/patches/patch-ak b/audio/xamp/patches/patch-ak
deleted file mode 100644
index 04ef374fcac..00000000000
--- a/audio/xamp/patches/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2000/10/18 11:22:44 rh Exp $
-
---- ../buffer.c.orig	Sat Dec 13 06:58:08 1997
-+++ ../buffer.c	Sun Oct  1 15:47:56 2000
-@@ -226,7 +226,17 @@
- 
- 				percentFull=100*bufferSize(&audioBuffer)/AUDIO_BUFFER_SIZE;
- #if defined(DEBUG)
--				if ((cntr++ % (16/(AUSIZ/4096)))==0) msg("\rBuffer (%2d%%) %6d",percentFull,bufferSize(&audioBuffer));
-+                                if (AUSIZ >= 4096) {
-+                                        if ((cntr++ % (16/(AUSIZ/4096)))==0)
-+                                                msg("\nBuffer(%2d%%) %6d\n",
-+                                                    percentFull,
-+                                                    bufferSize(&audioBuffer));
-+                                } else {
-+                                        if ((cntr++ % (16 * AUSIZ)) == 0)
-+                                                msg("\nBuffer(%2d%%) %6d\n",
-+                                                    percentFull,
-+                                                    bufferSize(&audioBuffer));
-+                                }
- #endif
- 				if (AUSIZ>bytesToEnd) {
- 					cnt = audioWrite(audioBuffer.bufferPtr + audioBuffer.outPos, bytesToEnd);
diff --git a/audio/xamp/patches/patch-al b/audio/xamp/patches/patch-al
deleted file mode 100644
index fad8e834a22..00000000000
--- a/audio/xamp/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.3 2004/05/11 12:18:37 wiz Exp $
-
---- ../configure.in.orig	Sat Aug 23 17:35:40 1997
-+++ ../configure.in	Mon Oct 16 21:12:37 2000
-@@ -73,6 +73,11 @@
-     DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" 
-     ;;
- 
-+  NetBSD)
-+    CC="gcc"
-+    DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
-+    ;;
-+
-   SunOS)
-     if test "$CC" = "gcc"; then
-     	CFLAGS="-O6 -Dinline= "
diff --git a/audio/xamp/patches/patch-am b/audio/xamp/patches/patch-am
deleted file mode 100644
index bd2dcbf00b0..00000000000
--- a/audio/xamp/patches/patch-am
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-am,v 1.4 2005/12/12 15:32:56 joerg Exp $
-
---- ../configure.orig	1997-08-23 09:11:24.000000000 +0000
-+++ ../configure
-@@ -1398,7 +1398,7 @@ case "$OS_TYPE" in
-     DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
-     ;;
- 
--  Linux|FreeBSD)
-+  Linux|FreeBSD|DragonFly)
-     CC="gcc"
-     if test "$ARCH_TYPE" = "i486" ; then
-       CFLAGS_ARCH="-m486"
-@@ -1413,6 +1413,11 @@ case "$OS_TYPE" in
-     DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" 
-     ;;
- 
-+  NetBSD)
-+    CC="gcc"
-+    DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
-+    ;;
-+
-   SunOS)
-     if test "$CC" = "gcc"; then
-     	CFLAGS="-O6 -Dinline= "
diff --git a/audio/xamp/patches/patch-an b/audio/xamp/patches/patch-an
deleted file mode 100644
index ee6a39975f3..00000000000
--- a/audio/xamp/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.1 2000/10/18 11:22:44 rh Exp $
-
---- ../proto.h.orig	Sat May 31 23:47:58 1997
-+++ ../proto.h	Tue Oct 17 16:23:23 2000
-@@ -6,6 +6,10 @@
- void debugOptions();
- 
- /* From: audioIO_<OSTYPE>.c */
-+#ifdef OS_NetBSD
-+void audioSetMixer();
-+void audioSetBalance(int, int);
-+#endif
- void audioOpen(int frequency, int stereo, int volume);
- void audioSetVolume(int);
- void audioFlush();
diff --git a/audio/xamp/patches/patch-ao b/audio/xamp/patches/patch-ao
deleted file mode 100644
index a0bcca9e0cd..00000000000
--- a/audio/xamp/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2000/10/18 11:22:44 rh Exp $
-
---- plDlgData.cpp.orig	Mon Feb  2 14:16:06 1998
-+++ plDlgData.cpp	Tue Jan 25 01:34:41 2000
-@@ -18,6 +18,9 @@
- #include <qlabel.h>
- #include <qkeycode.h>
- 
-+#define QColor(i)	(QColor)(i)
-+#define QRgb(i)		(QRgb)(i)
-+
- plDlgData::plDlgData
- (
- 	QWidget* parent,
diff --git a/audio/xamp/patches/patch-ap b/audio/xamp/patches/patch-ap
deleted file mode 100644
index a89b03e8355..00000000000
--- a/audio/xamp/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2000/10/18 11:22:45 rh Exp $
-
---- QtAMPData.cpp.orig	Tue Jan 25 01.35.30 2000
-+++ QtAMPData.cpp	Tue Jan 25 01:35:55 2000
-@@ -19,6 +19,9 @@
- #include <qkeycode.h>
- #include <qtooltip.h>
- 
-+#define QColor(i)	(QColor)(i)
-+#define QRgb(i)		(QRgb)(i)
-+
- QtAMPData::QtAMPData
- (
- 	QWidget* parent,
diff --git a/audio/xamp/patches/patch-aq b/audio/xamp/patches/patch-aq
deleted file mode 100644
index ed782c206b2..00000000000
--- a/audio/xamp/patches/patch-aq
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2000/10/18 11:22:45 rh Exp $
-
---- dirDlgData.cpp.orig	Tue Jan 25 01:36:16 2000
-+++ dirDlgData.cpp	Tue Jan 25 01:36:43 2000
-@@ -6,6 +6,9 @@
- #include <qframe.h>
- #include <qlabel.h>
- 
-+#define QColor(i)	(QColor)(i)
-+#define QRgb(i)		(QRgb)(i)
-+
- dirDlgData::dirDlgData
- (
- 	QWidget* parent,
diff --git a/audio/xamp/patches/patch-ar b/audio/xamp/patches/patch-ar
deleted file mode 100644
index e494e8a4c91..00000000000
--- a/audio/xamp/patches/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2000/10/18 11:22:45 rh Exp $
-
---- id3Data.cpp.orig	Tue Jan 25 01:37:13 2000
-+++ id3Data.cpp	Tue Jan 25 01:37:40 2000
-@@ -17,6 +17,9 @@
- #include <qframe.h>
- #include <qlabel.h>
- 
-+#define QColor(i)	(QColor)(i)
-+#define QRgb(i)		(QRgb)(i)
-+
- id3Data::id3Data
- (
- 	QWidget* parent,
diff --git a/audio/xamp/patches/patch-as b/audio/xamp/patches/patch-as
deleted file mode 100644
index 39e31314c40..00000000000
--- a/audio/xamp/patches/patch-as
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-as,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- main.cpp.orig	1997-12-14 21:35:38.000000000 +0100
-+++ main.cpp
-@@ -1,4 +1,5 @@
- #include <qapp.h>
-+#include <stdlib.h>
- #include "QtAMP.h"
- extern "C" {
- #define AUDIO
diff --git a/audio/xamp/patches/patch-at b/audio/xamp/patches/patch-at
deleted file mode 100644
index e3621998f0e..00000000000
--- a/audio/xamp/patches/patch-at
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- QScrLabel.cpp.orig	1998-02-10 22:04:28.000000000 +0100
-+++ QScrLabel.cpp
-@@ -5,14 +5,14 @@
- #include "QScrLabel.h"
- #include "id3.h"
- 
--QScrLabel::QScrLabel(QWidget* parent=0, const char* name=0, WFlags f=0) : QLabel(parent, name, f) {
-+QScrLabel::QScrLabel(QWidget* parent, const char* name, WFlags f) : QLabel(parent, name, f) {
- 	string = new QString;
- 	timer = new QTimer(this);
- 	connect(timer, SIGNAL(timeout()), this, SLOT(scroll()));
- 	dir = 1;
- }
- 
--QScrLabel::QScrLabel(const char* text, QWidget* parent=0, const char* name=0, WFlags f = 0)
-+QScrLabel::QScrLabel(const char* text, QWidget* parent, const char* name, WFlags f)
- {
- 	QScrLabel(parent, name, f);
- 	setLabel(text);
diff --git a/audio/xamp/patches/patch-au b/audio/xamp/patches/patch-au
deleted file mode 100644
index ce616a437c1..00000000000
--- a/audio/xamp/patches/patch-au
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- aboutData.cpp.orig	2004-05-11 13:53:23.000000000 +0200
-+++ aboutData.cpp
-@@ -50,11 +50,11 @@ aboutData::aboutData
- 	l = new QLabel( w );
- 	b->addWidget( l, 1, 0 );
- 	l->setAlignment( 268 );
--	l->setText( "You can get Xamp at http://elan.rulez.org/~xopy/
--and from mirrors at
--http://xopy.rulz.org/linux/xamp/ - in Slovenia
--and http://edu.lahti.fi/xamp/ - in Finland\n
--QtAMP is at http://www.xs4all.nl/~lodewijk/qtamp.html\n
-+	l->setText( "You can get Xamp at http://elan.rulez.org/~xopy/\n\
-+and from mirrors at\n\
-+http://xopy.rulz.org/linux/xamp/ - in Slovenia\n\
-+and http://edu.lahti.fi/xamp/ - in Finland\n\
-+QtAMP is at http://www.xs4all.nl/~lodewijk/qtamp.html\n\
- and amp at ftp://ftp.rasip.fer.hr/pub/mpeg/");
- 	
- 	addTab( w, "Xamp" );
diff --git a/audio/xamp/patches/patch-av b/audio/xamp/patches/patch-av
deleted file mode 100644
index 5a76748cdd9..00000000000
--- a/audio/xamp/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- ../args.c.orig	1998-07-30 15:53:01.000000000 +0200
-+++ ../args.c
-@@ -51,7 +51,7 @@ usage: amp [options] [ MPEG audio stream
-                       (for use with xmpeg3 or similar GUIs)\n\
-   -w                  wav output\n\
-       -downmix        downmix stereo streams to one channel\n\
--      -die            play the playlist and quit\n
-+      -die            play the playlist and quit\n\
-       -nobuffer       do not use an audio buffer\n\
-       -volume <vol>   set the volume to <vol> (0-100)\n\
-       -debug <opts..> When compiled in debug <opt, opt2,...> code sections\n\
diff --git a/audio/xamp/patches/patch-aw b/audio/xamp/patches/patch-aw
deleted file mode 100644
index 4710903f73b..00000000000
--- a/audio/xamp/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- QMyListBox.cpp.orig	1997-08-30 18:08:16.000000000 +0200
-+++ QMyListBox.cpp
-@@ -6,7 +6,7 @@
-  */
- #include "QMyListBox.h"
- 
--QMyListBox::QMyListBox(QWidget *parent=0, const char *name=0, WFlags f=0) 
-+QMyListBox::QMyListBox(QWidget *parent, const char *name, WFlags f) 
-   : QListBox(parent, name, f) {
- }
- 
diff --git a/audio/xamp/patches/patch-ax b/audio/xamp/patches/patch-ax
deleted file mode 100644
index 2730637e2bb..00000000000
--- a/audio/xamp/patches/patch-ax
+++ /dev/null
@@ -1,270 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- readme.h.orig	1997-10-05 16:18:16.000000000 +0200
-+++ readme.h
-@@ -1,133 +1,133 @@
--#define strim "
--amp MPEG audio decoder readme file (version 0.7.6)
--(C) Tomislav Uzelac  1996,1997
--
--amp is free software and can be _used_ freely by anyone. If you want to
--do anything else with it, be sure to check the Legal section of this
--document for legal issues.
--
--THERE IS NO WARRANTY FOR THIS PROGRAM. Please check out the Legal section
--of this document.
--
--1. Introduction
--2. Installation
--3. Running
--4. Feedback
--5. Contributing
--6. Legal
--
--
--1. Introduction
--
--amp (Audio Mpeg Player) is an MPEG audio decoder which I originally started 
--putting together as a side project of the MPEG hardware design project at 
--FER/Zagreb - just to confirm my knowledge of the standard. It works with
--both MPEG1 and MPEG2 audio streams (except for the multichannel extensions
--defined in MPEG2), layers 2 and 3. 
--
--There is a gui for amp, written in Tcl/Tk by Edouard Lafargue. It is 
--available at the amp home site ftp://ftp.rasip.fer.hr
--
--Another gui supported is the Sajber Jukebox, written by Joel Lindholm 
--<wizball@kewl.campus.luth.se>
--
--The following people contributed their time and knowledge to amp:
--Karl Anders Oygard, Ilkka Karvinen, Lutz Vieweg, Dan Nelson,
--Edouard Lafargue, Andrew Richards, George Colouris,
--Dmitry Boldyrev, Andy Lo A Foe, Thomas Sailer
--
--amp home location is
--	ftp://ftp.rasip.fer.hr/pub/mpeg/
--
--and the mailing list: send 'HELP' in the body of the message to:
--	multimedia@rasip.fer.hr
--
--If you want to find out more about MPEG, best places to start are
--	http://www.mpeg.org
--	http://www.mpeg2.de 
--
--
--2. Installation
--
--Installation should be simple enough if amp was ported to your system,
--just do a 
--
--./configure
--make 
--
--You can edit the makefile further to suit your system. If configure fails 
--to make a usable Makefile, you'll _have_ to edit it yourself.
--
--Linux users should try real-time playing support, as described
--in doc/realtime.txt. Some people that might pass on this feature are
--those with slower machines (i.e. 486's), or SMP systems (see the
--doc/linuxrealtime.txt file). 
--Some versions of the linux C library produce an error when compiling
--amp with realtime support. A quick fix is to edit /usr/include/sched.h
--and replace _P in the offending line with __P.
--
--./configure --enable-realtime
--make
--chown root.root amp
--chmod u+s amp
--
--
--3. Running:
--
--'amp -h' gives you usage & options. If your computer is on the slower
--side, direct playback might not work, but you can decode it
--to .wav or raw pcm and play it later.
--
--
--4. Feedback
--
--Send in your makefiles, opinions, bugreports, fixes; anything related to this
--program. You can also send me unlimited amounts of money, sugar, milk, etc.
--
--If you find any mpeg audio files that amp has trouble decoding, please tell
--me about this via e-mail <tuzelac@rasip.fer.hr>.
--
--
--5. Contributing
--
--Please contribute to amp. If you want to know what is going on in amp 
--development, you can join the developers mailing list
--
--	mpeg_audio_developers@rasip.fer.hr
--
--There are certain debugging facilities that I made in amp, but are disabled
--in the current release (they are neither nice nor user-friendly). If anyone
--enhances them (they are in dump.c) to the point that they're actually
--usable I'll be happy to include the changes in the release. I think this
--kind of debug output would be very useful to people studying these audio
--algorithms.
--
--
--6. Legal
--
--This software can be used freely for any purpose. It can be distributed
--freely, as long as it is not sold commercially without permission from
--Tomislav Uzelac <tuzelac@rasip.fer.hr>. However, including this software
--on CD_ROMs containing other free software is explicitly permitted even 
--when a modest distribution fee is charged for the CD, as long as this
--software is not a primary selling argument for the CD.
--
--Building derived versions of this software is permitted, as long as they
--are not sold commercially without permission from Tomislav Uzelac 
--<tuzelac@rasip.fer.hr>. Any derived versions must be clearly marked as
--such, and must be called by a name other than amp. Any derived versions
--must retain this copyright notice.
--
--/* This license is itself copied from Tatu Ylonen's ssh package. It does 
-- * not mention being copyrighted itself :)
-- */
--
--THERE IS NO WARRANTY FOR THIS PROGRAM - whatsoever. You use it entirely
--at your risk, and neither Tomislav Uzelac, nor FER will be liable for
--any damages that might occur to your computer, software, etc. in
--consequence of you using this freeware program.
--
--
--Tomislav Uzelac
--<tuzelac@rasip.fer.hr>
-+#define strim "\
-+amp MPEG audio decoder readme file (version 0.7.6)\n\
-+(C) Tomislav Uzelac  1996,1997\n\
-+\n\
-+amp is free software and can be _used_ freely by anyone. If you want to\n\
-+do anything else with it, be sure to check the Legal section of this\n\
-+document for legal issues.\n\
-+\n\
-+THERE IS NO WARRANTY FOR THIS PROGRAM. Please check out the Legal section\n\
-+of this document.\n\
-+\n\
-+1. Introduction\n\
-+2. Installation\n\
-+3. Running\n\
-+4. Feedback\n\
-+5. Contributing\n\
-+6. Legal\n\
-+\n\
-+\n\
-+1. Introduction\n\
-+\n\
-+amp (Audio Mpeg Player) is an MPEG audio decoder which I originally started \n\
-+putting together as a side project of the MPEG hardware design project at \n\
-+FER/Zagreb - just to confirm my knowledge of the standard. It works with\n\
-+both MPEG1 and MPEG2 audio streams (except for the multichannel extensions\n\
-+defined in MPEG2), layers 2 and 3. \n\
-+\n\
-+There is a gui for amp, written in Tcl/Tk by Edouard Lafargue. It is \n\
-+available at the amp home site ftp://ftp.rasip.fer.hr\n\
-+\n\
-+Another gui supported is the Sajber Jukebox, written by Joel Lindholm \n\
-+<wizball@kewl.campus.luth.se>\n\
-+\n\
-+The following people contributed their time and knowledge to amp:\n\
-+Karl Anders Oygard, Ilkka Karvinen, Lutz Vieweg, Dan Nelson,\n\
-+Edouard Lafargue, Andrew Richards, George Colouris,\n\
-+Dmitry Boldyrev, Andy Lo A Foe, Thomas Sailer\n\
-+\n\
-+amp home location is\n\
-+	ftp://ftp.rasip.fer.hr/pub/mpeg/\n\
-+\n\
-+and the mailing list: send 'HELP' in the body of the message to:\n\
-+	multimedia@rasip.fer.hr\n\
-+\n\
-+If you want to find out more about MPEG, best places to start are\n\
-+	http://www.mpeg.org\n\
-+	http://www.mpeg2.de \n\
-+\n\
-+\n\
-+2. Installation\n\
-+\n\
-+Installation should be simple enough if amp was ported to your system,\n\
-+just do a \n\
-+\n\
-+./configure\n\
-+make \n\
-+\n\
-+You can edit the makefile further to suit your system. If configure fails \n\
-+to make a usable Makefile, you'll _have_ to edit it yourself.\n\
-+\n\
-+Linux users should try real-time playing support, as described\n\
-+in doc/realtime.txt. Some people that might pass on this feature are\n\
-+those with slower machines (i.e. 486's), or SMP systems (see the\n\
-+doc/linuxrealtime.txt file). \n\
-+Some versions of the linux C library produce an error when compiling\n\
-+amp with realtime support. A quick fix is to edit /usr/include/sched.h\n\
-+and replace _P in the offending line with __P.\n\
-+\n\
-+./configure --enable-realtime\n\
-+make\n\
-+chown root.root amp\n\
-+chmod u+s amp\n\
-+\n\
-+\n\
-+3. Running:\n\
-+\n\
-+'amp -h' gives you usage & options. If your computer is on the slower\n\
-+side, direct playback might not work, but you can decode it\n\
-+to .wav or raw pcm and play it later.\n\
-+\n\
-+\n\
-+4. Feedback\n\
-+\n\
-+Send in your makefiles, opinions, bugreports, fixes; anything related to this\n\
-+program. You can also send me unlimited amounts of money, sugar, milk, etc.\n\
-+\n\
-+If you find any mpeg audio files that amp has trouble decoding, please tell\n\
-+me about this via e-mail <tuzelac@rasip.fer.hr>.\n\
-+\n\
-+\n\
-+5. Contributing\n\
-+\n\
-+Please contribute to amp. If you want to know what is going on in amp \n\
-+development, you can join the developers mailing list\n\
-+\n\
-+	mpeg_audio_developers@rasip.fer.hr\n\
-+\n\
-+There are certain debugging facilities that I made in amp, but are disabled\n\
-+in the current release (they are neither nice nor user-friendly). If anyone\n\
-+enhances them (they are in dump.c) to the point that they're actually\n\
-+usable I'll be happy to include the changes in the release. I think this\n\
-+kind of debug output would be very useful to people studying these audio\n\
-+algorithms.\n\
-+\n\
-+\n\
-+6. Legal\n\
-+\n\
-+This software can be used freely for any purpose. It can be distributed\n\
-+freely, as long as it is not sold commercially without permission from\n\
-+Tomislav Uzelac <tuzelac@rasip.fer.hr>. However, including this software\n\
-+on CD_ROMs containing other free software is explicitly permitted even \n\
-+when a modest distribution fee is charged for the CD, as long as this\n\
-+software is not a primary selling argument for the CD.\n\
-+\n\
-+Building derived versions of this software is permitted, as long as they\n\
-+are not sold commercially without permission from Tomislav Uzelac \n\
-+<tuzelac@rasip.fer.hr>. Any derived versions must be clearly marked as\n\
-+such, and must be called by a name other than amp. Any derived versions\n\
-+must retain this copyright notice.\n\
-+\n\
-+/* This license is itself copied from Tatu Ylonen's ssh package. It does \n\
-+ * not mention being copyrighted itself :)\n\
-+ */\n\
-+\n\
-+THERE IS NO WARRANTY FOR THIS PROGRAM - whatsoever. You use it entirely\n\
-+at your risk, and neither Tomislav Uzelac, nor FER will be liable for\n\
-+any damages that might occur to your computer, software, etc. in\n\
-+consequence of you using this freeware program.\n\
-+\n\
-+\n\
-+Tomislav Uzelac\n\
-+<tuzelac@rasip.fer.hr>\n\
- "
diff --git a/audio/xamp/patches/patch-ay b/audio/xamp/patches/patch-ay
deleted file mode 100644
index 67c6eff7aae..00000000000
--- a/audio/xamp/patches/patch-ay
+++ /dev/null
@@ -1,284 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2004/05/11 12:18:37 wiz Exp $
-
---- readmex.h.orig	1998-02-10 22:33:22.000000000 +0100
-+++ readmex.h
-@@ -1,140 +1,140 @@
--#define strimx "
--WHAT IS IT?
--
--Xamp is a version of amp plus a gui. Read the regular README on info about
--amp. It was developed on an cx86 running Linux, so it should be pretty
--portable. It doesn't take much cpu time; if your computer can run regular
--amp, it'll probably run Xamp.
--
--INSTALLING
--
--You'll need Qt (+include files), libX11 (+include files), a properly set up
--X server somewhere and a properly configured sound driver.
--
--$ tar xzvvf xamp-0.8.tgz
--# be carefull here. You need to enter the xamp-0.8/ directory again otherwise 
--# you will get just the command line amp.
--$ cd xamp-0.8/xamp-0.8/
--$ ./configure
--
--should take care of most configuration issues. I don't know autoconf very
--well, but I think what I added to amp's script works pretty well. Then just
--run make and you will get a binary called xamp. Just execute that and have
--fun with Xamp.
--
--DEBIAN USERS INSTALL (i386 only)
--    
--You can get a deb packet insted of the source or binary to install on a
--debian linux system. The install from here it is really easy. All you need
--is that you have installed qt properly and then just as root type
--
--# dpkg -i xamp_0.8-1_i386.deb
--    
--the filaname can be different, depends on the Xamp version.
--    
--REDHAT USERS INSTALL (i386 only)
--	
--There is a rpm of the package as well. For those with RedHat just get the
--xamp binary in the rpm format and execute as root
--
--# rpm -ivh xamp-0.8-1.i386.rpm
--
--the filaname can be different, depends on the Xamp version.
--
--RUNNING
--
--The program pretty much speaks for itself. There is a playlist from which
--the player plays. you can specify the initial list on the commandline (eg.
--$ xamp ~/mp3s/TypeO*mp3) or start empty. Click on the 'LOAD' button to get
--to the playlist editor. You can add new files, delete them and move items
--around by dragging. You can save the playlist to a flat textfile (one line
--per item) and you can load such files. Doubleclick on an item to make the
--player play that item.
--
--The main screen has regular previous, play/pause, stop and next
--buttons. there's also a shuffle and repeat togglebutton. You'll figure it out.
--
--There is an option added now that you can put a background in
--/usr/X11R6/lib/X11/xamp/ as a file back.bmp (i did tested it just with
--bitmaps, but it should work with pixmaps as well..). The one and only
--problem is that the filename must be in that exact path with name back.bmp
--	  
--SHORTCUTS
--    
--In new versions of Xamp there are shortcuts for all the main functions that
--Xamp supports.
--    
--Here are the shortcuts and the description for the command
--    Z - Rewind
--    X - Play/Pause
--    C - Stop
--    V - Fast forward
--    N - Mono/Stero adjustments
--    M - Mute
--    S - Shuffle mode playing
--    R - Repeat the song
--    UpKey - Incrase volume
--    DownKey - Decrase volume
--    LeftKey - Balance to left
--    RightKey - Balance to right
--    A - About dialog
--    ALT + Q - Quit
--
--    Double click on the song label opens the id3 tag editor
--    
--There are some in the playlist editor, but those shortcuts characters are
--underlined and you can connect with ALT+key.
--
--PROBLEMS
--
--if it dumps core, please send a patch or a detailed bugreport (don't attach
--the mp3!). this version seems pretty solid compared to the last, but I know
--I'm not a very good tester.
--
--xamp will refuse to play some weird (but compliant, according to the
--standard) mp3's, like ones that change bitrates halfway through or strange
--bitrates I couldn't reproduce here. the problem is that the function that
--gets called after you pull the slider needs to calculate where it should go
--in the mp3 stream. there are some magic values involved that calculation. I
--can't find out those values for weird bitrates I can't reproduce here, and I
--don't even want to think about the bitrate-switching streams.
--
--it was either keeping tabs on offsets while playing (slow & irritating,
--especially when seeking forward) or an ugly seeking function with a lot of
--magic values. the ugly function does seem to work for most cases, so I stuck
--with it. _if_ you should encounter an mp3 xamp won't play, email me.
--(andrej.bagon@uni-mb.si)
--
--BUGS
--
--I know about that quit bug. If somebody does solve that thing please
--just report to me how I should get rid of it.. Thanx.
--The playlist Length thing.. I dont know for now how to implement that length
--of the playlist, so I consider it a bug.
--Other bug reports are welcome!
--As a ID3 TAG editor was added.. you might encounter some problems.. not
--yet fully tested.
--    
--TODO
--
-- - stuff warnings (and errors?) into a messagebox
-- - multiple selection in the playlist editor
-- - some sort of bouncy fft or osciloscope graph.
--
--THANKS TO
--
-- - Tomislav & the rest for making amp.
-- - Adnans for BeMP, providing an idea on how to go about this.
-- - Lodewijk Voge for his port in the Xwindow system.
-- - the makers of the underlying system (dlgedit, Qt, etc down to the silicon)
--
--Legal addendum to the amp README:
--
--everything in this package that is not in the original amp package this
--version is based on, is released under the GNU General Public License. you
--make a derivative version -> you release the source, you mark your changes and
--you give credit where credit is due. clearly.
--
--Lodewijk V\"oge <lvoge@cs.vu.nl> and
--for Xamp Andrej Bagon <andrej.bagon@uni-mb.si>
-+#define strimx "\
-+WHAT IS IT?\n\
-+\n\
-+Xamp is a version of amp plus a gui. Read the regular README on info about\n\
-+amp. It was developed on an cx86 running Linux, so it should be pretty\n\
-+portable. It doesn't take much cpu time; if your computer can run regular\n\
-+amp, it'll probably run Xamp.\n\
-+\n\
-+INSTALLING\n\
-+\n\
-+You'll need Qt (+include files), libX11 (+include files), a properly set up\n\
-+X server somewhere and a properly configured sound driver.\n\
-+\n\
-+$ tar xzvvf xamp-0.8.tgz\n\
-+# be carefull here. You need to enter the xamp-0.8/ directory again otherwise \n\
-+# you will get just the command line amp.\n\
-+$ cd xamp-0.8/xamp-0.8/\n\
-+$ ./configure\n\
-+\n\
-+should take care of most configuration issues. I don't know autoconf very\n\
-+well, but I think what I added to amp's script works pretty well. Then just\n\
-+run make and you will get a binary called xamp. Just execute that and have\n\
-+fun with Xamp.\n\
-+\n\
-+DEBIAN USERS INSTALL (i386 only)\n\
-+    \n\
-+You can get a deb packet insted of the source or binary to install on a\n\
-+debian linux system. The install from here it is really easy. All you need\n\
-+is that you have installed qt properly and then just as root type\n\
-+\n\
-+# dpkg -i xamp_0.8-1_i386.deb\n\
-+    \n\
-+the filaname can be different, depends on the Xamp version.\n\
-+    \n\
-+REDHAT USERS INSTALL (i386 only)\n\
-+	\n\
-+There is a rpm of the package as well. For those with RedHat just get the\n\
-+xamp binary in the rpm format and execute as root\n\
-+\n\
-+# rpm -ivh xamp-0.8-1.i386.rpm\n\
-+\n\
-+the filaname can be different, depends on the Xamp version.\n\
-+\n\
-+RUNNING\n\
-+\n\
-+The program pretty much speaks for itself. There is a playlist from which\n\
-+the player plays. you can specify the initial list on the commandline (eg.\n\
-+$ xamp ~/mp3s/TypeO*mp3) or start empty. Click on the 'LOAD' button to get\n\
-+to the playlist editor. You can add new files, delete them and move items\n\
-+around by dragging. You can save the playlist to a flat textfile (one line\n\
-+per item) and you can load such files. Doubleclick on an item to make the\n\
-+player play that item.\n\
-+\n\
-+The main screen has regular previous, play/pause, stop and next\n\
-+buttons. there's also a shuffle and repeat togglebutton. You'll figure it out.\n\
-+\n\
-+There is an option added now that you can put a background in\n\
-+/usr/X11R6/lib/X11/xamp/ as a file back.bmp (i did tested it just with\n\
-+bitmaps, but it should work with pixmaps as well..). The one and only\n\
-+problem is that the filename must be in that exact path with name back.bmp\n\
-+	  \n\
-+SHORTCUTS\n\
-+    \n\
-+In new versions of Xamp there are shortcuts for all the main functions that\n\
-+Xamp supports.\n\
-+    \n\
-+Here are the shortcuts and the description for the command\n\
-+    Z - Rewind\n\
-+    X - Play/Pause\n\
-+    C - Stop\n\
-+    V - Fast forward\n\
-+    N - Mono/Stero adjustments\n\
-+    M - Mute\n\
-+    S - Shuffle mode playing\n\
-+    R - Repeat the song\n\
-+    UpKey - Incrase volume\n\
-+    DownKey - Decrase volume\n\
-+    LeftKey - Balance to left\n\
-+    RightKey - Balance to right\n\
-+    A - About dialog\n\
-+    ALT + Q - Quit\n\
-+\n\
-+    Double click on the song label opens the id3 tag editor\n\
-+    \n\
-+There are some in the playlist editor, but those shortcuts characters are\n\
-+underlined and you can connect with ALT+key.\n\
-+\n\
-+PROBLEMS\n\
-+\n\
-+if it dumps core, please send a patch or a detailed bugreport (don't attach\n\
-+the mp3!). this version seems pretty solid compared to the last, but I know\n\
-+I'm not a very good tester.\n\
-+\n\
-+xamp will refuse to play some weird (but compliant, according to the\n\
-+standard) mp3's, like ones that change bitrates halfway through or strange\n\
-+bitrates I couldn't reproduce here. the problem is that the function that\n\
-+gets called after you pull the slider needs to calculate where it should go\n\
-+in the mp3 stream. there are some magic values involved that calculation. I\n\
-+can't find out those values for weird bitrates I can't reproduce here, and I\n\
-+don't even want to think about the bitrate-switching streams.\n\
-+\n\
-+it was either keeping tabs on offsets while playing (slow & irritating,\n\
-+especially when seeking forward) or an ugly seeking function with a lot of\n\
-+magic values. the ugly function does seem to work for most cases, so I stuck\n\
-+with it. _if_ you should encounter an mp3 xamp won't play, email me.\n\
-+(andrej.bagon@uni-mb.si)\n\
-+\n\
-+BUGS\n\
-+\n\
-+I know about that quit bug. If somebody does solve that thing please\n\
-+just report to me how I should get rid of it.. Thanx.\n\
-+The playlist Length thing.. I dont know for now how to implement that length\n\
-+of the playlist, so I consider it a bug.\n\
-+Other bug reports are welcome!\n\
-+As a ID3 TAG editor was added.. you might encounter some problems.. not\n\
-+yet fully tested.\n\
-+    \n\
-+TODO\n\
-+\n\
-+ - stuff warnings (and errors?) into a messagebox\n\
-+ - multiple selection in the playlist editor\n\
-+ - some sort of bouncy fft or osciloscope graph.\n\
-+\n\
-+THANKS TO\n\
-+\n\
-+ - Tomislav & the rest for making amp.\n\
-+ - Adnans for BeMP, providing an idea on how to go about this.\n\
-+ - Lodewijk Voge for his port in the Xwindow system.\n\
-+ - the makers of the underlying system (dlgedit, Qt, etc down to the silicon)\n\
-+\n\
-+Legal addendum to the amp README:\n\
-+\n\
-+everything in this package that is not in the original amp package this\n\
-+version is based on, is released under the GNU General Public License. you\n\
-+make a derivative version -> you release the source, you mark your changes and\n\
-+you give credit where credit is due. clearly.\n\
-+\n\
-+Lodewijk V\"oge <lvoge@cs.vu.nl> and\n\
-+for Xamp Andrej Bagon <andrej.bagon@uni-mb.si>\n\
- "