From owner-svn-ports-head@freebsd.org Thu Nov 12 11:16:32 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41E95A2D15A; Thu, 12 Nov 2015 11:16:32 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E7F321B4A; Thu, 12 Nov 2015 11:16:31 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tACBGVBN093697; Thu, 12 Nov 2015 11:16:31 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tACBGUvj093695; Thu, 12 Nov 2015 11:16:30 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201511121116.tACBGUvj093695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Thu, 12 Nov 2015 11:16:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401323 - in head/security: cyrus-sasl2 cyrus-sasl2-gssapi 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: Thu, 12 Nov 2015 11:16:32 -0000 Author: ume Date: Thu Nov 12 11:16:30 2015 New Revision: 401323 URL: https://svnweb.freebsd.org/changeset/ports/401323 Log: Use OPTIONS helper. Modified: head/security/cyrus-sasl2-gssapi/Makefile head/security/cyrus-sasl2/Makefile Modified: head/security/cyrus-sasl2-gssapi/Makefile ============================================================================== --- head/security/cyrus-sasl2-gssapi/Makefile Thu Nov 12 11:10:28 2015 (r401322) +++ head/security/cyrus-sasl2-gssapi/Makefile Thu Nov 12 11:16:30 2015 (r401323) @@ -56,6 +56,10 @@ HEIMDAL_DESC= Use Heimdal from ports HEIMDAL_USES= gssapi:heimdal,flags HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal +HEIMDAL_PLIST_FILES= lib/sasl2/libgs2.a \ + lib/sasl2/libgs2.so \ + lib/sasl2/libgs2.so.3 \ + lib/sasl2/libgs2.so.3.0.0 MIT_DESC= Use MIT Kerberos V5 MIT_USES= gssapi:mit MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ @@ -68,13 +72,6 @@ PLIST_FILES= lib/sasl2/libgssapiv2.a \ .include -.if ${PORT_OPTIONS:MHEIMDAL} -PLIST_FILES+= lib/sasl2/libgs2.a \ - lib/sasl2/libgs2.so \ - lib/sasl2/libgs2.so.3 \ - lib/sasl2/libgs2.so.3.0.0 -.endif - .if ${OPENSSLBASE} == /usr CONFIGURE_ARGS+=--with-openssl=yes .else Modified: head/security/cyrus-sasl2/Makefile ============================================================================== --- head/security/cyrus-sasl2/Makefile Thu Nov 12 11:10:28 2015 (r401322) +++ head/security/cyrus-sasl2/Makefile Thu Nov 12 11:16:30 2015 (r401323) @@ -155,8 +155,7 @@ post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${PERL} -wpi.bak \ -e 's/\$$\*\.Tpo/$$&.$$./g' -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} @@ -170,6 +169,5 @@ post-install: .endfor @${INSTALL_DATA} ${FILESDIR}/Sendmail.README \ ${STAGEDIR}${DOCSDIR} -.endif .include