svn commit: r353290 - head/multimedia/motion

[Tim Bishop]

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
- at 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
- at exec [ -f %B/motion.conf ] || cp %B/%f %B/motion.conf
+ at sample etc/motion.conf.sample