diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2007-01-28 16:58:42 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2007-01-28 16:58:42 +0000 |
| commit | 8fe7848586a3ab4c046db0a0d7047c42fb652d82 (patch) | |
| tree | e8fbf431227fcd4b974aee25648e2feaee2a5595 /audio | |
| parent | - Update to 0.10.0 (diff) | |
Fix build for people who have somehow managed to install Perl without a
working /usr/bin/perl.
Notes
Notes:
svn path=/head/; revision=183555
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/slimserver/Makefile | 8 | ||||
| -rw-r--r-- | audio/slimserver/files/patch-Bin_build-perl-modules.pl | 2 | ||||
| -rw-r--r-- | audio/squeezeboxserver/Makefile | 8 | ||||
| -rw-r--r-- | audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl | 2 | ||||
| -rw-r--r-- | audio/squeezecenter/Makefile | 8 | ||||
| -rw-r--r-- | audio/squeezecenter/files/patch-Bin_build-perl-modules.pl | 2 |
6 files changed, 18 insertions, 12 deletions
diff --git a/audio/slimserver/Makefile b/audio/slimserver/Makefile index 986b5d9e96f8..1c4cf7b6a22e 100644 --- a/audio/slimserver/Makefile +++ b/audio/slimserver/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/slimserver/files/patch-Bin_build-perl-modules.pl b/audio/slimserver/files/patch-Bin_build-perl-modules.pl index b5ddceb89645..cc52da3652a6 100644 --- a/audio/slimserver/files/patch-Bin_build-perl-modules.pl +++ b/audio/slimserver/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"; 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"; diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile index 986b5d9e96f8..1c4cf7b6a22e 100644 --- a/audio/squeezecenter/Makefile +++ b/audio/squeezecenter/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/squeezecenter/files/patch-Bin_build-perl-modules.pl b/audio/squeezecenter/files/patch-Bin_build-perl-modules.pl index b5ddceb89645..cc52da3652a6 100644 --- a/audio/squeezecenter/files/patch-Bin_build-perl-modules.pl +++ b/audio/squeezecenter/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"; |