4 files changed, 98 insertions, 173 deletions

diff --git a/sysutils/bashburn/Makefile b/sysutils/bashburn/Makefile
index b9356ba6287f..5fd1ee9f712a 100644
--- a/sysutils/bashburn/Makefile
+++ b/sysutils/bashburn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bashburn
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 DISTNAME=	BashBurn-${PORTVERSION}
@@ -66,7 +66,7 @@ post-patch:
 		${WRKSRC}/bashburnrc
 
 do-install:
-	${MKDIR} ${DATADIR}
+	${MKDIR} ${DATADIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/BashBurn.sh ${PREFIX}/bin/bashburn
 	${INSTALL_DATA} ${WRKSRC}/bashburnrc ${PREFIX}/etc/bashburnrc.sample
 	cd ${WRKSRC} && ${CP} -Rfp \
diff --git a/sysutils/bashburn/distinfo b/sysutils/bashburn/distinfo
index 8f351571973a..5b7066e23034 100644
--- a/sysutils/bashburn/distinfo
+++ b/sysutils/bashburn/distinfo
@@ -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 --git a/sysutils/bashburn/files/patch-BashBurn.sh b/sysutils/bashburn/files/patch-BashBurn.sh
index 9d2314746086..e43e8bac3317 100644
--- a/sysutils/bashburn/files/patch-BashBurn.sh
+++ b/sysutils/bashburn/files/patch-BashBurn.sh
@@ -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 --git a/sysutils/bashburn/pkg-plist b/sysutils/bashburn/pkg-plist
index 701b62872e3b..7a81e3f7264b 100644
--- a/sysutils/bashburn/pkg-plist
+++ b/sysutils/bashburn/pkg-plist
@@ -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%%