From owner-svn-ports-head@freebsd.org Tue Mar 1 20:25:41 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 E8BBDABDAD4; Tue, 1 Mar 2016 20:25:41 +0000 (UTC) (envelope-from brnrd@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 A10691A2E; Tue, 1 Mar 2016 20:25:41 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u21KPeAn011652; Tue, 1 Mar 2016 20:25:40 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u21KPeQ4011650; Tue, 1 Mar 2016 20:25:40 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201603012025.u21KPeQ4011650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 1 Mar 2016 20:25:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409899 - in head/www/mod_http2-devel: . 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.20 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: Tue, 01 Mar 2016 20:25:42 -0000 Author: brnrd Date: Tue Mar 1 20:25:40 2016 New Revision: 409899 URL: https://svnweb.freebsd.org/changeset/ports/409899 Log: www/mod_http2-devel: Fix build on i386 - Fix apr_uint64_t format error on i386 - Fix pre-processor error in configure Reviewed by: feld (mentor) Approved by: feld (mentor) Differential Revision: D5506 Added: head/www/mod_http2-devel/files/ head/www/mod_http2-devel/files/patch-mod__http2_h2__push.c (contents, props changed) Modified: head/www/mod_http2-devel/Makefile Modified: head/www/mod_http2-devel/Makefile ============================================================================== --- head/www/mod_http2-devel/Makefile Tue Mar 1 20:22:45 2016 (r409898) +++ head/www/mod_http2-devel/Makefile Tue Mar 1 20:25:40 2016 (r409899) @@ -3,6 +3,7 @@ PORTNAME= mod_http2-devel PORTVERSION= 1.2.7 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www @@ -27,6 +28,7 @@ USE_APACHE= 24+ MODULENAME= ${GH_PROJECT} CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include post-install: # Rename mod_http2 to the mod_h2 to avoid conflict with Apache24 Added: head/www/mod_http2-devel/files/patch-mod__http2_h2__push.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_http2-devel/files/patch-mod__http2_h2__push.c Tue Mar 1 20:25:40 2016 (r409899) @@ -0,0 +1,14 @@ +Upstream fix for i386 build +https://github.com/icing/mod_h2/pull/89 + +--- mod_http2/h2_push.c.orig 2016-02-29 13:59:13 UTC ++++ mod_http2/h2_push.c +@@ -792,7 +792,7 @@ static apr_status_t gset_encode_next(gse + flex_bits = (delta >> encoder->fixed_bits); + ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, encoder->pool, + "h2_push_diary_enc: val=%"APR_UINT64_T_HEX_FMT", delta=%" +- APR_UINT64_T_HEX_FMT" flex_bits=%ld, " ++ APR_UINT64_T_HEX_FMT" flex_bits=%"APR_UINT64_T_FMT", " + "fixed_bits=%d, fixed_val=%"APR_UINT64_T_HEX_FMT, + pval, delta, flex_bits, encoder->fixed_bits, delta&encoder->fixed_mask); + for (; flex_bits != 0; --flex_bits) {