6 files changed, 2 insertions, 118 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 487847a5b1b8..ef61565ca429 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -36,7 +36,7 @@
     SUBDIR += gnonlin
     SUBDIR += goggles
     SUBDIR += gopchop
-    SUBDIR += gpac-libm4systems
+    SUBDIR += gpac-libgpac
     SUBDIR += grpplaylist
     SUBDIR += gstreamer
     SUBDIR += gstreamer-editor
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index 44afeb55348f..0521499678b4 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gpac-libm4systems
+PORTNAME=	gpac-libgpac
 DISTVERSION=	0.4.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/multimedia/gpac-libm4systems/Makefile b/multimedia/gpac-libm4systems/Makefile
deleted file mode 100644
index 44afeb55348f..000000000000
--- a/multimedia/gpac-libm4systems/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for:	gpac-libm4systems
-# Date created:		2005-05-04
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gpac-libm4systems
-DISTVERSION=	0.4.0
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gpac
-DISTNAME=	gpac-${DISTVERSION}
-
-MAINTAINER=	ahze@FreeBSD.org
-COMMENT=	Gpac MPEG-4 Systems library and headers
-
-WRKSRC=		${WRKDIR}/gpac
-ALL_TARGET=	lib
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-USE_REINPLACE=	yes
-
-BUILD_WRKSRC=	${WRKSRC}/src
-INSTALL_WRKSRC=	${WRKSRC}/bin/gcc
-
-CONFIGURE_ARGS=	--cc="${CC}" \
-		--extra-cflags="${CFLAGS} ${PTHREAD_CFLAGS} -fPIC" \
-		--extra-ldflags="${LDFLAGS} ${PTHREAD_LIBS}"
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
-		${WRKSRC}/include/gpac/setup.h
-	@${RM} -f ${WRKSRC}/include/gpac/setup.h.bak
-.endif
-	${CHMOD} +x ${WRKSRC}/configure
-
-do-install:
-	${MKDIR} ${PREFIX}/include/gpac
-	cd ${WRKSRC}/include/gpac && ${FIND} . | \
-		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/gpac
-	${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-libm4systems/distinfo b/multimedia/gpac-libm4systems/distinfo
deleted file mode 100644
index 7d24b438dfeb..000000000000
--- a/multimedia/gpac-libm4systems/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gpac-0.4.0.tar.gz) = a8b4b3206cabda946850240f1e7aea93
-SIZE (gpac-0.4.0.tar.gz) = 2836606
diff --git a/multimedia/gpac-libm4systems/pkg-descr b/multimedia/gpac-libm4systems/pkg-descr
deleted file mode 100644
index bcbab0683696..000000000000
--- a/multimedia/gpac-libm4systems/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Gpac MPEG-4 Systems library and headers
-
-WWW: http://gpac.sourceforge.net/
diff --git a/multimedia/gpac-libm4systems/pkg-plist b/multimedia/gpac-libm4systems/pkg-plist
deleted file mode 100644
index f0c87f80232e..000000000000
--- a/multimedia/gpac-libm4systems/pkg-plist
+++ /dev/null
@@ -1,62 +0,0 @@
-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