Index: head/multimedia/dvd-slideshow/Makefile =================================================================== --- head/multimedia/dvd-slideshow/Makefile (revision 232570) +++ head/multimedia/dvd-slideshow/Makefile (revision 232571) @@ -1,114 +1,114 @@ # New ports collection makefile for: dvd-slideshow # Date created: 2005-02-16 # Whom: Phil Oleson # # $FreeBSD$ # PORTNAME= dvd-slideshow -PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTVERSION= 0.8.2 CATEGORIES= multimedia MASTER_SITES= SF -DISTFILES= ${PORTNAME}-${PORTVERSION}-1${EXTRACT_SUFX} +DISTFILES= ${PORTNAME}-${PORTVERSION}-2${EXTRACT_SUFX} +THEMEVERSION= 0.8.0 MAINTAINER= oz@nixil.net COMMENT= Script that creates a slideshow-style DVD with some simple menus RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ identify:${PORTSDIR}/graphics/ImageMagick \ mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \ ffmpeg:${PORTSDIR}/multimedia/ffmpeg \ sox:${PORTSDIR}/audio/sox \ dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ jhead:${PORTSDIR}/graphics/jhead \ flvtool2:${PORTSDIR}/multimedia/ruby-flvtool2 \ ${LOCALBASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1 +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-2 NO_BUILD= yes USE_CDRTOOLS= yes DATADIR= ${PREFIX}/share/apps/${PORTNAME} 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 \ dir2slideshow.1 \ gallery1-to-slideshow.1 \ jigl2slideshow.1 .include .if exists(${LOCALBASE}/bin/lame) WITH_LAME=yes .endif .if exists(${LOCALBASE}/bin/oggdec) WITH_VORBISTOOLS=yes .endif .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 +DISTFILES+= ${PORTNAME}-themes-${THEMEVERSION}-1${EXTRACT_SUFX} +WRKSRC2= ${WRKDIR}/${PORTNAME}-themes-${THEMEVERSION}-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 @${REINPLACE_CMD} -e 's|!/bin/bash|!${PREFIX}/bin/bash|g ; \ s|/usr/share/fonts/|${LOCALBASE}/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 .endfor @${ECHO_MSG} "Installing man files." .for FILE in ${MAN1} ${INSTALL_MAN} ${WRKSRC}/man/${FILE} ${PREFIX}/man/man1 .endfor .ifndef(NOPORTDOCS) @${ECHO_MSG} "Installing doc files." ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/dvd-slideshowrc ${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} + ${INSTALL_DATA} ${WRKSRC}/doc/${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 Property changes on: head/multimedia/dvd-slideshow/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/multimedia/dvd-slideshow/distinfo =================================================================== --- head/multimedia/dvd-slideshow/distinfo (revision 232570) +++ head/multimedia/dvd-slideshow/distinfo (revision 232571) @@ -1,6 +1,6 @@ -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-0.8.2-2.tar.gz) = f945f66f941e72485384067a52f5d46d +SHA256 (dvd-slideshow-0.8.2-2.tar.gz) = 00ad7d8cced0f72dc8febf80f1cf7d843f8c390aa412ca46ca22ed9521ae0005 +SIZE (dvd-slideshow-0.8.2-2.tar.gz) = 155338 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 Property changes on: head/multimedia/dvd-slideshow/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/multimedia/dvd-slideshow/files/patch-dvd-slideshow =================================================================== --- head/multimedia/dvd-slideshow/files/patch-dvd-slideshow (revision 232570) +++ head/multimedia/dvd-slideshow/files/patch-dvd-slideshow (revision 232571) @@ -1,23 +1,23 @@ ---- 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 @@ +--- dvd-slideshow.orig 2008-12-05 07:48:58.000000000 +0000 ++++ dvd-slideshow 2009-04-13 11:10:55.000000000 +0000 +@@ -3845,7 +3845,7 @@ mkdir -p "$outdir/$newname"_pics fi 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 @@ +@@ -7136,9 +7136,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 + ffmpeg -y -i "$outdir"/"$slideshow_name".flv -f mjpeg -t 0.001 "$outdir"/"$slideshow_name".jpg >> "$ffmpeg_out" 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" Property changes on: head/multimedia/dvd-slideshow/files/patch-dvd-slideshow ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property