From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 9 07:00:13 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 858A516A468 for ; Thu, 9 Aug 2007 07:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 61B1C13C442 for ; Thu, 9 Aug 2007 07:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l7970BAa065523 for ; Thu, 9 Aug 2007 07:00:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l7970BhK065522; Thu, 9 Aug 2007 07:00:11 GMT (envelope-from gnats) Resent-Date: Thu, 9 Aug 2007 07:00:11 GMT Resent-Message-Id: <200708090700.l7970BhK065522@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Lars Erik Gullerud Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B91D16A498 for ; Thu, 9 Aug 2007 06:52:49 +0000 (UTC) (envelope-from lerik@saturn.noc.ventelo.net) Received: from nova.noc.catch.no (nova.noc.catch.no [193.69.2.2]) by mx1.freebsd.org (Postfix) with ESMTP id 42D0313C4D0 for ; Thu, 9 Aug 2007 06:52:47 +0000 (UTC) (envelope-from lerik@saturn.noc.ventelo.net) Received: from saturn.noc.ventelo.net (saturn.noc.ventelo.net [193.69.2.150]) by nova.noc.catch.no (Postfix) with ESMTP id 39ACD54AE; Thu, 9 Aug 2007 08:27:08 +0200 (CEST) Received: by saturn.noc.ventelo.net (Postfix, from userid 1000) id D449133C1B; Thu, 9 Aug 2007 08:27:45 +0200 (CEST) Message-Id: <20070809062745.D449133C1B@saturn.noc.ventelo.net> Date: Thu, 9 Aug 2007 08:27:45 +0200 (CEST) From: Lars Erik Gullerud To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Robert Gogolok Subject: ports/115342: [PATCH] sysutils/py-bcfg2: FreeBSD fixes and startup script X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Lars Erik Gullerud List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2007 07:00:13 -0000 >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: