diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile index 49bf6e07f9b0..ce34dbb1406b 100644 --- a/multimedia/tovid/Makefile +++ b/multimedia/tovid/Makefile @@ -6,10 +6,15 @@ # PORTNAME= tovid -PORTVERSION= 0.24 -PORTREVISION= 9 +PORTVERSION= 0.30 +PORTREVISION= 2 CATEGORIES= multimedia python -MASTER_SITES= http://download.berlios.de/tovid/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= tovid + +PATCH_SITES= http://tovid.sourceforge.net/download/patches/ +PATCHFILES= tovid-0.30.2.patch.gz +PATCH_DIST_STRIP=-p1 MAINTAINER= multimedia@FreeBSD.org COMMENT= A collection of video disc authoring tools @@ -33,26 +38,50 @@ BUILD_DEPENDS= \ tcrequant:${PORTSDIR}/multimedia/transcode \ vcdxbuild:${PORTSDIR}/multimedia/vcdimager \ cdrdao:${PORTSDIR}/sysutils/cdrdao \ - growisofs:${PORTSDIR}/sysutils/dvd+rw-tools + growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ + txt2tags:${PORTSDIR}/textproc/txt2tags RUN_DEPENDS= \ - ${BUILD_DEPENDS} \ + sox:${PORTSDIR}/audio/sox \ + composite:${PORTSDIR}/graphics/ImageMagick \ + convert:${PORTSDIR}/graphics/ImageMagick \ + dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ + spumux:${PORTSDIR}/multimedia/dvdauthor \ + ffmpeg:${PORTSDIR}/multimedia/ffmpeg \ + mp2enc:${PORTSDIR}/multimedia/mjpegtools \ + mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \ + mplex:${PORTSDIR}/multimedia/mjpegtools \ + ppmtoy4m:${PORTSDIR}/multimedia/mjpegtools \ + yuvdenoise:${PORTSDIR}/multimedia/mjpegtools \ + yuvfps:${PORTSDIR}/multimedia/mjpegtools \ + mencoder:${PORTSDIR}/multimedia/mplayer \ + mplayer:${PORTSDIR}/multimedia/mplayer \ + tcprobe:${PORTSDIR}/multimedia/transcode \ + tcrequant:${PORTSDIR}/multimedia/transcode \ + vcdxbuild:${PORTSDIR}/multimedia/vcdimager \ + cdrdao:${PORTSDIR}/sysutils/cdrdao \ + growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ + txt2tags:${PORTSDIR}/textproc/txt2tags \ bash:${PORTSDIR}/shells/bash USE_PYTHON= yes -USE_PYDISTUTILS= yes +#USE_PYDISTUTILS= yes USE_CDRTOOLS= yes USE_WX= 2.6 WX_COMPS= python GNU_CONFIGURE= yes +USE_GMAKE= yes +NO_BUILD= yes -MAN1= idvid.1 makedvd.1 makemenu.1 makeslides.1 makexml.1 postproc.1 \ - tovid-suite.1 tovid.1 +CONFIGURE_ARGS= --mandir=${PREFIX}/man/ + +MAN1= idvid.1 makedvd.1 makemenu.1 makeslides.1 makevcd.1 makexml.1 \ + postproc.1 todisc.1 tovid.1 tovid-stats.1 post-patch: @${REINPLACE_CMD} -E \ -e 's|gawk|${AWK}|' \ -e 's|md5sum|md5|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # md5sum -> md5 # gnu sed -> sed # linux du -b -> emulation with awk @@ -79,14 +108,12 @@ post-patch: ${WRKSRC}/src/* # python interpreter safeness .for dir in libtovid src - @${REINPLACE_CMD} -E \ - -e 's|/usr/bin/env[[:space:]]+python|${PYTHON_CMD}|' \ - ${WRKSRC}/${dir}/* + @${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \ + ${REINPLACE_CMD} -E \ + -e 's|/usr/bin/env[[:space:]]+python|${PYTHON_CMD}|' .endfor -# sh interpreter safeness - @${REINPLACE_CMD} -E \ - -e 's|`which env`[[:space:]]+sh|${LOCALBASE}/bin/bash|' \ - ${WRKSRC}/src/Makefile.in + + @${FIND} ${WRKSRC} -name '*.bak' -delete post-build: @cd ${WRKSRC} && ${MAKE} diff --git a/multimedia/tovid/distinfo b/multimedia/tovid/distinfo index 13962dbe9aef..e81c62087272 100644 --- a/multimedia/tovid/distinfo +++ b/multimedia/tovid/distinfo @@ -1,3 +1,6 @@ -MD5 (tovid-0.24.tar.gz) = e12bd1d8d034534f6808b3f45f9f54a5 -SHA256 (tovid-0.24.tar.gz) = 0643993a98a22baed3de01d2ee15d0fcbe54d38523d61e4a7beb06e88f656b2f -SIZE (tovid-0.24.tar.gz) = 167673 +MD5 (tovid-0.30.tar.gz) = feb3418acade9584cd8256f5ce2efb88 +SHA256 (tovid-0.30.tar.gz) = fe30a4ef08d1aa15fcb811d123d14a7934a9f5180abbcaddafef1e543c42720f +SIZE (tovid-0.30.tar.gz) = 393084 +MD5 (tovid-0.30.2.patch.gz) = 695f4ec2c5ed7a0305bfd32718b5d232 +SHA256 (tovid-0.30.2.patch.gz) = 2b778324f9db1813435843be75ec49eee241c508329770c77a5279ec097e2da0 +SIZE (tovid-0.30.2.patch.gz) = 1257 diff --git a/multimedia/tovid/files/patch-Makefile.in b/multimedia/tovid/files/patch-Makefile.in new file mode 100644 index 000000000000..059aff204cbc --- /dev/null +++ b/multimedia/tovid/files/patch-Makefile.in @@ -0,0 +1,13 @@ +--- Makefile.in.orig Tue Feb 13 13:16:01 2007 ++++ Makefile.in Sun May 27 22:27:03 2007 +@@ -952,8 +952,8 @@ + # Make the manpages for svn users (tarball users' man pages made in dist-hook) + # This is a static pattern rule as seen on (TV!) + # http://www.gnu.org/software/make/manual/make.html#Static-Pattern +-$(man_MANS): $(man_dir)/%.1: $(man_src_dir)/%.t2t +- txt2tags -t man -i "$<" -o "$@" ++#$(man_MANS): $(man_dir)/%.1: $(man_src_dir)/%.t2t ++# txt2tags -t man -i "$<" -o "$@" + + # src/tovid-init not needed b/c ./configure derives it from src/tovid-init.in + # make fresh man pages for tarball users, ensuring that they're newer than the diff --git a/multimedia/tovid/files/patch-man__postproc.1 b/multimedia/tovid/files/patch-man__postproc.1 deleted file mode 100644 index c48801716349..000000000000 --- a/multimedia/tovid/files/patch-man__postproc.1 +++ /dev/null @@ -1,11 +0,0 @@ ---- man/postproc.1.orig Fri Jan 20 00:33:04 2006 -+++ man/postproc.1 Fri Jan 20 00:33:14 2006 -@@ -6,7 +6,7 @@ - - .SS Synopsis - .nf -- makeslides [ OPTIONS ] IN_FILE OUT_FILE -+ postproc [ OPTIONS ] IN_FILE OUT_FILE - .fi - - diff --git a/multimedia/tovid/files/patch-src__dvrequant.sh b/multimedia/tovid/files/patch-src__dvrequant.sh deleted file mode 100644 index 55b41c9ce1bd..000000000000 --- a/multimedia/tovid/files/patch-src__dvrequant.sh +++ /dev/null @@ -1,16 +0,0 @@ ---- src/dvrequant.sh.orig Fri Jan 20 00:23:01 2006 -+++ src/dvrequant.sh Fri Jan 20 00:26:34 2006 -@@ -446,11 +446,11 @@ - echo "You may consult the log file:$PROCESS_LOG" - echo " " - echo "BURNING:" --echo "Use to burn image: growisofs -dvd-compat -Z $DVD_DEVICE=$DISK_TITLE.iso " -+echo "Use to burn image: growisofs -dvd-compat -dvd-video -use-the-force-luke=dao -Z $DVD_DEVICE=$DISK_TITLE.iso " - echo "Insert blank dvd and press ENTER" - read BURN - cd $WORKING_DIR/$DISK_TITLE --growisofs -dvd-compat -Z $DVD_DEVICE=$DISK_TITLE.iso -+growisofs -dvd-compat -dvd-video -use-the-force-luke=dao -Z $DVD_DEVICE=$DISK_TITLE.iso - - exit - diff --git a/multimedia/tovid/files/patch-src__makedvd b/multimedia/tovid/files/patch-src__makedvd new file mode 100644 index 000000000000..b59460ff4714 --- /dev/null +++ b/multimedia/tovid/files/patch-src__makedvd @@ -0,0 +1,25 @@ +--- src/makedvd.orig Tue May 29 07:51:08 2007 ++++ src/makedvd Tue May 29 07:51:55 2007 +@@ -288,11 +288,11 @@ + DISC_SUM=0 + while test $i -le $NUM_VOBS; do + VOB=$(echo "$VOB_LIST" | awk -F ':' '{ print $'$i' }') +- VOB_SIZE=$(du -B M "$VOB" | awk -F ' ' '{print $1}' | tr -d M) ++ VOB_SIZE=$(du -m "$VOB" | awk -F ' ' '{print $1}' | tr -d M) + DISC_SUM=$(expr $VOB_SIZE \+ $DISC_SUM) + i=$(expr $i \+ 1) + done +- AVAIL_SPACE=$(df -B M -P . | awk 'NR != 1 {print $4;}' | tr -d M) ++ AVAIL_SPACE=$(df -m -P . | awk 'NR != 1 {print $4;}' | tr -d M) + + if test $DISC_SUM -gt $AVAIL_SPACE; then + echo $SEPARATOR +@@ -400,7 +400,7 @@ + probe_media + fi + +- DISC_SUM=$(du -s -B M "$OUT_DIR" | awk '{print $1}' | tr -d M) ++ DISC_SUM=$(du -s -m "$OUT_DIR" | awk '{print $1}' | tr -d M) + if test $DISC_SUM -gt $DISC_CAPACITY; then + echo $SEPARATOR + echo "Cannot continue! DVD image (${DISC_SUM}MB) exceeds the DVD's capacity (${DISC_CAPACITY}MB)." diff --git a/multimedia/tovid/files/patch-src__makedvd.sh b/multimedia/tovid/files/patch-src__makedvd.sh deleted file mode 100644 index ef3a198785ae..000000000000 --- a/multimedia/tovid/files/patch-src__makedvd.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- src/makedvd.sh.orig Fri Jan 20 00:23:04 2006 -+++ src/makedvd.sh Fri Jan 20 00:27:46 2006 -@@ -236,7 +236,7 @@ - - # Burn the disc, if requested - if $DO_BURN; then -- BURN_CMD="growisofs -dvd-compat -speed=$BURN_SPEED -Z $DVDRW_DEVICE=$DISC_LABEL.iso" -+ BURN_CMD="growisofs -dvd-compat -dvd-video -use-the-force-luke=dao -speed=$BURN_SPEED -Z $DVDRW_DEVICE=$DISC_LABEL.iso" - echo $SEPARATOR - echo "Burning ISO to DVD with the following command:" - echo $BURN_CMD diff --git a/multimedia/tovid/files/patch-src__makexml.sh b/multimedia/tovid/files/patch-src__makexml.sh deleted file mode 100644 index bb968b4dd94f..000000000000 --- a/multimedia/tovid/files/patch-src__makexml.sh +++ /dev/null @@ -1,65 +0,0 @@ ---- src/makexml.sh.orig Sun Feb 19 05:52:41 2006 -+++ src/makexml.sh Sun Feb 19 05:52:41 2006 -@@ -183,7 +183,7 @@ - # Generate XML for the button linking to this titleset menu from the top menu - TOP_MENU_BUTTONS=`cat << EOF - $TOP_MENU_BUTTONS\ --