Index: head/www/groupoffice/Makefile
===================================================================
--- head/www/groupoffice/Makefile	(revision 401546)
+++ head/www/groupoffice/Makefile	(revision 401547)
@@ -1,73 +1,60 @@
 # Created by: Aron Schlesinger <as@bsdgroup.de>
 # $FreeBSD$
 
 PORTNAME=	groupoffice
 DISTVERSIONPREFIX=	com-
-DISTVERSION=	6.1.57
+DISTVERSION=	6.1.61
 CATEGORIES=	www
 MASTER_SITES=	SF/group-office/${DISTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular web application framework vor office
 
 RESTRICTED=	Free for personal use only
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 USE_PHP=	mysqli session mbstring pcre xml
 WANT_PHP_WEB=	yes
 USE_MYSQL=	yes
 USES=		shebangfix
 SHEBANG_FILES=	go/vendor/tcpdf/tools/tcpdf_addfont.php \
 		groupoffice \
 		groupofficecli.php \
 		install/autoinstall.php \
 		modules/postfixadmin/scripts/vacation.pl \
 		modules/sync/z-push/install.sh \
 		vendor/fkooman/php-oauth-client/bin/php-oauth-client-create-tables
-NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/${PORTNAME}${DISTVERSION:R:R}
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	IMAP GD CALENDAR WBXML
-OPTIONS_DEFAULT=	IMAP GD CALENDAR
+OPTIONS_DEFAULT=IMAP GD CALENDAR
 CALENDAR_DESC=	Calendar holiday support
 IMAP_DESC=	IMAP support
 GD_DESC=	Gallery support (GD)
 WBXML_DESC=	Synchronization Support
 
+CALENDAR_USE=		PHP=calendar
+GD_USE=			PHP=gd
+IMAP_USE=		PHP=iconv imap
+WBXML_LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
+
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/go/base/Config.php
 	${REINPLACE_CMD} 's|/etc/groupoffice|${PREFIX}&|g' \
 		${WRKSRC}/go/base/Config.php \
 		${WRKSRC}/install/configFile.php \
 		${WRKSRC}/modules/serverclient/HttpClient.php \
 		${WRKSRC}/modules/serverclient/ServerclientModule.php \
 		${WRKSRC}/modules/site/index.php
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIMAP}
-USE_PHP+=	imap iconv
-.endif
-
-.if ${PORT_OPTIONS:MGD}
-USE_PHP+=	gd
-.endif
-
-.if ${PORT_OPTIONS:MCALENDAR}
-USE_PHP+=	calendar
-.endif
-
-.if ${PORT_OPTIONS:MWBXML}
-LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
-.endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}
 	@${TOUCH} ${STAGEDIR}${WWWDIR}/config.php.sample
 
 .include <bsd.port.mk>
Index: head/www/groupoffice/distinfo
===================================================================
--- head/www/groupoffice/distinfo	(revision 401546)
+++ head/www/groupoffice/distinfo	(revision 401547)
@@ -1,2 +1,2 @@
-SHA256 (groupoffice-com-6.1.57.tar.gz) = 2036736ec651cd8f0aaf3b1e01e09362a63b3f242a78da7bcbff26e7aeb6b5fd
-SIZE (groupoffice-com-6.1.57.tar.gz) = 32594703
+SHA256 (groupoffice-com-6.1.61.tar.gz) = fabde5394c44d1b71235b42d00327d080804d27ee9b5c75c1a739445f25bb4e7
+SIZE (groupoffice-com-6.1.61.tar.gz) = 32597106