From owner-svn-ports-all@freebsd.org  Sun Dec 18 16:42:29 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 09E45C877FE;
 Sun, 18 Dec 2016 16:42:29 +0000 (UTC)
 (envelope-from sunpoet@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 CD7BC1D3D;
 Sun, 18 Dec 2016 16:42:28 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBIGgS7a067010;
 Sun, 18 Dec 2016 16:42:28 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBIGgShh067009;
 Sun, 18 Dec 2016 16:42:28 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201612181642.uBIGgShh067009@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 18 Dec 2016 16:42:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428878 - head/www/nghttp2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Dec 2016 16:42:29 -0000

Author: sunpoet
Date: Sun Dec 18 16:42:27 2016
New Revision: 428878
URL: https://svnweb.freebsd.org/changeset/ports/428878

Log:
  - Merge post-configure:
  
  PR:		215382
  Reported by:	Anton Sayetsky <vsasjason@gmail.com>

Modified:
  head/www/nghttp2/Makefile

Modified: head/www/nghttp2/Makefile
==============================================================================
--- head/www/nghttp2/Makefile	Sun Dec 18 16:12:28 2016	(r428877)
+++ head/www/nghttp2/Makefile	Sun Dec 18 16:42:27 2016	(r428878)
@@ -65,13 +65,6 @@ SPDY_LIB_DEPENDS=	libspdylay.so:www/spdy
 CPPFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
-# Disable thread_local support for hosts without __cxa_thread_atexit()
-# See PR/192320 for details
-.if (${OSVERSION} < 1003506) || ((${OSVERSION} >= 1100000) && (${OSVERSION} < 1100122)) || (${OSVERSION} == 1100500)
-post-configure:
-	@${REINPLACE_CMD} -e '/HAVE_THREAD_LOCAL/d' ${WRKSRC}/config.h
-.endif
-
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 CONFIGURE_ARGS+=--with-jemalloc
 .endif
@@ -85,6 +78,11 @@ post-configure:
 	@${MKDIR} ${WRKSRC}/lib/.libs/
 	@${CP} ${LOCALBASE}/lib/libnghttp2.so* ${WRKSRC}/lib/.libs/
 	@cd ${WRKSRC}/lib/.libs/ && ${AR} x ${LOCALBASE}/lib/libnghttp2.a
+# Disable thread_local support for hosts without __cxa_thread_atexit()
+# See PR/192320 for details
+.if (${OSVERSION} < 1003506) || ((${OSVERSION} >= 1100000) && (${OSVERSION} < 1100122)) || (${OSVERSION} == 1100500)
+	@${REINPLACE_CMD} -e '/HAVE_THREAD_LOCAL/d' ${WRKSRC}/config.h
+.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/