Update devel/clixon to 3.6.1

Approved by:	maintainer
Sponsored by:	Rubicon Communications, LLC (Netgate)

5 files changed, 6 insertions, 47 deletions

diff --git a/devel/clixon/Makefile b/devel/clixon/Makefile
index dc5629e65b8f..247efd10a0da 100644
--- a/devel/clixon/Makefile
+++ b/devel/clixon/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clixon
-DISTVERSION=	3.6.0.b.20180424
+PORTVERSION=	3.6.1
 CATEGORIES=	devel
 
 MAINTAINER=	dcornejo@netgate.com
@@ -18,7 +18,7 @@ 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}
diff --git a/devel/clixon/distinfo b/devel/clixon/distinfo
index e31b31703cba..e695a636a842 100644
--- a/devel/clixon/distinfo
+++ b/devel/clixon/distinfo
@@ -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
diff --git a/devel/clixon/files/patch-apps_netconf_Makefile.in b/devel/clixon/files/patch-apps_netconf_Makefile.in
deleted file mode 100644
index 42896da2bab2..000000000000
--- a/devel/clixon/files/patch-apps_netconf_Makefile.in
+++ /dev/null
@@ -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@
diff --git a/devel/clixon/files/patch-apps_restconf_Makefile.in b/devel/clixon/files/patch-apps_restconf_Makefile.in
deleted file mode 100644
index 510a55f056d8..000000000000
--- a/devel/clixon/files/patch-apps_restconf_Makefile.in
+++ /dev/null
@@ -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)
diff --git a/devel/clixon/pkg-plist b/devel/clixon/pkg-plist
index 3951bbb3e9cc..4bbad8238f13 100644
--- a/devel/clixon/pkg-plist
+++ b/devel/clixon/pkg-plist
@@ -20,7 +20,7 @@ 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