Use shebangfix

6 files changed, 19 insertions, 26 deletions

diff --git a/audio/cmus-post.fm/Makefile b/audio/cmus-post.fm/Makefile
index cca6c5b5ada5..2cf35cc89ece 100644
--- a/audio/cmus-post.fm/Makefile
+++ b/audio/cmus-post.fm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cmus-post.fm
-# Date created:		8 March 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	post.fm
 PORTVERSION=	1.0
@@ -17,15 +13,14 @@ COMMENT=	Last.fm submitter
 RUN_DEPENDS=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
 		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable
 
+USES=	shebangfix
 USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 SUB_FILES=	pkg-message
 NO_BUILD=	yes
 PLIST_FILES=	libexec/${PORTNAME} %%EXAMPLESDIR%%/${PORTNAME}.conf
 PLIST_DIRS=	%%EXAMPLESDIR%%
-
-post-patch:
-	@${REINPLACE_CMD} -e '1s|#!.*|#!${PERL5}|' ${WRKSRC}/${PORTNAME}
+SHEBANG_FILES=	${PORTNAME}
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/libexec/
diff --git a/audio/gnormalize/Makefile b/audio/gnormalize/Makefile
index 876b55d802c7..c6645088556e 100644
--- a/audio/gnormalize/Makefile
+++ b/audio/gnormalize/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnormalize
 PORTVERSION=	0.63
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -13,9 +13,12 @@ COMMENT=	An alternative for replaygain
 RUN_DEPENDS+=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		wavegain:${PORTSDIR}/audio/wavegain
 
+USES=		shebangfix
 USE_PERL5_RUN=	yes
 INSTALLS_ICONS=	yes
 
+SHEBANGFILES=	${PORTNAME}
+
 NO_BUILD=	yes
 
 MAN1=		gnormalize.1
@@ -68,10 +71,6 @@ RUN_DEPENDS+=	mac:${PORTSDIR}/audio/mac
 RUN_DEPENDS+=	mppenc:${PORTSDIR}/audio/musepack
 .endif
 
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-BUILD_DEPENDS+=	lzma:${PORTSDIR}/archivers/xz
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,^PREFIX=.*,PREFIX=${PREFIX},; \
 		s,^MANDIR=.*,MANDIR=${MANPREFIX}/man,; \
diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile
index d33f56bab12e..2ba6d9dcf985 100644
--- a/audio/mp3check/Makefile
+++ b/audio/mp3check/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Tool for checking and fixing MP3 archive inconsistencies
 RUN_DEPENDS=	${LOCALBASE}/bin/id3tool:${PORTSDIR}/audio/id3tool \
 		${LOCALBASE}/bin/mp3_check:${PORTSDIR}/audio/mp3_check
 
+USES=		shebangfix
 USE_PERL5_RUN=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
@@ -20,9 +21,7 @@ EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKSRC}
 NO_BUILD=	yes
 PLIST_FILES=	bin/mp3check
-
-pre-patch:
-	${REINPLACE_CMD} -E "s|^#!.+|#!${PERL}|" ${WRKSRC}/${DISTNAME}
+SHEBANG_FILES=	${DISTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/mp3check
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index 6cd856c1d9b0..e3558ec2f743 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	pacpl
 PORTVERSION=	4.0.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl Audio Converter
 
+USES=		shebangfix
 USE_PERL5_BUILD=yes
 USE_PERL5_RUN=	yes
 ONLY_FOR_ARCHS=	i386 amd64
@@ -51,6 +52,8 @@ MORELANGS_DESC=	Enable Additional language support
 MAN1=		pacpl.1
 PACPL_PO=	en_US.po
 
+SHEBANG_FILES=	pacpl plugins/amarok/pacx
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKDE4}
diff --git a/audio/pacpl/pkg-descr b/audio/pacpl/pkg-descr
index 2806ef65932e..c8b3e77e3b1b 100644
--- a/audio/pacpl/pkg-descr
+++ b/audio/pacpl/pkg-descr
@@ -9,5 +9,4 @@ CD ripping function with CDDB support, batch and playlist conversion,
 tag preservation for most supported formats, independent tag reading/
 writing, and extensions for Konqueror and Amarok are also provided.
 
-Author: Philip Lyons <viiron@gmail.com>
 WWW: http://pacpl.sourceforge.net/
diff --git a/audio/ripit/Makefile b/audio/ripit/Makefile
index be9368f0fa09..457292749f88 100644
--- a/audio/ripit/Makefile
+++ b/audio/ripit/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    ripit
-# Date created:         2 May 1999
-# Whom:                 oyvindmo@initio.no
-#
+# Created by: oyvindmo@initio.no
 # $FreeBSD$
-#
 
 PORTNAME=	ripit
 PORTVERSION=	3.9.0
@@ -22,20 +18,22 @@ RUN_DEPENDS=	p5-CDDB_get>=0:${PORTSDIR}/audio/p5-CDDB_get \
 	lame:${PORTSDIR}/audio/lame \
 	cdparanoia:${PORTSDIR}/audio/cdparanoia \
 
+USES=	shebangfix
 NO_BUILD=	yes
 PLIST_FILES=	bin/ripit
 MAN1=		ripit.1
 PORTEXAMPLES=	config
 USE_PERL5_RUN=	yes
 USE_BZIP2=	yes
+SHEBANG_FILES=	ripit.pl
+perl_OLD_CMD=	/usr/bin/env perl
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|#!/usr/bin/env perl|#!${PERL}|" ${WRKSRC}/ripit.pl
+.include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ripit.pl ${PREFIX}/bin/ripit
 	${INSTALL_MAN} ${WRKSRC}/ripit.1 ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/config ${EXAMPLESDIR}/config
 .endif