upgrade to cURL 7.10.5
This commit is contained in:
brad
parent
7f3a36ffd4
commit
418c26cc59
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.40 2003/05/27 14:35:13 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.41 2003/06/01 21:43:49 brad Exp $
|
||||
|
||||
COMMENT= "get files from FTP, Gopher, HTTP or HTTPS servers"
|
||||
|
||||
DISTNAME= curl-7.10.3
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
DISTNAME= curl-7.10.5
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= http://curl.haxx.se/download/ \
|
||||
ftp://ftp.sunet.se/pub/www/utilities/curl/ \
|
||||
@ -27,14 +26,13 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
SEPARATE_BUILD= concurrent
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+=--enable-static \
|
||||
--with-random="/dev/arandom"
|
||||
CONFIGURE_ARGS+= --with-random="/dev/arandom"
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/curl
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
|
||||
cd ${WRKSRC}; ${INSTALL_DATA} README ${PREFIX}/share/doc/curl
|
||||
cd ${WRKSRC}; ${INSTALL_DATA} curl-mode.el \
|
||||
cd ${WRKSRC}; ${INSTALL_DATA} curl-style.el \
|
||||
${PREFIX}/share/emacs/site-lisp
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (curl-7.10.3.tar.gz) = a76be06cd902ddb58cbec9335fa4e080
|
||||
RMD160 (curl-7.10.3.tar.gz) = 1e67352c8726f708fa3e1a11731e1074e59ecb2a
|
||||
SHA1 (curl-7.10.3.tar.gz) = e8a759e168f52f89de1edcf9b79b7e7c3a9b27a3
|
||||
MD5 (curl-7.10.5.tar.gz) = b4883c1fc97c036733047c31e7ef7225
|
||||
RMD160 (curl-7.10.5.tar.gz) = 89c5ed08027f73b6f18ead09b79e6718ec4fe329
|
||||
SHA1 (curl-7.10.5.tar.gz) = 91bf5f16460e996be68de68f3c2029a827abafb9
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.6 2003/02/07 03:40:25 brad Exp $
|
||||
--- configure.orig Tue Jan 7 06:14:02 2003
|
||||
+++ configure Thu Feb 6 22:13:17 2003
|
||||
@@ -6827,7 +6827,7 @@ else
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
export_dynamic_flag_spec='${wl}-E'
|
||||
else
|
||||
@@ -6837,7 +6837,7 @@ else
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
;;
|
||||
esac
|
||||
@@ -7354,6 +7354,8 @@ openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
+ sys_lib_search_path_spec="/usr/lib"
|
||||
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
case "$host_os" in
|
||||
openbsd2.[89] | openbsd2.[89].*)
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-curl-config_in,v 1.1 2003/02/14 02:38:15 brad Exp $
|
||||
--- curl-config.in.orig Thu Feb 13 21:21:37 2003
|
||||
+++ curl-config.in Thu Feb 13 21:21:48 2003
|
||||
@@ -107,7 +107,7 @@ while test $# -gt 0; do
|
||||
;;
|
||||
|
||||
--cflags)
|
||||
- #echo -I@includedir@
|
||||
+ echo -I@includedir@
|
||||
echo ""
|
||||
;;
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
$OpenBSD: patch-ltmain.sh,v 1.5 2001/11/10 04:24:44 brad Exp $
|
||||
--- ltmain.sh.orig Mon Oct 22 02:07:21 2001
|
||||
+++ ltmain.sh Fri Nov 9 22:49:13 2001
|
||||
@@ -1060,6 +1060,17 @@ compiler."
|
||||
continue
|
||||
;;
|
||||
|
||||
+ -pthread)
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -4460,40 +4471,6 @@ relink_command=\"$relink_command\""
|
||||
# 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 the \`-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
|
||||
;;
|
||||
|
||||
44
net/curl/patches/patch-ltmain_sh
Normal file
44
net/curl/patches/patch-ltmain_sh
Normal file
@ -0,0 +1,44 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.1 2003/06/01 21:43:49 brad Exp $
|
||||
--- ltmain.sh.orig Fri May 9 04:15:40 2003
|
||||
+++ ltmain.sh Sun Jun 1 16:09:49 2003
|
||||
@@ -5696,40 +5707,6 @@ relink_command=\"$relink_command\""
|
||||
# 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 the \`-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
|
||||
;;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.10 2003/05/27 14:35:13 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.11 2003/06/01 21:43:49 brad Exp $
|
||||
bin/curl
|
||||
bin/curl-config
|
||||
include/curl/curl.h
|
||||
@ -47,9 +47,8 @@ man/man3/libcurl-multi.3
|
||||
man/man3/libcurl.3
|
||||
share/curl/curl-ca-bundle.crt
|
||||
share/doc/curl/README
|
||||
share/emacs/site-lisp/curl-mode.el
|
||||
share/emacs/site-lisp/curl-style.el
|
||||
@comment @dirrm share/emacs/site-lisp
|
||||
@comment @dirrm share/emacs
|
||||
@dirrm share/doc/curl
|
||||
@dirrm share/curl
|
||||
@dirrm include/curl
|
||||
|
||||
Loading…
Reference in New Issue
Block a user