From eef66c4f9f1707366b06c210ae165aabc3d90fc3 Mon Sep 17 00:00:00 2001 From: eugen Date: Mon, 22 Jan 2018 17:05:49 +0000 Subject: sysutils/zfsnap: fix -s/-S mode. Move creation of files from "do-patch" to "post-extract" target, so that patches from files/ directory get applied. While here, add LICENSE. PR: 223951 Submitted by: Anton Sayetsky (based on) Approved by: yamagi@yamagi.org (maintainer timeout, 7 weeks) --- sysutils/zfsnap/Makefile | 5 ++++- sysutils/zfsnap/files/patch-zfSnap.sh | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 sysutils/zfsnap/files/patch-zfSnap.sh (limited to 'sysutils/zfsnap') diff --git a/sysutils/zfsnap/Makefile b/sysutils/zfsnap/Makefile index 47ae2c774567..5c8302ccacdc 100644 --- a/sysutils/zfsnap/Makefile +++ b/sysutils/zfsnap/Makefile @@ -4,18 +4,21 @@ PORTNAME= zfsnap PORTVERSION= 1.11.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= yamagi@yamagi.org COMMENT= Simple sh script to make zfs rolling snaphosts with cron +LICENSE= BSD3CLAUSE + NO_BUILD= yes USE_GITHUB= yes PERIODICDIR?= ${PREFIX}/etc/periodic PLIST_SUB+= PERIODICDIR="${PERIODICDIR:S,^${PREFIX}/,,}" -do-patch: +post-extract: .for period in hourly daily weekly monthly reboot @${SED} -e "s/xPERIODICx/${period}/g" -e "s#xPREFIXx#${PREFIX}/sbin#g" ${WRKSRC}/xPERIODICx_zfSnap.sh > ${WRKSRC}/${period}_zfSnap.sh .endfor diff --git a/sysutils/zfsnap/files/patch-zfSnap.sh b/sysutils/zfsnap/files/patch-zfSnap.sh new file mode 100644 index 000000000000..1cdd609dd8b3 --- /dev/null +++ b/sysutils/zfsnap/files/patch-zfSnap.sh @@ -0,0 +1,11 @@ +--- zfSnap.sh.orig 2013-01-18 03:37:09.000000000 +0700 ++++ zfSnap.sh 2018-01-22 23:20:20.257104000 +0700 +@@ -199,6 +199,8 @@ rm_zfs_snapshot() { + } + + skip_pool() { ++ local i ++ + # more like skip pool??? + if is_true $scrub_skip; then + for i in $scrub_pools; do -- cgit