*/*: sync with upstream

Taken from: FreeBSD

archivers/unarchiver/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	unar
 PORTVERSION=	1.10.1
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	archivers gnustep
 MASTER_SITES=	http://wakaba.c3.cx/releases/TheUnarchiver/
 DISTNAME=	${PORTNAME}${PORTVERSION}_src

astro/Makefile

@@ -83,12 +83,14 @@
     SUBDIR += py-astropy
     SUBDIR += py-astropy-helpers
     SUBDIR += py-ephem
+    SUBDIR += py-extension-helpers
     SUBDIR += py-horoscopegenerator
     SUBDIR += py-indiweb
     SUBDIR += py-jplephem
     SUBDIR += py-kosmorrolib
     SUBDIR += py-metar
     SUBDIR += py-metpy
+    SUBDIR += py-pyerfa
     SUBDIR += py-pykep
     SUBDIR += py-pymeeus
     SUBDIR += py-pymetar

astro/mkgmap/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	mkgmap
-PORTVERSION=	r4808
+PORTVERSION=	r4810
 CATEGORIES=	astro converters java
 MASTER_SITES=	https://www.mkgmap.org.uk/download/ \
 		https://mirror.amdmi3.ru/distfiles/

astro/mkgmap/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1634222739
-SHA256 (mkgmap-r4808.tar.gz) = 8fc80d3ea5e51151ff430fbdaad3ec6e314ae1ce54e42beaa9a7dc25c0eda2d4
-SIZE (mkgmap-r4808.tar.gz) = 3517992
+TIMESTAMP = 1635256433
+SHA256 (mkgmap-r4810.tar.gz) = cf9a2684eb67ab1d8a6f4c604280af2a86e98c29f06d25b4929b91d1c9c374b1
+SIZE (mkgmap-r4810.tar.gz) = 3518019

astro/py-extension-helpers/Makefile

@@ -0,0 +1,16 @@
+PORTNAME=	extension-helpers
+DISTVERSION=	0.1
+CATEGORIES=	astro
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	[email protected]
+COMMENT=	Building and installing packages in the Astropy ecosystem
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.rst
+
+USES=		python:3.6+
+USE_PYTHON=	autoplist distutils
+
+.include <bsd.port.mk>

astro/py-extension-helpers/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1635380088
+SHA256 (extension-helpers-0.1.tar.gz) = ac8a6fe91c6d98986a51a9f08ca0c7945f8fd70d95b662ced4040ae5eb973882
+SIZE (extension-helpers-0.1.tar.gz) = 24306

astro/py-extension-helpers/pkg-descr

@@ -0,0 +1,6 @@
+The extension-helpers package includes convenience helpers to assist
+with building Python packages with compiled C/Cython extensions. It
+is developed by the Astropy project but is intended to be general
+and usable by any Python package.
+
+WWW: https://extension-helpers.readthedocs.io/

astro/py-pyerfa/Makefile

@@ -0,0 +1,22 @@
+PORTNAME=	pyerfa
+DISTVERSION=	2.0.0
+CATEGORIES=	astro
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	[email protected]
+COMMENT=	Python wrapper for the ERFA library
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.rst
+
+BUILD_DEPENDS=	${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS=	${PYNUMPY}
+
+USES=		python:3.6+
+USE_PYTHON=	autoplist distutils
+
+.include <bsd.port.mk>

astro/py-pyerfa/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1635385118
+SHA256 (pyerfa-2.0.0.tar.gz) = f904231e1a570f94440e06140799590895107f942847b52a753ce81c9609162d
+SIZE (pyerfa-2.0.0.tar.gz) = 808283

astro/py-pyerfa/pkg-descr

@@ -0,0 +1,7 @@
+PyERFA is the Python wrapper for the ERFA library (Essential Routines for
+Fundamental Astronomy), a C library containing key algorithms for astronomy,
+which is based on the SOFA library published by the International Astronomical
+Union (IAU). All C routines are wrapped as Numpy universal functions, so
+that they can be called with scalar or array inputs.
+
+WWW: https://github.com/liberfa/pyerfa

audio/gnome-podcasts/distinfo

@@ -117,8 +117,6 @@ SHA256 (rust/crates/futures-util-0.3.5.crate) = 8764574ff08b701a084482c3c7031349
 SIZE (rust/crates/futures-util-0.3.5.crate) = 132197
 SHA256 (rust/crates/gdk-0.13.1.crate) = 5726681d558da88e07e4bffee21d4e7e5b02b4eb2de0b7d995a8b25813a7ed99
 SIZE (rust/crates/gdk-0.13.1.crate) = 77316
-SHA256 (rust/crates/gettext-sys-0.19.9.crate) = e034c4ba5bb796730a6cc5eb0d654c16885006a7c3d6c6603581ed809434f153
-SIZE (rust/crates/gettext-sys-0.19.9.crate) = 7216453
 SHA256 (rust/crates/gdk-pixbuf-0.9.0.crate) = 8f6dae3cb99dd49b758b88f0132f8d401108e63ae8edd45f432d42cdff99998a
 SIZE (rust/crates/gdk-pixbuf-0.9.0.crate) = 15962
 SHA256 (rust/crates/gdk-pixbuf-sys-0.10.0.crate) = 3bfe468a7f43e97b8d193a762b6c5cf67a7d36cacbc0b9291dbcae24bfea1e8f

audio/musicpd/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	musicpd
 PORTVERSION=	0.23.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}

audio/ncmpcpp/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	ncmpcpp
 DISTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://ncmpcpp.rybczak.net/stable/
 

audio/praat/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=		praat
 DISTVERSIONPREFIX=	v
-DISTVERSION=		6.1.53
+DISTVERSION=		6.1.54
 CATEGORIES=		audio science
 
 MAINTAINER=	[email protected]

audio/praat/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1631703024
-SHA256 (praat-praat-v6.1.53_GH0.tar.gz) = 9d3ee242533194cd22945c42eb6ff8fc3b8f829d4c4f2bef6483f8a892f8cf00
-SIZE (praat-praat-v6.1.53_GH0.tar.gz) = 33659190
+TIMESTAMP = 1635286983
+SHA256 (praat-praat-v6.1.54_GH0.tar.gz) = ffd4a2c482d2bc561409ebf7688ca1408e9fe25b0f2a8338e5d190043ddcc689
+SIZE (praat-praat-v6.1.54_GH0.tar.gz) = 33657676

databases/couchdb3/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	couchdb3
 DISTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${DISTVERSION}
 DISTNAME=	apache-couchdb-${DISTVERSION}

databases/cutelyst-asql/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	asql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.43.0
+DISTVERSION=	0.46.0
 CATEGORIES=	databases
 PKGNAMEPREFIX=	cutelyst-
 

databases/cutelyst-asql/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1625653795
-SHA256 (cutelyst-asql-v0.43.0_GH0.tar.gz) = 77eb209f663d9d6cca448064c1167d16b43e14e435eb04e4fc13cfe6d01564df
-SIZE (cutelyst-asql-v0.43.0_GH0.tar.gz) = 33998
+TIMESTAMP = 1635446790
+SHA256 (cutelyst-asql-v0.46.0_GH0.tar.gz) = e477d4c65f367aa58c74ad029801a2c5214b1a222640a61114cf3d6b8594eb4d
+SIZE (cutelyst-asql-v0.46.0_GH0.tar.gz) = 34882

databases/cutelyst-asql/pkg-plist

@@ -1,4 +1,4 @@
-bin/asql-migration
+bin/asql-migration0-qt5
 include/asql-qt5/ASql/acache.h
 include/asql-qt5/ASql/adatabase.h
 include/asql-qt5/ASql/adriver.h

databases/evolution-data-server/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	evolution-data-server
 DISTVERSION=	3.42.0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome

databases/firebird25-server/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	firebird
 PORTVERSION=	2.5.9
+PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R2_5_9/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server

databases/firebird30-server/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	firebird
 PORTVERSION=	3.0.7
+PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R3_0_7/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server

databases/firebird40-server/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	firebird
 PORTVERSION=	4.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	databases
 MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server

databases/geoserver-mysql-plugin/Makefile

@@ -1,7 +1,7 @@
 # Created by: Alexander Logvinov <[email protected]>
 
 PORTNAME=	geoserver
-PORTVERSION=	2.19.2
+PORTVERSION=	2.20.0
 CATEGORIES=	databases geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
 PKGNAMESUFFIX=	-mysql-plugin
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 
 GSLIBDIR=	geoserver/webapps/geoserver/WEB-INF/lib
 SUB_FILES=	pkg-message
-PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-25.2.jar \
+PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-26.0.jar \
 		${GSLIBDIR}/mysql-connector-java-8.0.23.jar
 
 do-install:

databases/geoserver-mysql-plugin/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1632747630
-SHA256 (geoserver-2.19.2-mysql-plugin.zip) = c6612aedd8597a7219af839c23ef416bb1930277e6406d9e25a142a18558435b
-SIZE (geoserver-2.19.2-mysql-plugin.zip) = 2316819
+TIMESTAMP = 1635439939
+SHA256 (geoserver-2.20.0-mysql-plugin.zip) = 83e9c09568b2366058cd30d43572fb3adbfc420e2ded03bb02fee4b2ac2c9c39
+SIZE (geoserver-2.20.0-mysql-plugin.zip) = 2316846

databases/kbibtex/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kbibtex
 DISTVERSION=	0.9.2
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	databases kde
 MASTER_SITES=	KDE/stable/KBibTeX/${DISTVERSION}
 

databases/kdb/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=		kdb
 DISTVERSION=		3.2.0
-PORTREVISION=		9
+PORTREVISION=		10
 CATEGORIES=		databases kde
 MASTER_SITES=		KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=		KDE/${PORTNAME}

databases/mysql80-client/Makefile

@@ -1,7 +1,7 @@
 # Created by: "Mahdi Mokhtari <[email protected]>"
 
 PORTNAME=	mysql
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)

databases/mysql80-server/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME?=		mysql
 PORTVERSION=		8.0.26
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server

databases/postgresql10-server/Makefile

@@ -3,7 +3,7 @@
 DISTVERSION?=	10.18
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 
 MAINTAINER?=	[email protected]
 

databases/postgresql11-server/Makefile

@@ -3,7 +3,7 @@
 DISTVERSION?=	11.13
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 
 MAINTAINER?=	[email protected]
 

databases/postgresql13-server/Makefile

@@ -3,7 +3,7 @@
 DISTVERSION?=	13.4
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 
 MAINTAINER?=	[email protected]
 

databases/postgresql14-server/Makefile

@@ -4,7 +4,7 @@ PORTNAME?=	postgresql
 DISTVERSION?=	14.0
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}

databases/postgresql96-server/Makefile

@@ -3,7 +3,7 @@
 DISTVERSION?=	9.6.23
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	[email protected]

databases/py-firebirdsql/Makefile

@@ -12,7 +12,7 @@ COMMENT=	Python DBAPI module for FirebirdSQL
 LICENSE=	BSD2CLAUSE
 
 NO_ARCH=	yes
-USES=		python:3.6+
+USES=		python:3.6-3.9
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>

databases/redis-devel/Makefile

@@ -1,7 +1,7 @@
 # Created by: Sergey Skvortsov <[email protected]>
 
 PORTNAME=	redis
-PORTVERSION=	7.0.0.20211019
+PORTVERSION=	7.0.0.20211027
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-devel
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES+=		compiler:c11 cpe gmake
 CPE_VENDOR=	redislabs
 USE_GITHUB=	yes
-GH_TUPLE=	redis:redis:4962c55
+GH_TUPLE=	redis:redis:b7afac6
 
 OPTIONS_DEFINE=	JEMALLOC TESTS TLS TRIB
 OPTIONS_RADIO=	EXTLUA

databases/redis-devel/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1634694176
-SHA256 (redis-redis-7.0.0.20211019-4962c55_GH0.tar.gz) = 8f6de75809cd55f3e87600c7098762d304ec2e1ca411db91c5df5206a81ecd94
-SIZE (redis-redis-7.0.0.20211019-4962c55_GH0.tar.gz) = 2639422
+TIMESTAMP = 1635342301
+SHA256 (redis-redis-7.0.0.20211027-b7afac6_GH0.tar.gz) = 784295b414ceefb1852c01ea159297bb9e54ad47d19b05865db9c61c3dd5b7d2
+SIZE (redis-redis-7.0.0.20211027-b7afac6_GH0.tar.gz) = 2656094

databases/redis-devel/files/patch-deps-Makefile

@@ -1,5 +1,5 @@
---- deps/Makefile.orig	2021-10-19 22:00:31.196463000 -0400
-+++ deps/Makefile	2021-10-19 22:00:41.781836000 -0400
+--- deps/Makefile.orig	2021-10-27 07:48:08.000000000 -0400
++++ deps/Makefile	2021-10-27 09:49:28.847356000 -0400
 @@ -69,7 +69,7 @@
  	LUA_CFLAGS= -D__C99FEATURES__=1
  endif
@@ -9,7 +9,7 @@
  LUA_LDFLAGS+= $(LDFLAGS)
  # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  # challenging to cross-compile lua (and redis).  These defines make it easier
-@@ -79,16 +79,16 @@
+@@ -79,11 +79,11 @@
 
  lua: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
@@ -22,11 +22,14 @@
 +JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
  JEMALLOC_LDFLAGS= $(LDFLAGS)
 
+ ifneq ($(DEB_HOST_GNU_TYPE),)
+@@ -92,7 +92,7 @@
+
  jemalloc: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
+-	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 -	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-+	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
++	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 +	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
 
  .PHONY: jemalloc