ports/131829: Update port: audio/faad to 2.7

[KATO Tsuguru]

>Number:         131829
>Category:       ports
>Synopsis:       Update port: audio/faad to 2.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 18 17:30:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.1-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 2.7

Remove file:
files/patch-configure.in
files/patch-frontend_main.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/faad/Makefile audio/faad/Makefile
--- /usr/ports/audio/faad/Makefile	2008-11-13 03:55:01.000000000 +0900
+++ audio/faad/Makefile	2009-02-18 22:55:58.000000000 +0900
@@ -6,38 +6,40 @@
 #
 
 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 at 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
 	@${ECHO_CMD} "SUBDIRS = libfaad common frontend" > \
 		${WRKSRC}/Makefile.am
 
+pre-configure:
+	@cd ${WRKSRC}; ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake
+
 .include <bsd.port.post.mk>
diff -urN /usr/ports/audio/faad/distinfo audio/faad/distinfo
--- /usr/ports/audio/faad/distinfo	2008-02-25 15:59:43.000000000 +0900
+++ audio/faad/distinfo	2009-02-18 22:19:24.000000000 +0900
@@ -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 -urN /usr/ports/audio/faad/files/patch-configure.in audio/faad/files/patch-configure.in
--- /usr/ports/audio/faad/files/patch-configure.in	2006-08-25 08:33:51.000000000 +0900
+++ audio/faad/files/patch-configure.in	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/audio/faad/files/patch-frontend_main.c audio/faad/files/patch-frontend_main.c
--- /usr/ports/audio/faad/files/patch-frontend_main.c	2008-11-13 01:31:27.000000000 +0900
+++ audio/faad/files/patch-frontend_main.c	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/audio/faad/pkg-plist audio/faad/pkg-plist
--- /usr/ports/audio/faad/pkg-plist	2006-08-25 08:33:51.000000000 +0900
+++ audio/faad/pkg-plist	2009-02-18 23:56:49.000000000 +0900
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: