Fix build on -CURRENT.

6 files changed, 31 insertions, 16 deletions

diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 418cd6b7a4c7..0721766d5793 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GCC=	any
 USES=		cmake
-USE_QT4=  gui qt3support xml  moc_build qmake_build rcc_build uic_build
+USE_QT4=	gui qt3support xml  moc_build qmake_build rcc_build uic_build
 CXXFLAGS+=	-I${PREFIX}/include \
 		-I${PREFIX}/include/libavcodec \
 		-I${PREFIX}/include/libavformat \
@@ -32,8 +32,6 @@ MAN1=		dvbcut.1
 PLIST_FILES=	bin/dvbcut
 
 NO_STAGE=	yes
-#post-extract:
-#		${RM} ${WRKSRC}/src/mplayererrorbase.h
 
 pre-patch:
 		cd ${WRKSRC} && ${BZCAT} ${FILESDIR}/use-qt4.diff.bz2 | ${PATCH} -p2
diff --git a/multimedia/dvbcut/files/patch-avframe.cpp b/multimedia/dvbcut/files/patch-avframe.cpp
new file mode 100644
index 000000000000..b69b21f07b4f
--- /dev/null
+++ b/multimedia/dvbcut/files/patch-avframe.cpp
@@ -0,0 +1,10 @@
+--- src/avframe.cpp.orig	2011-04-22 23:51:29.000000000 +0200
++++ src/avframe.cpp	2013-10-04 11:04:43.876355112 +0200
+@@ -18,6 +18,7 @@
+ 
+ /* $Id: avframe.cpp 141 2009-01-09 17:53:48Z too-tired $ */
+ 
++#include <sys/types.h>
+ #include <qimage.h>
+ #include <cstdlib>
+ #include <cstdio>
diff --git a/multimedia/dvbcut/files/patch-main.cpp b/multimedia/dvbcut/files/patch-main.cpp
new file mode 100644
index 000000000000..c00c6d09379c
--- /dev/null
+++ b/multimedia/dvbcut/files/patch-main.cpp
@@ -0,0 +1,10 @@
+--- /usr/work/usr/svn/ports/head/multimedia/dvbcut/work/dvbcut-0.6.1/src/main.cpp~	2011-04-22 23:51:29.000000000 +0200
++++ /usr/work/usr/svn/ports/head/multimedia/dvbcut/work/dvbcut-0.6.1/src/main.cpp	2013-10-04 11:10:52.016225398 +0200
+@@ -21,6 +21,7 @@
+ #include <cstring>
+ #include <cstdlib>
+ #include <cstdio>
++#include <unistd.h>
+ #include <cerrno>
+ #include <clocale>
+ #include <string>
diff --git a/multimedia/dvbcut/files/patch-src_Makefile.in b/multimedia/dvbcut/files/patch-src_Makefile.in
deleted file mode 100644
index 47a6f08b98ec..000000000000
--- a/multimedia/dvbcut/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	2010-06-06 16:15:41.000000000 +0200
-+++ src/Makefile.in	2010-06-06 16:15:59.000000000 +0200
-@@ -105,7 +105,7 @@ $(topdir)/bin:
- 
- $(topdir)/bin/dvbcut$(EXEEXT): dvbcut$(EXEEXT)
- 	$(INSTALL_PROGRAM) dvbcut$(EXEEXT) $(topdir)/bin/dvbcut$(EXEEXT)
--	$(STRIP) $(topdir)/bin/dvbcut$(EXEEXT)
-+#	$(STRIP) $(topdir)/bin/dvbcut$(EXEEXT)
- 
- dvbcut$(EXEEXT): $(SRCS) $(OBJS)
- 	$(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
diff --git a/multimedia/dvbcut/files/patch-src_playaudio.cpp b/multimedia/dvbcut/files/patch-src_playaudio.cpp
index bc3db4c00401..4f57642de540 100644
--- a/multimedia/dvbcut/files/patch-src_playaudio.cpp
+++ b/multimedia/dvbcut/files/patch-src_playaudio.cpp
@@ -1,6 +1,14 @@
 --- src/playaudio.cpp.orig	2010-06-06 16:19:25.000000000 +0200
-+++ src/playaudio.cpp	2010-06-06 16:19:47.000000000 +0200
-@@ -55,6 +55,7 @@ public:
++++ src/playaudio.cpp	2013-10-03 13:56:54.373309704 +0200
+@@ -19,6 +19,7 @@
+ /* $Id: playaudio.cpp 58 2007-07-23 07:03:07Z too-tired $ */
+ 
+ #include <stdint.h>
++#include <string.h>
+ #include <algorithm>
+ #include <string>
+ #include <sstream>
+@@ -55,6 +56,7 @@
  
        ao_sample_format format;
  
diff --git a/multimedia/dvbcut/files/use-qt4.diff.bz2 b/multimedia/dvbcut/files/use-qt4.diff.bz2
index e15c15aecd1c..742af5aa97b2 100644
--- a/multimedia/dvbcut/files/use-qt4.diff.bz2
+++ b/multimedia/dvbcut/files/use-qt4.diff.bz2