Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -2233,9 +2233,7 @@
     SUBDIR += smb_auth
     SUBDIR += snarf
     SUBDIR += sogo2
-    SUBDIR += sogo2-activesync
     SUBDIR += sogo3
-    SUBDIR += sogo3-activesync
     SUBDIR += spawn-fcgi
     SUBDIR += spdylay
     SUBDIR += spreadlogd
Index: sogo2-activesync/Makefile
===================================================================
--- sogo2-activesync/Makefile
+++ sogo2-activesync/Makefile
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-activesync
-
-MAINTAINER=		euan@potensol.com
-
-CONFLICTS=		sogo2-[0-9]* sogo3-[0-9]*
-
-OPTIONS_SLAVE=		ACTIVESYNC
-
-MASTERDIR=		${.CURDIR}/../sogo2
-
-.include "${MASTERDIR}/Makefile"
Index: sogo2-activesync/pkg-descr
===================================================================
--- sogo2-activesync/pkg-descr
+++ sogo2-activesync/pkg-descr
@@ -1,5 +0,0 @@
-ActiveSync is an extension to SOGo that provides support
-for the ActiveSync protocol to clients that supports
-it.
-
-WWW: http://www.sogo.nu/
Index: sogo2/Makefile
===================================================================
--- sogo2/Makefile
+++ sogo2/Makefile
@@ -1,14 +1,13 @@
-# Created by: Euan Thoms <euan@potensol.com>
 # $FreeBSD$
 
 PORTNAME=		sogo2
 PORTVERSION=		2.3.23
-PORTREVISION=	1
+PORTREVISION=		2
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
 
-MAINTAINER=		euan@potensol.com
+MAINTAINER=		acm@FreeBSD.org
 COMMENT=		Groupware server with a focus on scalability and open standards
 
 LICENSE=		GPLv2
@@ -17,13 +16,11 @@
 			libcurl.so:ftp/curl \
 			libDOM.so:devel/sope2
 
-OPTIONS_DEFINE=		ACTIVESYNC
-OPTIONS_SUB=		yes
+FLAVORS=		default activesync
 
-ACTIVESYNC_DESC=	Enable support for ActiveSync protocol
+activesync_PKGNAMESUFFIX=-activesync
+activesync_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 
-ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
-
 USERS=			sogod
 GROUPS=			sogod
 
@@ -31,8 +28,6 @@
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}/sogo
 
-CONFLICTS?=		sogo2-activesync-[0-9]* sogo3-activesync-[0-9]*
-
 USE_RC_SUBR=		sogod
 
 SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
@@ -40,15 +35,23 @@
 ETCDIR=			${PREFIX}/etc/${PORTNAME:S/2//}
 CONFIGURE_ARGS=		--disable-debug --enable-strip
 
+.if ${FLAVOR:U} == activesync
+CONFLICTS=	sogo3-activesync sogo4-activesync sogo2 sogo3 sogo4
+PLIST_SUB+=	ACTIVESYNC=""
+.else
+CONFLICTS=	sogo2-activesync sogo3-activesync sogo4-activesync sogo3 sogo4
+PLIST_SUB+=	ACTIVESYNC="@comment "
+.endif
+
 post-patch:
+.if ${FLAVOR:U} == activesync
+	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
+.endif
 	@${GREP} -rlF '/etc/sogo' ${WRKSRC} \
 		| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
 	@${REINPLACE_CMD} -e 's|/usr/lib/GNUstep|${GNUSTEP_LOCAL_ROOT}/Library|' ${WRKSRC}/Apache/SOGo.conf
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
 
-post-patch-ACTIVESYNC-on:
-	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
-
 do-configure:
 	cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}
 
Index: sogo3-activesync/Makefile
===================================================================
--- sogo3-activesync/Makefile
+++ sogo3-activesync/Makefile
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-activesync
-
-MAINTAINER=		euan@potensol.com
-
-CONFLICTS=		sogo[2-3]-[0-9]*
-
-OPTIONS_SLAVE=		ACTIVESYNC
-
-MASTERDIR=		${.CURDIR}/../sogo3
-
-.include "${MASTERDIR}/Makefile"
Index: sogo3-activesync/pkg-descr
===================================================================
--- sogo3-activesync/pkg-descr
+++ sogo3-activesync/pkg-descr
@@ -1,5 +0,0 @@
-ActiveSync is an extension to SOGo that provides support
-for the ActiveSync protocol to clients that supports
-it.
-
-WWW: http://www.sogo.nu/
Index: sogo3/Makefile
===================================================================
--- sogo3/Makefile
+++ sogo3/Makefile
@@ -1,14 +1,13 @@
-# Created by: Euan Thoms <euan@potensol.com>
 # $FreeBSD$
 
 PORTNAME=		sogo3
 PORTVERSION=		3.2.10
-PORTREVISION=	2
+PORTREVISION=		3
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
 
-MAINTAINER=		euan@potensol.com
+MAINTAINER=		acm@FreeBSD.org
 COMMENT=		Groupware server with a focus on scalability and open standards
 
 LICENSE=		GPLv2
@@ -18,13 +17,11 @@
 			libDOM.so:devel/sope3
 RUN_DEPENDS=		zip:archivers/zip
 
-OPTIONS_DEFINE=		ACTIVESYNC
-OPTIONS_SUB=		yes
+FLAVORS=		default activesync
 
-ACTIVESYNC_DESC=	Enable support for ActiveSync protocol
+activesync_PKGNAMESUFFIX=-activesync
+activesync_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 
-ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
-
 USERS=			sogod
 GROUPS=			sogod
 
@@ -32,8 +29,6 @@
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}/sogo
 
-CONFLICTS?=		sogo[2-3]-activesync-[0-9]* sogo2-[0-9]*
-
 USE_RC_SUBR=		sogod
 
 SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
@@ -41,14 +36,22 @@
 ETCDIR=			${PREFIX}/etc/${PORTNAME:S/3//}
 CONFIGURE_ARGS=		--disable-debug --enable-strip
 
+.if ${FLAVOR:U} == activesync
+CONFLICTS=	sogo2-activesync sogo4-activesync sogo2 sogo3 sogo4
+PLIST_SUB+=	ACTIVESYNC=""
+.else
+CONFLICTS=	sogo2-activesync sogo3-activesync sogo4-activesync sogo2 sogo4
+PLIST_SUB+=	ACTIVESYNC="@comment "
+.endif
+
 post-patch:
+.if ${FLAVOR:U} == activesync
+	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
+.endif
 	@${GREP} -rlF '/etc/sogo' ${WRKSRC} \
 		| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
 	@${REINPLACE_CMD} -e 's|/usr/|/usr/local/|g' ${WRKSRC}/Apache/SOGo.conf
 
-post-patch-ACTIVESYNC-on:
-	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
-
 do-configure:
 	cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}