From owner-svn-ports-head@freebsd.org Mon Oct 31 10:26:29 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A5ECC27091; Mon, 31 Oct 2016 10:26:29 +0000 (UTC) (envelope-from vg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D74AB1FFF; Mon, 31 Oct 2016 10:26:28 +0000 (UTC) (envelope-from vg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9VAQSbd035395; Mon, 31 Oct 2016 10:26:28 GMT (envelope-from vg@FreeBSD.org) Received: (from vg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9VAQRgv035392; Mon, 31 Oct 2016 10:26:27 GMT (envelope-from vg@FreeBSD.org) Message-Id: <201610311026.u9VAQRgv035392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vg set sender to vg@FreeBSD.org using -f From: Veniamin Gvozdikov Date: Mon, 31 Oct 2016 10:26:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424994 - in head/www/mongrel2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Oct 2016 10:26:29 -0000 Author: vg Date: Mon Oct 31 10:26:27 2016 New Revision: 424994 URL: https://svnweb.freebsd.org/changeset/ports/424994 Log: - Fix conflict with max_align_t PR: ports/213657 Submitted by: jhb Added: head/www/mongrel2/files/patch-src_mem_align.h (contents, props changed) head/www/mongrel2/files/patch-src_mem_halloc.c (contents, props changed) Modified: head/www/mongrel2/Makefile Modified: head/www/mongrel2/Makefile ============================================================================== --- head/www/mongrel2/Makefile Mon Oct 31 10:02:48 2016 (r424993) +++ head/www/mongrel2/Makefile Mon Oct 31 10:26:27 2016 (r424994) @@ -3,7 +3,7 @@ PORTNAME= mongrel2 PORTVERSION= 1.7.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://mongrel2.org/static/downloads/ Added: head/www/mongrel2/files/patch-src_mem_align.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mongrel2/files/patch-src_mem_align.h Mon Oct 31 10:26:27 2016 (r424994) @@ -0,0 +1,11 @@ +--- src/mem/align.h.orig 2016-10-31 10:10:23 UTC ++++ src/mem/align.h +@@ -30,7 +30,7 @@ union max_align + void (*q)(void); + }; + +-typedef union max_align max_align_t; ++typedef union max_align h_max_align_t; + + #endif + Added: head/www/mongrel2/files/patch-src_mem_halloc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mongrel2/files/patch-src_mem_halloc.c Mon Oct 31 10:26:27 2016 (r424994) @@ -0,0 +1,11 @@ +--- src/mem/halloc.c.orig 2016-10-31 10:10:30 UTC ++++ src/mem/halloc.c +@@ -34,7 +34,7 @@ typedef struct hblock + #endif + hlist_item_t siblings; /* 2 pointers */ + hlist_head_t children; /* 1 pointer */ +- max_align_t data[1]; /* not allocated, see below */ ++ h_max_align_t data[1]; /* not allocated, see below */ + + } hblock_t; +