From owner-svn-ports-head@freebsd.org  Wed Sep  9 14:02:08 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4EA37A016D1;
 Wed,  9 Sep 2015 14:02:08 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 13F051822;
 Wed,  9 Sep 2015 14:02:08 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t89E27Eo019909;
 Wed, 9 Sep 2015 14:02:07 GMT (envelope-from des@FreeBSD.org)
Received: (from des@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t89E27ER019907;
 Wed, 9 Sep 2015 14:02:07 GMT (envelope-from des@FreeBSD.org)
Message-Id: <201509091402.t89E27ER019907@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org
 using -f
From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org>
Date: Wed, 9 Sep 2015 14:02:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396500 - in head/mail/spampd: . 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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Sep 2015 14:02:08 -0000

Author: des
Date: Wed Sep  9 14:02:06 2015
New Revision: 396500
URL: https://svnweb.freebsd.org/changeset/ports/396500

Log:
  Fix rc script so status and restart work.

Modified:
  head/mail/spampd/Makefile
  head/mail/spampd/files/spampd.in

Modified: head/mail/spampd/Makefile
==============================================================================
--- head/mail/spampd/Makefile	Wed Sep  9 14:02:01 2015	(r396499)
+++ head/mail/spampd/Makefile	Wed Sep  9 14:02:06 2015	(r396500)
@@ -3,6 +3,7 @@
 
 PORTNAME=	spampd
 PORTVERSION=	2.42
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 
 MAINTAINER=	des@FreeBSD.org
@@ -17,6 +18,7 @@ NO_BUILD=	yes
 PLIST_FILES=	sbin/spampd
 USES=		perl5 shebangfix
 SHEBANG_FILES=	spampd.pl
+SUB_LIST=	PERL=${PERL}
 USE_RC_SUBR=	spampd
 
 USE_GITHUB=	yes

Modified: head/mail/spampd/files/spampd.in
==============================================================================
--- head/mail/spampd/files/spampd.in	Wed Sep  9 14:02:01 2015	(r396499)
+++ head/mail/spampd/files/spampd.in	Wed Sep  9 14:02:06 2015	(r396500)
@@ -24,27 +24,7 @@ load_rc_config $name
 
 command="%%PREFIX%%/sbin/$name"
 command_args="--pid=${spampd_pidfile}"
+command_interpreter=%%PERL%%
 pidfile="${spampd_pidfile}"
-sig_stop="KILL"
-stop_cmd="stop_cmd"
-status_cmd="status_cmd"
-
-stop_cmd()
-{
-	if [ -f "$pidfile" ]; then
-		kill `cat $pidfile`
-		rm -f $pidfile
-		echo -n " spampd"
-	fi
-}
-
-status_cmd()
-{
-	if [ -f "$pidfile" ]; then
-		echo "${name} is running as pid `cat $pidfile`."
-	else
-		echo "${name} is not running."
-	fi
-}
 
 run_rc_command $1