Use ports/security/openssl/Makefile.ssl instead of USE_OPENSSL
to prevent conflicts between the base system and port OpenSSL libraries. Bump PORTREVISION. Reported by: Stephen Cravey <clists@www.gotbrains.org> Submitted by: Scot Hetzel <hetzels@westbend.net>
This commit is contained in:
parent
748cf376cd
commit
e416b581e7
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=76916
1 changed files with 8 additions and 6 deletions
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= curl
|
||||
PORTVERSION= 7.10.3
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= ftp ipv6 www
|
||||
MASTER_SITES= http://curl.haxx.se/download/ \
|
||||
${MASTER_SITE_SOURCEFORGE} \
|
||||
|
@ -47,8 +47,13 @@ SHLIB_VER= 2
|
|||
MAKE_ENV= SHLIB_VER="${SHLIB_VER}"
|
||||
PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_BZIP2= yes
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if !defined(WITHOUT_SSL)
|
||||
USE_OPENSSL= YES
|
||||
.include "${PORTSDIR}/security/openssl/Makefile.ssl"
|
||||
CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE}
|
||||
.else
|
||||
CONFIGURE_ARGS= --without-ssl
|
||||
|
@ -58,9 +63,6 @@ CONFIGURE_ARGS= --without-ssl
|
|||
CONFIGURE_ARGS += --with-krb4=/usr
|
||||
.endif
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_BZIP2= yes
|
||||
|
||||
# Note: some of these tests seem to intermitently fail on my system.
|
||||
# I don't know why they would do that, yet.
|
||||
test: build
|
||||
|
@ -72,4 +74,4 @@ post-install:
|
|||
${CP} -r ${WRKSRC}/docs/* ${DOCSDIR}/
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
Loading…
Reference in a new issue