*/*: sync with upstream

Taken from: FreeBSD
2022-11-25 13:10:02 +01:00 · 2022-11-25 13:10:02 +01:00 · 32dc34014a
parent e37f02aa3b
commit 32dc34014a
204 changed files with 1745 additions and 608 deletions
--- a/archivers/advancecomp/Makefile
+++ b/archivers/advancecomp/Makefile
@ -1,11 +1,11 @@
 PORTNAME=	advancecomp
-DISTVERSION=	2.3
+DISTVERSION=	2.4
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/amadvance/advancecomp/releases/download/v${DISTVERSION}/

 MAINTAINER=	fuz@fuz.su
 COMMENT=	Recompression utilities for .ZIP, .PNG, .MNG, and .GZ files
-WWW=		http://advancemame.sourceforge.net/comp-readme.html
+WWW=		http://www.advancemame.it/comp-readme.html

 LICENSE=	GPLv3

--- a/archivers/advancecomp/distinfo
+++ b/archivers/advancecomp/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1650053323
-SHA256 (advancecomp-2.3.tar.gz) = 811f661dfbbdddefdcb5eaf133e403ca2af99328b850b22c1249f7bebe657578
-SIZE (advancecomp-2.3.tar.gz) = 1292157
+TIMESTAMP = 1669155740
+SHA256 (advancecomp-2.4.tar.gz) = 911133b8bdebd43aa86379e19584112b092459304401a56066e964207da423a5
+SIZE (advancecomp-2.4.tar.gz) = 1315369
--- a/biology/Makefile
+++ b/biology/Makefile
@ -7,6 +7,7 @@
    SUBDIR += babel
    SUBDIR += bamtools
    SUBDIR += bamutil
+    SUBDIR += barrnap
    SUBDIR += bbmap
    SUBDIR += bcftools
    SUBDIR += bedtools
--- a/biology/barrnap/Makefile
+++ b/biology/barrnap/Makefile
@ -0,0 +1,32 @@
+PORTNAME=	barrnap
+DISTVERSION=	0.9
+CATEGORIES=	biology science
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	BAsic Rapid Ribosomal RNA Predictor
+WWW=		https://github.com/tseemann/barrnap
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	bedtools:biology/bedtools \
+		nhmmer:biology/hmmer
+
+USES=		gmake perl5
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	tseemann
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+TEST_TARGET=	test
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/barrnap ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC} && ${COPYTREE_SHARE} db ${STAGEDIR}${DATADIR}
+	${REINPLACE_CMD} \
+		-i '' -e 's|^my $$DBDIR = .*|my $$DBDIR = "${DATADIR}/db";|' \
+		${STAGEDIR}${PREFIX}/bin/barrnap
+
+.include <bsd.port.mk>
--- a/biology/barrnap/distinfo
+++ b/biology/barrnap/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1669343398
+SHA256 (tseemann-barrnap-0.9_GH0.tar.gz) = 36c27cd4350531d98b3b2fb7d294a2d35c15b7365771476456d7873ba33cce15
+SIZE (tseemann-barrnap-0.9_GH0.tar.gz) = 11837541
--- a/biology/barrnap/pkg-descr
+++ b/biology/barrnap/pkg-descr
@ -0,0 +1,8 @@
+Barrnap predicts the location of ribosomal RNA genes in genomes. It supports
+bacteria (5S,23S,16S), archaea (5S,5.8S,23S,16S), metazoan mitochondria
+(12S,16S) and eukaryotes (5S,5.8S,28S,18S).
+
+It takes FASTA DNA sequence as input, and write GFF3 as output. It uses the new
+nhmmer tool that comes with HMMER 3.1 for HMM searching in RNA:DNA style.
+Multithreading is supported and one can expect roughly linear speed-ups with
+more CPUs.
--- a/biology/barrnap/pkg-plist
+++ b/biology/barrnap/pkg-plist
@ -0,0 +1,5 @@
+bin/barrnap
+%%DATADIR%%/db/arc.hmm
+%%DATADIR%%/db/bac.hmm
+%%DATADIR%%/db/euk.hmm
+%%DATADIR%%/db/mito.hmm
--- a/biology/cytoscape/Makefile
+++ b/biology/cytoscape/Makefile
@ -12,8 +12,6 @@ WWW=		https://www.cytoscape.org
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/api/LICENSE

-BROKEN=		fails to build: Cytoscape Third-Party Dependencies (third-party): FAILURE
-
 BUILD_DEPENDS=	mvn:devel/maven \
 		bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash
--- a/biology/megahit/Makefile
+++ b/biology/megahit/Makefile
@ -1,6 +1,7 @@
 PORTNAME=		megahit
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.2.9
+PORTREVISION=		1
 CATEGORIES=		biology

 MAINTAINER=	jwb@FreeBSD.org
--- a/biology/megahit/files/patch-CMakeLists.txt
+++ b/biology/megahit/files/patch-CMakeLists.txt
@ -0,0 +1,17 @@
+--- CMakeLists.txt.orig	2019-10-15 02:51:03 UTC
+++ CMakeLists.txt
+@@ -42,13 +42,12 @@ find_package(OpenMP REQUIRED)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DXXH_INLINE_ALL -ftemplate-depth=3000")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprefetch-loop-arrays -funroll-loops")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__XROOT__='\"${CMAKE_SOURCE_DIR}/src\"'")
+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__XFILE__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
+ 
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ZLIB_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+ 
+-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
+ set(CMAKE_CXX_FLAGS_DEBUG "-g -ggdb -O1 -D_LIBCPP_DEBUG -D_GLIBCXX_DEBUG")
+ 
+ if (COVERAGE)
--- a/databases/mongodb44/Makefile
+++ b/databases/mongodb44/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	4.4.16
+DISTVERSION=	4.4.18
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/
@ -22,8 +22,7 @@ ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD

 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
-		${LOCALBASE}/bin/ar:devel/binutils
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libcurl.so:ftp/curl \
 		libsnappy.so:archivers/snappy
@ -49,7 +48,7 @@ MAKE_ARGS=	--use-system-zlib \
 		-j ${MAKE_JOBS_NUMBER} \
 		--disable-warnings-as-errors \
 		VERBOSE=on \
-		AR=${PREFIX}/bin/ar
+		AR=llvm-ar

 USERS=		mongodb
 GROUPS=		mongodb
--- a/databases/mongodb44/distinfo
+++ b/databases/mongodb44/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1661414758
-SHA256 (mongodb-src-r4.4.16.tar.gz) = dfa2503904dabbeeac7980336458da9478115ea0ddc659d2e0ef2ab2c68d29fe
-SIZE (mongodb-src-r4.4.16.tar.gz) = 50831692
+TIMESTAMP = 1669202055
+SHA256 (mongodb-src-r4.4.18.tar.gz) = 03723468a175ea77c67ede4b941f1c27e45d0b086c697a8201d12581a09d1713
+SIZE (mongodb-src-r4.4.18.tar.gz) = 50851643
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1258,6 +1258,7 @@
    SUBDIR += libmatheval
    SUBDIR += libmatthew
    SUBDIR += libmba
+    SUBDIR += libmcfp
    SUBDIR += libmill
    SUBDIR += libmimedir
    SUBDIR += libmodi
@ -1517,6 +1518,7 @@
    SUBDIR += mate-common
    SUBDIR += maven
    SUBDIR += maven-wrapper
+    SUBDIR += maven363
    SUBDIR += mcpp
    SUBDIR += mdb
    SUBDIR += mdds
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	cppcheck
-PORTVERSION=	2.9.2
+PORTVERSION=	2.9.3
 CATEGORIES=	devel

 MAINTAINER=	amdmi3@FreeBSD.org
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1668185886
-SHA256 (danmar-cppcheck-2.9.2_GH0.tar.gz) = 93920d24d4442856bf7916ee0e3fc31308bc23948e7029b4fd332e01cac63c3e
-SIZE (danmar-cppcheck-2.9.2_GH0.tar.gz) = 3918275
+TIMESTAMP = 1669218988
+SHA256 (danmar-cppcheck-2.9.3_GH0.tar.gz) = 46319ca73e33e4b2bd91981a76a0d4f184cd3f86b62dc18e8938eabacd3ad2e3
+SIZE (danmar-cppcheck-2.9.3_GH0.tar.gz) = 3918291
--- a/devel/flatbuffers/Makefile
+++ b/devel/flatbuffers/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	flatbuffers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	22.10.26
+DISTVERSION=	22.11.23
 PORTEPOCH=	1
 CATEGORIES=	devel

--- a/devel/flatbuffers/distinfo
+++ b/devel/flatbuffers/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1666886155
-SHA256 (google-flatbuffers-v22.10.26_GH0.tar.gz) = 34f1820cfd78a3d92abc880fbb1a644c7fb31a71238995f4ed6b5915a1ad4e79
-SIZE (google-flatbuffers-v22.10.26_GH0.tar.gz) = 2122181
+TIMESTAMP = 1669315161
+SHA256 (google-flatbuffers-v22.11.23_GH0.tar.gz) = 8e9bacc942db59ca89a383dd7923f3e69a377d6e579d1ba13557de1fdfddf56a
+SIZE (google-flatbuffers-v22.11.23_GH0.tar.gz) = 2170419
--- a/devel/flatbuffers/pkg-plist
+++ b/devel/flatbuffers/pkg-plist
@ -39,5 +39,5 @@ lib/cmake/flatbuffers/flatbuffers-config-version.cmake
 lib/cmake/flatbuffers/flatbuffers-config.cmake
 lib/libflatbuffers.so
 lib/libflatbuffers.so.22
-lib/libflatbuffers.so.22.10.26
+lib/libflatbuffers.so.22.11.23
 libdata/pkgconfig/flatbuffers.pc
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	alex
-PORTVERSION=	3.2.6
-PORTREVISION=	2
+PORTVERSION=	3.2.7.1
 CATEGORIES=	devel haskell

 MAINTAINER=	haskell@FreeBSD.org
@ -15,7 +14,12 @@ CABAL_WRAPPER_SCRIPTS=	${CABAL_EXECUTABLES}

 OPTIONS_DEFINE=	EXAMPLES

-PORTEXAMPLES=	Makefile *.x *.y
+PORTEXAMPLES=	examples/*
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|ALEX=../dist/build/alex/alex|ALEX=${PREFIX}/bin/alex|' \
+		-e 's|--template=..||g' \
+		${WRKSRC}/examples/Makefile

 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1668452149
-SHA256 (cabal/alex-3.2.6/alex-3.2.6.tar.gz) = 91aa08c1d3312125fbf4284815189299bbb0be34421ab963b1f2ae06eccc5410
-SIZE (cabal/alex-3.2.6/alex-3.2.6.tar.gz) = 108832
+TIMESTAMP = 1669303496
+SHA256 (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 9bd2f1a27e8f1b2ffdb5b2fbd3ed82b6f0e85191459a1b24ffcbef4e68a81bec
+SIZE (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 108229
--- a/devel/hs-alex/pkg-plist
+++ b/devel/hs-alex/pkg-plist
@ -1,15 +1,15 @@
-%%DATADIR%%/AlexTemplate
-%%DATADIR%%/AlexTemplate-debug
-%%DATADIR%%/AlexTemplate-ghc
-%%DATADIR%%/AlexTemplate-ghc-debug
-%%DATADIR%%/AlexTemplate-ghc-nopred
-%%DATADIR%%/AlexWrapper-basic
-%%DATADIR%%/AlexWrapper-basic-bytestring
-%%DATADIR%%/AlexWrapper-gscan
-%%DATADIR%%/AlexWrapper-monad
-%%DATADIR%%/AlexWrapper-monad-bytestring
-%%DATADIR%%/AlexWrapper-monadUserState
-%%DATADIR%%/AlexWrapper-monadUserState-bytestring
-%%DATADIR%%/AlexWrapper-posn
-%%DATADIR%%/AlexWrapper-posn-bytestring
-%%DATADIR%%/AlexWrapper-strict-bytestring
+%%DATADIR%%/AlexTemplate.hs
+%%DATADIR%%/AlexWrappers.hs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tokens.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tokens_gscan.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tokens_posn.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haskell.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lit.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pp.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/state.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tiny.y
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/words.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/words_monad.x
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/words_posn.x
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@ -1,16 +1,17 @@
 PORTNAME=	ghc-events
-PORTVERSION=	0.17.0.3
-PORTREVISION=	1
+PORTVERSION=	0.18.0
 CATEGORIES=	devel haskell

 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Library and tool for parsing .eventlog files from GHC
-WWW=		https://hackage.haskell.org/package/ghc-events
+WWW=		https://github.com/haskell/ghc-events

 LICENSE=	BSD3CLAUSE

 USES=		cabal

-USE_CABAL=	primitive-0.7.4.0 vector-0.12.3.1_2
+USE_CABAL=	primitive-0.7.4.0 \
+		vector-0.13.0.0_1 \
+		vector-stream-0.1.0.0_1

 .include <bsd.port.mk>
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@ -1,9 +1,13 @@
-TIMESTAMP = 1668511761
-SHA256 (cabal/ghc-events-0.17.0.3/ghc-events-0.17.0.3.tar.gz) = bb8cd1998227a77d8874c2982fbf8e9ef210d80f7ae9c9bf3f6d90cdbce8a054
-SIZE (cabal/ghc-events-0.17.0.3/ghc-events-0.17.0.3.tar.gz) = 1498692
+TIMESTAMP = 1669304729
+SHA256 (cabal/ghc-events-0.18.0/ghc-events-0.18.0.tar.gz) = d06c78fc668fc653bf15c0129de3f183c92878c533b5c116e917c8f55aa2954f
+SIZE (cabal/ghc-events-0.18.0/ghc-events-0.18.0.tar.gz) = 1390796
 SHA256 (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5
 SIZE (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 56575
-SHA256 (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = fb4a53c02bd4d7fdf155c0604da9a5bb0f3b3bfce5d9960aea11c2ae235b9f35
-SIZE (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = 151420
-SHA256 (cabal/vector-0.12.3.1/revision/2.cabal) = fffbd00912d69ed7be9bc7eeb09f4f475e0d243ec43f916a9fd5bbd219ce7f3e
-SIZE (cabal/vector-0.12.3.1/revision/2.cabal) = 8238
+SHA256 (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = c5d3167d15e12f52e00879ddf304a591672a74e369cc47bc5c7fa1d5a8d15b4f
+SIZE (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = 154509
+SHA256 (cabal/vector-0.13.0.0/revision/1.cabal) = 54528e95501742b99462cc543891f21177e7db34d960ce8e3cbb25afb16a9c89
+SIZE (cabal/vector-0.13.0.0/revision/1.cabal) = 9112
+SHA256 (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = a888210f6467f155090653734be5cc920406a07227e0d3adb59096716fdb806c
+SIZE (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = 12377
+SHA256 (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 09b0f8dc4e51936b9d6b04791f0aa03f7c9759b5fb7140eac8a9461cda1e55a3
+SIZE (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 1404
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@ -1,11 +1,10 @@
 PORTNAME=	hlint
-PORTVERSION=	3.4
-PORTREVISION=	2
+PORTVERSION=	3.5
 CATEGORIES=	devel haskell

 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Source code suggestions
-WWW=		http://community.haskell.org/~ndm/hlint/
+WWW=		https://github.com/ndmitchell/hlint

 LICENSE=	BSD3CLAUSE

@ -15,7 +14,8 @@ USE_CABAL=	OneTuple-0.3.1_3 \
 		QuickCheck-2.14.2 \
 		StateVar-1.2.2 \
 		aeson-2.1.1.0 \
-		ansi-terminal-0.11.3 \
+		alex-3.2.7.1 \
+		ansi-terminal-0.11.4 \
 		assoc-1.0.2_3 \
 		attoparsec-0.14.4_2 \
 		base-compat-0.12.2 \
@ -36,13 +36,16 @@ USE_CABAL=	OneTuple-0.3.1_3 \
 		data-default-instances-dlist-0.0.1 \
 		data-default-instances-old-locale-0.0.1 \
 		data-fix-0.3.2_3 \
+		deriving-aeson-0.2.8_1 \
 		distributive-0.6.2.1_1 \
 		dlist-1.0 \
 		extra-1.7.12 \
 		file-embed-0.0.15.0 \
 		filepattern-0.1.3 \
 		generically-0.1 \
-		ghc-lib-parser-ex-9.2.0.4 \
+		ghc-lib-parser-9.4.3.20221104 \
+		ghc-lib-parser-ex-9.4.0.0 \
+		happy-1.20.0_1 \
 		hashable-1.4.1.0 \
 		hscolour-1.24.4 \
 		indexed-traversable-0.1.2_2 \
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1668511777
-SHA256 (cabal/hlint-3.4/hlint-3.4.tar.gz) = 76fc615d6949fb9478e586c9ddd5510578ddaa32261d94f1a1f3670f20db8e95
-SIZE (cabal/hlint-3.4/hlint-3.4.tar.gz) = 170489
+TIMESTAMP = 1669306044
+SHA256 (cabal/hlint-3.5/hlint-3.5.tar.gz) = 98bd120a10a086c17d6bf1176a510dc12b36581e5a901f1e024555bb3ccead4f
+SIZE (cabal/hlint-3.5/hlint-3.5.tar.gz) = 173976
 SHA256 (cabal/OneTuple-0.3.1/OneTuple-0.3.1.tar.gz) = 98853682d52fb4cc37a45cd186fbd77cf2565d3df5171acc4cf026427e103eef
 SIZE (cabal/OneTuple-0.3.1/OneTuple-0.3.1.tar.gz) = 5148
 SHA256 (cabal/OneTuple-0.3.1/revision/3.cabal) = fc32cb744477befa450a538ea4975cc523f0a2f1585cb5a36e9936a3d18e9a3c
@ -11,8 +11,10 @@ SHA256 (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5e4b39da395656a59827b02805
 SIZE (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5048
 SHA256 (cabal/aeson-2.1.1.0/aeson-2.1.1.0.tar.gz) = a3ae978d67cd8554a6dc11d1e5a4c46280dc90bbc50f3a8787fdd2278524b6ad
 SIZE (cabal/aeson-2.1.1.0/aeson-2.1.1.0.tar.gz) = 301830
-SHA256 (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = f4d563ecf71fb1d304bcdcad478d97efd9f61f6d9d4797a5d56e7722a92a9e6b
-SIZE (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = 37868
+SHA256 (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 9bd2f1a27e8f1b2ffdb5b2fbd3ed82b6f0e85191459a1b24ffcbef4e68a81bec
+SIZE (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 108229
+SHA256 (cabal/ansi-terminal-0.11.4/ansi-terminal-0.11.4.tar.gz) = 7898e48f0a535c1857cde52c803f28096ba89759461fe4d157fd55dcdb420e25
+SIZE (cabal/ansi-terminal-0.11.4/ansi-terminal-0.11.4.tar.gz) = 43299
 SHA256 (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = d8988dc6e8718c7a3456515b769c9336aeeec730cf86fc5175247969ff8f144f
 SIZE (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = 3047
 SHA256 (cabal/assoc-1.0.2/revision/3.cabal) = 93b8d43aa081e4205116a139f7cf690f608968161d19ebfb23d884d19b082b57
@ -65,6 +67,10 @@ SHA256 (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 3a172d3bc0639c327345e965f9
 SIZE (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 5842
 SHA256 (cabal/data-fix-0.3.2/revision/3.cabal) = bdea17f6b17c1d327f53ae6806e1bc3ca7813b46742a93c6088c72837c8ae77c
 SIZE (cabal/data-fix-0.3.2/revision/3.cabal) = 1706
+SHA256 (cabal/deriving-aeson-0.2.8/deriving-aeson-0.2.8.tar.gz) = 2dd3824fbb182811655e7ff9a2292ffc9178a29d0ccdcc0d04ef74c54856a938
+SIZE (cabal/deriving-aeson-0.2.8/deriving-aeson-0.2.8.tar.gz) = 5276
+SHA256 (cabal/deriving-aeson-0.2.8/revision/1.cabal) = 65aabe7fe384360bc4d472787423145c05f8e5ede64fac677a375ed82a3d9d5f
+SIZE (cabal/deriving-aeson-0.2.8/revision/1.cabal) = 1342
 SHA256 (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = d7351392e078f58caa46630a4b9c643e1e2e9dddee45848c5c8358e7b1316b91
 SIZE (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = 8140
 SHA256 (cabal/distributive-0.6.2.1/revision/1.cabal) = 0f99f5541cca04acf89b64432b03422b6408e830a8dff30e6c4334ef1a48680c
@ -79,8 +85,14 @@ SHA256 (cabal/filepattern-0.1.3/filepattern-0.1.3.tar.gz) = cc445d439ea2f65cac76
 SIZE (cabal/filepattern-0.1.3/filepattern-0.1.3.tar.gz) = 15495
 SHA256 (cabal/generically-0.1/generically-0.1.tar.gz) = d5b72880e1d00b24b6c221978d060bea620acc412cdcb62521f3016cbd3f2b71
 SIZE (cabal/generically-0.1/generically-0.1.tar.gz) = 2572
-SHA256 (cabal/ghc-lib-parser-ex-9.2.0.4/ghc-lib-parser-ex-9.2.0.4.tar.gz) = 9b9c78d1a73d5206b39b9961a06d1d8b604ec752d421010eb8b35d7cfc9d1c8d
-SIZE (cabal/ghc-lib-parser-ex-9.2.0.4/ghc-lib-parser-ex-9.2.0.4.tar.gz) = 23478
+SHA256 (cabal/ghc-lib-parser-9.4.3.20221104/ghc-lib-parser-9.4.3.20221104.tar.gz) = 44bee5fad9dfe9862940b7ca3b986b2fa56c98cb21bb1bed32e164a9aedb4482
+SIZE (cabal/ghc-lib-parser-9.4.3.20221104/ghc-lib-parser-9.4.3.20221104.tar.gz) = 2189260
+SHA256 (cabal/ghc-lib-parser-ex-9.4.0.0/ghc-lib-parser-ex-9.4.0.0.tar.gz) = ce3ff339a0a259a18ae921c547b35732eaca1a567a33fba1a7c65c16c973191b
+SIZE (cabal/ghc-lib-parser-ex-9.4.0.0/ghc-lib-parser-ex-9.4.0.0.tar.gz) = 23592
+SHA256 (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 3b1d3a8f93a2723b554d9f07b2cd136be1a7b2fcab1855b12b7aab5cbac8868c
+SIZE (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 184515
+SHA256 (cabal/happy-1.20.0/revision/1.cabal) = 5d47dc221a9fe964e36aaaa2e1ab7e8f085a225fd6528d6eff310b92360bbe99
+SIZE (cabal/happy-1.20.0/revision/1.cabal) = 5732
 SHA256 (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87
 SIZE (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = 25599
 SHA256 (cabal/hscolour-1.24.4/hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
--- a/devel/hs-hspec-discover/Makefile
+++ b/devel/hs-hspec-discover/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	hspec-discover
-PORTVERSION=	2.8.3
-PORTREVISION=	1
+PORTVERSION=	2.10.6
 CATEGORIES=	devel haskell

 MAINTAINER=	haskell@FreeBSD.org
--- a/devel/hs-hspec-discover/distinfo
+++ b/devel/hs-hspec-discover/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1668452332
-SHA256 (cabal/hspec-discover-2.8.3/hspec-discover-2.8.3.tar.gz) = 9a99fbb1dba6ad3ae9eb222ca073103b037492b8ec21a23e4320ea8404ce3227
-SIZE (cabal/hspec-discover-2.8.3/hspec-discover-2.8.3.tar.gz) = 6794
+TIMESTAMP = 1669308672
+SHA256 (cabal/hspec-discover-2.10.6/hspec-discover-2.10.6.tar.gz) = 3b1c7d92330ce9a6fcf636a33ed75137df25558e954cc13779cf32414be9fe74
+SIZE (cabal/hspec-discover-2.10.6/hspec-discover-2.10.6.tar.gz) = 6843
--- a/devel/hs-shake/Makefile
+++ b/devel/hs-shake/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	shake
-PORTVERSION=	0.19.6
-PORTREVISION=	2
+PORTVERSION=	0.19.7
 CATEGORIES=	devel haskell

 MAINTAINER=	haskell@FreeBSD.org
--- a/devel/hs-shake/distinfo
+++ b/devel/hs-shake/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1668511786
-SHA256 (cabal/shake-0.19.6/shake-0.19.6.tar.gz) = 7d9db837bfd67acaaabdb3cea29acc15559ede82dd9f75d438589268031cd542
-SIZE (cabal/shake-0.19.6/shake-0.19.6.tar.gz) = 267771
+TIMESTAMP = 1669314089
+SHA256 (cabal/shake-0.19.7/shake-0.19.7.tar.gz) = 352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1
+SIZE (cabal/shake-0.19.7/shake-0.19.7.tar.gz) = 267736
 SHA256 (cabal/clock-0.8.3/clock-0.8.3.tar.gz) = 845ce5db4c98cefd517323e005f87effceff886987305e421c4ef616dc0505d1
 SIZE (cabal/clock-0.8.3/clock-0.8.3.tar.gz) = 9099
 SHA256 (cabal/extra-1.7.12/extra-1.7.12.tar.gz) = e571a9ec1d8865f0fbb0e0ba1eb575f783b0365c80db19b54a93600bae43b03c
--- a/devel/jetbrains-goland/Makefile
+++ b/devel/jetbrains-goland/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	goland
-PORTVERSION=	2022.2.4
+PORTVERSION=	2022.2.5
 CATEGORIES=	devel java
 MASTER_SITES=	https://download-cdn.jetbrains.com/go/
 PKGNAMEPREFIX=	jetbrains-
--- a/devel/jetbrains-goland/distinfo
+++ b/devel/jetbrains-goland/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1665658079
-SHA256 (jetbrains/goland-2022.2.4.tar.gz) = e39aaae39e6021e87cece7622c51860d23e2a5b5ac2683fb67d369ec7d609084
-SIZE (jetbrains/goland-2022.2.4.tar.gz) = 656199702
+TIMESTAMP = 1669214011
+SHA256 (jetbrains/goland-2022.2.5.tar.gz) = 164d4a1122cf15db263616538df5d24a33314fe82a99d9925fd3cbb2997a7987
+SIZE (jetbrains/goland-2022.2.5.tar.gz) = 656392679
--- a/devel/jetbrains-goland/pkg-plist
+++ b/devel/jetbrains-goland/pkg-plist
@ -34,7 +34,7 @@ share/applications/goland.desktop
 %%DATADIR%%/lib/asm-tree-9.2.jar
 %%DATADIR%%/lib/asm-util-9.2.jar
 %%DATADIR%%/lib/async-profiler.jar
-%%DATADIR%%/lib/build-marker-GO-222.4345.24
+%%DATADIR%%/lib/build-marker-GO-222.4459.23
 %%DATADIR%%/lib/byte-buddy-agent.jar
 %%DATADIR%%/lib/cds/classesLogAgent.jar
 %%DATADIR%%/lib/dbus-java-3.2.1.jar
--- a/devel/libmcfp/Makefile
+++ b/devel/libmcfp/Makefile
@ -0,0 +1,24 @@
+PORTNAME=	libmcfp
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.2.2
+CATEGORIES=	devel
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	C++ header only library to parse command line arguments
+WWW=		https://github.com/mhekkel/libmcfp
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+TEST_DEPENDS=	${LOCALBASE}/include/boost/test/included/unit_test.hpp:devel/boost-libs
+
+USES=		cmake:testing localbase
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	mhekkel
+
+CMAKE_TESTING_ON=	ENABLE_TESTING
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/libmcfp/distinfo
+++ b/devel/libmcfp/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1669286645
+SHA256 (mhekkel-libmcfp-v1.2.2_GH0.tar.gz) = 688f1235f4881c6a2ad8b3f543bed4a9bec2f38191363843db68b1710b610b8e
+SIZE (mhekkel-libmcfp-v1.2.2_GH0.tar.gz) = 14695
--- a/devel/libmcfp/pkg-descr
+++ b/devel/libmcfp/pkg-descr
@ -0,0 +1,2 @@
+libmcfp is a library for parsing command line arguments and configuration files
+and making them available throughout a program.
--- a/devel/libmcfp/pkg-plist
+++ b/devel/libmcfp/pkg-plist
@ -0,0 +1,7 @@
+include/mcfp.hpp
+include/mcfp/mcfp.hpp
+include/mcfp/text.hpp
+include/mcfp/utilities.hpp
+lib/cmake/libmcfp/libmcfpConfig.cmake
+lib/cmake/libmcfp/libmcfpConfigVersion.cmake
+lib/cmake/libmcfp/libmcfpTargets.cmake
--- a/devel/maven363/Makefile
+++ b/devel/maven363/Makefile
@ -0,0 +1,46 @@
+PORTNAME=	maven
+DISTVERSION=	3.6.3
+CATEGORIES=	devel java
+MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
+DISTNAME=	apache-maven-${DISTVERSION}-bin
+PKGNAMESUFFIX=	363
+
+MAINTAINER=	michaelo@apache.org
+COMMENT=	Java project management tool
+WWW=		https://maven.apache.org/
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	mvn:devel/maven-wrapper
+
+USES=		cpe
+USE_JAVA=	yes
+
+CPE_PRODUCT=	maven
+CPE_VENDOR=	apache
+NO_BUILD=	yes
+NO_ARCH=	yes
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
+SUB_FILES=	mvn.sh
+SUB_LIST=	CLASSWORLDS_JAR=plexus-classworlds-2.6.0.jar
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+INSTANCE_FILE=	${PORTNAME}-${PORTVERSION}
+INSTANCES_DIR=	etc/maven-wrapper/instances.d/
+
+post-extract:
+	${RM} -r ${WRKSRC}/lib/jansi-native ${WRKSRC}/bin/*.bat
+	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
+
+do-install:
+	cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} \
+		${STAGEDIR}${DATADIR}/{} \;
+	cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" \
+		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
+	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${STAGEDIR}${DATADIR}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/mvn.sh ${STAGEDIR}${DATADIR}/bin/mvn
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
+	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \
+		${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
+
+.include <bsd.port.mk>
--- a/devel/maven363/distinfo
+++ b/devel/maven363/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1575665365
+SHA256 (apache-maven-3.6.3-bin.tar.gz) = 26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5
+SIZE (apache-maven-3.6.3-bin.tar.gz) = 9506321
--- a/devel/maven363/files/mvn.sh.in
+++ b/devel/maven363/files/mvn.sh.in
@ -0,0 +1,46 @@
+#!/bin/sh
+#
+
+if [ -f /etc/mavenrc ] ; then
+	. /etc/mavenrc
+fi
+
+if [ -f "${HOME}/.mavenrc" ] ; then
+	. "${HOME}/.mavenrc"
+fi
+
+M2_HOME=${M2_HOME:-"%%DATADIR%%"}
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir()
+{
+  local basedir=$(pwd)
+  local wdir=$(pwd)
+  while [ "$wdir" != '/' ] ; do
+    wdir=$(cd "$wdir/.."; pwd)
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines()
+{
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
+	-classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \
+	"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+	"-Dmaven.home=${M2_HOME}" \
+	"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+	org.codehaus.classworlds.Launcher "$@"
--- a/devel/maven363/pkg-descr
+++ b/devel/maven363/pkg-descr
@ -0,0 +1,3 @@
+Apache Maven is a software project management and comprehension tool. Based on
+the concept of a project object model (POM), Maven can manage a project's
+build, reporting and documentation from a central piece of information.
--- a/devel/maven363/pkg-plist
+++ b/devel/maven363/pkg-plist
@ -0,0 +1,78 @@
+%%ETCDIR%%-wrapper/instances.d/maven-%%PORTVERSION%%
+%%DATADIR%%/LICENSE
+%%DATADIR%%/NOTICE
+%%DATADIR%%/README.txt
+%%DATADIR%%/bin/m2.conf
+%%DATADIR%%/bin/mvn
+%%DATADIR%%/bin/mvn.cmd
+%%DATADIR%%/bin/mvnDebug
+%%DATADIR%%/bin/mvnDebug.cmd
+%%DATADIR%%/bin/mvnyjp
+%%DATADIR%%/boot/plexus-classworlds-2.6.0.jar
+%%DATADIR%%/boot/plexus-classworlds.license
+%%DATADIR%%/conf/logging/simplelogger.properties
+%%DATADIR%%/conf/settings.xml
+%%DATADIR%%/conf/toolchains.xml
+%%DATADIR%%/lib/cdi-api-1.0.jar
+%%DATADIR%%/lib/cdi-api.license
+%%DATADIR%%/lib/commons-cli-1.4.jar
+%%DATADIR%%/lib/commons-cli.license
+%%DATADIR%%/lib/commons-io-2.5.jar
+%%DATADIR%%/lib/commons-io.license
+%%DATADIR%%/lib/commons-lang3-3.8.1.jar
+%%DATADIR%%/lib/commons-lang3.license
+%%DATADIR%%/lib/ext/README.txt
+%%DATADIR%%/lib/guava-25.1-android.jar
+%%DATADIR%%/lib/guava.license
+%%DATADIR%%/lib/guice-4.2.1-no_aop.jar
+%%DATADIR%%/lib/guice.license
+%%DATADIR%%/lib/jansi-1.17.1.jar
+%%DATADIR%%/lib/jansi.license
+%%DATADIR%%/lib/javax.inject-1.jar
+%%DATADIR%%/lib/javax.inject.license
+%%DATADIR%%/lib/jcl-over-slf4j-1.7.29.jar
+%%DATADIR%%/lib/jcl-over-slf4j.license
+%%DATADIR%%/lib/jsoup-1.12.1.jar
+%%DATADIR%%/lib/jsoup.license
+%%DATADIR%%/lib/jsr250-api-1.0.jar
+%%DATADIR%%/lib/jsr250-api.license
+%%DATADIR%%/lib/maven-artifact-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-builder-support-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-compat-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-core-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-embedder-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-model-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-model-builder-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-plugin-api-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-repository-metadata-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-resolver-api-1.4.1.jar
+%%DATADIR%%/lib/maven-resolver-connector-basic-1.4.1.jar
+%%DATADIR%%/lib/maven-resolver-impl-1.4.1.jar
+%%DATADIR%%/lib/maven-resolver-provider-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-resolver-spi-1.4.1.jar
+%%DATADIR%%/lib/maven-resolver-transport-wagon-1.4.1.jar
+%%DATADIR%%/lib/maven-resolver-util-1.4.1.jar
+%%DATADIR%%/lib/maven-settings-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-settings-builder-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/maven-shared-utils-3.2.1.jar
+%%DATADIR%%/lib/maven-slf4j-provider-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/org.eclipse.sisu.inject-0.3.4.jar
+%%DATADIR%%/lib/org.eclipse.sisu.inject.license
+%%DATADIR%%/lib/org.eclipse.sisu.plexus-0.3.4.jar
+%%DATADIR%%/lib/org.eclipse.sisu.plexus.license
+%%DATADIR%%/lib/plexus-cipher-1.7.jar
+%%DATADIR%%/lib/plexus-cipher.license
+%%DATADIR%%/lib/plexus-component-annotations-2.1.0.jar
+%%DATADIR%%/lib/plexus-component-annotations.license
+%%DATADIR%%/lib/plexus-interpolation-1.25.jar
+%%DATADIR%%/lib/plexus-interpolation.license
+%%DATADIR%%/lib/plexus-sec-dispatcher-1.4.jar
+%%DATADIR%%/lib/plexus-sec-dispatcher.license
+%%DATADIR%%/lib/plexus-utils-3.2.1.jar
+%%DATADIR%%/lib/plexus-utils.license
+%%DATADIR%%/lib/slf4j-api-1.7.29.jar
+%%DATADIR%%/lib/slf4j-api.license
+%%DATADIR%%/lib/wagon-file-3.3.4.jar
+%%DATADIR%%/lib/wagon-http-3.3.4-shaded.jar
+%%DATADIR%%/lib/wagon-provider-api-3.3.4.jar
+%%DATADIR%%/maven-%%PORTVERSION%%
--- a/devel/oci-cli/Makefile
+++ b/devel/oci-cli/Makefile
@ -18,11 +18,11 @@ LICENSE_PERMS_UPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>=1.0.0:devel/py-arrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click7>=7.1.2:devel/py-click@7${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click7>=7.1.2:devel/py-click7@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=3.2.1:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0.10.0:devel/py-jmespath@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oci>=2.88.20:devel/py-oci@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oci>=2.88.2:devel/py-oci@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=19.1.0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.29:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \
--- a/devel/purescript-language-server/Makefile
+++ b/devel/purescript-language-server/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	purescript-language-server
-PORTVERSION=	0.16.6
+PORTVERSION=	0.17.1
 CATEGORIES=	devel textproc
 MASTER_SITES=	https://github.com/nwolverson/${PORTNAME}/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}.js
--- a/devel/py-BTrees/Makefile
+++ b/devel/py-BTrees/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	BTrees
-DISTVERSION=	4.10.1
+DISTVERSION=	4.11.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-BTrees/distinfo
+++ b/devel/py-BTrees/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1663982718
-SHA256 (BTrees-4.10.1.tar.gz) = 40e3d416b3b031a8c86334507d121b69d9c9de907e112344de526b5451d903c5
-SIZE (BTrees-4.10.1.tar.gz) = 195843
+TIMESTAMP = 1669365959
+SHA256 (BTrees-4.11.3.tar.gz) = 908500b020ff989b00946f8a6f6573f38a9b1808d077e52e3dcf048fb170c13a
+SIZE (BTrees-4.11.3.tar.gz) = 245282
--- a/devel/py-flake8-import-order/Makefile
+++ b/devel/py-flake8-import-order/Makefile
@ -1,13 +1,14 @@
 PORTNAME=	flake8-import-order
 PORTVERSION=	0.18.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Flake8 and pylama plugin that checks the ordering of import statements
-WWW=		https://pypi.org/project/flake8-import-order/
+WWW=		https://pypi.org/project/flake8-import-order/ \
+		https://github.com/PyCQA/flake8-import-order

 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
--- a/devel/py-flake8-import-order/files/patch-flake8-6
+++ b/devel/py-flake8-import-order/files/patch-flake8-6
@ -0,0 +1,44 @@
+From 231a632a294bb303d7d50ccc1d7650526493efa7 Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike_mp@zzzcomputing.com>
+Date: Wed, 23 Nov 2022 17:36:42 -0500
+Subject: [PATCH] repair register opt calls
+
+flake8 uses only argparse option styles now, use
+str instead of "string" for types given.
+
+Fixes: #189
+---
+ flake8_import_order/flake8_linter.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/flake8_import_order/flake8_linter.py b/flake8_import_order/flake8_linter.py
+index c6fb1ba..7734592 100644
+--- flake8_import_order/flake8_linter.py
+++ flake8_import_order/flake8_linter.py
+@@ -25,7 +25,7 @@ def add_options(cls, parser):
+             "--application-import-names",
+             default="",
+             action="store",
+-            type="string",
+            type=str,
+             help="Import names to consider as application-specific",
+             parse_from_config=True,
+             comma_separated_list=True,
+@@ -35,7 +35,7 @@ def add_options(cls, parser):
+             "--application-package-names",
+             default="",
+             action="store",
+-            type="string",
+            type=str,
+             help=("Package names to consider as company-specific "
+                   "(used only by 'appnexus' style)"),
+             parse_from_config=True,
+@@ -46,7 +46,7 @@ def add_options(cls, parser):
+             "--import-order-style",
+             default=DEFAULT_IMPORT_ORDER_STYLE,
+             action="store",
+-            type="string",
+            type=str,
+             help=("Style to follow. Available: " +
+                   ", ".join(cls.list_available_styles())),
+             parse_from_config=True,
--- a/devel/py-flake8-quotes/Makefile
+++ b/devel/py-flake8-quotes/Makefile
@ -6,11 +6,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Flake8 lint for quotes
-WWW=		https://pypi.org/project/flake8-quotes/
+WWW=		https://pypi.org/project/flake8-quotes/ \
+		https://github.com/zheller/flake8-quotes/

 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

+BROKEN=		does not work with flake8 6.x  # https://github.com/zheller/flake8-quotes/issues/110
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR}

 USES=		python:3.6+
--- a/devel/py-persistent/Makefile
+++ b/devel/py-persistent/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	persistent
-DISTVERSION=	4.9.1
+DISTVERSION=	4.9.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-persistent/distinfo
+++ b/devel/py-persistent/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1664112318
-SHA256 (persistent-4.9.1.tar.gz) = a5f91e0090f9392fd324d97f4c2a636c923995828238cda2e3fbcc6b1bbc4686
-SIZE (persistent-4.9.1.tar.gz) = 125296
+TIMESTAMP = 1669366268
+SHA256 (persistent-4.9.3.tar.gz) = a6215221feb3955d485fa90c7bcec4fb29650ce39ca3d0c1126710392e0dc2dc
+SIZE (persistent-4.9.3.tar.gz) = 134003
--- a/devel/py-pythran/Makefile
+++ b/devel/py-pythran/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	pythran
-PORTVERSION=	0.11.0
+PORTVERSION=	0.12.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-pythran/distinfo
+++ b/devel/py-pythran/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1639552713
-SHA256 (pythran-0.11.0.tar.gz) = 0b2cba712e09f7630879dff69f268460bfe34a6d6000451b47d598558a92a875
-SIZE (pythran-0.11.0.tar.gz) = 3768003
+TIMESTAMP = 1669366612
+SHA256 (pythran-0.12.0.tar.gz) = eff3dd0d3eebe57372f0d14f82985525e9bcdfb5b1d1010e1932cf9207060f9f
+SIZE (pythran-0.12.0.tar.gz) = 3913199
--- a/devel/py-thriftpy2/Makefile
+++ b/devel/py-thriftpy2/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	thriftpy2
-DISTVERSION=	0.4.14
+DISTVERSION=	0.4.16
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-thriftpy2/distinfo
+++ b/devel/py-thriftpy2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1626928084
-SHA256 (thriftpy2-0.4.14.tar.gz) = 1758ccaeb2a40d8779b50cdd3d7a3b43e8c5752f21ad0a54ded7c251d05219e8
-SIZE (thriftpy2-0.4.14.tar.gz) = 361668
+TIMESTAMP = 1669189321
+SHA256 (thriftpy2-0.4.16.tar.gz) = 2aa67ecda99a948e4146341d388260b48ee7da5dfb9a951c4151988e2ed2fb4c
+SIZE (thriftpy2-0.4.16.tar.gz) = 643424
--- a/devel/py-types-Pillow/Makefile
+++ b/devel/py-types-Pillow/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	types-Pillow
-PORTVERSION=	9.3.0.1
+PORTVERSION=	9.3.0.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-types-Pillow/distinfo
+++ b/devel/py-types-Pillow/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1668085533
-SHA256 (types-Pillow-9.3.0.1.tar.gz) = f3b7cada3fa496c78d75253c6b1f07a843d625f42e5639b320a72acaff6f7cfb
-SIZE (types-Pillow-9.3.0.1.tar.gz) = 23991
+TIMESTAMP = 1669218975
+SHA256 (types-Pillow-9.3.0.2.tar.gz) = 2a0323bdc0af126a7ba12d3a529a50f1d058e827cb475500f14994876ab7d863
+SIZE (types-Pillow-9.3.0.2.tar.gz) = 24036
--- a/devel/py-types-protobuf/Makefile
+++ b/devel/py-types-protobuf/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	types-protobuf
-PORTVERSION=	3.20.4.5
+PORTVERSION=	3.20.4.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-types-protobuf/distinfo
+++ b/devel/py-types-protobuf/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1668442223
-SHA256 (types-protobuf-3.20.4.5.tar.gz) = e9b45008d106e1d10cc77a29d2d344b85c0f01e2e643aaccf32f69e9e81b0cdd
-SIZE (types-protobuf-3.20.4.5.tar.gz) = 45969
+TIMESTAMP = 1669294593
+SHA256 (types-protobuf-3.20.4.6.tar.gz) = ba27443c592bbec1629dd69494a24c84461c63f0d3b7d648ce258aaae9680965
+SIZE (types-protobuf-3.20.4.6.tar.gz) = 46007
--- a/devel/ruby-build/Makefile
+++ b/devel/ruby-build/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	ruby-build
-PORTVERSION=	20221123
+PORTVERSION=	20221124
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel ruby

--- a/devel/ruby-build/distinfo
+++ b/devel/ruby-build/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1669263145
-SHA256 (rbenv-ruby-build-v20221123_GH0.tar.gz) = af80d7e91aa62209443d541903974f18abe16ef06dc0fde33cf6b0437d6c4505
-SIZE (rbenv-ruby-build-v20221123_GH0.tar.gz) = 79206
+TIMESTAMP = 1669338450
+SHA256 (rbenv-ruby-build-v20221124_GH0.tar.gz) = 4fb3817ee0ecc2c46cce526a4b07fe97dfa56975a1767a4d454bc4c3afbc60cf
+SIZE (rbenv-ruby-build-v20221124_GH0.tar.gz) = 79385
--- a/devel/rubymine/Makefile
+++ b/devel/rubymine/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	rubymine
-PORTVERSION=	2022.2.3
+PORTVERSION=	2022.2.4
 CATEGORIES=	devel java
 MASTER_SITES=	https://download.jetbrains.com/ruby/ \
 		http://download.jetbrains.com/ruby/
--- a/devel/rubymine/distinfo
+++ b/devel/rubymine/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1665221779
-SHA256 (RubyMine-2022.2.3.tar.gz) = a8c3412db30ab7bd8b8601b0a50c95dc48a412391f1c33df27c47cf5d2204257
-SIZE (RubyMine-2022.2.3.tar.gz) = 611463423
+TIMESTAMP = 1669279185
+SHA256 (RubyMine-2022.2.4.tar.gz) = f1065e3e098f907d9eae63eec7b55e24c84b5f3e03499a842ebc7a40768af806
+SIZE (RubyMine-2022.2.4.tar.gz) = 611621381
--- a/devel/rubymine/pkg-plist
+++ b/devel/rubymine/pkg-plist
@ -67,6 +67,7 @@ share/applications/rubymine.desktop
 %%DATADIR%%/jbr/include/jvmticmlr.h
 %%DATADIR%%/jbr/include/linux/jawt_md.h
 %%DATADIR%%/jbr/include/linux/jni_md.h
+%%DATADIR%%/jbr/include/sizecalc.h
 %%DATADIR%%/jbr/legal/java.base/ADDITIONAL_LICENSE_INFO
 %%DATADIR%%/jbr/legal/java.base/ASSEMBLY_EXCEPTION
 %%DATADIR%%/jbr/legal/java.base/LICENSE
@ -444,7 +445,7 @@ share/applications/rubymine.desktop
 %%DATADIR%%/lib/asm-tree-9.2.jar
 %%DATADIR%%/lib/asm-util-9.2.jar
 %%DATADIR%%/lib/async-profiler.jar
-%%DATADIR%%/lib/build-marker-RM-222.4345.14
+%%DATADIR%%/lib/build-marker-RM-222.4459.24
 %%DATADIR%%/lib/byte-buddy-agent.jar
 %%DATADIR%%/lib/cds/classesLogAgent.jar
 %%DATADIR%%/lib/dbus-java-3.2.1.jar
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	simgear
-PORTVERSION=	2020.3.16
+PORTVERSION=	2020.3.17
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}

--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1666388505
-SHA256 (simgear-2020.3.16.tar.bz2) = 246e1a75be4e48491b33d5c31402e34339b22cad30bf5d1fb77b0ed280fcc492
-SIZE (simgear-2020.3.16.tar.bz2) = 1419254
+TIMESTAMP = 1669235885
+SHA256 (simgear-2020.3.17.tar.bz2) = 4c5e9cd0dcff1bd311c2460aa601230bd80abdbaec751b559c1d7147749f377c
+SIZE (simgear-2020.3.17.tar.bz2) = 1418448
--- a/devel/sonarqube-community/Makefile
+++ b/devel/sonarqube-community/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	sonarqube
 DISTVERSION=	9.7.1.62043
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel security www java
 MASTER_SITES=	https://binaries.sonarsource.com/Distribution/sonarqube/:m_core \
 		https://binaries.sonarsource.com/Distribution/sonar-csharp-plugin/:m_csharp \
@ -52,9 +52,9 @@ DBBASE_DIR=	/var/db/${PORTNAME}
 DATA_DIR=	${DBBASE_DIR}/data
 TEMP_DIR=	${DBBASE_DIR}/temp

-SONARCSHARP_VER=	8.48.0.56517
+SONARCSHARP_VER=	8.49.0.57237
 SONARJAVA_VER=		7.15.0.30507
-SONARJAVASCRIPT_VER=	9.10.0.19937
+SONARJAVASCRIPT_VER=	9.11.0.20161
 SONARPHP_VER=		3.25.0.9077
 SONARPYTHON_VER=	3.20.0.10345
 SONARVBNET_VER=		${SONARCSHARP_VER}
--- a/devel/sonarqube-community/distinfo
+++ b/devel/sonarqube-community/distinfo
@ -1,15 +1,15 @@
-TIMESTAMP = 1668086142
+TIMESTAMP = 1669368350
 SHA256 (sonarqube-9.7.1.62043.zip) = d3e5d6f36f7a1f0f08d5df2936a9d1d5f962a7a65d980e533e5576482c529e91
 SIZE (sonarqube-9.7.1.62043.zip) = 294891765
-SHA256 (sonar-csharp-plugin-8.48.0.56517.jar) = e61d5ebbe24a732b11cd4ae5fabe83059760b5bc0c56cdeed03506adf34126e8
-SIZE (sonar-csharp-plugin-8.48.0.56517.jar) = 5550760
+SHA256 (sonar-csharp-plugin-8.49.0.57237.jar) = 9859664557e897759510c85ee2306ee193db7c7905e0e810c4f1bc0c8b48b54b
+SIZE (sonar-csharp-plugin-8.49.0.57237.jar) = 5555539
 SHA256 (sonar-java-plugin-7.15.0.30507.jar) = 92ee49f61ff02727dfb19ce8ba4b967a04169dd4b9aa47c09bdff4cbab42a037
 SIZE (sonar-java-plugin-7.15.0.30507.jar) = 17790248
-SHA256 (sonar-javascript-plugin-9.10.0.19937.jar) = 1016755b3b8c5f36092f563c4d081c8a598a1555b2dc9a3c6bd2f43d277d0e6a
-SIZE (sonar-javascript-plugin-9.10.0.19937.jar) = 24212732
+SHA256 (sonar-javascript-plugin-9.11.0.20161.jar) = 5413488fd265827dc1b12348c9b40f222fb067f168d7513eb2b1870a42ae02ae
+SIZE (sonar-javascript-plugin-9.11.0.20161.jar) = 24039800
 SHA256 (sonar-php-plugin-3.25.0.9077.jar) = 1d92ac25308b0fde7b0adbc797b6a6d4e339c062a317b9c9c7175241b7b4b8f2
 SIZE (sonar-php-plugin-3.25.0.9077.jar) = 5591847
 SHA256 (sonar-python-plugin-3.20.0.10345.jar) = 037bb9e14aefdb04d4a162408f829072fa9231ddaf05ee5b26f1d4c8a5199d79
 SIZE (sonar-python-plugin-3.20.0.10345.jar) = 7824824
-SHA256 (sonar-vbnet-plugin-8.48.0.56517.jar) = cfd54787acc584ac65606d14a6c757b32558db9e7e270a0c8cb89c4ff1642c64
-SIZE (sonar-vbnet-plugin-8.48.0.56517.jar) = 4312554
+SHA256 (sonar-vbnet-plugin-8.49.0.57237.jar) = 8186b00deb90811bd626c4e179d8341dff497bdb2f5a8160f422443d1ae45bb1
+SIZE (sonar-vbnet-plugin-8.49.0.57237.jar) = 4316241
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	tortoisehg
-DISTVERSION=	6.2.2
+DISTVERSION=	6.3.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.mercurial-scm.org/release/tortoisehg/targz/

--- a/devel/tortoisehg/distinfo
+++ b/devel/tortoisehg/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1662560200
-SHA256 (tortoisehg-6.2.2.tar.gz) = 5dbbe0fc572e5ff00bdab796b1a336a1a1722dbcb7f870c27d8b51cacc04ec30
-SIZE (tortoisehg-6.2.2.tar.gz) = 8928012
+TIMESTAMP = 1669285988
+SHA256 (tortoisehg-6.3.1.tar.gz) = cc3d9c747c5b9804b0cb7af5ff6b3a16b75331e3ed0d973bcc9a931e4c970103
+SIZE (tortoisehg-6.3.1.tar.gz) = 8931552
--- a/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
+++ b/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
@ -1,9 +1,9 @@
--- tortoisehg/util/hgversion.py.orig	2022-03-06 02:33:21 UTC
+--- tortoisehg/util/hgversion.py.orig	2022-11-13 03:06:49 UTC
 +++ tortoisehg/util/hgversion.py
-@@ -33,15 +33,7 @@ def checkhgversion(v):
+@@ -39,15 +39,7 @@ def checkhgversion(v: bytes) -> Optional[bytes]:
     return vers
 
- def checkhgversion(v):
+ def checkhgversion(v: bytes) -> Optional[bytes]:
 -    """range check the Mercurial version"""
 -    reqvers = testedwith.split()
 -    vers = _splitversion(v)
@ -15,5 +15,5 @@
 -            b'%s.n, but found %s') % (reqvers[0], reqvers[-1], v)
 +    return
 
- def checkminhgversion(v):
+ def checkminhgversion(v: bytes) -> Optional[bytes]:
     """Check if the given Mercurial version is not lower than the minimum
--- a/devel/utf8cpp/Makefile
+++ b/devel/utf8cpp/Makefile
@ -1,13 +1,14 @@
 PORTNAME=	utf8cpp
-PORTVERSION=	3.1.2
 DISTVERSIONPREFIX=	v
+DISTVERSION=	3.2.2
 CATEGORIES=	devel

 MAINTAINER=	k@stereochro.me
 COMMENT=	Simple, portable, lightweight library for handling UTF-8 strings
-WWW=		http://utfcpp.sourceforge.net/
+WWW=		https://github.com/nemtrif/utfcpp

 LICENSE=	BSL
+LICENSE_FILE=	${WRKSRC}/LICENSE

 USES=		cmake
 USE_GITHUB=	yes
@ -20,6 +21,7 @@ PLIST_FILES=	include/utf8cpp/utf8.h \
 		include/utf8cpp/utf8/checked.h \
 		include/utf8cpp/utf8/core.h \
 		include/utf8cpp/utf8/cpp11.h \
+		include/utf8cpp/utf8/cpp17.h \
 		include/utf8cpp/utf8/unchecked.h \
 		lib/cmake/utf8cpp/utf8cppConfig.cmake

--- a/devel/utf8cpp/distinfo
+++ b/devel/utf8cpp/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1606387752
-SHA256 (nemtrif-utfcpp-v3.1.2_GH0.tar.gz) = fea3bfa39fb8bd7368077ea5e1e0db9a8951f7e6fb6d9400b00ab3d92b807c6d
-SIZE (nemtrif-utfcpp-v3.1.2_GH0.tar.gz) = 26388
+TIMESTAMP = 1667982422
+SHA256 (nemtrif-utfcpp-v3.2.2_GH0.tar.gz) = 6f81e7cb2be2a6a9109a8a0cb7dc39ec947f1bcdb5dfa4a660e11a23face19f5
+SIZE (nemtrif-utfcpp-v3.2.2_GH0.tar.gz) = 27476
--- a/devel/websvn/Makefile
+++ b/devel/websvn/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	websvn
-PORTVERSION=	2.8.0
+PORTVERSION=	2.8.1
 CATEGORIES=	devel www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}

--- a/devel/websvn/distinfo
+++ b/devel/websvn/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1665562275
-SHA256 (websvnphp-websvn-2.8.0_GH0.tar.gz) = 3376f2d3710a2c4faaa332295b9f655f6bb7b2c2b792bb5e4a26eb84f5264760
-SIZE (websvnphp-websvn-2.8.0_GH0.tar.gz) = 253612
+TIMESTAMP = 1669285669
+SHA256 (websvnphp-websvn-2.8.1_GH0.tar.gz) = 06038a940dd45397ac94120a10d31c629dc3c51af6f9583d7b2326ce5c3d730b
+SIZE (websvnphp-websvn-2.8.1_GH0.tar.gz) = 253634
--- a/editors/Makefile
+++ b/editors/Makefile
@ -263,6 +263,7 @@
    SUBDIR += texworks
    SUBDIR += the
    SUBDIR += treeform
+    SUBDIR += turbo
    SUBDIR += tweak
    SUBDIR += uemacs
    SUBDIR += uzap
--- a/editors/turbo/Makefile
+++ b/editors/turbo/Makefile
@ -0,0 +1,26 @@
+PORTNAME=	turbo
+PORTVERSION=	g20221121
+CATEGORIES=	editors
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Text editor based on Scintilla and Turbo Vision
+WWW=		https://github.com/magiblot/turbo
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
+LIB_DEPENDS=	libclipboard.so:x11/libclipboard \
+		libfmt.so:devel/libfmt
+
+USES=		cmake compiler:c++17-lang xorg
+USE_GITHUB=	yes
+USE_XORG=	xcb
+
+GH_ACCOUNT=	magiblot
+GH_PROJECT=	tvision:tv
+GH_TAGNAME=	3e3a0db 0675ade:tv
+GH_SUBDIR=	deps/tvision:tv
+
+CMAKE_ON=	TURBO_USE_SYSTEM_DEPS
+
+.include <bsd.port.mk>
--- a/editors/turbo/distinfo
+++ b/editors/turbo/distinfo
@ -0,0 +1,5 @@
+TIMESTAMP = 1669070950
+SHA256 (magiblot-turbo-g20221121-3e3a0db_GH0.tar.gz) = 2628fad1f5342798628ac69353749201b53279745479dfcb4d534f71e8b11d1f
+SIZE (magiblot-turbo-g20221121-3e3a0db_GH0.tar.gz) = 717275
+SHA256 (magiblot-tvision-0675ade_GH0.tar.gz) = 7d8cd92cf2a36e9cc67590f7f23453b26ef3e1f28c44961ea3f48d60d67eda9d
+SIZE (magiblot-tvision-0675ade_GH0.tar.gz) = 818148
--- a/editors/turbo/pkg-descr
+++ b/editors/turbo/pkg-descr
@ -0,0 +1,8 @@
+Turbo is an experimental text editor for the terminal, based on the
+Scintilla editing component and the Turbo Vision application framework.
+
+It aims at being intuitive and easy to use.  Usability and productivity
+are its two other major objectives, although it has not got that far yet.
+And only for being a Turbo Vision application, it offers a vintage look
+and feel, while being fully Unicode/UTF-8 aware, including support for
+CJK (wide) characters.
--- a/editors/turbo/pkg-plist
+++ b/editors/turbo/pkg-plist
@ -0,0 +1,155 @@
+bin/turbo
+include/turbo/basicframe.h
+include/turbo/basicwindow.h
+include/turbo/clipboard.h
+include/turbo/editor.h
+include/turbo/editstates.h
+include/turbo/fileeditor.h
+include/turbo/funcview.h
+include/turbo/scintilla.h
+include/turbo/scintilla/include/ILexer.h
+include/turbo/scintilla/include/ILoader.h
+include/turbo/scintilla/include/Platform.h
+include/turbo/scintilla/include/SciLexer.h
+include/turbo/scintilla/include/Sci_Position.h
+include/turbo/scintilla/include/Scintilla.h
+include/turbo/scintilla/include/ScintillaWidget.h
+include/turbo/scintilla/internals.h
+include/turbo/scintilla/lexlib/Accessor.h
+include/turbo/scintilla/lexlib/CatalogueModules.h
+include/turbo/scintilla/lexlib/CharacterCategory.h
+include/turbo/scintilla/lexlib/CharacterSet.h
+include/turbo/scintilla/lexlib/DefaultLexer.h
+include/turbo/scintilla/lexlib/LexAccessor.h
+include/turbo/scintilla/lexlib/LexerBase.h
+include/turbo/scintilla/lexlib/LexerModule.h
+include/turbo/scintilla/lexlib/LexerNoExceptions.h
+include/turbo/scintilla/lexlib/LexerSimple.h
+include/turbo/scintilla/lexlib/OptionSet.h
+include/turbo/scintilla/lexlib/PropSetSimple.h
+include/turbo/scintilla/lexlib/SparseState.h
+include/turbo/scintilla/lexlib/StringCopy.h
+include/turbo/scintilla/lexlib/StyleContext.h
+include/turbo/scintilla/lexlib/SubStyles.h
+include/turbo/scintilla/lexlib/WordList.h
+include/turbo/scintilla/src/AutoComplete.h
+include/turbo/scintilla/src/CallTip.h
+include/turbo/scintilla/src/CaseConvert.h
+include/turbo/scintilla/src/CaseFolder.h
+include/turbo/scintilla/src/Catalogue.h
+include/turbo/scintilla/src/CellBuffer.h
+include/turbo/scintilla/src/CharClassify.h
+include/turbo/scintilla/src/ContractionState.h
+include/turbo/scintilla/src/DBCS.h
+include/turbo/scintilla/src/Decoration.h
+include/turbo/scintilla/src/Document.h
+include/turbo/scintilla/src/EditModel.h
+include/turbo/scintilla/src/EditView.h
+include/turbo/scintilla/src/Editor.h
+include/turbo/scintilla/src/ElapsedPeriod.h
+include/turbo/scintilla/src/ExternalLexer.h
+include/turbo/scintilla/src/FontQuality.h
+include/turbo/scintilla/src/Indicator.h
+include/turbo/scintilla/src/IntegerRectangle.h
+include/turbo/scintilla/src/KeyMap.h
+include/turbo/scintilla/src/LineMarker.h
+include/turbo/scintilla/src/MarginView.h
+include/turbo/scintilla/src/Partitioning.h
+include/turbo/scintilla/src/PerLine.h
+include/turbo/scintilla/src/Position.h
+include/turbo/scintilla/src/PositionCache.h
+include/turbo/scintilla/src/RESearch.h
+include/turbo/scintilla/src/RunStyles.h
+include/turbo/scintilla/src/ScintillaBase.h
+include/turbo/scintilla/src/Selection.h
+include/turbo/scintilla/src/SparseVector.h
+include/turbo/scintilla/src/SplitVector.h
+include/turbo/scintilla/src/Style.h
+include/turbo/scintilla/src/UniConversion.h
+include/turbo/scintilla/src/UniqueString.h
+include/turbo/scintilla/src/ViewStyle.h
+include/turbo/scintilla/src/XPM.h
+include/turbo/scintilla/tscintilla.h
+include/turbo/styles.h
+include/turbo/tpath.h
+include/turbo/turbo.h
+include/turbo/util.h
+include/tvision/app.h
+include/tvision/buffers.h
+include/tvision/colors.h
+include/tvision/colorsel.h
+include/tvision/compat/borland/_defs.h
+include/tvision/compat/borland/_null.h
+include/tvision/compat/borland/alloc.h
+include/tvision/compat/borland/dir.h
+include/tvision/compat/borland/dos.h
+include/tvision/compat/borland/fstream.h
+include/tvision/compat/borland/io.h
+include/tvision/compat/borland/iomanip.h
+include/tvision/compat/borland/iosfwd.h
+include/tvision/compat/borland/iostream.h
+include/tvision/compat/borland/mem.h
+include/tvision/compat/borland/strstrea.h
+include/tvision/compat/malloc/malloc.h
+include/tvision/compat/windows/windows.h
+include/tvision/config.h
+include/tvision/dialogs.h
+include/tvision/drawbuf.h
+include/tvision/editors.h
+include/tvision/hardware.h
+include/tvision/help.h
+include/tvision/helpbase.h
+include/tvision/internal/ansidisp.h
+include/tvision/internal/buffdisp.h
+include/tvision/internal/codepage.h
+include/tvision/internal/constarr.h
+include/tvision/internal/constmap.h
+include/tvision/internal/cursor.h
+include/tvision/internal/events.h
+include/tvision/internal/findfrst.h
+include/tvision/internal/getenv.h
+include/tvision/internal/gpminput.h
+include/tvision/internal/linuxcon.h
+include/tvision/internal/ncurdisp.h
+include/tvision/internal/ncursinp.h
+include/tvision/internal/pathconv.h
+include/tvision/internal/platform.h
+include/tvision/internal/scrlife.h
+include/tvision/internal/sighandl.h
+include/tvision/internal/sigwinch.h
+include/tvision/internal/stdioctl.h
+include/tvision/internal/strings.h
+include/tvision/internal/termdisp.h
+include/tvision/internal/terminal.h
+include/tvision/internal/unixcon.h
+include/tvision/internal/utf8.h
+include/tvision/internal/win32con.h
+include/tvision/internal/winwidth.h
+include/tvision/menus.h
+include/tvision/msgbox.h
+include/tvision/objects.h
+include/tvision/outline.h
+include/tvision/resource.h
+include/tvision/scrncell.h
+include/tvision/stddlg.h
+include/tvision/surface.h
+include/tvision/system.h
+include/tvision/textview.h
+include/tvision/tkeys.h
+include/tvision/tobjstrm.h
+include/tvision/tspan.h
+include/tvision/tstrview.h
+include/tvision/ttext.h
+include/tvision/ttypes.h
+include/tvision/tv.h
+include/tvision/tvobjs.h
+include/tvision/util.h
+include/tvision/validate.h
+include/tvision/views.h
+lib/cmake/turbo/turbo-config-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/turbo/turbo-config.cmake
+lib/cmake/tvision/tvision-config-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/tvision/tvision-config.cmake
+lib/libturbo-core.a
+lib/libtvision.a
+share/man/man1/turbo.1.gz
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	homebank
-PORTVERSION=	5.5.7
+PORTVERSION=	5.5.8
 CATEGORIES=	finance
 MASTER_SITES=	http://homebank.free.fr/public/

--- a/finance/homebank/distinfo
+++ b/finance/homebank/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1665281460
-SHA256 (homebank-5.5.7.tar.gz) = ada0165f2883ca47af3cea8907c05e6080bc2d04274deebb58bd84b00c3b2838
-SIZE (homebank-5.5.7.tar.gz) = 3099150
+TIMESTAMP = 1669333145
+SHA256 (homebank-5.5.8.tar.gz) = 507a5bb3ceea230780f11206728b061daac00f654b52e782aab875ab71abcf85
+SIZE (homebank-5.5.8.tar.gz) = 3099161
--- a/ftp/Makefile
+++ b/ftp/Makefile
@ -2,6 +2,7 @@

    SUBDIR += R-cran-RCurl
    SUBDIR += R-cran-curl
+    SUBDIR += axel
    SUBDIR += bbftp-client
    SUBDIR += bbftp-server
    SUBDIR += bftpd
--- a/ftp/axel/Makefile
+++ b/ftp/axel/Makefile
@ -0,0 +1,33 @@
+PORTNAME=	axel
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.17.11-21
+DISTVERSIONSUFFIX=	-gd65dffa
+CATEGORIES=	ftp
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Lightweight CLI download accelerator
+WWW=		https://github.com/axel-download-accelerator/axel
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive \
+		txt2man:textproc/txt2man
+
+USES=		autoreconf gettext-tools gmake pkgconfig ssl
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	axel-download-accelerator
+
+GNU_CONFIGURE=	yes
+
+.if exists(/usr/libdata/pkgconfig/openssl.pc)
+CONFIGURE_ARGS=	--with-ssl=openssl
+.else
+CONFIGURE_ARGS=	--without-ssl # no easy workaround
+.endif
+
+PLIST_FILES=	bin/axel \
+		man/man1/axel.1.gz
+
+.include <bsd.port.mk>
--- a/ftp/axel/distinfo
+++ b/ftp/axel/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1669338799
+SHA256 (axel-download-accelerator-axel-v2.17.11-21-gd65dffa_GH0.tar.gz) = f58501c4f82e1e9dbf085552387328eccb211fb1592fafae06582899cb0cfbdf
+SIZE (axel-download-accelerator-axel-v2.17.11-21-gd65dffa_GH0.tar.gz) = 101764
--- a/ftp/axel/files/patch-src_axel.c
+++ b/ftp/axel/files/patch-src_axel.c
@ -0,0 +1,11 @@
+--- src/axel.c.orig	2022-11-25 02:14:41 UTC
+++ src/axel.c
+@@ -151,7 +151,7 @@ axel_new(conf_t *conf, int count, const search_t *res)
+ 			axel->conf->buffer_size = axel->conf->max_speed;
+ 		}
+ 		uint64_t delay =
+-			UINT64_C(1073741824) * axel->conf->buffer_size *
+			((uint64_t)1073741824) * axel->conf->buffer_size *
+ 			axel->conf->num_connections / axel->conf->max_speed;
+ 
+ 		axel->delay_time.tv_sec  = delay / 1073741824;
--- a/ftp/axel/files/patch-src_random.c
+++ b/ftp/axel/files/patch-src_random.c
@ -0,0 +1,11 @@
+--- src/random.c.orig	2022-11-25 01:30:10 UTC
+++ src/random.c
+@@ -6,7 +6,7 @@
+ ssize_t
+ axel_rand64(uint64_t *out)
+ {
+-	static int fd = -1;
+	static atomic_int fd = -1;
+ 	if (fd == -1) {
+ 		int tmp = open("/dev/random", O_RDONLY);
+ 		int expect = -1;
--- a/ftp/axel/pkg-descr
+++ b/ftp/axel/pkg-descr
@ -0,0 +1,7 @@
+Axel tries to accelerate the download process by using multiple connections per
+file, and can also balance the load between different servers.
+
+Axel tries to be as light as possible, so it might be useful on byte-critical
+systems.
+
+Axel supports HTTP, HTTPS, FTP and FTPS protocols.
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	burgerspace
-PORTVERSION=	1.9.4
+PORTVERSION=	1.9.5
 CATEGORIES=	games
 MASTER_SITES=	http://perso.b2b2c.ca/~sarrazip/dev/ \
 		LOCAL/martymac
--- a/games/burgerspace/distinfo
+++ b/games/burgerspace/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1625086915
-SHA256 (burgerspace-1.9.4.tar.gz) = d4ec00e9df6fdac463a1627d34445746f5158ffbf35104944a81b4fa6b8d64f5
-SIZE (burgerspace-1.9.4.tar.gz) = 542060
+TIMESTAMP = 1669238415
+SHA256 (burgerspace-1.9.5.tar.gz) = 991fdc5a95dd3ebeab94857b328f34c96f716be8ba51c6332afa79b1f1a24ae4
+SIZE (burgerspace-1.9.5.tar.gz) = 542551
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	flightgear-data
-PORTVERSION=	2020.3.16
+PORTVERSION=	2020.3.17
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 DISTNAME=	FlightGear-${PORTVERSION}-data
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1666388826
-SHA256 (FlightGear-2020.3.16-data.txz) = f30b1e565d49f24f30cd1bc1705d2badefcb13c16619f634e458ac148e62c3a8
-SIZE (FlightGear-2020.3.16-data.txz) = 1789373040
+TIMESTAMP = 1669236178
+SHA256 (FlightGear-2020.3.17-data.txz) = 2a5eba2b9ae67a3691285833a6ce3f6bbdf3f20229f5871d7c940e151d54d8e8
+SIZE (FlightGear-2020.3.17-data.txz) = 1789324280
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	flightgear
-PORTVERSION=	2020.3.16
+PORTVERSION=	2020.3.17
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}

--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1666388527
-SHA256 (flightgear-2020.3.16.tar.bz2) = be62c98ea2c9cc164281b00a34b8c6ac812e750497eb9178f87ee852aecd6c85
-SIZE (flightgear-2020.3.16.tar.bz2) = 8931645
+TIMESTAMP = 1669238022
+SHA256 (flightgear-2020.3.17.tar.bz2) = 6670dedeaca2683aca77f9f06bf9d1d8062ae32a2a5459dddc8aa0989c5f1854
+SIZE (flightgear-2020.3.17.tar.bz2) = 8934871
--- a/games/glbsp/Makefile
+++ b/games/glbsp/Makefile
@ -1,48 +1,43 @@
 PORTNAME=	glbsp
-PORTVERSION=	2.20
-PORTREVISION=	1
+PORTVERSION=	2.24
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/.//}

 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	BSP node builder for OpenGL ports of the DOOM game engine
+COMMENT=	BSP node builder for OpenGL-based DOOM engines
 WWW=		https://glbsp.sourceforge.net/

 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt

 USES=		gmake
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/[[:alpha:]]//}
+MAKEFILE=	Makefile.unx
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source

-PORTDOCS=	README.txt USAGE.txt
+PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt TRICKS.txt USAGE.txt
+PLIST_FILES=	bin/glbsp man/man1/glbsp.1.gz include/glbsp.h lib/libglbsp.a
+
+OPTIONS_DEFINE=	DOCS GUI

-OPTIONS_DEFINE=	GUI PLUGIN DOCS
-OPTIONS_SUB=	yes
-PLUGIN_DESC=	Build plugin used in DOOM engines
 GUI_DESC=	Build FLTK based GUI
-GUI_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
-
-post-patch:
-	@${REINPLACE_CMD} -i '' -e 's|CC=|CC\?=|; s|CFLAGS=|CFLAGS\+=|' \
-		${WRKSRC}/Makefile ${WRKSRC}/Plugin_unx.mak
-
-post-build-GUI-on:
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} -f GUI_unx.mak all
-
-post-build-PLUGIN-on:
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} -f Plugin_unx.mak all
+GUI_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+			libfontconfig.so:x11-fonts/fontconfig \
+			libpng.so:graphics/png
+GUI_USES=	jpeg xorg
+GUI_USE=	XORG=x11,xcursor,xext,xfixes,xft,xinerama,xrender
+GUI_ALL_TARGET=	all glBSPX
+GUI_PLIST_FILES=	bin/glBSPX

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/glbsp ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/glbsp.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/src/glbsp.h ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/libglbsp.a ${STAGEDIR}${PREFIX}/lib

 do-install-GUI-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/glBSPX ${STAGEDIR}${PREFIX}/bin

-do-install-PLUGIN-on:
-	${INSTALL_DATA} ${WRKSRC}/libglbsp.a ${STAGEDIR}${PREFIX}/lib
-
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
--- a/games/glbsp/distinfo
+++ b/games/glbsp/distinfo
@ -1,2 +1,3 @@
-SHA256 (glbsp_src_220.tar.gz) = 0b68b82962aff8c66c4663a5283fa28ef1287beb303dc0c09325e1cecaa8e4d3
-SIZE (glbsp_src_220.tar.gz) = 172283
+TIMESTAMP = 1185432952
+SHA256 (glbsp_src_224.tar.gz) = e3b7c4bce21c2f9b77732a9b5920b6877e884b31dd1ed9273776538dba48a75c
+SIZE (glbsp_src_224.tar.gz) = 230977
--- a/games/glbsp/files/patch-GUI_unx.mak
+++ b/games/glbsp/files/patch-GUI_unx.mak
@ -1,26 +0,0 @@
--- GUI_unx.mak.orig	2005-09-16 05:29:39 UTC
-+++ GUI_unx.mak
-@@ -8,16 +8,16 @@ SRC_DIR=glbsp
- 
- PROGNAME=glBSPX
- 
-FLTK_PREFIX=../fltk-1.1.6
-FLTK_CFLAGS=-I$(FLTK_PREFIX) -I$(FLTK_PREFIX)/zlib
-FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images -lfltk_png -lfltk_z -lfltk_jpeg \
-          -lfltk -lX11 -lXext
-+FLTK_PREFIX=${LOCALBASE}
-+FLTK_CFLAGS=`fltk-config --use-images --cflags`
-+FLTK_LIBSTMP=$(shell fltk-config --use-images --ldflags)
-+FLTK_LIBS=$(subst -R,-L,$(FLTK_LIBSTMP))
- 
-CC=gcc
-CXX=g++
-+CC?=gcc
-+CXX?=g++
- CFLAGS=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
- CXXFLAGS=$(CFLAGS)
-LDFLAGS=-L/usr/X11R6/lib
-+LDFLAGS?=-L/usr/X11R6/lib
- LIBS=-lm $(FLTK_LIBS)
- 
- OBJS=$(SYSDIR)/main.o     \
--- a/games/glbsp/files/patch-Makefile.unx
+++ b/games/glbsp/files/patch-Makefile.unx
@ -0,0 +1,54 @@
+--- Makefile.unx.orig	2007-07-26 03:14:34 UTC
+++ Makefile.unx
+@@ -18,13 +18,13 @@ DOC_NAME=glbsp.txt
+ GUI_NAME=glBSPX
+ DOC_NAME=glbsp.txt
+ 
+-CC=gcc
+-CXX=g++
+CC?=gcc
+CXX?=g++
+ AR=ar rc
+ RANLIB=ranlib
+ STRIP=strip --strip-unneeded
+ 
+-BASE_FLAGS=-Wall -O2 -I./src -DUNIX -DINLINE_G=inline
+BASE_FLAGS=-Wall $(CFLAGS) -I./src -DUNIX -DINLINE_G=inline
+ 
+ FLTK_DIR=./fltk-1.1.7
+ 
+@@ -34,7 +34,7 @@ MAN_PREFIX=$(INSTALL_PREFIX)/share/man
+ 
+ # ----- GENERAL STUFF ----------------------------------------------
+ 
+-all:    $(LIB_NAME) $(CMD_NAME) $(DOC_NAME)
+all:    $(LIB_NAME) $(CMD_NAME)
+ 
+ clean:
+ 	rm -f $(LIB_NAME) $(CMD_NAME) $(GUI_NAME) $(DOC_NAME)
+@@ -80,7 +80,6 @@ $(CMD_NAME): $(LIB_NAME) $(CMD_OBJS)
+ 
+ $(CMD_NAME): $(LIB_NAME) $(CMD_OBJS)
+ 	$(CC) $(CMD_FLAGS) $(CMD_OBJS) -o $@ $(LIB_NAME) $(CMD_LIBS)
+-	$(STRIP) $@
+ 
+ install: $(CMD_NAME)
+ 	cp $(CMD_NAME) $(INSTALL_PREFIX)/bin/
+@@ -94,14 +93,13 @@ install: $(CMD_NAME)
+ 
+ # ----- GUI PROGRAM ---------------------------------------------
+ 
+-FLTK_FLAGS=-I$(FLTK_DIR) -I$(FLTK_DIR)/zlib
+-FLTK_LIBS=-L$(FLTK_DIR)/lib -lfltk_images -lpng -lz -ljpeg \
+-          -lfltk -lX11 -lXext
+FLTK_FLAGS=$(shell fltk-config --use-images --cflags)
+FLTK_LIBS=$(shell fltk-config --use-images --ldflags)
+ 
+ ## may need: -L/usr/X11R6/lib
+ 
+ GUI_FLAGS=$(BASE_FLAGS) $(FLTK_FLAGS)
+-GUI_LIBS=$(FLTK_LIBS) -lm
+GUI_LIBS=$(FLTK_LIBS)
+ 
+ GUI_OBJS=\
+ 	gui/main.o     \
--- a/games/glbsp/files/patch-wad.c
+++ b/games/glbsp/files/patch-wad.c
@ -1,18 +0,0 @@
--- wad.c.orig	2005-09-13 10:19:36 UTC
-+++ wad.c
-@@ -1632,14 +1632,13 @@ void ReportOverflows(boolean_g hard)
- void ReportV5Switches(void)
- {
-   lump_t *cur;
-+  int saw_zdbsp = FALSE;
- 
-   PrintMsg(
-     "V5 FORMAT UPGRADES.  The following levels require a Doom port\n"
-     "which supports V5 GL-Nodes, otherwise they will fail (or crash).\n\n"
-   );
- 
-  int saw_zdbsp = FALSE;
-
-   for (cur=wad.dir_head; cur; cur=cur->next)
-   {
-     level_t *lev = cur->lev_info;
--- a/games/glbsp/pkg-plist
+++ b/games/glbsp/pkg-plist
@ -1,4 +0,0 @@
-bin/glbsp
-man/man1/glbsp.1.gz
-%%GUI%%bin/glBSPX
-%%PLUGIN%%lib/libglbsp.a
--- a/games/oblige/Makefile
+++ b/games/oblige/Makefile
@ -10,19 +10,23 @@ WWW=		https://oblige.sourceforge.net/

 LICENSE=	GPLv2+

+BUILD_DEPENDS=	${LOCALBASE}/include/glbsp.h:games/glbsp
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
+		libphysfs.so:devel/physfs \
 		libpng.so:graphics/png

 USES=		gmake jpeg xorg zip
 USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
-MAKE_ARGS=	CXX="${CXX}"
 WRKSRC=		${WRKDIR}/Oblige-${PORTVERSION}-source

 OPTIONS_DEFINE=	DOCS

 PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt TODO.txt

+post-extract:
+	@cd ${WRKSRC} && ${RM} -r glbsp_src physfs_src
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Oblige ${STAGEDIR}${PREFIX}/bin/oblige
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "addons data engines games \
@ -35,9 +39,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/icon_128x128.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/oblige.png

-post-install-DOCS-on:
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} changelogs ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
+
+PATCH_ARGS+=	-l
--- a/Show More
+++ b/Show More