From owner-svn-ports-all@FreeBSD.ORG Fri May 30 14:41:42 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32331337; Fri, 30 May 2014 14:41:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 12DD22D19; Fri, 30 May 2014 14:41:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4UEffDi099299; Fri, 30 May 2014 14:41:41 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4UEff12099296; Fri, 30 May 2014 14:41:41 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201405301441.s4UEff12099296@svn.freebsd.org> From: Koop Mast Date: Fri, 30 May 2014 14:41:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355853 - head/mail/libmapi X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2014 14:41:42 -0000 Author: kwm Date: Fri May 30 14:41:41 2014 New Revision: 355853 URL: http://svnweb.freebsd.org/changeset/ports/355853 QAT: https://qat.redports.org/buildarchive/r355853/ Log: Switch libmapi to use samba 4.1 by default, provide option if samba 4.0 is prefered. Lightly based on a patch by: Joe Maloney Modified: head/mail/libmapi/Makefile head/mail/libmapi/pkg-plist Modified: head/mail/libmapi/Makefile ============================================================================== --- head/mail/libmapi/Makefile Fri May 30 14:37:00 2014 (r355852) +++ head/mail/libmapi/Makefile Fri May 30 14:41:41 2014 (r355853) @@ -3,6 +3,7 @@ PORTNAME= libmapi PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://tracker.openchange.org/attachments/download/${DOWNLOADCODE}/ DISTNAME= openchange-${PORTVERSION}-${CODENAME} @@ -10,13 +11,13 @@ DISTNAME= openchange-${PORTVERSION}-${CO 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,13 +38,24 @@ SHEBANG_FILES= libmapi/conf/mparse.pl \ setup/openchange_provision OPTIONS_SUB= yes -OPTIONS_DEFINE= BOOST DOXYGEN +OPTIONS_DEFINE= BOOST DOXYGEN SAMBA40 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="" +SAMBA40_DESC= Build agains samba 4.0 instead of 4.1 + +.include + +.if ${PORT_OPTIONS:MSAMBA40} +SAMBA_DEP= samba4>=4.0.1:${PORTSDIR}/net/samba4 +PLIST_SUB+= SAMBA=samba4 +.else +SAMBA_DEP= samba41>=4.1.0:${PORTSDIR}/net/samba41 +PLIST_SUB+= SAMBA=samba41 +.endif CONFIGURE_ARGS+= --disable-pymapi # --enable-openchange-qt4 Compile OpenChange Qt4 wrapper. Modified: head/mail/libmapi/pkg-plist ============================================================================== --- head/mail/libmapi/pkg-plist Fri May 30 14:37:00 2014 (r355852) +++ head/mail/libmapi/pkg-plist Fri May 30 14:41:41 2014 (r355853) @@ -118,20 +118,20 @@ 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/%%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 @@ share/setup/profiles/oc_profiles_schema. @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