ports/181064: multimedia/2mandvd: Update to version 1.8.5

[KATO Tsuguru]

The following reply was made to PR ports/181064; it has been noted by GNATS.

From: KATO Tsuguru <tkato432 at yahoo.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/181064: multimedia/2mandvd: Update to version 1.8.5
Date: Tue, 15 Oct 2013 02:50:36 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Tue__15_Oct_2013_02_50_36_+0900_ULE.Di603XmrJZyX
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Tue__15_Oct_2013_02_50_36_+0900_ULE.Di603XmrJZyX
 Content-Type: text/x-diff;
  name="multimedia_2mandvd.diff"
 Content-Disposition: attachment;
  filename="multimedia_2mandvd.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/multimedia/2mandvd/Makefile multimedia/2mandvd/Makefile
 --- /usr/ports/multimedia/2mandvd/Makefile	2013-10-14 05:19:47.000000000 +0900
 +++ multimedia/2mandvd/Makefile	2013-10-15 00:00:00.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/multimedia/2mandvd/Makefile 330227 2013-10-13 13:03:03Z makc $
  
  PORTNAME=	2ManDVD
 -PORTVERSION=	1.8.4
 -PORTREVISION=	1
 +PORTVERSION=	1.8.5
  CATEGORIES=	multimedia kde
  MASTER_SITES=	http://download.tuxfamily.org/2mandvd/
  
 @@ -25,17 +24,19 @@
  		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
  USE_SDL=	sdl
  USE_PERL5=	run
 +MAKE_ENV=	QTDIR="${QT_PREFIX}"
  
  DATADIR=	${PREFIX}/share/2ManDVD
  
 @@ -56,25 +57,24 @@
  		 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 -urN /usr/ports/multimedia/2mandvd/distinfo multimedia/2mandvd/distinfo
 --- /usr/ports/multimedia/2mandvd/distinfo	2013-08-16 17:35:16.000000000 +0900
 +++ multimedia/2mandvd/distinfo	2013-10-15 00:00:00.000000000 +0900
 @@ -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 -urN /usr/ports/multimedia/2mandvd/files/patch-videowrapper.cpp multimedia/2mandvd/files/patch-videowrapper.cpp
 --- /usr/ports/multimedia/2mandvd/files/patch-videowrapper.cpp	2013-08-16 17:35:16.000000000 +0900
 +++ multimedia/2mandvd/files/patch-videowrapper.cpp	2013-10-15 00:00:00.000000000 +0900
 @@ -1,6 +1,17 @@
  --- videowrapper.cpp.orig
  +++ videowrapper.cpp
 -@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper()
 +@@ -31,14 +31,17 @@
 + {
 +     av_free_packet(&packet);
 +     avcodec_close(pCodecCtx);
 +-    //av_close_input_file(pFormatCtx);
 ++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,5,0)
 +     avformat_close_input(&pFormatCtx);
 ++#else
 ++    av_close_input_file(pFormatCtx);
 ++#endif
 + }
 + 
   int videowrapper::load_video(QString filename)
   {
       // *** OUVERTURE DU FICHIER VIDEO ***
 
 --Multipart=_Tue__15_Oct_2013_02_50_36_+0900_ULE.Di603XmrJZyX--