2 files changed, 6 insertions, 4 deletions

diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 986b5d9e96f8..1c4cf7b6a22e 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -119,7 +119,7 @@ post-fetch:
 
 post-patch:
 	@${REINPLACE_CMD} \
-	    -e 's|%%PERL%%|${PERL}|' \
+	    -e 's|/usr/bin/perl|${PERL}|' \
 	    -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	    -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|' \
 	    -e 's|%%CPANWRKDIR%%|${CPANWRKDIR}|' \
@@ -127,8 +127,10 @@ post-patch:
 		${WRKSRC}/Bin/build-perl-modules.pl
 	@${REINPLACE_CMD} \
 	    -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/scanner.pl ${WRKSRC}/slimserver.pl
-	@${RM} ${WRKSRC}/scanner.pl.bak ${WRKSRC}/slimserver.pl.bak
+		${WRKSRC}/scanner.pl ${WRKSRC}/slimserver.pl \
+		${WRKSRC}/Bin/dbish
+	@${RM} ${WRKSRC}/scanner.pl.bak ${WRKSRC}/slimserver.pl.bak \
+	    ${WRKSRC}/Bin/dbish.bak
 
 do-build:
 	@${MKDIR} -m 0755 ${TMP_SLIMDIR}
diff --git a/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl b/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl
index b5ddceb89645..cc52da3652a6 100644
--- a/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl
+++ b/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl
@@ -49,7 +49,7 @@ $FreeBSD$
 -	chomp($perlBinary = <STDIN>);
 -
 -	$perlBinary ||= '/usr/bin/perl';
-+	$perlBinary = '%%PERL%%';
++	$perlBinary = '/usr/bin/perl';
  
  	unless (-f $perlBinary && -x $perlBinary) {
  		die "Couldn't find a perl binary. Exiting.\n";