Make build with gcc3. Make it use buildlink3. Closes PR 22281.

15 files changed, 713 insertions, 106 deletions

diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 141a2ab6e35..899ada7ebb6 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/22 07:15:01 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/11 12:18:37 wiz Exp $
 # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
 #
 
@@ -14,20 +14,19 @@ MAINTAINER=	rxg@ms25.url.com.tw
 HOMEPAGE=	http://andrej.co.ru/~andrej/programs/xamp/
 COMMENT=	Version of amp (stands for `Audio Mpeg Player') plus a Qt GUI
 
-DEPENDS+=	qt1-1.44:../../x11/qt1
-
 WRKSRC=		${WRKDIR}/xamp-0.8/xamp-0.8g
 DIST_SUBDIR=	xamp
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
+USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
-USE_X11BASE=	yes
+USE_LANGUAGES=	c c++
+USE_X11=	yes
 
-EVAL_PREFIX+=	QT1DIR=qt1
-CONFIGURE_ARGS+=	"--with-qt-dir=${QT1DIR}/qt1"
+CONFIGURE_ARGS+=	--with-qt-dir=${BUILDLINK_PREFIX.qt1:Q}/qt1
 
-CONFIGURE_ENV+=	"QTDIR=${QT1DIR}/qt1"
-CONFIGURE_ENV+=	"MOC=${QT1DIR}/qt1/bin/moc"
+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
@@ -49,4 +48,5 @@ do-install:
 	@${INSTALL_DATA_DIR} ${SKIN_DIR}/mmxxamp-xamp
 	${INSTALL_DATA} ${WRKDIR}/mmxxamp-xamp/*.bmp ${SKIN_DIR}/mmxxamp-xamp
 
+.include "../../x11/qt1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xamp/distinfo b/audio/xamp/distinfo
index 23ef2db87c7..62176012e09 100644
--- a/audio/xamp/distinfo
+++ b/audio/xamp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/06/28 13:15:16 agc Exp $
+$NetBSD: distinfo,v 1.4 2004/05/11 12:18:37 wiz Exp $
 
 SHA1 (xamp/xamp-0.8-10.tgz) = 65f83c41091184432d64baf1d74aef880733fbd5
 Size (xamp/xamp-0.8-10.tgz) = 239024 bytes
@@ -9,20 +9,27 @@ Size (xamp/chrome.tar.gz) = 32636 bytes
 SHA1 (xamp/mmxamp.tar.gz) = f703dfe3040bd72db35bb05e26a8eb7841b54887
 Size (xamp/mmxamp.tar.gz) = 41405 bytes
 SHA1 (patch-aa) = a178fc8dee38f4e55eff7289577f2f4b36806574
-SHA1 (patch-ab) = e44114a8770cc7065f230932da2c10dab19bd730
+SHA1 (patch-ab) = 96c0e3db7637c035345cbf2df7d2ee195b538bcb
 SHA1 (patch-ac) = de83b1fd7b170438f818d76d025838f8aa07c752
 SHA1 (patch-ad) = 3595460ae4f848b60d1c829ebfecff92cd2a8e58
-SHA1 (patch-ae) = 2cefc9da5bf237ecb00aa23b5bad6be1036ea6b1
+SHA1 (patch-ae) = 348aff7b4cef04198359c4ea5d7e06cc2b63fd08
 SHA1 (patch-af) = be56e4d380045d0be4c90c88b263cacd611d0eab
 SHA1 (patch-ag) = c17579b095485510bc5dc99d0c22da2f44e152b8
-SHA1 (patch-ah) = b93e477392003318a835c08f5bd1a7b1ba56c0c8
-SHA1 (patch-ai) = 4b301a05e9884466959abce6c7b8092b467800ea
+SHA1 (patch-ah) = 2460dd3cc32f18847f99cdc3f5cefa87601a4c85
+SHA1 (patch-ai) = 9c128048fdb8bed0fb7abd15758a197bd3e35487
 SHA1 (patch-aj) = ab841128854cdacceb54b6c7726d07e5f4fb1140
 SHA1 (patch-ak) = 0d32700aad4cdf232bc1c48376ddcbd762b41852
-SHA1 (patch-al) = 82d615beca8919d1a28e6fa6b344013d771afffe
-SHA1 (patch-am) = 880c459e9e1b8a36eedd04bf372f9458b4bad49b
+SHA1 (patch-al) = 38760f05d5ca7b4557c6d8ddfb0b08cbc4b0dd9b
+SHA1 (patch-am) = 1847c96306c21514adb4f2825bf17c9ea6fd3f0f
 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-ab b/audio/xamp/patches/patch-ab
index 150e047cb83..2b5760454ce 100644
--- a/audio/xamp/patches/patch-ab
+++ b/audio/xamp/patches/patch-ab
@@ -1,55 +1,37 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2004/05/11 12:18:37 wiz Exp $
 
-*** ../guicontrol.c~	Sat Aug 23 07:30:51 1997
---- ../guicontrol.c	Thu Mar  5 21:31:06 1998
-***************
-*** 312,317 ****
---- 312,325 ----
-        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,340 ****
-  	 
-  	 if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-  	   perror("fcntl");
-! 	 flags ^= O_NONBLOCK;
-  	 
-  	 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-  	   perror("fcntl");
---- 342,348 ----
-  	 
-  	 if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-  	   perror("fcntl");
-! 	 flags &= ~O_NONBLOCK;
-  	 
-  	 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-  	   perror("fcntl");
-***************
-*** 394,400 ****
-                  /* Set stdin to blocking */
-                  if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-                          perror("fcntl");
-!                 flags ^= O_NONBLOCK;
-                  if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-                          perror("fcntl");
-          }
---- 402,408 ----
-                  /* Set stdin to blocking */
-                  if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-                          perror("fcntl");
-!                 flags &= ~O_NONBLOCK;
-                  if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-                          perror("fcntl");
-          }
+--- ../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-ae b/audio/xamp/patches/patch-ae
index c06f39967db..233ffa4bd1d 100644
--- a/audio/xamp/patches/patch-ae
+++ b/audio/xamp/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2002/06/28 13:15:16 agc Exp $
+$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
@@ -18,7 +18,7 @@ $NetBSD: patch-ae,v 1.5 2002/06/28 13:15:16 agc Exp $
  	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}/qt1/lib -Wl,-R${QT1DIR}/qt1/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lXext
++LIBS = @QT_LDFLAGS@ -lm -lqt -L${QT1DIR}/lib -Wl,-R${QT1DIR}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lXext
  
  all: xamp
  
diff --git a/audio/xamp/patches/patch-ah b/audio/xamp/patches/patch-ah
index 977560b6115..256edeae599 100644
--- a/audio/xamp/patches/patch-ah
+++ b/audio/xamp/patches/patch-ah
@@ -1,17 +1,14 @@
-$NetBSD: patch-ah,v 1.4 2000/10/18 11:22:44 rh Exp $
+$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,14 @@
+@@ -71,6 +71,11 @@
      CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
      ;;
  
 +  NetBSD)
 +    CC="gcc"
-+    if test "$ARCH_TYPE" = "i386" ; then
-+      CFLAGS_ARCH="-i586 -pipe"
-+    fi
-+    CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
++    CFLAGS="${CFLAGS} -DNO_BYTE_SWAPPING"
 +    ;;
 +
    SunOS)
diff --git a/audio/xamp/patches/patch-ai b/audio/xamp/patches/patch-ai
index f70ca157d4f..cebce55fcdc 100644
--- a/audio/xamp/patches/patch-ai
+++ b/audio/xamp/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2000/10/18 11:22:44 rh Exp $
+$NetBSD: patch-ai,v 1.5 2004/05/11 12:18:37 wiz Exp $
 
---- configure.orig	Sun Oct 26 22:55:34 1997
-+++ configure	Mon Oct 16 21:09:00 2000
-@@ -970,7 +970,7 @@
+--- configure.orig	1997-10-26 15:55:34.000000000 +0100
++++ 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"
@@ -11,18 +11,15 @@ $NetBSD: patch-ai,v 1.4 2000/10/18 11:22:44 rh Exp $
  
  qt_incdir=NO
  for i in $qt_incdirs;
-@@ -1710,6 +1710,14 @@
-     fi
-     if test "$OS_TYPE" = "FreeBSD" ; then
-       OS_TYPE="BSD"
-+    fi
-+    CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
-+    ;;
-+
-+  NetBSD)
-+    CC="gcc"
-+    if test "$ARCH_TYPE" = "i386" ; then
-+      CFLAGS_ARCH="-i586 -pipe"
-     fi
+@@ -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-al b/audio/xamp/patches/patch-al
index 3d6db2db242..fad8e834a22 100644
--- a/audio/xamp/patches/patch-al
+++ b/audio/xamp/patches/patch-al
@@ -1,17 +1,13 @@
-$NetBSD: patch-al,v 1.2 2000/10/18 11:22:44 rh Exp $
+$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,15 @@
+@@ -73,6 +73,11 @@
      DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" 
      ;;
  
 +  NetBSD)
 +    CC="gcc"
-+    if test "$ARCH_TYPE" = "i386" ; then
-+      CFLAGS_ARCH="-i586 -pipe"
-+    fi
-+    CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
 +    DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
 +    ;;
 +
diff --git a/audio/xamp/patches/patch-am b/audio/xamp/patches/patch-am
index 1d09640316d..e4b79b9a627 100644
--- a/audio/xamp/patches/patch-am
+++ b/audio/xamp/patches/patch-am
@@ -1,17 +1,13 @@
-$NetBSD: patch-am,v 1.2 2000/10/18 11:22:44 rh Exp $
+$NetBSD: patch-am,v 1.3 2004/05/11 12:18:37 wiz Exp $
 
 --- ../configure.orig	Sat Aug 23 17:11:24 1997
 +++ ../configure	Mon Oct 16 21:13:14 2000
-@@ -1413,6 +1413,15 @@
+@@ -1413,6 +1413,11 @@
      DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" 
      ;;
  
 +  NetBSD)
 +    CC="gcc"
-+    if test "$ARCH_TYPE" = "i386" ; then
-+      CFLAGS_ARCH="-i586 -pipe"
-+    fi
-+    CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
 +    DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
 +    ;;
 +
diff --git a/audio/xamp/patches/patch-as b/audio/xamp/patches/patch-as
new file mode 100644
index 00000000000..39e31314c40
--- /dev/null
+++ b/audio/xamp/patches/patch-as
@@ -0,0 +1,10 @@
+$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
new file mode 100644
index 00000000000..e3621998f0e
--- /dev/null
+++ b/audio/xamp/patches/patch-at
@@ -0,0 +1,21 @@
+$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
new file mode 100644
index 00000000000..ce616a437c1
--- /dev/null
+++ b/audio/xamp/patches/patch-au
@@ -0,0 +1,21 @@
+$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
new file mode 100644
index 00000000000..5a76748cdd9
--- /dev/null
+++ b/audio/xamp/patches/patch-av
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..4710903f73b
--- /dev/null
+++ b/audio/xamp/patches/patch-aw
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..2730637e2bb
--- /dev/null
+++ b/audio/xamp/patches/patch-ax
@@ -0,0 +1,270 @@
+$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
new file mode 100644
index 00000000000..67c6eff7aae
--- /dev/null
+++ b/audio/xamp/patches/patch-ay
@@ -0,0 +1,284 @@
+$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\
+ "