Date: Thu, 9 Aug 2007 08:27:45 +0200 (CEST) From: Lars Erik Gullerud <lerik@nolink.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Robert Gogolok <gogo@cs.uni-sb.de> Subject: ports/115342: [PATCH] sysutils/py-bcfg2: FreeBSD fixes and startup script Message-ID: <20070809062745.D449133C1B@saturn.noc.ventelo.net> Resent-Message-ID: <200708090700.l7970BhK065522@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115342
>Category: ports
>Synopsis: [PATCH] sysutils/py-bcfg2: FreeBSD fixes and startup script
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 09 07:00:10 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Lars Erik Gullerud
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD saturn.noc.catch.no 6.2-STABLE FreeBSD 6.2-STABLE #0: Wed Apr 11 13:25:22 CEST 2007 root@saturn.noc.catch.no:/usr/obj/usr/src/sys/OPS-SMP i386
>Description:
This patch enhances the sysutils/py-bcfg2 port with the following:
* Make the port use ${PREFIX}/etc/bcfg2.conf rather than hardcoded
/etc/bcfg2.conf everywhere
* Added rc.subr-style startup script for the server
* Bump PORTREVISION
This patch was reviewed by the maintainer (cc'ed) before submission.
>How-To-Repeat:
>Fix:
Patch included below:
--- py-bcfg2.patch begins here ---
diff -ruN py-bcfg2/Makefile py-bcfg2.old/Makefile
--- py-bcfg2/Makefile Tue Aug 7 09:29:39 2007
+++ py-bcfg2.old/Makefile Mon Aug 6 11:49:50 2007
@@ -7,7 +7,6 @@
PORTNAME= bcfg2
PORTVERSION= 0.9.4
-PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/bcfg/ \
http://mirror.opensysadmin.com/bcfg/
@@ -23,10 +22,6 @@
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-USE_RC_SUBR= bcfg2
-SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
-
-
MAN1= bcfg2.1
MAN5= bcfg2.conf.5
MAN8= bcfg2-admin.8 bcfg2-build-reports.8 bcfg2-repo-validate.8 bcfg2-server.8 bcfg2-info.8
@@ -35,10 +30,6 @@
post-patch:
@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py
-.for f in bcfg2 bcfg2-admin bcfg2-build-reports bcfg2-info bcfg2-repo-validate bcfg2-server bcfg2-ping-sweep bcfg2-query
- @${REINPLACE_CMD} -e 's|/etc/bcfg2.conf|${PREFIX}/etc/bcfg2.conf|g' ${WRKSRC}/src/sbin/$f
-.endfor
- @${RM} ${WRKSRC}/src/sbin/*.bak
.if !defined(NOPORTDOCS)
post-install:
diff -ruN py-bcfg2/files/bcfg2.in py-bcfg2.old/files/bcfg2.in
--- py-bcfg2/files/bcfg2.in Tue Aug 7 09:51:30 2007
+++ py-bcfg2.old/files/bcfg2.in Thu Jan 1 01:00:00 1970
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: bcfg2
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable bcfg2-server:
-# bcfg2_enable (bool): Set it to "YES" to enable bcfg2.
-# Default is "NO".
-# bcfg2_flags (str): Flags passed to bcfg2 on startup.
-# Default is "".
-
-. %%RC_SUBR%%
-
-name="bcfg2"
-rcvar=${name}_enable
-
-load_rc_config $name
-
-: ${bcfg2_enable="NO"}
-: ${bcfg2_pidfile="/var/run/$name.pid"}
-: ${bcfg2_flags="-D ${bcfg2_pidfile}"}
-
-pidfile=${bcfg2_pidfile}
-command=%%PREFIX%%/bin/${name}-server
-command_interpreter=%%PYTHON_CMD%%
-
-run_rc_command "$1"
--- py-bcfg2.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?20070809062745.D449133C1B>