Chase multimedia/mp4v2 update.

PR:		ports/148643
Submitted by:	Christopher Key <cjk32 at cam.ac.uk>

23 files changed, 253 insertions, 51 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index c5d90d3b3756..f49ac47408be 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	1.4.10
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
@@ -17,7 +17,7 @@ COMMENT=	Media player for KDE
 
 LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
 		tunepimp.5:${PORTSDIR}/audio/libtunepimp \
-		mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
+		mp4v2.10:${PORTSDIR}/multimedia/mp4v2 \
 		xine.1:${PORTSDIR}/multimedia/libxine
 
 MIN_OPTIONS_VER=	${PORTNAME}-1.4.1
@@ -109,10 +109,14 @@ STRIP=		# none
 pre-extract:	check-options-version
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|LIBS="-ltunepimp  $$LIBS"|LIBS="-ltunepimp -liconv $$LIBS"|g' \
-	${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g;	\
+		s|LIBS="-ltunepimp  $$LIBS"|LIBS="-ltunepimp -liconv $$LIBS"|g; \
+		s|mp4\.h|mp4v2/mp4v2.h|g' \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|xx||g' ${WRKSRC}/po/Makefile.in
+	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
+		${WRKSRC}/amarok/src/metadata/mp4/mp4properties.h \
+		${WRKSRC}/amarok/src/metadata/mp4/mp4tag.h
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${TOUCH}
 
 post-install:
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 928995469fef..842fb75aae65 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cmus
 PORTVERSION=	2.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -104,7 +104,7 @@ CONFIGURE_ARGS+=CONFIG_TREMOR=y
 
 .if defined(WITH_MP4)
 LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
-LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mp4v2
 CONFIGURE_ARGS+=CONFIG_MP4=y
 PLIST_SUB+=	MP4=""
 .else
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index d531e3073147..3d8fed0df6b7 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	2.1.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20unstable%20%28gtk%202%29/${PORTVERSION}
 PKGNAMESUFFIX=	-devel
@@ -18,7 +18,7 @@ COMMENT=	GTK2 Tag editor for MP3 and OGG files
 LIB_DEPENDS=	id3tag:${PORTSDIR}/audio/libid3tag \
 		vorbis:${PORTSDIR}/audio/libvorbis \
 		FLAC:${PORTSDIR}/audio/flac \
-		mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+		mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 
 MAN1=		easytag.1
 CONFLICTS=	easytag-[0-9]*
@@ -43,4 +43,10 @@ CONFIGURE_ARGS+=	--disable-id3v23
 LIB_DEPENDS+=		id3:${PORTSDIR}/audio/id3lib
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
+		${WRKSRC}/${CONFIGURE_SCRIPT} \
+		${WRKSRC}/src/mp4_header.c \
+		${WRKSRC}/src/mp4_tag.c
+
 .include <bsd.port.mk>
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index fb94a4b9b600..9d2f3eeee043 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	2.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28gtk%202%29/${PORTVERSION}
 
@@ -17,7 +17,7 @@ COMMENT=	GTK2 Tag editor for MP3 and OGG files
 LIB_DEPENDS=	id3:${PORTSDIR}/audio/id3lib \
 		vorbis:${PORTSDIR}/audio/libvorbis \
 		FLAC:${PORTSDIR}/audio/flac \
-		mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+		mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 
 MAN1=		easytag.1
 CONFLICTS=	easytag-devel-[0-9]*
@@ -36,4 +36,9 @@ CONFIGURE_ARGS+=	--enable-wavpack
 CONFIGURE_ARGS+=	--disable-wavpack
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
+		${WRKSRC}/src/mp4_header.c \
+		${WRKSRC}/src/mp4_tag.c
+
 .include <bsd.port.mk>
diff --git a/audio/etoile-melodie/Makefile b/audio/etoile-melodie/Makefile
index 011b33c735b0..56fe535b8909 100644
--- a/audio/etoile-melodie/Makefile
+++ b/audio/etoile-melodie/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	melodie
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -17,7 +17,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project music player
 
 LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
-		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+		mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 
 USE_BZIP2=	yes
 USE_GNUSTEP=	yes
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 24f13c210fb7..a01b24e80f63 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	faac
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	MPEG-2 and MPEG-4 AAC audio encoder
 
-LIB_DEPENDS=	mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+LIB_DEPENDS=	mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 
 RESTRICTED=	Distribution in binary form is prohibited
 
@@ -24,6 +25,7 @@ MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
+CONFIGURE_ARGS= --with-mp4v2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="-lmp4v2"
@@ -35,6 +37,8 @@ MAN1=		faac.1
 
 post-patch:
 	@${ECHO_CMD} "" >> ${WRKSRC}/libfaac/psych.h
+	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
+		${WRKSRC}/frontend/main.c \
 
 pre-configure:
 	@cd ${WRKSRC}; ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake
diff --git a/audio/faac/files/patch-configure.in b/audio/faac/files/patch-configure.in
index 866cfe74f560..cc2b5fc2d6f8 100644
--- a/audio/faac/files/patch-configure.in
+++ b/audio/faac/files/patch-configure.in
@@ -1,15 +1,20 @@
---- configure.in.orig	Thu Aug 24 18:43:12 2006
-+++ configure.in	Thu Aug 24 18:45:13 2006
+--- ./configure.in.orig	2010-07-11 22:10:12.000000000 +0100
++++ ./configure.in	2010-07-11 22:10:49.000000000 +0100
 @@ -1,7 +1,7 @@
  AC_PREREQ(2.50)
- AC_INIT(FAAC, 1.25, faac-dev@lists.sourceforge.net)
+ AC_INIT(FAAC, 1.28, faac-dev@lists.sourceforge.net)
  AC_CONFIG_AUX_DIR(.)
 -AM_INIT_AUTOMAKE
 +AM_INIT_AUTOMAKE(faac, 1.25)
  
  AM_CONFIG_HEADER(config.h)
  
-@@ -35,6 +35,7 @@
+@@ -32,10 +32,11 @@
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+                             external_mp4v2=no, -lstdc++),
+-               external_mp4v2=no, [#include <mp4.h>])
++               external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
  
  if test x$external_mp4v2 = xyes; then
    AC_MSG_NOTICE([*** Building with external mp4v2 ***])
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index f67ce0eeb981..e40d9e45d544 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkpod
 PORTVERSION=	0.99.14
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -40,11 +40,14 @@ OPTIONS=	MPEG4IP	 "Enable AAC and H.264 support with MPEG4IP"	off \
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MPEG4IP) || exists(${LOCALBASE}/lib/libmp4v2.so)
-LIB_DEPENDS+=	mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+.if defined(WITH_MPEG4IP) && !defined(WITHOUT_MPEG4IP)
+LIB_DEPENDS+=	mp4v2.10:${PORTSDIR}/multimedia/mp4v2
+CONFIGURE_ARGS+=	--with-mp4v2
 # Define HAVE_GTK to unbreak the build with libmp4v2.so (it is built
 # without Gtk support by default, which can result in gtkpod breakage)
 MAKE_ARGS+=	CPPFLAGS="-DHAVE_GTK"
+.else
+CONFIGURE_ARGS+=	--without-mp4v2
 .endif
 .for x in faac faad
 .  if exists(${LOCALBASE}/bin/${x})
diff --git a/audio/gtkpod/files/patch-src__mp4file.c b/audio/gtkpod/files/patch-src__mp4file.c
new file mode 100644
index 000000000000..f31f6d23a10c
--- /dev/null
+++ b/audio/gtkpod/files/patch-src__mp4file.c
@@ -0,0 +1,99 @@
+--- ./src/mp4file.c.orig	2010-07-13 12:23:59.000000000 +0100
++++ ./src/mp4file.c	2010-07-13 12:39:31.000000000 +0100
+@@ -132,6 +132,8 @@
+ /* define metadata bug is present (see note at mp4_write_file_info()) */
+ #define MP4V2_HAS_METADATA_BUG TRUE
+ 
++#define HAVE_LIBMP4V2_19X 1
++
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <inttypes.h>
+@@ -399,7 +401,7 @@
+ #else
+ #warning "Album Artist field not supported with this version of libmp4v2. Album Artist support requires at least V1.6.0"
+ #endif
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 		    if (MP4GetMetadataComposer(mp4File, &value) && value != NULL)
+ #else
+ 		    if (MP4GetMetadataWriter(mp4File, &value) && value != NULL)
+@@ -413,7 +415,7 @@
+ 			track->comment = charset_to_utf8 (value);
+ 			g_free(value);
+ 		    }
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 		    if (MP4GetMetadataReleaseDate(mp4File, &value) && value != NULL)
+ #else
+ 		    if (MP4GetMetadataYear(mp4File, &value) && value != NULL)
+@@ -447,7 +449,7 @@
+ 			track->genre = charset_to_utf8 (value);
+ 			g_free(value);
+ 		    }
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 		    if (MP4GetMetadataBPM (mp4File, &numvalue))
+ #else
+ 		    if (MP4GetMetadataTempo (mp4File, &numvalue))
+@@ -541,7 +543,7 @@
+ 						      &m_track, &m_tracks);
+ 	    gboolean has_disk = MP4GetMetadataDisk (mp4File,
+ 	    &m_disk, &m_disks);*/
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 	    gboolean has_tempo = MP4GetMetadataBPM (mp4File,
+ 						      &m_tempo);
+ #else
+@@ -553,13 +555,13 @@
+ /*	    MP4GetMetadataName (mp4File, &m_name);
+ 	    MP4GetMetadataArtist (mp4File, &m_artist);
+ 	    MP4GetMetadataAlbumArtist (mp4File, &m_albumartist);
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 	    MP4GetMetadataComposer (mp4File, &m_writer);
+ #else
+ 	    MP4GetMetadataWriter (mp4File, &m_writer);
+ #endif
+ 	    MP4GetMetadataComment (mp4File, &m_comment);
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 	    MP4GetMetadataReleaseDate (mp4File, &m_year);
+ #else
+ 	    MP4GetMetadataYear (mp4File, &m_year);
+@@ -584,7 +586,7 @@
+ 	    g_free (value);
+ #endif
+ 	    value = charset_from_utf8 (track->composer);
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 	    MP4SetMetadataComposer (mp4File, value);
+ #else
+ 	    MP4SetMetadataWriter (mp4File, value);
+@@ -596,7 +598,7 @@
+ 	    g_free (value);
+ 
+ 	    value = g_strdup_printf ("%d", track->year);
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 	    MP4SetMetadataReleaseDate (mp4File, value);
+ #else
+ 	    MP4SetMetadataYear (mp4File, value);
+@@ -611,7 +613,7 @@
+ 
+ 	    MP4SetMetadataDisk (mp4File, track->cd_nr, track->cds);
+ 
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 	    MP4SetMetadataBPM (mp4File, track->BPM);
+ #else
+ 	    MP4SetMetadataTempo (mp4File, track->BPM);
+@@ -626,7 +628,7 @@
+ 	    g_free (value);
+ 
+ #if MP4V2_HAS_METADATA_BUG
+-#if HAVE_LIBMP4V2_2
++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X
+ 	    if (has_tempo) MP4SetMetadataBPM (mp4File, m_tempo);
+ #else
+ 	    if (has_tempo) MP4SetMetadataTempo (mp4File, m_tempo);
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index f5b5d6715be5..f4a3f4d1039d 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kid3
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio kde
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-kde4
@@ -20,7 +20,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		ogg.7:${PORTSDIR}/audio/libogg \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		tunepimp.5:${PORTSDIR}/audio/libtunepimp \
-		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+		mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USE_QT_VER=	4
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 2b63462cb67c..dd53d213e980 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kid3
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio kde
 MASTER_SITES=	SF
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		ogg.7:${PORTSDIR}/audio/libogg \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		tunepimp.5:${PORTSDIR}/audio/libtunepimp \
-		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+		mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index 1a350a34771e..b1c024f624c2 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtunepimp-old
 PORTVERSION=	0.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.osuosl.org/pub/musicbrainz/ \
@@ -20,7 +20,7 @@ COMMENT=	Client library for musicbrainz
 LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 		expat:${PORTSDIR}/textproc/expat2 \
 		mad:${PORTSDIR}/audio/libmad \
-		mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
+		mp4v2.10:${PORTSDIR}/multimedia/mp4v2 \
 		musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
 		ogg:${PORTSDIR}/audio/libogg \
 		tag:${PORTSDIR}/audio/taglib \
@@ -40,6 +40,8 @@ post-patch:
 		 s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lthr|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/lib/threads/posix/Makefile.in
+	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
+		${WRKSRC}/plugins/mp4/mp4.cpp
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|\(^LDFLAGS =.*\)|\1 ${PTHREAD_LIBS} -liconv|g' \
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 6b68ce7a6365..497ce7b3408b 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtunepimp
 PORTVERSION=	0.5.3
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/ \
@@ -19,7 +19,7 @@ COMMENT=	Client library for musicbrainz
 LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 		expat:${PORTSDIR}/textproc/expat2 \
 		mad:${PORTSDIR}/audio/libmad \
-		mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
+		mp4v2.10:${PORTSDIR}/multimedia/mp4v2 \
 		musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
 		ogg:${PORTSDIR}/audio/libogg \
 		tag:${PORTSDIR}/audio/taglib \
@@ -39,6 +39,8 @@ post-patch:
 		 s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lthr|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/lib/threads/posix/Makefile.in
+	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
+		${WRKSRC}/plugins/mp4/mp4.cpp
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|\(^LDFLAGS =.*\)|\1 ${PTHREAD_LIBS} -liconv|g' \
diff --git a/audio/libtunepimp/pkg-plist b/audio/libtunepimp/pkg-plist
index fae9fbb249bd..7afd6228e74f 100644
--- a/audio/libtunepimp/pkg-plist
+++ b/audio/libtunepimp/pkg-plist
@@ -24,5 +24,4 @@ lib/tunepimp/plugins/wma.tpp
 lib/tunepimp/plugins/wv.tpp
 @dirrm lib/tunepimp/plugins
 @dirrm lib/tunepimp
-@dirrm include/tunepimp
 @dirrm include/tunepimp-0.5
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index aca3fad93dc6..24953dd3c28e 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tellico
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc kde
 MASTER_SITES=	http://tellico-project.org/files/
 
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index da4871d4c4fc..65d53a5e1418 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
@@ -18,7 +18,7 @@ PKGNAMESUFFIX=	${PKG_NAME_SUFFIX}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Standards-based system to encode, stream and play MPEG-4 audio/video
 
-BUILD_DEPENDS=	mpeg4ip-libmp4v2>=1.6.1:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
+BUILD_DEPENDS=	mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2 \
 		${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 		faad.2:${PORTSDIR}/audio/faad \
@@ -28,7 +28,7 @@ LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2	\
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		x264.98:${PORTSDIR}/multimedia/x264
-RUN_DEPENDS=	mpeg4ip-libmp4v2>=1.6.1:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+RUN_DEPENDS=	mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2
 
 USE_GNOME=	gtk20
 USE_SDL=	sdl
@@ -147,24 +147,15 @@ BROKEN=		Does not compile
 post-patch:
 	@${TOUCH} -f ${WRKSRC}/bootstrapped
 # don't compile or use libmp4v2
-	@${REINPLACE_CMD} -e 's|mp4v2||; s|gnu||; s|mp4av||' \
+	@${REINPLACE_CMD} -e 's|mp4v2||' \
 		${WRKSRC}/lib/Makefile.in
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|-I$(top_srcdir)/lib/mp4v2||; \
 		s|$$(top_builddir)/lib/mp4v2/libmp4v2.la||; \
-		s|$$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la||; \
-		s|$$(top_builddir)/lib/mp4av/libmp4av.la||; \
 		s|$$(top_srcdir)/lib/mp4v2/libmp4v2.la||; \
-		s|$$(top_srcdir)/lib/gnu/libmpeg4ip_gnu.la||; \
-		s|$$(top_srcdir)/lib/mp4av/libmp4av.la||; \
-		s|@LIBS@|@LIBS@ -lmp4v2 -lmp4av -lmpeg4ip_gnu|; \
+		s|@LIBS@|@LIBS@ -lmp4v2|; \
 		s|nasm|yasm|'
-	@${REINPLACE_CMD} -e 's|mpeg4ip.h||; \
-		s|mpeg4ip_config.h||; s|mpeg4ip_version.h||' \
-		${WRKSRC}/include/Makefile.in
-	@${REINPLACE_CMD} -e 's|include_HEADERS = mpeg4ip_config.h||' \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|-Werror||' \
 		${WRKSRC}/common/video/iso-mpeg4/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|mp4venc_template.par||' \
@@ -172,7 +163,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*.[ch]" -or -name "*.cpp" | ${XARGS} -n 10 \
 		${REINPLACE_CMD} -e \
 		's|<stdint.h>|<inttypes.h>|; \
-		s|mp4v2/mp4.h|mp4.h|; \
 		s|<malloc.h>|<stdlib.h>|; \
 		s|<avcodec.h>|<libavcodec/avcodec.h>|; \
 		s|<swscale.h>|<libswscale/swscale.h>|; \
@@ -196,6 +186,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$${enable_ffmpeg}/lib/libavcodec.a|-lavcodec -lswscale|g' \
 		${WRKSRC}/configure
 
+# replace bundled mp4v2 with placeholder
+post-configure:
+	@${RM} -rf ${WRKSRC}/lib/mp4v2
+	@${MKDIR} ${WRKSRC}/lib/mp4v2
+	@echo '#include "mpeg4ip.h"' > ${WRKSRC}/lib/mp4v2/mp4.h
+
+
 post-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/server/util/mp4encode/mp4encode \
diff --git a/multimedia/mpeg4ip/files/patch-include__mpeg4ip.h b/multimedia/mpeg4ip/files/patch-include__mpeg4ip.h
new file mode 100644
index 000000000000..57da1d24bb27
--- /dev/null
+++ b/multimedia/mpeg4ip/files/patch-include__mpeg4ip.h
@@ -0,0 +1,43 @@
+--- ./include/mpeg4ip.h.orig	2006-08-07 19:27:00.000000000 +0100
++++ ./include/mpeg4ip.h	2010-07-14 18:47:44.000000000 +0100
+@@ -58,6 +58,8 @@
+ // file 
+ #include "mpeg4ip_version.h"
+ 
++#include <mp4v2/mp4v2.h>
++
+ #ifdef _WIN32
+ #include "mpeg4ip_win32.h"
+ #include "mpeg4ip_version.h"
+@@ -178,6 +180,7 @@
+ #define LLU  U64
+ 
+ #include <stdarg.h>
++/* from mp4v2/mp4v2.h
+ typedef void (*error_msg_func_t)(int loglevel,
+ 				 const char *lib,
+ 				 const char *fmt,
+@@ -186,6 +189,7 @@
+ 				   const char *lib,
+ 				   const char *fmt,
+ 				   ...);
++*/
+ #ifndef HAVE_IN_PORT_T
+ typedef uint16_t in_port_t;
+ #endif
+@@ -271,6 +275,7 @@
+ 
+ #ifndef __cplusplus
+ 
++/* from mp4v2/mp4v2.h
+ #ifndef bool
+  #if SIZEOF_BOOL == 8
+   typedef uint64_t bool;
+@@ -292,6 +297,7 @@
+  #define true TRUE
+  #endif
+ #endif
++*/
+ 
+ #endif
+ 
diff --git a/multimedia/mpeg4ip/files/patch-include__mpeg4ip_getopt.h b/multimedia/mpeg4ip/files/patch-include__mpeg4ip_getopt.h
new file mode 100644
index 000000000000..3677f0259efc
--- /dev/null
+++ b/multimedia/mpeg4ip/files/patch-include__mpeg4ip_getopt.h
@@ -0,0 +1,12 @@
+--- include/mpeg4ip_getopt.h.orig	Tue Oct 15 13:12:27 2002
++++ include/mpeg4ip_getopt.h	Mon Feb 24 05:23:50 2003
+@@ -11,6 +11,9 @@
+ #endif
+ 
+ #ifdef HAVE_GETOPT_H
++#ifdef __FreeBSD__
++#define __GNU_LIBRARY__
++#endif
+ #include <getopt.h>
+ #endif
+ 
diff --git a/multimedia/mpeg4ip/pkg-plist b/multimedia/mpeg4ip/pkg-plist
index cdc6cc1c2472..1c3c92b5e8fc 100644
--- a/multimedia/mpeg4ip/pkg-plist
+++ b/multimedia/mpeg4ip/pkg-plist
@@ -18,12 +18,26 @@ bin/sdl_pcm_play
 bin/yuvdump
 include/codec_plugin.h
 include/h264_sdp.h
+include/mp4av.h
+include/mp4av_aac.h
+include/mp4av_ac3.h
+include/mp4av_adts.h
+include/mp4av_amr.h
+include/mp4av_audio.h
+include/mp4av_h264.h
+include/mp4av_hinters.h
+include/mp4av_mp3.h
+include/mp4av_mpeg3.h
+include/mp4av_mpeg4.h
+include/mpeg4ip.h
 include/mpeg4_audio_config.h
 include/mpeg4_sdp.h
 include/mpeg4ip_bitstream.h
 include/mpeg4ip_byteswap.h
+include/mpeg4ip_config.h
 include/mpeg4ip_config_set.h
 include/mpeg4ip_getopt.h
+include/mpeg4ip_version.h
 include/rtp_plugin.h
 include/sdp.h
 include/sdp_error.h
@@ -37,6 +51,9 @@ lib/libismacryp.so.0
 lib/libmp4.la
 lib/libmp4.so
 lib/libmp4.so.0
+lib/libmp4av.la
+lib/libmp4av.so
+lib/libmp4av.so.0
 lib/libmp4util.la
 lib/libmp4util.so
 lib/libmp4util.so.0
@@ -59,6 +76,9 @@ lib/libmpeg4ip_ffmpeg.so.0
 lib/libmpeg4ip_fposrec.la
 lib/libmpeg4ip_fposrec.so
 lib/libmpeg4ip_fposrec.so.0
+lib/libmpeg4ip_gnu.la
+lib/libmpeg4ip_gnu.so
+lib/libmpeg4ip_gnu.so.0
 lib/libmpeg4ip_mpeg4_iso.la
 lib/libmpeg4ip_mpeg4_iso.so
 lib/libmpeg4ip_mpeg4_iso.so.0
diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index dfa0c7f0426b..7347f2054d97 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quodlibet
 PORTVERSION=	2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia audio python gnome
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -82,7 +82,7 @@ USE_GSTREAMER+=	wavpack
 .endif
 
 .if !defined(WITHOUT_MPEG4IP)
-LIB_DEPENDS+=	mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+LIB_DEPENDS+=	mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 USE_GSTREAMER+=	faad
 .endif
 
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 10c83c8a3bf0..4410551ceea6 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index f1449215c02a..49a6aa471a8a 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_musicindex
 PORTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www audio
 MASTER_SITES=	http://www.parisc-linux.org/~varenet/musicindex/ \
 		http://depot.fsck.ch/mirror/distfiles/
@@ -62,7 +62,7 @@ LIB_DEPENDS+=	id3tag:${PORTSDIR}/audio/libid3tag \
 .if defined(WITHOUT_MP4)
 CONFIGURE_ARGS+=	--disable-mp4
 .else
-LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mp4v2
 .endif
 
 .if defined(WITHOUT_VORBIS)
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index ed5c00f04737..23a0ba0cfb38 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kde4
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none