16 files changed, 30 insertions, 121 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 236fdd8235f3..eef0831c6229 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -114,10 +114,10 @@
     SUBDIR += kplayer
     SUBDIR += ksubeditor
     SUBDIR += ldvd
+    SUBDIR += libdca
     SUBDIR += libdivxdecore
     SUBDIR += libdivxdecore-devel
     SUBDIR += libdivxencore
-    SUBDIR += libdts
     SUBDIR += libdv
     SUBDIR += libdvbpsi
     SUBDIR += libdvdcss
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index b77aee439cd7..7f8c4d220132 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -84,7 +84,7 @@ CONFIGURE_ARGS+=	--disable-liba52
 .endif
 ## dts
 .ifdef(WITH_DTS) || exists(${LOCALBASE}/lib/libdts.a)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
+LIB_DEPENDS+=		dca.0:${PORTSDIR}/multimedia/libdca
 
 CONFIGURE_ARGS+=	--enable-libdts
 .endif
@@ -311,7 +311,6 @@ post-patch:
 post-configure:
 .ifdef(WITH_DTS)
 	@${REINPLACE_CMD} -E \
-		-e 's|-ldts|${LOCALBASE}/lib/libdts_pic.a|' \
 		-e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \
 			${WRKSRC}/config.mak \
 			${WRKSRC}/libavcodec/Makefile
diff --git a/multimedia/libdca/Makefile b/multimedia/libdca/Makefile
index fbaac4a2df07..40583f5c239d 100644
--- a/multimedia/libdca/Makefile
+++ b/multimedia/libdca/Makefile
@@ -5,26 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libdts
-PORTVERSION=	0.0.2
-PORTREVISION=	2
+PORTNAME=	libdca
+PORTVERSION=	0.0.5
 CATEGORIES=	multimedia
-MASTER_SITES=	http://debian.unnet.nl/pub/videolan/libdts/${PORTVERSION}/ \
-		http://download.videolan.org/pub/videolan/libdts/${PORTVERSION}/
+MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Free DTS Coherent Acoustics decoder
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
+USE_BZIP2=	yes
 USE_GNOME=	pkgconfig gnomehack
+USE_LDCONFIG=	yes
 
-MAN1=		dtsdec.1 extract_dts.1
+MAN1=		dcadec.1 extract_dca.1
+MLINKS=		dcadec.1 dtsdec.1 extract_dca.1 extract_dts.1
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-post-patch:
-	@${REINPLACE_CMD} -e 's|-ldts|-ldts_pic|' ${WRKSRC}/libdts/libdts.pc.in
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libdca/distinfo b/multimedia/libdca/distinfo
index eb5c9fe7380a..e7b3c1d6f408 100644
--- a/multimedia/libdca/distinfo
+++ b/multimedia/libdca/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdts-0.0.2.tar.gz) = a1c0dac95d7031498c2d19d7a3107469
-SHA256 (libdts-0.0.2.tar.gz) = ef552cedb9addd5c54a1d5adf49c2b5d6932606e7161443bd88a524a9a477595
-SIZE (libdts-0.0.2.tar.gz) = 295185
+MD5 (libdca-0.0.5.tar.bz2) = dab6b2795c66a82a6fcd4f8343343021
+SHA256 (libdca-0.0.5.tar.bz2) = dba022e022109a5bacbe122d50917769ff27b64a7bba104bd38ced8de8510642
+SIZE (libdca-0.0.5.tar.bz2) = 393291
diff --git a/multimedia/libdca/files/patch-libao-audio_out_oss.c b/multimedia/libdca/files/patch-libao-audio_out_oss.c
deleted file mode 100644
index b4141ec764c7..000000000000
--- a/multimedia/libdca/files/patch-libao-audio_out_oss.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- libao/audio_out_oss.c.orig	Thu Feb  5 10:14:12 2004
-+++ libao/audio_out_oss.c	Wed May 12 11:49:35 2004
-@@ -34,8 +34,9 @@
- 
- #if defined(__OpenBSD__) || defined(__NetBSD__)
- #include <soundcard.h>
--#elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#if defined(__FreeBSD__)
- #ifndef AFMT_S16_NE
- #include <machine/endian.h>
- #if BYTE_ORDER == LITTLE_ENDIAN
-@@ -44,8 +45,7 @@
- #define AFMT_S16_NE AFMT_S16_BE
- #endif
- #endif
--#else
--#include <sys/soundcard.h>
-+#endif
- #endif
- 
- #if defined(__NetBSD__)
diff --git a/multimedia/libdca/pkg-descr b/multimedia/libdca/pkg-descr
index 38a135720c56..bf122c10a37e 100644
--- a/multimedia/libdca/pkg-descr
+++ b/multimedia/libdca/pkg-descr
@@ -1,5 +1,5 @@
-libdts is a free library for decoding DTS Coherent Acoustics streams.
+libdca is a free library for decoding DTS Coherent Acoustics streams.
 
-libdts is still in early development stage so don't expect too much from it.
+libdca is still in early development stage so don't expect too much from it.
 
-WWW: http://www.videolan.org/dtsdec.html
+WWW: http://www.videolan.org/developers/libdca.html
diff --git a/multimedia/libdca/pkg-plist b/multimedia/libdca/pkg-plist
index 05c846270a34..4be667e44cf4 100644
--- a/multimedia/libdca/pkg-plist
+++ b/multimedia/libdca/pkg-plist
@@ -1,6 +1,13 @@
+bin/dcadec
 bin/dtsdec
+bin/extract_dca
 bin/extract_dts
+include/dca.h
 include/dts.h
+lib/libdca.a
+lib/libdca.la
+lib/libdca.so
+lib/libdca.so.0
 lib/libdts.a
-lib/libdts_pic.a
+libdata/pkgconfig/libdca.pc
 libdata/pkgconfig/libdts.pc
diff --git a/multimedia/libdts/Makefile b/multimedia/libdts/Makefile
deleted file mode 100644
index fbaac4a2df07..000000000000
--- a/multimedia/libdts/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	libdts
-# Date created:				12th May 2004
-# Whom:					Pav Lucistnik <pav@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libdts
-PORTVERSION=	0.0.2
-PORTREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	http://debian.unnet.nl/pub/videolan/libdts/${PORTVERSION}/ \
-		http://download.videolan.org/pub/videolan/libdts/${PORTVERSION}/
-
-MAINTAINER=	pav@FreeBSD.org
-COMMENT=	Free DTS Coherent Acoustics decoder
-
-GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig gnomehack
-
-MAN1=		dtsdec.1 extract_dts.1
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-post-patch:
-	@${REINPLACE_CMD} -e 's|-ldts|-ldts_pic|' ${WRKSRC}/libdts/libdts.pc.in
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/multimedia/libdts/distinfo b/multimedia/libdts/distinfo
deleted file mode 100644
index eb5c9fe7380a..000000000000
--- a/multimedia/libdts/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libdts-0.0.2.tar.gz) = a1c0dac95d7031498c2d19d7a3107469
-SHA256 (libdts-0.0.2.tar.gz) = ef552cedb9addd5c54a1d5adf49c2b5d6932606e7161443bd88a524a9a477595
-SIZE (libdts-0.0.2.tar.gz) = 295185
diff --git a/multimedia/libdts/files/patch-libao-audio_out_oss.c b/multimedia/libdts/files/patch-libao-audio_out_oss.c
deleted file mode 100644
index b4141ec764c7..000000000000
--- a/multimedia/libdts/files/patch-libao-audio_out_oss.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- libao/audio_out_oss.c.orig	Thu Feb  5 10:14:12 2004
-+++ libao/audio_out_oss.c	Wed May 12 11:49:35 2004
-@@ -34,8 +34,9 @@
- 
- #if defined(__OpenBSD__) || defined(__NetBSD__)
- #include <soundcard.h>
--#elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#if defined(__FreeBSD__)
- #ifndef AFMT_S16_NE
- #include <machine/endian.h>
- #if BYTE_ORDER == LITTLE_ENDIAN
-@@ -44,8 +45,7 @@
- #define AFMT_S16_NE AFMT_S16_BE
- #endif
- #endif
--#else
--#include <sys/soundcard.h>
-+#endif
- #endif
- 
- #if defined(__NetBSD__)
diff --git a/multimedia/libdts/pkg-descr b/multimedia/libdts/pkg-descr
deleted file mode 100644
index 38a135720c56..000000000000
--- a/multimedia/libdts/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-libdts is a free library for decoding DTS Coherent Acoustics streams.
-
-libdts is still in early development stage so don't expect too much from it.
-
-WWW: http://www.videolan.org/dtsdec.html
diff --git a/multimedia/libdts/pkg-plist b/multimedia/libdts/pkg-plist
deleted file mode 100644
index 05c846270a34..000000000000
--- a/multimedia/libdts/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/dtsdec
-bin/extract_dts
-include/dts.h
-lib/libdts.a
-lib/libdts_pic.a
-libdata/pkgconfig/libdts.pc
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index ac26fed3c363..e85af1b31368 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -17,7 +17,6 @@ DISTNAME=	${PORTNAME}-lib-${PORTVERSION}
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
 LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		speex.1:${PORTSDIR}/audio/speex \
@@ -30,7 +29,8 @@ LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		modplug.0:${PORTSDIR}/audio/libmodplug \
 		vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
 		theora.2:${PORTSDIR}/multimedia/libtheora \
-		mad.2:${PORTSDIR}/audio/libmad
+		mad.2:${PORTSDIR}/audio/libmad \
+		dca.0:${PORTSDIR}/multimedia/libdca
 
 USE_GCC=	3.4+
 USE_GETTEXT=	yes
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 31cf6df64caf..509f2a5a6cd2 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -507,7 +507,7 @@ CONFIGURE_ARGS+=	--disable-xmms
 .if !defined(WITHOUT_DTS)
 CFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-libdts
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
+LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
 .else
 CONFIGURE_ARGS+=	--disable-libdts
 .endif
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 41718ee42b9e..1096661654bb 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -326,7 +326,7 @@ CONFIGURE_ARGS+=--disable-daap
 .endif
 
 .if !defined(WITHOUT_DTS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
+LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
 CONFIGURE_ARGS+=--enable-dts
 .else
 CONFIGURE_ARGS+=--disable-dts
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 975835a19ead..e5378e991c6c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -334,7 +334,7 @@ CONFIGURE_ARGS+=--disable-daap
 .endif
 
 .if !defined(WITHOUT_DTS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
+LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
 CONFIGURE_ARGS+=--enable-dts
 .else
 CONFIGURE_ARGS+=--disable-dts