aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@FreeBSD.org>2013-06-09 19:30:58 +0000
committerChristian Weisgerber <naddy@FreeBSD.org>2013-06-09 19:30:58 +0000
commit1f2b1eac8efc6c78fe5812a440328a74c1db3ec5 (patch)
tree45e6d01ac243fc692b2b3dc21ccf4af150938e8d /audio
parentb6702c813611f59c5c532b812919372252db5fc7 (diff)
downloadports-1f2b1eac8efc6c78fe5812a440328a74c1db3ec5.tar.gz
ports-1f2b1eac8efc6c78fe5812a440328a74c1db3ec5.zip
Notes
Diffstat (limited to 'audio')
-rw-r--r--audio/akode-plugins-xiph/Makefile2
-rw-r--r--audio/alure/Makefile1
-rw-r--r--audio/aqualung/Makefile2
-rw-r--r--audio/audacity/Makefile1
-rw-r--r--audio/bmp-flac/Makefile4
-rw-r--r--audio/cmus/Makefile1
-rw-r--r--audio/cynthiune/Makefile2
-rw-r--r--audio/deadbeef/Makefile2
-rw-r--r--audio/dvda-author/Makefile4
-rw-r--r--audio/easytag/Makefile1
-rw-r--r--audio/flac/Makefile19
-rw-r--r--audio/flac/distinfo4
-rw-r--r--audio/flac/files/patch-Makefile.in22
-rw-r--r--audio/flac/files/patch-configure14
-rw-r--r--audio/flac/files/patch-man_flac.18
-rw-r--r--audio/flac/files/patch-src_libFLAC_Makefile.in13
-rw-r--r--audio/flac/pkg-plist190
-rw-r--r--audio/flac123/Makefile4
-rw-r--r--audio/gmtp/Makefile2
-rw-r--r--audio/gtkpod/Makefile2
-rw-r--r--audio/harp/Makefile1
-rw-r--r--audio/kid3-kde4/Makefile3
-rw-r--r--audio/kid3/Makefile4
-rw-r--r--audio/kio-audiocd/Makefile3
-rw-r--r--audio/libbs2b/Makefile2
-rw-r--r--audio/libfishsound/Makefile2
-rw-r--r--audio/libgig/Makefile4
-rw-r--r--audio/libsndfile/Makefile4
-rw-r--r--audio/lmms/Makefile2
-rw-r--r--audio/mixxx/Makefile1
-rw-r--r--audio/mous/Makefile1
-rw-r--r--audio/muine/Makefile4
-rw-r--r--audio/musicpd/Makefile3
-rw-r--r--audio/mythplugin-mythmusic/Makefile3
-rw-r--r--audio/ocp/Makefile2
-rw-r--r--audio/p5-Audio-FLAC-Header/Makefile3
-rw-r--r--audio/prokyon3/Makefile2
-rw-r--r--audio/rezound/Makefile2
-rw-r--r--audio/sdl_mixer/Makefile2
-rw-r--r--audio/sdl_sound/Makefile2
-rw-r--r--audio/sox/Makefile4
-rw-r--r--audio/squash/Makefile4
-rw-r--r--audio/vorbis-tools/Makefile4
-rw-r--r--audio/xmcd/Makefile4
-rw-r--r--audio/xmms-flac/Makefile26
-rw-r--r--audio/xmms-flac/distinfo4
-rw-r--r--audio/xmms-flac/files/patch-configure14
-rw-r--r--audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in35
-rw-r--r--audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c14
-rw-r--r--audio/xmms-flac/pkg-descr4
-rw-r--r--audio/xmms2/Makefile2
51 files changed, 137 insertions, 326 deletions
diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile
index b76962217773..4ea1f790a55a 100644
--- a/audio/akode-plugins-xiph/Makefile
+++ b/audio/akode-plugins-xiph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= akode-plugins-${PORTNAMESUFX}
PORTVERSION= 2.0.2
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= audio kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/ \
diff --git a/audio/alure/Makefile b/audio/alure/Makefile
index 2e38b0e6fc2c..bbfa8c2ca7c0 100644
--- a/audio/alure/Makefile
+++ b/audio/alure/Makefile
@@ -3,6 +3,7 @@
PORTNAME= alure
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://kcat.strangesoft.net/alure-releases/
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 2023172b862a..dd022ba07c13 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aqualung
DISTVERSION= 0.9beta11
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
http://wickedmachine.net/mirror/
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index c28636d7480a..1515e1039d41 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -3,6 +3,7 @@
PORTNAME= audacity
PORTVERSION= 2.0.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE \
SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index b09974b4870f..b3dba44797ce 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flac
PORTVERSION= 20040316
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= http://ccm.sherry.jp/tmp/
PKGNAMEPREFIX= bmp-
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= FLAC input plugin for beep-media-player
LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \
- FLAC.10:${PORTSDIR}/audio/flac
+ FLAC:${PORTSDIR}/audio/flac
PLIST_FILES= lib/bmp/Input/libbmp-flac.so
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 0d7a226df96e..0eb70bd47d47 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cmus
PORTVERSION= 2.5.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/audio/cynthiune/Makefile b/audio/cynthiune/Makefile
index 3a8253f19221..65fcbc6b79d1 100644
--- a/audio/cynthiune/Makefile
+++ b/audio/cynthiune/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cynthiune
PORTVERSION= 0.9.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= audio gnustep
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/c/cynthiune.app
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 85e70c44debb..ccee5ee6ed6e 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -3,7 +3,7 @@
PORTNAME= deadbeef
PORTVERSION= 0.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}
diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile
index a50f1aa18e4f..b858ed8eb7c6 100644
--- a/audio/dvda-author/Makefile
+++ b/audio/dvda-author/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dvda-author
PORTVERSION= 09.05
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= SF/dvd-audio/${PORTNAME}-core/${PORTNAME}-${PORTVERSION}-core
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-7
MAINTAINER= martin.dieringer@gmx.de
COMMENT= Author and playback unencrypted and uncompressed Audio-DVDs
-LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
+LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
ogg:${PORTSDIR}/audio/libogg \
sox.1:${PORTSDIR}/audio/sox \
samplerate.1:${PORTSDIR}/audio/libsamplerate \
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 2febaa4099fe..c949258a3e7b 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -3,6 +3,7 @@
PORTNAME= easytag
PORTVERSION= 2.1.8
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= GNOME
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 6fbb7300cfba..f2a5e1a6621f 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= flac
-PORTVERSION= 1.2.1
-PORTREVISION= 3
+PORTVERSION= 1.3.0
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/flac/
@@ -12,28 +11,28 @@ COMMENT= Free lossless audio codec
LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg
+USES= pathfix
USE_AUTOTOOLS= libtool
+USE_XZ= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sse \
--with-ogg="${LOCALBASE}" \
+ --disable-silent-rules \
--disable-thorough-tests \
--disable-xmms-plugin
-CPPFLAGS+= -I${WRKSRC}/include
MAKE_JOBS_SAFE= yes
-OPTIONS_DEFINE= ICONV
+OPTIONS_DEFINE= DOCS ICONV
OPTIONS_DEFAULT=ICONV
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MICONV}
USES+= iconv
-CONFIGURE_ARGS+=--with-libiconv-prefix="${LOCALBASE}"
-.else
-CONFIGURE_ARGS+=--without-libiconv-prefix
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
-MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
.if ${PORT_OPTIONS:MDOCS}
MAKE_ENV+= DOC=doc
.else
@@ -53,10 +52,6 @@ pre-patch:
@${REINPLACE_CMD} 's:^docdir = $$(datadir)/doc/$$(PACKAGE)-$$(VERSION):docdir = $$(datadir)/doc/$$(PACKAGE):' \
`find ${WRKSRC}/doc -name Makefile.in`
-# "obj" is magic to our make(1)
-post-configure:
- @${RM} -rf ${WRKSRC}/obj
-
post-build:
${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/flac.1
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 72f3a3237456..60d728331dda 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flac-1.2.1.tar.gz) = 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
-SIZE (flac-1.2.1.tar.gz) = 2009217
+SHA256 (flac-1.3.0.tar.xz) = fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc
+SIZE (flac-1.3.0.tar.xz) = 1084256
diff --git a/audio/flac/files/patch-Makefile.in b/audio/flac/files/patch-Makefile.in
index 14dd79539ad5..7246f1072586 100644
--- a/audio/flac/files/patch-Makefile.in
+++ b/audio/flac/files/patch-Makefile.in
@@ -1,14 +1,14 @@
$FreeBSD$
---- Makefile.in.orig
-+++ Makefile.in
-@@ -234,7 +234,7 @@
-
- AUTOMAKE_OPTIONS = foreign 1.7
-
--SUBDIRS = doc include m4 man src examples test build obj
-+SUBDIRS = $(DOC) include m4 man src test build
-
- DISTCLEANFILES = libtool-disable-static
-
+--- Makefile.in.orig 2013-05-27 10:11:58.639908000 +0200
++++ Makefile.in 2013-06-09 18:13:05.000000000 +0200
+@@ -323,7 +323,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = doc include m4 man src examples test build objs
++SUBDIRS = $(DOC) include m4 man src examples test build objs
+ EXTRA_DIST = \
+ COPYING.FDL \
+ COPYING.GPL \
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
index 75fe5afb534a..f4d604e92fac 100644
--- a/audio/flac/files/patch-configure
+++ b/audio/flac/files/patch-configure
@@ -1,14 +1,14 @@
$FreeBSD$
---- configure.orig
-+++ configure
-@@ -23490,7 +23490,7 @@
+--- configure.orig 2013-05-27 10:11:54.740045000 +0200
++++ configure 2013-06-09 18:15:53.000000000 +0200
+@@ -19807,7 +19807,7 @@ else
CPPFLAGS="-DNDEBUG $CPPFLAGS"
if test "x$GCC" = xyes; then
- CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
-- CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
-+ CFLAGS="-Wall -W $CFLAGS"
+ if test "x$user_cflags" = x; then
+- CFLAGS="-O3 -funroll-loops -Wall -W -Winline"
++ CFLAGS="-Wall -W"
+ fi
fi
fi
-
diff --git a/audio/flac/files/patch-man_flac.1 b/audio/flac/files/patch-man_flac.1
index 48102d8cd528..938598f371ed 100644
--- a/audio/flac/files/patch-man_flac.1
+++ b/audio/flac/files/patch-man_flac.1
@@ -1,13 +1,13 @@
$FreeBSD$
---- man/flac.1.orig
-+++ man/flac.1
-@@ -325,7 +325,7 @@
+--- man/flac.1.orig 2013-05-26 11:30:33.924201000 +0200
++++ man/flac.1 2013-06-09 18:16:59.000000000 +0200
+@@ -380,7 +380,7 @@ These flags can be used to invert the se
.PP
metaflac(1).
.PP
--The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/flac/html\fR on Debian GNU/Linux systems.
+-The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/libflac-doc/html\fR on Debian GNU/Linux systems.
+The programs are documented fully by HTML format documentation, available in \fI%%PREFIX%%/share/doc/flac/html\fR.
.SH "AUTHOR"
.PP
diff --git a/audio/flac/files/patch-src_libFLAC_Makefile.in b/audio/flac/files/patch-src_libFLAC_Makefile.in
deleted file mode 100644
index 83d8e416ea8c..000000000000
--- a/audio/flac/files/patch-src_libFLAC_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/libFLAC/Makefile.in.orig
-+++ src/libFLAC/Makefile.in
-@@ -249,7 +249,6 @@
- @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ia32/libFLAC-asm.la
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ppc/gas/libFLAC-asm.la
--@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LDFLAGS = ""
-
- libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index 60dea510fef6..87a1fba987d9 100644
--- a/audio/flac/pkg-plist
+++ b/audio/flac/pkg-plist
@@ -18,201 +18,16 @@ include/FLAC/stream_encoder.h
lib/libFLAC++.a
lib/libFLAC++.la
lib/libFLAC++.so
-lib/libFLAC++.so.8
+lib/libFLAC++.so.9
lib/libFLAC.a
lib/libFLAC.la
lib/libFLAC.so
-lib/libFLAC.so.10
+lib/libFLAC.so.11
libdata/pkgconfig/flac++.pc
libdata/pkgconfig/flac.pc
share/aclocal/libFLAC++.m4
share/aclocal/libFLAC.m4
%%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2all_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2export_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2export_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/all_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/assert_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000000.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000001.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000002.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/dirs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/files.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_enum.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_type.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__callbacks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__export.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__format.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level0.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__object.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__export.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level0.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__object.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__2__to__1__1__3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__3__to__1__1__4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__4__to__1__2__0.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/hierarchy.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/modules.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/ordinals_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Application-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Application.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__StreamInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Unknown-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Unknown.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Constant-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Constant.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Fixed-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Fixed.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim.html
%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
%%PORTDOCS%%%%DOCSDIR%%/html/comparison.html
%%PORTDOCS%%%%DOCSDIR%%/html/comparison__chopin_prelude_24.html
@@ -304,7 +119,6 @@ share/aclocal/libFLAC.m4
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ru
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/hw
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/api
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/FLAC++
diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile
index bee1a23f0ff9..10156b7efc60 100644
--- a/audio/flac123/Makefile
+++ b/audio/flac123/Makefile
@@ -7,14 +7,14 @@
PORTNAME= flac123
PORTVERSION= 0.0.11
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF/flac-tools/${PORTNAME}/${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Command-line player for flac audio files
-LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
+LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
ao.4:${PORTSDIR}/audio/libao \
popt.0:${PORTSDIR}/devel/popt
diff --git a/audio/gmtp/Makefile b/audio/gmtp/Makefile
index d44a9f4cdd5c..a17e90c3d24d 100644
--- a/audio/gmtp/Makefile
+++ b/audio/gmtp/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gmtp
PORTVERSION= 1.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/gMTP-${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-i386
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 71bce0e8565b..610aab5560a5 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkpod
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index ea12a30b9fef..5aab5295acd9 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -2,6 +2,7 @@
PORTNAME= harp
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index 0df2598635d6..ba5fc7338fce 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kid3
PORTVERSION= 2.3
+PORTREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= SF
@@ -31,7 +32,7 @@ CHROMAPRINT_DESC= Support for Chromaprint audio fingerprints
.if ${PORT_OPTIONS:MFLAC}
CMAKE_ARGS+= -DWITH_FLAC=ON
-LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac
+LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
.else
CMAKE_ARGS+= -DWITH_FLAC=OFF
.endif
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index b964e018d9d1..817984556bcc 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kid3
PORTVERSION= 1.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio kde
MASTER_SITES= SF
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= MP3/Ogg/FLAC tag editor for KDE
LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
- FLAC.10:${PORTSDIR}/audio/flac \
+ FLAC:${PORTSDIR}/audio/flac \
ogg:${PORTSDIR}/audio/libogg \
vorbis.4:${PORTSDIR}/audio/libvorbis \
mp4v2.10:${PORTSDIR}/multimedia/mp4v2 \
diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd/Makefile
index 148188de6805..2e2040c69bf2 100644
--- a/audio/kio-audiocd/Makefile
+++ b/audio/kio-audiocd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kio-audiocd
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -14,7 +15,7 @@ COMMENT= KDE IOSlave for accessing audio CDs
LICENSE= GPLv2
-LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
+LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
ogg.8:${PORTSDIR}/audio/libogg \
vorbis.4:${PORTSDIR}/audio/libvorbis
diff --git a/audio/libbs2b/Makefile b/audio/libbs2b/Makefile
index d70aaea5ede2..2e6b64a2a1f3 100644
--- a/audio/libbs2b/Makefile
+++ b/audio/libbs2b/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libbs2b
PORTVERSION= 3.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF/bs2b/bs2b/${PORTVERSION}
diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile
index 3a6b1a7af9d3..0b5d9cf8758b 100644
--- a/audio/libfishsound/Makefile
+++ b/audio/libfishsound/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libfishsound
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/libfishsound/ \
LOCAL/sunpoet
diff --git a/audio/libgig/Makefile b/audio/libgig/Makefile
index e30d17b6c351..76a402ccb21f 100644
--- a/audio/libgig/Makefile
+++ b/audio/libgig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgig
PORTVERSION= 3.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF/qsampler/${PORTNAME}/${PORTVERSION} \
http://download.linuxsampler.org/packages/
@@ -17,7 +17,7 @@ COMMENT= Gigasampler file loader library
LICENSE= GPLv2
-LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
+LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
sndfile.1:${PORTSDIR}/audio/libsndfile \
uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 8fdc595b760a..cc11e63f8651 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libsndfile
PORTVERSION= 1.0.25
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.mega-nerd.com/libsndfile/files/
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --disable-cpu-clip
.endif
.if ${PORT_OPTIONS:MEXTERNAL}
-LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac \
+LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac \
vorbis.4:${PORTSDIR}/audio/libvorbis
.else
CONFIGURE_ARGS+=--disable-external-libs
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 2732f6188d1d..dcf2aa521f1f 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lmms
PORTVERSION= 0.4.14
-PORTEPOCH= 1
+PORTEPOCH= 2
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 50391c62d078..d221b8a92630 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mixxx
PORTVERSION= 1.11.0
+PORTREVISION= 1
DISTVERSIONSUFFIX= -src
CATEGORIES= audio
MASTER_SITES= http://downloads.mixxx.org/%SUBDIR%/
diff --git a/audio/mous/Makefile b/audio/mous/Makefile
index 6771fb21599d..f9680676a253 100644
--- a/audio/mous/Makefile
+++ b/audio/mous/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mous
PORTVERSION= 1.1a
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://cloud.github.com/downloads/0x02/mous/
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 6645273a1f9c..918b7ca55375 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -4,14 +4,14 @@
PORTNAME= muine
PORTVERSION= 0.8.11
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= audio gnome
MASTER_SITES= GNOME
MAINTAINER= cy@FreeBSD.org
COMMENT= Mono based Gnome audio player
-LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
+LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
id3tag.0:${PORTSDIR}/audio/libid3tag \
gdbm:${PORTSDIR}/databases/gdbm \
vorbis.4:${PORTSDIR}/audio/libvorbis
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 4311c048cbfa..874f9587a36e 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= musicpd
PORTVERSION= 0.17.3
+PORTREVISION= 1
CATEGORIES= audio ipv6
MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION}
DISTNAME= mpd-${PORTVERSION}
@@ -73,7 +74,7 @@ MSG=You still have ${PREFIX}/etc/mpd.conf in existence-- this file is no longer
.endif
.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac
+LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
.else
CONFIGURE_ARGS+=--disable-flac \
--disable-oggflac
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index bbfd3de2b74e..09e9ee5e5138 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mythmusic
PORTVERSION= 0.26.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \
http://ftp.osuosl.org/pub/mythtv/old_releases/ \
@@ -15,7 +16,7 @@ MAINTAINER= decke@FreeBSD.org
COMMENT= Music playing plugin for MythTV
LIB_DEPENDS= cdio.13:${PORTSDIR}/sysutils/libcdio \
- FLAC.10:${PORTSDIR}/audio/flac \
+ FLAC:${PORTSDIR}/audio/flac \
vorbis.4:${PORTSDIR}/audio/libvorbis \
tag.1:${PORTSDIR}/audio/taglib \
fftw3f:${PORTSDIR}/math/fftw3-float
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index f1100bfd6d60..ea7406ffeee1 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ocp
PORTVERSION= 0.1.20
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= http://stian.cubic.org/ocp/ \
diff --git a/audio/p5-Audio-FLAC-Header/Makefile b/audio/p5-Audio-FLAC-Header/Makefile
index f3c3446bf82e..3d92700eea3c 100644
--- a/audio/p5-Audio-FLAC-Header/Makefile
+++ b/audio/p5-Audio-FLAC-Header/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Audio-FLAC-Header
PORTVERSION= 2.4
+PORTREVISION= 1
CATEGORIES= audio perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -14,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lippe@FreeBSD.org
COMMENT= Interface to FLAC header metadata
-LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac
+LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac
PERL_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile
index d4d978f6f814..1c4ad703c1f5 100644
--- a/audio/prokyon3/Makefile
+++ b/audio/prokyon3/Makefile
@@ -3,7 +3,7 @@
PORTNAME= prokyon3
PORTVERSION= 0.9.6
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index a1183efd3694..9f69f7016a6b 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rezound
DISTVERSION= 0.12.3beta
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/ReZound/${DISTVERSION}
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 8bb16bd6ad52..5ecdde0bbeb9 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sdl_mixer
PORTVERSION= 1.2.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/
DISTNAME= SDL_mixer-${PORTVERSION}
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 493e5e69b5f3..b539d58e35aa 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sdl_sound
PORTVERSION= 1.0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= http://offload1.icculus.org:9090/SDL_sound/downloads/ \
http://offload2.icculus.org:9090/SDL_sound/downloads/
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 4784dcc46c26..275ae306f524 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sox
PORTVERSION= 14.3.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= SF
@@ -111,7 +111,7 @@ CONFIGURE_ARGS+= --without-lame
.if ${PORT_OPTIONS:MFLAC}
CONFIGURE_ARGS+= --with-flac
-LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac
+LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
.else
CONFIGURE_ARGS+= --without-flac
.endif
diff --git a/audio/squash/Makefile b/audio/squash/Makefile
index 562000d750f3..f4cadf3cf5b7 100644
--- a/audio/squash/Makefile
+++ b/audio/squash/Makefile
@@ -6,7 +6,7 @@
PORTNAME= squash
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mandree@FreeBSD.org
COMMENT= Learning console-based MP3/OGG player
-LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac \
+LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac \
fftw.2:${PORTSDIR}/math/fftw \
id3-3.8.3:${PORTSDIR}/audio/id3lib \
mad.2:${PORTSDIR}/audio/mad \
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 3e0023c177df..7df92dc87eb4 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vorbis-tools
PORTVERSION= 1.4.0
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 3
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/vorbis/
@@ -13,7 +13,7 @@ COMMENT= Play, encode, and manage Ogg Vorbis files
LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao \
curl.6:${PORTSDIR}/ftp/curl \
- FLAC.10:${PORTSDIR}/audio/flac \
+ FLAC:${PORTSDIR}/audio/flac \
kate.4:${PORTSDIR}/multimedia/libkate \
speex.1:${PORTSDIR}/audio/speex \
vorbis.4:${PORTSDIR}/audio/libvorbis
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 640f97ce3735..c52b47bd7932 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmcd
PORTVERSION= 3.3.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= audio
MASTER_SITES= http://www.ibiblio.org/tkan/download/xmcd/3.3.2/src/
@@ -15,7 +15,7 @@ MAINTAINER= eischen@vigrid.com
COMMENT= Motif CD player
LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis \
- FLAC.10:${PORTSDIR}/audio/flac
+ FLAC:${PORTSDIR}/audio/flac
RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame
USE_MOTIF= yes
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index fb7b4a923f9a..b0515a026bb0 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -1,35 +1,33 @@
# $FreeBSD$
PORTNAME= xmms-flac
-PORTVERSION= 1.2.1
-PORTREVISION= 3
+PORTVERSION= 1.3.0
CATEGORIES= audio
-MASTER_SITES= SF/flac/flac-src/flac-${PORTVERSION}-src
+MASTER_SITES= http://downloads.xiph.org/releases/flac/
DISTNAME= flac-${PORTVERSION}
MAINTAINER= naddy@FreeBSD.org
COMMENT= XMMS input plugin for playing FLAC files
-LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
- FLAC.10:${PORTSDIR}/audio/flac \
- pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
+LIB_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms \
+ FLAC:${PORTSDIR}/audio/flac \
+ pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
ogg:${PORTSDIR}/audio/libogg
-USE_AUTOTOOLS= libtool
USES= gettext iconv
+USE_AUTOTOOLS= libtool
USE_GNOME= gtk12
USE_XORG= x11 xau xcb xdmcp xext xi
-CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \
- --with-ogg="${LOCALBASE}" \
- --with-xmms-prefix="${LOCALBASE}"
+USE_XZ= yes
+
+CONFIGURE_ARGS= --disable-silent-rules
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
MAKE_ARGS= LIBTOOL="${LIBTOOL} --tag=disable-static"
MAKEFILE= ${FILESDIR}/Makefile
MAKE_JOBS_SAFE= yes
-# "obj" is magic to our make(1)
-post-configure:
- @${RM} -rf ${WRKSRC}/obj
-
# XXX
post-install:
${RM} ${PREFIX}/lib/xmms/Input/libxmms-flac.la
diff --git a/audio/xmms-flac/distinfo b/audio/xmms-flac/distinfo
index 72f3a3237456..60d728331dda 100644
--- a/audio/xmms-flac/distinfo
+++ b/audio/xmms-flac/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flac-1.2.1.tar.gz) = 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
-SIZE (flac-1.2.1.tar.gz) = 2009217
+SHA256 (flac-1.3.0.tar.xz) = fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc
+SIZE (flac-1.3.0.tar.xz) = 1084256
diff --git a/audio/xmms-flac/files/patch-configure b/audio/xmms-flac/files/patch-configure
index 75fe5afb534a..f4d604e92fac 100644
--- a/audio/xmms-flac/files/patch-configure
+++ b/audio/xmms-flac/files/patch-configure
@@ -1,14 +1,14 @@
$FreeBSD$
---- configure.orig
-+++ configure
-@@ -23490,7 +23490,7 @@
+--- configure.orig 2013-05-27 10:11:54.740045000 +0200
++++ configure 2013-06-09 18:15:53.000000000 +0200
+@@ -19807,7 +19807,7 @@ else
CPPFLAGS="-DNDEBUG $CPPFLAGS"
if test "x$GCC" = xyes; then
- CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
-- CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
-+ CFLAGS="-Wall -W $CFLAGS"
+ if test "x$user_cflags" = x; then
+- CFLAGS="-O3 -funroll-loops -Wall -W -Winline"
++ CFLAGS="-Wall -W"
+ fi
fi
fi
-
diff --git a/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in b/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
index 8d8965c55cc2..acdd7b0b88e4 100644
--- a/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
+++ b/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
@@ -1,28 +1,9 @@
$FreeBSD$
---- src/plugin_xmms/Makefile.in.orig
-+++ src/plugin_xmms/Makefile.in
-@@ -147,7 +147,7 @@
- LIBS = @LIBS@
-
- # Don't build a static library
--LIBTOOL = $(top_builddir)/libtool-disable-static
-+LIBTOOL = @LIBTOOL@ --tag=disable-static
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -264,8 +264,7 @@
- $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
- $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
- $(top_builddir)/src/share/utf8/libutf8.la \
-- $(top_builddir)/src/libFLAC/libFLAC.la \
-- -L$(top_builddir)/src/libFLAC/.libs \
-+ -lFLAC \
- @OGG_LIBS@ \
- @XMMS_LIBS@ \
- @LIBICONV@
-@@ -283,8 +282,7 @@
+--- src/plugin_xmms/Makefile.in.orig 2013-05-27 10:11:57.951933000 +0200
++++ src/plugin_xmms/Makefile.in 2013-06-09 19:13:03.000000000 +0200
+@@ -127,8 +127,7 @@ libxmms_flac_la_DEPENDENCIES = \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
@@ -32,3 +13,13 @@ $FreeBSD$
am__objects_1 = charset.lo configure.lo fileinfo.lo http.lo plugin.lo \
tag.lo
am_libxmms_flac_la_OBJECTS = $(am__objects_1)
+@@ -360,8 +359,7 @@ libxmms_flac_la_LIBADD = \
+ $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
+ $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
+ $(top_builddir)/src/share/utf8/libutf8.la \
+- $(top_builddir)/src/libFLAC/libFLAC.la \
+- -L$(top_builddir)/src/libFLAC/.libs \
++ -lFLAC \
+ @XMMS_LIBS@ \
+ @LIBICONV@
+
diff --git a/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c b/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c
new file mode 100644
index 000000000000..6bb679e96229
--- /dev/null
+++ b/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/plugin_xmms/plugin.c.orig
++++ src/plugin_xmms/plugin.c
+@@ -140,7 +140,7 @@
+ static unsigned bitrate_history_[BITRATE_HIST_SIZE];
+
+
+-InputPlugin *get_iplugin_info(void)
++FLAC_API InputPlugin *get_iplugin_info(void)
+ {
+ flac_ip.description = g_strdup_printf("Reference FLAC Player v%s", FLAC__VERSION_STRING);
+ return &flac_ip;
diff --git a/audio/xmms-flac/pkg-descr b/audio/xmms-flac/pkg-descr
index 3de8dcdd0c2d..d9fc597580d1 100644
--- a/audio/xmms-flac/pkg-descr
+++ b/audio/xmms-flac/pkg-descr
@@ -1,5 +1,5 @@
-FLAC stands for Free Lossless Audio Codec.
+FLAC is an Open Source lossless audio codec.
This is an XMMS input plugin for FLAC files.
-WWW: http://flac.sourceforge.net/
+WWW: https://www.xiph.org/flac/
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index adb8efddb6c8..8230515eea80 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= xmms2
PORTVERSION= 0.8
-PORTREVISION?= 2
+PORTREVISION?= 3
DISTVERSIONSUFFIX=DrO_o
CATEGORIES?= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}