svn commit: r359474 - in head/net/rsync: . files

[Emanuel Haupt]

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 <marck at rinet.ru>
-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