svn commit: r436122 - in head/security: krb5-113 krb5-114 krb5-115
Cy Schubert
cy at FreeBSD.org
Tue Mar 14 03:09:18 UTC 2017
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 <john at saltant.com>
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
More information about the svn-ports-all
mailing list