Index: head/devel/clixon/files/patch-apps_restconf_Makefile.in
===================================================================
--- head/devel/clixon/files/patch-apps_restconf_Makefile.in	(revision 472263)
+++ head/devel/clixon/files/patch-apps_restconf_Makefile.in	(nonexistent)
@@ -1,30 +0,0 @@
---- apps/restconf/Makefile.in.orig	2018-04-24 15:43:19 UTC
-+++ apps/restconf/Makefile.in
-@@ -44,7 +44,7 @@ bindir 		= @bindir@
- libdir		= @libdir@
- mandir		= @mandir@
- libexecdir	= @libexecdir@
--wwwdir  	= /www-data
-+wwwdir  	= @sbindir@
- localstatedir	= @localstatedir@
- sysconfdir	= @sysconfdir@
- includedir	= @includedir@
-@@ -101,14 +101,14 @@ install:	install-lib $(APPL)
- 	install -m 0755 -s $(APPL) $(DESTDIR)$(wwwdir)
- 
- install-lib: $(MYLIB)
--	install -d $(DESTDIR)$(libdir) 
--	install $(MYLIB) $(DESTDIR)$(libdir) 
-+	install -d -m 0755 $(DESTDIR)$(libdir) 
-+	install -m 0644 -s $(MYLIB) $(DESTDIR)$(libdir) 
- 	ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO)     # -l:libclixon_restconf.so.2
- 	ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon_restconf.so
- 
- install-include:	clixon_restconf.h
--	install -d $(DESTDIR)$(includedir)/clixon
--	install -m 644 $^ $(DESTDIR)$(includedir)/clixon
-+	install -d -m 0755 $(DESTDIR)$(includedir)/clixon
-+	install -m 0644 $^ $(DESTDIR)$(includedir)/clixon
- 
- uninstall:
- 	rm -f $(DESTDIR)$(wwwdir)/$(APPL)

Property changes on: head/devel/clixon/files/patch-apps_restconf_Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-on
\ 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-apps_netconf_Makefile.in
===================================================================
--- head/devel/clixon/files/patch-apps_netconf_Makefile.in	(revision 472263)
+++ head/devel/clixon/files/patch-apps_netconf_Makefile.in	(nonexistent)
@@ -1,11 +0,0 @@
---- apps/netconf/Makefile.in.orig	2018-04-15 09:53:12 UTC
-+++ apps/netconf/Makefile.in
-@@ -44,7 +44,7 @@ bindir 		= @bindir@
- libdir		= @libdir@
- mandir		= @mandir@
- libexecdir	= @libexecdir@
--wwwdir  	= /www-data
-+wwwdir  	= @prefix@/sbin
- localstatedir	= @localstatedir@
- sysconfdir	= @sysconfdir@
- includedir	= @includedir@

Property changes on: head/devel/clixon/files/patch-apps_netconf_Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-on
\ 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/Makefile
===================================================================
--- head/devel/clixon/Makefile	(revision 472263)
+++ head/devel/clixon/Makefile	(revision 472264)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	clixon
-DISTVERSION=	3.6.0.b.20180424
+PORTVERSION=	3.6.1
 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
 
 USES=		bison gmake
 
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	clicon
-GH_TAGNAME=	d57a6cf53cdda4a3e5da122eb34de5ce069676f0
+MAKE_ARGS=	wwwdir=${PREFIX}/sbin
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cligen=${LOCALBASE} --sysconfdir=${ETCDIR}
 
 MAKE_JOBS_UNSAFE=yes
 
 .include <bsd.port.mk>
Index: head/devel/clixon/distinfo
===================================================================
--- head/devel/clixon/distinfo	(revision 472263)
+++ head/devel/clixon/distinfo	(revision 472264)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524681931
-SHA256 (clicon-clixon-3.6.0.b.20180424-d57a6cf53cdda4a3e5da122eb34de5ce069676f0_GH0.tar.gz) = 3985436b89f0e1547ac8d49b277877a1cd5b4001bc2fbca14ffc217d81dcdca9
-SIZE (clicon-clixon-3.6.0.b.20180424-d57a6cf53cdda4a3e5da122eb34de5ce069676f0_GH0.tar.gz) = 697630
+TIMESTAMP = 1528817447
+SHA256 (clicon-clixon-3.6.1_GH0.tar.gz) = 77848fdbccecacab4945310e0c8d0b6e0bc757e219b3aae3a71027ab9e134a79
+SIZE (clicon-clixon-3.6.1_GH0.tar.gz) = 698688
Index: head/devel/clixon/pkg-plist
===================================================================
--- head/devel/clixon/pkg-plist	(revision 472263)
+++ head/devel/clixon/pkg-plist	(revision 472264)
@@ -1,30 +1,30 @@
 bin/clixon_cli
 bin/clixon_netconf
 bin/datastore_client
 %%ETCDIR%%/clixonrc
 lib/libclixon.so
 lib/libclixon.so.3
 lib/libclixon.so.3.6
 lib/libclixon_backend.so
 lib/libclixon_backend.so.3
 lib/libclixon_backend.so.3.6
 lib/libclixon_cli.so
 lib/libclixon_cli.so.3
 lib/libclixon_cli.so.3.6
 lib/libclixon_netconf.so
 lib/libclixon_netconf.so.3
 lib/libclixon_netconf.so.3.6
 lib/libclixon_restconf.so
 lib/libclixon_restconf.so.3
 lib/libclixon_restconf.so.3.6
 lib/xmldb/text.so
 sbin/clixon_backend
 sbin/clixon_restconf
-%%DATADIR%%/clixon-config@2018-02-12.yang
+%%DATADIR%%/clixon-config@2018-04-30.yang
 %%DATADIR%%/clixon.mk
 %%DATADIR%%/ietf-inet-types@2013-07-15.yang
 %%DATADIR%%/ietf-netconf-acm@2018-02-14.yang
 %%DATADIR%%/ietf-netconf@2011-06-01.yang
 %%DATADIR%%/ietf-yang-types@2013-07-15.yang
 @dir lib/clixon/plugins/backend
 @dir lib/clixon/plugins/cli