5 files changed, 28 insertions, 51 deletions

diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 71f80a45b67b..7e250c027474 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -6,38 +6,42 @@
 #
 
 PORTNAME=	faad2
-PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTVERSION=	2.7
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	faac
+MASTER_SITES=	SFE/faac
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	MPEG-2 and MPEG-4 AAC audio decoder
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
+USE_BZIP2=	yes
 USE_DOS2UNIX=	yes
-USE_AUTOTOOLS=	automake:15 autoheader:262 libtool:15
-AUTOMAKE_ARGS=	--add-missing
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
+ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+USE_LDCONFIG=	yes
+
+MAN1=		faad.1
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|<stdint\.h>|<inttypes.h>|g' \
-		${WRKSRC}/common/mp4ff/mp4ff_int_types.h
+post-extract:
+	@${LN} -sf faad.man ${WRKSRC}/frontend/faad.1
 
-pre-configure:
-	${MKDIR} ${WRKSRC}/plugins/bmp
-	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \
-		${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
+post-patch:
+	@${REINPLACE_CMD} -e '/AC_CONFIG_FILES(plugins/d' \
+		${WRKSRC}/configure.in
+	@${REINPLACE_CMD} -e 's|faad.man|faad.1|g' \
+		${WRKSRC}/frontend/Makefile.am
+	@${REINPLACE_CMD} -e 's|^AM_CFLAGS|AM_CPPFLAGS|g ; \
+		 s|-iquote |-I|g' ${WRKSRC}/libfaad/Makefile.am
 	@${ECHO_CMD} "SUBDIRS = libfaad common frontend" > \
 		${WRKSRC}/Makefile.am
 
+pre-configure:
+	@cd ${WRKSRC}; ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake
+
 .include <bsd.port.post.mk>
diff --git a/audio/faad/distinfo b/audio/faad/distinfo
index c8d49a93c658..86a0ea442beb 100644
--- a/audio/faad/distinfo
+++ b/audio/faad/distinfo
@@ -1,3 +1,3 @@
-MD5 (faad2-2.6.1.tar.gz) = 74e92df40c270f216a8305fc87603c8a
-SHA256 (faad2-2.6.1.tar.gz) = 8ad2c2e0c09b787a943e2ef831c1c84534e3a8726cc1eb1abc4da9eb3038285c
-SIZE (faad2-2.6.1.tar.gz) = 839410
+MD5 (faad2-2.7.tar.bz2) = 4c332fa23febc0e4648064685a3d4332
+SHA256 (faad2-2.7.tar.bz2) = 14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5
+SIZE (faad2-2.7.tar.bz2) = 901043
diff --git a/audio/faad/files/patch-configure.in b/audio/faad/files/patch-configure.in
deleted file mode 100644
index be425fb8f261..000000000000
--- a/audio/faad/files/patch-configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in.orig	Thu Aug 24 08:55:38 2006
-+++ configure.in	Thu Aug 24 08:55:58 2006
-@@ -128,10 +128,6 @@
- AC_CONFIG_FILES(libfaad/Makefile)
- AC_CONFIG_FILES(common/Makefile)
- AC_CONFIG_FILES(common/mp4ff/Makefile)
--AC_CONFIG_FILES(plugins/Makefile)
--AC_CONFIG_FILES(plugins/xmms/Makefile)
--AC_CONFIG_FILES(plugins/xmms/src/Makefile)
--AC_CONFIG_FILES(plugins/mpeg4ip/Makefile)
- AC_CONFIG_FILES(faad2.spec)
- AC_CONFIG_FILES(frontend/Makefile)
- AC_CONFIG_FILES(Makefile)
diff --git a/audio/faad/files/patch-frontend_main.c b/audio/faad/files/patch-frontend_main.c
deleted file mode 100644
index 71dd8693de4e..000000000000
--- a/audio/faad/files/patch-frontend_main.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- frontend/main.c.orig	2007-11-01 13:33:30.000000000 -0700
-+++ frontend/main.c	2008-09-16 11:01:40.000000000 -0700
-@@ -911,12 +911,14 @@
-             if (sampleId == 0) dur = 0;
- 
-             if (useAacLength || (timescale != samplerate)) {
-                 sample_count = frameInfo.samples;
-             } else {
-                 sample_count = (unsigned int)(dur * frameInfo.channels);
-+                if (sample_count > frameInfo.samples)
-+                    sample_count = frameInfo.samples;
- 
-                 if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples))
-                 {
-                     faad_fprintf(stderr, "MP4 seems to have incorrect frame duration, using values from AAC data.\n");
-                     useAacLength = 1;
-                     sample_count = frameInfo.samples;
diff --git a/audio/faad/pkg-plist b/audio/faad/pkg-plist
index f04fded76d42..270b4382e249 100644
--- a/audio/faad/pkg-plist
+++ b/audio/faad/pkg-plist
@@ -1,7 +1,10 @@
 bin/faad
 include/faad.h
+include/mp4ff.h
+include/mp4ffint.h
 include/neaacdec.h
 lib/libfaad.a
 lib/libfaad.la
 lib/libfaad.so
-lib/libfaad.so.0
+lib/libfaad.so.2
+lib/libmp4ff.a