sysutils/bashburn updated to 3.1.0

staging support
use option helpers

files/* are unneeded!

PR:		ports/189656
Submitted by:	Zsolt Udvari <udvzsolt@gmail.com>

5 files changed, 116 insertions, 149 deletions

diff --git a/sysutils/bashburn/Makefile b/sysutils/bashburn/Makefile
index 3eca3e7db970..dbb525963ce4 100644
--- a/sysutils/bashburn/Makefile
+++ b/sysutils/bashburn/Makefile
@@ -2,20 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	bashburn
-PORTVERSION=	2.1.2
-PORTREVISION=	3
+PORTVERSION=	3.1.0
 CATEGORIES=	sysutils
-MASTER_SITES=	SF
-DISTNAME=	BashBurn-${PORTVERSION}
+MASTER_SITES=	http://bashburn.dose.se/
+DISTNAME=	'index.php?s=file_download&id=25'
+EXTRACT_SUFX=
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	CD burning bash script
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
+WRKSRC=		${WRKDIR}/BashBurn-${PORTVERSION}
+
 NO_BUILD=	yes
 
+USES=		shebangfix
+SHEBANG_FILES=	BashBurn.sh
+
 OPTIONS_DEFINE=	CDRDAO DVDTOOLS EJECT FLAC LAME MPG123 NORMALIZE SUDO VORBIS
 OPTIONS_DEFAULT=	CDRDAO DVDTOOLS EJECT FLAC LAME MPG123 NORMALIZE SUDO VORBIS
 CDRDAO_DESC=	Disk-At-Once Recording
@@ -24,50 +32,26 @@ EJECT_DESC=	Ejecting the CD/DVD drive
 NORMALIZE_DESC=	An audio file volume normalizer
 SUDO_DESC=	To allow non-privileged users to burn CD's
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCDRDAO}
-RUN_DEPENDS+=	${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao
-.endif
-.if ${PORT_OPTIONS:MDVDTOOLS}
-RUN_DEPENDS+=	${LOCALBASE}/bin/dvd+rw-mediainfo:${PORTSDIR}/sysutils/dvd+rw-tools
-.endif
-.if ${PORT_OPTIONS:MEJECT}
-RUN_DEPENDS+=	${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
-.endif
-.if ${PORT_OPTIONS:MFLAC}
-RUN_DEPENDS+=	${LOCALBASE}/bin/flac:${PORTSDIR}/audio/flac
-.endif
-.if ${PORT_OPTIONS:MLAME}
-RUN_DEPENDS+=	${LOCALBASE}/bin/lame:${PORTSDIR}/audio/lame
-.endif
-.if ${PORT_OPTIONS:MMPG123}
-RUN_DEPENDS+=	${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123
-.endif
-.if ${PORT_OPTIONS:MNORMALIZE}
-RUN_DEPENDS+=	${LOCALBASE}/bin/normalize:${PORTSDIR}/audio/normalize
-.endif
-.if ${PORT_OPTIONS:MSUDO}
-RUN_DEPENDS+=	${LOCALBASE}/bin/sudo:${PORTSDIR}/security/sudo
-.endif
-.if ${PORT_OPTIONS:MVORBIS}
-RUN_DEPENDS+=	${LOCALBASE}/bin/ogg123:${PORTSDIR}/audio/vorbis-tools
-.endif
+CDRDAO_RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
+DVDTOOLS_RUN_DEPENDS=	dvd+rw-mediainfo:${PORTSDIR}/sysutils/dvd+rw-tools
+EJECT_RUN_DEPENDS=	eject:${PORTSDIR}/sysutils/eject
+FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
+LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
+MPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+NORMALIZE_RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize
+SUDO_RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
+VORBIS_RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
 
 post-patch:
-	@${REINPLACE_CMD} 's|/etc/|${PREFIX}/etc/|' \
+	@${REINPLACE_CMD} 's|@@BBROOTDIR@@|${DATADIR}|' \
 		${WRKSRC}/BashBurn.sh
-	@${REINPLACE_CMD} 's|/usr/local/BashBurn|${DATADIR}|' \
-		${WRKSRC}/bashburnrc
 
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/BashBurn.sh ${PREFIX}/bin/bashburn
-	${INSTALL_DATA} ${WRKSRC}/bashburnrc ${PREFIX}/etc/bashburnrc.sample
-	cd ${WRKSRC} && ${CP} -Rfp \
-		burning config convert lang menus misc func ${DATADIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
+	${INSTALL_SCRIPT} ${WRKSRC}/BashBurn.sh ${STAGEDIR}${PREFIX}/bin/bashburn
+.for dir in burning config convert func lang menus misc
+	@cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${dir}
+.endfor
+	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name COPYING"
+	${INSTALL_MAN} ${WRKSRC}/bashburn_man/bashburn.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/bashburn/distinfo b/sysutils/bashburn/distinfo
index 8839f3ab9a8f..f972044c37ce 100644
--- a/sysutils/bashburn/distinfo
+++ b/sysutils/bashburn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (BashBurn-2.1.2.tar.gz) = 5eb0fdb8bca0ee73b9fffb23f0b09f9ee428efede38d8bb725165c13316fac44
-SIZE (BashBurn-2.1.2.tar.gz) = 77517
+SHA256 (bashburn/index.php?s=file_download&id=25) = b78d5de1ee1b6e19aeee5b2f37a12aa6d02c665fd7645cad626ae7267351bb3c
+SIZE (bashburn/index.php?s=file_download&id=25) = 91295
diff --git a/sysutils/bashburn/files/patch-BashBurn.sh b/sysutils/bashburn/files/patch-BashBurn.sh
deleted file mode 100644
index e43e8bac3317..000000000000
--- a/sysutils/bashburn/files/patch-BashBurn.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 [[ ! -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
diff --git a/sysutils/bashburn/pkg-descr b/sysutils/bashburn/pkg-descr
index fec3f869ede3..6a67d5860c04 100644
--- a/sysutils/bashburn/pkg-descr
+++ b/sysutils/bashburn/pkg-descr
@@ -7,4 +7,4 @@ not the best looking CD-burning application out there, but it does
 what you want it to do. (And if not then probably didn't want to do it
 anyway)
 
-WWW: http://bashburn.sourceforge.net/
+WWW: http://bashburn.dose.se/
diff --git a/sysutils/bashburn/pkg-plist b/sysutils/bashburn/pkg-plist
index 7a81e3f7264b..92ebc059a320 100644
--- a/sysutils/bashburn/pkg-plist
+++ b/sysutils/bashburn/pkg-plist
@@ -1,111 +1,109 @@
 bin/bashburn
-%%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
+man/man1/bashburn.1.gz
+%%DATADIR%%/burning/bincue.sh
+%%DATADIR%%/burning/burning.sh
+%%DATADIR%%/burning/multi.sh
+%%DATADIR%%/config/apply_options.sh
+%%DATADIR%%/convert/convert_audio.sh
+%%DATADIR%%/convert/convert_images.sh
+%%DATADIR%%/func/advancedfunc.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/English/#advanced.lang#
+%%DATADIR%%/lang/English/#convert_audio.lang#
+%%DATADIR%%/lang/English/BashBurn.lang
 %%DATADIR%%/lang/English/README
+%%DATADIR%%/lang/English/advanced.lang
+%%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/convert_mp3s.lang
-%%DATADIR%%/lang/English/convert_oggs.lang
 %%DATADIR%%/lang/English/commonfunctions.lang
-%%DATADIR%%/lang/English/data_menu.lang
-%%DATADIR%%/lang/English/bincue.lang
 %%DATADIR%%/lang/English/configure.lang
-%%DATADIR%%/lang/English/mount.lang
+%%DATADIR%%/lang/English/convert_audio.lang
+%%DATADIR%%/lang/English/convert_images.lang
+%%DATADIR%%/lang/English/data_menu.lang
+%%DATADIR%%/lang/English/datadefine.lang
+%%DATADIR%%/lang/English/image_menu.lang
 %%DATADIR%%/lang/English/iso_menu.lang
+%%DATADIR%%/lang/English/loopback.lang
+%%DATADIR%%/lang/English/mount.lang
 %%DATADIR%%/lang/English/multi.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/BashBurn.lang
 %%DATADIR%%/lang/German/README
+%%DATADIR%%/lang/German/advanced.lang
+%%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/convert_mp3s.lang
-%%DATADIR%%/lang/German/convert_oggs.lang
 %%DATADIR%%/lang/German/commonfunctions.lang
-%%DATADIR%%/lang/German/data_menu.lang
-%%DATADIR%%/lang/German/bincue.lang
 %%DATADIR%%/lang/German/configure.lang
-%%DATADIR%%/lang/German/mount.lang
+%%DATADIR%%/lang/German/convert_audio.lang
+%%DATADIR%%/lang/German/convert_images.lang
+%%DATADIR%%/lang/German/data_menu.lang
+%%DATADIR%%/lang/German/datadefine.lang
+%%DATADIR%%/lang/German/image_menu.lang
 %%DATADIR%%/lang/German/iso_menu.lang
+%%DATADIR%%/lang/German/loopback.lang
+%%DATADIR%%/lang/German/mount.lang
 %%DATADIR%%/lang/German/multi.lang
-%%DATADIR%%/lang/German/burning.lang
-%%DATADIR%%/lang/German/audio_menu.lang
-%%DATADIR%%/lang/German/BashBurn.lang
-%%DATADIR%%/misc/commands.idx
-%%DATADIR%%/misc/datadefine.sh
-%%DATADIR%%/misc/variables.idx
-%%DATADIR%%/misc/mount.sh
-%%DATADIR%%/misc/xmmsread.sh
+%%DATADIR%%/lang/Swedish/BashBurn.lang
+%%DATADIR%%/lang/Swedish/README
+%%DATADIR%%/lang/Swedish/advanced.lang
+%%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_audio.lang
+%%DATADIR%%/lang/Swedish/convert_images.lang
+%%DATADIR%%/lang/Swedish/data_menu.lang
+%%DATADIR%%/lang/Swedish/datadefine.lang
+%%DATADIR%%/lang/Swedish/image_menu.lang
+%%DATADIR%%/lang/Swedish/iso_menu.lang
+%%DATADIR%%/lang/Swedish/loopback.lang
+%%DATADIR%%/lang/Swedish/mount.lang
+%%DATADIR%%/lang/Swedish/multi.lang
+%%DATADIR%%/menus/advanced.sh
+%%DATADIR%%/menus/audio_menu.sh
+%%DATADIR%%/menus/bbmenu.sh
+%%DATADIR%%/menus/configure.sh
+%%DATADIR%%/menus/data_menu.sh
+%%DATADIR%%/menus/datadefine.sh
+%%DATADIR%%/menus/image_menu.sh
+%%DATADIR%%/menus/iso_menu.sh
+%%DATADIR%%/menus/mount.sh
 %%DATADIR%%/misc/check_path.sh
-%%DATADIR%%/misc/commonfunctions.sh
 %%DATADIR%%/misc/colors.idx
+%%DATADIR%%/misc/commands.idx
+%%DATADIR%%/misc/commonfunctions.sh
+%%DATADIR%%/misc/configure_temp_help.lang
 %%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
+%%DATADIR%%/misc/m3u_read.sh
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HOWTO
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/TRANSLATION_RULE
 @dirrm %%DATADIR%%/burning
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/convert
 @dirrm %%DATADIR%%/func
-@dirrm %%DATADIR%%/menus
-@dirrm %%DATADIR%%/misc
-@dirrm %%DATADIR%%/lang/German
 @dirrm %%DATADIR%%/lang/English
-@dirrm %%DATADIR%%/lang/Spanish
+@dirrm %%DATADIR%%/lang/German
 @dirrm %%DATADIR%%/lang/Swedish
 @dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/menus
+@dirrm %%DATADIR%%/misc
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%