- Remove mpeg4ip-faad, this port is no longer needed with mpeg4ip-1.3

7 files changed, 1 insertions, 103 deletions

diff --git a/MOVED b/MOVED
index b4fb92dbe687..eecbaee37270 100644
--- a/MOVED
+++ b/MOVED
@@ -1491,3 +1491,4 @@ www/mnogosearch|www/mnogosearch31|2004-05-15|finished repocopy
 net/amule|net/amule1|2005-05-16|port renamed
 net/amule-devel|net/amule2|2005-05-16|obsolete
 databases/firebird|databases/firebird-server|2005-05-17|split into -client and -server
+audio/mpeg4ip-faad||2005-05-19|Port no longer needed with new mpeg4ip-1.3
diff --git a/audio/Makefile b/audio/Makefile
index 6edbdbf1a5aa..866070cc0587 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -297,7 +297,6 @@
     SUBDIR += mp3stat
     SUBDIR += mp3wrap
     SUBDIR += mpc
-    SUBDIR += mpeg4ip-faad
     SUBDIR += mpegaudio
     SUBDIR += mpeglib_artsplug
     SUBDIR += mpg123
diff --git a/audio/mpeg4ip-faad/Makefile b/audio/mpeg4ip-faad/Makefile
deleted file mode 100644
index f2f3dea23174..000000000000
--- a/audio/mpeg4ip-faad/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# New ports collection makefile for:	mpeg4ip-faad2
-# Date created:			28 Sep 2004
-# Whom:				Michael Johnson <ahze@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	faad2
-PORTVERSION=	2.0
-PORTREVISION=	1
-CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	faac
-PKGNAMEPREFIX=	mpeg4ip-
-
-MAINTAINER=	ahze@FreeBSD.org
-COMMENT=	faad plugin for mpeg4ip
-
-LIB_DEPENDS=	faad.0:${PORTSDIR}/audio/faad \
-		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
-		mp4.0:${PORTSDIR}/multimedia/mpeg4ip
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-USE_AUTOMAKE_VER=	15
-USE_AUTOHEADER_VER=	253
-AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
-USE_REINPLACE=	yes
-USE_SDL=	yes
-
-CONFIGURE_ARGS=	--with-drm
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-INSTALLS_SHLIB=	yes
-
-INSTALL_WRKSRC=	${WRKSRC}/plugins
-
-PLIST_FILES=	lib/mp4player_plugin/faad2_plugin.a \
-		lib/mp4player_plugin/faad2_plugin.so \
-		lib/mp4player_plugin/faad2_plugin.so.0
-
-.include <bsd.port.pre.mk>
-
-pre-patch: build-depends
-
-post-patch:
-# make sure everything is prepared prior to configure stage
-# pre-configure will not work since *AUTO* tools happen in-between
-	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \
-		${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
-	@${REINPLACE_CMD} -e 's|$$lt_target|$$host|' \
-		${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e 's|<SDL/|<SDL11/|' \
-		${WRKSRC}/plugins/mpeg4ip/faad2.cpp
-	@${ECHO_CMD} "SUBDIRS = plugins" > \
-		${WRKSRC}/Makefile.am
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e 's|stdint.h|sys/inttypes.h|' \
-		${WRKSRC}/common/mp4ff/mp4ff_int_types.h
-.endif
-# CFLAGS safeness
-	@${FIND} ${WRKSRC} -type f -name Makefile.am | \
-		${XARGS} -n 5 -x \
-			${REINPLACE_CMD} -e \
-				's|-O2|${CFLAGS}|'
-
-.include <bsd.port.post.mk>
diff --git a/audio/mpeg4ip-faad/distinfo b/audio/mpeg4ip-faad/distinfo
deleted file mode 100644
index a9c4a8a47246..000000000000
--- a/audio/mpeg4ip-faad/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (faad2-2.0.tar.gz) = 1a6f79365f2934a4888b210ef47a3a07
-SIZE (faad2-2.0.tar.gz) = 766660
diff --git a/audio/mpeg4ip-faad/files/patch-plugins_mpeg4ip_Makefile.am b/audio/mpeg4ip-faad/files/patch-plugins_mpeg4ip_Makefile.am
deleted file mode 100644
index 5699c6587bef..000000000000
--- a/audio/mpeg4ip-faad/files/patch-plugins_mpeg4ip_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/mpeg4ip/Makefile.am.orig	Wed Sep 29 13:30:33 2004
-+++ plugins/mpeg4ip/Makefile.am	Wed Sep 29 13:31:08 2004
-@@ -8,9 +8,7 @@
- 	aa_file.cpp \
- 	aa_file.h
- 
--faad2_plugin_la_LIBADD = \
--	$(top_builddir)/libfaad/libfaad.la \
--	-lm
-+LIBS=	-lm -lfaad
- 
- 
- INCLUDES =  -I$(top_srcdir)/include
diff --git a/audio/mpeg4ip-faad/files/patch-plugins_mpeg4ip_faad2.cpp b/audio/mpeg4ip-faad/files/patch-plugins_mpeg4ip_faad2.cpp
deleted file mode 100644
index 12c322ab4203..000000000000
--- a/audio/mpeg4ip-faad/files/patch-plugins_mpeg4ip_faad2.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/mpeg4ip/faad2.cpp.orig	Wed Sep 29 03:20:19 2004
-+++ plugins/mpeg4ip/faad2.cpp	Wed Sep 29 03:31:53 2004
-@@ -237,7 +237,7 @@
-       aac->m_vft->audio_configure(aac->m_ifptr,
-                   aac->m_freq,
-                   aac->m_chans,
--                  AUDIO_S16SYS,
-+                  (audio_format_t)AUDIO_S16SYS,
-                   aac->m_output_frame_size);
-       uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr);
-       aac->m_audio_inited = 1;
diff --git a/audio/mpeg4ip-faad/pkg-descr b/audio/mpeg4ip-faad/pkg-descr
deleted file mode 100644
index b819547aa547..000000000000
--- a/audio/mpeg4ip-faad/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Faad plugin for mpeg4ip
-
-WWW: http://audiocoding.com