6 files changed, 47 insertions, 54 deletions

diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 345682e41be2..cf3c28aad7b5 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	avidemux2
-PORTVERSION=	2.1.2
-PORTREVISION=	4
+PORTVERSION=	2.3.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/ \
 		${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	avidemux
-DISTNAME=	avidemux-${PORTVERSION}
+DISTNAME=	avidemux_${PORTVERSION}
 
 MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Simple GUI based video editor
 
 PATCH_DEPENDS=	${ACLOCAL}:${PORTSDIR}/devel/automake19
-LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
-		mad.2:${PORTSDIR}/audio/libmad \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		js.1:${PORTSDIR}/lang/spidermonkey
+BUILD_DEPENDS=	spidermonkey>=1.5_3:${PORTSDIR}/lang/spidermonkey
+LIB_DEPENDS=	mp3lame:${PORTSDIR}/audio/lame \
+		mad:${PORTSDIR}/audio/libmad \
+		js:${PORTSDIR}/lang/spidermonkey \
+		xml2:${PORTSDIR}/textproc/libxml2
 
 USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15 aclocal:19:env
 USE_X_PREFIX=	yes
@@ -63,25 +63,25 @@ WITH_X264=	yes
 WITH_FAAC=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libfaad.so.0)
+.if exists(${LOCALBASE}/lib/libfaad.so)
 WITH_FAAD=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/liba52.so.0)
+.if exists(${LOCALBASE}/lib/liba52.so)
 WITH_A52=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
+.if exists(${LOCALBASE}/lib/libxvidcore.so)
 WITH_XVID=	yes
 .endif
 
 .if defined(WITH_XVID)
-LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=	xvidcore:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--with-xvid-as-decoder
 .endif
 
 .if defined(WITH_A52)
-LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
+LIB_DEPENDS+=	a52:${PORTSDIR}/audio/liba52
 .endif
 
 .if defined(WITH_SDL)
@@ -89,19 +89,19 @@ USE_SDL+=	sdl
 .endif
 
 .if defined(WITH_FAAC)
-LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+LIB_DEPENDS+=	faac:${PORTSDIR}/audio/faac
 .endif
 
 .if defined(WITH_FAAD)
-LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
 .endif
 
 .if defined(WITH_X264)
-LIB_DEPENDS+=	x264.50:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264:${PORTSDIR}/multimedia/x264
 .endif
 
 .if defined(WITH_VORBIS)
-LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if ${OSVERSION} < 500000
@@ -119,24 +119,24 @@ pre-build:
 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|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/avidemux/ADM_lavcodec/*.c
+	@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/avidemux/ADM_lavcodec/*/*.c
 	@${REINPLACE_CMD} 's|ADM_LOCALEDIR=$${datadir}/locale|ADM_LOCALEDIR=${PREFIX}/share/locale|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} "s|-O2|${CFLAGS}|" ${WRKSRC}/configure
 .if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${REINPLACE_CMD} "s|-O3|${CFLAGS}|" ${WRKSRC}/adm_lavcodec/Makefile.am
+	@${REINPLACE_CMD} "s|-O3|${CFLAGS}|" ${WRKSRC}/avidemux/ADM_lavcodec/Makefile.am
 .endif
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} 's|-falign-loops=16||' ${WRKSRC}/configure \
-		${WRKSRC}/adm_lavcodec/Makefile.in \
-		${WRKSRC}/adm_lavcodec/Makefile.in \
-		${WRKSRC}/adm_lavcodec/libpostproc/Makefile.in \
-		${WRKSRC}/adm_lavcodec/libpostproc/Makefile.am
+		${WRKSRC}/avidemux/ADM_lavcodec/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/libpostproc/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/libpostproc/Makefile.am
 	@${REINPLACE_CMD} 's|-msse||' ${WRKSRC}/configure \
-		${WRKSRC}/adm_lavcodec/Makefile.in \
-		${WRKSRC}/adm_lavcodec/Makefile.am \
-		${WRKSRC}/adm_lavcodec/libpostproc/Makefile.in \
-		${WRKSRC}/adm_lavcodec/libpostproc/Makefile.am
+		${WRKSRC}/avidemux/ADM_lavcodec/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/Makefile.am \
+		${WRKSRC}/avidemux/ADM_lavcodec/libpostproc/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/libpostproc/Makefile.am
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/avidemux2/distinfo b/multimedia/avidemux2/distinfo
index a55342fa0217..2d7252cf55c0 100644
--- a/multimedia/avidemux2/distinfo
+++ b/multimedia/avidemux2/distinfo
@@ -1,3 +1,3 @@
-MD5 (avidemux-2.1.2.tar.gz) = 727214aacdf729506a13d0e0117f01de
-SHA256 (avidemux-2.1.2.tar.gz) = d76bff4e92e76a79785a8649e6350a1af9de13efc67f9871e287f4e662733910
-SIZE (avidemux-2.1.2.tar.gz) = 3830241
+MD5 (avidemux_2.3.0.tar.gz) = 14c58c14fc9757d36e4d72498431da42
+SHA256 (avidemux_2.3.0.tar.gz) = ef083ab24e3ec612b10c8a0163845ff680fea845d5eade21d60d47e843b4c623
+SIZE (avidemux_2.3.0.tar.gz) = 4750919
diff --git a/multimedia/avidemux2/files/patch-avidemux_ADM_codecs_ADM_x264.cpp b/multimedia/avidemux2/files/patch-avidemux_ADM_codecs_ADM_x264.cpp
deleted file mode 100644
index 31db973f1a63..000000000000
--- a/multimedia/avidemux2/files/patch-avidemux_ADM_codecs_ADM_x264.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- avidemux/ADM_codecs/ADM_x264.cpp.orig	Thu Aug 10 07:44:45 2006
-+++ avidemux/ADM_codecs/ADM_x264.cpp	Thu Aug 10 07:45:53 2006
-@@ -200,7 +200,7 @@
- {
-   memset(&param,0,sizeof(param));
-   x264_param_default( &param );
--  param.rc.b_cbr=1;
-+  param.rc.i_rc_method = X264_RC_CQP;
-   param.rc.i_bitrate=val/1000;  
- //  param.rc.i_rc_buffer_size=val/1000;
- //  param.rc.i_rc_init_buffer=(val/1000)>>1;
-@@ -234,7 +234,7 @@
-   memset(&param,0,sizeof(param));
-   x264_param_default( &param );
-   
--  param.rc.b_cbr=1;
-+  param.rc.i_rc_method = X264_RC_CQP;
-   param.rc.i_bitrate=val;  
-   //param.rc.i_rc_buffer_size=val;
-   //param.rc.i_rc_init_buffer=val>>1;
diff --git a/multimedia/avidemux2/pkg-descr b/multimedia/avidemux2/pkg-descr
index 557c0b2f51b7..7f4f45e8e888 100644
--- a/multimedia/avidemux2/pkg-descr
+++ b/multimedia/avidemux2/pkg-descr
@@ -5,7 +5,7 @@ for cutting without re-encoding.  Has the ability to re-encode and re-sample.
 Utilizes ECMAScript (aka. Javascript) to provide batch scripting and
 processing support.
 
-WWW: http://fixounet.free.fr/avidemux/
+WWW: http://avidemux.org/
 
 - Anish Mistry
 amistry@am-productions.biz
diff --git a/multimedia/avidemux2/pkg-message b/multimedia/avidemux2/pkg-message
deleted file mode 100644
index 763266797aa4..000000000000
--- a/multimedia/avidemux2/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-Remove any encore2.h, encore.h, and decore.h that you may have moved to the
-${PREFIX}/include directory since it may cause the built program to crash
-when opening a file.  
diff --git a/multimedia/avidemux2/pkg-plist b/multimedia/avidemux2/pkg-plist
index cece1bd92783..82b8bc62e8ab 100644
--- a/multimedia/avidemux2/pkg-plist
+++ b/multimedia/avidemux2/pkg-plist
@@ -1 +1,17 @@
 bin/avidemux2
+share/locale/es/LC_MESSAGES/avidemux.mo
+share/locale/fr/LC_MESSAGES/avidemux.mo
+share/locale/ru/LC_MESSAGES/avidemux.mo
+share/locale/cs/LC_MESSAGES/avidemux.mo
+share/locale/klingon/LC_MESSAGES/avidemux.mo
+@dirrmtry share/locale/klingon/LC_MESSAGES
+@dirrmtry share/locale/klingon
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/ru/LC_MESSAGES
+@dirrmtry share/locale/ru
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+