diff options
| author | ehaupt <ehaupt@FreeBSD.org> | 2013-10-02 11:14:13 +0000 |
|---|---|---|
| committer | ehaupt <ehaupt@FreeBSD.org> | 2013-10-02 11:14:13 +0000 |
| commit | 8d0b26b5e503758a2f6c62f7a25c2ef436d70b9f (patch) | |
| tree | d6e73feb4da9d4f27cae8186bd404c520b1e1d8c /net/rsync/Makefile | |
| parent | 57009d54eab5a6f5273be3e922b8db5256511529 (diff) | |
| download | FreeBSD-ports-8d0b26b5e503758a2f6c62f7a25c2ef436d70b9f.zip FreeBSD-ports-8d0b26b5e503758a2f6c62f7a25c2ef436d70b9f.tar.gz | |
- Update to 3.1.0
- Rework OPTIONS to use OPTIONS_RADIO for mutually exclusive options. This
allows us to get rid of various IGNORE definitions
- Add an option to use zlib from base instead of the bundled one (default)
- Functionality of extrapatch-detect-renamed.diff has been incorporated with the
upstream patch maintainers
- Provide a patch required for the "file system flags" option (have been
submitted upstream)
Diffstat (limited to 'net/rsync/Makefile')
| -rw-r--r-- | net/rsync/Makefile | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 661528f..bd7d40b 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rsync -PORTVERSION= 3.0.9 -PORTREVISION= 3 +PORTVERSION= 3.1.0 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \ ftp://ftp.samba.org/pub/%SUBDIR%/ \ @@ -31,37 +30,42 @@ PORTDOCS= NEWS README csprotocol.txt tech_report.tex MAN1= rsync.1 MAN5= rsyncd.conf.5 -OPTIONS_DEFINE= POPT_PORT SSH FLAGS ATIMES ACL ICONV TIMELIMIT RENAMED DOCS +# define options +OPTIONS_DEFINE= POPT_PORT ZLIB_BASE SSH +OPTIONS_RADIO= PTS +OPTIONS_RADIO_PTS= TIMELIMIT RENAMED FLAGS ATIMES ACL + +# options provided upstream POPT_PORT_DESC= Use popt from devel/popt instead of bundled one +ZLIB_BASE_DESC= Use zlib from base instead of bundled one SSH_DESC= Use SSH instead of RSH + +# options provided by patch (mutually exclusive) +PTS_DESC= Functionality provided by third party patches +TIMELIMIT_DESC= Time limit patch +RENAMED_DESC= Add support for renamed file detection FLAGS_DESC= File system flags support patch, adds --fileflags ATIMES_DESC= Preserve access times, adds --atimes ACL_DESC= Add backward-compatibility for the --acls option -TIMELIMIT_DESC= Time limit patch -RENAMED_DESC= Add support for renamed file detection -OPTIONS_DEFAULT=SSH +# define default options +OPTIONS_DEFAULT=SSH ZLIB_BASE NO_STAGE= yes .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MZLIB_BASE} +CONFIGURE_ARGS= --with-included-zlib=no +.endif + .if ${PORT_OPTIONS:MTIMELIMIT} PATCH_STRIP= -p1 EXTRA_PATCHES+= ${WRKSRC}/patches/time-limit.diff -.if ${PORT_OPTIONS:MFLAGS} -IGNORE= flags and timelimit can't be enabled simultaneously. Please rerun 'make config' and disable one of them -.endif -.if ${PORT_OPTIONS:MATIMES} -IGNORE= atimes and timelimit can't be enabled simultaneously. Please rerun 'make config' and disable one of them -.endif .endif .if ${PORT_OPTIONS:MATIMES} PATCH_STRIP= -p1 EXTRA_PATCHES+= ${WRKSRC}/patches/atimes.diff -.if ${PORT_OPTIONS:MFLAGS} -IGNORE= flags and atimes can't be enabled simultaneously. Please rerun 'make config' and disable one of them -.endif .endif .if ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} || ${PORT_OPTIONS:MACL} || make(makesum) || ${PORT_OPTIONS:MTIMELIMIT} || ${PORT_OPTIONS:MATIMES} || ${PORT_OPTIONS:MRENAMED} @@ -82,15 +86,13 @@ CONFIGURE_ENV+= ac_cv_header_iconv_h=no .if ${PORT_OPTIONS:MFLAGS} PATCH_STRIP= -p1 -EXTRA_PATCHES+= ${WRKSRC}/patches/fileflags.diff -# https://bugzilla.samba.org/show_bug.cgi?id=8941 -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-syscall.c +EXTRA_PATCHES+= ${WRKSRC}/patches/fileflags.diff \ + ${FILESDIR}/extrapatch-main.c .endif .if ${PORT_OPTIONS:MRENAMED} PATCH_STRIP= -p1 -#EXTRA_PATCHES+= ${WRKSRC}/patches/detect-renamed.diff -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-detect-renamed.diff +EXTRA_PATCHES+= ${WRKSRC}/patches/detect-renamed.diff .endif .if ${PORT_OPTIONS:MACL} |
