From owner-svn-ports-all@FreeBSD.ORG Wed May 13 15:07:35 2015 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 5D0A7FEB; Wed, 13 May 2015 15:07:35 +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 31FFA17A8; Wed, 13 May 2015 15:07:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DF7ZHd031413; Wed, 13 May 2015 15:07:35 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DF7YKg031411; Wed, 13 May 2015 15:07:34 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201505131507.t4DF7YKg031411@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 13 May 2015 15:07:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386223 - in head/sysutils/acts: . 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.20 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: Wed, 13 May 2015 15:07:35 -0000 Author: feld Date: Wed May 13 15:07:34 2015 New Revision: 386223 URL: https://svnweb.freebsd.org/changeset/ports/386223 Log: Simplify setup for new users Backport support for /usr/local/etc/acts.conf as default config location Remove ionice reference from sample config file Added: head/sysutils/acts/files/ head/sysutils/acts/files/patch-acts (contents, props changed) Modified: head/sysutils/acts/Makefile Modified: head/sysutils/acts/Makefile ============================================================================== --- head/sysutils/acts/Makefile Wed May 13 14:57:32 2015 (r386222) +++ head/sysutils/acts/Makefile Wed May 13 15:07:34 2015 (r386223) @@ -3,6 +3,7 @@ PORTNAME= acts PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= sysutils archivers MAINTAINER= feld@FreeBSD.org @@ -15,6 +16,9 @@ GH_ACCOUNT= alexjurkiewicz NO_BUILD= yes +post-patch: + ${REINPLACE_CMD} 's|ionice -c3 ||' ${WRKSRC}/acts.conf + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/acts ${STAGEDIR}/${PREFIX}/bin/acts ${INSTALL_DATA} ${WRKSRC}/acts.conf ${STAGEDIR}/${PREFIX}/etc/acts.conf.sample Added: head/sysutils/acts/files/patch-acts ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/acts/files/patch-acts Wed May 13 15:07:34 2015 (r386223) @@ -0,0 +1,15 @@ +--- acts.orig 2014-12-24 00:50:43 UTC ++++ acts +@@ -31,8 +31,11 @@ if [ -f acts.conf ] ; then + elif [ -f /etc/acts.conf ] ; then + . /etc/acts.conf + log_debug "Loaded /etc/acts.conf" ++elif [ -f /usr/local/etc/acts.conf ] ; then ++ . /usr/local/etc/acts.conf ++ log_debug "Loaded /usr/local/etc/acts.conf" + else +- log_message "No $(pwd)/acts.conf or /etc/acts.conf! Exiting." ++ log_message "No $(pwd)/acts.conf, /etc/acts.conf or /usr/local/etc/acts.conf! Exiting." + exit 1 + fi + # Use default values if anything is not set