Date: Sun, 8 Oct 2006 11:34:58 +0800 From: chinsan <chinsan@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: oz@nixil.net Subject: ports/104140: [PATCH] multimedia/dvd-slideshow: update to 0.7.5 Message-ID: <20061008034207.4E8302E9DF@smtp2.bc.hgc.com.tw> Resent-Message-ID: <200610080350.k983oQrw059077@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104140
>Category: ports
>Synopsis: [PATCH] multimedia/dvd-slideshow: update to 0.7.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 08 03:50:25 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
Taiwan
>Environment:
System: FreeBSD BSD6.giga.hgc.com.tw 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #6: Thu Sep 14 09:46:10 CST 2006
>Description:
- Update to 0.7.5
Port maintainer (oz@nixil.net) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- dvd-slideshow-0.7.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/dvd-slideshow/Makefile /usr/home/chinsan/project/dvd-slideshow/Makefile
--- /usr/ports/multimedia/dvd-slideshow/Makefile Mon Mar 20 23:24:56 2006
+++ /usr/home/chinsan/project/dvd-slideshow/Makefile Sun Oct 8 11:29:00 2006
@@ -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 @@
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 @@
.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 @@
.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 -ruN --exclude=CVS /usr/ports/multimedia/dvd-slideshow/distinfo /usr/home/chinsan/project/dvd-slideshow/distinfo
--- /usr/ports/multimedia/dvd-slideshow/distinfo Sat Dec 31 05:26:13 2005
+++ /usr/home/chinsan/project/dvd-slideshow/distinfo Sun Oct 8 10:27:22 2006
@@ -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 -ruN --exclude=CVS /usr/ports/multimedia/dvd-slideshow/files/patch-dvd-slideshow /usr/home/chinsan/project/dvd-slideshow/files/patch-dvd-slideshow
--- /usr/ports/multimedia/dvd-slideshow/files/patch-dvd-slideshow Sat Mar 18 23:37:46 2006
+++ /usr/home/chinsan/project/dvd-slideshow/files/patch-dvd-slideshow Sun Oct 8 10:31:25 2006
@@ -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
--- dvd-slideshow-0.7.5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061008034207.4E8302E9DF>