From owner-svn-ports-head@freebsd.org  Fri Oct 27 10:39:41 2017
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 84BBEE3FBA9;
 Fri, 27 Oct 2017 10:39:41 +0000 (UTC)
 (envelope-from olgeni@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 mx1.freebsd.org (Postfix) with ESMTPS id 397FB8422A;
 Fri, 27 Oct 2017 10:39:41 +0000 (UTC)
 (envelope-from olgeni@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9RAde4C098026;
 Fri, 27 Oct 2017 10:39:40 GMT (envelope-from olgeni@FreeBSD.org)
Received: (from olgeni@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9RAdeT1098023;
 Fri, 27 Oct 2017 10:39:40 GMT (envelope-from olgeni@FreeBSD.org)
Message-Id: <201710271039.v9RAdeT1098023@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: olgeni set sender to
 olgeni@FreeBSD.org using -f
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Fri, 27 Oct 2017 10:39:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r452970 - in head/sysutils/immortal: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: olgeni
X-SVN-Commit-Paths: in head/sysutils/immortal: . files
X-SVN-Commit-Revision: 452970
X-SVN-Commit-Repository: ports
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.23
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: Fri, 27 Oct 2017 10:39:41 -0000

Author: olgeni
Date: Fri Oct 27 10:39:40 2017
New Revision: 452970
URL: https://svnweb.freebsd.org/changeset/ports/452970

Log:
  sysutils/immortal:
  
  - Initialize immortaldir_enable in startup script to avoid warnings.
  
  - Move www.yml.sample to EXAMPLESDIR so it will not be in the way of actually
    used files.
  
  PR:		223245
  Submitted by:	olgeni
  Approved by:	maintainer

Modified:
  head/sysutils/immortal/Makefile
  head/sysutils/immortal/files/immortaldir.in
  head/sysutils/immortal/pkg-plist   (contents, props changed)

Modified: head/sysutils/immortal/Makefile
==============================================================================
--- head/sysutils/immortal/Makefile	Fri Oct 27 10:15:27 2017	(r452969)
+++ head/sysutils/immortal/Makefile	Fri Oct 27 10:39:40 2017	(r452970)
@@ -2,6 +2,7 @@
 
 PORTNAME=	immortal
 PORTVERSION=	0.16.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	nbari@tequila.io
@@ -40,6 +41,7 @@ do-install:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${FILESDIR}/www.yml ${STAGEDIR}${ETCDIR}/www.yml.sample
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/www.yml ${STAGEDIR}${EXAMPLESDIR}/www.yml.sample
 
 .include <bsd.port.mk>

Modified: head/sysutils/immortal/files/immortaldir.in
==============================================================================
--- head/sysutils/immortal/files/immortaldir.in	Fri Oct 27 10:15:27 2017	(r452969)
+++ head/sysutils/immortal/files/immortaldir.in	Fri Oct 27 10:39:40 2017	(r452970)
@@ -22,6 +22,7 @@ rcvar=immortaldir_enable
 
 load_rc_config $name
 
+: ${immortaldir_enable="NO"}
 : ${immortaldir_path=%%PREFIX%%/etc/immortal}
 
 command=%%PREFIX%%/bin/${name}

Modified: head/sysutils/immortal/pkg-plist
==============================================================================
--- head/sysutils/immortal/pkg-plist	Fri Oct 27 10:15:27 2017	(r452969)
+++ head/sysutils/immortal/pkg-plist	Fri Oct 27 10:39:40 2017	(r452970)
@@ -1,7 +1,8 @@
 bin/immortal
 bin/immortalctl
 bin/immortaldir
-%%ETCDIR%%/www.yml.sample
 man/man8/immortal.8.gz
 man/man8/immortalctl.8.gz
 man/man8/immortaldir.8.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/www.yml.sample
+@dir %%ETCDIR%%