diff options
| author | roam <roam@FreeBSD.org> | 2003-03-05 10:43:08 +0000 |
|---|---|---|
| committer | roam <roam@FreeBSD.org> | 2003-03-05 10:43:08 +0000 |
| commit | 580fe350a8b55de629bf865e9c875613dab9df24 (patch) | |
| tree | 2ec4c7161d7d8940ea4e20f84e6b83e1ef6677e7 /ftp/curl | |
| parent | 9dffed9ac62756efc5608a973c522223da2c6829 (diff) | |
| download | FreeBSD-ports-580fe350a8b55de629bf865e9c875613dab9df24.zip FreeBSD-ports-580fe350a8b55de629bf865e9c875613dab9df24.tar.gz | |
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>
Diffstat (limited to 'ftp/curl')
| -rw-r--r-- | ftp/curl/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index f0dcdc7..459bd27 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -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> |
