Date: Tue, 14 Mar 2017 02:59:39 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436119 - in head/security: krb5-113 krb5-114 krb5-115 Message-ID: <201703140259.v2E2xdTm091804@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Mar 14 02:59:38 2017 New Revision: 436119 URL: https://svnweb.freebsd.org/changeset/ports/436119 Log: Use options helpers. PR: 217552 Submitted by: John W. O'brien <john@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 02:55:24 2017 (r436118) +++ head/security/krb5-113/Makefile Tue Mar 14 02:59:38 2017 (r436119) @@ -46,7 +46,12 @@ OPTIONS_RADIO_CMD_LINE_EDITING= READLINE 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 +DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm LDAP= Enable LDAP support +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_WITH= ldap +LIBEDIT_USES= libedit +LIBEDIT_CONFIGURE_WITH= libedit .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} @@ -76,15 +81,6 @@ LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl, BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif -.if ${PORT_OPTIONS:MDNS_FOR_REALM} -CONFIGURE_ARGS+= --enable-dns-for-realm -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --with-ldap -.endif - .if ${PORT_OPTIONS:MREADLINE} USES+= readline CONFIGURE_ARGS+= --with-readline @@ -92,13 +88,6 @@ CONFIGURE_ARGS+= --with-readline CONFIGURE_ARGS+= --without-readline .endif -.if ${PORT_OPTIONS:MLIBEDIT} -USES+= libedit -CONFIGURE_ARGS+= --with-libedit -.else -CONFIGURE_ARGS+= --without-libedit -.endif - .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif Modified: head/security/krb5-114/Makefile ============================================================================== --- head/security/krb5-114/Makefile Tue Mar 14 02:55:24 2017 (r436118) +++ head/security/krb5-114/Makefile Tue Mar 14 02:59:38 2017 (r436119) @@ -44,7 +44,12 @@ OPTIONS_RADIO_CMD_LINE_EDITING= READLINE 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 +DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm LDAP= Enable LDAP support +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_WITH= ldap +LIBEDIT_USES= libedit +LIBEDIT_CONFIGURE_WITH= libedit .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} @@ -74,15 +79,6 @@ LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl, BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif -.if ${PORT_OPTIONS:MDNS_FOR_REALM} -CONFIGURE_ARGS+= --enable-dns-for-realm -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --with-ldap -.endif - .if ${PORT_OPTIONS:MREADLINE} USES+= readline CONFIGURE_ARGS+= --with-readline @@ -90,13 +86,6 @@ CONFIGURE_ARGS+= --with-readline CONFIGURE_ARGS+= --without-readline .endif -.if ${PORT_OPTIONS:MLIBEDIT} -USES+= libedit -CONFIGURE_ARGS+= --with-libedit -.else -CONFIGURE_ARGS+= --without-libedit -.endif - .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif Modified: head/security/krb5-115/Makefile ============================================================================== --- head/security/krb5-115/Makefile Tue Mar 14 02:55:24 2017 (r436118) +++ head/security/krb5-115/Makefile Tue Mar 14 02:59:38 2017 (r436119) @@ -44,7 +44,12 @@ OPTIONS_RADIO_CMD_LINE_EDITING= READLINE 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 +DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm LDAP= Enable LDAP support +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_WITH= ldap +LIBEDIT_USES= libedit +LIBEDIT_CONFIGURE_WITH= libedit .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} @@ -74,15 +79,6 @@ LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl, BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif -.if ${PORT_OPTIONS:MDNS_FOR_REALM} -CONFIGURE_ARGS+= --enable-dns-for-realm -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --with-ldap -.endif - .if ${PORT_OPTIONS:MREADLINE} USES+= readline CONFIGURE_ARGS+= --with-readline @@ -90,13 +86,6 @@ CONFIGURE_ARGS+= --with-readline CONFIGURE_ARGS+= --without-readline .endif -.if ${PORT_OPTIONS:MLIBEDIT} -USES+= libedit -CONFIGURE_ARGS+= --with-libedit -.else -CONFIGURE_ARGS+= --without-libedit -.endif - .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703140259.v2E2xdTm091804>