*/*: sync with upstream

Taken from: FreeBSD

archivers/py-borgbackup/Makefile

@@ -27,17 +27,19 @@ USES=		python:3.4+
 USE_PYTHON=	autoplist distutils
 USE_OPENSSL=	yes
 
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
+.include <bsd.port.options.mk>
 
 # borg requires openssl>=1.0.0
 .if ${OSVERSION} < 1000015
 WITH_OPENSSL_PORT=yes
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
+IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
+.endif
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/*.so
 

benchmarks/fio/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fio
-PORTVERSION=	2.11
+PORTVERSION=	2.12
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://brick.kernel.dk/snaps/
 

benchmarks/fio/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1464561760
-SHA256 (fio-2.11.tar.bz2) = be0130047a396e7b76a3cd2bd21705e0497807c037bbaeade273a4c3ea9be4af
-SIZE (fio-2.11.tar.bz2) = 527395
+TIMESTAMP = 1466083025
+SHA256 (fio-2.12.tar.bz2) = 72fd4bb9fb20bce003ea0cda98cb89f38d2a345a3112b253ff76402c3cde8407
+SIZE (fio-2.12.tar.bz2) = 529288

converters/R-cran-jsonlite/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jsonlite
-PORTVERSION=	0.9.21
+PORTVERSION=	0.9.22
 CATEGORIES=	converters
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 

converters/R-cran-jsonlite/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1465155284
-SHA256 (jsonlite_0.9.21.tar.gz) = 079349342ea6eb92bd5fa8f6a7c08d9e3652c3d41010b64afbc3297671eb3791
-SIZE (jsonlite_0.9.21.tar.gz) = 1057400
+TIMESTAMP = 1466076246
+SHA256 (jsonlite_0.9.22.tar.gz) = 381d97ca92b14a87774e75e4b3b83bd8799bccd70b6fdd93faff896ac78f1d0a
+SIZE (jsonlite_0.9.22.tar.gz) = 1057097

databases/adabase/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adabase
-PORTVERSION=	3.0
+PORTVERSION=	3.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 

databases/adabase/distinfo

@@ -1,2 +1,3 @@
-SHA256 (jrmarino-AdaBase-v3.0_GH0.tar.gz) = 65b2b81b1b083951771ff6f8c4efa6dadb84ecdc7147659dffb10527803b54c5
-SIZE (jrmarino-AdaBase-v3.0_GH0.tar.gz) = 132468
+TIMESTAMP = 1466107071
+SHA256 (jrmarino-AdaBase-v3.1_GH0.tar.gz) = 115967a90abf94f102aa4916a2ed14fb7aac2382f56113b791f2fd08b909444a
+SIZE (jrmarino-AdaBase-v3.1_GH0.tar.gz) = 163154

databases/adabase/pkg-plist

@@ -55,6 +55,10 @@ include/adabase/adabase-statement.ads
 include/adabase/adabase.ads
 include/adabase/commontext.adb
 include/adabase/commontext.ads
+include/adabase/spatial_data-well_known_binary.adb
+include/adabase/spatial_data-well_known_binary.ads
+include/adabase/spatial_data.adb
+include/adabase/spatial_data.ads
 %%MYSQL%%lib/adabase/adabase-bindings-mysql.ali
 %%PGSQL%%lib/adabase/adabase-bindings-postgresql.ali
 %%SQLITE%%lib/adabase/adabase-bindings-sqlite.ali
@@ -92,4 +96,6 @@ lib/adabase/adabase-statement.ali
 lib/adabase/adabase.ali
 lib/adabase/commontext.ali
 lib/adabase/libadabase.a
+lib/adabase/spatial_data-well_known_binary.ali
+lib/adabase/spatial_data.ali
 lib/gnat/adabase.gpr

databases/mariadb101-server/Makefile

@@ -144,12 +144,12 @@ post-install:
 		${STAGEDIR}/${PREFIX}/share/pkgconfig
 .endif # defined(CLIENT_ONLY)
 
-.if defined(WITH_OPENSSL_PORT)
-GSSAPI_BASE_IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
-.endif
-
 .include <bsd.port.pre.mk>
 
+.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
+IGNORE=		BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
+.endif
+
 .if ${OPSYS} == DragonFly
 CMAKE_ARGS+=	-DWITHOUT_TOKUDB
 .endif

databases/mysql57-server/Makefile

@@ -129,18 +129,22 @@ PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
 PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ### Just for the sake of FreeBSD 9.X ###
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
 .if !defined(CLIENT_ONLY)
 EXTRA_PATCHES+=		${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
 .endif
 WITH_OPENSSL_PORT=	yes
+CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
+.endif
+
+.include <bsd.port.pre.mk>
 
 ### FreeBSD Version > 9.X ###
-.else
-.if defined(WITH_OPENSSL_BASE)
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
+.if ${SSL_DEFAULT} == base
 CMAKE_ARGS+=		-DWITH_SSL=system
 .else
 CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}

devel/Makefile

@@ -43,6 +43,7 @@
     SUBDIR += R-cran-reshape2
     SUBDIR += R-cran-rngtools
     SUBDIR += R-cran-rstudioapi
+    SUBDIR += R-cran-tibble
     SUBDIR += R-cran-tidyr
     SUBDIR += SpecTcl
     SUBDIR += aap

devel/R-cran-caret/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	caret
-DISTVERSION=	6.0-68
+DISTVERSION=	6.0-70
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 

devel/R-cran-caret/distinfo

@@ -1,2 +1,3 @@
-SHA256 (caret_6.0-68.tar.gz) = 4636a974eb187a7a53199a1b5e5189dbbe11d2c892c5aea0c3ab4be41f47d213
-SIZE (caret_6.0-68.tar.gz) = 4181028
+TIMESTAMP = 1465982430
+SHA256 (caret_6.0-70.tar.gz) = 21c5bdf7cf07bece38729465366564d8ca104c2466ee9fd800ca1fd88eb82f38
+SIZE (caret_6.0-70.tar.gz) = 4287504

devel/R-cran-tibble/Makefile

@@ -0,0 +1,20 @@
+# Created by: TAKATSU Tomonari <[email protected]>
+# $FreeBSD$
+
+PORTNAME=	tibble
+PORTVERSION=	1.0
+CATEGORIES=	devel
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	[email protected]
+COMMENT=	Simple Data Frames
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	R-cran-assertthat>0:math/R-cran-assertthat \
+		R-cran-lazyeval>0.0.10:math/R-cran-lazyeval \
+		R-cran-Rcpp>0:devel/R-cran-Rcpp
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>

devel/R-cran-tibble/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1466077159
+SHA256 (tibble_1.0.tar.gz) = c61285cc07dc9182b7a631c648eaf6f8994f5fde0f603736ada2c2da6b55b180
+SIZE (tibble_1.0.tar.gz) = 38038

devel/R-cran-tibble/pkg-descr

@@ -0,0 +1,4 @@
+tibble provides a 'tbl_df' class that offers better checking and
+printing capabilities than traditional data frames.
+
+WWW: https://cran.r-project.org/web/packages/tibble/

devel/R-cran-tidyr/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tidyr
-PORTVERSION=	0.4.1
+PORTVERSION=	0.5.1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -11,7 +11,8 @@ COMMENT=	Easily tidy data with spread and gather functions
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-dplyr>=0.4:math/R-cran-dplyr \
+RUN_DEPENDS=	R-cran-tibble>0:devel/R-cran-tibble \
+		R-cran-dplyr>=0.4:math/R-cran-dplyr \
 		R-cran-stringi>0:textproc/R-cran-stringi \
 		R-cran-lazyeval>0:math/R-cran-lazyeval \
 		R-cran-magrittr>0:devel/R-cran-magrittr \

devel/R-cran-tidyr/distinfo

@@ -1,2 +1,3 @@
-SHA256 (tidyr_0.4.1.tar.gz) = 506cfb48b9fc697c9c259588b8e1aab8547e14ab98741a73153d122ab2a7e676
-SIZE (tidyr_0.4.1.tar.gz) = 158472
+TIMESTAMP = 1465983461
+SHA256 (tidyr_0.5.1.tar.gz) = dbab642ac7231cbfe3e2a0d4553fb4ffb3699c6d6b432be2bb5812dfbbdbdace
+SIZE (tidyr_0.5.1.tar.gz) = 344562

devel/acsccid/Makefile

@@ -13,22 +13,22 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
-USES=	perl5 pkgconfig tar:bz2
+USES=		perl5 pkgconfig tar:bz2
 
-PLIST_FILES=	lib/pcsc/drivers/ifd-acsccid.bundle/Contents/FreeBSD/libacsccid.so \
+PLIST_FILES=	lib/pcsc/drivers/ifd-acsccid.bundle/Contents/${OPSYS}/libacsccid.so \
 		lib/pcsc/drivers/ifd-acsccid.bundle/Contents/Info.plist
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
 # Old versions don't have pkgconfig files for libusb
-.if ${OSVERSION} < 1000024
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024
 CONFIGURE_ENV+=	LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
 		LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb"
 .endif
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers/ifd-acsccid.bundle/Contents/FreeBSD/libacsccid.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers/ifd-acsccid.bundle/Contents/${OPSYS}/libacsccid.so
 
 .include <bsd.port.post.mk>

devel/erlang-gpb/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gpb
-PORTVERSION=	3.22.2
+PORTVERSION=	3.22.3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 

devel/erlang-gpb/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1465199162
-SHA256 (tomas-abrahamsson-gpb-3.22.2_GH0.tar.gz) = ee73ad6ee2dee84da66ab936edd0789444cda0ef7c46dd8bde597e3e7855ec30
-SIZE (tomas-abrahamsson-gpb-3.22.2_GH0.tar.gz) = 316758
+TIMESTAMP = 1466071499
+SHA256 (tomas-abrahamsson-gpb-3.22.3_GH0.tar.gz) = 8151e12798e85f077441167919a9575e9cf1072a53d6b4715e84fb21982b0be1
+SIZE (tomas-abrahamsson-gpb-3.22.3_GH0.tar.gz) = 317184

devel/fossil/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fossil
-PORTVERSION=	1.34
+PORTVERSION=	1.35
 DISTVERSIONPREFIX=	src-
 PORTEPOCH=	2
 CATEGORIES=	devel www
@@ -23,6 +23,7 @@ MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	JSON FUSE STATIC
 OPTIONS_DEFAULT=	JSON
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 JSON_DESC=	JSON API support
 FUSE_DESC=	Enable fossil fusefs command
 

devel/fossil/distinfo

@@ -1,2 +1,3 @@
-SHA256 (fossil-src-1.34.tar.gz) = 53a6b83e878feced9ac7705f87e5b6ea82727314e3e19202ae1c46c7e4dba49f
-SIZE (fossil-src-1.34.tar.gz) = 4449452
+TIMESTAMP = 1466078387
+SHA256 (fossil-src-1.35.tar.gz) = c1f92f925a87c9872cb40d166f56ba08b90edbab01a8546ff37025836136ba1d
+SIZE (fossil-src-1.35.tar.gz) = 4642421

devel/libgit2/Makefile

@@ -40,7 +40,7 @@ BROKEN_sparc64=	does not install: thread-local storage not supported
 post-patch:
 	@${REINPLACE_CMD} -e "s|/pkgconfig|/../libdata/pkgconfig|; \
 		/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
-.if defined(WITH_OPENSSL_BASE)
+.if ${SSL_DEFAULT} == base
 	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
 		${WRKSRC}/CMakeLists.txt
 .endif

devel/libopkele/Makefile

@@ -41,7 +41,7 @@ USE_OPENSSL=	yes
 post-patch:
 	@ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \
 	    ${WRKSRC}/Makefile.in
-.if !defined(WITH_OPENSSL_PORT)
+.if ${SSL_DEFAULT} == base
 	@ ${REINPLACE_CMD} -e "s|Requires: openssl|Requires:|" ${WRKSRC}/libopkele.pc.in
 .endif
 

devel/ocaml-pomap/Makefile

@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	[email protected]
 COMMENT=	OCaml library to maintain a list of partially ordered elements
 
-LICENSE=	LGPL21
+LICENSE=	LGPL20+ # source says LGPL20+, COPYING says LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmottl
@@ -32,11 +33,13 @@ PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS.txt CHANGES.txt README.md
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/examples && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})

devel/pep8/Makefile

@@ -15,7 +15,7 @@ LICENSE=	MIT
 
 NO_ARCH=	yes
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils py3kplist
+USE_PYTHON=	autoplist concurrent distutils
 
 do-test: extract
 	@(cd ${WRKSRC}; ${PYTHON_CMD} ${PORTNAME}.py \

devel/thrift-cpp/Makefile

@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=	\
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_OPENSSL_PORT) && \
+.if ${SSL_DEFAULT} == base && \
 	${OPSYS} == FreeBSD && ${OSVERSION} < 1000015
 # src/thrift/transport/TSSLSocket.cpp:147: error: 'TLSv1_1_method' was not declared in this scope
 # src/thrift/transport/TSSLSocket.cpp:149: error: 'TLSv1_2_method' was not declared in this scope

dns/bind9-devel/Makefile

@@ -207,9 +207,9 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE)
+.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base
 BROKEN=	OpenSSL from the base system does not support GOST, add \
-	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
+	DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \
 	that needs SSL.
 .endif
 

dns/bind99/Makefile

@@ -191,9 +191,9 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ( ${PORT_OPTIONS:MGOST} ) && defined(WITH_OPENSSL_BASE)
+.if ( ${PORT_OPTIONS:MGOST} ) && ${SSL_DEFAULT} == base
 BROKEN=	OpenSSL from the base system does not support GOST, add \
-	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
+	DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \
 	that needs SSL.
 .endif
 

dns/py-pycares/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pycares
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1.0
 CATEGORIES=	dns python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

dns/py-pycares/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1464695332
-SHA256 (pycares-2.0.1.tar.gz) = 3a684c09b753e143d86190b57d71bd82d24492062d11d6ab6acc21349d2da34d
-SIZE (pycares-2.0.1.tar.gz) = 225788
+TIMESTAMP = 1466077939
+SHA256 (pycares-2.1.0.tar.gz) = 449ad785ecb594ae063c0c86537ef97513385117a2eb172f747ad2a29221e898
+SIZE (pycares-2.1.0.tar.gz) = 226838