From owner-svn-ports-head@FreeBSD.ORG  Thu May  8 12:18:26 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 59C4341D;
 Thu,  8 May 2014 12:18:26 +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 4727C8B5;
 Thu,  8 May 2014 12:18:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s48CIQ5O086241;
 Thu, 8 May 2014 12:18:26 GMT (envelope-from tdb@svn.freebsd.org)
Received: (from tdb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s48CIPhk086239;
 Thu, 8 May 2014 12:18:25 GMT (envelope-from tdb@svn.freebsd.org)
Message-Id: <201405081218.s48CIPhk086239@svn.freebsd.org>
From: Tim Bishop <tdb@FreeBSD.org>
Date: Thu, 8 May 2014 12:18:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r353290 - head/multimedia/motion
X-SVN-Group: ports-head
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.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 May 2014 12:18:26 -0000

Author: tdb
Date: Thu May  8 12:18:25 2014
New Revision: 353290
URL: http://svnweb.freebsd.org/changeset/ports/353290
QAT: https://qat.redports.org/buildarchive/r353290/

Log:
  Fix check-stagedir plist warning.
  
  https://jenkins.freebsd.org/pci/head-amd64/logs/bulk/headamd64-default/708/logs/errors/motion-3.2.12_4.log
  Error: Orphaned: %%ETCDIR%%.conf
  
  This was caused by motion.conf being installed by the Makefile when it
  should have been handled only in pkg-plist.
  
  Also switched pkg-plist to use the new @sample keyword.
  
  Submitted by:	swills

Modified:
  head/multimedia/motion/Makefile
  head/multimedia/motion/pkg-plist

Modified: head/multimedia/motion/Makefile
==============================================================================
--- head/multimedia/motion/Makefile	Thu May  8 12:01:18 2014	(r353289)
+++ head/multimedia/motion/Makefile	Thu May  8 12:18:25 2014	(r353290)
@@ -100,10 +100,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/motion.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/motion-dist.conf \
 		${STAGEDIR}${PREFIX}/etc/motion.conf.sample
-.if !exists(${STAGEDIR}${PREFIX}/etc/motion.conf)
-	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/motion.conf.sample \
-		${STAGEDIR}${PREFIX}/etc/motion.conf
-.endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}

Modified: head/multimedia/motion/pkg-plist
==============================================================================
--- head/multimedia/motion/pkg-plist	Thu May  8 12:01:18 2014	(r353289)
+++ head/multimedia/motion/pkg-plist	Thu May  8 12:18:25 2014	(r353290)
@@ -1,5 +1,3 @@
 bin/motion
 man/man1/motion.1.gz
-@unexec if cmp -s %D/etc/motion.conf %D/etc/motion.conf.sample; then rm -f %D/etc/motion.conf; fi
-etc/motion.conf.sample
-@exec [ -f %B/motion.conf ] || cp %B/%f %B/motion.conf
+@sample etc/motion.conf.sample