Index: head/devel/uclcmd/Makefile =================================================================== --- head/devel/uclcmd/Makefile (revision 496633) +++ head/devel/uclcmd/Makefile (revision 496634) @@ -1,26 +1,26 @@ # $FreeBSD$ PORTNAME= uclcmd PORTVERSION= 0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= allanjude@FreeBSD.org COMMENT= Command line tool for working with UCL config files LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libucl.so:textproc/libucl USE_GITHUB= yes GH_ACCOUNT= allanjude GH_TAGNAME= da1ac0f USES= pkgconfig PLIST_FILES= bin/uclcmd post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/sysutils/hfm/Makefile =================================================================== --- head/sysutils/hfm/Makefile (revision 496633) +++ head/sysutils/hfm/Makefile (revision 496634) @@ -1,52 +1,52 @@ # $FreeBSD$ PORTNAME= hfm PORTVERSION= 1.2.3 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= 554b8425@razorfever.net COMMENT= Run tests in parallel at high frequency LICENSE= BSD2CLAUSE # gb 0.4 includes FreeBSD-specific fixes that this port requires # https://github.com/constabulary/gb/issues/506 BUILD_DEPENDS= go>=1.5:lang/go \ gb>=0.4:devel/gb \ ${LOCALBASE}/lib/libucl.a:textproc/libucl USES= compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= derekmarcotte GH_TUPLE= mitchellh:go-libucl:f9d0e55:gu/vendor/src/github.com/mitchellh/go-libucl \ op:go-logging:dfaf3df:gl/vendor/src/github.com/op/go-logging USERS= _hfm GROUPS= _hfm USE_RC_SUBR= hfm MAKE_ARGS+= ETCDIR=${ETCDIR} TAG=${DISTVERSIONPREFIX}${PORTVERSION} ALL_TARGET= test build OPTIONS_DEFINE= DOCS EXAMPLES do-patch: (cd ${WRKSRC}; ${PATCH} vendor/src/github.com/mitchellh/go-libucl/libucl.go < vendor/patches/github.com/mitchellh/go-libucl/libucl.go.patch ) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/hfm ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/examples/hfm.conf.sample ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} .include Index: head/textproc/libucl/Makefile =================================================================== --- head/textproc/libucl/Makefile (revision 496633) +++ head/textproc/libucl/Makefile (revision 496634) @@ -1,55 +1,61 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= libucl -PORTVERSION= 0.8.0 +PORTVERSION= 0.8.1 CATEGORIES= textproc devel MAINTAINER= koobs@FreeBSD.org COMMENT= Universal configuration library parser LICENSE= BSD2CLAUSE 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 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} LUA_LDFLAGS= -L${LUA_LIBDIR} LUA_USES= lua REGEX_CONFIGURE_ENABLE= regex SIGNATURES_CONFIGURE_ENABLE= signatures SIGNATURES_CPPFLAGS= -I${OPENSSLINC} SIGNATURES_LDFLAGS= -L${OPENSSLLIB} SIGNATURES_USES= ssl URLS_CONFIGURE_ENABLE= urls UTILS_CONFIGURE_ENABLE= utils -USES= autoreconf gmake libtool pathfix pkgconfig -USE_GITHUB= yes -USE_LDCONFIG= yes +.include -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 Index: head/textproc/libucl/distinfo =================================================================== --- head/textproc/libucl/distinfo (revision 496633) +++ head/textproc/libucl/distinfo (revision 496634) @@ -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 Index: head/textproc/libucl/pkg-plist =================================================================== --- head/textproc/libucl/pkg-plist (revision 496633) +++ head/textproc/libucl/pkg-plist (revision 496634) @@ -1,14 +1,14 @@ %%UTILS%%bin/ucl_chargen %%UTILS%%bin/ucl_objdump %%UTILS%%bin/ucl_tool %%LUA%%include/lua_ucl.h 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 man/man3/libucl.3.gz Index: head/textproc/py-ucl/Makefile =================================================================== --- head/textproc/py-ucl/Makefile (revision 496633) +++ head/textproc/py-ucl/Makefile (revision 496634) @@ -1,27 +1,28 @@ # $FreeBSD$ PORTNAME= ucl PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= textproc python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wg@FreeBSD.org COMMENT= UCL parser and emmitter LICENSE= MIT LICENSE_FILE= ${WRKDIR}/libucl-${PORTVERSION}/COPYING LIB_DEPENDS= libucl.so:textproc/libucl CFLAGS+= -I${PREFIX}/include USES= python USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils GH_ACCOUNT= vstakhov GH_PROJECT= libucl WRKSRC_SUBDIR= python .include Index: head/textproc/uncle/Makefile =================================================================== --- head/textproc/uncle/Makefile (revision 496633) +++ head/textproc/uncle/Makefile (revision 496634) @@ -1,21 +1,22 @@ # Created by: Grzegorz Blach # $FreeBSD$ PORTNAME= uncle PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= gblach@FreeBSD.org COMMENT= Convert UCL config file to desired format LICENSE= BSD2CLAUSE LIB_DEPENDS= libucl.so:textproc/libucl USE_CSTD= c99 USE_GITHUB= yes GH_ACCOUNT= MagikBSD PLIST_FILES= bin/uncle .include