4 files changed, 67 insertions, 56 deletions

diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index 3c5d1ff406d6..cd211c8a81a9 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gpac-libm4systems
-DISTVERSION=	0.3.0
+DISTVERSION=	0.4.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gpac
@@ -22,7 +22,7 @@ HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
-BUILD_WRKSRC=	${WRKSRC}/M4Systems
+BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/bin/gcc
 
 CONFIGURE_ARGS=	--cc="${CC}" \
@@ -47,7 +47,7 @@ do-install:
 	${MKDIR} ${PREFIX}/include/gpac
 	cd ${WRKSRC}/include/gpac && ${FIND} . | \
 		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/gpac
-	${INSTALL_DATA} ${INSTALL_WRKSRC}/libm4systems.so ${PREFIX}/lib
-	${INSTALL_DATA} ${INSTALL_WRKSRC}/libm4systems_static.a ${PREFIX}/lib
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/libgpac.so ${PREFIX}/lib
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/libgpac_static.a ${PREFIX}/lib
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/gpac-libgpac/distinfo b/multimedia/gpac-libgpac/distinfo
index 3854e9ea6665..7d24b438dfeb 100644
--- a/multimedia/gpac-libgpac/distinfo
+++ b/multimedia/gpac-libgpac/distinfo
@@ -1,2 +1,2 @@
-MD5 (gpac-0.3.0.tar.gz) = a321362d5e1b338678457f77ecb28b4c
-SIZE (gpac-0.3.0.tar.gz) = 2831455
+MD5 (gpac-0.4.0.tar.gz) = a8b4b3206cabda946850240f1e7aea93
+SIZE (gpac-0.4.0.tar.gz) = 2836606
diff --git a/multimedia/gpac-libgpac/files/patch-M4Systems-Tools-linux-os_net.c b/multimedia/gpac-libgpac/files/patch-M4Systems-Tools-linux-os_net.c
deleted file mode 100644
index 50270eee4c10..000000000000
--- a/multimedia/gpac-libgpac/files/patch-M4Systems-Tools-linux-os_net.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- M4Systems/Tools/linux/os_net.c.orig	Tue Feb  1 13:50:56 2005
-+++ M4Systems/Tools/linux/os_net.c	Wed May  4 13:09:09 2005
-@@ -41,6 +41,9 @@
- #include <netinet/tcp.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
-+#if __FreeBSD_osversion < 500000
-+#include <sys/time.h>
-+#endif
- 
- 
- #define INVALID_SOCKET -1
diff --git a/multimedia/gpac-libgpac/pkg-plist b/multimedia/gpac-libgpac/pkg-plist
index 63d9118d0045..f0c87f80232e 100644
--- a/multimedia/gpac-libgpac/pkg-plist
+++ b/multimedia/gpac-libgpac/pkg-plist
@@ -1,39 +1,62 @@
-include/gpac/intern/avilib.h
-include/gpac/intern/m4_author_dev.h
-include/gpac/intern/m4_bifs_dev.h
-include/gpac/intern/m4_bifs_tables.h
-include/gpac/intern/m4_crypt_dev.h
-include/gpac/intern/m4_esm_dev.h
-include/gpac/intern/m4_ietf_dev.h
-include/gpac/intern/m4_isomedia_dev.h
-include/gpac/intern/m4_od_dev.h
-include/gpac/intern/m4_render_dev.h
-include/gpac/intern/m4_scenegraph_dev.h
-include/gpac/intern/m4_swf_dev.h
-include/gpac/m4_author.h
-include/gpac/m4_avhw.h
-include/gpac/m4_bifs.h
-include/gpac/m4_config.h
-include/gpac/m4_crypt.h
-include/gpac/m4_decoder.h
-include/gpac/m4_descriptors.h
-include/gpac/m4_ietf.h
-include/gpac/m4_isomedia.h
-include/gpac/m4_math.h
-include/gpac/m4_mpeg4_nodes.h
-include/gpac/m4_network.h
-include/gpac/m4_ogg.h
-include/gpac/m4_raster2d.h
-include/gpac/m4_render.h
-include/gpac/m4_scenegraph.h
-include/gpac/m4_scenegraph_svg.h
-include/gpac/m4_scenegraph_vrml.h
-include/gpac/m4_svg_nodes.h
-include/gpac/m4_terminal.h
-include/gpac/m4_tools.h
-include/gpac/m4_user.h
-include/gpac/m4_x3d_nodes.h
-lib/libm4systems.so
-lib/libm4systems_static.a
-@dirrm include/gpac/intern
+include/gpac/avparse.h
+include/gpac/base_coding.h
+include/gpac/bifs.h
+include/gpac/bifsengine.h
+include/gpac/bitstream.h
+include/gpac/config.h
+include/gpac/constants.h
+include/gpac/crypt.h
+include/gpac/download.h
+include/gpac/ietf.h
+include/gpac/internal/avilib.h
+include/gpac/internal/bifs_dev.h
+include/gpac/internal/bifs_tables.h
+include/gpac/internal/crypt_dev.h
+include/gpac/internal/ietf_dev.h
+include/gpac/internal/isomedia_dev.h
+include/gpac/internal/media_dev.h
+include/gpac/internal/odf_dev.h
+include/gpac/internal/ogg.h
+include/gpac/internal/renderer_dev.h
+include/gpac/internal/scenegraph_dev.h
+include/gpac/internal/swf_dev.h
+include/gpac/internal/terminal_dev.h
+include/gpac/ismacryp.h
+include/gpac/isomedia.h
+include/gpac/list.h
+include/gpac/math.h
+include/gpac/media_tools.h
+include/gpac/mediaobject.h
+include/gpac/module.h
+include/gpac/modules/audio_out.h
+include/gpac/modules/codec.h
+include/gpac/modules/font.h
+include/gpac/modules/raster2d.h
+include/gpac/modules/service.h
+include/gpac/modules/video_out.h
+include/gpac/mpeg4_odf.h
+include/gpac/network.h
+include/gpac/nodes_mpeg4.h
+include/gpac/nodes_svg.h
+include/gpac/nodes_x3d.h
+include/gpac/options.h
+include/gpac/path2d.h
+include/gpac/renderer.h
+include/gpac/scene_manager.h
+include/gpac/scenegraph.h
+include/gpac/scenegraph_svg.h
+include/gpac/scenegraph_vrml.h
+include/gpac/setup.h
+include/gpac/terminal.h
+include/gpac/thread.h
+include/gpac/token.h
+include/gpac/tools.h
+include/gpac/user.h
+include/gpac/utf.h
+include/gpac/xml.h
+include/gpac/yuv.h
+lib/libgpac.so
+lib/libgpac_static.a
+@dirrm include/gpac/modules
+@dirrm include/gpac/internal
 @dirrm include/gpac