diff options
| author | lioux <lioux@FreeBSD.org> | 2007-07-26 10:46:25 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2007-07-26 10:46:25 +0800 |
| commit | 4211cac2b9acd96cd802f80e0ee390e0cb565c7c (patch) | |
| tree | 54a5b92fd1b6b94f63a7e0f38574236e55f3044d /net-p2p | |
| parent | 68af924fca454dff8c201d148d9ca8120cfb866a (diff) | |
| download | freebsd-ports-gnome-4211cac2b9acd96cd802f80e0ee390e0cb565c7c.tar.gz freebsd-ports-gnome-4211cac2b9acd96cd802f80e0ee390e0cb565c7c.tar.zst freebsd-ports-gnome-4211cac2b9acd96cd802f80e0ee390e0cb565c7c.zip | |
o Fix RC script. Make sure the shell is sh(1) when starting mlnet.
o Bump PORTREVISION
PR: 112253
Submitted by: Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/mldonkey/Makefile | 7 | ||||
| -rw-r--r-- | net-p2p/mldonkey/files/mlnet.in | 7 | ||||
| -rw-r--r-- | net-p2p/mldonkey/files/wrapper.sh | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile index b2acdfe191ab..4150b1564858 100644 --- a/net-p2p/mldonkey/Makefile +++ b/net-p2p/mldonkey/Makefile @@ -7,6 +7,7 @@ PORTNAME= mldonkey PORTVERSION= 2.8.7 +PORTREVISION= 1 CATEGORIES+= net-p2p MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \ ${MASTER_SITE_SAVANNAH} @@ -89,6 +90,7 @@ USE_GNOME= gtk20 .if !defined(WITHOUT_CORE) USE_RC_SUBR= mlnet +SUB_LIST+= SH=${SH:Q} . if !defined(WITHOUT_GD) LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd @@ -141,7 +143,10 @@ pre-everything:: .endif post-patch: - @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \ + @${SED} \ + -e "s|%%PREFIX%%|${PREFIX}|" \ + -e "s|%%SH%%|${SH}|" \ + ${FILESDIR}/wrapper.sh > \ ${WRKDIR}/wrapper.sh @${REINPLACE_CMD} -E \ -e 's|%%AUTOCONF%%|${AUTOCONF}|' \ diff --git a/net-p2p/mldonkey/files/mlnet.in b/net-p2p/mldonkey/files/mlnet.in index 8405a66675cd..7a11c52e343f 100644 --- a/net-p2p/mldonkey/files/mlnet.in +++ b/net-p2p/mldonkey/files/mlnet.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!%%SH%% # # $FreeBSD$ # @@ -59,10 +59,11 @@ start_cmd() ${mlnet_flags} \ >> ${mlnet_logfile} 2>&1 &" else - su -l ${mlnet_user} -c "${command} \ + su -l ${mlnet_user} -c "%%SH%% -c \ + \"${command} \ ${mlnet_logcommand} \ ${mlnet_flags} \ - >> ${mlnet_logfile} 2>&1 &" + >> ${mlnet_logfile} 2>&1 &\"" fi } diff --git a/net-p2p/mldonkey/files/wrapper.sh b/net-p2p/mldonkey/files/wrapper.sh index c25fd62bc133..e3a5e1adb5ca 100644 --- a/net-p2p/mldonkey/files/wrapper.sh +++ b/net-p2p/mldonkey/files/wrapper.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!%%SH%% PREFIX="%%PREFIX%%/bin" PROGRAM="${0}" |