7 files changed, 58 insertions, 4 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index c76f03da7871..38df08d04785 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://home.student.utwente.nl/t.vanklaveren/distfiles/ \
 
 MAINTAINER=	t.vanklaveren@student.utwente.nl
 
+WANT_ESOUND=	yes
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
@@ -20,4 +22,20 @@ USE_AUTOMAKE=	yes
 
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_ESOUND)
+USE_ESOUND=	yes
+PLIST_SUB=	ESOUND=""
+.else
+PLIST_SUB=	ESOUND="@comment "
+.endif
+
+.if exists(${LOCALBASE}/bin/artsc-config)
+LIB_DEPENDS=	artsc.0:${PORTSDIR}/x11/kdelibs2
+PLIST_SUB+=	ARTS=""
+.else
+PLIST_SUB+=	ARTS="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/libao/files/patch-ac b/audio/libao/files/patch-ac
new file mode 100644
index 000000000000..cdac7830f87a
--- /dev/null
+++ b/audio/libao/files/patch-ac
@@ -0,0 +1,11 @@
+--- configure.in.orig	Sat Feb 24 10:31:45 2001
++++ configure.in	Fri Mar  2 13:03:53 2001
+@@ -60,7 +60,7 @@
+                 PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
+         *)
+                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+-                CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
++                CFLAGS="-D__NO_MATH_INLINES -fsigned-char $CFLAGS"
+                 PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+         esac
+ fi
diff --git a/audio/libao/pkg-plist b/audio/libao/pkg-plist
index 3eb113a93009..1a119665b127 100644
--- a/audio/libao/pkg-plist
+++ b/audio/libao/pkg-plist
@@ -2,7 +2,9 @@ include/ao/ao.h
 include/ao/os_types.h
 lib/libao.so
 lib/libao.so.1
+%%ARTS%%lib/ao/libarts.so
 lib/ao/liboss.so
+%%ESOUND%%lib/ao/libesd.so
 share/doc/libao-0.6.0/API
 share/doc/libao-0.6.0/DRIVERS
 share/doc/libao-0.6.0/USAGE
diff --git a/audio/libogg/files/patch-ac b/audio/libogg/files/patch-ac
new file mode 100644
index 000000000000..ebf70ad691f2
--- /dev/null
+++ b/audio/libogg/files/patch-ac
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Feb 26 13:30:03 2001
++++ configure	Fri Mar  2 12:40:51 2001
+@@ -1513,7 +1513,7 @@
+ 		;;
+         *)
+                 DEBUG="-g -Wall -fsigned-char"
+-                CFLAGS="-O20 -fsigned-char"
++                CFLAGS="-fsigned-char $CFLAGS"
+                 PROFILE="-O20 -g -pg -fsigned-char" 
+ 		;;
+         esac
diff --git a/audio/libogg/pkg-descr b/audio/libogg/pkg-descr
index a3b604665b27..b13159199a26 100644
--- a/audio/libogg/pkg-descr
+++ b/audio/libogg/pkg-descr
@@ -4,5 +4,7 @@ the Ogg bitstream makes seeking, time stamping and error recovery
 possible, as well as mixing several separate, concurrent media
 streams into a single physical bitstream.
 
+WWW: http://www.xiph.org/ogg/
+
 - Theo van Klaveren
 t.vanklaveren@student.utwente.nl
diff --git a/audio/libvorbis/files/patch-ac b/audio/libvorbis/files/patch-ac
new file mode 100644
index 000000000000..b19fc64a8391
--- /dev/null
+++ b/audio/libvorbis/files/patch-ac
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Feb 26 22:34:27 2001
++++ configure	Fri Mar  2 12:44:18 2001
+@@ -1710,7 +1710,7 @@
+ 		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
+ 	*)
+ 		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+-		CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
++		CFLAGS="-D__NO_MATH_INLINES -fsigned-char $CFLAGS"
+ 		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+         esac
+ fi
diff --git a/audio/vorbis/Makefile b/audio/vorbis/Makefile
index b662ce73b329..982e0cbb2a3c 100644
--- a/audio/vorbis/Makefile
+++ b/audio/vorbis/Makefile
@@ -18,13 +18,12 @@ MAINTAINER=	t.vanklaveren@student.utwente.nl
 LIB_DEPENDS=	ao.1:${PORTSDIR}/audio/libao \
 		ogg.1:${PORTSDIR}/audio/libogg \
 		vorbis.0:${PORTSDIR}/audio/libvorbis
-RUN_DEPENDS=	${X11BASE}/lib/xmms/Input/libvorbis.so:${PORTSDIR}/audio/vorbis-xmms \
-		ogg123:${PORTSDIR}/audio/vorbis-tools
+RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
 
 MD5_FILE=	Makefile	# dummy
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/pkg-plist
-SUBPORTS=	libao libogg libvorbis vorbis-tools vorbis-xmms
+SUBPORTS=	libao libogg libvorbis vorbis-tools
 
 pre-install:
 		${ECHO} "@comment intentionally left empty" > ${PLIST}