From owner-svn-ports-all@freebsd.org Tue Mar 14 03:09:18 2017 Return-Path: Delivered-To: svn-ports-all@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 324DED0B99E; Tue, 14 Mar 2017 03:09:18 +0000 (UTC) (envelope-from cy@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 035781AF2; Tue, 14 Mar 2017 03:09:17 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2E39HTR097092; Tue, 14 Mar 2017 03:09:17 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2E39GP6097089; Tue, 14 Mar 2017 03:09:16 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201703140309.v2E39GP6097089@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 14 Mar 2017 03:09:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436122 - in head/security: krb5-113 krb5-114 krb5-115 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 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: Tue, 14 Mar 2017 03:09:18 -0000 Author: cy Date: Tue Mar 14 03:09:16 2017 New Revision: 436122 URL: https://svnweb.freebsd.org/changeset/ports/436122 Log: New READLINE_PORT option to select to use readline in base or readline in ports. PR: 217552 Submitted by: John W. O'brien Differential Revision: D9889 Modified: head/security/krb5-113/Makefile head/security/krb5-114/Makefile head/security/krb5-115/Makefile Modified: head/security/krb5-113/Makefile ============================================================================== --- head/security/krb5-113/Makefile Tue Mar 14 03:06:23 2017 (r436121) +++ head/security/krb5-113/Makefile Tue Mar 14 03:09:16 2017 (r436122) @@ -42,7 +42,7 @@ CPE_PRODUCT= kerberos OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE OPTIONS_RADIO= CMD_LINE_EDITING -OPTIONS_RADIO_CMD_LINE_EDITING= READLINE LIBEDIT +OPTIONS_RADIO_CMD_LINE_EDITING= READLINE READLINE_PORT LIBEDIT KRB5_PDF_DESC= Install krb5 PDF documentation KRB5_HTML_DESC= Install krb5 HTML documentation DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names @@ -50,6 +50,9 @@ DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for- LDAP= Enable LDAP support LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap +READLINE_USES= readline +READLINE_PORT_DESC= Command line editing via devel/readline +READLINE_PORT_USES= readline:port LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit @@ -81,8 +84,8 @@ LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl, BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif -.if ${PORT_OPTIONS:MREADLINE} -USES+= readline +# OPTIONS helper causes conflicting with/without +.if ${PORT_OPTIONS:MREADLINE} || ${PORT_OPTIONS:MREADLINE_PORT} CONFIGURE_ARGS+= --with-readline .else CONFIGURE_ARGS+= --without-readline Modified: head/security/krb5-114/Makefile ============================================================================== --- head/security/krb5-114/Makefile Tue Mar 14 03:06:23 2017 (r436121) +++ head/security/krb5-114/Makefile Tue Mar 14 03:09:16 2017 (r436122) @@ -40,7 +40,7 @@ CPE_PRODUCT= kerberos OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE OPTIONS_RADIO= CMD_LINE_EDITING -OPTIONS_RADIO_CMD_LINE_EDITING= READLINE LIBEDIT +OPTIONS_RADIO_CMD_LINE_EDITING= READLINE READLINE_PORT LIBEDIT KRB5_PDF_DESC= Install krb5 PDF documentation KRB5_HTML_DESC= Install krb5 HTML documentation DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names @@ -48,6 +48,9 @@ DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for- LDAP= Enable LDAP support LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap +READLINE_USES= readline +READLINE_PORT_DESC= Command line editing via devel/readline +READLINE_PORT_USES= readline:port LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit @@ -79,8 +82,8 @@ LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl, BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif -.if ${PORT_OPTIONS:MREADLINE} -USES+= readline +# OPTIONS helper causes conflicting with/without +.if ${PORT_OPTIONS:MREADLINE} || ${PORT_OPTIONS:MREADLINE_PORT} CONFIGURE_ARGS+= --with-readline .else CONFIGURE_ARGS+= --without-readline Modified: head/security/krb5-115/Makefile ============================================================================== --- head/security/krb5-115/Makefile Tue Mar 14 03:06:23 2017 (r436121) +++ head/security/krb5-115/Makefile Tue Mar 14 03:09:16 2017 (r436122) @@ -40,7 +40,7 @@ CPE_PRODUCT= kerberos OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE OPTIONS_RADIO= CMD_LINE_EDITING -OPTIONS_RADIO_CMD_LINE_EDITING= READLINE LIBEDIT +OPTIONS_RADIO_CMD_LINE_EDITING= READLINE READLINE_PORT LIBEDIT KRB5_PDF_DESC= Install krb5 PDF documentation KRB5_HTML_DESC= Install krb5 HTML documentation DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names @@ -48,6 +48,9 @@ DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for- LDAP= Enable LDAP support LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap +READLINE_USES= readline +READLINE_PORT_DESC= Command line editing via devel/readline +READLINE_PORT_USES= readline:port LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit @@ -79,8 +82,8 @@ LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl, BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif -.if ${PORT_OPTIONS:MREADLINE} -USES+= readline +# OPTIONS helper causes conflicting with/without +.if ${PORT_OPTIONS:MREADLINE} || ${PORT_OPTIONS:MREADLINE_PORT} CONFIGURE_ARGS+= --with-readline .else CONFIGURE_ARGS+= --without-readline