Index: mail/libmapi/Makefile
===================================================================
--- mail/libmapi/Makefile	(revision 355836)
+++ mail/libmapi/Makefile	(working copy)
@@ -10,13 +10,13 @@
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Open Source implementation of Microsoft Exchange protocols
 
-BUILD_DEPENDS=	samba4>=4.0.1:${PORTSDIR}/net/samba4 \
+BUILD_DEPENDS=	${SAMBA_DEP} \
 		p5-Parse-Pidl>=4.0.1:${PORTSDIR}/devel/p5-Parse-Pidl
 LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical \
 		libtdb.so:${PORTSDIR}/databases/tdb \
 		libtevent.so:${PORTSDIR}/devel/tevent \
 		libtalloc.so:${PORTSDIR}/devel/talloc
-RUN_DEPENDS=	samba4>=4.0.1:${PORTSDIR}/net/samba4
+RUN_DEPENDS=	${SAMBA_DEP}
 
 CODENAME=	QUADRANT
 DOWNLOADCODE=	244
@@ -37,7 +37,7 @@
 		setup/openchange_provision
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BOOST DOXYGEN
+OPTIONS_DEFINE=	BOOST DOXYGEN SAMBA41
 OPTIONS_DEFAULT=BOOST
 BOOST_LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 BOOST_CONFIGURE_ENV_OFF=	ov_cv_boost_thread=no
@@ -44,7 +44,18 @@
 BOOST_DESC=	libmapi C++ library (needs boost)
 DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_path_DOXYGEN=""
+SAMBA41_DESC=	Build agains samba 4.1 instead of 4.0
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSAMBA41}
+SAMBA_DEP=	samba41>=4.1.0:${PORTSDIR}/net/samba41
+PLIST_SUB+=	SAMBA=samba41
+.else
+SAMBA_DEP=	samba4>=4.0.1:${PORTSDIR}/net/samba4
+PLIST_SUB+=	SAMBA=samba4
+.endif
+
 CONFIGURE_ARGS+=	--disable-pymapi
 #  --enable-openchange-qt4 Compile OpenChange Qt4 wrapper.
 
Index: mail/libmapi/pkg-plist
===================================================================
--- mail/libmapi/pkg-plist	(revision 355836)
+++ mail/libmapi/pkg-plist	(working copy)
@@ -118,20 +118,20 @@
 share/openchange/pictures/middle_bg.jpg
 share/openchange/pictures/nav_tab.gif
 share/openchange/pictures/pixel_grey.gif
-share/samba4/setup/AD/oc_provision_configuration.ldif
-share/samba4/setup/AD/oc_provision_configuration_finalize.ldif
-share/samba4/setup/AD/oc_provision_schema.ldif
-share/samba4/setup/AD/oc_provision_schema_attributes.ldif
-share/samba4/setup/AD/oc_provision_schema_auxiliary_class.ldif
-share/samba4/setup/AD/oc_provision_schema_container.ldif
-share/samba4/setup/AD/oc_provision_schema_modify.ldif
-share/samba4/setup/AD/oc_provision_schema_objectCategory.ldif
-share/samba4/setup/AD/oc_provision_schema_possSuperior.ldif
-share/samba4/setup/AD/oc_provision_schema_sub_CfgProtocol.ldif
-share/samba4/setup/AD/oc_provision_schema_sub_mailGateway.ldif
-share/samba4/setup/AD/oc_provision_schema_subcontainer.ldif
-share/samba4/setup/AD/prefixMap.txt
-share/samba4/setup/AD/provision_schema_basedn_modify.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_configuration.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_configuration_finalize.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema_attributes.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema_auxiliary_class.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema_container.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema_modify.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema_objectCategory.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema_possSuperior.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema_sub_CfgProtocol.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema_sub_mailGateway.ldif
+share/%%SAMBA%%/setup/AD/oc_provision_schema_subcontainer.ldif
+share/%%SAMBA%%/setup/AD/prefixMap.txt
+share/%%SAMBA%%/setup/AD/provision_schema_basedn_modify.ldif
 share/setup/mapistore/mapistore_namedprops.ldif
 share/setup/openchangedb/oc_provision_openchange_init.ldif
 share/setup/openchangedb/oc_provision_openchange_mailbox.ldif
@@ -141,7 +141,7 @@
 @dirrm share/setup/openchangedb
 @dirrm share/setup/mapistore
 @dirrm share/setup
-@dirrm share/samba4/setup/AD
+@dirrm share/%%SAMBA%%/setup/AD
 @dirrm share/openchange/pictures
 @dirrm share/openchange
 @dirrm share/mapitest/lzxpress