From owner-svn-ports-all@FreeBSD.ORG Sat Nov 22 20:04:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 686BF144; Sat, 22 Nov 2014 20:04:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C294D3E; Sat, 22 Nov 2014 20:04:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMK4pcA069153; Sat, 22 Nov 2014 20:04:51 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMK4oDN069150; Sat, 22 Nov 2014 20:04:50 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201411222004.sAMK4oDN069150@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sat, 22 Nov 2014 20:04:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373099 - in head/irc/bopm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 20:04:51 -0000 Author: tijl Date: Sat Nov 22 20:04:49 2014 New Revision: 373099 URL: https://svnweb.freebsd.org/changeset/ports/373099 QAT: https://qat.redports.org/buildarchive/r373099/ Log: Create a subdirectory of /var/run that is writeable by the bopm user and put the pidfile there. Tested by: Michael D Modified: head/irc/bopm/Makefile head/irc/bopm/files/bopm.in head/irc/bopm/pkg-plist Modified: head/irc/bopm/Makefile ============================================================================== --- head/irc/bopm/Makefile Sat Nov 22 19:48:51 2014 (r373098) +++ head/irc/bopm/Makefile Sat Nov 22 20:04:49 2014 (r373099) @@ -3,7 +3,7 @@ PORTNAME= bopm PORTVERSION= 3.1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= irc MASTER_SITES= http://static.blitzed.org/www.blitzed.org/bopm/files/ \ ftp://rusunix.org/pub/FreeBSD/distfiles/ @@ -11,17 +11,13 @@ MASTER_SITES= http://static.blitzed.org/ MAINTAINER= ports@FreeBSD.org COMMENT= Open proxy and DNSBL monitor designed for use with ircds -LOGDIR= /var/log/${PORTNAME} - GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${LOGDIR} +CONFIGURE_ARGS= --localstatedir=/var/log/bopm INSTALL_TARGET= install-strip USES= libtool USE_LDCONFIG= yes USE_RC_SUBR= bopm -PLIST_SUB= LOGDIR=${LOGDIR} - USERS= bopm GROUPS= bopm @@ -29,8 +25,11 @@ MAKE_JOBS_UNSAFE= yes post-patch: @${REINPLACE_CMD} \ - -e 's,/some/path/bopm.pid,/var/run/bopm.pid,g' \ - -e 's,/some/path/scan.log,${LOGDIR}/scan.log,g' \ + -e 's,/some/path/bopm.pid,/var/run/bopm/bopm.pid,g' \ + -e 's,/some/path/scan.log,/var/log/bopm/scan.log,g' \ ${WRKSRC}/bopm.conf.sample +post-stage: + @${MKDIR} ${STAGEDIR}/var/run/bopm + .include Modified: head/irc/bopm/files/bopm.in ============================================================================== --- head/irc/bopm/files/bopm.in Sat Nov 22 19:48:51 2014 (r373098) +++ head/irc/bopm/files/bopm.in Sat Nov 22 20:04:49 2014 (r373099) @@ -24,7 +24,7 @@ load_rc_config $name : ${bopm_config="%%PREFIX%%/etc/bopm.conf"} bopm_user="bopm" -pidfile="/var/run/bopm.pid" +pidfile="/var/run/bopm/bopm.pid" required_files="${bopm_config}" # NOTE: bopm behaves differently with or without the -d flag. Modified: head/irc/bopm/pkg-plist ============================================================================== --- head/irc/bopm/pkg-plist Sat Nov 22 19:48:51 2014 (r373098) +++ head/irc/bopm/pkg-plist Sat Nov 22 20:04:49 2014 (r373099) @@ -9,4 +9,5 @@ lib/libopm.a lib/libopm.so lib/libopm.so.0 lib/libopm.so.0.0.0 -@dir(bopm,bopm,750) %%LOGDIR%% +@dir(bopm,bopm,750) /var/log/bopm +@dir(bopm,bopm,750) /var/run/bopm