- Add back libexecinfo code that I disabled at first.

- Sort plugin plist.
- Some other minor cosmetic fixes.
- Bump PORTREVISIONs.

7 files changed, 147 insertions, 118 deletions

diff --git a/multimedia/avidemux2-plugins/Makefile b/multimedia/avidemux2-plugins/Makefile
index f94fecd30e2..e4ea0c08c71 100644
--- a/multimedia/avidemux2-plugins/Makefile
+++ b/multimedia/avidemux2-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	${AVIDEMUX2_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-plugins
 
diff --git a/multimedia/avidemux2-plugins/pkg-plist b/multimedia/avidemux2-plugins/pkg-plist
index 3cee105b70c..33132af0663 100644
--- a/multimedia/avidemux2-plugins/pkg-plist
+++ b/multimedia/avidemux2-plugins/pkg-plist
@@ -1,146 +1,146 @@
-lib/ADM_plugins/audioDecoder/libADM_ad_a52.so
-%%FAAD%%lib/ADM_plugins/audioDecoder/libADM_ad_faad.so
 lib/ADM_plugins/audioDecoder/libADM_ad_Mad.so
+lib/ADM_plugins/audioDecoder/libADM_ad_a52.so
 lib/ADM_plugins/audioDecoder/libADM_ad_vorbis.so
-%%AMRNB%%lib/ADM_plugins/audioDecoder/libADM_ad_opencore_amrnb.so
-%%AMRWB%%lib/ADM_plugins/audioDecoder/libADM_ad_opencore_amrwb.so
-%%SDL%%lib/ADM_plugins/audioDevices/libADM_av_sdl.so
 lib/ADM_plugins/audioDevices/libADM_av_oss.so
-%%ESD%%lib/ADM_plugins/audioDevices/libADM_av_esd.so
-%%JACK%%lib/ADM_plugins/audioDevices/libADM_av_jack.so
-%%PULSE%%lib/ADM_plugins/audioDevices/libADM_av_pulseAudioSimple.so
-lib/ADM_plugins/videoEncoder/libADM_vidEnc_avcodec.so
-lib/ADM_plugins/videoEncoder/avcodec/Mpeg1Param.xsd
-lib/ADM_plugins/videoEncoder/avcodec/Mpeg2Param.xsd
+lib/ADM_plugins/audioEncoders/libADM_ae_lame.so
+lib/ADM_plugins/audioEncoders/libADM_ae_lav_ac3.so
+lib/ADM_plugins/audioEncoders/libADM_ae_lav_mp2.so
+lib/ADM_plugins/audioEncoders/libADM_ae_pcm.so
+lib/ADM_plugins/audioEncoders/libADM_ae_twolame.so
 lib/ADM_plugins/videoEncoder/avcodec/Flv1Param.xsd
-lib/ADM_plugins/videoEncoder/avcodec/MjpegParam.xsd
 lib/ADM_plugins/videoEncoder/avcodec/H263Param.xsd
+lib/ADM_plugins/videoEncoder/avcodec/MjpegParam.xsd
+lib/ADM_plugins/videoEncoder/avcodec/Mpeg1Param.xsd
+lib/ADM_plugins/videoEncoder/avcodec/Mpeg2Param.xsd
 lib/ADM_plugins/videoEncoder/avcodec/Mpeg4aspParam.xsd
 lib/ADM_plugins/videoEncoder/avcodec/mpeg-1/Video CD.xml
 lib/ADM_plugins/videoEncoder/avcodec/mpeg-2/DVD.xml
 lib/ADM_plugins/videoEncoder/avcodec/mpeg-2/Super Video CD.xml
-%%X264%%lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so
-%%X264%%lib/ADM_plugins/videoEncoder/x264/x264Param.xsd
-%%GTK%%%%X264%%lib/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Gtk.so
-%%QT4%%%%X264%%lib/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Qt.so
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPhone.xml
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Microsoft Zune.xml
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Sony PlayStation Portable.xml
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPod 5.5G.xml
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPod.xml
-%%XVID%%lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so
-%%XVID%%lib/ADM_plugins/videoEncoder/xvid/XvidParam.xsd
-%%GTK%%%%XVID%%lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Gtk.so
-%%QT4%%%%XVID%%lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Qt.so
+lib/ADM_plugins/videoEncoder/libADM_vidEnc_avcodec.so
 lib/ADM_plugins/videoEncoder/libADM_vidEnc_mpeg2enc.so
 lib/ADM_plugins/videoEncoder/mpeg2enc/Mpeg1Param.xsd
 lib/ADM_plugins/videoEncoder/mpeg2enc/Mpeg2Param.xsd
 lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-1/Video CD.xml
 lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/DVD.xml
 lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/Super Video CD.xml
+lib/ADM_plugins/videoFilter/libADM_vf_Deinterlace.so
+lib/ADM_plugins/videoFilter/libADM_vf_Delta.so
+lib/ADM_plugins/videoFilter/libADM_vf_Denoise.so
+lib/ADM_plugins/videoFilter/libADM_vf_FluxSmooth.so
+lib/ADM_plugins/videoFilter/libADM_vf_Hue_cli.so
+lib/ADM_plugins/videoFilter/libADM_vf_Mosaic.so
+lib/ADM_plugins/videoFilter/libADM_vf_Pulldown.so
+lib/ADM_plugins/videoFilter/libADM_vf_Stabilize.so
+lib/ADM_plugins/videoFilter/libADM_vf_Tisophote.so
+lib/ADM_plugins/videoFilter/libADM_vf_Whirl.so
 lib/ADM_plugins/videoFilter/libADM_vf_addborders.so
+lib/ADM_plugins/videoFilter/libADM_vf_asharp_cli.so
+lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_cli.so
 lib/ADM_plugins/videoFilter/libADM_vf_avsfilter.so
+lib/ADM_plugins/videoFilter/libADM_vf_blackenBorders.so
+lib/ADM_plugins/videoFilter/libADM_vf_blendDgBob.so
 lib/ADM_plugins/videoFilter/libADM_vf_blendRemoval.so
-lib/ADM_plugins/videoFilter/libADM_vidChromaU.so
-lib/ADM_plugins/videoFilter/libADM_vidChromaV.so
+lib/ADM_plugins/videoFilter/libADM_vf_chromashift_cli.so
+lib/ADM_plugins/videoFilter/libADM_vf_cnr2_cli.so
+lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_cli.so
+lib/ADM_plugins/videoFilter/libADM_vf_contrast_cli.so
+lib/ADM_plugins/videoFilter/libADM_vf_crop_cli.so
 lib/ADM_plugins/videoFilter/libADM_vf_decimate.so
-lib/ADM_plugins/videoFilter/libADM_vf_blendDgBob.so
+lib/ADM_plugins/videoFilter/libADM_vf_denoise3d.so
+lib/ADM_plugins/videoFilter/libADM_vf_denoise3dhq.so
+lib/ADM_plugins/videoFilter/libADM_vf_dropOut.so
+lib/ADM_plugins/videoFilter/libADM_vf_eq2_cli.so
+lib/ADM_plugins/videoFilter/libADM_vf_equalizer_cli.so
 lib/ADM_plugins/videoFilter/libADM_vf_fade.so
-lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmean.so
 lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutiongauss.so
+lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmean.so
 lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmedian.so
 lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionsharpen.so
 lib/ADM_plugins/videoFilter/libADM_vf_forcedPP.so
+lib/ADM_plugins/videoFilter/libADM_vf_hzStackField.so
+lib/ADM_plugins/videoFilter/libADM_vf_keepEvenField.so
+lib/ADM_plugins/videoFilter/libADM_vf_keepOddField.so
+lib/ADM_plugins/videoFilter/libADM_vf_kernelDeint.so
 lib/ADM_plugins/videoFilter/libADM_vf_largemedian.so
+lib/ADM_plugins/videoFilter/libADM_vf_lavDeinterlace.so
+lib/ADM_plugins/videoFilter/libADM_vf_logo.so
 lib/ADM_plugins/videoFilter/libADM_vf_lumaonly.so
+lib/ADM_plugins/videoFilter/libADM_vf_mSharpen.so
+lib/ADM_plugins/videoFilter/libADM_vf_mSmooth.so
 lib/ADM_plugins/videoFilter/libADM_vf_mcdeint.so
-lib/ADM_plugins/videoFilter/libADM_vf_denoise3dhq.so
-lib/ADM_plugins/videoFilter/libADM_vf_denoise3d.so
+lib/ADM_plugins/videoFilter/libADM_vf_mergeField.so
+lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_cli.so
+lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_cli.so
+lib/ADM_plugins/videoFilter/libADM_vf_palShift.so
 lib/ADM_plugins/videoFilter/libADM_vf_resampleFps.so
 lib/ADM_plugins/videoFilter/libADM_vf_reverse.so
+lib/ADM_plugins/videoFilter/libADM_vf_rotate.so
+lib/ADM_plugins/videoFilter/libADM_vf_separateField.so
+lib/ADM_plugins/videoFilter/libADM_vf_smartPalShift.so
+lib/ADM_plugins/videoFilter/libADM_vf_smartSwapField.so
+lib/ADM_plugins/videoFilter/libADM_vf_soften.so
+lib/ADM_plugins/videoFilter/libADM_vf_stackField.so
+lib/ADM_plugins/videoFilter/libADM_vf_swapField.so
 lib/ADM_plugins/videoFilter/libADM_vf_swapuv.so
+lib/ADM_plugins/videoFilter/libADM_vf_tdeint.so
 lib/ADM_plugins/videoFilter/libADM_vf_telecide.so
-lib/ADM_plugins/videoFilter/libADM_vf_vlad.so
+lib/ADM_plugins/videoFilter/libADM_vf_unstackField.so
 lib/ADM_plugins/videoFilter/libADM_vf_vflip.so
+lib/ADM_plugins/videoFilter/libADM_vf_vlad.so
 lib/ADM_plugins/videoFilter/libADM_vf_yadif.so
-lib/ADM_plugins/videoFilter/libADM_vf_Pulldown.so
-lib/ADM_plugins/videoFilter/libADM_vf_Denoise.so
-lib/ADM_plugins/videoFilter/libADM_vf_Delta.so
-lib/ADM_plugins/videoFilter/libADM_vf_dropOut.so
+lib/ADM_plugins/videoFilter/libADM_vidChromaU.so
+lib/ADM_plugins/videoFilter/libADM_vidChromaV.so
+%%AMRNB%%lib/ADM_plugins/audioDecoder/libADM_ad_opencore_amrnb.so
+%%AMRWB%%lib/ADM_plugins/audioDecoder/libADM_ad_opencore_amrwb.so
+%%ESD%%lib/ADM_plugins/audioDevices/libADM_av_esd.so
+%%FAAC%%lib/ADM_plugins/audioEncoders/libADM_ae_faac.so
+%%FAAD%%lib/ADM_plugins/audioDecoder/libADM_ad_faad.so
+%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_ssa.so
+%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_cli.so
+%%GTK%%%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_gtk.so
+%%GTK%%%%X264%%lib/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Gtk.so
+%%GTK%%%%XVID%%lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Gtk.so
+%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_Crop_gtk.so
+%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_asharp_gtk.so
 %%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_cli.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_blackenBorders.so
-lib/ADM_plugins/videoFilter/libADM_vf_kernelDeint.so
-lib/ADM_plugins/videoFilter/libADM_vf_Deinterlace.so
-lib/ADM_plugins/videoFilter/libADM_vf_separateField.so
-lib/ADM_plugins/videoFilter/libADM_vf_mergeField.so
-lib/ADM_plugins/videoFilter/libADM_vf_stackField.so
-lib/ADM_plugins/videoFilter/libADM_vf_hzStackField.so
-lib/ADM_plugins/videoFilter/libADM_vf_unstackField.so
-lib/ADM_plugins/videoFilter/libADM_vf_FluxSmooth.so
-lib/ADM_plugins/videoFilter/libADM_vf_Stabilize.so
-lib/ADM_plugins/videoFilter/libADM_vf_Mosaic.so
-lib/ADM_plugins/videoFilter/libADM_vf_Whirl.so
-lib/ADM_plugins/videoFilter/libADM_vf_palShift.so
-lib/ADM_plugins/videoFilter/libADM_vf_smartPalShift.so
-lib/ADM_plugins/videoFilter/libADM_vf_swapField.so
-lib/ADM_plugins/videoFilter/libADM_vf_smartSwapField.so
-lib/ADM_plugins/videoFilter/libADM_vf_keepOddField.so
-lib/ADM_plugins/videoFilter/libADM_vf_keepEvenField.so
-lib/ADM_plugins/videoFilter/libADM_vf_mSharpen.so
-lib/ADM_plugins/videoFilter/libADM_vf_mSmooth.so
-lib/ADM_plugins/videoFilter/libADM_vf_soften.so
-lib/ADM_plugins/videoFilter/libADM_vf_lavDeinterlace.so
-lib/ADM_plugins/videoFilter/libADM_vf_logo.so
 %%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_chromaShift_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_chromashift_cli.so
 %%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_cnr2_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_cnr2_cli.so
 %%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_cli.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_equalizer_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_equalizer_cli.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_cli.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_asharp_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_asharp_cli.so
 %%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_contrast_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_contrast_cli.so
 %%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_eq2_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_eq2_cli.so
+%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_equalizer_gtk.so
 %%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_hue_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_Hue_cli.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_Crop_gtk.so
-lib/ADM_plugins/videoFilter/libADM_vf_crop_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_rotate.so
-lib/ADM_plugins/videoFilter/libADM_vf_tdeint.so
-%%GTK%%%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_gtk.so
+%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_gtk.so
+%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_gtk.so
+%%JACK%%lib/ADM_plugins/audioDevices/libADM_av_jack.so
+%%PULSE%%lib/ADM_plugins/audioDevices/libADM_av_pulseAudioSimple.so
 %%QT4%%%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_qt4.so
-%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_cli.so
-%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_ssa.so
-lib/ADM_plugins/videoFilter/libADM_vf_Tisophote.so
+%%QT4%%%%X264%%lib/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Qt.so
+%%QT4%%%%XVID%%lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Qt.so
+%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_asharp_qt4.so
 %%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_qt4.so
 %%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_chromaShift_qt4.so
 %%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_cnr2_qt4.so
 %%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_equalizer_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_asharp_qt4.so
 %%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_contrast_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_eq2_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_hue_qt4.so
 %%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_crop_qt4.so
 %%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_curveEditor_qt4.so
-lib/ADM_plugins/audioEncoders/libADM_ae_twolame.so
-lib/ADM_plugins/audioEncoders/libADM_ae_pcm.so
-lib/ADM_plugins/audioEncoders/libADM_ae_lav_mp2.so
-lib/ADM_plugins/audioEncoders/libADM_ae_lav_ac3.so
-lib/ADM_plugins/audioEncoders/libADM_ae_lame.so
+%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_eq2_qt4.so
+%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_equalizer_qt4.so
+%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_hue_qt4.so
+%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_qt4.so
+%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_qt4.so
+%%SDL%%lib/ADM_plugins/audioDevices/libADM_av_sdl.so
 %%VORBIS%%lib/ADM_plugins/audioEncoders/libADM_ae_vorbis.so
-%%FAAC%%lib/ADM_plugins/audioEncoders/libADM_ae_faac.so
+%%X264%%lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so
+%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPhone.xml
+%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPod 5.5G.xml
+%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPod.xml
+%%X264%%lib/ADM_plugins/videoEncoder/x264/Microsoft Zune.xml
+%%X264%%lib/ADM_plugins/videoEncoder/x264/Sony PlayStation Portable.xml
+%%X264%%lib/ADM_plugins/videoEncoder/x264/x264Param.xsd
+%%XVID%%lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so
+%%XVID%%lib/ADM_plugins/videoEncoder/xvid/XvidParam.xsd
 @dirrm lib/ADM_plugins/audioDecoder
 @dirrm lib/ADM_plugins/audioDevices
 @dirrm lib/ADM_plugins/videoEncoder/avcodec/mpeg-1
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 3c8ec8e4162..bbd7e9ede16 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	${AVIDEMUX2_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common
index 9b09939e673..2ceef5bc6b7 100644
--- a/multimedia/avidemux2/Makefile.common
+++ b/multimedia/avidemux2/Makefile.common
@@ -64,6 +64,12 @@ WITHOUT_AMRNB=	yes
 WITHOUT_AMRWB=	yes
 .endif
 
+# for libexecinfo: (so that __builtin_frame_address() finds the top
+# of the stack)
+.if ${ARCH} == "amd64"
+CFLAGS+=	-fno-omit-frame-pointer
+.endif
+
 # We haven't ALSA(Never) & Aften(Yet) on FreeBSD
 CMAKE_ARGS+=	-DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF
 
@@ -236,12 +242,9 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/*/*/Makefile
 	@${CP} ${FILESDIR}/execinfo.cpp ${WRKSRC}/cmake_compile_check/
-	@${REINPLACE_CMD} "s|%%DATADIR%%|${DATADIR}|g" \
-	    ${WRKSRC}/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp \
-	    ${WRKSRC}/cmake/Ts.cmake
 	@${CP} ${FILESDIR}/*.patch ${WRKSRC}/cmake/patches/
 	@${MKDIR} ${CONFIGURE_WRKSRC}/config
 	@${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config
 
 post-configure-common:
-	@${FIND} ${WRKDIR}/.build/avidemux -name link.txt -print0 |${XARGS} -0 ${REINPLACE_CMD} 's|-ldl||'
+	@${FIND} ${CONFIGURE_WRKSRC}/avidemux -name link.txt -print0 |${XARGS} -0 ${REINPLACE_CMD} 's|-ldl||'
diff --git a/multimedia/avidemux2/files/patch-CMakeLists.txt b/multimedia/avidemux2/files/patch-CMakeLists.txt
index ee426718683..226fb9787e0 100644
--- a/multimedia/avidemux2/files/patch-CMakeLists.txt
+++ b/multimedia/avidemux2/files/patch-CMakeLists.txt
@@ -15,12 +15,3 @@
  

  IF (WIN32)

  	SET(BIN_DIR .)

-@@ -104,7 +104,7 @@ SET(VERSION 2.5.4)

- # since it uses the minimum set of required libraries and CMake will 

- # fail if these aren't met.

- SET(ADM_UI_GTK 1)

--SET(ADM_UI_QT4 1)

-+# SET(ADM_UI_QT4 1)

- 

- SET(ADM_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")

- 

diff --git a/multimedia/avidemux2/files/patch-avidemux-ADM_core-src-ADM_crashdump.cpp b/multimedia/avidemux2/files/patch-avidemux-ADM_core-src-ADM_crashdump.cpp
deleted file mode 100644
index fb0405d72e1..00000000000
--- a/multimedia/avidemux2/files/patch-avidemux-ADM_core-src-ADM_crashdump.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- avidemux/ADM_core/src/ADM_crashdump.cpp.orig
-+++ avidemux/ADM_core/src/ADM_crashdump.cpp
-@@ -47,7 +47,7 @@ void ADM_setCrashHook(ADM_saveFunction *
- extern char *ADM_getBaseDir(void);

- extern void A_parseECMAScript(const char *name);

- 

--#ifdef __APPLE__

-+#if defined(__APPLE__) || defined(__FreeBSD__)

- void installSigHandler() {}

- 

- void ADM_backTrack(const char *info,int lineno,const char *file)

diff --git a/multimedia/avidemux2/files/patch-cmake-admCheckMiscLibs.cmake b/multimedia/avidemux2/files/patch-cmake-admCheckMiscLibs.cmake
new file mode 100644
index 00000000000..a9f31b8ae70
--- /dev/null
+++ b/multimedia/avidemux2/files/patch-cmake-admCheckMiscLibs.cmake
@@ -0,0 +1,44 @@
+--- cmake/admCheckMiscLibs.cmake.orig
++++ cmake/admCheckMiscLibs.cmake
+@@ -103,3 +103,41 @@ ELSE (USE_SYSTEM_SPIDERMONKEY)

+ ENDIF (USE_SYSTEM_SPIDERMONKEY)

+ 

+ MESSAGE("")

++########################################

++# Execinfo

++########################################

++MESSAGE(STATUS "Checking for execinfo")

++MESSAGE(STATUS "*********************")

++

++FIND_PATH(LIBEXECINFO_H_DIR execinfo.h $ENV{CXXFLAGS})

++MESSAGE(STATUS "libexecinfo Header Path: ${LIBEXECINFO_H_DIR}")

++

++IF (NOT LIBEXECINFO_H_DIR STREQUAL "LIBEXECINFO_H-NOTFOUND")

++        FIND_LIBRARY(LIBEXECINFO_LIB_DIR execinfo $ENV{CXXFLAGS})

++        MESSAGE(STATUS "libexecinfo Library Path: ${LIBEXECINFO_LIB_DIR}")

++

++        # Try linking without -lexecinfo

++        ADM_COMPILE(execinfo.cpp "" ${LIBEXECINFO_H_DIR} "" WITHOUT_LIBEXECINFO outputWithoutLibexecinfo)

++

++        IF (WITHOUT_LIBEXECINFO)

++               SET(HAVE_EXECINFO 1)

++               MESSAGE(STATUS "OK, No lib needed (${ADM_EXECINFO_LIB})")

++        ELSE (WITHOUT_LIBEXECINFO)

++               ADM_COMPILE(execinfo.cpp "" ${LIBEXECINFO_H_DIR} ${LIBEXECINFO_LIB_DIR} WITH_LIBEXECINFO outputWithLibexecinfo)

++

++               IF (WITH_LIBEXECINFO)

++                           SET(HAVE_EXECINFO 1)

++                            MESSAGE(STATUS "OK, libexecinfo needed")

++               ELSE (WITH_LIBEXECINFO)

++                            MESSAGE(STATUS "Does not work, without ${outputWithoutLibexecinfo}")

++                            MESSAGE(STATUS "Does not work, with ${outputWithLibexecinfo}")

++                        ENDIF (WITH_LIBEXECINFO)

++                ENDIF (WITHOUT_LIBEXECINFO)

++        ENDIF (NOT LIBEXECINFO_H_DIR STREQUAL "LIBEXECINFO_H-NOTFOUND")

++

++        IF (HAVE_EXECINFO)

++                SET(CMAKE_CLINK_FLAGS "${CFLAGS} -lexecinfo")

++                SET(CMAKE_CXX_LINK_FLAGS "${CXXFLAGS} -lexecinfo")

++        ENDIF(HAVE_EXECINFO)

++

++MESSAGE("")