Update mp4v2 to 1.9.1 after repocopy from multimedia/mpeg4ip-libmp4v2.

MPEG4IP is no longer maintained[1]. mp4v2 [2] forked the libmp4v2
components, and is under active developement.

[1] http://mpeg4ip.sourceforge.net/
[2] http://code.google.com/p/mp4v2/

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

9 files changed, 60 insertions, 118 deletions

diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile
index d3bb1e1f217..d0ea09df47e 100644
--- a/multimedia/mp4v2/Makefile
+++ b/multimedia/mp4v2/Makefile
@@ -5,50 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mpeg4ip
-PORTVERSION=	1.6.1
+PORTNAME=	mp4v2
+PORTVERSION=	1.9.1
 CATEGORIES=	multimedia
-MASTER_SITES=	LOCAL/ahze
-# http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMESUFFIX=	-libmp4v2
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	multimedia@FreeBSD.org
-COMMENT=	Mpeg-4 library and tools from mpeg4ip
+COMMENT=	Library and tools to read, create, and modify mp4 files
 
-USE_AUTOTOOLS=	libtool:22
+CONFLICTS=	mpeg4ip-libmp4v2-[0-9.]*
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
-USE_GNOME=	gnometarget
+MAKEFILE=	GNUmakefile
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
+CONFIGURE_ENV=	"FOUND_HELP2MAN=no"
 
-post-patch:
-	${TOUCH} -f ${WRKSRC}/bootstrapped
-# Speed up configure by not using 2 unneeded configure scripts.
-	@${ECHO_CMD} "" > ${WRKSRC}/lib/rtp/configure
-	@${ECHO_CMD} "" > ${WRKSRC}/lib/SDLAudio/configure
-	@${REINPLACE_CMD} \
-		-e 's|>&/|>/|; s|-Wmissing-declarations||; \
-			s|-Wmissing-prototypes||; \
-			s|nasm -r|nasm -v|' \
-			${WRKSRC}/configure
-do-build:
-.for dir in lib/gnu lib/mp4av lib/mp4v2
-	@(cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.endfor
-
-do-install:
-.for dir in lib/gnu lib/mp4av lib/mp4v2
-	@(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.endfor
-
-post-install:
-.for i in include/mpeg4ip.h include/mpeg4ip_version.h mpeg4ip_config.h
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include
-.endfor
+MAN1=	mp4art.1 \
+	mp4file.1 \
+	mp4subtitle.1 \
+	mp4track.1
 
 .include <bsd.port.mk>
diff --git a/multimedia/mp4v2/distinfo b/multimedia/mp4v2/distinfo
index beecfaf4541..39dac0f3a8f 100644
--- a/multimedia/mp4v2/distinfo
+++ b/multimedia/mp4v2/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpeg4ip-1.6.1.tar.gz) = 59e9d9cb7aad0a9605fb6015e7f0b197
-SHA256 (mpeg4ip-1.6.1.tar.gz) = 7049793ab18efc7d36b0581ecf137b59b1d9e4cee1df20a4241ffd37ce510214
-SIZE (mpeg4ip-1.6.1.tar.gz) = 6324289
+MD5 (mp4v2-1.9.1.tar.bz2) = 986701929ef15b03155ac4fb16444797
+SHA256 (mp4v2-1.9.1.tar.bz2) = 5c381caeab2326fc48cfda0fe202bdb8ba0ae624d9c97ad7680a2b07e2c2e3b4
+SIZE (mp4v2-1.9.1.tar.bz2) = 432943
diff --git a/multimedia/mp4v2/files/patch-GNUmakefile.in b/multimedia/mp4v2/files/patch-GNUmakefile.in
new file mode 100644
index 00000000000..f8bef790c0c
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-GNUmakefile.in
@@ -0,0 +1,11 @@
+--- ./GNUmakefile.in.orig	2010-07-12 21:25:25.000000000 +0100
++++ ./GNUmakefile.in	2010-07-12 21:26:04.000000000 +0100
+@@ -443,7 +443,7 @@
+ lib_LTLIBRARIES = libmp4v2.la
+ 
+ ###############################################################################
+-libmp4v2_la_LDFLAGS = -version-number $(PROJECT_version_major):$(PROJECT_version_minor):$(PROJECT_version_point) $(X_libmp4v2_la_LDFLAGS)
++libmp4v2_la_LDFLAGS = -version-info 10:1:9
+ libmp4v2_la_SOURCES = src/3gp.cpp src/atom_ac3.cpp src/atom_amr.cpp \
+ 	src/atom_avc1.cpp src/atom_avcC.cpp src/atom_chpl.cpp \
+ 	src/atom_colr.cpp src/atom_d263.cpp src/atom_dac3.cpp \
diff --git a/multimedia/mp4v2/files/patch-include::mpeg4ip_getopt.h b/multimedia/mp4v2/files/patch-include::mpeg4ip_getopt.h
deleted file mode 100644
index 3677f0259ef..00000000000
--- a/multimedia/mp4v2/files/patch-include::mpeg4ip_getopt.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/mp4v2/files/patch-include__mp4v2__itmf_tags.h b/multimedia/mp4v2/files/patch-include__mp4v2__itmf_tags.h
new file mode 100644
index 00000000000..a29fd4a9777
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-include__mp4v2__itmf_tags.h
@@ -0,0 +1,11 @@
+--- ./include/mp4v2/itmf_tags.h.orig	2010-07-14 16:35:27.000000000 +0100
++++ ./include/mp4v2/itmf_tags.h	2010-07-14 16:35:35.000000000 +0100
+@@ -122,7 +122,7 @@
+  *  @return structure with all tags missing.
+  */
+ MP4V2_EXPORT
+-const MP4Tags* MP4TagsAlloc();
++const MP4Tags* MP4TagsAlloc(void);
+ 
+ /** Fetch data from mp4 file and populate structure.
+  *
diff --git a/multimedia/mp4v2/files/patch-lib::mp4v2::util::mp4tags.cpp b/multimedia/mp4v2/files/patch-lib::mp4v2::util::mp4tags.cpp
deleted file mode 100644
index a1a61782802..00000000000
--- a/multimedia/mp4v2/files/patch-lib::mp4v2::util::mp4tags.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/mp4v2/util/mp4tags.cpp.orig	Thu Nov 11 03:16:39 2004
-+++ lib/mp4v2/util/mp4tags.cpp	Thu Nov 11 03:23:05 2004
-@@ -178,7 +178,7 @@
-     }
-     
-     /* Set the other relevant attributes */
--    for (int i = 0;  i < UCHAR_MAX;  i++) {
-+    for (int i = 0;  i < (int)UCHAR_MAX;  i++) {
-       if (tags[i]) {
-         switch(i) {
-         case OPT_ALBUM:   MP4SetMetadataAlbum(h, tags[i]); break;
diff --git a/multimedia/mp4v2/files/patch-mpeg4ip_config.h.in b/multimedia/mp4v2/files/patch-mpeg4ip_config.h.in
deleted file mode 100644
index 8bfb7a0aff7..00000000000
--- a/multimedia/mp4v2/files/patch-mpeg4ip_config.h.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- mpeg4ip_config.h.in.orig	Tue May 18 13:31:06 2004
-+++ mpeg4ip_config.h.in	Wed Sep 29 14:40:59 2004
-@@ -25,16 +25,12 @@
- #undef HAVE_FPOS_T___POS
- 
- /* Define to 1 if you have the `getopt' function. */
--#undef HAVE_GETOPT
- 
- /* Define to 1 if you have the <getopt.h> header file. */
--#undef HAVE_GETOPT_H
- 
- /* Define to 1 if you have the `getopt_long' function. */
--#undef HAVE_GETOPT_LONG
- 
- /* Define to 1 if you have the `getopt_long_only' function. */
--#undef HAVE_GETOPT_LONG_ONLY
- 
- /* Define to 1 if you have the `getrusage' function. */
- #undef HAVE_GETRUSAGE
-@@ -67,7 +63,6 @@
- #undef HAVE_IPv6
- 
- /* Define to 1 if you have the `gnugetopt' library (-lgnugetopt). */
--#undef HAVE_LIBGNUGETOPT
- 
- /* have libmpeg2 decoder library */
- #undef HAVE_LIBMPEG2
diff --git a/multimedia/mp4v2/pkg-descr b/multimedia/mp4v2/pkg-descr
index 76c7e44c885..b4629f1a0c1 100644
--- a/multimedia/mp4v2/pkg-descr
+++ b/multimedia/mp4v2/pkg-descr
@@ -1,3 +1,3 @@
-Mpeg4 library and tools from mpeg4ip
+Library and tools to read, create, and modify mp4 files.
 
-WWW: http://mpeg4ip.sourceforge.net/
+WWW: http://code.google.com/p/mp4v2/
diff --git a/multimedia/mp4v2/pkg-plist b/multimedia/mp4v2/pkg-plist
index 0678dba656e..e9e42b3ef00 100644
--- a/multimedia/mp4v2/pkg-plist
+++ b/multimedia/mp4v2/pkg-plist
@@ -1,34 +1,29 @@
 bin/mp4art
-bin/mp4dump
+bin/mp4chaps
 bin/mp4extract
+bin/mp4file
 bin/mp4info
+bin/mp4subtitle
 bin/mp4tags
+bin/mp4track
 bin/mp4trackdump
-bin/mp4videoinfo
-include/mp4.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/mpeg4ip_config.h
-include/mpeg4ip_version.h
-lib/libmp4av.a
-lib/libmp4av.la
-lib/libmp4av.so
-lib/libmp4av.so.0
+include/mp4v2/project.h
+include/mp4v2/chapter.h
+include/mp4v2/file.h
+include/mp4v2/file_prop.h
+include/mp4v2/general.h
+include/mp4v2/isma.h
+include/mp4v2/itmf_generic.h
+include/mp4v2/itmf_tags.h
+include/mp4v2/meta.h
+include/mp4v2/mp4v2.h
+include/mp4v2/platform.h
+include/mp4v2/sample.h
+include/mp4v2/streaming.h
+include/mp4v2/track.h
+include/mp4v2/track_prop.h
 lib/libmp4v2.a
 lib/libmp4v2.la
 lib/libmp4v2.so
-lib/libmp4v2.so.0
-lib/libmpeg4ip_gnu.a
-lib/libmpeg4ip_gnu.la
-lib/libmpeg4ip_gnu.so
-lib/libmpeg4ip_gnu.so.0
+lib/libmp4v2.so.10
+@dirrm include/mp4v2