From feed0802f04776fa95826c46c8352da7ef154f7a Mon Sep 17 00:00:00 2001 From: purplerain Date: Tue, 19 Sep 2023 16:33:42 +0000 Subject: [PATCH] sync ports with The Matrix --- cad/prusaslicer/Makefile | 29 ++++++--- devel/git/Makefile | 2 +- devel/tl-expected/Makefile | 2 +- devel/xsd/Makefile | 2 +- editors/vis/Makefile | 4 +- graphics/Makefile | 1 + graphics/spirv-cross/Makefile | 27 ++++++++ graphics/spirv-cross/distinfo | 2 + graphics/spirv-cross/pkg/DESCR | 6 ++ graphics/spirv-cross/pkg/PLIST | 65 +++++++++++++++++++ lang/fennel/Makefile | 41 ------------ lang/fennel/distinfo | 2 - lang/fennel/pkg/DESCR | 16 ----- lang/fennel/pkg/PLIST | 3 - mail/isync/Makefile | 2 +- multimedia/libmediainfo/Makefile | 6 +- multimedia/libmediainfo/distinfo | 4 +- multimedia/mediainfo/Makefile | 4 +- multimedia/mediainfo/distinfo | 4 +- net/catgirl/Makefile | 2 +- net/dino/Makefile | 4 +- net/dog/Makefile | 4 +- net/eduvpn/Makefile.inc | 3 +- net/eduvpn/vpn-portal-artwork-eduvpn/Makefile | 2 +- net/eduvpn/vpn-portal-artwork-eduvpn/distinfo | 4 +- .../vpn-portal-artwork-eduvpn/pkg/PLIST | 2 + net/eduvpn/vpn-user-portal/Makefile | 4 +- net/gelatod/Makefile | 2 +- net/isc-bind/Makefile | 4 +- net/libnice/Makefile | 4 +- net/libtorrent-rasterbar/Makefile | 2 +- net/routinator/Makefile | 18 +++-- net/tg_owt/Makefile | 4 +- productivity/ktimetracker/Makefile | 2 +- security/libdigidocpp/Makefile | 4 +- security/pcsc-cyberjack/Makefile | 2 +- security/qdigidoc4/Makefile | 6 +- security/xml-security-c/Makefile | 2 +- sysutils/firmware/vmm/Makefile | 9 +-- sysutils/firmware/vmm/distinfo | 4 +- sysutils/ipmitool/Makefile | 13 ++-- sysutils/mdprint/Makefile | 2 +- sysutils/patchelf/Makefile | 2 +- sysutils/snmp_exporter/Makefile | 7 +- telephony/asterisk/Makefile | 2 +- telephony/asterisk/Makefile.inc | 16 ++--- textproc/loccount/Makefile | 2 +- 47 files changed, 196 insertions(+), 158 deletions(-) create mode 100644 graphics/spirv-cross/Makefile create mode 100644 graphics/spirv-cross/distinfo create mode 100644 graphics/spirv-cross/pkg/DESCR create mode 100644 graphics/spirv-cross/pkg/PLIST delete mode 100644 lang/fennel/Makefile delete mode 100644 lang/fennel/distinfo delete mode 100644 lang/fennel/pkg/DESCR delete mode 100644 lang/fennel/pkg/PLIST diff --git a/cad/prusaslicer/Makefile b/cad/prusaslicer/Makefile index 0cee49ba8..d33bd7c83 100644 --- a/cad/prusaslicer/Makefile +++ b/cad/prusaslicer/Makefile @@ -1,6 +1,7 @@ COMMENT = g-code generator for 3D printers V = 2.5.2 +REVISION = 0 PKGNAME = prusaslicer-${V} GH_ACCOUNT = prusa3d @@ -38,21 +39,29 @@ MODULES = devel/cmake \ MODGNOME_TOOLS = desktop-file-utils gtk-update-icon-cache +# uses headers from gmp,-cxx but not libgmpxx so BDEP not LDEP +# cereal/eigen3 are header-only libraries BUILD_DEPENDS = devel/cereal \ - devel/gmp,-cxx + devel/gmp,-cxx \ + math/eigen3 -LIB_DEPENDS = devel/tbb \ - math/nlopt \ - graphics/openvdb \ - graphics/glew \ - x11/dbus \ - x11/wxWidgets \ - math/cgal \ +LIB_DEPENDS = archivers/blosc \ + cad/oce \ comms/libhidapi \ + devel/gmp \ + devel/tbb \ + graphics/glew \ + graphics/openvdb \ + graphics/png \ + math/cgal \ + math/nlopt \ math/qhull \ - cad/oce + net/curl \ + x11/dbus \ + x11/wxWidgets -CONFIGURE_ARGS += -DSLIC3R_GTK=3 -DSLIC3R_FHS=1 \ +CONFIGURE_ARGS += -DSLIC3R_GTK=3 \ + -DSLIC3R_FHS=1 \ -DOPENVDB_FIND_MODULE_PATH=${PREFIX}/lib/cmake/OpenVDB .include diff --git a/devel/git/Makefile b/devel/git/Makefile index 7afdb76ab..aa53d1ed4 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -18,7 +18,7 @@ DOC_DISTFILE = git-manpages-${V}${EXTRACT_SUFX} DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILE} EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX} -MASTER_SITES = https://www.kernel.org/pub/software/scm/git/ +SITES = https://www.kernel.org/pub/software/scm/git/ MODULES = perl \ x11/tk diff --git a/devel/tl-expected/Makefile b/devel/tl-expected/Makefile index a34811a03..f91ecc68f 100644 --- a/devel/tl-expected/Makefile +++ b/devel/tl-expected/Makefile @@ -7,7 +7,7 @@ PKGNAME = tl-${DISTNAME} CATEGORIES = devel DIST_SUBDIR = tl-expected -MASTER_SITES.pr = https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/ +SITES.pr = https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/ # pending "Added packaged Catch2 support and switched to v3" PATCHFILES.pr = use-system-catch2-{pull/}141.patch # pending "Fixed version number in exported CMake configs" diff --git a/devel/xsd/Makefile b/devel/xsd/Makefile index 8ac12be92..e02e13648 100644 --- a/devel/xsd/Makefile +++ b/devel/xsd/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} c m xerces-c -MASTER_SITES = https://codesynthesis.com/~boris/tmp/xsd/${V}/ +SITES = https://codesynthesis.com/~boris/tmp/xsd/${V}/ EXTRACT_SUFX = .tar.bz2 # C++11 diff --git a/editors/vis/Makefile b/editors/vis/Makefile index 3ba0c1814..2f15bce7b 100644 --- a/editors/vis/Makefile +++ b/editors/vis/Makefile @@ -18,8 +18,8 @@ PERMIT_PACKAGE = Yes WANTLIB += c curses iconv intl m termkey tre ${MODLUA_WANTLIB} -MASTER_SITES = ${HOMEPAGE}/releases/download/v${V}/ -MASTER_SITES.test = ${HOMEPAGE}-test/releases/download/v${TEST_V}/ +SITES = ${HOMEPAGE}/releases/download/v${V}/ +SITES.test = ${HOMEPAGE}-test/releases/download/v${TEST_V}/ DISTFILES = ${DISTNAME}${EXTRACT_SUFX} DISTFILES.test = ${TEST_DISTNAME}${EXTRACT_SUFX} diff --git a/graphics/Makefile b/graphics/Makefile index 881e0fda6..71f6e38ce 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -305,6 +305,7 @@ SUBDIR += skanlite SUBDIR += sketch SUBDIR += slop + SUBDIR += spirv-cross SUBDIR += spirv-headers SUBDIR += spirv-tools SUBDIR += termtosvg diff --git a/graphics/spirv-cross/Makefile b/graphics/spirv-cross/Makefile new file mode 100644 index 000000000..c6d9e5be2 --- /dev/null +++ b/graphics/spirv-cross/Makefile @@ -0,0 +1,27 @@ +COMMENT = parse and convert SPIR-V to other shader languages + +VERSION = 2021-01-15 +DIST_TUPLE = github KhronosGroup SPIRV-Cross ${VERSION} . +PKGNAME = spirv-cross-${VERSION:S/-//g} + +SHARED_LIBS += spirv-cross-c-shared 0.0 # 0.0 + +CATEGORIES = devel graphics + +# Apache 2.0 +PERMIT_PACKAGE = Yes + +WANTLIB += ${COMPILER_LIBCXX} c m + +# C++11 +COMPILER = base-clang ports-gcc + +MODULES = devel/cmake \ + lang/python + +MODPY_RUNDEP = No + +CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE \ + -DSPIRV_CROSS_SHARED=ON + +.include diff --git a/graphics/spirv-cross/distinfo b/graphics/spirv-cross/distinfo new file mode 100644 index 000000000..fb253e985 --- /dev/null +++ b/graphics/spirv-cross/distinfo @@ -0,0 +1,2 @@ +SHA256 (KhronosGroup-SPIRV-Cross-2021-01-15.tar.gz) = 1wCGO1SMvH8npnjO4wX1YWaaEm6yzBHTanAj38RiucQ= +SIZE (KhronosGroup-SPIRV-Cross-2021-01-15.tar.gz) = 1444164 diff --git a/graphics/spirv-cross/pkg/DESCR b/graphics/spirv-cross/pkg/DESCR new file mode 100644 index 000000000..a73e612c5 --- /dev/null +++ b/graphics/spirv-cross/pkg/DESCR @@ -0,0 +1,6 @@ +SPIRV-Cross is a tool designed for parsing and converting SPIR-V to +other shader languages. + +SPIRV-Cross tries hard to emit readable and clean output from the +SPIR-V. The goal is to emit GLSL or MSL that looks like it was written +by a human and not awkward IR/assembly-like code. diff --git a/graphics/spirv-cross/pkg/PLIST b/graphics/spirv-cross/pkg/PLIST new file mode 100644 index 000000000..8f0e78622 --- /dev/null +++ b/graphics/spirv-cross/pkg/PLIST @@ -0,0 +1,65 @@ +@bin bin/spirv-cross +include/spirv_cross/ +include/spirv_cross/GLSL.std.450.h +include/spirv_cross/spirv.h +include/spirv_cross/spirv.hpp +include/spirv_cross/spirv_cfg.hpp +include/spirv_cross/spirv_common.hpp +include/spirv_cross/spirv_cpp.hpp +include/spirv_cross/spirv_cross.hpp +include/spirv_cross/spirv_cross_c.h +include/spirv_cross/spirv_cross_containers.hpp +include/spirv_cross/spirv_cross_error_handling.hpp +include/spirv_cross/spirv_cross_parsed_ir.hpp +include/spirv_cross/spirv_cross_util.hpp +include/spirv_cross/spirv_glsl.hpp +include/spirv_cross/spirv_hlsl.hpp +include/spirv_cross/spirv_msl.hpp +include/spirv_cross/spirv_parser.hpp +include/spirv_cross/spirv_reflect.hpp +@lib lib/libspirv-cross-c-shared.so.${LIBspirv-cross-c-shared_VERSION} +@static-lib lib/libspirv-cross-c.a +@static-lib lib/libspirv-cross-core.a +@static-lib lib/libspirv-cross-cpp.a +@static-lib lib/libspirv-cross-glsl.a +@static-lib lib/libspirv-cross-hlsl.a +@static-lib lib/libspirv-cross-msl.a +@static-lib lib/libspirv-cross-reflect.a +@static-lib lib/libspirv-cross-util.a +lib/pkgconfig/spirv-cross-c-shared.pc +share/spirv_cross_c/ +share/spirv_cross_c/cmake/ +share/spirv_cross_c/cmake/spirv_cross_cConfig${MODCMAKE_BUILD_SUFFIX} +share/spirv_cross_c/cmake/spirv_cross_cConfig.cmake +share/spirv_cross_c_shared/ +share/spirv_cross_c_shared/cmake/ +share/spirv_cross_c_shared/cmake/spirv_cross_c_sharedConfig${MODCMAKE_BUILD_SUFFIX} +share/spirv_cross_c_shared/cmake/spirv_cross_c_sharedConfig.cmake +share/spirv_cross_core/ +share/spirv_cross_core/cmake/ +share/spirv_cross_core/cmake/spirv_cross_coreConfig${MODCMAKE_BUILD_SUFFIX} +share/spirv_cross_core/cmake/spirv_cross_coreConfig.cmake +share/spirv_cross_cpp/ +share/spirv_cross_cpp/cmake/ +share/spirv_cross_cpp/cmake/spirv_cross_cppConfig${MODCMAKE_BUILD_SUFFIX} +share/spirv_cross_cpp/cmake/spirv_cross_cppConfig.cmake +share/spirv_cross_glsl/ +share/spirv_cross_glsl/cmake/ +share/spirv_cross_glsl/cmake/spirv_cross_glslConfig${MODCMAKE_BUILD_SUFFIX} +share/spirv_cross_glsl/cmake/spirv_cross_glslConfig.cmake +share/spirv_cross_hlsl/ +share/spirv_cross_hlsl/cmake/ +share/spirv_cross_hlsl/cmake/spirv_cross_hlslConfig${MODCMAKE_BUILD_SUFFIX} +share/spirv_cross_hlsl/cmake/spirv_cross_hlslConfig.cmake +share/spirv_cross_msl/ +share/spirv_cross_msl/cmake/ +share/spirv_cross_msl/cmake/spirv_cross_mslConfig${MODCMAKE_BUILD_SUFFIX} +share/spirv_cross_msl/cmake/spirv_cross_mslConfig.cmake +share/spirv_cross_reflect/ +share/spirv_cross_reflect/cmake/ +share/spirv_cross_reflect/cmake/spirv_cross_reflectConfig${MODCMAKE_BUILD_SUFFIX} +share/spirv_cross_reflect/cmake/spirv_cross_reflectConfig.cmake +share/spirv_cross_util/ +share/spirv_cross_util/cmake/ +share/spirv_cross_util/cmake/spirv_cross_utilConfig${MODCMAKE_BUILD_SUFFIX} +share/spirv_cross_util/cmake/spirv_cross_utilConfig.cmake diff --git a/lang/fennel/Makefile b/lang/fennel/Makefile deleted file mode 100644 index a87743f1b..000000000 --- a/lang/fennel/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -COMMENT = Lisp dialect that runs on Lua ${MODLUA_VERSION} - -V = 1.2.1 -PKGNAME = fennel-$V -FULLPKGNAME = fennel-${FLAVOR}-${V} - -CATEGORIES = lang - -HOMEPAGE = https://fennel-lang.org/ - -MAINTAINER = Omar Polo - -# MIT -PERMIT_PACKAGE = Yes - -MASTER_SITES = https://git.sr.ht/~technomancy/fennel/archive/ - -DISTFILES = fennel-{}$V${EXTRACT_SUFX} - -MODULES = lang/lua - -FLAVORS = lua51 lua52 lua53 lua54 -FLAVOR ?= lua51 - -PKG_ARCH = * - -USE_GMAKE = Yes -ALL_TARGET = build -MAKE_FLAGS += LUA=${MODLUA_BIN} \ - LUA_VERSION=${MODLUA_VERSION} \ - LUA_LIB_DIR=${MODLUA_LIBDIR} -FAKE_FLAGS += PREFIX=${TRUEPREFIX} - -WRKDIST = ${WRKDIR}/${PKGNAME} - -post-install: - chmod +x ${PREFIX}/bin/fennel - cd ${PREFIX}/bin && mv fennel fennel-${MODLUA_VERSION} - cd ${PREFIX}/man/man1 && mv fennel.1 fennel-${MODLUA_VERSION}.1 - -.include diff --git a/lang/fennel/distinfo b/lang/fennel/distinfo deleted file mode 100644 index 91d2f94d4..000000000 --- a/lang/fennel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (fennel-1.2.1.tar.gz) = ZlSq23ZZu/iNOHkZA5JXPhrjkIfqr1CE6V9F246CrVE= -SIZE (fennel-1.2.1.tar.gz) = 271590 diff --git a/lang/fennel/pkg/DESCR b/lang/fennel/pkg/DESCR deleted file mode 100644 index 907690156..000000000 --- a/lang/fennel/pkg/DESCR +++ /dev/null @@ -1,16 +0,0 @@ -Fennel is a programming language that brings together the speed, -simplicity, and reach of Lua with the flexibility of a lisp syntax and -macro system. - - - Full Lua compatibility: Easily call any Lua function or library from - Fennel and vice-versa. - - - Zero overhead: Compiled code should be just as efficient as - hand-written Lua. - - - Compile-time macros: Ship compiled code with no runtime dependency on - Fennel. - - - Embeddable: Fennel is a one-file library as well as an executable. - Embed it in other programs to support runtime extensibility and - interactive development. diff --git a/lang/fennel/pkg/PLIST b/lang/fennel/pkg/PLIST deleted file mode 100644 index 40f57b954..000000000 --- a/lang/fennel/pkg/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -bin/fennel-${MODLUA_VERSION} -lib/lua/${MODLUA_VERSION}/fennel.lua -@man man/man1/fennel-${MODLUA_VERSION}.1 diff --git a/mail/isync/Makefile b/mail/isync/Makefile index 2f1793d78..ad6e15897 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -4,7 +4,7 @@ DISTNAME= isync-1.4.4 REVISION= 1 CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/} +SITES= ${MASTER_SITE_SOURCEFORGE:=isync/} HOMEPAGE= http://isync.sourceforge.net/ diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index 10a19027d..bfc688b5c 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -1,8 +1,8 @@ COMMENT= read metadata from media files -VERSION= 23.07 +VERSION= 23.09 PKGNAME= libmediainfo-${VERSION} -SHARED_LIBS= mediainfo 7.0 # 0.0 +SHARED_LIBS= mediainfo 8.0 # 0.0 CATEGORIES= multimedia HOMEPAGE= https://mediaarea.net/en/MediaInfo @@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes WANTLIB= ${COMPILER_LIBCXX} m z zen -MASTER_SITES= https://mediaarea.net/download/source/libmediainfo/${VERSION}/ +SITES= https://mediaarea.net/download/source/libmediainfo/${VERSION}/ DISTFILES= libmediainfo_${VERSION}.tar.xz COMPILER= base-clang ports-gcc diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo index 21078b871..389e808c6 100644 --- a/multimedia/libmediainfo/distinfo +++ b/multimedia/libmediainfo/distinfo @@ -1,2 +1,2 @@ -SHA256 (libmediainfo_23.07.tar.xz) = YEVsiyq4dppggdlv176G20/jJSDkoCI5fLIsrPR86CA= -SIZE (libmediainfo_23.07.tar.xz) = 1964840 +SHA256 (libmediainfo_23.09.tar.xz) = HDJvFmVyrGwsHIim1Tr35FE4iEDH7r7scdWrv9G7LtM= +SIZE (libmediainfo_23.09.tar.xz) = 1970192 diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile index c375ae786..139d36e56 100644 --- a/multimedia/mediainfo/Makefile +++ b/multimedia/mediainfo/Makefile @@ -1,6 +1,6 @@ COMMENT= utility for reading information from audio/video files -VERSION= 23.07 +VERSION= 23.09 PKGNAME= mediainfo-${VERSION} CATEGORIES= multimedia @@ -13,7 +13,7 @@ PERMIT_PACKAGE= Yes WANTLIB= ${COMPILER_LIBCXX} c m mediainfo pthread z zen -MASTER_SITES= https://mediaarea.net/download/source/mediainfo/${VERSION}/ +SITES= https://mediaarea.net/download/source/mediainfo/${VERSION}/ DISTFILES= mediainfo_${VERSION}.tar.xz COMPILER= base-clang ports-gcc diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo index 9132d8c71..1bcfe9c5c 100644 --- a/multimedia/mediainfo/distinfo +++ b/multimedia/mediainfo/distinfo @@ -1,2 +1,2 @@ -SHA256 (mediainfo_23.07.tar.xz) = ttfanimZX9NKIhAIJbhD50wyx7xnrbARZrG+7epJ9dA= -SIZE (mediainfo_23.07.tar.xz) = 2018796 +SHA256 (mediainfo_23.09.tar.xz) = Tg/pTao6nmD+k3thYNnbnTxXoORyntrTXMES68zyNqw= +SIZE (mediainfo_23.09.tar.xz) = 2025792 diff --git a/net/catgirl/Makefile b/net/catgirl/Makefile index 5608afc98..40df397fc 100644 --- a/net/catgirl/Makefile +++ b/net/catgirl/Makefile @@ -19,7 +19,7 @@ WANTLIB += c curses tls DEBUG_PACKAGES =${BUILD_PACKAGES} -MASTER_SITES = https://git.causal.agency/catgirl/snapshot/ +SITES = https://git.causal.agency/catgirl/snapshot/ CONFIGURE_STYLE = simple diff --git a/net/dino/Makefile b/net/dino/Makefile index 7d56fc556..601194928 100644 --- a/net/dino/Makefile +++ b/net/dino/Makefile @@ -11,8 +11,8 @@ SHARED_LIBS += xmpp-vala 3.0 # 0.1 HOMEPAGE= https://dino.im/ -MASTER_SITES= https://github.com/dino/dino/releases/download/v${VERSION}/ -MASTER_SITES.fix= https://github.com/dino/dino/commit/ +SITES= https://github.com/dino/dino/releases/download/v${VERSION}/ +SITES.fix= https://github.com/dino/dino/commit/ # "Always export symbols to fix startup on BSDs" merged in master but not (yet) # into the "v0.4" release branch: https://github.com/dino/dino/issues/438 PATCHFILES.fix= b75b6062abc07b25d0dcd6717e168aa85be7cf4e.patch diff --git a/net/dog/Makefile b/net/dog/Makefile index e43287ef1..6751af12d 100644 --- a/net/dog/Makefile +++ b/net/dog/Makefile @@ -19,8 +19,8 @@ CONFIGURE_STYLE = cargo SEPARATE_BUILD = Yes HOMEPAGE = https://dns.lookup.dog/ -MASTER_SITES0 = https://github.com/ogham/dog/releases/download/${GH_TAGNAME}/ -DISTFILES += dog-${GH_TAGNAME}-x86_64-apple-darwin.zip:0 +MASTER_SITES.man = https://github.com/ogham/dog/releases/download/${GH_TAGNAME}/ +DISTFILES.man = dog-${GH_TAGNAME}-x86_64-apple-darwin.zip # for riscv64 and powerpc64, please keep: cc >= 1.0.73 and libc >= 0.2.113 MODCARGO_CRATES_UPDATE = cc libc diff --git a/net/eduvpn/Makefile.inc b/net/eduvpn/Makefile.inc index 46d4110d4..e48f59bcc 100644 --- a/net/eduvpn/Makefile.inc +++ b/net/eduvpn/Makefile.inc @@ -1,7 +1,8 @@ CATEGORIES+= net net/eduvpn .if !defined(GH_ACCOUNT) EXTRACT_SUFX?= .tar.xz -MASTER_SITES?= https://git.sr.ht/~fkooman/${DISTNAME:S/-$V//}/refs/download/$V/ +# not DIST_TUPLE, these are proper uploads like github /releases/ URLs +SITES?= https://git.sr.ht/~fkooman/${DISTNAME:S/-$V//}/refs/download/$V/ HOMEPAGE?= https://git.sr.ht/~fkooman/${DISTNAME:S/-$V//} PKGNAME?= ${DISTNAME:L} .endif diff --git a/net/eduvpn/vpn-portal-artwork-eduvpn/Makefile b/net/eduvpn/vpn-portal-artwork-eduvpn/Makefile index 956f358e4..b43dd4e7a 100644 --- a/net/eduvpn/vpn-portal-artwork-eduvpn/Makefile +++ b/net/eduvpn/vpn-portal-artwork-eduvpn/Makefile @@ -1,6 +1,6 @@ COMMENT= eduVPN artwork for vpn-user-portal -V= 3.0.0 +V= 3.0.1 DISTNAME= vpn-portal-artwork-eduVPN-$V # AGPL-3.0 diff --git a/net/eduvpn/vpn-portal-artwork-eduvpn/distinfo b/net/eduvpn/vpn-portal-artwork-eduvpn/distinfo index a6961f140..ca5276323 100644 --- a/net/eduvpn/vpn-portal-artwork-eduvpn/distinfo +++ b/net/eduvpn/vpn-portal-artwork-eduvpn/distinfo @@ -1,2 +1,2 @@ -SHA256 (vpn-portal-artwork-eduVPN-3.0.0.tar.xz) = BwJrjjpTwb82HkTxqks4Ghh9JNo29qLVda3W2NFZudw= -SIZE (vpn-portal-artwork-eduVPN-3.0.0.tar.xz) = 603612 +SHA256 (vpn-portal-artwork-eduVPN-3.0.1.tar.xz) = G7yl62AnTugefnP3fOyWRNwPjdniSBG16XWEb/bfY+o= +SIZE (vpn-portal-artwork-eduVPN-3.0.1.tar.xz) = 604424 diff --git a/net/eduvpn/vpn-portal-artwork-eduvpn/pkg/PLIST b/net/eduvpn/vpn-portal-artwork-eduvpn/pkg/PLIST index 82223b98a..286cacbd3 100644 --- a/net/eduvpn/vpn-portal-artwork-eduvpn/pkg/PLIST +++ b/net/eduvpn/vpn-portal-artwork-eduvpn/pkg/PLIST @@ -2,6 +2,7 @@ vpn-user-portal/ vpn-user-portal/locale/ vpn-user-portal/locale/eduVPN/ vpn-user-portal/locale/eduVPN/ar-MA.php +vpn-user-portal/locale/eduVPN/cs-CZ.php vpn-user-portal/locale/eduVPN/de-DE.php vpn-user-portal/locale/eduVPN/empty.php vpn-user-portal/locale/eduVPN/et-EE.php @@ -10,6 +11,7 @@ vpn-user-portal/locale/eduVPN/nb-NO.php vpn-user-portal/locale/eduVPN/nl-NL.php vpn-user-portal/locale/eduVPN/pl-PL.php vpn-user-portal/locale/eduVPN/pt-PT.php +vpn-user-portal/locale/eduVPN/sk-SK.php vpn-user-portal/locale/eduVPN/uk-UA.php vpn-user-portal/views/ vpn-user-portal/views/eduVPN/ diff --git a/net/eduvpn/vpn-user-portal/Makefile b/net/eduvpn/vpn-user-portal/Makefile index 9bb11dae1..af817d63a 100644 --- a/net/eduvpn/vpn-user-portal/Makefile +++ b/net/eduvpn/vpn-user-portal/Makefile @@ -1,9 +1,9 @@ COMMENT= user and admin portal for Let's Connect/eduVPN V= 3.4.1 -MASTER_SITES0= https://spacehopper.org/mirrors/ DISTNAME= vpn-user-portal-$V -DISTFILES= ${DISTNAME}.tar.xz ${DISTNAME}-vendor.tar.xz:0 +SITES.sh= https://spacehopper.org/mirrors/ +DISTFILES.sh= ${DISTNAME}-vendor.tar.xz # Debian packaging in https://git.sr.ht/~fkooman/vpn-user-portal.deb/tree # AGPL-3.0 diff --git a/net/gelatod/Makefile b/net/gelatod/Makefile index 2563c62e2..c432bd201 100644 --- a/net/gelatod/Makefile +++ b/net/gelatod/Makefile @@ -6,7 +6,7 @@ CATEGORIES = net # BSD 2-clause PERMIT_PACKAGE = Yes -MASTER_SITES = https://codeberg.org/fobser/gelatod/releases/download/v${V}/ +SITES = https://codeberg.org/fobser/gelatod/releases/download/v${V}/ MAINTAINER = Klemens Nanni diff --git a/net/isc-bind/Makefile b/net/isc-bind/Makefile index 5eb604eb1..3ecd81e7b 100644 --- a/net/isc-bind/Makefile +++ b/net/isc-bind/Makefile @@ -7,7 +7,6 @@ SUBST_VARS+= V PORTROACH= limitw:1,even EXTRACT_SUFX= .tar.xz EPOCH= 3 -PATCH_DIST_STRIP= -p1 DISTNAME= bind-$V PKGNAME= isc-bind-${V:S/-P/pl/} @@ -27,8 +26,7 @@ WANTLIB += pthread ssl unistring uv xml2 z FLAVORS= geoip FLAVOR?= -MASTER_SITES= ${MASTER_SITE_ISC:=bind9/$V/} -MASTER_SITES0= ${MASTER_SITE_ISC:=bind9/$V/patches/} +SITES= ${MASTER_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/libnice/Makefile b/net/libnice/Makefile index 06db73d5c..c0bef1020 100644 --- a/net/libnice/Makefile +++ b/net/libnice/Makefile @@ -11,8 +11,8 @@ WANTLIB += gupnp-igd-1.6 HOMEPAGE = https://libnice.freedesktop.org DIST_SUBDIR = libnice -MASTER_SITES = https://libnice.freedesktop.org/releases/ -MASTER_SITES.pr = https://gitlab.freedesktop.org/libnice/libnice/-/ +SITES = https://libnice.freedesktop.org/releases/ +SITES.pr = https://gitlab.freedesktop.org/libnice/libnice/-/ # merged "Fix build with clang" PATCHFILES.pr = fix-clang15-build-{commit/}f4e2838f.patch # merged "Use ifr_index to fix build on OpenBSD" diff --git a/net/libtorrent-rasterbar/Makefile b/net/libtorrent-rasterbar/Makefile index a29076ee9..127255f70 100644 --- a/net/libtorrent-rasterbar/Makefile +++ b/net/libtorrent-rasterbar/Makefile @@ -17,7 +17,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} boost_python${MODPY_MAJORMINOR}-mt crypto WANTLIB += m ssl -MASTER_SITES = https://github.com/arvidn/libtorrent/releases/download/v${V}/ +SITES = https://github.com/arvidn/libtorrent/releases/download/v${V}/ MODULES = devel/cmake \ lang/python diff --git a/net/routinator/Makefile b/net/routinator/Makefile index 2b97f690a..50ec0a9a9 100644 --- a/net/routinator/Makefile +++ b/net/routinator/Makefile @@ -1,17 +1,15 @@ # ring-v0.16.20 does not support those archs -NOT_FOR_ARCHS = powerpc64 riscv64 sparc64 +NOT_FOR_ARCHS = powerpc64 riscv64 sparc64 -COMMENT = RPKI "relying party" software +COMMENT = RPKI "relying party" software -GH_ACCOUNT = NLnetLabs -GH_PROJECT = routinator -GH_TAGNAME = v0.12.2 +GH_ACCOUNT = NLnetLabs +GH_PROJECT = routinator +GH_TAGNAME = v0.12.2 -ROUTINATOR_UI_URL = https://github.com/NLnetLabs/routinator-ui/releases/download/ -ROUTINATOR_UI_VERSION = 0.3.4 - -MASTER_SITES0 = ${ROUTINATOR_UI_URL}/v${ROUTINATOR_UI_VERSION}/ -DISTFILES += routinator-ui-${ROUTINATOR_UI_VERSION}{routinator-ui-build}.tar.gz:0 +UI = 0.3.4 +SITES.ui = https://github.com/NLnetLabs/routinator-ui/releases/download/v${UI}/ +DISTFILES.ui = routinator-ui-${UI}{routinator-ui-build}.tar.gz # The routinator-ui crate expects its Vue.js parts to be in ../dist EXTRACT_CASES += routinator-ui-*.tar.gz) \ diff --git a/net/tg_owt/Makefile b/net/tg_owt/Makefile index 9e118efa3..aefce2be8 100644 --- a/net/tg_owt/Makefile +++ b/net/tg_owt/Makefile @@ -27,11 +27,11 @@ DIST_SUBDIR = tg_owt # https://chromium.googlesource.com/libyuv/libyuv clone, no releases or tags # main/master/stable/ tarballs are *not reproducible* # use a mirror to get stable tarballs for latest master -MASTER_SITES.libyuv = https://github.com/klemensn/libyuv/archive/ +SITES.libyuv = https://github.com/klemensn/libyuv/archive/ LIBYUV_COMMIT = 77c2121f7e6b8e694d6e908bbbe9be24214097da DISTFILES.libyuv = libyuv-20230420-{}${LIBYUV_COMMIT}${EXTRACT_SUFX} -MASTER_SITES.tg_owt = https://github.com/desktop-app/tg_owt/commit/ +SITES.tg_owt = https://github.com/desktop-app/tg_owt/commit/ # Pending "Defer third-party source handling to when it is needed" # https://github.com/desktop-app/tg_owt/pull/85 PATCHFILES.tg_owt += defer-third-party-sources-{}a264c33.patch diff --git a/productivity/ktimetracker/Makefile b/productivity/ktimetracker/Makefile index ce872d9dd..849c89db0 100644 --- a/productivity/ktimetracker/Makefile +++ b/productivity/ktimetracker/Makefile @@ -13,7 +13,7 @@ MAINTAINER = Klemens Nanni # documentation: GFDL 1.2, icons: LGPL 3, source code: GPL 2.0 PERMIT_PACKAGE = Yes -MASTER_SITES = ${MASTER_SITE_KDE:=stable/ktimetracker/${VERSION}/src/} +SITES = ${MASTER_SITE_KDE:=stable/ktimetracker/${VERSION}/src/} WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5CalendarCore WANTLIB += KF5Codecs KF5ConfigCore KF5ConfigGui KF5ConfigWidgets diff --git a/security/libdigidocpp/Makefile b/security/libdigidocpp/Makefile index 208bc11b3..bdfa75827 100644 --- a/security/libdigidocpp/Makefile +++ b/security/libdigidocpp/Makefile @@ -13,11 +13,11 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES} PERMIT_PACKAGE = Yes HOMEPAGE = https://www.id.ee/ -MASTER_SITES = https://github.com/open-eid/libdigidocpp/releases/download/v${V}/ +SITES = https://github.com/open-eid/libdigidocpp/releases/download/v${V}/ # pending "Get EVP_MD_CTX from EVP_Digest(3) to fix LibreSSL build" # https://github.com/open-eid/libdigidocpp/pull/550 -MASTER_SITES.pr = https://github.com/open-eid/libdigidocpp/commit/ +SITES.pr = https://github.com/open-eid/libdigidocpp/commit/ PATCHFILES.pr = 2619a2a70a312558d912e9d758e376463e3e6482.patch PATCH_DIST_STRIP = -p1 diff --git a/security/pcsc-cyberjack/Makefile b/security/pcsc-cyberjack/Makefile index 77d4bef18..3f25db723 100644 --- a/security/pcsc-cyberjack/Makefile +++ b/security/pcsc-cyberjack/Makefile @@ -18,7 +18,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} m usb-1.0 -MASTER_SITES = https://support.reiner-sct.de/downloads/LINUX/V${V}_SP${SP}/ +SITES = https://support.reiner-sct.de/downloads/LINUX/V${V}_SP${SP}/ EXTRACT_SUFX = .tar.bz2 # -std=c++11 diff --git a/security/qdigidoc4/Makefile b/security/qdigidoc4/Makefile index 59bcc4d40..1916c4407 100644 --- a/security/qdigidoc4/Makefile +++ b/security/qdigidoc4/Makefile @@ -13,11 +13,11 @@ HOMEPAGE = https://www.id.ee/ PERMIT_PACKAGE = Yes DIST_SUBDIR = qdigidoc4 -MASTER_SITES = https://github.com/open-eid/DigiDoc4-Client/releases/download/v${V}/ +SITES = https://github.com/open-eid/DigiDoc4-Client/releases/download/v${V}/ DISTFILES = ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX} -MASTER_SITES.eesti = https://id.eesti.ee/ +SITES.eesti = https://id.eesti.ee/ CONFIG_NAME = config-20230904 # need to be in sync due to CONFIG_URL handling .for _suffix in json pub rsa @@ -26,7 +26,7 @@ DISTFILES.eesti += ${CONFIG_NAME}{config}.${_suffix} # ${WRKSRC}/common/CMakeLists.txt itself substitutes suffix in CONFIG_URL CONFIGURE_ENV += CONFIG_URL=file://${FULLDISTDIR}/${CONFIG_NAME}.json -MASTER_SITES.eu = https://ec.europa.eu/tools/lotl/ +SITES.eu = https://ec.europa.eu/tools/lotl/ DISTFILES.eu = eu-lotl-pivot-300.xml CONFIGURE_ENV += TSL_URL=file://${FULLDISTDIR}/eu-lotl-pivot-300.xml diff --git a/security/xml-security-c/Makefile b/security/xml-security-c/Makefile index d401f5480..2226b4c0b 100644 --- a/security/xml-security-c/Makefile +++ b/security/xml-security-c/Makefile @@ -17,7 +17,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} c crypto icudata icui18n icuuc m WANTLIB += xerces-c -MASTER_SITES = https://dlcdn.apache.org/santuario/c-library/ +SITES = https://dlcdn.apache.org/santuario/c-library/ # C++ COMPILER = base-clang ports-gcc diff --git a/sysutils/firmware/vmm/Makefile b/sysutils/firmware/vmm/Makefile index 39912852b..eb3f606f5 100644 --- a/sysutils/firmware/vmm/Makefile +++ b/sysutils/firmware/vmm/Makefile @@ -1,4 +1,4 @@ -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 COMPILER= ports-gcc COMPILER_LANGS= c @@ -16,13 +16,11 @@ FW_DRIVER= vmm FW_VER= 1.16.2 SB_VER= 20180715 DISTNAME= seabios-${FW_VER} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - sgabios-${SB_VER}{72f39d48bedf044e202fd51fecf3e2218fc2ae66}.tar.gz:0 +DIST_TUPLE= github qemu sgabios 72f39d48bedf044e202fd51fecf3e2218fc2ae66 sgabios HOMEPAGE= https://www.seabios.org/ -MASTER_SITES= https://www.seabios.org/downloads/ -MASTER_SITES0= https://github.com/qemu/sgabios/archive/ +SITES= https://www.seabios.org/downloads/ # LGPLv3 but distributed via fw_update/firmware.openbsd.org so disable # normal packaging. @@ -50,7 +48,6 @@ MAKE_FLAGS= V=1 \ PYTHON="${MODPY_BIN}" post-extract: - mv ${WRKDIR}/sgabios-* ${WRKSRC}/sgabios cp ${FILESDIR}/config ${WRKSRC}/.config post-build: diff --git a/sysutils/firmware/vmm/distinfo b/sysutils/firmware/vmm/distinfo index 9dc124453..2c3dfc9a6 100644 --- a/sysutils/firmware/vmm/distinfo +++ b/sysutils/firmware/vmm/distinfo @@ -1,4 +1,4 @@ +SHA256 (firmware/qemu-sgabios-72f39d48bedf044e202fd51fecf3e2218fc2ae66.tar.gz) = a9r+PdIplwrxyPRinx3TbRGUvu/wU+/6PBh7Sj1iGLA= SHA256 (firmware/seabios-1.16.2.tar.gz) = 76jVKUQq0WgFb5SsZmaxs1Q8Yv969tngIFYfTQ4y+Vk= -SHA256 (firmware/sgabios-20180715.tar.gz) = a9r+PdIplwrxyPRinx3TbRGUvu/wU+/6PBh7Sj1iGLA= +SIZE (firmware/qemu-sgabios-72f39d48bedf044e202fd51fecf3e2218fc2ae66.tar.gz) = 31205 SIZE (firmware/seabios-1.16.2.tar.gz) = 635918 -SIZE (firmware/sgabios-20180715.tar.gz) = 31205 diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile index d7aea560a..9824459ad 100644 --- a/sysutils/ipmitool/Makefile +++ b/sysutils/ipmitool/Makefile @@ -7,12 +7,11 @@ GH_TAGNAME= IPMITOOL_${V:S/./_/g} PKGNAME= ipmitool-$V REVISION= 0 -#DISTFILES= ${GH_DISTFILE} \ -# enterprise-numbers.20220204.gz:0 -#EXTRACT_ONLY= ${GH_DISTFILE} -# was re-rolled -DISTFILES= ipmitool-IPMITOOL_1_8_19.0{ipmitool-IPMITOOL_1_8_19}.tar.gz \ - enterprise-numbers.20220204.gz:0 +# renamed as the distfile was re-rolled +DISTFILES= ipmitool-IPMITOOL_1_8_19.0{ipmitool-IPMITOOL_1_8_19}.tar.gz + +SITES.sh= https://spacehopper.org/mirrors/ +DISTFILES.sh= enterprise-numbers.20220204.gz EXTRACT_ONLY= ipmitool-IPMITOOL_1_8_19.0.tar.gz CATEGORIES= sysutils @@ -30,8 +29,6 @@ WANTLIB= m curses edit crypto c # -std=gnu11 COMPILER = base-clang ports-gcc -MASTER_SITES0= https://spacehopper.org/mirrors/ - SEPARATE_BUILD= Yes CONFIGURE_STYLE= autoreconf AUTORECONF= ./bootstrap diff --git a/sysutils/mdprint/Makefile b/sysutils/mdprint/Makefile index c60d6e4e4..1d76ebf6c 100644 --- a/sysutils/mdprint/Makefile +++ b/sysutils/mdprint/Makefile @@ -13,7 +13,7 @@ MAINTAINER = Klemens Nanni # Universal Permissive License (UPL), Version 1.0 PERMIT_PACKAGE = Yes -MASTER_SITES = https://yum.oracle.com/repo/OracleLinux/OL6/latest/source/getPackageSource/ +SITES = https://yum.oracle.com/repo/OracleLinux/OL6/latest/source/getPackageSource/ EXTRACT_SUFX = .el6.src.rpm # the SRC RPM contains a SPEC file and the actual uncompressed source tarball EXTRACT_FILES = ${DISTNAME}.tar diff --git a/sysutils/patchelf/Makefile b/sysutils/patchelf/Makefile index 322d7b00a..9b1d9ef00 100644 --- a/sysutils/patchelf/Makefile +++ b/sysutils/patchelf/Makefile @@ -2,7 +2,7 @@ COMMENT = utility for modifying existing ELF executables and libraries V = 0.18.0 DISTNAME = patchelf-${V} -MASTER_SITES = https://github.com/NixOS/patchelf/releases/download/${V}/ +SITES = https://github.com/NixOS/patchelf/releases/download/${V}/ CATEGORIES = sysutils diff --git a/sysutils/snmp_exporter/Makefile b/sysutils/snmp_exporter/Makefile index 3365994dd..c3f6b8057 100644 --- a/sysutils/snmp_exporter/Makefile +++ b/sysutils/snmp_exporter/Makefile @@ -7,8 +7,9 @@ M= 0.24.1 GH_ACCOUNT= prometheus GH_PROJECT= snmp_exporter GH_TAGNAME= v$V -DISTFILES= snmp_exporter-$V.tar.gz \ - snmp_exporter_mibs+vendor-$M.tar.xz:0 + +SITES.sh= https://spacehopper.org/mirrors/ +DISTFILES.sh= snmp_exporter_mibs+vendor-$M.tar.xz CATEGORIES= sysutils @@ -21,8 +22,6 @@ PERMIT_PACKAGE= Yes WANTLIB += c netsnmp pthread -MASTER_SITES0= https://spacehopper.org/mirrors/ - LIB_DEPENDS= net/net-snmp MODULES= lang/go diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile index cfacbf052..8b0fb0b55 100644 --- a/telephony/asterisk/Makefile +++ b/telephony/asterisk/Makefile @@ -1,5 +1,5 @@ SUBDIR = -SUBDIR += 16 +#SUBDIR += 16 SUBDIR += 18 SUBDIR += 20 diff --git a/telephony/asterisk/Makefile.inc b/telephony/asterisk/Makefile.inc index 3db19c3ef..5f2015409 100644 --- a/telephony/asterisk/Makefile.inc +++ b/telephony/asterisk/Makefile.inc @@ -1,11 +1,14 @@ COMMENT-main= open source multi-protocol PBX and telephony toolkit DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/} -DISTFILES= ${DISTNAME}.tar.gz +SITES= https://downloads.asterisk.org/pub/telephony/asterisk/releases/ \ + https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ +SITES.pjast= https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/$(PJ_V)/ +SITES.pjsip= https://github.com/pjsip/pjproject/archive/refs/tags/ # from asterisk mirror: -DISTFILES+= pjproject-${PJ_V}.tar.gz:0 +DISTFILES.pjast= pjproject-${PJ_V}.tar.gz # from pjsip original: -#DISTFILES+= pjproject-{}${PJ_V}.tar.gz:1 +#DISTFILES.pjsip= pjproject-{}${PJ_V}.tar.gz PKGNAME-main= asterisk-${VER} SHORTVER= ${.CURDIR:T} @@ -81,11 +84,6 @@ LIB_DEPENDS-main= ${MODGCC4_CPPLIBDEP} \ RUN_DEPENDS-main= telephony/asterisk-sounds/core-sounds/en,gsm>=1.4.25 \ telephony/asterisk-sounds/moh-opsound,wav -MASTER_SITES= https://downloads.asterisk.org/pub/telephony/asterisk/releases/ \ - https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ -MASTER_SITES0= https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/$(PJ_V)/ -MASTER_SITES1= https://github.com/pjsip/pjproject/archive/refs/tags/ - USE_GMAKE= Yes CONFIGURE_STYLE= autoreconf @@ -171,7 +169,7 @@ CFLAGS += -DHAVE_OPENSSL_BIO_METHOD .if ${PROPERTIES:Mclang} LDFLAGS += -lBlocksRuntime -BLOCKSLIBDEP = devel/libdispatch +BLOCKSLIBDEP = devel/libdispatch BLOCKSWANTLIB = BlocksRuntime .else CFLAGS += -ftrampolines diff --git a/textproc/loccount/Makefile b/textproc/loccount/Makefile index 2f0bf87f6..b10e1ed4a 100644 --- a/textproc/loccount/Makefile +++ b/textproc/loccount/Makefile @@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes # statically linked WANTLIB = c pthread -MASTER_SITES = https://gitlab.com/esr/loccount/-/archive/${V}/ +SITES = https://gitlab.com/esr/loccount/-/archive/${V}/ MODULES = lang/python MODPY_RUNDEP = No