mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

Fix check-stagedir plist warning.

Browse Source 
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
This commit is contained in:
Tim Bishop 2014-05-08 12:18:25 +00:00
parent 6a39e84809
commit af8348bb5b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=353290
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
multimedia/motion/Makefile
View File

@ -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}

4
multimedia/motion/pkg-plist
View File

@ -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