Index: head/sysutils/duply/Makefile =================================================================== --- head/sysutils/duply/Makefile (revision 476918) +++ head/sysutils/duply/Makefile (revision 476919) @@ -1,43 +1,38 @@ # Created by: Michael Ranner # $FreeBSD$ PORTNAME= duply -PORTVERSION= 1.10.1 +PORTVERSION= 2.1 CATEGORIES= sysutils -MASTER_SITES= SF/ftplicity/${PORTNAME}%20%28simple%20duplicity%29/${PORTVERSION:R}.x/ +MASTER_SITES= https://duply.net/projects/ftplicity/files/latest/download/ DISTNAME= ${PORTNAME}_${PORTVERSION} -EXTRACT_SUFX= .tgz MAINTAINER= michael@ranner.eu COMMENT= Shell front end for the duplicity backup tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/gpl-2.0.txt RUN_DEPENDS= duplicity:sysutils/duplicity \ bash:shells/bash -USES= python +USES= python tar:tgz +NO_ARCH= yes NO_BUILD= yes -PORTDOCS= INSTALL.txt PLIST_FILES= bin/duply ${PERIODICDIR}/${PERIODICFILE} PERIODICFILE?= 300.duply PERIODICDIR?= ${PREFIX}/etc/periodic/backup SUB_FILES= pkg-message periodic_duply post-patch: ${REINPLACE_CMD} -e "s,/etc/duply,${ETCDIR},g" ${WRKSRC}/duply ${REINPLACE_CMD} -e "s,(python,(${PYTHON_CMD},g" ${WRKSRC}/duply do-install: ${INSTALL_SCRIPT} ${WRKSRC}/duply ${STAGEDIR}${PREFIX}/bin/duply @${MKDIR} ${STAGEDIR}${PERIODICDIR} ${INSTALL_SCRIPT} ${WRKDIR}/periodic_duply ${STAGEDIR}${PERIODICDIR}/${PERIODICFILE} - @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -. endfor .include Index: head/sysutils/duply/distinfo =================================================================== --- head/sysutils/duply/distinfo (revision 476918) +++ head/sysutils/duply/distinfo (revision 476919) @@ -1,2 +1,3 @@ -SHA256 (duply_1.10.1.tgz) = 78f3714b0dc39657e2b3030e206370d38205305ca484e212704dcf77f9e70d35 -SIZE (duply_1.10.1.tgz) = 36079 +TIMESTAMP = 1533248620 +SHA256 (duply_2.1.tgz) = a8d2bfa907aacbef1c66bf1079fa24e541ad63f5d0694029e4596b030f3cb244 +SIZE (duply_2.1.tgz) = 47010 Index: head/sysutils/duply/files/periodic_duply.in =================================================================== --- head/sysutils/duply/files/periodic_duply.in (revision 476918) +++ head/sysutils/duply/files/periodic_duply.in (revision 476919) @@ -1,61 +1,69 @@ #!/bin/sh # # periodic(8) script that runs duply on a nightly basis # # Define these variables in either /etc/periodic.conf or # /etc/periodic.conf.local to override the defaults. # # Configuration Settings (with default values): # # backup_duply_enable="NO" # enable duply backup # # backup_duply_profile="" # default duply profile to use # see duply usage # # backup_duply_command="bkp_status" # default duply commands # # backup_duply_opt="" # options passed to duply # -# backup_duply_random="0" +# backup_duply_random="3600" # randomize backup time +# In FreeBSD 12.0 is used the anticongestion function (3600) and this +# variable is ignored # if [ -r /etc/defaults/periodic.conf ] then . /etc/defaults/periodic.conf source_periodic_confs fi : ${backup_duply_enable}="NO" : ${backup_duply_command}="bkp_status" : ${backup_duply_profile}="" : ${backup_duply_opt}="" -: ${backup_duply_random}="0" +: ${backup_duply_random}="3600" PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin export PATH case "$backup_duply_enable" in [Yy][Ee][Ss]) - eval sleep $(jot -r 1 0 ${backup_duply_random}) + # In FreeBSD 12.0 the anticongestion function should be used + # instead of a hard-coded sleep + if [ -n "$anticongestion_sleeptime" ]; then + anticongestion + else + eval sleep $(jot -r 1 0 ${backup_duply_random}) + fi echo echo "Duply Backup:" for duply_profile in ${backup_duply_profile} do eval duply ${duply_profile} ${backup_duply_command} ${backup_duply_opt} if [ $? -gt 0 ] then echo "Errors were reported during backup." rc=3 break fi done ;; esac exit $rc