Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Nov 2015 11:16:30 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
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
Message-ID:  <201511121116.tACBGUvj093695@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
 
-.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 <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511121116.tACBGUvj093695>