svn commit: r453242 - head/www/lighttpd/files

[Guido Falsi]

Author: madpilot
Date: Tue Oct 31 15:26:06 2017
New Revision: 453242
URL: https://svnweb.freebsd.org/changeset/ports/453242

Log:
  - Really fix build when IPV6 option is disabled
  - Correctly rename patch file
  
  PR:		223288
  Submitted by:	Piotr Kubaj <pkubaj at anongoth.pl> (maintainer)
  Reported by:	edgeman at gmail.com

Added:
  head/www/lighttpd/files/patch-src_network.c
     - copied, changed from r453241, head/www/lighttpd/files/patch-patch-src__network.c
Deleted:
  head/www/lighttpd/files/patch-patch-src__network.c

Copied and modified: head/www/lighttpd/files/patch-src_network.c (from r453241, head/www/lighttpd/files/patch-patch-src__network.c)
==============================================================================
--- head/www/lighttpd/files/patch-patch-src__network.c	Tue Oct 31 15:06:58 2017	(r453241, copy source)
+++ head/www/lighttpd/files/patch-src_network.c	Tue Oct 31 15:26:06 2017	(r453242)
@@ -1,19 +1,16 @@
---- patch-src_network.c.orig	2017-10-28 15:54:22 UTC
-+++ patch-src_network.c
-@@ -0,0 +1,16 @@
-+--- src/network.c.orig	2017-10-28 14:00:17 UTC
-++++ src/network.c
-+@@ -77,9 +77,13 @@ static void network_host_normalize_addr_
-+     if (addr->plain.sa_family == AF_INET6)
-+         buffer_append_string_len(host, CONST_STR_LEN("]"));
-+     if (addr->plain.sa_family != AF_UNIX) {
-++#ifdef HAVE_IPV6
-+         unsigned short port = (addr->plain.sa_family == AF_INET)
-+           ? ntohs(addr->ipv4.sin_port)
-+           : ntohs(addr->ipv6.sin6_port);
-++#elif
-++	unsigned short port = ntohs(addr->ipv6.sin6_port);
-++#endif
-+         buffer_append_string_len(host, CONST_STR_LEN(":"));
-+         buffer_append_int(host, (int)port);
-+     }
+--- src/network.c.orig	2017-10-22 20:09:57 UTC
++++ src/network.c
+@@ -77,9 +77,13 @@ static void network_host_normalize_addr_str(buffer *ho
+     if (addr->plain.sa_family == AF_INET6)
+         buffer_append_string_len(host, CONST_STR_LEN("]"));
+     if (addr->plain.sa_family != AF_UNIX) {
++#ifdef HAVE_IPV6
+         unsigned short port = (addr->plain.sa_family == AF_INET)
+           ? ntohs(addr->ipv4.sin_port)
+           : ntohs(addr->ipv6.sin6_port);
++#else
++	unsigned short port = ntohs(addr->ipv4.sin_port);
++#endif
+         buffer_append_string_len(host, CONST_STR_LEN(":"));
+         buffer_append_int(host, (int)port);
+     }