upgrade to Curl 7.2.1

2000-09-06 20:50:13 +00:00 · 2000-09-06 20:50:13 +00:00 · 92ce5d1c49
commit 92ce5d1c49
parent e1b157a003
6 changed files with 96 additions and 22 deletions
--- a/net/curl/Makefile
+++ b/net/curl/Makefile
@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2000/07/22 20:49:51 brad Exp $
+# $OpenBSD: Makefile,v 1.15 2000/09/06 20:50:13 brad Exp $

-DISTNAME=	curl-6.5.2
+DISTNAME=	curl-7.2.1
 CATEGORIES=	net
-NEED_VERSION=	1.310
-MASTER_SITES=	http://curl.haxx.nu/stuff/ \
-		http://www.fts.frontec.se/~dast/stuff/ \
+NEED_VERSION=	1.324
+MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.rhrz.uni-bonn.de/pub-koeln/net/inet/ \
 		ftp://ftp.win.or.jp/pub/network/www/misc/ \
 		ftp://crydee.sai.msu.ru/zeus/unix/WWW/tools/mirror/
@ -19,19 +18,13 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

 CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=	CPPFLAGS="-I/usr/include/ssl"
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
+CONFIGURE_ARGS+= --enable-static --disable-thread

-MAKEFILES=	Makefile src/Makefile
-
-post-configure:
-.for x in ${MAKEFILES}
-	@mv ${WRKSRC}/${x} ${WRKSRC}/${x}.pre_sed
-	@sed -e s#@SHELL@#${SH}# ${WRKSRC}/${x}.pre_sed > ${WRKSRC}/${x}
-.endfor
+DOCS=	CHANGES LEGAL MPL-1.0.txt README

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/curl
-	cd ${WRKSRC}; ${INSTALL_DATA} CHANGES INSTALL LEGAL MPL-1.0.txt \
-		README RESOURCES TODO ${PREFIX}/share/doc/curl
+	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/curl

 .include <bsd.port.mk>
--- a/net/curl/files/md5
+++ b/net/curl/files/md5
@ -1,3 +1,3 @@
-MD5 (curl-6.5.2.tar.gz) = af75db1f23a81fd8ea262677f870bca1
-RMD160 (curl-6.5.2.tar.gz) = 3ffb11a036323bf8ca015aaef31722f1e8957e61
-SHA1 (curl-6.5.2.tar.gz) = 650750770f25b391f49854bbcf55556d06e710f5
+MD5 (curl-7.2.1.tar.gz) = f74497cf49e1f61bb1f07e9353606f38
+RMD160 (curl-7.2.1.tar.gz) = 195928b7a333593585e5998b86d83ee129240a4d
+SHA1 (curl-7.2.1.tar.gz) = 2f0fce7515b36a38a6322db0f09fe440b20a34f9
--- a/net/curl/patches/patch-ltconfig
+++ b/net/curl/patches/patch-ltconfig
@ -0,0 +1,10 @@
+--- ltconfig.orig	Wed Sep  6 16:21:08 2000
+++ ltconfig	Wed Sep  6 16:21:32 2000
+@@ -2028,6 +2028,7 @@
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+  deplibs_check_method='pass_all'
+   ;;
+ 
+ os2*)
--- a/net/curl/patches/patch-ltmain.sh
+++ b/net/curl/patches/patch-ltmain.sh
@ -0,0 +1,52 @@
+--- ltmain.sh.orig	Wed Sep  6 16:20:23 2000
+++ ltmain.sh	Wed Sep  6 16:20:37 2000
+@@ -2623,7 +2623,7 @@
+ 	  # linked before any other PIC object.  But we must not use
+ 	  # pic_flag when linking with -static.  The problem exists in
+ 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ 	    case "$compile_command " in
+ 	    *" -static "*) ;;
+ 	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
+@@ -3567,40 +3567,6 @@
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
--- a/net/curl/pkg/PFRAG.shared
+++ b/net/curl/pkg/PFRAG.shared
@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2000/09/06 20:50:15 brad Exp $
+lib/libcurl.so.0.0
+DYNLIBDIR(%B)
--- a/net/curl/pkg/PLIST
+++ b/net/curl/pkg/PLIST
@ -1,11 +1,27 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/07/22 20:49:51 brad Exp $
+@comment $OpenBSD: PLIST,v 1.3 2000/09/06 20:50:15 brad Exp $
 bin/curl
+include/curl/curl.h
+include/curl/easy.h
+include/curl/mprintf.h
+include/curl/stdcheaders.h
+include/curl/types.h
+lib/libcurl.a
+lib/libcurl.la
+%%SHARED%%
 man/man1/curl.1
+man/man3/curl_easy_cleanup.3
+man/man3/curl_easy_init.3
+man/man3/curl_easy_perform.3
+man/man3/curl_easy_setopt.3
+man/man3/curl_formparse.3
+man/man3/curl_getdate.3
+man/man3/curl_getenv.3
+man/man3/curl_slist_append.3
+man/man3/curl_slist_free_all.3
+man/man3/curl_version.3
 share/doc/curl/CHANGES
-share/doc/curl/INSTALL
 share/doc/curl/LEGAL
 share/doc/curl/MPL-1.0.txt
 share/doc/curl/README
-share/doc/curl/RESOURCES
-share/doc/curl/TODO
+@dirrm include/curl
@dirrm share/doc/curl