Index: branches/2015Q4/sysutils/acts/Makefile =================================================================== --- branches/2015Q4/sysutils/acts/Makefile (revision 400551) +++ branches/2015Q4/sysutils/acts/Makefile (revision 400552) @@ -1,26 +1,23 @@ # Created by: Mark Felder # $FreeBSD$ PORTNAME= acts -PORTVERSION= 1.0 -PORTREVISION= 2 +PORTVERSION= 1.2 +PORTREVISION= 0 CATEGORIES= sysutils archivers MAINTAINER= feld@FreeBSD.org COMMENT= Another Calendar-based Tarsnap Script RUN_DEPENDS= tarsnap>=0:${PORTSDIR}/sysutils/tarsnap USE_GITHUB= yes GH_ACCOUNT= alexjurkiewicz NO_BUILD= yes -post-patch: - ${REINPLACE_CMD} 's|ionice -c3 tarsnap|${LOCALBASE}/bin/tarsnap|' ${WRKSRC}/acts.conf - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/acts ${STAGEDIR}/${PREFIX}/bin/acts - ${INSTALL_DATA} ${WRKSRC}/acts.conf ${STAGEDIR}/${PREFIX}/etc/acts.conf.sample + ${INSTALL_DATA} ${WRKSRC}/acts.conf.sample ${STAGEDIR}/${PREFIX}/etc/acts.conf.sample .include Index: branches/2015Q4/sysutils/acts/distinfo =================================================================== --- branches/2015Q4/sysutils/acts/distinfo (revision 400551) +++ branches/2015Q4/sysutils/acts/distinfo (revision 400552) @@ -1,2 +1,2 @@ -SHA256 (alexjurkiewicz-acts-1.0_GH0.tar.gz) = 60541d245d9e1c11c2bd34784f45f7e89010d453c4132e6af62f83f1c115f59d -SIZE (alexjurkiewicz-acts-1.0_GH0.tar.gz) = 3330 +SHA256 (alexjurkiewicz-acts-1.2_GH0.tar.gz) = fca976c24b6c3e66cc9a7f84c548d0689980acd5b740e78d002ef5de64d46b20 +SIZE (alexjurkiewicz-acts-1.2_GH0.tar.gz) = 4032 Index: branches/2015Q4/sysutils/acts/files/patch-acts =================================================================== --- branches/2015Q4/sysutils/acts/files/patch-acts (revision 400551) +++ branches/2015Q4/sysutils/acts/files/patch-acts (nonexistent) @@ -1,15 +0,0 @@ ---- acts.orig 2014-12-24 00:50:43 UTC -+++ acts -@@ -31,8 +31,11 @@ if [ -f acts.conf ] ; then - elif [ -f /etc/acts.conf ] ; then - . /etc/acts.conf - log_debug "Loaded /etc/acts.conf" -+elif [ -f /usr/local/etc/acts.conf ] ; then -+ . /usr/local/etc/acts.conf -+ log_debug "Loaded /usr/local/etc/acts.conf" - else -- log_message "No $(pwd)/acts.conf or /etc/acts.conf! Exiting." -+ log_message "No $(pwd)/acts.conf, /etc/acts.conf or /usr/local/etc/acts.conf! Exiting." - exit 1 - fi - # Use default values if anything is not set Property changes on: branches/2015Q4/sysutils/acts/files/patch-acts ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q4/sysutils/acts/files/patch-acts.conf.sample =================================================================== --- branches/2015Q4/sysutils/acts/files/patch-acts.conf.sample (nonexistent) +++ branches/2015Q4/sysutils/acts/files/patch-acts.conf.sample (revision 400552) @@ -0,0 +1,17 @@ +--- acts.conf.sample.orig 2015-10-30 19:25:27 UTC ++++ acts.conf.sample +@@ -4,12 +4,12 @@ + # backuptargets + # Space-separated list of directories to backup, relative to /. This is a required option. + # Default: unset +-backuptargets="var etc home root" ++backuptargets="var etc home root usr/home" + + # tarsnap + # What command to call for 'tarsnap'. + # Default: tarsnap +-tarsnap="nice -n19 ionice -c3 tarsnap" ++tarsnap="nice -n19 tarsnap" + + # tarsnapbackupoptions + # What options to use when backing up. Property changes on: branches/2015Q4/sysutils/acts/files/patch-acts.conf.sample ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q4 =================================================================== --- branches/2015Q4 (revision 400551) +++ branches/2015Q4 (revision 400552) Property changes on: branches/2015Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r400551