diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2015-08-31 07:18:23 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2015-08-31 07:18:23 +0000 |
| commit | d12bdd828a7dd403c1bbd77b83811d1a7f354a14 (patch) | |
| tree | 039f803f95ab363faea0fa59f8d6c0c2900e7fb6 | |
| parent | www/py-pelican: Add description for MARKDOWN option (diff) | |
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
| -rw-r--r-- | security/krb5-112/Makefile | 8 | ||||
| -rw-r--r-- | security/krb5/Makefile | 9 |
2 files changed, 3 insertions, 14 deletions
diff --git a/security/krb5-112/Makefile b/security/krb5-112/Makefile index f4a3a3b8cd39..67a03ed2cf68 100644 --- a/security/krb5-112/Makefile +++ b/security/krb5-112/Makefile @@ -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}" diff --git a/security/krb5/Makefile b/security/krb5/Makefile index 831bb83ba3ab..4882e39ce7ee 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -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:build \ 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 |