diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2008-02-22 11:50:38 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2008-02-22 11:50:38 +0000 |
| commit | c45a5502eaedb61eac16d4bce7684812fb00687b (patch) | |
| tree | b966cc707584b39b25e02618e47791d2a9f8615a /net/rsync | |
| parent | - Update to 0.2.3255 (diff) | |
- Add a knob to apply atimes patch from vendor distribution
Submitted by: koitsu
Notes
Notes:
svn path=/head/; revision=207747
Diffstat (limited to 'net/rsync')
| -rw-r--r-- | net/rsync/Makefile | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 581d631ca238..a8e5bb945abb 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -39,6 +39,7 @@ MAN5= rsyncd.conf.5 OPTIONS= POPT_PORT "Use popt from devel/popt instead of bundled one" off \ TIMELIMIT "Time limit patch" on \ FLAGSP "File system flags support patch, adds --flags" off \ + ATIMES "Preserve file atimes; adds --atimes" off \ ACLSP "ACL support patch, adds --acls" off \ SSH "Use SSH instead of RSH" on @@ -60,6 +61,25 @@ EXTRA_PATCHES+= ${WRKSRC}/patches/time-limit.diff EXTRA_PATCHES+= ${WRKSRC}/patches/flags.diff .endif +# The atimes patch works only by itself; it does not patch cleanly when used +# alongside timelimit, flags, or acls. +# +.if defined(WITH_ATIMES) +EXTRA_PATCHES+= ${WRKSRC}/patches/atimes.diff + +.if defined(WITH_ACLSP) +IGNORE= ACLs and atimes patches don't work together; please re-run 'make config' and disable one of them +.endif + +.if !defined(WITHOUT_TIMELIMIT) +IGNORE= timelimit and atimes patches don't work together; please re-run 'make config' and disable one of them +.endif + +.if defined(WITH_FLAGSP) +IGNORE= Flags and atimes patches don't work together; please re-run 'make config' and disable one of them +.endif +.endif + .if defined(WITH_ACLSP) EXTRA_PATCHES+= ${PATCHDIR}/extra-patches-acls.diff ${WRKSRC}/patches/acls.diff CONFIGURE_ARGS+=--enable-acl-support |