From owner-svn-ports-all@freebsd.org Mon Aug 31 07:18:24 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 7EAB59C5B3B; Mon, 31 Aug 2015 07:18:24 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 56FD9CB; Mon, 31 Aug 2015 07:18:24 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7V7IO9w000782; Mon, 31 Aug 2015 07:18:24 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7V7INNd000780; Mon, 31 Aug 2015 07:18:23 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201508310718.t7V7INNd000780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 31 Aug 2015 07:18:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395651 - in head/security: krb5 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, 31 Aug 2015 07:18:24 -0000 Author: cy Date: Mon Aug 31 07:18:23 2015 New Revision: 395651 URL: https://svnweb.freebsd.org/changeset/ports/395651 Log: Fix build under 11-CURRENT. r378417 introduced a libreadline link workaround due to libtool not working with 11-CURRENT at the time. The workaround now causes grief under 11-CURRENT and needs to be removed. PR: 202782 Modified: head/security/krb5-112/Makefile head/security/krb5/Makefile Modified: head/security/krb5-112/Makefile ============================================================================== --- head/security/krb5-112/Makefile Mon Aug 31 05:44:56 2015 (r395650) +++ head/security/krb5-112/Makefile Mon Aug 31 07:18:23 2015 (r395651) @@ -3,7 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.12.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PKGNAMESUFFIX= -112 @@ -86,15 +86,9 @@ PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MREADLINE} -.if ${OSVERSION} >= 1100000 -# libtool has some gas with libreadline in 11-CURRENT. -BUILD_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline -LIB_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline -.else USES+= readline:port CONFIGURE_ARGS+= --with-readline .endif -.endif .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" Modified: head/security/krb5/Makefile ============================================================================== --- head/security/krb5/Makefile Mon Aug 31 05:44:56 2015 (r395650) +++ head/security/krb5/Makefile Mon Aug 31 07:18:23 2015 (r395651) @@ -3,7 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.13.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-signed @@ -30,6 +30,7 @@ USES= cpe gettext gmake perl5 libtool: gssapi:bootstrap,mit CONFIGURE_ARGS?= --enable-shared --without-system-verto \ --disable-rpath --localstatedir="${PREFIX}/var" +CONFIGURE_ARGS+= --disable-thread-support CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" @@ -85,13 +86,7 @@ PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MREADLINE} -.if ${OSVERSION} >= 1100000 -# libtool has some gas with libreadline in 11-CURRENT. -BUILD_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline -LIB_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline -.else USES+= readline:port -.endif CONFIGURE_ARGS+= --with-readline .endif