- maintenance update to 7.17.1

- libidn pulls in a gettext dependency - make sure we link against the correct libcurl
avsm · Nov 14, 2007 · e4549bb · e4549bb
1 parent 294a7ff
commit e4549bb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/net/curl/Makefile b/net/curl/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.58 2007/10/02 16:52:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.59 2007/11/14 19:38:58 naddy Exp $
 
 COMMENT=	get files from FTP, Gopher, HTTP or HTTPS servers
 
-DISTNAME=	curl-7.17.0
-SHARED_LIBS +=  curl                 7.0      # .4.0
+DISTNAME=	curl-7.17.1
+SHARED_LIBS +=  curl                 8.0      # .4.1
 CATEGORIES=	net
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/ \
@@ -24,15 +24,18 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MODULES=	devel/gettext
 LIB_DEPENDS=	idn.>=16::devel/libidn
-WANTLIB=	c crypto iconv ssl z
+WANTLIB=	c crypto ssl z
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-random="/dev/arandom" \
 		--with-libidn=${LOCALBASE} \
 		--without-libssh2
+# don't link against ${LOCALBASE}/lib/libcurl
+CONFIGURE_ENV=	LDFLAGS="-L${WRKBUILD}/lib/.libs"
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp

diff --git a/net/curl/distinfo b/net/curl/distinfo
@@ -1,5 +1,5 @@
-MD5 (curl-7.17.0.tar.gz) = DhLgESWJIGtKj0mkFBRaAQ==
-RMD160 (curl-7.17.0.tar.gz) = f29n/bRSc/ojgHy+gV4BGUsvOXo=
-SHA1 (curl-7.17.0.tar.gz) = mgyt4vTysDQ71VzaEO8KbeSjAno=
-SHA256 (curl-7.17.0.tar.gz) = 7bNM27gB34yIZHzlXVHUVSun1Je06gF119CnnYI+Hqg=
-SIZE (curl-7.17.0.tar.gz) = 2195377
+MD5 (curl-7.17.1.tar.gz) = lwWDTHGWbdYzqECjr1b1hg==
+RMD160 (curl-7.17.1.tar.gz) = yg4RpaPlidlrPfyRNUXVm3DFw+E=
+SHA1 (curl-7.17.1.tar.gz) = wKJIOhykTnR80LwdB1eDS2AOR1Y=
+SHA256 (curl-7.17.1.tar.gz) = D0FaMmtjHNkrdaIBesb2Ye1Bpk79cYAHJiMHuPB/aaE=
+SIZE (curl-7.17.1.tar.gz) = 2225788