Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Feb 2019 12:49:52 +0000 (UTC)
From:      "Lev A. Serebryakov" <lev@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492691 - head/www/serf
Message-ID:  <201902111249.x1BCnqtC052914@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lev
Date: Mon Feb 11 12:49:52 2019
New Revision: 492691
URL: https://svnweb.freebsd.org/changeset/ports/492691

Log:
    Rename Kerberos-related options to system-wide names.
  
  PR:		235584
  Submitted by:	prj@rootwyrm.com

Modified:
  head/www/serf/Makefile

Modified: head/www/serf/Makefile
==============================================================================
--- head/www/serf/Makefile	Mon Feb 11 12:00:30 2019	(r492690)
+++ head/www/serf/Makefile	Mon Feb 11 12:49:52 2019	(r492691)
@@ -18,15 +18,15 @@ LIB_DEPENDS+=	libapr-1.so:devel/apr1
 USES=		scons ssl tar:bzip2 cpe
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_RADIO=	KERBEROS
-OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE
+OPTIONS_DEFINE=		DOCS
+OPTIONS_RADIO=		KERBEROS
+OPTIONS_RADIO_KERBEROS=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
-HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
-HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
-MIT_DESC=		MIT Kerberos (security/krb5)
-MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
-HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
+GSSAPI_BASE_DESC=		Heimdal Kerberos (base)
+GSSAPI_HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
+GSSAPI_MIT_DESC=		MIT Kerberos (security/krb5)
+GSSAPI_HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
+GSSAPI_MIT_LIB_DEPENDS=		libkrb5.so.3:security/krb5
 
 SCONS_ARGS=	APR=${LOCALBASE}/bin/apr-1-config
 SCONS_ARGS+=	APU=${LOCALBASE}/bin/apu-1-config
@@ -39,10 +39,10 @@ TEST_TARGET=	check  # some tests fail
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MHEIMDAL_BASE}
+.if ${PORT_OPTIONS:MGSSAPI_BASE}
 SCONS_ARGS+=	GSSAPI="/usr"
 .endif
-.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL}
+.if ${PORT_OPTIONS:MGSSAPI_MIT} || ${PORT_OPTIONS:MGSAPI_HEIMDAL}
 SCONS_ARGS+=    GSSAPI="${LOCALBASE}"
 .endif
 



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