Update to upstream version 1.29.8.3

4 files changed, 6 insertions, 60 deletions

diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 26a442c812cb..9a0e49978b36 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	faac
-PORTVERSION=	1.28
-PORTREVISION=	5
+PORTVERSION=	1.29.8.3
 CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION:R:R}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	MPEG-2 and MPEG-4 AAC audio encoder
@@ -17,19 +16,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_FILE_ISO=	${WRKSRC}/README
 LICENSE_PERMS_ISO=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
-
-USES=		autoreconf gmake libtool tar:bzip2
+USES=		gmake libtool
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-mp4v2
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${ECHO_CMD} "" >> ${WRKSRC}/libfaac/psych.h
-	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
-		${WRKSRC}/frontend/main.c
-
 .include <bsd.port.mk>
diff --git a/audio/faac/distinfo b/audio/faac/distinfo
index 1b1dfae5b86b..5617a8512f2a 100644
--- a/audio/faac/distinfo
+++ b/audio/faac/distinfo
@@ -1,2 +1,3 @@
-SHA256 (faac-1.28.tar.bz2) = aac475e59d38ae9e29bff760e26bf72b507ccec037a6837cc33e3ac1db3ef352
-SIZE (faac-1.28.tar.bz2) = 531256
+TIMESTAMP = 1509540497
+SHA256 (faac-1.29.8.3.tar.gz) = 3d85267b394dd8ebd5dd88845b25bc5e5e4fc88ac5affb8a2807f50368dc3b41
+SIZE (faac-1.29.8.3.tar.gz) = 483404
diff --git a/audio/faac/files/patch-configure.in b/audio/faac/files/patch-configure.in
deleted file mode 100644
index 4bcd4d66738e..000000000000
--- a/audio/faac/files/patch-configure.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.in.orig	2009-02-05 00:55:38 UTC
-+++ configure.in
-@@ -1,7 +1,7 @@
- AC_PREREQ(2.50)
- AC_INIT(FAAC, 1.28, faac-dev@lists.sourceforge.net)
- AC_CONFIG_AUX_DIR(.)
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE(faac, 1.25)
- 
- AM_CONFIG_HEADER(config.h)
- 
-@@ -28,14 +28,17 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
- AC_CHECK_LIB(gnugetopt, getopt_long)
- 
- AM_CONDITIONAL(WITH_MP4V2, false)
-+AM_CONDITIONAL(WITH_EXT_MP4V2, false)
- 
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
-                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-                             external_mp4v2=no, -lstdc++),
--               external_mp4v2=no, [#include <mp4.h>])
-+               external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
- 
- if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+  AM_CONDITIONAL(WITH_EXT_MP4V2, true)
-+  MY_DEFINE(HAVE_LIBMP4V2)
- else
-   if test x$WITHMP4V2 = xyes; then
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
diff --git a/audio/faac/files/patch-frontend_Makefile.am b/audio/faac/files/patch-frontend_Makefile.am
deleted file mode 100644
index c49d149144fa..000000000000
--- a/audio/faac/files/patch-frontend_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
---- frontend/Makefile.am.orig	2008-12-16 00:56:00 UTC
-+++ frontend/Makefile.am
-@@ -7,6 +7,11 @@ if WITH_MP4V2
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
- LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
- else
-+if WITH_EXT_MP4V2
-+INCLUDES = -I$(top_srcdir)/include 
-+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++
-+else
- INCLUDES = -I$(top_srcdir)/include 
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm
- endif
-+endif