Date: Mon, 31 Mar 2008 20:42:24 -0600 (MDT) From: Phil Oleson <oz@nixil.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/122323: [Maintainer-Update] multimedia/dvd-slideshow upgraded to 0.8.0 Message-ID: <200804010242.m312gOFL088009@nixil.net> Resent-Message-ID: <200804010250.m312o3f2065307@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 122323
>Category: ports
>Synopsis: [Maintainer-Update] multimedia/dvd-slideshow upgraded to 0.8.0
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 01 02:50:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Phil Oleson
>Release: FreeBSD 4.7-RELEASE-p28 i386
>Organization:
N/A
>Environment:
System: FreeBSD nixil.net 4.7-RELEASE-p28 FreeBSD 4.7-RELEASE-p28 #47: Tue Apr 10 10:28:38 MDT 2007 root@nixil:/os/freebsd4/sys/compile/nixil i386
>Description:
Upgrades dvd-slideshow to 0.8.0
- Needed for qdvdauthor-1.1.0 upgrade
- Added theme option (might be complex but I didnt want to create a new port yet)
- Used patches from <supraexpress @ globaleyes . net> PR 116037
>How-To-Repeat:
N/A
>Fix:
Patch is below.
--- dvd-slideshow.patch begins here ---
diff -ruN dvd-slideshow.orig/Makefile dvd-slideshow/Makefile
--- dvd-slideshow.orig/Makefile 2008-02-06 18:55:27.000000000 -0700
+++ dvd-slideshow/Makefile 2008-03-31 20:28:16.000000000 -0600
@@ -6,11 +6,11 @@
#
PORTNAME= dvd-slideshow
-PORTVERSION= 0.7.5
-PORTREVISION= 2
+PORTVERSION= 0.8.0
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
+DISTFILES= ${PORTNAME}-${PORTVERSION}-1${EXTRACT_SUFX}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
MAINTAINER= oz@nixil.net
COMMENT= Script that creates a slideshow-style DVD with some simple menus
@@ -21,21 +21,19 @@
ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
sox:${PORTSDIR}/audio/sox \
dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
- seq2:${PORTSDIR}/misc/seq2 \
+ jhead:${PORTSDIR}/graphics/jhead \
+ flvtool2:${PORTSDIR}/multimedia/ruby-flvtool2 \
${X11BASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf
NO_BUILD= yes
USE_CDRTOOLS= yes
+DATADIR= ${PREFIX}/share/apps/${PORTNAME}
+PLIST_SUB+= DATADIR="share/apps/${PORTNAME}"
-OPTIONS= DVDRWTOOLS "Needed to record/burn DVD" off \
- LAME "Optional support for audio" off \
- VORBISTOOLS "Optional audio support" off
-
-PLIST_FILES= bin/dvd-slideshow \
- bin/dvd-menu \
- bin/dir2slideshow \
- bin/gallery1-to-slideshow \
- bin/jigl2slideshow
+OPTIONS= LAME "Optional mp3 audio support" off \
+ THEMES "Optional themes" off \
+ TOOLAME "Faster Optional mp3 audio support" off \
+ VORBISTOOLS "Optional ogg vorbis audio support" off
MAN1= dvd-slideshow.1 \
dvd-menu.1 \
@@ -43,32 +41,39 @@
gallery1-to-slideshow.1 \
jigl2slideshow.1
-DOC_FILES= changelog.html gallery1-to-slideshow.html \
- dir2slideshow.html jigl2slideshow.html \
- dvd-menu.html dvd-slideshow.html
-PORTDOCS= ${DOC_FILES} dvd-slideshowrc
-
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/bin/growisofs)
-WITH_DVDRWTOOLS=yes
-.endif
.if exists(${LOCALBASE}/bin/lame)
WITH_LAME=yes
.endif
.if exists(${LOCALBASE}/bin/oggdec)
WITH_VORBISTOOLS=yes
.endif
-
-.if defined(WITH_DVDRWTOOLS)
-RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+.if exists(${LOCALBASE}/bin/toolame)
+WITH_TOOLAME=yes
.endif
+
.if defined(WITH_LAME)
RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame
.endif
.if defined(WITH_VORBISTOOLS)
RUN_DEPENDS+= oggdec:${PORTSDIR}/audio/vorbis-tools
.endif
+.if defined(WITH_TOOLAME)
+RUN_DEPENDS+= toolame:${PORTSDIR}/audio/toolame
+.endif
+.if defined(WITH_THEMES)
+DISTFILES+= ${PORTNAME}-themes-${PORTVERSION}-1${EXTRACT_SUFX}
+WRKSRC2= ${WRKDIR}/${PORTNAME}-themes-${PORTVERSION}-1
+PLIST_SUB+= NOTHEMES=""
+.else
+PLIST_SUB+= NOTHEMES="@comment "
+.endif
+.if defined(NOPORTDOCS)
+PLIST_SUB+= NOPORTDOCS="@comment "
+.else
+PLIST_SUB+= NOPORTDOCS=""
+.endif
post-patch:
.for FILE in dvd-slideshow dvd-menu dir2slideshow gallery1-to-slideshow jigl2slideshow
@@ -76,11 +81,16 @@
s|/usr/share/fonts/|${X11BASE}/lib/X11/fonts/|g ; \
s|seq |seq2 |g' \
${WRKSRC}/${FILE}
+.ifdef(WITH_THEMES)
+ @${REINPLACE_CMD} -e 's|/opt/dvd-slideshow/themes|${DATADIR}/themes|g' \
+ ${WRKSRC}/${FILE}
+.endif
.endfor
do-install:
+ @${ECHO_MSG} "Installing scripts."
.for FILE in dvd-slideshow dvd-menu dir2slideshow gallery1-to-slideshow jigl2slideshow
- ${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/bin
+ @${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/bin
.endfor
@${ECHO_MSG} "Installing man files."
.for FILE in ${MAN1}
@@ -90,9 +100,14 @@
@${ECHO_MSG} "Installing doc files."
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/dvd-slideshowrc ${DOCSDIR}
-.for FILE in ${DOC_FILES}
- @${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
+.for FILE in changelog.html gallery1-to-slideshow.html dir2slideshow.html jigl2slideshow.html dvd-menu.html dvd-slideshow.html
+ @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
.endif
+.ifdef(WITH_THEMES)
+ @${ECHO_MSG} "Installing theme files."
+ @${MKDIR} ${DATADIR}/themes
+ @cd ${WRKSRC2} && ${FIND} * | ${CPIO} -dpmu -R ${BINOWN}:${BINGRP} --quiet ${DATADIR}/themes
+.endif
.include <bsd.port.post.mk>
diff -ruN dvd-slideshow.orig/distinfo dvd-slideshow/distinfo
--- dvd-slideshow.orig/distinfo 2008-02-06 18:55:27.000000000 -0700
+++ dvd-slideshow/distinfo 2008-03-31 20:28:16.000000000 -0600
@@ -1,3 +1,6 @@
-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
+MD5 (dvd-slideshow-0.8.0-1.tar.gz) = 83ff69e76ba2bfd0d1c735ada0dc64dd
+SHA256 (dvd-slideshow-0.8.0-1.tar.gz) = c75455a9e434c7c5ec05c015d022e62d8a1be2f17cab96eef7deb1ca81d31978
+SIZE (dvd-slideshow-0.8.0-1.tar.gz) = 126102
+MD5 (dvd-slideshow-themes-0.8.0-1.tar.gz) = 0597ce2f325119db7fc9e286fc9f4c03
+SHA256 (dvd-slideshow-themes-0.8.0-1.tar.gz) = 56c13c272eb6e850b98f4182acd3c5e90ba378a6ec7fc37e4c47af70b6e25cb5
+SIZE (dvd-slideshow-themes-0.8.0-1.tar.gz) = 1224977
diff -ruN dvd-slideshow.orig/files/patch-dir2slideshow dvd-slideshow/files/patch-dir2slideshow
--- dvd-slideshow.orig/files/patch-dir2slideshow 1969-12-31 17:00:00.000000000 -0700
+++ dvd-slideshow/files/patch-dir2slideshow 2008-03-31 20:28:16.000000000 -0600
@@ -0,0 +1,16 @@
+--- dir2slideshow.orig 2006-12-21 00:43:48.000000000 -0600
++++ dir2slideshow 2007-09-02 20:20:34.000000000 -0500
+@@ -633,8 +633,11 @@
+ check_rm "$output_dir"/filelist_date.txt
+ for (( i=1 ; i<=pictures ; i++ )) ; do
+ file=`sed -n "$i"p "$output_dir"/imagelist.txt`
+- modified_day=`ls -l --full-time "$file" | awk '{print $6}'`
+- modified_time=`ls -l --full-time "$file" | awk '{print $7}'`
++ modified_day=`ls -lT "$file" | awk '{print $9"-"$6"-"$7}'`
++ modified_day=`date -j -f "%Y-%b-%d" "$modified_day" "+%Y-%m-%d"`
++ modified_time=`ls -lT "$file" | awk '{print $8}'`
++## modified_day=`ls -l --full-time "$file" | awk '{print $6}'`
++## modified_time=`ls -l --full-time "$file" | awk '{print $7}'`
+ # echo "modified_day=$modified_day"
+ # echo "modified_time=$modified_time"
+ echo "$file: $modified_day $modified_time" >> "$output_dir"/filelist_date.txt
diff -ruN dvd-slideshow.orig/files/patch-dvd-menu dvd-slideshow/files/patch-dvd-menu
--- dvd-slideshow.orig/files/patch-dvd-menu 1969-12-31 17:00:00.000000000 -0700
+++ dvd-slideshow/files/patch-dvd-menu 2008-03-31 20:28:16.000000000 -0600
@@ -0,0 +1,25 @@
+--- dvd-menu.orig 2008-03-05 23:20:15.000000000 -0700
++++ dvd-menu 2008-03-05 23:22:38.000000000 -0700
+@@ -804,8 +804,8 @@
+ subtitle_code="EN"
+
+ # define some possible fonts:
+-font_dir="/usr/share/fonts/"
+-default_font1='n019004l.pfb' # helvetica bold URW fonts
++font_dir="/usr/local/lib/X11/fonts/"
++default_font1='n019004l.ttf' # helvetica bold URW fonts
+ default_font2='helb____.ttf' # helvetica bold truetype
+
+ ## other cool colors: cadetblue cornflowerblue midnightblue
+@@ -1577,9 +1577,9 @@
+ checkforprog ffmpeg
+ echo "[dvd-menu] Creating ac3 audio..."
+ check_rm "$tmpdir/audio.ac3"
+- ffmpeg -i "$tmpdir/audio.wav" -vn -y -ab 192 -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/audio.ac3" >> "$logfile" 2>&1
++ ffmpeg -i "$tmpdir/audio.wav" -vn -y -ab 192k -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/audio.ac3" >> "$logfile" 2>&1
+ if [ "$fadein" -eq 1 ] || [ "$fadeout" -eq 1 ] ; then
+- ffmpeg -i "$tmpdir/fade_audio.wav" -vn -y -ab 192 -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/fade_audio.ac3" >> "$logfile" 2>&1
++ ffmpeg -i "$tmpdir/fade_audio.wav" -vn -y -ab 192k -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/fade_audio.ac3" >> "$logfile" 2>&1
+ fi
+ else
+ ## toolame is way faster! (3x in my test)
diff -ruN dvd-slideshow.orig/files/patch-dvd-slideshow dvd-slideshow/files/patch-dvd-slideshow
--- dvd-slideshow.orig/files/patch-dvd-slideshow 2008-02-06 18:55:27.000000000 -0700
+++ dvd-slideshow/files/patch-dvd-slideshow 2008-03-31 20:28:16.000000000 -0600
@@ -1,160 +1,23 @@
---- dvd-slideshow.orig 2006-03-09 23:56:54.000000000 -0600
-+++ dvd-slideshow 2007-09-02 17:02:53.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- # dvd-slideshow
- # Copyright 2003 Scott Dylewski <scott at dylewski.com>
- #
-@@ -151,7 +151,7 @@
- Got rid of calls to NetPBM functions, so it is no longer required...
- Changed "wc -m" call to "wc --chars" for better compatibility.
- Fixed syntax so spaces should be allowed in input files now.
-- Changed "seq 2 1" to "seq 2 -1 1" for better compatibility
-+ Changed "seq2 2 1" to "seq2 2 -1 1" for better compatibility
- Added option to "autocrop" images (-c) that are close to the
- output aspect ratio, but not quite.
- Title syntax changed... (see documentation)
-@@ -562,7 +562,7 @@
- border=0 # not implemented yet
- subtitle_type="render" # format of subtitles. other values make dvd-slideshow render them internally.
- #subtitle_type="srt" # format of subtitles. other values make dvd-slideshow render them internally.
--font_dir="/usr/share/fonts/"
-+font_dir="/usr/local/lib/X11/fonts/"
- default_font1='n019004l.pfb' # helvetica bold URW fonts
- default_font2='helb____.ttf' # helvetica bold truetype
- ## Subtitle:
-@@ -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`
-- characters=`echo "$fraction" | wc --chars`
-+ characters=`echo "$fraction" | wc -m`
- if [ "$characters" -eq 1 ] ; then ## no decimal was specified
- duration_ms="0"
- elif [ "$characters" -eq 2 ] ; then ## 1 decimal was specified
-@@ -1074,7 +1074,7 @@
- # $1_$2.ppm
- ## wait for all files in a fade to exist...
- dir_tmp=`dirname "$1"`
-- for i_tmp in `seq 1 $2` ; do
-+ for i_tmp in `seq2 1 $2` ; do
- di_tmp=`addzeros $i_tmp`
- newfile_tmp="$1"_$di_tmp.ppm
- while [ ! -f "$newfile_tmp" ]
-@@ -1099,14 +1099,14 @@
- echo -n ''
- elif [ $this_frame -gt $(( $total_frames - $stepsize )) ] ; then
- ## make ( $total_frames - $this_frame ) copies
-- for it in `seq 1 $(( $total_frames - $this_frame ))`; do
-+ for it in `seq2 1 $(( $total_frames - $this_frame ))`; do
- dj2=`addzeros $(( $this_frame + $it ))`
- cp "$tmpdir/fade_$dj.ppm" "$tmpdir/fade_$dj2.ppm"
- waitforfile "$tmpdir/fade_$dj2.ppm" # need on slow systems?
- done
- else
- ## loop over number of copies = stepsize-1
-- for it in `seq 1 $(( $stepsize - 1 ))`; do
-+ for it in `seq2 1 $(( $stepsize - 1 ))`; do
- dj2=`addzeros $(( $this_frame + $it ))`
- cp "$tmpdir/fade_$dj.ppm" "$tmpdir/fade_$dj2.ppm"
- waitforfile "$tmpdir/fade_$dj2.ppm" # need on slow systems?
-@@ -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
-@@ -2418,7 +2418,7 @@
- #######################################################################
- ## Roate?
- ## rotate image first, then apply other effects?
-- for e in `seq 2 -1 1`; do
-+ for e in `seq2 2 -1 1`; do
- if [ "$e" -eq 1 ] ; then
- this_effect="${effect1[$i]}"
- this_effect_params="${effect1_params[$i]}"
-@@ -2800,7 +2800,7 @@
-
- # open the fifo for writing as fd 3 (unlikely to be used!)
- exec 3>"$tmpdir/$yuvfifo"
-- /usr/sbin/lsof -a -u $USER -d 3 +c 0 -c dvd -c convert -c mpeg2 >> "$outdir/$logfile" 2>&1
-+ /usr/local/sbin/lsof -a -u $USER -d 3 +c 0 -c dvd -c convert -c mpeg2 >> "$outdir/$logfile" 2>&1
- fi
-
- ## make both a slideshow_background file and a title_background file
-@@ -3141,7 +3141,7 @@
- ## do two frames each loop so it's faster?
- echo -n "[dvd-slideshow]"
- lastbar=0
-- for fr in `seq 1 $stepsize $frames`; do
-+ for fr in `seq2 1 $stepsize $frames`; do
- dj=`addzeros $fr`
- progressbar $fr $frames
- percent=$(( 100 * $fr / $frames ))
-@@ -3281,7 +3281,7 @@
- echo -n "[dvd-slideshow]"
- lastbar=0 # required for progressbar
- ## do two frames each loop so it's faster?
-- for fr in `seq 1 $stepsize $frames`; do
-+ for fr in `seq2 1 $stepsize $frames`; do
- progressbar $fr $frames
- dj=`addzeros $fr`
- percent=$(( 100 * $fr / $frames ))
-@@ -3329,7 +3329,7 @@
- convert "$lastslide" "$tmpdir/temp_slideshow_image.mpc"
- echo -n "[dvd-slideshow]"
- lastbar=0
-- for fr in `seq 1 $stepsize $frames`; do
-+ for fr in `seq2 1 $stepsize $frames`; do
- dj=`addzeros $fr`
- progressbar $fr $frames
- percent=$(( 100 - 100 * $fr / $frames ))
-@@ -3645,7 +3645,7 @@
- smooth_offset=$( echo "scale=9;$frames-$smooth_slope/$smooth_time*($frames^2/2)" | bc -l ) #random constant in the decel equation
- fi
-
-- for fr in `seq 1 $stepsize $frames`; do
-+ for fr in `seq2 1 $stepsize $frames`; do
- dj=`addzeros $fr`
-
- if [ $smooth_ken -eq 1 ] && [ $frames -ge 30 ]; then
-@@ -3932,7 +3932,7 @@
+--- dvd-slideshow.orig 2007-01-13 20:03:38.000000000 -0600
++++ dvd-slideshow 2007-09-02 20:22:00.000000000 -0500
+@@ -3825,7 +3825,7 @@
+ mkdir -p "$outdir/$newname"_pics
fi
- echo -n "[dvd-slideshow]"
- lastbar=0
-- for fr in `seq 1 $stepsize $frames`; do
-+ for fr in `seq2 1 $stepsize $frames`; do
- dj=`addzeros $fr`
- x0=`div1000 $(( 1000 * $xs0 + $(($xe0-$xs0)) * 1000 * $fr / $frames ))`
- y0=`div1000 $(( 1000 * $ys0 + $(($ye0-$ys0)) * 1000 * $fr / $frames ))`
-@@ -4319,7 +4319,7 @@
- # just close the fifo and wait for the encoder to finish
- logecho "[dvd-slideshow] mpeg2enc process=$yuvpid"
- logecho "[dvd-slideshow] output from ps=`ps $yuvpid`"
-- /usr/sbin/lsof -a -u $USER -d 3 +c 0 -c dvd -c convert -c mpeg2 >> "$outdir/$logfile" 2>&1
-+ /usr/local/sbin/lsof -a -u $USER -d 3 +c 0 -c dvd -c convert -c mpeg2 >> "$outdir/$logfile" 2>&1
- # close pipe to mpeg2enc
- exec 3>&-
- myecho '[dvd-slideshow] waiting for mpeg2enc to finish...'
-@@ -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
-- audio1_end="$end_time"
-+ audio1_end="5"
- fi
-
- ## let's split this audio processing into two loops: one just prepares the
+ if [ "$copy" -eq 1 ] ; then
+- cp -af "${image[$i]}" "$outdir/$newname"_pics
++ cp -pf "${image[$i]}" "$outdir/$newname"_pics
+ fi
+ moviefiles=$(( $moviefiles + 1 ))
+ elif [ "${filetype[$i]}" == 'ogg' ] || [ "${filetype[$i]}" == 'mp3' ] || [ "${filetype[$i]}" == 'wav' ] || [ "${image[$i]}" == 'silence' ] || [ "${filetype[$i]}" == 'm4a' ] || [ "${filetype[$i]}" == 'aac' ] ; then
+@@ -6602,9 +6602,9 @@
+ mv "$tmpdir/video1.flv" "$outdir"/"$slideshow_name".flv
+ myecho "[dvd-slideshow] Generating video thumbnail..."
+ ffmpeg -y -i "$outdir"/"$slideshow_name".flv -f mjpeg -t 0.001 "$outdir"/"$slideshow_name".jpg >> "$outdir"/"$logfile" 2>&1
+- if [ -f "/usr/bin/flvtool2" ] ; then
++ if [ -f "/usr/local/bin/flvtool2" ] ; then
+ myecho "[dvd-slideshow] Running flvtool2 -U $slideshow_name".flv
+- /usr/bin/flvtool2 -U "$outdir"/"$slideshow_name".flv
++ /usr/local/bin/flvtool2 -U "$outdir"/"$slideshow_name".flv
+ fi
+ elif [ "$output_format" == 'swf' ] ; then
+ myecho "[dvd-slideshow] Adding audio to .swf file"
diff -ruN dvd-slideshow.orig/files/patch-install.sh dvd-slideshow/files/patch-install.sh
--- dvd-slideshow.orig/files/patch-install.sh 1969-12-31 17:00:00.000000000 -0700
+++ dvd-slideshow/files/patch-install.sh 2008-03-31 20:28:16.000000000 -0600
@@ -0,0 +1,26 @@
+--- install.sh.orig 2006-09-18 00:26:46.000000000 -0500
++++ install.sh 2007-09-02 19:46:04.000000000 -0500
+@@ -10,16 +10,16 @@
+ cp man/jigl2slideshow.1 /usr/local/man/man1/.
+
+ # copy executables:
+-cp dvd-slideshow /usr/bin/.
+-cp dvd-menu /usr/bin/.
+-cp gallery1-to-slideshow /usr/bin/.
+-cp jigl2slideshow /usr/bin/.
+-cp dir2slideshow /usr/bin/.
++cp dvd-slideshow /usr/local/bin/.
++cp dvd-menu /usr/local/bin/.
++cp gallery1-to-slideshow /usr/local/bin/.
++cp jigl2slideshow /usr/local/bin/.
++cp dir2slideshow /usr/local/bin/.
+
+ # remove old versions:
+-if [ -r '/usr/bin/gallery2slideshow' ] ; then
++if [ -r '/usr/local/bin/gallery2slideshow' ] ; then
+ echo 'Removing old gallery2slideshow and installing gallery1-to-slideshow instead'
+ echo 'See changelog for details.'
+- rm "/usr/bin/gallery2slideshow"
++ rm "/usr/local/bin/gallery2slideshow"
+ rm "/usr/local/man/man1/gallery2slideshow.1"
+ fi
diff -ruN dvd-slideshow.orig/pkg-plist dvd-slideshow/pkg-plist
--- dvd-slideshow.orig/pkg-plist 1969-12-31 17:00:00.000000000 -0700
+++ dvd-slideshow/pkg-plist 2008-03-31 20:28:16.000000000 -0600
@@ -0,0 +1,67 @@
+bin/dvd-slideshow
+bin/dvd-menu
+bin/dir2slideshow
+bin/gallery1-to-slideshow
+bin/jigl2slideshow
+%%NOPORTDOCS%%%%DOCSDIR%%/changelog.html
+%%NOPORTDOCS%%%%DOCSDIR%%/gallery1-to-slideshow.html
+%%NOPORTDOCS%%%%DOCSDIR%%/dir2slideshow.html
+%%NOPORTDOCS%%%%DOCSDIR%%/jigl2slideshow.html
+%%NOPORTDOCS%%%%DOCSDIR%%/dvd-menu.html
+%%NOPORTDOCS%%%%DOCSDIR%%/dvd-slideshow.html
+%%NOPORTDOCS%%%%DOCSDIR%%/dvd-slideshowrc
+%%NOTHEMES%%%%DATADIR%%/themes/themes.readme.txt
+%%NOTHEMES%%%%DATADIR%%/themes/babyblue/thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/babyblue/bip.ttf
+%%NOTHEMES%%%%DATADIR%%/themes/babyblue/slide_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/babyblue/bip.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/babyblue/babyblue.dvd-slideshow.theme
+%%NOTHEMES%%%%DATADIR%%/themes/babyblue/title_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/babypink/thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/babypink/bip.ttf
+%%NOTHEMES%%%%DATADIR%%/themes/babypink/slide_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/babypink/bip.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/babypink/title_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/babypink/babypink.dvd-slideshow.theme
+%%NOTHEMES%%%%DATADIR%%/themes/default/thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/default/slide_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/default/title_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/default/default.dvd-slideshow.theme
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/journal.ttf
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/slide_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/journal.ttf.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/title_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/dinner.readme.txt
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/dinner_plate_menu.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/dinner_plate_menu.jpg.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/tablecloth.jpg.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/dinner.dvd-slideshow.theme
+%%NOTHEMES%%%%DATADIR%%/themes/dinner/tablecloth.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/travel/thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/travel/journal.ttf
+%%NOTHEMES%%%%DATADIR%%/themes/travel/america_map.jpg.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/travel/travel.readme.txt
+%%NOTHEMES%%%%DATADIR%%/themes/travel/parchment.jpg.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/travel/america_map.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/travel/slide_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/travel/journal.ttf.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/travel/title_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/travel/travel.dvd-slideshow.theme
+%%NOTHEMES%%%%DATADIR%%/themes/travel/parchment.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/wedding/thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/wedding/journal.ttf
+%%NOTHEMES%%%%DATADIR%%/themes/wedding/wedding_table_sepia.jpg.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/wedding/wedding_table_sepia.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/wedding/wedding.dvd-slideshow.theme
+%%NOTHEMES%%%%DATADIR%%/themes/wedding/slide_thumbnail.jpg
+%%NOTHEMES%%%%DATADIR%%/themes/wedding/journal.ttf.license.txt
+%%NOTHEMES%%%%DATADIR%%/themes/wedding/title_thumbnail.jpg
+%%NOTHEMES%%@dirrmtry %%DATADIR%%/themes/wedding
+%%NOTHEMES%%@dirrmtry %%DATADIR%%/themes/travel
+%%NOTHEMES%%@dirrmtry %%DATADIR%%/themes/dinner
+%%NOTHEMES%%@dirrmtry %%DATADIR%%/themes/default
+%%NOTHEMES%%@dirrmtry %%DATADIR%%/themes/babypink
+%%NOTHEMES%%@dirrmtry %%DATADIR%%/themes/babyblue
+%%NOTHEMES%%@dirrmtry %%DATADIR%%/themes
+%%NOTHEMES%%@dirrmtry %%DATADIR%%
--- dvd-slideshow.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?200804010242.m312gOFL088009>