From owner-svn-ports-all@FreeBSD.ORG Wed Jun 19 20:34:58 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id ABCAA3D4; Wed, 19 Jun 2013 20:34:58 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 849841D77; Wed, 19 Jun 2013 20:34:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JKYw6v065107; Wed, 19 Jun 2013 20:34:58 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5JKYwYN065105; Wed, 19 Jun 2013 20:34:58 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201306192034.r5JKYwYN065105@svn.freebsd.org> From: William Grzybowski Date: Wed, 19 Jun 2013 20:34:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321321 - in head/net/minidlna: . 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.14 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, 19 Jun 2013 20:34:58 -0000 Author: wg Date: Wed Jun 19 20:34:57 2013 New Revision: 321321 URL: http://svnweb.freebsd.org/changeset/ports/321321 Log: net/minidlna: fix run dir for packages - Use rc.d script to install /var/{db,run}/minidlna as precmd - Fix order (rclint) PR: ports/179487 Submitted by: crees Approved by: culot / jpaetzel (mentors, implicit) Modified: head/net/minidlna/Makefile head/net/minidlna/files/minidlna.in Modified: head/net/minidlna/Makefile ============================================================================== --- head/net/minidlna/Makefile Wed Jun 19 20:12:38 2013 (r321320) +++ head/net/minidlna/Makefile Wed Jun 19 20:34:57 2013 (r321321) @@ -49,9 +49,6 @@ post-install: ${INSTALL_MAN} ${MAN5:S,^,${WRKSRC}/,} ${MANPREFIX}/man/man5/ ${INSTALL_MAN} ${MAN8:S,^,${WRKSRC}/,} ${MANPREFIX}/man/man8/ ${INSTALL_DATA} ${WRKSRC}/minidlna.conf ${PREFIX}/etc/minidlna.conf.sample - @${MKDIR} /var/run/minidlna - @${MKDIR} /var/db/minidlna - @${CHOWN} ${USERS} /var/db/minidlna @${FMT} ${PKGMESSAGE} .include Modified: head/net/minidlna/files/minidlna.in ============================================================================== --- head/net/minidlna/files/minidlna.in Wed Jun 19 20:12:38 2013 (r321320) +++ head/net/minidlna/files/minidlna.in Wed Jun 19 20:34:57 2013 (r321321) @@ -1,4 +1,5 @@ #!/bin/sh +# # $FreeBSD$ # # PROVIDE: minidlna @@ -13,21 +14,21 @@ name=minidlna rcvar=minidlna_enable -command=%%PREFIX%%/sbin/minidlnad load_rc_config $name minidlna_enable=${minidlna_enable-"NO"} minidlna_uid=${minidlna_uid-"%%USER%%"} +command=%%PREFIX%%/sbin/minidlnad pidfile="/var/run/minidlna/minidlna.pid" +command_args="-P $pidfile -u $minidlna_uid -f %%PREFIX%%/etc/minidlna.conf" +required_dirs="/var/run/minidlna /var/db/minidlna" -start_precmd="rm -f $pidfile" -stop_postcmd=$start_precmd +start_precmd="install -d -o $minidlna_uid ${pidfile%/*} /var/db/minidlna" +stop_postcmd="rm -f $pidfile" -command_args="-P $pidfile -u $minidlna_uid -f %%PREFIX%%/etc/minidlna.conf" extra_commands=rescan rescan_cmd="$command -R -u $minidlna_uid -f %%PREFIX%%/etc/minidlna.conf" -required_dirs="/var/run/minidlna /var/db/minidlna" run_rc_command $1