Index: head/devel/clixon/Makefile =================================================================== --- head/devel/clixon/Makefile (revision 510951) +++ head/devel/clixon/Makefile (revision 510952) @@ -1,32 +1,35 @@ # $FreeBSD$ PORTNAME= clixon -PORTVERSION= 3.9.0 -PORTREVISION= 1 +PORTVERSION= 4.0.0 CATEGORIES= devel MAINTAINER= dcornejo@netgate.com COMMENT= CLIgen is a Command-Line Interface generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libcligen.so:devel/cligen \ libfcgi.so:www/fcgi BUILD_DEPENDS= cligen>=3.9.0:devel/cligen USES= autoreconf bison gmake USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= clicon -MAKE_ARGS= wwwdir=${PREFIX}/sbin wwwuser=${WWWOWN} +MAKE_ARGS= wwwdir=${PREFIX}/sbin \ + wwwuser=${WWWOWN} GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-cligen=${LOCALBASE} --sysconfdir=${ETCDIR} +CONFIGURE_ARGS= --sysconfdir=${ETCDIR} \ + --with-cligen=${LOCALBASE} CONFIGURE_ENV= YACC="bison -y" -MAKE_JOBS_UNSAFE=yes +SUB_FILES= pkg-message + +MAKE_JOBS_UNSAFE= yes .include Index: head/devel/clixon/distinfo =================================================================== --- head/devel/clixon/distinfo (revision 510951) +++ head/devel/clixon/distinfo (revision 510952) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550886761 -SHA256 (clicon-clixon-3.9.0_GH0.tar.gz) = 3be8eb904a505cc740568e06f75123c6e9b4e0e8173faccdd4a091b1dccfca60 -SIZE (clicon-clixon-3.9.0_GH0.tar.gz) = 781568 +TIMESTAMP = 1563660130 +SHA256 (clicon-clixon-4.0.0_GH0.tar.gz) = b4f8ffd0e781b2e0097a2ed7bcba65e8fe8e50ae08a35f6867459a3a84a35f39 +SIZE (clicon-clixon-4.0.0_GH0.tar.gz) = 952149 Property changes on: head/devel/clixon/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/devel/clixon/files/patch-apps_netconf_netconf__main.c =================================================================== --- head/devel/clixon/files/patch-apps_netconf_netconf__main.c (revision 510951) +++ head/devel/clixon/files/patch-apps_netconf_netconf__main.c (nonexistent) @@ -1,11 +0,0 @@ ---- apps/netconf/netconf_main.c.orig 2019-02-21 19:04:04 UTC -+++ apps/netconf/netconf_main.c -@@ -312,7 +312,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; - } - Property changes on: head/devel/clixon/files/patch-apps_netconf_netconf__main.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/clixon/files/patch-lib_clixon_clixon__plugin.h =================================================================== --- head/devel/clixon/files/patch-lib_clixon_clixon__plugin.h (revision 510951) +++ head/devel/clixon/files/patch-lib_clixon_clixon__plugin.h (nonexistent) @@ -1,11 +0,0 @@ ---- lib/clixon/clixon_plugin.h.orig 2019-02-21 19:04:04 UTC -+++ lib/clixon/clixon_plugin.h -@@ -49,8 +49,6 @@ - /* - * Types - */ --/* Dynamicically loadable plugin object handle. @see return value of dlopen(3) */ --typedef void *plghndl_t; - - /*! Registered RPC callback function - * @param[in] h Clicon handle Property changes on: head/devel/clixon/files/patch-lib_clixon_clixon__plugin.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/clixon/files/patch-configure.ac =================================================================== --- head/devel/clixon/files/patch-configure.ac (nonexistent) +++ head/devel/clixon/files/patch-configure.ac (revision 510952) @@ -0,0 +1,12 @@ +--- configure.ac.orig 2019-07-13 14:33:23 UTC ++++ configure.ac +@@ -123,9 +123,6 @@ AC_PROG_LEX + if test "$LEX" = ":"; then + AC_MSG_ERROR(CLIXON does not find lex or flex.) + fi +-if test "$YACC" != "bison -y"; then +- AC_MSG_ERROR(CLIXON does not find bison. There are several problems with yacc and byacc. Please install bison.) +-fi + + if test "$prefix" = "NONE"; then + prefix=${ac_default_prefix} Property changes on: head/devel/clixon/files/patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/clixon/files/pkg-message.in =================================================================== --- head/devel/clixon/files/pkg-message.in (nonexistent) +++ head/devel/clixon/files/pkg-message.in (revision 510952) @@ -0,0 +1,7 @@ + +Version 4.0.0 is much stricter and more standards compliant + +It is very likely that you will need to change your code. + +See https://github.com/clicon/clixon/blob/master/CHANGELOG.md +for details on the changes, especially the API changes. Property changes on: head/devel/clixon/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/clixon/pkg-plist =================================================================== --- head/devel/clixon/pkg-plist (revision 510951) +++ head/devel/clixon/pkg-plist (revision 510952) @@ -1,37 +1,37 @@ bin/clixon_cli bin/clixon_netconf %%ETCDIR%%/clixonrc lib/libclixon.so -lib/libclixon.so.3 -lib/libclixon.so.3.9 +lib/libclixon.so.4 +lib/libclixon.so.4.0 lib/libclixon_backend.so -lib/libclixon_backend.so.3 -lib/libclixon_backend.so.3.9 +lib/libclixon_backend.so.4 +lib/libclixon_backend.so.4.0 lib/libclixon_cli.so -lib/libclixon_cli.so.3 -lib/libclixon_cli.so.3.9 +lib/libclixon_cli.so.4 +lib/libclixon_cli.so.4.0 lib/libclixon_netconf.so -lib/libclixon_netconf.so.3 -lib/libclixon_netconf.so.3.9 +lib/libclixon_netconf.so.4 +lib/libclixon_netconf.so.4.0 lib/libclixon_restconf.so -lib/libclixon_restconf.so.3 -lib/libclixon_restconf.so.3.9 -lib/xmldb/text.so +lib/libclixon_restconf.so.4 +lib/libclixon_restconf.so.4.0 sbin/clixon_backend sbin/clixon_restconf -%%DATADIR%%/clixon-config@2019-02-06.yang -%%DATADIR%%/clixon-lib@2019-01-02.yang +%%DATADIR%%/clixon-config@2019-06-05.yang +%%DATADIR%%/clixon-lib@2019-06-05.yang %%DATADIR%%/clixon-rfc5277@2008-07-01.yang +%%DATADIR%%/clixon-xml-changelog@2019-03-21.yang %%DATADIR%%/iana-if-type@2014-05-08.yang %%DATADIR%%/ietf-inet-types@2013-07-15.yang %%DATADIR%%/ietf-interfaces@2018-02-20.yang %%DATADIR%%/ietf-ip@2014-06-16.yang %%DATADIR%%/ietf-netconf-acm@2018-02-14.yang %%DATADIR%%/ietf-netconf-monitoring@2010-10-04.yang %%DATADIR%%/ietf-netconf@2011-06-01.yang %%DATADIR%%/ietf-restconf-monitoring@2017-01-26.yang %%DATADIR%%/ietf-routing@2018-03-13.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 Property changes on: head/devel/clixon/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property