Update to avidemux-2.0.40

Numerous releases and fixes since 2.0.18. Most recent changes include:

* miniocr fix : Fix error on decoding some subs.
* xvideco fix : Fix compilation issue.
* ffv1rec fix : Fix compilation issue.
* SSE2 display fix : SSE2 cpu flag display.
* Mplayer resize fix : Caused crash in some case.

* [Filter] Ported Asharp by MarcFD .
* [Filter] Mplayer Eq2 is now completly ported.
* [Cli ] New cli command --rebuild-index.
* [Video ] Accelerated playback selectable in misc/pref.
* [Audio ] Fixed mp3 decoding on low frequency mpeg.
* [Audio ] More tolerant with mpeg audio match codec (it created async in some rare cases).
* [Codec ] Fixed save as huffyuv.
* [Codec ] Fixed save jpeg.
* [Export] Fixed race in mpeg ps export (thanks to T. Rupp).
* [Import] Support mov file starting by skip atom.

See website news for more changes.

I never tested the USE_MMX. And the webpage says the --disable-mmx
has been removed and all x86 stuff is now probed at run time, so
maybe get rid of USE_MMX support for this?

Require gcc 3.0. On NetBSD 1.6.2_STABLE with older gcc received
cc1: Invalid option `-falign-loops=16' and various warnings.

Reworded part of DESCRiption. And this does support divx.

Updated MASTER_SITES.

Removed BUILD_USES_MSGFMT and USE_PKGLOCALEDIR. The locale support
removed and maybe will be readded later according to author.

Use CPPFLAGS instead of CFLAGS to define -DDEVOSSAUDIO, because
"`DEVOSSAUDIO' was not declared in this scope".

Sorted some settings.
Remove the --disable-warnings and the rm:-O3 BUILDLINK_TRANSFORM.
I didn't need them, but maybe on another system they are needed.

Disable faad support since Dolby doesn't allow binary distributions.

Add faac support.

Remove two patches. Disable ARTS using ac_cv_path_ART_CONFIG=no instead.

Just let regular install target install it. (This is slow though.)

Update PLIST. Name this avidemux2 with the two as the author requests.

6 files changed, 21 insertions, 82 deletions

diff --git a/multimedia/avidemux/DESCR b/multimedia/avidemux/DESCR
index b2a82f28758..cb237667ee9 100644
--- a/multimedia/avidemux/DESCR
+++ b/multimedia/avidemux/DESCR
@@ -1,6 +1,5 @@
-Avidemux is a graphical tool to edit video.  It can open AVI, MPEG, Nuppelvideo
-and BMPs.  Most common codecs are supported (M-JPEG, MPEG, DivX, Xvid, huffyuv,
-WMA, etc.) thanks to libavcodec.  Video can be edited, cut, appended, filtered
-(resize/crop/denoise), and re-encoded to either AVI (DivX/Xvid) or MPEG 1/2.
-
-Note that this package does not support DivX.
+Avidemux is a graphical tool to edit video.  It can open several file
+formats, and various audio and video codecs.  Video can be edited,
+cut, appended, filtered (resize/crop/denoise), and re-encoded. Output
+file formats include Avi, MPEG1/2, MPEG2PS, OGM, and raw stripped audio
+or video.
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 4111cbe7ae3..3dc5f676d25 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,27 +1,24 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/28 05:52:18 reed Exp $
 #
 
-DISTNAME=	avidemux-2.0.18
-PKGREVISION=	5
+DISTNAME=	avidemux-2.0.40
 CATEGORIES=	multimedia
-MASTER_SITES=	http://fixounet.free.fr/avidemux/
+MASTER_SITES=	http://download.berlios.de/avidemux/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://fixounet.free.fr/avidemux/
 COMMENT=	Graphical video editing program
 
-BUILD_USES_MSGFMT=	YES
-
+GCC_REQD=		3.0
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
+USE_TOOLS+=		gmake
 
-CFLAGS+=		-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
+CPPFLAGS+=		-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 LDFLAGS+=		${LIBOSSAUDIO}
-
-CONFIGURE_ARGS+=	--disable-warnings
-
-BUILDLINK_TRANSFORM+=   rm:-O3
+CONFIGURE_ENV+=		ac_cv_path_ART_CONFIG=no
+CONFIGURE_ARGS+=	--disable-faad # Dolby doesn't allow binary distribution
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -40,9 +37,7 @@ post-configure:
 .  endif
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/avidemux/avidemux2 ${PREFIX}/bin/avidemux
-
+.include "../../audio/faac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
diff --git a/multimedia/avidemux/PLIST b/multimedia/avidemux/PLIST
index 4c45e3ba188..c89599bd143 100644
--- a/multimedia/avidemux/PLIST
+++ b/multimedia/avidemux/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 12:59:01 jmmv Exp $
-bin/avidemux
+@comment $NetBSD: PLIST,v 1.2 2005/05/28 05:52:18 reed Exp $
+bin/avidemux2
diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
index 8edb481002a..3608052e026 100644
--- a/multimedia/avidemux/distinfo
+++ b/multimedia/avidemux/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:02 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/05/28 05:52:18 reed Exp $
 
-SHA1 (avidemux-2.0.18.tar.gz) = ce3b6de5bdcade98ea564ec496de4eb370cd5740
-RMD160 (avidemux-2.0.18.tar.gz) = d87442b325b6d67dc3e7f5a243e902a1d1f3b0b9
-Size (avidemux-2.0.18.tar.gz) = 2518712 bytes
-SHA1 (patch-aa) = 441462c537aa8a2205b6c1d9ab160afc34b5c967
-SHA1 (patch-ab) = cb3aa64dfe3d48bca554e5f8bd857152cdfd309c
+SHA1 (avidemux-2.0.40.tar.gz) = 0231cf9e6a42b091bde2d90f5fc5d65fa9b3d06d
+RMD160 (avidemux-2.0.40.tar.gz) = faa76ae78fb60bdb0790174cce591118d03578e0
+Size (avidemux-2.0.40.tar.gz) = 3755632 bytes
diff --git a/multimedia/avidemux/patches/patch-aa b/multimedia/avidemux/patches/patch-aa
deleted file mode 100644
index 325765668c0..00000000000
--- a/multimedia/avidemux/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:59:01 jmmv Exp $
-
---- configure.orig	2003-12-18 04:24:04.000000000 +0100
-+++ configure	2003-12-18 04:25:26.000000000 +0100
-@@ -18902,6 +18902,7 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+if false; then
- 
- echo "$as_me:$LINENO: checking for Divx encode" >&5
- echo $ECHO_N "checking for Divx encode... $ECHO_C" >&6
-@@ -19097,7 +19098,8 @@
- echo "$as_me: WARNING: DIVX support removed until it works on p4" >&2;}
- fi
- 
--
-+fi
-+have_divx="no"
- 
- echo "$as_me:$LINENO: checking for xvid codec" >&5
- echo $ECHO_N "checking for xvid codec... $ECHO_C" >&6
-@@ -19792,7 +19794,7 @@
- 
- fi
- 
--
-+if false; then
- 
- echo "$as_me:$LINENO: checking for Arts audio support" >&5
- echo $ECHO_N "checking for Arts audio support... $ECHO_C" >&6
-@@ -20005,6 +20007,8 @@
- 	  fi
- 	  CPPFLAGS=$old_flags
-  fi
-+fi
-+have_arts="no"
- if test "x$have_arts" = "xno"; then
- 	   	ARTS_LIBS=""
-     	ARTS_CFLAGS=""
diff --git a/multimedia/avidemux/patches/patch-ab b/multimedia/avidemux/patches/patch-ab
deleted file mode 100644
index 39725a2b780..00000000000
--- a/multimedia/avidemux/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/03/11 10:53:05 jmmv Exp $
-
---- adm_lavcodec/dsputil.h.orig	2003-09-16 19:52:00.000000000 +0200
-+++ adm_lavcodec/dsputil.h
-@@ -477,7 +477,7 @@ static int name16(void /*MpegEncContext*
-           +name8(s, dst+8+8*stride, src+8+8*stride, stride);\
- }
- 
--#ifndef HAVE_LRINTF
-+#if defined(USE_MMX) && !defined(HAVE_LRINTF)
- /* XXX: add ISOC specific test to avoid specific BSD testing. */
- /* better than nothing implementation. */
- /* btw, rintf() is existing on fbsd too -- alex */