--- devel/subversion/Makefile	(revision 467836)
+++ devel/subversion/Makefile	(working copy)
@@ -27,7 +27,7 @@ 
 		TEST		\
 		TOOLS
 
-OPTIONS_DEFAULT=FREEBSD_TEMPLATE LZ4 \
+OPTIONS_DEFAULT=LZ4 \
 		SERF TOOLS
 
 FREEBSD_TEMPLATE_DESC=	FreeBSD Project log template
@@ -43,6 +43,15 @@ 
 FREEBSD_TEMPLATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd-template
 SVNSERVE_WRAPPER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-svnserve-wrapper
 
+FLAVORS=			full freebsd
+freebsd_CONFLICTS_INSTALL=	subversion
+freebsd_PKGNAMESUFFIX=		-freebsd
+full_CONFLICTS_INSTALL=		subversion-freebsd
+
+.if ${FLAVOR:U} == freebsd
+OPTIONS_SLAVE=         FREEBSD_TEMPLATE
+.endif
+
 USES+=			shebangfix python:2.7,env
 python_OLD_CMD+=	"/bin/env python"
 SHEBANG_REGEX=		./tools/.*