diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2016-12-18 15:20:38 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2016-12-18 15:20:38 +0000 |
| commit | 096906da0dbdb8bddbbede2000c0f68c0a446f75 (patch) | |
| tree | c6ccbf35d3ef075ae25d250dabe07769f43d725d /www | |
| parent | - Add libnghttp2 1.17.0 (diff) | |
- 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
Notes
Notes:
svn path=/head/; revision=428856
Diffstat (limited to 'www')
| -rw-r--r-- | www/nghttp2/Makefile | 14 | ||||
| -rw-r--r-- | www/nghttp2/pkg-plist | 7 |
2 files changed, 13 insertions, 8 deletions
diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile index b89547ce2800..01d78f146523 100644 --- a/www/nghttp2/Makefile +++ b/www/nghttp2/Makefile @@ -4,7 +4,7 @@ PORTNAME= nghttp2 PORTVERSION= 1.17.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www net MAINTAINER= sunpoet@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 diff --git a/www/nghttp2/pkg-plist b/www/nghttp2/pkg-plist index 7e710caf2ed7..9a680bb19b81 100644 --- a/www/nghttp2/pkg-plist +++ b/www/nghttp2/pkg-plist @@ -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 |