svn commit: r428856 - head/www/nghttp2

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Dec 18 15:20:38 2016
New Revision: 428856
URL: https://svnweb.freebsd.org/changeset/ports/428856

Log:
  - Update for libnghttp2 change (moved into www/libnghttp2)
  - Add LIB_DEPENDS on www/libnghttp2
  - Copy libnghttp2 to lib/ to avoid unnecessary rebuild
  - Bump PORTREVISION for dependency and package change

Modified:
  head/www/nghttp2/Makefile
  head/www/nghttp2/pkg-plist

Modified: head/www/nghttp2/Makefile
==============================================================================
--- head/www/nghttp2/Makefile	Sun Dec 18 15:20:33 2016	(r428855)
+++ head/www/nghttp2/Makefile	Sun Dec 18 15:20:38 2016	(r428856)
@@ -4,7 +4,7 @@
 PORTNAME=	nghttp2
 PORTVERSION=	1.17.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www net
 
 MAINTAINER=	sunpoet at FreeBSD.org
@@ -13,6 +13,8 @@ COMMENT=	HTTP/2.0 C Library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
+
 OPTIONS_DEFINE=	APP ASIO DOCS EXAMPLES HPACK SPDY
 OPTIONS_DEFAULT=APP HPACK SPDY
 OPTIONS_SUB=	yes
@@ -74,6 +76,16 @@ post-configure:
 CONFIGURE_ARGS+=--with-jemalloc
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| lib||' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|$$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' ${WRKSRC}/*/Makefile.am
+
+# lib/libnghttp2.* are not available until configure phase
+post-configure:
+	@${MKDIR} ${WRKSRC}/lib/.libs/
+	@${CP} ${LOCALBASE}/lib/libnghttp2.so* ${WRKSRC}/lib/.libs/
+	@cd ${WRKSRC}/lib/.libs/ && ${AR} x ${LOCALBASE}/lib/libnghttp2.a
+
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/
 	${INSTALL_DATA} ${FILESDIR}/nghttpx.conf.sample ${STAGEDIR}${PREFIX}/etc/nghttpx/nghttpx.conf.sample

Modified: head/www/nghttp2/pkg-plist
==============================================================================
--- head/www/nghttp2/pkg-plist	Sun Dec 18 15:20:33 2016	(r428855)
+++ head/www/nghttp2/pkg-plist	Sun Dec 18 15:20:38 2016	(r428856)
@@ -8,17 +8,10 @@
 %%ASIO%%include/nghttp2/asio_http2.h
 %%ASIO%%include/nghttp2/asio_http2_client.h
 %%ASIO%%include/nghttp2/asio_http2_server.h
-include/nghttp2/nghttp2.h
-include/nghttp2/nghttp2ver.h
-lib/libnghttp2.a
-lib/libnghttp2.so
-lib/libnghttp2.so.14
-lib/libnghttp2.so.14.12.2
 %%ASIO%%lib/libnghttp2_asio.a
 %%ASIO%%lib/libnghttp2_asio.so
 %%ASIO%%lib/libnghttp2_asio.so.1
 %%ASIO%%lib/libnghttp2_asio.so.1.0.0
-libdata/pkgconfig/libnghttp2.pc
 %%ASIO%%libdata/pkgconfig/libnghttp2_asio.pc
 man/man1/h2load.1.gz
 man/man1/nghttp.1.gz