From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 16 10:30:11 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 98539106564A for ; Sun, 16 Sep 2012 10:30:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 700268FC16 for ; Sun, 16 Sep 2012 10:30:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8GAUBtV053042 for ; Sun, 16 Sep 2012 10:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8GAUBnj053028; Sun, 16 Sep 2012 10:30:11 GMT (envelope-from gnats) Resent-Date: Sun, 16 Sep 2012 10:30:11 GMT Resent-Message-Id: <201209161030.q8GAUBnj053028@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, CyberLeo Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6EAE106567D for ; Sun, 16 Sep 2012 10:25:33 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id B19C18FC17 for ; Sun, 16 Sep 2012 10:25:33 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8GAPXK8068391 for ; Sun, 16 Sep 2012 10:25:33 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q8GAPX3v068390; Sun, 16 Sep 2012 10:25:33 GMT (envelope-from nobody) Message-Id: <201209161025.q8GAPX3v068390@red.freebsd.org> Date: Sun, 16 Sep 2012 10:25:33 GMT From: CyberLeo To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/171681: Patch ports Makefile to support rsync update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Sep 2012 10:30:11 -0000 >Number: 171681 >Category: ports >Synopsis: Patch ports Makefile to support rsync update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Sep 16 10:30:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: CyberLeo >Release: 9.1-RC1 >Organization: CyberLeo.Net >Environment: FreeBSD mtumishi.cyberleo.net 9.1-RC1 FreeBSD 9.1-RC1 #0 r239653+91c9b44: Sat Aug 25 22:14:59 EDT 2012 cyberleo@mtumishi.cyberleo.net:/usr/obj/usr/src/sys/MTUMISHI amd64 >Description: Since I maintain a ports tree overlay, I find it easier to update ports from a centralized patched copy instead of worrying about patching separately on each machine. None of the available ports tree update methods are useful for this. The attached patch adds an rsync update mechanism, requiring only RSYNC_UPDATE and PORTS_RSYNC_SOURCE defined in /etc/make.conf. Tested on 9.1-RC1 and 8.2-RELEASE. >How-To-Repeat: >Fix: Included patch. Patch attached with submission follows: --- Makefile.orig 2012-08-05 13:06:49.000000000 -0400 +++ Makefile 2012-09-16 05:56:08.885054241 -0400 @@ -155,6 +155,8 @@ 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) + @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" >Release-Note: >Audit-Trail: >Unformatted: