diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1998-09-16 06:55:18 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1998-09-16 06:55:18 +0000 |
| commit | 289b80fb84dff8e3798885717e091a48a619c669 (patch) | |
| tree | c6462da2049521a8beeadebdca069db6722efb78 /irc | |
| parent | Upgrade to 3.1.2, which is fetchable. (diff) | |
Better fix for perl5-in-current world.
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=13168
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/sirc/Makefile | 20 | ||||
| -rw-r--r-- | irc/sirc/scripts/sirc-proto | 7 |
2 files changed, 18 insertions, 9 deletions
diff --git a/irc/sirc/Makefile b/irc/sirc/Makefile index ac276c676b24..466631d41ee3 100644 --- a/irc/sirc/Makefile +++ b/irc/sirc/Makefile @@ -3,7 +3,7 @@ # Date created: 4 May 1998 # Whom: Studded <Studded@dal.net> # -# $Id: Makefile,v 1.1.1.1 1998/05/07 05:20:19 mph Exp $ +# $Id: Makefile,v 1.2 1998/05/07 21:58:53 mph Exp $ # # If you need SOCKS support, define SOCKS_SERVER with # the name of your SOCKS proxy and remove the '#'. @@ -22,6 +22,12 @@ MAINTAINER= Studded@dal.net USE_PERL5= yes +.if exists(/usr/bin/perl5) +SHORT_PERL5=/usr/bin/perl5 +.else +SHORT_PERL5=${PREFIX}/bin/perl5 +.endif + post-extract: .if !defined(SOCKS_SERVER) @${ECHO_MSG} '' @@ -39,12 +45,16 @@ pre-patch: do-patch: .if defined(SOCKS_SERVER) @${PATCH} ${PATCH_DIST_ARGS} < ${PATCHDIR}/patch-aa - @${SED} 's%SOCKS_SERVER\=%SOCKS_SERVER\=${SOCKS_SERVER}%' \ - ${WRKSRC}/sirc-proto > ${WRKSRC}/sirc-socks - @${SED} 's%PREFIX\=%PREFIX\=${PREFIX}%' ${WRKSRC}/sirc-socks \ + @${SED} 's:SOCKS_SERVER\=:SOCKS_SERVER\=${SOCKS_SERVER}:' \ + ${WRKSRC}/sirc-proto > ${WRKSRC}/sirc-proto.1 + @${SED} 's:PREFIX.SED:${PREFIX}:' ${WRKSRC}/sirc-proto.1 \ + > ${WRKSRC}/sirc-proto.2 + @${SED} 's:PERL5.SED:${SHORT_PERL5}:' ${WRKSRC}/sirc-proto.2 \ > ${WRKSRC}/sirc .else - @${SED} 's%PREFIX\=%PREFIX\=${PREFIX}%' ${WRKSRC}/sirc-proto \ + @${SED} 's:PREFIX.SED:${PREFIX}:' ${WRKSRC}/sirc-proto \ + > ${WRKSRC}/sirc-proto.1 + @${SED} 's:PERL5.SED:${SHORT_PERL5}:' ${WRKSRC}/sirc-proto.1 \ > ${WRKSRC}/sirc .endif diff --git a/irc/sirc/scripts/sirc-proto b/irc/sirc/scripts/sirc-proto index 95223b1d3dd7..0c98a05ec0f5 100644 --- a/irc/sirc/scripts/sirc-proto +++ b/irc/sirc/scripts/sirc-proto @@ -1,7 +1,6 @@ #!/bin/sh -PREFIX= -SIRCLIB=${PREFIX}/libexec/sirc ; export SIRCLIB +SIRCLIB=PREFIX.SED/libexec/sirc ; export SIRCLIB if test -z "$SIRCSERVER" && test -z "$IRCSERVER" then @@ -11,7 +10,7 @@ fi case "$1" in -d) shift - exec ${PERL5} ${SIRCLIB}/dsirc "$@" + exec PERL5.SED ${SIRCLIB}/dsirc "$@" ;; - *) eval exec ${PREFIX}/bin/ssfe $SSFE ${PERL5} ${SIRCLIB}/dsirc \"\$@\" + *) eval exec PREFIX.SED/bin/ssfe $SSFE PERL5.SED ${SIRCLIB}/dsirc \"\$@\" esac |