From af8348bb5bbc9ec470edad9a80588a05c06b676e Mon Sep 17 00:00:00 2001
From: Tim Bishop <tdb@FreeBSD.org>
Date: Thu, 8 May 2014 12:18:25 +0000
Subject: [PATCH] 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
---
 multimedia/motion/Makefile  | 4 ----
 multimedia/motion/pkg-plist | 4 +---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 83a0a6a5f6b8..d4650f4258c1 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -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}
diff --git a/multimedia/motion/pkg-plist b/multimedia/motion/pkg-plist
index 8ce3d341f600..ac8f5c1e66e3 100644
--- a/multimedia/motion/pkg-plist
+++ b/multimedia/motion/pkg-plist
@@ -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