- Update to 0.7.5

PR:		ports/104140
Submitted by:	chinsan
Approved by:	maintainer (Phil Oleson)

3 files changed, 31 insertions, 41 deletions

diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index df6347e0cad3..03112080ef69 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dvd-slideshow
-PORTVERSION=	0.7.2
-PORTREVISION=	3
+PORTVERSION=	0.7.5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,17 +33,17 @@ OPTIONS=	DVDRWTOOLS "Needed to record/burn DVD" off \
 PLIST_FILES=	bin/dvd-slideshow \
 		bin/dvd-menu \
 		bin/dir2slideshow \
-		bin/gallery2slideshow \
+		bin/gallery1-to-slideshow \
 		bin/jigl2slideshow
 
 MAN1=		dvd-slideshow.1 \
 		dvd-menu.1 \
 		dir2slideshow.1 \
-		gallery2slideshow.1 \
+		gallery1-to-slideshow.1 \
 		jigl2slideshow.1
 
 .if !defined(NOPORTDOCS)
-DOC_FILES=	README.html changelog.html gallery2slideshow.html \
+DOC_FILES=	changelog.html gallery1-to-slideshow.html \
 		dir2slideshow.html jigl2slideshow.html \
 		dvd-menu.html dvd-slideshow.html
 PLIST_FILES+=	${DOC_FILES:S,^,%%DOCSDIR%%/,}
@@ -75,7 +74,7 @@ RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
 
 post-patch:
-.for FILE in dvd-slideshow dvd-menu dir2slideshow gallery2slideshow jigl2slideshow
+.for FILE in dvd-slideshow dvd-menu dir2slideshow gallery1-to-slideshow jigl2slideshow
 	@${REINPLACE_CMD} -e 's|!/bin/bash|!${PREFIX}/bin/bash|g ; \
 			      s|/usr/share/fonts/|${X11BASE}/lib/X11/fonts/|g ; \
 			      s|seq |seq2 |g' \
@@ -83,7 +82,7 @@ post-patch:
 .endfor
 
 do-install:
-.for FILE in dvd-slideshow dvd-menu dir2slideshow gallery2slideshow jigl2slideshow
+.for FILE in dvd-slideshow dvd-menu dir2slideshow gallery1-to-slideshow jigl2slideshow
 	${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/bin
 .endfor
 	@${ECHO_MSG} "Installing man files."
diff --git a/multimedia/dvd-slideshow/distinfo b/multimedia/dvd-slideshow/distinfo
index 56e2c45f705f..4361a89fc116 100644
--- a/multimedia/dvd-slideshow/distinfo
+++ b/multimedia/dvd-slideshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (dvd-slideshow-0.7.2.tar.gz) = bc3b5a691b81ccc94ce0e96b805ef71b
-SHA256 (dvd-slideshow-0.7.2.tar.gz) = e49d2fd3c8e663449948668915cd717855528958a07d4f79ca3cd6d0f2ea62ff
-SIZE (dvd-slideshow-0.7.2.tar.gz) = 85603
+MD5 (dvd-slideshow-0.7.5.tar.gz) = 8c6633af3965c350aaef5562edbb152d
+SHA256 (dvd-slideshow-0.7.5.tar.gz) = 5270dfa36488cfa16052d551751c3189022ac7979b25984b109e92716fe13029
+SIZE (dvd-slideshow-0.7.5.tar.gz) = 98747
diff --git a/multimedia/dvd-slideshow/files/patch-dvd-slideshow b/multimedia/dvd-slideshow/files/patch-dvd-slideshow
index bd1729e204ad..34ddc73a898e 100644
--- a/multimedia/dvd-slideshow/files/patch-dvd-slideshow
+++ b/multimedia/dvd-slideshow/files/patch-dvd-slideshow
@@ -1,6 +1,15 @@
---- dvd-slideshow.orig	Fri Dec 30 04:21:02 2005
-+++ dvd-slideshow	Fri Dec 30 04:25:22 2005
-@@ -738,7 +738,7 @@
+--- dvd-slideshow.orig	Sun Oct  8 10:30:57 2006
++++ dvd-slideshow	Sun Oct  8 10:30:58 2006
+@@ -877,7 +877,7 @@
+ 		it=$(( $1 - $minutes * 60000 ))
+ 		seconds=$(( $it / 1000 )) ; [ $seconds -eq 0 ] && seconds="0" 
+ 		thousandths=$(( $it - $seconds * 1000 )) ;
+-		characters=`echo "$thousandths" | wc --chars`
++		characters=`echo "$thousandths" | wc -m`
+ 		if [ $characters -eq 1 ] ; then
+ 			thousandths_out="000"  # empty string!
+ 		elif [ $characters -eq 2 ] ; then
+@@ -923,7 +923,7 @@
  		minutes=`echo $1 | cut -d: -f2`
  		seconds=`echo $1 | cut -d: -f3 | cut -d. -f1`
  		fraction=`echo $1 | cut -d: -f3 | cut -d. -f2`
@@ -9,34 +18,16 @@
  		if [ "$characters" -eq 1 ] ; then ## no decimal was specified
  			duration_ms="0"
  		elif [ "$characters" -eq 2 ] ; then ## 1 decimal was specified
-@@ -982,7 +982,7 @@
- 	duration_sec=`echo $1 | awk -F. '{ print $1 }'`
- 	if [ -z "$duration_sec" ] ; then duration_sec=0 ; fi
- 	duration_hu=`echo $1 | awk -F. '{ print $2 }'`
--	characters=`echo "$duration_hu" | wc --chars`
-+	characters=`echo "$duration_hu" | wc -m`
- 	if [ "$characters" -eq 1 ] ; then
- 		## no decimal was specified
- 		duration_hu=0
-@@ -1010,7 +1010,7 @@
- 	duration_sec=`echo $1 | awk -F. '{ print $1 }'`
- 	if [ -z "$duration_sec" ] ; then duration_sec=0 ; fi
- 	duration_ms=`echo $1 | awk -F. '{ print $2 }'`
--	characters=`echo "$duration_ms" | wc --chars`
-+	characters=`echo "$duration_ms" | wc -m`
- 	if [ "$characters" -eq 1 ] ; then
- 		## no decimal was specified
- 		duration_ms=0
-@@ -2051,7 +2051,7 @@
- audio_inside_txtfile=0
- imagefiles=0 ; moviefiles=0 ; audiofiles=0
- ## let's parse the txtfile:
--total_lines=`wc -l ${input_txtfile} | awk '{print $1}'`
-+total_lines=`wc -l "${input_txtfile}" | awk '{print $1}'`
- total_lines=$(( $total_lines + 1 ))
- let line=1
- 
-@@ -3813,7 +3813,7 @@
+@@ -1121,7 +1121,7 @@
+ 	local l_duration_sec=`echo $1 | awk -F. '{ print $1 }'`
+ 	[ -z "$l_duration_sec" ] && l_duration_sec=0 
+ 	local l_duration_ms=`echo $1 | awk -F. '{ print $2 }'`
+-	local l_characters=`echo "$l_duration_ms" | wc --chars`
++	local l_characters=`echo "$l_duration_ms" | wc -m`
+ 	if [ -z "$l_duration_ms" ] ; then
+ 		l_duration_ms=0 
+ 	elif [ "$l_characters" -eq 1 ] ; then
+@@ -4422,7 +4422,7 @@
  	audio_1[0]='silence'  # no duration needed
  	myecho "[dvd-slideshow] No audio files passed.  Using $end_hms silence."
  	audio1_start=0