From owner-svn-ports-all@freebsd.org Sat Jan 16 17:18:00 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7DAE84E4C4E; Sat, 16 Jan 2021 17:18:00 +0000 (UTC) (envelope-from nc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DJ4WD2RXZz4YQB; Sat, 16 Jan 2021 17:18:00 +0000 (UTC) (envelope-from nc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C13E12BA1; Sat, 16 Jan 2021 17:18:00 +0000 (UTC) (envelope-from nc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10GHI0r0005146; Sat, 16 Jan 2021 17:18:00 GMT (envelope-from nc@FreeBSD.org) Received: (from nc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10GHHxMJ005141; Sat, 16 Jan 2021 17:17:59 GMT (envelope-from nc@FreeBSD.org) Message-Id: <202101161717.10GHHxMJ005141@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nc set sender to nc@FreeBSD.org using -f From: Neel Chauhan Date: Sat, 16 Jan 2021 17:17:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561740 - in head/games/automuteus: . files X-SVN-Group: ports-head X-SVN-Commit-Author: nc X-SVN-Commit-Paths: in head/games/automuteus: . files X-SVN-Commit-Revision: 561740 X-SVN-Commit-Repository: ports 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.34 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, 16 Jan 2021 17:18:00 -0000 Author: nc Date: Sat Jan 16 17:17:59 2021 New Revision: 561740 URL: https://svnweb.freebsd.org/changeset/ports/561740 Log: games/automuteus: Fix rc script Reviewed by: 0mp (mentor) Approved by: 0mp (mentor) Differential Revision: https://reviews.freebsd.org/D28107 Modified: head/games/automuteus/Makefile head/games/automuteus/files/automuteus.in Modified: head/games/automuteus/Makefile ============================================================================== --- head/games/automuteus/Makefile Sat Jan 16 17:17:20 2021 (r561739) +++ head/games/automuteus/Makefile Sat Jan 16 17:17:59 2021 (r561740) @@ -2,6 +2,7 @@ PORTNAME= automuteus DISTVERSION= 6.10.1 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= nc@FreeBSD.org @@ -11,12 +12,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules -USE_RC_SUBR= ${PORTNAME} -SUB_FILES= pkg-message - -GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} -GO_TARGET= .:${PORTNAME} - USE_GITHUB= yes GH_ACCOUNT= denverquane @@ -64,10 +59,21 @@ GH_TUPLE= \ stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \ stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify -PLIST_FILES= bin/${PORTNAME} etc/${PORTNAME}/config.txt +USE_RC_SUBR= ${PORTNAME} +GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_TARGET= .:${PORTNAME} + +SUB_FILES= pkg-message +PLIST_FILES= bin/${PORTNAME} \ + "@sample etc/${PORTNAME}/config.txt.sample" \ + "@dir /var/log/automuteus" \ + /var/log/${PORTNAME}/logs.txt + post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/automuteus - @${CP} ${FILESDIR}/config.txt ${STAGEDIR}${PREFIX}/etc/automuteus + @${MKDIR} ${STAGEDIR}${ETCDIR} + @${CP} ${FILESDIR}/config.txt ${STAGEDIR}${ETCDIR}/config.txt.sample + @${MKDIR} ${STAGEDIR}/var/log/${PORTNAME} + @${TOUCH} ${STAGEDIR}/var/log/${PORTNAME}/logs.txt .include Modified: head/games/automuteus/files/automuteus.in ============================================================================== --- head/games/automuteus/files/automuteus.in Sat Jan 16 17:17:20 2021 (r561739) +++ head/games/automuteus/files/automuteus.in Sat Jan 16 17:17:59 2021 (r561740) @@ -19,11 +19,12 @@ load_rc_config $name : ${automuteus_enable:="NO"} : ${automuteus_conf:="%%PREFIX%%/etc/automuteus/config.txt"} -: ${automuteus_log:="/var/log/automuteus.log"} +: ${automuteus_log:="/var/log/automuteus"} command="%%PREFIX%%/bin/automuteus" pidfile=/var/run/${name}.pid start_cmd="automuteus_start" +stop_cmd="automuteus_stop" automuteus_start() { @@ -31,9 +32,14 @@ automuteus_start() /usr/sbin/daemon \ -p ${pidfile} \ /usr/bin/env \ - "CONFIG_FILE=${automuteus_conf}" \ + "CONFIG_PATH=${automuteus_conf}" \ "LOG_PATH=${automuteus_log}" \ ${command} +} + +automuteus_stop() +{ + kill `cat ${pidfile}` } run_rc_command "$1"