Upgrade to version 0.8, also removing the dependency on OSS. This

now works fine with the standard audio driver as well.

4 files changed, 31 insertions, 19 deletions

diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index aa97a31f084f..bef454f17dc3 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -3,33 +3,31 @@
 # Date created:         13 Jul 1998
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1998/09/28 01:55:08 steve Exp $
+# $Id: Makefile,v 1.5 1998/11/14 09:43:04 asami Exp $
 #
 
-DISTNAME=	x11amp-0.7-FreeBSD
-PKGNAME=	x11amp-0.7
+DISTNAME=	x11amp-freebsd-0.8
+PKGNAME=	x11amp-0.8
 CATEGORIES=	audio
-MASTER_SITES=	http://x11amp.ml.org/files/0.7/ \
-		ftp://x11amp.bz.nu/x11amp/0.7/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://www.se.opensound.com/pub/oss/ossapps/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	dburr@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/x11amp
-
-USE_X_PREFIX=	YES
-NO_BUILD=	YES
+NO_BUILD=		YES
+NO_FILTER_SHLIBS=	YES
 
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "elf"
 STRIP=
+DISTNAME=	x11amp-freebsd-0.8-elf
+ROOT=		${WRKDIR}/usr/local
+.else
+ROOT=		${WRKDIR}/x11amp
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/x11amp ${PREFIX}/bin/x11amp
-
-post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@tar -cpf - -C ${ROOT} . | tar -xpf - -C ${PREFIX}
 
 .include <bsd.port.post.mk>
diff --git a/audio/x11amp/distinfo b/audio/x11amp/distinfo
index 752571fe09c5..22f4fb99f4db 100644
--- a/audio/x11amp/distinfo
+++ b/audio/x11amp/distinfo
@@ -1 +1,2 @@
-MD5 (x11amp-0.7-FreeBSD.tgz) = faac026c99a7ab2628389148b00f47f9
+MD5 (x11amp-freebsd-0.8-elf.tar.gz) = c99a9f664e11d60ee683967bfa64b227
+MD5 (x11amp-freebsd-0.8.tar.gz) = 222bde0a35ab680e2fff2806c92f06b4
diff --git a/audio/x11amp/pkg-descr b/audio/x11amp/pkg-descr
index d0546003d941..b721d4734f7f 100644
--- a/audio/x11amp/pkg-descr
+++ b/audio/x11amp/pkg-descr
@@ -2,7 +2,8 @@ x11amp is a graphical (X11) MP3 player, with a user interface similar
 to the WinAMP MP3 player for Windows.  Please see http://x11amp.ml.org/
 for more information.
 
-It requires that you have the Open Sound System (OSS) sound driver.
-This is an advanced, high quality, commercial sound driver for FreeBSD.
-You may evaluate it for free for 7 days, after which you must purchase
-it for $20.  Please see http://www.4front-tech.com/ for more details.
+This version will work with either the standard FreeBSD audio driver
+or with the Open Sound System (OSS) sound driver.  This is an advanced,
+high quality, commercial sound driver for FreeBSD.  You may evaluate it
+for free for 7 days, after which you must purchase it for $20.  Please see
+http://www.opensound.com/ for more details.
diff --git a/audio/x11amp/pkg-plist b/audio/x11amp/pkg-plist
index fdf91b30e614..3c060a1b7ede 100644
--- a/audio/x11amp/pkg-plist
+++ b/audio/x11amp/pkg-plist
@@ -1 +1,13 @@
 bin/x11amp
+share/x11amp/Players/libwav.a
+share/x11amp/Players/libamp.la
+share/x11amp/Players/libamp.a
+share/x11amp/Players/libwav.la
+share/x11amp/Players/libwav.so.8.0
+@exec ln -fs %D/%F %B/libwav.so 
+@unexec rm -f %B/libwav.so
+share/x11amp/Players/libamp.so.8.0
+@exec ln -fs %D/%F %B/libamp.so 
+@unexec rm -f %B/libamp.so
+@dirrm share/x11amp/Players
+@dirrm share/x11amp