kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build under 11-CURRENT. r378417 introduced a libreadline link

Browse source 
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
This commit is contained in:
Cy Schubert 2015-08-31 07:18:23 +00:00
parent 19ce0adeeb
commit d12bdd828a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=395651
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
security/krb5-112/Makefile
View file

@ -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}"

9
security/krb5/Makefile
View file

@ -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