4 files changed, 32 insertions, 28 deletions

diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile
index da845d239e43..999f43bf7961 100644
--- a/multimedia/mp4v2/Makefile
+++ b/multimedia/mp4v2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mpeg4ip
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,9 +23,6 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 
-BUILD_WRKSRC=	${WRKSRC}/lib/mp4v2
-INSTALL_WRKSRC=	${WRKSRC}/lib/mp4v2
-
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/include/systems.h)
@@ -38,6 +34,7 @@ CFLAGS+=	-O2
 .endif
 
 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
@@ -45,8 +42,15 @@ post-patch:
 		-e 's|>&/|>/|; s|-Wmissing-declarations||; \
 			s|-Wmissing-prototypes||' \
 			${WRKSRC}/configure
-pre-build:
-	@cd ${WRKSRC}/lib/gnu && ${MAKE}
+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
diff --git a/multimedia/mp4v2/distinfo b/multimedia/mp4v2/distinfo
index 02820732b2b3..0243e6a5f5de 100644
--- a/multimedia/mp4v2/distinfo
+++ b/multimedia/mp4v2/distinfo
@@ -1,2 +1,2 @@
-MD5 (mpeg4ip-1.1.tar.gz) = fef0224a45485653a8db87bdd5c9e745
-SIZE (mpeg4ip-1.1.tar.gz) = 4351378
+MD5 (mpeg4ip-1.3.tar.gz) = 5a0301d3e395f17b2462ab95c2e5ba6a
+SIZE (mpeg4ip-1.3.tar.gz) = 4680258
diff --git a/multimedia/mp4v2/files/patch-include::mpeg4ip.h b/multimedia/mp4v2/files/patch-include::mpeg4ip.h
deleted file mode 100644
index 550c65913825..000000000000
--- a/multimedia/mp4v2/files/patch-include::mpeg4ip.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/mpeg4ip.h.orig	Wed Sep 29 14:43:52 2004
-+++ include/mpeg4ip.h	Wed Sep 29 14:44:10 2004
-@@ -160,14 +160,14 @@
- #include <errno.h>
- #include <stdlib.h>
- 
--#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#endif
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
- #endif
-+#if 0
- #if !defined(HAVE_INTTYPES_H) || !defined(HAVE_STDINT_H)
- #error "Don't have stdint.h or inttypes.h - no way to get uint8_t"
-+#endif
- #endif
- 
- #include <unistd.h>
diff --git a/multimedia/mp4v2/pkg-plist b/multimedia/mp4v2/pkg-plist
index 51483ab5f2f2..8e64c33547e1 100644
--- a/multimedia/mp4v2/pkg-plist
+++ b/multimedia/mp4v2/pkg-plist
@@ -1,12 +1,31 @@
+bin/mp4art
 bin/mp4dump
 bin/mp4extract
 bin/mp4info
 bin/mp4tags
 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.so
+lib/libmp4av.so.0
 lib/libmp4v2.a
 lib/libmp4v2.so
 lib/libmp4v2.so.0
+lib/libmpeg4ip_gnu.a
+lib/libmpeg4ip_gnu.so
+lib/libmpeg4ip_gnu.so.0