From owner-svn-ports-all@freebsd.org Mon Oct 19 07:17:48 2015 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 D0FC5A10610; Mon, 19 Oct 2015 07:17:48 +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 8165A366; Mon, 19 Oct 2015 07:17:48 +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 t9J7HlXr086901; Mon, 19 Oct 2015 07:17:47 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9J7Hl3g086900; Mon, 19 Oct 2015 07:17:47 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201510190717.t9J7Hl3g086900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 19 Oct 2015 07:17:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399632 - head/security/krb5-112 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.20 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, 19 Oct 2015 07:17:48 -0000 Author: cy Date: Mon Oct 19 07:17:47 2015 New Revision: 399632 URL: https://svnweb.freebsd.org/changeset/ports/399632 Log: Fix READLINE option. Add support for libedit (LIBEDIT option). Both command line editing options now supported by RADIO button. Fix typo in gssapi: bootstrap. Modified: head/security/krb5-112/Makefile Modified: head/security/krb5-112/Makefile ============================================================================== --- head/security/krb5-112/Makefile Mon Oct 19 07:13:33 2015 (r399631) +++ head/security/krb5-112/Makefile Mon Oct 19 07:17:47 2015 (r399632) @@ -28,7 +28,7 @@ USE_LDCONFIG= yes USE_CSTD= gnu99 GNU_CONFIGURE= yes USES= cpe gettext gmake perl5 libtool:build \ - gssapi:boostrap,mit + gssapi:bootstrap,mit pkgconfig:both CONFIGURE_ARGS?= --enable-shared --without-system-verto \ --disable-rpath --localstatedir="${PREFIX}/var" CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" @@ -38,8 +38,10 @@ CPE_VENDOR= mit CPE_VERSION= 5-${PORTVERSION} CPE_PRODUCT= kerberos -OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP READLINE +OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML +OPTIONS_RADIO= CMD_LINE_EDITING +OPTIONS_RADIO_CMD_LINE_EDITING= READLINE 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 @@ -54,7 +56,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSS USE_OPENSSL= yes USE_RC_SUBR= kpropd -.include +.include # Fix up -Wl,-rpath in LDFLAGS .if !empty(KRB5_HOME) @@ -86,8 +88,17 @@ PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MREADLINE} -USES+= readline:port +USES+= readline CONFIGURE_ARGS+= --with-readline +.else +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} != "" @@ -150,4 +161,4 @@ post-install: @${ECHO} "for more information. " @${ECHO} "------------------------------------------------------" -.include +.include