From fe29fea6e77c09240dd039768b4a1d474f36ef3e Mon Sep 17 00:00:00 2001 From: "yd.zhang" Date: Fri, 4 Jun 2021 15:56:54 +0800 Subject: [PATCH] New package: nng-1.4.0 --- common/shlibs | 1 + srcpkgs/libnng | 1 + srcpkgs/libnng-devel | 1 + srcpkgs/nng/patches/0001-no_html_doc.patch | 37 ++++ .../patches/0002-no_non-standard_doc.patch | 160 ++++++++++++++++++ srcpkgs/nng/template | 42 +++++ 6 files changed, 242 insertions(+) create mode 120000 srcpkgs/libnng create mode 120000 srcpkgs/libnng-devel create mode 100644 srcpkgs/nng/patches/0001-no_html_doc.patch create mode 100644 srcpkgs/nng/patches/0002-no_non-standard_doc.patch create mode 100644 srcpkgs/nng/template diff --git a/common/shlibs b/common/shlibs index ba589537b1f3..60f6c93bd62d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4007,3 +4007,4 @@ libbasu.so.0 basu-0.2.0_1 libXcomp.so.3 nx-libs-3.5.99.24_1 libXcompshad.so.3 nx-libs-3.5.99.24_1 libNX_X11.so.6 nx-libs-3.5.99.24_1 +libnng.so.1 libnng-1.4.0_1 diff --git a/srcpkgs/libnng b/srcpkgs/libnng new file mode 120000 index 000000000000..cb46bd461484 --- /dev/null +++ b/srcpkgs/libnng @@ -0,0 +1 @@ +nng \ No newline at end of file diff --git a/srcpkgs/libnng-devel b/srcpkgs/libnng-devel new file mode 120000 index 000000000000..cb46bd461484 --- /dev/null +++ b/srcpkgs/libnng-devel @@ -0,0 +1 @@ +nng \ No newline at end of file diff --git a/srcpkgs/nng/patches/0001-no_html_doc.patch b/srcpkgs/nng/patches/0001-no_html_doc.patch new file mode 100644 index 000000000000..7d1b0d6dc7a4 --- /dev/null +++ b/srcpkgs/nng/patches/0001-no_html_doc.patch @@ -0,0 +1,37 @@ +--- docs/man/CMakeLists.txt ++++ docs/man/CMakeLists.txt +@@ -25,7 +25,6 @@ + set(NNG_DOCDIR ${CMAKE_CURRENT_SOURCE_DIR}) + + set(NNG_A2M ${ASCIIDOCTOR} -b manpage -amanmanual='NNG Reference Manual') +- set(NNG_A2H ${ASCIIDOCTOR} -a nofooter -atoc=left -aicons=font -d manpage -b html5) + + macro(nng_man NAME SECT) + +@@ -35,20 +34,9 @@ + MAIN_DEPENDENCY ${NNG_DOCDIR}/${NAME}.${SECT}.adoc + ) + +- add_custom_command( +- OUTPUT ${NAME}.${SECT}.html +- COMMAND ${NNG_A2H} -o ${NAME}.${SECT}.html ${NNG_DOCDIR}/${NAME}.${SECT}.adoc +- MAIN_DEPENDENCY ${NNG_DOCDIR}/${NAME}.${SECT}.adoc +- ) +- + set(NNG_MANS ${NNG_MANS} ${NAME}.${SECT}) +- set(NNG_HTMLS ${NNG_HTMLS} ${NAME}.${SECT}.html) + + install( +- FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.${SECT}.html +- DESTINATION ${CMAKE_INSTALL_DOCDIR} +- ) +- install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.${SECT} + DESTINATION ${CMAKE_INSTALL_MANDIR}/man${SECT} + ) +@@ -433,5 +421,4 @@ + endforeach () + + add_custom_target(man ALL DEPENDS ${NNG_MANS}) +- add_custom_target(html ALL DEPENDS ${NNG_HTMLS}) + endif () diff --git a/srcpkgs/nng/patches/0002-no_non-standard_doc.patch b/srcpkgs/nng/patches/0002-no_non-standard_doc.patch new file mode 100644 index 000000000000..3674c1322a88 --- /dev/null +++ b/srcpkgs/nng/patches/0002-no_non-standard_doc.patch @@ -0,0 +1,160 @@ +--- docs/man/CMakeLists.txt ++++ docs/man/CMakeLists.txt +@@ -181,157 +181,6 @@ + nng_zt_register + ) + +- set(NNG_MAN3COMPAT +- nn_allocmsg +- nn_bind +- nn_close +- nn_cmsg +- nn_connect +- nn_device +- nn_errno +- nn_freemsg +- nn_get_statistic +- nn_getsockopt +- nn_poll +- nn_reallocmsg +- nn_recv +- nn_recvmsg +- nn_send +- nn_sendmsg +- nn_setsockopt +- nn_shutdown +- nn_socket +- nn_strerror +- nn_term +- nng_compat +- ) +- +- set(NNG_MAN3HTTP +- nng_http_client_alloc +- nng_http_client_connect +- nng_http_client_free +- nng_http_client_get_tls +- nng_http_client_set_tls +- nng_http_client_transact +- nng_http_conn_close +- nng_http_conn_read +- nng_http_conn_read_all +- nng_http_conn_read_req +- nng_http_conn_read_res +- nng_http_conn_transact +- nng_http_conn_write +- nng_http_conn_write_all +- nng_http_conn_write_req +- nng_http_conn_write_res +- nng_http_handler_alloc +- nng_http_handler_free +- nng_http_handler_get_data +- nng_http_handler_set_data +- nng_http_handler_set_host +- nng_http_handler_set_method +- nng_http_handler_set_tree +- nng_http_hijack +- nng_http_req_add_header +- nng_http_req_alloc +- nng_http_req_copy_data +- nng_http_req_del_header +- nng_http_req_free +- nng_http_req_get_data +- nng_http_req_get_header +- nng_http_req_get_method +- nng_http_req_get_uri +- nng_http_req_get_version +- nng_http_req_reset +- nng_http_req_set_data +- nng_http_req_set_header +- nng_http_req_set_method +- nng_http_req_set_uri +- nng_http_req_set_version +- nng_http_res_add_header +- nng_http_res_alloc +- nng_http_res_alloc_error +- nng_http_res_copy_data +- nng_http_res_del_header +- nng_http_res_free +- nng_http_res_get_data +- nng_http_res_get_header +- nng_http_res_get_reason +- nng_http_res_get_status +- nng_http_res_get_version +- nng_http_res_reset +- nng_http_res_set_data +- nng_http_res_set_header +- nng_http_res_set_reason +- nng_http_res_set_status +- nng_http_res_set_version +- nng_http_server_add_handler +- nng_http_server_del_handler +- nng_http_server_get_addr +- nng_http_server_get_tls +- nng_http_server_hold +- nng_http_server_release +- nng_http_server_set_tls +- nng_http_server_start +- nng_http_server_stop +- ) +- +- set(NNG_MAN3SUPP +- nng_clock +- nng_cv_alloc +- nng_cv_free +- nng_cv_until +- nng_cv_wait +- nng_cv_wake +- nng_cv_wake1 +- nng_msleep +- nng_mtx_alloc +- nng_mtx_free +- nng_mtx_lock +- nng_mtx_unlock +- nng_opts_parse +- nng_random +- nng_thread_create +- nng_thread_destroy +- nng_thread_set_name +- ) +- +- set(NNG_MAN3STR +- nng_stream_close +- nng_stream_free +- nng_stream_get +- nng_stream_recv +- nng_stream_send +- nng_stream_set +- nng_stream_dialer_alloc +- nng_stream_dialer_close +- nng_stream_dialer_dial +- nng_stream_dialer_free +- nng_stream_dialer_get +- nng_stream_dialer_set +- nng_stream_listener_accept +- nng_stream_listener_alloc +- nng_stream_listener_close +- nng_stream_listener_free +- nng_stream_listener_get +- nng_stream_listener_listen +- nng_stream_listener_set +- ) +- +- set(NNG_MAN3TLS +- nng_tls_config_alloc +- nng_tls_config_auth_mode +- nng_tls_config_ca_chain +- nng_tls_config_ca_file +- nng_tls_config_cert_key_file +- nng_tls_config_free +- nng_tls_config_hold +- nng_tls_config_own_cert +- nng_tls_config_server_name +- nng_tls_engine_description +- nng_tls_engine_fips_mode +- nng_tls_engine_name +- ) +- + set(NNG_MAN5 + nng_aio + nng_ctx diff --git a/srcpkgs/nng/template b/srcpkgs/nng/template new file mode 100644 index 000000000000..2e8718467ac2 --- /dev/null +++ b/srcpkgs/nng/template @@ -0,0 +1,42 @@ +# Template file for 'nng' +pkgname=nng +version=1.4.0 +revision=1 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON -DNNG_TESTS=OFF -DNNG_TOOLS=ON -DNNG_ENABLE_DOC=ON -DNNG_ENABLE_TLS=ON" +hostmakedepends="ruby-asciidoctor" +makedepends="mbedtls-devel" +short_desc="nanomsg next generation utilities" +maintainer="yd.zhang " +license="MIT" +homepage="https://nng.nanomsg.org/" +distfiles="https://github.com/nanomsg/${pkgname}/archive/refs/tags/v${version}.tar.gz" +checksum=e0af76aff291c670d091a07a4e71febf7b7a254f1ab5939f9464ccbd8f8aa2ba + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi + +post_install() { + vlicense LICENSE.txt +} + +libnng_package() { + short_desc="nanomsg next generation library" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +libnng-devel_package() { + depends="libnng-${version}_${revision}" + short_desc="nanomsg next generation library - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/cmake + vmove usr/share/man/man3 + vmove usr/share/man/man5 + vmove usr/share/man/man7 + } +}