From owner-svn-ports-head@FreeBSD.ORG Tue Jan 8 14:46:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B8889D34; Tue, 8 Jan 2013 14:46:15 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 92FFE6AA; Tue, 8 Jan 2013 14:46:15 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r08EkFRM095654; Tue, 8 Jan 2013 14:46:15 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r08EkFHJ095649; Tue, 8 Jan 2013 14:46:15 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201301081446.r08EkFHJ095649@svn.freebsd.org> From: Ulrich Spoerlein Date: Tue, 8 Jan 2013 14:46:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310092 - in head/mail/spamd: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2013 14:46:15 -0000 Author: uqs Date: Tue Jan 8 14:46:14 2013 New Revision: 310092 URL: http://svnweb.freebsd.org/changeset/ports/310092 Log: Fix obspamlogd rc script's use of tests, while here fix whitespace. Approved by: beat (mentor) Modified: head/mail/spamd/Makefile head/mail/spamd/files/obspamlogd.in Modified: head/mail/spamd/Makefile ============================================================================== --- head/mail/spamd/Makefile Tue Jan 8 13:55:52 2013 (r310091) +++ head/mail/spamd/Makefile Tue Jan 8 14:46:14 2013 (r310092) @@ -3,6 +3,7 @@ PORTNAME= spamd PORTVERSION= 4.9.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF MASTER_SITE_SUBDIR=freebsdspamd.berlios Modified: head/mail/spamd/files/obspamlogd.in ============================================================================== --- head/mail/spamd/files/obspamlogd.in Tue Jan 8 13:55:52 2013 (r310091) +++ head/mail/spamd/files/obspamlogd.in Tue Jan 8 14:46:14 2013 (r310092) @@ -33,20 +33,20 @@ pidfile="/var/run/spamlogd.pid" obspamlogd_precmd() { - if [ ! -z ${obspamlogd_pflog_if} ]; then - # Configure i/f explicitly - load_kld pflog || { - warn "Unable to kldload pflog module" - return 1 - } + if [ ! -z "${obspamlogd_pflog_if}" ]; then + # Configure i/f explicitly + load_kld pflog || { + warn "Unable to kldload pflog module" + return 1 + } - if ! ifconfig ${obspamlogd_pflog_if} create up; then - warn "could not bring up ${obspamlogd_pflog_if}" - return 1 - fi + if ! ifconfig ${obspamlogd_pflog_if} create up; then + warn "could not bring up ${obspamlogd_pflog_if}" + return 1 + fi - rc_flags="${rc_flags} -l ${obspamlogd_pflog_if}" - fi + rc_flags="${rc_flags} -l ${obspamlogd_pflog_if}" + fi _rc=0 /sbin/mount -p | grep 'fdescfs.*/dev/fd.*fdescfs.*rw' 2>&1 > /dev/null _rc=${?} @@ -63,7 +63,7 @@ obspamlogd_precmd() obspamlogd_cleanup() { - if [ -n ${obspamlogd_pflog_if} ]; then + if [ -n "${obspamlogd_pflog_if}" ]; then ifconfig ${obspamlogd_pflog_if} destroy fi /bin/rm -f ${pidfile}