From a9b27aed6449f0551ad166b5b93a7544fe2bd958 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Tue, 16 Jul 2013 16:59:23 -0400 Subject: [PATCH] Makefile: CVS removal broke rsync ports update patch --- cdn/patch/Makefile-rsync-update.patch | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/cdn/patch/Makefile-rsync-update.patch b/cdn/patch/Makefile-rsync-update.patch index ab4ddad..bf721d3 100644 --- a/cdn/patch/Makefile-rsync-update.patch +++ b/cdn/patch/Makefile-rsync-update.patch @@ -1,25 +1,22 @@ -http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/171681 - ---- Makefile.orig 2012-08-05 13:06:49.000000000 -0400 -+++ Makefile 2012-09-16 05:56:08.885054241 -0400 -@@ -155,6 +155,8 @@ +--- 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 - SUP?= csup +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 defined(SUPHOST) -@@ -172,6 +174,11 @@ - @echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${CVS} -R -q update -A -P -d -I! -+.elif defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE) + .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) ++.elif exists(${.CURDIR}/.svn) @echo "--------------------------------------------------------------" @echo ">>> Updating ${.CURDIR} using Subversion" + @echo "--------------------------------------------------------------" -- 2.42.0