Attachment 83875 Details for Bug 119757 – bashburn.diff

[patch] bashburn.diff

bashburn.diff (text/plain; charset=us-ascii), 12.62 KB, created by Martin Tournoij on 2008-01-17 22:35:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Tournoij

Created: 2008-01-17 22:35:51 UTC

Size: 12.62 KB

patch

obsolete

>diff -urN --exclude CVS /ports/sysutils/bashburn/Makefile ./Makefile
>--- /ports/sysutils/bashburn/Makefile	2007-09-14 06:26:27.000000000 +0200
>+++ ./Makefile	2008-01-17 23:21:30.000000000 +0100
>@@ -2,11 +2,12 @@
> # Date created:				24 august 2007
> # Whom:					Martin Tournoij <carpetsmoker@xs4all.nl>
> #
>+# $Carpetsmoker: ports/sysutils/bashburn/Makefile,v 1.2 2007/09/24 08:06:55 carpetsmoker Exp $
> # $FreeBSD: ports/sysutils/bashburn/Makefile,v 1.1 2007/09/14 04:26:27 alepulver Exp $
> #
> 
> PORTNAME=	bashburn
>-PORTVERSION=	2.1.1
>+PORTVERSION=	2.1.2
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
> DISTNAME=	BashBurn-${PORTVERSION}
>diff -urN --exclude CVS /ports/sysutils/bashburn/distinfo ./distinfo
>--- /ports/sysutils/bashburn/distinfo	2007-09-14 06:26:27.000000000 +0200
>+++ ./distinfo	2008-01-15 12:20:14.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (BashBurn-2.1.1.tar.gz) = bc67340aa00ffe27b51b13d20cbbfe17
>-SHA256 (BashBurn-2.1.1.tar.gz) = fcdbff0d38652df283d0b3f774b8efefc301ec2067d33a17dd67ea23d9c5102f
>-SIZE (BashBurn-2.1.1.tar.gz) = 103937
>+MD5 (BashBurn-2.1.2.tar.gz) = 7ffe68291307aff24ec43d45d6866f6d
>+SHA256 (BashBurn-2.1.2.tar.gz) = 5eb0fdb8bca0ee73b9fffb23f0b09f9ee428efede38d8bb725165c13316fac44
>+SIZE (BashBurn-2.1.2.tar.gz) = 77517
>diff -urN --exclude CVS /ports/sysutils/bashburn/files/patch-BashBurn.sh ./files/patch-BashBurn.sh
>--- /ports/sysutils/bashburn/files/patch-BashBurn.sh	2007-09-14 06:26:27.000000000 +0200
>+++ ./files/patch-BashBurn.sh	2008-01-17 23:17:38.000000000 +0100
>@@ -1,24 +1,15 @@
>---- BashBurn.sh.orig	2007-07-18 21:48:55.000000000 +0200
>-+++ BashBurn.sh	2007-08-24 14:58:30.000000000 +0200
>-@@ -31,18 +31,13 @@
>+--- BashBurn.sh.orig	2007-11-09 19:02:46.000000000 +0100
>++++ BashBurn.sh	2008-01-17 23:17:18.000000000 +0100
>+@@ -31,7 +31,11 @@
>  # This is run at first
>  init_bashburn()
>  {
> -	if [[ -r "${BBCONFFILE}" ]]; then	# If /etc/bashburnrc exists, read in the vars.
>-+	if [[ ! -r "${BBCONFFILE}" ]]; then
>-+		cp ${BBCONFFILE}.sample ${BBCONFFILE}
>-+	fi
>- 		export BBROOTDIR="$( cat $BBCONFFILE | grep -v '^#' | grep BBROOTDIR:  | cut -d ":" -f 2- | sed -e "s/^[[:blank:]]//g")"
>++ 	if [[ ! -f "${BBCONFFILE}" ]]; then
>++ 		cp ${BBCONFFILE}.sample ${BBCONFFILE}
>++ 	fi
>++
>++ 	if [[ -r "${BBCONFFILE}" ]]; then
>+ 		# Next line a tip from paddor
>+ 		export BBROOTDIR="$( sed -n 's/^[[:blank:]]*BBROOTDIR:[[:blank:]]*$.*$/\1/p' < $BBCONFFILE)"
>  		source ${BBROOTDIR}/misc/commands.idx
>- 		source ${BBROOTDIR}/misc/variables.idx
>- 		export BBTEMPMOUNTDIR="${BBBURNDIR}/mnt"
>--	else
>--		echo "There is no '${BBCONFFILE}'" 1>&2		
>--		echo "That is the file where BashBurn stores its settings."
>--		echo "You must run the BashBurn installation script first as root to install"
>--		echo "all needed files. Do that now and then start 'bashburn' again."
>--		exit 1
>--	fi
>- 	
>- 	# Read in the language file
>- 	source ${BBROOTDIR}/lang/${BBLANG}/BashBurn.lang
>diff -urN --exclude CVS /ports/sysutils/bashburn/pkg-plist ./pkg-plist
>--- /ports/sysutils/bashburn/pkg-plist	2007-09-14 06:26:27.000000000 +0200
>+++ ./pkg-plist	2008-01-17 23:20:36.000000000 +0100
>@@ -1,177 +1,111 @@
> bin/bashburn
>-etc/bashburnrc.sample
>-%%DATADIR%%/burning/bincue.sh
>-%%DATADIR%%/burning/burning.sh
>-%%DATADIR%%/burning/multi.sh
>-%%DATADIR%%/config/apply_options.sh
>-%%DATADIR%%/config/configure.sh
>-%%DATADIR%%/config/reset_options.sh
>-%%DATADIR%%/convert/convert_flacs.sh
>-%%DATADIR%%/convert/convert_mp3s.sh
>-%%DATADIR%%/convert/convert_oggs.sh
>-%%DATADIR%%/func/audiofunc.sh
>-%%DATADIR%%/func/bincuefunc.sh
>-%%DATADIR%%/func/configfunc.sh
>-%%DATADIR%%/func/datafunc.sh
>-%%DATADIR%%/func/definefunc.sh
>-%%DATADIR%%/func/isofunc.sh
>-%%DATADIR%%/func/mountfunc.sh
>-%%DATADIR%%/func/multifunc.sh
>-%%DATADIR%%/lang/Czech/BashBurn.lang
>-%%DATADIR%%/lang/Czech/README
>-%%DATADIR%%/lang/Czech/audio_menu.lang
>-%%DATADIR%%/lang/Czech/bincue.lang
>-%%DATADIR%%/lang/Czech/burning.lang
>-%%DATADIR%%/lang/Czech/check_path.lang
>-%%DATADIR%%/lang/Czech/configure.lang
>-%%DATADIR%%/lang/Czech/convert_flacs.lang
>-%%DATADIR%%/lang/Czech/convert_mp3s.lang
>-%%DATADIR%%/lang/Czech/convert_oggs.lang
>-%%DATADIR%%/lang/Czech/data_menu.lang
>-%%DATADIR%%/lang/Czech/datadefine.lang
>-%%DATADIR%%/lang/Czech/iso_menu.lang
>-%%DATADIR%%/lang/Czech/mount.lang
>-%%DATADIR%%/lang/Czech/multi.lang
>-%%DATADIR%%/lang/English/BashBurn.lang
>+%%ETCDIR%%rc.sample
>+%%DATADIR%%/lang/Swedish/convert_flacs.lang
>+%%DATADIR%%/lang/Swedish/datadefine.lang
>+%%DATADIR%%/lang/Swedish/loopback.lang
>+%%DATADIR%%/lang/Swedish/README
>+%%DATADIR%%/lang/Swedish/check_path.lang
>+%%DATADIR%%/lang/Swedish/convert_mp3s.lang
>+%%DATADIR%%/lang/Swedish/convert_oggs.lang
>+%%DATADIR%%/lang/Swedish/commonfunctions.lang
>+%%DATADIR%%/lang/Swedish/data_menu.lang
>+%%DATADIR%%/lang/Swedish/bincue.lang
>+%%DATADIR%%/lang/Swedish/configure.lang
>+%%DATADIR%%/lang/Swedish/mount.lang
>+%%DATADIR%%/lang/Swedish/iso_menu.lang
>+%%DATADIR%%/lang/Swedish/multi.lang
>+%%DATADIR%%/lang/Swedish/burning.lang
>+%%DATADIR%%/lang/Swedish/audio_menu.lang
>+%%DATADIR%%/lang/Swedish/BashBurn.lang
>+%%DATADIR%%/lang/Spanish/convert_flacs.lang
>+%%DATADIR%%/lang/Spanish/datadefine.lang
>+%%DATADIR%%/lang/Spanish/loopback.lang
>+%%DATADIR%%/lang/Spanish/README
>+%%DATADIR%%/lang/Spanish/check_path.lang
>+%%DATADIR%%/lang/Spanish/convert_mp3s.lang
>+%%DATADIR%%/lang/Spanish/convert_oggs.lang
>+%%DATADIR%%/lang/Spanish/commonfunctions.lang
>+%%DATADIR%%/lang/Spanish/data_menu.lang
>+%%DATADIR%%/lang/Spanish/bincue.lang
>+%%DATADIR%%/lang/Spanish/configure.lang
>+%%DATADIR%%/lang/Spanish/mount.lang
>+%%DATADIR%%/lang/Spanish/iso_menu.lang
>+%%DATADIR%%/lang/Spanish/multi.lang
>+%%DATADIR%%/lang/Spanish/burning.lang
>+%%DATADIR%%/lang/Spanish/audio_menu.lang
>+%%DATADIR%%/lang/Spanish/BashBurn.lang
>+%%DATADIR%%/lang/English/convert_flacs.lang
>+%%DATADIR%%/lang/English/datadefine.lang
>+%%DATADIR%%/lang/English/loopback.lang
> %%DATADIR%%/lang/English/README
>-%%DATADIR%%/lang/English/audio_menu.lang
>-%%DATADIR%%/lang/English/bincue.lang
>-%%DATADIR%%/lang/English/burning.lang
> %%DATADIR%%/lang/English/check_path.lang
>-%%DATADIR%%/lang/English/commonfunctions.lang
>-%%DATADIR%%/lang/English/configure.lang
>-%%DATADIR%%/lang/English/convert_flacs.lang
> %%DATADIR%%/lang/English/convert_mp3s.lang
> %%DATADIR%%/lang/English/convert_oggs.lang
>+%%DATADIR%%/lang/English/commonfunctions.lang
> %%DATADIR%%/lang/English/data_menu.lang
>-%%DATADIR%%/lang/English/datadefine.lang
>-%%DATADIR%%/lang/English/iso_menu.lang
>-%%DATADIR%%/lang/English/loopback.lang
>+%%DATADIR%%/lang/English/bincue.lang
>+%%DATADIR%%/lang/English/configure.lang
> %%DATADIR%%/lang/English/mount.lang
>+%%DATADIR%%/lang/English/iso_menu.lang
> %%DATADIR%%/lang/English/multi.lang
>-%%DATADIR%%/lang/German/BashBurn.lang
>+%%DATADIR%%/lang/English/burning.lang
>+%%DATADIR%%/lang/English/audio_menu.lang
>+%%DATADIR%%/lang/English/BashBurn.lang
>+%%DATADIR%%/lang/German/convert_flacs.lang
>+%%DATADIR%%/lang/German/datadefine.lang
>+%%DATADIR%%/lang/German/loopback.lang
> %%DATADIR%%/lang/German/README
>-%%DATADIR%%/lang/German/audio_menu.lang
>-%%DATADIR%%/lang/German/bincue.lang
>-%%DATADIR%%/lang/German/burning.lang
> %%DATADIR%%/lang/German/check_path.lang
>-%%DATADIR%%/lang/German/commonfunctions.lang
>-%%DATADIR%%/lang/German/configure.lang
>-%%DATADIR%%/lang/German/convert_flacs.lang
> %%DATADIR%%/lang/German/convert_mp3s.lang
> %%DATADIR%%/lang/German/convert_oggs.lang
>+%%DATADIR%%/lang/German/commonfunctions.lang
> %%DATADIR%%/lang/German/data_menu.lang
>-%%DATADIR%%/lang/German/datadefine.lang
>-%%DATADIR%%/lang/German/iso_menu.lang
>+%%DATADIR%%/lang/German/bincue.lang
>+%%DATADIR%%/lang/German/configure.lang
> %%DATADIR%%/lang/German/mount.lang
>+%%DATADIR%%/lang/German/iso_menu.lang
> %%DATADIR%%/lang/German/multi.lang
>-%%DATADIR%%/lang/Italian/BashBurn.lang
>-%%DATADIR%%/lang/Italian/README
>-%%DATADIR%%/lang/Italian/audio_menu.lang
>-%%DATADIR%%/lang/Italian/bincue.lang
>-%%DATADIR%%/lang/Italian/burning.lang
>-%%DATADIR%%/lang/Italian/check_path.lang
>-%%DATADIR%%/lang/Italian/commonfunctions.lang
>-%%DATADIR%%/lang/Italian/configure.lang
>-%%DATADIR%%/lang/Italian/convert_flacs.lang
>-%%DATADIR%%/lang/Italian/convert_mp3s.lang
>-%%DATADIR%%/lang/Italian/convert_oggs.lang
>-%%DATADIR%%/lang/Italian/data_menu.lang
>-%%DATADIR%%/lang/Italian/datadefine.lang
>-%%DATADIR%%/lang/Italian/iso_menu.lang
>-%%DATADIR%%/lang/Italian/loopback.lang
>-%%DATADIR%%/lang/Italian/mount.lang
>-%%DATADIR%%/lang/Italian/multi.lang
>-%%DATADIR%%/lang/Norwegian/BashBurn.lang
>-%%DATADIR%%/lang/Norwegian/audio_menu.lang
>-%%DATADIR%%/lang/Norwegian/bincue.lang
>-%%DATADIR%%/lang/Norwegian/burning.lang
>-%%DATADIR%%/lang/Norwegian/check_path.lang
>-%%DATADIR%%/lang/Norwegian/configure.lang
>-%%DATADIR%%/lang/Norwegian/convert_flacs.lang
>-%%DATADIR%%/lang/Norwegian/convert_mp3s.lang
>-%%DATADIR%%/lang/Norwegian/convert_oggs.lang
>-%%DATADIR%%/lang/Norwegian/data_menu.lang
>-%%DATADIR%%/lang/Norwegian/datadefine.lang
>-%%DATADIR%%/lang/Norwegian/iso_menu.lang
>-%%DATADIR%%/lang/Norwegian/mount.lang
>-%%DATADIR%%/lang/Norwegian/multi.lang
>-%%DATADIR%%/lang/Polish/BashBurn.lang
>-%%DATADIR%%/lang/Polish/README
>-%%DATADIR%%/lang/Polish/audio_menu.lang
>-%%DATADIR%%/lang/Polish/bincue.lang
>-%%DATADIR%%/lang/Polish/burning.lang
>-%%DATADIR%%/lang/Polish/check_path.lang
>-%%DATADIR%%/lang/Polish/commonfunctions.lang
>-%%DATADIR%%/lang/Polish/configure.lang
>-%%DATADIR%%/lang/Polish/convert_flacs.lang
>-%%DATADIR%%/lang/Polish/convert_mp3s.lang
>-%%DATADIR%%/lang/Polish/convert_oggs.lang
>-%%DATADIR%%/lang/Polish/data_menu.lang
>-%%DATADIR%%/lang/Polish/datadefine.lang
>-%%DATADIR%%/lang/Polish/iso_menu.lang
>-%%DATADIR%%/lang/Polish/loopback.lang
>-%%DATADIR%%/lang/Polish/mount.lang
>-%%DATADIR%%/lang/Polish/multi.lang
>-%%DATADIR%%/lang/Spanish/BashBurn.lang
>-%%DATADIR%%/lang/Spanish/README
>-%%DATADIR%%/lang/Spanish/audio_menu.lang
>-%%DATADIR%%/lang/Spanish/bincue.lang
>-%%DATADIR%%/lang/Spanish/burning.lang
>-%%DATADIR%%/lang/Spanish/check_path.lang
>-%%DATADIR%%/lang/Spanish/commonfunctions.lang
>-%%DATADIR%%/lang/Spanish/configure.lang
>-%%DATADIR%%/lang/Spanish/convert_flacs.lang
>-%%DATADIR%%/lang/Spanish/convert_mp3s.lang
>-%%DATADIR%%/lang/Spanish/convert_oggs.lang
>-%%DATADIR%%/lang/Spanish/data_menu.lang
>-%%DATADIR%%/lang/Spanish/datadefine.lang
>-%%DATADIR%%/lang/Spanish/iso_menu.lang
>-%%DATADIR%%/lang/Spanish/loopback.lang
>-%%DATADIR%%/lang/Spanish/mount.lang
>-%%DATADIR%%/lang/Spanish/multi.lang
>-%%DATADIR%%/lang/Swedish/BashBurn.lang
>-%%DATADIR%%/lang/Swedish/README
>-%%DATADIR%%/lang/Swedish/audio_menu.lang
>-%%DATADIR%%/lang/Swedish/bincue.lang
>-%%DATADIR%%/lang/Swedish/burning.lang
>-%%DATADIR%%/lang/Swedish/check_path.lang
>-%%DATADIR%%/lang/Swedish/commonfunctions.lang
>-%%DATADIR%%/lang/Swedish/configure.lang
>-%%DATADIR%%/lang/Swedish/convert_flacs.lang
>-%%DATADIR%%/lang/Swedish/convert_mp3s.lang
>-%%DATADIR%%/lang/Swedish/convert_oggs.lang
>-%%DATADIR%%/lang/Swedish/data_menu.lang
>-%%DATADIR%%/lang/Swedish/datadefine.lang
>-%%DATADIR%%/lang/Swedish/iso_menu.lang
>-%%DATADIR%%/lang/Swedish/loopback.lang
>-%%DATADIR%%/lang/Swedish/mount.lang
>-%%DATADIR%%/lang/Swedish/multi.lang
>-%%DATADIR%%/menus/audio_menu.sh
>-%%DATADIR%%/menus/data_menu.sh
>-%%DATADIR%%/menus/iso_menu.sh
>-%%DATADIR%%/misc/check_path.sh
>-%%DATADIR%%/misc/colors.idx
>+%%DATADIR%%/lang/German/burning.lang
>+%%DATADIR%%/lang/German/audio_menu.lang
>+%%DATADIR%%/lang/German/BashBurn.lang
> %%DATADIR%%/misc/commands.idx
>-%%DATADIR%%/misc/commonfunctions.sh
> %%DATADIR%%/misc/datadefine.sh
>-%%DATADIR%%/misc/loopback.sh
>-%%DATADIR%%/misc/mount.sh
> %%DATADIR%%/misc/variables.idx
>+%%DATADIR%%/misc/mount.sh
> %%DATADIR%%/misc/xmmsread.sh
>+%%DATADIR%%/misc/check_path.sh
>+%%DATADIR%%/misc/commonfunctions.sh
>+%%DATADIR%%/misc/colors.idx
>+%%DATADIR%%/misc/loopback.sh
>+%%DATADIR%%/menus/data_menu.sh
>+%%DATADIR%%/menus/iso_menu.sh
>+%%DATADIR%%/menus/audio_menu.sh
>+%%DATADIR%%/func/isofunc.sh
>+%%DATADIR%%/func/definefunc.sh
>+%%DATADIR%%/func/configfunc.sh
>+%%DATADIR%%/func/multifunc.sh
>+%%DATADIR%%/func/bincuefunc.sh
>+%%DATADIR%%/func/datafunc.sh
>+%%DATADIR%%/func/audiofunc.sh
>+%%DATADIR%%/func/mountfunc.sh
>+%%DATADIR%%/convert/convert_mp3s.sh
>+%%DATADIR%%/convert/convert_oggs.sh
>+%%DATADIR%%/convert/convert_flacs.sh
>+%%DATADIR%%/config/configure.sh
>+%%DATADIR%%/config/reset_options.sh
>+%%DATADIR%%/config/apply_options.sh
>+%%DATADIR%%/burning/bincue.sh
>+%%DATADIR%%/burning/multi.sh
>+%%DATADIR%%/burning/burning.sh
> @dirrm %%DATADIR%%/burning
> @dirrm %%DATADIR%%/config
> @dirrm %%DATADIR%%/convert
> @dirrm %%DATADIR%%/func
>-@dirrm %%DATADIR%%/lang/Czech
>-@dirrm %%DATADIR%%/lang/English
>+@dirrm %%DATADIR%%/menus
>+@dirrm %%DATADIR%%/misc
> @dirrm %%DATADIR%%/lang/German
>-@dirrm %%DATADIR%%/lang/Italian
>-@dirrm %%DATADIR%%/lang/Norwegian
>-@dirrm %%DATADIR%%/lang/Polish
>+@dirrm %%DATADIR%%/lang/English
> @dirrm %%DATADIR%%/lang/Spanish
> @dirrm %%DATADIR%%/lang/Swedish
> @dirrm %%DATADIR%%/lang
>-@dirrm %%DATADIR%%/menus
>-@dirrm %%DATADIR%%/misc
> @dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 119757: 83874 | 83875