From owner-svn-ports-head@FreeBSD.ORG Wed Apr 29 17:47:39 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D9E04C8; Wed, 29 Apr 2015 17:47:39 +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 31EFC101E; Wed, 29 Apr 2015 17:47:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3THldKZ035180; Wed, 29 Apr 2015 17:47:39 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3THldtK035179; Wed, 29 Apr 2015 17:47:39 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201504291747.t3THldtK035179@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Wed, 29 Apr 2015 17:47:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384999 - head/mail/cyrus-imapd25 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 17:47:39 -0000 Author: ume Date: Wed Apr 29 17:47:38 2015 New Revision: 384999 URL: https://svnweb.freebsd.org/changeset/ports/384999 Log: - Disable GSSAPI_BASE on 8.X. It seems configure fails to detect libkrb5 on it. [1] - Suppress empty share/doc/cyrus-imapd/man directory. - Since vzic is not built now, we don't need to depend upon glib20. Spotted by: pkg-fallout [1] Modified: head/mail/cyrus-imapd25/Makefile Modified: head/mail/cyrus-imapd25/Makefile ============================================================================== --- head/mail/cyrus-imapd25/Makefile Wed Apr 29 17:44:39 2015 (r384998) +++ head/mail/cyrus-imapd25/Makefile Wed Apr 29 17:47:38 2015 (r384999) @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.5.1 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ http://cyrusimap.org/releases/ @@ -59,13 +59,11 @@ CLAMAV_LIB_DEPENDS= libclamav.so:${PORTS DRAC_DESC= Enable DRAC support DRAC_CONFIGURE_ON= --with-drac=${LOCALBASE} DRAC_BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac -# XXX: Does not install vzic for now. -# Only vzic depends upon glib. HTTP_DESC= Enable HTTP (beta quality) HTTP_CONFIGURE_ENABLE= http HTTP_LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson \ libical.so:${PORTSDIR}/devel/libical -HTTP_USE= GNOME=libxml2,glib20 +HTTP_USE= GNOME=libxml2 IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) @@ -92,12 +90,17 @@ SNMP_CONFIGURE_ON= --with-snmp=${LOCALBA SNMP_CONFIGURE_OFF= --with-snmp=no SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} +UNAMER!= uname -r +OSMAJOR= ${UNAMER:C/[.-].*//} + OPTIONS_RADIO= GSSAPI OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT .if exists(/usr/lib/libkrb5.a) OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE +.if ${OSMAJOR} >= 9 OPTIONS_DEFAULT+= GSSAPI_BASE .endif +.endif GSSAPI_BASE_DESC= Use Heimdal in base GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ @@ -230,7 +233,8 @@ post-install: @${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/man + @${MKDIR} ${STAGEDIR}${DOCSDIR} +# @${MKDIR} ${STAGEDIR}${DOCSDIR}/man # @${MKDIR} ${STAGEDIR}${DOCSDIR}/text .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${STAGEDIR}${DOCSDIR} @@ -254,7 +258,7 @@ post-install: # @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST} #.endfor # @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST} - @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} +# @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}