From b816ee4b96c9a03ec83cd2a9e1a4a18c411c32e2 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Fri, 4 Jul 2014 02:34:45 -0500 Subject: [PATCH] patch: rsync-update patch made it in, but the flags did not --- .../Makefile-rsync-update-missing-flags.patch | 10 +++++++++ cdn/patch/Makefile-rsync-update.patch | 22 ------------------- 2 files changed, 10 insertions(+), 22 deletions(-) create mode 100644 cdn/patch/Makefile-rsync-update-missing-flags.patch delete mode 100644 cdn/patch/Makefile-rsync-update.patch diff --git a/cdn/patch/Makefile-rsync-update-missing-flags.patch b/cdn/patch/Makefile-rsync-update-missing-flags.patch new file mode 100644 index 0000000..be6f9f8 --- /dev/null +++ b/cdn/patch/Makefile-rsync-update-missing-flags.patch @@ -0,0 +1,10 @@ +--- Makefile.orig 2014-06-15 17:47:10.000000000 -0500 ++++ Makefile 2014-06-26 00:30:50.582677180 -0500 +@@ -163,6 +163,7 @@ + GIT?= git + SVN?= svn + RSYNC?= rsync ++RSYNC_FLAGS?= --recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --verbose + PORTSNAP?= portsnap + PORTSNAP_FLAGS?= -p ${.CURDIR} + .if !target(update) diff --git a/cdn/patch/Makefile-rsync-update.patch b/cdn/patch/Makefile-rsync-update.patch deleted file mode 100644 index bf721d3..0000000 --- a/cdn/patch/Makefile-rsync-update.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.orig 2013-06-01 01:11:59.374630772 -0400 -+++ Makefile 2013-06-01 01:13:32.861834918 -0400 -@@ -152,11 +152,18 @@ - - GIT?= git - SVN?= svn -+RSYNC?= rsync -+RSYNC_FLAGS?= --recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --verbose - PORTSNAP?= portsnap - PORTSNAP_FLAGS?= -p ${.CURDIR} - .if !target(update) - update: --.if exists(${.CURDIR}/.svn) -+.if defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE) -+ @echo "--------------------------------------------------------------" -+ @echo ">>> Updating with ${RSYNC} from ${PORTS_RSYNC_SOURCE}" -+ @echo "--------------------------------------------------------------" -+ @${RSYNC} ${RSYNC_FLAGS} ${PORTS_RSYNC_SOURCE}/ ${.CURDIR}/ -+.elif exists(${.CURDIR}/.svn) - @echo "--------------------------------------------------------------" - @echo ">>> Updating ${.CURDIR} using Subversion" - @echo "--------------------------------------------------------------" -- 2.42.0