Index: head/multimedia/dvbcut/Makefile
===================================================================
--- head/multimedia/dvbcut/Makefile	(revision 427489)
+++ head/multimedia/dvbcut/Makefile	(revision 427490)
@@ -1,60 +1,60 @@
 # Created by: se@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	dvbcut
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Qt application for cutting of MPEG PS and MPEG TS streams (DVB)
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	mplayer:multimedia/mplayer \
 		ffmpeg:multimedia/ffmpeg
 LIB_DEPENDS=	liba52.so:audio/liba52 \
 		libao.so:audio/libao \
 		libmad.so:audio/libmad \
 		libavutil.so:multimedia/ffmpeg
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bernhardu
 GH_PROJECT=	dvbcut-deb
-GH_TAGNAME=	381549c
+GH_TAGNAME=	040c1ef
 
 USES=		qmake:outsource pkgconfig desktop-file-utils shared-mime-info
 
 CXXFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/libavcodec \
 		-I${LOCALBASE}/include/libavformat \
 		-I${LOCALBASE}/include/libswscale \
 		-D DVBCUT_VERSION=$(PORTVERSION)
 
 QMAKE_SOURCE_PATH=${WRKSRC}/src
 QMAKE_ARGS=	LRELEASE="${LRELEASE}"
 
 OPTIONS_RADIO=	QT
 OPTIONS_RADIO_QT=	QT4 QT5
 OPTIONS_DEFAULT=	QT4
 
 QT4_USE=	QT4=corelib,gui,xml,qt3support,linguisttools_build,moc_build,rcc_build,uic_build
 QT5_USE=	QT5=core,gui,widgets,xml,buildtools_build,linguisttools_build GL=gl
 
 post-build:
 		@${SED} -e 's;@prefix@;${PREFIX};' \
 			< ${WRKSRC}/dvbcut.desktop.in \
 			> ${WRKSRC}/dvbcut.desktop
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKDIR}/.build/dvbcut ${STAGEDIR}${PREFIX}/bin/
 		${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 		${INSTALL_DATA} ${WRKSRC}/dvbcut.desktop ${STAGEDIR}${PREFIX}/share/applications/
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/dvbcut
 		${INSTALL_DATA} ${WRKSRC}/dvbcut.svg ${STAGEDIR}${PREFIX}/share/icons/dvbcut/
 		${INSTALL_DATA} ${WRKSRC}/icons/* ${STAGEDIR}${PREFIX}/share/icons/dvbcut/
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 		${INSTALL_DATA} ${WRKSRC}/dvbcut.xml ${STAGEDIR}${PREFIX}/share/mime/packages/
 
 .include <bsd.port.mk>
Index: head/multimedia/dvbcut/distinfo
===================================================================
--- head/multimedia/dvbcut/distinfo	(revision 427489)
+++ head/multimedia/dvbcut/distinfo	(revision 427490)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478854634
-SHA256 (bernhardu-dvbcut-deb-0.7.0-381549c_GH0.tar.gz) = 176104ec3edb438161e96b21f04057670c23611f938baac510b6e4fc4a976298
-SIZE (bernhardu-dvbcut-deb-0.7.0-381549c_GH0.tar.gz) = 183544
+TIMESTAMP = 1479555788
+SHA256 (bernhardu-dvbcut-deb-0.7.1-040c1ef_GH0.tar.gz) = 9094eb67adc98fc98e7b7292ca5dbe739c171852174406497764494e0bd2c9df
+SIZE (bernhardu-dvbcut-deb-0.7.1-040c1ef_GH0.tar.gz) = 186236
Index: head/multimedia/dvbcut/files/patch-dvbcut.cpp
===================================================================
--- head/multimedia/dvbcut/files/patch-dvbcut.cpp	(revision 427489)
+++ head/multimedia/dvbcut/files/patch-dvbcut.cpp	(nonexistent)
@@ -1,11 +0,0 @@
---- src/dvbcut.cpp.orig	2016-06-23 12:34:35 UTC
-+++ src/dvbcut.cpp
-@@ -1232,7 +1232,7 @@ void dvbcut::playPlay()
-   arguments << "-geometry" << QString().sprintf("%dx%d+0+0",int(ui->imagedisplay->width()),int(ui->imagedisplay->height()));
- 
-   if (currentaudiotrack>=0 && currentaudiotrack<mpg->getaudiostreams()) {
--    arguments << "-aid" << QString().sprintf("0x%x",int(currentaudiotrack));
-+    arguments << "-aid" << QString().sprintf("0x%x", int(mpg->mplayeraudioid(currentaudiotrack)));
-     }
-     
-   // for now, pass all filenames from the current one up to the last one

Property changes on: head/multimedia/dvbcut/files/patch-dvbcut.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-dvbcut.h
===================================================================
--- head/multimedia/dvbcut/files/patch-dvbcut.h	(revision 427489)
+++ head/multimedia/dvbcut/files/patch-dvbcut.h	(nonexistent)
@@ -1,19 +0,0 @@
---- src/dvbcut.h.orig	2016-06-23 12:34:35 UTC
-+++ src/dvbcut.h
-@@ -22,11 +22,14 @@
- #define _DVBCUT_DVBCUT_H
- 
- #if !defined(DVBCUT_VERSION)
--#define DVBCUT_VERSION "git"
-+#define DVBCUT_VERSION  git
- #endif
- 
-+#define STRINGIFY(x) STRINGIFY1(x)
-+#define STRINGIFY1(x) #x
-+
- #ifndef VERSION_STRING
--#define VERSION_STRING "dvbcut-" DVBCUT_VERSION
-+#define VERSION_STRING "dvbcut-" STRINGIFY(DVBCUT_VERSION)
- #endif
- 
- #include <string>

Property changes on: head/multimedia/dvbcut/files/patch-dvbcut.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-main.cpp
===================================================================
--- head/multimedia/dvbcut/files/patch-main.cpp	(revision 427489)
+++ head/multimedia/dvbcut/files/patch-main.cpp	(nonexistent)
@@ -1,11 +0,0 @@
---- src/main.cpp.orig	2016-06-23 12:34:35 UTC
-+++ src/main.cpp
-@@ -52,7 +52,7 @@ static char *argv0;
- void
- usage_exit(int rv=1) {
-   fprintf(stderr,
--    "Usage ("VERSION_STRING"):\n"
-+    "Usage (" VERSION_STRING "):\n"
-     "  %s -generateidx [-idx <idxfilename>] [<mpgfilename> ...]\n"
-     "  %s -batch [ OPTIONS ] <prjfilename> | <mpgfilename> ...\n\n"
-     "OPTIONS: -cut 4:3|16:9|TS|TS2|<list>, -exp <expfilename>,\n"

Property changes on: head/multimedia/dvbcut/files/patch-main.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-defines.h
===================================================================
--- head/multimedia/dvbcut/files/patch-defines.h	(revision 427489)
+++ head/multimedia/dvbcut/files/patch-defines.h	(nonexistent)
@@ -1,14 +0,0 @@
---- src/defines.h.orig	2016-06-23 12:34:35 UTC
-+++ src/defines.h
-@@ -42,6 +42,11 @@ static inline int videostream(int s=0)
- #endif
-   }
- 
-+#ifdef __FreeBSD__
-+#define __bswap_32(x) __bswap32(x)
-+#define __bswap_16(x) __bswap16(x)
-+#endif
-+
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- #define mbo32(x) \
-       ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \

Property changes on: head/multimedia/dvbcut/files/patch-defines.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-avframe.cpp
===================================================================
--- head/multimedia/dvbcut/files/patch-avframe.cpp	(revision 427489)
+++ head/multimedia/dvbcut/files/patch-avframe.cpp	(nonexistent)
@@ -1,11 +0,0 @@
---- src/avframe.cpp.orig	2016-06-23 12:34:35 UTC
-+++ src/avframe.cpp
-@@ -52,7 +52,7 @@ avframe::avframe(AVFrame *src, AVCodecCo
-   tobefreed = (uint8_t *)malloc(avpicture_get_size(ctx->pix_fmt, ctx->width, ctx->height));
- 
-   avpicture_fill((AVPicture *)f,
--                 (u_int8_t*)tobefreed,
-+                 (uint8_t*)tobefreed,
-                  ctx->pix_fmt,ctx->width,ctx->height);
- 
-   av_picture_copy((AVPicture *)f, (const AVPicture *) src,

Property changes on: head/multimedia/dvbcut/files/patch-avframe.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-index.h
===================================================================
--- head/multimedia/dvbcut/files/patch-index.h	(revision 427489)
+++ head/multimedia/dvbcut/files/patch-index.h	(nonexistent)
@@ -1,12 +0,0 @@
---- src/index.h.orig	2016-06-23 12:34:35 UTC
-+++ src/index.h
-@@ -22,7 +22,9 @@
- #define _DVBCUT_INDEX_H
- 
- #include <stdint.h>
-+#ifndef __FreeBSD__
- #include <byteswap.h>
-+#endif
- #include <set>
- #include <vector>
- #include "types.h"

Property changes on: head/multimedia/dvbcut/files/patch-index.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-src_avframe.cpp
===================================================================
--- head/multimedia/dvbcut/files/patch-src_avframe.cpp	(nonexistent)
+++ head/multimedia/dvbcut/files/patch-src_avframe.cpp	(revision 427490)
@@ -0,0 +1,11 @@
+--- src/avframe.cpp.orig	2016-11-18 13:31:01 UTC
++++ src/avframe.cpp
+@@ -52,7 +52,7 @@ avframe::avframe(AVFrame *src, AVCodecCo
+   tobefreed = (uint8_t *)malloc(avpicture_get_size(ctx->pix_fmt, ctx->width, ctx->height));
+ 
+   avpicture_fill((AVPicture *)f,
+-                 (u_int8_t*)tobefreed,
++                 (uint8_t*)tobefreed,
+                  ctx->pix_fmt,ctx->width,ctx->height);
+ 
+   av_picture_copy((AVPicture *)f, (const AVPicture *) src,

Property changes on: head/multimedia/dvbcut/files/patch-src_avframe.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-src_defines.h
===================================================================
--- head/multimedia/dvbcut/files/patch-src_defines.h	(nonexistent)
+++ head/multimedia/dvbcut/files/patch-src_defines.h	(revision 427490)
@@ -0,0 +1,14 @@
+--- src/defines.h.orig	2016-11-18 13:31:01 UTC
++++ src/defines.h
+@@ -42,6 +42,11 @@ static inline int videostream(int s=0)
+ #endif
+   }
+ 
++#ifdef __FreeBSD__
++#define __bswap_32(x) __bswap32(x)
++#define __bswap_16(x) __bswap16(x)
++#endif
++
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define mbo32(x) \
+       ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \

Property changes on: head/multimedia/dvbcut/files/patch-src_defines.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-src_dvbcut.cpp
===================================================================
--- head/multimedia/dvbcut/files/patch-src_dvbcut.cpp	(nonexistent)
+++ head/multimedia/dvbcut/files/patch-src_dvbcut.cpp	(revision 427490)
@@ -0,0 +1,42 @@
+--- src/dvbcut.cpp.orig	2016-11-18 13:31:01 UTC
++++ src/dvbcut.cpp
+@@ -580,7 +580,7 @@ void dvbcut::fileExport()
+     }
+   }
+ 
+-  std::unique_ptr<exportdialog> expd(new exportdialog(QString::fromStdString(expfilen),this));
++  std::auto_ptr<exportdialog> expd(new exportdialog(QString::fromStdString(expfilen),this));
+   expd->ui->muxercombo->addItem(tr("MPEG program stream/DVD (DVBCUT multiplexer)"));
+   expd->ui->muxercombo->addItem(tr("MPEG program stream (DVBCUT multiplexer)"));
+   expd->ui->muxercombo->addItem(tr("MPEG program stream/DVD (libavformat)"));
+@@ -725,7 +725,7 @@ void dvbcut::fileExport()
+ 
+   //   lavfmuxer mux(fmt,*mpg,outfilename);
+ 
+-  std::unique_ptr<muxer> mux;
++  std::auto_ptr<muxer> mux;
+   uint32_t audiostreammask(0);
+ 
+   for(int a=0;a<mpg->getaudiostreams();++a)
+@@ -737,17 +737,17 @@ void dvbcut::fileExport()
+ 
+   switch(expfmt) {
+     case 1:
+-      mux = std::unique_ptr<muxer>(new mpegmuxer(audiostreammask,*mpg,out_file.c_str(),false,0));
++      mux = std::auto_ptr<muxer>(new mpegmuxer(audiostreammask,*mpg,out_file.c_str(),false,0));
+       break;
+     case 2:
+-      mux = std::unique_ptr<muxer>(new lavfmuxer("dvd",audiostreammask,*mpg,out_file.c_str()));
++      mux = std::auto_ptr<muxer>(new lavfmuxer("dvd",audiostreammask,*mpg,out_file.c_str()));
+       break;
+     case 3:
+-      mux = std::unique_ptr<muxer>(new lavfmuxer("mpegts",audiostreammask,*mpg,out_file.c_str()));
++      mux = std::auto_ptr<muxer>(new lavfmuxer("mpegts",audiostreammask,*mpg,out_file.c_str()));
+       break;
+     case 0:
+     default:
+-      mux = std::unique_ptr<muxer>(new mpegmuxer(audiostreammask,*mpg,out_file.c_str()));
++      mux = std::auto_ptr<muxer>(new mpegmuxer(audiostreammask,*mpg,out_file.c_str()));
+       break;
+   }
+ 

Property changes on: head/multimedia/dvbcut/files/patch-src_dvbcut.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-src_dvbcut.h
===================================================================
--- head/multimedia/dvbcut/files/patch-src_dvbcut.h	(nonexistent)
+++ head/multimedia/dvbcut/files/patch-src_dvbcut.h	(revision 427490)
@@ -0,0 +1,19 @@
+--- src/dvbcut.h.orig	2016-11-18 13:31:01 UTC
++++ src/dvbcut.h
+@@ -22,11 +22,14 @@
+ #define _DVBCUT_DVBCUT_H
+ 
+ #if !defined(DVBCUT_VERSION)
+-#define DVBCUT_VERSION "git"
++#define DVBCUT_VERSION  git
+ #endif
+ 
++#define STRINGIFY(x) STRINGIFY1(x)
++#define STRINGIFY1(x) #x
++
+ #ifndef VERSION_STRING
+-#define VERSION_STRING "dvbcut-" DVBCUT_VERSION
++#define VERSION_STRING "dvbcut-" STRINGIFY(DVBCUT_VERSION)
+ #endif
+ 
+ #include <string>

Property changes on: head/multimedia/dvbcut/files/patch-src_dvbcut.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/files/patch-src_index.h
===================================================================
--- head/multimedia/dvbcut/files/patch-src_index.h	(nonexistent)
+++ head/multimedia/dvbcut/files/patch-src_index.h	(revision 427490)
@@ -0,0 +1,12 @@
+--- src/index.h.orig	2016-11-18 13:31:01 UTC
++++ src/index.h
+@@ -22,7 +22,9 @@
+ #define _DVBCUT_INDEX_H
+ 
+ #include <stdint.h>
++#ifndef __FreeBSD__
+ #include <byteswap.h>
++#endif
+ #include <set>
+ #include <vector>
+ #include "types.h"

Property changes on: head/multimedia/dvbcut/files/patch-src_index.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/dvbcut/pkg-descr
===================================================================
--- head/multimedia/dvbcut/pkg-descr	(revision 427489)
+++ head/multimedia/dvbcut/pkg-descr	(revision 427490)
@@ -1,8 +1,8 @@
 dvbcut is a Qt application which enables you to select certain parts of an
 MPEG transport stream (as received on Digital Video Broadcasting, DVB) and
 save these parts into a single MPEG output file. It follows a "keyhole
 surgery" approach. Thus, the input video and audio data is mostly kept
 unchanged, only very few frames at the beginning and/or end of the selected
 range are recoded in order to obtain a valid MPEG file.
 
-WWW: http://github.com/nextghost/dvbcut-qt4
+WWW: http://github.com/bernhardu/dvbcut-deb/