From owner-svn-ports-all@freebsd.org Mon Feb 11 12:49:53 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1464E14D6131; Mon, 11 Feb 2019 12:49:53 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD91E6BFE3; Mon, 11 Feb 2019 12:49:52 +0000 (UTC) (envelope-from lev@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A02927EBC; Mon, 11 Feb 2019 12:49:52 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1BCnqH2052915; Mon, 11 Feb 2019 12:49:52 GMT (envelope-from lev@FreeBSD.org) Received: (from lev@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1BCnqtC052914; Mon, 11 Feb 2019 12:49:52 GMT (envelope-from lev@FreeBSD.org) Message-Id: <201902111249.x1BCnqtC052914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lev set sender to lev@FreeBSD.org using -f From: "Lev A. Serebryakov" Date: Mon, 11 Feb 2019 12:49:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492691 - head/www/serf X-SVN-Group: ports-head X-SVN-Commit-Author: lev X-SVN-Commit-Paths: head/www/serf X-SVN-Commit-Revision: 492691 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AD91E6BFE3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 11 Feb 2019 12:49:53 -0000 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 -.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