From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 08:44:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14FCAD63; Fri, 27 Jun 2014 08:44:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 017EA22A2; Fri, 27 Jun 2014 08:44:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5R8i6Ja048906; Fri, 27 Jun 2014 08:44:06 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5R8i675048904; Fri, 27 Jun 2014 08:44:06 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201406270844.s5R8i675048904@svn.freebsd.org> From: Emanuel Haupt Date: Fri, 27 Jun 2014 08:44:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359474 - in head/net/rsync: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 08:44:07 -0000 Author: ehaupt Date: Fri Jun 27 08:44:06 2014 New Revision: 359474 URL: http://svnweb.freebsd.org/changeset/ports/359474 QAT: https://qat.redports.org/buildarchive/r359474/ Log: - Update to 3.1.1 - Remove the "Renamed and flags options combined" option as the 4th party patch does not apply anymore. The author of this patch has been notified about this circumstance. I happily re-add this option once a working patch exists. Deleted: head/net/rsync/files/extrapatch-renamed-flags.diff Modified: head/net/rsync/Makefile head/net/rsync/distinfo Modified: head/net/rsync/Makefile ============================================================================== --- head/net/rsync/Makefile Fri Jun 27 08:38:39 2014 (r359473) +++ head/net/rsync/Makefile Fri Jun 27 08:44:06 2014 (r359474) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rsync -PORTVERSION= 3.1.0 -PORTREVISION= 3 +PORTVERSION= 3.1.1 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \ ftp://ftp.samba.org/pub/%SUBDIR%/ \ @@ -31,7 +30,7 @@ PORTDOCS= NEWS README csprotocol.txt tec # define options OPTIONS_DEFINE= DOCS POPT_PORT ZLIB_BASE SSH ICONV OPTIONS_RADIO= PTS -OPTIONS_RADIO_PTS= TIMELIMIT RENAMED FLAGS RENFL ATIMES ACL +OPTIONS_RADIO_PTS= TIMELIMIT RENAMED FLAGS ATIMES ACL # options provided upstream POPT_PORT_DESC= Use popt from devel/popt instead of bundled one @@ -46,10 +45,6 @@ FLAGS_DESC= File system flags support pa ATIMES_DESC= Preserve access times, adds --atimes ACL_DESC= Add backward-compatibility for the --acls option -# The following unsupported patch has been provided by: -# Dmitry Morozovsky -RENFL_DESC= Renamed and flags options combined - # define default options OPTIONS_DEFAULT=SSH ZLIB_BASE FLAGS @@ -69,7 +64,7 @@ PATCH_STRIP= -p1 EXTRA_PATCHES+= ${WRKSRC}/patches/atimes.diff .endif -.if ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} || ${PORT_OPTIONS:MACL} || make(makesum) || ${PORT_OPTIONS:MTIMELIMIT} || ${PORT_OPTIONS:MATIMES} || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MRENFL} +.if ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} || ${PORT_OPTIONS:MACL} || make(makesum) || ${PORT_OPTIONS:MTIMELIMIT} || ${PORT_OPTIONS:MATIMES} || ${PORT_OPTIONS:MRENAMED} DISTFILES+= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX} .endif @@ -92,15 +87,6 @@ PATCH_STRIP= -p1 EXTRA_PATCHES+= ${WRKSRC}/patches/detect-renamed.diff .endif -.if ${PORT_OPTIONS:MRENFL} -PATCH_STRIP= -p1 -EXTRA_PATCHES+= \ - ${FILESDIR}/extrapatch-renamed-flags.diff \ - ${WRKSRC}/patches/fileflags.diff \ - ${FILESDIR}/extrapatch-main.c \ - ${WRKSRC}/patches/detect-renamed.diff -.endif - .if ${PORT_OPTIONS:MACL} PATCH_STRIP= -p1 EXTRA_PATCHES+= ${WRKSRC}/patches/acls.diff Modified: head/net/rsync/distinfo ============================================================================== --- head/net/rsync/distinfo Fri Jun 27 08:38:39 2014 (r359473) +++ head/net/rsync/distinfo Fri Jun 27 08:44:06 2014 (r359474) @@ -1,4 +1,4 @@ -SHA256 (rsync-3.1.0.tar.gz) = 81ca23f77fc9b957eb9845a6024f41af0ff0c619b7f38576887c63fa38e2394e -SIZE (rsync-3.1.0.tar.gz) = 883901 -SHA256 (rsync-patches-3.1.0.tar.gz) = b79c489f2864c726a767e0f39c4086df83f401d151bd5dc05a9b2e799b52886a -SIZE (rsync-patches-3.1.0.tar.gz) = 174111 +SHA256 (rsync-3.1.1.tar.gz) = 7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621 +SIZE (rsync-3.1.1.tar.gz) = 890124 +SHA256 (rsync-patches-3.1.1.tar.gz) = 547ea4a37eb497050b37bda029dee4927436781e7b0e4eb207c2fad54d4a3246 +SIZE (rsync-patches-3.1.1.tar.gz) = 167954