summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2013-10-22 12:15:53 +0000
committeradam <adam@pkgsrc.org>2013-10-22 12:15:53 +0000
commita9c75bd0cb9c791285a822cca96ec9f91dee2f34 (patch)
tree4b3323cadfe79d7a4ed4b856ce86e6dcd65a856b
parentc474186a34eada8afa0967105e3907db613ed749 (diff)
downloadpkgsrc-a9c75bd0cb9c791285a822cca96ec9f91dee2f34.tar.gz
Changes 0.9.31:
* Fixing build issues on OS X with CLOCK_MONOTONIC not being implemented on OS X. * Make libmicrohttpd play nicely with upcoming libgcrypt 1.6.0. * Improved configure checks for cURL. * Signal connection termination as OK (and not as ERROR) if the stream was terminated by the callback returning MHD_CONTENT_READER_END_OF_STREAM. Also, release response mutex before calling the termination callback, to avoid possible deadlock if the client destroys the response in the termination callback (due to non-recursiveness of the lock). * Adding #define MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN. * Also pass MHD connection handle in URI log callback. * Improved check for proper OpenSSL version for libmicrospdy. * Set IPV6_V6ONLY socket option correctly when IPv6 is enabled (MHD_USE_IPv6) but not dual stack (MHD_USE_DUAL_STACK).
-rw-r--r--www/libmicrohttpd/Makefile19
-rw-r--r--www/libmicrohttpd/buildlink3.mk4
-rw-r--r--www/libmicrohttpd/distinfo8
3 files changed, 16 insertions, 15 deletions
diff --git a/www/libmicrohttpd/Makefile b/www/libmicrohttpd/Makefile
index 2e84dbe03d5..8cd3e60399e 100644
--- a/www/libmicrohttpd/Makefile
+++ b/www/libmicrohttpd/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2013/02/06 23:24:01 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.16 2013/10/22 12:15:53 adam Exp $
-DISTNAME= libmicrohttpd-0.9.25
-PKGREVISION= 1
+DISTNAME= libmicrohttpd-0.9.31
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GNU:=libmicrohttpd/}
@@ -11,15 +9,18 @@ HOMEPAGE= http://www.gnu.org/software/libmicrohttpd/
COMMENT= Small C library to run an HTTP server as part of another app
LICENSE= gnu-lgpl-v2.1
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-INFO_FILES= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+GNU_CONFIGURE= yes
+# Too many problems with libmicrospdy at the moment (0.9.31)
+CONFIGURE_ARGS+= --disable-spdy
+# Avoid building and installing 'demo' program
+CONFIGURE_ENV+= ac_cv_header_magic_h=no
+INFO_FILES= yes
PKGCONFIG_OVERRIDE+= libmicrohttpd.pc.in
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/www/libmicrohttpd/buildlink3.mk b/www/libmicrohttpd/buildlink3.mk
index 7c60da49d8a..39ea1f082fe 100644
--- a/www/libmicrohttpd/buildlink3.mk
+++ b/www/libmicrohttpd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/09/23 10:47:48 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2013/10/22 12:15:53 adam Exp $
BUILDLINK_TREE+= libmicrohttpd
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libmicrohttpd
LIBMICROHTTPD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libmicrohttpd+= libmicrohttpd>=0.9.9
-BUILDLINK_ABI_DEPENDS.libmicrohttpd?= libmicrohttpd>=0.9.20nb1
+BUILDLINK_ABI_DEPENDS.libmicrohttpd+= libmicrohttpd>=0.9.20nb1
BUILDLINK_PKGSRCDIR.libmicrohttpd?= ../../www/libmicrohttpd
.include "../../security/gnutls/buildlink3.mk"
diff --git a/www/libmicrohttpd/distinfo b/www/libmicrohttpd/distinfo
index 77711779b20..72e112f2a9e 100644
--- a/www/libmicrohttpd/distinfo
+++ b/www/libmicrohttpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2013/02/06 07:42:05 wiz Exp $
+$NetBSD: distinfo,v 1.12 2013/10/22 12:15:53 adam Exp $
-SHA1 (libmicrohttpd-0.9.25.tar.gz) = da24fe9572f83e67959b0e32e15d261fcbf46bc1
-RMD160 (libmicrohttpd-0.9.25.tar.gz) = 4edf3384205ffa4282080d8fb65153914d614ea9
-Size (libmicrohttpd-0.9.25.tar.gz) = 802090 bytes
+SHA1 (libmicrohttpd-0.9.31.tar.gz) = 45d79b0ae25a7fa40dbae90a4195fed9d52f5041
+RMD160 (libmicrohttpd-0.9.31.tar.gz) = 03f822822a7487a9b0b551ae34da67785e7029dc
+Size (libmicrohttpd-0.9.31.tar.gz) = 1118373 bytes