summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/alsaplayer/Makefile3
-rw-r--r--audio/audacity-devel/Makefile2
-rw-r--r--audio/audacity/Makefile2
-rw-r--r--audio/liteamp/Makefile3
-rw-r--r--audio/mp3splt/Makefile3
-rw-r--r--audio/mpg321/Makefile4
-rw-r--r--audio/musicpd/Makefile3
-rw-r--r--audio/net-rhythmbox/Makefile4
-rw-r--r--audio/normalize/Makefile3
-rw-r--r--audio/py-mad/Makefile3
-rw-r--r--audio/rhythmbox-devel/Makefile3
-rw-r--r--audio/rhythmbox/Makefile3
-rw-r--r--audio/sox/Makefile4
-rw-r--r--audio/squash/Makefile3
-rw-r--r--audio/sweep/Makefile4
-rw-r--r--audio/terminatorx/Makefile2
-rw-r--r--audio/trm/Makefile2
-rw-r--r--audio/xmms-mad/Makefile3
-rw-r--r--emulators/scummvm/Makefile3
-rw-r--r--games/scummvm/Makefile3
-rw-r--r--graphics/swfdec/Makefile3
-rw-r--r--multimedia/avidemux/Makefile3
-rw-r--r--multimedia/avidemux2/Makefile3
-rw-r--r--multimedia/avifile/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile3
-rw-r--r--multimedia/gstreamer-plugins80/Makefile3
-rw-r--r--multimedia/libxine/Makefile4
-rw-r--r--multimedia/mplayer/Makefile4
-rw-r--r--multimedia/ogle/Makefile3
-rw-r--r--multimedia/vlc-devel/Makefile3
-rw-r--r--multimedia/vlc/Makefile3
-rw-r--r--www/mod_musicindex/Makefile5
32 files changed, 60 insertions, 39 deletions
diff --git a/audio/alsaplayer/Makefile b/audio/alsaplayer/Makefile
index 32394efc2772..cc352ff2417a 100644
--- a/audio/alsaplayer/Makefile
+++ b/audio/alsaplayer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= alsaplayer
PORTVERSION= 0.99.75
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ftp://ftp.alsa-project.org/pub/people/andy/ \
http://www.alsaplayer.org/
@@ -14,7 +15,7 @@ MASTER_SITES= ftp://ftp.alsa-project.org/pub/people/andy/ \
MAINTAINER= co9@xs4all.nl
COMMENT= Audio player with pitch control and a GNOME GUI
-LIB_DEPENDS= mad.1:${PORTSDIR}/audio/mad \
+LIB_DEPENDS= mad.2:${PORTSDIR}/audio/mad \
sndfile.1:${PORTSDIR}/audio/libsndfile
USE_REINPLACE= yes
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index 101e0498588e..b83e81e53efa 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT= Audacity is a GUI editor for digital audio waveforms
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
- mad.1:${PORTSDIR}/audio/mad
+ mad.2:${PORTSDIR}/audio/mad
WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
GNU_CONFIGURE= yes
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 101e0498588e..b83e81e53efa 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -18,7 +18,7 @@ COMMENT= Audacity is a GUI editor for digital audio waveforms
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
- mad.1:${PORTSDIR}/audio/mad
+ mad.2:${PORTSDIR}/audio/mad
WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
GNU_CONFIGURE= yes
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 01b27becce9c..0b48ed93bd5d 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -6,6 +6,7 @@
PORTNAME= liteamp
PORTVERSION= 0.2.3.2
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= http://download.kldp.net/liteamp/
@@ -13,7 +14,7 @@ MAINTAINER= perky@FreeBSD.org
COMMENT= Light-weight Music Player for GNOME2
LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
- mad.1:${PORTSDIR}/audio/mad \
+ mad.2:${PORTSDIR}/audio/mad \
ogg.4:${PORTSDIR}/audio/libogg \
vorbisfile.3:${PORTSDIR}/audio/libvorbis
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index c8bb679e9be8..ab5dacebb03b 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mp3splt
PORTVERSION= 1.9
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= q@uni.de
COMMENT= Utility to split mp3 and ogg files (via CUE sheets)
-LIB_DEPENDS= mad.1:${PORTSDIR}/audio/mad \
+LIB_DEPENDS= mad.2:${PORTSDIR}/audio/mad \
vorbis.2:${PORTSDIR}/audio/libvorbis \
ogg.4:${PORTSDIR}/audio/libogg
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index a114902aa019..15cb1028f465 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mpg321
PORTVERSION= 0.2.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mpg321
@@ -16,7 +16,7 @@ MAINTAINER= naddy@FreeBSD.org
COMMENT= A free command-line mp3 player, compatible with mpg123
LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
- mad.1:${PORTSDIR}/audio/mad
+ mad.2:${PORTSDIR}/audio/mad
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-mpg123-symlink
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index ed94f1d32bc3..1dbf988191d4 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= musicpd
PORTVERSION= 0.9.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +17,7 @@ MAINTAINER= ports@mark.reidel.info
COMMENT= A remote-controllable music-daemon
LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao \
- mad.1:${PORTSDIR}/audio/mad
+ mad.2:${PORTSDIR}/audio/mad
GNU_CONFIGURE= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/audio/net-rhythmbox/Makefile b/audio/net-rhythmbox/Makefile
index 84849068887f..6958fc0de240 100644
--- a/audio/net-rhythmbox/Makefile
+++ b/audio/net-rhythmbox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= net-rhythmbox
PORTVERSION= 0.4.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio gnome
MASTER_SITES= http://download.raisdorf.net/files/
@@ -17,7 +17,7 @@ COMMENT= Audio player for the Gnome 2 desktop environment
LIB_DEPENDS= musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins \
FLAC.5:${PORTSDIR}/audio/flac \
- mad.1:${PORTSDIR}/audio/mad \
+ mad.2:${PORTSDIR}/audio/mad \
vorbis.2:${PORTSDIR}/audio/libvorbis
USE_X_PREFIX= yes
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 181377b875f6..5b8478b0debd 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -7,13 +7,14 @@
PORTNAME= normalize
PORTVERSION= 0.7.6
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www1.cs.columbia.edu/~cvaill/normalize/
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool for adjusting the volume of wave/MP3 files to a standard level
-LIB_DEPENDS= mad.1:${PORTSDIR}/audio/mad \
+LIB_DEPENDS= mad.2:${PORTSDIR}/audio/mad \
intl.5:${PORTSDIR}/devel/gettext
USE_BZIP2= yes
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index 81ad408c7c3a..6a0f63c8abe8 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -6,6 +6,7 @@
PORTNAME= mad
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= audio python
MASTER_SITES= http://spacepants.org/src/pymad/download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ DISTNAME= pymad-${PORTVERSION}
MAINTAINER= perky@FreeBSD.org
COMMENT= Python module that provides the MPEG Audio Decoder interface
-LIB_DEPENDS= mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS= mad.2:${PORTSDIR}/audio/mad
USE_REINPLACE= yes
USE_PYTHON= yes
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 197109570324..77cae8ddb7d0 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rhythmbox
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6
@@ -17,7 +18,7 @@ COMMENT= Audio player for the Gnome 2 desktop environment
LIB_DEPENDS= musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
FLAC.5:${PORTSDIR}/audio/flac \
- mad.1:${PORTSDIR}/audio/mad
+ mad.2:${PORTSDIR}/audio/mad
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 197109570324..77cae8ddb7d0 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rhythmbox
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6
@@ -17,7 +18,7 @@ COMMENT= Audio player for the Gnome 2 desktop environment
LIB_DEPENDS= musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
FLAC.5:${PORTSDIR}/audio/flac \
- mad.1:${PORTSDIR}/audio/mad
+ mad.2:${PORTSDIR}/audio/mad
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index b16d02e41a21..fd8f09c4b863 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
WITH_LAME= YES
.endif
-.if exists(${LOCALBASE}/lib/libmad.so.1)
+.if exists(${LOCALBASE}/lib/libmad.so.2)
WITH_MAD= YES
.endif
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --disable-lame
.if defined(WITH_MAD)
CONFIGURE_ARGS+= --enable-mad
-LIB_DEPENDS+= mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/mad
.else
CONFIGURE_ARGS+= --disable-mad
.endif
diff --git a/audio/squash/Makefile b/audio/squash/Makefile
index cee6758b32ca..76b25b5539e7 100644
--- a/audio/squash/Makefile
+++ b/audio/squash/Makefile
@@ -6,6 +6,7 @@
PORTNAME= squash
PORTVERSION= 1.0.p1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= squash
@@ -17,7 +18,7 @@ COMMENT= Learning console-based MP3/OGG player
LIB_DEPENDS+= FLAC.5:${PORTSDIR}/audio/flac \
fftw.2:${PORTSDIR}/math/fftw \
id3-3.8.2:${PORTSDIR}/audio/id3lib \
- mad.1:${PORTSDIR}/audio/mad \
+ mad.2:${PORTSDIR}/audio/mad \
vorbis.2:${PORTSDIR}/audio/libvorbis \
ao.3:${PORTSDIR}/audio/libao
RUN_DEPENDS= id3v2:${PORTSDIR}/audio/id3v2
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 04fe77d356fe..0f14fb8d478e 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sweep
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +19,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
samplerate.0:${PORTSDIR}/audio/libsamplerate \
vorbis.2:${PORTSDIR}/audio/libvorbis \
speex.2:${PORTSDIR}/audio/speex \
- mad.1:${PORTSDIR}/audio/mad \
+ mad.2:${PORTSDIR}/audio/mad \
tdb.1:${PORTSDIR}/databases/tdb
USE_X_PREFIX= yes
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index b1d34b68185b..7cead3dc07d9 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+= --disable-vorbis
.endif
.if !defined(WITHOUT_MAD)
-LIB_DEPENDS+= mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/mad
.else
CONFIGURE_ARGS+= --disable-mad
.endif
diff --git a/audio/trm/Makefile b/audio/trm/Makefile
index 18f88fed1c47..67f3a22944f9 100644
--- a/audio/trm/Makefile
+++ b/audio/trm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= trm
PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
ftp://ftp.nl.musicbrainz.org/ \
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index 98bc58e2b216..7dab589f65b9 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmms-mad
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xmms-mad
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= xmms-mad
MAINTAINER= dyeske@yahoo.com
COMMENT= A XMMS input plugin that uses libmad
-LIB_DEPENDS= mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS= mad.2:${PORTSDIR}/audio/mad
BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
diff --git a/emulators/scummvm/Makefile b/emulators/scummvm/Makefile
index 26a2d3336116..c070fe29ab9b 100644
--- a/emulators/scummvm/Makefile
+++ b/emulators/scummvm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scummvm
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= games emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +16,7 @@ MAINTAINER= alexander@trull.com
COMMENT= Free implementation of LucasArts S.C.U.M.M. interpreter
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
- mad.1:${PORTSDIR}/audio/mad
+ mad.2:${PORTSDIR}/audio/mad
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 26a2d3336116..c070fe29ab9b 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scummvm
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= games emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +16,7 @@ MAINTAINER= alexander@trull.com
COMMENT= Free implementation of LucasArts S.C.U.M.M. interpreter
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
- mad.1:${PORTSDIR}/audio/mad
+ mad.2:${PORTSDIR}/audio/mad
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 8fcbff05573b..854c9de27b75 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -8,6 +8,7 @@
PORTNAME= swfdec
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Flash Rendering Library
-LIB_DEPENDS= mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS= mad.2:${PORTSDIR}/audio/mad
USE_X_PREFIX= yes
USE_SDL= yes
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 0dd6a5cc22b0..d2a0cb1ccdc3 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -7,6 +7,7 @@
PORTNAME= avidemux
PORTVERSION= 0.9.0.110
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://fixounet.free.fr/avidemux/
DISTNAME= avidemux-0.9
@@ -16,7 +17,7 @@ MAINTAINER= amistry@am-productions.biz
COMMENT= Simple GUI-based video editor
LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
- mad.1:${PORTSDIR}/audio/mad \
+ mad.2:${PORTSDIR}/audio/mad \
freetype.9:${PORTSDIR}/print/freetype2
BUILD_DEPENDS= \
${X11BASE}/include/X11/extensions/Xvlib.h:${PORTSDIR}/graphics/xv
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 6bb3bfc5f652..e8ebd159a0df 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= avidemux2
PORTVERSION= 2.0.18
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://fixounet.free.fr/avidemux/
DISTNAME= avidemux-2.0.18
@@ -15,7 +16,7 @@ MAINTAINER= amistry@am-productions.biz
COMMENT= Simple GUI based video editor
LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
- mad.1:${PORTSDIR}/audio/mad
+ mad.2:${PORTSDIR}/audio/mad
BUILD_DEPENDS= \
${X11BASE}/include/X11/extensions/Xvlib.h:${PORTSDIR}/graphics/xv
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 5710a65a1e7a..700f74260efc 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -108,7 +108,7 @@ PLIST_SUB+= A52="@comment "
# libmad
.if !defined(WITHOUT_MAD)
-LIB_DEPENDS+= mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/mad
CONFIGURE_ARGS+= --enable-mad \
--enable-libmad
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index e485eee7a09d..7f9075ba2454 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -541,7 +541,8 @@ PLIST_SUB+= LIBSIDPLAY=""
CONFIGURE_ARGS+= --disable-mad
PLIST_SUB+= LIBMAD="@comment "
.else
-LIB_DEPENDS+= mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \
+ id3tag.2:${PORTSDIR}/audio/libid3tag
PLIST_SUB+= LIBMAD=""
.endif
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index e485eee7a09d..7f9075ba2454 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -541,7 +541,8 @@ PLIST_SUB+= LIBSIDPLAY=""
CONFIGURE_ARGS+= --disable-mad
PLIST_SUB+= LIBMAD="@comment "
.else
-LIB_DEPENDS+= mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \
+ id3tag.2:${PORTSDIR}/audio/libid3tag
PLIST_SUB+= LIBMAD=""
.endif
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index f3f677b44deb..0b1e2bfbe480 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine
PORTVERSION= 1.0.r2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,7 +22,7 @@ LIB_DEPENDS= FLAC.5:${PORTSDIR}/audio/flac \
a52.0:${PORTSDIR}/audio/liba52 \
ogg.4:${PORTSDIR}/audio/libogg \
vorbis.2:${PORTSDIR}/audio/libvorbis \
- mad.1:${PORTSDIR}/audio/mad \
+ mad.2:${PORTSDIR}/audio/mad \
speex.2:${PORTSDIR}/audio/speex \
iconv.3:${PORTSDIR}/converters/libiconv \
intl.5:${PORTSDIR}/devel/gettext \
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 011b0c53b3b9..2b316fe3c64c 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -257,7 +257,7 @@ WITH_LIBDVDNAV= yes
WITH_LIBUNGIF= yes
.endif
-.if exists(${LOCALBASE}/lib/libmad.so.1)
+.if exists(${LOCALBASE}/lib/libmad.so.2)
WITH_MAD= yes
.endif
@@ -399,7 +399,7 @@ CONFIGURE_ARGS+= --disable-libdv
.endif
.if defined(WITH_MAD)
-LIB_DEPENDS+= mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/mad
CONFIGURE_ARGS+= --enable-mad \
--with-madlibdir=${LOCALBASE}/lib
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index e5fd26842805..f9c77b6eeb2f 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ogle
PORTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
@@ -16,7 +17,7 @@ COMMENT= Open DVD player that supports DVD menus
LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \
dvdread.3:${PORTSDIR}/multimedia/libdvdread \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- mad.1:${PORTSDIR}/audio/mad \
+ mad.2:${PORTSDIR}/audio/mad \
xml2.5:${PORTSDIR}/textproc/libxml2
USE_REINPLACE= yes
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 09e07278171c..83f417727631 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vlc
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/
@@ -15,7 +16,7 @@ COMMENT= An X11 video streaming client/server solution
LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
dvdread.3:${PORTSDIR}/multimedia/libdvdread \
- mad.1:${PORTSDIR}/audio/mad \
+ mad.2:${PORTSDIR}/audio/mad \
avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
a52.0:${PORTSDIR}/audio/liba52 \
intl.5:${PORTSDIR}/devel/gettext \
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 09e07278171c..83f417727631 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vlc
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/
@@ -15,7 +16,7 @@ COMMENT= An X11 video streaming client/server solution
LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
dvdread.3:${PORTSDIR}/multimedia/libdvdread \
- mad.1:${PORTSDIR}/audio/mad \
+ mad.2:${PORTSDIR}/audio/mad \
avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
a52.0:${PORTSDIR}/audio/liba52 \
intl.5:${PORTSDIR}/devel/gettext \
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index ef0043df1334..ad7aaa0c066b 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mod_musicindex
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= www audio
MASTER_SITES= http://www.esiee.fr/~puffin/musicindex/
DISTNAME= libapache-mod-musicindex_${PORTVERSION}
@@ -18,8 +19,8 @@ BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
LIB_DEPENDS= ogg.4:${PORTSDIR}/audio/libogg \
vorbis.2:${PORTSDIR}/audio/libvorbis \
- id3tag.1:${PORTSDIR}/audio/mad \
- mad.1:${PORTSDIR}/audio/mad
+ id3tag.2:${PORTSDIR}/audio/libid3tag \
+ mad.2:${PORTSDIR}/audio/libmad
APXS?= ${LOCALBASE}/sbin/apxs
USE_GMAKE= yes