Finally upgrade to 1.1.7.

Changelog at
<http://sourceforge.net/p/xvidcap/news/2008/07/xvidcap-117-released/>.

10 files changed, 60 insertions, 343 deletions

diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 68162e9c8381..b08cbf4fe6fa 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -2,35 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=		xvidcap
-DISTVERSION=		1.1.4p1
-PORTREVISION=	11
+PORTVERSION=		1.1.7
 PORTEPOCH=		1
 CATEGORIES=		sysutils multimedia
-MASTER_SITES=		SF/${PORTNAME}/OldFiles
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Capture your X display to individual frames or MPEG video
 
-BUILD_DEPENDS=		rarian-sk-config:${PORTSDIR}/textproc/rarian	\
-			xml2po:${PORTSDIR}/textproc/gnome-doc-utils	\
-			texi2html:${PORTSDIR}/textproc/texi2html
-# To be reactivated when ffmpeg-devel will install libswscale.
-#LIB_DEPENDS=		avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel
-LIB_DEPENDS=		mp3lame.0:${PORTSDIR}/audio/lame
-RUN_DEPENDS=		animate:${PORTSDIR}/graphics/ImageMagick
+LICENSE=		GPLv3
+
+BUILD_DEPENDS=		xml2po:${PORTSDIR}/textproc/gnome-doc-utils	\
+			scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+LIB_DEPENDS=		libswscale.so:${PORTSDIR}/multimedia/ffmpeg	\
+			libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib	\
+			libmp3lame.so:${PORTSDIR}/audio/lame
+RUN_DEPENDS=		animate:${PORTSDIR}/graphics/ImageMagick	\
+			gimp:${PORTSDIR}/graphics/gimp-app
 
 GNU_CONFIGURE=		yes
-# Remove MAKE="${GMAKE}" after ffmpeg-devel's upgrade
-CONFIGURE_ENV=		LOCALBASE="${LOCALBASE}"		\
-			MAKE="${GMAKE}"
 CPPFLAGS+=		-I${LOCALBASE}/include
-CONFIGURE_ARGS=		--with-forced-embedded-ffmpeg	# To be removed after ffmpeg-devel's upgrade
+# --export-dynamic fixes libglade problems
+LDFLAGS+=		-L${LOCALBASE}/lib -Wl,--export-dynamic
 
-USE_GMAKE=		yes	# To be removed after ffmpeg-devel's upgrade
 USE_GNOME=		glib20 libglade2
-USES=		gettext pkgconfig
-USE_XORG=		x11 xmu
+USES=			gettext gmake pkgconfig
+USE_XORG=		x11 xmu ice xfixes xdamage
 INSTALLS_OMF=		yes
+MANLANG=		"" de es it
 
 .if !defined(CFLAGS) || ${CFLAGS:M-fno-strict-aliasing*} == ""
 CFLAGS+=	-O2 -fno-strict-aliasing
@@ -39,18 +38,16 @@ CFLAGS+=	-O2 -fno-strict-aliasing
 PORTDOCS=		AUTHORS ChangeLog README
 NULLDOCS=		COPYING
 
-MAN1=			xvidcap.1
-
-NO_STAGE=	yes
 pre-configure:
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e 's|pkgdataDATA install-xvidcapdocDATA|pkgdataDATA|'	\
 		${WRKSRC}/Makefile.in
 .endif
+	${REINPLACE_CMD} -e 's|/bin/bash | /bin/sh|' ${WRKSRC}/ppm2mpeg.sh
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${RM} ${NULLDOCS:S|^|${DOCSDIR}/|}
+	${RM} -f ${NULLDOCS:S|^|${STAGEDIR}${DOCSDIR}/|}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/xvidcap/distinfo b/sysutils/xvidcap/distinfo
index d20f6937e7c8..30b251a4e0ca 100644
--- a/sysutils/xvidcap/distinfo
+++ b/sysutils/xvidcap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xvidcap-1.1.4p1.tar.gz) = 861fdb75e5f78de9f160f6c475a32389d825227292b33a976cbc12e0446324bf
-SIZE (xvidcap-1.1.4p1.tar.gz) = 4006788
+SHA256 (xvidcap-1.1.7.tar.gz) = 154622801e8d5e91b834e7707e9e1cc65cf20d0161f6e0323bc3bf0efd85195d
+SIZE (xvidcap-1.1.7.tar.gz) = 4789924
diff --git a/sysutils/xvidcap/files/patch-configure b/sysutils/xvidcap/files/patch-configure
deleted file mode 100644
index 4051e1ea181f..000000000000
--- a/sysutils/xvidcap/files/patch-configure
+++ /dev/null
@@ -1,196 +0,0 @@
---- configure.orig	2006-11-16 18:50:24.000000000 +0100
-+++ configure	2010-09-05 22:17:41.000000000 +0200
-@@ -9078,7 +9078,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lXmu  $LIBS"
-+LIBS="-L$x_libraries -lXmu  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9140,7 +9140,7 @@
- #define HAVE_LIBXMU 1
- _ACEOF
- 
--  LIBS="-lXmu $LIBS"
-+  LIBS="-L$x_libraries -lXmu $LIBS"
- 
- else
-   unset ac_cv_lib_Xmu_XmuClientWindow; echo "Couldn't find libXmu in LD_LIBRARY_PATH, checking X11 paths"; echo "$as_me:$LINENO: checking for XmuClientWindow in -lXmu" >&5
-@@ -9513,11 +9513,11 @@
- # if cache empty (not tested or failed) and want static avcodec (then it failed) ...
- if ( `test \( \( x${ac_cv_lib_avutil_av_rescale+set} = x \) -a \( x$static_avutil = xyes \) \)` ) ; then
- 	# build embedded ffmpeg
--	echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && ( cd ./ffmpeg/ && ./configure --cc=${CC} --enable-gpl ${ac_my_ffmpeg_cfg_lame_switch} --enable-pthreads --enable-swscaler --disable-ffserver --disable-ffplay && ln -s libavcodec/avcodec.h && ln -s libavformat/avformat.h && ln -s libavformat/avio.h && ln -s libavformat/rt*.h ./ && ln -s libavutil/common.h ./ && ln -s libavutil/avutil.h ./ && ln -s libavutil/mathematics.h ./ && ln -s libavutil/int*.h ./ && ln -s libavutil/rational.h ./ && ln -s libswscale/swscale.h ./ && ln -s libswscale/rgb2rgb.h . && ${MAKE-make} )
-+	echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && ( cd ./ffmpeg/ && ./configure --cc=${CC} --extra-cflags=${CPPFLAGS} --extra-libs=-lm --disable-opts --disable-muxer=v4l --disable-muxer=v4l2 --enable-gpl ${ac_my_ffmpeg_cfg_lame_switch} --enable-pthreads --enable-swscaler --disable-ffserver --disable-ffplay && ln -s libavcodec/avcodec.h && ln -s libavformat/avformat.h && ln -s libavformat/avio.h && ln -s libavformat/rt*.h ./ && ln -s libavutil/common.h ./ && ln -s libavutil/avutil.h ./ && ln -s libavutil/mathematics.h ./ && ln -s libavutil/int*.h ./ && ln -s libavutil/rational.h ./ && ln -s libswscale/swscale.h ./ && ln -s libswscale/rgb2rgb.h . && ${MAKE-make} )
- 	#echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && ( cd ./ffmpeg/ && ./configure --cc=${CC} ${ac_my_ffmpeg_cfg_lame_switch} --enable-pthreads --disable-ffserver --disable-ffplay && ln -s libavcodec/avcodec.h && ln -s libavformat/avformat.h && ln -s libavformat/avio.h && ln -s libavformat/rt*.h ./ && ln -s libavutil/common.h ./ && ln -s libavutil/avutil.h ./ && ln -s libavutil/mathematics.h ./ && ln -s libavutil/int*.h ./ && ln -s libavutil/rational.h ./ && ${MAKE-make} )
- 	# try to link it statically, or reset cache, set static_avcodec=no
- 	top_srcdir=`pwd`
--	ac_my_ldflags_save=${LDFLAGS} ; LDFLAGS="${LDFLAGS} -L$top_srcdir/ffmpeg/libavcodec -L$top_srcdir/ffmpeg/libavformat -L$top_srcdir/ffmpeg/libavutil -L$top_srcdir/ffmpeg/libswscale"
-+	ac_my_ldflags_save=${LDFLAGS} ; LOCALLIBPATH="-L$top_srcdir/ffmpeg/libavcodec -L$top_srcdir/ffmpeg/libavformat -L$top_srcdir/ffmpeg/libavutil -L$top_srcdir/ffmpeg/libswscale"
- 	ac_my_cflags_save=${CFLAGS} ; CFLAGS="${CFLAGS} -I $top_srcdir -I$top_srcdir/ffmpeg/libavcodec -I$top_srcdir/ffmpeg/libavformat -I$top_srcdir/ffmpeg/libavutil -I$top_srcdir/ffmpeg/libswscale"
- 
- 
-@@ -9532,7 +9532,7 @@
- 
- echo -n "(static?) ... "
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-Wl,-Bstatic -lavutil -Wl,-Bdynamic  $LIBS"
-+LIBS="-Wl,-Bstatic -L$top_srcdir/ffmpeg/libavutil -lavutil -Wl,-Bdynamic $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9599,7 +9599,7 @@
- #define HAVE_LIBAVUTIL 1
- _ACEOF
- 
--		LIBS="-Wl,-Bstatic -lavutil -Wl,-Bdynamic $LIBS"
-+		LIBS="-Wl,-Bstatic -L$top_srcdir/ffmpeg/libavutil -lavutil -Wl,-Bdynamic $LIBS"
- 
- else
-   unset ac_cv_lib_avutil_av_rescale ; static_avcodec=no ; LDFLAGS=$ac_my_ldflags_save ; CFLAGS=$ac_my_cflags_save
-@@ -9618,7 +9618,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lavutil  $LIBS"
-+LIBS="-L$top_srcdir/ffmpeg/libavutil -lavutil $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9680,7 +9680,7 @@
- #define HAVE_LIBAVUTIL 1
- _ACEOF
- 
--  LIBS="-lavutil $LIBS"
-+  LIBS="-L$top_srcdir/ffmpeg/libavutil -lavutil $LIBS"
- 
- fi
- 
-@@ -9703,7 +9703,7 @@
- 
- echo -n "(static?) ... "
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-Wl,-Bstatic -lswscale -Wl,-Bdynamic $ac_my_swscale_libs $LIBS"
-+LIBS="-Wl,-Bstatic -L$top_srcdir/ffmpeg/libswscale -lswscale -Wl,-Bdynamic $ac_my_swscale_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9770,7 +9770,7 @@
- #define HAVE_LIBSWSCALE 1
- _ACEOF
- 
--		LIBS="-Wl,-Bstatic -lswscale -Wl,-Bdynamic $LIBS"
-+		LIBS="-Wl,-Bstatic -L$top_srcdir/ffmpeg/libswscale -lswscale -Wl,-Bdynamic $LIBS"
- 
- else
-   unset ac_cv_lib_swscale_sws_scale ; static_swscale=no ;
-@@ -9780,7 +9780,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lswscale $ac_my_swscale_libs $LIBS"
-+LIBS="-L$top_srcdir/ffmpeg/libswscale -lswscale $ac_my_swscale_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9842,7 +9842,7 @@
- #define HAVE_LIBSWSCALE 1
- _ACEOF
- 
--  LIBS="-lswscale $LIBS"
-+  LIBS="-L$top_srcdir/ffmpeg/libswscale -lswscale $LIBS"
- 
- fi
- 
-@@ -9868,7 +9868,7 @@
- 
- echo -n "(static?) ... "
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-Wl,-Bstatic -lavcodec -Wl,-Bdynamic $ac_my_avcodec_libs $LIBS"
-+LIBS="-Wl,-Bstatic -L$top_srcdir/ffmpeg/libavcodec -lavcodec -Wl,-Bdynamic $ac_my_avcodec_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9935,7 +9935,7 @@
- #define HAVE_LIBAVCODEC 1
- _ACEOF
- 
--		LIBS="-Wl,-Bstatic -lavcodec -Wl,-Bdynamic $LIBS"
-+		LIBS="-Wl,-Bstatic -L$top_srcdir/ffmpeg/libavcodec -lavcodec -Wl,-Bdynamic $LIBS"
- 
- else
-   unset ac_cv_lib_avcodec_avcodec_encode_video ; static_avcodec=no ;
-@@ -9945,7 +9945,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lavcodec $ac_my_avcodec_libs $LIBS"
-+LIBS="-L$top_srcdir/ffmpeg/libavcodec -lavcodec $ac_my_avcodec_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10007,7 +10007,7 @@
- #define HAVE_LIBAVCODEC 1
- _ACEOF
- 
--  LIBS="-lavcodec $LIBS"
-+  LIBS="-L$top_srcdir/ffmpeg/libavcodec -lavcodec $LIBS"
- 
- fi
- 
-@@ -10033,7 +10033,7 @@
- 
- echo -n "(static?) ... "
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-Wl,-Bstatic -lavformat -Wl,-Bdynamic $ac_my_avformat_libs $LIBS"
-+LIBS="-Wl,-Bstatic -L$top_srcdir/ffmpeg/libavformat -lavformat -Wl,-Bdynamic $ac_my_avformat_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10100,7 +10100,7 @@
- #define HAVE_LIBAVFORMAT 1
- _ACEOF
- 
--		LIBS="-Wl,-Bstatic -lavformat -Wl,-Bdynamic $LIBS"
-+		LIBS="-Wl,-Bstatic -L$top_srcdir/ffmpeg/libavformat -lavformat -Wl,-Bdynamic $LIBS"
- 
- else
-   unset ac_cv_lib_avformat_av_write_header ; static_avformat=no ;
-@@ -10110,7 +10110,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lavformat $ac_my_avformat_libs $LIBS"
-+LIBS="-L$top_srcdir/ffmpeg/libavformat -lavformat $ac_my_avformat_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10172,7 +10172,7 @@
- #define HAVE_LIBAVFORMAT 1
- _ACEOF
- 
--  LIBS="-lavformat $LIBS"
-+  LIBS="-L$top_srcdir/ffmpeg/libavformat -lavformat $LIBS"
- 
- fi
- 
-@@ -10206,7 +10206,7 @@
- 
- echo -n "(static?) ... "
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-Wl,-Bstatic -lavcodec -Wl,-Bdynamic $ac_my_avcodec_libs $LIBS"
-+LIBS="-Wl,-Bstatic -L$top_srcdir/ffmpeg/libavcodec -lavcodec -Wl,-Bdynamic $ac_my_avcodec_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10277,7 +10277,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lavcodec $ac_my_avcodec_libs $LIBS"
-+LIBS="-L$top_srcdir/ffmpeg/libavcodec -lavcodec $ac_my_avcodec_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/sysutils/xvidcap/files/patch-ffmpeg_Makefile b/sysutils/xvidcap/files/patch-ffmpeg_Makefile
deleted file mode 100644
index 98cd3dc125f2..000000000000
--- a/sysutils/xvidcap/files/patch-ffmpeg_Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- ffmpeg/Makefile.orig	2006-10-25 21:31:11.000000000 +0200
-+++ ffmpeg/Makefile	2010-09-05 16:47:52.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- VPATH=$(SRC_PATH)
- 
--CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
-+CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) $(OPTFLAGS) -I$(SRC_PATH)/libavutil \
-        -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
-        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
- LDFLAGS+= -g
-@@ -55,11 +55,11 @@
- OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
- SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
- LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
--EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
-+EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
- 
- ifeq ($(CONFIG_SWSCALER),yes)
- LDFLAGS+=-L./libswscale
--EXTRALIBS+=-lswscale$(BUILDSUF)
-+EXTRALIBS+=-L$(BUILD_ROOT)/libswscale -lswscale$(BUILDSUF)
- endif
- 
- all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
diff --git a/sysutils/xvidcap/files/patch-ffmpeg_configure b/sysutils/xvidcap/files/patch-ffmpeg_configure
deleted file mode 100644
index b2e3ba0ee7b6..000000000000
--- a/sysutils/xvidcap/files/patch-ffmpeg_configure
+++ /dev/null
@@ -1,39 +0,0 @@
---- ffmpeg/configure.orig	2006-10-25 21:31:11.000000000 +0200
-+++ ffmpeg/configure	2010-09-05 17:13:00.000000000 +0200
-@@ -556,7 +556,7 @@
- audio_oss="yes"
- dv1394="no"
- make="gmake"
--add_cflags "-pthread"
-+add_cflags "-fomit-frame-pointer"
- ;;
- GNU/kFreeBSD)
- v4l="no"
-@@ -1001,7 +1001,7 @@
- 
- # compute MMX state
- if test $mmx = "default"; then
--    if test $arch = "x86" -o $arch = "x86_64"; then
-+    if test $arch = "x86"; then
-         mmx="yes"
-     else
-         mmx="no"
-@@ -1304,7 +1304,7 @@
- # these are off by default, so fail if requested and not available
- enabled dts     && require libdts dts.h dts_init -ldts -lm
- enabled libgsm  && require libgsm gsm.h gsm_create -lgsm
--enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
-+enabled mp3lame && require LAME lame/lame.h lame_init -L${LOCALBASE}/lib -lmp3lame -lm
- enabled vorbis  && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg
- enabled libogg  && require libogg ogg/ogg.h ogg_sync_init -logg
- enabled xvid    && require XviD xvid.h xvid_global -lxvidcore
-@@ -1514,9 +1514,6 @@
- check_cflags -Wall
- check_cflags -Wno-switch
- check_cflags -Wdisabled-optimization
--check_cflags -Wpointer-arith
--check_cflags -Wredundant-decls
--check_cflags -Winline
- 
- # add some linker flags
- check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavformat' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
diff --git a/sysutils/xvidcap/files/patch-ffmpeg_libavcodec_cabac.h b/sysutils/xvidcap/files/patch-ffmpeg_libavcodec_cabac.h
deleted file mode 100644
index 30115fae388f..000000000000
--- a/sysutils/xvidcap/files/patch-ffmpeg_libavcodec_cabac.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ffmpeg/libavcodec/cabac.h.orig	2010-08-29 11:27:54.000000000 +0000
-+++ ffmpeg/libavcodec/cabac.h	2010-08-29 11:28:07.000000000 +0000
-@@ -28,9 +28,6 @@
- 
- //#undef NDEBUG
- #include <assert.h>
--#ifdef ARCH_X86_64
--#define ARCH_X86
--#endif
- #ifdef ARCH_X86
- #include "x86_cpu.h"
- #endif
diff --git a/sysutils/xvidcap/files/patch-ffmpeg_libavformat_grab-bktr.c b/sysutils/xvidcap/files/patch-ffmpeg_libavformat_grab-bktr.c
deleted file mode 100644
index f143bb51396e..000000000000
--- a/sysutils/xvidcap/files/patch-ffmpeg_libavformat_grab-bktr.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- ffmpeg/libavformat/grab_bktr.c~	2010-08-29 11:31:58.000000000 +0000
-+++ ffmpeg/libavformat/grab_bktr.c	2010-08-29 11:32:13.000000000 +0000
-@@ -25,13 +25,8 @@
-  */
- #include "avformat.h"
- #if defined(__FreeBSD__)
--# if __FreeBSD__ >= 502100
- #  include <dev/bktr/ioctl_meteor.h>
- #  include <dev/bktr/ioctl_bt848.h>
--# else
--#  include <machine/ioctl_meteor.h>
--#  include <machine/ioctl_bt848.h>
--# endif
- #elif defined(__FreeBSD_kernel__)
- # include <dev/bktr/ioctl_meteor.h>
- # include <dev/bktr/ioctl_bt848.h>
diff --git a/sysutils/xvidcap/files/patch-src_Makefile.in b/sysutils/xvidcap/files/patch-src_Makefile.in
deleted file mode 100644
index a8d813d8b649..000000000000
--- a/sysutils/xvidcap/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig	2006-11-16 18:50:23.000000000 +0100
-+++ src/Makefile.in	2010-09-05 22:20:46.000000000 +0200
-@@ -62,8 +62,8 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS) $(INCLUDES) $(CPPFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(xvidcap_SOURCES)
-@@ -347,7 +347,7 @@
- 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
- xvidcap$(EXEEXT): $(xvidcap_OBJECTS) $(xvidcap_DEPENDENCIES) 
- 	@rm -f xvidcap$(EXEEXT)
--	$(LINK) $(xvidcap_LDFLAGS) $(xvidcap_OBJECTS) $(xvidcap_LDADD) $(LIBS)
-+	$(LINK) $(xvidcap_LDFLAGS) $(xvidcap_OBJECTS) $(LIBS) $(xvidcap_LDADD)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff --git a/sysutils/xvidcap/files/patch-src_gnome_ui.c b/sysutils/xvidcap/files/patch-src_gnome_ui.c
new file mode 100644
index 000000000000..9d2e09be88ca
--- /dev/null
+++ b/sysutils/xvidcap/files/patch-src_gnome_ui.c
@@ -0,0 +1,11 @@
+--- ./src/gnome_ui.c.orig	2008-06-12 22:48:03.000000000 +0200
++++ ./src/gnome_ui.c	2014-04-30 22:44:15.000000000 +0200
+@@ -1679,7 +1679,7 @@
+ {
+ #define DEBUGFUNCTION "xvc_init_pre()"
+     g_thread_init (NULL);
+-    gdk_threads_init ();
++    /*gdk_threads_init ();*/
+ 
+     gtk_init (&argc, &argv);
+     return TRUE;
diff --git a/sysutils/xvidcap/pkg-plist b/sysutils/xvidcap/pkg-plist
index 112c0acae3ec..fd867686bc91 100644
--- a/sysutils/xvidcap/pkg-plist
+++ b/sysutils/xvidcap/pkg-plist
@@ -1,5 +1,13 @@
 bin/xvidcap
+bin/xvidcap-dbus-client
+man/de/man1/xvidcap-dbus-client.1.gz
+man/de/man1/xvidcap.1.gz
+man/es/man1/xvidcap.1.gz
+man/it/man1/xvidcap.1.gz
+man/man1/xvidcap-dbus-client.1.gz
+man/man1/xvidcap.1.gz
 share/applications/xvidcap.desktop
+share/dbus-1/services/net.jarre_de_the.Xvidcap.service
 share/gnome/help/xvidcap/C/figures/back-button.png
 share/gnome/help/xvidcap/C/figures/edit-button.png
 share/gnome/help/xvidcap/C/figures/filename-button.png
@@ -16,6 +24,7 @@ share/gnome/help/xvidcap/C/figures/menu-prefs.png
 share/gnome/help/xvidcap/C/figures/menu-quit.png
 share/gnome/help/xvidcap/C/figures/menu-save-prefs.png
 share/gnome/help/xvidcap/C/figures/menu-sf.png
+share/gnome/help/xvidcap/C/figures/menu-show-frame.png
 share/gnome/help/xvidcap/C/figures/menu.png
 share/gnome/help/xvidcap/C/figures/pause-toggle.png
 share/gnome/help/xvidcap/C/figures/prefs-commands.png
@@ -47,6 +56,7 @@ share/gnome/help/xvidcap/de/figures/menu-prefs.png
 share/gnome/help/xvidcap/de/figures/menu-quit.png
 share/gnome/help/xvidcap/de/figures/menu-save-prefs.png
 share/gnome/help/xvidcap/de/figures/menu-sf.png
+share/gnome/help/xvidcap/de/figures/menu-show-frame.png
 share/gnome/help/xvidcap/de/figures/menu.png
 share/gnome/help/xvidcap/de/figures/pause-toggle.png
 share/gnome/help/xvidcap/de/figures/prefs-commands.png
@@ -125,6 +135,10 @@ share/gnome/help/xvidcap/it/figures/xvidcap-ctrl.png
 share/gnome/help/xvidcap/it/figures/xvidcap-main-ctrl.png
 share/gnome/help/xvidcap/it/figures/xvidcap-warning.png
 share/gnome/help/xvidcap/it/xvidcap.xml
+share/locale/de/LC_MESSAGES/xvidcap.mo
+share/locale/en/LC_MESSAGES/xvidcap.mo
+share/locale/es/LC_MESSAGES/xvidcap.mo
+share/locale/it/LC_MESSAGES/xvidcap.mo
 share/omf/xvidcap/xvidcap-C.omf
 share/omf/xvidcap/xvidcap-de.omf
 share/omf/xvidcap/xvidcap-es.omf
@@ -135,16 +149,21 @@ share/pixmaps/xvidcap.png
 %%DATADIR%%/ppm2mpeg.sh
 %%DATADIR%%/xvidcap.desktop
 %%DATADIR%%/xvidcap.png
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%
-@dirrm share/omf/xvidcap
-@dirrmtry share/omf
-@dirrm share/gnome/help/xvidcap/it/figures
-@dirrm share/gnome/help/xvidcap/it
-@dirrm share/gnome/help/xvidcap/es/figures
-@dirrm share/gnome/help/xvidcap/es
-@dirrm share/gnome/help/xvidcap/de/figures
-@dirrm share/gnome/help/xvidcap/de
+@dirrmtry man/de/man1
+@dirrmtry man/de
+@dirrmtry man/es/man1
+@dirrmtry man/es
+@dirrmtry man/it/man1
+@dirrmtry man/it
 @dirrm share/gnome/help/xvidcap/C/figures
 @dirrm share/gnome/help/xvidcap/C
+@dirrm share/gnome/help/xvidcap/de/figures
+@dirrm share/gnome/help/xvidcap/de
+@dirrm share/gnome/help/xvidcap/es/figures
+@dirrm share/gnome/help/xvidcap/es
+@dirrm share/gnome/help/xvidcap/it/figures
+@dirrm share/gnome/help/xvidcap/it
 @dirrm share/gnome/help/xvidcap
+@dirrm share/omf/xvidcap
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%