From owner-svn-ports-all@freebsd.org  Mon Dec 26 18:48:31 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 3DE11C92293;
 Mon, 26 Dec 2016 18:48:31 +0000 (UTC)
 (envelope-from feld@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 E79CF11CC;
 Mon, 26 Dec 2016 18:48:30 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBQImU18050812;
 Mon, 26 Dec 2016 18:48:30 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQImTNA050809;
 Mon, 26 Dec 2016 18:48:29 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201612261848.uBQImTNA050809@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 26 Dec 2016 18:48:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r429565 - in head/net-p2p/couchpotato: . 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Dec 2016 18:48:31 -0000

Author: feld
Date: Mon Dec 26 18:48:29 2016
New Revision: 429565
URL: https://svnweb.freebsd.org/changeset/ports/429565

Log:
  net-p2p/couchpotato: Provision ETCDIR in rc script, not in package.
  
  CouchPotato creates the config file on first run. If you choose to run
  with a custom user you will want the rc script to provision the ETCDIR
  with the correct ownership.

Modified:
  head/net-p2p/couchpotato/Makefile
  head/net-p2p/couchpotato/files/couchpotato.in
  head/net-p2p/couchpotato/pkg-plist

Modified: head/net-p2p/couchpotato/Makefile
==============================================================================
--- head/net-p2p/couchpotato/Makefile	Mon Dec 26 18:45:01 2016	(r429564)
+++ head/net-p2p/couchpotato/Makefile	Mon Dec 26 18:48:29 2016	(r429565)
@@ -3,6 +3,7 @@
 
 PORTNAME=	couchpotato
 PORTVERSION=	0.0.20161225
+PORTREVISION=	1
 CATEGORIES=	net-p2p python
 
 MAINTAINER=	feld@FreeBSD.org
@@ -29,7 +30,7 @@ GH_PROJECT=	CouchPotatoServer
 GH_TAGNAME=	b538f9a
 
 do-install:
-	${MKDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${ETCDIR}
+	${MKDIR} ${STAGEDIR}/${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>

Modified: head/net-p2p/couchpotato/files/couchpotato.in
==============================================================================
--- head/net-p2p/couchpotato/files/couchpotato.in	Mon Dec 26 18:45:01 2016	(r429564)
+++ head/net-p2p/couchpotato/files/couchpotato.in	Mon Dec 26 18:48:29 2016	(r429565)
@@ -42,6 +42,9 @@ couch_pre()
 	if [ ! -d ${pidfile%/*} ]; then
 		install -d -o ${couchpotato_user} ${pidfile%/*}
 	fi
+	if [ ! -d ${couchpotato_conf%/*} ]; then
+		install -d -o ${couchpotato_user} ${couchpotato_conf%/*}
+	fi
 }
 
 run_rc_command "$1"

Modified: head/net-p2p/couchpotato/pkg-plist
==============================================================================
--- head/net-p2p/couchpotato/pkg-plist	Mon Dec 26 18:45:01 2016	(r429564)
+++ head/net-p2p/couchpotato/pkg-plist	Mon Dec 26 18:48:29 2016	(r429565)
@@ -1005,4 +1005,3 @@
 %%DATADIR%%/package.json
 %%DATADIR%%/requirements-dev.txt
 %%DATADIR%%/version.py
-@dir(nobody,wheel,755) %%ETCDIR%%