sync ports with The Matrix

comms/conserver/Makefile

@@ -17,7 +17,7 @@ WANTLIB += c util
 FLAVORS=	ipmi net
 FLAVOR?=
 
-MASTER_SITES=	https://github.com/bstansell/conserver/releases/download/v$V/
+SITES=		https://github.com/bstansell/conserver/releases/download/v$V/
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--with-master=localhost \

databases/freetds/Makefile

@@ -12,7 +12,7 @@ HOMEPAGE=	https://www.freetds.org/
 
 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 
-MASTER_SITES=	https://www.freetds.org/files/stable/ \
+SITES=		https://www.freetds.org/files/stable/ \
 		ftp://ftp.freetds.org/pub/freetds/stable/
 
 # LGPLv2+ (most things) GPLv2+ (fisql, tdspool) FDL (docs)

databases/iodbc/Makefile

@@ -16,7 +16,7 @@ SHARED_LIBS +=		iodbcadm	3.15
 SHARED_LIBS +=	drvproxy	3.15
 
 HOMEPAGE=	http://www.iodbc.org/
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=iodbc/}
+SITES=		${SITE_SOURCEFORGE:=iodbc/}
 
 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 

databases/openldap/Makefile

@@ -26,7 +26,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB=	c crypto pthread sasl2 ssl
 WANTLIB-server=	${WANTLIB} lber ldap ltdl m perl sodium
 
-MASTER_SITES =	https://openldap.org/software/download/OpenLDAP/openldap-release/ \
+SITES =		https://openldap.org/software/download/OpenLDAP/openldap-release/ \
 		https://mirror.eu.oneandone.net/software/openldap/ \
 		https://mirror.aarnet.edu.au/pub/openldap/openldap-release/ \
 		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/

devel/Makefile

@@ -40,6 +40,7 @@
      SUBDIR += autoconf-archive
      SUBDIR += autogen
      SUBDIR += automake
+     SUBDIR += autopep8
      SUBDIR += avr
      SUBDIR += avr32
      SUBDIR += avrdude

devel/abseil-cpp/Makefile

@@ -3,8 +3,7 @@ CATEGORIES =	devel
 
 GH_ACCOUNT =	abseil
 GH_PROJECT =	${GH_ACCOUNT}-cpp
-GH_TAGNAME =	20230802.0
+GH_TAGNAME =	20230802.1
-REVISION =	0
 
 HOMEPAGE =	https://abseil.io/
 

devel/abseil-cpp/distinfo

@@ -1,2 +1,2 @@
-SHA256 (abseil-cpp-20230802.0.tar.gz) = WdKXavnW7PABqBo1dJpuVRozW5SdNJGM+t4Hc3udk8U=
+SHA256 (abseil-cpp-20230802.1.tar.gz) = mHzpjwLu+6+TDW44qxaqBXNyNNevurLVxOp62+UMKO0=
-SIZE (abseil-cpp-20230802.0.tar.gz) = 2156669
+SIZE (abseil-cpp-20230802.1.tar.gz) = 2157158

devel/abseil-cpp/patches/patch-absl_base_internal_sysinfo_cc

@@ -1,18 +0,0 @@
-Use getthrid(2) as GetTID() implementation.
-
-Index: absl/base/internal/sysinfo.cc
---- absl/base/internal/sysinfo.cc.orig
-+++ absl/base/internal/sysinfo.cc
-@@ -441,6 +441,12 @@ pid_t GetTID() {
-   return reinterpret_cast<pid_t>(thread);
- }
- 
-+#elif defined(__OpenBSD__)
-+
-+pid_t GetTID() {
-+  return getthrid();
-+}
-+
- #else
- 
- // Fallback implementation of `GetTID` using `pthread_self`.

devel/autopep8/Makefile

@@ -0,0 +1,19 @@
+COMMENT =		format Python code to comply with PEP 8
+
+MODPY_EGG_VERSION =	2.0.4
+DISTNAME =		autopep8-${MODPY_EGG_VERSION}
+
+CATEGORIES =		devel
+
+# MIT
+PERMIT_PACKAGE =	Yes
+
+MODULES =		lang/python
+
+MODPY_PI =		Yes
+MODPY_PYBUILD =		setuptools
+
+RUN_DEPENDS =		devel/py-codestyle${MODPY_FLAVOR}>=2.10.0 \
+			textproc/py-toml${MODPY_FLAVOR}
+
+.include <bsd.port.mk>

devel/autopep8/distinfo

@@ -0,0 +1,2 @@
+SHA256 (autopep8-2.0.4.tar.gz) = KRMGSr2Xs0GdHMg+px8ELLgh+H5FuciMrVrTxOqH/gw=
+SIZE (autopep8-2.0.4.tar.gz) = 116472

devel/autopep8/pkg/DESCR

@@ -0,0 +1,4 @@
+autopep8 automatically formats Python code to conform to the PEP 8
+style guide. It uses the pycodestyle utility to determine what parts
+of the code needs to be formatted. autopep8 is capable of fixing
+most of the formatting issues that can be reported by pycodestyle.

devel/autopep8/pkg/PLIST

@@ -0,0 +1,12 @@
+bin/autopep8
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}autopep8.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}autopep8.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/autopep8-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/autopep8-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst
+lib/python${MODPY_VERSION}/site-packages/autopep8-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/autopep8-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/autopep8-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/autopep8-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/autopep8-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/autopep8-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/autopep8.py

editors/Makefile

@@ -54,6 +54,7 @@
      SUBDIR += poke
      SUBDIR += py-neovim,python3
      SUBDIR += py-qscintilla,python3
+     SUBDIR += qownnotes
      SUBDIR += qscintilla
      SUBDIR += scintilla
      SUBDIR += scite

editors/qownnotes/Makefile

@@ -0,0 +1,38 @@
+COMMENT =	markdown note taking program with nextcloud integration
+
+V =		23.9.4
+DISTNAME =	qownnotes-${V}
+
+CATEGORIES =	editors
+
+HOMEPAGE =	https://www.qownnotes.org/
+
+MAINTAINER = 	Kevin Lo <kevlo@openbsd.org>
+
+# GPLv2
+PERMIT_PACKAGE=	Yes
+
+WANTLIB +=	${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Gui
+WANTLIB +=	Qt5Network Qt5PrintSupport Qt5Qml Qt5Sql Qt5Svg Qt5WebSockets
+WANTLIB +=	Qt5Widgets Qt5X11Extras Qt5Xml X11 botan-2 c m
+
+SITES =		https://github.com/pbek/QOwnNotes/releases/download/v${V}/
+
+EXTRACT_SUFX =	.tar.xz
+
+COMPILER =	base-clang ports-gcc
+
+MODULES =	devel/qmake x11/qt5
+
+RUN_DEPENDS =	devel/desktop-file-utils \
+		x11/gtk+4,-guic
+LIB_DEPENDS =	security/botan2 \
+		x11/qt5/qtsvg \
+		x11/qt5/qtwebsockets \
+		x11/qt5/qtx11extras
+
+USE_GMAKE =	Yes
+
+MODQMAKE_ARGS =	USE_SYSTEM_BOTAN=1
+
+.include <bsd.port.mk>

editors/qownnotes/distinfo

@@ -0,0 +1,2 @@
+SHA256 (qownnotes-23.9.4.tar.xz) = e5x3YeWCaTNoQR924r2EseqDOfFluj58MGS78DzfJUM=
+SIZE (qownnotes-23.9.4.tar.xz) = 5655972

editors/qownnotes/pkg/DESCR

@@ -0,0 +1,2 @@
+Qownnotes is the open source notepad with markdown support and
+todo list manager, that works together with nextcloud notes.

editors/qownnotes/pkg/PLIST

@@ -0,0 +1,81 @@
+@bin bin/QOwnNotes
+share/applications/PBE.QOwnNotes.desktop
+share/icons/hicolor/128x128/apps/QOwnNotes.png
+share/icons/hicolor/16x16/apps/QOwnNotes.png
+share/icons/hicolor/24x24/apps/QOwnNotes.png
+share/icons/hicolor/256x256/apps/QOwnNotes.png
+share/icons/hicolor/32x32/apps/QOwnNotes.png
+share/icons/hicolor/48x48/apps/QOwnNotes.png
+share/icons/hicolor/512x512/apps/QOwnNotes.png
+share/icons/hicolor/64x64/apps/QOwnNotes.png
+share/icons/hicolor/96x96/apps/QOwnNotes.png
+share/icons/hicolor/scalable/apps/QOwnNotes.svg
+share/qt5/
+share/qt5/translations/
+share/qt5/translations/QOwnNotes_ar.qm
+share/qt5/translations/QOwnNotes_bg.qm
+share/qt5/translations/QOwnNotes_bn.qm
+share/qt5/translations/QOwnNotes_bs.qm
+share/qt5/translations/QOwnNotes_ca.qm
+share/qt5/translations/QOwnNotes_ceb.qm
+share/qt5/translations/QOwnNotes_cs.qm
+share/qt5/translations/QOwnNotes_da.qm
+share/qt5/translations/QOwnNotes_de.qm
+share/qt5/translations/QOwnNotes_el.qm
+share/qt5/translations/QOwnNotes_en.qm
+share/qt5/translations/QOwnNotes_es.qm
+share/qt5/translations/QOwnNotes_et.qm
+share/qt5/translations/QOwnNotes_eu.qm
+share/qt5/translations/QOwnNotes_fa.qm
+share/qt5/translations/QOwnNotes_fi.qm
+share/qt5/translations/QOwnNotes_fil.qm
+share/qt5/translations/QOwnNotes_fr.qm
+share/qt5/translations/QOwnNotes_ga.qm
+share/qt5/translations/QOwnNotes_gl.qm
+share/qt5/translations/QOwnNotes_ha.qm
+share/qt5/translations/QOwnNotes_he.qm
+share/qt5/translations/QOwnNotes_hi.qm
+share/qt5/translations/QOwnNotes_hil.qm
+share/qt5/translations/QOwnNotes_hr.qm
+share/qt5/translations/QOwnNotes_hu.qm
+share/qt5/translations/QOwnNotes_id.qm
+share/qt5/translations/QOwnNotes_is.qm
+share/qt5/translations/QOwnNotes_it.qm
+share/qt5/translations/QOwnNotes_ja.qm
+share/qt5/translations/QOwnNotes_km.qm
+share/qt5/translations/QOwnNotes_ko.qm
+share/qt5/translations/QOwnNotes_ku.qm
+share/qt5/translations/QOwnNotes_lt.qm
+share/qt5/translations/QOwnNotes_lv.qm
+share/qt5/translations/QOwnNotes_mi.qm
+share/qt5/translations/QOwnNotes_mk.qm
+share/qt5/translations/QOwnNotes_ms.qm
+share/qt5/translations/QOwnNotes_nl.qm
+share/qt5/translations/QOwnNotes_no.qm
+share/qt5/translations/QOwnNotes_pa.qm
+share/qt5/translations/QOwnNotes_pl.qm
+share/qt5/translations/QOwnNotes_pt_BR.qm
+share/qt5/translations/QOwnNotes_pt_PT.qm
+share/qt5/translations/QOwnNotes_ro.qm
+share/qt5/translations/QOwnNotes_ru.qm
+share/qt5/translations/QOwnNotes_si.qm
+share/qt5/translations/QOwnNotes_sk.qm
+share/qt5/translations/QOwnNotes_sl.qm
+share/qt5/translations/QOwnNotes_sn.qm
+share/qt5/translations/QOwnNotes_sq.qm
+share/qt5/translations/QOwnNotes_sr.qm
+share/qt5/translations/QOwnNotes_sv.qm
+share/qt5/translations/QOwnNotes_th.qm
+share/qt5/translations/QOwnNotes_tl.qm
+share/qt5/translations/QOwnNotes_tr.qm
+share/qt5/translations/QOwnNotes_uk.qm
+share/qt5/translations/QOwnNotes_ur.qm
+share/qt5/translations/QOwnNotes_uz.qm
+share/qt5/translations/QOwnNotes_vi.qm
+share/qt5/translations/QOwnNotes_xh.qm
+share/qt5/translations/QOwnNotes_yi.qm
+share/qt5/translations/QOwnNotes_zh_CN.qm
+share/qt5/translations/QOwnNotes_zh_TW.qm
+share/qt5/translations/QOwnNotes_zu.qm
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor

graphics/iec16022/Makefile

@@ -17,7 +17,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB =  c iconv intl popt z
 
-MASTER_SITES=	https://github.com/rdoeffinger/iec16022/releases/download/v$V/
+SITES=		https://github.com/rdoeffinger/iec16022/releases/download/v$V/
 
 LIB_DEPENDS=	devel/popt
 

java/jBCrypt/Makefile

@@ -12,7 +12,7 @@ MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 # ISC
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=	https://www.mindrot.org/files/jBCrypt/
+SITES=		https://www.mindrot.org/files/jBCrypt/
 
 MODULES=	java
 MODJAVA_VER=	1.8+

lang/deno/Makefile

@@ -11,7 +11,7 @@ HOMEPAGE =		https://deno.com/runtime
 
 DISTNAME =		deno-${VERSION}
 DISTFILES =		${DISTNAME}{deno_src}${EXTRACT_SUFX}
-MASTER_SITES =		https://github.com/denoland/deno/releases/download/v${VERSION}/
+SITES 	=		https://github.com/denoland/deno/releases/download/v${VERSION}/
 
 MAINTAINER =		Volker Schlecht <openbsd-ports@schlecht.dev>
 

lang/erlang/Makefile.inc

@@ -6,7 +6,7 @@ CATEGORIES =	lang
 PERMIT_PACKAGE =	Yes
 
 HOMEPAGE =	https://www.erlang.org/
-MASTER_SITES =	https://github.com/erlang/otp/releases/download/OTP-${V}/
+SITES =	https://github.com/erlang/otp/releases/download/OTP-${V}/
 MAJ_V =		${V:C/\.[0-9]+//g}
 
 MAINTAINER =	Volker Schlecht <openbsd-ports@schlecht.dev>

lang/janet/Makefile

@@ -3,7 +3,7 @@ CATEGORIES =	lang
 
 GH_ACCOUNT =	janet-lang
 GH_PROJECT =	janet
-GH_TAGNAME =	v1.30.0
+GH_TAGNAME =	v1.31.0
 
 SHARED_LIBS +=	janet		8.0 # 1.20
 

lang/janet/distinfo

@@ -1,2 +1,2 @@
-SHA256 (janet-1.30.0.tar.gz) = ZKipI/XFBlBHyRzOnCftCmCJmtWBCyxvWQvF4kpOg0s=
+SHA256 (janet-1.31.0.tar.gz) = H1BkuXMTuT8oLjZYTft9SR3RPWzPT2VQKBIy53zO94A=
-SIZE (janet-1.30.0.tar.gz) = 551023
+SIZE (janet-1.31.0.tar.gz) = 555039

lang/janet/patches/patch-Makefile

@@ -22,8 +22,8 @@ Index: Makefile
  JANET_PKG_CONFIG_PATH?=$(LIBDIR)/pkgconfig
  JANET_DIST_DIR?=janet-dist
  JANET_BOOT_FLAGS:=. JANET_PATH '$(JANET_PATH)'
-@@ -311,7 +311,7 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT
+@@ -313,7 +313,7 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT
- 	strip '$(DESTDIR)$(BINDIR)/janet'
+ 	strip -x -S '$(DESTDIR)$(BINDIR)/janet'
  	mkdir -p '$(DESTDIR)$(INCLUDEDIR)/janet'
  	cp -r build/janet.h '$(DESTDIR)$(INCLUDEDIR)/janet'
 -	ln -sf ./janet/janet.h '$(DESTDIR)$(INCLUDEDIR)/janet.h'
@@ -31,7 +31,7 @@ Index: Makefile
  	mkdir -p '$(DESTDIR)$(JANET_PATH)'
  	mkdir -p '$(DESTDIR)$(LIBDIR)'
  	if test $(UNAME) = Darwin ; then \
-@@ -319,9 +319,7 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT
+@@ -321,9 +321,7 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT
  		ln -sf $(SONAME) '$(DESTDIR)$(LIBDIR)/libjanet.dylib' ; \
  		ln -sf libjanet.$(shell $(JANET_TARGET) -e '(print janet/version)').dylib $(DESTDIR)$(LIBDIR)/$(SONAME) ; \
  	else \
@@ -42,7 +42,7 @@ Index: Makefile
  	fi
  	cp $(JANET_STATIC_LIBRARY) '$(DESTDIR)$(LIBDIR)/libjanet.a'
  	mkdir -p '$(DESTDIR)$(JANET_MANPATH)'
-@@ -329,7 +327,6 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT
+@@ -331,7 +329,6 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT
  	mkdir -p '$(DESTDIR)$(JANET_PKG_CONFIG_PATH)'
  	cp build/janet.pc '$(DESTDIR)$(JANET_PKG_CONFIG_PATH)/janet.pc'
  	cp '$(JANET_IMPORT_LIB)' '$(DESTDIR)$(LIBDIR)' || echo 'no import lib to install (mingw only)'

lang/lucee/Makefile

@@ -13,7 +13,7 @@ MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 # LGPLv2.1
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=	https://cdn.lucee.org/
+SITES=		https://cdn.lucee.org/
 
 # doesn't actually need tomcat to build, but listing it here avoids
 # providing a useless package on arch where it's unavailable

mail/dcc/Makefile

@@ -18,7 +18,7 @@ PERMIT_DISTFILES=Yes
 
 WANTLIB += c curses edit m pthread
 
-MASTER_SITES=	https://www.dcc-servers.net/dcc/source/old/
+SITES=		https://www.dcc-servers.net/dcc/source/old/
 
 USE_GMAKE=	Yes
 

mail/mutt/Makefile

@@ -14,7 +14,7 @@ PERMIT_PACKAGE=	Yes
 # uses pledge()
 WANTLIB+=	c crypto curses iconv idn2 intl qdbm ssl unistring z
 
-MASTER_SITES=	http://ftp.mutt.org/pub/mutt/ \
+SITES=		http://ftp.mutt.org/pub/mutt/ \
 		https://ftp.osuosl.org/pub/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/ \
 		ftp://ftp.mutt.org/pub/mutt/

math/calc/Makefile

@@ -19,7 +19,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += c curses readline
 
-MASTER_SITES=	https://github.com/lcn2/calc/releases/download/v$V/ \
+SITES=	https://github.com/lcn2/calc/releases/download/v$V/ \
 	http://www.isthe.com/chongo/src/calc/
 
 MAKE_FLAGS= Q="" \

net/dhcpcd/Makefile

@@ -9,7 +9,7 @@ EPOCH=		0
 CATEGORIES=	net
 
 HOMEPAGE=	https://roy.marples.name/projects/dhcpcd
-MASTER_SITES=	https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$V/
+SITES=		https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$V/
 
 # BSD-2
 PERMIT_PACKAGE=	Yes

net/fping/Makefile

@@ -14,7 +14,7 @@ PERMIT_PACKAGE=	Yes
 # uses pledge()
 WANTLIB += c
 DEBUG_PACKAGES=	${BUILD_PACKAGES}
-MASTER_SITES=	https://fping.org/dist/
+SITES=		https://fping.org/dist/
 
 CONFIGURE_STYLE= gnu
 SEPARATE_BUILD=	Yes

net/freeradius/Makefile

@@ -24,7 +24,7 @@ PKGNAME-python3= freeradius-python3-$V
 
 CATEGORIES=	net security
 
-MASTER_SITES=	https://ftp.cc.uoc.gr/mirrors/ftp.freeradius.org/ \
+SITES=		https://ftp.cc.uoc.gr/mirrors/ftp.freeradius.org/ \
 		ftp://ftp.freeradius.org/pub/freeradius/ \
 		ftp://ftp.freeradius.org/pub/freeradius/old/
 

net/guacamole/server/Makefile

@@ -1,4 +1,4 @@
-SITES=		${MASTER_SITE_APACHE:=guacamole/$V/source/}
+SITES=		${SITE_APACHE:=guacamole/$V/source/}
 DISTNAME=	guacamole-server-$V
 COMMENT=	clientless remote desktop gateway
 

net/isc-bind/Makefile

@@ -26,7 +26,7 @@ WANTLIB += pthread ssl unistring uv xml2 z
 FLAVORS=	geoip
 FLAVOR?=
 
-SITES=		${MASTER_SITE_ISC:=bind9/$V/}
+SITES=		${SITE_ISC:=bind9/$V/}
 
 MODULES=	lang/python
 # used for dnssec-checkds/dnssec-coverage, but don't want to force the run dep.

net/libunbound/Makefile

@@ -16,7 +16,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += crypto event pthread ssl
 
-MASTER_SITES=	https://www.unbound.net/downloads/
+SITES=		https://www.unbound.net/downloads/
 
 SEPARATE_BUILD=	 Yes
 CONFIGURE_STYLE= gnu

net/maclookup/Makefile

@@ -9,7 +9,7 @@ MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 # Public Domain
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=	https://spacehopper.org/mirrors/
+SITES=		https://spacehopper.org/mirrors/
 
 RUN_DEPENDS=	net/arp-scan,-mac \
 		textproc/p5-Text-CSV \

net/monitoring-plugins/Makefile

@@ -38,7 +38,7 @@ WANTLIB=	c iconv intl pthread
 COMPILER=	base-clang ports-gcc base-gcc
 DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
-MASTER_SITES=	https://www.monitoring-plugins.org/download/
+SITES=		https://www.monitoring-plugins.org/download/
 
 LIB_DEPENDS=	devel/gettext,-runtime
 

net/nagios/check_email_delivery/Makefile

@@ -12,7 +12,7 @@ HOMEPAGE=	http://buhacoff.net/software/check_email_delivery/
 # GPLv3+
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=	${HOMEPAGE}/archive/
+SITES=		${HOMEPAGE}/archive/
 
 PKG_ARCH=	*
 NO_BUILD=	Yes

net/nagios/check_postgres/Makefile

@@ -7,7 +7,7 @@ CATEGORIES=	net databases
 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 
 HOMEPAGE=	http://bucardo.org/wiki/Check_postgres
-MASTER_SITES=	http://bucardo.org/downloads/
+SITES=		http://bucardo.org/downloads/
 
 # BSD
 PERMIT_PACKAGE=	Yes

net/nagios/check_sip/Makefile

@@ -7,7 +7,7 @@ CATEGORIES=	net
 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 
 HOMEPAGE=	http://isle.wumpus.org/src/nagios/
-MASTER_SITES=	https://spacehopper.org/mirrors/
+SITES=		https://spacehopper.org/mirrors/
 
 # Artistic License 2.0
 PERMIT_PACKAGE=	Yes

net/net-snmp/Makefile

@@ -21,7 +21,7 @@ SHARED_LIBS += netsnmptrapd	15.1
 
 CATEGORIES=	net perl5
 PORTROACH=	site:https://github.com/net-snmp/net-snmp/releases/
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/}
+SITES=		${SITE_SOURCEFORGE:=net-snmp/}
 
 HOMEPAGE=	http://www.net-snmp.org/
 

net/ntopng/Makefile

@@ -1,24 +1,10 @@
 COMMENT=	network traffic probe with web ui and deep packet inspection
 
-GH_ACCOUNT=	ntop
+# see GIT_RELEASE below if moving back to a commit id rather than a tag
-GH_PROJECT=	ntopng
+NTOPNG_V=	5.2.1
-GH_TAGNAME=	5.2.1
+DIST_TUPLE=	github ntop ntopng ${NTOPNG_V} . \
-# if using a branch commit of ntopng, comment GH_TAGNAME and
+		github ntop nDPI 4.2 nDPI
-# update/uncomment the below 4 lines:
+REVISION=	1
-#NTOPNG_V=	4.2
-#GH_COMMIT=	025e96e6cbb61e0f7320acf1d4038fafbbf836fa
-#NTOPNG_D=	20210727
-#DISTNAME=	ntopng-${NTOPNG_V}.${NTOPNG_D}
-REVISION=	0
-
-NDPI_V=		4.2
-DISTFILES=	${GH_DISTFILE} \
-		ndpi-{}${NDPI_V}.tar.gz:0
-# if using a branch commit of ndpi, comment above and update/uncomment below:
-#NDPI_V=		4.0pl20211111
-#NDPI_COMMIT=	92a1be258117c6e68c5f5b92ce688e2cea089495
-#DISTFILES=	${GH_DISTFILE} \
-#		ndpi-${NDPI_V}-{}${NDPI_COMMIT}.tar.gz:0
 
 CATEGORIES=	net
 
@@ -36,8 +22,6 @@ WANTLIB += ssl z zmq zstd
 
 COMPILER =	base-clang ports-gcc
 
-MASTER_SITES0=	https://github.com/ntop/ndpi/archive/
-
 RUN_DEPENDS=	databases/redis \
 		net/libmaxminddb,-db \
 		net/libmaxminddb,-city \
@@ -76,12 +60,7 @@ SHARED_LIBS=	ndpi 1.0
 
 AUTOCONF_VERSION=	2.71
 AUTOMAKE_VERSION=	1.16
-.if defined(GH_COMMIT)
+AUTORECONF=		sh -c "GIT_RELEASE=${NTOPNG_V} ./autogen.sh; cd nDPI; ./autogen.sh"
-GIT_RELEASE=		${NTOPNG_V}:${GH_COMMIT:C/(^..........).*/\1/}
-.else
-GIT_RELEASE=		${GH_TAGNAME}
-.endif
-AUTORECONF=		sh -c "GIT_RELEASE=${GIT_RELEASE} ./autogen.sh; cd nDPI; ./autogen.sh"
 
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/nDPI
 
@@ -92,9 +71,6 @@ MODLUA_RUNDEP=	No
 
 NO_TEST=	Yes
 
-post-extract:
-	cd ${WRKDIR}; mv nDPI-* ${WRKSRC}/nDPI
-
 pre-configure:
 	sed -i 's,/var/db,${LOCALSTATEDIR}/db,' \
 		${WRKSRC}/include/ntop_defines.h

net/ntopng/distinfo

@@ -1,4 +1,4 @@
-SHA256 (ndpi-4.2.tar.gz) = 5Uzo/hOtxddHvnVTUTZX+uePeW4L1FnhIsKAzAbOTa8=
+SHA256 (ntop-nDPI-4.2.tar.gz) = 5Uzo/hOtxddHvnVTUTZX+uePeW4L1FnhIsKAzAbOTa8=
-SHA256 (ntopng-5.2.1.tar.gz) = Z0BMzYcgKGTSw8REJuYMtZzC6H10bHBLJ+amPWHsdkQ=
+SHA256 (ntop-ntopng-5.2.1.tar.gz) = Z0BMzYcgKGTSw8REJuYMtZzC6H10bHBLJ+amPWHsdkQ=
-SIZE (ndpi-4.2.tar.gz) = 126559327
+SIZE (ntop-nDPI-4.2.tar.gz) = 126559327
-SIZE (ntopng-5.2.1.tar.gz) = 60280025
+SIZE (ntop-ntopng-5.2.1.tar.gz) = 60280025

net/rabbitmq/Makefile

@@ -1,8 +1,8 @@
 COMMENT =	highly reliable Enterprise Messaging System
 
 V =		3.11.22
-DISTNAME =	rabbitmq-server-$V
+DISTNAME =	rabbitmq-server-${V}
-PKGNAME =	rabbitmq-$V
+PKGNAME =	rabbitmq-${V}
 CATEGORIES =	net
 
 HOMEPAGE =	https://www.rabbitmq.com/
@@ -10,7 +10,7 @@ HOMEPAGE =	https://www.rabbitmq.com/
 # MPL
 PERMIT_PACKAGE= Yes
 
-MASTER_SITES =	https://github.com/rabbitmq/rabbitmq-server/releases/download/v$V/
+SITES =		https://github.com/rabbitmq/rabbitmq-server/releases/download/v${V}/
 EXTRACT_SUFX =	.tar.xz
 
 MODULES =	lang/erlang \

net/rrdtool/Makefile

@@ -16,7 +16,7 @@ CATEGORIES=	net databases
 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 
 HOMEPAGE=	https://oss.oetiker.ch/rrdtool/
-MASTER_SITES=	https://github.com/oetiker/rrdtool-1.x/releases/download/v$V/
+SITES=		https://github.com/oetiker/rrdtool-1.x/releases/download/v$V/
 
 # GPLv2+, with exemptions for use of the library with certain
 # named open-source licenses; see COPYRIGHT

net/scamper/Makefile

@@ -19,7 +19,7 @@ PERMIT_PACKAGE=	 Yes
 
 WANTLIB += c crypto m ssl pthread z
 
-MASTER_SITES=	https://www.caida.org/tools/measurement/scamper/code/
+SITES=		https://www.caida.org/tools/measurement/scamper/code/
 
 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE= gnu

net/unifi/snappy-java/Makefile

@@ -17,17 +17,17 @@ CATEGORIES=	net/unifi
 # Apache 2.0
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=	https://github.com/
+SITES=		https://github.com/
-MASTER_SITES0=	https://repo1.maven.org/maven2/org/xerial/snappy/snappy-java/${SNAPPYJ_V}/
 DISTFILES=	{xerial/snappy-java/archive/${SNAPPYJ_V}/}snappy-java-${SNAPPYJ_V}.tar.gz \
 		{google/snappy/archive/${SNAPPY_V}/}snappy-${SNAPPY_V}.tar.gz \
-		{kiyo-masui/bitshuffle/archive/${BITSHUFFLE_V}/}bitshuffle-${BITSHUFFLE_V}.tar.gz \
+		{kiyo-masui/bitshuffle/archive/${BITSHUFFLE_V}/}bitshuffle-${BITSHUFFLE_V}.tar.gz
-		snappy-java-${SNAPPYJ_V}.jar:0
+SITES.mvn=	https://repo1.maven.org/maven2/org/xerial/snappy/snappy-java/${SNAPPYJ_V}/
+DISTFILES.mvn=	snappy-java-${SNAPPYJ_V}.jar
 
 EXTRACT_ONLY=	${_LIST_DISTFILES:N*jar}
 
 MODULES=	java
-MODJAVA_VER=	1.8+
+MODJAVA_VER=	11+
 
 # not MODULES; it is run from a Makefile
 BUILD_DEPENDS=	devel/cmake
@@ -36,7 +36,7 @@ USE_GMAKE=	Yes
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME}
 MAKE_FLAGS=	CXX="${CXX}" CC="${CC}" LINKFLAGS="-shared" \
 		HOME=${WRKDIR} \
-		PATH="${PATH}:${LOCALBASE}/jdk-1.8.0/bin"
+		PATH="${PATH}:${LOCALBASE}/jdk-11/bin"
 ALL_TARGET=	native
 NO_TEST=	Yes
 
@@ -52,7 +52,7 @@ post-extract:
 post-build:
 	cp ${FULLDISTDIR}/snappy-java-${SNAPPYJ_V}.jar ${WRKDIR}
 	cd ${WRKSRC}/target/classes; \
-	    ${LOCALBASE}/jdk-1.8.0/bin/jar uvf ${WRKDIR}/snappy-java-${SNAPPYJ_V}.jar \
+	    ${LOCALBASE}/jdk-11/bin/jar uvf ${WRKDIR}/snappy-java-${SNAPPYJ_V}.jar \
 	    org/xerial/snappy/native/OpenBSD/*/libsnappyjava.so
 
 do-install:

net/wireshark/Makefile

@@ -59,7 +59,7 @@ WANTLIB-main += minizip speexdsp wireshark wiretap wsutil
 WANTLIB-main += Qt6Core Qt6Core5Compat Qt6Gui Qt6Multimedia Qt6PrintSupport
 WANTLIB-main += Qt6Widgets
 
-MASTER_SITES =		https://www.wireshark.org/download/src/all-versions/
+SITES =		https://www.wireshark.org/download/src/all-versions/
 
 WVER =		${V:C/^(...).*/\1/}
 SUBST_VARS =	WVER

security/clamav/Makefile

@@ -31,10 +31,10 @@ LIB_DEPENDS=		archivers/bzip2 \
 		textproc/libxml
 TEST_DEPENDS=	security/clamav
 
-MASTER_SITES=		https://www.clamav.net/downloads/production/
+SITES=		https://www.clamav.net/downloads/production/
 
 MODULES=	devel/cmake
-CONFIGURE_ARGS+=	-DCLAMAV_USER=_clamav \
+CONFIGURE_ARGS=	-DCLAMAV_USER=_clamav \
 		-DCLAMAV_GROUP=_clamav \
 		-DENABLE_EXTERNAL_MSPACK=ON \
 		-DDATABASE_DIRECTORY=/var/db/clamav \

security/py-fastecdsa/Makefile

@@ -13,7 +13,7 @@ HOMEPAGE =		https://github.com/AntonKueltz/fastecdsa
 MAINTAINER =		Theo Buehler <tb@openbsd.org>
 
 # Avoid fetching test cases from the internet during 'make test'
-MASTER_SITES.ietf =	https://tools.ietf.org/rfc/
+SITES.ietf =		https://tools.ietf.org/rfc/
 DISTFILES.ietf +=	rfc6979.txt
 EXTRACT_CASES =		*.txt)	cp ${FULLDISTDIR}/$$archive ${MODPY_TEST_DIR};;
 

security/xca/Makefile

@@ -16,7 +16,7 @@ PERMIT_PACKAGE=	Yes
 WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Help Qt5Sql Qt5Widgets
 WANTLIB += c crypto ltdl m
 
-MASTER_SITES=	https://github.com/chris2511/xca/releases/download/RELEASE.$V/
+SITES=		https://github.com/chris2511/xca/releases/download/RELEASE.$V/
 
 MODULES=	x11/qt5
 

sysutils/firmware/amd/Makefile

@@ -1,16 +1,15 @@
 COMMENT=	microcode update binaries for AMD CPUs
 FW_DRIVER=	amd
-FW_VER=		20230809
+FW_VER=		20230919
-DISTNAME=	linux-firmware-f2eb058afc57348cde66852272d6bf11da1eef8f
+DISTNAME=	linux-firmware-${FW_VER}
-#DISTNAME=	linux-firmware-${FW_VER}
+EXTRACT_SUFX=	.tar.xz
-#EXTRACT_SUFX=	.tar.xz
 EXTRACT_FILES=	${DISTNAME}/{LICENSE.\*,amd-ucode}
 
 MAINTAINER=	Jonathan Gray <jsg@openbsd.org>
 
 HOMEPAGE=	https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/amd-ucode
-MASTER_SITES=	https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/
+#MASTER_SITES=	https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/
-#MASTER_SITES=	https://cdn.kernel.org/pub/linux/kernel/firmware/
+MASTER_SITES=	https://cdn.kernel.org/pub/linux/kernel/firmware/
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/firmware/amd

sysutils/firmware/amd/distinfo

@@ -1,2 +1,2 @@
-SHA256 (firmware/linux-firmware-f2eb058afc57348cde66852272d6bf11da1eef8f.tar.gz) = /NVwuLJZBJ3YSgMm8XoxMnGWL4Bsoy29nkDN2QeYV9A=
+SHA256 (firmware/linux-firmware-20230919.tar.xz) = l/raDQK9r8TgF6TcxFbn+ki8ja8t33UWHzmpLjjwhK0=
-SIZE (firmware/linux-firmware-f2eb058afc57348cde66852272d6bf11da1eef8f.tar.gz) = 457911356
+SIZE (firmware/linux-firmware-20230919.tar.xz) = 314110436

sysutils/firmware/amdgpu/Makefile

@@ -1,5 +1,5 @@
 FW_DRIVER=	amdgpu
-FW_VER=		20230804
+FW_VER=		20230919
 DISTNAME=	linux-firmware-${FW_VER}
 EXTRACT_SUFX=	.tar.xz
 EXTRACT_FILES=	${DISTNAME}/{LICENSE.\*,\*.bin}

sysutils/firmware/amdgpu/distinfo

@@ -1,2 +1,2 @@
-SHA256 (firmware/linux-firmware-20230804.tar.xz) = iNRsVDhH7jsDQE1JQdkckpdGkO4fb9y+6c7z5fl9tog=
+SHA256 (firmware/linux-firmware-20230919.tar.xz) = l/raDQK9r8TgF6TcxFbn+ki8ja8t33UWHzmpLjjwhK0=
-SIZE (firmware/linux-firmware-20230804.tar.xz) = 295170972
+SIZE (firmware/linux-firmware-20230919.tar.xz) = 314110436

sysutils/firmware/inteldrm/Makefile

@@ -1,5 +1,5 @@
 FW_DRIVER=	inteldrm
-FW_VER=		20230804
+FW_VER=		20230919
 DISTNAME=	linux-firmware-${FW_VER}
 EXTRACT_SUFX=	.tar.xz
 EXTRACT_FILES=	${DISTNAME}/{LICENSE.\*,i915}

sysutils/firmware/inteldrm/distinfo

@@ -1,2 +1,2 @@
-SHA256 (firmware/linux-firmware-20230804.tar.xz) = iNRsVDhH7jsDQE1JQdkckpdGkO4fb9y+6c7z5fl9tog=
+SHA256 (firmware/linux-firmware-20230919.tar.xz) = l/raDQK9r8TgF6TcxFbn+ki8ja8t33UWHzmpLjjwhK0=
-SIZE (firmware/linux-firmware-20230804.tar.xz) = 295170972
+SIZE (firmware/linux-firmware-20230919.tar.xz) = 314110436

sysutils/firmware/radeondrm/Makefile

@@ -1,5 +1,5 @@
 FW_DRIVER=	radeondrm
-FW_VER=		20230804
+FW_VER=		20230919
 DISTNAME=	linux-firmware-${FW_VER}
 EXTRACT_SUFX=	.tar.xz
 EXTRACT_FILES=	${DISTNAME}/{LICENSE.\*,radeon/\*.bin}

sysutils/firmware/radeondrm/distinfo

@@ -1,2 +1,2 @@
-SHA256 (firmware/linux-firmware-20230804.tar.xz) = iNRsVDhH7jsDQE1JQdkckpdGkO4fb9y+6c7z5fl9tog=
+SHA256 (firmware/linux-firmware-20230919.tar.xz) = l/raDQK9r8TgF6TcxFbn+ki8ja8t33UWHzmpLjjwhK0=
-SIZE (firmware/linux-firmware-20230804.tar.xz) = 295170972
+SIZE (firmware/linux-firmware-20230919.tar.xz) = 314110436

sysutils/flashrom/Makefile

@@ -19,7 +19,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB=	c ftdi1 usb-1.0 z
 
-MASTER_SITES=	https://download.flashrom.org/releases/
+SITES=		https://download.flashrom.org/releases/
 
 LIB_DEPENDS=	devel/libftdi1 \
 		devel/libusb1

sysutils/freeipmi/Makefile

@@ -18,7 +18,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += c gcrypt gpg-error iconv intl m pthread
 
-MASTER_SITES=	${MASTER_SITE_GNU:=freeipmi/}
+SITES=		${SITE_GNU:=freeipmi/}
 
 BUILD_DEPENDS=	devel/argp-standalone
 LIB_DEPENDS=	security/libgcrypt \

sysutils/moreutils/Makefile

@@ -17,7 +17,7 @@ PERMIT_PACKAGE = Yes
 
 WANTLIB += c
 
-MASTER_SITES =		${MASTER_SITE_DEBIAN:=main/m/moreutils/}
+SITES =			${SITE_DEBIAN:=main/m/moreutils/}
 
 BUILD_DEPENDS =		textproc/docbook-xsl
 RUN_DEPENDS =		devel/p5-IPC-Run \

sysutils/reposync/Makefile

@@ -3,7 +3,7 @@ COMMENT=	script to update an OpenBSD CVS repository via rsync
 DISTNAME=	reposync-20230713
 
 HOMEPAGE=	https://github.com/sthen/reposync
-MASTER_SITES=	https://spacehopper.org/mirrors/
+SITES=		https://spacehopper.org/mirrors/
 
 CATEGORIES=	sysutils devel
 PKG_ARCH=	*

textproc/grepcidr/Makefile

@@ -18,7 +18,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += c
 
-MASTER_SITES=	http://www.pc-tools.net/files/unix/
+SITES=		http://www.pc-tools.net/files/unix/
 
 MAKE_FLAGS=	CFLAGS="${CFLAGS}"
 FAKE_FLAGS=	MANDIR="${PREFIX}/man"

textproc/mupdf/Makefile

@@ -24,7 +24,7 @@ FLAVORS =	js
 FLAVOR ?=
 
 # http://git.ghostscript.com/?p=mupdf.git;a=summary
-MASTER_SITES =	https://mupdf.com/downloads/archive/
+SITES =		https://mupdf.com/downloads/archive/
 
 COMPILER =	base-clang ports-gcc
 

textproc/oniguruma/Makefile

@@ -16,7 +16,7 @@ MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 # BSD
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=	https://github.com/kkos/oniguruma/releases/download/v$V/
+SITES=		https://github.com/kkos/oniguruma/releases/download/v$V/
 
 SEPARATE_BUILD=	 Yes
 DEBUG_PACKAGES=	 ${BUILD_PACKAGES}

textproc/patchutils/Makefile

@@ -15,7 +15,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += c
 
-MASTER_SITES=	http://cyberelk.net/tim/data/patchutils/stable/
+SITES=		http://cyberelk.net/tim/data/patchutils/stable/
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		textproc/xmlto

www/pear/Makefile

@@ -16,7 +16,7 @@ WRKDIST=	${WRKDIR}
 CATEGORIES=	www devel
 
 HOMEPAGE=	https://pear.php.net/
-MASTER_SITES=	https://github.com/pear/pearweb_phars/raw/v${VERSION}/
+SITES=		https://github.com/pear/pearweb_phars/raw/v${VERSION}/
 
 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 

www/trac/Makefile

@@ -10,7 +10,7 @@ MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 
 HOMEPAGE=	https://trac.edgewall.org/
 
-MASTER_SITES=	https://download.edgewall.org/trac/
+SITES=		https://download.edgewall.org/trac/
 
 MODPY_PYBUILD=	setuptools
 

x11/i3/Makefile

@@ -23,7 +23,7 @@ COMPILER_LANGS=	c
 
 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 
-MASTER_SITES=	${HOMEPAGE}/downloads/
+SITES=		${HOMEPAGE}/downloads/
 EXTRACT_SUFX=	.tar.xz
 DEBUG_PACKAGES= ${BUILD_PACKAGES}
 

x11/rxvt-unicode/Makefile

@@ -8,7 +8,7 @@ CATEGORIES=	x11
 
 FIX_EXTRACT_PERMISSIONS=	Yes
 
-MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/ \
+SITES=		http://dist.schmorp.de/rxvt-unicode/ \
 		http://dist.schmorp.de/rxvt-unicode/Attic/
 
 HOMEPAGE=	http://software.schmorp.de/pkg/rxvt-unicode.html

x11/tigervnc/Makefile

@@ -27,12 +27,12 @@ WANTLIB += iconv idn2 intl jpeg kvm m nettle p11-kit
 WANTLIB += pixman-1 swscale tasn1 unistring xcb xshmfence
 WANTLIB += z zstd
 
-MASTER_SITES.x=	https://www.x.org/releases/individual/xserver/
+SITES.x=	https://www.x.org/releases/individual/xserver/
 
 # the vncserver script in 1.11.0+ is no longer useful for us (systemd/pam
 # dependencies) so fetch an old working one from the v1.10.1 tag.
 SCRIPTV=	1.10.1
-MASTER_SITES.t=	https://raw.githubusercontent.com/TigerVNC/tigervnc/v${SCRIPTV}/unix/
+SITES.t=	https://raw.githubusercontent.com/TigerVNC/tigervnc/v${SCRIPTV}/unix/
 EXTRACT_ONLY=	${GH_DISTFILE} xorg-server-21.1.1.tar.xz
 DISTFILES.t=	tigervnc-vncserver-${SCRIPTV}.pl{vncserver} \
 		tigervnc-vncserver-${SCRIPTV}.man{vncserver.man}