diff -urN rsync.orig/Makefile rsync/Makefile
--- rsync.orig/Makefile	Tue Apr 25 00:47:27 2006
+++ rsync/Makefile	Tue May  9 20:27:16 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	rsync
 PORTVERSION=	2.6.8
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://rsync.samba.org/ftp/%SUBDIR%/ \
 		ftp://ftp.samba.org//pub/%SUBDIR%/ \
@@ -20,6 +21,14 @@
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	A network file distribution/synchronization utility
 
+OPTIONS=	POPT_PORT "Use popt from ports" off \
+		TIMELIMIT "Include time limit support" on \
+		FLAGS "Include file flags support" on \
+		ACLS "Include ACL support" on \
+		SSH "Use ssh instead of rsh" on
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_POPT_PORT)
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 .endif
@@ -47,7 +56,15 @@
 PATCH_STRIP=	-p1
 .endif
 
-.include <bsd.port.pre.mk>
+.if !defined(WITHOUT_FLAGS)
+EXTRA_PATCHES+=	${WRKSRC}/patches/flags.diff
+PATCH_STRIP=	-p1
+.endif
+
+.if !defined(WITHOUT_ACLS)
+EXTRA_PATCHES+=	${WRKSRC}/patches/acls.diff
+PATCH_STRIP=	-p1
+.endif
 
 SUB_LIST+=	NAME=rsyncd
 
@@ -67,13 +84,6 @@
 
 MAN1=		rsync.1
 MAN5=		rsyncd.conf.5
-
-.if !defined(WITH_POPT_PORT)
-pre-everything::
-	@${ECHO_CMD} "rsync comes with an included version of popt."
-	@${ECHO_CMD} "To build rsync with devel/popt instead,"
-	@${ECHO_CMD} "hit Ctrl-C now and define WITH_POPT_PORT"
-.endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's:/etc/:${PREFIX}/etc/:g'  \