4 files changed, 21 insertions, 32 deletions

diff --git a/multimedia/2mandvd/Makefile b/multimedia/2mandvd/Makefile
index 128c28d9128e..8a0184e81dc4 100644
--- a/multimedia/2mandvd/Makefile
+++ b/multimedia/2mandvd/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	2ManDVD
-PORTVERSION=	1.8.4
-PORTREVISION=	1
+PORTVERSION=	1.8.5
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://download.tuxfamily.org/2mandvd/
 
@@ -25,12 +24,13 @@ RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
 		tcprobe:${PORTSDIR}/multimedia/transcode \
 		xine:${PORTSDIR}/multimedia/xine \
 		bash:${PORTSDIR}/shells/bash \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+		cdrecord:${PORTSDIR}/sysutils/cdrtools \
+		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		perl5 qmake gmake
+USES=		desktop-file-utils gmake perl5 qmake:norecursive shebangfix
+SHEBANG_FILES=	fake.pl
 USE_QT4=	corelib gui opengl \
 		linguist_build moc_build qmake_build rcc_build uic_build
 USE_GL=		glu
@@ -56,25 +56,24 @@ post-patch:
 		 s|/usr/share/applications|${PREFIX}/share/applications| ; \
 		 s|^QMAKE_|#QMAKE_|' ${WRKSRC}/2ManDVD.pro
 	@${REINPLACE_CMD} -e \
-		's|/usr/bin/perl|${LOCALBASE}/bin/perl|' ${WRKSRC}/fake.pl
-	@${REINPLACE_CMD} -e \
 		's|/usr/share/2ManDVD|${PREFIX}/share/pixmaps| ; \
 		 s|/usr/bin/||' ${WRKSRC}/2ManDVD.desktop
 	@${REINPLACE_CMD} -e \
-		's|Ne slideshow|New slidshow|' ${WRKSRC}/2mandvd_en.ts
+		's|Ne slideshow|New slideshow|' ${WRKSRC}/2mandvd_en.ts
 
 pre-build:
 	(cd ${WRKSRC} && ${LRELEASE} 2mandvd_en.ts)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/2ManDVD ${STAGEDIR}${PREFIX}/bin
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} 2ManDVD ${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/fake.pl ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.qm ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} Bibliotheque ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} fake.pl ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.qm ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} Bibliotheque ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/2ManDVD.desktop ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/Interface/mandvdico.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps
+	(cd ${WRKSRC} && ${INSTALL_DATA} 2ManDVD.desktop \
+		${STAGEDIR}${DESKTOPDIR})
+	(cd ${WRKSRC}/Interface && ${INSTALL_DATA} mandvdico.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps)
 
 .include <bsd.port.mk>
diff --git a/multimedia/2mandvd/distinfo b/multimedia/2mandvd/distinfo
index ebbf45ac7862..e9ffd04c3d0c 100644
--- a/multimedia/2mandvd/distinfo
+++ b/multimedia/2mandvd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (2ManDVD-1.8.4.tar.gz) = b74e8a62b4e396c4cbb1db2864d77c87ea45f74bb599f4f270608d9e7f91888c
-SIZE (2ManDVD-1.8.4.tar.gz) = 29523342
+SHA256 (2ManDVD-1.8.5.tar.gz) = 19c3c02123684220e77b3baa12f37b6feb5ecb523c504c65d306c75136191873
+SIZE (2ManDVD-1.8.5.tar.gz) = 29525071
diff --git a/multimedia/2mandvd/files/patch-videowrapper.cpp b/multimedia/2mandvd/files/patch-videowrapper.cpp
index 91be12310c65..b9e56e81834a 100644
--- a/multimedia/2mandvd/files/patch-videowrapper.cpp
+++ b/multimedia/2mandvd/files/patch-videowrapper.cpp
@@ -10,12 +10,12 @@ diff -urN videowrapper.cpp videowrapper.cpp
          if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0)
          {
      #else
-@@ -90,7 +90,7 @@
+@@ -91,7 +91,7 @@
  
      // *** OUVERTURE DU CODEC ***
  
--    if(avcodec_open(pCodecCtx, pCodec)<0)
-+    if(avcodec_open2(pCodecCtx, pCodec, NULL)<0)
+-    #ifdef av_find_stream_info
++    #if 0
+     if(avcodec_open(pCodecCtx, pCodec)<0)
      {
-         qDebug() << "CAN'T FIND VIDEO CODEC";
-         return 1;
+     #else
diff --git a/multimedia/2mandvd/files/patch-videowrapper.h b/multimedia/2mandvd/files/patch-videowrapper.h
deleted file mode 100644
index 8236e4af7904..000000000000
--- a/multimedia/2mandvd/files/patch-videowrapper.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- videowrapper.h.orig
-+++ videowrapper.h
-@@ -11,6 +11,7 @@
-         #include <libavutil/common.h>
-         #include <libavcodec/avcodec.h>
-         #include <libavformat/avformat.h>
-+        #include <libavutil/mathematics.h>
-         #include <libswscale/swscale.h>
- }
-