From owner-svn-ports-all@freebsd.org Mon Feb 24 14:20:53 2020 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 E17E525DC8B; Mon, 24 Feb 2020 14:20:53 +0000 (UTC) (envelope-from pizzamig@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48R43n21qBz3FQb; Mon, 24 Feb 2020 14:20:53 +0000 (UTC) (envelope-from pizzamig@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 E6BB9267AD; Mon, 24 Feb 2020 14:20:52 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01OEKqw0046269; Mon, 24 Feb 2020 14:20:52 GMT (envelope-from pizzamig@FreeBSD.org) Received: (from pizzamig@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01OEKqP5046267; Mon, 24 Feb 2020 14:20:52 GMT (envelope-from pizzamig@FreeBSD.org) Message-Id: <202002241420.01OEKqP5046267@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pizzamig set sender to pizzamig@FreeBSD.org using -f From: Luca Pizzamiglio Date: Mon, 24 Feb 2020 14:20:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526971 - in head/sysutils/pot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pizzamig X-SVN-Commit-Paths: in head/sysutils/pot: . files X-SVN-Commit-Revision: 526971 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.29 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: Mon, 24 Feb 2020 14:20:53 -0000 Author: pizzamig Date: Mon Feb 24 14:20:52 2020 New Revision: 526971 URL: https://svnweb.freebsd.org/changeset/ports/526971 Log: sysutils/pot: adopt PREFIX in the rc script Remove hard-coded /usr/local and use %%PREFIX%% Reported by: jbeich@ Modified: head/sysutils/pot/Makefile head/sysutils/pot/files/pot.in Modified: head/sysutils/pot/Makefile ============================================================================== --- head/sysutils/pot/Makefile Mon Feb 24 13:23:53 2020 (r526970) +++ head/sysutils/pot/Makefile Mon Feb 24 14:20:52 2020 (r526971) @@ -3,6 +3,7 @@ PORTNAME= pot PORTVERSION= 0.10.4 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org Modified: head/sysutils/pot/files/pot.in ============================================================================== --- head/sysutils/pot/files/pot.in Mon Feb 24 13:23:53 2020 (r526970) +++ head/sysutils/pot/files/pot.in Mon Feb 24 14:20:52 2020 (r526971) @@ -8,7 +8,7 @@ . /etc/rc.subr -PATH=$PATH:/usr/local/bin +PATH=$PATH:%%PREFIX%%/bin name="pot" desc="Pot containers" procname="pot" @@ -41,10 +41,10 @@ pot_deprecated_stop() pot_start() { local _pname _dyn_pot_list _start - _dyn_pot_list=$(/usr/local/bin/pot ls -q) + _dyn_pot_list=$(%%PREFIX%%/bin/pot ls -q) for _pname in $_dyn_pot_list ; do - if _start=$( /usr/local/bin/pot get-attr -p "$_pname" -A start-at-boot -q ) && [ "$_start" = "YES" ]; then - /usr/local/bin/pot start "$_pname" + if _start=$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A start-at-boot -q ) && [ "$_start" = "YES" ]; then + %%PREFIX%%/bin/pot start "$_pname" fi done } @@ -52,10 +52,10 @@ pot_start() pot_stop() { local _pname _dyn_pot_list _start - _dyn_pot_list=$(/usr/local/bin/pot ls -q) + _dyn_pot_list=$(%%PREFIX%%/bin/pot ls -q) for _pname in $_dyn_pot_list ; do - if _start=$( /usr/local/bin/pot get-attr -p "$_pname" -A start-at-boot -q ) && [ "$_start" = "YES" ]; then - /usr/local/bin/pot stop "$_pname" + if _start=$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A start-at-boot -q ) && [ "$_start" = "YES" ]; then + %%PREFIX%%/bin/pot stop "$_pname" fi done } @@ -73,8 +73,8 @@ pot_status() { local _pname _dyn_pot_list _start for _pname in $_dyn_pot_list ; do - if _start=$( /usr/local/bin/pot get-attr -p "$_pname" -A start-at-boot -q ) && [ "$_start" = "YES" ]; then - if /usr/local/bin/pot info -qrp "$_pname" ; then + if _start=$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A start-at-boot -q ) && [ "$_start" = "YES" ]; then + if %%PREFIX%%/bin/pot info -qrp "$_pname" ; then echo "pot $_pname is up and running" else echo "pot $_pname is not running"