Attachment #87855 for bug #124553

View | Details | Raw Unified | Return to bug 124553
Collapse All | Expand All

Lines 39-44 Link Here

(-)/usr/ports/user/rsync/Makefile (-1 / +12 lines)
39	MAN5= rsyncd.conf.5	39	MAN5= rsyncd.conf.5
40		40
41	OPTIONS= POPT_PORT "Use popt from devel/popt instead of bundled one" off \	41	OPTIONS= POPT_PORT "Use popt from devel/popt instead of bundled one" off \
		42	TIMELIMIT "Time limit patch" on \
42	SSH "Use SSH instead of RSH" on \	43	SSH "Use SSH instead of RSH" on \
43	FLAGS "File system flags support patch, adds --fileflags" off \	44	FLAGS "File system flags support patch, adds --fileflags" off \
44	ACL "Add backward-compatibility for the --acls option" off \	45	ACL "Add backward-compatibility for the --acls option" off \
Lines 46-52 Link Here
46		47
47	.include <bsd.port.pre.mk>	48	.include <bsd.port.pre.mk>
48		49
49	.if defined(WITH_ICONV) \|\| defined(WITH_FLAGS) \|\| defined(WITH_ACL) \|\| make(makesum)	50	.if !defined(WITHOUT_TIMELIMIT)
		51	PATCH_STRIP= -p1
		52	EXTRA_PATCHES+= ${WRKSRC}/patches/time-limit.diff
		53	.endif
		54
		55	.if defined(WITH_ICONV) \|\| defined(WITH_FLAGS) \|\| defined(WITH_ACL) \|\| make(makesum) \|\| defined(WITH_TIMELIMIT)
50	DISTFILES+= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}	56	DISTFILES+= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
51	.endif	57	.endif
52		58
Lines 83-88 Link Here
83	CONFIGURE_ARGS+= --with-rsh=rsh	89	CONFIGURE_ARGS+= --with-rsh=rsh
84	.endif	90	.endif
85		91
		92	.if defined( WITH_TIMELIMIT ) && defined( WITH_FLAGS )
		93	pre-patch:
		94	${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E < ${PATCHDIR}/timelimit_fileflags_patch-proto.h
		95	.endif
		96
86	# guard against CFLAGS damage by MAKE_ENV	97	# guard against CFLAGS damage by MAKE_ENV
87	post-patch:	98	post-patch:
88	@${REINPLACE_CMD} -e 's\|CFLAGS\|CONFIGUREDCFLAGS\|' ${WRKSRC}/Makefile.in	99	@${REINPLACE_CMD} -e 's\|CFLAGS\|CONFIGUREDCFLAGS\|' ${WRKSRC}/Makefile.in

Line 0 Link Here

(-)/usr/ports/user/rsync/files/timelimit_fileflags_patch-proto.h (+10 lines)
	1	--- patches/fileflags.diff.orig 2008-06-13 22:23:51.000000000 +1000
	2	+++ patches/fileflags.diff 2008-06-13 22:24:55.000000000 +1000
	3	@@ -1135,6 +1135,7 @@
	4	void print_child_argv(const char prefix, char *cmd);
	5	NORETURN void out_of_memory(const char *str);
	6	NORETURN void overflow_exit(const char *str);
	7	+ time_t parse_time(const char *arg);
	8	-int set_modtime(const char *fname, time_t modtime, mode_t mode);
	9	+int set_modtime(const char *fname, time_t modtime, mode_t mode, uint32 fileflags);
	10	int mkdir_defmode(char *fname);

Return to bug 124553