svn commit: r409094 - head/www/nghttp2/files

[Kevin Lo]

Author: kevlo
Date: Thu Feb 18 07:13:13 2016
New Revision: 409094
URL: https://svnweb.freebsd.org/changeset/ports/409094

Log:
  Add a patch from upstream commit f0b5a8db8c50e03bde30be96ed6172e220533411 to
  fix build.

Modified:
  head/www/nghttp2/files/patch-configure.ac

Modified: head/www/nghttp2/files/patch-configure.ac
==============================================================================
--- head/www/nghttp2/files/patch-configure.ac	Thu Feb 18 07:06:03 2016	(r409093)
+++ head/www/nghttp2/files/patch-configure.ac	Thu Feb 18 07:13:13 2016	(r409094)
@@ -1,19 +1,6 @@
-From e4b2847d3135a024c740d25f9e11da7ff0bf0fd6 Mon Sep 17 00:00:00 2001
-From: Bernard Spil <Sp1l at users.noreply.github.com>
-Date: Sat, 6 Feb 2016 14:36:27 +0100
-Subject: [PATCH] Don't check for dlopen/libdl on *BSD
-
-This makes linking fail on -ldl as there is no libdl on in /usr/lib or /usr/local/lib on *BSD
-Tested (and part of the proposed nghttp2 1.7.0) on [https://reviews.freebsd.org/D5218|FreeBSD]
----
- configure.ac | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 09a2538..4a4defe 100644
---- configure.ac.orig
-+++ configure.ac
-@@ -256,9 +256,16 @@ if test "x${have_zlib}" = "xno"; then
+--- configure.ac.orig	2016-02-11 22:13:41.000000000 +0800
++++ configure.ac	2016-02-18 15:04:13.137454000 +0800
+@@ -256,9 +256,16 @@
  fi
  
  # dl: openssl requires libdl when it is statically linked.
@@ -33,3 +20,18 @@ index 09a2538..4a4defe 100644
  
  # cunit
  PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
+@@ -633,7 +640,13 @@
+ # For cygwin: we can link initgroups, so AC_CHECK_FUNCS succeeds, but
+ # cygwin disables initgroups due to feature test macro magic with our
+ # configuration.
+-AC_CHECK_DECLS([initgroups], [], [], [[#include <grp.h>]])
++# configuration.  FreeBSD declares initgroups() in unistd.h.
++AC_CHECK_DECLS([initgroups], [], [], [[
++  #ifdef HAVE_UNISTD_H
++  # include <unistd.h>
++  #endif
++  #include <grp.h>
++]])
+ 
+ # Checks for epoll availability, primarily for examples/tiny-nghttpd
+ AX_HAVE_EPOLL([have_epoll=yes], [have_epoll=no])