Update to 2.1.

Stagify.

3 files changed, 113 insertions, 73 deletions

diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index 50d88e2ebe6e..025669fc9f76 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -2,70 +2,62 @@
 # $FreeBSD$
 
 PORTNAME=	libmapi
-PORTVERSION=	0.9
-PORTREVISION=	6
+PORTVERSION=	2.1
 CATEGORIES=	mail
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=openchange/openchange/openchange-${PORTVERSION}%20${CODENAME}/
+MASTER_SITES=	http://tracker.openchange.org/attachments/download/${DOWNLOADCODE}/
 DISTNAME=	openchange-${PORTVERSION}-${CODENAME}
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Open Source implementation of Microsoft Exchange protocols
 
-BROKEN=		Does not compile
-
-BUILD_DEPENDS=	${HOSTCONFIG}:${PORTSDIR}/net/samba4 \
-		pidl:${PORTSDIR}/devel/p5-Parse-Pidl
+BUILD_DEPENDS=	samba4>=4.0.1:${PORTSDIR}/net/samba4 \
+		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=	${HOSTCONFIG}:${PORTSDIR}/net/samba4
+RUN_DEPENDS=	samba4>=4.0.1:${PORTSDIR}/net/samba4
 
-HOSTCONFIG=	${LOCALBASE}/libdata/pkgconfig/samba-hostconfig.pc
+CODENAME=	QUADRANT
+DOWNLOADCODE=	244
 
-CODENAME=	COCHRANE
-USE_GMAKE=	yes
 USE_SQLITE=	3
-USES=		pkgconfig
+USES=		gmake pathfix pkgconfig shebangfix
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-samba=${LOCALBASE}
+CONFIGURE_ENV=	ac_cv_path_DOXYGEN=""
+SHEBANG_FILES=	libmapi/conf/mparse.pl \
+		script/check_exchange \
+		setup/openchange_newuser \
+		setup/openchange_provision
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	BOOST DOXYGEN
-OPTIONS_DEFAULT=	BOOST
-BOOST_DESC=	Enable libmapi++ (needs boost)
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFAULT=BOOST
+BOOST_LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+BOOST_CONFIGURE_ENV_OFF=	ov_cv_boost_thread=no
+BOOST_DESC=	libmapi C++ library (needs boost)
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_path_DOXYGEN=""
 
-CONFIGURE_ARGS+=	--disable-swig-perl
 CONFIGURE_ARGS+=	--disable-pymapi
-
-.if ${PORT_OPTIONS:MBOOST} || exists(${LOCALBASE}/lib/libboost_thread.so)
-LIB_DEPENDS+=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
-PLIST_SUB+=	BOOST=""
-.else
-PLIST_SUB+=	BOOST="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOXYGEN} || exists(${LOCALBASE}/bin/doxygen)
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-PLIST_SUB+=	DOXYGEN=""
-.else
-PLIST_SUB+=	DOXYGEN="@comment "
-.endif
+#  --enable-openchange-qt4 Compile OpenChange Qt4 wrapper.
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+	@${REINPLACE_CMD} -e "s/mkdir --parent/mkdir -p/g; \
+		s,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,g" \
 		${WRKSRC}/Makefile
 
 post-install:
-.for i in libmapi libmapiadmin libmapiproxy libmapiserver libmapistore libocpf
-	@${LN} -fs ${PREFIX}/lib/${i}.so.0.9 ${PREFIX}/lib/${i}.so.0
-.endfor
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/openchange
+	cd ${WRKSRC}/doc/doxygen/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/openchange/
+	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/*
+	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/lib*.so.*
+	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/shared-modules/dcerpc_server/dcesrv_mapiproxy.so
+	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/modules/dcerpc_mapiproxy*/*.so
 
 .include <bsd.port.mk>
diff --git a/mail/libmapi/distinfo b/mail/libmapi/distinfo
index 7be6fe17072c..5a9d02d12f59 100644
--- a/mail/libmapi/distinfo
+++ b/mail/libmapi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openchange-0.9-COCHRANE.tar.gz) = b8467d1fa9fd025323a2ddc2d4b4a29a78fee1b6cb1f4373725e45f7769b5402
-SIZE (openchange-0.9-COCHRANE.tar.gz) = 1601358
+SHA256 (openchange-2.1-QUADRANT.tar.gz) = fc75863ab77646ae9c92e3f9f61c5104422359bb3339cfff7d6342562e1e978f
+SIZE (openchange-2.1-QUADRANT.tar.gz) = 1898567
diff --git a/mail/libmapi/pkg-plist b/mail/libmapi/pkg-plist
index 91a854626f0b..0874ebc15a03 100644
--- a/mail/libmapi/pkg-plist
+++ b/mail/libmapi/pkg-plist
@@ -1,20 +1,20 @@
+bin/check_fasttransfer
 bin/exchange2ical
 bin/exchange2mbox
-bin/locale_codepage
 bin/mapiprofile
 bin/mapitest
 bin/openchangeclient
 bin/openchangemapidump
 bin/openchangepfadmin
 bin/schemaIDGUID
+bin/test_asyncnotif
 include/gen_ndr/exchange.h
+include/gen_ndr/ndr_exchange.h
+include/gen_ndr/ndr_property.h
 include/gen_ndr/property.h
 %%BOOST%%include/libmapi++/attachment.h
 %%BOOST%%include/libmapi++/clibmapi.h
 %%BOOST%%include/libmapi++/folder.h
-%%BOOST%%include/libmapi++/impl/message.ipp
-%%BOOST%%include/libmapi++/impl/object.ipp
-%%BOOST%%include/libmapi++/impl/session.ipp
 %%BOOST%%include/libmapi++/libmapi++.h
 %%BOOST%%include/libmapi++/mapi_exception.h
 %%BOOST%%include/libmapi++/message.h
@@ -23,10 +23,11 @@ include/gen_ndr/property.h
 %%BOOST%%include/libmapi++/profile.h
 %%BOOST%%include/libmapi++/property_container.h
 %%BOOST%%include/libmapi++/session.h
-include/libmapi/dlinklist.h
 include/libmapi/emsmdb.h
+include/libmapi/fxics.h
+include/libmapi/idset.h
 include/libmapi/libmapi.h
-include/libmapi/mapi_ctx.h
+include/libmapi/mapi_context.h
 include/libmapi/mapi_id_array.h
 include/libmapi/mapi_nameid.h
 include/libmapi/mapi_notification.h
@@ -36,48 +37,60 @@ include/libmapi/mapi_provider.h
 include/libmapi/mapicode.h
 include/libmapi/mapidefs.h
 include/libmapi/nspi.h
-include/libmapi/proto.h
+include/libmapi/property_altnames.h
+include/libmapi/property_tags.h
 include/libmapi/socket/netif.h
 include/libmapi/version.h
 include/libmapiadmin/libmapiadmin.h
-include/libmapiadmin/proto.h
 include/libmapiproxy.h
 include/libmapiserver.h
 include/libocpf/ocpf.h
-include/libocpf/proto.h
 include/mapistore/mapistore.h
 include/mapistore/mapistore_errors.h
+include/mapistore/mapistore_nameid.h
 lib/libmapi.so
 lib/libmapi.so.0
-lib/libmapi.so.0.9
+lib/libmapi.so.2.0
 lib/libmapiadmin.so
 lib/libmapiadmin.so.0
-lib/libmapiadmin.so.0.9
+lib/libmapiadmin.so.2.0
+%%BOOST%%lib/libmapipp.so
+%%BOOST%%lib/libmapipp.so.0
+%%BOOST%%lib/libmapipp.so.2.0
 lib/libmapiproxy.so
 lib/libmapiproxy.so.0
-lib/libmapiproxy.so.0.9
+lib/libmapiproxy.so.2.0
 lib/libmapiserver.so
 lib/libmapiserver.so.0
-lib/libmapiserver.so.0.9
+lib/libmapiserver.so.2.0
 lib/libmapistore.so
 lib/libmapistore.so.0
-lib/libmapistore.so.0.9
+lib/libmapistore.so.2.0
 lib/libocpf.so
 lib/libocpf.so.0
-lib/libocpf.so.0.9
-lib/mapistore_backends/mapistore_sqlite3.so
+lib/libocpf.so.2.0
 lib/nagios/check_exchange
-libdata/pkgconfig/libmapi.pc
-libdata/pkgconfig/libmapiadmin.pc
-libdata/pkgconfig/libmapiproxy.pc
-libdata/pkgconfig/libmapiserver.pc
-libdata/pkgconfig/libocpf.pc
 %%PYTHON_SITELIBDIR%%/openchange/__init__.py
 %%PYTHON_SITELIBDIR%%/openchange/mailbox.py
 %%PYTHON_SITELIBDIR%%/openchange/provision.py
 %%PYTHON_SITELIBDIR%%/openchange/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/openchange/tests/test_mailbox.py
 %%PYTHON_SITELIBDIR%%/openchange/tests/test_provision.py
+%%PYTHON_SITELIBDIR%%/openchange/utils/__init__.py
+%%PYTHON_SITELIBDIR%%/openchange/utils/fdunix.py
+%%PYTHON_SITELIBDIR%%/openchange/utils/packets.py
+%%PYTHON_SITELIBDIR%%/openchange/urlutils.py
+%%PYTHON_SITELIBDIR%%/openchange/web/__init__.py
+%%PYTHON_SITELIBDIR%%/openchange/web/auth/__init__.py
+%%PYTHON_SITELIBDIR%%/openchange/web/auth/NTLMAuthHandler.py
+lib/shared-modules/dcerpc_server/dcesrv_mapiproxy.so
+%%BOOST%%libdata/pkgconfig/libmapi++.pc
+libdata/pkgconfig/libmapi.pc
+libdata/pkgconfig/libmapiadmin.pc
+libdata/pkgconfig/libmapiproxy.pc
+libdata/pkgconfig/libmapiserver.pc
+libdata/pkgconfig/libmapistore.pc
+libdata/pkgconfig/libocpf.pc
 modules/dcerpc_mapiproxy/mpm_cache.so
 modules/dcerpc_mapiproxy/mpm_downgrade.so
 modules/dcerpc_mapiproxy/mpm_dummy.so
@@ -85,34 +98,69 @@ modules/dcerpc_mapiproxy/mpm_pack.so
 modules/dcerpc_mapiproxy_server/exchange_ds_rfr.so
 modules/dcerpc_mapiproxy_server/exchange_emsmdb.so
 modules/dcerpc_mapiproxy_server/exchange_nsp.so
-modules/dcerpc_server/dcesrv_mapiproxy.so
-modules/torture/openchange.so
-share/setup/AD/oc_provision_configuration.ldif
-share/setup/AD/oc_provision_schema.ldif
-share/setup/AD/oc_provision_schema_modify.ldif
-share/setup/AD/prefixMap.txt
+sbin/openchange_newuser
+sbin/openchange_provision
+share/mapitest/lzfu/testcase.rtf
+share/mapitest/lzxpress/001_Outlook_2007_in_ModifyRecipients_comp.dat
+share/mapitest/lzxpress/002_Outlook_2007_in_Tables_operations_comp.dat
+share/openchange/apidocs.css
+share/openchange/footer.html
+share/openchange/header.html
+share/openchange/index.html
+share/openchange/libmapi-concepts.doxy
+share/openchange/libmapi-examples.doxy
+share/openchange/libmapi-mainpage.doxy
+share/openchange/pictures/24px-Cc-by_white.svg.png
+share/openchange/pictures/24px-Cc-sa_white.svg.png
+share/openchange/pictures/CC_SomeRightsReserved.png
+share/openchange/pictures/body_top_bg2.jpg
+share/openchange/pictures/header.jpg
+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/setup/mapistore/mapistore_namedprops.ldif
 share/setup/openchangedb/oc_provision_openchange_init.ldif
 share/setup/openchangedb/oc_provision_openchange_mailbox.ldif
 share/setup/profiles/oc_profiles_init.ldif
 share/setup/profiles/oc_profiles_schema.ldif
 @dirrm share/setup/profiles
 @dirrm share/setup/openchangedb
-@dirrm share/setup/AD
+@dirrm share/setup/mapistore
 @dirrm share/setup
-@dirrm %%PYTHON_SITELIBDIR%%/openchange/tests
-@dirrm %%PYTHON_SITELIBDIR%%/openchange
-@dirrm modules/torture
-@dirrm modules/dcerpc_server
+@dirrm share/samba4/setup/AD
+@dirrm share/openchange/pictures
+@dirrm share/openchange
+@dirrm share/mapitest/lzxpress
+@dirrm share/mapitest/lzfu
+@dirrm share/mapitest
 @dirrm modules/dcerpc_mapiproxy_server
 @dirrm modules/dcerpc_mapiproxy
 @dirrmtry modules
+@dirrm lib/shared-modules/dcerpc_server
+@dirrm %%PYTHON_SITELIBDIR%%/openchange/web/auth
+@dirrm %%PYTHON_SITELIBDIR%%/openchange/web
+@dirrm %%PYTHON_SITELIBDIR%%/openchange/utils
+@dirrm %%PYTHON_SITELIBDIR%%/openchange/tests
+@dirrm %%PYTHON_SITELIBDIR%%/openchange
 @dirrm lib/nagios
-@dirrm lib/mapistore_backends
 @dirrm include/mapistore
 @dirrm include/libocpf
 @dirrm include/libmapiadmin
 @dirrm include/libmapi/socket
 @dirrm include/libmapi
-%%BOOST%%@dirrm include/libmapi++/impl
 %%BOOST%%@dirrm include/libmapi++
 @dirrm include/gen_ndr