Date: Fri, 17 Jul 2009 07:12:14 GMT From: "Philip M. Gollucci" <pgollucci@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tdb@FreeBSD.org Subject: ports/136842: [PATCH] misc/proxyper: USE_RC_SUBR != yes Message-ID: <200907170712.n6H7CEjG040084@freefall.freebsd.org> Resent-Message-ID: <200907170720.n6H7K2gt045844@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 136842 >Category: ports >Synopsis: [PATCH] misc/proxyper: USE_RC_SUBR != yes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 17 07:20:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 7.2-STABLE i386 >Organization: RideCharge Inc. >Environment: System: FreeBSD freefall.freebsd.org 7.2-STABLE FreeBSD 7.2-STABLE #38 r194101: Sat Jun 13 11:12:24 UTC >Description: Added file(s): - files/proxyper.in Removed file(s): - files/proxyper.sh Port maintainer (tdb@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- proxyper-343_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/misc/proxyper/Makefile,v retrieving revision 1.24 diff -u -u -r1.24 Makefile --- Makefile 6 Jan 2009 12:50:06 -0000 1.24 +++ Makefile 17 Jul 2009 07:12:03 -0000 @@ -7,6 +7,7 @@ PORTNAME= proxyper PORTVERSION= 343 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= ftp://ftp.distributed.net/pub/dcti/proxyper/ \ http://http.distributed.net/pub/dcti/proxyper/ @@ -16,10 +17,11 @@ ONLY_FOR_ARCHS= i386 -USE_RC_SUBR= yes +USE_RC_SUBR= ${PORTNAME} NO_BUILD= yes -BINDIR= ${PREFIX}/distributed.net/proxy +BINDIR= ${PREFIX}/distributed.net/proxy +SUB_LIST+= BINDIR=${PREFIX}/distributed.net/proxy PROXYUSER= nobody PROXYGROUP= daemon @@ -36,11 +38,6 @@ DISTNAME= proxyper${PORTVERSION}-freebsd4-x86 .endif -post-extract: - @${SED} -e 's#%%BINDIR%%#${BINDIR}#'g \ - -e 's#%%RC_SUBR%%#${RC_SUBR}#g' \ - ${FILESDIR}/proxyper.sh > ${WRKDIR}/proxyper.sh - do-install: if [ ! -d ${BINDIR} ]; then \ ${MKDIR} ${BINDIR}; \ @@ -48,13 +45,11 @@ ${CHOWN} ${PROXYUSER}:${PROXYGROUP} ${BINDIR} ${CHMOD} 755 ${BINDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/proxyper ${BINDIR} + @${INSTALL_PROGRAM} ${WRKSRC}/proxyper ${BINDIR} ${INSTALL_MAN} ${WRKSRC}/ChangeLog.txt ${BINDIR} ${INSTALL_MAN} ${WRKSRC}/manual.html ${BINDIR} - ${INSTALL_SCRIPT} ${WRKDIR}/proxyper.sh ${PREFIX}/etc/rc.d/proxyper.sh - ${INSTALL_DATA} ${WRKSRC}/proxyper.ini ${BINDIR}/proxyper.ini.sample .if !exists(${BINDIR}/proxyper.ini) ${INSTALL_DATA} ${WRKSRC}/proxyper.ini ${BINDIR}/proxyper.ini Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/misc/proxyper/pkg-plist,v retrieving revision 1.11 diff -u -u -r1.11 pkg-plist --- pkg-plist 22 Jan 2006 02:28:43 -0000 1.11 +++ pkg-plist 17 Jul 2009 07:12:03 -0000 @@ -4,6 +4,5 @@ @unexec if cmp -s %D/distributed.net/proxy/proxyper.ini %D/distributed.net/proxy/proxyper.ini.sample; then rm -f %D/distributed.net/proxy/proxyper.ini; fi distributed.net/proxy/proxyper.ini.sample @exec [ -f %B/proxyper.ini ] || cp %B/%f %B/proxyper.ini -etc/rc.d/proxyper.sh @dirrm distributed.net/proxy @dirrmtry distributed.net Index: files/proxyper.in =================================================================== RCS file: files/proxyper.in diff -N files/proxyper.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/proxyper.in 17 Jul 2009 07:12:03 -0000 @@ -0,0 +1,28 @@ +#!/bin/sh +# +# $FreeBSD: ports/misc/proxyper/files/proxyper.sh,v 1.6 2006/02/20 20:47:17 dougb Exp $ +# +# PROVIDE: proxyper +# REQUIRE: LOGIN +# KEYWORD: shutdown + +proxyper_enable=${proxyper_enable:-"NO"} + +dir="%%BINDIR%%" +user="nobody" + +. %%RC_SUBR%% + +name="proxyper" +rcvar=`set_rcvar` + +pidfile=${dir}/rc5desproxy.pid +required_files=${dir}/${name}.ini + +proxyper_user=${user} + +command=${dir}/${name} +command_args=">/dev/null 2>&1 &" + +load_rc_config $name +run_rc_command "$1" Index: files/proxyper.sh =================================================================== RCS file: files/proxyper.sh diff -N files/proxyper.sh --- files/proxyper.sh 20 Feb 2006 20:47:17 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/misc/proxyper/files/proxyper.sh,v 1.6 2006/02/20 20:47:17 dougb Exp $ -# -# PROVIDE: proxyper -# REQUIRE: LOGIN -# KEYWORD: shutdown - -proxyper_enable=${proxyper_enable:-"NO"} - -dir="%%BINDIR%%" -user="nobody" - -. %%RC_SUBR%% - -name="proxyper" -rcvar=`set_rcvar` - -pidfile=${dir}/rc5desproxy.pid -required_files=${dir}/${name}.ini - -proxyper_user=${user} - -command=${dir}/${name} -command_args=">/dev/null 2>&1 &" - -load_rc_config $name -run_rc_command "$1" --- proxyper-343_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907170712.n6H7CEjG040084>