upgrade to curl-7.6.1 (ok'd by brad@)

This commit is contained in:
obecian 2001-02-18 21:49:36 +00:00
parent dda4bdbd3f
commit 48f00f9355
3 changed files with 44 additions and 15 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.21 2001/01/28 01:37:55 brad Exp $
# $OpenBSD: Makefile,v 1.22 2001/02/18 21:49:36 obecian Exp $
DISTNAME= curl-7.6
DISTNAME= curl-7.6.1
CATEGORIES= net
NEED_VERSION= 1.336
MASTER_SITES= http://curl.haxx.se/download/ \

View File

@ -1,3 +1,3 @@
MD5 (curl-7.6.tar.gz) = 580ffaaf346b28f14ee8f3ddb0e76ec0
RMD160 (curl-7.6.tar.gz) = 6c4d77f6c3b25a4e8828f16aecbd7450cc55d9a7
SHA1 (curl-7.6.tar.gz) = 55add338ef066b89ee8bd4d40d02b1d8edd29047
MD5 (curl-7.6.1.tar.gz) = 89f149aaeeb4e92d3ebd88d5936264b6
RMD160 (curl-7.6.1.tar.gz) = 978de7139bedfa8a1f38e659704df0585011c618
SHA1 (curl-7.6.1.tar.gz) = f7b440a983315b57ce36e9f73804bcbe6449f478

View File

@ -1,16 +1,45 @@
--- ltmain.sh.orig Sat Oct 21 13:54:20 2000
+++ ltmain.sh Sat Oct 21 13:54:11 2000
@@ -1799,6 +1799,9 @@
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
--- ltmain.sh.orig Thu Jul 27 02:16:06 2000
+++ ltmain.sh Sun Feb 18 13:02:19 2001
@@ -1079,6 +1079,17 @@
# These systems don't actually have c library (as such)
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
esac
elif test "$arg" = "-lm"; then
case "$host" in
@@ -1091,6 +1102,10 @@
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1795,6 +1810,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3570,6 @@
*-*-rhapsody*)
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
@@ -3567,40 +3585,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0