summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/clixon/Makefile7
-rw-r--r--devel/clixon/distinfo6
-rw-r--r--devel/clixon/files/patch-apps_netconf_netconf__main.c11
-rw-r--r--devel/clixon/files/patch-lib_src_clixon__handle.c13
-rw-r--r--devel/clixon/pkg-plist15
5 files changed, 40 insertions, 12 deletions
diff --git a/devel/clixon/Makefile b/devel/clixon/Makefile
index f265855fd608..308c67783267 100644
--- a/devel/clixon/Makefile
+++ b/devel/clixon/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= clixon
-PORTVERSION= 3.7.0
+PORTVERSION= 3.8.0
CATEGORIES= devel
MAINTAINER= dcornejo@netgate.com
@@ -13,12 +13,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
LIB_DEPENDS= libcligen.so:devel/cligen \
libfcgi.so:www/fcgi
-USES= bison gmake
+USES= autoreconf bison gmake
USE_LDCONFIG= yes
USE_GITHUB= yes
+
GH_ACCOUNT= clicon
-MAKE_ARGS= wwwdir=${PREFIX}/sbin
+MAKE_ARGS= wwwdir=${PREFIX}/sbin wwwuser=${WWWOWN}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-cligen=${LOCALBASE} --sysconfdir=${ETCDIR}
diff --git a/devel/clixon/distinfo b/devel/clixon/distinfo
index 4d741839a014..7cb664680f3f 100644
--- a/devel/clixon/distinfo
+++ b/devel/clixon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532378444
-SHA256 (clicon-clixon-3.7.0_GH0.tar.gz) = 2abb753ab7b9d5f84a00153a15b0fcb93615ace75c917172247e49532ae4fa38
-SIZE (clicon-clixon-3.7.0_GH0.tar.gz) = 734615
+TIMESTAMP = 1541588035
+SHA256 (clicon-clixon-3.8.0_GH0.tar.gz) = 6a60ed3f23410c6c7c8165b0619c3d1f630fb373578572392d2db7f407f3a515
+SIZE (clicon-clixon-3.8.0_GH0.tar.gz) = 763928
diff --git a/devel/clixon/files/patch-apps_netconf_netconf__main.c b/devel/clixon/files/patch-apps_netconf_netconf__main.c
new file mode 100644
index 000000000000..580dea472946
--- /dev/null
+++ b/devel/clixon/files/patch-apps_netconf_netconf__main.c
@@ -0,0 +1,11 @@
+--- apps/netconf/netconf_main.c.orig 2018-11-07 19:13:50 UTC
++++ apps/netconf/netconf_main.c
+@@ -294,7 +294,7 @@ static int
+ timeout_fn(int s,
+ void *arg)
+ {
+- clicon_err(OE_EVENTS, ETIME, "User request timeout");
++ clicon_err(OE_EVENTS, ETIMEDOUT, "User request timeout");
+ return -1;
+ }
+
diff --git a/devel/clixon/files/patch-lib_src_clixon__handle.c b/devel/clixon/files/patch-lib_src_clixon__handle.c
new file mode 100644
index 000000000000..8b608e75ff77
--- /dev/null
+++ b/devel/clixon/files/patch-lib_src_clixon__handle.c
@@ -0,0 +1,13 @@
+--- lib/src/clixon_handle.c.orig 2018-11-07 19:14:08 UTC
++++ lib/src/clixon_handle.c
+@@ -43,7 +43,9 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <assert.h>
+-
++
++#include <sys/time.h>
++
+ #include <cligen/cligen.h>
+
+ /* clicon */
diff --git a/devel/clixon/pkg-plist b/devel/clixon/pkg-plist
index fda5e72ee8b3..cdb7f6170f8e 100644
--- a/devel/clixon/pkg-plist
+++ b/devel/clixon/pkg-plist
@@ -3,26 +3,29 @@ bin/clixon_netconf
%%ETCDIR%%/clixonrc
lib/libclixon.so
lib/libclixon.so.3
-lib/libclixon.so.3.7
+lib/libclixon.so.3.8
lib/libclixon_backend.so
lib/libclixon_backend.so.3
-lib/libclixon_backend.so.3.7
+lib/libclixon_backend.so.3.8
lib/libclixon_cli.so
lib/libclixon_cli.so.3
-lib/libclixon_cli.so.3.7
+lib/libclixon_cli.so.3.8
lib/libclixon_netconf.so
lib/libclixon_netconf.so.3
-lib/libclixon_netconf.so.3.7
+lib/libclixon_netconf.so.3.8
lib/libclixon_restconf.so
lib/libclixon_restconf.so.3
-lib/libclixon_restconf.so.3.7
+lib/libclixon_restconf.so.3.8
lib/xmldb/text.so
sbin/clixon_backend
sbin/clixon_restconf
-%%DATADIR%%/clixon-config@2018-04-30.yang
+%%DATADIR%%/clixon-config@2018-10-21.yang
%%DATADIR%%/ietf-inet-types@2013-07-15.yang
%%DATADIR%%/ietf-netconf-acm@2018-02-14.yang
+%%DATADIR%%/ietf-netconf-notification@2008-07-01.yang
%%DATADIR%%/ietf-netconf@2011-06-01.yang
+%%DATADIR%%/ietf-restconf-monitoring@2017-01-26.yang
+%%DATADIR%%/ietf-yang-library@2016-06-21.yang
%%DATADIR%%/ietf-yang-types@2013-07-15.yang
@dir lib/clixon/plugins/backend
@dir lib/clixon/plugins/cli