diff --git a/devel/clixon/Makefile b/devel/clixon/Makefile index bb81b24be874..73c90cfa2a25 100644 --- a/devel/clixon/Makefile +++ b/devel/clixon/Makefile @@ -1,56 +1,55 @@ PORTNAME= clixon -PORTVERSION= 6.2.0 +PORTVERSION= 6.4.0 CATEGORIES= devel MAINTAINER= dave@dogwood.com COMMENT= YANG-based toolchain including CLI, NETCONF and RESTCONF interfaces WWW= https://www.clicon.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md -#LIB_DEPENDS= libfcgi.so:www/fcgi BUILD_DEPENDS= cligen>=${PORTVERSION}:devel/cligen \ nghttp2>=0:www/nghttp2 RUN_DEPENDS= cligen>=${PORTVERSION}:devel/cligen \ nghttp2>=0:www/nghttp2 -USES= bison compiler:c11 gmake +USES= autoreconf bison compiler:c11 gmake USE_GITHUB= yes GH_ACCOUNT= clicon USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${ETCDIR} \ --with-cligen=${LOCALBASE} CONFIGURE_ENV= YACC="bison -y" MAKE_ARGS= wwwdir=${PREFIX}/sbin \ wwwuser=${WWWOWN} SUB_FILES= pkg-message USERS= clixon GROUPS= clixon PLIST_SUB= LIBMAJORVERSION=${PORTVERSION:R:R} \ LIBVERSION=${PORTVERSION:R} OPTIONS_DEFAULT= NATIVE OPTIONS_SINGLE= RESTCONF OPTIONS_SINGLE_RESTCONF= NATIVE FCGI OFF OPTIONS_SUB= yes FCGI_DESC= FCGI interface for stand-alone web rev-proxy (eg nginx) NATIVE_DESC= Use embedded web server OFF_DESC= Disable restconf FCGI_LIB_DEPENDS= libfcgi.so:www/fcgi FCGI_CONFIGURE_ON= --with-restconf=fcgi NATIVE_BUILD_DEPENDS= nghttp2>=0:www/nghttp2 NATIVE_RUN_DEPENDS= nghttp2>=0:www/nghttp2 NATIVE_CONFIGURE_ON= --with-restconf=native OFF_CONFIGURE_ON= --without-restconf .include diff --git a/devel/clixon/distinfo b/devel/clixon/distinfo index 1d8a00f0b92c..010e1408e140 100644 --- a/devel/clixon/distinfo +++ b/devel/clixon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685985947 -SHA256 (clicon-clixon-6.2.0_GH0.tar.gz) = 91b2721c6b09b916cd261a87bfb85cff59ba95c07d13039ad006c681f6dab7c2 -SIZE (clicon-clixon-6.2.0_GH0.tar.gz) = 1731809 +TIMESTAMP = 1696258556 +SHA256 (clicon-clixon-6.4.0_GH0.tar.gz) = 0165867d25db434474001d26c122702a44f60e7f2ac017bdbd5a3cfa4a5ae6f3 +SIZE (clicon-clixon-6.4.0_GH0.tar.gz) = 1763455 diff --git a/devel/clixon/files/patch-configure.ac b/devel/clixon/files/patch-configure.ac new file mode 100644 index 000000000000..26bb2748f5ac --- /dev/null +++ b/devel/clixon/files/patch-configure.ac @@ -0,0 +1,23 @@ +--- configure.ac.orig 2023-09-25 19:29:54 UTC ++++ configure.ac +@@ -178,6 +178,9 @@ LIBSTATIC_SUFFIX=".a" + # Postfix for static libs + LIBSTATIC_SUFFIX=".a" + ++CPPFLAGS="-I$(eval echo ${includedir}) ${CPPFLAGS}" ++LDFLAGS="-L$(eval echo ${libdir}) ${LDFLAGS}" ++ + # This is for cligen + AC_ARG_WITH([cligen], [AS_HELP_STRING([--with-cligen=dir], [Use CLIGEN installation in this dir])], [ + CLIGEN_DIR="$withval" +@@ -185,8 +188,8 @@ if test -n "${CLIGEN_DIR}" -a -d "${CLIGEN_DIR}"; then + AC_SUBST(CLIGEN_DIR) + if test -n "${CLIGEN_DIR}" -a -d "${CLIGEN_DIR}"; then + echo "Using CLIGEN here: ${CLIGEN_DIR}" +- CPPFLAGS="-I${CLIGEN_DIR}$(eval echo ${includedir}) ${CPPFLAGS}" +- LDFLAGS="-L${CLIGEN_DIR}$(eval echo ${libdir}) ${LDFLAGS}" ++ CPPFLAGS="-I${CLIGEN_DIR}/include ${CPPFLAGS}" ++ LDFLAGS="-L${CLIGEN_DIR}/lib ${LDFLAGS}" + fi + + # Disable/enable yang patch diff --git a/devel/clixon/pkg-plist b/devel/clixon/pkg-plist index b59e1e8b3959..973a3a520dcc 100644 --- a/devel/clixon/pkg-plist +++ b/devel/clixon/pkg-plist @@ -1,104 +1,104 @@ bin/clixon_cli bin/clixon_netconf %%ETCDIR%%/clixonrc include/clixon/cli_autocli.h include/clixon/cli_generate.h include/clixon/clixon.h include/clixon/clixon_backend.h include/clixon/clixon_backend_client.h include/clixon/clixon_backend_commit.h include/clixon/clixon_backend_plugin.h include/clixon/clixon_backend_transaction.h include/clixon/clixon_cli.h include/clixon/clixon_cli_api.h include/clixon/clixon_client.h include/clixon/clixon_data.h include/clixon/clixon_datastore.h include/clixon/clixon_dispatcher.h include/clixon/clixon_err.h include/clixon/clixon_err_string.h include/clixon/clixon_event.h include/clixon/clixon_file.h include/clixon/clixon_handle.h include/clixon/clixon_hash.h include/clixon/clixon_json.h include/clixon/clixon_log.h include/clixon/clixon_nacm.h include/clixon/clixon_netconf.h include/clixon/clixon_netconf_input.h include/clixon/clixon_netconf_lib.h include/clixon/clixon_netconf_monitoring.h include/clixon/clixon_netns.h include/clixon/clixon_options.h include/clixon/clixon_path.h include/clixon/clixon_plugin.h include/clixon/clixon_proc.h include/clixon/clixon_proto.h include/clixon/clixon_proto_client.h include/clixon/clixon_queue.h include/clixon/clixon_regex.h %%NO_OFF%%include/clixon/clixon_restconf.h include/clixon/clixon_sig.h include/clixon/clixon_stream.h include/clixon/clixon_string.h include/clixon/clixon_text_syntax.h include/clixon/clixon_uid.h include/clixon/clixon_validate.h include/clixon/clixon_validate_minmax.h include/clixon/clixon_xml.h include/clixon/clixon_xml_bind.h include/clixon/clixon_xml_changelog.h include/clixon/clixon_xml_default.h include/clixon/clixon_xml_io.h include/clixon/clixon_xml_map.h include/clixon/clixon_xml_nsctx.h include/clixon/clixon_xml_sort.h include/clixon/clixon_xml_vec.h include/clixon/clixon_xpath.h include/clixon/clixon_xpath_ctx.h include/clixon/clixon_xpath_optimize.h include/clixon/clixon_xpath_yang.h include/clixon/clixon_yang.h include/clixon/clixon_yang_module.h include/clixon/clixon_yang_parse_lib.h include/clixon/clixon_yang_schema_mount.h include/clixon/clixon_yang_type.h lib/libclixon.so lib/libclixon.so.%%LIBMAJORVERSION%% lib/libclixon.so.%%LIBVERSION%% lib/libclixon_backend.so lib/libclixon_backend.so.%%LIBMAJORVERSION%% lib/libclixon_backend.so.%%LIBVERSION%% lib/libclixon_cli.so lib/libclixon_cli.so.%%LIBMAJORVERSION%% lib/libclixon_cli.so.%%LIBVERSION%% %%NO_OFF%%lib/libclixon_restconf.so %%NO_OFF%%lib/libclixon_restconf.so.%%LIBMAJORVERSION%% %%NO_OFF%%lib/libclixon_restconf.so.%%LIBVERSION%% sbin/clixon_backend %%NO_OFF%%sbin/clixon_restconf -%%DATADIR%%/clixon-autocli@2022-02-11.yang -%%DATADIR%%/clixon-config@2023-03-01.yang -%%DATADIR%%/clixon-lib@2023-03-01.yang +%%DATADIR%%/clixon-autocli@2023-09-01.yang +%%DATADIR%%/clixon-config@2023-05-01.yang +%%DATADIR%%/clixon-lib@2023-05-01.yang %%DATADIR%%/clixon-restconf@2022-08-01.yang %%DATADIR%%/clixon-rfc5277@2008-07-01.yang %%DATADIR%%/clixon-xml-changelog@2019-03-21.yang %%DATADIR%%/ietf-datastores@2018-02-14.yang %%DATADIR%%/ietf-inet-types@2021-02-22.yang %%DATADIR%%/ietf-list-pagination-nc@2022-07-24.yang %%DATADIR%%/ietf-list-pagination@2022-07-24.yang %%DATADIR%%/ietf-netconf-acm@2018-02-14.yang %%DATADIR%%/ietf-netconf-monitoring@2010-10-04.yang %%DATADIR%%/ietf-netconf-nmda@2019-01-07.yang %%DATADIR%%/ietf-netconf-with-defaults@2011-06-01.yang %%DATADIR%%/ietf-netconf@2011-06-01.yang %%DATADIR%%/ietf-origin@2018-02-14.yang %%DATADIR%%/ietf-restconf-monitoring@2017-01-26.yang %%DATADIR%%/ietf-restconf@2017-01-26.yang %%DATADIR%%/ietf-yang-library@2019-01-04.yang %%DATADIR%%/ietf-yang-metadata@2016-08-05.yang %%DATADIR%%/ietf-yang-patch@2017-02-22.yang %%DATADIR%%/ietf-yang-schema-mount@2019-01-14.yang %%DATADIR%%/ietf-yang-types@2013-07-15.yang @dir lib/clixon/plugins/backend @dir lib/clixon/plugins/cli