From 9cd1db4fef933674a3b75d6ca4262e0ffe647637 Mon Sep 17 00:00:00 2001
From: adamw <adamw@FreeBSD.org>
Date: Wed, 16 Jul 2014 03:18:26 +0000
Subject: Add DOCS option where PORTDOCS is in plist.

---
 sysutils/gather/Makefile  | 2 ++
 sysutils/gather/pkg-plist | 8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'sysutils/gather')

diff --git a/sysutils/gather/Makefile b/sysutils/gather/Makefile
index 1dae62cf6c82..a3e54aaab83a 100644
--- a/sysutils/gather/Makefile
+++ b/sysutils/gather/Makefile
@@ -22,6 +22,8 @@ MAKE_ENV+=	CONFDIR=${PREFIX}/etc/gather DATADIR=${DATADIR}
 
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gather ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/gather.1 ${STAGEDIR}${PREFIX}/man/man1
diff --git a/sysutils/gather/pkg-plist b/sysutils/gather/pkg-plist
index be663e9e50ee..00fca1cfe353 100644
--- a/sysutils/gather/pkg-plist
+++ b/sysutils/gather/pkg-plist
@@ -6,10 +6,6 @@ man/man1/gather.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gather.map.linux
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@unexec if cmp -s %D/etc/gather/gather.cfg.sample %D/etc/gather/gather.cfg; then rm -f %D/etc/gather/gather.cfg; else echo "If permanently deleting this package, %D/etc/gather/gather.cfg must be removed manually."; fi
-etc/gather/gather.cfg.sample
-@exec if [ ! -f %D/etc/gather/gather.cfg ]; then cp -p %D/%F %B/gather.cfg; fi
-@unexec if cmp -s %D/etc/gather/gather.map.sample %D/etc/gather/gather.map; then rm -f %D/etc/gather/gather.map; else echo "If permanently deleting this package, %D/etc/gather/gather.map must be removed manually."; fi
-etc/gather/gather.map.sample
-@exec if [ ! -f %D/etc/gather/gather.map ]; then cp -p %D/%F %B/gather.map; fi
+@sample etc/gather/gather.cfg.sample
+@sample etc/gather/gather.map.sample
 @dirrmtry etc/gather
-- 
cgit