- Update to 2.0.24

PR:		ports/66372
Submitted by:	amistry <amistry@am-productions.biz> (maintainer)

multimedia/avidemux2/Makefile

@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	avidemux2
-PORTVERSION=	2.0.20
-PORTREVISION=	2
+PORTVERSION=	2.0.24
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/
-DISTNAME=	avidemux-2.0.20
+DISTNAME=	avidemux-2.0.24
 
 MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Simple GUI based video editor
@@ -59,7 +58,7 @@ LIB_DEPENDS+=	xvidcore.2:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--with-xvid-as-decoder
 .endif
 
-.if ${MACHINE_ARCH} != "i386"
+.if ${ARCH} != "i386"
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
 
@@ -84,10 +83,7 @@ post-patch:
 	@${TOUCH} ${WRKSRC}/*
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${WRKSRC}/*/*/Makefile
 	@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/adm_lavcodec/*.c
+	@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/adm_lavcodec/*/*.c
 	@${REINPLACE_CMD} 's|ADM_LOCALEDIR=$${datadir}/locale|ADM_LOCALEDIR=${PREFIX}/share/locale|' ${WRKSRC}/configure
-.if ${OSVERSION} >= 500000
-	@${ECHO_MSG} "Remove this ugly hack!"
-	@${REINPLACE_CMD} 's|#define EMULATE_FAST_INT 1||g' ${WRKSRC}/configure
-.endif
 
 .include <bsd.port.post.mk>

multimedia/avidemux2/distinfo

@@ -1,2 +1,2 @@
-MD5 (avidemux-2.0.20.tar.gz) = c7070e0a4b506e688d653d159cceeb31
-SIZE (avidemux-2.0.20.tar.gz) = 2640772
+MD5 (avidemux-2.0.24.tar.gz) = c4482219ede0f6e0be8ddc61bf753589
+SIZE (avidemux-2.0.24.tar.gz) = 2637501

multimedia/avidemux2/files/patch-adm_lavcoded::dsputil.h

@@ -1,10 +0,0 @@
---- adm_lavcodec/dsputil.h.orig	Sat Feb 14 16:22:04 2004
-+++ adm_lavcodec/dsputil.h	Sat Feb 14 16:22:28 2004
-@@ -487,6 +487,7 @@
-           +name8(s, dst+8+8*stride, src+8+8*stride, stride);\
- }
- 
-+#define HAVE_LRINTF
- #ifndef HAVE_LRINTF
- /* XXX: add ISOC specific test to avoid specific BSD testing. */
- /* better than nothing implementation. */

multimedia/avidemux2/pkg-plist

@@ -1,4 +1,5 @@
 bin/avidemux2
+share/locale/de/LC_MESSAGES/avidemux.mo
 share/locale/es/LC_MESSAGES/avidemux.mo
 share/locale/fr/LC_MESSAGES/avidemux.mo
 share/locale/klingon/LC_MESSAGES/avidemux.mo