textproc/libucl: Update to 0.8.1

- Bump revision of consumers for shared library change
- Pet portlint and reorder some variables
- Mark the SIGNATURES option as broken with OpenSSL 1.1.1.  It has
  been broken for a while even with libucl 0.8.0.

Changes:	https://github.com/vstakhov/libucl/blob/0.8.1/ChangeLog.md#libucl-081
PR:		233383
Submitted by:	Lorenzo Salvadore <phascolarctos@protonmail.ch>
Approved by:	koobs (maintainer timeout, 4 months)

5 files changed, 26 insertions, 17 deletions

diff --git a/textproc/libucl/Makefile b/textproc/libucl/Makefile
index aec86f09202b..5aba9ea44571 100644
--- a/textproc/libucl/Makefile
+++ b/textproc/libucl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libucl
-PORTVERSION=	0.8.0
+PORTVERSION=	0.8.1
 CATEGORIES=	textproc devel
 
 MAINTAINER=	koobs@FreeBSD.org
@@ -14,6 +14,18 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_mips=		fails to link: undefined reference to '__sync_add_and_fetch_4'
 BROKEN_mips64=		fails to link: undefined reference to '__sync_add_and_fetch_4'
 
+USES=		autoreconf gmake libtool pathfix pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	vstakhov
+USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+
+CONFLICTS_INSTALL=	ucl
+
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
+
 OPTIONS_DEFINE=		LUA REGEX SIGNATURES URLS UTILS
 OPTIONS_DEFAULT=	REGEX UTILS
 OPTIONS_SUB=		yes
@@ -21,7 +33,7 @@ OPTIONS_SUB=		yes
 REGEX_DESC=		Enable regex checking for schema
 SIGNATURES_DESC=	Enable signatures checking
 URLS_DESC=		Enable fetching URLs
-UTILS_DESC=		Enable tools:  ucl_chargen, ucl_ucldump, ucl_tool
+UTILS_DESC=		Enable tools: ucl_chargen, ucl_ucldump, ucl_tool
 
 LUA_CONFIGURE_ENABLE=	lua
 LUA_CONFIGURE_ENV=	LUA=${LOCALBASE}/bin/${LUA_CMD}
@@ -39,17 +51,11 @@ URLS_CONFIGURE_ENABLE=	urls
 
 UTILS_CONFIGURE_ENABLE=	utils
 
-USES=		autoreconf gmake libtool pathfix pkgconfig
-USE_GITHUB=	yes
-USE_LDCONFIG=	yes
+.include <bsd.port.options.mk>
 
-GNU_CONFIGURE=	yes
-
-GH_ACCOUNT=	vstakhov
-
-CONFLICTS_INSTALL=	ucl
-
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check
+# https://github.com/vstakhov/libucl/issues/203
+.if ${PORT_OPTIONS:MSIGNATURES} && ((${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl111)
+BROKEN=	Signatures checking support does not build with OpenSSL 1.1.1
+.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/libucl/distinfo b/textproc/libucl/distinfo
index 3f11bb0a9b1c..f90524f62801 100644
--- a/textproc/libucl/distinfo
+++ b/textproc/libucl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vstakhov-libucl-0.8.0_GH0.tar.gz) = af361cd1f0b7b66c228a1c04a662ccaa9ee8af79842046c04446d915db349ee1
-SIZE (vstakhov-libucl-0.8.0_GH0.tar.gz) = 2022942
+TIMESTAMP = 1542811208
+SHA256 (vstakhov-libucl-0.8.1_GH0.tar.gz) = a6397e179672f0e8171a0f9a2cfc37e01432b357fd748b13f4394436689d24ef
+SIZE (vstakhov-libucl-0.8.1_GH0.tar.gz) = 2028394
diff --git a/textproc/libucl/pkg-plist b/textproc/libucl/pkg-plist
index 630ced40ec8b..82d7c08a5cce 100644
--- a/textproc/libucl/pkg-plist
+++ b/textproc/libucl/pkg-plist
@@ -6,8 +6,8 @@ include/ucl.h
 include/ucl++.h
 lib/libucl.a
 lib/libucl.so
-lib/libucl.so.6
-lib/libucl.so.6.0.0
+lib/libucl.so.5
+lib/libucl.so.5.1.0
 %%LUA%%%%LUA_MODLIBDIR%%/ucl.a
 %%LUA%%%%LUA_MODLIBDIR%%/ucl.so
 libdata/pkgconfig/libucl.pc
diff --git a/textproc/py-ucl/Makefile b/textproc/py-ucl/Makefile
index 1130711a980f..ce04e2a907f8 100644
--- a/textproc/py-ucl/Makefile
+++ b/textproc/py-ucl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ucl
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/textproc/uncle/Makefile b/textproc/uncle/Makefile
index c5598ca183c9..b1a2bd2793b3 100644
--- a/textproc/uncle/Makefile
+++ b/textproc/uncle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	uncle
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	gblach@FreeBSD.org