*/*: sync with upstream

Taken from: FreeBSD

audio/boops-lv2/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	boops
-DISTVERSION=	1.8.0
+DISTVERSION=	1.8.2
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 

audio/boops-lv2/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1630401125
-SHA256 (sjaehn-BOops-1.8.0_GH0.tar.gz) = 6e0acb9aead02ec67da854db3f4fbc0c15296c360c48ef8506f55b525b23f0c4
-SIZE (sjaehn-BOops-1.8.0_GH0.tar.gz) = 19005093
+TIMESTAMP = 1630811306
+SHA256 (sjaehn-BOops-1.8.2_GH0.tar.gz) = 0a810f869dc7a6bcea09b832fd778df4e161477294d631dd1a08186c6a9ae1fb
+SIZE (sjaehn-BOops-1.8.2_GH0.tar.gz) = 19188649

audio/libopenmpt/Makefile

@@ -1,7 +1,7 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 
 PORTNAME=	libopenmpt
-PORTVERSION=	0.5.10
+PORTVERSION=	0.5.11
 DISTVERSIONSUFFIX=	+release.autotools
 CATEGORIES=	audio
 MASTER_SITES=	https://lib.openmpt.org/files/libopenmpt/src/ \

audio/libopenmpt/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1625498110
-SHA256 (libopenmpt-0.5.10+release.autotools.tar.gz) = 59a8fa28d8b8df69cb7fa5972bdf931081dab4e1e1156c69a1a53b65c2be9ffa
-SIZE (libopenmpt-0.5.10+release.autotools.tar.gz) = 1475967
+TIMESTAMP = 1630786708
+SHA256 (libopenmpt-0.5.11+release.autotools.tar.gz) = 4469e095948d976cff4d7eb1936a27e9947624e49b160c29fcb246911ba5a4b0
+SIZE (libopenmpt-0.5.11+release.autotools.tar.gz) = 1477946

audio/mixxx/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	mixxx
 DISTVERSION=	2.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 MAINTAINER=	acm@FreeBSD.org
@@ -62,28 +62,21 @@ OPTIONS_SUB=		yes
 
 BROADCAST_DESC=		Live Broadcasting (Shoutcast) support
 #BROADCAST_LIB_DEPENDS=	libshout-idjc.so:audio/shout-idjc
-BROADCAST_CMAKE_ARGS=	-DBROADCAST:BOOL=ON
-BROADCAST_CMAKE_ARGS_OFF=-DBROADCAST:BOOL=OFF
+BROADCAST_CMAKE_BOOL=	BROADCAST
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-FFMPEG_CMAKE_ARGS=	-DFFMPEG:BOOL=ON
-FFMPEG_CMAKE_ARGS_OFF=	-DFFMPEG:BOOL=OFF
+FFMPEG_CMAKE_BOOL=	FFMPEG
 GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
-GPERFTOOLS_CMAKE_ARGS=	-DPERFTOOLS:BOOL=ON
-GPERFTOOLS_CMAKE_ARGS_OFF=	-DPERFTOOLS:BOOL=OFF
+GPERFTOOLS_CMAKE_BOOL=	GPERFTOOLS
 HID_DESC=		USB HID controllers support
-HID_CMAKE_ARGS=		-DHID:BOOL=ON
-HID_CMAKE_ARGS_OFF=	-DHID:BOOL=OFF
+HID_CMAKE_BOOL=		HID
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus \
 			libopusfile.so:audio/opusfile
-OPUS_CMAKE_ARGS=	-DOPUS:BOOL=ON
-OPUS_CMAKE_ARGS_OFF=	-DOPUS:BOOL=OFF
+OPUS_CMAKE_BOOL=	OPUS
 QTKEYCHAIN_DESC=	Secure credentials storage for Live Broadcasting profiles
 QTKEYCHAIN_LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain
-QTKEYCHAIN_CMAKE_ARGS=	-DQTKEYCHAIN:BOOL:ON
-QTKEYCHAIN_CMAKE_ARGS_OFF=-DQTKEYCHAIN:BOOL:OFF
+QTKEYCHAIN_CMAKE_BOOL=	QTKEYCHAIN
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
-WAVPACK_CMAKE_ARGS=	-DWAVPACK:BOOL=ON
-WAVPACK_CMAKE_ARGS_OFF=	-DWAVPACK:BOOL=OFF
+WAVPACK_CMAKE_BOOL=	WAVPACK
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx|" \

biology/ncbi-cxx-toolkit/Makefile

@@ -10,6 +10,8 @@ COMMENT=	NCBI C++ Toolkit
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/doc/public/LICENSE
 
+BROKEN_FreeBSD_11=	libxconnserv.so, not found (try using -rpath or -rpath-link)
+
 LIB_DEPENDS=	libcdd.so:math/cddlib \
 		liblmdb.so:databases/lmdb \
 		libpcre.so:devel/pcre

biology/unikmer/Makefile

@@ -11,15 +11,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	csvtk:science/csvtk
 
-USES=		go:modules
+USES=		go:modules perl5
+USE_PERL5=	test
 
 GO_MODULE=	github.com/shenwei356/unikmer
 GO_TARGET=	./${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
-TEST_USES=	perl5
-
 do-test: # from the benchmark section in README
 	@cd ${WRKSRC} && \
 		${GO_CMD} test . -bench=Bench* -benchmem \

cad/kicad-devel/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
-#PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}

databases/iowow/Makefile

@@ -1,7 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	iowow
-PORTVERSION=	1.4.12
+PORTVERSION=	1.4.13
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 

databases/iowow/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1626664145
-SHA256 (Softmotions-iowow-v1.4.12_GH0.tar.gz) = c09e00c3fb0464edddb2e52b55bc73558ec4db1ef13e1445ae75545a5de9c376
-SIZE (Softmotions-iowow-v1.4.12_GH0.tar.gz) = 521697
+TIMESTAMP = 1630659785
+SHA256 (Softmotions-iowow-v1.4.13_GH0.tar.gz) = 73535cd7a0bb6de2a8d1063da787b9b9d95810c2036e342400c12ad6f853fe60
+SIZE (Softmotions-iowow-v1.4.13_GH0.tar.gz) = 522886

databases/mongodb44/Makefile

@@ -75,8 +75,6 @@ EXTRA_PATCHES=	${FILESDIR}/${ARCH}
 
 ALL_TARGET=	install-core
 
-PORTSCOUT=	limitw:1,even
-
 CPE_PRODUCT=	mongodb
 
 pre-patch:

databases/phpmyadmin/Makefile

@@ -28,7 +28,7 @@ NO_BUILD=	yes
 # could, in principle, also use the PHP dbase extension, but it's not
 # available for PHP >= 7.0 and of only minority interest.
 
-USE_PHP=	ctype filter hash json mysqli session spl xml
+USE_PHP=	ctype filter hash iconv json mysqli session spl xml
 .endif
 
 # Note: default settings will pull in X11 client support.  If you don't

databases/phpmyadmin5/Makefile

@@ -26,7 +26,7 @@ NO_BUILD=	yes
 # could, in principle, also use the PHP dbase extension, but it's not
 # available for PHP >= 7.0 and of only minority interest.
 
-USE_PHP=	ctype filter hash json mysqli session spl xml xmlwriter
+USE_PHP=	ctype filter hash iconv json mysqli session spl xml xmlwriter
 .endif
 
 # Note: default settings will pull in X11 client support.  If you don't

databases/proftpd-mod_sql_mysql/Makefile

@@ -13,7 +13,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
-USES=		mysql
+USES=		cpe mysql
 
 INCLUDEDIRS=	${LOCALBASE}/include:${LOCALBASE}/include/mysql
 LIBDIRS=	${LOCALBASE}/lib

databases/proftpd-mod_sql_odbc/Makefile

@@ -15,6 +15,8 @@ DESCR=		${.CURDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
+USES=		cpe
+
 CONFIGURE_ARGS=	LIBS=-liodbc \
 		LD_LIBRARY_PATH="${LOCALBASE}/lib" \
 		LDFLAGS="-L${LOCALBASE}/lib"

databases/proftpd-mod_sql_postgres/Makefile

@@ -14,7 +14,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
-USES=	pgsql
+USES=		cpe pgsql
 
 INCLUDEDIRS=	${LOCALBASE}/include
 LIBDIRS=	${LOCALBASE}/lib

databases/proftpd-mod_sql_sqlite/Makefile

@@ -14,7 +14,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
-USES=		sqlite
+USES=		cpe sqlite
 
 INCLUDEDIRS=	${LOCALBASE}/include
 LIBDIRS=	${LOCALBASE}/lib

databases/redis-devel/Makefile

@@ -1,9 +1,8 @@
 # Created by: Sergey Skvortsov <skv@protey.ru>
 
 PORTNAME=	redis
-PORTVERSION=	6.2.5
+PORTVERSION=	7.0.0.20210902
 CATEGORIES=	databases
-MASTER_SITES=	https://download.redis.io/releases/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	osa@FreeBSD.org
@@ -13,6 +12,8 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		compiler:c11 gmake
+USE_GITHUB=	yes
+GH_TUPLE=	redis:redis:6aa2285
 
 OPTIONS_DEFINE=	JEMALLOC TESTS TLS TRIB
 OPTIONS_RADIO=	EXTLUA
@@ -62,7 +63,7 @@ USE_GCC=	yes
 CFLAGS+=	-march=i586
 .endif
 
-.if defined(_addflags)
+.if defined(_ADDFLAGS)
 CFLAGS=		-fPIC
 LDFLAGS=	-Wl,-E
 .endif

databases/redis-devel/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1626937780
-SHA256 (redis-6.2.5.tar.gz) = 4b9a75709a1b74b3785e20a6c158cab94cf52298aa381eea947a678a60d551ae
-SIZE (redis-6.2.5.tar.gz) = 2465302
+TIMESTAMP = 1630687513
+SHA256 (redis-redis-7.0.0.20210902-6aa2285_GH0.tar.gz) = 0ba419f6976b90048a4fbe88d8a2876e8d2596849f1eddc94f7a550cb8c24ec7
+SIZE (redis-redis-7.0.0.20210902-6aa2285_GH0.tar.gz) = 2534145

databases/redis-devel/files/extra-patch-src-Makefile.lua

@@ -42,7 +42,7 @@
 @@ -271,6 +274,7 @@
  REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
  REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
  REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o

databases/redis-devel/files/extra-patch-src-Makefile.luajit

@@ -42,7 +42,7 @@
 @@ -271,6 +274,7 @@
  REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
  REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
  REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o

databases/redis-devel/files/extra-patch-src-Makefile.luajit-or

@@ -42,7 +42,7 @@
 @@ -271,6 +274,7 @@
  REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
  REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
  REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o

databases/redis6/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	redis6
 PORTVERSION=	6.0.15
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://download.redis.io/releases/
 DISTNAME=	redis-${PORTVERSION}
@@ -62,7 +63,7 @@ USE_GCC=	yes
 CFLAGS+=	-march=i586
 .endif
 
-.if defined(_addflags)
+.if defined(_ADDFLAGS)
 CFLAGS=		-fPIC
 LDFLAGS=	-Wl,-E
 .endif

databases/sqldeveloper/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	sqldeveloper
-DISTVERSION=	20.4.1.407.0006
+DISTVERSION=	21.2.1.204.1703
 DISTVERSIONSUFFIX=	-no-jre
 CATEGORIES=	databases java
 # https://www.oracle.com/tools/downloads/sqldev-downloads.html
@@ -61,7 +61,7 @@ do-install:
 	${ECHO_MSG} " [ DONE ]"
 
 .for d in configuration dataminer dropins equinox \
-    external ide javavm jdbc jdev jlib jviews module modules \
+    external ide javavm jdbc jdev jlib jviews modules \
     netbeans orakafka rdbms sleepycat sqldeveloper sqlj svnkit
 	${ECHO_MSG} -n ">> Installing data directory '${d}'..."
 	cd ${WRKSRC} && ${FIND} ${d} -type d \

databases/sqldeveloper/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1622708099
-SHA256 (oracle/sqldeveloper-20.4.1.407.0006-no-jre.zip) = 941135b2de75ffd27ef277b7e4538de4d8bdc4050dd2a87af05ce31b2bb7d95f
-SIZE (oracle/sqldeveloper-20.4.1.407.0006-no-jre.zip) = 60
+TIMESTAMP = 1630799719
+SHA256 (oracle/sqldeveloper-21.2.1.204.1703-no-jre.zip) = 928692bc6f481f51053fac4458e805d2389a5b3b21c761c59c7f773d3b526995
+SIZE (oracle/sqldeveloper-21.2.1.204.1703-no-jre.zip) = 458220863

databases/sqldeveloper/pkg-plist

@@ -413,8 +413,8 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/jviews/icu4j-55_1.jar
 %%DATADIR%%/jviews/jviews-diagrammer.jar
 %%DATADIR%%/jviews/jviews-framework-lib.jar
-%%DATADIR%%/module/el-api-2.2.1-b04.jar
-%%DATADIR%%/module/javax.el-2.2.5.jar
+%%DATADIR%%/modules/el-api-2.2.1-b04.jar
+%%DATADIR%%/modules/javax.el-2.2.5.jar
 %%DATADIR%%/modules/com.fasterxml.woodstox/woodstox-core.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-core.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-impl.jar
@@ -579,7 +579,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/modules/thirdparty/batik-all-1.11.0.0.1.jar
 %%DATADIR%%/modules/thirdparty/commons-codec-1.13.jar
 %%DATADIR%%/modules/thirdparty/commons-io-2.6.jar
-%%DATADIR%%/modules/thirdparty/commons-logging-1.2.0.0.1.jar
+%%DATADIR%%/modules/thirdparty/commons-logging-1.2.0.0.2.jar
 %%DATADIR%%/modules/thirdparty/features/batik-all.jar
 %%DATADIR%%/modules/thirdparty/features/commons-codec.jar
 %%DATADIR%%/modules/thirdparty/features/commons-io.jar
@@ -597,6 +597,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/modules/thirdparty/httpcore-4.4.12.jar
 %%DATADIR%%/modules/thirdparty/httpmime-4.5.1.jar
 %%DATADIR%%/modules/thirdparty/jakarta-commons-el-1.jar
+%%DATADIR%%/modules/thirdparty/jaxen-1.2.0.jar
 %%DATADIR%%/modules/thirdparty/jsch-0.1.55.jar
 %%DATADIR%%/modules/thirdparty/xml-apis-ext-1.4.01.jar
 %%DATADIR%%/netbeans/fcpbridge/config/Modules/com-oracle-jdeveloper-extcache.xml
@@ -1318,6 +1319,8 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/extensions/oracle.datamodeler/doc/welcome/welcomeImages/welcome_r2_c3_f5.png
 %%DATADIR%%/sqldeveloper/extensions/oracle.datamodeler/lib/awxml.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.datamodeler/lib/fontbox.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.datamodeler/lib/itext-licensekey.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.datamodeler/lib/itextpdf.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.datamodeler/lib/olap_api.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.datamodeler/lib/pdfbox.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.datamodeler/lib/rsyntaxtextarea.jar
@@ -2084,7 +2087,9 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.teradata.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph/lib/rdfgraph_help.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph/lib/sdordf-client.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph/lib/sdordf.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph/lib/sdoutl.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.report.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rest.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.scheduler.jar
@@ -2138,11 +2143,8 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/lib/hk2-api.jar
 %%DATADIR%%/sqldeveloper/lib/hk2-locator.jar
 %%DATADIR%%/sqldeveloper/lib/hk2-utils.jar
-%%DATADIR%%/sqldeveloper/lib/httpclient.jar
-%%DATADIR%%/sqldeveloper/lib/httpcore.jar
-%%DATADIR%%/sqldeveloper/lib/httpmime.jar
-%%DATADIR%%/sqldeveloper/lib/itext-licensekey.jar
-%%DATADIR%%/sqldeveloper/lib/itextpdf.jar
+%%DATADIR%%/sqldeveloper/lib/httpclient5.jar
+%%DATADIR%%/sqldeveloper/lib/httpcore5.jar
 %%DATADIR%%/sqldeveloper/lib/jackson-annotations.jar
 %%DATADIR%%/sqldeveloper/lib/jackson-core.jar
 %%DATADIR%%/sqldeveloper/lib/jackson-jr-objects.jar
@@ -2158,7 +2160,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/lib/jersey-common.jar
 %%DATADIR%%/sqldeveloper/lib/jersey-guava.jar
 %%DATADIR%%/sqldeveloper/lib/jgraphx.jar
-%%DATADIR%%/sqldeveloper/lib/jline.jar
+%%DATADIR%%/sqldeveloper/lib/jline3.jar
 %%DATADIR%%/sqldeveloper/lib/json.jar
 %%DATADIR%%/sqldeveloper/lib/log4j-1.2-api.jar
 %%DATADIR%%/sqldeveloper/lib/log4j-api.jar

devel/Makefile

@@ -7011,6 +7011,7 @@
     SUBDIR += tl-expected
     SUBDIR += tla
     SUBDIR += tllist
+    SUBDIR += tlsh
     SUBDIR += tlx
     SUBDIR += tmake
     SUBDIR += tnt

devel/RStudio/Makefile

@@ -1,10 +1,10 @@
 # This port opens too many files during build, more than the default setting.
-# Its build is known to succeed with MAX_FILES_RStudio=4096 and MAX_FILES_RStudio_server=4096 in poudriere.conf
+# Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf
 
 PORTNAME=	RStudio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.1717
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel math java
 MASTER_SITES=	https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
 		https://s3.amazonaws.com/rstudio-buildtools/:buildtools
@@ -114,7 +114,6 @@ post-patch:
 pre-build:
 	@${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cpp/desktop/global-setenv.h
-	@${ECHO} "Current max open files (ulimit -n) setting is $$(ulimit -n)." # since build is likely to fail when it is lower than 4096
 
 post-install:
 	@(echo "#!/bin/sh"; \
@@ -137,6 +136,12 @@ post-install:
 	# Some functions expect the pandoc symlink.
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc
 	@cd ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc && ${LN} -s ../../../../bin/pandoc
+	# Add $LOCALBASE/bin to PATH to allow RStudio-server to run gmake (R_HOME/etc/Renviron.site is installed, see https://stat.ethz.ch/R-manual/R-devel/library/base/html/Startup.html)
+.if ${FLAVOR:U} == server
+	#@${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/R/etc
+	#@${ECHO} "PATH=\"${LOCALBASE}/bin:\$$PATH\"" > ${STAGEDIR}${LOCALBASE}/lib/R/etc/Renviron.site # it should be this way, but this fails: https://github.com/rstudio/rstudio/issues/9815
+	@${LN} -s ${LOCALBASE}/bin/${GMAKE} ${STAGEDIR}${PREFIX}/lib/rstudio-server/bin/postback/${GMAKE} # hack, should be as above, but at least gmake is in the path now
+.endif
 	# There is a variability in .js file names due to use of random numbers, so we use the automatic plist.
 	@${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | ${GREP} -v ^\/ | ${SED} -e 's|%%WWWDIR%%|www/rstudio| ; s|%%CMAKE_BUILD_TYPE%%|${CMAKE_BUILD_TYPE:tl}|' > ${TMPPLIST}
 

devel/gitleaks/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	gitleaks
 DISTVERSIONPREFIX=	v
-DISTVERSION=	7.5.0
+DISTVERSION=	7.6.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,27 +14,28 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	zricethezav
 GH_TUPLE=	\
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
+		Microsoft:go-winio:v0.4.16:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
+		ProtonMail:go-crypto:04723f9f07d7:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \
+		acomagu:bufpipe:v1.0.3:acomagu_bufpipe/vendor/github.com/acomagu/bufpipe \
 		emirpasic:gods:v1.12.0:emirpasic_gods/vendor/github.com/emirpasic/gods \
 		go-git:gcfg:v1.5.0:go_git_gcfg/vendor/github.com/go-git/gcfg \
-		go-git:go-billy:v5.0.0:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \
+		go-git:go-billy:v5.3.1:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \
 		go-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \
-		go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:78000ba7a073:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:244492dfa37a:golang_net/vendor/golang.org/x/net \
+		golang:crypto:83a5a9bb288b:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:6b1517762897:golang_net/vendor/golang.org/x/net \
 		golang:sync:67f06af15bc9:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:5c8b2ff67527:golang_sys/vendor/golang.org/x/sys \
-		google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
+		golang:sys:71e4cd670f79:golang_sys/vendor/golang.org/x/sys \
 		hako:durafmt:3f39dc1ed9f4:hako_durafmt/vendor/github.com/hako/durafmt \
-		imdario:mergo:v0.3.9:imdario_mergo/vendor/github.com/imdario/mergo \
+		imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \
 		jbenet:go-context:d14ea06fba99:jbenet_go_context/vendor/github.com/jbenet/go-context \
-		jessevdk:go-flags:v1.4.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \
-		kevinburke:ssh_config:01f96b0aa0cd:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \
+		jessevdk:go-flags:v1.5.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \
+		kevinburke:ssh_config:4977a11b4351:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \
 		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		sergi:go-diff:v1.1.0:sergi_go_diff/vendor/github.com/sergi/go-diff \
 		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		xanzy:ssh-agent:v0.2.1:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \
-		zricethezav:go-git:v5.2.2:zricethezav_go_git_v5/vendor/github.com/go-git/go-git/v5
+		xanzy:ssh-agent:v0.3.0:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \
+		zricethezav:go-git:v5.3.0:zricethezav_go_git_v5/vendor/github.com/go-git/go-git/v5
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>

devel/gitleaks/distinfo

@@ -1,38 +1,40 @@
-TIMESTAMP = 1620282075
-SHA256 (zricethezav-gitleaks-v7.5.0_GH0.tar.gz) = 9b06dbec9d1bc220630bb85298158d8a54d4be6f068472a0b3a0cc7a89cdfec7
-SIZE (zricethezav-gitleaks-v7.5.0_GH0.tar.gz) = 146036
+TIMESTAMP = 1630811427
+SHA256 (zricethezav-gitleaks-v7.6.0_GH0.tar.gz) = 922af2a6f3945954aacdf61919508d360685ee6fa165eab5070009ca9dcd523f
+SIZE (zricethezav-gitleaks-v7.6.0_GH0.tar.gz) = 147506
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
+SHA256 (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 0cb82f4cdba942af6b545695d694e91b9d9d56bd38555c81744235d7c6f6485d
+SIZE (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 85568
+SHA256 (ProtonMail-go-crypto-04723f9f07d7_GH0.tar.gz) = 09ca24a9956ebb6a8564ef17ab6b0eab6387938ac608a0c429f75360d3b176f5
+SIZE (ProtonMail-go-crypto-04723f9f07d7_GH0.tar.gz) = 308315
+SHA256 (acomagu-bufpipe-v1.0.3_GH0.tar.gz) = 9d34d4a015aa069649b951c36d4dc50fdbf6a2075717812ba68b9260d5c79986
+SIZE (acomagu-bufpipe-v1.0.3_GH0.tar.gz) = 3020
 SHA256 (emirpasic-gods-v1.12.0_GH0.tar.gz) = 889d06b5f88db9e2dae19a799a35324c4f59305aa5e966dcdb4b637e70607ff9
 SIZE (emirpasic-gods-v1.12.0_GH0.tar.gz) = 76825
 SHA256 (go-git-gcfg-v1.5.0_GH0.tar.gz) = 662e46a93aba5ffe383e55597ce5749447e5c8e9409b1452f5790bfd6e1f8a11
 SIZE (go-git-gcfg-v1.5.0_GH0.tar.gz) = 28522
-SHA256 (go-git-go-billy-v5.0.0_GH0.tar.gz) = a03d8e8d66a82c6175f985dab470efef1af163accdfd1b26598ed726ae02fdba
-SIZE (go-git-go-billy-v5.0.0_GH0.tar.gz) = 27960
+SHA256 (go-git-go-billy-v5.3.1_GH0.tar.gz) = 7d715d7cf11f731dc0466bf93903ba7fe6ac70d086bb862fc24e718d9ddc209e
+SIZE (go-git-go-billy-v5.3.1_GH0.tar.gz) = 29365
 SHA256 (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 4712c4ceae321433d8c1d9ebc6afd154d7932c849129ded48b1c4a51c21275e8
 SIZE (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 3769
-SHA256 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045
-SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732
-SHA256 (golang-crypto-78000ba7a073_GH0.tar.gz) = bb0b23f5a138f10f16dda21aa34784503d86920b922b59554ffa5ef60fdb4c39
-SIZE (golang-crypto-78000ba7a073_GH0.tar.gz) = 1727038
-SHA256 (golang-net-244492dfa37a_GH0.tar.gz) = 511fcc4f88e15cf97dccca6ea4bdde6d240ebd7e1b14212a0447fc4f5b54031c
-SIZE (golang-net-244492dfa37a_GH0.tar.gz) = 1172556
+SHA256 (golang-crypto-83a5a9bb288b_GH0.tar.gz) = c6aa1fc9104536c3335135c9c0bf5a9c2ee3cedc05a937a24cee93aa21a72d80
+SIZE (golang-crypto-83a5a9bb288b_GH0.tar.gz) = 1726653
+SHA256 (golang-net-6b1517762897_GH0.tar.gz) = abba75259e1f26e95c2b0c60c9fee04692e75b113a33d3a09be092fd844671ea
+SIZE (golang-net-6b1517762897_GH0.tar.gz) = 1251211
 SHA256 (golang-sync-67f06af15bc9_GH0.tar.gz) = 1d77987f36d54a2918aa7d62555a3801776c6c182a5f643c9dd01d93064fd5a2
 SIZE (golang-sync-67f06af15bc9_GH0.tar.gz) = 18701
-SHA256 (golang-sys-5c8b2ff67527_GH0.tar.gz) = 9f8cc5b07a664262b956c4f687e6078da265e119a093bb542d3bd132afef2db6
-SIZE (golang-sys-5c8b2ff67527_GH0.tar.gz) = 1040138
-SHA256 (google-go-cmp-v0.4.0_GH0.tar.gz) = 97964b47aa6dc61007f9e1b1ad67812f0a8a2380072a59daebac7bc0cdcf740a
-SIZE (google-go-cmp-v0.4.0_GH0.tar.gz) = 81600
+SHA256 (golang-sys-71e4cd670f79_GH0.tar.gz) = 05ef37b81a3ca9eef4f30ce8f5a2f0207e440aeb850a6de1bf5a72a1d9d12816
+SIZE (golang-sys-71e4cd670f79_GH0.tar.gz) = 1234998
 SHA256 (hako-durafmt-3f39dc1ed9f4_GH0.tar.gz) = eb02533a2ca0f3c1c592ca1f4be1d2146502eb3057e3117f334db091563a9f02
 SIZE (hako-durafmt-3f39dc1ed9f4_GH0.tar.gz) = 6967
-SHA256 (imdario-mergo-v0.3.9_GH0.tar.gz) = 962a8392b47ab758009c94bcb0b7cd7e345026954f893f90f28f2791523206ca
-SIZE (imdario-mergo-v0.3.9_GH0.tar.gz) = 18910
+SHA256 (imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302
+SIZE (imdario-mergo-v0.3.12_GH0.tar.gz) = 22319
 SHA256 (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = b5a5c4fe8d73dea7dc838f1c428c5fff0db9b50a2c014208a2761de4e94fa5ba
 SIZE (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = 5945
-SHA256 (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 3be7e8fb4b63887e8aeb55878244c04b7dcbe5ac77211c73ee35e38ca681e611
-SIZE (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 55452
-SHA256 (kevinburke-ssh_config-01f96b0aa0cd_GH0.tar.gz) = 2f2ed02113fc5e25a278355f69b136fdaf71e4fae535436937f47a37726d4044
-SIZE (kevinburke-ssh_config-01f96b0aa0cd_GH0.tar.gz) = 17351
+SHA256 (jessevdk-go-flags-v1.5.0_GH0.tar.gz) = d4bf30f729cbc16d2aa0095ac10ca4fadc8f092b9a28990c0cfca2345c3e7ffd
+SIZE (jessevdk-go-flags-v1.5.0_GH0.tar.gz) = 59316
+SHA256 (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 568ea6be8d237ca16dcd03e2fa5e07461ab596ccff40197ac34dac43f97389ec
+SIZE (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 17407
 SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87
 SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909
 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
@@ -41,7 +43,7 @@ SHA256 (sergi-go-diff-v1.1.0_GH0.tar.gz) = 3d4362670655e970366d555418f3c8d179c21
 SIZE (sergi-go-diff-v1.1.0_GH0.tar.gz) = 43552
 SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
 SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
-SHA256 (xanzy-ssh-agent-v0.2.1_GH0.tar.gz) = 5947e25161db0d3dd830dc37f3ae7edb259e293a9d46e68e1ec6f0b47097c9d5
-SIZE (xanzy-ssh-agent-v0.2.1_GH0.tar.gz) = 7611
-SHA256 (zricethezav-go-git-v5.2.2_GH0.tar.gz) = 9c2af74ae754a51df9412e8d2c40c00c24c4b919a8aed3605b2e337f9f40eeaa
-SIZE (zricethezav-go-git-v5.2.2_GH0.tar.gz) = 460972
+SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215b809e50f0a80c78b8730c61582858
+SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421
+SHA256 (zricethezav-go-git-v5.3.0_GH0.tar.gz) = 1d9758b94dcad81eb3edd7dc1b1284ed913d8aeee9627de89a83c81fd86c5dc1
+SIZE (zricethezav-go-git-v5.3.0_GH0.tar.gz) = 463779

devel/godot/Makefile

@@ -17,7 +17,8 @@ LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.txt
 BUILD_DEPENDS=	yasm:devel/yasm
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpcre2-8.so:devel/pcre2 \
-		libpng.so:graphics/png
+		libpng.so:graphics/png \
+		libvpx.so:multimedia/libvpx
 RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
 		xdg-open:devel/xdg-utils \
 		xmessage:x11/xmessage
@@ -30,8 +31,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	godotengine
 
 MAKE_ARGS+=		platform=x11 builtin_freetype=False \
-			builtin_libpng=False builtin_pcre2=False \
-			builtin_zlib=False verbose=True
+			builtin_libpng=False builtin_libvpx=False \
+			builtin_pcre2=False builtin_zlib=False verbose=True
 MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
 MAKE_ARGS_clang=	use_llvm=True use_lld=True
 CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
@@ -82,14 +83,6 @@ PLIST_FILES=		bin/${GODOTFILE}
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE=
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != armv6 && ${ARCH} != armv7
-# use system libvpx on archs that break with built-in
-LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
-MAKE_ARGS+=	builtin_libvpx=False
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \
 		${WRKSRC}/methods.py
@@ -122,4 +115,4 @@ do-install-TOOLS-on:
 	${INSTALL_DATA} ${WRKSRC}/icon.svg \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

devel/got/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	got
-PORTVERSION=	0.56
+PORTVERSION=	0.57
 CATEGORIES=	devel
 MASTER_SITES=	https://gameoftrees.org/releases/
 

devel/got/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1630413439
-SHA256 (got-0.56.tar.gz) = 2da4d25b248467f579d9e5620b9654e59111972c46d20ea0eba0212ad6e2047e
-SIZE (got-0.56.tar.gz) = 552459
+TIMESTAMP = 1630671815
+SHA256 (got-0.57.tar.gz) = a91286c7b67d4694826dde8153ff743b8416cff8298868a21d0454268e8eb992
+SIZE (got-0.57.tar.gz) = 552981

devel/hs-hasktags/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	hasktags
-PORTVERSION=	0.71.2
-PORTREVISION=	5
+PORTVERSION=	0.72.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,9 +10,9 @@ LICENSE=	BSD3CLAUSE
 USES=		cabal
 
 USE_CABAL=	ansi-terminal-0.10.3 \
-		ansi-wl-pprint-0.6.9_1 \
+		ansi-wl-pprint-0.6.9_2 \
 		colour-2.3.5 \
-		hashable-1.3.0.0_1 \
+		hashable-1.3.0.0_2 \
 		json-0.10_1 \
 		microlens-0.4.11.2 \
 		microlens-ghc-0.4.12 \
@@ -22,7 +21,7 @@ USE_CABAL=	ansi-terminal-0.10.3 \
 		microlens-th-0.4.3.5 \
 		optparse-applicative-0.15.1.0_1 \
 		primitive-0.7.0.1 \
-		syb-0.7.1 \
+		syb-0.7.1_1 \
 		th-abstraction-0.3.2.0 \
 		transformers-compat-0.6.5 \
 		unordered-containers-0.2.10.0_1 \

devel/hs-hasktags/distinfo

@@ -1,18 +1,18 @@
-TIMESTAMP = 1588322142
-SHA256 (cabal/hasktags-0.71.2.tar.gz) = 2c40fdcb834e8ac1d588daf0e8ace5b58c776cbde2d56892a75106ff324e53e8
-SIZE (cabal/hasktags-0.71.2.tar.gz) = 58919
+TIMESTAMP = 1630745196
+SHA256 (cabal/hasktags-0.72.0.tar.gz) = adadb5800ab2996f0198a6fc6af959dee6d69339c204cc9789f83e67024fe726
+SIZE (cabal/hasktags-0.72.0.tar.gz) = 59000
 SHA256 (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = fa2e2e32dfad29835aa7fd442bbe233e07d97e933223a001fe5efa562535b57c
 SIZE (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = 35863
 SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac
 SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723
-SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/1.cabal) = f6fd6dbd4adcad0432bf75e5f5b19bb1deda00a1d8056faf18090026e577652d
-SIZE (cabal/ansi-wl-pprint-0.6.9/revision/1.cabal) = 2388
+SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/2.cabal) = 20d30674f137d43aa0279c2c2cc5e45a5f1c3c57e301852494906158b6313bf7
+SIZE (cabal/ansi-wl-pprint-0.6.9/revision/2.cabal) = 2388
 SHA256 (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 3b8d471979617dce7c193523743c9782df63433d8e87e3ef6d97922e0da104e7
 SIZE (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 20485
 SHA256 (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4
 SIZE (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 29835
-SHA256 (cabal/hashable-1.3.0.0/revision/1.cabal) = 4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1
-SIZE (cabal/hashable-1.3.0.0/revision/1.cabal) = 5206
+SHA256 (cabal/hashable-1.3.0.0/revision/2.cabal) = d60cad00223d46172020c136e68acef0481a47d0302b2e74b1805b4f3a446a9b
+SIZE (cabal/hashable-1.3.0.0/revision/2.cabal) = 5389
 SHA256 (cabal/json-0.10/json-0.10.tar.gz) = 0c046a3c03c9332816d3c9e50319b1d1eb3c2c1baba1123a7650d047b26856ba
 SIZE (cabal/json-0.10/json-0.10.tar.gz) = 22622
 SHA256 (cabal/json-0.10/revision/1.cabal) = d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799
@@ -35,6 +35,8 @@ SHA256 (cabal/primitive-0.7.0.1/primitive-0.7.0.1.tar.gz) = dd8bb7d829f492d6200f
 SIZE (cabal/primitive-0.7.0.1/primitive-0.7.0.1.tar.gz) = 66023
 SHA256 (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = e04a9c7ae48d9fe25e9b7a064f7122d39c710753544511e15df7a6e87fdfe700
 SIZE (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = 39594
+SHA256 (cabal/syb-0.7.1/revision/1.cabal) = 809b4587757c9358db125577fb7e4e11031b8a26075fabe346912bbe2cfffd65
+SIZE (cabal/syb-0.7.1/revision/1.cabal) = 2544
 SHA256 (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 36fef33ad0f34b9b8fb5552fe6187579a00d5f90d938e9bc24d382a9919feb79
 SIZE (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 35111
 SHA256 (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = da67cf11515da751b32a8ce6e96549f7268f7c435769ad19dc9766b69774620b

devel/hs-hasktags/files/patch-hasktags.cabal

@@ -1,216 +0,0 @@
---- hasktags.cabal.orig	2020-05-01 08:36:35 UTC
-+++ hasktags.cabal
-@@ -1,106 +1,107 @@
--Name: hasktags
--Version: 0.71.2
--Copyright: The University Court of the University of Glasgow
--License: BSD3
--License-File: LICENSE
--Author: The GHC Team
--Maintainer:
-- Jack Henahan <jhenahan@me.com>,
-- Marc Weber <marco-oweber@gmx.de>,
-- Marco Túlio Pimenta Gontijo <marcotmarcot@gmail.com>
--homepage: http://github.com/MarcWeber/hasktags
--bug-reports: http://github.com/MarcWeber/hasktags/issues
--Synopsis: Produces ctags "tags" and etags "TAGS" files for Haskell programs
--Description:
--  Produces ctags "tags" and etags "TAGS" files for Haskell programs.
--Category: Development
--build-type: Simple
--cabal-version: >=1.10
--extra-source-files:
--  README.md,
--  TODO,
--  testcases/HUnitBase.lhs
--  testcases/Repair.lhs
--  testcases/blockcomment.hs
--  testcases/constructor.hs
--  testcases/module.hs
--  testcases/space.hs
--  testcases/substring.hs
--  testcases/tabs.hs
--  testcases/testcase1.hs
--  testcases/testcase2.hs
--  testcases/testcase3.lhs
--  testcases/testcase4.hs
--  testcases/testcase8.hs
--  testcases/twoblockcommentshs.hs
--  testcases/twoblockcommentslhs.lhs
--  testcases/twoblockcommentstogether.hs
--  testcases/typesig.hs
--  testcases/expected_failures_testing_suite.hs
--  testcases/testcase9.hs
--  testcases/testcase10.hs
--  testcases/testcase11.hs
--  testcases/simple.hs
--  testcases/monad-base-control.hs
--  testcases/16-regression.hs
--  testcases/9.hs
--  testcases/9-too.hs
--
--Flag debug
--  Default: False
--  Description: When set to true tokens will be print at various places. This helps understanding why hasktags does not behave the way it should
--
--source-repository head
--  type: git
--  location: http://github.com/MarcWeber/hasktags
--
--library
--  default-language:  Haskell2010
--  hs-source-dirs:    src
--  ghc-options:       -Wall
--  exposed-modules:   Hasktags
--  other-modules:     Tags, DebugShow
--  build-depends:
--    utf8-string,
--    base >= 4 && < 5,
--    bytestring >= 0.9 && < 0.11,
--    directory >= 1.2.6 && < 1.4,
--    filepath,
--    json >= 0.5 && < 0.10,
--    microlens-platform >= 0.3.8.0 && < 0.4
--
--Executable hasktags
--    Main-Is: src/Main.hs
--    Build-Depends:
--      base,
--      directory,
--      filepath,
--      hasktags,
--      optparse-applicative,
--      containers
--    other-modules: Paths_hasktags
--    ghc-options: -Wall
--    default-language: Haskell2010
--
--  if flag(debug)
--    cpp-options: -Ddebug
--
--Test-Suite testsuite
--  Type: exitcode-stdio-1.0
--  Main-Is: Test.hs
--  hs-source-dirs: src, tests
--  Build-Depends:
--                utf8-string,
--                base,
--                bytestring,
--                directory,
--                filepath,
--                json,
--                HUnit,
--                microlens-platform
--  other-modules: Tags, Hasktags, DebugShow
--  ghc-options: -Wall
--  default-language: Haskell2010
--
--  if flag(debug)
--    cpp-options: -Ddebug
-+Name: hasktags
-+Version: 0.71.2
-+x-revision: 2
-+Copyright: The University Court of the University of Glasgow
-+License: BSD3
-+License-File: LICENSE
-+Author: The GHC Team
-+Maintainer:
-+ Jack Henahan <jhenahan@me.com>,
-+ Marc Weber <marco-oweber@gmx.de>,
-+ Marco Túlio Pimenta Gontijo <marcotmarcot@gmail.com>
-+homepage: http://github.com/MarcWeber/hasktags
-+bug-reports: http://github.com/MarcWeber/hasktags/issues
-+Synopsis: Produces ctags "tags" and etags "TAGS" files for Haskell programs
-+Description:
-+  Produces ctags "tags" and etags "TAGS" files for Haskell programs.
-+Category: Development
-+build-type: Simple
-+cabal-version: >=1.10
-+extra-source-files:
-+  README.md,
-+  TODO,
-+  testcases/HUnitBase.lhs
-+  testcases/Repair.lhs
-+  testcases/blockcomment.hs
-+  testcases/constructor.hs
-+  testcases/module.hs
-+  testcases/space.hs
-+  testcases/substring.hs
-+  testcases/tabs.hs
-+  testcases/testcase1.hs
-+  testcases/testcase2.hs
-+  testcases/testcase3.lhs
-+  testcases/testcase4.hs
-+  testcases/testcase8.hs
-+  testcases/twoblockcommentshs.hs
-+  testcases/twoblockcommentslhs.lhs
-+  testcases/twoblockcommentstogether.hs
-+  testcases/typesig.hs
-+  testcases/expected_failures_testing_suite.hs
-+  testcases/testcase9.hs
-+  testcases/testcase10.hs
-+  testcases/testcase11.hs
-+  testcases/simple.hs
-+  testcases/monad-base-control.hs
-+  testcases/16-regression.hs
-+  testcases/9.hs
-+  testcases/9-too.hs
-+
-+Flag debug
-+  Default: False
-+  Description: When set to true tokens will be print at various places. This helps understanding why hasktags does not behave the way it should
-+
-+source-repository head
-+  type: git
-+  location: http://github.com/MarcWeber/hasktags
-+
-+library
-+  default-language:  Haskell2010
-+  hs-source-dirs:    src
-+  ghc-options:       -Wall
-+  exposed-modules:   Hasktags
-+  other-modules:     Tags, DebugShow
-+  build-depends:
-+    utf8-string,
-+    base >= 4 && < 5,
-+    bytestring >= 0.9 && < 0.11,
-+    directory >= 1.2.6 && < 1.4,
-+    filepath,
-+    json >= 0.5 && < 0.11,
-+    microlens-platform >= 0.3.8.0 && < 0.5
-+
-+Executable hasktags
-+    Main-Is: src/Main.hs
-+    Build-Depends:
-+      base,
-+      directory,
-+      filepath,
-+      hasktags,
-+      optparse-applicative,
-+      containers
-+    other-modules: Paths_hasktags
-+    ghc-options: -Wall
-+    default-language: Haskell2010
-+
-+  if flag(debug)
-+    cpp-options: -Ddebug
-+
-+Test-Suite testsuite
-+  Type: exitcode-stdio-1.0
-+  Main-Is: Test.hs
-+  hs-source-dirs: src, tests
-+  Build-Depends:
-+                utf8-string,
-+                base,
-+                bytestring,
-+                directory,
-+                filepath,
-+                json,
-+                HUnit,
-+                microlens-platform
-+  other-modules: Tags, Hasktags, DebugShow
-+  ghc-options: -Wall
-+  default-language: Haskell2010
-+
-+  if flag(debug)
-+    cpp-options: -Ddebug

devel/hs-hlint/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	hlint
-PORTVERSION=	3.3.2
+PORTVERSION=	3.3.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ LICENSE=	BSD3CLAUSE
 
 USES=		cabal
 
-USE_CABAL=	aeson-1.5.6.0_1 \
+USE_CABAL=	aeson-1.5.6.0_2 \
 		alex-3.2.6 \
 		ansi-terminal-0.11 \
 		assoc-1.0.2_1 \

devel/hs-hlint/distinfo

@@ -1,10 +1,10 @@
-TIMESTAMP = 1630256050
-SHA256 (cabal/hlint-3.3.2.tar.gz) = 7d1ea1bdb2d9d7b26bd11bced1d27d2495f0d26de20dd98599d0b9b6472c3a91
-SIZE (cabal/hlint-3.3.2.tar.gz) = 162346
+TIMESTAMP = 1630750563
+SHA256 (cabal/hlint-3.3.4.tar.gz) = 189bab4a78ded3bf0db64878a0775805855aff49796396abbac5d90a81db100c
+SIZE (cabal/hlint-3.3.4.tar.gz) = 162535
 SHA256 (cabal/aeson-1.5.6.0/aeson-1.5.6.0.tar.gz) = 0361c34be3d2ec945201f02501693436fbda10dcc549469481a084b2de22bfe8
 SIZE (cabal/aeson-1.5.6.0/aeson-1.5.6.0.tar.gz) = 286364
-SHA256 (cabal/aeson-1.5.6.0/revision/1.cabal) = d3e76872f8634c9cd33eb128d6c4dd1bf0cc8d71d1f32055d774490d5f6dedf8
-SIZE (cabal/aeson-1.5.6.0/revision/1.cabal) = 6786
+SHA256 (cabal/aeson-1.5.6.0/revision/2.cabal) = 72c170b9fa0a4d1eaf47098902c621d0d95331cda1ebc4d86582bd557756b3ff
+SIZE (cabal/aeson-1.5.6.0/revision/2.cabal) = 6791
 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
 SHA256 (cabal/ansi-terminal-0.11/ansi-terminal-0.11.tar.gz) = c6611b9e51add41db3f79eac30066c06b33a6ca2a09e586b4b361d7f98303793

devel/hs-profiteur/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	profiteur
-PORTVERSION=	0.4.5.1
-PORTREVISION=	5
+PORTVERSION=	0.4.6.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,24 +9,24 @@ LICENSE=	BSD3CLAUSE
 
 USES=		cabal
 
-USE_CABAL=	aeson-1.4.7.1_1 \
-		attoparsec-0.13.2.4 \
+USE_CABAL=	aeson-1.4.7.1_2 \
+		attoparsec-0.13.2.4_1 \
 		base-compat-0.11.1 \
 		base-compat-batteries-0.11.1 \
 		base-orphans-0.8.2 \
 		dlist-0.8.0.8 \
 		ghc-prof-1.4.1.7 \
-		hashable-1.3.0.0_1 \
+		hashable-1.3.0.0_2 \
 		integer-logarithms-1.0.3_2 \
 		js-jquery-3.3.1 \
 		primitive-0.7.0.1 \
 		random-1.1_1 \
 		scientific-0.3.6.2 \
-		tagged-0.8.6_2 \
+		tagged-0.8.6_3 \
 		th-abstraction-0.3.2.0 \
 		time-compat-1.9.3 \
 		unordered-containers-0.2.10.0_1 \
-		uuid-types-1.0.3_2 \
+		uuid-types-1.0.3_4 \
 		vector-0.12.1.2
 
 profiteur_DATADIR_VARS=		js-jquery

devel/hs-profiteur/distinfo

@@ -1,12 +1,14 @@
-TIMESTAMP = 1590225303
-SHA256 (cabal/profiteur-0.4.5.1.tar.gz) = 00754cf597ea69b05f5f0928aee27c6d04c2f0c7bc031cdfcc82ec91a8720257
-SIZE (cabal/profiteur-0.4.5.1.tar.gz) = 12275
+TIMESTAMP = 1630701187
+SHA256 (cabal/profiteur-0.4.6.0.tar.gz) = 1dbb0bf567b2bf2cb3a2a21a66898781c7768f12dc32d9b102a7570fc9e8794a
+SIZE (cabal/profiteur-0.4.6.0.tar.gz) = 12401
 SHA256 (cabal/aeson-1.4.7.1/aeson-1.4.7.1.tar.gz) = 07e746655fd9bec81c59927c5617877ff4fcd81d0df45c5fb8ef154fb8f40294
 SIZE (cabal/aeson-1.4.7.1/aeson-1.4.7.1.tar.gz) = 277911
-SHA256 (cabal/aeson-1.4.7.1/revision/1.cabal) = 6d8d2fd959b7122a1df9389cf4eca30420a053d67289f92cdc0dbc0dab3530ba
-SIZE (cabal/aeson-1.4.7.1/revision/1.cabal) = 7098
+SHA256 (cabal/aeson-1.4.7.1/revision/2.cabal) = 6199a98b072e5a7748e81ab72476a0992cf23d925ebe4fefd5b917cbda9c2af8
+SIZE (cabal/aeson-1.4.7.1/revision/2.cabal) = 7098
 SHA256 (cabal/attoparsec-0.13.2.4/attoparsec-0.13.2.4.tar.gz) = ba66cd6de1749ec92568db1b9c905b43a849f0ad918d45d7b594407a02ebefb2
 SIZE (cabal/attoparsec-0.13.2.4/attoparsec-0.13.2.4.tar.gz) = 163431
+SHA256 (cabal/attoparsec-0.13.2.4/revision/1.cabal) = 5941a05141a61239e8d6c4f2c9876bec3765d786766721b8474b8625febf914a
+SIZE (cabal/attoparsec-0.13.2.4/revision/1.cabal) = 5796
 SHA256 (cabal/base-compat-0.11.1/base-compat-0.11.1.tar.gz) = 356f1542ec93e7192a9073d32a8ef1e48194275495dcec7fb0d241f4baaf6d36
 SIZE (cabal/base-compat-0.11.1/base-compat-0.11.1.tar.gz) = 33691
 SHA256 (cabal/base-compat-batteries-0.11.1/base-compat-batteries-0.11.1.tar.gz) = caf66fed3c0a3b0437692cad18c93a7074e8524a86b8be1ce04d0a18cbf6aed8
@@ -19,8 +21,8 @@ SHA256 (cabal/ghc-prof-1.4.1.7/ghc-prof-1.4.1.7.tar.gz) = df61b65924f23f0421b9e4
 SIZE (cabal/ghc-prof-1.4.1.7/ghc-prof-1.4.1.7.tar.gz) = 11074
 SHA256 (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4
 SIZE (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 29835
-SHA256 (cabal/hashable-1.3.0.0/revision/1.cabal) = 4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1
-SIZE (cabal/hashable-1.3.0.0/revision/1.cabal) = 5206
+SHA256 (cabal/hashable-1.3.0.0/revision/2.cabal) = d60cad00223d46172020c136e68acef0481a47d0302b2e74b1805b4f3a446a9b
+SIZE (cabal/hashable-1.3.0.0/revision/2.cabal) = 5389
 SHA256 (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 5ae262018698af35bb74916fad170d96d3eb44669c72ed36db9a19a3392cec16
 SIZE (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 8840
 SHA256 (cabal/integer-logarithms-1.0.3/revision/2.cabal) = 63d42595ec92b71ac98a07b984b0a2eb3d4956f4ad2d856c3bf6fc3dc218d228
@@ -37,8 +39,8 @@ SHA256 (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 278d0afc87450254f8
 SIZE (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 23510
 SHA256 (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = ad16def0884cf6f05ae1ae8e90192cf9d8d9673fa264b249499bd9e4fac791dd
 SIZE (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = 11759
-SHA256 (cabal/tagged-0.8.6/revision/2.cabal) = 1f7ca84e6c88cbb923641c60041c9f56c34f1a889759cc073cdf10542b441ff9
-SIZE (cabal/tagged-0.8.6/revision/2.cabal) = 2606
+SHA256 (cabal/tagged-0.8.6/revision/3.cabal) = 7cce0b9355d1daad797555dfa906f756ed0253a40bc826ca367adf21d7b369f3
+SIZE (cabal/tagged-0.8.6/revision/3.cabal) = 2606
 SHA256 (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 36fef33ad0f34b9b8fb5552fe6187579a00d5f90d938e9bc24d382a9919feb79
 SIZE (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 35111
 SHA256 (cabal/time-compat-1.9.3/time-compat-1.9.3.tar.gz) = bb6a44e667945ddca8ded93e041ee91986a4a19f59e149a5dd21fdb1bfa3db88
@@ -49,7 +51,7 @@ SHA256 (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5e9b095a9283d9e2
 SIZE (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5199
 SHA256 (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 9276517ab24a9b06f39d6e3c33c6c2b4ace1fc2126dbc1cd9806866a6551b3fd
 SIZE (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 11999
-SHA256 (cabal/uuid-types-1.0.3/revision/2.cabal) = 2cab161f274309cfd9ef62694a6bd1b47525bc4c79a827293b055e4a9eadb4d2
-SIZE (cabal/uuid-types-1.0.3/revision/2.cabal) = 2473
+SHA256 (cabal/uuid-types-1.0.3/revision/4.cabal) = 963505cf2eeadb4f1c14336cda8ee8a0e658386450caa6eef34100e44b73fc46
+SIZE (cabal/uuid-types-1.0.3/revision/4.cabal) = 2462
 SHA256 (cabal/vector-0.12.1.2/vector-0.12.1.2.tar.gz) = 3b6e27683f6f20b37b8a35d0fab9e34b57dad72ac64cb16f428726780d4011bd
 SIZE (cabal/vector-0.12.1.2/vector-0.12.1.2.tar.gz) = 131049

devel/libvirt/Makefile

@@ -1,7 +1,7 @@
 # Created by: Jason Helfman <jgh@FreeBSD.org>
 
 PORTNAME=	libvirt
-PORTVERSION=	7.6.0
+PORTVERSION=	7.7.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -106,7 +106,7 @@ USE_PERL5=	build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
-SHLIB_VER=	0.7006.0
+SHLIB_VER=	0.7007.0
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 PORTDOCS=	*
 SHEBANG_FILES=	src/keycodemapdb/tools/keymap-gen

devel/libvirt/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1627965322
-SHA256 (libvirt-7.6.0.tar.xz) = 8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
-SIZE (libvirt-7.6.0.tar.xz) = 8661024
+TIMESTAMP = 1630649156
+SHA256 (libvirt-7.7.0.tar.xz) = 1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2
+SIZE (libvirt-7.7.0.tar.xz) = 8670212

devel/omake/Makefile

@@ -1,11 +1,9 @@
 # Created by: Stanislav Sedov <ssedov@mbsd.msk.ru>
 
 PORTNAME=	omake
-DISTVERSION=	0.9.8.6-0.rc1
-PORTREVISION=	4
+PORTVERSION=	0.10.3
 CATEGORIES=	devel
-MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/omake-0.9.8.6-0.rc1.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/ \
-		http://download.camlcity.org/download/
+MASTER_SITES=	http://download.camlcity.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flexible build system
@@ -13,10 +11,10 @@ COMMENT=	Flexible build system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C|-.*||}
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=yes
 USES=		ncurses readline
+HAS_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_ROOT=${STAGEDIR}
 MAKE_JOBS_UNSAFE=	yes
 
@@ -24,30 +22,6 @@ INFO=		omake-doc
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-#
-# Dirty hack for PREFIX safety
-#
-	@${REINPLACE_CMD} -E -e \
-		's|(getenv[[:space:]]+)LIBDIR|\1PREFLIBDIR|' ${WRKSRC}/mk/defaults
-
-#
-# Permissions safety
-#
-.for f in OMakefile doc/OMakefile src/main/OMakefile
-	@${REINPLACE_CMD} -e \
-		's|cp -f -m 444|$$(BSD_INSTALL_DATA)| ; \
-		 s|cp -f -m 555|$$(BSD_INSTALL_PROGRAM)|' ${WRKSRC}/${f}
-.endfor
-	@${REINPLACE_CMD} -e 's| -j2 | |' ${WRKSRC}/Makefile
-.if ${NCURSESBASE} == "/usr"
-.for f in lib/configure/ncurses.om src/libmojave-external/cutil/lm_terminfo.c
-	@${REINPLACE_CMD} -E -e 's|ncurses/(term\.h)|\1|' ${WRKSRC}/${f}
-.endfor
-.endif
-
 do-test:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_ARGS} boot/omake check
 	@${FIND} -ds ${WRKSRC}/test -type f -name 'result.log' -print0 | \
@@ -66,4 +40,4 @@ post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

devel/omake/distinfo

@@ -1,2 +1,3 @@
-SHA256 (omake-0.9.8.6-0.rc1.tar.gz) = 23c498f071723621dd5e1e29c1abefd6937c73c67bb85d223fd514b9ae005ae9
-SIZE (omake-0.9.8.6-0.rc1.tar.gz) = 3254283
+TIMESTAMP = 1509812770
+SHA256 (omake-0.10.3.tar.gz) = ff3107e9459615ea6526309c533b04815eef60692a20dcd3a6169f5860786d1d
+SIZE (omake-0.10.3.tar.gz) = 2438877

devel/omake/files/patch-OMakefile

@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- OMakefile.orig	2010-10-27 00:42:37 UTC
-+++ OMakefile
-@@ -57,7 +57,7 @@ if $(not $(defined CAMLLIB))
- #
- # OCaml options
- #
--OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z)
-+OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z-9-29)
- if $(THREADS_ENABLED)
-     OCAMLFLAGS += -thread
-     export

devel/omake/files/patch-lib_build_OCaml.om

@@ -1,19 +0,0 @@
-$NetBSD: patch-lib_build_OCaml.om,v 1.1 2012/11/23 22:55:22 marino Exp $
-
-Omake will break in over a dozen places on gcc 4.7.x if warnings are
-treated as errors.  All valid but unreferenced functions and constants
-are warned about in gcc 4.7, and the alternative to removing the
-warn-error flag is to remove all these unreferenced functions and
-constants via patches.
-
---- lib/build/OCaml.om.orig	2008-03-05 01:07:25 UTC
-+++ lib/build/OCaml.om
-@@ -176,7 +176,7 @@ public.PREFIXED_OCAMLPACKS =\
- #
- declare OCAMLDEPFLAGS
- public.OCAMLPPFLAGS  =
--public.OCAMLFLAGS    = -warn-error A
-+public.OCAMLFLAGS    =
- public.OCAMLCFLAGS   = -g
- public.OCAMLOPTFLAGS =
- public.OCAMLCPPFLAGS =

devel/omake/files/patch-src_build_omake_rule.ml

@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/build/omake_rule.ml.orig	2010-10-07 19:59:08 UTC
-+++ src/build/omake_rule.ml
-@@ -768,7 +768,7 @@ let lazy_command venv pos command =
-          let fv = free_vars_exp_list el in
-             CommandSection (eval_string_exp venv pos s, fv, el)
-     | ShellExp (loc, s) ->
--         CommandValue (loc, ValStringExp (venv_get_env venv, s))
-+         CommandValue (loc, venv_get_env venv, s)
-     | _ ->
-          let fv = free_vars_exp command in
-             CommandSection (ValData "eval", fv, [command])
-@@ -1121,7 +1121,8 @@ and eval_rule venv loc target sources sl
-             let commands = ([], CommandEval e) :: commands in
-             let fv = free_vars_union fv fv' in
-                commands, fv
--       | CommandValue (loc, v) ->
-+       | CommandValue (loc, env, s) ->
-+            let v = ValStringExp (env, s) in
-             let commands =
-                try
-                   let flags, pipe = pipe_of_value venv find_alias options pos loc v in

devel/omake/files/patch-src_builtin_omake__builtin__target.ml

@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/builtin/omake_builtin_target.ml.orig	2008-01-15 19:57:00 UTC
-+++ src/builtin/omake_builtin_target.ml
-@@ -221,8 +221,8 @@ let split_command venv (values1, lines1)
-                match line with
-                   CommandSection (_, _, e) ->
-                      ValBody (e, ExportNone)
--                | CommandValue (_, v) ->
--                     v
-+                | CommandValue (_, exp, v) ->
-+                     ValStringExp(exp,v)
-             in
-                v :: lines) lines1 lines2
-    in

devel/omake/files/patch-src_clib_omake__shell__sys.c

@@ -1,177 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/clib/omake_shell_sys.c.orig	2007-12-01 21:32:13 UTC
-+++ src/clib/omake_shell_sys.c
-@@ -551,7 +551,7 @@ value omake_shell_sys_suspend(value v_pg
-     fflush(stderr);
- #endif
-     if(process_group_map(suspend_process, Int_val(v_pgrp)) < 0)
--        failwith("omake_shell_sys_suspend");
-+        caml_failwith("omake_shell_sys_suspend");
-     CAMLreturn(Val_unit);
- }
- 
-@@ -563,7 +563,7 @@ value omake_shell_sys_resume(value v_pgr
-     fflush(stderr);
- #endif
-     if(process_group_map(resume_process, Int_val(v_pgrp)) < 0)
--        failwith("omake_shell_sys_resume");
-+        caml_failwith("omake_shell_sys_resume");
-     CAMLreturn(Val_unit);
- }
- 
-@@ -575,7 +575,7 @@ value omake_shell_sys_kill(value v_pgrp)
-     fflush(stderr);
- #endif
-     if(process_group_map(kill_process, Int_val(v_pgrp)) < 0)
--        failwith("omake_shell_sys_kill");
-+        caml_failwith("omake_shell_sys_kill");
-     CAMLreturn(Val_unit);
- }
- 
-@@ -600,14 +600,14 @@ value omake_shell_sys_create_thread_pid(
-     /* Allocate the process data */
-     processp = (Process *) malloc(sizeof(Process));
-     if(processp == 0)
--        failwith("omake_shell_sys_create_thread_pid: out of memory");
-+        caml_failwith("omake_shell_sys_create_thread_pid: out of memory");
-     memset(processp, 0, sizeof(Process));
- 
-     /* Create an event for waiting on the thread */
-     event = CreateEvent(NULL, FALSE, FALSE, NULL);
-     if(event == NULL) {
-         free(processp);
--        failwith("omake_shell_sys_create_thread_pid: can't create event");
-+        caml_failwith("omake_shell_sys_create_thread_pid: can't create event");
-     }
- 
-     pgrp = Int_val(v_pgrp);
-@@ -645,7 +645,7 @@ value omake_shell_sys_init_thread_pid(va
-             break;
-     }
-     if(processp == 0)
--        raise_not_found();
-+        caml_raise_not_found();
- 
-     /* Process has terminated */
-     processp->thread = GetCurrentThreadId();
-@@ -679,7 +679,7 @@ value omake_shell_sys_release_thread_pid
-             break;
-     }
-     if(processp == 0)
--        raise_not_found();
-+        caml_raise_not_found();
- 
-     /* Process has terminated */
-     processp->changed = 1;
-@@ -771,7 +771,7 @@ value omake_shell_sys_wait(value v_pgrp,
-             goto done;
-         else {
-             if(ncount == MAXIMUM_WAIT_OBJECTS)
--                invalid_argument("omake_shell_sys_wait: too many processes");
-+                caml_invalid_argument("omake_shell_sys_wait: too many processes");
-             processes[ncount] = processp->pid;
-             handles[ncount] = processp->handle;
-             ncount++;
-@@ -787,11 +787,11 @@ value omake_shell_sys_wait(value v_pgrp,
-     /* Wait for an event */
-     while(1) {
-         /* Perform the wait */
--        enter_blocking_section();
-+        caml_enter_blocking_section();
-         index = WaitForMultipleObjects(ncount, handles, FALSE, timeout);
-         if(index == WAIT_FAILED)
-             code = GetLastError();
--        leave_blocking_section();
-+        caml_leave_blocking_section();
- 
-         /* See if something has changed */
-         if(index == WAIT_OBJECT_0) {
-@@ -810,7 +810,7 @@ value omake_shell_sys_wait(value v_pgrp,
-     else if(index >= WAIT_ABANDONED_0 + 1 && index < WAIT_ABANDONED_0 + ncount)
-         index -= WAIT_ABANDONED_0;
-     else
--        raise_not_found();
-+        caml_raise_not_found();
- 
-     /* Adjust process */
-     pid = processes[index];
-@@ -863,7 +863,7 @@ value omake_shell_sys_wait(value v_pgrp,
-         break;
-     case STATUS_RUNNING:
-     default:
--        invalid_argument("wait_process: process is running");
-+        caml_invalid_argument("wait_process: process is running");
-         break;
-     }
- 
-@@ -908,7 +908,7 @@ value omake_shell_sys_create_process(val
-         strp = String_val(Field(v_envp, i));
-         length = strlen(strp);
-         if(index + length + 2 > SIZEOF_ENVIRONMENT)
--            failwith("omake_shell_sys_create_process: environment is too big");
-+            caml_failwith("omake_shell_sys_create_process: environment is too big");
-         strcpy(env + index, strp);
-         index += length + 1;
-     }
-@@ -919,7 +919,7 @@ value omake_shell_sys_create_process(val
-     v_argvp = Field(v_info, CREATE_PROCESS_ARGV);
-     count = Wosize_val(v_argvp);
-     if(count == 0)
--        invalid_argument("omake_shell_sys_create_process: command line is empty");
-+        caml_invalid_argument("omake_shell_sys_create_process: command line is empty");
-     index = 0;
-     for(i = 0; i != count; i++) {
-         /* Win32 doesn't deal well when the command name differs from the executable */
-@@ -930,7 +930,7 @@ value omake_shell_sys_create_process(val
-         length = strlen(argp);
-         white = string_escape_length(argp);
-         if(index + length + white + 4 >= SIZEOF_COMMAND)
--            failwith("omake_shell_sys_create_process: command line is too long");
-+            caml_failwith("omake_shell_sys_create_process: command line is too long");
-         if(index)
-             argv[index++] = ' ';
-         if(white)
-@@ -1019,13 +1019,13 @@ value omake_shell_sys_create_process(val
-         if ((bufLen < 1) || (bufLen > 1024)) {
-             if (lpMsgBuf != NULL) 
-                 LocalFree( lpMsgBuf );
--            failwith("omake_shell_sys_create_process: process creation failed");
-+            caml_failwith("omake_shell_sys_create_process: process creation failed");
-         } else {
-             char err[2048];
-             sprintf(err, "omake_shell_sys_create_process: process creation failed: %s", (char *)lpMsgBuf);
-             if (lpMsgBuf != NULL) 
-                 LocalFree( lpMsgBuf );
--            failwith(err);
-+            caml_failwith(err);
-         }
-     }
-     CloseHandle(process.hThread);
-@@ -1034,7 +1034,7 @@ value omake_shell_sys_create_process(val
-     processp = (Process *) malloc(sizeof(Process));
-     if(processp == 0) {
-         CloseHandle(process.hProcess);
--        failwith("omake_shell_sys_create_process: out of memory");
-+        caml_failwith("omake_shell_sys_create_process: out of memory");
-     }
-     memset(processp, 0, sizeof(Process));
-     processp->pid = pid;
-@@ -1129,13 +1129,13 @@ value omake_shell_sys_init(value v_unit)
-     /* Allocate a struct for the current process */
-     processp = (Process *) malloc(sizeof(Process));
-     if(processp == 0)
--        failwith("Omake_shell_csys.create_state: out of memory");
-+        caml_failwith("Omake_shell_csys.create_state: out of memory");
-     memset(processp, 0, sizeof(Process));
- 
-     /* Allocate the state */
-     state = (ShellState *) malloc(sizeof(ShellState));
-     if(state == 0)
--        failwith("Omake_shell_csys.create_state: out of memory");
-+        caml_failwith("Omake_shell_csys.create_state: out of memory");
-     memset(state, 0, sizeof(ShellState));
-     state->pid_counter = INIT_PID;
-     state->changed = CreateEvent(NULL, FALSE, FALSE, NULL);

devel/omake/files/patch-src_clib_readline.c

@@ -1,127 +0,0 @@
-$NetBSD: patch-af,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/clib/readline.c.orig	2007-05-15 19:03:03 UTC
-+++ src/clib/readline.c
-@@ -134,7 +134,7 @@ static char **readline_completion(char *
-         CAMLreturnT(char **, 0);
- 
-     /* The callback returns an array of strings */
--    request = copy_string(text);
-+    request = caml_copy_string(text);
-     response = caml_callback(*callbackp, request);
-     
-     /* Copy the array of strings */
-@@ -726,9 +726,9 @@ static ProcessCode processor(ReadLine *r
- 
-     /* Input loop */
-     while(1) {
--        enter_blocking_section();
-+        caml_enter_blocking_section();
-         status = ReadConsoleInput(readp->console_in, input, INPUT_COUNT, &count);
--        leave_blocking_section();
-+        caml_leave_blocking_section();
-         if(status == 0) {
-             print_error("ReadConsoleInput");
-             return CODE_EOF;
-@@ -766,11 +766,11 @@ static void readline_cooked(ReadLine *re
- {
-     char *s;
- 
--    enter_blocking_section();
-+    caml_enter_blocking_section();
-     s = fgets(readp->current.buffer, LINE_MAX, stdin);
--    leave_blocking_section();
-+    caml_leave_blocking_section();
-     if(s == 0)
--        raise_end_of_file();
-+        caml_raise_end_of_file();
-     readp->current.length = strlen(readp->current.buffer);
- }
- 
-@@ -1053,7 +1053,7 @@ value omake_readline(value v_prompt)
- 
-     /* Copy it to a string */
-     linep = &readp->current;
--    v_str = alloc_string(linep->length);
-+    v_str = caml_alloc_string(linep->length);
-     memcpy(String_val(v_str), linep->buffer, linep->length);
- 
-     /* Reset the current buffer */
-@@ -1105,7 +1105,7 @@ value omake_readline_init(value v_unit)
-     c_stdin = GetStdHandle(STD_INPUT_HANDLE);
-     c_stdout = GetStdHandle(STD_OUTPUT_HANDLE);
-     if(c_stdin == INVALID_HANDLE_VALUE || c_stdout == INVALID_HANDLE_VALUE)
--        failwith("omake_readline_init: no standard channels");
-+        caml_failwith("omake_readline_init: no standard channels");
- 
-     /* Check if it is a console */
-     is_console = 1;
-@@ -1179,18 +1179,18 @@ static ReadLine *AllocReadLine(int is_co
-     /* Allocate */
-     readp = (ReadLine *) malloc(sizeof(ReadLine));
-     if(readp == NULL)
--        failwith("AllocReadLine: out of memory");
-+        caml_failwith("AllocReadLine: out of memory");
-     memset(readp, 0, sizeof(ReadLine));
- 
-     /* Initialize */
-     readp->buffer = malloc(LINE_MAX);
-     if (readp->buffer == NULL)
--        failwith("AllocReadLine: out of memory");
-+        caml_failwith("AllocReadLine: out of memory");
-     readp->buffer_size = LINE_MAX;
- 
-     readp->prompt = malloc(MAX_PROMPT_LENGTH);
-     if (readp->prompt == NULL)
--        failwith("AllocReadLine: out of memory");
-+        caml_failwith("AllocReadLine: out of memory");
-     readp->prompt_size = MAX_PROMPT_LENGTH;
- 
-     readp->console_in = console_in;
-@@ -1262,7 +1262,7 @@ static void readline_raw(ReadLine *readp
-         if(length >= readp->buffer_size) {
-             char *new_buffer = malloc(length + 1);
-             if(new_buffer == NULL)
--                failwith("readline_raw: out of memory");
-+                caml_failwith("readline_raw: out of memory");
-             free(readp->buffer);
-             readp->buffer = new_buffer;
-             readp->buffer_size = length + 1;
-@@ -1307,7 +1307,7 @@ static void do_readline(ReadLine *readp,
-             readp->prompt = malloc(new_size);
-             if (readp->prompt == NULL) {
-                 readp->prompt = old_prompt;
--                failwith("do_readline: out of memory");
-+                caml_failwith("do_readline: out of memory");
-             } else {
-                 memcpy(readp->prompt, old_prompt, i);
-                 free(old_prompt);
-@@ -1545,7 +1545,7 @@ value omake_readline(value v_prompt)
-     do_readline(readp, String_val(v_prompt));
- 
-     /* Copy it to the buffer */
--    v_str = alloc_string(readp->length);
-+    v_str = caml_alloc_string(readp->length);
-     memcpy(String_val(v_str), readp->buffer, readp->length);
- 
-     /* Reset the current buffer */
-@@ -1609,7 +1609,7 @@ value omake_rl_prompt_wrappers(value v_u
-         CAMLlocal2(s1, s2);
-         s1 = caml_copy_string(begin);
-         s2 = caml_copy_string(end);
--        buf = alloc_tuple(2);
-+        buf = caml_alloc_tuple(2);
-         Field(buf, 0) = s1;
-         Field(buf, 1) = s2;
-     }
-@@ -1617,7 +1617,7 @@ value omake_rl_prompt_wrappers(value v_u
-     {
-         CAMLlocal1(emptystr);
-         emptystr = caml_copy_string("");
--        buf = alloc_tuple(2);
-+        buf = caml_alloc_tuple(2);
-         Field(buf, 0) = emptystr;
-         Field(buf, 1) = emptystr;
-     }

devel/omake/files/patch-src_env_omake__env.ml

@@ -1,45 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/env/omake_env.ml.orig	2008-01-15 19:57:00 UTC
-+++ src/env/omake_env.ml
-@@ -404,8 +404,8 @@ let rec pp_print_command buf command =
-    match command with
-       CommandSection (arg, fv, e) ->
-          fprintf buf "@[<hv 3>section %a@ %a@]" pp_print_value arg pp_print_exp_list e
--    | CommandValue (_, v) ->
--         pp_print_value buf v
-+    | CommandValue (_, _, v) ->
-+         pp_print_string_exp buf v
- 
- and pp_print_commands buf commands =
-    List.iter (fun command -> fprintf buf "@ %a" pp_print_command command) commands
-@@ -1928,6 +1928,14 @@ let venv_save_explicit_rules venv loc er
- let venv_add_wild_match venv v =
-    venv_add_var venv wild_var v
- 
-+let command_add_wild venv wild command =
-+   match command with
-+      CommandSection _ ->
-+         command
-+    | CommandValue(loc, env, s) ->
-+         let env = venv_get_env (venv_add_wild_match (venv_with_env venv env) wild) in
-+            CommandValue(loc, env, s)
-+
- (*
-  * This is the standard way to add results of a pattern match.
-  *)
-@@ -2699,8 +2707,10 @@ let venv_find_implicit_rules_inner venv 
-                         let scanner_args = List.map (subst_source venv target_dir subst) irule.irule_scanners in
-                         let scanners = node_set_of_list scanner_args in
-                         let core = wild_core subst in
--                        let venv = venv_add_wild_match venv (ValData core) in
--                        let commands = make_command_info venv source_args irule.irule_values irule.irule_body in
-+                        let core_val = ValData core in
-+                        let venv = venv_add_wild_match venv core_val in
-+                        let commands = List.map (command_add_wild venv core_val) irule.irule_body in
-+                        let commands = make_command_info venv source_args irule.irule_values commands in
-                         let effects =
-                            List.fold_left (fun effects pattern ->
-                                  let effect = wild_subst_in subst pattern in

devel/omake/files/patch-src_ir_omake__value__type.ml

@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/ir/omake_value_type.ml.orig	2010-10-07 19:59:08 UTC
-+++ src/ir/omake_value_type.ml
-@@ -162,7 +162,7 @@ type path =
-  *)
- type command =
-    CommandSection of value * free_vars * exp list   (* Name of the section, its free variables, and the expression *)
-- | CommandValue of loc * value
-+ | CommandValue of loc * env * string_exp
- 
- (*
-  * Kinds of rules.

devel/omake/files/patch-src_libmojave-external_cutil_fam__pseudo.h

@@ -1,15 +0,0 @@
-$NetBSD: patch-src_libmojave-external_cutil_fam__pseudo.h,v 1.1 2012/11/16 00:46:04 joerg Exp $
-
---- src/libmojave-external/cutil/fam_pseudo.h.orig	2006-07-15 17:23:37 UTC
-+++ src/libmojave-external/cutil/fam_pseudo.h
-@@ -43,7 +43,10 @@
- /*
-  * Maximum file name length.
-  */
-+#include <limits.h>
-+#ifndef NAME_MAX
- #define NAME_MAX                1024
-+#endif
- 
- /*
-  * Possible events.

devel/omake/files/patch-src_libmojave-external_cutil_lm__channel.c

@@ -1,24 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/cutil/lm_channel.c.orig	2006-07-15 17:23:37 UTC
-+++ src/libmojave-external/cutil/lm_channel.c
-@@ -57,7 +57,7 @@ value omake_shell_peek_pipe(value v_fd)
-                            &total,              // Total number of bytes available
-                            NULL);               // Number of bytes in the next message
-     if(status == 0)
--        failwith("Not a pipe");
-+        caml_failwith("Not a pipe");
-     return total ? Val_int(1) : Val_int(0);
- }
- 
-@@ -83,7 +83,7 @@ value omake_shell_pipe_kind(value v_fd)
- 
- value omake_shell_peek_pipe(value v_fd)
- {
--    failwith("omake_shell_peek_pipe: not available on Unix systems");
-+    caml_failwith("omake_shell_peek_pipe: not available on Unix systems");
-     return Val_unit;
- }
- 

devel/omake/files/patch-src_libmojave-external_cutil_lm__ctype.c

@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/cutil/lm_ctype.c.orig	2006-12-01 21:13:14 UTC
-+++ src/libmojave-external/cutil/lm_ctype.c
-@@ -59,7 +59,7 @@ static value get_chars(int (*f)(int))
-         if(f(i))
-             *p++ = (char) i;
-     }
--    s = alloc_string(p - buf);
-+    s = caml_alloc_string(p - buf);
-     memcpy(String_val(s), buf, p - buf);
-     return s;
- }

devel/omake/files/patch-src_libmojave-external_cutil_lm__notify.c

@@ -1,90 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/cutil/lm_notify.c.orig	2007-07-27 17:58:13 UTC
-+++ src/libmojave-external/cutil/lm_notify.c
-@@ -74,13 +74,13 @@ typedef struct {
- 
- #define CheckCode(fmt, expr)                 \
-   do {                                       \
--     enter_blocking_section();               \
-+     caml_enter_blocking_section();               \
-      code = expr;                            \
--     leave_blocking_section();               \
-+     caml_leave_blocking_section();               \
-      if(code < 0) {                          \
-          char buffer[256];                   \
-          ErrFmt(buffer, fmt);                \
--         failwith(buffer);                   \
-+         caml_failwith(buffer);                   \
-      }                                       \
-   } while(0)
- 
-@@ -145,11 +145,11 @@ value om_notify_open(value v_unit)
-     FAMInfo *info;
-     int code;
- 
--    v = alloc_custom(&fam_connection_ops, sizeof(FAMInfo), 0, 1);
-+    v = caml_alloc_custom(&fam_connection_ops, sizeof(FAMInfo), 0, 1);
-     info = FAMInfo_val(v);
-     fc = malloc(sizeof(FAMConnection));
-     if(fc == 0)
--        invalid_argument("om_notify_open: out of memory");
-+        caml_invalid_argument("om_notify_open: out of memory");
-     info->fc = fc;
-     CheckCode("om_notify_open", FAMOpen(fc));
- #ifdef HAVE_FAMNOEXISTS
-@@ -180,7 +180,7 @@ value om_notify_fd(value v_fc)
-     fc = FAMConnection_val(v_fc);
-     return Val_int(fc->id);
- #else /* FAM_PSEUDO && !FAM_INOTIFY */
--    failwith("No file descriptors in pseudo-FAM");
-+    caml_failwith("No file descriptors in pseudo-FAM");
-     return Val_unit;
- #endif /* FAM_INOTIFY */
- #else /* FAM_PSEUDO */
-@@ -209,7 +209,7 @@ value om_notify_monitor_directory(value 
- #ifdef WIN32
-         CheckCode("om_notify_monitor_directory", FAMMonitorDirectoryTree(fc, name, &request, 0));
- #else /* WIN32 */
--        failwith("om_notify_monitor_directory: recursive monitoring is not allowed");
-+        caml_failwith("om_notify_monitor_directory: recursive monitoring is not allowed");
- #endif /* !WIN32 */
-     }
-     else
-@@ -294,13 +294,13 @@ value om_notify_next_event(value v_fc)
-     CheckCode("om_notify_next_event", FAMNextEvent(fc, &event));
-     code = event.code;
-     if(code < 1 || code > 10)
--        failwith("om_notify_next_event: code out of bounds");
-+        caml_failwith("om_notify_next_event: code out of bounds");
- 
-     /* Allocate the string name */
--    v_name = copy_string(event.filename);
-+    v_name = caml_copy_string(event.filename);
- 
-     /* Allocate the tuple */
--    v_tuple = alloc_tuple(3);
-+    v_tuple = caml_alloc_tuple(3);
-     Field(v_tuple, 0) = Val_int(event.fr.reqnum);
-     Field(v_tuple, 1) = v_name;
-     Field(v_tuple, 2) = Val_int(code - 1);
-@@ -330,7 +330,7 @@ value om_notify_open(value v_unit)
-  */
- value om_notify_fd(value v_fc)
- {
--    invalid_argument("FAM not enabled");
-+    caml_invalid_argument("FAM not enabled");
-     return Val_unit;
- }
- 
-@@ -389,7 +389,7 @@ value om_notify_pending(value v_fc)
-  */
- value om_notify_next_event(value v_fc)
- {
--    invalid_argument("FAM not enabled");
-+    caml_invalid_argument("FAM not enabled");
-     return Val_unit;
- }
- 

devel/omake/files/patch-src_libmojave-external_cutil_lm__printf.c

@@ -1,96 +0,0 @@
-$NetBSD: patch-al,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/cutil/lm_printf.c.orig	2009-02-06 16:41:21 UTC
-+++ src/libmojave-external/cutil/lm_printf.c
-@@ -61,12 +61,12 @@ value ml_print_char(value v_fmt, value v
-     char c = (char) Int_val(v_char);
- #ifdef HAVE_SNPRINTF
-     if(snprintf(buffer, sizeof(buffer), fmt, c) < 0)
--        failwith("ml_print_char");
-+        caml_failwith("ml_print_char");
- #else
-     if(sprintf(buffer, fmt, c) < 0)
--        failwith("ml_print_char");
-+        caml_failwith("ml_print_char");
- #endif
--    return copy_string(buffer);
-+    return caml_copy_string(buffer);
- }
- 
- /*
-@@ -79,12 +79,12 @@ value ml_print_int(value v_fmt, value v_
-     int i = Int_val(v_int);
- #ifdef HAVE_SNPRINTF
-     if(snprintf(buffer, sizeof(buffer), fmt, i) < 0)
--        failwith("ml_print_int");
-+        caml_failwith("ml_print_int");
- #else
-     if(sprintf(buffer, fmt, i) < 0)
--        failwith("ml_print_int");
-+        caml_failwith("ml_print_int");
- #endif
--    return copy_string(buffer);
-+    return caml_copy_string(buffer);
- }
- 
- 
-@@ -98,12 +98,12 @@ value ml_print_float(value v_fmt, value 
-     double x = Double_val(v_float);
- #ifdef HAVE_SNPRINTF
-     if(snprintf(buffer, sizeof(buffer), fmt, x) < 0)
--        failwith("ml_print_float");
-+        caml_failwith("ml_print_float");
- #else
-     if(sprintf(buffer, fmt, x) < 0)
--        failwith("ml_print_float");
-+        caml_failwith("ml_print_float");
- #endif
--    return copy_string(buffer);
-+    return caml_copy_string(buffer);
- }
- 
- /*
-@@ -132,7 +132,7 @@ value ml_print_string(value v_fmt, value
-         size = len * 2;
-         bufp = malloc(size);
-         if(bufp == 0)
--            failwith("ml_print_string");
-+            caml_failwith("ml_print_string");
-     }
- 
- #ifdef HAVE_SNPRINTF
-@@ -143,9 +143,9 @@ value ml_print_string(value v_fmt, value
-     if(code < 0) {
-         if(bufp != buffer)
-             free(bufp);
--        failwith("ml_print_string");
-+        caml_failwith("ml_print_string");
-     }
--    v_result = copy_string(bufp);
-+    v_result = caml_copy_string(bufp);
-     if(bufp != buffer)
-         free(bufp);
-     return v_result;
-@@ -180,7 +180,7 @@ value ml_print_string2(value v_width, va
-         size = len * 2;
-         bufp = malloc(size);
-         if(bufp == 0)
--            failwith("ml_print_string");
-+            caml_failwith("ml_print_string");
-     }
- 
- #ifdef HAVE_SNPRINTF
-@@ -191,9 +191,9 @@ value ml_print_string2(value v_width, va
-     if(code < 0) {
-         if(bufp != buffer)
-             free(bufp);
--        failwith("ml_print_string");
-+        caml_failwith("ml_print_string");
-     }
--    v_result = copy_string(bufp);
-+    v_result = caml_copy_string(bufp);
-     if(bufp != buffer)
-         free(bufp);
-     return v_result;

devel/omake/files/patch-src_libmojave-external_cutil_lm__terminfo.c

@@ -1,18 +0,0 @@
-$NetBSD: patch-am,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/cutil/lm_terminfo.c.orig	2007-05-15 19:03:32 UTC
-+++ src/libmojave-external/cutil/lm_terminfo.c
-@@ -75,9 +75,9 @@ value caml_tgetstr(value id) {
- 
-    /* Note that tigetstr will return either 0 or -1 on error. */
-    if(termdata == NULL || termdata == (char *)(-1)) {
--      result = copy_string("");
-+      result = caml_copy_string("");
-    } else {
--      result = copy_string(termdata);
-+      result = caml_copy_string(termdata);
-       /* apparently we're not supposed to free termdata here */
-       /* TEMP:  I cannot find specs on this! */
-       //free(termdata);

devel/omake/files/patch-src_libmojave-external_cutil_lm__termsize.c

@@ -1,33 +0,0 @@
-$NetBSD: patch-an,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/cutil/lm_termsize.c.orig	2008-03-19 00:44:12 UTC
-+++ src/libmojave-external/cutil/lm_termsize.c
-@@ -45,7 +45,7 @@ value caml_term_size(value arg)
-     CAMLlocal1(buf);
- 
-     /* Return a pair of numbers */
--    buf = alloc_small(2, 0);
-+    buf = caml_alloc_small(2, 0);
- 
-     /* Get the terminal size, return None on failure */
- #ifdef WIN32
-@@ -53,7 +53,7 @@ value caml_term_size(value arg)
-         HANDLE fd = *(HANDLE *)Data_custom_val(arg);
-         CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo;
-         if (! GetConsoleScreenBufferInfo(fd, &ConsoleInfo))
--            failwith("lm_termsize.c: caml_term_size: GetConsoleScreenBufferInfo failed");
-+            caml_failwith("lm_termsize.c: caml_term_size: GetConsoleScreenBufferInfo failed");
- 
-         Field(buf, 0) = Val_int(ConsoleInfo.dwSize.Y);
-         Field(buf, 1) = Val_int(ConsoleInfo.dwSize.X);
-@@ -65,7 +65,7 @@ value caml_term_size(value arg)
-         struct winsize ws;
- 
-         if(ioctl(fd, TIOCGWINSZ, &ws) < 0)
--            failwith("lm_termsize.c: caml_term_size: not a terminal");
-+            caml_failwith("lm_termsize.c: caml_term_size: not a terminal");
-     
-         /* Return the pair of numbers */
-         Field(buf, 0) = Val_int(ws.ws_row);

devel/omake/files/patch-src_libmojave-external_cutil_lm__uname__ext.c

@@ -1,35 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/cutil/lm_uname_ext.c.orig	2006-12-08 19:21:40 UTC
-+++ src/libmojave-external/cutil/lm_uname_ext.c
-@@ -147,21 +147,21 @@ value lm_uname(value x)
- 
-     /* Get sysinfo */
-     if(uname(&name) < 0)
--        failwith("uname");
-+        caml_failwith("uname");
- 
-     /* Copy data */
--    result = alloc_tuple(5);
-+    result = caml_alloc_tuple(5);
-     Field(result, 0) = Val_unit;
-     Field(result, 1) = Val_unit;
-     Field(result, 2) = Val_unit;
-     Field(result, 3) = Val_unit;
-     Field(result, 4) = Val_unit;
- 
--    Field(result, 0) = copy_string(name.sysname);
--    Field(result, 1) = copy_string(name.nodename);
--    Field(result, 2) = copy_string(name.release);
--    Field(result, 3) = copy_string(name.version);
--    Field(result, 4) = copy_string(name.machine);
-+    Field(result, 0) = caml_copy_string(name.sysname);
-+    Field(result, 1) = caml_copy_string(name.nodename);
-+    Field(result, 2) = caml_copy_string(name.release);
-+    Field(result, 3) = caml_copy_string(name.version);
-+    Field(result, 4) = caml_copy_string(name.machine);
- 
-     /* Return it */
-     CAMLreturn(result);

devel/omake/files/patch-src_libmojave-external_cutil_lm__unix__cutil.c

@@ -1,117 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/cutil/lm_unix_cutil.c.orig	2007-07-18 17:42:32 UTC
-+++ src/libmojave-external/cutil/lm_unix_cutil.c
-@@ -87,9 +87,9 @@ value home_win32(value v_unit)
-     TCHAR path[MAX_PATH];
- 
-     if(SUCCEEDED(CompatSHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, path)))
--        CAMLreturn(copy_string(path));
-+        CAMLreturn(caml_copy_string(path));
- 
--    failwith("home_win32");
-+    caml_failwith("home_win32");
-     return Val_unit;
- }
- 
-@@ -138,7 +138,7 @@ value lockf_win32(value v_fd, value v_ki
-             flags = LOCKFILE_FAIL_IMMEDIATELY;
-             break;
-         default:
--            invalid_argument("lockf_win32");
-+            caml_invalid_argument("lockf_win32");
-             break;
-         }
- 
-@@ -147,11 +147,11 @@ value lockf_win32(value v_fd, value v_ki
-         overlapped.Offset = pos;
- 
-         /* Perform the lock */
--        enter_blocking_section();
-+        caml_enter_blocking_section();
-         code = LockFileEx(fd, flags, 0, len, 0, &overlapped);
-         if(code == 0)
-             error = GetLastError();
--        leave_blocking_section();
-+        caml_leave_blocking_section();
- 
-         /* Fail if the lock was not successful */
-         if(code == 0) {
-@@ -165,14 +165,14 @@ value lockf_win32(value v_fd, value v_ki
-                  * XXX: HACK: this exception is being caught
-                  *            Do not change the string w/o changing the wrapper code.
-                  */
--                failwith("lockf_win32: already locked");
-+                caml_failwith("lockf_win32: already locked");
-                 break;
-             case ERROR_POSSIBLE_DEADLOCK:
-                 /*
-                  * XXX: HACK: this exception is being caught
-                  *            Do not change the string w/o changing the wrapper code.
-                  */
--                failwith("lockf_win32: possible deadlock");
-+                caml_failwith("lockf_win32: possible deadlock");
-                 break;
-             default:
-                 FormatMessage(
-@@ -187,7 +187,7 @@ value lockf_win32(value v_fd, value v_ki
-                 sprintf(szBuf, "lockf_win32 failed with error %d: %s", error, lpMsgBuf); 
-                 LocalFree(lpMsgBuf);
- 
--                failwith(szBuf);
-+                caml_failwith(szBuf);
-                 break;
-             }
-         }
-@@ -289,7 +289,7 @@ value caml_registry_find(value v_hkey, v
- #endif
- 
-     /* Got the value */
--    return copy_string(buffer);
-+    return caml_copy_string(buffer);
- }
- 
- #else /* WIN32 */
-@@ -381,9 +381,9 @@ value lm_flock(value v_fd, value v_op)
-     op = Int_val(v_op);
- #if defined(FLOCK_ENABLED)
-     cmd = flock_of_flock[op];
--    enter_blocking_section();
-+    caml_enter_blocking_section();
-     code = flock(fd, cmd);
--    leave_blocking_section();
-+    caml_leave_blocking_section();
- #elif defined(FCNTL_ENABLED)
-     {
-         struct flock info;
-@@ -392,9 +392,9 @@ value lm_flock(value v_fd, value v_op)
-         info.l_whence = SEEK_SET;
-         info.l_start = 0;
-         info.l_len = FLOCK_LEN;
--        enter_blocking_section();
-+        caml_enter_blocking_section();
-         code = fcntl(fd, cmd, &info);
--        leave_blocking_section();
-+        caml_leave_blocking_section();
-     }
- #elif defined(LOCKF_ENABLED)
-     cmd = lockf_of_flock[op];
-@@ -457,12 +457,12 @@ value lm_getpwents(value v_unit)
-         Store_field(entry, 2, Val_int(entryp->pw_uid));
-         Store_field(entry, 3, Val_int(entryp->pw_gid));
- #ifdef __BEOS__
--        Store_field(entry, 4, copy_string(""));
-+        Store_field(entry, 4, caml_copy_string(""));
- #else
--        Store_field(entry, 4, copy_string(entryp->pw_gecos));
-+        Store_field(entry, 4, caml_copy_string(entryp->pw_gecos));
- #endif
--        Store_field(entry, 5, copy_string(entryp->pw_dir));
--        Store_field(entry, 6, copy_string(entryp->pw_shell));
-+        Store_field(entry, 5, caml_copy_string(entryp->pw_dir));
-+        Store_field(entry, 6, caml_copy_string(entryp->pw_shell));
-         cons = caml_alloc_tuple(2);
-         Store_field(cons, 0, entry);
-         Store_field(cons, 1, users);

devel/omake/files/patch-src_libmojave-external_stdlib_lm__debug.ml

@@ -1,58 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/stdlib/lm_debug.ml.orig	2006-08-03 22:51:52 UTC
-+++ src/libmojave-external/stdlib/lm_debug.ml
-@@ -173,11 +173,10 @@ let create_debug
-  *)
- let load_debug name =
-    let rec search = function
--      { info_name = name'; info_flag = flag } :: t ->
--         if name' = name then
--            flag
--         else
--            search t
-+      info :: _ when info.info_name = name ->
-+         info.info_flag
-+    | _ :: t ->
-+         search t
-     | [] ->
-          raise (Failure (sprintf "Lm_debug.load_debug: variable '%s' has not been created" name))
-    in
-@@ -189,11 +188,10 @@ let load_debug name =
- let set_debug name flag =
-    let rec search = function
-       h :: t ->
--         let { info_name = name'; info_flag = flag' } = h in
--            if name' = name then
--               flag' := flag
--            else
--               search t
-+         if h.info_name = name then
-+            h.info_flag := flag
-+         else
-+            search t
-     | [] ->
- (*
-          (* Try a C function *)
-@@ -227,9 +225,8 @@ let get_debug name =
-    let rec search = function
-       h :: t ->
-          if h.info_name = name then
--            let { info_info = description; info_flag = flag } = h in
-             let description =
--               match description with
-+               match h.info_info with
-                   Some desc ->
-                      desc
-                 | None ->
-@@ -237,7 +234,7 @@ let get_debug name =
-             in
-                { debug_name = name;
-                  debug_description = description;
--                 debug_value = !flag
-+                 debug_value = !(h.info_flag)
-                }
-          else
-             search t

devel/omake/files/patch-src_libmojave-external_stdlib_lm__string__util.ml

@@ -1,125 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/stdlib/lm_string_util.ml.orig	2008-06-28 01:21:34 UTC
-+++ src/libmojave-external/stdlib/lm_string_util.ml
-@@ -613,18 +613,13 @@ let tokens_create wrap group =
-  * Get the tokens list.
-  *)
- let tokens_flush info =
--   let { tokens_group  = group;
--         tokens_list   = tokens;
--         tokens_prefix = prefix
--       } = info
--   in
-    let tokens =
--      match prefix with
-+      match info.tokens_prefix with
-          NoPrefix ->
--            tokens
-+            info.tokens_list
-        | WordPrefix prefix
-        | QuotePrefix (_, prefix) ->
--            group prefix :: tokens
-+            info.tokens_group prefix :: info.tokens_list
-    in
-       List.rev tokens
- 
-@@ -632,38 +627,29 @@ let tokens_flush info =
-  * End the current word.
-  *)
- let tokens_break info =
--   let { tokens_group  = group;
--         tokens_list   = tokens;
--         tokens_prefix = prefix
--       } = info
--   in
--      match prefix with
--         NoPrefix ->
--            info
--       | WordPrefix prefix
--       | QuotePrefix (_, prefix) ->
--            { info with tokens_list   = group prefix :: tokens;
--                        tokens_prefix = NoPrefix
--            }
-+   match info.tokens_prefix with
-+      NoPrefix ->
-+         info
-+    | WordPrefix prefix
-+    | QuotePrefix (_, prefix) ->
-+         { info with tokens_list   = info.tokens_group prefix :: info.tokens_list;
-+                     tokens_prefix = NoPrefix
-+         }
- 
- (*
-  * Add a value directly.
-  * This also performs a break.
-  *)
- let tokens_atomic info x =
--   let { tokens_group  = group;
--         tokens_list   = tokens;
--         tokens_prefix = prefix
--       } = info
--   in
--      match prefix with
-+   let tokens = info.tokens_list in
-+      match info.tokens_prefix with
-          NoPrefix ->
-             { info with tokens_list   = x :: tokens;
-                         tokens_prefix = NoPrefix
-             }
-        | WordPrefix prefix
-        | QuotePrefix (_, prefix) ->
--            { info with tokens_list   = x :: group prefix :: tokens;
-+            { info with tokens_list   = x :: info.tokens_group prefix :: tokens;
-                         tokens_prefix = NoPrefix
-             }
- 
-@@ -758,11 +744,8 @@ let tokens_string info s =
-       if len = 0 then
-          info
-       else
--         let { tokens_list = tokens;
--               tokens_prefix = prefix
--             } = info
--         in
--            match prefix with
-+         let tokens = info.tokens_list in
-+            match info.tokens_prefix with
-                NoPrefix ->
-                   scan_white tokens 0
-              | WordPrefix prefix ->
-@@ -809,13 +792,11 @@ let buffer_get_token lexer s i len =
-                BufChar
- 
- let tokens_lex info s =
--   let { tokens_lexer       = lexer;
--         tokens_wrap_string = wrap_string;
--         tokens_wrap_data   = wrap_data;
--         tokens_wrap_token  = wrap_token;
--         tokens_group       = group
--       } = info
--   in
-+   let lexer = info.tokens_lexer in
-+   let wrap_string = info.tokens_wrap_string in
-+   let wrap_data = info.tokens_wrap_data in
-+   let wrap_token = info.tokens_wrap_token in
-+   let group = info.tokens_group in
-    let len = String.length s in
- 
-    (* Don't add empty strings *)
-@@ -902,11 +883,8 @@ let tokens_lex info s =
-       if len = 0 then
-          info
-       else
--         let { tokens_list = tokens;
--               tokens_prefix = prefix
--             } = info
--         in
--            match prefix with
-+         let tokens = info.tokens_list in
-+            match info.tokens_prefix with
-                NoPrefix ->
-                   scan_white tokens 0
-              | WordPrefix prefix ->

devel/omake/files/patch-src_libmojave-external_unix_lm__notify.ml

@@ -1,127 +0,0 @@
-$NetBSD: patch-as,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/unix/lm_notify.ml.orig	2007-07-19 21:06:05 UTC
-+++ src/libmojave-external/unix/lm_notify.ml
-@@ -153,10 +153,8 @@ let is_path_prefix (root1, path1) (root2
- let is_monitored_name requests name =
-    let new_path = path_of_name name in
-       IntTable.exists (fun _ job ->
--            let { job_path = path;
--                  job_recursive = recursive
--                } = job
--            in
-+            let path = job.job_path in
-+            let recursive = job.job_recursive in
-                new_path = path || (recursive && is_path_prefix path new_path)) requests
- 
- (************************************************************************
-@@ -215,18 +213,16 @@ let close notify =
- (*
-  * Get the file descriptor.
-  *)
--let file_descr { notify_fd = fd } =
--   fd
-+let file_descr notify =
-+   notify.notify_fd
- 
- (*
-  * Monitoring.
-  *)
- let monitor notify dir recursive =
--   let { notify_info = info;
--         notify_dirs = dirs;
--         notify_requests = requests
--       } = notify
--   in
-+   let info = notify.notify_info in
-+   let dirs = notify.notify_dirs in
-+   let requests = notify.notify_requests in
-    let name = name_of_dir dir in
-       if not (is_monitored_name requests name) then begin
-          if !debug_notify then
-@@ -250,11 +246,9 @@ let monitor notify dir recursive =
-  * Suspend notifications.
-  *)
- let suspend notify dir =
--   let { notify_info = info;
--         notify_dirs = dirs;
--         notify_requests = requests
--       } = notify
--   in
-+   let info = notify.notify_info in
-+   let dirs = notify.notify_dirs in
-+   let requests = notify.notify_requests in
-    let dir = name_of_dir dir in
-    let request =
-       try StringTable.find dirs dir with
-@@ -269,10 +263,8 @@ let suspend notify dir =
-          end
- 
- let suspend_all notify =
--   let { notify_info = info;
--         notify_requests = requests
--       } = notify
--   in
-+   let info = notify.notify_info in
-+   let requests = notify.notify_requests in
-       IntTable.iter (fun _ job ->
-             if job.job_running then
-                begin
-@@ -281,11 +273,9 @@ let suspend_all notify =
-                end) requests
- 
- let resume notify dir =
--   let { notify_info = info;
--         notify_dirs = dirs;
--         notify_requests = requests
--       } = notify
--   in
-+   let info = notify.notify_info in
-+   let dirs = notify.notify_dirs in
-+   let requests = notify.notify_requests in
-    let dir = name_of_dir dir in
-    let request =
-       try StringTable.find dirs dir with
-@@ -300,10 +290,8 @@ let resume notify dir =
-          end
- 
- let resume_all notify =
--   let { notify_info = info;
--         notify_requests = requests
--       } = notify
--   in
-+   let info = notify.notify_info in
-+   let requests = notify.notify_requests in
-       IntTable.iter (fun _ job ->
-             if not job.job_running then
-                begin
-@@ -315,11 +303,9 @@ let resume_all notify =
-  * Cancel a request.
-  *)
- let cancel notify dir =
--   let { notify_info = info;
--         notify_dirs = dirs;
--         notify_requests = requests
--       } = notify
--   in
-+   let info = notify.notify_info in
-+   let dirs = notify.notify_dirs in
-+   let requests = notify.notify_requests in
-    let dir = name_of_dir dir in
-    let request =
-       try StringTable.find dirs dir with
-@@ -332,10 +318,8 @@ let cancel notify dir =
-       notify.notify_requests <- IntTable.remove requests request
- 
- let cancel_all notify =
--   let { notify_info = info;
--         notify_requests = requests
--       } = notify
--   in
-+   let info = notify.notify_info in
-+   let requests = notify.notify_requests in
-       IntTable.iter (fun request _ -> notify_cancel info request) requests;
-       notify.notify_dirs <- StringTable.empty;
-       notify.notify_requests <- IntTable.empty

devel/omake/files/patch-src_libmojave-external_util_lm__channel.ml

@@ -1,364 +0,0 @@
-$NetBSD: patch-at,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/util/lm_channel.ml.orig	2007-07-16 21:10:43 UTC
-+++ src/libmojave-external/util/lm_channel.ml
-@@ -337,12 +337,10 @@ let of_string s =
-    of_string string_sym 1 0 (String.copy s)
- 
- let info channel =
--   let { channel_id = id;
--         channel_kind = kind;
--         channel_mode = mode;
--         channel_binary = binary
--       } = channel
--   in
-+   let id = channel.channel_id in
-+   let kind = channel.channel_kind in
-+   let mode = channel.channel_mode in
-+   let binary = channel.channel_binary in
-       id, kind, mode, binary
- 
- let name channel =
-@@ -468,13 +466,11 @@ let squash_text buffer off amount =
-  * Get the line/char for a particular point in the input buffer.
-  *)
- let line_of_index info buffer index =
--   let { start_line   = start_line;
--         start_char   = start_char;
--         middle_index = middle_index;
--         middle_line  = middle_line;
--         middle_char  = middle_char
--       } = info
--   in
-+   let start_line = info.start_line in
-+   let start_char = info.start_char in
-+   let middle_index = info.middle_index in
-+   let middle_line = info.middle_line in
-+   let middle_char = info.middle_char in
-    let rec search line char i =
-       if i = index then
-          begin
-@@ -509,12 +505,10 @@ let reset_input_buffer info =
-       info.lex_index    <- 0
- 
- let shift_input_buffer info =
--   let { in_buffer = in_buffer;
--         in_index  = in_index;
--         lex_index = lex_index;
--         in_max    = in_max
--       } = info
--   in
-+   let in_buffer = info.in_buffer in
-+   let in_index = info.in_index in
-+   let lex_index = info.lex_index in
-+   let in_max = info.in_max in
-    let line, char = line_of_index info in_buffer in_index in
-       String.blit in_buffer in_index in_buffer 0 (in_max - in_index);
-       info.start_line   <- line;
-@@ -562,10 +556,8 @@ let reset_output_buffer info =
-  * flushing.
-  *)
- let expand_output info =
--   let { out_buffer = buffer;
--         out_max    = max
--       } = info
--   in
-+   let buffer = info.out_buffer in
-+   let max = info.out_max in
-       if max = String.length buffer then begin
-          let buffer2 = String.create (max * 2) in
-             String.blit buffer 0 buffer2 0 max;
-@@ -575,10 +567,8 @@ let expand_output info =
-       end
- 
- let to_string info =
--   let { out_buffer = buffer;
--         out_max = max
--       } = info
--   in
-+   let buffer = info.out_buffer in
-+   let max = info.out_max in
-       String.sub buffer 0 max
- 
- (************************************************************************
-@@ -614,12 +604,10 @@ let setup_write_buffer info =
-  *)
- let flush_output_once info =
-    setup_write_buffer info;
--   let { write_index  = off;
--         write_max    = max;
--         write_buffer = buf;
--         write_fun    = write
--       } = info
--   in
-+   let off = info.write_index in
-+   let max = info.write_max in
-+   let buf = info.write_buffer in
-+   let write = info.write_fun in
-    let count = write buf off (max - off) in
-    let off' = off + count in
-       if off' = max then
-@@ -632,17 +620,13 @@ let flush_output_once info =
-  *)
- let flush_aux info =
-    setup_write_buffer info;
--   let { write_buffer = buf;
--         write_fun    = writer
--       } = info
--   in
-+   let buf = info.write_buffer in
-+   let writer = info.write_fun in
- 
-    (* Now write the data directly *)
-    let rec write () =
--      let { write_index = index;
--            write_max = max
--          } = info
--      in
-+      let index = info.write_index in
-+      let max = info.write_max in
-       let len = max - index in
-          if len <> 0 then
-             let count = writer buf index len in
-@@ -701,10 +685,8 @@ let close info =
-  * Print a byte.
-  *)
- let rec output_char info c =
--   let { out_max = max;
--         out_buffer = buffer
--       } = info
--   in
-+   let max = info.out_max in
-+   let buffer = info.out_buffer in
-       flush_input info;
-       if max = String.length buffer then
-          begin
-@@ -724,10 +706,8 @@ let output_byte info c =
-  * Write a substring.
-  *)
- let rec output_buffer info buf off len =
--   let { out_max = max;
--         out_buffer = buffer
--       } = info
--   in
-+   let max = info.out_max in
-+   let buffer = info.out_buffer in
-    let avail = String.length buffer - max in
-       flush_input info;
-       if len <> 0 then
-@@ -758,21 +738,17 @@ let write info buf off len =
-  * Check if there is input already in the buffer.
-  *)
- let poll info =
--   let { in_index = index;
--         in_max = max
--       } = info
--   in
-+   let index = info.in_index in
-+   let max = info.in_max in
-       index <> max
- 
- (*
-  * Get data when the buffer is empty.
-  *)
- let fillbuf info =
--   let { channel_binary = binary;
--         in_buffer = buf;
--         read_fun = reader
--       } = info
--   in
-+   let binary = info.channel_binary in
-+   let buf = info.in_buffer in
-+   let reader = info.read_fun in
-    let count = reader buf 0 buf_size in
-    let count =
-       if count = 0 then
-@@ -797,11 +773,9 @@ let fillbuf info =
-  * Get a single char.
-  *)
- let rec input_char info =
--   let { in_index = index;
--         in_max = max;
--         in_buffer = buf;
--       } = info
--   in
-+   let index = info.in_index in
-+   let max = info.in_max in
-+   let buf = info.in_buffer in
-       flush_output info;
-       if index = max then
-          begin
-@@ -823,11 +797,9 @@ let input_byte info =
-  * Read data into a buffer.
-  *)
- let rec input_buffer info s off len =
--   let { in_index = index;
--         in_max = max;
--         in_buffer = buf
--       } = info
--   in
-+   let index = info.in_index in
-+   let max = info.in_max in
-+   let buf = info.in_buffer in
-    let avail = max - index in
-       flush_output info;
-       if len <> 0 then
-@@ -884,12 +856,10 @@ let input_entire_line info =
-  * Read allows for partial reading.
-  *)
- let read info s off len =
--   let { in_index = index;
--         in_max = max;
--         in_buffer = buf;
--         read_fun = reader
--       } = info
--   in
-+   let index = info.in_index in
-+   let max = info.in_max in
-+   let buf = info.in_buffer in
-+   let reader = info.read_fun in
-    let avail = max - index in
-       flush_output info;
-       if avail = 0 then
-@@ -925,13 +895,11 @@ let seek info pos whence =
-  * Get the current location.
-  *)
- let loc info =
--   let { out_max = out_max;
--         in_index = in_index;
--         in_buffer = in_buffer;
--         out_buffer = out_buffer;
--         channel_file = file
--       } = info
--   in
-+   let out_max = info.out_max in
-+   let in_index = info.in_index in
-+   let in_buffer = info.in_buffer in
-+   let out_buffer = info.out_buffer in
-+   let file = info.channel_file in
-    let line, char =
-       if out_max <> 0 then
-          line_of_index info out_buffer out_max
-@@ -1132,10 +1100,8 @@ struct
-     * Start lex mode.
-     *)
-    let lex_start channel =
--      let { in_index = index;
--            in_buffer = buffer
--          } = channel
--      in
-+      let index = channel.in_index in
-+      let buffer = channel.in_buffer in
-       let prev =
-          if index = 0 then
-             bof
-@@ -1149,10 +1115,8 @@ struct
-     * Restart at a previous position.
-     *)
-    let lex_restart channel pos =
--      let { in_max = max;
--            in_index = index
--          } = channel
--      in
-+      let max = channel.in_max in
-+      let index = channel.in_index in
-          assert (pos >= 0 && pos <= max - index);
-          channel.lex_index <- index + pos
- 
-@@ -1168,20 +1132,16 @@ struct
-     * Get the string matched by the lexer.
-     *)
-    let lex_string channel pos =
--      let { in_index = start;
--            in_buffer = buffer
--          } = channel
--      in
-+      let start = channel.in_index in
-+      let buffer = channel.in_buffer in
-          String.sub buffer start pos
- 
-    (*
-     * Get the string matched by the lexer.
-     *)
-    let lex_substring channel off len =
--      let { in_index = start;
--            in_buffer = buffer
--          } = channel
--      in
-+      let start = channel.in_index in
-+      let buffer = channel.in_buffer in
-          String.sub buffer (start + off) len
- 
-    (*
-@@ -1189,13 +1149,11 @@ struct
-     * We can't discard any of the existing data.
-     *)
-    let rec lex_fill channel =
--      let { in_max         = max;
--            in_buffer      = buffer;
--            in_index       = start;
--            read_fun       = reader;
--            channel_binary = binary
--          } = channel
--      in
-+      let max = channel.in_max in
-+      let buffer = channel.in_buffer in
-+      let start = channel.in_index in
-+      let reader = channel.read_fun in
-+      let binary = channel.channel_binary in
-       let len = String.length buffer in
-       let amount = len - max in
-          (* If we have space, fill it *)
-@@ -1245,11 +1203,9 @@ struct
-     * Get the next character in lex mode.
-     *)
-    let lex_next channel =
--      let { in_max = max;
--            in_buffer = buffer;
--            lex_index = index
--          } = channel
--      in
-+      let max = channel.in_max in
-+      let buffer = channel.in_buffer in
-+      let index = channel.lex_index in
-          if index = max then
-             lex_fill channel
-          else
-@@ -1267,14 +1223,12 @@ struct
-     * Get the location of the buffer.
-     *)
-    let lex_loc channel off =
--      let { start_line = line;
--            start_char = char;
--            channel_file = file;
--            lex_index = index;
--            in_buffer = buffer;
--            in_max = max
--          } = channel
--      in
-+      let line = channel.start_line in
-+      let char = channel.start_char in
-+      let file = channel.channel_file in
-+      let index = channel.lex_index in
-+      let buffer = channel.in_buffer in
-+      let max = channel.in_max in
-       let line1, char1 =
-          if index > max then
-             line, char
-@@ -1293,11 +1247,9 @@ struct
-     * Add any remaining buffered text to a buffer.
-     *)
-    let lex_buffer channel buf =
--      let { in_max    = max;
--            in_buffer = buffer;
--            in_index  = start
--          } = channel
--      in
-+      let max = channel.in_max in
-+      let buffer = channel.in_buffer in
-+      let start = channel.in_index in
-          Buffer.add_substring buf buffer start (max - start);
-          channel.in_index <- max
- end

devel/omake/files/patch-src_libmojave-external_util_lm__filename__util.ml

@@ -1,24 +0,0 @@
-$NetBSD: patch-au,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/util/lm_filename_util.ml.orig	2007-01-29 20:14:42 UTC
-+++ src/libmojave-external/util/lm_filename_util.ml
-@@ -48,12 +48,11 @@ let groups =
- let unix_is_executable s =
-    let flag =
-       try
--         let { Unix.LargeFile.st_kind = kind;
--               Unix.LargeFile.st_perm = perm;
--               Unix.LargeFile.st_uid = uid;
--               Unix.LargeFile.st_gid = gid
--             } = Unix.LargeFile.stat s
--         in
-+         let st = Unix.LargeFile.stat s in
-+         let kind = st.Unix.LargeFile.st_kind in
-+         let perm = st.Unix.LargeFile.st_perm in
-+         let uid = st.Unix.LargeFile.st_uid in
-+         let gid = st.Unix.LargeFile.st_gid in
-             (kind = Unix.S_REG)
-             && ((perm land 0o001) <> 0
-                 || (List.mem gid groups && (perm land 0o010) <> 0)

devel/omake/files/patch-src_libmojave-external_util_lm__glob.ml

@@ -1,20 +0,0 @@
-$NetBSD: patch-av,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/util/lm_glob.ml.orig	2007-09-04 16:12:33 UTC
-+++ src/libmojave-external/util/lm_glob.ml
-@@ -157,11 +157,8 @@ let home_dir =
- let getusers () =
-    let users = Lm_unix_util.getpwents () in
-       List.map (fun entry ->
--            let { Unix.pw_name = name;
--                  Unix.pw_dir  = dir
--                } = entry
--            in
--               tilde_insert dir name;
-+            let name = entry.Unix.pw_name in
-+               tilde_insert entry.Unix.pw_dir name;
-                name) users
- 
- (************************************************************************

devel/omake/files/patch-src_libmojave-external_util_lm__lexer.ml

@@ -1,343 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/util/lm_lexer.ml.orig	2007-01-25 18:31:18 UTC
-+++ src/libmojave-external/util/lm_lexer.ml
-@@ -1325,10 +1325,8 @@ struct
-     * Expressions.
-     *)
-    let pp_print_exp buf exp =
--      let { exp_clauses = clauses;
--            exp_id = id
--          } = exp
--      in
-+      let clauses = exp.exp_clauses in
-+      let id = exp.exp_id in
-          fprintf buf "Id: %d" id;
-          List.iter (fun (action, id, regex) ->
-                fprintf buf "@ @[<hv 3>Clause:@ id = %d@ action = %a@ @[<hv 3>regex =@ %a@]@]" (**)
-@@ -1370,10 +1368,8 @@ struct
-    let add_clause_exp exp action s =
-       let regex = regex_of_string s in
-       let arity = regex_arg_count 0 regex in
--      let { exp_clauses = clauses;
--            exp_id      = id
--          } = exp
--      in
-+      let clauses = exp.exp_clauses in
-+      let id = exp.exp_id in
-       let exp =
-          { exp_clauses = (action, id, regex) :: clauses;
-            exp_id      = succ id
-@@ -1395,11 +1391,9 @@ struct
-     * Take the union of two expression lists.
-     *)
-    let union_exp exp1 exp2 =
--      let { exp_clauses = clauses1;
--            exp_id = id1
--          } = exp1
--      in
--      let { exp_clauses = clauses2 } = exp2 in
-+      let clauses1 = exp1.exp_clauses in
-+      let id1 = exp1.exp_id in
-+      let clauses2 = exp2.exp_clauses in
-       let actions =
-          List.fold_left (fun actions (action, _, _) ->
-                ActionSet.add actions action) ActionSet.empty clauses1
-@@ -1474,20 +1468,16 @@ struct
-                counter min final max start
- 
-    let pp_print_nfa_state buf nfa_state =
--      let { nfa_state_index = index;
--            nfa_state_action = action
--          } = nfa_state
--      in
-+      let index = nfa_state.nfa_state_index in
-+      let action = nfa_state.nfa_state_action in
-          fprintf buf "@[<hv 3>NFA state %d:@ action %a@]" index pp_print_nfa_action action
- 
-    let pp_print_nfa buf nfa =
--      let { nfa_hash  = hash;
--            nfa_start = start;
--            nfa_search_start = search;
--            nfa_search_states = search_states;
--            nfa_table = table
--          } = nfa
--      in
-+      let hash = nfa.nfa_hash in
-+      let start = nfa.nfa_start in
-+      let search = nfa.nfa_search_start in
-+      let search_states = nfa.nfa_search_states in
-+      let table = nfa.nfa_table in
-          fprintf buf "@[<hv 3>NFA:@ start = %a@ search = %a@ @[<b 3>search-states =%a@]" (**)
-             (pp_print_nfa_id hash) start
-             (pp_print_nfa_id hash) search
-@@ -1500,7 +1490,7 @@ struct
-     * Construct a new state.
-     *)
-    let nfa_state accum action =
--      let { nfa_index = index } = accum in
-+      let index = accum.nfa_index in
-       let state =
-          { nfa_state_index = index;
-            nfa_state_action = action
-@@ -1582,7 +1572,7 @@ struct
-             in
-                accum, info, start, start1 :: final1 :: states
-        | RegexInterval (regex, min, max) ->
--            let { nfa_counter = counter } = accum in
-+            let counter = accum.nfa_counter in
-             let accum, start1 = nfa_state accum NfaActionNone in
-             let accum, final1 =
-                nfa_state accum (NfaActionIncrCounter (counter, min, final.nfa_state_index, max, start1.nfa_state_index))
-@@ -1605,11 +1595,11 @@ struct
- 
-          (* Arguments *)
-        | RegexArg regex ->
--            let { nfa_arg_index = argindex } = accum in
-+            let argindex = accum.nfa_arg_index in
-             let accum, final1 = nfa_state accum (NfaActionArgStop (argindex, final.nfa_state_index)) in
-             let accum, start1 = nfa_state accum NfaActionNone in
-             let start = set_action start (NfaActionArgStart (argindex, start1.nfa_state_index)) in
--            let { nfa_arg_number = argnumber } = info in
-+            let argnumber = info.nfa_arg_number in
-             let accum = { accum with nfa_arg_index = succ argindex } in
-             let info = { info with nfa_arg_number  = succ argnumber } in
-             let accum, info, start1, states =
-@@ -1783,10 +1773,8 @@ struct
-                fprintf buf "search-stop at %d" off
- 
-    let pp_print_dfa_actions nfa_hash buf action =
--      let { dfa_action_final = final;
--            dfa_action_actions = actions
--          } = action
--      in
-+      let final = action.dfa_action_final in
-+      let actions = action.dfa_action_actions in
-       let () =
-          fprintf buf "@[<hv 3>(action"
-       in
-@@ -1798,20 +1786,16 @@ struct
-                ()
-       in
-          NfaStateTable.iter (fun dst action ->
--               let { dfa_action_src = src;
--                     dfa_action_args = args
--                   } = action
--               in
-+               let src = action.dfa_action_src in
-+               let args = action.dfa_action_args in
-                   fprintf buf "@ @[<hv 3>(%a -> %a" (pp_print_nfa_id nfa_hash) src (pp_print_nfa_id nfa_hash) dst;
-                   List.iter (fun action -> fprintf buf "@ %a" pp_print_dfa_arg_action action) args;
-                   fprintf buf ")@]") actions;
-          fprintf buf ")@]"
- 
-    let pp_print_pre_actions buf action =
--      let { pre_action_final = final;
--            pre_action_args = args
--          } = action
--      in
-+      let final = action.pre_action_final in
-+      let args = action.pre_action_args in
-       let () =
-          fprintf buf "@[<hv 3>(pre-action@ "
-       in
-@@ -1897,10 +1881,10 @@ struct
-     * DFA actions.
-     *)
-    let dfa_action_is_empty action =
--      match action with
--         { dfa_action_final = None; dfa_action_actions = actions } ->
--            NfaStateTable.is_empty actions
--       | { dfa_action_final = Some _ } ->
-+      match action.dfa_action_final with
-+         None ->
-+            NfaStateTable.is_empty action.dfa_action_actions
-+       | Some _ ->
-             false
- 
-    (*
-@@ -1920,21 +1904,15 @@ struct
-                ArgTable.add args ArgSearch pos
- 
-    let dfa_eval_action dfa info action =
--      let { dfa_channel = channel;
--            dfa_args = args_table
--          } = info
--      in
--      let { dfa_action_final = final;
--            dfa_action_actions = actions
--          } = action
--      in
-+      let channel = info.dfa_channel in
-+      let args_table = info.dfa_args in
-+      let final = action.dfa_action_final in
-+      let actions = action.dfa_action_actions in
-       let pos = Input.lex_pos channel in
-       let args_table =
-          NfaStateTable.map (fun action ->
--               let { dfa_action_src = src;
--                     dfa_action_args = actions
--                   } = action
--               in
-+               let src = action.dfa_action_src in
-+               let actions = action.dfa_action_args in
-                let args =
-                   try NfaStateTable.find args_table src with
-                      Not_found ->
-@@ -2140,10 +2118,8 @@ struct
-     * the DFA state.
-     *)
-    let close_state dfa table nids c =
--      let { dfa_search_states = search_states;
--            dfa_nfa_hash = nfa_hash
--          } = dfa
--      in
-+      let search_states = dfa.dfa_search_states in
-+      let nfa_hash = dfa.dfa_nfa_hash in
-       let final, actions =
-          List.fold_left (fun final_actions nid ->
-                let frontier =
-@@ -2152,10 +2128,8 @@ struct
-                   if !debug_lexgen then
-                      eprintf "@[<v 3>Frontier:@ %a@]@." (pp_print_frontier nfa_hash) frontier;
-                   NfaStateTable.fold (fun (final', actions) id action ->
--                        let { pre_action_final = final;
--                              pre_action_args = args
--                            } = action
--                        in
-+                        let final = action.pre_action_final in
-+                        let args = action.pre_action_args in
-                         let final =
-                            match final', final with
-                               Some (clause_id', _nid'), Some clause_id ->
-@@ -2264,11 +2238,9 @@ struct
-          extend_args ("" :: args) (succ len1) len2
- 
-    let dfa_args dfa_info lexeme =
--      let { dfa_start_pos = start;
--            dfa_stop_pos = stop;
--            dfa_stop_args = args
--          } = dfa_info
--      in
-+      let start = dfa_info.dfa_start_pos in
-+      let stop = dfa_info.dfa_stop_pos in
-+      let args = dfa_info.dfa_stop_args in
- 
-       (* Get the pairs of argument info *)
-       let info, start_pos =
-@@ -2326,11 +2298,9 @@ struct
-     * Add a state to the DFA.  It is initially empty.
-     *)
-    let dfa_find_state dfa nids =
--      let { dfa_map    = map;
--            dfa_length = dfa_id;
--            dfa_states = states
--          } = dfa
--      in
-+      let map = dfa.dfa_map in
-+      let dfa_id = dfa.dfa_length in
-+      let states = dfa.dfa_states in
-          try DfaStateTable.find map nids with
-             Not_found ->
-                (* Make a new state *)
-@@ -2362,14 +2332,10 @@ struct
-     * an entry in the transition table yet.
-     *)
-    let create_entry dfa dfa_state c =
--      let { dfa_dfa_hash = dfa_hash;
--            dfa_table = table
--          } = dfa
--      in
--      let { dfa_state_set = nids;
--            dfa_state_delta = delta
--          } = dfa_state
--      in
-+      let dfa_hash = dfa.dfa_dfa_hash in
-+      let table = dfa.dfa_table in
-+      let nids = dfa_state.dfa_state_set in
-+      let delta = dfa_state.dfa_state_delta in
-       let frontier, actions = close_next_state dfa table (DfaState.get dfa_hash nids) c in
-          if frontier = [] && dfa_action_is_empty actions then
-             dfa_state.dfa_state_delta <- TransTable.add delta c DfaNoTransition
-@@ -2437,10 +2403,8 @@ struct
-       let () = loop dfa_state c in
- 
-       (* Now figure out what happened *)
--      let { dfa_stop_clause = clause;
--            dfa_stop_pos    = stop;
--          } = dfa_info
--      in
-+      let clause = dfa_info.dfa_stop_clause in
-+      let stop = dfa_info.dfa_stop_pos in
-          (*
-           * If we did not get a match, return the channel to
-           * the starting position, and raise an exception.
-@@ -2489,10 +2453,8 @@ struct
-       let () = loop dfa_state c in
- 
-       (* Now figure out what happened *)
--      let { dfa_stop_clause = clause;
--            dfa_stop_pos    = stop;
--          } = dfa_info
--      in
-+      let clause = dfa_info.dfa_stop_clause in
-+      let stop = dfa_info.dfa_stop_pos in
-          (*
-           * If we did not get a match, return the channel to
-           * the starting position, and raise an exception.
-@@ -2551,10 +2513,8 @@ struct
-       let () = loop dfa_state c in
- 
-       (* Now figure out what happened *)
--      let { dfa_stop_clause = clause;
--            dfa_stop_pos    = stop;
--          } = dfa_info
--      in
-+      let clause = dfa_info.dfa_stop_clause in
-+      let stop = dfa_info.dfa_stop_pos in
-          (*
-           * If we did not get a match, return all the text to
-           * the end of the channel.
-@@ -2610,14 +2570,12 @@ struct
-          if !debug_lexgen || !debug_lex then
-             eprintf "%a@." pp_print_nfa nfa
-       in
--      let { nfa_hash          = nfa_hash;
--            nfa_table         = nfa_table;
--            nfa_start         = nfa_start;
--            nfa_actions       = actions;
--            nfa_search_start  = nfa_search_start;
--            nfa_search_states = nfa_search_states
--          } = nfa
--      in
-+      let nfa_hash = nfa.nfa_hash in
-+      let nfa_table = nfa.nfa_table in
-+      let nfa_start = nfa.nfa_start in
-+      let actions = nfa.nfa_actions in
-+      let nfa_search_start = nfa.nfa_search_start in
-+      let nfa_search_states = nfa.nfa_search_states in
-       let dfa_hash = DfaState.create_state () in
-       let nfa_start = DfaState.create dfa_hash [nfa_start] in
-       let start =
-@@ -2673,8 +2631,8 @@ struct
-     * then we have seen all the rest of the clauses too.
-     *)
-    let union info1 info2 =
--      let { lex_exp = exp1 } = info1 in
--      let { lex_exp = exp2 } = info2 in
-+      let exp1 = info1.lex_exp in
-+      let exp2 = info2.lex_exp in
-          (* Catch degenerate cases first *)
-          match exp1.exp_clauses, exp2.exp_clauses with
-             [], _ -> info2
-@@ -2711,7 +2669,7 @@ struct
-       ignore (dfa_of_info info)
- 
-    let pp_print_lexer buf info =
--      let { lex_exp = exp } = info in
-+      let exp = info.lex_exp in
-       let dfa = dfa_of_info info in
-          fprintf buf "@[<v 0>@[<hv 3>Lexer:@ %a@]" pp_print_exp exp;
-          fprintf buf "@ @[<hv 3>NFA:";

devel/omake/files/patch-src_libmojave-external_util_lm__parser.ml

@@ -1,366 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/libmojave-external/util/lm_parser.ml.orig	2007-01-25 18:31:18 UTC
-+++ src/libmojave-external/util/lm_parser.ml
-@@ -282,15 +282,11 @@ struct
-       let debug = "ProdItem"
- 
-       let hash item =
--         let { prod_item_name   = name;
--               prod_item_left   = left;
--               prod_item_right  = right;
--               prod_item_action = action
--             } = item
--         in
-+         let name = item.prod_item_name in
-+         let action = item.prod_item_action in
-          let hash = hash_combine (IVar.hash name) (IAction.hash action) in
--         let hash = ivar_list_hash hash left in
--         let hash = ivar_list_hash hash right in
-+         let hash = ivar_list_hash hash item.prod_item_left in
-+         let hash = ivar_list_hash hash item.prod_item_right in
-             hash
- 
-       let compare item1 item2 =
-@@ -657,18 +653,12 @@ struct
-             fprintf buf "@ %a: %a" (pp_print_ivar info) v (pp_print_pda_action info) action) actions
- 
-    let pp_print_prod_item_core info buf item =
--      let { prod_item_action = action;
--            prod_item_name   = name;
--            prod_item_left   = left;
--            prod_item_right  = right
--          } = item
--      in
-       let hash = info.info_hash in
-          fprintf buf "%a ::=%a .%a (%a)" (**)
--            (pp_print_ivar hash) name
--            (pp_print_ivars hash) (List.rev left)
--            (pp_print_ivars hash) right
--            (pp_print_iaction hash) action
-+            (pp_print_ivar hash) item.prod_item_name
-+            (pp_print_ivars hash) (List.rev item.prod_item_left)
-+            (pp_print_ivars hash) item.prod_item_right
-+            (pp_print_iaction hash) item.prod_item_action
- 
-    let pp_print_prod_item info buf item =
-       pp_print_prod_item_core info buf (ProdItem.get info.info_hash.hash_prod_item_state item)
-@@ -678,40 +668,27 @@ struct
-             fprintf buf "@ %a" (pp_print_prod_item info) item) items
- 
-    let pp_print_state info buf state =
--      let { info_state_items = items } = State.get info.info_hash.hash_state_state state in
-+      let items = (State.get info.info_hash.hash_state_state state).info_state_items in
-          eprintf "@[<v 3>State %d" (State.hash state);
-          pp_print_prod_item_set info buf items;
-          eprintf "@]"
- 
-    let pp_print_info_item info buf info_item =
--      let { info_hash = hash;
--            info_hash_state_item = hash_state_item
--          } = info
--      in
--      let { info_item_index = index;
--            info_item_entries = entries
--          } = info_item
--      in
--         fprintf buf "@[<v 3>State %d:" index;
-+      let hash = info.info_hash in
-+      let hash_state_item = info.info_hash_state_item in
-+         fprintf buf "@[<v 3>State %d:" info_item.info_item_index;
-          Array.iter (fun entry ->
--               let { prop_state_item = state_item;
--                     prop_vars = lookahead
--                   } = entry
--               in
-+               let state_item = entry.prop_state_item in
-+               let lookahead = entry.prop_vars in
-                let _, prod_item = StateItem.get hash_state_item state_item in
--                  fprintf buf "@ @[<hv 3>%a@ @[<b 2>#%a@]@]" (pp_print_prod_item info) prod_item (pp_print_ivar_set hash) lookahead) entries;
-+                  fprintf buf "@ @[<hv 3>%a@ @[<b 2>#%a@]@]" (pp_print_prod_item info) prod_item (pp_print_ivar_set hash) lookahead) info_item.info_item_entries;
-          fprintf buf "@]"
- 
-    let pp_print_info buf info =
--      let { info_grammar = gram;
--            info_nullable = nullable;
--            info_first = first;
--            info_hash = hash
--          } = info
--      in
--         fprintf buf "@[<v 0>%a" pp_print_grammar gram;
--         fprintf buf "@ @[<b 3>Nullable:%a@]" (pp_print_ivar_set hash) nullable;
--         fprintf buf "@ @[<v 3>First:%a@]" (pp_print_ivar_table hash) first;
-+      let hash = info.info_hash in
-+         fprintf buf "@[<v 0>%a" pp_print_grammar info.info_grammar;
-+         fprintf buf "@ @[<b 3>Nullable:%a@]" (pp_print_ivar_set hash) info.info_nullable;
-+         fprintf buf "@ @[<v 3>First:%a@]" (pp_print_ivar_table hash) info.info_first;
-          fprintf buf "@]"
- 
-    let pp_print_lookahead hash buf look =
-@@ -917,16 +894,11 @@ struct
-       let changed, prods =
-          VarMTable.fold_all (fun (changed, prods) _ prodlist ->
-                List.fold_left (fun (changed, prods) prod ->
--                     let { prod_action = action;
--                           prod_name   = name;
--                           prod_prec   = pre
--                         } = prod
--                     in
--                        if ActionSet.mem actions action then
--                           changed, prods
--                        else
--                           let prod = { prod with prod_prec = PrecTable.find prec_translate pre } in
--                              true, VarMTable.add prods name prod) (changed, prods) prodlist) (false, prod1) prod2
-+                     if ActionSet.mem actions prod.prod_action then
-+                        changed, prods
-+                     else
-+                        let prod = { prod with prod_prec = PrecTable.find prec_translate prod.prod_prec } in
-+                           true, VarMTable.add prods prod.prod_name prod) (changed, prods) prodlist) (false, prod1) prod2
-       in
- 
-       (* Union of the start symbols *)
-@@ -1012,12 +984,10 @@ struct
-       let step first prods =
-          IVarTable.fold (fun (first, changed) _ prods ->
-                List.fold_left (fun (first, changed) prod ->
--                     let { prod_item_name = x;
--                           prod_item_right = rhs
--                         } = ProdItem.get prod_state prod
--                     in
-+                     let prod_item = ProdItem.get prod_state prod in
-+                     let x = prod_item.prod_item_name in
-                      let set = IVarTable.find first x in
--                     let set' = first_rhs nullable first set rhs in
-+                     let set' = first_rhs nullable first set prod_item.prod_item_right in
-                      let set, changed =
-                         if changed || IVarSet.cardinal set' <> IVarSet.cardinal set then
-                            set', true
-@@ -1059,10 +1029,8 @@ struct
-     * Get the set of first symbols that can begin a list.
-     *)
-    let lookahead info rhs =
--      let { info_first = first;
--            info_nullable = nullable
--          } = info
--      in
-+      let first = info.info_first in
-+      let nullable = info.info_nullable in
-       let rec search set rhs =
-          match rhs with
-             v :: rhs ->
-@@ -1274,14 +1242,10 @@ struct
-       let hash = info.info_hash.hash_prod_item_state in
-          ProdItemSet.fold (fun delta prod_item ->
-                let core = ProdItem.get hash prod_item in
--               let { prod_item_left = left;
--                     prod_item_right = right
--                   } = core
--               in
--                  match right with
-+                  match core.prod_item_right with
-                      v :: right ->
-                         let core =
--                           { core with prod_item_left = v :: left;
-+                           { core with prod_item_left = v :: core.prod_item_left;
-                                        prod_item_right = right
-                            }
-                         in
-@@ -1517,11 +1481,7 @@ struct
-       let goto_table = StateTable.find shift_table state in
-       let prod_item_hash = info.info_hash.hash_prod_item_state in
-       let prod_item_core = ProdItem.get prod_item_hash prod_item in
--      let { prod_item_left = left;
--            prod_item_right = right
--          } = prod_item_core
--      in
--         match right with
-+         match prod_item_core.prod_item_right with
-             v :: right ->
-                (* If v is a nonterminal, then also propagate to initial items *)
-                let prop_items =
-@@ -1534,7 +1494,7 @@ struct
-                (* Propagate directly to the next state *)
-                let next_state = IVarTable.find goto_table v in
-                let next_item_core =
--                  { prod_item_core with prod_item_left = v :: left;
-+                  { prod_item_core with prod_item_left = v :: prod_item_core.prod_item_left;
-                                         prod_item_right = right
-                   }
-                in
-@@ -1833,8 +1793,8 @@ struct
-                      item :: items ->
-                         let core = ProdItem.get hash item in
-                         let empty_flag =
--                           match core with
--                              { prod_item_left = []; prod_item_right = [] } ->
-+                           match core.prod_item_left, core.prod_item_right with
-+                              [], [] ->
-                                  true
-                             | _ ->
-                                  false
-@@ -1865,14 +1825,12 @@ struct
-                      look)
- 
-    let reduce_actions info empties prop_table =
--      let { info_head_lookahead = look_table } = info in
-+      let look_table = info.info_head_lookahead in
-       let hash = info.info_hash.hash_prod_item_state in
-       let hash_state_item = info.info_hash_state_item in
-          Array.fold_left (fun actions entry ->
--               let { prop_state_item = state_item;
--                     prop_vars = look3
--                   } = entry
--               in
-+               let state_item = entry.prop_state_item in
-+               let look3 = entry.prop_vars in
-                let state, item = StateItem.get hash_state_item state_item in
-                let core = ProdItem.get hash item in
-                   match core.prod_item_right with
-@@ -1902,8 +1860,8 @@ struct
-     * Error messages.
-     *)
-    let shift_reduce_conflict info state v shift_state reduce_item =
--      let { info_hash = hash } = info in
--      let { hash_prod_item_state = hash_prod_item } = hash in
-+      let hash = info.info_hash in
-+      let hash_prod_item = hash.hash_prod_item_state in
-       let pp_print_ivar = pp_print_ivar hash in
-       let pp_print_iaction = pp_print_iaction hash in
-       let reduce_core = ProdItem.get hash_prod_item reduce_item in
-@@ -1917,8 +1875,8 @@ struct
-             raise (Invalid_argument "Lm_parser.shift_reduce_conflict\n\tset MP_DEBUG=parse_conflict_is_warning to ignore this error")
- 
-    let reduce_reduce_conflict info state v reduce_item action =
--      let { info_hash = hash } = info in
--      let { hash_prod_item_state = hash_prod_item } = hash in
-+      let hash = info.info_hash in
-+      let hash_prod_item = hash.hash_prod_item_state in
-       let pp_print_ivar = pp_print_ivar hash in
-       let pp_print_iaction = pp_print_iaction hash in
-       let reduce_core = ProdItem.get hash_prod_item reduce_item in
-@@ -1936,24 +1894,18 @@ struct
-     * This is finally the stage where we check for conflicts.
-     *)
-    let process_reduce_actions info reduce_actions action_table =
--      let { info_grammar         = gram;
--            info_prec            = var_prec_table;
--            info_hash = { hash_prod_item_state = hash_prod_item }
--          } = info
--      in
--      let { gram_prec_table = prec_table } = gram in
-+      let gram = info.info_grammar in
-+      let var_prec_table = info.info_prec in
-+      let hash_prod_item = info.info_hash.hash_prod_item_state in
-+      let prec_table = gram.gram_prec_table in
-       let state_item_hash = info.info_hash_state_item in
-          StateItemTable.fold (fun action_table state_item look ->
-                let look = lookahead_set look in
-                let state, item = StateItem.get state_item_hash state_item in
--               let { prod_item_name   = name;
--                     prod_item_action = action;
--                     prod_item_left   = left;
--                     prod_item_prec   = prec_name
--                   } = ProdItem.get hash_prod_item item
--               in
-+               let prod_item = ProdItem.get hash_prod_item item in
-+               let prec_name = prod_item.prod_item_prec in
-                let assoc = Precedence.assoc prec_table prec_name in
--               let reduce = ReduceAction (action, name, List.length left) in
-+               let reduce = ReduceAction (prod_item.prod_item_action, prod_item.prod_item_name, List.length prod_item.prod_item_left) in
-                let actions = StateTable.find action_table state in
-                let actions =
-                   IVarSet.fold (fun actions v ->
-@@ -2006,7 +1958,8 @@ struct
-                { prod_item_right = [];
-                  prod_item_action = action;
-                  prod_item_name = name;
--                 prod_item_left = left
-+                 prod_item_left = left;
-+                 prod_item_prec = _
-                } ->
-                   let state_item = StateItem.create info.info_hash_state_item (state, item) in
-                   let lookahead = prop_table.(StateItem.hash state_item).prop_vars in
-@@ -2027,18 +1980,14 @@ struct
-     * Flatten a production state to a pda description.
-     *)
-    let pda_info_of_items info prop_table state items =
--      let { info_first = first;
--            info_hash_state_item = hash_state_item;
--            info_hash = { hash_prod_item_state = hash_prod_item }
--          } = info
--      in
-+      let first = info.info_first in
-+      let hash_state_item = info.info_hash_state_item in
-+      let hash_prod_item = info.info_hash.hash_prod_item_state in
-       let items, next =
-          ProdItemSet.fold (fun (items, next) prod_item ->
-                let core = ProdItem.get hash_prod_item prod_item in
--               let { prod_item_left  = left;
--                     prod_item_right = right
--                   } = core
--               in
-+               let left = core.prod_item_left in
-+               let right = core.prod_item_right in
-                let item =
-                   { pda_item_left  = left;
-                     pda_item_right = right
-@@ -2094,7 +2043,7 @@ struct
-       (* Build the PDA states *)
-       let table =
-          State.map_array (fun state core ->
--               let { info_state_items = items } = core in
-+               let items = core.info_state_items in
-                   { pda_delta  = pda_delta (StateTable.find trans_table state);
-                     pda_reduce = reduce_early info prop_table state items;
-                     pda_info   = pda_info_of_items info prop_table state items
-@@ -2155,7 +2104,7 @@ struct
-     * Exceptions.
-     *)
-    let parse_error loc hash run _stack state (v : ivar) =
--      let { pda_info = { pda_items = items; pda_next = next } } = run.run_states.(state) in
-+      let { pda_items = items; pda_next = next } = run.run_states.(state).pda_info in
-       let pp_print_ivar = pp_print_ivar hash in
-       let buf = stdstr in
-          fprintf buf "@[<v 0>Syntax error on token %a" pp_print_ivar v;
-@@ -2188,7 +2137,7 @@ struct
- 
-    let pda_loop hash run arg start =
-       let rec pda_lookahead arg stack state tok =
--         let { pda_delta = delta } = run.run_states.(state) in
-+         let delta = run.run_states.(state).pda_delta in
-          let v, loc, x = tok in
-             match
-                (try IVarTable.find delta v with
-@@ -2323,24 +2272,24 @@ struct
-    let prec_max = Precedence.prec_max
- 
-    let add_assoc info pre assoc =
--      let { parse_grammar = gram } = info in
--      let { gram_prec_table = prec_table } = gram in
-+      let gram = info.parse_grammar in
-+      let prec_table = gram.gram_prec_table in
-       let prec_table = Precedence.add_assoc prec_table pre assoc in
-       let gram = { gram with gram_prec_table = prec_table } in
-       let info = { parse_grammar = gram; parse_pda = None } in
-          info
- 
-    let create_prec_lt info pre assoc =
--      let { parse_grammar = gram } = info in
--      let { gram_prec_table = prec_table } = gram in
-+      let gram = info.parse_grammar in
-+      let prec_table = gram.gram_prec_table in
-       let prec_table, pre = Precedence.create_prec_lt prec_table pre assoc in
-       let gram = { gram with gram_prec_table = prec_table } in
-       let info = { parse_grammar = gram; parse_pda = None } in
-          info, pre
- 
-    let create_prec_gt info pre assoc =
--      let { parse_grammar = gram } = info in
--      let { gram_prec_table = prec_table } = gram in
-+      let gram = info.parse_grammar in
-+      let prec_table = gram.gram_prec_table in
-       let prec_table, pre = Precedence.create_prec_gt prec_table pre assoc in
-       let gram = { gram with gram_prec_table = prec_table } in
-       let info = { parse_grammar = gram; parse_pda = None } in

devel/omake/pkg-plist

@@ -1,4 +1,3 @@
-bin/cvs_realclean
 bin/omake
 bin/osh
 lib/omake/OMakefile.default
@@ -14,7 +13,9 @@ lib/omake/configure/Configure.om
 lib/omake/configure/X.om
 lib/omake/configure/fam.om
 lib/omake/configure/fs_case_sensitive.om
+lib/omake/configure/moncontrol.om
 lib/omake/configure/ncurses.om
+lib/omake/configure/posix_spawn.om
 lib/omake/configure/readline.om
 lib/omake/configure/snprintf.om
 lib/omake/parse/C/Lex.om
@@ -24,6 +25,7 @@ lib/omake/parse/LaTeX/Macros.om
 lib/omake/parse/LaTeX/Parse.om
 lib/omake/parse/LaTeX/Spell.om
 lib/omake/web/simple-xml.om
+%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-all-index.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-autoconf.html
 %%PORTDOCS%%%%DOCSDIR%%/omake-base.html

devel/py-QtPy/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	QtPy
-DISTVERSION=	1.10.0
+DISTVERSION=	1.11.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,6 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>

devel/py-QtPy/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1629870494
-SHA256 (QtPy-1.10.0.tar.gz) = 3d20f010caa3b2c04835d6a2f66f8873b041bdaf7a76085c2a0d7890cdd65ea9
-SIZE (QtPy-1.10.0.tar.gz) = 34339
+TIMESTAMP = 1630813650
+SHA256 (QtPy-1.11.0.tar.gz) = bbd61f8d6480a01cec39ad94249dbde7d0a8fce2aca61ff5037b645c4fd13e02
+SIZE (QtPy-1.11.0.tar.gz) = 36855

devel/py-itemadapter/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	itemadapter
-DISTVERSION=	0.3.0
+DISTVERSION=	0.4.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

devel/py-itemadapter/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1626609070
-SHA256 (itemadapter-0.3.0.tar.gz) = ab2651ba20f5f6d0e15f041deba4c13ffc59270def2bd01518d13e94c4cd27d1
-SIZE (itemadapter-0.3.0.tar.gz) = 12436
+TIMESTAMP = 1630710283
+SHA256 (itemadapter-0.4.0.tar.gz) = f05df8da52619da4b8c7f155d8a15af19083c0c7ad941d8c1de799560ad994ca
+SIZE (itemadapter-0.4.0.tar.gz) = 12834

devel/py-libvirt/Makefile

@@ -1,7 +1,7 @@
 # Created by: Jason Helfman <jgh@FreeBSD.org>
 
 PORTNAME=	libvirt
-PORTVERSION=	7.6.0
+PORTVERSION=	7.7.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/python/ \
 		ftp://libvirt.org/libvirt/python/

devel/py-libvirt/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1627969365
-SHA256 (libvirt-python-7.6.0.tar.gz) = d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
-SIZE (libvirt-python-7.6.0.tar.gz) = 217448
+TIMESTAMP = 1630649473
+SHA256 (libvirt-python-7.7.0.tar.gz) = cc8d6528cef7cf395c5d97566328f16faef6b5653a500b0e88c9c0fc36b72cdb
+SIZE (libvirt-python-7.7.0.tar.gz) = 217406

devel/py-spyder-kernels/Makefile

@@ -1,7 +1,7 @@
 # Created by: Rainer Hurling <rhurlin@gwdg.de>
 
 PORTNAME=	spyder-kernels
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

devel/py-spyder-kernels/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1627971694
-SHA256 (spyder-kernels-2.1.0.tar.gz) = 6c287207c7855bb581eae66ef8d990407382d5f9caccb1e0cabf909aaaf10c9b
-SIZE (spyder-kernels-2.1.0.tar.gz) = 65048
+TIMESTAMP = 1630672307
+SHA256 (spyder-kernels-2.1.1.tar.gz) = 3373abddf38cc03cb9d7659e9acd70ab599c51a44eb07b304bdc2671e2e4ac3a
+SIZE (spyder-kernels-2.1.1.tar.gz) = 65569

devel/sonarqube-community/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	sonarqube
 DISTVERSION=	9.0.1.46107
-PORTREVISION=	0
+PORTREVISION=	1
 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 \
@@ -51,10 +51,10 @@ DBBASE_DIR=	/var/db/${PORTNAME}
 DATA_DIR=	${DBBASE_DIR}/data
 TEMP_DIR=	${DBBASE_DIR}/temp
 
-SONARCSHARP_VER=	8.26.0.34506
+SONARCSHARP_VER=	8.28.0.36372
 SONARJAVA_VER=		7.2.0.26923
-SONARJAVASCRIPT_VER=	8.1.0.15788
-SONARPHP_VER=		3.17.0.7439
+SONARJAVASCRIPT_VER=	8.3.0.16208
+SONARPHP_VER=		3.19.0.7847
 SONARPYTHON_VER=	3.6.0.8488
 SONARVBNET_VER=		${SONARCSHARP_VER}
 

devel/sonarqube-community/distinfo

@@ -1,15 +1,15 @@
-TIMESTAMP = 1627558927
+TIMESTAMP = 1630751292
 SHA256 (sonarqube-9.0.1.46107.zip) = cb27f3230c8126f7082b89a7d018734b59321821e150a50c016e5cb887e68c5c
 SIZE (sonarqube-9.0.1.46107.zip) = 290201762
-SHA256 (sonar-csharp-plugin-8.26.0.34506.jar) = aca77309bef15a9a48c4c8d53b5f72db37309424ac47e26e3af1991405402b23
-SIZE (sonar-csharp-plugin-8.26.0.34506.jar) = 5390201
+SHA256 (sonar-csharp-plugin-8.28.0.36372.jar) = e073a83f9f57fc951752c780a32e4e8f47b766e86fc1e82433755ca82f28993a
+SIZE (sonar-csharp-plugin-8.28.0.36372.jar) = 5420885
 SHA256 (sonar-java-plugin-7.2.0.26923.jar) = 9548be4bb19af614faabca4a7a648df9fb9c19eae634fc2e9c4271fb567424ad
 SIZE (sonar-java-plugin-7.2.0.26923.jar) = 17636710
-SHA256 (sonar-javascript-plugin-8.1.0.15788.jar) = 0c17fd91ad203186e766e5d17793d329a7df0240885cc82a02a06894a3a6c96d
-SIZE (sonar-javascript-plugin-8.1.0.15788.jar) = 20464408
-SHA256 (sonar-php-plugin-3.17.0.7439.jar) = 058004a29deb22254609250ffbacc885bdcf6ba3d09ec60438a7970871b8c897
-SIZE (sonar-php-plugin-3.17.0.7439.jar) = 5099105
+SHA256 (sonar-javascript-plugin-8.3.0.16208.jar) = d350b4aa52cbda0aee07111679d74434712e297408667fda60bbc5fd9343dd76
+SIZE (sonar-javascript-plugin-8.3.0.16208.jar) = 19834062
+SHA256 (sonar-php-plugin-3.19.0.7847.jar) = 7d79a26bd7309e46f1a32a5fbdcffaa3628fb237bfba0be51e7be4a7ebd1ee0d
+SIZE (sonar-php-plugin-3.19.0.7847.jar) = 5169882
 SHA256 (sonar-python-plugin-3.6.0.8488.jar) = 3308494e7c2e8d37af9823b1879bfa1b5464f6a728fb2fab11920ab10c0a112f
 SIZE (sonar-python-plugin-3.6.0.8488.jar) = 6290520
-SHA256 (sonar-vbnet-plugin-8.26.0.34506.jar) = 95fe5603ff360ee730d647aa1b64a83faaedbd094d1a95f2b6b1aee70024978b
-SIZE (sonar-vbnet-plugin-8.26.0.34506.jar) = 3880679
+SHA256 (sonar-vbnet-plugin-8.28.0.36372.jar) = 44af10e509f78231b59eeb809ccdd99215f98aac25cc6e22b87a9f09148d400f
+SIZE (sonar-vbnet-plugin-8.28.0.36372.jar) = 3907169

devel/stack/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	stack
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel haskell
 
@@ -19,9 +19,9 @@ USE_PERL5=	run
 
 CABAL_FLAGS=	-support_aesni
 
-USE_CABAL=	Glob-0.10.1 \
+USE_CABAL=	Glob-0.10.1_1 \
 		StateVar-1.2.1 \
-		aeson-1.5.6.0_1 \
+		aeson-1.5.6.0_2 \
 		annotated-wl-pprint-0.7.0_1 \
 		ansi-terminal-0.11 \
 		ansi-wl-pprint-0.6.9_2 \
@@ -32,7 +32,7 @@ USE_CABAL=	Glob-0.10.1 \
 		assoc-1.0.2_1 \
 		async-2.2.3 \
 		attoparsec-0.14.1 \
-		attoparsec-iso8601-1.0.2.0_1 \
+		attoparsec-iso8601-1.0.2.0_2 \
 		auto-update-0.1.6 \
 		base-compat-0.11.2 \
 		base-compat-batteries-0.11.2 \
@@ -40,7 +40,7 @@ USE_CABAL=	Glob-0.10.1 \
 		base16-bytestring-1.0.1.0 \
 		base64-bytestring-1.2.0.1 \
 		basement-0.0.12_1 \
-		bifunctors-5.5.11 \
+		bifunctors-5.5.11_1 \
 		blaze-builder-0.4.2.1 \
 		blaze-html-0.9.1.2_1 \
 		blaze-markup-0.8.2.8 \
@@ -52,20 +52,20 @@ USE_CABAL=	Glob-0.10.1 \
 		clock-0.8.2 \
 		cmdargs-0.10.21 \
 		colour-2.3.5 \
-		comonad-5.0.8 \
+		comonad-5.0.8_1 \
 		conduit-1.3.4.1 \
 		conduit-combinators-1.3.0 \
 		conduit-extra-1.3.5 \
 		connection-0.3.1_1 \
 		contravariant-1.5.3 \
 		cookie-0.4.5 \
-		cryptohash-sha256-0.11.102.0 \
+		cryptohash-sha256-0.11.102.0_1 \
 		cryptonite-0.29 \
 		cryptonite-conduit-0.2.2_1 \
 		data-default-class-0.1.2.0 \
 		data-fix-0.3.1 \
 		digest-0.0.1.2 \
-		distributive-0.6.2.1 \
+		distributive-0.6.2.1_1 \
 		dlist-1.0 \
 		easy-file-0.2.2 \
 		echo-0.1.4 \
@@ -79,19 +79,19 @@ USE_CABAL=	Glob-0.10.1 \
 		fsnotify-0.3.0.1_1 \
 		generic-deriving-1.14_1 \
 		githash-0.1.5.0 \
-		hackage-security-0.6.0.1_5 \
+		hackage-security-0.6.0.1_8 \
 		hashable-1.3.1.0 \
 		hi-file-parser-0.1.2.0 \
 		hourglass-0.2.12 \
 		hpack-0.34.4 \
 		hsc2hs-0.68.7_1 \
-		http-api-data-0.4.3_2 \
+		http-api-data-0.4.3_3 \
 		http-client-0.7.8 \
 		http-client-tls-0.3.5.3_1 \
 		http-conduit-2.3.8 \
 		http-download-0.2.0.0 \
 		http-types-0.12.3 \
-		indexed-traversable-0.1.1 \
+		indexed-traversable-0.1.1_1 \
 		infer-license-0.2.0 \
 		integer-logarithms-1.0.3.1 \
 		iproute-1.7.11 \
@@ -109,7 +109,7 @@ USE_CABAL=	Glob-0.10.1 \
 		monad-control-1.0.2.3 \
 		monad-logger-0.3.36 \
 		monad-loops-0.4.3 \
-		mono-traversable-1.0.15.1 \
+		mono-traversable-1.0.15.1_1 \
 		mustache-2.3.1 \
 		neat-interpolation-0.5.1.2 \
 		network-3.1.2.1_1 \
@@ -117,7 +117,7 @@ USE_CABAL=	Glob-0.10.1 \
 		old-locale-1.0.0.7_2 \
 		old-time-1.1.0.3_2 \
 		open-browser-0.2.1.0 \
-		optparse-applicative-0.16.1.0 \
+		optparse-applicative-0.16.1.0_1 \
 		optparse-simple-0.1.1.3 \
 		pantry-0.5.2.1 \
 		parser-combinators-1.3.0 \
@@ -128,10 +128,10 @@ USE_CABAL=	Glob-0.10.1 \
 		persistent-2.13.0.1 \
 		persistent-sqlite-2.13.0.0_1 \
 		persistent-template-2.12.0.0 \
-		primitive-0.7.1.0_2 \
-		profunctors-5.6.2 \
+		primitive-0.7.1.0_3 \
+		profunctors-5.6.2_1 \
 		project-template-0.2.1.0 \
-		random-1.2.0_5 \
+		random-1.2.0_6 \
 		regex-applicative-0.3.4 \
 		regex-applicative-text-0.1.0.1_5 \
 		resource-pool-0.2.3.2 \
@@ -143,38 +143,38 @@ USE_CABAL=	Glob-0.10.1 \
 		safe-0.3.19 \
 		safe-exceptions-0.1.7.1 \
 		scientific-0.3.6.2 \
-		semigroupoids-5.3.5 \
-		semigroups-0.19.1 \
+		semigroupoids-5.3.5_1 \
+		semigroups-0.19.1_1 \
 		silently-1.2.5.1 \
 		socks-0.6.1 \
 		split-0.2.3.4_1 \
 		splitmix-0.1.0.3 \
 		stm-chans-3.0.0.4_1 \
 		streaming-commons-0.2.2.1 \
-		strict-0.4.0.1 \
+		strict-0.4.0.1_1 \
 		syb-0.7.2.1 \
-		tagged-0.8.6.1_1 \
+		tagged-0.8.6.1_2 \
 		tar-0.5.1.1_3 \
 		tar-conduit-0.3.2 \
 		temporary-1.3 \
 		text-metrics-0.3.0_4 \
 		th-abstraction-0.4.2.0_1 \
 		th-compat-0.1.2 \
-		th-expand-syns-0.4.8.0 \
+		th-expand-syns-0.4.8.0_1 \
 		th-lift-0.8.2_1 \
 		th-lift-instances-0.1.18 \
-		th-reify-many-0.1.9 \
-		these-1.1.1.1_1 \
+		th-reify-many-0.1.9_1 \
+		these-1.1.1.1_2 \
 		time-compat-1.9.5_1 \
 		tls-1.5.5 \
-		transformers-base-0.4.5.2 \
+		transformers-base-0.4.5.2_1 \
 		transformers-compat-0.6.6 \
 		typed-process-0.2.6.0 \
-		unicode-transforms-0.3.7.1_1 \
+		unicode-transforms-0.3.7.1_2 \
 		unix-compat-0.5.3 \
 		unix-time-0.4.7 \
 		unliftio-0.2.16 \
-		unliftio-core-0.2.0.1_1 \
+		unliftio-core-0.2.0.1_2 \
 		unordered-containers-0.2.13.0 \
 		uuid-types-1.0.5 \
 		vector-0.12.3.0 \

devel/stack/distinfo

@@ -1,12 +1,14 @@
-TIMESTAMP = 1620927454
+TIMESTAMP = 1630493872
 SHA256 (cabal/Glob-0.10.1/Glob-0.10.1.tar.gz) = cae4476d944947010705e0b00cf3e36c90ef407f968861f6771b931056b6d315
 SIZE (cabal/Glob-0.10.1/Glob-0.10.1.tar.gz) = 29763
+SHA256 (cabal/Glob-0.10.1/revision/1.cabal) = 17cbe8f4f023d3288d168f5eb34f9fd1125348ece2682bad2137ed8a06d5d0d6
+SIZE (cabal/Glob-0.10.1/revision/1.cabal) = 3108
 SHA256 (cabal/StateVar-1.2.1/StateVar-1.2.1.tar.gz) = ee261552912b60d8b937f0253615e310e6cc25f9c407001b3bcc2e3d55000f8b
 SIZE (cabal/StateVar-1.2.1/StateVar-1.2.1.tar.gz) = 5055
 SHA256 (cabal/aeson-1.5.6.0/aeson-1.5.6.0.tar.gz) = 0361c34be3d2ec945201f02501693436fbda10dcc549469481a084b2de22bfe8
 SIZE (cabal/aeson-1.5.6.0/aeson-1.5.6.0.tar.gz) = 286364
-SHA256 (cabal/aeson-1.5.6.0/revision/1.cabal) = d3e76872f8634c9cd33eb128d6c4dd1bf0cc8d71d1f32055d774490d5f6dedf8
-SIZE (cabal/aeson-1.5.6.0/revision/1.cabal) = 6786
+SHA256 (cabal/aeson-1.5.6.0/revision/2.cabal) = 72c170b9fa0a4d1eaf47098902c621d0d95331cda1ebc4d86582bd557756b3ff
+SIZE (cabal/aeson-1.5.6.0/revision/2.cabal) = 6791
 SHA256 (cabal/annotated-wl-pprint-0.7.0/annotated-wl-pprint-0.7.0.tar.gz) = 0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18
 SIZE (cabal/annotated-wl-pprint-0.7.0/annotated-wl-pprint-0.7.0.tar.gz) = 10338
 SHA256 (cabal/annotated-wl-pprint-0.7.0/revision/1.cabal) = 5d6e26cfeb17a187e992d482d8811d89df6a061f2bf0c6dba120d1dd3111138d
@@ -37,8 +39,8 @@ SHA256 (cabal/attoparsec-0.14.1/attoparsec-0.14.1.tar.gz) = 870f8f81d90c28f977c0
 SIZE (cabal/attoparsec-0.14.1/attoparsec-0.14.1.tar.gz) = 165043
 SHA256 (cabal/attoparsec-iso8601-1.0.2.0/attoparsec-iso8601-1.0.2.0.tar.gz) = 02952d77c78e95710eea855f4e86ca048ab9fda83c6c08dd9215f21a40604f98
 SIZE (cabal/attoparsec-iso8601-1.0.2.0/attoparsec-iso8601-1.0.2.0.tar.gz) = 4427
-SHA256 (cabal/attoparsec-iso8601-1.0.2.0/revision/1.cabal) = aa26c75c7c02c05e82c3ae8d91f9dfa48165b30da21c73b51d575227abf583b0
-SIZE (cabal/attoparsec-iso8601-1.0.2.0/revision/1.cabal) = 1664
+SHA256 (cabal/attoparsec-iso8601-1.0.2.0/revision/2.cabal) = f517cd588d0a64fd3cbec083ca67c671e68861ed9c97b1349070ee577c3fa5a0
+SIZE (cabal/attoparsec-iso8601-1.0.2.0/revision/2.cabal) = 1669
 SHA256 (cabal/auto-update-0.1.6/auto-update-0.1.6.tar.gz) = f4e023dc8713c387ecf20d851247597fd012cabea3872310b35e911105eb66c4
 SIZE (cabal/auto-update-0.1.6/auto-update-0.1.6.tar.gz) = 10929
 SHA256 (cabal/base-compat-0.11.2/base-compat-0.11.2.tar.gz) = 53a6b5145442fba5a4bad6db2bcdede17f164642b48bc39b95015422a39adbdb
@@ -57,6 +59,8 @@ SHA256 (cabal/basement-0.0.12/revision/1.cabal) = cbb9187d3575b78ee1165b7a49a0e8
 SIZE (cabal/basement-0.0.12/revision/1.cabal) = 5516
 SHA256 (cabal/bifunctors-5.5.11/bifunctors-5.5.11.tar.gz) = 2b6b9672faab649995cf4c885f353b6638b6daee467a9ace40a7fc773831091c
 SIZE (cabal/bifunctors-5.5.11/bifunctors-5.5.11.tar.gz) = 46003
+SHA256 (cabal/bifunctors-5.5.11/revision/1.cabal) = cc425ee85aae56dba1123baf6fb3fa7abcd90782f26bb904eef14c7332ee85f6
+SIZE (cabal/bifunctors-5.5.11/revision/1.cabal) = 3919
 SHA256 (cabal/blaze-builder-0.4.2.1/blaze-builder-0.4.2.1.tar.gz) = 6e6889bc9c3ff92062a17f3825dcc1b28510d261334d4d4e177232d904ea0b06
 SIZE (cabal/blaze-builder-0.4.2.1/blaze-builder-0.4.2.1.tar.gz) = 60704
 SHA256 (cabal/blaze-html-0.9.1.2/blaze-html-0.9.1.2.tar.gz) = 60503f42546c6c1b954014d188ea137e43d74dcffd2bf6157c113fd91a0c394c
@@ -83,6 +87,8 @@ SHA256 (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 3b8d471979617dce7c193523743c97
 SIZE (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 20485
 SHA256 (cabal/comonad-5.0.8/comonad-5.0.8.tar.gz) = ef6cdf2cc292cc43ee6aa96c581b235fdea8ab44a0bffb24dc79ae2b2ef33d13
 SIZE (cabal/comonad-5.0.8/comonad-5.0.8.tar.gz) = 15227
+SHA256 (cabal/comonad-5.0.8/revision/1.cabal) = 1f1aabd73ec7f80f20cf078a748a60cd48d8e57277802fdf6a9ab3601a9b8f7e
+SIZE (cabal/comonad-5.0.8/revision/1.cabal) = 3631
 SHA256 (cabal/conduit-1.3.4.1/conduit-1.3.4.1.tar.gz) = 85743b8d5f2d5779ccb7459b5a919c5786707af23fe7a065d281ee8e6dc226f1
 SIZE (cabal/conduit-1.3.4.1/conduit-1.3.4.1.tar.gz) = 88893
 SHA256 (cabal/conduit-combinators-1.3.0/conduit-combinators-1.3.0.tar.gz) = 9717d916a0422a7fb7cc262302333269607530d40cd0bea3be947872f906e7d3
@@ -99,6 +105,8 @@ SHA256 (cabal/cookie-0.4.5/cookie-0.4.5.tar.gz) = 707f94d1b31018b91d6a1e9e19ef54
 SIZE (cabal/cookie-0.4.5/cookie-0.4.5.tar.gz) = 6048
 SHA256 (cabal/cryptohash-sha256-0.11.102.0/cryptohash-sha256-0.11.102.0.tar.gz) = 8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519
 SIZE (cabal/cryptohash-sha256-0.11.102.0/cryptohash-sha256-0.11.102.0.tar.gz) = 15636
+SHA256 (cabal/cryptohash-sha256-0.11.102.0/revision/1.cabal) = 797a0af7b8a0e654cbddd3df6b9de02d2cbfcb2292cf001399ab53910fbbb76c
+SIZE (cabal/cryptohash-sha256-0.11.102.0/revision/1.cabal) = 5678
 SHA256 (cabal/cryptonite-0.29/cryptonite-0.29.tar.gz) = d83a021cdaae90f3734b725a03ac7b555e999809779ec197011d2da8e1b8b08f
 SIZE (cabal/cryptonite-0.29/cryptonite-0.29.tar.gz) = 622119
 SHA256 (cabal/cryptonite-conduit-0.2.2/cryptonite-conduit-0.2.2.tar.gz) = 705d69ab3f79b7b8810c7b9e7da81a1c6686b6a4323b1e78150576a25a658dae
@@ -113,6 +121,8 @@ SHA256 (cabal/digest-0.0.1.2/digest-0.0.1.2.tar.gz) = 641717eb16392abf8965986a9e
 SIZE (cabal/digest-0.0.1.2/digest-0.0.1.2.tar.gz) = 3790
 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
+SIZE (cabal/distributive-0.6.2.1/revision/1.cabal) = 2996
 SHA256 (cabal/dlist-1.0/dlist-1.0.tar.gz) = 173d637328bb173fcc365f30d29ff4a94292a1e0e5558aeb3dfc11de81510115
 SIZE (cabal/dlist-1.0/dlist-1.0.tar.gz) = 18667
 SHA256 (cabal/easy-file-0.2.2/easy-file-0.2.2.tar.gz) = 52f52e72ba48d60935932401c233a72bf45c582871238aecc5a18021ce67b47e
@@ -149,8 +159,8 @@ SHA256 (cabal/githash-0.1.5.0/githash-0.1.5.0.tar.gz) = 146fef47fae91d2d26a08945
 SIZE (cabal/githash-0.1.5.0/githash-0.1.5.0.tar.gz) = 6773
 SHA256 (cabal/hackage-security-0.6.0.1/hackage-security-0.6.0.1.tar.gz) = 9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17
 SIZE (cabal/hackage-security-0.6.0.1/hackage-security-0.6.0.1.tar.gz) = 86006
-SHA256 (cabal/hackage-security-0.6.0.1/revision/5.cabal) = e7243dc32731692f2f384e184e5509422488975abb1eafc1b552de711f73226f
-SIZE (cabal/hackage-security-0.6.0.1/revision/5.cabal) = 12304
+SHA256 (cabal/hackage-security-0.6.0.1/revision/8.cabal) = ae6cdda307237c0b7efeebfb0bf23ff8a26c30f5ba295dce5e4f81ef6e63fff6
+SIZE (cabal/hackage-security-0.6.0.1/revision/8.cabal) = 12304
 SHA256 (cabal/hashable-1.3.1.0/hashable-1.3.1.0.tar.gz) = 8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4
 SIZE (cabal/hashable-1.3.1.0/hashable-1.3.1.0.tar.gz) = 21424
 SHA256 (cabal/hi-file-parser-0.1.2.0/hi-file-parser-0.1.2.0.tar.gz) = 695f8a7baae616b47ec2b5105ab999bef5847a70e7eb6da31d7c3ab5e27aa3ca
@@ -165,8 +175,8 @@ SHA256 (cabal/hsc2hs-0.68.7/revision/1.cabal) = 4a0f6860a17e7c245646975e3c298141
 SIZE (cabal/hsc2hs-0.68.7/revision/1.cabal) = 2794
 SHA256 (cabal/http-api-data-0.4.3/http-api-data-0.4.3.tar.gz) = df2747abb477a46c382cd6c2e3a7a2e2f4ba9317fc9de34703e55d4294e02b9c
 SIZE (cabal/http-api-data-0.4.3/http-api-data-0.4.3.tar.gz) = 20827
-SHA256 (cabal/http-api-data-0.4.3/revision/2.cabal) = 31005a0514d795d38574239910fcc94810f16b2254a0d9ded7cc08bb8e211fc6
-SIZE (cabal/http-api-data-0.4.3/revision/2.cabal) = 3812
+SHA256 (cabal/http-api-data-0.4.3/revision/3.cabal) = 9607047dbbca75a989dd7e0f4d475f40f431423d805a83262aea8e32971cb142
+SIZE (cabal/http-api-data-0.4.3/revision/3.cabal) = 3812
 SHA256 (cabal/http-client-0.7.8/http-client-0.7.8.tar.gz) = 18fcaf0340871daa1859596e9338feda65888084e97f782b7c4c003a956b7e10
 SIZE (cabal/http-client-0.7.8/http-client-0.7.8.tar.gz) = 92430
 SHA256 (cabal/http-client-tls-0.3.5.3/http-client-tls-0.3.5.3.tar.gz) = 471abf8f29a909f40b21eab26a410c0e120ae12ce337512a61dae9f52ebb4362
@@ -181,6 +191,8 @@ SHA256 (cabal/http-types-0.12.3/http-types-0.12.3.tar.gz) = 4e8a4a66477459fa436a
 SIZE (cabal/http-types-0.12.3/http-types-0.12.3.tar.gz) = 13547
 SHA256 (cabal/indexed-traversable-0.1.1/indexed-traversable-0.1.1.tar.gz) = 7ac36ae3153cbe7a8e99eacffd065367b87544953cc92997f424a150db468139
 SIZE (cabal/indexed-traversable-0.1.1/indexed-traversable-0.1.1.tar.gz) = 8424
+SHA256 (cabal/indexed-traversable-0.1.1/revision/1.cabal) = e4602357513aa3b146546227732e6e5698392f4324ab690e109cc05676ba3b4f
+SIZE (cabal/indexed-traversable-0.1.1/revision/1.cabal) = 2491
 SHA256 (cabal/infer-license-0.2.0/infer-license-0.2.0.tar.gz) = 12e6fe616575159c03cf6fd4a4f30021ecf264a529ab4e4edd6e96e296a98e72
 SIZE (cabal/infer-license-0.2.0/infer-license-0.2.0.tar.gz) = 48173
 SHA256 (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9b0a9f9fab609b15cd015865721fb05f744a1bc77ae92fd133872de528bbea7f
@@ -221,6 +233,8 @@ SHA256 (cabal/monad-loops-0.4.3/monad-loops-0.4.3.tar.gz) = 7eaaaf6bc43661e9e86e
 SIZE (cabal/monad-loops-0.4.3/monad-loops-0.4.3.tar.gz) = 4996
 SHA256 (cabal/mono-traversable-1.0.15.1/mono-traversable-1.0.15.1.tar.gz) = c2df5b79ed2f88f2ee313e57c1d591d4463788e20d39e439297eec5ba5835ddf
 SIZE (cabal/mono-traversable-1.0.15.1/mono-traversable-1.0.15.1.tar.gz) = 40815
+SHA256 (cabal/mono-traversable-1.0.15.1/revision/1.cabal) = 9ea638260fb4ea04ef138b9954922531f61e50df427565ed6969138cac77ffaf
+SIZE (cabal/mono-traversable-1.0.15.1/revision/1.cabal) = 2252
 SHA256 (cabal/mustache-2.3.1/mustache-2.3.1.tar.gz) = ac8bf93d36fc766f54a54b72ddf71d1ab90864ca86bdce3415d2e69823fdb348
 SIZE (cabal/mustache-2.3.1/mustache-2.3.1.tar.gz) = 20207
 SHA256 (cabal/neat-interpolation-0.5.1.2/neat-interpolation-0.5.1.2.tar.gz) = 962a4a92da4911c8e5b784ed43200b764ea8c6b3add032a09c57658e4b4684a1
@@ -243,6 +257,8 @@ SHA256 (cabal/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz) = 0bed2e63800f73
 SIZE (cabal/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz) = 2629
 SHA256 (cabal/optparse-applicative-0.16.1.0/optparse-applicative-0.16.1.0.tar.gz) = 6205278362f333c52256b9dd3edf5f8fe0f84f00cb9ee000291089f6eaccd69a
 SIZE (cabal/optparse-applicative-0.16.1.0/optparse-applicative-0.16.1.0.tar.gz) = 58315
+SHA256 (cabal/optparse-applicative-0.16.1.0/revision/1.cabal) = 16ebd7054b2265c1aad16c1d19dc503695fbfc67b35203d9952fd577d08c0110
+SIZE (cabal/optparse-applicative-0.16.1.0/revision/1.cabal) = 4982
 SHA256 (cabal/optparse-simple-0.1.1.3/optparse-simple-0.1.1.3.tar.gz) = 3365d415a437ffe760ae642fea80ee63cee00d7e00218ed49ccf6ac114c4d5f3
 SIZE (cabal/optparse-simple-0.1.1.3/optparse-simple-0.1.1.3.tar.gz) = 5096
 SHA256 (cabal/pantry-0.5.2.1/pantry-0.5.2.1.tar.gz) = d3848098b15df155070c8d329a1f24f6f2e6be1d317a5337b0d5a8fe2a3a3b3c
@@ -271,16 +287,18 @@ SHA256 (cabal/persistent-template-2.12.0.0/persistent-template-2.12.0.0.tar.gz)
 SIZE (cabal/persistent-template-2.12.0.0/persistent-template-2.12.0.0.tar.gz) = 4506
 SHA256 (cabal/primitive-0.7.1.0/primitive-0.7.1.0.tar.gz) = 6bebecfdf2a57787d9fd5231bfd612b65a92edd7b33a973b2a0f11312b89a3f0
 SIZE (cabal/primitive-0.7.1.0/primitive-0.7.1.0.tar.gz) = 52184
-SHA256 (cabal/primitive-0.7.1.0/revision/2.cabal) = f6357d5720c1c665096c3e011467daf443198b786a708d2ff926958a24d508d4
-SIZE (cabal/primitive-0.7.1.0/revision/2.cabal) = 2728
+SHA256 (cabal/primitive-0.7.1.0/revision/3.cabal) = 29de6bfd0cf8ba023ceb806203dfbec0e51e3524e75ffe41056f70b4229c6f0f
+SIZE (cabal/primitive-0.7.1.0/revision/3.cabal) = 2728
 SHA256 (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 65955d7b50525a4a3bccdab1d982d2ae342897fd38140d5a94b5ef3800d8c92a
 SIZE (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 28522
+SHA256 (cabal/profunctors-5.6.2/revision/1.cabal) = d91e81cf7fc186d616543d5ca7aad78b1c45c692486ca75a3f022466ff8e4bad
+SIZE (cabal/profunctors-5.6.2/revision/1.cabal) = 2483
 SHA256 (cabal/project-template-0.2.1.0/project-template-0.2.1.0.tar.gz) = 2d99e5bf750e409d8f2daa2a9038ce39c40c310e2e52076549659968461f8429
 SIZE (cabal/project-template-0.2.1.0/project-template-0.2.1.0.tar.gz) = 8485
 SHA256 (cabal/random-1.2.0/random-1.2.0.tar.gz) = e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de
 SIZE (cabal/random-1.2.0/random-1.2.0.tar.gz) = 37889
-SHA256 (cabal/random-1.2.0/revision/5.cabal) = 30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9
-SIZE (cabal/random-1.2.0/revision/5.cabal) = 6094
+SHA256 (cabal/random-1.2.0/revision/6.cabal) = 195506fedaa7c31c1fa2a747e9b49b4a5d1f0b09dd8f1291f23a771656faeec3
+SIZE (cabal/random-1.2.0/revision/6.cabal) = 6097
 SHA256 (cabal/regex-applicative-0.3.4/regex-applicative-0.3.4.tar.gz) = 1769a479c3ff953bc5a99a89e5648a6f01c5ff54fc9a09acceb9e029e2352636
 SIZE (cabal/regex-applicative-0.3.4/regex-applicative-0.3.4.tar.gz) = 15924
 SHA256 (cabal/regex-applicative-text-0.1.0.1/regex-applicative-text-0.1.0.1.tar.gz) = b093051f80865d257da2ded8ad1b566927b01b3d2f86d41da2ffee4a26c4e2d9
@@ -307,8 +325,12 @@ SHA256 (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 278d0afc87450254f8
 SIZE (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 23510
 SHA256 (cabal/semigroupoids-5.3.5/semigroupoids-5.3.5.tar.gz) = 552f18e13ef347118911c950957e4adcda0a1f948e274f29ec449cc413d3c6b0
 SIZE (cabal/semigroupoids-5.3.5/semigroupoids-5.3.5.tar.gz) = 23362
+SHA256 (cabal/semigroupoids-5.3.5/revision/1.cabal) = e9ad7265a3baca520054fd2f9d6b1ebe6779502dc377550c99dee43e88555a8f
+SIZE (cabal/semigroupoids-5.3.5/revision/1.cabal) = 7439
 SHA256 (cabal/semigroups-0.19.1/semigroups-0.19.1.tar.gz) = 79e761e64b862564a3470d5d356cb6b060b14452d675859aed3b2d1e14646648
 SIZE (cabal/semigroups-0.19.1/semigroups-0.19.1.tar.gz) = 21124
+SHA256 (cabal/semigroups-0.19.1/revision/1.cabal) = cd827aaba0c2b57727dedecdfcc7eec5f14719b73c7675037c73c74f642c1782
+SIZE (cabal/semigroups-0.19.1/revision/1.cabal) = 6463
 SHA256 (cabal/silently-1.2.5.1/silently-1.2.5.1.tar.gz) = 7fc9baf6f47ffc082e7e05c9dade1451bdee06a0c4e2d882e8e0b692f50bfad1
 SIZE (cabal/silently-1.2.5.1/silently-1.2.5.1.tar.gz) = 3358
 SHA256 (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 734447558bb061ce768f53a0df1f2401902c6bee396cc96ce627edd986ef6a73
@@ -327,12 +349,14 @@ SHA256 (cabal/streaming-commons-0.2.2.1/streaming-commons-0.2.2.1.tar.gz) = 3069
 SIZE (cabal/streaming-commons-0.2.2.1/streaming-commons-0.2.2.1.tar.gz) = 86559
 SHA256 (cabal/strict-0.4.0.1/strict-0.4.0.1.tar.gz) = dff6abc08ad637e51891bb8b475778c40926c51219eda60fd64f0d9680226241
 SIZE (cabal/strict-0.4.0.1/strict-0.4.0.1.tar.gz) = 12488
+SHA256 (cabal/strict-0.4.0.1/revision/1.cabal) = 50187e750751a258efea12ef2979e16a014a953c15bf4c2fca2f1168a44a5a12
+SIZE (cabal/strict-0.4.0.1/revision/1.cabal) = 4156
 SHA256 (cabal/syb-0.7.2.1/syb-0.7.2.1.tar.gz) = 1807c66f77e66786739387f0ae9f16d150d1cfa9d626afcb729f0e9b442a8d96
 SIZE (cabal/syb-0.7.2.1/syb-0.7.2.1.tar.gz) = 39768
 SHA256 (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = f5e0fcf95f0bb4aa63f428f2c01955a41ea1a42cfcf39145ed631f59a9616c02
 SIZE (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = 9842
-SHA256 (cabal/tagged-0.8.6.1/revision/1.cabal) = 5ddf1e324c3cd644f097a48bf490f0bedf467f723fd240afb3ab3b750577f8e7
-SIZE (cabal/tagged-0.8.6.1/revision/1.cabal) = 2874
+SHA256 (cabal/tagged-0.8.6.1/revision/2.cabal) = 29c67d98a4404607f024750ab9c7210dadcbbef4e1944c48c52902f2071b2662
+SIZE (cabal/tagged-0.8.6.1/revision/2.cabal) = 2874
 SHA256 (cabal/tar-0.5.1.1/tar-0.5.1.1.tar.gz) = b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de
 SIZE (cabal/tar-0.5.1.1/tar-0.5.1.1.tar.gz) = 39155
 SHA256 (cabal/tar-0.5.1.1/revision/3.cabal) = 94ded05718fe75b88c98e7113feeb9fca50688a7e59b6aefd80a6f48438c5062
@@ -353,6 +377,8 @@ SHA256 (cabal/th-compat-0.1.2/th-compat-0.1.2.tar.gz) = 2bc45d0199de3dc65ebc9b71
 SIZE (cabal/th-compat-0.1.2/th-compat-0.1.2.tar.gz) = 11737
 SHA256 (cabal/th-expand-syns-0.4.8.0/th-expand-syns-0.4.8.0.tar.gz) = 5113610c59a17a4e554ce0ffd3a43feaa761afd1e4b3ec72049bc5ba5cf780d7
 SIZE (cabal/th-expand-syns-0.4.8.0/th-expand-syns-0.4.8.0.tar.gz) = 8285
+SHA256 (cabal/th-expand-syns-0.4.8.0/revision/1.cabal) = 3490062f2907a1abc447326a0915864127418cecbea891f7958f025179656050
+SIZE (cabal/th-expand-syns-0.4.8.0/revision/1.cabal) = 1867
 SHA256 (cabal/th-lift-0.8.2/th-lift-0.8.2.tar.gz) = 3a5927037a10ae63e605c02228c4027c32b7bab1985ae7b5379e6363b3cd5ce4
 SIZE (cabal/th-lift-0.8.2/th-lift-0.8.2.tar.gz) = 14385
 SHA256 (cabal/th-lift-0.8.2/revision/1.cabal) = 955f3ad62b202d2ff37a616d2155ad9ce30879c7c63edab1f1ec69d757d70ed1
@@ -361,10 +387,12 @@ SHA256 (cabal/th-lift-instances-0.1.18/th-lift-instances-0.1.18.tar.gz) = bee57c
 SIZE (cabal/th-lift-instances-0.1.18/th-lift-instances-0.1.18.tar.gz) = 6098
 SHA256 (cabal/th-reify-many-0.1.9/th-reify-many-0.1.9.tar.gz) = f889dd029d5ab191ace99fe595f363c60314d536e61c8c58f6167f1a9d29ae43
 SIZE (cabal/th-reify-many-0.1.9/th-reify-many-0.1.9.tar.gz) = 5693
+SHA256 (cabal/th-reify-many-0.1.9/revision/1.cabal) = 2867a14f6bd3209c6d27aa4e233023b05316d69fab8a71c25180446310f40f78
+SIZE (cabal/th-reify-many-0.1.9/revision/1.cabal) = 1775
 SHA256 (cabal/these-1.1.1.1/these-1.1.1.1.tar.gz) = d798c9f56e17def441e8f51e54cc11afdb3e76c6a9d1e9ee154e9a78da0bf508
 SIZE (cabal/these-1.1.1.1/these-1.1.1.1.tar.gz) = 9804
-SHA256 (cabal/these-1.1.1.1/revision/1.cabal) = e981c65228db5ae77a043631f74a1e4a4b770f7213866f584e3476b52512f1af
-SIZE (cabal/these-1.1.1.1/revision/1.cabal) = 2631
+SHA256 (cabal/these-1.1.1.1/revision/2.cabal) = bdc0a3015b2e5cdf016e402937d71856ae5fe4e9e9a0d4823cc94a214c55a39b
+SIZE (cabal/these-1.1.1.1/revision/2.cabal) = 2732
 SHA256 (cabal/time-compat-1.9.5/time-compat-1.9.5.tar.gz) = 3126b267d19f31d52a3c36f13a8788be03242f829a5bddd8a3084e134d01e3a6
 SIZE (cabal/time-compat-1.9.5/time-compat-1.9.5.tar.gz) = 59336
 SHA256 (cabal/time-compat-1.9.5/revision/1.cabal) = a586bd5a59b47ea0c9eafc55c6936ede11126f4a6e619d6d7aeefee73c43d9b8
@@ -373,14 +401,16 @@ SHA256 (cabal/tls-1.5.5/tls-1.5.5.tar.gz) = 8a48b5ced43fac15c99158f0eedec458d77a
 SIZE (cabal/tls-1.5.5/tls-1.5.5.tar.gz) = 158700
 SHA256 (cabal/transformers-base-0.4.5.2/transformers-base-0.4.5.2.tar.gz) = d0c80c63fdce6a077dd8eda4f1ff289b85578703a3f1272e141d400fe23245e8
 SIZE (cabal/transformers-base-0.4.5.2/transformers-base-0.4.5.2.tar.gz) = 2849
+SHA256 (cabal/transformers-base-0.4.5.2/revision/1.cabal) = 402740dd5ef6574a05c7e4a3c874262e5a24b713c2b8b5125d59847ebd1041a2
+SIZE (cabal/transformers-base-0.4.5.2/revision/1.cabal) = 1572
 SHA256 (cabal/transformers-compat-0.6.6/transformers-compat-0.6.6.tar.gz) = 7e2e0251e5e6d28142615a4b950a3fabac9c0b7804b1ec4a4ae985f19519a9f9
 SIZE (cabal/transformers-compat-0.6.6/transformers-compat-0.6.6.tar.gz) = 41347
 SHA256 (cabal/typed-process-0.2.6.0/typed-process-0.2.6.0.tar.gz) = 31a2a81f33463fedc33cc519ad5b9679787e648fe2ec7efcdebd7d54bdbbc2b1
 SIZE (cabal/typed-process-0.2.6.0/typed-process-0.2.6.0.tar.gz) = 17363
 SHA256 (cabal/unicode-transforms-0.3.7.1/unicode-transforms-0.3.7.1.tar.gz) = 8ef4dfa741ab9ebeb0fc71970ece1074554ff3387c488a7bc55f5612a1d22080
 SIZE (cabal/unicode-transforms-0.3.7.1/unicode-transforms-0.3.7.1.tar.gz) = 717790
-SHA256 (cabal/unicode-transforms-0.3.7.1/revision/1.cabal) = 5fc98879a54a1a13e685650f8a4aef96d82a76e159603eef3e8c336c150c6e06
-SIZE (cabal/unicode-transforms-0.3.7.1/revision/1.cabal) = 6227
+SHA256 (cabal/unicode-transforms-0.3.7.1/revision/2.cabal) = a7acf4a3fb4d8c480966f716fa463d36643e495572327c5104b0eb8050b16c4d
+SIZE (cabal/unicode-transforms-0.3.7.1/revision/2.cabal) = 6227
 SHA256 (cabal/unix-compat-0.5.3/unix-compat-0.5.3.tar.gz) = 0893b597ea0db406429d0d563506af6755728eface0e1981f9392122db88e5c8
 SIZE (cabal/unix-compat-0.5.3/unix-compat-0.5.3.tar.gz) = 13582
 SHA256 (cabal/unix-time-0.4.7/unix-time-0.4.7.tar.gz) = 19233f8badf921d444c6165689253d877cfed58ce08f28cad312558a9280de09
@@ -389,8 +419,8 @@ SHA256 (cabal/unliftio-0.2.16/unliftio-0.2.16.tar.gz) = 792c2ecedd920fa3bbf1a062
 SIZE (cabal/unliftio-0.2.16/unliftio-0.2.16.tar.gz) = 55154
 SHA256 (cabal/unliftio-core-0.2.0.1/unliftio-core-0.2.0.1.tar.gz) = 919f0d1297ea2f5373118553c1df2a9405d8b9e31a8307e829da67d4953c299a
 SIZE (cabal/unliftio-core-0.2.0.1/unliftio-core-0.2.0.1.tar.gz) = 3696
-SHA256 (cabal/unliftio-core-0.2.0.1/revision/1.cabal) = 9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a
-SIZE (cabal/unliftio-core-0.2.0.1/revision/1.cabal) = 1082
+SHA256 (cabal/unliftio-core-0.2.0.1/revision/2.cabal) = f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7
+SIZE (cabal/unliftio-core-0.2.0.1/revision/2.cabal) = 1082
 SHA256 (cabal/unordered-containers-0.2.13.0/unordered-containers-0.2.13.0.tar.gz) = 86b01369ab8eb311383a052d389337e2cd71a63088323f02932754df4aa37b55
 SIZE (cabal/unordered-containers-0.2.13.0/unordered-containers-0.2.13.0.tar.gz) = 53379
 SHA256 (cabal/uuid-types-1.0.5/uuid-types-1.0.5.tar.gz) = ad68b89b7a64c07dd5c250a11be2033ee929318ff51ec7b4e4b54e1b4deba7dd
@@ -421,5 +451,5 @@ SHA256 (cabal/zip-archive-0.4.1/revision/1.cabal) = 51774bdc747d20b8f23172315f9c
 SIZE (cabal/zip-archive-0.4.1/revision/1.cabal) = 4055
 SHA256 (cabal/zlib-0.6.2.3/zlib-0.6.2.3.tar.gz) = 807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88
 SIZE (cabal/zlib-0.6.2.3/zlib-0.6.2.3.tar.gz) = 149186
-SHA256 (cabal/commercialhaskell-stack-v2.7.1_GH0.tar.gz) = eb849d5625084a6de57e8520ddf8172aca64ddadd9fee37cdafeefad80895b62
-SIZE (cabal/commercialhaskell-stack-v2.7.1_GH0.tar.gz) = 686145
+SHA256 (cabal/commercialhaskell-stack-v2.7.3_GH0.tar.gz) = 37f4bc0177534782609ec3a67ec413548d3f2cabff7c4c0bc8a92a36e49c6877
+SIZE (cabal/commercialhaskell-stack-v2.7.3_GH0.tar.gz) = 689876

devel/tlsh/Makefile

@@ -0,0 +1,68 @@
+# Created by: John Hood <cgull@glup.org>
+
+PORTNAME=	tlsh
+DISTVERSION=	4.7.2
+CATEGORIES=	devel
+
+MAINTAINER=	cgull@glup.org
+COMMENT=	Trend Micro Locality Sensitive Hash library and utilities
+
+LICENSE=	APACHE20 BSD3CLAUSE
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	trendmicro
+GH_TAGNAME=	d842e75
+USE_LDCONFIG=	yes
+
+CMAKE_ARGS=	create_symlink \
+		tlsh \
+		tlsh_unittest
+CMAKE_ON=	TLSH_SHARED_LIBRARY
+
+PORTDOCS=	README.md TLSH_Introduction.pdf TLSH_CTC_final.pdf
+
+# XXX Testing/test.sh is too dumb to work with separated source and
+# build directories.
+TEST_TARGET=	test
+
+_TLSH_VERSION=	${PORTVERSION}
+_SHLIBVERMAJ=	${DISTVERSION:S/./ /g:[1]}
+PLIST_SUB=	SHLIBVER=${DISTVERSION} \
+		SHLIBVERMAJ=${_SHLIBVERMAJ} \
+		TLSH_VERSION=${_TLSH_VERSION}
+
+OPTIONS_DEFINE=	DOCS
+# The tlsh build always builds static libraries, and shared libraries
+# are optional.  The STATIC option is the reverse, and can't be used
+# with tlsh.
+# OPTIONS_DEFINE=	STATIC
+# OPTIONS_DEFAULT=
+# STATIC_CMAKE_BOOL_OFF=	TLSH_SHARED_LIBRARY
+
+post-build:
+	${RLN} ${WRKSRC}/bin/tlsh_unittest ${WRKSRC}/bin/tlsh
+
+# rely on cmake install for library itself, add docs and command after.
+# XXX tlsh's install only installs ${INCLUDEDIR}/tlsh.h, and skips version.h,
+# so we must install both in ${INCLUDEDIR}/tlsh/
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/tlsh
+	${RM} ${STAGEDIR}${PREFIX}/include/tlsh.h
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/tlsh ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/tlsh_unittest \
+	    ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/include/tlsh.h \
+	    ${STAGEDIR}${PREFIX}/include/tlsh/
+	${INSTALL_DATA} ${WRKSRC}/include/version.h \
+	    ${STAGEDIR}${PREFIX}/include/tlsh/
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endfor
+
+.include <bsd.port.mk>

devel/tlsh/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1630608937
+SHA256 (trendmicro-tlsh-4.7.2-d842e75_GH0.tar.gz) = 2cdcc05cd20026839f8b0d6b42a40b5c83d99b4620ff3c1770218167ebc4937d
+SIZE (trendmicro-tlsh-4.7.2-d842e75_GH0.tar.gz) = 3345166

devel/tlsh/files/patch-Testing_test.sh

@@ -0,0 +1,268 @@
+--- Testing/test.sh.orig	2020-12-10 01:30:11 UTC
++++ Testing/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ ##################################
+ # set CREATE_EXP_FILE=1 if you want this script to create the Expected Results for the regression tests
+@@ -8,7 +8,7 @@ CREATE_EXP_FILE=0
+ echoerr() { echo "$@" 1>&2; }
+ 
+ BASEDIR=$(dirname $0)
+-pushd $BASEDIR > /dev/null
++cd $BASEDIR
+ 
+ LISTOPTION=1
+ JSONOPTION=1
+@@ -34,14 +34,12 @@ echo "TLSH_PROG=$TLSH_PROG"
+ if test ! -f $TLSH_PROG
+ then
+ 	echoerr "error: (127), you must compile $TLSH_PROG"
+-        popd > /dev/null
+ 	exit 127
+ fi
+ 
+ if test ! -f $SIMP_PROG
+ then
+ 	echoerr "error: (127), you must compile $SIMP_PROG"
+-        popd > /dev/null
+ 	exit 127
+ fi
+ 
+@@ -104,7 +102,6 @@ runit() {
+ 	if test ! -f $TMP/example_data.out
+ 	then
+ 		echoerr "error: (1), $TMP/example_data.out does not exist"
+-		popd > /dev/null
+ 		exit 1
+ 	fi
+ 	EXPECTED_OUT=exp/example_data.$HASH.$CHKSUM.$XLEN.out_EXP
+@@ -114,7 +111,6 @@ runit() {
+ 		if test $CREATE_EXP_FILE = 0
+ 		then
+ 			echoerr "error: (1), Expected Result file $EXPECTED_OUT does not exist"
+-			popd > /dev/null
+ 			exit 1
+ 		else
+ 			echo "cp $TMP/example_data.out $EXPECTED_OUT"
+@@ -126,7 +122,6 @@ runit() {
+ 		if test $CREATE_EXP_FILE = 0
+ 		then
+ 			echoerr "error: (1), Expected Result file $EXPECTED_ERR does not exist"
+-			popd > /dev/null
+ 			exit 1
+ 		else
+ 			echo "cp $TMP/example_data.err $EXPECTED_ERR"
+@@ -137,7 +132,6 @@ runit() {
+ 	if test ! $diffc = 0
+ 	then
+ 		echoerr "error: (1), diff $TMP/example_data.out $EXPECTED_OUT"
+-		popd > /dev/null
+ 		exit 1
+ 	fi
+ 
+@@ -145,7 +139,6 @@ runit() {
+ 	if test ! $diffc = 0
+ 	then
+ 		echoerr "error: (1), diff $TMP/example_data.err $EXPECTED_ERR"
+-		popd > /dev/null
+ 		exit 1
+ 	fi
+ 
+@@ -160,7 +153,6 @@ runit() {
+ 		if test ! $diffc = 0
+ 		then
+ 			echoerr "error: (1), diff $TMP/example_data.json_out $EXPECTED_OUT"
+-			popd > /dev/null
+ 			exit 1
+ 		fi
+ 		echo "passed"
+@@ -194,7 +186,6 @@ runit() {
+ 		if test $CREATE_EXP_FILE = 0
+ 		then
+ 			echoerr "error: (1), Expected Result file $EXPECTED_SCO does not exist"
+-			popd > /dev/null
+ 			exit 1
+ 		else
+ 			echo "cp $TMP/example_data.scores $EXPECTED_SCO"
+@@ -206,7 +197,6 @@ runit() {
+ 		if test $CREATE_EXP_FILE = 0
+ 		then
+ 			echoerr "error: (1), Expected Result file $EXPECTED_ERR does not exist"
+-			popd > /dev/null
+ 			exit 1
+ 		else
+ 			echo "cp $TMP/example_data.err2 $EXPECTED_ERR"
+@@ -218,14 +208,12 @@ runit() {
+ 	if test ! $diffc = 0
+ 	then
+ 		echoerr "error: (2), diff $TMP/example_data.scores $EXPECTED_SCO"
+-		popd > /dev/null
+ 		exit 2
+ 	fi
+ 	diffc=`diff --ignore-all-space $TMP/example_data.err2 $EXPECTED_ERR | wc -l`
+ 	if test ! $diffc = 0
+ 	then
+ 		echoerr "error: (2), diff $TMP/example_data.err2 $EXPECTED_ERR"
+-		popd > /dev/null
+ 		exit 2
+ 	fi
+ 
+@@ -260,7 +248,6 @@ runit() {
+ 			if test $CREATE_EXP_FILE = 0
+ 			then
+ 				echoerr "error: (3), Expected Result file $EXPECTED_SCO does not exist"
+-				popd > /dev/null
+ 				exit 1
+ 			else
+ 				echo "cp $TMP/example_data.scores.2 $EXPECTED_SCO"
+@@ -272,7 +259,6 @@ runit() {
+ 		if test ! $diffc = 0
+ 		then
+ 			echoerr "error: (3) diff $TMP/example_data.scores.2 $EXPECTED_SCO"
+-			popd > /dev/null
+ 			exit 3
+ 		fi
+ 
+@@ -304,7 +290,6 @@ runit() {
+ 		if test $CREATE_EXP_FILE = 0
+ 		then
+ 			echoerr "error: ($testnum), Expected Result file $EXPECTED_SCO does not exist"
+-			popd > /dev/null
+ 			exit 1
+ 		else
+ 			echo "cp $TMP/example_data.xref.scores $EXPECTED_SCO"
+@@ -315,7 +300,6 @@ runit() {
+ 	diff --ignore-all-space $TMP/example_data.xref.scores $EXPECTED_SCO > /dev/null 2>/dev/null
+ 	if [ $? -ne 0 ]; then
+ 		echoerr "error: ($testnum), diff $TMP/example_data.xref.scores $EXPECTED_SCO"
+-		popd > /dev/null
+ 		exit $testnum
+ 	fi
+ 
+@@ -334,7 +318,6 @@ runit() {
+ 		diff --ignore-all-space $TMP/example_data.xref.json_scores $EXPECTED_SCO > /dev/null 2>/dev/null
+ 		if [ $? -ne 0 ]; then
+ 			echoerr "error: ($testnum), diff $TMP/example_data.xref.json_scores $EXPECTED_SCO"
+-			popd > /dev/null
+ 			exit $testnum
+ 		fi
+ 		echo "passed"
+@@ -370,7 +353,6 @@ runit() {
+ 			if test $CREATE_EXP_FILE = 0
+ 			then
+ 				echoerr "error: ($testnum), Expected Result file $EXPECTED_SCO does not exist"
+-				popd > /dev/null
+ 				exit 1
+ 			else
+ 				echo "cp $TMP/example_data.scores.2.T-201 $EXPECTED_SCO"
+@@ -381,7 +363,6 @@ runit() {
+ 		diff --ignore-all-space $TMP/example_data.scores.2.T-201 $EXPECTED_SCO > /dev/null 2>/dev/null
+ 		if [ $? -ne 0 ]; then
+ 			echoerr "error: ($testnum) diff $TMP/example_data.scores.2.T-201 $EXPECTED_SCO"
+-			popd > /dev/null
+ 			exit $testnum
+ 		fi
+ 		echo "passed"
+@@ -398,7 +379,6 @@ runit
+ if test "$1" = "_go"
+ then
+ 	echo "passed all example data tests (for go implementation)"
+-	popd > /dev/null
+ 	exit 0
+ fi
+ runit "-xlen"
+@@ -428,7 +408,6 @@ then
+ 	if test $CREATE_EXP_FILE = 0
+ 	then
+ 		echoerr "error: ($testnum), Expected Result file $EXPECTED_TESTLEN does not exist"
+-		popd > /dev/null
+ 		exit 1
+ 	else
+ 		echo "cp $TMP/testlen.out $EXPECTED_TESTLEN"
+@@ -439,7 +418,6 @@ fi
+ diff --ignore-all-space $TMP/testlen.out $EXPECTED_TESTLEN > /dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+ 	echoerr "error: ($testnum) diff $TMP/testlen.out $EXPECTED_TESTLEN"
+-	popd > /dev/null
+ 	exit $testnum
+ fi
+ echo "passed"
+@@ -467,7 +445,6 @@ for file in small small2 ; do
+ 		if test $CREATE_EXP_FILE = 0
+ 		then
+ 			echoerr "error: ($testnum), Expected Result file $EXPECTED_TLSH does not exist"
+-			popd > /dev/null
+ 			exit 1
+ 		else
+ 			echo "cp $TMP/$file.tlsh $EXPECTED_TLSH"
+@@ -478,7 +455,6 @@ for file in small small2 ; do
+ 	diff --ignore-all-space $TMP/$file.tlsh $EXPECTED_TLSH
+ 	if [ $? -ne 0 ]; then
+ 		echoerr "error: ($testnum) $TMP/$file.tlsh $EXPECTED_TLSH"
+-		popd > /dev/null
+ 		exit $testnum
+ 	fi
+ done
+@@ -511,14 +487,12 @@ then
+ 	if test ! -f $EXPECTED_SCO
+ 	then
+ 		echoerr "error: ($testnum), Expected Result file $EXPECTED_SCO does not exist"
+-		popd > /dev/null
+ 		exit 1
+ 	fi
+ 
+ 	diff --ignore-all-space $TMP/example_data.scores.l2.T-201 $EXPECTED_SCO > /dev/null 2>/dev/null
+ 	if [ $? -ne 0 ]; then
+ 		echoerr "error: ($testnum) diff $TMP/example_data.scores.l2.T-201 $EXPECTED_SCO"
+-		popd > /dev/null
+ 		exit $testnum
+ 	fi
+ 
+@@ -533,7 +507,6 @@ then
+ 	diff --ignore-all-space $TMP/example_data.scores.l2csv.T-201 $EXPECTED_SCO > /dev/null 2>/dev/null
+ 	if [ $? -ne 0 ]; then
+ 		echoerr "error: ($testnum) diff $TMP/example_data.scores.l2csv.T-201 $EXPECTED_SCO"
+-		popd > /dev/null
+ 		exit $testnum
+ 	fi
+ 
+@@ -563,14 +536,12 @@ then
+ 	if test ! -f $EXPECTED_RES
+ 	then
+ 		echoerr "error: ($testnum), Expected Result file $EXPECTED_RES does not exist"
+-		popd > /dev/null
+ 		exit 1
+ 	fi
+ 
+ 	diff --ignore-all-space $TMP/example_data.Week3.split.tlsh $EXPECTED_RES > /dev/null 2>/dev/null
+ 	if [ $? -ne 0 ]; then
+ 		echoerr "error: ($testnum) diff $TMP/example_data.Week3.split.tlsh $EXPECTED_RES"
+-		popd > /dev/null
+ 		exit $testnum
+ 	fi
+ 
+@@ -598,7 +569,6 @@ then
+ 	if test $CREATE_EXP_FILE = 0
+ 	then
+ 		echoerr "error: ($testnum), Expected Result file $EXPECTED_STEST does not exist"
+-		popd > /dev/null
+ 		exit 1
+ 	else
+ 		echo "cp $TMP/simple_unittest.out $EXPECTED_STEST"
+@@ -609,13 +579,10 @@ fi
+ diff --ignore-all-space $TMP/simple_unittest.out $EXPECTED_STEST > /dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+ 	echoerr "error: ($testnum) diff $TMP/simple_unittest.out $EXPECTED_STEST"
+-        popd > /dev/null
+-	exit -1
++	exit 255
+ fi
+ 
+ echo "passed all example data tests"
+-
+-popd > /dev/null
+ 
+ echo
+ echo "If you have made changes to the Tlsh python module, build and install it, and run python_test.sh"

devel/tlsh/files/patch-src_CMakeLists.txt

@@ -0,0 +1,22 @@
+--- src/CMakeLists.txt.orig	2020-02-16 00:07:55 UTC
++++ src/CMakeLists.txt
+@@ -65,16 +65,15 @@ set_target_properties(tlsh PROPERTIES OUTPUT_NAME tlsh
+ # it was causing problems when compiling / testing tools on Linux
+ ##########################
+ 
+-set(TLSH_SHARED_LIBRARY 0)
+-if(TLSH_SHARED_LIBRARY EQUAL 1)
++if(TLSH_SHARED_LIBRARY)
+     add_library(tlsh_shared SHARED ${TLSH_SRCS})
+     set_target_properties(tlsh_shared PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
+     set_target_properties(tlsh_shared PROPERTIES OUTPUT_NAME tlsh${BUILD_POSTFIX})
+     set_target_properties(tlsh_shared PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
+-                                                 SOVERSION "0")
++                                                 SOVERSION "${VERSION_MAJOR}")
+ endif()
+ 
+-if(TLSH_SHARED_LIBRARY EQUAL 1)
++if(TLSH_SHARED_LIBRARY)
+     install(TARGETS tlsh tlsh_shared DESTINATION lib)
+ else()
+     install(TARGETS tlsh             DESTINATION lib)

devel/tlsh/pkg-descr

@@ -0,0 +1,8 @@
+TLSH is a fuzzy matching program and library.  Given a file (min 50 bytes),
+TLSH generates a hash value which can be used for similarity comparisons.
+Similar files will have similar hash values which allows for the detection of
+similar objects by comparing their hash values.
+
+This port only includes the core C++ library.
+
+WWW: https://tlsh.org

devel/tlsh/pkg-plist

@@ -0,0 +1,8 @@
+bin/tlsh
+bin/tlsh_unittest
+include/tlsh/tlsh.h
+include/tlsh/version.h
+lib/libtlsh.a
+lib/libtlsh.so
+lib/libtlsh.so.%%SHLIBVERMAJ%%
+lib/libtlsh.so.%%SHLIBVER%%

devel/vc-intrinsics/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	vc-intrinsics
-PORTVERSION=	s20210820
+PORTVERSION=	s20210903
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-${FLAVOR}
 
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${FLAVOR}>0:devel/${FLAVOR}
 USES=		cmake compiler:c++11-lib
 USE_GITHUB=	yes
 GH_ACCOUNT=	intel
-GH_TAGNAME=	a2f2f10
+GH_TAGNAME=	b1db3e5
 CMAKE_ARGS=	-DLLVM_DIR:PATH="${LOCALBASE}/${FLAVOR}"
 CMAKE_INSTALL_PREFIX=		${PREFIX}/${FLAVOR}
 _PLIST_FILES= 	include/llvm/GenXIntrinsics/GenXIntrOpts.h \

devel/vc-intrinsics/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1629463037
-SHA256 (intel-vc-intrinsics-s20210820-a2f2f10_GH0.tar.gz) = 7328651bfd328934d7bae6dc99d99eea65569b5047a573f05fa70de4a4b4348e
-SIZE (intel-vc-intrinsics-s20210820-a2f2f10_GH0.tar.gz) = 127831
+TIMESTAMP = 1630716467
+SHA256 (intel-vc-intrinsics-s20210903-b1db3e5_GH0.tar.gz) = 86b64d40e436acc447a65c22e59fbf71b69062e23cf50f21bb72028607fe86a4
+SIZE (intel-vc-intrinsics-s20210903-b1db3e5_GH0.tar.gz) = 128202

devel/xbyak/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	xbyak
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.995
+DISTVERSION=	5.996
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -23,8 +23,9 @@ PLIST_FILES=	include/xbyak/xbyak.h \
 		include/xbyak/xbyak_bin2hex.h \
 		include/xbyak/xbyak_mnemonic.h \
 		include/xbyak/xbyak_util.h \
-		lib/cmake/xbyak/xbyak-targets.cmake \
-		lib/cmake/xbyak/xbyakConfig.cmake
+		lib/cmake/xbyak/xbyak-config-version.cmake \
+		lib/cmake/xbyak/xbyak-config.cmake \
+		lib/cmake/xbyak/xbyak-targets.cmake
 
 do-test: install
 	@cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} test

devel/xbyak/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1629218097
-SHA256 (herumi-xbyak-v5.995_GH0.tar.gz) = 8c5507426803bbc228c63255568a25a7a8661642722fdda6bd9afaafd9be9d19
-SIZE (herumi-xbyak-v5.995_GH0.tar.gz) = 230520
+TIMESTAMP = 1630813831
+SHA256 (herumi-xbyak-v5.996_GH0.tar.gz) = 4395ef89bd2faefb6e049401ab500dd842ad58de8c4ea98e19086efb76d21772
+SIZE (herumi-xbyak-v5.996_GH0.tar.gz) = 232084

dns/gdnsd3/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	gdnsd
 PORTVERSION=	3.7.0
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/gdnsd/gdnsd/releases/download/v${PORTVERSION}/ \
 		ZI \

dns/gdnsd3/files/gdnsd.in

@@ -48,12 +48,12 @@ gdnsd_prestart()
 
 gdnsd_reload()
 {
-  gdnsdctl reload-zones
+  %%PREFIX%%/bin/gdnsdctl reload-zones
 }
 
 gdnsd_restart()
 {
-  gdnsdctl replace
+  %%PREFIX%%/bin/gdnsdctl replace
 }
 
 gdnsd_checkconf()
@@ -63,7 +63,7 @@ gdnsd_checkconf()
 
 gdnsd_stats()
 {
-  gdnsdctl stats
+  %%PREFIX%%/bin/gdnsdctl stats
 }
 
 run_rc_command "$1"

editors/cudatext/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	cudatext
-PORTVERSION=	1.142.0
+PORTVERSION=	1.143.0
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -17,7 +17,7 @@ GH_PROJECT=	CudaText
 GH_TUPLE=	bgrabitmap:bgrabitmap:ace7e0e:bgrabitmap/bgrabitmap \
 		Alexey-T:Python-for-Lazarus:24d15bb:python4lazarus/python4lazarus \
 		Alexey-T:ATFlatControls:cd99204:atflatcontrols/atflatcontrols  \
-		Alexey-T:ATSynEdit:a9cb219:atsynedit/atsynedit \
+		Alexey-T:ATSynEdit:3d90938:atsynedit/atsynedit \
 		Alexey-T:Emmet-Pascal:fb5b116:emmet/emmet \
 		Alexey-T:EControl:f3c5b90:econtrol/econtrol \
 		Alexey-T:ATSynEdit_Ex:4b17f2e:atsyneditex/atsyneditex \

editors/cudatext/distinfo

@@ -1,14 +1,14 @@
-TIMESTAMP = 1629520287
-SHA256 (Alexey-T-CudaText-1.142.0_GH0.tar.gz) = 1afeb9930ae122a4f1ded6d8b67836b9673fefab026ab6197c812c7a8e0c348d
-SIZE (Alexey-T-CudaText-1.142.0_GH0.tar.gz) = 6273385
+TIMESTAMP = 1630809782
+SHA256 (Alexey-T-CudaText-1.143.0_GH0.tar.gz) = 04465fdfc303fc8a5aebd0a1b4b9bd6e83580273d5c87b0a24444288ca49eb65
+SIZE (Alexey-T-CudaText-1.143.0_GH0.tar.gz) = 6316969
 SHA256 (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = ae3f28596c2a5f44bc468f6c3380fc1ceb27e95afea579f09b1d340c781bbef2
 SIZE (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = 6983967
 SHA256 (Alexey-T-Python-for-Lazarus-24d15bb_GH0.tar.gz) = 5ee4a511e6c4cbd8d5105203acbcb04fbeb180160b9cdff7dac2ce0e3cce04f4
 SIZE (Alexey-T-Python-for-Lazarus-24d15bb_GH0.tar.gz) = 94717
 SHA256 (Alexey-T-ATFlatControls-cd99204_GH0.tar.gz) = 9faaedf8f354dccc8e5a1b5f280ddc26d550a57a412e91d95c913b01b743f5a7
 SIZE (Alexey-T-ATFlatControls-cd99204_GH0.tar.gz) = 531659
-SHA256 (Alexey-T-ATSynEdit-a9cb219_GH0.tar.gz) = 888140087cc79ea359e53db8b547dec4642bd6aff6daf647cc44f7cc58b5b872
-SIZE (Alexey-T-ATSynEdit-a9cb219_GH0.tar.gz) = 1383952
+SHA256 (Alexey-T-ATSynEdit-3d90938_GH0.tar.gz) = 4f8b632d26d604acfc5cf2ee2d82ad0a6dfb5156c0241630e4b7f8ebd2e0eeea
+SIZE (Alexey-T-ATSynEdit-3d90938_GH0.tar.gz) = 1383916
 SHA256 (Alexey-T-Emmet-Pascal-fb5b116_GH0.tar.gz) = 295598366827234dedf7338d2e5878cdd7058fde6117e8c7cd65e7a3aa81a671
 SIZE (Alexey-T-Emmet-Pascal-fb5b116_GH0.tar.gz) = 82395
 SHA256 (Alexey-T-EControl-f3c5b90_GH0.tar.gz) = 4b06a9cf15c158031f940a7f41e7599e7dc41a832249c8198ed8f8b8b1a99f26

editors/cudatext/pkg-plist

@@ -510,6 +510,21 @@ share/applications/cudatext.desktop
 %%DATADIR%%/data/toolbaricons/default_24x24/opt.png
 %%DATADIR%%/data/toolbaricons/default_24x24/unindent.png
 %%DATADIR%%/data/toolbaricons/default_24x24/unpri.png
+%%DATADIR%%/data/toolbaricons/light_24x24/case.png
+%%DATADIR%%/data/toolbaricons/light_24x24/comment.png
+%%DATADIR%%/data/toolbaricons/light_24x24/e_copy.png
+%%DATADIR%%/data/toolbaricons/light_24x24/e_cut.png
+%%DATADIR%%/data/toolbaricons/light_24x24/e_paste.png
+%%DATADIR%%/data/toolbaricons/light_24x24/e_redo.png
+%%DATADIR%%/data/toolbaricons/light_24x24/e_undo.png
+%%DATADIR%%/data/toolbaricons/light_24x24/f_new.png
+%%DATADIR%%/data/toolbaricons/light_24x24/f_open.png
+%%DATADIR%%/data/toolbaricons/light_24x24/f_save.png
+%%DATADIR%%/data/toolbaricons/light_24x24/indent.png
+%%DATADIR%%/data/toolbaricons/light_24x24/map.png
+%%DATADIR%%/data/toolbaricons/light_24x24/opt.png
+%%DATADIR%%/data/toolbaricons/light_24x24/unindent.png
+%%DATADIR%%/data/toolbaricons/light_24x24/unpri.png
 %%DATADIR%%/py/cuda_addonman/__init__.py
 %%DATADIR%%/py/cuda_addonman/install.inf
 %%DATADIR%%/py/cuda_addonman/opt.py
@@ -562,7 +577,6 @@ share/applications/cudatext.desktop
 %%DATADIR%%/py/cuda_prefs/icons/cb_unckecked.png
 %%DATADIR%%/py/cuda_prefs/icons/desc.png
 %%DATADIR%%/py/cuda_prefs/install.inf
-%%DATADIR%%/py/cuda_prefs/readme/history.txt
 %%DATADIR%%/py/cuda_prefs/readme/readme.txt
 %%DATADIR%%/py/cuda_prefs/tests/test_options_editor.py
 %%DATADIR%%/py/cuda_project_man/__init__.py
@@ -785,6 +799,7 @@ share/applications/cudatext.desktop
 %%DATADIR%%/readme/wiki/cudatext-tabs-left_.png
 %%DATADIR%%/readme/wiki/cudatext-tabs-multiline.png
 %%DATADIR%%/readme/wiki/cudatext-tabs-path-suffix.png
+%%DATADIR%%/readme/wiki/cudatext-tabs-red-marker.png
 %%DATADIR%%/readme/wiki/cudatext-toolbar.png
 %%DATADIR%%/readme/wiki/cudatext-tools-menuitem.png
 %%DATADIR%%/readme/wiki/cudatext-tools-props.png

editors/vim-console/Makefile

@@ -1,12 +0,0 @@
-# Created by: David O'Brien (obrien@NUXI.com)
-
-PKGNAMESUFFIX=	-console
-
-COMMENT=	Improved version of the vi editor (console only)
-
-CONFLICTS_INSTALL=	vim vim-tiny
-
-CONSOLE=	yes
-MASTERDIR=	${.CURDIR}/../vim
-
-.include "${MASTERDIR}/Makefile"

editors/vim-console/pkg-descr

@@ -1,14 +0,0 @@
-Vim is a highly configurable text editor built to enable efficient text editing.
-It is an improved version of the vi editor distributed with most UNIX systems.
-
-Vim is often called a "programmer's editor," and so useful for programming that
-many consider it an entire IDE. It's not just for programmers, though. Vim is
-perfect for all kinds of text editing, from composing email to editing
-configuration files.
-
-This is the console-only version. It differs from the main vim package only in
-lack of Gtk2 GUI and no external language bindings. The editing experience is
-identical.
-
-WWW: http://www.vim.org/
-WWW: https://github.com/vim/vim

emulators/nemu/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1630488234
-SHA256 (nemuTUI-nemu-v3.0.0_GH0.tar.gz) = 5282013f64c812faed59ac8835775aed2df3d285662b6286ae7f0139bee148a7
-SIZE (nemuTUI-nemu-v3.0.0_GH0.tar.gz) = 151091
+TIMESTAMP = 1630826039
+SHA256 (nemuTUI-nemu-v3.0.0_GH0.tar.gz) = 4a7ba85d6e5944a83f04184bfbb82ea1be1401e704448ef3f1fa721adccf8091
+SIZE (nemuTUI-nemu-v3.0.0_GH0.tar.gz) = 151223