svn commit: r482801 - head/sysutils/zfsnap2

[Martin Matuska]

Author: mm
Date: Tue Oct 23 00:18:53 2018
New Revision: 482801
URL: https://svnweb.freebsd.org/changeset/ports/482801

Log:
  sysutils/zfsnap2: install periodic and completions to DATADIR
  
  PR:		221689
  Reported by:	Anton Saietskii <vsasjason at gmail.com>

Modified:
  head/sysutils/zfsnap2/Makefile
  head/sysutils/zfsnap2/pkg-plist

Modified: head/sysutils/zfsnap2/Makefile
==============================================================================
--- head/sysutils/zfsnap2/Makefile	Mon Oct 22 23:54:46 2018	(r482800)
+++ head/sysutils/zfsnap2/Makefile	Tue Oct 23 00:18:53 2018	(r482801)
@@ -4,6 +4,7 @@
 PORTNAME=	zfsnap
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0-beta3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	2
 
@@ -16,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 NO_BUILD=	yes
 USE_GITHUB=	yes
 
-OPTIONS_DEFINE=		BASH ZSH DOCS EXAMPLES
+OPTIONS_DEFINE=		BASH ZSH DOCS
 OPTIONS_DEFAULT=	BASH ZSH
 OPTIONS_SUB=	yes
 
@@ -27,11 +28,10 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sbin/zfsnap.sh ${STAGEDIR}${PREFIX}/sbin/zfsnap
-	cd ${WRKSRC}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share
+	cd ${WRKSRC}/share && ${COPYTREE_SHARE} zfsnap ${STAGEDIR}${PREFIX}/share/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} completion ${STAGEDIR}${PREFIX}/share/zfsnap
+	cd ${WRKSRC} && ${COPYTREE_SHARE} periodic ${STAGEDIR}${PREFIX}/share/zfsnap
 	${INSTALL_MAN} ${WRKSRC}/man/man8/zfsnap.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/zfsnap.8
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} completion ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} periodic ${STAGEDIR}${EXAMPLESDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}/${file}
@@ -39,12 +39,12 @@ do-install:
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
-	${INSTALL_DATA} ${WRKSRC}/completion/zfsnap-completion.bash \
+	${LN} -s ../../share/zfsnap/completion/zfsnap-completion.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/zfsnap.sh
 
 post-install-ZSH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKSRC}/completion/zfsnap-completion.bash \
+	${LN} -s ../../share/zfsnap/completion/zfsnap-completion.zsh \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_zfsnap
 
 .include <bsd.port.mk>

Modified: head/sysutils/zfsnap2/pkg-plist
==============================================================================
--- head/sysutils/zfsnap2/pkg-plist	Mon Oct 22 23:54:46 2018	(r482800)
+++ head/sysutils/zfsnap2/pkg-plist	Tue Oct 23 00:18:53 2018	(r482801)
@@ -3,11 +3,11 @@ sbin/zfsnap
 share/zfsnap/commands/destroy.sh
 share/zfsnap/commands/recurseback.sh
 share/zfsnap/commands/snapshot.sh
+share/zfsnap/completion/zfsnap-completion.bash
+share/zfsnap/completion/zfsnap-completion.tcsh
+share/zfsnap/completion/zfsnap-completion.zsh
 share/zfsnap/core.sh
+share/zfsnap/periodic/xPERIODICx_zfsnap_delete.sh
+share/zfsnap/periodic/xPERIODICx_zfsnap.sh
 %%BASH%%etc/bash_completion.d/zfsnap.sh
 %%ZSH%%share/zsh/site-functions/_zfsnap
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/periodic/xPERIODICx_zfsnap_delete.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/periodic/xPERIODICx_zfsnap.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/completion/zfsnap-completion.bash
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/completion/zfsnap-completion.tcsh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/completion/zfsnap-completion.zsh