Merge remote-tracking branch 'upstream/master'

Conflicts:
	sysutils/monit/Makefile (unresolved)
	www/squid3/files/patch-src_ssl_gadgets.cc (unresolved)
	www/squid3/files/patch-src_ssl_support.cc (unresolved)

MOVED

@@ -16197,3 +16197,4 @@ devel/hs-c2hs||2021-03-27|Has expired: Was used as BUILD_DEPENDS, not useful on
 x11-toolkits/tile||2021-03-27|Has expired: The Tile widget set is part of Tk 8.5 and above, see TIP 248
 security/apg||2021-03-28|Has expired: Abandonware. Please try security/makepasswd or security/rndpassw instead
 lang/Gofer||2021-03-28|Has expired: Old, unmaintained language
+net/libsignal|net/libsignal-protocol-c|2021-03-30|Rename to match upstream naming

Mk/Uses/cmake.mk

@@ -4,7 +4,7 @@
 #
 # Feature:		cmake
 # Usage:		USES=cmake or USES=cmake:ARGS
-# Valid ARGS:		insource, run, noninja
+# Valid ARGS:		insource, run, noninja, testing
 # ARGS description:
 # insource		do not perform an out-of-source build
 # noninja		don't use ninja instead of make
@@ -16,6 +16,9 @@
 #				2) ports that set BUILD_- or INSTALL_WRKSRC to
 #				   something different than CONFIGURE_WRKSRC
 # run			add a runtime dependency on cmake
+# testing		add the test target based on ctest
+#			Additionally, CMAKE_TESTING_ON, CMAKE_TESTING_OFF, CMAKE_TESTING_ARGS, CMAKE_TESTING_TARGET
+#			can be defined to override the default values.
 #
 #
 # Additional variables that affect cmake behaviour:
@@ -46,7 +49,7 @@
 .if !defined(_INCLUDE_USES_CMAKE_MK)
 _INCLUDE_USES_CMAKE_MK=	yes
 
-_valid_ARGS=		insource run noninja
+_valid_ARGS=		insource run noninja testing
 
 # Sanity check
 .for arg in ${cmake_ARGS}
@@ -140,4 +143,22 @@ do-configure:
 	@cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
 .endif
 
+.if !target(do-test) && ${cmake_ARGS:Mtesting}
+CMAKE_TESTING_ON?=		BUILD_TESTING
+CMAKE_TESTING_TARGET?=		test
+
+# Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists.
+.for _bool_kind in ON OFF
+.  if defined(CMAKE_TESTING_${_bool_kind})
+CMAKE_TESTING_ARGS+=		${CMAKE_TESTING_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/}
+.  endif
+.endfor
+
+do-test:
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}
+.endif
+
 .endif #!defined(_INCLUDE_USES_CMAKE_MK)

Mk/Uses/python.mk

@@ -499,13 +499,6 @@ PYTHONPREFIX_SITELIBDIR=	${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};}
 # Used for recording the installed files.
 _PYTHONPKGLIST=	${WRKDIR}/.PLIST.pymodtmp
 
-# PEP 0488 (https://www.python.org/dev/peps/pep-0488/)
-.if ${PYTHON_REL} < 3500
-PYTHON_PYOEXTENSION=	pyo
-.else
-PYTHON_PYOEXTENSION=	opt-1.pyc
-.endif
-
 # Ports bound to a certain python version SHOULD
 # - use the PYTHON_PKGNAMEPREFIX
 # - use directories using the PYTHON_PKGNAMEPREFIX

README

+This repository is being converted from Subversion to Git.
+The latest status is available at https://wiki.freebsd.org/git
+
 This is the FreeBSD Ports Collection.  For an easy to use
 WEB-based interface to it, please see:
 

astro/weather/Makefile

@@ -20,7 +20,7 @@ NO_ARCH=	yes
 PLIST_FILES=	bin/weather \
 		${PYTHON_SITELIBDIR}/weather.py \
 		${PYTHON_SITELIBDIR}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.pyc \
-		${PYTHON_SITELIBDIR}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.${PYTHON_PYOEXTENSION} \
+		${PYTHON_SITELIBDIR}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.opt-1.pyc \
 		share/man/man1/weather.1.gz \
 		share/man/man5/weatherrc.5.gz
 PORTDATA=	airports places stations zctas zones
@@ -36,7 +36,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/weather ${STAGEDIR}${PREFIX}/bin/weather
 	${INSTALL_DATA} ${WRKSRC}/weather.py ${STAGEDIR}${PYTHON_SITELIBDIR}/
 	${INSTALL_DATA} ${WRKSRC}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/__pycache__/
-	${INSTALL_DATA} ${WRKSRC}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.${PYTHON_PYOEXTENSION} ${STAGEDIR}${PYTHON_SITELIBDIR}/__pycache__/
+	${INSTALL_DATA} ${WRKSRC}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.opt-1.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/__pycache__/
 	${INSTALL_MAN} ${WRKSRC}/weather.1 ${STAGEDIR}${PREFIX}/share/man/man1/weather.1
 	${INSTALL_MAN} ${WRKSRC}/weatherrc.5 ${STAGEDIR}${PREFIX}/share/man/man5/weatherrc.5
 	${MKDIR} ${STAGEDIR}${DATADIR}/

audio/gsequencer/Makefile

 # $FreeBSD$
 
 PORTNAME=	gsequencer
-DISTVERSION=	3.6.21
+DISTVERSION=	3.7.50
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH/gsequencer/${DISTVERSION:R}.x
 
@@ -26,14 +26,16 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 RUN_DEPENDS=	dssi>0:audio/dssi
 
 USES=		desktop-file-utils gettext-runtime gettext-tools gmake gnome libtool localbase pkgconfig shared-mime-info xorg
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-alsa --enable-oss --disable-introspection --disable-rt
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 libxml2 pango
 USE_XORG=	x11
+USE_GSTREAMER1=	yes
 USE_GCC=	yes # the project uses gnu99 extensions, clang fails even with USE_CSTD=gnu99. Suggestions how to build with clang are welcome.
 USE_CSTD=	gnu99
 USE_LDCONFIG=	yes
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-alsa --enable-oss --disable-introspection --disable-rt
+
 CPPFLAGS+=	-DAGS_LICENSE_FILENAME=\\\"${LOCALBASE}/share/licenses/${PKGNAME}/${LICENSE}\\\" \
 		-DAGS_LOGO_FILENAME=\\\"${DATADIR}/images/ags.png\\\" # there should be no need to supply AGS_LOGO_FILENAME here since the app knows its location
 LDFLAGS+=	-luuid

audio/gsequencer/distinfo

-TIMESTAMP = 1606252094
-SHA256 (gsequencer-3.6.21.tar.gz) = 37e0b6c642a479b5ce0be2aaa832101d8ff4128e81b5463b5c1bba3d6e895b8d
-SIZE (gsequencer-3.6.21.tar.gz) = 7387931
+TIMESTAMP = 1617130436
+SHA256 (gsequencer-3.7.50.tar.gz) = c0a5eb90efb6e59d5c8eb90126da6b97779409ac4265c73f0afcaf91f6c8b086
+SIZE (gsequencer-3.7.50.tar.gz) = 7597242

audio/gsequencer/pkg-plist

 bin/gsequencer
 bin/midi2xml
+include/ags/ags_api_config.h
 include/ags/audio/ags_acceleration.h
 include/ags/audio/ags_audio.h
 include/ags/audio/ags_audio_application_context.h
@@ -368,7 +369,6 @@ include/ags/audio/thread/ags_soundcard_thread.h
 include/ags/audio/thread/ags_wave_loader.h
 include/ags/audio/wasapi/ags_wasapi_devin.h
 include/ags/audio/wasapi/ags_wasapi_devout.h
-include/ags/config.h
 include/ags/file/ags_file.h
 include/ags/file/ags_file_id_ref.h
 include/ags/file/ags_file_launch.h
@@ -540,6 +540,10 @@ share/icons/hicolor/128x128/apps/gsequencer.png
 share/icons/hicolor/32x32/apps/gsequencer.png
 share/icons/hicolor/48x48/apps/gsequencer.png
 share/icons/hicolor/64x64/apps/gsequencer.png
+share/locale/de/LC_MESSAGES/gsequencer.mo
+share/locale/fr/LC_MESSAGES/gsequencer.mo
+share/locale/it/LC_MESSAGES/gsequencer.mo
+share/locale/pl/LC_MESSAGES/gsequencer.mo
 share/metainfo/org.nongnu.gsequencer.gsequencer.appdata.xml
 share/mime/packages/gsequencer.xml
 share/xml/gsequencer/schema/dtd/%%PORTVERSION%%/ags_file.dtd

biology/subread/Makefile

 # $FreeBSD$
 
 PORTNAME=		subread
-DISTVERSION=		2.0.1
+DISTVERSION=		2.0.2
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=		biology
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}

biology/subread/distinfo

-TIMESTAMP = 1591305316
-SHA256 (subread-2.0.1-source.tar.gz) = d808eb5b1823c572cb45a97c95a3c5acb3d8e29aa47ec74e3ca1eb345787c17b
-SIZE (subread-2.0.1-source.tar.gz) = 23260381
+TIMESTAMP = 1617112862
+SHA256 (subread-2.0.2-source.tar.gz) = 0b64bd51f39f8d322c4594697fa5f0f64fbe60283113eadadff9f4268f897079
+SIZE (subread-2.0.2-source.tar.gz) = 23295764

biology/subread/files/patch-gene-algorithms.c

---- gene-algorithms.c.orig	2020-06-04 23:57:31 UTC
+--- gene-algorithms.c.orig	2021-03-30 13:51:05 UTC
 +++ gene-algorithms.c
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  
@@ -9,12 +9,12 @@
  #include <sys/timeb.h>
  #endif
  
-@@ -1563,7 +1563,7 @@ int load_offsets(gene_offset_t* offsets , const char i
+@@ -1568,7 +1568,7 @@ int load_offsets(gene_offset_t* offsets , const char i
  
  double miltime(){
  	double ret;
 -	#ifdef FREEBSD
 +	#ifdef __FreeBSD__
- 	struct timeval tp;
- 	struct timezone tz;
- 	tz.tz_minuteswest=0;
+ 		struct timeval tp;
+ 		struct timezone tz;
+ 		tz.tz_minuteswest=0;

biology/subread/files/patch-longread-one_longread-mapping.c

---- longread-one/longread-mapping.c.orig	2019-09-04 04:22:49 UTC
+--- longread-one/longread-mapping.c.orig	2021-03-30 13:58:29 UTC
 +++ longread-one/longread-mapping.c
 @@ -30,7 +30,9 @@
  #ifndef __MINGW32__
  #include <sys/resource.h>
  #endif
-+#ifndef __FreeBSD__	// Deprecated on FreeBSD
++#ifndef __FreeBSD__
  #include <sys/timeb.h>
 +#endif
  #include <sys/stat.h>
  #include <locale.h>
  #include <ctype.h>
-@@ -223,9 +225,24 @@ int LRMvalidate_and_init_context(LRMcontext_t ** conte
- 
+@@ -225,6 +227,17 @@ int LRMvalidate_and_init_context(LRMcontext_t ** conte
+ #endif
  double LRMmiltime(){
  	double ret;
-+
-+/* Why not use gettimeofday() on all platforms? */
 +#ifdef __FreeBSD__
 +
 +	struct timeval tp;
@@ -27,10 +25,13 @@
 +
 +#else
 +
- 	struct timeb trp;
- 	ftime(&trp);
+ 	#ifdef LRM_CLOCK_USE_GETTIME
+ 	struct timespec tsc;
+ 	clock_gettime(CLOCK_REALTIME, &tsc);
+@@ -235,6 +248,7 @@ double LRMmiltime(){
  	ret = trp.time*1.0+(trp.millitm*1.0/1000.0);
-+
+ 	#endif
+ 
 +#endif
  	return ret;
  }

devel/Makefile

@@ -4060,6 +4060,7 @@
     SUBDIR += py-aiortc
     SUBDIR += py-amalgamate
     SUBDIR += py-aniso8601
+    SUBDIR += py-aniso86016
     SUBDIR += py-ansi
     SUBDIR += py-antlr4-python3-runtime
     SUBDIR += py-anyconfig

devel/R-cran-cpp11/Makefile

 # $FreeBSD$
 
 PORTNAME=	cpp11
-PORTVERSION=	0.2.6
+PORTVERSION=	0.2.7
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 

devel/R-cran-cpp11/distinfo

-TIMESTAMP = 1612011975
-SHA256 (cpp11_0.2.6.tar.gz) = ff09b3fb254db73c34e2025754d2328c65d316e3872c0b7d4f74a3938e461185
-SIZE (cpp11_0.2.6.tar.gz) = 204227
+TIMESTAMP = 1617092968
+SHA256 (cpp11_0.2.7.tar.gz) = 1d4154c0d8ef4b564eea828ebebc836b7dbdc89a0848a840dd98173b07f661d4
+SIZE (cpp11_0.2.7.tar.gz) = 199530

devel/R-cran-sfsmisc/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sfsmisc
-DISTVERSION=	1.1-9
+DISTVERSION=	1.1-10
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 

devel/R-cran-sfsmisc/distinfo

-TIMESTAMP = 1616569630
-SHA256 (sfsmisc_1.1-9.tar.gz) = d4df6cfd6287944bd59330004aee8b2891475ad2559850284e4edb3ef87af5e7
-SIZE (sfsmisc_1.1-9.tar.gz) = 179532
+TIMESTAMP = 1617093132
+SHA256 (sfsmisc_1.1-10.tar.gz) = 4413a5e2ea728c86b402c7b1efea901e50f42fcb7f2b7d29d50d3f5930547dea
+SIZE (sfsmisc_1.1-10.tar.gz) = 179639

devel/bitkeeper/Makefile

@@ -37,12 +37,16 @@ MANDIRS=	${PREFIX}/bitkeeper/man
 WRKSRC=		${WRKDIR}/bk-${PORTVERSION}/src
 ALL_TARGET=	p
 
+post-patch:
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
+		's/DESTDIR/PDESTDIR/g'
+
 do-build:
 	@(cd ${WRKSRC}; ${MAKE_CMD} ${ALL_TARGET})
 
 do-install:
 	@(cd ${WRKSRC}; \
-	${MAKE_CMD} DESTDIR=${STAGEDIR}${PREFIX}/bitkeeper ${INSTALL_TARGET}); \
+	${MAKE_CMD} PDESTDIR=${STAGEDIR}${PREFIX} ${INSTALL_TARGET})
 	${INSTALL_SCRIPT} ${WRKDIR}/bk ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/bk-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/bk.conf

devel/bitkeeper/files/patch-src_Makefile

+--- Makefile.orig	2018-12-29 05:21:08.000000000 -0800
++++ Makefile	2021-03-30 17:02:38.009421000 -0700
+@@ -70,11 +70,7 @@
+ 	EXE=
+ 	# You can set this to anywhere you like and do a 
+ 	# build production" and you'll have an installed BitKeeper.
+-	ifeq (,$(INSTALLED_BK))
+-		BINDIR := /usr/local/bitkeeper
+-	else
+-		BINDIR := $(shell "$(INSTALLED_BK)" bin)
+-	endif
++	BINDIR := /bitkeeper
+ 	INSTALL=install
+ 	RESOURCE=
+ endif

devel/fossil/Makefile

 # $FreeBSD$
 
 PORTNAME=	fossil
-PORTVERSION=	2.14
+PORTVERSION=	2.15
 DISTVERSIONPREFIX=	src-
 #PORTREVISION=	0
 PORTEPOCH=	2