diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile index eefe9bbc8..6ea3e6e69 100644 --- a/comms/conserver/Makefile +++ b/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 \ diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 0bf1a810a..6a8d86100 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -12,7 +12,7 @@ HOMEPAGE= https://www.freetds.org/ MAINTAINER= Stuart Henderson -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) diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile index b60ca46af..ba5960001 100644 --- a/databases/iodbc/Makefile +++ b/databases/iodbc/Makefile @@ -1,24 +1,24 @@ -COMMENT-main= ODBC 3.x driver manager -COMMENT-admin= ODBC 3.x driver manager admin application -REVISION-admin= 3 -REVISION-main= 3 +COMMENT-main= ODBC 3.x driver manager +COMMENT-admin= ODBC 3.x driver manager admin application +REVISION-admin= 3 +REVISION-main= 3 -V= 3.52.12 -DISTNAME= libiodbc-$V -PKGNAME= iodbc-$V -REVISION= 3 +V= 3.52.12 +DISTNAME= libiodbc-$V +PKGNAME= iodbc-$V +REVISION= 3 -CATEGORIES= databases +CATEGORIES= databases -SHARED_LIBS += iodbcinst 3.15 -SHARED_LIBS += iodbc 3.16 -SHARED_LIBS += iodbcadm 3.15 -SHARED_LIBS += drvproxy 3.15 +SHARED_LIBS += iodbcinst 3.15 +SHARED_LIBS += iodbc 3.16 +SHARED_LIBS += iodbcadm 3.15 +SHARED_LIBS += drvproxy 3.15 -HOMEPAGE= http://www.iodbc.org/ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=iodbc/} +HOMEPAGE= http://www.iodbc.org/ +SITES= ${SITE_SOURCEFORGE:=iodbc/} -MAINTAINER= Stuart Henderson +MAINTAINER= Stuart Henderson # Dual licensed: BSD or LGPLv2 PERMIT_PACKAGE= yes diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 9ce144e7f..b08f79ef0 100644 --- a/databases/openldap/Makefile +++ b/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/ diff --git a/devel/Makefile b/devel/Makefile index 30875678d..1548f8fb6 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -40,6 +40,7 @@ SUBDIR += autoconf-archive SUBDIR += autogen SUBDIR += automake + SUBDIR += autopep8 SUBDIR += avr SUBDIR += avr32 SUBDIR += avrdude diff --git a/devel/abseil-cpp/Makefile b/devel/abseil-cpp/Makefile index b15bdebca..c298db565 100644 --- a/devel/abseil-cpp/Makefile +++ b/devel/abseil-cpp/Makefile @@ -3,8 +3,7 @@ CATEGORIES = devel GH_ACCOUNT = abseil GH_PROJECT = ${GH_ACCOUNT}-cpp -GH_TAGNAME = 20230802.0 -REVISION = 0 +GH_TAGNAME = 20230802.1 HOMEPAGE = https://abseil.io/ diff --git a/devel/abseil-cpp/distinfo b/devel/abseil-cpp/distinfo index c0260c7b1..305fadacb 100644 --- a/devel/abseil-cpp/distinfo +++ b/devel/abseil-cpp/distinfo @@ -1,2 +1,2 @@ -SHA256 (abseil-cpp-20230802.0.tar.gz) = WdKXavnW7PABqBo1dJpuVRozW5SdNJGM+t4Hc3udk8U= -SIZE (abseil-cpp-20230802.0.tar.gz) = 2156669 +SHA256 (abseil-cpp-20230802.1.tar.gz) = mHzpjwLu+6+TDW44qxaqBXNyNNevurLVxOp62+UMKO0= +SIZE (abseil-cpp-20230802.1.tar.gz) = 2157158 diff --git a/devel/abseil-cpp/patches/patch-absl_base_internal_sysinfo_cc b/devel/abseil-cpp/patches/patch-absl_base_internal_sysinfo_cc deleted file mode 100644 index 95d5336a4..000000000 --- a/devel/abseil-cpp/patches/patch-absl_base_internal_sysinfo_cc +++ /dev/null @@ -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(thread); - } - -+#elif defined(__OpenBSD__) -+ -+pid_t GetTID() { -+ return getthrid(); -+} -+ - #else - - // Fallback implementation of `GetTID` using `pthread_self`. diff --git a/devel/autopep8/Makefile b/devel/autopep8/Makefile new file mode 100644 index 000000000..05c8934c0 --- /dev/null +++ b/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 diff --git a/devel/autopep8/distinfo b/devel/autopep8/distinfo new file mode 100644 index 000000000..2f1eecf4a --- /dev/null +++ b/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 diff --git a/devel/autopep8/pkg/DESCR b/devel/autopep8/pkg/DESCR new file mode 100644 index 000000000..a6d30c94f --- /dev/null +++ b/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. diff --git a/devel/autopep8/pkg/PLIST b/devel/autopep8/pkg/PLIST new file mode 100644 index 000000000..063807e03 --- /dev/null +++ b/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 diff --git a/editors/Makefile b/editors/Makefile index b20d375e7..98eca5ce4 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -54,6 +54,7 @@ SUBDIR += poke SUBDIR += py-neovim,python3 SUBDIR += py-qscintilla,python3 + SUBDIR += qownnotes SUBDIR += qscintilla SUBDIR += scintilla SUBDIR += scite diff --git a/editors/qownnotes/Makefile b/editors/qownnotes/Makefile new file mode 100644 index 000000000..048507ad9 --- /dev/null +++ b/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 + +# 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 diff --git a/editors/qownnotes/distinfo b/editors/qownnotes/distinfo new file mode 100644 index 000000000..9938b2378 --- /dev/null +++ b/editors/qownnotes/distinfo @@ -0,0 +1,2 @@ +SHA256 (qownnotes-23.9.4.tar.xz) = e5x3YeWCaTNoQR924r2EseqDOfFluj58MGS78DzfJUM= +SIZE (qownnotes-23.9.4.tar.xz) = 5655972 diff --git a/editors/qownnotes/pkg/DESCR b/editors/qownnotes/pkg/DESCR new file mode 100644 index 000000000..fc00ecfae --- /dev/null +++ b/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. diff --git a/editors/qownnotes/pkg/PLIST b/editors/qownnotes/pkg/PLIST new file mode 100644 index 000000000..2372d33b4 --- /dev/null +++ b/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 diff --git a/graphics/iec16022/Makefile b/graphics/iec16022/Makefile index f649fcb5f..fdec94302 100755 --- a/graphics/iec16022/Makefile +++ b/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 diff --git a/java/jBCrypt/Makefile b/java/jBCrypt/Makefile index 0117e2124..11a5e5f47 100644 --- a/java/jBCrypt/Makefile +++ b/java/jBCrypt/Makefile @@ -12,15 +12,15 @@ MAINTAINER= Stuart Henderson # 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+ -MODJAVA_BUILD= ant +MODULES= java +MODJAVA_VER= 1.8+ +MODJAVA_BUILD= ant # JUnit tests exist but unsure how to handle non-ascii chars (or run them in # the first place..) -NO_TEST= Yes +NO_TEST= Yes do-configure: cp ${FILESDIR}/build.xml ${WRKSRC}/ diff --git a/lang/deno/Makefile b/lang/deno/Makefile index 752eb42e6..a3c6f5f44 100644 --- a/lang/deno/Makefile +++ b/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 diff --git a/lang/erlang/Makefile.inc b/lang/erlang/Makefile.inc index ac194ef7b..1b85f0ec0 100644 --- a/lang/erlang/Makefile.inc +++ b/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 diff --git a/lang/janet/Makefile b/lang/janet/Makefile index 74c117deb..8699e9114 100644 --- a/lang/janet/Makefile +++ b/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 diff --git a/lang/janet/distinfo b/lang/janet/distinfo index f378fb437..3fb7b9761 100644 --- a/lang/janet/distinfo +++ b/lang/janet/distinfo @@ -1,2 +1,2 @@ -SHA256 (janet-1.30.0.tar.gz) = ZKipI/XFBlBHyRzOnCftCmCJmtWBCyxvWQvF4kpOg0s= -SIZE (janet-1.30.0.tar.gz) = 551023 +SHA256 (janet-1.31.0.tar.gz) = H1BkuXMTuT8oLjZYTft9SR3RPWzPT2VQKBIy53zO94A= +SIZE (janet-1.31.0.tar.gz) = 555039 diff --git a/lang/janet/patches/patch-Makefile b/lang/janet/patches/patch-Makefile index 32733baf8..94b9946b2 100644 --- a/lang/janet/patches/patch-Makefile +++ b/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 - strip '$(DESTDIR)$(BINDIR)/janet' +@@ -313,7 +313,7 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT + 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)' diff --git a/lang/lucee/Makefile b/lang/lucee/Makefile index a8d2ade39..7e97c4cf6 100644 --- a/lang/lucee/Makefile +++ b/lang/lucee/Makefile @@ -13,7 +13,7 @@ MAINTAINER= Stuart Henderson # 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 diff --git a/mail/dcc/Makefile b/mail/dcc/Makefile index 1e155c009..81b46ef95 100644 --- a/mail/dcc/Makefile +++ b/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 diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index b0d4e1a5d..7221b6cfa 100644 --- a/mail/mutt/Makefile +++ b/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/ diff --git a/math/calc/Makefile b/math/calc/Makefile index 1e5a6b0d3..14363958c 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -19,8 +19,8 @@ PERMIT_PACKAGE= Yes WANTLIB += c curses readline -MASTER_SITES= https://github.com/lcn2/calc/releases/download/v$V/ \ - http://www.isthe.com/chongo/src/calc/ +SITES= https://github.com/lcn2/calc/releases/download/v$V/ \ + http://www.isthe.com/chongo/src/calc/ MAKE_FLAGS= Q="" \ BINDIR='$${DESTDIR}${PREFIX}/bin' \ diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile index a92eeeafa..883352f34 100644 --- a/net/dhcpcd/Makefile +++ b/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 diff --git a/net/fping/Makefile b/net/fping/Makefile index 2a518a6af..1cf866fb4 100644 --- a/net/fping/Makefile +++ b/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 diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 125646efb..a08c2be02 100644 --- a/net/freeradius/Makefile +++ b/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/ diff --git a/net/guacamole/server/Makefile b/net/guacamole/server/Makefile index 165016b69..c6ffac9cc 100644 --- a/net/guacamole/server/Makefile +++ b/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 diff --git a/net/isc-bind/Makefile b/net/isc-bind/Makefile index 3ecd81e7b..06a37736e 100644 --- a/net/isc-bind/Makefile +++ b/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. diff --git a/net/libunbound/Makefile b/net/libunbound/Makefile index 461605877..9e19fce3d 100644 --- a/net/libunbound/Makefile +++ b/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 diff --git a/net/maclookup/Makefile b/net/maclookup/Makefile index 0235a8890..3b0f3dcbe 100644 --- a/net/maclookup/Makefile +++ b/net/maclookup/Makefile @@ -9,7 +9,7 @@ MAINTAINER= Stuart Henderson # 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 \ diff --git a/net/monitoring-plugins/Makefile b/net/monitoring-plugins/Makefile index 9ac4f6b2c..95b92cdd7 100644 --- a/net/monitoring-plugins/Makefile +++ b/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 diff --git a/net/nagios/check_email_delivery/Makefile b/net/nagios/check_email_delivery/Makefile index 120f00c42..bb7472c0c 100644 --- a/net/nagios/check_email_delivery/Makefile +++ b/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 diff --git a/net/nagios/check_postgres/Makefile b/net/nagios/check_postgres/Makefile index 4cca39517..aaa699fa0 100644 --- a/net/nagios/check_postgres/Makefile +++ b/net/nagios/check_postgres/Makefile @@ -7,7 +7,7 @@ CATEGORIES= net databases MAINTAINER= Stuart Henderson HOMEPAGE= http://bucardo.org/wiki/Check_postgres -MASTER_SITES= http://bucardo.org/downloads/ +SITES= http://bucardo.org/downloads/ # BSD PERMIT_PACKAGE= Yes diff --git a/net/nagios/check_sip/Makefile b/net/nagios/check_sip/Makefile index 249d9a54a..5646ad627 100644 --- a/net/nagios/check_sip/Makefile +++ b/net/nagios/check_sip/Makefile @@ -7,7 +7,7 @@ CATEGORIES= net MAINTAINER= Stuart Henderson 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 diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index d59cd827d..cbbe31949 100644 --- a/net/net-snmp/Makefile +++ b/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/ diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 9e7f2874b..d06d61ae9 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -1,24 +1,10 @@ COMMENT= network traffic probe with web ui and deep packet inspection -GH_ACCOUNT= ntop -GH_PROJECT= ntopng -GH_TAGNAME= 5.2.1 -# if using a branch commit of ntopng, comment GH_TAGNAME and -# update/uncomment the below 4 lines: -#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 +# see GIT_RELEASE below if moving back to a commit id rather than a tag +NTOPNG_V= 5.2.1 +DIST_TUPLE= github ntop ntopng ${NTOPNG_V} . \ + github ntop nDPI 4.2 nDPI +REVISION= 1 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) -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" +AUTORECONF= sh -c "GIT_RELEASE=${NTOPNG_V} ./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 diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo index ed61facc5..ab3e0c5d9 100644 --- a/net/ntopng/distinfo +++ b/net/ntopng/distinfo @@ -1,4 +1,4 @@ -SHA256 (ndpi-4.2.tar.gz) = 5Uzo/hOtxddHvnVTUTZX+uePeW4L1FnhIsKAzAbOTa8= -SHA256 (ntopng-5.2.1.tar.gz) = Z0BMzYcgKGTSw8REJuYMtZzC6H10bHBLJ+amPWHsdkQ= -SIZE (ndpi-4.2.tar.gz) = 126559327 -SIZE (ntopng-5.2.1.tar.gz) = 60280025 +SHA256 (ntop-nDPI-4.2.tar.gz) = 5Uzo/hOtxddHvnVTUTZX+uePeW4L1FnhIsKAzAbOTa8= +SHA256 (ntop-ntopng-5.2.1.tar.gz) = Z0BMzYcgKGTSw8REJuYMtZzC6H10bHBLJ+amPWHsdkQ= +SIZE (ntop-nDPI-4.2.tar.gz) = 126559327 +SIZE (ntop-ntopng-5.2.1.tar.gz) = 60280025 diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index 7999a1ccc..bf9595290 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -1,8 +1,8 @@ COMMENT = highly reliable Enterprise Messaging System V = 3.11.22 -DISTNAME = rabbitmq-server-$V -PKGNAME = rabbitmq-$V +DISTNAME = rabbitmq-server-${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 \ diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile index de65c6f89..0ed5f6ff7 100644 --- a/net/rrdtool/Makefile +++ b/net/rrdtool/Makefile @@ -16,7 +16,7 @@ CATEGORIES= net databases MAINTAINER= Stuart Henderson 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 diff --git a/net/scamper/Makefile b/net/scamper/Makefile index 7a1a91a28..1b12a3efe 100644 --- a/net/scamper/Makefile +++ b/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 diff --git a/net/unifi/snappy-java/Makefile b/net/unifi/snappy-java/Makefile index 0303f8a45..ac0515761 100644 --- a/net/unifi/snappy-java/Makefile +++ b/net/unifi/snappy-java/Makefile @@ -17,17 +17,17 @@ CATEGORIES= net/unifi # Apache 2.0 PERMIT_PACKAGE= Yes -MASTER_SITES= https://github.com/ -MASTER_SITES0= https://repo1.maven.org/maven2/org/xerial/snappy/snappy-java/${SNAPPYJ_V}/ +SITES= https://github.com/ 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 \ - snappy-java-${SNAPPYJ_V}.jar:0 + {kiyo-masui/bitshuffle/archive/${BITSHUFFLE_V}/}bitshuffle-${BITSHUFFLE_V}.tar.gz +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: diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index f129bd349..77465977d 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -59,10 +59,10 @@ 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 +WVER = ${V:C/^(...).*/\1/} +SUBST_VARS = WVER BUILD_DEPENDS += devel/bison \ devel/desktop-file-utils \ diff --git a/security/clamav/Makefile b/security/clamav/Makefile index c7d41347e..2e2009978 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -19,37 +19,37 @@ WANTLIB += ${COMPILER_LIBCXX} WANTLIB += bz2 c crypto curl curses execinfo iconv json-c m milter WANTLIB += mspack pcre2-8 ssl util xml2 z -COMPILER= base-clang ports-gcc +COMPILER= base-clang ports-gcc -BUILD_DEPENDS= lang/rust -LIB_DEPENDS= archivers/bzip2 \ - archivers/libmspack \ - devel/json-c \ - devel/pcre2 \ - mail/sendmail,-libmilter \ - net/curl \ - textproc/libxml -TEST_DEPENDS= security/clamav +BUILD_DEPENDS= lang/rust +LIB_DEPENDS= archivers/bzip2 \ + archivers/libmspack \ + devel/json-c \ + devel/pcre2 \ + mail/sendmail,-libmilter \ + net/curl \ + 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 \ - -DCLAMAV_GROUP=_clamav \ - -DENABLE_EXTERNAL_MSPACK=ON \ - -DDATABASE_DIRECTORY=/var/db/clamav \ - -DAPP_CONFIG_DIRECTORY=${SYSCONFDIR} \ - -DCMAKE_INSTALL_DOCDIR=${PREFIX}/share/doc/clamav +MODULES= devel/cmake +CONFIGURE_ARGS= -DCLAMAV_USER=_clamav \ + -DCLAMAV_GROUP=_clamav \ + -DENABLE_EXTERNAL_MSPACK=ON \ + -DDATABASE_DIRECTORY=/var/db/clamav \ + -DAPP_CONFIG_DIRECTORY=${SYSCONFDIR} \ + -DCMAKE_INSTALL_DOCDIR=${PREFIX}/share/doc/clamav # the LLVM bytecode runtime uses W+X-maps (and often doesn't support # current LLVM versions anyway) -CONFIGURE_ARGS+= -DBYTECODE_RUNTIME=interpreter +CONFIGURE_ARGS += -DBYTECODE_RUNTIME=interpreter # for tests -MODULES+= lang/python -MODPY_RUNDEP= No -BUILD_DEPENDS+= devel/check -CONFIGURE_ARGS+= -DENABLE_TESTS=on +MODULES+= lang/python +MODPY_RUNDEP= No +BUILD_DEPENDS+= devel/check +CONFIGURE_ARGS+= -DENABLE_TESTS=on post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/clamav diff --git a/security/py-fastecdsa/Makefile b/security/py-fastecdsa/Makefile index b3f2ba7dd..4bd403d4d 100644 --- a/security/py-fastecdsa/Makefile +++ b/security/py-fastecdsa/Makefile @@ -13,7 +13,7 @@ HOMEPAGE = https://github.com/AntonKueltz/fastecdsa MAINTAINER = Theo Buehler # 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};; diff --git a/security/xca/Makefile b/security/xca/Makefile index fef93d071..a786f7004 100644 --- a/security/xca/Makefile +++ b/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 diff --git a/sysutils/firmware/amd/Makefile b/sysutils/firmware/amd/Makefile index 7278f7cf6..0144bfa69 100644 --- a/sysutils/firmware/amd/Makefile +++ b/sysutils/firmware/amd/Makefile @@ -1,16 +1,15 @@ COMMENT= microcode update binaries for AMD CPUs FW_DRIVER= amd -FW_VER= 20230809 -DISTNAME= linux-firmware-f2eb058afc57348cde66852272d6bf11da1eef8f -#DISTNAME= linux-firmware-${FW_VER} -#EXTRACT_SUFX= .tar.xz +FW_VER= 20230919 +DISTNAME= linux-firmware-${FW_VER} +EXTRACT_SUFX= .tar.xz EXTRACT_FILES= ${DISTNAME}/{LICENSE.\*,amd-ucode} MAINTAINER= Jonathan Gray 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://cdn.kernel.org/pub/linux/kernel/firmware/ +#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/ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/firmware/amd diff --git a/sysutils/firmware/amd/distinfo b/sysutils/firmware/amd/distinfo index c9be1bc13..f5eccd104 100644 --- a/sysutils/firmware/amd/distinfo +++ b/sysutils/firmware/amd/distinfo @@ -1,2 +1,2 @@ -SHA256 (firmware/linux-firmware-f2eb058afc57348cde66852272d6bf11da1eef8f.tar.gz) = /NVwuLJZBJ3YSgMm8XoxMnGWL4Bsoy29nkDN2QeYV9A= -SIZE (firmware/linux-firmware-f2eb058afc57348cde66852272d6bf11da1eef8f.tar.gz) = 457911356 +SHA256 (firmware/linux-firmware-20230919.tar.xz) = l/raDQK9r8TgF6TcxFbn+ki8ja8t33UWHzmpLjjwhK0= +SIZE (firmware/linux-firmware-20230919.tar.xz) = 314110436 diff --git a/sysutils/firmware/amdgpu/Makefile b/sysutils/firmware/amdgpu/Makefile index 5ed6d3830..6f8919610 100644 --- a/sysutils/firmware/amdgpu/Makefile +++ b/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} diff --git a/sysutils/firmware/amdgpu/distinfo b/sysutils/firmware/amdgpu/distinfo index 6bfa36f1b..f5eccd104 100644 --- a/sysutils/firmware/amdgpu/distinfo +++ b/sysutils/firmware/amdgpu/distinfo @@ -1,2 +1,2 @@ -SHA256 (firmware/linux-firmware-20230804.tar.xz) = iNRsVDhH7jsDQE1JQdkckpdGkO4fb9y+6c7z5fl9tog= -SIZE (firmware/linux-firmware-20230804.tar.xz) = 295170972 +SHA256 (firmware/linux-firmware-20230919.tar.xz) = l/raDQK9r8TgF6TcxFbn+ki8ja8t33UWHzmpLjjwhK0= +SIZE (firmware/linux-firmware-20230919.tar.xz) = 314110436 diff --git a/sysutils/firmware/inteldrm/Makefile b/sysutils/firmware/inteldrm/Makefile index 93fbf269f..ba37bda72 100644 --- a/sysutils/firmware/inteldrm/Makefile +++ b/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} diff --git a/sysutils/firmware/inteldrm/distinfo b/sysutils/firmware/inteldrm/distinfo index 6bfa36f1b..f5eccd104 100644 --- a/sysutils/firmware/inteldrm/distinfo +++ b/sysutils/firmware/inteldrm/distinfo @@ -1,2 +1,2 @@ -SHA256 (firmware/linux-firmware-20230804.tar.xz) = iNRsVDhH7jsDQE1JQdkckpdGkO4fb9y+6c7z5fl9tog= -SIZE (firmware/linux-firmware-20230804.tar.xz) = 295170972 +SHA256 (firmware/linux-firmware-20230919.tar.xz) = l/raDQK9r8TgF6TcxFbn+ki8ja8t33UWHzmpLjjwhK0= +SIZE (firmware/linux-firmware-20230919.tar.xz) = 314110436 diff --git a/sysutils/firmware/radeondrm/Makefile b/sysutils/firmware/radeondrm/Makefile index d45e4b165..e83380e19 100644 --- a/sysutils/firmware/radeondrm/Makefile +++ b/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} diff --git a/sysutils/firmware/radeondrm/distinfo b/sysutils/firmware/radeondrm/distinfo index 6bfa36f1b..f5eccd104 100644 --- a/sysutils/firmware/radeondrm/distinfo +++ b/sysutils/firmware/radeondrm/distinfo @@ -1,2 +1,2 @@ -SHA256 (firmware/linux-firmware-20230804.tar.xz) = iNRsVDhH7jsDQE1JQdkckpdGkO4fb9y+6c7z5fl9tog= -SIZE (firmware/linux-firmware-20230804.tar.xz) = 295170972 +SHA256 (firmware/linux-firmware-20230919.tar.xz) = l/raDQK9r8TgF6TcxFbn+ki8ja8t33UWHzmpLjjwhK0= +SIZE (firmware/linux-firmware-20230919.tar.xz) = 314110436 diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile index ada302890..84f56125b 100644 --- a/sysutils/flashrom/Makefile +++ b/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 diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile index 89f10260a..e3263ab85 100644 --- a/sysutils/freeipmi/Makefile +++ b/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 \ diff --git a/sysutils/moreutils/Makefile b/sysutils/moreutils/Makefile index 742cdf3b5..3b82e40ee 100644 --- a/sysutils/moreutils/Makefile +++ b/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 \ diff --git a/sysutils/reposync/Makefile b/sysutils/reposync/Makefile index e6d00d259..10111bf83 100644 --- a/sysutils/reposync/Makefile +++ b/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= * diff --git a/textproc/grepcidr/Makefile b/textproc/grepcidr/Makefile index a6620e01c..ced826216 100644 --- a/textproc/grepcidr/Makefile +++ b/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" diff --git a/textproc/mupdf/Makefile b/textproc/mupdf/Makefile index 3ef1fb6b0..2f760d1b8 100644 --- a/textproc/mupdf/Makefile +++ b/textproc/mupdf/Makefile @@ -24,9 +24,9 @@ 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 +COMPILER = base-clang ports-gcc RUN_DEPENDS = devel/desktop-file-utils \ devel/xdg-utils diff --git a/textproc/oniguruma/Makefile b/textproc/oniguruma/Makefile index 670a11ab3..366485e1d 100644 --- a/textproc/oniguruma/Makefile +++ b/textproc/oniguruma/Makefile @@ -16,7 +16,7 @@ MAINTAINER= Stuart Henderson # 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} diff --git a/textproc/patchutils/Makefile b/textproc/patchutils/Makefile index b61517e23..98aa7d0ad 100644 --- a/textproc/patchutils/Makefile +++ b/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 diff --git a/www/pear/Makefile b/www/pear/Makefile index 1afffb9ee..15b2975c6 100644 --- a/www/pear/Makefile +++ b/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 diff --git a/www/trac/Makefile b/www/trac/Makefile index 6df26b0a7..9afb05514 100644 --- a/www/trac/Makefile +++ b/www/trac/Makefile @@ -10,7 +10,7 @@ MAINTAINER= Stuart Henderson HOMEPAGE= https://trac.edgewall.org/ -MASTER_SITES= https://download.edgewall.org/trac/ +SITES= https://download.edgewall.org/trac/ MODPY_PYBUILD= setuptools diff --git a/x11/i3/Makefile b/x11/i3/Makefile index df3fb08b6..39eafb2eb 100644 --- a/x11/i3/Makefile +++ b/x11/i3/Makefile @@ -23,7 +23,7 @@ COMPILER_LANGS= c MAINTAINER= Stuart Henderson -MASTER_SITES= ${HOMEPAGE}/downloads/ +SITES= ${HOMEPAGE}/downloads/ EXTRACT_SUFX= .tar.xz DEBUG_PACKAGES= ${BUILD_PACKAGES} diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 32e956fbc..1a5ba6f15 100644 --- a/x11/rxvt-unicode/Makefile +++ b/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 diff --git a/x11/tigervnc/Makefile b/x11/tigervnc/Makefile index be05778ff..771a1bf3e 100644 --- a/x11/tigervnc/Makefile +++ b/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}