summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-06-10 21:39:00 +0000
committerjmmv <jmmv@pkgsrc.org>2004-06-10 21:39:00 +0000
commit2f7ce5e2eef63ce18bd69ab7e4014f79800e7974 (patch)
tree3cd3704fa473fb84950a9a3cffe241c75acaab3a
parentfec33c7153ffa0598ebae6c839c4861edcb806fb (diff)
downloadpkgsrc-2f7ce5e2eef63ce18bd69ab7e4014f79800e7974.tar.gz
Fix detection of curl: the configure script was trying to locate a
deprecated (?) function. Even though, the module seems to build correctly with the current version of curl in pkgsrc, so change the check to look for an existent function. This fixes the build of the curl module, thus solving the problem exposed in latest kristerw@'s bulk build in NetBSD 2.0_BETA/i386. Not bumping PKGREVISION because this was not packaged in the first place.
-rw-r--r--archivers/libcomprex/distinfo3
-rw-r--r--archivers/libcomprex/patches/patch-ac30
2 files changed, 32 insertions, 1 deletions
diff --git a/archivers/libcomprex/distinfo b/archivers/libcomprex/distinfo
index 391c6d237ff..ccee0f10c2d 100644
--- a/archivers/libcomprex/distinfo
+++ b/archivers/libcomprex/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/18 16:22:13 cjep Exp $
+$NetBSD: distinfo,v 1.2 2004/06/10 21:39:00 jmmv Exp $
SHA1 (libcomprex-0.3.2.tar.gz) = d98667dbff85147ef0ccf923c8b168f7d6083fe5
Size (libcomprex-0.3.2.tar.gz) = 558088 bytes
SHA1 (patch-aa) = 967fdbf14cf06ff1f483df16bfe45226a8b64e5c
SHA1 (patch-ab) = 851286dfb8a930d839f509cf3ee1dd09945b22c3
+SHA1 (patch-ac) = 16d7c70e52296de20d8eba392b8e231f3bdf67e8
diff --git a/archivers/libcomprex/patches/patch-ac b/archivers/libcomprex/patches/patch-ac
new file mode 100644
index 00000000000..7146232870f
--- /dev/null
+++ b/archivers/libcomprex/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2004/06/10 21:39:00 jmmv Exp $
+
+--- configure.orig 2004-06-10 23:30:16.000000000 +0200
++++ configure
+@@ -8433,9 +8433,9 @@ fi
+
+
+ if test "x$enable_scheme_mods" = "xyes" -o "x$static_scheme_curl" = "xyes"; then
+- echo $ac_n "checking for curl_formparse in -lcurl""... $ac_c" 1>&6
+-echo "configure:8438: checking for curl_formparse in -lcurl" >&5
+-ac_lib_var=`echo curl'_'curl_formparse | sed 'y%./+-%__p_%'`
++ echo $ac_n "checking for curl_easy_init in -lcurl""... $ac_c" 1>&6
++echo "configure:8438: checking for curl_easy_init in -lcurl" >&5
++ac_lib_var=`echo curl'_'curl_easy_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8447,10 +8447,10 @@ cat > conftest.$ac_ext <<EOF
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char curl_formparse();
++char curl_easy_init();
+
+ int main() {
+-curl_formparse()
++curl_easy_init()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:8457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then