From 4cc27cb2e44911b5c9515ae39c1c9c864f5b66d9 Mon Sep 17 00:00:00 2001 From: purplerain Date: Wed, 20 Sep 2023 18:59:05 +0000 Subject: [PATCH] sync ports with The Matrix --- astro/gnuastro/Makefile | 4 +- audio/ario/Makefile | 3 +- audio/deadbeef/Makefile | 3 +- audio/grip/Makefile | 4 +- chinese/c2t/Makefile | 7 +- chinese/cconv/Makefile | 2 +- chinese/cless/Makefile | 2 +- chinese/hc/Makefile | 2 +- chinese/libchewing/Makefile | 2 +- chinese/libpinyin/Makefile | 2 +- chinese/libtabe/Makefile | 2 +- chinese/lunar/Makefile | 2 +- comms/amtterm/Makefile | 2 +- comms/birda/Makefile | 2 +- comms/bottlerocket/Makefile | 2 +- comms/c3270/Makefile | 2 +- comms/chirp/Makefile | 2 +- comms/colrdx/Makefile | 2 +- comms/dfu-util/Makefile | 2 +- comms/efax/Makefile | 2 +- comms/ems-flasher/Makefile | 2 +- comms/fldigi/Makefile | 4 +- comms/flipit/Makefile | 2 +- comms/gammu/Makefile | 2 +- comms/gnuradio/Makefile | 4 +- comms/gpsk31/Makefile | 2 +- comms/hackrf/Makefile | 2 +- comms/hamlib/Makefile | 2 +- comms/hylafax/Makefile | 2 +- comms/kermit/Makefile | 2 +- comms/lcdproc/Makefile | 2 +- comms/lrzsz/Makefile | 2 +- comms/mgetty+sendfax/Makefile | 2 +- comms/minicom/Makefile | 2 +- comms/minimodem/Makefile | 2 +- comms/owx/Makefile | 4 +- comms/p5-SendPage/Makefile | 2 +- comms/pterm/Makefile | 2 +- comms/py-gammu/Makefile | 2 +- comms/qodem/Makefile | 2 +- comms/qpage/Makefile | 2 +- comms/rtl-sdr/Makefile | 2 +- comms/scmxx/Makefile | 2 +- comms/sigrok/Makefile.inc | 2 +- comms/sigrok/sigrok-firmware-fx2lafw/Makefile | 2 +- comms/smstools/Makefile | 6 +- comms/spisniffer/Makefile | 2 +- comms/sredird/Makefile | 2 +- comms/syncterm/Makefile | 2 +- comms/tkhylafax/Makefile | 2 +- comms/tlf/Makefile | 2 +- comms/wy60/Makefile | 2 +- comms/x3270/Makefile | 2 +- comms/xdx/Makefile | 2 +- comms/xlog/Makefile | 2 +- comms/zmtx-zmrx/Makefile | 2 +- converters/base64/Makefile | 2 +- converters/bdf2psf/Makefile | 2 +- converters/bdf2sfd/Makefile | 2 +- converters/btoa/Makefile | 2 +- converters/convmv/Makefile | 2 +- converters/d1489/Makefile | 2 +- converters/dos2unix/Makefile | 2 +- converters/enca/Makefile | 2 +- converters/fondu/Makefile | 2 +- converters/html2text/Makefile | 2 +- converters/html2wml/Makefile | 4 +- converters/ish/Makefile | 5 +- converters/k2pdfopt/Makefile | 2 +- converters/libdvdcss/Makefile | 2 +- converters/libiconv/Makefile | 2 +- converters/libpst/Makefile | 2 +- converters/libunistring/Makefile | 2 +- converters/luastruct/Makefile | 2 +- converters/mimepp/Makefile | 2 +- converters/mpack/Makefile | 2 +- converters/otf2bdf/Makefile | 2 +- converters/pflogx/Makefile | 2 +- converters/ppmtoTbmp/Makefile | 4 +- converters/qprint/Makefile | 4 +- converters/recode/Makefile | 2 +- converters/ripmime/Makefile | 2 +- converters/sqlite2mdoc/Makefile | 2 +- converters/trans/Makefile | 2 +- converters/uudeview/Makefile | 2 +- converters/wv/Makefile | 2 +- converters/wv2/Makefile | 2 +- converters/xlhtml/Makefile | 2 +- converters/xmltoman/Makefile | 2 +- databases/architect/Makefile | 2 +- databases/barman/Makefile | 2 +- databases/db/Makefile.inc | 2 +- databases/db/v4/Makefile | 12 +- databases/galera/Makefile | 6 +- databases/gdbm/Makefile | 2 +- databases/influxdb/Makefile | 8 +- databases/jxplorer/Makefile | 2 +- databases/kdb/Makefile | 2 +- databases/kexi/Makefile | 2 +- databases/ksql/Makefile | 2 +- databases/kyotocabinet/Makefile | 2 +- databases/lbdb/Makefile | 2 +- databases/libdbi-drivers/Makefile | 2 +- databases/libdbi/Makefile | 2 +- databases/libzdb/Makefile | 2 +- databases/liquibase/Makefile | 2 +- databases/lmdb/Makefile | 2 +- databases/lualdap/Makefile | 2 +- databases/luasqlite3/Makefile | 2 +- databases/mariadb/Makefile | 2 +- databases/mongodb/Makefile.inc | 2 +- databases/mydumper/Makefile | 2 +- databases/mysql-utilities/Makefile | 2 +- databases/mysql-zrm/Makefile | 2 +- databases/mysql2pgsql/Makefile | 2 +- databases/p5-GDBM_File/Makefile | 2 +- databases/p5-pgsql/Makefile | 2 +- databases/percona-toolkit/Makefile | 2 +- databases/pg-toolbox/Makefile | 2 +- databases/pg_stats_reporter/Makefile | 2 +- databases/pg_statsinfo/Makefile | 2 +- databases/pgbackrest/Makefile | 2 +- databases/pgbouncer/Makefile | 2 +- databases/pgcluu/Makefile | 4 +- databases/pgfouine/Makefile | 2 +- databases/pgpool/Makefile | 2 +- databases/pgtap/Makefile | 2 +- databases/postgresql-odbc/Makefile | 2 +- databases/postgresql-pllua/Makefile | 2 +- databases/postgresql-previous/Makefile | 2 +- databases/postgresql/Makefile | 2 +- databases/postgresql_autodoc/Makefile | 2 +- databases/puppetdb/7/Makefile | 2 +- databases/py-apsw/Makefile | 2 +- databases/qdbm/Makefile | 4 +- databases/recoll/Makefile | 2 +- databases/redis/Makefile | 2 +- databases/repmgr/Makefile | 2 +- databases/ruby-ldap/Makefile | 2 +- databases/sharedance/Makefile | 4 +- databases/sqlbox/Makefile | 2 +- databases/sqlite/Makefile | 2 +- databases/sqlite3-odbc/Makefile | 2 +- databases/sqlite3-tcl/Makefile | 2 +- databases/sqlite3/Makefile | 2 +- databases/sqsh/Makefile | 4 +- databases/tdb/Makefile | 2 +- databases/tdbc-mysql/Makefile | 2 +- databases/tdbc-odbc/Makefile | 2 +- databases/tdbc-postgres/Makefile | 2 +- databases/tdbc-sqlite3/Makefile | 2 +- databases/tdbc/Makefile | 2 +- databases/tinycdb/Makefile | 2 +- databases/tokyocabinet/Makefile | 2 +- databases/web2ldap/Makefile | 2 +- databases/xapian-bindings/Makefile | 2 +- databases/xapian-core/Makefile | 2 +- devel/codeblocks/Makefile | 4 +- devel/gettext/Makefile | 12 +- devel/gettext/distinfo | 4 +- .../patch-gettext-runtime_intl_Makefile_in | 14 +- .../patch-gettext-runtime_intl_configure | 2 +- ...patch-gettext-tools_gnulib-lib_Makefile_in | 16 +- .../patch-gettext-tools_src_Makefile_in | 4 +- devel/github-cli/Makefile | 2 +- devel/github-cli/distinfo | 4 +- devel/libofx/Makefile | 3 +- devel/py-apipkg/Makefile | 27 ++- devel/py-apipkg/distinfo | 4 +- devel/quirks/Makefile | 2 +- devel/quirks/files/Quirks.pm | 3 +- emulators/mame/Makefile | 5 + games/freeciv/Makefile | 4 +- games/gnubg/Makefile | 4 +- games/love/11/Makefile | 2 + games/love/Makefile.inc | 2 + geo/postgis/Makefile | 3 +- geo/spatialite/gui/Makefile | 4 +- geo/spatialite/librasterlite2/Makefile | 4 +- geo/spatialite/libspatialite/Makefile | 3 +- geo/spatialite/tools/Makefile | 3 +- graphics/libgphoto2/Makefile | 3 +- graphics/sane-backends/Makefile | 3 +- graphics/tesseract/tesseract/Makefile | 3 +- korean/hanterm-xf/Makefile | 7 +- korean/hanterm-xf/distinfo | 4 +- korean/hanterm-xf/patches/patch-Makefile_in | 11 +- korean/hanterm-xf/patches/patch-sinstall_sh | 7 +- korean/hanterm-xf/pkg/PLIST | 2 +- korean/libhangul/Makefile | 6 +- korean/libhangul/pkg/PLIST | 2 +- lang/php/7.4/Makefile | 7 +- lang/php/8.0/Makefile | 6 +- lang/php/8.1/Makefile | 6 +- lang/php/8.2/Makefile | 6 +- lang/php/Makefile.inc | 2 +- lang/python/python.port.mk | 2 +- lang/rust/Makefile | 18 +- lang/rust/distinfo | 12 +- mail/claws-mail/Makefile | 12 +- mail/grommunio/gromox/Makefile | 4 +- mail/grommunio/gromox/distinfo | 4 +- mail/grommunio/mapi-header-php/Makefile | 5 +- mail/grommunio/mapi-header-php/distinfo | 4 +- mail/grommunio/mapi-header-php/pkg/PLIST | 1 + mail/grommunio/web/Makefile | 4 +- mail/grommunio/web/distinfo | 4 +- mail/py-spf/Makefile | 2 - math/libqalculate/Makefile | 3 +- math/netcdf/Makefile | 4 +- net/Makefile | 1 - net/curl/Makefile | 3 +- net/curl/patches/patch-configure_ac | 83 ------- .../patches/patch-lib_vquic_curl_ngtcp2_c | 196 ---------------- net/filezilla/Makefile | 3 +- net/ipcheck/Makefile | 35 --- net/ipcheck/distinfo | 2 - net/ipcheck/pkg/DESCR | 19 -- net/ipcheck/pkg/PLIST | 1 - net/isc-bind/Makefile | 2 +- net/isc-bind/distinfo | 4 +- net/mautrix-whatsapp/Makefile | 2 +- net/mautrix-whatsapp/distinfo | 4 +- net/ngtcp2/Makefile | 6 +- net/ngtcp2/distinfo | 4 +- net/ngtcp2/pkg/PLIST | 10 +- net/openconnect/Makefile | 4 +- net/py-dnspython/Makefile | 33 ++- net/py-dnspython/distinfo | 4 +- .../patches/patch-dns_resolver_py | 8 +- net/py-dnspython/patches/patch-pyproject_toml | 11 - net/py-dnspython/pkg/PLIST | 80 ++++++- net/seafile/seafile/Makefile | 3 +- security/openssl/3.1/Makefile | 2 +- security/rust-openssl-tests/Makefile | 4 +- security/rust-openssl-tests/crates.inc | 8 +- security/rust-openssl-tests/distinfo | 20 +- security/rust-openssl-tests/pkg/PLIST | 219 +++++++++--------- security/sshguard/Makefile | 7 +- security/sshguard/distinfo | 4 +- .../sshguard/patches/patch-doc_sshguard_8 | 2 +- .../patches/patch-src_common_sandbox_c | 9 + .../patches/patch-src_parser_attack_scanner_l | 12 + .../patches/patch-src_parser_tests_txt | 13 ++ sysutils/conky/Makefile | 4 +- sysutils/google-cloud-sdk/Makefile | 2 +- sysutils/google-cloud-sdk/distinfo | 4 +- ...googlecloudsdk_core_updater_local_state_py | 2 +- sysutils/google-cloud-sdk/pkg/PLIST | 81 +++++-- sysutils/sblim-sfcc/Makefile | 3 +- sysutils/wsmancli/Makefile | 3 +- textproc/py-vobject/Makefile | 6 +- textproc/raptor/Makefile | 4 +- textproc/sword/Makefile | 3 +- www/nghttp3/Makefile | 4 +- www/nghttp3/distinfo | 4 +- www/py-quixote/Makefile | 1 - x11/gnome/libsecret/Makefile | 2 +- x11/gnome/libsecret/distinfo | 4 +- x11/wxSVG/Makefile | 4 +- x11/xfce4/tumbler/Makefile | 4 +- x11/xfce4/xfce4-notifyd/Makefile | 4 +- x11/xfce4/xfce4-notifyd/distinfo | 4 +- x11/xfce4/xfce4-notifyd/pkg/PLIST | 4 + 264 files changed, 725 insertions(+), 901 deletions(-) delete mode 100644 net/curl/patches/patch-configure_ac delete mode 100644 net/curl/patches/patch-lib_vquic_curl_ngtcp2_c delete mode 100644 net/ipcheck/Makefile delete mode 100644 net/ipcheck/distinfo delete mode 100644 net/ipcheck/pkg/DESCR delete mode 100644 net/ipcheck/pkg/PLIST delete mode 100644 net/py-dnspython/patches/patch-pyproject_toml create mode 100644 security/sshguard/patches/patch-src_common_sandbox_c create mode 100644 security/sshguard/patches/patch-src_parser_attack_scanner_l create mode 100644 security/sshguard/patches/patch-src_parser_tests_txt diff --git a/astro/gnuastro/Makefile b/astro/gnuastro/Makefile index b4bad40d2..97236b739 100644 --- a/astro/gnuastro/Makefile +++ b/astro/gnuastro/Makefile @@ -1,7 +1,7 @@ COMMENT = GNU Astronomy Utilities DISTNAME = gnuastro-0.18 CATEGORIES = astro -REVISION = 0 +REVISION = 1 SHARED_LIBS += gnuastro 3.1 # 16.0 @@ -13,7 +13,7 @@ PERMIT_PACKAGE = Yes WANTLIB += bz2 c cfitsio crypto curl git2 gsl gslcblas http_parser WANTLIB += jpeg lzma m nghttp2 pcre pthread ssh2 ssl -WANTLIB += tiff wcs z zstd nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += tiff wcs z zstd nghttp3 ngtcp2 ngtcp2_crypto_quictls SITES = ${SITE_GNU:=gnuastro/} diff --git a/audio/ario/Makefile b/audio/ario/Makefile index 66d1a97f6..3d0bdb967 100644 --- a/audio/ario/Makefile +++ b/audio/ario/Makefile @@ -1,6 +1,7 @@ COMMENT = GTK3 MPD client inspired by Rhythmbox DISTNAME = ario-1.6 CATEGORIES = audio x11 +REVISION = 0 SHARED_LIBS += filesystem 1.0 # 0.0 SHARED_LIBS += information 1.0 # 0.0 @@ -19,7 +20,7 @@ WANTLIB += c cairo cairo-gobject crypto curl dbus-1 dbus-glib-1 WANTLIB += epoxy execinfo expat ffi fontconfig freetype fribidi WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += graphite2 gthread-2.0 harfbuzz iconv intl jpeg lzma -WANTLIB += m mpdclient nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += m mpdclient nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 WANTLIB += png ssl tag tag_c xcb xcb-render xcb-shm xml2 z diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile index 2e67186da..8c32bae91 100644 --- a/audio/deadbeef/Makefile +++ b/audio/deadbeef/Makefile @@ -1,6 +1,7 @@ COMMENT = DeaDBeeF is an audio player DISTNAME = deadbeef-1.9.4 CATEGORIES = audio +REVISION = 0 HOMEPAGE = https://deadbeef.sourceforge.io/ @@ -20,7 +21,7 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png pulse WANTLIB += pulse-simple sndfile speex ssl swresample theoradec WANTLIB += theoraenc vorbis vorbisenc vorbisfile vpx wavpack x264 WANTLIB += x265 xcb xcb-render xcb-shm xml2 xvidcore z zip zstd -WANTLIB += atspi nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += atspi nghttp3 ngtcp2 ngtcp2_crypto_quictls COMPILER = base-clang ports-gcc diff --git a/audio/grip/Makefile b/audio/grip/Makefile index b5e5d6064..79edc4a5e 100644 --- a/audio/grip/Makefile +++ b/audio/grip/Makefile @@ -1,7 +1,7 @@ COMMENT= front-end to external cd audio rippers and mp3 encoders DISTNAME= grip-4.2.4 -REVISION= 0 +REVISION= 1 CATEGORIES= audio @@ -16,7 +16,7 @@ WANTLIB += c cairo cdda_interface cdda_paranoia crypto curl expat WANTLIB += ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB += gtk-x11-2.0 harfbuzz iconv id3 intl jpeg m nghttp2 -WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_openssl pango-1.0 pangocairo-1.0 +WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_quictls pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png ssl xcb xcb-render WANTLIB += xcb-shm z diff --git a/chinese/c2t/Makefile b/chinese/c2t/Makefile index b4112bb0c..83b8492d6 100644 --- a/chinese/c2t/Makefile +++ b/chinese/c2t/Makefile @@ -8,9 +8,10 @@ PERMIT_PACKAGE= Yes WANTLIB= c -MASTER_SITES= ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/convert/ -MASTER_SITES0= ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/x-win/cxterm/dict/gb/ -DISTFILES= c2t.tar.gz TONEPY.tit:0 +SITES= ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/convert/ +SITES.dict= ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/x-win/cxterm/dict/gb/ +DISTFILES= c2t.tar.gz +DISTFILES.dict= TONEPY.tit EXTRACT_ONLY= c2t.tar.gz WRKDIST= ${WRKDIR} diff --git a/chinese/cconv/Makefile b/chinese/cconv/Makefile index 3de97a453..1d2fcfd7e 100644 --- a/chinese/cconv/Makefile +++ b/chinese/cconv/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c iconv -MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=cconv/} +SITES= ${SITE_GOOGLECODE:=cconv/} LIB_DEPENDS= converters/libiconv diff --git a/chinese/cless/Makefile b/chinese/cless/Makefile index b3a2efaae..4ea70adde 100644 --- a/chinese/cless/Makefile +++ b/chinese/cless/Makefile @@ -3,7 +3,7 @@ COMMENT= pager utility that speaks Chinese DISTNAME= cless-290 PKGNAME= zh-${DISTNAME} CATEGORIES= chinese misc -MASTER_SITES= http://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/c-utils/ +SITES= http://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/c-utils/ REVISION = 2 # BSD diff --git a/chinese/hc/Makefile b/chinese/hc/Makefile index 294e810ea..9fad38380 100644 --- a/chinese/hc/Makefile +++ b/chinese/hc/Makefile @@ -9,7 +9,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c -MASTER_SITES= ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/convert/ +SITES= ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/convert/ DISTFILES= hc-30.tar.gz hc-supp.tab EXTRACT_ONLY= hc-30.tar.gz diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile index be19a0fd2..497a37541 100644 --- a/chinese/libchewing/Makefile +++ b/chinese/libchewing/Makefile @@ -18,7 +18,7 @@ PERMIT_PACKAGE= Yes WANTLIB += m pthread sqlite3 z -MASTER_SITES = https://github.com/chewing/libchewing/releases/download/v$V/ +SITES = https://github.com/chewing/libchewing/releases/download/v$V/ EXTRACT_SUFX= .tar.bz2 diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile index b68c876c1..aded16fa7 100644 --- a/chinese/libpinyin/Makefile +++ b/chinese/libpinyin/Makefile @@ -21,7 +21,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} c db glib-2.0 iconv intl m pcre2-8 -MASTER_SITES = https://github.com/libpinyin/libpinyin/releases/download/$V/ +SITES = https://github.com/libpinyin/libpinyin/releases/download/$V/ COMPILER = base-clang ports-gcc BUILD_DEPENDS = print/texinfo diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile index 90621cb96..b9d077e00 100644 --- a/chinese/libtabe/Makefile +++ b/chinese/libtabe/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes WANTLIB += c lib/db/db=3 -MASTER_SITES= http://www.kpvs.tp.edu.tw/ +SITES= http://www.kpvs.tp.edu.tw/ LIB_DEPENDS= databases/db/v3 diff --git a/chinese/lunar/Makefile b/chinese/lunar/Makefile index a86fab47c..723165800 100644 --- a/chinese/lunar/Makefile +++ b/chinese/lunar/Makefile @@ -7,7 +7,7 @@ FIX_EXTRACT_PERMISSIONS=Yes CATEGORIES= chinese -MASTER_SITES= http://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/c-utils/ +SITES= http://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/c-utils/ PERMIT_PACKAGE= Yes diff --git a/comms/amtterm/Makefile b/comms/amtterm/Makefile index f8fd6cd1b..3aea6d690 100644 --- a/comms/amtterm/Makefile +++ b/comms/amtterm/Makefile @@ -20,7 +20,7 @@ WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0 WANTLIB += pangocairo-1.0 ssl vte-2.91 # https://git.kraxel.org/cgit/amtterm/ -MASTER_SITES= https://www.kraxel.org/releases/amtterm/ +SITES= https://www.kraxel.org/releases/amtterm/ LIB_DEPENDS-term= LIB_DEPENDS-main= devel/gettext,-runtime \ diff --git a/comms/birda/Makefile b/comms/birda/Makefile index bbb8ad1e1..5cbedd690 100644 --- a/comms/birda/Makefile +++ b/comms/birda/Makefile @@ -2,7 +2,7 @@ COMMENT= Bohlin's IrDA utilities DISTNAME= birda-1.3 CATEGORIES= comms -MASTER_SITES= https://ftp.netbsd.org/pub/pkgsrc/distfiles/ +SITES= https://ftp.netbsd.org/pub/pkgsrc/distfiles/ # BSD PERMIT_PACKAGE= Yes diff --git a/comms/bottlerocket/Makefile b/comms/bottlerocket/Makefile index fb31bb066..30e524c1e 100644 --- a/comms/bottlerocket/Makefile +++ b/comms/bottlerocket/Makefile @@ -5,7 +5,7 @@ REVISION = 2 CATEGORIES= comms HOMEPAGE = http://www.linuxha.com/bottlerocket/ -MASTER_SITES = ${HOMEPAGE} +SITES = ${HOMEPAGE} CONFIGURE_STYLE=gnu diff --git a/comms/c3270/Makefile b/comms/c3270/Makefile index c98028cc1..17e1dd925 100644 --- a/comms/c3270/Makefile +++ b/comms/c3270/Makefile @@ -15,7 +15,7 @@ WANTLIB += c crypto curses iconv readline ssl util LIB_DEPENDS= converters/libiconv -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x3270/} +SITES= ${SITE_SOURCEFORGE:=x3270/} WRKDIST= ${WRKDIR}/suite3270-4.0 USE_GMAKE = Yes diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile index a82d4e61b..160200bfc 100644 --- a/comms/chirp/Makefile +++ b/comms/chirp/Makefile @@ -11,7 +11,7 @@ HOMEPAGE= https://chirp.danplanet.com/ # GPLv3+ PERMIT_PACKAGE= Yes -MASTER_SITES= https://trac.chirp.danplanet.com/chirp_next/next-${MODPY_EGG_VERSION}/ +SITES= https://trac.chirp.danplanet.com/chirp_next/next-${MODPY_EGG_VERSION}/ MODULES= lang/python diff --git a/comms/colrdx/Makefile b/comms/colrdx/Makefile index 16e79b368..120b3078b 100644 --- a/comms/colrdx/Makefile +++ b/comms/colrdx/Makefile @@ -10,7 +10,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c curses -MASTER_SITES= http://www.qsl.net/pg4i/download/ +SITES= http://www.qsl.net/pg4i/download/ MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" diff --git a/comms/dfu-util/Makefile b/comms/dfu-util/Makefile index c84f4baed..0c2adf012 100644 --- a/comms/dfu-util/Makefile +++ b/comms/dfu-util/Makefile @@ -11,7 +11,7 @@ PERMIT_PACKAGE = Yes WANTLIB = c usb-1.0 -MASTER_SITES = ${HOMEPAGE}/releases/ +SITES = ${HOMEPAGE}/releases/ LIB_DEPENDS = devel/libusb1 diff --git a/comms/efax/Makefile b/comms/efax/Makefile index 8afdd456b..ca6a5b401 100644 --- a/comms/efax/Makefile +++ b/comms/efax/Makefile @@ -10,7 +10,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c -MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/serialcomm/fax/} +SITES= ${SITE_SUNSITE:=apps/serialcomm/fax/} MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" diff --git a/comms/ems-flasher/Makefile b/comms/ems-flasher/Makefile index d1c8b5e38..754c43773 100644 --- a/comms/ems-flasher/Makefile +++ b/comms/ems-flasher/Makefile @@ -13,7 +13,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c pthread usb-1.0 -MASTER_SITES = https://lacklustre.net/projects/ems-flasher/ +SITES = https://lacklustre.net/projects/ems-flasher/ EXTRACT_SUFX = .tgz LIB_DEPENDS = devel/libusb1 diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index 91072c75d..55aebdb48 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -16,9 +16,9 @@ WANTLIB += X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama c fltk WANTLIB += fltk_images fontconfig hamlib iconv intl jpeg m png WANTLIB += portaudio pthread samplerate sndfile ${COMPILER_LIBCXX} z -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fldigi/} +SITES= ${SITE_SOURCEFORGE:=fldigi/} -COMPILER = base-clang ports-gcc base-gcc +COMPILER = base-clang ports-gcc base-gcc RUN_DEPENDS= devel/desktop-file-utils BUILD_DEPENDS= textproc/asciidoc diff --git a/comms/flipit/Makefile b/comms/flipit/Makefile index 716b4609b..c01906ebb 100644 --- a/comms/flipit/Makefile +++ b/comms/flipit/Makefile @@ -4,7 +4,7 @@ DISTNAME= flipit-0.3.6 CATEGORIES= comms REVISION = 0 -MASTER_SITES= http://www.lickey.com/flipit/dist/ +SITES= ${HOMEPAGE}/dist/ HOMEPAGE= http://www.lickey.com/flipit/ # MIT diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile index 28057f2ba..6ead1ee58 100644 --- a/comms/gammu/Makefile +++ b/comms/gammu/Makefile @@ -16,7 +16,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c curl dbi glib-2.0 gobject-2.0 iconv intl m pthread usb-1.0 -MASTER_SITES = https://dl.cihar.com/gammu/releases/ +SITES = https://dl.cihar.com/gammu/releases/ MODULES = devel/cmake diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index ceeff5e67..fa5f23799 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -47,9 +47,9 @@ WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c fftw3f WANTLIB += fftw3f_threads gmp gmpxx gsl gslcblas gsm iconv jack WANTLIB += log4cpp m orc-0.4 portaudio qwt zmq -MASTER_SITES = https://github.com/gnuradio/gnuradio/releases/download/v$V/ +SITES = https://github.com/gnuradio/gnuradio/releases/download/v$V/ -COMPILER = base-clang ports-gcc base-gcc +COMPILER = base-clang ports-gcc base-gcc MODULES = devel/cmake \ lang/python \ diff --git a/comms/gpsk31/Makefile b/comms/gpsk31/Makefile index 9143381eb..4ea8f7893 100644 --- a/comms/gpsk31/Makefile +++ b/comms/gpsk31/Makefile @@ -20,7 +20,7 @@ WANTLIB += pixman-1 png pthread sndio ${COMPILER_LIBCXX} xcb xcb-render WANTLIB += z gtk-x11-2.0 gdk_pixbuf-2.0 gdk-x11-2.0 GL WANTLIB += xcb-shm harfbuzz -MASTER_SITES= http://www.qsl.net/pg4i/download/ +SITES= http://www.qsl.net/pg4i/download/ COMPILER = base-clang ports-gcc base-gcc diff --git a/comms/hackrf/Makefile b/comms/hackrf/Makefile index 45443539a..bc56ed6e6 100644 --- a/comms/hackrf/Makefile +++ b/comms/hackrf/Makefile @@ -17,7 +17,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c fftw3f m pthread usb-1.0 -MASTER_SITES = https://github.com/mossmann/hackrf/releases/download/v$V/ +SITES = https://github.com/mossmann/hackrf/releases/download/v$V/ EXTRACT_SUFX = .tar.xz diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index 18b5d94a8..3112832f1 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -45,7 +45,7 @@ RUN_DEPENDS-main= RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS} RUN_DEPENDS-tcl= ${MODTCL_RUN_DEPENDS} -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hamlib/} +SITES= ${SITE_SOURCEFORGE:=hamlib/} CONFIGURE_STYLE= autoreconf AUTOCONF_VERSION= 2.69 diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index ca75ea2b6..04a3b4624 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -5,7 +5,7 @@ CATEGORIES= comms HOMEPAGE= https://www.HylaFAX.org/ -MASTER_SITES= http://ftp.hylafax.org/source/ \ +SITES= http://ftp.hylafax.org/source/ \ ftp://ftp.hylafax.org/source/ \ ftp://ftp.ntua.gr/pub/net/hylafax/source/ \ http://mirror.aarnet.edu.au/pub/hylafax/source/ diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile index cc2378673..96da53245 100644 --- a/comms/kermit/Makefile +++ b/comms/kermit/Makefile @@ -11,7 +11,7 @@ PERMIT_PACKAGE = Yes WANTLIB = c curses m util -MASTER_SITES = https://www.kermitproject.org/ftp/kermit/archives/ +SITES = https://www.kermitproject.org/ftp/kermit/archives/ WRKDIST = ${WRKDIR} diff --git a/comms/lcdproc/Makefile b/comms/lcdproc/Makefile index 4ce8027ea..7fa1ed4ea 100644 --- a/comms/lcdproc/Makefile +++ b/comms/lcdproc/Makefile @@ -17,7 +17,7 @@ WANTLIB += X11 c curses ftdi1 hid kvm pthread png usb-1.0 usb USE_GMAKE = Yes -MASTER_SITES = https://github.com/lcdproc/lcdproc/releases/download/v$V/ +SITES = https://github.com/lcdproc/lcdproc/releases/download/v$V/ CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include ${WITH_APM}" \ diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile index 82da9b0a8..fcc7e17d0 100644 --- a/comms/lrzsz/Makefile +++ b/comms/lrzsz/Makefile @@ -6,7 +6,7 @@ CATEGORIES= comms HOMEPAGE= https://www.ohse.de/uwe/software/lrzsz.html -MASTER_SITES= https://www.ohse.de/uwe/releases/ +SITES= https://www.ohse.de/uwe/releases/ # GPLv2 PERMIT_PACKAGE= Yes diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index cc61d5f35..f1d839c2c 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -12,7 +12,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c m util -MASTER_SITES= ftp://mgetty.greenie.net/pub/mgetty/source/${VERSION:R}/ +SITES= ftp://mgetty.greenie.net/pub/mgetty/source/${VERSION:R}/ RUN_DEPENDS= print/ghostscript/gnu \ graphics/netpbm diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index 4d9fb83e6..126b0d6db 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -2,7 +2,7 @@ COMMENT= MS-DOS Telix-like serial communication program DISTNAME= minicom-2.8 CATEGORIES= comms -MASTER_SITES= https://salsa.debian.org/minicom-team/minicom/-/archive/2.8/ +SITES= ${HOMEPAGE}/-/archive/2.8/ HOMEPAGE= https://salsa.debian.org/minicom-team/minicom diff --git a/comms/minimodem/Makefile b/comms/minimodem/Makefile index c42de55eb..79e4be568 100644 --- a/comms/minimodem/Makefile +++ b/comms/minimodem/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes WANTLIB = c fftw3f fftw3f_threads intl m pthread pulse pulse-simple WANTLIB += sndfile -MASTER_SITES = http://www.whence.com/minimodem/ +SITES = ${HOMEPAGE} LIB_DEPENDS = audio/libsndfile \ audio/pulseaudio \ diff --git a/comms/owx/Makefile b/comms/owx/Makefile index 131b9519d..94f0fa6a7 100644 --- a/comms/owx/Makefile +++ b/comms/owx/Makefile @@ -12,9 +12,9 @@ PERMIT_PACKAGE= Yes WANTLIB = c m ${COMPILER_LIBCXX} -MASTER_SITES = https://distfiles.sigtrap.nl/ +SITES = https://distfiles.sigtrap.nl/ -COMPILER = base-clang ports-gcc base-gcc +COMPILER = base-clang ports-gcc base-gcc MAKE_FLAGS = CXX="${CXX}" PORTS_CXXFLAGS="${CXXFLAGS}" diff --git a/comms/p5-SendPage/Makefile b/comms/p5-SendPage/Makefile index 3fa66631d..707bd41b4 100644 --- a/comms/p5-SendPage/Makefile +++ b/comms/p5-SendPage/Makefile @@ -11,7 +11,7 @@ HOMEPAGE= http://sendpage.org/ # GPL PERMIT_PACKAGE= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sendpage/} +SITES= ${SITE_SOURCEFORGE:=sendpage/} RUN_DEPENDS= comms/p5-Device-SerialPort \ mail/p5-Mail-Tools \ diff --git a/comms/pterm/Makefile b/comms/pterm/Makefile index 120a50b78..710307281 100644 --- a/comms/pterm/Makefile +++ b/comms/pterm/Makefile @@ -18,7 +18,7 @@ WANTLIB += wx_baseu-3.2 wx_baseu_net-3.2 wx_baseu_xml-3.2 WANTLIB += wx_gtk3u_core-3.2 WANTLIB += wx_gtk3u_html-3.2 wx_gtk3u_qa-3.2 wx_gtk3u_xrc-3.2 -MASTER_SITES = https://cyber1.org/download/linux/ +SITES = https://cyber1.org/download/linux/ EXTRACT_SUFX = .tar.bz2 diff --git a/comms/py-gammu/Makefile b/comms/py-gammu/Makefile index 8294729a3..6a827bd73 100644 --- a/comms/py-gammu/Makefile +++ b/comms/py-gammu/Makefile @@ -16,7 +16,7 @@ PERMIT_PACKAGE = Yes WANTLIB += Gammu gsmsd m pthread ${MODPY_WANTLIB} -MASTER_SITES = https://dl.cihar.com/python-gammu/ +SITES = https://dl.cihar.com/python-gammu/ MODULES = lang/python MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} diff --git a/comms/qodem/Makefile b/comms/qodem/Makefile index 01034c63d..4dbac47a7 100644 --- a/comms/qodem/Makefile +++ b/comms/qodem/Makefile @@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c curses util -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qodem/} +SITES = ${SITE_SOURCEFORGE:=qodem/} USE_GMAKE = Yes diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile index 8256df9f1..ba05e764d 100644 --- a/comms/qpage/Makefile +++ b/comms/qpage/Makefile @@ -9,7 +9,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c -MASTER_SITES= http://www.qpage.org/download/ +SITES= http://www.qpage.org/download/ EXTRACT_SUFX= .tar.Z CONFIGURE_STYLE=gnu diff --git a/comms/rtl-sdr/Makefile b/comms/rtl-sdr/Makefile index 6beebf9b8..1c5c492dc 100644 --- a/comms/rtl-sdr/Makefile +++ b/comms/rtl-sdr/Makefile @@ -15,7 +15,7 @@ PERMIT_PACKAGE= Yes WANTLIB += c m pthread usb-1.0 # http://cgit.osmocom.org/rtl-sdr -MASTER_SITES= https://spacehopper.org/mirrors/ +SITES= https://spacehopper.org/mirrors/ MODULES= devel/cmake LIB_DEPENDS= devel/libusb1 diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile index efe8dda56..77def4870 100644 --- a/comms/scmxx/Makefile +++ b/comms/scmxx/Makefile @@ -3,7 +3,7 @@ COMMENT= data exchange utility for Siemens mobile phones DISTNAME= scmxx-0.9.0 CATEGORIES= comms -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scmxx/} +SITES= ${SITE_SOURCEFORGE:=scmxx/} EXTRACT_SUFX= .tar.bz2 # GPLv2 diff --git a/comms/sigrok/Makefile.inc b/comms/sigrok/Makefile.inc index e789ee092..19d8ab047 100644 --- a/comms/sigrok/Makefile.inc +++ b/comms/sigrok/Makefile.inc @@ -2,7 +2,7 @@ CATEGORIES += comms/sigrok MAINTAINER ?= Anthony J. Bentley HOMEPAGE ?= https://sigrok.org/ -MASTER_SITES ?= https://sigrok.org/download/source/${SIGROK_PROJECT}/ +SITES ?= https://sigrok.org/download/source/${SIGROK_PROJECT}/ DISTNAME ?= ${SIGROK_PROJECT}-${SIGROK_VERSION} # GPLv3+ diff --git a/comms/sigrok/sigrok-firmware-fx2lafw/Makefile b/comms/sigrok/sigrok-firmware-fx2lafw/Makefile index 8483d78d2..bbce87b25 100644 --- a/comms/sigrok/sigrok-firmware-fx2lafw/Makefile +++ b/comms/sigrok/sigrok-firmware-fx2lafw/Makefile @@ -4,7 +4,7 @@ SIGROK_PROJECT = sigrok-firmware-fx2lafw-bin SIGROK_VERSION = 0.1.7 PKGNAME = sigrok-firmware-fx2lafw-${SIGROK_VERSION} -MASTER_SITES = https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/ +SITES = https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/ CONFIGURE_STYLE = NO_BUILD = Yes diff --git a/comms/smstools/Makefile b/comms/smstools/Makefile index f1ae9a827..01d384d93 100644 --- a/comms/smstools/Makefile +++ b/comms/smstools/Makefile @@ -13,11 +13,11 @@ PERMIT_PACKAGE = Yes WANTLIB = c mm -MASTER_SITES = ${HOMEPAGE}/packages/ +SITES = ${HOMEPAGE}/packages/ # -fno-common fixes from https://salsa.debian.org/debian-mobcom-team/smstools/-/tree/master/debian/patches -MASTER_SITES0 = https://salsa.debian.org/debian-mobcom-team/smstools/-/raw/57a358a9eebbe2ca5639cc526f7027944ed95ea1/debian/patches/ -PATCHFILES = ${DISTNAME}-{}gcc10.patch:0 +SITES.p = https://salsa.debian.org/debian-mobcom-team/smstools/-/raw/57a358a9eebbe2ca5639cc526f7027944ed95ea1/debian/patches/ +PATCHFILES.p = ${DISTNAME}-{}gcc10.patch PATCH_DIST_ARGS = -p2 -d${WRKSRC} RUN_DEPENDS = mail/procmail # some scripts use formail(1) diff --git a/comms/spisniffer/Makefile b/comms/spisniffer/Makefile index d1e1a9031..eb8497f9f 100644 --- a/comms/spisniffer/Makefile +++ b/comms/spisniffer/Makefile @@ -10,7 +10,7 @@ HOMEPAGE= http://dangerousprototypes.com/docs/Bus_Pirate_binary_SPI_sniffer_uti # http://creativecommons.org/publicdomain/zero/1.0/ PERMIT_PACKAGE= Yes -MASTER_SITES= https://distfiles.sigtrap.nl/ +SITES= https://distfiles.sigtrap.nl/ WANTLIB= c diff --git a/comms/sredird/Makefile b/comms/sredird/Makefile index fbfeaebe5..9ce2980a4 100644 --- a/comms/sredird/Makefile +++ b/comms/sredird/Makefile @@ -9,7 +9,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c -MASTER_SITES= http://www.ibiblio.org/pub/Linux/system/serial/ +SITES= http://www.ibiblio.org/pub/Linux/system/serial/ NO_TEST= Yes diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile index d0dfe98ec..36a1b71ee 100644 --- a/comms/syncterm/Makefile +++ b/comms/syncterm/Makefile @@ -13,7 +13,7 @@ PERMIT_PACKAGE= Yes # sdl2 is dlopen()'d WANTLIB += SDL2 c curses m ossaudio pthread util -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=syncterm/} +SITES= ${SITE_SOURCEFORGE:=syncterm/} EXTRACT_SUFX= -src.tgz USE_GMAKE= Yes diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile index e6e8e3f7d..a73b0c820 100644 --- a/comms/tkhylafax/Makefile +++ b/comms/tkhylafax/Makefile @@ -7,7 +7,7 @@ CATEGORIES= comms # BSD PERMIT_PACKAGE= Yes -MASTER_SITES= http://ftp.hylafax.org/contrib/tkhylafax/ \ +SITES= http://ftp.hylafax.org/contrib/tkhylafax/ \ ftp://ftp.hylafax.org/contrib/tkhylafax/ \ http://mirror.aarnet.edu.au/pub/hylafax/contrib/tkhylafax/ \ ftp://ftp.ntua.gr/pub/net/hylafax/contrib/tkhylafax/ diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile index a641e35a4..97f4c702a 100644 --- a/comms/tlf/Makefile +++ b/comms/tlf/Makefile @@ -8,7 +8,7 @@ REVISION= 2 HOMEPAGE= http://home.iae.nl/users/reinc/TLF-0.2.html -MASTER_SITES= https://github.com/Tlf/tlf/archive/ +SITES= https://github.com/Tlf/tlf/archive/ WRKDIST= ${WRKDIR}/tlf-${DISTNAME} # GPLv2+ diff --git a/comms/wy60/Makefile b/comms/wy60/Makefile index f2cd23039..6882b9956 100644 --- a/comms/wy60/Makefile +++ b/comms/wy60/Makefile @@ -9,7 +9,7 @@ MAINTAINER= Christian Weisgerber # GPLv2+ PERMIT_PACKAGE= Yes -MASTER_SITES= https://distfiles.sigtrap.nl/ +SITES= https://distfiles.sigtrap.nl/ WANTLIB= c curses diff --git a/comms/x3270/Makefile b/comms/x3270/Makefile index be620848b..31bb1a1fe 100644 --- a/comms/x3270/Makefile +++ b/comms/x3270/Makefile @@ -5,7 +5,7 @@ REVISION= 5 CATEGORIES= comms HOMEPAGE= http://x3270.bgp.nu/ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x3270/} +SITES= ${SITE_SOURCEFORGE:=x3270/} EXTRACT_SUFX= .tgz # BSD, MIT diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile index c724690d1..3d20138d6 100644 --- a/comms/xdx/Makefile +++ b/comms/xdx/Makefile @@ -14,7 +14,7 @@ WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gobject-2.0 gtk-x11-2.0 harfbuzz intl pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 z -MASTER_SITES= https://distfiles.sigtrap.nl/ +SITES= https://distfiles.sigtrap.nl/ CONFIGURE_STYLE=gnu diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile index b47dcd68a..e315ac1fc 100644 --- a/comms/xlog/Makefile +++ b/comms/xlog/Makefile @@ -15,7 +15,7 @@ WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 WANTLIB += hamlib harfbuzz intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += z -MASTER_SITES= http://download.savannah.nongnu.org/releases/xlog/ \ +SITES= http://download.savannah.nongnu.org/releases/xlog/ \ https://distfiles.sigtrap.nl/ RUN_DEPENDS= devel/desktop-file-utils \ diff --git a/comms/zmtx-zmrx/Makefile b/comms/zmtx-zmrx/Makefile index 0b3632f0e..97a7e8deb 100644 --- a/comms/zmtx-zmrx/Makefile +++ b/comms/zmtx-zmrx/Makefile @@ -9,7 +9,7 @@ PERMIT_DISTFILES= Yes WANTLIB= c -MASTER_SITES= ftp://ftp.netsw.org/net/modem/protocols/zmodem/zmtx-zmrx/ +SITES= ftp://ftp.netsw.org/net/modem/protocols/zmodem/zmtx-zmrx/ # see also comp.unix.sources for version 1.0 # ftp://ftp.lth.se/pub/usenet/comp.sources.unix/volume28/zm/part01.gz diff --git a/converters/base64/Makefile b/converters/base64/Makefile index c7ac5f1a4..c5ba03f12 100644 --- a/converters/base64/Makefile +++ b/converters/base64/Makefile @@ -10,7 +10,7 @@ HOMEPAGE= http://www.fourmilab.ch/webtools/base64/ PERMIT_PACKAGE= Yes WANTLIB= c -MASTER_SITES= ${HOMEPAGE} +SITES= ${HOMEPAGE} CONFIGURE_STYLE=gnu ALL_TARGET= prog diff --git a/converters/bdf2psf/Makefile b/converters/bdf2psf/Makefile index 6aa5338e9..95d5c0654 100644 --- a/converters/bdf2psf/Makefile +++ b/converters/bdf2psf/Makefile @@ -12,7 +12,7 @@ HOMEPAGE = https://packages.debian.org/sid/bdf2psf # GPLv2+ PERMIT_PACKAGE = Yes -MASTER_SITES = ${MASTER_SITE_DEBIAN:=main/c/console-setup/} +SITES = ${SITE_DEBIAN:=main/c/console-setup/} WRKDIST = ${WRKDIR}/console-setup diff --git a/converters/bdf2sfd/Makefile b/converters/bdf2sfd/Makefile index 3a4927975..f2f6f17a6 100644 --- a/converters/bdf2sfd/Makefile +++ b/converters/bdf2sfd/Makefile @@ -13,7 +13,7 @@ PERMIT_PACKAGE = Yes # uses pledge() WANTLIB += c -MASTER_SITES = https://github.com/fcambus/bdf2sfd/releases/download/$V/ +SITES = https://github.com/fcambus/bdf2sfd/releases/download/$V/ MODULES = devel/cmake diff --git a/converters/btoa/Makefile b/converters/btoa/Makefile index 18a3fc87e..dd3dcb598 100644 --- a/converters/btoa/Makefile +++ b/converters/btoa/Makefile @@ -8,7 +8,7 @@ REVISION = 0 PERMIT_PACKAGE= Yes WANTLIB= c -MASTER_SITES= http://www.netsw.org/system/tools/fileutils/encode/ +SITES= http://www.netsw.org/system/tools/fileutils/encode/ PATCHFILES= btoa-5.2-patch1.gz MAKE_FLAGS= DESTDIR=${PREFIX} diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile index 6152be1a8..b62bcbe30 100644 --- a/converters/convmv/Makefile +++ b/converters/convmv/Makefile @@ -6,7 +6,7 @@ HOMEPAGE = https://www.j3e.de/linux/convmv/ # GPLv2+ PERMIT_PACKAGE = Yes -MASTER_SITES = ${HOMEPAGE} +SITES = ${HOMEPAGE} PKG_ARCH = * diff --git a/converters/d1489/Makefile b/converters/d1489/Makefile index ebc7635c2..db39dc629 100644 --- a/converters/d1489/Makefile +++ b/converters/d1489/Makefile @@ -4,7 +4,7 @@ DISTNAME= d1489-1.5.1 REVISION= 0 CATEGORIES= converters -MASTER_SITES= http://koi8.pp.ru/dist/ +SITES= http://koi8.pp.ru/dist/ EXTRACT_SUFX= .tgz # MIT diff --git a/converters/dos2unix/Makefile b/converters/dos2unix/Makefile index 2b5d71d24..80031e51e 100644 --- a/converters/dos2unix/Makefile +++ b/converters/dos2unix/Makefile @@ -12,7 +12,7 @@ PERMIT_PACKAGE= Yes WANTLIB += c intl -MASTER_SITES= https://waterlan.home.xs4all.nl/dos2unix/ +SITES= https://waterlan.home.xs4all.nl/dos2unix/ BUILD_DEPENDS= devel/gettext,-tools diff --git a/converters/enca/Makefile b/converters/enca/Makefile index 1e8690818..14c52770e 100644 --- a/converters/enca/Makefile +++ b/converters/enca/Makefile @@ -12,7 +12,7 @@ PERMIT_PACKAGE= Yes WANTLIB = c iconv intl m recode -MASTER_SITES= http://dl.cihar.com/enca/ +SITES= http://dl.cihar.com/enca/ BUILD_DEPENDS= converters/p5-Unicode-Map8 diff --git a/converters/fondu/Makefile b/converters/fondu/Makefile index 93961d2d4..e51cece69 100644 --- a/converters/fondu/Makefile +++ b/converters/fondu/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c m -MASTER_SITES = http://fondu.sourceforge.net/ +SITES = http://fondu.sourceforge.net/ WRKDIST = ${WRKDIR}/${PKGNAME} diff --git a/converters/html2text/Makefile b/converters/html2text/Makefile index 41fa393e8..cec8328ca 100644 --- a/converters/html2text/Makefile +++ b/converters/html2text/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes WANTLIB += c m ${COMPILER_LIBCXX} -MASTER_SITES= http://www.mbayer.de/html2text/downloads/ \ +SITES= http://www.mbayer.de/html2text/downloads/ \ ftp://ftp.ibiblio.org/pub/linux/apps/www/converters/ COMPILER = base-clang ports-gcc base-gcc diff --git a/converters/html2wml/Makefile b/converters/html2wml/Makefile index 7307caf08..0d994bfaf 100644 --- a/converters/html2wml/Makefile +++ b/converters/html2wml/Makefile @@ -9,8 +9,8 @@ HOMEPAGE = http://maddingue.free.fr/softwares/html2wml.html.en # GPLv2 PERMIT_PACKAGE= Yes -MASTER_SITES = http://maddingue.free.fr/softwares/download/Html2Wml/ \ - ${MASTER_SITE_SOURCEFORGE:=htmlwml/} +SITES = http://maddingue.free.fr/softwares/download/Html2Wml/ \ + ${SITE_SOURCEFORGE:=htmlwml/} BUILD_DEPENDS = ${RUN_DEPENDS} RUN_DEPENDS = www/p5-libwww \ diff --git a/converters/ish/Makefile b/converters/ish/Makefile index 9e1ed91b1..0cdf7cf29 100644 --- a/converters/ish/Makefile +++ b/converters/ish/Makefile @@ -10,9 +10,8 @@ PERMIT_DISTFILES= no license WANTLIB += c -MASTER_SITES= \ - ${MASTER_SITE_FREEBSD} \ - http://www.unix.gr.jp/jnetcex/soft/ +SITES= ${SITE_FREEBSD} \ + http://www.unix.gr.jp/jnetcex/soft/ MAKE_FILE= makefile MAKE_FLAGS= CFLAGS="${CFLAGS}" CC="${CC}" diff --git a/converters/k2pdfopt/Makefile b/converters/k2pdfopt/Makefile index f71f0c3b9..be06fec75 100644 --- a/converters/k2pdfopt/Makefile +++ b/converters/k2pdfopt/Makefile @@ -25,7 +25,7 @@ COMMENT = optimizes PDF/DJVU files for mobile e-readers V = 2.42 DISTNAME = k2pdfopt_v${V}_src PKGNAME = k2pdfopt-${V} -MASTER_SITES = http://willus.com/k2pdfopt/src/ +SITES = http://willus.com/k2pdfopt/src/ EXTRACT_SUFX = .zip REVISION = 3 diff --git a/converters/libdvdcss/Makefile b/converters/libdvdcss/Makefile index 3184c2dda..0589334cb 100644 --- a/converters/libdvdcss/Makefile +++ b/converters/libdvdcss/Makefile @@ -3,7 +3,7 @@ COMMENT= descramble scrambled DVDs VER= 1.4.3 DISTNAME= libdvdcss-${VER} CATEGORIES= converters -MASTER_SITES= https://download.videolan.org/pub/videolan/libdvdcss/${VER}/ +SITES= https://download.videolan.org/pub/videolan/libdvdcss/${VER}/ EXTRACT_SUFX= .tar.bz2 SHARED_LIBS= dvdcss 4.1 diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 73d13f15e..a03c2bd22 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -2,7 +2,7 @@ COMMENT= character set conversion library DISTNAME= libiconv-1.17 CATEGORIES= converters devel -MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/} +SITES= ${SITE_GNU:=libiconv/} SHARED_LIBS= charset 1.1 \ iconv 7.1 diff --git a/converters/libpst/Makefile b/converters/libpst/Makefile index f1f5a2635..91473e948 100644 --- a/converters/libpst/Makefile +++ b/converters/libpst/Makefile @@ -32,7 +32,7 @@ WANTLIB-python += pst boost_python${MODPY_VERSION:C/\.//g}-mt COMPILER = base-clang ports-gcc base-gcc -MASTER_SITES= http://www.five-ten-sg.com/libpst/packages/ +SITES= http://www.five-ten-sg.com/libpst/packages/ MULTI_PACKAGES= -main -python diff --git a/converters/libunistring/Makefile b/converters/libunistring/Makefile index cc39bac67..d0676a876 100644 --- a/converters/libunistring/Makefile +++ b/converters/libunistring/Makefile @@ -15,7 +15,7 @@ PERMIT_PACKAGE = Yes WANTLIB = iconv -MASTER_SITES = ${MASTER_SITE_GNU:=libunistring/} +SITES = ${SITE_GNU:=libunistring/} LIB_DEPENDS = converters/libiconv diff --git a/converters/luastruct/Makefile b/converters/luastruct/Makefile index 9b5058789..c09a0870a 100644 --- a/converters/luastruct/Makefile +++ b/converters/luastruct/Makefile @@ -10,7 +10,7 @@ HOMEPAGE= http://www.inf.puc-rio.br/~roberto/struct/ # MIT PERMIT_PACKAGE= Yes -MASTER_SITES= ${HOMEPAGE} +SITES= ${HOMEPAGE} MODULES= lang/lua diff --git a/converters/mimepp/Makefile b/converters/mimepp/Makefile index 76e79e38b..e0d6bbd25 100644 --- a/converters/mimepp/Makefile +++ b/converters/mimepp/Makefile @@ -7,7 +7,7 @@ CATEGORIES= converters PERMIT_PACKAGE= restrictive non-commercial license PERMIT_DISTFILES= Yes -MASTER_SITES= ${MASTER_SITE_SUNSITE:=devel/lang/c++/} +SITES= ${SITE_SUNSITE:=devel/lang/c++/} MAKE_FILE= makefile.unx MAKE_FLAGS= CXX="${CXX}" diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile index d671dfd3e..a3bbbf5df 100644 --- a/converters/mpack/Makefile +++ b/converters/mpack/Makefile @@ -9,7 +9,7 @@ PERMIT_PACKAGE= Yes WANTLIB += c -MASTER_SITES= http://ftp.andrew.cmu.edu/pub/mpack/ \ +SITES= http://ftp.andrew.cmu.edu/pub/mpack/ \ https://spacehopper.org/mirrors/ CONFIGURE_STYLE= gnu diff --git a/converters/otf2bdf/Makefile b/converters/otf2bdf/Makefile index aaf78d333..91f2a40d6 100644 --- a/converters/otf2bdf/Makefile +++ b/converters/otf2bdf/Makefile @@ -3,7 +3,7 @@ CATEGORIES = converters fonts HOMEPAGE = http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/ DISTNAME = otf2bdf-3.1 REVISION = 2 -MASTER_SITES = http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/ +SITES = http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/ EXTRACT_SUFX = .tgz # BSD diff --git a/converters/pflogx/Makefile b/converters/pflogx/Makefile index 94a16e660..920a5ddc7 100644 --- a/converters/pflogx/Makefile +++ b/converters/pflogx/Makefile @@ -14,7 +14,7 @@ WANTLIB= c expat m pcap ${COMPILER_LIBCXX} COMPILER = base-clang ports-gcc base-gcc -MASTER_SITES= ${HOMEPAGE}/releases/ \ +SITES= ${HOMEPAGE}/releases/ \ https://distfiles.sigtrap.nl/ MAKE_FLAGS= WITH_EXPAT=1 \ diff --git a/converters/ppmtoTbmp/Makefile b/converters/ppmtoTbmp/Makefile index f86e5c4c3..f6acfc8da 100644 --- a/converters/ppmtoTbmp/Makefile +++ b/converters/ppmtoTbmp/Makefile @@ -7,9 +7,9 @@ HOMEPAGE= http://www.isaac.cs.berkeley.edu/pilot/ PERMIT_PACKAGE= Yes -WANTLIB= c m netpbm +WANTLIB= c m netpbm -MASTER_SITES= ${HOMEPAGE} +SITES= ${HOMEPAGE} MAKE_FLAGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/netpbm" \ LDLIBS="-L${LOCALBASE}/lib -lnetpbm -lm" diff --git a/converters/qprint/Makefile b/converters/qprint/Makefile index 81b833c0c..18f2e7a1f 100644 --- a/converters/qprint/Makefile +++ b/converters/qprint/Makefile @@ -7,9 +7,9 @@ REVISION = 0 # public domain PERMIT_PACKAGE= Yes -WANTLIB= c +WANTLIB= c -MASTER_SITES= ${HOMEPAGE} +SITES= ${HOMEPAGE} AUTOCONF_VERSION= 2.13 CONFIGURE_STYLE= autoconf no-autoheader diff --git a/converters/recode/Makefile b/converters/recode/Makefile index ab135fa4c..d473aa395 100644 --- a/converters/recode/Makefile +++ b/converters/recode/Makefile @@ -13,7 +13,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c iconv intl -MASTER_SITES= https://github.com/rrthomas/recode/releases/download/v$V/ +SITES= https://github.com/rrthomas/recode/releases/download/v$V/ MODULES= lang/python MODPY_RUNDEP= No diff --git a/converters/ripmime/Makefile b/converters/ripmime/Makefile index ae45b85db..1ebfa5466 100644 --- a/converters/ripmime/Makefile +++ b/converters/ripmime/Makefile @@ -12,7 +12,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c iconv -MASTER_SITES= ${HOMEPAGE} +SITES= ${HOMEPAGE} LIB_DEPENDS= converters/libiconv diff --git a/converters/sqlite2mdoc/Makefile b/converters/sqlite2mdoc/Makefile index 91c03cdfc..a0bd891cb 100644 --- a/converters/sqlite2mdoc/Makefile +++ b/converters/sqlite2mdoc/Makefile @@ -6,7 +6,7 @@ MAINTAINER = Kristaps Dzonsons CATEGORIES = converters databases HOMEPAGE = https://github.com/kristapsdz/sqlite2mdoc -MASTER_SITES = https://kristaps.bsd.lv/sqlite2mdoc/snapshots/ +SITES = https://kristaps.bsd.lv/sqlite2mdoc/snapshots/ # ISC PERMIT_PACKAGE = Yes diff --git a/converters/trans/Makefile b/converters/trans/Makefile index 8eea589a1..9b68d8970 100644 --- a/converters/trans/Makefile +++ b/converters/trans/Makefile @@ -9,7 +9,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c -MASTER_SITES= http://www.kostis.net/freeware/ +SITES= http://www.kostis.net/freeware/ LIBDIR= ${PREFIX}/lib/trans ALL= transhtm transiso transce8 transtab checkiso checkuni diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile index 042b9c0c6..adc8e9e85 100644 --- a/converters/uudeview/Makefile +++ b/converters/uudeview/Makefile @@ -13,7 +13,7 @@ PERMIT_PACKAGE = Yes WANTLIB = c m -MASTER_SITES = ${HOMEPAGE}download/ +SITES = ${HOMEPAGE}download/ CONFIGURE_STYLE = autoconf dest AUTOCONF_VERSION = 2.13 diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 06d812cbc..5b9f2e7be 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -16,7 +16,7 @@ WANTLIB = X11 bz2 c expat ffi freetype gio-2.0 glib-2.0 gmodule-2.0 WANTLIB += gobject-2.0 gsf-1 iconv intl jpeg lzma m pcre2-8 png pthread WANTLIB += wmf-0.2 wmflite-0.2 xcb xml2 z -MASTER_SITES = http://abisource.com/downloads/wv/1.2.9/ +SITES = http://abisource.com/downloads/wv/1.2.9/ RUN_DEPENDS = graphics/ImageMagick LIB_DEPENDS = devel/libgsf \ diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile index 35b39379e..6d50afd82 100644 --- a/converters/wv2/Makefile +++ b/converters/wv2/Makefile @@ -4,7 +4,7 @@ REVISION = 4 DISTNAME= wv2-0.4.2 SHARED_LIBS += wv2 4.0 # .1.8 CATEGORIES= converters -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/} +SITES= ${SITE_SOURCEFORGE:=wvware/} EXTRACT_SUFX= .tar.bz2 HOMEPAGE= http://wvware.sourceforge.net/ diff --git a/converters/xlhtml/Makefile b/converters/xlhtml/Makefile index 18555ff0b..a5e2b1aeb 100644 --- a/converters/xlhtml/Makefile +++ b/converters/xlhtml/Makefile @@ -7,7 +7,7 @@ REVISION= 4 SHARED_LIBS += cole 2.1 # .2.1 CATEGORIES= converters -MASTER_SITES= http://gd.tuwien.ac.at/utils/format-conv/xlHtml/ +SITES= http://gd.tuwien.ac.at/utils/format-conv/xlHtml/ HOMEPAGE= http://chicago.sourceforge.net/xlhtml/ PERMIT_PACKAGE= Yes diff --git a/converters/xmltoman/Makefile b/converters/xmltoman/Makefile index e5f1a7750..64a7950a7 100644 --- a/converters/xmltoman/Makefile +++ b/converters/xmltoman/Makefile @@ -10,7 +10,7 @@ MAINTAINER= Benoit Lecocq # GPLv2 PERMIT_PACKAGE= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmltoman/} +SITES= ${SITE_SOURCEFORGE:=xmltoman/} NO_TEST= Yes diff --git a/databases/architect/Makefile b/databases/architect/Makefile index cee9e0a16..bf3057464 100644 --- a/databases/architect/Makefile +++ b/databases/architect/Makefile @@ -4,7 +4,7 @@ COMMENT= database exploration/builder written in Java V= 1.0.6 DISTNAME= SQL-Power-Architect-generic-jdbc-${V} -MASTER_SITES= http://download.sqlpower.ca/architect/${V}/community/ +SITES= http://download.sqlpower.ca/architect/${V}/community/ PKGNAME= architect-${V} CATEGORIES= databases WRKDIST= ${WRKDIR}/architect-${V} diff --git a/databases/barman/Makefile b/databases/barman/Makefile index 57d98d544..de4a2c732 100644 --- a/databases/barman/Makefile +++ b/databases/barman/Makefile @@ -16,7 +16,7 @@ HOMEPAGE = https://www.pgbarman.org/ PERMIT_PACKAGE = Yes # generated tars are available in /releases/, but lack tests -#MASTER_SITES = https://github.com/EnterpriseDB/barman/releases/download/release%2F${MODPY_EGG_VERSION}/ +#SITES = https://github.com/EnterpriseDB/barman/releases/download/release%2F${MODPY_EGG_VERSION}/ MODULES = lang/python MODPY_PYBUILD = setuptools diff --git a/databases/db/Makefile.inc b/databases/db/Makefile.inc index 97f933cf5..4ab985e83 100644 --- a/databases/db/Makefile.inc +++ b/databases/db/Makefile.inc @@ -4,7 +4,7 @@ COMMENT-tcl= TCL bindings for Berkeley DB, revision ${REV} DISTNAME= db-${VERSION} CATEGORIES= databases HOMEPAGE= https://www.oracle.com/database/technologies/related/berkeleydb.html -MASTER_SITES= https://download.oracle.com/berkeley-db/ +SITES= https://download.oracle.com/berkeley-db/ # License: BSD + SleepyCat's additions. # Must purchase license to redistribute if not distributing the source. diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile index ec42ee94e..5246a7649 100644 --- a/databases/db/v4/Makefile +++ b/databases/db/v4/Makefile @@ -21,14 +21,14 @@ SHARED_LIBS += db_tcl 6.0 # .0.0 COMPILER = base-clang ports-gcc base-gcc -MASTER_SITES0= ${HOMEPAGE}db/update/${VERSION}/ +SITES.up= ${HOMEPAGE}db/update/${VERSION}/ # patch 2 has converted DOS line-endings; no other change # patches 1,3,4 are just mirrored -MASTER_SITES2= https://spacehopper.org/mirrors/ -PATCHFILES= patch.${VERSION}.1:2 \ - patch.${VERSION}.2.fixed:2 \ - patch.${VERSION}.3:2 \ - patch.${VERSION}.4:2 +SITES.stu= https://spacehopper.org/mirrors/ +PATCHFILES.stu= patch.${VERSION}.1 \ + patch.${VERSION}.2.fixed \ + patch.${VERSION}.3 \ + patch.${VERSION}.4 CONFIGURE_STYLE=gnu diff --git a/databases/galera/Makefile b/databases/galera/Makefile index 81a495ade..3ec3f1cfb 100644 --- a/databases/galera/Makefile +++ b/databases/galera/Makefile @@ -13,10 +13,10 @@ WSREP_API_COMMIT= 694d6ca47f5eec7873be99b7d6babccf633d1231 MAINTAINER= Robert Nagy -MASTER_SITES0= https://github.com/ +SITES.extra = https://github.com/ -DISTFILES= ${GH_PROJECT}-{}${GH_TAGNAME}${EXTRACT_SUFX} \ - wsrep-api-{codership/wsrep-API/archive/}${WSREP_API_COMMIT}${EXTRACT_SUFX}:0 +DISTFILES= ${GH_PROJECT}-{}${GH_TAGNAME}${EXTRACT_SUFX} +DISTFILES.extra=wsrep-api-{codership/wsrep-API/archive/}${WSREP_API_COMMIT}${EXTRACT_SUFX} # GPLv2 and LGPLv2.1 PERMIT_PACKAGE= Yes diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index dd5438d4f..fa3e8e60d 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -7,7 +7,7 @@ SHARED_LIBS += gdbm 7.0 # 6.0 HOMEPAGE= https://www.gnu.org/software/gdbm/ -MASTER_SITES= ${MASTER_SITE_GNU:=gdbm/} +SITES= ${SITE_GNU:=gdbm/} # GPLv3 PERMIT_PACKAGE= Yes diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile index 31d42168d..4bc610245 100644 --- a/databases/influxdb/Makefile +++ b/databases/influxdb/Makefile @@ -46,13 +46,13 @@ EXTRACT_ONLY += ${_MODCARGO_DIST_SUBDIR}${_cratename}-${_cratever}.tar.gz MODGO_LDFLAGS = -X main.version=${MODGO_VERSION:S/v//} # fetch compiled ui assets -MASTER_SITES0 = https://github.com/influxdata/ui/releases/download/OSS-${MODGO_VERSION}/ -DISTFILES += influxdb-ui-${MODGO_VERSION}.tar.gz{build.tar.gz}:0 +SITES.ui = https://github.com/influxdata/ui/releases/download/OSS-${MODGO_VERSION}/ +DISTFILES.ui = influxdb-ui-${MODGO_VERSION}.tar.gz{build.tar.gz} EXTRACT_ONLY += influxdb-ui-${MODGO_VERSION}.tar.gz # sha comes from ${WRKSRC}/scripts/fetch-swagger.sh OPENAPI_SHA = 8b5f1bbb2cd388eb454dc9da19e3d2c4061cdf5f -MASTER_SITES1 = https://github.com/influxdata/openapi/raw/${OPENAPI_SHA}/contracts/ -DISTFILES += influxdb-openapi-${OPENAPI_SHA}.json{oss.json}:1 +SITES.json = https://github.com/influxdata/openapi/raw/${OPENAPI_SHA}/contracts/ +DISTFILES.json =influxdb-openapi-${OPENAPI_SHA}.json{oss.json} # tell go to bundle web ui assets in binary MODGO_FLAGS += -tags assets diff --git a/databases/jxplorer/Makefile b/databases/jxplorer/Makefile index c64dd288b..d1385b41c 100644 --- a/databases/jxplorer/Makefile +++ b/databases/jxplorer/Makefile @@ -12,7 +12,7 @@ HOMEPAGE= http://www.pegacat.com/jxplorer/ # CA Open Source Licence v1.0 PERMIT_PACKAGE= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jxplorer/} +SITES= ${SITE_SOURCEFORGE:=jxplorer/} WRKDIST= ${WRKDIR}/jxplorer MODULES= java diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile index 7ac56f9b5..25891a9db 100644 --- a/databases/kdb/Makefile +++ b/databases/kdb/Makefile @@ -18,7 +18,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} KF5CoreAddons Qt5Core Qt5Gui Qt5Network WANTLIB += Qt5Widgets Qt5Xml c icui18n icuuc m mariadb pq sqlite3 -MASTER_SITES = ${MASTER_SITE_KDE:=stable/kdb/src/}} +SITES = ${SITE_KDE:=stable/kdb/src/}} EXTRACT_SUFX = .tar.xz MODULES = devel/cmake \ diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile index 9589f1e6f..35c9d8d2f 100644 --- a/databases/kexi/Makefile +++ b/databases/kexi/Makefile @@ -41,7 +41,7 @@ WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport WANTLIB += Qt5Test Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml WANTLIB += c glib-2.0 iconv m mariadb X11 -MASTER_SITES = ${MASTER_SITE_KDE:=stable/kexi/src/} +SITES = ${SITE_KDE:=stable/kexi/src/} EXTRACT_SUFX = .tar.xz MODULES = devel/cmake \ diff --git a/databases/ksql/Makefile b/databases/ksql/Makefile index e09ae9605..c1903ddf2 100644 --- a/databases/ksql/Makefile +++ b/databases/ksql/Makefile @@ -6,7 +6,7 @@ CATEGORIES = databases MAINTAINER = James Turner HOMEPAGE = https://kristaps.bsd.lv/ksql/ -MASTER_SITES = https://kristaps.bsd.lv/ksql/snapshots/ +SITES = https://kristaps.bsd.lv/ksql/snapshots/ # ISC PERMIT_PACKAGE = Yes diff --git a/databases/kyotocabinet/Makefile b/databases/kyotocabinet/Makefile index de159b171..9425484d0 100755 --- a/databases/kyotocabinet/Makefile +++ b/databases/kyotocabinet/Makefile @@ -18,7 +18,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} c m z -MASTER_SITES= ${HOMEPAGE}pkg/ +SITES= ${HOMEPAGE}pkg/ COMPILER= base-clang ports-gcc base-gcc DEBUG_PACKAGES= ${BUILD_PACKAAGES} diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile index 1fd39fdcc..f732e7082 100644 --- a/databases/lbdb/Makefile +++ b/databases/lbdb/Makefile @@ -15,7 +15,7 @@ PERMIT_PACKAGE = Yes WANTLIB-main = c iconv -MASTER_SITES = https://www.spinnaker.de/lbdb/download/ +SITES = https://www.spinnaker.de/lbdb/download/ BUILD_DEPENDS = ${RUN_DEPENDS-main} LIB_DEPENDS-main = converters/libiconv diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile index ac8d89faf..5f4cf4a2c 100644 --- a/databases/libdbi-drivers/Makefile +++ b/databases/libdbi-drivers/Makefile @@ -11,7 +11,7 @@ PKGNAME-main = libdbi-drivers-mysql-${V:S/-/./} CATEGORIES = databases HOMEPAGE = http://libdbi-drivers.sourceforge.net/ -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=libdbi-drivers/} +SITES = ${SITE_SOURCEFORGE:=libdbi-drivers/} MULTI_PACKAGES = -main -pgsql -sqlite3 -freetds diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile index b1d668f47..17e50baf4 100644 --- a/databases/libdbi/Makefile +++ b/databases/libdbi/Makefile @@ -4,7 +4,7 @@ CATEGORIES = databases SHARED_LIBS += dbi 1.0 HOMEPAGE = http://libdbi.sourceforge.net/ -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=libdbi/} +SITES = ${SITE_SOURCEFORGE:=libdbi/} # LGPLv2.1 PERMIT_PACKAGE = Yes diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile index 033d5c337..83555411f 100644 --- a/databases/libzdb/Makefile +++ b/databases/libzdb/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes WANTLIB += m pthread sqlite3 z -MASTER_SITES = http://www.tildeslash.com/libzdb/dist/ +SITES = http://www.tildeslash.com/libzdb/dist/ USE_GMAKE = Yes CONFIGURE_STYLE = gnu diff --git a/databases/liquibase/Makefile b/databases/liquibase/Makefile index 3b11b2670..89751bb22 100644 --- a/databases/liquibase/Makefile +++ b/databases/liquibase/Makefile @@ -15,7 +15,7 @@ PERMIT_PACKAGE= Yes RUN_DEPENDS = java/javaPathHelper -MASTER_SITES = https://github.com/liquibase/liquibase/releases/download/liquibase-parent-${VERSION}/ +SITES = https://github.com/liquibase/liquibase/releases/download/liquibase-parent-${VERSION}/ MODULES = java # XXX when updating please confirm if this is 1.8 only or if 11 is also ok (in which case, switch to 1.8+) diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile index 8922dab63..5fe335dca 100644 --- a/databases/lmdb/Makefile +++ b/databases/lmdb/Makefile @@ -18,7 +18,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c pthread -MASTER_SITES = https://git.openldap.org/openldap/openldap/-/archive/LMDB_${VERSION}/ +SITES = https://git.openldap.org/openldap/openldap/-/archive/LMDB_${VERSION}/ DEBUG_PACKAGES = ${BUILD_PACKAGES} diff --git a/databases/lualdap/Makefile b/databases/lualdap/Makefile index b7bea6cd4..b64662897 100644 --- a/databases/lualdap/Makefile +++ b/databases/lualdap/Makefile @@ -2,7 +2,7 @@ COMMENT = interface LDAP from lua DISTNAME= lualdap-1.1.0 CATEGORIES = databases -MASTER_SITES = http://files.luaforge.net/releases/lualdap/lualdap/LuaLDAP1.1.0/ +SITES = http://files.luaforge.net/releases/lualdap/lualdap/LuaLDAP1.1.0/ HOMEPAGE = http://www.keplerproject.org/lualdap/ # MIT diff --git a/databases/luasqlite3/Makefile b/databases/luasqlite3/Makefile index 647e54f9f..b5cf94057 100644 --- a/databases/luasqlite3/Makefile +++ b/databases/luasqlite3/Makefile @@ -3,7 +3,7 @@ PKGNAME= luasqlite3-0.4.1 REVISION= 7 DISTNAME= lua-sqlite3-0.4.1 CATEGORIES= databases -MASTER_SITES= ${HOMEPAGE} +SITES= ${HOMEPAGE} HOMEPAGE= http://www.nessie.de/mroth/lua-sqlite3/ diff --git a/databases/mariadb/Makefile b/databases/mariadb/Makefile index 3f6b5344a..0969fff5e 100644 --- a/databases/mariadb/Makefile +++ b/databases/mariadb/Makefile @@ -7,7 +7,7 @@ DISTNAME= mariadb-${VERSION} PKGNAME-main= mariadb-client-${VERSION} EPOCH= 1 CATEGORIES= databases -MASTER_SITES= https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \ +SITES= https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \ https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/ LIB_VERSION= 30 diff --git a/databases/mongodb/Makefile.inc b/databases/mongodb/Makefile.inc index 8ef7f92a4..20b536dd4 100644 --- a/databases/mongodb/Makefile.inc +++ b/databases/mongodb/Makefile.inc @@ -21,7 +21,7 @@ HOMEPAGE = https://www.mongodb.com/ # (later versions: fmt: MIT) PERMIT_PACKAGE = Yes -MASTER_SITES = https://fastdl.mongodb.org/src/ +SITES = https://fastdl.mongodb.org/src/ FIX_CRLF_FILES = src/third_party/IntelRDFPMathLib*/LIBRARY/src/bid_functions.h MODULES = devel/scons \ diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile index 83f9b3fae..7bddb9ed6 100644 --- a/databases/mydumper/Makefile +++ b/databases/mydumper/Makefile @@ -13,7 +13,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c crypto glib-2.0 gthread-2.0 m iconv mariadb WANTLIB += pcre ssl z -MASTER_SITES = https://launchpad.net/mydumper/${V:R}/${V}/+download/ +SITES = https://launchpad.net/mydumper/${V:R}/${V}/+download/ MODULES = devel/cmake BUILD_DEPENDS = textproc/py-sphinx,python3>=4.0.2 diff --git a/databases/mysql-utilities/Makefile b/databases/mysql-utilities/Makefile index ca6688402..a34f4e376 100644 --- a/databases/mysql-utilities/Makefile +++ b/databases/mysql-utilities/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 1.6.5 DISTNAME = mysql-utilities-${MODPY_EGG_VERSION} REVISION = 0 CATEGORIES = databases -MASTER_SITES = http://mirror.switch.ch/mirror/mysql/Downloads/MySQLGUITools/ \ +SITES = http://mirror.switch.ch/mirror/mysql/Downloads/MySQLGUITools/ \ http://ftp.fi.muni.cz/pub/mysql/Downloads/MySQLGUITools/ \ http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/ EXTRACT_SUFX = .zip diff --git a/databases/mysql-zrm/Makefile b/databases/mysql-zrm/Makefile index a9c83a1c9..7d7827923 100644 --- a/databases/mysql-zrm/Makefile +++ b/databases/mysql-zrm/Makefile @@ -13,7 +13,7 @@ MAINTAINER = Giovanni Bechis # GPLv2 PERMIT_PACKAGE = Yes -MASTER_SITES = http://www.zmanda.com/downloads/community/ZRM-MySQL/$V/Source/ +SITES = http://www.zmanda.com/downloads/community/ZRM-MySQL/$V/Source/ RUN_DEPENDS = archivers/gtar \ databases/p5-DBD-mysql \ diff --git a/databases/mysql2pgsql/Makefile b/databases/mysql2pgsql/Makefile index b038dd932..61c42a009 100644 --- a/databases/mysql2pgsql/Makefile +++ b/databases/mysql2pgsql/Makefile @@ -5,7 +5,7 @@ PKGNAME= mysql2pgsql-20010320 REVISION= 1 CATEGORIES= databases -MASTER_SITES= http://www.rot13.org/~dpavlin/projects/sql/ +SITES= http://www.rot13.org/~dpavlin/projects/sql/ EXTRACT_SUFX= #empty EXTRACT_ONLY= #empty diff --git a/databases/p5-GDBM_File/Makefile b/databases/p5-GDBM_File/Makefile index 6c29813f7..a022cccd7 100644 --- a/databases/p5-GDBM_File/Makefile +++ b/databases/p5-GDBM_File/Makefile @@ -6,7 +6,7 @@ EXTRACT_SUFX= .tar.bz2 PKGNAME = p5-GDBM_File-1.26.3 CATEGORIES= databases perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../src/} +SITES= ${SITE_PERL_CPAN:=../../src/} # perl PERMIT_PACKAGE= Yes diff --git a/databases/p5-pgsql/Makefile b/databases/p5-pgsql/Makefile index b13dfc4b6..06dd03792 100644 --- a/databases/p5-pgsql/Makefile +++ b/databases/p5-pgsql/Makefile @@ -5,7 +5,7 @@ DISTNAME= pgsql_perl5-${VERSION} PKGNAME= p5-pgsql-${VERSION} REVISION= 6 CATEGORIES= databases perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Pg/} +SITES= ${SITE_PERL_CPAN:=Pg/} LIB_DEPENDS = databases/postgresql diff --git a/databases/percona-toolkit/Makefile b/databases/percona-toolkit/Makefile index 38b25531c..482b5a459 100644 --- a/databases/percona-toolkit/Makefile +++ b/databases/percona-toolkit/Makefile @@ -13,7 +13,7 @@ MAINTAINER = Giovanni Bechis # GPLv2 PERMIT_PACKAGE = Yes -MASTER_SITES = http://www.percona.com/redir/downloads/percona-toolkit/${V}/ +SITES = http://www.percona.com/redir/downloads/percona-toolkit/${V}/ RUN_DEPENDS = databases/p5-DBD-mysql>=3.0 \ sysutils/flock diff --git a/databases/pg-toolbox/Makefile b/databases/pg-toolbox/Makefile index 640a6004c..9df50c50c 100644 --- a/databases/pg-toolbox/Makefile +++ b/databases/pg-toolbox/Makefile @@ -10,7 +10,7 @@ MAINTAINER= Pierre-Emmanuel Andre # BSD / Zlib PERMIT_PACKAGE= Yes -MASTER_SITES= https://ftp.postgresql.org/pub/projects/pgFoundry/pg-toolbox/pg-toolbox/Release$V/ +SITES= https://ftp.postgresql.org/pub/projects/pgFoundry/pg-toolbox/pg-toolbox/Release$V/ RUN_DEPENDS= databases/postgresql,-main diff --git a/databases/pg_stats_reporter/Makefile b/databases/pg_stats_reporter/Makefile index 0e35e7739..9eb707af2 100644 --- a/databases/pg_stats_reporter/Makefile +++ b/databases/pg_stats_reporter/Makefile @@ -9,7 +9,7 @@ HOMEPAGE = http://pgstatsinfo.sourceforge.net/ # GPLv2 PERMIT_PACKAGE = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pgstatsinfo/} +SITES = ${SITE_SOURCEFORGE:=pgstatsinfo/} NO_BUILD = Yes NO_TEST = Yes diff --git a/databases/pg_statsinfo/Makefile b/databases/pg_statsinfo/Makefile index dcda84558..bb646c922 100644 --- a/databases/pg_statsinfo/Makefile +++ b/databases/pg_statsinfo/Makefile @@ -8,7 +8,7 @@ HOMEPAGE = http://pgstatsinfo.sourceforge.net/ # GPLv2 PERMIT_PACKAGE = Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pgstatsinfo/} +SITES= ${SITE_SOURCEFORGE:=pgstatsinfo/} USE_GMAKE = Yes MAKE_FLAGS = USE_PGXS=1 CFLAGS="-DPG_USE_INLINE" LDFLAGS=-lkvm diff --git a/databases/pgbackrest/Makefile b/databases/pgbackrest/Makefile index d152e917f..301acc452 100644 --- a/databases/pgbackrest/Makefile +++ b/databases/pgbackrest/Makefile @@ -10,7 +10,7 @@ MAINTAINER = Pavel Korovin # MIT PERMIT_PACKAGE = Yes -MASTER_SITES = https://github.com/pgbackrest/pgbackrest/archive/release/ +SITES = https://github.com/pgbackrest/pgbackrest/archive/release/ DISTFILES = pgbackrest-{}${V}.tar.gz WRKDIST = ${WRKDIR}/pgbackrest-release-${V} diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile index f68c88243..d286ecae8 100644 --- a/databases/pgbouncer/Makefile +++ b/databases/pgbouncer/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes WANTLIB = c event_core event_extra crypto ssl -MASTER_SITES = https://pgbouncer.github.io/downloads/files/${V}/ +SITES = https://pgbouncer.github.io/downloads/files/${V}/ LIB_DEPENDS = devel/libevent2 diff --git a/databases/pgcluu/Makefile b/databases/pgcluu/Makefile index 596837620..0cab52514 100644 --- a/databases/pgcluu/Makefile +++ b/databases/pgcluu/Makefile @@ -6,9 +6,9 @@ CATEGORIES= databases sysutils HOMEPAGE= https://pgcluu.darold.net/ # BSD -PERMIT_PACKAGE= Yes +PERMIT_PACKAGE= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pgcluu/} +SITES= ${SITE_SOURCEFORGE:=pgcluu/} MODULES= perl CONFIGURE_STYLE= perl diff --git a/databases/pgfouine/Makefile b/databases/pgfouine/Makefile index b8071ffda..12171266b 100644 --- a/databases/pgfouine/Makefile +++ b/databases/pgfouine/Makefile @@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes # XXX likely to be broken with php>=5; version in PORTROACH site may work PORTROACH = site:https://github.com/milo/pgFouine/archive/ -MASTER_SITES = https://ftp.postgresql.org/pub/projects/pgFoundry/pgfouine/pgFouine/pgFouine$V/ +SITES = https://ftp.postgresql.org/pub/projects/pgFoundry/pgfouine/pgFouine/pgFouine$V/ NO_BUILD = Yes NO_TEST = Yes PKG_ARCH = * diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile index d61fe4b42..7b727f2f1 100644 --- a/databases/pgpool/Makefile +++ b/databases/pgpool/Makefile @@ -14,7 +14,7 @@ SHARED_LIBS= pcp 0.0 # BSD PERMIT_PACKAGE= Yes -MASTER_SITES= https://www.pgpool.net/mediawiki/images/ +SITES= https://www.pgpool.net/mediawiki/images/ WANTLIB= c crypto m pq ssl pthread diff --git a/databases/pgtap/Makefile b/databases/pgtap/Makefile index 4fbab8529..bb0db8534 100644 --- a/databases/pgtap/Makefile +++ b/databases/pgtap/Makefile @@ -9,7 +9,7 @@ HOMEPAGE = https://pgtap.org/ # PostgreSQL PERMIT_PACKAGE= Yes -MASTER_SITES = https://api.pgxn.org/dist/pgtap/${V}/ +SITES = https://api.pgxn.org/dist/pgtap/${V}/ MODULES = databases/postgresql SUBST_VARS += V diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile index a42e4a6c2..d0f81cf30 100644 --- a/databases/postgresql-odbc/Makefile +++ b/databases/postgresql-odbc/Makefile @@ -11,7 +11,7 @@ MAINTAINER= Paul Irofti # LGPL PERMIT_PACKAGE= Yes -MASTER_SITES= https://ftp.postgresql.org/pub/odbc/versions/src/ +SITES= https://ftp.postgresql.org/pub/odbc/versions/src/ LIB_DEPENDS = databases/postgresql>=10.3 \ databases/iodbc diff --git a/databases/postgresql-pllua/Makefile b/databases/postgresql-pllua/Makefile index 0eb7914a7..e4adf1b57 100644 --- a/databases/postgresql-pllua/Makefile +++ b/databases/postgresql-pllua/Makefile @@ -8,7 +8,7 @@ PKGNAME = postgresql-pllua-${VERSION} REVISION = 0 # Use upstream pull request for PostgreSQL 15 support -MASTER_SITES.github = https://github.com/pllua/pllua/commit/ +SITES.github = https://github.com/pllua/pllua/commit/ PATCH_DIST_STRIP = -p1 PATCHFILES.github = pllua-pg-15-fix{d0e014cdfd4e9ad801e7d2814584ff4b1892a08c}.patch diff --git a/databases/postgresql-previous/Makefile b/databases/postgresql-previous/Makefile index bb3ccfc1b..9e9eb0813 100644 --- a/databases/postgresql-previous/Makefile +++ b/databases/postgresql-previous/Makefile @@ -20,7 +20,7 @@ PERMIT_PACKAGE= Yes WANTLIB = c crypto curses execinfo m perl readline ssl xml2 z -MASTER_SITES= https://ftp.postgresql.org/pub/source/v${VERSION}/ \ +SITES= https://ftp.postgresql.org/pub/source/v${VERSION}/ \ ftp://ftp.postgresql.org/pub/source/v${VERSION}/ MAKE_FILE= GNUmakefile diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index 3d4c376e1..1d498e12f 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -30,7 +30,7 @@ WANTLIB += c curses crypto m readline ssl z WANTLIB-server += pthread WANTLIB-contrib += pthread -MASTER_SITES= https://ftp.postgresql.org/pub/source/v${VERSION}/ \ +SITES= https://ftp.postgresql.org/pub/source/v${VERSION}/ \ ftp://ftp.postgresql.org/pub/source/v${VERSION}/ MULTI_PACKAGES= -docs -main -server -contrib -pg_upgrade -plpython diff --git a/databases/postgresql_autodoc/Makefile b/databases/postgresql_autodoc/Makefile index 2bac43137..b9dbc1321 100644 --- a/databases/postgresql_autodoc/Makefile +++ b/databases/postgresql_autodoc/Makefile @@ -5,7 +5,7 @@ CATEGORIES = databases REVISION = 1 HOMEPAGE = http://www.rbt.ca/autodoc/ -MASTER_SITES = ${HOMEPAGE}binaries/ +SITES = ${HOMEPAGE}binaries/ # BSD PERMIT_PACKAGE = Yes diff --git a/databases/puppetdb/7/Makefile b/databases/puppetdb/7/Makefile index 81c568528..63333b206 100644 --- a/databases/puppetdb/7/Makefile +++ b/databases/puppetdb/7/Makefile @@ -12,7 +12,7 @@ HOMEPAGE= https://puppet.com/docs/puppetdb/ MAINTAINER= Sebastian Reitenbach -MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ +SITES= https://downloads.puppetlabs.com/puppetdb/ # Apachev2 PERMIT_PACKAGE= Yes diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile index d487a9e8b..ac1c2dcc4 100644 --- a/databases/py-apsw/Makefile +++ b/databases/py-apsw/Makefile @@ -13,7 +13,7 @@ HOMEPAGE = https://rogerbinns.github.io/apsw/ # zlib PERMIT_PACKAGE = Yes -MASTER_SITES = https://github.com/rogerbinns/apsw/releases/download/${MODPY_EGG_VERSION}${DISTVERSIONSUFFIX}/ +SITES = https://github.com/rogerbinns/apsw/releases/download/${MODPY_EGG_VERSION}${DISTVERSIONSUFFIX}/ EXTRACT_SUFX = .zip diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile index aab2403ae..2d6e8682c 100644 --- a/databases/qdbm/Makefile +++ b/databases/qdbm/Makefile @@ -8,9 +8,9 @@ REVISION= 2 HOMEPAGE= https://fallabs.com/qdbm/ # LGPLv2.1+ -PERMIT_PACKAGE= Yes +PERMIT_PACKAGE= Yes -MASTER_SITES= ${HOMEPAGE}/ +SITES= ${HOMEPAGE}/ WANTLIB= c iconv z LIB_DEPENDS= converters/libiconv diff --git a/databases/recoll/Makefile b/databases/recoll/Makefile index 9b390081a..ceaaa8928 100644 --- a/databases/recoll/Makefile +++ b/databases/recoll/Makefile @@ -13,7 +13,7 @@ HOMEPAGE= https://www.lesbonscomptes.com/recoll/ # GPLv2+ PERMIT_PACKAGE= Yes -MASTER_SITES= https://www.lesbonscomptes.com/recoll/ +SITES= https://www.lesbonscomptes.com/recoll/ # C++11 COMPILER= base-clang ports-gcc diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 547d0dd9c..a5b3b6473 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -11,7 +11,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c crypto ssl m pthread -MASTER_SITES = http://download.redis.io/releases/ +SITES = http://download.redis.io/releases/ DEBUG_PACKAGES = ${BUILD_PACKAGES} diff --git a/databases/repmgr/Makefile b/databases/repmgr/Makefile index c26237b31..bf8a5d605 100644 --- a/databases/repmgr/Makefile +++ b/databases/repmgr/Makefile @@ -9,7 +9,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c pq -MASTER_SITES = ${HOMEPAGE}download/ +SITES = ${HOMEPAGE}download/ USE_GMAKE = Yes MAKE_FLAGS = USE_PGXS=1 diff --git a/databases/ruby-ldap/Makefile b/databases/ruby-ldap/Makefile index 60e930294..6d81ce234 100644 --- a/databases/ruby-ldap/Makefile +++ b/databases/ruby-ldap/Makefile @@ -5,7 +5,7 @@ REVISION= 2 DISTNAME= ruby-${PKGNAME} CATEGORIES= databases -MASTER_SITES.github= https://github.com/bearded/ruby-ldap/commit/ +SITES.github= https://github.com/bearded/ruby-ldap/commit/ PATCHFILES.github= ruby-ldap-taint-fix{72a4a89b28a99560b018b78069b29632f362a7d0}.patch PATCH_DIST_STRIP= -p1 diff --git a/databases/sharedance/Makefile b/databases/sharedance/Makefile index 21a29ee13..e25a07343 100644 --- a/databases/sharedance/Makefile +++ b/databases/sharedance/Makefile @@ -9,9 +9,9 @@ HOMEPAGE= http://sharedance.pureftpd.org/project/sharedance # BSD PERMIT_PACKAGE= Yes -WANTLIB= c event +WANTLIB= c event -MASTER_SITES= http://download.pureftpd.org/pub/sharedance/ +SITES= http://download.pureftpd.org/pub/sharedance/ CONFIGURE_STYLE= simple diff --git a/databases/sqlbox/Makefile b/databases/sqlbox/Makefile index d8709d3f3..d2a6488fd 100644 --- a/databases/sqlbox/Makefile +++ b/databases/sqlbox/Makefile @@ -6,7 +6,7 @@ CATEGORIES = databases MAINTAINER = James Turner HOMEPAGE = https://kristaps.bsd.lv/sqlbox/ -MASTER_SITES = https://kristaps.bsd.lv/sqlbox/snapshots/ +SITES = https://kristaps.bsd.lv/sqlbox/snapshots/ # ISC PERMIT_PACKAGE = Yes diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile index 0b117cf4e..531268eb2 100644 --- a/databases/sqlite/Makefile +++ b/databases/sqlite/Makefile @@ -5,7 +5,7 @@ REVISION = 5 CATEGORIES= databases SHARED_LIBS += sqlite 8.6 # .0.0 -MASTER_SITES= ${HOMEPAGE} +SITES= ${HOMEPAGE} HOMEPAGE= http://www.sqlite.org/ diff --git a/databases/sqlite3-odbc/Makefile b/databases/sqlite3-odbc/Makefile index 65ae01b66..f63ccc51b 100644 --- a/databases/sqlite3-odbc/Makefile +++ b/databases/sqlite3-odbc/Makefile @@ -10,7 +10,7 @@ MAINTAINER = Stuart Cassoff # BSD PERMIT_PACKAGE = Yes -MASTER_SITES = ${HOMEPAGE} +SITES = ${HOMEPAGE} WANTLIB = iodbcinst m pthread sqlite3 z LIB_DEPENDS = databases/iodbc databases/sqlite3 AUTOCONF_VERSION = 2.63 diff --git a/databases/sqlite3-tcl/Makefile b/databases/sqlite3-tcl/Makefile index e3a6b0eae..495f302b1 100644 --- a/databases/sqlite3-tcl/Makefile +++ b/databases/sqlite3-tcl/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes WANTLIB = pthread -MASTER_SITES = ${HOMEPAGE}2023/ +SITES = ${HOMEPAGE}2023/ MODULES = lang/tcl BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS} diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 245dfedc1..949b1f4c2 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -20,7 +20,7 @@ PERMIT_PACKAGE= Yes WANTLIB += c curses m pthread readline z -MASTER_SITES = ${HOMEPAGE}2023/ +SITES = ${HOMEPAGE}2023/ DEBUG_PACKAGES= ${BUILD_PACKAGES} diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index d39431a65..7573f5d91 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -12,9 +12,9 @@ HOMEPAGE= http://sourceforge.net/projects/sqsh/ # GPLv2+ PERMIT_PACKAGE= Yes -WANTLIB += c ct>=2 iconv curses m pthread readline +WANTLIB += c ct>=2 iconv curses m pthread readline -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqsh/} +SITES= ${SITE_SOURCEFORGE:=sqsh/} LIB_DEPENDS= converters/libiconv \ databases/freetds diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 0f4286bcb..e56728cc7 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -32,7 +32,7 @@ WANTLIB-python= intl m pthread tdb util # Extra WANTLIB-python+=${MODPY_WANTLIB} -MASTER_SITES= https://download.samba.org/pub/tdb/ +SITES= https://download.samba.org/pub/tdb/ DEBUG_PACKAGES= ${BUILD_PACKAGES} diff --git a/databases/tdbc-mysql/Makefile b/databases/tdbc-mysql/Makefile index b43bfd0e6..11f26571a 100644 --- a/databases/tdbc-mysql/Makefile +++ b/databases/tdbc-mysql/Makefile @@ -12,7 +12,7 @@ MAINTAINER = Stuart Cassoff # BSD PERMIT_PACKAGE = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/} +SITES = ${SITE_SOURCEFORGE:=tcl/} MODULES = lang/tcl \ databases/mariadb diff --git a/databases/tdbc-odbc/Makefile b/databases/tdbc-odbc/Makefile index 55b64cf12..59bd5f409 100644 --- a/databases/tdbc-odbc/Makefile +++ b/databases/tdbc-odbc/Makefile @@ -12,7 +12,7 @@ MAINTAINER = Stuart Cassoff # BSD PERMIT_PACKAGE = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/} +SITES = ${SITE_SOURCEFORGE:=tcl/} MODULES = lang/tcl MODTCL_VERSION = 8.6 diff --git a/databases/tdbc-postgres/Makefile b/databases/tdbc-postgres/Makefile index 9bc776b4a..40f17d5ff 100644 --- a/databases/tdbc-postgres/Makefile +++ b/databases/tdbc-postgres/Makefile @@ -12,7 +12,7 @@ MAINTAINER = Stuart Cassoff # BSD PERMIT_PACKAGE = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/} +SITES = ${SITE_SOURCEFORGE:=tcl/} MODULES = lang/tcl \ databases/postgresql diff --git a/databases/tdbc-sqlite3/Makefile b/databases/tdbc-sqlite3/Makefile index 0c2395fe2..6226fcf43 100644 --- a/databases/tdbc-sqlite3/Makefile +++ b/databases/tdbc-sqlite3/Makefile @@ -11,7 +11,7 @@ MAINTAINER = Stuart Cassoff # BSD PERMIT_PACKAGE = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/} +SITES = ${SITE_SOURCEFORGE:=tcl/} MODULES = lang/tcl MODTCL_VERSION = 8.6 diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile index 8b4006d31..e24cf7f0a 100644 --- a/databases/tdbc/Makefile +++ b/databases/tdbc/Makefile @@ -12,7 +12,7 @@ MAINTAINER = Stuart Cassoff # BSD PERMIT_PACKAGE = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/} +SITES = ${SITE_SOURCEFORGE:=tcl/} MODULES = lang/tcl MODTCL_VERSION = 8.6 BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS} diff --git a/databases/tinycdb/Makefile b/databases/tinycdb/Makefile index 819d917cd..8634c033d 100644 --- a/databases/tinycdb/Makefile +++ b/databases/tinycdb/Makefile @@ -5,7 +5,7 @@ CATEGORIES = databases SHARED_LIBS = cdb 0.0 HOMEPAGE = http://www.corpit.ru/mjt/tinycdb.html -MASTER_SITES = http://www.corpit.ru/mjt/tinycdb/ +SITES = http://www.corpit.ru/mjt/tinycdb/ MAINTAINER = Christian Rueger diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile index b700af431..dd4ca1ff5 100644 --- a/databases/tokyocabinet/Makefile +++ b/databases/tokyocabinet/Makefile @@ -13,7 +13,7 @@ PERMIT_PACKAGE= Yes WANTLIB += bz2 c m pthread z -MASTER_SITES= ${HOMEPAGE} +SITES= ${HOMEPAGE} CONFIGURE_STYLE= gnu USE_GMAKE= Yes diff --git a/databases/web2ldap/Makefile b/databases/web2ldap/Makefile index d49585cd3..ff74c87bc 100644 --- a/databases/web2ldap/Makefile +++ b/databases/web2ldap/Makefile @@ -12,7 +12,7 @@ MAINTAINER = Lucas Raab # Apache 2.0 PERMIT_PACKAGE = Yes -MASTER_SITES = https://www.web2ldap.de/download/ +SITES = https://www.web2ldap.de/download/ MODULES = lang/python diff --git a/databases/xapian-bindings/Makefile b/databases/xapian-bindings/Makefile index a91bb821c..a5880cc8d 100755 --- a/databases/xapian-bindings/Makefile +++ b/databases/xapian-bindings/Makefile @@ -19,7 +19,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} m z xapian WANTLIB-main = ${WANTLIB} c perl -MASTER_SITES= https://oligarchy.co.uk/xapian/${V}/ +SITES= https://oligarchy.co.uk/xapian/${V}/ EXTRACT_SUFX= .tar.xz # -std=gnu++11 diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile index b957ac618..8bdab73f3 100755 --- a/databases/xapian-core/Makefile +++ b/databases/xapian-core/Makefile @@ -18,7 +18,7 @@ PERMIT_PACKAGE= Yes WANTLIB += c m ${COMPILER_LIBCXX} z -MASTER_SITES= https://oligarchy.co.uk/xapian/${V}/ +SITES= https://oligarchy.co.uk/xapian/${V}/ EXTRACT_SUFX= .tar.xz # -std=gnu++11 diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile index 321f33672..7dc79deec 100755 --- a/devel/codeblocks/Makefile +++ b/devel/codeblocks/Makefile @@ -3,7 +3,7 @@ COMMENT= Code::Blocks C/C++ IDE R= 12751 V= 20.03 -REVISION= 4 +REVISION= 5 DISTNAME= codeblocks-${V}pl${R} EXTRACT_SUFX= .tar.xz @@ -44,7 +44,7 @@ WANTLIB += freetype fribidi gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gpg-error graphite2 WANTLIB += gspell-1 gthread-2.0 gtk-3 harfbuzz hunspell-1.7 iconv WANTLIB += icudata icuuc intl jpeg lzma m mspack nghttp2 nghttp3 -WANTLIB += ngtcp2 ngtcp2_crypto_openssl notify pango-1.0 pangocairo-1.0 +WANTLIB += ngtcp2 ngtcp2_crypto_quictls notify pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre2-32 pcre2-8 pixman-1 png samplerate WANTLIB += secret-1 sndio ssl tiff usbhid wx_baseu-3.2 wx_baseu_net-3.2 WANTLIB += wx_baseu_xml-3.2 wx_gtk3u_aui-3.2 wx_gtk3u_core-3.2 diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 3ce2ca7dc..7140be894 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -2,16 +2,16 @@ COMMENT-runtime= GNU gettext runtime libraries and programs COMMENT-textstyle= text styling library COMMENT-tools= GNU gettext development and translation tools -VERSION= 0.22 +VERSION= 0.22.2 DISTNAME= gettext-${VERSION} PKGNAME-textstyle= libtextstyle-${VERSION} -SHARED_LIBS += intl 8.0 # 11.0 -SHARED_LIBS += asprintf 2.0 # unknown -SHARED_LIBS += textstyle 0.2 # 2.0 -SHARED_LIBS += gettextlib 12.0 # unknown +SHARED_LIBS += intl 8.0 # 12.0 +SHARED_LIBS += asprintf 3.0 # unknown +SHARED_LIBS += textstyle 0.2 # 2.1 +SHARED_LIBS += gettextlib 13.0 # unknown SHARED_LIBS += gettextsrc 10.0 # unknown -SHARED_LIBS += gettextpo 12.0 # 5.9 +SHARED_LIBS += gettextpo 12.0 # 5.10 SUBST_VARS= VERSION diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo index 0c7e47687..e15529792 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -1,2 +1,2 @@ -SHA256 (gettext-0.22.tar.xz) = DmA5OkcGFWe0aHWySbfSeIsJLWRX1lYUW7Dn5qPibZM= -SIZE (gettext-0.22.tar.xz) = 10008808 +SHA256 (gettext-0.22.2.tar.xz) = TIL7/l5T1xqXxjSqmKiYudqAewiydBD2pGQei7RNxLI= +SIZE (gettext-0.22.2.tar.xz) = 10238092 diff --git a/devel/gettext/patches/patch-gettext-runtime_intl_Makefile_in b/devel/gettext/patches/patch-gettext-runtime_intl_Makefile_in index 1b6babfe2..dbdc505b8 100644 --- a/devel/gettext/patches/patch-gettext-runtime_intl_Makefile_in +++ b/devel/gettext/patches/patch-gettext-runtime_intl_Makefile_in @@ -1,22 +1,10 @@ -Provide unprefixed symbols, e.g. libintl_dgettext -> dgettext -https://savannah.gnu.org/bugs/index.php?64323 - Fix build failure with "make -j" https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=97a6a63ad61949663283f5fad68c9d5fb9be1f15 Index: gettext-runtime/intl/Makefile.in --- gettext-runtime/intl/Makefile.in.orig +++ gettext-runtime/intl/Makefile.in -@@ -1692,7 +1692,7 @@ SUFFIXES = - AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \ - -DLOCALEDIR=$(localedir_c_make) \ - -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" \ -- -DBUILDING_LIBINTL $(am__append_1) -+ -DBUILDING_LIBINTL -DBUILDING_DLL $(am__append_1) - - # Enable more warning options in this directory. - -@@ -2601,8 +2601,8 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h +@@ -2606,8 +2606,8 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS) plural-exp.lo: ../config.h $(srcdir)/plural-exp.h diff --git a/devel/gettext/patches/patch-gettext-runtime_intl_configure b/devel/gettext/patches/patch-gettext-runtime_intl_configure index 9ac9a9e21..d76d91417 100644 --- a/devel/gettext/patches/patch-gettext-runtime_intl_configure +++ b/devel/gettext/patches/patch-gettext-runtime_intl_configure @@ -4,7 +4,7 @@ https://savannah.gnu.org/bugs/index.php?64536 Index: gettext-runtime/intl/configure --- gettext-runtime/intl/configure.orig +++ gettext-runtime/intl/configure -@@ -6695,7 +6695,7 @@ fi +@@ -6698,7 +6698,7 @@ fi diff --git a/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile_in b/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile_in index bc59f3212..8d9d62a55 100644 --- a/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile_in +++ b/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile_in @@ -6,16 +6,16 @@ This was also a race if MAKE_JOBS > 1. Index: gettext-tools/gnulib-lib/Makefile.in --- gettext-tools/gnulib-lib/Makefile.in.orig +++ gettext-tools/gnulib-lib/Makefile.in -@@ -4390,7 +4390,7 @@ libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined - $(LTLIBICONV) $(LTLIBINTL) $(LTLIBUNISTRING) $(MBRTOWC_LIB) \ - $(POSIX_SPAWN_LIB) $(POW_LIBM) $(QCOPY_ACL_LIB) $(SERVENT_LIB) \ - $(SETLOCALE_LIB) $(SETLOCALE_NULL_LIB) @INTL_MACOSX_LIBS@ \ -- -release @VERSION@ $(am__append_36) $(am__append_50) \ -+ $(am__append_36) $(am__append_50) \ - $(am__append_150) $(am__append_151) +@@ -4600,7 +4600,7 @@ libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined + $(LTLIBC32CONV) $(LTLIBICONV) $(LTLIBINTL) $(LTLIBUNISTRING) \ + $(MBRTOWC_LIB) $(POSIX_SPAWN_LIB) $(POW_LIBM) $(QCOPY_ACL_LIB) \ + $(SERVENT_LIB) $(SETLOCALE_LIB) $(SETLOCALE_NULL_LIB) \ +- @INTL_MACOSX_LIBS@ -release @VERSION@ $(am__append_36) \ ++ @INTL_MACOSX_LIBS@ $(am__append_36) \ + $(am__append_52) $(am__append_171) $(am__append_172) # Use this preprocessor expression to decide whether #include_next works. -@@ -6539,7 +6539,7 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CX +@@ -6899,7 +6899,7 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CX @GL_GENERATE_GETOPT_CDEFS_H_FALSE@ rm -f $@ # No need to install libgettextlib.a, except on AIX. diff --git a/devel/gettext/patches/patch-gettext-tools_src_Makefile_in b/devel/gettext/patches/patch-gettext-tools_src_Makefile_in index e0f60e53f..984a4d436 100644 --- a/devel/gettext/patches/patch-gettext-tools_src_Makefile_in +++ b/devel/gettext/patches/patch-gettext-tools_src_Makefile_in @@ -6,7 +6,7 @@ This was also a race if MAKE_JOBS > 1. Index: gettext-tools/src/Makefile.in --- gettext-tools/src/Makefile.in.orig +++ gettext-tools/src/Makefile.in -@@ -3819,7 +3819,7 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD) +@@ -3923,7 +3923,7 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD) # Need @LTLIBINTL@ because many source files use gettext(). # Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c # use iconv(). @@ -15,7 +15,7 @@ Index: gettext-tools/src/Makefile.in ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) \ $(LT_LIBTEXTSTYLE) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined \ $(am__append_3) $(am__append_5) $(am__append_7) -@@ -5281,7 +5281,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIB +@@ -5385,7 +5385,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIB @USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here" # No need to install libgettextsrc.a, except on AIX. diff --git a/devel/github-cli/Makefile b/devel/github-cli/Makefile index 5f4c60832..812af43b3 100644 --- a/devel/github-cli/Makefile +++ b/devel/github-cli/Makefile @@ -1,6 +1,6 @@ COMMENT = command-line access to github pull requests, issues and more -V = 2.34.0 +V = 2.35.0 MODGO_MODNAME = github.com/cli/cli/v${V:R:R} MODGO_VERSION = v${V} diff --git a/devel/github-cli/distinfo b/devel/github-cli/distinfo index 7bdb6a7ce..61a3e6ffb 100644 --- a/devel/github-cli/distinfo +++ b/devel/github-cli/distinfo @@ -1,4 +1,4 @@ -SHA256 (cli-v2.34.0.zip) = gGvAfMFRTq1E2a0aCOxKDjkDl1qWWMejI30FSoEm/P0= +SHA256 (cli-v2.35.0.zip) = g1RMKXmXAlsC8zbSxQQnQbCjxo51e79aNEx3pAqYeNE= SHA256 (go_modules/cloud.google.com/go/@v/v0.105.0.mod) = X4d8/qVd81QmYDxnHgs2Ne/tSlCq8FKOMU7/wIEFZwI= SHA256 (go_modules/cloud.google.com/go/@v/v0.105.0.zip) = JJxNp89MzDfSpwi/A8Zx55iMaoWz9xJpwGA19MzcE70= SHA256 (go_modules/cloud.google.com/go/accessapproval/@v/v1.5.0.mod) = dwzvPNTuoNjjlJrg+8gsSFaI78J3R/k3KhRhSehcJqQ= @@ -530,7 +530,7 @@ SHA256 (go_modules/gopkg.in/h2non/gock.v1/@v/v1.1.2.zip) = oGf7/77c+jWbAKmKXv2SQ SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = qrj7xOYwDqCOav4crqGKIckMefSJ9SxT4vIEMfGpoBU= -SIZE (cli-v2.34.0.zip) = 1343570 +SIZE (cli-v2.35.0.zip) = 1345518 SIZE (go_modules/cloud.google.com/go/@v/v0.105.0.mod) = 1034 SIZE (go_modules/cloud.google.com/go/@v/v0.105.0.zip) = 553446 SIZE (go_modules/cloud.google.com/go/accessapproval/@v/v1.5.0.mod) = 948 diff --git a/devel/libofx/Makefile b/devel/libofx/Makefile index 2d383b46c..6e86dc40e 100644 --- a/devel/libofx/Makefile +++ b/devel/libofx/Makefile @@ -2,6 +2,7 @@ COMMENT= opensource implementation of the OFX specification V= 0.10.9 DISTNAME= libofx-${V} +REVISION= 0 CATEGORIES= devel @@ -19,7 +20,7 @@ COMPILER = base-clang ports-gcc base-gcc WANTLIB += ${COMPILER_LIBCXX} c crypto curl ffi glib-2.0 glibmm-2.4 WANTLIB += gmodule-2.0 gobject-2.0 iconv intl lzma m nghttp2 nghttp3 -WANTLIB += ngtcp2 ngtcp2_crypto_openssl osp pcre2-8 sigc-2.0 ssl +WANTLIB += ngtcp2 ngtcp2_crypto_quictls osp pcre2-8 sigc-2.0 ssl WANTLIB += xml++-2.6 xml2 z LIB_DEPENDS= textproc/opensp \ diff --git a/devel/py-apipkg/Makefile b/devel/py-apipkg/Makefile index e59834b6f..a16e13cc7 100644 --- a/devel/py-apipkg/Makefile +++ b/devel/py-apipkg/Makefile @@ -1,23 +1,22 @@ -COMMENT = namespace control and lazy-import mechanism for Python +COMMENT= namespace control and lazy-import mechanism for Python -DISTNAME = apipkg-${MODPY_EGG_VERSION} -MODPY_EGG_VERSION = 3.0.1 -MODPY_PI = Yes -PKGNAME = py-${DISTNAME} -REVISION = 0 +DISTNAME= apipkg-${MODPY_EGG_VERSION} +MODPY_EGG_VERSION= 3.0.2 +MODPY_PI= Yes +PKGNAME= py-${DISTNAME} -CATEGORIES = devel +CATEGORIES= devel -HOMEPAGE = https://github.com/pytest-dev/apipkg +HOMEPAGE= https://github.com/pytest-dev/apipkg # MIT -PERMIT_PACKAGE = Yes +PERMIT_PACKAGE= Yes -FLAVORS = python3 -FLAVOR = python3 +FLAVORS= python3 +FLAVOR= python3 -MODULES = lang/python -MODPY_PYBUILD = hatch-vcs -NO_TEST = Yes +MODULES= lang/python +MODPY_PYBUILD= hatch-vcs +NO_TEST= Yes .include diff --git a/devel/py-apipkg/distinfo b/devel/py-apipkg/distinfo index 3b6e653a9..14200ccf2 100644 --- a/devel/py-apipkg/distinfo +++ b/devel/py-apipkg/distinfo @@ -1,2 +1,2 @@ -SHA256 (apipkg-3.0.1.tar.gz) = +MAhra/JEyrC+6n9PFdoNl0KjBCqN1+xXjKfH86KXwE= -SIZE (apipkg-3.0.1.tar.gz) = 6595 +SHA256 (apipkg-3.0.2.tar.gz) = x6phpPgml/2qZn5wrxUFrPH3QoscJ7iR0gS6eoo8Xg0= +SIZE (apipkg-3.0.2.tar.gz) = 6594 diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index 0acedb48b..3ee18dc36 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-6.155 +PKGNAME = quirks-6.156 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index e94b9659a..35172af00 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1551 2023/09/18 18:56:38 rsadowski Exp $ +# $OpenBSD: Quirks.pm,v 1.1552 2023/09/20 08:51:42 sthen Exp $ # # Copyright (c) 2009 Marc Espie # @@ -1851,6 +1851,7 @@ setup_obsolete_reason( 1 => 'ocaml-camlp5', 3 => 'freetype', 3 => 'freetype-doc', + 6 => 'ipcheck', ); # though it's not yet used, these should be pkgnames, so that eventually diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 3e2f0d249..1ef783541 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,3 +1,5 @@ +BROKEN-aarch64 = Fails to compile in 3rdparty/lzma/C/7zCrc.c + ONLY_FOR_ARCHS = amd64 aarch64 DPB_PROPERTIES = parallel @@ -10,11 +12,14 @@ GH_ACCOUNT = mamedev GH_PROJECT = mame GH_TAGNAME = mame0${V} DISTNAME = mame-0.${V} +REVISION = 0 CATEGORIES = emulators HOMEPAGE = https://mamedev.org/ +MAINTAINER = Frederic Cambus + # GPLv2+ PERMIT_PACKAGE = Yes diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index 12901fa1c..c4a14266b 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -5,6 +5,8 @@ COMMENT-share= shared data files for Freeciv VERSION= 3.0.8 DISTNAME= freeciv-${VERSION} PKGNAME-main= freeciv-server-${VERSION} +REVISION-main= 0 +REVISION-client=0 CATEGORIES= games @@ -17,7 +19,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freeciv/} EXTRACT_SUFX= .tar.xz cWANTLIB += bz2 c crypto curl execinfo iconv icudata icuuc intl -cWANTLIB += lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +cWANTLIB += lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls cWANTLIB += pthread sqlite3 ssl z ${MODLUA_WANTLIB} WANTLIB-main += readline ${cWANTLIB} diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile index 269119f2d..def94d887 100644 --- a/games/gnubg/Makefile +++ b/games/gnubg/Makefile @@ -3,7 +3,7 @@ COMMENT = GNU Backgammon V = 1.07.001 DISTNAME = gnubg-release-$V-sources PKGNAME = gnubg-$V -REVISION = 2 +REVISION = 3 CATEGORIES = games x11 @@ -20,7 +20,7 @@ WANTLIB += canberra-gtk3 crypto curl curses dbus-1 drm epoxy execinfo WANTLIB += expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gmp gobject-2.0 WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl jpeg -WANTLIB += ltdl m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += ltdl m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 WANTLIB += png readline sqlite3 ssl util vorbis vorbisfile xcb WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render xcb-shm diff --git a/games/love/11/Makefile b/games/love/11/Makefile index 24d9e87fc..bfa5e850d 100644 --- a/games/love/11/Makefile +++ b/games/love/11/Makefile @@ -22,6 +22,8 @@ LIB_DEPENDS = audio/libmodplug \ RUN_DEPENDS = devel/desktop-file-utils \ games/love/mime +PORTROACH = + # delete the liblove.so symlink, .a and .la files; delete the icon for # the application/x-love-game mime type too. # rename some files to avoid name clashes with other version of love. diff --git a/games/love/Makefile.inc b/games/love/Makefile.inc index d87392df4..2f888dc94 100644 --- a/games/love/Makefile.inc +++ b/games/love/Makefile.inc @@ -47,3 +47,5 @@ AUTOCONF_VERSION = 2.69 AUTOMAKE_VERSION = 1.14 WRKDIST = ${WRKDIR}/love-${VERSION} + +PORTROACH ?= limit:^${VERSION} diff --git a/geo/postgis/Makefile b/geo/postgis/Makefile index 2cbd6a8e6..e24c6f924 100644 --- a/geo/postgis/Makefile +++ b/geo/postgis/Makefile @@ -2,6 +2,7 @@ V = 3.4.0 COMMENT= geographic objects support for PostgreSQL DISTNAME= postgis-${V} CATEGORIES= geo databases +REVISION= 0 HOMEPAGE= http://www.postgis.net/ @@ -14,7 +15,7 @@ WANTLIB += c crypto curl expat freexl gdal geos geos_c geotiff gif iconv intl WANTLIB += jpeg json-c lz4 lzma m nghttp2 openjp2 pcre2-8 png pq>=5.3 protobuf-c zstd WANTLIB += proj pthread qhull_r spatialite sqlite3 ssl ${COMPILER_LIBCXX} tiff webp xml2 z WANTLIB += hdf5 hdf5_hl minizip netcdf rttopo execinfo fontconfig freetype lcms2 poppler -WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_openssl jxl jxl_threads zip +WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_quictls jxl jxl_threads zip WANTLIB += archive b2 brotlicommon brotlidec brotlienc bz2 hwy sharpyuv COMPILER = base-clang ports-gcc base-gcc diff --git a/geo/spatialite/gui/Makefile b/geo/spatialite/gui/Makefile index 35cf6683f..7e3b234ba 100644 --- a/geo/spatialite/gui/Makefile +++ b/geo/spatialite/gui/Makefile @@ -1,7 +1,7 @@ COMMENT = GUI for spatialite DISTNAME = spatialite_gui-2.1.0-beta1 PKGNAME = spatialite_gui-2.1.0beta1 -REVISION = 3 +REVISION = 4 PROJECT = spatialite_gui LIB_DEPENDS += x11/wxWidgets>=3.0.4 \ @@ -21,7 +21,7 @@ WANTLIB += fribidi gcrypt gdk-3 gdk_pixbuf-2.0 geos geos_c geotiff WANTLIB += gif gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error WANTLIB += graphite2 gspell-1 gthread-2.0 gtk-3 harfbuzz iconv WANTLIB += icudata icuuc intl jpeg lz4 lzma m minizip mspack nghttp2 -WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_openssl notify openjp2 +WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_quictls notify openjp2 WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-32 pcre2-8 WANTLIB += pixman-1 png pq proj rasterlite2 rttopo samplerate WANTLIB += secret-1 sndio spatialite sqlite3 ssl tiff usbhid virtualpg diff --git a/geo/spatialite/librasterlite2/Makefile b/geo/spatialite/librasterlite2/Makefile index 9b59eac3c..5b4c9e1df 100644 --- a/geo/spatialite/librasterlite2/Makefile +++ b/geo/spatialite/librasterlite2/Makefile @@ -1,6 +1,6 @@ COMMENT = store rasters coverages within spatialite PROJECT = librasterlite2 -REVISION = 1 +REVISION = 2 DISTNAME = ${PROJECT}-1.1.0-beta1 PKGNAME = ${DISTNAME:S/-beta/beta/} SHARED_LIBS += rasterlite2 0.0 # 1.0 @@ -21,7 +21,7 @@ WANTLIB += freetype freexl geos geos_c geotiff gif iconv jpeg lzma m WANTLIB += nghttp2 pixman-1 png proj pthread spatialite sqlite3 WANTLIB += ssl ${COMPILER_LIBCXX} tiff webp xcb xcb-render xcb-shm xml2 z WANTLIB += bz2 lz4 minizip openjp2 rttopo zstd Xau Xdmcp -WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_openssl sharpyuv +WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_quictls sharpyuv COMPILER = base-clang ports-gcc base-gcc diff --git a/geo/spatialite/libspatialite/Makefile b/geo/spatialite/libspatialite/Makefile index fa6f8545b..8d1307a1f 100644 --- a/geo/spatialite/libspatialite/Makefile +++ b/geo/spatialite/libspatialite/Makefile @@ -1,6 +1,7 @@ COMMENT= sqlite extented with spatial SQL capabilities PROJECT = libspatialite DISTNAME = ${PROJECT}-5.1.0 +REVISION = 0 SHARED_LIBS = spatialite 2.0 # 9.0 CONFIGURE_ARGS += --enable-rttopo \ @@ -17,7 +18,7 @@ LIB_DEPENDS += converters/libiconv \ WANTLIB += ${COMPILER_LIBCXX} bz2 crypto curl freexl geos WANTLIB += geos_c iconv jpeg lzma m minizip nghttp2 proj rttopo WANTLIB += sqlite3 ssl tiff xml2 z zstd -WANTLIB += expat nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += expat nghttp3 ngtcp2 ngtcp2_crypto_quictls COMPILER = base-clang ports-gcc base-gcc diff --git a/geo/spatialite/tools/Makefile b/geo/spatialite/tools/Makefile index 15d402a31..3e0effa28 100644 --- a/geo/spatialite/tools/Makefile +++ b/geo/spatialite/tools/Makefile @@ -2,6 +2,7 @@ COMMENT = CLI tools for spatialite PROJECT = spatialite-tools DISTNAME = ${PROJECT}-5.1.0a PKGNAME = ${DISTNAME:S/a$/pl0/} +REVISION = 0 LIB_DEPENDS += converters/libiconv \ databases/sqlite3 \ @@ -12,7 +13,7 @@ WANTLIB += ${COMPILER_LIBCXX} WANTLIB += c curses expat freexl geos geos_c iconv lzma m proj pthread WANTLIB += readline readosm spatialite sqlite3 xml2 z WANTLIB += crypto curl jpeg nghttp2 ssl tiff zstd bz2 minizip rttopo -WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += nghttp3 ngtcp2 ngtcp2_crypto_quictls COMPILER = base-clang ports-gcc base-gcc diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 7c42dc93d..9eb722553 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -3,6 +3,7 @@ COMMENT= digital camera library VERSION= 2.5.31 DISTNAME= libgphoto2-${VERSION} PKGNAME= libgphoto-${VERSION} +REVISION= 0 GPHOTO2_PORT_API= 0.12.2 SUBST_VARS= GPHOTO2_PORT_API VERSION @@ -21,7 +22,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} c crypto curl exif expat fontconfig WANTLIB += freetype gd iconv intl jpeg ltdl lzma m nghttp2 nghttp3 -WANTLIB += ngtcp2 ngtcp2_crypto_openssl png sharpyuv ssl tiff +WANTLIB += ngtcp2 ngtcp2_crypto_quictls png sharpyuv ssl tiff WANTLIB += usb usb-1.0 webp xml2 z zstd MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/} diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index 15d65b111..4169983eb 100755 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -5,6 +5,7 @@ COMMENT= API for accessing scanners, backends V= 1.2.1 DISTNAME= backends-${V} PKGNAME= sane-${DISTNAME} +REVISION= 0 SHARED_LIBS += sane 2.3 # unknown @@ -70,7 +71,7 @@ WANTLIB += X11 Xext Xrender avahi-client avahi-common cairo crypto WANTLIB += curl dbus-1 expat ffi fontconfig freetype gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 intl lcms2 nghttp2 openjp2 WANTLIB += pcre2-8 pixman-1 poppler poppler-glib ssl xcb xcb-render -WANTLIB += xcb-shm Xau Xdmcp nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += xcb-shm Xau Xdmcp nghttp3 ngtcp2 ngtcp2_crypto_quictls .else CONFIGURE_ARGS += --without-avahi .endif diff --git a/graphics/tesseract/tesseract/Makefile b/graphics/tesseract/tesseract/Makefile index 6bf51381e..a796e0bd3 100644 --- a/graphics/tesseract/tesseract/Makefile +++ b/graphics/tesseract/tesseract/Makefile @@ -2,6 +2,7 @@ COMMENT= OCR Engine developed at HP Labs GH_PROJECT= tesseract GH_TAGNAME= 5.3.2 +REVISION= 0 SHARED_LIBS += tesseract 5.0 # 5.3 @@ -10,7 +11,7 @@ WANTLIB += X11 Xau Xdmcp Xext Xrender archive b2 bz2 c cairo crypto WANTLIB += curl expat ffi fontconfig freetype fribidi gif gio-2.0 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 harfbuzz WANTLIB += iconv icudata icui18n icuuc intl jpeg leptonica lz4 -WANTLIB += lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 WANTLIB += pixman-1 png sharpyuv ssl tiff webp webpmux xcb xcb-render WANTLIB += xcb-shm z zstd diff --git a/korean/hanterm-xf/Makefile b/korean/hanterm-xf/Makefile index 8e63e0fb9..e2f05a255 100644 --- a/korean/hanterm-xf/Makefile +++ b/korean/hanterm-xf/Makefile @@ -2,13 +2,14 @@ COMMENT= X Hangul Terminal (XFree86 xterm Based) V= 2.0.6-177 DISTNAME= hanterm-xf-$V +DISTFILES= 1761-${DISTNAME}${EXTRACT_SUFX} CATEGORIES= korean PKGNAME= hanterm-xf-${V:S/-/./} -REVISION= 6 +REVISION= 7 EPOCH= 0 -MASTER_SITES= http://kldp.net/frs/download.php/3281/ -HOMEPAGE= http://hanterm-xf.kldp.net +SITES= https://kldp.net/hanterm-xf/release/ +HOMEPAGE= https://hanterm-xf.kldp.net PERMIT_PACKAGE= Yes diff --git a/korean/hanterm-xf/distinfo b/korean/hanterm-xf/distinfo index 56ea1f579..ad45aa0f8 100644 --- a/korean/hanterm-xf/distinfo +++ b/korean/hanterm-xf/distinfo @@ -1,2 +1,2 @@ -SHA256 (hanterm-xf-2.0.6-177.tar.gz) = 0fXRAW9or0gxmmad26ZBlus5C42zDFtpLCBGWsEAeBk= -SIZE (hanterm-xf-2.0.6-177.tar.gz) = 769301 +SHA256 (1761-hanterm-xf-2.0.6-177.tar.gz) = 0fXRAW9or0gxmmad26ZBlus5C42zDFtpLCBGWsEAeBk= +SIZE (1761-hanterm-xf-2.0.6-177.tar.gz) = 769301 diff --git a/korean/hanterm-xf/patches/patch-Makefile_in b/korean/hanterm-xf/patches/patch-Makefile_in index 50b3ee24d..818722b1a 100644 --- a/korean/hanterm-xf/patches/patch-Makefile_in +++ b/korean/hanterm-xf/patches/patch-Makefile_in @@ -1,6 +1,7 @@ ---- Makefile.in.orig Thu May 4 11:46:59 2006 -+++ Makefile.in Thu May 4 12:00:00 2006 -@@ -175,15 +175,12 @@ +Index: Makefile.in +--- Makefile.in.orig ++++ Makefile.in +@@ -175,15 +175,12 @@ install \ install-bin \ install-full :: $(BINNAME)$x resize$x $(BINDIR) $(SHELL) $(srcdir)/sinstall.sh "$(INSTALL_PROGRAM)" $(BINNAME)$x @XTERM_PATH@ $(BINDIR)/$(binary_xterm) @@ -16,7 +17,7 @@ install \ install-app \ -@@ -194,9 +191,6 @@ +@@ -194,9 +191,6 @@ install-full :: $(APPSDIR) @echo installing $(APPSDIR)/$(CLASS)-color @sed -e s/$(RESFNAME)/$(CLASS)/ $(srcdir)/$(RESFNAME)-col.ad >XTerm.tmp @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)-color @@ -26,7 +27,7 @@ @rm -f XTerm.tmp install :: -@@ -219,13 +213,9 @@ +@@ -219,13 +213,9 @@ installdirs: $(INSTALL_DIRS) uninstall: -$(RM) $(BINDIR)/$(binary_xterm) diff --git a/korean/hanterm-xf/patches/patch-sinstall_sh b/korean/hanterm-xf/patches/patch-sinstall_sh index ab67dbbe9..07d4f76f3 100644 --- a/korean/hanterm-xf/patches/patch-sinstall_sh +++ b/korean/hanterm-xf/patches/patch-sinstall_sh @@ -1,6 +1,7 @@ ---- sinstall.sh.orig Wed Sep 20 19:19:43 2006 -+++ sinstall.sh Wed Sep 20 19:19:54 2006 -@@ -67,7 +67,7 @@ +Index: sinstall.sh +--- sinstall.sh.orig ++++ sinstall.sh +@@ -67,7 +67,7 @@ if test -f "$REF_PROG" ; then PROG_GRP= ;; .??????s*) diff --git a/korean/hanterm-xf/pkg/PLIST b/korean/hanterm-xf/pkg/PLIST index c15f9cdcf..39892f076 100644 --- a/korean/hanterm-xf/pkg/PLIST +++ b/korean/hanterm-xf/pkg/PLIST @@ -1,6 +1,6 @@ @mode g+s @group utmp -bin/hanterm +@bin bin/hanterm @mode @group lib/X11/app-defaults/Hanterm diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile index 3082ce12f..2c12ebfca 100644 --- a/korean/libhangul/Makefile +++ b/korean/libhangul/Makefile @@ -2,13 +2,13 @@ COMMENT= hangul input library DISTNAME= libhangul-0.1.0 DISTFILES= 3442-${DISTNAME}${EXTRACT_SUFX} -REVISION= 0 +REVISION= 1 SHARED_LIBS= hangul 1.0 # .1.0 CATEGORIES= korean inputmethods -HOMEPAGE= http://kldp.net/hangul/ +HOMEPAGE= https://kldp.net/hangul/ # LGPLv2.1+ PERMIT_PACKAGE= Yes @@ -18,7 +18,7 @@ WANTLIB += c iconv intl LIB_DEPENDS= converters/libiconv \ devel/gettext,-runtime -MASTER_SITES= http://kldp.net/hangul/release/ +SITES= https://kldp.net/hangul/release/ CONFIGURE_STYLE=gnu diff --git a/korean/libhangul/pkg/PLIST b/korean/libhangul/pkg/PLIST index 82bf4e082..1b3f7ddcb 100644 --- a/korean/libhangul/pkg/PLIST +++ b/korean/libhangul/pkg/PLIST @@ -1,7 +1,7 @@ @bin bin/hangul include/hangul-1.0/ include/hangul-1.0/hangul.h -lib/libhangul.a +@static-lib lib/libhangul.a lib/libhangul.la @lib lib/libhangul.so.${LIBhangul_VERSION} lib/pkgconfig/libhangul.pc diff --git a/lang/php/7.4/Makefile b/lang/php/7.4/Makefile index ddfdee72f..6dc736878 100644 --- a/lang/php/7.4/Makefile +++ b/lang/php/7.4/Makefile @@ -1,11 +1,12 @@ PHP_VERSION= 7.4.33 PHP_PKGSPEC= <7.5 REVISION-main= 1 -REVISION-curl= 0 -# keep REVISION-gd >= -stable for 7.3 cycle; -# libwebp gained additional WANTLIB post 7.3-release +# keep these REVISIONs >= -stable for 7.3 cycle; +# libwebp gained additional WANTLIB REVISION-gd= 1 +# WANTLIB changed (ngtcp2_crypto_openssl to ngtcp2_crypto_quictls) +REVISION-curl= 1 CONFIGURE_ARGS= --enable-inline-optimization PHP_EXTENSIONS= -xmlrpc diff --git a/lang/php/8.0/Makefile b/lang/php/8.0/Makefile index 78f49c2b9..7deb48489 100644 --- a/lang/php/8.0/Makefile +++ b/lang/php/8.0/Makefile @@ -1,8 +1,10 @@ PHP_VERSION= 8.0.30 PHP_PKGSPEC= >=8.0,<8.1 -# keep REVISION-gd >= -stable for 7.3 cycle; -# libwebp gained additional WANTLIB post 7.3-release +# keep these REVISIONs >= -stable for 7.3 cycle; +# libwebp gained additional WANTLIB REVISION-gd= 0 +# WANTLIB changed (ngtcp2_crypto_openssl to ngtcp2_crypto_quictls) +REVISION-curl= 0 .include diff --git a/lang/php/8.1/Makefile b/lang/php/8.1/Makefile index 1348df5eb..006d66c38 100644 --- a/lang/php/8.1/Makefile +++ b/lang/php/8.1/Makefile @@ -3,9 +3,11 @@ BROKEN-sparc64= fibers requires either ucontext or asm code (not present for spa PHP_VERSION= 8.1.23 PHP_PKGSPEC= >=8.1,<8.2 -# keep REVISION-gd >= -stable for 7.3 cycle; -# libwebp gained additional WANTLIB post 7.3-release +# keep these REVISIONs >= -stable for 7.3 cycle; +# libwebp gained additional WANTLIB REVISION-gd= 0 +# WANTLIB changed (ngtcp2_crypto_openssl to ngtcp2_crypto_quictls) +REVISION-curl= 0 AUTOCONF_VERSION= 2.71 diff --git a/lang/php/8.2/Makefile b/lang/php/8.2/Makefile index d8131043e..cc9eb84a8 100644 --- a/lang/php/8.2/Makefile +++ b/lang/php/8.2/Makefile @@ -6,9 +6,11 @@ PHP_PKGSPEC= >=8.2,<8.3 # no PORTROACH marker for the highest branch, to allow finding new branches PORTROACH= -# keep REVISION-gd >= -stable for 7.3 cycle; -# libwebp gained additional WANTLIB post 7.3-release +# keep these REVISIONs >= -stable for 7.3 cycle; +# libwebp gained additional WANTLIB REVISION-gd= 0 +# WANTLIB changed (ngtcp2_crypto_openssl to ngtcp2_crypto_quictls) +REVISION-curl= 0 AUTOCONF_VERSION= 2.71 diff --git a/lang/php/Makefile.inc b/lang/php/Makefile.inc index 609651122..c0884252b 100644 --- a/lang/php/Makefile.inc +++ b/lang/php/Makefile.inc @@ -231,7 +231,7 @@ COMMENT-curl= curl URL library extensions for php HOMEPAGE-curl= https://www.php.net/curl LIB_DEPENDS-curl= net/curl WANTLIB-curl= crypto curl nghttp2 nghttp3 ngtcp2 \ - ngtcp2_crypto_openssl pthread ssl z + ngtcp2_crypto_quictls pthread ssl z .if ${BUILD_PACKAGES:M-curl} CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE} .endif diff --git a/lang/python/python.port.mk b/lang/python/python.port.mk index 5c7f5c6c0..d508841f8 100644 --- a/lang/python/python.port.mk +++ b/lang/python/python.port.mk @@ -247,7 +247,7 @@ _MODPY_USERBASE = ${WRKDIR} .if ${MODPY_PI:L} == "yes" _MODPY_EGG_NAME = ${DISTNAME:S/-${MODPY_EGG_VERSION}//} MODPY_PI_DIR ?= ${DISTNAME:C/^([a-zA-Z0-9]).*/\1/}/${_MODPY_EGG_NAME} -MASTER_SITES = ${MASTER_SITE_PYPI:=${MODPY_PI_DIR}/} +SITES = ${SITE_PYPI:=${MODPY_PI_DIR}/} HOMEPAGE ?= https://pypi.python.org/pypi/${_MODPY_EGG_NAME} .endif diff --git a/lang/rust/Makefile b/lang/rust/Makefile index e21061fd1..72b8b8956 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -14,7 +14,7 @@ COMMENT-clippy = Rust linter COMMENT-rustfmt = Rust code formatter COMMENT-src = Rust source component -V = 1.72.0 +V = 1.72.1 DISTNAME = rustc-${V}-src # rustc bootstrap version @@ -22,8 +22,8 @@ BV-aarch64 = 1.72.0-20230825 BV-amd64 = 1.72.0-20230824 BV-i386 = 1.72.0-20230825 BV-powerpc64 = 1.65.0-20221213 -BV-riscv64 = 1.71.0-20230716 -BV-sparc64 = 1.71.1-20230826 +BV-riscv64 = 1.72.0-20230920 +BV-sparc64 = 1.72.0-20230920 BV = ${BV-${MACHINE_ARCH}} PKGNAME = rust-${V} @@ -38,7 +38,7 @@ MULTI_PACKAGES = -main -gdb -clippy -rustfmt -src CATEGORIES = lang HOMEPAGE = https://www.rust-lang.org/ -MAINTAINER = Sebastien Marie +MAINTAINER = Sebastien Marie # both MIT and Apache2.0 # with portions covered by various BSD-like licenses @@ -49,9 +49,9 @@ WANTLIB-gdb = WANTLIB-clippy = ${COMPILER_LIBCXX} c m pthread WANTLIB-rustfmt = ${COMPILER_LIBCXX} c m pthread -MASTER_SITES = https://static.rust-lang.org/dist/ \ +SITES = https://static.rust-lang.org/dist/ \ https://dev-static.rust-lang.org/dist/ -MASTER_SITES.bsp = http://kapouay.odns.fr/pub/rust/ +SITES.bsp = http://kapouay.eu.org/pub/rust/ FLAVOR ?= PSEUDO_FLAVORS = native_bootstrap @@ -81,7 +81,7 @@ TRIPLE_ARCH-riscv64 = riscv64gc-unknown-openbsd TRIPLE_ARCH-sparc64 = sparc64-unknown-openbsd TRIPLE_ARCH = ${TRIPLE_ARCH-${MACHINE_ARCH}} -USE_EMB_LLVM ?= Yes +USE_EMB_LLVM ?= No # flags to use when building LLVM LLVMCXXFLAGS-aarch64 = -fno-ret-protector @@ -145,8 +145,8 @@ BUILD_DEPENDS += devel/gdb .if !${USE_EMB_LLVM:L:Myes} MODULES += lang/clang -MODCLANG_VERSION= 16 -MODCLANG_COMPILER_LINKS= No +MODCLANG_VERSION = 16 +MODCLANG_COMPILER_LINKS = No .else WANTLIB-main += execinfo .endif diff --git a/lang/rust/distinfo b/lang/rust/distinfo index a5a029bee..df74dbf3b 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,14 +1,14 @@ -SHA256 (rust/rustc-1.72.0-src.tar.xz) = 0wdEH47nin6U9yy1yBODgi8TAn955npVUb/SwtLbMBQ= +SHA256 (rust/rustc-1.72.1-src.tar.xz) = rqWNli/xwZUhufWHqtiChfD9Nba2c4sDGnoVuxtwp8M= SHA256 (rust/rustc-bootstrap-aarch64-1.72.0-20230825.tar.xz) = Wzjtco6JjD5yZQGLhi76jb2RNCFyImw5XA1wcEyGYQA= SHA256 (rust/rustc-bootstrap-amd64-1.72.0-20230824.tar.xz) = jL45+sGiHRz18eUITw8uF+2eBLapNu24gECwpyn3YCc= SHA256 (rust/rustc-bootstrap-i386-1.72.0-20230825.tar.xz) = 5EgsJnpIQLf8dvfUBe4wGLZPG+bsuz0fIruYQfhC6ic= SHA256 (rust/rustc-bootstrap-powerpc64-1.65.0-20221213.tar.xz) = w5/EmOdqCKuxnLR2RG6/lZIZW57e+FhvxoA5VUniaTY= -SHA256 (rust/rustc-bootstrap-riscv64-1.71.0-20230716.tar.xz) = d32TWmjUpnXk1B2czsLRFlpV8USWHPwy6oooNCafqCc= -SHA256 (rust/rustc-bootstrap-sparc64-1.71.1-20230826.tar.xz) = BPDpfjvW8Dx4B4C6bd2yrDtnSFDjojfII86/JbDpRKI= -SIZE (rust/rustc-1.72.0-src.tar.xz) = 151630408 +SHA256 (rust/rustc-bootstrap-riscv64-1.72.0-20230920.tar.xz) = 4TAcFDYkum+D+SZQkQita974hvUzGLaoEmDcbXUhZ6o= +SHA256 (rust/rustc-bootstrap-sparc64-1.72.0-20230920.tar.xz) = 5Arfg3LL4PpnA/z/ckfGogUC8LlPNbgUywEmA5+d6n0= +SIZE (rust/rustc-1.72.1-src.tar.xz) = 151643600 SIZE (rust/rustc-bootstrap-aarch64-1.72.0-20230825.tar.xz) = 61720452 SIZE (rust/rustc-bootstrap-amd64-1.72.0-20230824.tar.xz) = 68317076 SIZE (rust/rustc-bootstrap-i386-1.72.0-20230825.tar.xz) = 69767388 SIZE (rust/rustc-bootstrap-powerpc64-1.65.0-20221213.tar.xz) = 61141484 -SIZE (rust/rustc-bootstrap-riscv64-1.71.0-20230716.tar.xz) = 65622164 -SIZE (rust/rustc-bootstrap-sparc64-1.71.1-20230826.tar.xz) = 60209272 +SIZE (rust/rustc-bootstrap-riscv64-1.72.0-20230920.tar.xz) = 61405024 +SIZE (rust/rustc-bootstrap-sparc64-1.72.0-20230920.tar.xz) = 61195032 diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 21b7b6cda..05466d826 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -11,11 +11,11 @@ PKGNAME-bogofilter= claws-mail-bogofilter-${V} PKGNAME-spamassassin= claws-mail-spamassassin-${V} PKGNAME-pdfviewer= claws-mail-pdfviewer-${V} PKGNAME-gdata= claws-mail-gdata-${V} -REVISION-bogofilter= 0 -REVISION-gdata= 0 -REVISION-main= 0 -REVISION-pdfviewer= 0 -REVISION-spamassassin= 0 +REVISION-bogofilter= 1 +REVISION-gdata= 1 +REVISION-main= 1 +REVISION-pdfviewer= 1 +REVISION-spamassassin= 1 CATEGORIES= mail news @@ -47,7 +47,7 @@ WANTLIB += cairo cairo-gobject crypto curl dbus-1 epoxy etpan execinfo WANTLIB += expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB += gtk-3 harfbuzz iconv intl jpeg m nghttp2 nghttp3 ngtcp2 -WANTLIB += ngtcp2_crypto_openssl pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += ngtcp2_crypto_quictls pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre2-8 pixman-1 png sasl2 ssl xcb xcb-render xcb-shm z WANTLIB-main = ${WANTLIB} diff --git a/mail/grommunio/gromox/Makefile b/mail/grommunio/gromox/Makefile index 1bd714629..d31f19032 100644 --- a/mail/grommunio/gromox/Makefile +++ b/mail/grommunio/gromox/Makefile @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= ${LLD_ARCHS} COMMENT-main= groupware server backend with RPC, IMAP, POP3 support COMMENT-mapi= gromox MAPI extensions for PHP -V= 2.11 +V= 2.12 DISTNAME= gromox-${V} REVISION= 0 @@ -46,7 +46,7 @@ BUILD_DEPENDS= devel/cppunit \ WANTLIB += HX iconv jsoncpp m pthread tinyxml2 vmime zstd WANTLIB-main += ${LIBCXX} ${WANTLIB} c crypto curl fmt icudata icuuc lber -WANTLIB-main += ldap lzma mariadb nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB-main += ldap lzma mariadb nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB-main += sasl2 sqlite3 ssl ssl xml2 xxhash z # Do not substitute MODULE_NAME diff --git a/mail/grommunio/gromox/distinfo b/mail/grommunio/gromox/distinfo index f539d7c21..205511598 100644 --- a/mail/grommunio/gromox/distinfo +++ b/mail/grommunio/gromox/distinfo @@ -1,2 +1,2 @@ -SHA256 (grommunio/gromox-2.11-ae30bb00.tar.gz) = +l+/S6KqwukngoaGlSvWcpcC484LWM7xZqc0STvscR0= -SIZE (grommunio/gromox-2.11-ae30bb00.tar.gz) = 1680837 +SHA256 (grommunio/gromox-2.12-ae30bb00.tar.gz) = +l+/S6KqwukngoaGlSvWcpcC484LWM7xZqc0STvscR0= +SIZE (grommunio/gromox-2.12-ae30bb00.tar.gz) = 1680837 diff --git a/mail/grommunio/mapi-header-php/Makefile b/mail/grommunio/mapi-header-php/Makefile index ee3cb501d..ba9cf7779 100644 --- a/mail/grommunio/mapi-header-php/Makefile +++ b/mail/grommunio/mapi-header-php/Makefile @@ -1,12 +1,11 @@ COMMENT= grommunio PHP MAPI headers -V= 1.1 +V= 1.2 DISTNAME= grommunio-mapi-header-php-${V} -REVISION= 0 GH_ACCOUNT= grommunio GH_PROJECT= mapi-header-php -GH_COMMIT= 18b40f9701e08026713286c4c80dd2e765ae032c +GH_COMMIT= 0db2832363265ed27861e14d20c2590c6c8062fe CATEGORIES= mail www diff --git a/mail/grommunio/mapi-header-php/distinfo b/mail/grommunio/mapi-header-php/distinfo index 215e6131e..02bd9e9dd 100644 --- a/mail/grommunio/mapi-header-php/distinfo +++ b/mail/grommunio/mapi-header-php/distinfo @@ -1,2 +1,2 @@ -SHA256 (grommunio/grommunio-mapi-header-php-1.1-18b40f97.tar.gz) = FOuhuHg2fK2NDSF0l5T5OYc1PMQtgRspQR+pc70dImo= -SIZE (grommunio/grommunio-mapi-header-php-1.1-18b40f97.tar.gz) = 104054 +SHA256 (grommunio/grommunio-mapi-header-php-1.2-0db28323.tar.gz) = v55GamqVIcF3d9rkMukZAzhxvTvfDxuIdlf4Zpii6wE= +SIZE (grommunio/grommunio-mapi-header-php-1.2-0db28323.tar.gz) = 104175 diff --git a/mail/grommunio/mapi-header-php/pkg/PLIST b/mail/grommunio/mapi-header-php/pkg/PLIST index 0f3d016cc..ecc508d06 100644 --- a/mail/grommunio/mapi-header-php/pkg/PLIST +++ b/mail/grommunio/mapi-header-php/pkg/PLIST @@ -2,6 +2,7 @@ grommunio-mapi-header-php/ grommunio-mapi-header-php/LICENSE.txt grommunio-mapi-header-php/Makefile grommunio-mapi-header-php/README.rst +grommunio-mapi-header-php/changelog.rst grommunio-mapi-header-php/class.baseexception.php grommunio-mapi-header-php/class.baserecurrence.php grommunio-mapi-header-php/class.freebusy.php diff --git a/mail/grommunio/web/Makefile b/mail/grommunio/web/Makefile index c1956ce49..8c3be349f 100644 --- a/mail/grommunio/web/Makefile +++ b/mail/grommunio/web/Makefile @@ -2,11 +2,11 @@ COMMENT= web user interface for grommunio V= 3.2 DISTNAME= grommunio-web-${V} -REVISION= 4 +REVISION= 5 GH_ACCOUNT= grommunio GH_PROJECT= grommunio-web -GH_COMMIT= dddd22913a541c08cfcf08846c4b1ce3af067bd7 +GH_COMMIT= 8350b619b1ddf3571774a56baa5dc770c0303191 CATEGORIES= mail www diff --git a/mail/grommunio/web/distinfo b/mail/grommunio/web/distinfo index 63a3ff8f7..5da5750fc 100644 --- a/mail/grommunio/web/distinfo +++ b/mail/grommunio/web/distinfo @@ -1,2 +1,2 @@ -SHA256 (grommunio/grommunio-web-3.2-dddd2291.tar.gz) = pXMHa68FLjYM+vo5BYREWbbVudDcIdwmBmzMtbujkNE= -SIZE (grommunio/grommunio-web-3.2-dddd2291.tar.gz) = 27325889 +SHA256 (grommunio/grommunio-web-3.2-8350b619.tar.gz) = C69j6Vx3SR1HC/3PPvJJ9q4g1Iv9xaRHS1MoYnMKi+g= +SIZE (grommunio/grommunio-web-3.2-8350b619.tar.gz) = 27326214 diff --git a/mail/py-spf/Makefile b/mail/py-spf/Makefile index 9aeb0dc74..8cdfa8583 100644 --- a/mail/py-spf/Makefile +++ b/mail/py-spf/Makefile @@ -10,8 +10,6 @@ HOMEPAGE= https://github.com/sdgathman/pyspf/ # Python PERMIT_PACKAGE= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pymilter/} - MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile index 2bdc3a9f4..6168b9388 100644 --- a/math/libqalculate/Makefile +++ b/math/libqalculate/Makefile @@ -4,6 +4,7 @@ CATEGORIES = math devel V = 4.8.0 DISTNAME = libqalculate-$V HOMEPAGE = https://qalculate.github.io/ +REVISION = 0 SHARED_LIBS += qalculate 6.0 # 42.0 @@ -12,7 +13,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} c crypto curl curses ehistory ereadline WANTLIB += gmp iconv icudata icuuc intl lzma m mpfr nghttp2 nghttp3 -WANTLIB += ngtcp2 ngtcp2_crypto_openssl ssl xml2 z +WANTLIB += ngtcp2 ngtcp2_crypto_quictls ssl xml2 z COMPILER = base-clang ports-gcc diff --git a/math/netcdf/Makefile b/math/netcdf/Makefile index 3b98bc7c8..06b954a51 100644 --- a/math/netcdf/Makefile +++ b/math/netcdf/Makefile @@ -4,7 +4,7 @@ V= 4.9.2 NAME= netcdf DISTNAME= ${NAME}-c-${V} PKGNAME= ${NAME}-${V} -REVISION= 2 +REVISION= 3 CATEGORIES= math @@ -18,7 +18,7 @@ MAINTAINER= Martin Reindl PERMIT_PACKAGE= Yes WANTLIB += bz2 c crypto curl execinfo hdf5 hdf5_hl iconv lzma -WANTLIB += m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl pthread +WANTLIB += m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls pthread WANTLIB += ssl xml2 z zip zstd # curl is needed for DAP support diff --git a/net/Makefile b/net/Makefile index afac5c7b0..e52d6af45 100644 --- a/net/Makefile +++ b/net/Makefile @@ -162,7 +162,6 @@ SUBDIR += ipaudit SUBDIR += ipcad SUBDIR += ipcalc - SUBDIR += ipcheck SUBDIR += iperf SUBDIR += iperf3 SUBDIR += ipfm diff --git a/net/curl/Makefile b/net/curl/Makefile index 6399cd123..5af74c57e 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -4,6 +4,7 @@ DISTNAME= curl-8.3.0 SHARED_LIBS= curl 26.22 # 12.0 CATEGORIES= net HOMEPAGE= https://curl.se/ +REVISION= 0 MAINTAINER= Christian Weisgerber @@ -14,7 +15,7 @@ SITES= https://curl.se/download/ EXTRACT_SUFX= .tar.xz LIB_DEPENDS= www/nghttp2 www/nghttp3 net/ngtcp2 -WANTLIB= c crypto pthread nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB= c crypto pthread nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB+= ssl z AUTOCONF_VERSION=2.71 diff --git a/net/curl/patches/patch-configure_ac b/net/curl/patches/patch-configure_ac deleted file mode 100644 index e45f67604..000000000 --- a/net/curl/patches/patch-configure_ac +++ /dev/null @@ -1,83 +0,0 @@ -Revert "ngtcp2: build with 0.17.0 and nghttp3 0.13.0" -https://github.com/curl/curl/commit/e0093b4b732f6495b0fb1cd6747cbfedcdcf63ed - -Index: configure.ac ---- configure.ac.orig -+++ configure.ac -@@ -2926,42 +2926,42 @@ if test X"$want_tcp2" != Xno; then - fi - - if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1"; then -- dnl backup the pre-ngtcp2_crypto_quictls variables -+ dnl backup the pre-ngtcp2_crypto_openssl variables - CLEANLDFLAGS="$LDFLAGS" - CLEANCPPFLAGS="$CPPFLAGS" - CLEANLIBS="$LIBS" - -- CURL_CHECK_PKGCONFIG(libngtcp2_crypto_quictls, $want_tcp2_path) -+ CURL_CHECK_PKGCONFIG(libngtcp2_crypto_openssl, $want_tcp2_path) - - if test "$PKGCONFIG" != "no" ; then -- LIB_NGTCP2_CRYPTO_QUICTLS=`CURL_EXPORT_PCDIR([$want_tcp2_path]) -- $PKGCONFIG --libs-only-l libngtcp2_crypto_quictls` -- AC_MSG_NOTICE([-l is $LIB_NGTCP2_CRYPTO_QUICTLS]) -+ LIB_NGTCP2_CRYPTO_OPENSSL=`CURL_EXPORT_PCDIR([$want_tcp2_path]) -+ $PKGCONFIG --libs-only-l libngtcp2_crypto_openssl` -+ AC_MSG_NOTICE([-l is $LIB_NGTCP2_CRYPTO_OPENSSL]) - -- CPP_NGTCP2_CRYPTO_QUICTLS=`CURL_EXPORT_PCDIR([$want_tcp2_path]) dnl -- $PKGCONFIG --cflags-only-I libngtcp2_crypto_quictls` -- AC_MSG_NOTICE([-I is $CPP_NGTCP2_CRYPTO_QUICTLS]) -+ CPP_NGTCP2_CRYPTO_OPENSSL=`CURL_EXPORT_PCDIR([$want_tcp2_path]) dnl -+ $PKGCONFIG --cflags-only-I libngtcp2_crypto_openssl` -+ AC_MSG_NOTICE([-I is $CPP_NGTCP2_CRYPTO_OPENSSL]) - -- LD_NGTCP2_CRYPTO_QUICTLS=`CURL_EXPORT_PCDIR([$want_tcp2_path]) -- $PKGCONFIG --libs-only-L libngtcp2_crypto_quictls` -- AC_MSG_NOTICE([-L is $LD_NGTCP2_CRYPTO_QUICTLS]) -+ LD_NGTCP2_CRYPTO_OPENSSL=`CURL_EXPORT_PCDIR([$want_tcp2_path]) -+ $PKGCONFIG --libs-only-L libngtcp2_crypto_openssl` -+ AC_MSG_NOTICE([-L is $LD_NGTCP2_CRYPTO_OPENSSL]) - -- LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_QUICTLS" -- CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_QUICTLS" -- LIBS="$LIB_NGTCP2_CRYPTO_QUICTLS $LIBS" -+ LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_OPENSSL" -+ CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_OPENSSL" -+ LIBS="$LIB_NGTCP2_CRYPTO_OPENSSL $LIBS" - - if test "x$cross_compiling" != "xyes"; then -- DIR_NGTCP2_CRYPTO_QUICTLS=`echo $LD_NGTCP2_CRYPTO_QUICTLS | $SED -e 's/^-L//'` -+ DIR_NGTCP2_CRYPTO_OPENSSL=`echo $LD_NGTCP2_CRYPTO_OPENSSL | $SED -e 's/^-L//'` - fi -- AC_CHECK_LIB(ngtcp2_crypto_quictls, ngtcp2_crypto_recv_client_initial_cb, -+ AC_CHECK_LIB(ngtcp2_crypto_openssl, ngtcp2_crypto_recv_client_initial_cb, - [ - AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h, - NGTCP2_ENABLED=1 -- AC_DEFINE(USE_NGTCP2_CRYPTO_QUICTLS, 1, [if ngtcp2_crypto_quictls is in use]) -- AC_SUBST(USE_NGTCP2_CRYPTO_QUICTLS, [1]) -- CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_QUICTLS" -+ AC_DEFINE(USE_NGTCP2_CRYPTO_OPENSSL, 1, [if ngtcp2_crypto_openssl is in use]) -+ AC_SUBST(USE_NGTCP2_CRYPTO_OPENSSL, [1]) -+ CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_OPENSSL" - export CURL_LIBRARY_PATH -- AC_MSG_NOTICE([Added $DIR_NGTCP2_CRYPTO_QUICTLS to CURL_LIBRARY_PATH]) -+ AC_MSG_NOTICE([Added $DIR_NGTCP2_CRYPTO_OPENSSL to CURL_LIBRARY_PATH]) - ) - ], - dnl not found, revert back to clean variables -@@ -2971,11 +2971,11 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLE - ) - - else -- dnl no ngtcp2_crypto_quictls pkg-config found, deal with it -+ dnl no ngtcp2_crypto_openssl pkg-config found, deal with it - if test X"$want_tcp2" != Xdefault; then - dnl To avoid link errors, we do not allow --with-ngtcp2 without - dnl a pkgconfig file -- AC_MSG_ERROR([--with-ngtcp2 was specified but could not find ngtcp2_crypto_quictls pkg-config file.]) -+ AC_MSG_ERROR([--with-ngtcp2 was specified but could not find ngtcp2_crypto_openssl pkg-config file.]) - fi - fi - fi diff --git a/net/curl/patches/patch-lib_vquic_curl_ngtcp2_c b/net/curl/patches/patch-lib_vquic_curl_ngtcp2_c deleted file mode 100644 index fe611cfbc..000000000 --- a/net/curl/patches/patch-lib_vquic_curl_ngtcp2_c +++ /dev/null @@ -1,196 +0,0 @@ -Revert "ngtcp2: use 0.15.0" -https://github.com/curl/curl/commit/10998e3b89be65e2bf9d9666bd9a1734c186ec0a - -Revert "ngtcp2: build with 0.16.0 and nghttp3 0.12.0" -https://github.com/curl/curl/commit/cae9d10be3d3446beda9e217a0abca91b1b2ab79 - -Revert "ngtcp2: build with 0.17.0 and nghttp3 0.13.0" -https://github.com/curl/curl/commit/e0093b4b732f6495b0fb1cd6747cbfedcdcf63ed - -Index: lib/vquic/curl_ngtcp2.c ---- lib/vquic/curl_ngtcp2.c.orig -+++ lib/vquic/curl_ngtcp2.c -@@ -33,7 +33,7 @@ - #ifdef OPENSSL_IS_BORINGSSL - #include - #else --#include -+#include - #endif - #include "vtls/openssl.h" - #elif defined(USE_GNUTLS) -@@ -141,7 +141,7 @@ struct cf_ngtcp2_ctx { - uint32_t version; - ngtcp2_settings settings; - ngtcp2_transport_params transport_params; -- ngtcp2_ccerr last_error; -+ ngtcp2_connection_close_error last_error; - ngtcp2_crypto_conn_ref conn_ref; - #ifdef USE_OPENSSL - SSL_CTX *sslctx; -@@ -356,7 +356,7 @@ static void quic_settings(struct cf_ngtcp2_ctx *ctx, - t->initial_max_streams_uni = QUIC_MAX_STREAMS; - t->max_idle_timeout = QUIC_IDLE_TIMEOUT; - if(ctx->qlogfd != -1) { -- s->qlog_write = qlog_callback; -+ s->qlog.write = qlog_callback; - } - } - -@@ -413,8 +413,8 @@ static CURLcode quic_ssl_ctx(SSL_CTX **pssl_ctx, - goto out; - } - #else -- if(ngtcp2_crypto_quictls_configure_client_context(ssl_ctx) != 0) { -- failf(data, "ngtcp2_crypto_quictls_configure_client_context failed"); -+ if(ngtcp2_crypto_openssl_configure_client_context(ssl_ctx) != 0) { -+ failf(data, "ngtcp2_crypto_openssl_configure_client_context failed"); - goto out; - } - #endif -@@ -777,9 +777,9 @@ static int cb_recv_stream_data(ngtcp2_conn *tconn, uin - CURL_TRC_CF(data, cf, "[%" PRId64 "] read_stream(len=%zu) -> %zd", - stream_id, buflen, nconsumed); - if(nconsumed < 0) { -- ngtcp2_ccerr_set_application_error( -- &ctx->last_error, -- nghttp3_err_infer_quic_app_error_code((int)nconsumed), NULL, 0); -+ ngtcp2_connection_close_error_set_application_error( -+ &ctx->last_error, -+ nghttp3_err_infer_quic_app_error_code((int)nconsumed), NULL, 0); - return NGTCP2_ERR_CALLBACK_FAILURE; - } - -@@ -836,8 +836,8 @@ static int cb_stream_close(ngtcp2_conn *tconn, uint32_ - CURL_TRC_CF(data, cf, "[%" PRId64 "] quic close(err=%" - PRIu64 ") -> %d", stream3_id, app_error_code, rv); - if(rv) { -- ngtcp2_ccerr_set_application_error( -- &ctx->last_error, nghttp3_err_infer_quic_app_error_code(rv), NULL, 0); -+ ngtcp2_connection_close_error_set_application_error( -+ &ctx->last_error, nghttp3_err_infer_quic_app_error_code(rv), NULL, 0); - return NGTCP2_ERR_CALLBACK_FAILURE; - } - -@@ -949,13 +949,13 @@ static int cb_get_new_connection_id(ngtcp2_conn *tconn - return 0; - } - --static int cb_recv_rx_key(ngtcp2_conn *tconn, ngtcp2_encryption_level level, -+static int cb_recv_rx_key(ngtcp2_conn *tconn, ngtcp2_crypto_level level, - void *user_data) - { - struct Curl_cfilter *cf = user_data; - (void)tconn; - -- if(level != NGTCP2_ENCRYPTION_LEVEL_1RTT) { -+ if(level != NGTCP2_CRYPTO_LEVEL_APPLICATION) { - return 0; - } - -@@ -1040,7 +1040,7 @@ static CURLcode check_and_set_expiry(struct Curl_cfilt - if(rv) { - failf(data, "ngtcp2_conn_handle_expiry returned error: %s", - ngtcp2_strerror(rv)); -- ngtcp2_ccerr_set_liberr(&ctx->last_error, rv, NULL, 0); -+ ngtcp2_connection_close_error_set_transport_error_liberr(&ctx->last_error, rv, NULL, 0); - return CURLE_SEND_ERROR; - } - result = cf_progress_ingress(cf, data, pktx); -@@ -1315,8 +1315,7 @@ static int cb_h3_stop_sending(nghttp3_conn *conn, int6 - (void)conn; - (void)stream_user_data; - -- rv = ngtcp2_conn_shutdown_stream_read(ctx->qconn, 0, stream_id, -- app_error_code); -+ rv = ngtcp2_conn_shutdown_stream_read(ctx->qconn, stream_id, app_error_code); - if(rv && rv != NGTCP2_ERR_STREAM_NOT_FOUND) { - return NGTCP2_ERR_CALLBACK_FAILURE; - } -@@ -1334,7 +1333,7 @@ static int cb_h3_reset_stream(nghttp3_conn *conn, int6 - (void)conn; - (void)data; - -- rv = ngtcp2_conn_shutdown_stream_write(ctx->qconn, 0, stream_id, -+ rv = ngtcp2_conn_shutdown_stream_write(ctx->qconn, stream_id, - app_error_code); - CURL_TRC_CF(data, cf, "[%" PRId64 "] reset -> %d", stream_id, rv); - if(rv && rv != NGTCP2_ERR_STREAM_NOT_FOUND) { -@@ -1358,8 +1357,7 @@ static nghttp3_callbacks ngh3_callbacks = { - cb_h3_stop_sending, - NULL, /* end_stream */ - cb_h3_reset_stream, -- NULL, /* shutdown */ -- NULL /* recv_settings */ -+ NULL /* shutdown */ - }; - - static int init_ngh3_conn(struct Curl_cfilter *cf) -@@ -1369,7 +1367,7 @@ static int init_ngh3_conn(struct Curl_cfilter *cf) - int rc; - int64_t ctrl_stream_id, qpack_enc_stream_id, qpack_dec_stream_id; - -- if(ngtcp2_conn_get_streams_uni_left(ctx->qconn) < 3) { -+ if(ngtcp2_conn_get_max_local_streams_uni(ctx->qconn) < 3) { - return CURLE_QUIC_CONNECT_ERROR; - } - -@@ -1950,12 +1948,13 @@ static CURLcode recv_pkt(const unsigned char *pkt, siz - ngtcp2_strerror(rv)); - if(!ctx->last_error.error_code) { - if(rv == NGTCP2_ERR_CRYPTO) { -- ngtcp2_ccerr_set_tls_alert(&ctx->last_error, -- ngtcp2_conn_get_tls_alert(ctx->qconn), -- NULL, 0); -+ ngtcp2_connection_close_error_set_transport_error_tls_alert( -+ &ctx->last_error, -+ ngtcp2_conn_get_tls_alert(ctx->qconn), NULL, 0); - } - else { -- ngtcp2_ccerr_set_liberr(&ctx->last_error, rv, NULL, 0); -+ ngtcp2_connection_close_error_set_transport_error_liberr( -+ &ctx->last_error, rv, NULL, 0); - } - } - -@@ -2050,9 +2049,9 @@ static ssize_t read_pkt_to_send(void *userp, - if(veccnt < 0) { - failf(x->data, "nghttp3_conn_writev_stream returned error: %s", - nghttp3_strerror((int)veccnt)); -- ngtcp2_ccerr_set_application_error( -- &ctx->last_error, -- nghttp3_err_infer_quic_app_error_code((int)veccnt), NULL, 0); -+ ngtcp2_connection_close_error_set_application_error( -+ &ctx->last_error, -+ nghttp3_err_infer_quic_app_error_code((int)veccnt), NULL, 0); - *err = CURLE_SEND_ERROR; - return -1; - } -@@ -2092,7 +2091,8 @@ static ssize_t read_pkt_to_send(void *userp, - DEBUGASSERT(ndatalen == -1); - failf(x->data, "ngtcp2_conn_writev_stream returned error: %s", - ngtcp2_strerror((int)n)); -- ngtcp2_ccerr_set_liberr(&ctx->last_error, (int)n, NULL, 0); -+ ngtcp2_connection_close_error_set_transport_error_liberr( -+ &ctx->last_error, (int)n, NULL, 0); - *err = CURLE_SEND_ERROR; - nwritten = -1; - goto out; -@@ -2471,7 +2471,7 @@ static CURLcode cf_connect_start(struct Curl_cfilter * - ngtcp2_conn_set_tls_native_handle(ctx->qconn, ctx->ssl); - #endif - -- ngtcp2_ccerr_default(&ctx->last_error); -+ ngtcp2_connection_close_error_default(&ctx->last_error); - - ctx->conn_ref.get_conn = get_conn; - ctx->conn_ref.user_data = cf; -@@ -2547,7 +2547,7 @@ static CURLcode cf_ngtcp2_connect(struct Curl_cfilter - - out: - if(result == CURLE_RECV_ERROR && ctx->qconn && -- ngtcp2_conn_in_draining_period(ctx->qconn)) { -+ ngtcp2_conn_is_in_draining_period(ctx->qconn)) { - /* When a QUIC server instance is shutting down, it may send us a - * CONNECTION_CLOSE right away. Our connection then enters the DRAINING - * state. diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile index 50001cb30..cb1cd928f 100644 --- a/net/filezilla/Makefile +++ b/net/filezilla/Makefile @@ -6,6 +6,7 @@ COMMENT= fast FTP and SFTP GUI client with a lot of features V= 3.65.0 PKGNAME= filezilla-$V DISTNAME= FileZilla_$V_src +REVISION= 0 SHARED_LIBS+= fzclient-commonui-private 4.1 SHARED_LIBS+= fzclient-private 9.0 @@ -28,7 +29,7 @@ WANTLIB += fontconfig freetype fribidi gcrypt gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 WANTLIB += gpg-error graphite2 gspell-1 gthread-2.0 gtk-3 harfbuzz WANTLIB += hogweed iconv icudata icuuc idn idn2 intl jpeg lzma -WANTLIB += m mspack nettle nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += m mspack nettle nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += notify p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre2-32 pcre2-8 pixman-1 png pugixml samplerate secret-1 WANTLIB += sndio sqlite3 ssl tasn1 tiff unistring usbhid wx_baseu-3.2 diff --git a/net/ipcheck/Makefile b/net/ipcheck/Makefile deleted file mode 100644 index 794dccd43..000000000 --- a/net/ipcheck/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -COMMENT= fully compliant DynDNS.org client - -MV= 0 -V= 207 -PKGNAME= ipcheck-${MV}.${V} -REVISION= 5 -DISTNAME= ipcheck.${V} -CATEGORIES= net - -HOMEPAGE= http://ipcheck.sourceforge.net/ - -# GPL -PERMIT_PACKAGE= Yes - -MASTER_SITES= ${HOMEPAGE}releases/ -EXTRACT_SUFX= -EXTRACT_ONLY= - -MODULES= lang/python -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} - -NO_TEST= Yes -NO_BUILD= Yes -PKG_ARCH= * -WRKDIST= ${WRKDIR} - -do-patch: - @sed -e "s!/usr/bin/python!${LOCALBASE}/bin/python${MODPY_VERSION}!" \ - -e "s!ppp0!tun0!" \ - ${FULLDISTDIR}/${DISTNAME} > ${WRKDIR}/${DISTNAME} - -do-install: - @${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME} ${PREFIX}/bin/ipcheck.py - -.include diff --git a/net/ipcheck/distinfo b/net/ipcheck/distinfo deleted file mode 100644 index 23f552420..000000000 --- a/net/ipcheck/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (ipcheck.207) = uHilc5bud2ojAS7kzY6XwAasmQU+vn2yqiCqR1TmhJc= -SIZE (ipcheck.207) = 158838 diff --git a/net/ipcheck/pkg/DESCR b/net/ipcheck/pkg/DESCR deleted file mode 100644 index fceb55f14..000000000 --- a/net/ipcheck/pkg/DESCR +++ /dev/null @@ -1,19 +0,0 @@ -This is a simple Python script to register your dynamic IP address -using the NIC V2.0 protocol. We aim to be fully compliant with the -dyndns client specification. - -We currently support all options and latest recommendations by -Dyndns. Ipcheck is easy to install and very easy to use. - -Root access is not required and no configuration files are needed. - -Just specify your username, password and hostname(s) on the command -line (or cron entry). - -You can specify the interface (default tun0) to search for your ip -address on or use web based IP detection. - -There is also direct support for determining the IP address on the -following devices: Linksys (-L), Netgear (-N), Draytek (-D), Netopia -(-O), HawkingTech (-H), Cisco 667i (-C), Cisco 700 series (-I), -ZyXEL Prestige (-Z), SMC Barricade (-S). diff --git a/net/ipcheck/pkg/PLIST b/net/ipcheck/pkg/PLIST deleted file mode 100644 index ae286ad3a..000000000 --- a/net/ipcheck/pkg/PLIST +++ /dev/null @@ -1 +0,0 @@ -bin/ipcheck.py diff --git a/net/isc-bind/Makefile b/net/isc-bind/Makefile index 06a37736e..243073c46 100644 --- a/net/isc-bind/Makefile +++ b/net/isc-bind/Makefile @@ -2,7 +2,7 @@ COMMENT= Berkeley Internet Name Daemon: DNS server and tools # Second digits: odd numbers devel, even numbers stable, # ESV branched occasionally. 9.18.x is ESV. -V= 9.18.18 +V= 9.18.19 SUBST_VARS+= V PORTROACH= limitw:1,even EXTRACT_SUFX= .tar.xz diff --git a/net/isc-bind/distinfo b/net/isc-bind/distinfo index 180c0c15a..05eda402b 100644 --- a/net/isc-bind/distinfo +++ b/net/isc-bind/distinfo @@ -1,2 +1,2 @@ -SHA256 (bind-9.18.18.tar.xz) = 1zXNwSemxXCb3kdbW/FvohM/Nv26IC98PDfRNOUZIWA= -SIZE (bind-9.18.18.tar.xz) = 5490428 +SHA256 (bind-9.18.19.tar.xz) = EV4JwFQ5vrreHScu2gj6iOs7YBKe3vaQWIyHpNJ2Esw= +SIZE (bind-9.18.19.tar.xz) = 5508464 diff --git a/net/mautrix-whatsapp/Makefile b/net/mautrix-whatsapp/Makefile index 4e948b956..40cb0cadb 100644 --- a/net/mautrix-whatsapp/Makefile +++ b/net/mautrix-whatsapp/Makefile @@ -1,6 +1,6 @@ COMMENT = matrix-WhatsApp puppeting bridge -MODGO_VERSION = v0.10.1 +MODGO_VERSION = v0.10.2 MODGO_MODNAME = maunium.net/go/mautrix-whatsapp DISTNAME = mautrix-whatsapp-${MODGO_VERSION} diff --git a/net/mautrix-whatsapp/distinfo b/net/mautrix-whatsapp/distinfo index fececcae4..4254c1702 100644 --- a/net/mautrix-whatsapp/distinfo +++ b/net/mautrix-whatsapp/distinfo @@ -201,7 +201,7 @@ SHA256 (go_modules/maunium.net/go/maulogger/v2/@v/v2.4.1.mod) = UaR297ZfR4YSLC1i SHA256 (go_modules/maunium.net/go/maulogger/v2/@v/v2.4.1.zip) = 9+1m2Ab6zyA1Pv0pC16yNDQS7U+Te7YnG230R7dIPKA= SHA256 (go_modules/maunium.net/go/mautrix/@v/v0.16.1.mod) = zjLNoI881AXYgAhKlnXcTOuNolambuSjswzWFmTn3D4= SHA256 (go_modules/maunium.net/go/mautrix/@v/v0.16.1.zip) = wh5KP+b3SPh6eKAkDt6VPsFE+Uqon60/FUuyJ1zSHu4= -SHA256 (mautrix-whatsapp-v0.10.1.zip) = ZeUN6zHH4W9CyihkiaUDg5yVgREYRrvejQA2eedPdlg= +SHA256 (mautrix-whatsapp-v0.10.2.zip) = wGEoOIiJOgqxRgT1p7o3mHZoGqN/fR3fg2uWd7te6nY= SIZE (go_modules/filippo.io/edwards25519/@v/v1.0.0.mod) = 40 SIZE (go_modules/filippo.io/edwards25519/@v/v1.0.0.zip) = 48930 SIZE (go_modules/github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.5.0.mod) = 38 @@ -405,4 +405,4 @@ SIZE (go_modules/maunium.net/go/maulogger/v2/@v/v2.4.1.mod) = 423 SIZE (go_modules/maunium.net/go/maulogger/v2/@v/v2.4.1.zip) = 16363 SIZE (go_modules/maunium.net/go/mautrix/@v/v0.16.1.mod) = 1049 SIZE (go_modules/maunium.net/go/mautrix/@v/v0.16.1.zip) = 351903 -SIZE (mautrix-whatsapp-v0.10.1.zip) = 195027 +SIZE (mautrix-whatsapp-v0.10.2.zip) = 195065 diff --git a/net/ngtcp2/Makefile b/net/ngtcp2/Makefile index 4e777170a..e485cb5c3 100644 --- a/net/ngtcp2/Makefile +++ b/net/ngtcp2/Makefile @@ -1,10 +1,10 @@ COMMENT= implementation of the RFC 9000 QUIC protocol -V= 0.14.1 +V= 0.19.1 DISTNAME= ngtcp2-$V -SHARED_LIBS += ngtcp2 2.0 # 11.0 -SHARED_LIBS += ngtcp2_crypto_openssl 0.0 # 4.0 +SHARED_LIBS+= ngtcp2 3.0 # 15.1 +SHARED_LIBS+= ngtcp2_crypto_quictls 0.0 # 1.0 CATEGORIES= net diff --git a/net/ngtcp2/distinfo b/net/ngtcp2/distinfo index e766d61d7..0fa7e1427 100644 --- a/net/ngtcp2/distinfo +++ b/net/ngtcp2/distinfo @@ -1,2 +1,2 @@ -SHA256 (ngtcp2-0.14.1.tar.gz) = lq6MvFmggAY7u7y7YnSA975c0YCuGyXYgJXJX8FjG2U= -SIZE (ngtcp2-0.14.1.tar.gz) = 1015886 +SHA256 (ngtcp2-0.19.1.tar.gz) = UUBdsUuk5JZNm5ZDo95WD55A0IhMMWFk7F8PfjO8R1Y= +SIZE (ngtcp2-0.19.1.tar.gz) = 1026624 diff --git a/net/ngtcp2/pkg/PLIST b/net/ngtcp2/pkg/PLIST index f9c510918..f89a74209 100644 --- a/net/ngtcp2/pkg/PLIST +++ b/net/ngtcp2/pkg/PLIST @@ -1,15 +1,15 @@ include/ngtcp2/ include/ngtcp2/ngtcp2.h include/ngtcp2/ngtcp2_crypto.h -include/ngtcp2/ngtcp2_crypto_openssl.h +include/ngtcp2/ngtcp2_crypto_quictls.h include/ngtcp2/version.h @static-lib lib/libngtcp2.a lib/libngtcp2.la @lib lib/libngtcp2.so.${LIBngtcp2_VERSION} -@static-lib lib/libngtcp2_crypto_openssl.a -lib/libngtcp2_crypto_openssl.la -@lib lib/libngtcp2_crypto_openssl.so.${LIBngtcp2_crypto_openssl_VERSION} +@static-lib lib/libngtcp2_crypto_quictls.a +lib/libngtcp2_crypto_quictls.la +@lib lib/libngtcp2_crypto_quictls.so.${LIBngtcp2_crypto_quictls_VERSION} lib/pkgconfig/libngtcp2.pc -lib/pkgconfig/libngtcp2_crypto_openssl.pc +lib/pkgconfig/libngtcp2_crypto_quictls.pc share/doc/ngtcp2/ share/doc/ngtcp2/README.rst diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile index a8bcd8a58..d742398e6 100644 --- a/net/openconnect/Makefile +++ b/net/openconnect/Makefile @@ -1,7 +1,7 @@ COMMENT= client for Cisco AnyConnect SSL VPN DISTNAME= openconnect-8.20 -REVISION= 3 +REVISION= 4 SHARED_LIBS += openconnect 4.5 # 5.6 @@ -57,7 +57,7 @@ CONFIGURE_ARGS+= --without-libpcsclite \ .else WANTLIB += ssl ltdl pcsclite proxy pskc xmlsec1 xslt WANTLIB += crypto curl duktape gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl pcre2-8 +WANTLIB += nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls pcre2-8 LIB_DEPENDS+= net/libproxy>=0.4.6p7 \ security/oath-toolkit,-pskc \ security/pcsc-lite diff --git a/net/py-dnspython/Makefile b/net/py-dnspython/Makefile index 5ca3f6a85..ca0b56922 100644 --- a/net/py-dnspython/Makefile +++ b/net/py-dnspython/Makefile @@ -1,30 +1,27 @@ -COMMENT= DNS toolkit for Python +COMMENT= DNS toolkit for Python # see net/py2-dnspython for py2 version -MODPY_EGG_VERSION= 2.1.0 -DISTNAME= dnspython-${MODPY_EGG_VERSION} -EXTRACT_SUFX= .zip -MASTER_SITES= ${HOMEPAGE}kits/${MODPY_EGG_VERSION}/ -PKGNAME= py-${DISTNAME} -CATEGORIES= net -REVISION= 2 +MODPY_EGG_VERSION= 2.4.2 +DISTNAME= dnspython-${MODPY_EGG_VERSION} +PKGNAME= py-${DISTNAME} +CATEGORIES= net -HOMEPAGE= https://www.dnspython.org/ +HOMEPAGE= https://www.dnspython.org/ # BSD -PERMIT_PACKAGE= Yes +PERMIT_PACKAGE= Yes -FLAVORS= python3 -FLAVOR= python3 +FLAVORS= python3 +FLAVOR= python3 -MODULES= lang/python -MODPY_PI= Yes -MODPY_PYBUILD= poetry-core -MODPY_ADJ_FILES= examples/*.py +MODULES= lang/python +MODPY_PI= Yes +MODPY_PYBUILD= poetry-core +MODPY_ADJ_FILES= examples/*.py -TEST_DEPENDS= security/py-ecdsa${MODPY_FLAVOR} +TEST_DEPENDS= security/py-ecdsa${MODPY_FLAVOR} -TEST_ENV+= PYTHONPATH="${WRKSRC}" +#TEST_ENV+= PYTHONPATH="${WRKSRC}" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${MODPY_PY_PREFIX}dnspython diff --git a/net/py-dnspython/distinfo b/net/py-dnspython/distinfo index d42a956a6..9cb110f18 100644 --- a/net/py-dnspython/distinfo +++ b/net/py-dnspython/distinfo @@ -1,2 +1,2 @@ -SHA256 (dnspython-2.1.0.zip) = 5Kh/C1cyAaDzcn+hilFrBV/REH4OVHfN7Uot5JffHdQ= -SIZE (dnspython-2.1.0.zip) = 389021 +SHA256 (dnspython-2.4.2.tar.gz) = jc+ujHRgovhLQHLibxyfQQHKIMBxZJy3w06LapPViYQ= +SIZE (dnspython-2.4.2.tar.gz) = 328126 diff --git a/net/py-dnspython/patches/patch-dns_resolver_py b/net/py-dnspython/patches/patch-dns_resolver_py index 7ac71347d..3eec9d49a 100644 --- a/net/py-dnspython/patches/patch-dns_resolver_py +++ b/net/py-dnspython/patches/patch-dns_resolver_py @@ -1,12 +1,12 @@ -openbsd doesn't have v4mapped +openbsd doesn't support v4mapped Index: dns/resolver.py --- dns/resolver.py.orig +++ dns/resolver.py -@@ -1410,7 +1410,7 @@ def _getaddrinfo(host=None, service=None, family=socke +@@ -1841,7 +1841,7 @@ def _getaddrinfo( + # reasons. We will also do this short circuit below if we # discover that the host is an address literal. - return _original_getaddrinfo(host, service, family, socktype, proto, - flags) + return _original_getaddrinfo(host, service, family, socktype, proto, flags) - if flags & (socket.AI_ADDRCONFIG | socket.AI_V4MAPPED) != 0: + if flags & (socket.AI_ADDRCONFIG) != 0: # Not implemented. We raise a gaierror as opposed to a diff --git a/net/py-dnspython/patches/patch-pyproject_toml b/net/py-dnspython/patches/patch-pyproject_toml deleted file mode 100644 index 85ff11fae..000000000 --- a/net/py-dnspython/patches/patch-pyproject_toml +++ /dev/null @@ -1,11 +0,0 @@ -Index: pyproject.toml ---- pyproject.toml.orig -+++ pyproject.toml -@@ -36,5 +36,5 @@ trio = ['trio'] - curio = ['curio', 'sniffio'] - - [build-system] --requires = ["poetry>=0.12"] --build-backend = "poetry.masonry.api" -+requires = ["poetry-core>=0.12"] -+build-backend = "poetry.core.masonry.api" diff --git a/net/py-dnspython/pkg/PLIST b/net/py-dnspython/pkg/PLIST index 902013263..2a1742aa1 100644 --- a/net/py-dnspython/pkg/PLIST +++ b/net/py-dnspython/pkg/PLIST @@ -7,10 +7,8 @@ lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncbackend.${MOD lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncbackend.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncio_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncio_backend.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_curio_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} -lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_curio_backend.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_immutable_attr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} -lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_immutable_attr.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_ddr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_ddr.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_immutable_ctx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_immutable_ctx.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_trio_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -23,6 +21,8 @@ lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncresolver.${MOD lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncresolver.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}dnssec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}dnssec.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}dnssectypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}dnssectypes.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}e164.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}e164.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}edns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -51,6 +51,8 @@ lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}name.${MODPY_PYC_MA lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}name.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}namedict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}namedict.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}nameserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}nameserver.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}opcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -95,6 +97,8 @@ lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}version.${MODPY_PYC lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}versioned.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}versioned.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}win32util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}win32util.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}wire.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}wire.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}xfr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -103,16 +107,41 @@ lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zone.${MODPY_PYC_MA lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zone.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zonefile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zonefile.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zonetypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zonetypes.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/_asyncbackend.py lib/python${MODPY_VERSION}/site-packages/dns/_asyncio_backend.py -lib/python${MODPY_VERSION}/site-packages/dns/_curio_backend.py -lib/python${MODPY_VERSION}/site-packages/dns/_immutable_attr.py +lib/python${MODPY_VERSION}/site-packages/dns/_ddr.py lib/python${MODPY_VERSION}/site-packages/dns/_immutable_ctx.py lib/python${MODPY_VERSION}/site-packages/dns/_trio_backend.py lib/python${MODPY_VERSION}/site-packages/dns/asyncbackend.py lib/python${MODPY_VERSION}/site-packages/dns/asyncquery.py lib/python${MODPY_VERSION}/site-packages/dns/asyncresolver.py lib/python${MODPY_VERSION}/site-packages/dns/dnssec.py +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/ +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}cryptography.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}cryptography.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}dsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}dsa.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}ecdsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}ecdsa.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}eddsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}eddsa.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}rsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/${MODPY_PYCACHE}rsa.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/base.py +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/cryptography.py +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/dsa.py +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/ecdsa.py +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/eddsa.py +lib/python${MODPY_VERSION}/site-packages/dns/dnssecalgs/rsa.py +lib/python${MODPY_VERSION}/site-packages/dns/dnssectypes.py lib/python${MODPY_VERSION}/site-packages/dns/e164.py lib/python${MODPY_VERSION}/site-packages/dns/edns.py lib/python${MODPY_VERSION}/site-packages/dns/entropy.py @@ -127,10 +156,28 @@ lib/python${MODPY_VERSION}/site-packages/dns/ipv6.py lib/python${MODPY_VERSION}/site-packages/dns/message.py lib/python${MODPY_VERSION}/site-packages/dns/name.py lib/python${MODPY_VERSION}/site-packages/dns/namedict.py +lib/python${MODPY_VERSION}/site-packages/dns/nameserver.py lib/python${MODPY_VERSION}/site-packages/dns/node.py lib/python${MODPY_VERSION}/site-packages/dns/opcode.py lib/python${MODPY_VERSION}/site-packages/dns/py.typed lib/python${MODPY_VERSION}/site-packages/dns/query.py +lib/python${MODPY_VERSION}/site-packages/dns/quic/ +lib/python${MODPY_VERSION}/site-packages/dns/quic/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}_asyncio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}_asyncio.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}_common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}_common.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}_sync.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}_sync.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}_trio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/quic/${MODPY_PYCACHE}_trio.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/quic/_asyncio.py +lib/python${MODPY_VERSION}/site-packages/dns/quic/_common.py +lib/python${MODPY_VERSION}/site-packages/dns/quic/_sync.py +lib/python${MODPY_VERSION}/site-packages/dns/quic/_trio.py lib/python${MODPY_VERSION}/site-packages/dns/rcode.py lib/python${MODPY_VERSION}/site-packages/dns/rdata.py lib/python${MODPY_VERSION}/site-packages/dns/rdataclass.py @@ -157,8 +204,12 @@ lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/GPOS.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/HINFO.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/HIP.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/ISDN.py +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/L32.py +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/L64.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/LOC.py +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/LP.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/MX.py +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NID.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NINFO.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NS.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NSEC.py @@ -180,6 +231,7 @@ lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/TSIG.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/TXT.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/URI.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/X25.py +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/ZONEMD.py lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AFSDB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -220,10 +272,18 @@ lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}HIP.${M lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}HIP.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}ISDN.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}ISDN.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}L32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}L32.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}L64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}L64.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}LOC.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}LOC.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}LP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}LP.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}MX.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}MX.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NID.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NID.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NINFO.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NINFO.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -266,6 +326,8 @@ lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}URI.${M lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}URI.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}X25.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}X25.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}ZONEMD.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}ZONEMD.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/CH/ @@ -368,10 +430,12 @@ lib/python${MODPY_VERSION}/site-packages/dns/ttl.py lib/python${MODPY_VERSION}/site-packages/dns/update.py lib/python${MODPY_VERSION}/site-packages/dns/version.py lib/python${MODPY_VERSION}/site-packages/dns/versioned.py +lib/python${MODPY_VERSION}/site-packages/dns/win32util.py lib/python${MODPY_VERSION}/site-packages/dns/wire.py lib/python${MODPY_VERSION}/site-packages/dns/xfr.py lib/python${MODPY_VERSION}/site-packages/dns/zone.py lib/python${MODPY_VERSION}/site-packages/dns/zonefile.py +lib/python${MODPY_VERSION}/site-packages/dns/zonetypes.py lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/ lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/LICENSE lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/METADATA @@ -380,10 +444,14 @@ lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-inf share/examples/${MODPY_PY_PREFIX}dnspython/ share/examples/${MODPY_PY_PREFIX}dnspython/async_dns.py share/examples/${MODPY_PY_PREFIX}dnspython/ddns.py +share/examples/${MODPY_PY_PREFIX}dnspython/ddr.py share/examples/${MODPY_PY_PREFIX}dnspython/doh-json.py share/examples/${MODPY_PY_PREFIX}dnspython/doh.py +share/examples/${MODPY_PY_PREFIX}dnspython/doq.py share/examples/${MODPY_PY_PREFIX}dnspython/e164.py share/examples/${MODPY_PY_PREFIX}dnspython/ecs.py +share/examples/${MODPY_PY_PREFIX}dnspython/edns.py +share/examples/${MODPY_PY_PREFIX}dnspython/edns_resolver.py share/examples/${MODPY_PY_PREFIX}dnspython/mx.py share/examples/${MODPY_PY_PREFIX}dnspython/name.py share/examples/${MODPY_PY_PREFIX}dnspython/query_specific.py diff --git a/net/seafile/seafile/Makefile b/net/seafile/seafile/Makefile index bb6ee2260..68d9a99ab 100644 --- a/net/seafile/seafile/Makefile +++ b/net/seafile/seafile/Makefile @@ -5,12 +5,13 @@ GH_PROJECT = seafile # this commit is from the "v8.0.10" tag GH_COMMIT = 20d59479163492eb309c90499011ab508a4f1ecb DISTNAME = seafile-daemon-9.0.10pl20230410 +REVISION = 0 SHARED_LIBS = seafile 4.0 WANTLIB += c crypto curl event_core event_extra event_pthreads WANTLIB += execinfo ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += iconv intl jansson m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += iconv intl jansson m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += pcre2-8 pthread searpc sqlite3 ssl uuid websockets z WANTLIB += lib/inotify/inotify diff --git a/security/openssl/3.1/Makefile b/security/openssl/3.1/Makefile index 6c58d2c5d..b603c8c36 100644 --- a/security/openssl/3.1/Makefile +++ b/security/openssl/3.1/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= no-asm INSTALL_TARGET= install_sw install_ssldirs install_man_docs -SUBST_VARS+= MAN_PREFIX SHLIBVER +SUBST_VARS+= SHLIBVER # install to unusual directory name - this port is *not* intended to be # picked up by configure scripts without explicitly CPPFLAGS/LDFLAGS. diff --git a/security/rust-openssl-tests/Makefile b/security/rust-openssl-tests/Makefile index 233b5894f..d422ba9b5 100644 --- a/security/rust-openssl-tests/Makefile +++ b/security/rust-openssl-tests/Makefile @@ -1,12 +1,12 @@ COMMENT = source of the rust-openssl crate for regression testing # Follows HEAD -VERSION = 20230914 +VERSION = 20230919 DISTNAME = rust-openssl-tests-${VERSION} GH_ACCOUNT = sfackler GH_PROJECT = rust-openssl -GH_COMMIT = f9907087a788191b87432c6b8bf8fc60c55f153a +GH_COMMIT = 2f269c9ecd262bb5f4a9e78524449788d7d33de0 CATEGORIES = security devel diff --git a/security/rust-openssl-tests/crates.inc b/security/rust-openssl-tests/crates.inc index ff258cc42..29d1417aa 100644 --- a/security/rust-openssl-tests/crates.inc +++ b/security/rust-openssl-tests/crates.inc @@ -1,4 +1,4 @@ -MODCARGO_CRATES += aho-corasick 1.0.5 # Unlicense OR MIT +MODCARGO_CRATES += aho-corasick 1.1.0 # Unlicense OR MIT MODCARGO_CRATES += bindgen 0.64.0 # BSD-3-Clause MODCARGO_CRATES += bitflags 1.3.2 # MIT/Apache-2.0 MODCARGO_CRATES += bitflags 2.4.0 # MIT OR Apache-2.0 @@ -34,7 +34,7 @@ MODCARGO_CRATES += memchr 2.6.3 # Unlicense OR MIT MODCARGO_CRATES += minimal-lexical 0.2.1 # MIT/Apache-2.0 MODCARGO_CRATES += nom 7.1.3 # MIT MODCARGO_CRATES += once_cell 1.18.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += openssl-src 300.1.3+3.1.2 # MIT/Apache-2.0 +MODCARGO_CRATES += openssl-src 300.1.5+3.1.3 # MIT/Apache-2.0 MODCARGO_CRATES += peeking_take_while 0.1.2 # Apache-2.0/MIT MODCARGO_CRATES += pkg-config 0.3.27 # MIT OR Apache-2.0 MODCARGO_CRATES += proc-macro2 1.0.67 # MIT OR Apache-2.0 @@ -51,10 +51,10 @@ MODCARGO_CRATES += ryu 1.0.15 # Apache-2.0 OR BSL-1.0 MODCARGO_CRATES += semver 1.0.18 # MIT OR Apache-2.0 MODCARGO_CRATES += serde 1.0.188 # MIT OR Apache-2.0 MODCARGO_CRATES += serde_derive 1.0.188 # MIT OR Apache-2.0 -MODCARGO_CRATES += serde_json 1.0.106 # MIT OR Apache-2.0 +MODCARGO_CRATES += serde_json 1.0.107 # MIT OR Apache-2.0 MODCARGO_CRATES += shlex 1.2.0 # MIT OR Apache-2.0 MODCARGO_CRATES += syn 1.0.109 # MIT OR Apache-2.0 -MODCARGO_CRATES += syn 2.0.33 # MIT OR Apache-2.0 +MODCARGO_CRATES += syn 2.0.37 # MIT OR Apache-2.0 MODCARGO_CRATES += term 0.6.1 # MIT/Apache-2.0 MODCARGO_CRATES += thiserror 1.0.48 # MIT OR Apache-2.0 MODCARGO_CRATES += thiserror-impl 1.0.48 # MIT OR Apache-2.0 diff --git a/security/rust-openssl-tests/distinfo b/security/rust-openssl-tests/distinfo index 3dd6dff4f..d3d86cb8c 100644 --- a/security/rust-openssl-tests/distinfo +++ b/security/rust-openssl-tests/distinfo @@ -1,4 +1,4 @@ -SHA256 (cargo/aho-corasick-1.0.5.tar.gz) = DDeNeEI/2tgIlhb4J1Ju4zwZ8v3b1d4WKRUslZO6R4M= +SHA256 (cargo/aho-corasick-1.1.0.tar.gz) = DyE1Vj+1xgnSsrh8HoznvEGwtFQw+pZh9FeYFQPdW/A= SHA256 (cargo/bindgen-0.64.0.tar.gz) = xCQ+YDEmDbd+3pethsJ+UB1kaierV7WaV09yXZirH7Q= SHA256 (cargo/bitflags-1.3.2.tar.gz) = vvONRRY8Lx3eCUp9/TPM9ZXJKQXI+PT9wY0G+xA3cYo= SHA256 (cargo/bitflags-2.4.0.tar.gz) = tGgq5ih/z3Uuyqu/zHtvm3KqM5M9wjpVTYU66o7qhjU= @@ -34,7 +34,7 @@ SHA256 (cargo/memchr-2.6.3.tar.gz) = jyMtbvcH4ZVqQzQmk9KjHnKYlVTVgpnXqIc4zJWw01w SHA256 (cargo/minimal-lexical-0.2.1.tar.gz) = aDVMXGvTbXP/P+zrBe+lm2rLdiZhf0livjIqgl5h95o= SHA256 (cargo/nom-7.1.3.tar.gz) = 0nOYPFplenCj6PKgEymCLzuMgXK3OCZBGlV1HkBKCko= SHA256 (cargo/once_cell-1.18.0.tar.gz) = 3Ytd0q5e1xRixUAli+3LUZZRI61+fM9LmoyvqkpjV20= -SHA256 (cargo/openssl-src-300.1.3+3.1.2.tar.gz) = zSwQGhZf/5k1403vRmlZWrHHhHlDxCvobiFQPkgr4Qc= +SHA256 (cargo/openssl-src-300.1.5+3.1.3.tar.gz) = VZBo5MEpUNfcqhhXphclwNONT8A/+OBwqzGnXW4xZJE= SHA256 (cargo/peeking_take_while-0.1.2.tar.gz) = GbF83b5+w/i8gAiHurXnFzSMleosoLG/CDf7lk3GcJk= SHA256 (cargo/pkg-config-0.3.27.tar.gz) = JgcoYLqSTL+pjqOcjBm03WpKJUI9vfIZweypGqDPaWQ= SHA256 (cargo/proc-macro2-1.0.67.tar.gz) = PUM9nxo+jBJj2UVlmLFv7Gb0rMmnTaz/01x7sJs6Eyg= @@ -51,10 +51,10 @@ SHA256 (cargo/ryu-1.0.15.tar.gz) = GtTMjaTvcj7WC87SARgdg3ka1DMhPYwk7//aHuyF10E= SHA256 (cargo/semver-1.0.18.tar.gz) = sCk7Synar0hyhFKcwvVnW45Xxh9wFnukFaRjZR/WqRg= SHA256 (cargo/serde-1.0.188.tar.gz) = z54Py6aaNw7tYbzytyhXX3JrULVcungGR1PXCN3HVJ4= SHA256 (cargo/serde_derive-1.0.188.tar.gz) = Tsp6xkLYKqNbYASabsy0vmvnXlmb0umttfh1pzdlSvI= -SHA256 (cargo/serde_json-1.0.106.tar.gz) = LMZqYZ7YC/eg9rF90GOoS4j23qGBNzfPRprvHQgRQsI= +SHA256 (cargo/serde_json-1.0.107.tar.gz) = a0IM5uPYvYgumyQ8bu0128mmEQyXaedLWE4NaNHyDGU= SHA256 (cargo/shlex-1.2.0.tar.gz) = p87gUpptQPWA56XmxJXI+/4ht7Unle1LteYs35K8Y4A= SHA256 (cargo/syn-1.0.109.tar.gz) = crZBkbJ1tm/+JGnorywc/juvpntSnq15Km0BYIiLQjc= -SHA256 (cargo/syn-2.0.33.tar.gz) = nK7OcMY7+6Kewv7YQaCYUbFKI1xgAQ+k3lgIm2wCVmg= +SHA256 (cargo/syn-2.0.37.tar.gz) = cwPvLAXNZUGGyyUNKQSaJIQMol0nR8JcA4HI2eL1gug= SHA256 (cargo/term-0.6.1.tar.gz) = wIY6M0XnD2HWE+qzLuBGzNG8xfkQX+QCxh/NDBPuuLU= SHA256 (cargo/thiserror-1.0.48.tar.gz) = nW16dAuKZmp+go3QDanA3CkN/1MVTqd6wQkoHekFibc= SHA256 (cargo/thiserror-impl-1.0.48.tar.gz) = SZIuyuZsyKJJt35o0dBiPBssUU8AYMJ83Gi9YqEhnTU= @@ -75,8 +75,8 @@ SHA256 (cargo/windows_i686_msvc-0.48.5.tar.gz) = j1XCM/cMSyf2bFI1gPePEATotai2WeB SHA256 (cargo/windows_x86_64_gnu-0.48.5.tar.gz) = U9QKvSWD0j5HGP3fHr7ITb/4OBwHyuZ/93aLvxnGcY4= SHA256 (cargo/windows_x86_64_gnullvm-0.48.5.tar.gz) = C3tSdnhooj1bq3aOOQ3F9cVYJbbTC4bIRP8tx0FARMw= SHA256 (cargo/windows_x86_64_msvc-0.48.5.tar.gz) = 7ZT85hVxpABoUrc4mgY6uYPALrG7N7R/gnLOktBtlTg= -SHA256 (rust-openssl-tests-20230914-f9907087.tar.gz) = XxQF+Oiujt2P8aGujI3kdMIDrsP6zGobMPciw8aXTbw= -SIZE (cargo/aho-corasick-1.0.5.tar.gz) = 172064 +SHA256 (rust-openssl-tests-20230919-2f269c9e.tar.gz) = S2LcFtqFfK2pXNI7Z+4BRoWsDwJmooCdvy5l/ixeGvg= +SIZE (cargo/aho-corasick-1.1.0.tar.gz) = 182697 SIZE (cargo/bindgen-0.64.0.tar.gz) = 204700 SIZE (cargo/bitflags-1.3.2.tar.gz) = 23021 SIZE (cargo/bitflags-2.4.0.tar.gz) = 36954 @@ -112,7 +112,7 @@ SIZE (cargo/memchr-2.6.3.tar.gz) = 94377 SIZE (cargo/minimal-lexical-0.2.1.tar.gz) = 94841 SIZE (cargo/nom-7.1.3.tar.gz) = 117570 SIZE (cargo/once_cell-1.18.0.tar.gz) = 32969 -SIZE (cargo/openssl-src-300.1.3+3.1.2.tar.gz) = 8823710 +SIZE (cargo/openssl-src-300.1.5+3.1.3.tar.gz) = 8829668 SIZE (cargo/peeking_take_while-0.1.2.tar.gz) = 6697 SIZE (cargo/pkg-config-0.3.27.tar.gz) = 18838 SIZE (cargo/proc-macro2-1.0.67.tar.gz) = 43683 @@ -129,10 +129,10 @@ SIZE (cargo/ryu-1.0.15.tar.gz) = 46906 SIZE (cargo/semver-1.0.18.tar.gz) = 29703 SIZE (cargo/serde-1.0.188.tar.gz) = 76230 SIZE (cargo/serde_derive-1.0.188.tar.gz) = 55563 -SIZE (cargo/serde_json-1.0.106.tar.gz) = 146672 +SIZE (cargo/serde_json-1.0.107.tar.gz) = 146458 SIZE (cargo/shlex-1.2.0.tar.gz) = 6584 SIZE (cargo/syn-1.0.109.tar.gz) = 237611 -SIZE (cargo/syn-2.0.33.tar.gz) = 242543 +SIZE (cargo/syn-2.0.37.tar.gz) = 243250 SIZE (cargo/term-0.6.1.tar.gz) = 37578 SIZE (cargo/thiserror-1.0.48.tar.gz) = 18862 SIZE (cargo/thiserror-impl-1.0.48.tar.gz) = 15096 @@ -153,4 +153,4 @@ SIZE (cargo/windows_i686_msvc-0.48.5.tar.gz) = 864300 SIZE (cargo/windows_x86_64_gnu-0.48.5.tar.gz) = 801619 SIZE (cargo/windows_x86_64_gnullvm-0.48.5.tar.gz) = 418486 SIZE (cargo/windows_x86_64_msvc-0.48.5.tar.gz) = 798412 -SIZE (rust-openssl-tests-20230914-f9907087.tar.gz) = 350170 +SIZE (rust-openssl-tests-20230919-2f269c9e.tar.gz) = 350172 diff --git a/security/rust-openssl-tests/pkg/PLIST b/security/rust-openssl-tests/pkg/PLIST index 8153d21cd..43001be39 100644 --- a/security/rust-openssl-tests/pkg/PLIST +++ b/security/rust-openssl-tests/pkg/PLIST @@ -35,14 +35,15 @@ share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/nfa/mod.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/nfa/noncontiguous.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/ share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/api.rs +share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/ext.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/mod.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/pattern.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/rabinkarp.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/teddy/ share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/teddy/README.md -share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/teddy/compile.rs +share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/teddy/builder.rs +share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/teddy/generic.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/teddy/mod.rs -share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/teddy/runtime.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/tests.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/packed/vector.rs share/rust-openssl-tests/modcargo-crates/${VER_aho-corasick}/src/tests.rs @@ -2828,113 +2829,113 @@ share/rust-openssl-tests/modcargo-crates/syn-1.0.109/tests/test_token_trees.rs share/rust-openssl-tests/modcargo-crates/syn-1.0.109/tests/test_ty.rs share/rust-openssl-tests/modcargo-crates/syn-1.0.109/tests/test_visibility.rs share/rust-openssl-tests/modcargo-crates/syn-1.0.109/tests/zzz_stable.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/.cargo-checksum.json -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/Cargo.toml -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/Cargo.toml.orig -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/LICENSE-APACHE -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/LICENSE-MIT -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/README.md -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/benches/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/benches/file.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/benches/rust.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/attr.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/bigint.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/buffer.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/custom_keyword.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/custom_punctuation.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/data.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/derive.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/discouraged.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/drops.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/error.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/export.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/expr.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/ext.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/file.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/clone.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/debug.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/eq.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/fold.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/hash.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/visit.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/visit_mut.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen_helper.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/generics.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/group.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/ident.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/item.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/lib.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/lifetime.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/lit.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/lookahead.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/mac.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/macros.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/meta.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/op.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/parse.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/parse_macro_input.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/parse_quote.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/pat.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/path.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/print.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/punctuated.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/restriction.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/sealed.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/span.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/spanned.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/stmt.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/thread.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/token.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/tt.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/ty.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/verbatim.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/whitespace.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/common/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/common/eq.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/common/mod.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/common/parse.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/debug/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/debug/gen.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/debug/mod.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/macros/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/macros/mod.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/regression/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/regression.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/regression/issue1108.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/regression/issue1235.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/repo/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/repo/mod.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/repo/progress.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_asyncness.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_attribute.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_derive_input.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_expr.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_generics.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_grouping.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_ident.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_item.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_iterators.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_lit.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_meta.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_parse_buffer.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_parse_stream.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_pat.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_path.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_precedence.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_receiver.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_round_trip.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_shebang.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_should_parse.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_size.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_stmt.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_token_trees.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_ty.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_visibility.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/zzz_stable.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/.cargo-checksum.json +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/Cargo.toml +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/Cargo.toml.orig +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/LICENSE-APACHE +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/LICENSE-MIT +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/README.md +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/benches/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/benches/file.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/benches/rust.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/attr.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/bigint.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/buffer.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/custom_keyword.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/custom_punctuation.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/data.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/derive.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/discouraged.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/drops.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/error.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/export.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/expr.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/ext.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/file.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/gen/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/gen/clone.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/gen/debug.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/gen/eq.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/gen/fold.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/gen/hash.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/gen/visit.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/gen/visit_mut.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/gen_helper.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/generics.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/group.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/ident.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/item.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/lib.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/lifetime.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/lit.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/lookahead.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/mac.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/macros.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/meta.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/op.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/parse.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/parse_macro_input.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/parse_quote.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/pat.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/path.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/print.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/punctuated.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/restriction.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/sealed.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/span.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/spanned.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/stmt.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/thread.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/token.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/tt.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/ty.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/verbatim.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/src/whitespace.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/common/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/common/eq.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/common/mod.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/common/parse.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/debug/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/debug/gen.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/debug/mod.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/macros/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/macros/mod.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/regression/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/regression.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/regression/issue1108.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/regression/issue1235.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/repo/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/repo/mod.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/repo/progress.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_asyncness.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_attribute.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_derive_input.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_expr.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_generics.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_grouping.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_ident.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_item.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_iterators.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_lit.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_meta.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_parse_buffer.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_parse_stream.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_pat.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_path.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_precedence.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_receiver.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_round_trip.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_shebang.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_should_parse.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_size.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_stmt.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_token_trees.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_ty.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/test_visibility.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.37/tests/zzz_stable.rs share/rust-openssl-tests/modcargo-crates/${VER_term}/ share/rust-openssl-tests/modcargo-crates/${VER_term}/.cargo-checksum.json share/rust-openssl-tests/modcargo-crates/${VER_term}/.gitignore diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile index 1ec3701ef..e8a4fd0e5 100644 --- a/security/sshguard/Makefile +++ b/security/sshguard/Makefile @@ -1,17 +1,18 @@ COMMENT= protect against brute force attacks on sshd and others -DISTNAME= sshguard-2.4.2 +DISTNAME= sshguard-2.4.3 CATEGORIES= security HOMEPAGE= https://www.sshguard.net/ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sshguard/} +SITES= ${SITE_SOURCEFORGE:=sshguard/} -MAINTAINER= Andreas Kusalananda Kahari +MAINTAINER= Stuart Henderson # BSD PERMIT_PACKAGE= Yes +# uses pledge() WANTLIB+= c pthread CONFIGURE_STYLE=gnu diff --git a/security/sshguard/distinfo b/security/sshguard/distinfo index e8296cd0b..fb502d6eb 100644 --- a/security/sshguard/distinfo +++ b/security/sshguard/distinfo @@ -1,2 +1,2 @@ -SHA256 (sshguard-2.4.2.tar.gz) = J3C3duXqcKm+3+xP2E1XQAr6kn8PdSKHDS3LvhrON+g= -SIZE (sshguard-2.4.2.tar.gz) = 835431 +SHA256 (sshguard-2.4.3.tar.gz) = ZAKd7/bekP3u+x9JfUFPDkBFB2aTqR2hpw63WV6X7+s= +SIZE (sshguard-2.4.3.tar.gz) = 1118756 diff --git a/security/sshguard/patches/patch-doc_sshguard_8 b/security/sshguard/patches/patch-doc_sshguard_8 index 6f24e622c..871151995 100644 --- a/security/sshguard/patches/patch-doc_sshguard_8 +++ b/security/sshguard/patches/patch-doc_sshguard_8 @@ -1,7 +1,7 @@ Index: doc/sshguard.8 --- doc/sshguard.8.orig +++ doc/sshguard.8 -@@ -119,8 +119,8 @@ Set to enable verbose output from sshg\-blocker. +@@ -124,8 +124,8 @@ Set to enable verbose output from \fBsshg\-blocker\fP\ .SH FILES .INDENT 0.0 .TP diff --git a/security/sshguard/patches/patch-src_common_sandbox_c b/security/sshguard/patches/patch-src_common_sandbox_c new file mode 100644 index 000000000..092e2bbdf --- /dev/null +++ b/security/sshguard/patches/patch-src_common_sandbox_c @@ -0,0 +1,9 @@ +Index: src/common/sandbox.c +--- src/common/sandbox.c.orig ++++ src/common/sandbox.c +@@ -1,3 +1,5 @@ ++#include ++#include + #include "config.h" + #include "sandbox.h" + diff --git a/security/sshguard/patches/patch-src_parser_attack_scanner_l b/security/sshguard/patches/patch-src_parser_attack_scanner_l new file mode 100644 index 000000000..8aa0ad7ac --- /dev/null +++ b/security/sshguard/patches/patch-src_parser_attack_scanner_l @@ -0,0 +1,12 @@ +Index: src/parser/attack_scanner.l +--- src/parser/attack_scanner.l.orig ++++ src/parser/attack_scanner.l +@@ -249,7 +249,7 @@ HTTP_LOGIN_200OK_BAD .*({WORDPRESS_LOGIN}|{TYPO3 + "]".* { BEGIN(INITIAL); return SENDMAIL_AUTHFAILURE_SUFF; } + + /* dovecot */ +-("(libdovecot."[0-9\.]+".dylib) ")?(imap|pop3|submission)"-login: ""Info: "?("Aborted login"|Disconnected).*" (auth failed, "{NUMBER}" attempts".*"): ".+" rip=" { BEGIN(dovecot_loginerr); return DOVECOT_IMAP_LOGINERR_PREF; } ++("(libdovecot."[0-9\.]+".dylib) "|"dovecot: ")?(imap|pop3|submission)"-login: ""Info: "?("Aborted login"|Disconnected).*" (auth failed, "{NUMBER}" attempts".*"): ".+" rip=" { BEGIN(dovecot_loginerr); return DOVECOT_IMAP_LOGINERR_PREF; } + ", lip=".+ { BEGIN(INITIAL); return DOVECOT_IMAP_LOGINERR_SUFF; } + + /* UWimap login errors */ diff --git a/security/sshguard/patches/patch-src_parser_tests_txt b/security/sshguard/patches/patch-src_parser_tests_txt new file mode 100644 index 000000000..4cfd9bd25 --- /dev/null +++ b/security/sshguard/patches/patch-src_parser_tests_txt @@ -0,0 +1,13 @@ +Index: src/parser/tests.txt +--- src/parser/tests.txt.orig ++++ src/parser/tests.txt +@@ -231,6 +231,9 @@ M + imap-login: Aborted login (auth failed, 6 attempts): XYZ rip=2001:db8::a11:beef:7ac0, lip=127.0.0.1 + 210 2001:db8::a11:beef:7ac0 6 10 + M ++dovecot: imap-login: Disconnected: Aborted login by logging out (auth failed, 2 attempts in 4 secs): XYZ, method=PLAIN, rip=192.0.2.1, lip=192.168.41.21, TLS, session=, TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) ++210 192.0.2.1 4 10 ++M + 2019-10-15 08:08:52 imap-login: Info: Disconnected (auth failed, 1 attempts in 2 secs): user=, method=PLAIN, rip=172.21.0.1, lip=172.21.0.3, TLS, session=<1MyTfu0USIqsFQAB> + 210 172.21.0.1 4 10 + M diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 47c3f3986..f1a6fe43f 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -6,7 +6,7 @@ COMMENT= light-weight system monitor GH_ACCOUNT= brndnmtthws GH_PROJECT= conky GH_TAGNAME= 1.9.0 -REVISION= 23 +REVISION= 24 # remove after updating: DISTFILES= conky_0-{}${GH_TAGNAME}.tar.gz @@ -17,7 +17,7 @@ CATEGORIES= sysutils PERMIT_PACKAGE= Yes WANTLIB += ${MODLUA_WANTLIB} X11-xcb c crypto curl curses glib-2.0 iconv -WANTLIB += intl kvm lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += intl kvm lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += ossaudio pcre2-8 pthread ssl xcb-shm xml2 z MODULES= lang/lua diff --git a/sysutils/google-cloud-sdk/Makefile b/sysutils/google-cloud-sdk/Makefile index 5e2dcc841..e599deb02 100644 --- a/sysutils/google-cloud-sdk/Makefile +++ b/sysutils/google-cloud-sdk/Makefile @@ -1,6 +1,6 @@ COMMENT= manage resources on Google Cloud Platform -V= 446.0.1 +V= 447.0.0 DISTNAME= google-cloud-sdk-${V}-linux-x86 PKGNAME= google-cloud-sdk-${V} WRKDIST= ${WRKDIR}/google-cloud-sdk diff --git a/sysutils/google-cloud-sdk/distinfo b/sysutils/google-cloud-sdk/distinfo index 1d70e8c47..76b36382f 100644 --- a/sysutils/google-cloud-sdk/distinfo +++ b/sysutils/google-cloud-sdk/distinfo @@ -1,2 +1,2 @@ -SHA256 (google-cloud-sdk-446.0.1-linux-x86.tar.gz) = b6kesOuSAu8KJuMUCaCBeL8SO/hJNG+CMs2PJJwVla4= -SIZE (google-cloud-sdk-446.0.1-linux-x86.tar.gz) = 116779847 +SHA256 (google-cloud-sdk-447.0.0-linux-x86.tar.gz) = DifBkUhl0kIidtNiDxdww53a7b+VKShtXTHw1KBEq3s= +SIZE (google-cloud-sdk-447.0.0-linux-x86.tar.gz) = 114547139 diff --git a/sysutils/google-cloud-sdk/patches/patch-lib_googlecloudsdk_core_updater_local_state_py b/sysutils/google-cloud-sdk/patches/patch-lib_googlecloudsdk_core_updater_local_state_py index 74ff376e9..fc791fd6f 100644 --- a/sysutils/google-cloud-sdk/patches/patch-lib_googlecloudsdk_core_updater_local_state_py +++ b/sysutils/google-cloud-sdk/patches/patch-lib_googlecloudsdk_core_updater_local_state_py @@ -3,7 +3,7 @@ Text from lib/googlecloudsdk/core/updater/update_manager.py. Index: lib/googlecloudsdk/core/updater/local_state.py --- lib/googlecloudsdk/core/updater/local_state.py.orig +++ lib/googlecloudsdk/core/updater/local_state.py -@@ -55,10 +55,13 @@ class InvalidSDKRootError(Error): +@@ -54,10 +54,13 @@ class InvalidSDKRootError(Error): def __init__(self): super(InvalidSDKRootError, self).__init__( diff --git a/sysutils/google-cloud-sdk/pkg/PLIST b/sysutils/google-cloud-sdk/pkg/PLIST index 3a1b33f67..f46718e31 100644 --- a/sysutils/google-cloud-sdk/pkg/PLIST +++ b/sysutils/google-cloud-sdk/pkg/PLIST @@ -435,12 +435,6 @@ google-cloud-sdk/lib/googlecloudsdk/api_lib/billing/${MODPY_PYCACHE}billing_clie google-cloud-sdk/lib/googlecloudsdk/api_lib/billing/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/api_lib/billing/billing_client.py google-cloud-sdk/lib/googlecloudsdk/api_lib/billing/utils.py -google-cloud-sdk/lib/googlecloudsdk/api_lib/blockchainnodeengine/ -google-cloud-sdk/lib/googlecloudsdk/api_lib/blockchainnodeengine/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/api_lib/blockchainnodeengine/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/googlecloudsdk/api_lib/blockchainnodeengine/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/api_lib/blockchainnodeengine/${MODPY_PYCACHE}api_util.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/api_lib/blockchainnodeengine/api_util.py google-cloud-sdk/lib/googlecloudsdk/api_lib/bms/ google-cloud-sdk/lib/googlecloudsdk/api_lib/bms/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/api_lib/bms/${MODPY_PYCACHE}/ @@ -7765,16 +7759,6 @@ google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/ google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1/blockchainnodeengine_v1_client.py google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1/blockchainnodeengine_v1_messages.py google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1/resources.py -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/ -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/${MODPY_PYCACHE}blockchainnodeengine_v1alpha1_client.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/${MODPY_PYCACHE}blockchainnodeengine_v1alpha1_messages.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/blockchainnodeengine_v1alpha1_client.py -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/blockchainnodeengine_v1alpha1_messages.py -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/blockchainnodeengine/v1alpha1/resources.py google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/certificatemanager/ google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/certificatemanager/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/certificatemanager/${MODPY_PYCACHE}/ @@ -12144,6 +12128,7 @@ google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/HttpRouteRo google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/HttpRouteRouteRule.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/HttpRouteURLRewrite.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/LabelsValue.yaml +google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/LbRouteExtension.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/LbServiceSteeringExtension.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/LbTrafficExtension.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/LogConfig.yaml @@ -12170,6 +12155,7 @@ google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/Secret.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/ServiceGraph.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/ServiceLbPolicy.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/ServiceLbPolicyAutoCapacityDrain.yaml +google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/ServiceLbPolicyFailoverConfig.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/SetValue.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/TcpRoute.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/TcpRouteRouteAction.yaml @@ -12188,11 +12174,17 @@ google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1alpha1/UrlRewrite. google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/ google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/EndpointMatcher.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/EndpointPolicy.yaml +google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/ExtensionChain.yaml +google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/ExtensionChainExtension.yaml +google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/ExtensionChainMatchCondition.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/LabelsValue.yaml +google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/LbRouteExtension.yaml +google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/LbTrafficExtension.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/MetadataLabelMatcher.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/MetadataLabels.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/ServiceLbPolicy.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/ServiceLbPolicyAutoCapacityDrain.yaml +google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/ServiceLbPolicyFailoverConfig.yaml google-cloud-sdk/lib/googlecloudsdk/schemas/networkservices/v1beta1/TrafficPortSelector.yaml google-cloud-sdk/lib/googlecloudsdk/third_party/ google-cloud-sdk/lib/googlecloudsdk/third_party/__init__.py @@ -14540,6 +14532,12 @@ ${MODPY_COMMENT}google-cloud-sdk/lib/surface/cbrs_spectrum_access/${MODPY_PYCACH google-cloud-sdk/lib/surface/cbrs_spectrum_access/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/cbrs_spectrum_access/${MODPY_PYCACHE}migrate.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/cbrs_spectrum_access/${MODPY_PYCACHE}provision.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/cbrs_spectrum_access/analytics/ +google-cloud-sdk/lib/surface/cbrs_spectrum_access/analytics/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/cbrs_spectrum_access/analytics/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/cbrs_spectrum_access/analytics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/cbrs_spectrum_access/analytics/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/cbrs_spectrum_access/analytics/setup.py google-cloud-sdk/lib/surface/cbrs_spectrum_access/migrate.py google-cloud-sdk/lib/surface/cbrs_spectrum_access/provision.py google-cloud-sdk/lib/surface/certificate_manager/ @@ -14901,6 +14899,7 @@ google-cloud-sdk/lib/surface/compute/backend_services/${MODPY_PYCACHE}get_health google-cloud-sdk/lib/surface/compute/backend_services/${MODPY_PYCACHE}get_iam_policy.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/compute/backend_services/${MODPY_PYCACHE}import.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/compute/backend_services/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/compute/backend_services/${MODPY_PYCACHE}list_usable.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/compute/backend_services/${MODPY_PYCACHE}remove_backend.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/compute/backend_services/${MODPY_PYCACHE}remove_iam_policy_binding.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/compute/backend_services/${MODPY_PYCACHE}remove_service_bindings.${MODPY_PYC_MAGIC_TAG}pyc @@ -14922,6 +14921,7 @@ google-cloud-sdk/lib/surface/compute/backend_services/get_health.py google-cloud-sdk/lib/surface/compute/backend_services/get_iam_policy.py google-cloud-sdk/lib/surface/compute/backend_services/import.py google-cloud-sdk/lib/surface/compute/backend_services/list.py +google-cloud-sdk/lib/surface/compute/backend_services/list_usable.py google-cloud-sdk/lib/surface/compute/backend_services/remove_backend.py google-cloud-sdk/lib/surface/compute/backend_services/remove_iam_policy_binding.py google-cloud-sdk/lib/surface/compute/backend_services/remove_service_bindings.py @@ -16065,8 +16065,10 @@ ${MODPY_COMMENT}google-cloud-sdk/lib/surface/compute/project_zonal_metadata/${MO google-cloud-sdk/lib/surface/compute/project_zonal_metadata/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/compute/project_zonal_metadata/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/compute/project_zonal_metadata/${MODPY_PYCACHE}describe.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/compute/project_zonal_metadata/${MODPY_PYCACHE}remove.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/compute/project_zonal_metadata/add.py google-cloud-sdk/lib/surface/compute/project_zonal_metadata/describe.py +google-cloud-sdk/lib/surface/compute/project_zonal_metadata/remove.py google-cloud-sdk/lib/surface/compute/public_advertised_prefixes/ google-cloud-sdk/lib/surface/compute/public_advertised_prefixes/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/compute/public_advertised_prefixes/${MODPY_PYCACHE}/ @@ -17611,6 +17613,14 @@ google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/${ google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/${MODPY_PYCACHE}set.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/remove.py google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/set.py +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/templates/ +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/templates/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/templates/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/templates/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/templates/${MODPY_PYCACHE}disable.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/templates/${MODPY_PYCACHE}enable.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/templates/disable.py +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/templates/enable.py google-cloud-sdk/lib/surface/container/fleet/policycontroller/deployment/ google-cloud-sdk/lib/surface/container/fleet/policycontroller/deployment/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/container/fleet/policycontroller/deployment/${MODPY_PYCACHE}/ @@ -22032,10 +22042,14 @@ ${MODPY_COMMENT}google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODP google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}create.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}delete.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}describe.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/create.py google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/delete.py +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/describe.py google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/list.py +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/update.py google-cloud-sdk/lib/surface/netapp/backup_vaults/create.py google-cloud-sdk/lib/surface/netapp/backup_vaults/delete.py google-cloud-sdk/lib/surface/netapp/backup_vaults/describe.py @@ -22434,10 +22448,12 @@ google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/ google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/${MODPY_PYCACHE}/ google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/add_app_vpc.yaml google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/create.yaml google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/delete.yaml google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/describe.yaml google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/list.yaml +google-cloud-sdk/lib/surface/network_security/secure_service_edge/gateways/remove_app_vpc.yaml google-cloud-sdk/lib/surface/network_security/secure_service_edge/partner/ google-cloud-sdk/lib/surface/network_security/secure_service_edge/partner/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/network_security/secure_service_edge/partner/${MODPY_PYCACHE}/ @@ -23762,17 +23778,26 @@ google-cloud-sdk/lib/surface/scc/operations/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/scc/operations/${MODPY_PYCACHE}/ google-cloud-sdk/lib/surface/scc/operations/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/scc/operations/describe.yaml +google-cloud-sdk/lib/surface/scc/posture_deployments/ +google-cloud-sdk/lib/surface/scc/posture_deployments/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/scc/posture_deployments/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/scc/posture_deployments/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/scc/posture_deployments/describe.yaml google-cloud-sdk/lib/surface/scc/posture_templates/ google-cloud-sdk/lib/surface/scc/posture_templates/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/scc/posture_templates/${MODPY_PYCACHE}/ google-cloud-sdk/lib/surface/scc/posture_templates/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/scc/posture_templates/describe.yaml +google-cloud-sdk/lib/surface/scc/posture_templates/list.yaml google-cloud-sdk/lib/surface/scc/postures/ google-cloud-sdk/lib/surface/scc/postures/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/scc/postures/${MODPY_PYCACHE}/ google-cloud-sdk/lib/surface/scc/postures/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/scc/postures/create.yaml +google-cloud-sdk/lib/surface/scc/postures/delete.yaml google-cloud-sdk/lib/surface/scc/postures/describe.yaml +google-cloud-sdk/lib/surface/scc/postures/extract.yaml +google-cloud-sdk/lib/surface/scc/postures/update.yaml google-cloud-sdk/lib/surface/scc/settings/ google-cloud-sdk/lib/surface/scc/settings/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/scc/settings/${MODPY_PYCACHE}/ @@ -24010,6 +24035,14 @@ google-cloud-sdk/lib/surface/service_extensions/ google-cloud-sdk/lib/surface/service_extensions/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/service_extensions/${MODPY_PYCACHE}/ google-cloud-sdk/lib/surface/service_extensions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/service_extensions/lb_route_extensions/ +google-cloud-sdk/lib/surface/service_extensions/lb_route_extensions/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/service_extensions/lb_route_extensions/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/service_extensions/lb_route_extensions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/service_extensions/lb_route_extensions/delete.yaml +google-cloud-sdk/lib/surface/service_extensions/lb_route_extensions/describe.yaml +google-cloud-sdk/lib/surface/service_extensions/lb_route_extensions/import.yaml +google-cloud-sdk/lib/surface/service_extensions/lb_route_extensions/list.yaml google-cloud-sdk/lib/surface/service_extensions/lb_service_steering_extensions/ google-cloud-sdk/lib/surface/service_extensions/lb_service_steering_extensions/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/service_extensions/lb_service_steering_extensions/${MODPY_PYCACHE}/ @@ -24033,7 +24066,6 @@ google-cloud-sdk/lib/surface/services/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC google-cloud-sdk/lib/surface/services/${MODPY_PYCACHE}disable.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/services/${MODPY_PYCACHE}enable.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/services/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/surface/services/${MODPY_PYCACHE}list_group_members.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/services/api_keys/ google-cloud-sdk/lib/surface/services/api_keys/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/services/api_keys/${MODPY_PYCACHE}/ @@ -24056,6 +24088,12 @@ google-cloud-sdk/lib/surface/services/api_keys/undelete.py google-cloud-sdk/lib/surface/services/api_keys/update.py google-cloud-sdk/lib/surface/services/disable.py google-cloud-sdk/lib/surface/services/enable.py +google-cloud-sdk/lib/surface/services/groups/ +google-cloud-sdk/lib/surface/services/groups/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/services/groups/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/services/groups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/services/groups/${MODPY_PYCACHE}list_members.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/services/groups/list_members.py google-cloud-sdk/lib/surface/services/identity/ google-cloud-sdk/lib/surface/services/identity/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/services/identity/${MODPY_PYCACHE}/ @@ -24063,7 +24101,6 @@ google-cloud-sdk/lib/surface/services/identity/${MODPY_PYCACHE}__init__.${MODPY_ google-cloud-sdk/lib/surface/services/identity/${MODPY_PYCACHE}create.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/services/identity/create.py google-cloud-sdk/lib/surface/services/list.py -google-cloud-sdk/lib/surface/services/list_group_members.py google-cloud-sdk/lib/surface/services/operations/ google-cloud-sdk/lib/surface/services/operations/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/services/operations/${MODPY_PYCACHE}/ @@ -24082,6 +24119,14 @@ google-cloud-sdk/lib/surface/services/peered_dns_domains/${MODPY_PYCACHE}list.${ google-cloud-sdk/lib/surface/services/peered_dns_domains/create.py google-cloud-sdk/lib/surface/services/peered_dns_domains/delete.py google-cloud-sdk/lib/surface/services/peered_dns_domains/list.py +google-cloud-sdk/lib/surface/services/policies/ +google-cloud-sdk/lib/surface/services/policies/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/services/policies/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/services/policies/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/services/policies/${MODPY_PYCACHE}check.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/services/policies/${MODPY_PYCACHE}get_effective.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/services/policies/check.py +google-cloud-sdk/lib/surface/services/policies/get_effective.py google-cloud-sdk/lib/surface/services/quota/ google-cloud-sdk/lib/surface/services/quota/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/services/quota/${MODPY_PYCACHE}/ diff --git a/sysutils/sblim-sfcc/Makefile b/sysutils/sblim-sfcc/Makefile index 328ee05fc..32d28e0be 100644 --- a/sysutils/sblim-sfcc/Makefile +++ b/sysutils/sblim-sfcc/Makefile @@ -4,6 +4,7 @@ GH_ACCOUNT= kkaempf GH_PROJECT= sblim-sfcc GH_TAGNAME= SFCC_2_2_8 PKGNAME= sblim-sfcc-2.2.8 +REVISION= 0 SHARED_LIBS += cimcClientXML 0.0 # 0.0 SHARED_LIBS += cimcclient 0.0 # 0.0 @@ -14,7 +15,7 @@ CATEGORIES= sysutils # Eclipse Public License v1.0 PERMIT_PACKAGE= Yes -WANTLIB += crypto curl nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += crypto curl nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += pthread ssl z AUTOCONF_VERSION= 2.71 diff --git a/sysutils/wsmancli/Makefile b/sysutils/wsmancli/Makefile index b69ec253a..738681568 100644 --- a/sysutils/wsmancli/Makefile +++ b/sysutils/wsmancli/Makefile @@ -3,6 +3,7 @@ COMMENT= command line client to run WS-Management requests GH_ACCOUNT= Openwsman GH_PROJECT= wsmancli GH_TAGNAME= v2.6.2 +REVISION= 0 CATEGORIES= sysutils @@ -12,7 +13,7 @@ HOMEPAGE= https://github.com/Openwsman/openwsman/wiki/openwsman-command-line-cli # BSD PERMIT_PACKAGE= Yes -WANTLIB += c crypto curl iconv lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += c crypto curl iconv lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += pthread ssl wsman wsman_client wsman_curl_client_transport WANTLIB += xml2 z diff --git a/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile index 976211554..6b95aa43b 100644 --- a/textproc/py-vobject/Makefile +++ b/textproc/py-vobject/Makefile @@ -3,17 +3,15 @@ COMMENT= iCalendar library for Python MODPY_EGG_VERSION= 0.9.6.1 DISTNAME= vobject-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} -REVISION= 7 +REVISION= 8 CATEGORIES= textproc devel -HOMEPAGE= http://eventable.github.io/vobject/ +HOMEPAGE= https://eventable.github.io/vobject/ # Apache2 PERMIT_PACKAGE= Yes -MASTER_SITES= ${HOMEPAGE} - MODULES= lang/python MODPY_PI= Yes diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile index b085990a7..00fe75f86 100755 --- a/textproc/raptor/Makefile +++ b/textproc/raptor/Makefile @@ -2,7 +2,7 @@ COMMENT= RDF Parser Toolkit for Redland DISTNAME= raptor2-2.0.16 PKGNAME= ${DISTNAME:C/raptor2/raptor/} CATEGORIES= textproc -REVISION= 0 +REVISION= 1 SHARED_LIBS += raptor2 0.1 # 0.0 @@ -17,7 +17,7 @@ PERMIT_PACKAGE= Yes COMPILER= base-clang ports-gcc WANTLIB += ${COMPILER_LIBCXX} c crypto curl iconv icudata icuuc -WANTLIB += lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += lzma m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += ssl xml2 xslt yajl z LIB_DEPENDS= devel/libyajl \ diff --git a/textproc/sword/Makefile b/textproc/sword/Makefile index f0eaea95c..a83fe6fd2 100644 --- a/textproc/sword/Makefile +++ b/textproc/sword/Makefile @@ -3,6 +3,7 @@ COMMENT= Crosswire's Bible study utility V= 1.9.0 DISTNAME= sword-${V} CATEGORIES= textproc books +REVISION= 0 MASTER_SITES= https://crosswire.org/ftpmirror/pub/sword/source/v${V:R}/ MASTER_SITES0= https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ @@ -22,7 +23,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} c clucene-core clucene-shared crypto WANTLIB += curl icudata icui18n icuio icuuc m nghttp2 nghttp3 -WANTLIB += ngtcp2 ngtcp2_crypto_openssl ssl xapian z +WANTLIB += ngtcp2 ngtcp2_crypto_quictls ssl xapian z COMPILER= base-clang ports-gcc diff --git a/www/nghttp3/Makefile b/www/nghttp3/Makefile index 675b40110..1dd9bc569 100644 --- a/www/nghttp3/Makefile +++ b/www/nghttp3/Makefile @@ -1,9 +1,9 @@ COMMENT= implementation of HTTP/3 -V= 0.11.0 +V= 0.15.0 DISTNAME= nghttp3-$V -SHARED_LIBS += nghttp3 1.0 # 6.0 +SHARED_LIBS += nghttp3 2.0 # 9.0 CATEGORIES= www diff --git a/www/nghttp3/distinfo b/www/nghttp3/distinfo index 9fcbd4827..b86978e78 100644 --- a/www/nghttp3/distinfo +++ b/www/nghttp3/distinfo @@ -1,2 +1,2 @@ -SHA256 (nghttp3-0.11.0.tar.gz) = R0JMAkzVPELRwjBQL5KCH/X03HfCreALtWxcRDX7JCE= -SIZE (nghttp3-0.11.0.tar.gz) = 589973 +SHA256 (nghttp3-0.15.0.tar.gz) = PFbZ+m8bWLN717G1Pq8WzXERi8LVytvJBPCdb2RmtC8= +SIZE (nghttp3-0.15.0.tar.gz) = 591088 diff --git a/www/py-quixote/Makefile b/www/py-quixote/Makefile index ee01a6916..9dff92b31 100644 --- a/www/py-quixote/Makefile +++ b/www/py-quixote/Makefile @@ -8,7 +8,6 @@ REVISION= 0 CATEGORIES= www HOMEPAGE= http://quixote.ca/ -MASTER_SITES= ${HOMEPAGE}releases/ # MIT PERMIT_PACKAGE= Yes diff --git a/x11/gnome/libsecret/Makefile b/x11/gnome/libsecret/Makefile index d606a3d38..b25000793 100644 --- a/x11/gnome/libsecret/Makefile +++ b/x11/gnome/libsecret/Makefile @@ -1,7 +1,7 @@ COMMENT= library for storing and retrieving passwords and secrets GNOME_PROJECT= libsecret -GNOME_VERSION= 0.21.0 +GNOME_VERSION= 0.21.1 SHARED_LIBS += secret-1 2.2 # 0.0.0 diff --git a/x11/gnome/libsecret/distinfo b/x11/gnome/libsecret/distinfo index d0f53d2e2..703f69e8d 100644 --- a/x11/gnome/libsecret/distinfo +++ b/x11/gnome/libsecret/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/libsecret-0.21.0.tar.xz) = JzWynRzA5bErqQvuiL0hd0rI20rhpLcW9GxAnBmhRhM= -SIZE (gnome/libsecret-0.21.0.tar.xz) = 190320 +SHA256 (gnome/libsecret-0.21.1.tar.xz) = Z09RMjpfdOTLfjJ32mi1r93TM+yiW8n9LYIKkpcvkLE= +SIZE (gnome/libsecret-0.21.1.tar.xz) = 190796 diff --git a/x11/wxSVG/Makefile b/x11/wxSVG/Makefile index 81fc8c126..8279369dc 100644 --- a/x11/wxSVG/Makefile +++ b/x11/wxSVG/Makefile @@ -5,7 +5,7 @@ EPOCH= 0 CATEGORIES= x11 graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxsvg/} EXTRACT_SUFX= .tar.bz2 -REVISION= 1 +REVISION= 2 SHARED_LIBS += wxsvg 4.1 # 15.6 @@ -25,7 +25,7 @@ WANTLIB += expat ffi fontconfig freetype fribidi gcrypt gdk-3 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += gpg-error graphite2 gsm gspell-1 gthread-2.0 gtk-3 WANTLIB += harfbuzz iconv icudata icuuc intl jpeg lzma m mp3lame -WANTLIB += mspack nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += mspack nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls WANTLIB += notify ogg opus pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre2-32 pcre2-8 pixman-1 png samplerate secret-1 sndio WANTLIB += speex ssl swresample swscale theoradec theoraenc tiff diff --git a/x11/xfce4/tumbler/Makefile b/x11/xfce4/tumbler/Makefile index 42751c641..aae6b4abb 100644 --- a/x11/xfce4/tumbler/Makefile +++ b/x11/xfce4/tumbler/Makefile @@ -2,7 +2,7 @@ COMMENT= D-Bus thumbnailing service XFCE_PROJECT= tumbler XFCE_VERSION= 4.18.1 -REVISION= 0 +REVISION= 1 SHARED_LIBS+= tumbler-1 1.0 @@ -19,7 +19,7 @@ WANTLIB += vorbis xcb xcb-render xcb-shm xml2 z iconv intl WANTLIB += ${COMPILER_LIBCXX} ass avfilter fribidi unibreak WANTLIB += gsm mp3lame opus postproc speex swresample vorbisenc WANTLIB += vpx x264 x265 xfce4util xvidcore theoradec theoraenc zstd -WANTLIB += Xau Xdmcp vidstab nghttp3 ngtcp2 ngtcp2_crypto_openssl zimg +WANTLIB += Xau Xdmcp vidstab nghttp3 ngtcp2 ngtcp2_crypto_quictls zimg COMPILER = base-clang ports-gcc base-gcc diff --git a/x11/xfce4/xfce4-notifyd/Makefile b/x11/xfce4/xfce4-notifyd/Makefile index f8b56e7e0..42132cb98 100644 --- a/x11/xfce4/xfce4-notifyd/Makefile +++ b/x11/xfce4/xfce4-notifyd/Makefile @@ -1,6 +1,6 @@ COMMENT= Xfce4 notification daemon -XFCE_VERSION= 0.9.0 +XFCE_VERSION= 0.9.1 XFCE_GOODIE= xfce4-notifyd # GPLv2 @@ -18,6 +18,8 @@ CONFIGURE_ARGS = --enable-dbus-start-daemon \ --disable-sound \ --disable-wayland +FAKE_FLAGS = autostartdir=${PREFIX}/share/examples/xfce4-notifyd + WANTLIB += ICE SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage Xdmcp WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender WANTLIB += atk-1.0 atspi c cairo dbus-1 execinfo expat ffi fontconfig diff --git a/x11/xfce4/xfce4-notifyd/distinfo b/x11/xfce4/xfce4-notifyd/distinfo index e54f09df9..8aa891b39 100644 --- a/x11/xfce4/xfce4-notifyd/distinfo +++ b/x11/xfce4/xfce4-notifyd/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-notifyd-0.9.0.tar.bz2) = vkpum4+yim/BMheDy0ilt/FqTKn4nNkF8R8y5PLq2rw= -SIZE (xfce4/xfce4-notifyd-0.9.0.tar.bz2) = 727524 +SHA256 (xfce4/xfce4-notifyd-0.9.1.tar.bz2) = 7L4BdRW2xcOy8ogkUdNRoLZzXYAxMDnG3eIH3ZZTT+o= +SIZE (xfce4/xfce4-notifyd-0.9.1.tar.bz2) = 728342 diff --git a/x11/xfce4/xfce4-notifyd/pkg/PLIST b/x11/xfce4/xfce4-notifyd/pkg/PLIST index ef352e2dc..bed69f173 100644 --- a/x11/xfce4/xfce4-notifyd/pkg/PLIST +++ b/x11/xfce4/xfce4-notifyd/pkg/PLIST @@ -1,4 +1,5 @@ @bin bin/xfce4-notifyd-config +lib/systemd/user/xfce4-notifyd.service lib/xfce4/notifyd/ @bin lib/xfce4/notifyd/xfce4-notifyd @so lib/xfce4/panel/plugins/libnotification-plugin.so @@ -6,6 +7,9 @@ lib/xfce4/notifyd/ share/applications/xfce4-notifyd-config.desktop share/dbus-1/services/org.xfce.xfce4-notifyd.Notifications.service share/dbus-1/services/org.xfce.xfce4-notifyd.Notifyd.service +share/examples/xfce4-notifyd/ +share/examples/xfce4-notifyd/xfce4-notifyd.desktop +@sample ${SYSCONFDIR}/xdg/autostart/xfce4-notifyd.desktop share/icons/hicolor/16x16/apps/org.xfce.notification.png share/icons/hicolor/48x48/apps/org.xfce.notification.png share/icons/hicolor/scalable/apps/org.xfce.notification.svg