diff options
Diffstat (limited to '')
37 files changed, 815 insertions, 80 deletions
diff --git a/devel/Makefile b/devel/Makefile index c38c39ae2685..99d2342f9597 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4815,6 +4815,8 @@ SUBDIR += py-distributed SUBDIR += py-dj51-django-rq SUBDIR += py-dj51-strawberry-graphql + SUBDIR += py-dj52-django-rq + SUBDIR += py-dj52-strawberry-graphql SUBDIR += py-django-rq SUBDIR += py-dm-tree SUBDIR += py-docformatter diff --git a/devel/R-cran-reshape/Makefile b/devel/R-cran-reshape/Makefile index 8c59c0a56e34..3f235d296011 100644 --- a/devel/R-cran-reshape/Makefile +++ b/devel/R-cran-reshape/Makefile @@ -1,6 +1,5 @@ PORTNAME= reshape -PORTVERSION= 0.8.9 -PORTREVISION= 1 +PORTVERSION= 0.8.10 CATEGORIES= devel DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -10,10 +9,8 @@ WWW= http://had.co.nz/reshape/ LICENSE= MIT -CRAN_DEPENDS= R-cran-plyr>0:devel/R-cran-plyr -BUILD_DEPENDS= ${CRAN_DEPENDS} -RUN_DEPENDS= ${CRAN_DEPENDS} +RUN_DEPENDS= R-cran-plyr>0:devel/R-cran-plyr -USES= cran:auto-plist,compiles +USES= cran:auto-plist,compiles .include <bsd.port.mk> diff --git a/devel/R-cran-reshape/distinfo b/devel/R-cran-reshape/distinfo index da6f1daa78c4..4420877da89c 100644 --- a/devel/R-cran-reshape/distinfo +++ b/devel/R-cran-reshape/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650109378 -SHA256 (reshape_0.8.9.tar.gz) = 791178b3b5f30c166ebf5910a5ab1c67b54e7023b10b6c2e2ddd1cc02a1e4048 -SIZE (reshape_0.8.9.tar.gz) = 41843 +TIMESTAMP = 1750516602 +SHA256 (reshape_0.8.10.tar.gz) = 35ef6e8956520279f44d538c613ff9605bc594fed46133200d61937828fc6b64 +SIZE (reshape_0.8.10.tar.gz) = 42889 diff --git a/devel/aws-c-event-stream/Makefile b/devel/aws-c-event-stream/Makefile index f524574fdfd4..5ad0b0a8225a 100644 --- a/devel/aws-c-event-stream/Makefile +++ b/devel/aws-c-event-stream/Makefile @@ -1,6 +1,6 @@ PORTNAME= aws-c-event-stream DISTVERSIONPREFIX= v -DISTVERSION= 0.5.4 +DISTVERSION= 0.5.5 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/aws-c-event-stream/distinfo b/devel/aws-c-event-stream/distinfo index d946e3745d89..26589ffd1ce2 100644 --- a/devel/aws-c-event-stream/distinfo +++ b/devel/aws-c-event-stream/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1741359127 -SHA256 (awslabs-aws-c-event-stream-v0.5.4_GH0.tar.gz) = cef8b78e362836d15514110fb43a0a0c7a86b0a210d5fe25fd248a82027a7272 -SIZE (awslabs-aws-c-event-stream-v0.5.4_GH0.tar.gz) = 98545 +TIMESTAMP = 1750602901 +SHA256 (awslabs-aws-c-event-stream-v0.5.5_GH0.tar.gz) = f6e55c8fd6afd7f904e08d36c3210e199ece5dc838f0f8457b43b72ec4d818e9 +SIZE (awslabs-aws-c-event-stream-v0.5.5_GH0.tar.gz) = 99105 diff --git a/devel/hare/Makefile b/devel/hare/Makefile index 3aec11c3dbba..83efccc6129c 100644 --- a/devel/hare/Makefile +++ b/devel/hare/Makefile @@ -1,10 +1,8 @@ PORTNAME= hare -PORTVERSION= 0.24.2 +DISTVERSION= 0.25.2 CATEGORIES= devel -MASTER_SITES= https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/ +MASTER_SITES= https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ PKGNAMESUFFIX= -lang -DISTNAME= ${PORTVERSION} -DIST_SUBDIR= hare MAINTAINER= se@FreeBSD.org COMMENT= Hare language build system and standard library @@ -25,22 +23,25 @@ MAKE_ARGS= ARCH=${ARCH:S/^amd64$/x86_64/} \ DESTDIR=${STAGEDIR} \ HARECACHE=${WRKDIR}/.cache/hare \ PREFIX=${PREFIX} - -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTNAME} +TEST_TARGET= check OPTIONS_DEFINE= DOCS -do-build: - cd ${WRKSRC} && ${CP} configs/freebsd.mk config.mk - cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} - -do-install: - cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} install - ${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/* - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.md ${STAGEDIR}${DOCSDIR}/ - -do-test: - cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} check +post-patch: + @${REINPLACE_CMD} -e '\ + s|@$$(AS)|$$(AS)|g; \ + s|@$$(LD)|$$(LD)|g; \ + s|@$$(QBE)|$$(QBE)|g' \ + ${PATCH_WRKSRC}/Makefile + @${REINPLACE_CMD} -e '/printf/d' \ + ${PATCH_WRKSRC}/Makefile + +do-configure: + (cd ${WRKSRC} && ${CP} configs/freebsd.mk config.mk) + +post-install: + ${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/* + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.md ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/devel/hare/distinfo b/devel/hare/distinfo index 469a48777623..261a30f2c80a 100644 --- a/devel/hare/distinfo +++ b/devel/hare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1732550790 -SHA256 (hare/0.24.2.tar.gz) = afba69fd537a63442da53d115d9b50f525918159b395843ede2a5473323e0776 -SIZE (hare/0.24.2.tar.gz) = 912808 +TIMESTAMP = 1750617369 +SHA256 (hare-0.25.2.tar.gz) = d0baf74f4e20a3a875ddd8e2b299032ada4e5de17d8413053cad0f709446348e +SIZE (hare-0.25.2.tar.gz) = 940391 diff --git a/devel/hare/files/patch-configs_freebsd.mk b/devel/hare/files/patch-configs_freebsd.mk index 84de58e4d48b..97d62281f76d 100644 --- a/devel/hare/files/patch-configs_freebsd.mk +++ b/devel/hare/files/patch-configs_freebsd.mk @@ -1,18 +1,22 @@ ---- configs/freebsd.mk.orig 2024-02-16 09:48:20 UTC +--- configs/freebsd.mk.orig 2025-06-21 07:52:26 UTC +++ configs/freebsd.mk -@@ -1,15 +1,16 @@ +@@ -1,27 +1,28 @@ # install locations -PREFIX = /usr/local -BINDIR = $(PREFIX)/bin -MANDIR = $(PREFIX)/share/man -SRCDIR = $(PREFIX)/src -STDLIB = $(SRCDIR)/hare/stdlib -+#PREFIX = %%LOCALBASE%% -+BINDIR = $(PREFIX)/bin -+MANDIR = $(PREFIX)/share/man -+DATADIR = $(PREFIX)/share/hare -+SRCDIR = $(DATADIR)/src -+STDLIB = $(DATADIR)/stdlib +-LIBEXECDIR = $(PREFIX)/libexec +-TOOLDIR = $(LIBEXECDIR)/hare ++PREFIX ?= /usr/local ++BINDIR ?= $(PREFIX)/bin ++MANDIR ?= $(PREFIX)/share/man ++DATADIR ?= $(PREFIX)/share/hare ++SRCDIR ?= $(DATADIR)/src ++STDLIB ?= $(DATADIR)/stdlib ++LIBEXECDIR ?= $(PREFIX)/libexec ++TOOLDIR ?= $(LIBEXECDIR)/hare # variables used during build PLATFORM = freebsd @@ -22,15 +26,48 @@ +HARECFLAGS = -a ${ARCH} QBEFLAGS = ASFLAGS = - LDLINKFLAGS = --gc-sections -z noexecstack -@@ -26,7 +27,9 @@ BINOUT = .bin - BINOUT = .bin +-LDLINKFLAGS = --gc-sections -z noexecstack ++LDLINKFLAGS ?= --gc-sections -z noexecstack + + # commands used by the build script +-HAREC = harec +-QBE = qbe +-AS = as +-LD = ld +-SCDOC = scdoc ++HAREC ?= harec ++QBE ?= qbe ++AS ?= as ++LD ?= ld ++SCDOC ?= scdoc + + # build locations + HARECACHE = .cache +@@ -29,17 +30,17 @@ HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third- # variables that will be embedded in the binary with -D definitions --HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party -+#LOCALSRCDIR = ${SRCDIR}/local-src -+#HAREPATH = $(LOCALSRCDIR)/stdlib:$(LOCALSRCDIR)/third-party:$(DATADIR)/stdlib:$(DATADIR)/third-party -+HAREPATH = $(DATADIR)/stdlib:$(DATADIR)/third-party - VERSION=$$(./scripts/version) + HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party +-VERSION=$$(./scripts/version) ++VERSION ?= $$(./scripts/version) # For cross-compilation, modify the variables below +-AARCH64_AS=as +-AARCH64_CC=cc +-AARCH64_LD=ld ++AARCH64_AS ?= as ++AARCH64_CC ?= cc ++AARCH64_LD ?= ld + +-RISCV64_AS=as +-RISCV64_CC=cc +-RISCV64_LD=ld ++RISCV64_AS ?= as ++RISCV64_CC ?= cc ++RISCV64_LD ?= ld + +-X86_64_AS=as +-X86_64_CC=cc +-X86_64_LD=ld ++X86_64_AS ?= as ++X86_64_CC ?= cc ++X86_64_LD ?= ld diff --git a/devel/hare/pkg-plist b/devel/hare/pkg-plist index ffdaa6fbe051..5e12c4d3bbda 100644 --- a/devel/hare/pkg-plist +++ b/devel/hare/pkg-plist @@ -1,6 +1,5 @@ bin/hare bin/haredoc -%%PORTDOCS%%%%DOCSDIR%%/rfc.md %%PORTDOCS%%%%DOCSDIR%%/stdlib.md %%DATADIR%%/stdlib/ascii/README %%DATADIR%%/stdlib/ascii/ctype.ha @@ -130,17 +129,21 @@ bin/haredoc %%DATADIR%%/stdlib/crypto/rsa/+test/core_test.ha %%DATADIR%%/stdlib/crypto/rsa/+test/keys_test.ha %%DATADIR%%/stdlib/crypto/rsa/+test/pkcs1_test.ha +%%DATADIR%%/stdlib/crypto/rsa/+test/pss_test.ha %%DATADIR%%/stdlib/crypto/rsa/README %%DATADIR%%/stdlib/crypto/rsa/core.ha %%DATADIR%%/stdlib/crypto/rsa/errors.ha %%DATADIR%%/stdlib/crypto/rsa/keys.ha %%DATADIR%%/stdlib/crypto/rsa/pkcs1.ha +%%DATADIR%%/stdlib/crypto/rsa/pss.ha %%DATADIR%%/stdlib/crypto/salsa/+test.ha %%DATADIR%%/stdlib/crypto/salsa/README %%DATADIR%%/stdlib/crypto/salsa/salsa20.ha %%DATADIR%%/stdlib/crypto/sha1/+test.ha +%%DATADIR%%/stdlib/crypto/sha1/README %%DATADIR%%/stdlib/crypto/sha1/sha1.ha %%DATADIR%%/stdlib/crypto/sha256/+test.ha +%%DATADIR%%/stdlib/crypto/sha256/README %%DATADIR%%/stdlib/crypto/sha256/sha256.ha %%DATADIR%%/stdlib/crypto/sha512/+test.ha %%DATADIR%%/stdlib/crypto/sha512/README @@ -192,8 +195,12 @@ bin/haredoc %%DATADIR%%/stdlib/debug/image/self+netbsd.ha %%DATADIR%%/stdlib/debug/image/self+openbsd.ha %%DATADIR%%/stdlib/debug/image/self_argv.ha +%%DATADIR%%/stdlib/debug/malloc+libc.ha +%%DATADIR%%/stdlib/debug/malloc.ha +%%DATADIR%%/stdlib/debug/source.ha %%DATADIR%%/stdlib/debug/symbols.ha %%DATADIR%%/stdlib/debug/testaddr.ha +%%DATADIR%%/stdlib/debug/traces.ha %%DATADIR%%/stdlib/dirs/README %%DATADIR%%/stdlib/dirs/xdg.ha %%DATADIR%%/stdlib/encoding/README @@ -206,6 +213,7 @@ bin/haredoc %%DATADIR%%/stdlib/encoding/asn1/encoder.ha %%DATADIR%%/stdlib/encoding/asn1/errors.ha %%DATADIR%%/stdlib/encoding/asn1/oid.ha +%%DATADIR%%/stdlib/encoding/asn1/stdoid/README %%DATADIR%%/stdlib/encoding/asn1/stdoid/db.ha %%DATADIR%%/stdlib/encoding/asn1/stdoid/db.txt %%DATADIR%%/stdlib/encoding/asn1/strings.ha @@ -357,18 +365,22 @@ bin/haredoc %%DATADIR%%/stdlib/io/+freebsd/dup.ha %%DATADIR%%/stdlib/io/+freebsd/mmap.ha %%DATADIR%%/stdlib/io/+freebsd/platform_file.ha +%%DATADIR%%/stdlib/io/+freebsd/sync.ha %%DATADIR%%/stdlib/io/+freebsd/vector.ha %%DATADIR%%/stdlib/io/+linux/dup.ha %%DATADIR%%/stdlib/io/+linux/mmap.ha %%DATADIR%%/stdlib/io/+linux/platform_file.ha +%%DATADIR%%/stdlib/io/+linux/sync.ha %%DATADIR%%/stdlib/io/+linux/vector.ha %%DATADIR%%/stdlib/io/+netbsd/dup.ha %%DATADIR%%/stdlib/io/+netbsd/mmap.ha %%DATADIR%%/stdlib/io/+netbsd/platform_file.ha +%%DATADIR%%/stdlib/io/+netbsd/sync.ha %%DATADIR%%/stdlib/io/+netbsd/vector.ha %%DATADIR%%/stdlib/io/+openbsd/dup.ha %%DATADIR%%/stdlib/io/+openbsd/mmap.ha %%DATADIR%%/stdlib/io/+openbsd/platform_file.ha +%%DATADIR%%/stdlib/io/+openbsd/sync.ha %%DATADIR%%/stdlib/io/+openbsd/vector.ha %%DATADIR%%/stdlib/io/+test/limit_test.ha %%DATADIR%%/stdlib/io/+test/stream_test.ha @@ -389,7 +401,6 @@ bin/haredoc %%DATADIR%%/stdlib/io/zero.ha %%DATADIR%%/stdlib/linux/+linux/README %%DATADIR%%/stdlib/linux/+linux/env.ha -%%DATADIR%%/stdlib/linux/+linux/start+libc.ha %%DATADIR%%/stdlib/linux/+linux/start.ha %%DATADIR%%/stdlib/linux/keyctl/+linux/README %%DATADIR%%/stdlib/linux/keyctl/+linux/keyctl.ha @@ -459,6 +470,7 @@ bin/haredoc %%DATADIR%%/stdlib/net/ip/+linux.ha %%DATADIR%%/stdlib/net/ip/+netbsd.ha %%DATADIR%%/stdlib/net/ip/+openbsd.ha +%%DATADIR%%/stdlib/net/ip/README %%DATADIR%%/stdlib/net/ip/ip.ha %%DATADIR%%/stdlib/net/ip/test+test.ha %%DATADIR%%/stdlib/net/msg.ha @@ -466,6 +478,7 @@ bin/haredoc %%DATADIR%%/stdlib/net/tcp/+linux.ha %%DATADIR%%/stdlib/net/tcp/+netbsd.ha %%DATADIR%%/stdlib/net/tcp/+openbsd.ha +%%DATADIR%%/stdlib/net/tcp/README %%DATADIR%%/stdlib/net/tcp/listener.ha %%DATADIR%%/stdlib/net/tcp/options.ha %%DATADIR%%/stdlib/net/types.ha @@ -473,6 +486,7 @@ bin/haredoc %%DATADIR%%/stdlib/net/udp/+linux.ha %%DATADIR%%/stdlib/net/udp/+netbsd.ha %%DATADIR%%/stdlib/net/udp/+openbsd.ha +%%DATADIR%%/stdlib/net/udp/README %%DATADIR%%/stdlib/net/udp/options.ha %%DATADIR%%/stdlib/net/unix/+freebsd.ha %%DATADIR%%/stdlib/net/unix/+linux.ha @@ -495,6 +509,7 @@ bin/haredoc %%DATADIR%%/stdlib/os/+freebsd/exit+libc-test.ha %%DATADIR%%/stdlib/os/+freebsd/exit+test.ha %%DATADIR%%/stdlib/os/+freebsd/exit.ha +%%DATADIR%%/stdlib/os/+freebsd/fcntl.ha %%DATADIR%%/stdlib/os/+freebsd/fs.ha %%DATADIR%%/stdlib/os/+freebsd/memfd.ha %%DATADIR%%/stdlib/os/+freebsd/platform_environ.ha @@ -505,6 +520,7 @@ bin/haredoc %%DATADIR%%/stdlib/os/+linux/exit+libc-test.ha %%DATADIR%%/stdlib/os/+linux/exit+test.ha %%DATADIR%%/stdlib/os/+linux/exit.ha +%%DATADIR%%/stdlib/os/+linux/fcntl.ha %%DATADIR%%/stdlib/os/+linux/fs.ha %%DATADIR%%/stdlib/os/+linux/memfd.ha %%DATADIR%%/stdlib/os/+linux/memory.ha @@ -515,6 +531,7 @@ bin/haredoc %%DATADIR%%/stdlib/os/+netbsd/dirfdfs.ha %%DATADIR%%/stdlib/os/+netbsd/exit+test.ha %%DATADIR%%/stdlib/os/+netbsd/exit.ha +%%DATADIR%%/stdlib/os/+netbsd/fcntl.ha %%DATADIR%%/stdlib/os/+netbsd/fs.ha %%DATADIR%%/stdlib/os/+netbsd/platform_environ.ha %%DATADIR%%/stdlib/os/+netbsd/shm.ha @@ -523,12 +540,14 @@ bin/haredoc %%DATADIR%%/stdlib/os/+openbsd/dirfdfs.ha %%DATADIR%%/stdlib/os/+openbsd/exit+test.ha %%DATADIR%%/stdlib/os/+openbsd/exit.ha +%%DATADIR%%/stdlib/os/+openbsd/fcntl.ha %%DATADIR%%/stdlib/os/+openbsd/fs.ha %%DATADIR%%/stdlib/os/+openbsd/platform_environ.ha %%DATADIR%%/stdlib/os/+openbsd/shm.ha %%DATADIR%%/stdlib/os/+openbsd/status.ha %%DATADIR%%/stdlib/os/+openbsd/stdfd.ha %%DATADIR%%/stdlib/os/README +%%DATADIR%%/stdlib/os/bufio.ha %%DATADIR%%/stdlib/os/environ.ha %%DATADIR%%/stdlib/os/exec/+freebsd/exec.ha %%DATADIR%%/stdlib/os/exec/+freebsd/platform_cmd.ha @@ -544,6 +563,7 @@ bin/haredoc %%DATADIR%%/stdlib/os/exec/+openbsd/process.ha %%DATADIR%%/stdlib/os/exec/README %%DATADIR%%/stdlib/os/exec/cmd.ha +%%DATADIR%%/stdlib/os/exec/env+test.ha %%DATADIR%%/stdlib/os/exec/types.ha %%DATADIR%%/stdlib/os/os.ha %%DATADIR%%/stdlib/path/+freebsd.ha @@ -674,10 +694,10 @@ bin/haredoc %%DATADIR%%/stdlib/rt/+x86_64/longjmp.s %%DATADIR%%/stdlib/rt/+x86_64/setjmp.s %%DATADIR%%/stdlib/rt/README -%%DATADIR%%/stdlib/rt/abort+test.ha %%DATADIR%%/stdlib/rt/abort.ha %%DATADIR%%/stdlib/rt/ensure.ha %%DATADIR%%/stdlib/rt/fenv_defs.ha +%%DATADIR%%/stdlib/rt/heap-libc.ha %%DATADIR%%/stdlib/rt/jmp.ha %%DATADIR%%/stdlib/rt/malloc+debug.ha %%DATADIR%%/stdlib/rt/malloc+libc.ha @@ -696,17 +716,17 @@ bin/haredoc %%DATADIR%%/stdlib/sort/+test.ha %%DATADIR%%/stdlib/sort/README %%DATADIR%%/stdlib/sort/bisect.ha +%%DATADIR%%/stdlib/sort/cmp/README %%DATADIR%%/stdlib/sort/cmp/cmp.ha %%DATADIR%%/stdlib/sort/search.ha %%DATADIR%%/stdlib/sort/sort.ha %%DATADIR%%/stdlib/sort/types.ha %%DATADIR%%/stdlib/strconv/+test/ftos_test.ha %%DATADIR%%/stdlib/strconv/README +%%DATADIR%%/stdlib/strconv/decimal.ha %%DATADIR%%/stdlib/strconv/ftos.ha -%%DATADIR%%/stdlib/strconv/ftos_multiprecision.ha %%DATADIR%%/stdlib/strconv/ftos_ryu.ha %%DATADIR%%/stdlib/strconv/itos.ha -%%DATADIR%%/stdlib/strconv/numeric.ha %%DATADIR%%/stdlib/strconv/stof.ha %%DATADIR%%/stdlib/strconv/stof_data.ha %%DATADIR%%/stdlib/strconv/stoi.ha @@ -735,6 +755,7 @@ bin/haredoc %%DATADIR%%/stdlib/temp/+netbsd.ha %%DATADIR%%/stdlib/temp/README %%DATADIR%%/stdlib/test/+test.ha +%%DATADIR%%/stdlib/test/README %%DATADIR%%/stdlib/test/fail+test.ha %%DATADIR%%/stdlib/test/util+test.ha %%DATADIR%%/stdlib/test/util.ha @@ -753,29 +774,37 @@ bin/haredoc %%DATADIR%%/stdlib/time/chrono/+openbsd.ha %%DATADIR%%/stdlib/time/chrono/README %%DATADIR%%/stdlib/time/chrono/arithmetic.ha -%%DATADIR%%/stdlib/time/chrono/chronology.ha %%DATADIR%%/stdlib/time/chrono/error.ha -%%DATADIR%%/stdlib/time/chrono/leapsec.ha +%%DATADIR%%/stdlib/time/chrono/moment.ha %%DATADIR%%/stdlib/time/chrono/timescale.ha -%%DATADIR%%/stdlib/time/chrono/timezone.ha -%%DATADIR%%/stdlib/time/chrono/tzdb.ha -%%DATADIR%%/stdlib/time/conv.ha +%%DATADIR%%/stdlib/time/chrono/utc.ha +%%DATADIR%%/stdlib/time/date/+freebsd.ha +%%DATADIR%%/stdlib/time/date/+linux.ha +%%DATADIR%%/stdlib/time/date/+netbsd.ha +%%DATADIR%%/stdlib/time/date/+openbsd.ha %%DATADIR%%/stdlib/time/date/README %%DATADIR%%/stdlib/time/date/constants.ha %%DATADIR%%/stdlib/time/date/date.ha %%DATADIR%%/stdlib/time/date/daydate.ha %%DATADIR%%/stdlib/time/date/daytime.ha +%%DATADIR%%/stdlib/time/date/duration.ha %%DATADIR%%/stdlib/time/date/error.ha %%DATADIR%%/stdlib/time/date/format.ha +%%DATADIR%%/stdlib/time/date/hop.ha %%DATADIR%%/stdlib/time/date/locality.ha %%DATADIR%%/stdlib/time/date/observe.ha -%%DATADIR%%/stdlib/time/date/parithm.ha %%DATADIR%%/stdlib/time/date/parse.ha -%%DATADIR%%/stdlib/time/date/period.ha +%%DATADIR%%/stdlib/time/date/posix.ha %%DATADIR%%/stdlib/time/date/reckon.ha -%%DATADIR%%/stdlib/time/date/tarithm.ha +%%DATADIR%%/stdlib/time/date/span.ha +%%DATADIR%%/stdlib/time/date/step.ha +%%DATADIR%%/stdlib/time/date/timezone.ha +%%DATADIR%%/stdlib/time/date/traverse.ha +%%DATADIR%%/stdlib/time/date/truncate.ha +%%DATADIR%%/stdlib/time/date/tzdb.ha %%DATADIR%%/stdlib/time/date/virtual.ha -%%DATADIR%%/stdlib/time/types.ha +%%DATADIR%%/stdlib/time/duration.ha +%%DATADIR%%/stdlib/time/instant.ha %%DATADIR%%/stdlib/types/README %%DATADIR%%/stdlib/types/arch+aarch64.ha %%DATADIR%%/stdlib/types/arch+riscv64.ha @@ -792,27 +821,33 @@ bin/haredoc %%DATADIR%%/stdlib/unix/+freebsd/creds.ha %%DATADIR%%/stdlib/unix/+freebsd/nice.ha %%DATADIR%%/stdlib/unix/+freebsd/pipe.ha +%%DATADIR%%/stdlib/unix/+freebsd/rlimit.ha %%DATADIR%%/stdlib/unix/+freebsd/umask.ha %%DATADIR%%/stdlib/unix/+linux/creds.ha %%DATADIR%%/stdlib/unix/+linux/nice.ha %%DATADIR%%/stdlib/unix/+linux/pipe.ha +%%DATADIR%%/stdlib/unix/+linux/rlimit.ha %%DATADIR%%/stdlib/unix/+linux/umask.ha %%DATADIR%%/stdlib/unix/+netbsd/creds.ha %%DATADIR%%/stdlib/unix/+netbsd/nice.ha %%DATADIR%%/stdlib/unix/+netbsd/pipe.ha +%%DATADIR%%/stdlib/unix/+netbsd/rlimit.ha %%DATADIR%%/stdlib/unix/+netbsd/umask.ha %%DATADIR%%/stdlib/unix/+openbsd/creds.ha %%DATADIR%%/stdlib/unix/+openbsd/nice.ha %%DATADIR%%/stdlib/unix/+openbsd/pipe.ha +%%DATADIR%%/stdlib/unix/+openbsd/rlimit.ha %%DATADIR%%/stdlib/unix/+openbsd/umask.ha %%DATADIR%%/stdlib/unix/README %%DATADIR%%/stdlib/unix/hosts/+freebsd.ha %%DATADIR%%/stdlib/unix/hosts/+linux.ha %%DATADIR%%/stdlib/unix/hosts/+netbsd.ha %%DATADIR%%/stdlib/unix/hosts/+openbsd.ha +%%DATADIR%%/stdlib/unix/hosts/README %%DATADIR%%/stdlib/unix/hosts/errors.ha %%DATADIR%%/stdlib/unix/hosts/hosts.ha %%DATADIR%%/stdlib/unix/hosts/test+test.ha +%%DATADIR%%/stdlib/unix/passwd/README %%DATADIR%%/stdlib/unix/passwd/group.ha %%DATADIR%%/stdlib/unix/passwd/passwd.ha %%DATADIR%%/stdlib/unix/passwd/types.ha @@ -836,6 +871,7 @@ bin/haredoc %%DATADIR%%/stdlib/unix/signal/+netbsd.ha %%DATADIR%%/stdlib/unix/signal/+openbsd.ha %%DATADIR%%/stdlib/unix/signal/README +%%DATADIR%%/stdlib/unix/signal/signal+test.ha %%DATADIR%%/stdlib/unix/signal/types.ha %%DATADIR%%/stdlib/unix/tty/+freebsd/isatty.ha %%DATADIR%%/stdlib/unix/tty/+freebsd/open.ha @@ -862,7 +898,7 @@ bin/haredoc %%DATADIR%%/stdlib/unix/tty/+openbsd/termios.ha %%DATADIR%%/stdlib/unix/tty/+openbsd/winsize.ha %%DATADIR%%/stdlib/unix/tty/README -%%DATADIR%%/stdlib/unix/tty/pty_test.ha +%%DATADIR%%/stdlib/unix/tty/pty_test+test.ha %%DATADIR%%/stdlib/unix/tty/types.ha %%DATADIR%%/stdlib/uuid/README %%DATADIR%%/stdlib/uuid/uuid.ha diff --git a/devel/libdbusmenu-lxqt/Makefile b/devel/libdbusmenu-lxqt/Makefile index 8b7b8af194e4..e3ebd6fc041b 100644 --- a/devel/libdbusmenu-lxqt/Makefile +++ b/devel/libdbusmenu-lxqt/Makefile @@ -1,5 +1,6 @@ PORTNAME= libdbusmenu-lxqt PORTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITE= LXQT/${PORTNAME} diff --git a/devel/liblxqt/Makefile b/devel/liblxqt/Makefile index bbfd6c9051bc..d381231bbda9 100644 --- a/devel/liblxqt/Makefile +++ b/devel/liblxqt/Makefile @@ -1,6 +1,6 @@ PORTNAME= liblxqt PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= LXQT @@ -12,7 +12,7 @@ LICENSE= LGPL21+ LIB_DEPENDS= libpolkit-qt6-core-1.so:sysutils/polkit-qt-1@qt6 -USES= cmake compiler:c++17-lang gnome kde:6 lxqt:2 \ +USES= cmake compiler:c++20-lang gnome kde:6 lxqt:2 \ pkgconfig qt:6 tar:xz xorg USE_GNOME= glib20 USE_QT= base:run tools:build svg diff --git a/devel/libqt6xdg/Makefile b/devel/libqt6xdg/Makefile index 907ef16880e5..4a606c64f2ca 100644 --- a/devel/libqt6xdg/Makefile +++ b/devel/libqt6xdg/Makefile @@ -1,6 +1,6 @@ PORTNAME= libqt6xdg PORTVERSION= 4.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= LXQT/${PORTNAME:S/6//} @@ -10,7 +10,7 @@ WWW= https://github.com/lxde/libqtxdg LICENSE= LGPL21+ -USES= cmake compiler:c++17-lang gnome lxqt:2 pkgconfig qt:6 tar:xz +USES= cmake compiler:c++20-lang gnome lxqt:2 pkgconfig qt:6 tar:xz USE_LDCONFIG= yes USE_GNOME= glib20 USE_LXQT= buildtools2 diff --git a/devel/lxqt2-build-tools/Makefile b/devel/lxqt2-build-tools/Makefile index 56605a28a028..e29e1e18c541 100644 --- a/devel/lxqt2-build-tools/Makefile +++ b/devel/lxqt2-build-tools/Makefile @@ -1,5 +1,5 @@ PORTNAME= lxqt2-build-tools -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.1 CATEGORIES= devel MASTER_SITES= LXQT/${PORTNAME:S/2//} diff --git a/devel/lxqt2-build-tools/distinfo b/devel/lxqt2-build-tools/distinfo index 84ae05966e5f..bea3d215bd72 100644 --- a/devel/lxqt2-build-tools/distinfo +++ b/devel/lxqt2-build-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744924722 -SHA256 (lxqt/lxqt-build-tools-2.2.0.tar.xz) = 1214e12ca06561ca724e67092ae1265fdd23128fde449e9d3b0275cb2a051d43 -SIZE (lxqt/lxqt-build-tools-2.2.0.tar.xz) = 26088 +TIMESTAMP = 1750552448 +SHA256 (lxqt/lxqt-build-tools-2.2.1.tar.xz) = 13dcdf2e6b55cc334ac0ddadd0c131d46c46e06fab0d6ca7b8b96c260c8e332f +SIZE (lxqt/lxqt-build-tools-2.2.1.tar.xz) = 25728 diff --git a/devel/lxqt2-build-tools/pkg-plist b/devel/lxqt2-build-tools/pkg-plist index b2354faa3821..4764645644d8 100644 --- a/devel/lxqt2-build-tools/pkg-plist +++ b/devel/lxqt2-build-tools/pkg-plist @@ -5,7 +5,6 @@ share/cmake/lxqt2-build-tools/find-modules/FindFontconfig.cmake share/cmake/lxqt2-build-tools/find-modules/FindGLIB.cmake share/cmake/lxqt2-build-tools/find-modules/FindMenuCache.cmake share/cmake/lxqt2-build-tools/find-modules/FindUDev.cmake -share/cmake/lxqt2-build-tools/find-modules/FindXCB.cmake share/cmake/lxqt2-build-tools/find-modules/FindXKBCommon.cmake share/cmake/lxqt2-build-tools/find-modules/FindXTerm.cmake share/cmake/lxqt2-build-tools/find-modules/FindXdgEmail.cmake diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile index 5623983262b6..0151ff225b7e 100644 --- a/devel/p5-Date-Manip/Makefile +++ b/devel/p5-Date-Manip/Makefile @@ -1,5 +1,6 @@ PORTNAME= Date-Manip PORTVERSION= 6.98 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:SBECK diff --git a/devel/p5-Date-Manip/pkg-plist b/devel/p5-Date-Manip/pkg-plist index e4828a6a0abb..3fd4030dea6e 100644 --- a/devel/p5-Date-Manip/pkg-plist +++ b/devel/p5-Date-Manip/pkg-plist @@ -469,6 +469,7 @@ bin/dm_zdump %%SITE_PERL%%/Date/Manip/Offset/off404.pm %%SITE_PERL%%/Date/Manip/Offset/off405.pm %%SITE_PERL%%/Date/Manip/Offset/off406.pm +%%SITE_PERL%%/Date/Manip/Offset/off407.pm %%SITE_PERL%%/Date/Manip/Problems.pod %%SITE_PERL%%/Date/Manip/Recur.pm %%SITE_PERL%%/Date/Manip/Recur.pod @@ -520,6 +521,7 @@ bin/dm_zdump %%SITE_PERL%%/Date/Manip/TZ/amciud00.pm %%SITE_PERL%%/Date/Manip/TZ/amcord00.pm %%SITE_PERL%%/Date/Manip/TZ/amcost00.pm +%%SITE_PERL%%/Date/Manip/TZ/amcoyh00.pm %%SITE_PERL%%/Date/Manip/TZ/amcuia00.pm %%SITE_PERL%%/Date/Manip/TZ/amdanm00.pm %%SITE_PERL%%/Date/Manip/TZ/amdaws00.pm diff --git a/devel/py-dj52-django-rq/Makefile b/devel/py-dj52-django-rq/Makefile new file mode 100644 index 000000000000..3e376d972e51 --- /dev/null +++ b/devel/py-dj52-django-rq/Makefile @@ -0,0 +1,41 @@ +PORTNAME= django-rq +PORTVERSION= 3.0.1 +CATEGORIES= devel python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj52- +MASTER_SITES= PYPI +DISTNAME= django_rq-${PORTVERSION} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Provides Django integration for RQ (Redis Queue) +WWW= https://github.com/rq/django-rq + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django52>=3.2:www/py-django52@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}redis>=3.5:databases/py-redis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rq>=2:devel/py-rq@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dj52-django-redis>=0:www/py-dj52-django-redis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rq-scheduler>=0:devel/py-rq-scheduler@${PY_FLAVOR} \ + redis-server:databases/redis + +USES= python:3.10+ +USE_PYTHON= autoplist concurrent pep517 + +NO_ARCH= yes +TEST_ENV= PYTHONPATH=. + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}*django-rq + +OPTIONS_DEFINE= SENTRY +SENTRY_DESC= Sentry support + +SENTRY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sentry-sdk>=1.0.0:devel/py-sentry-sdk@${PY_FLAVOR} + +# https://github.com/rq/django-rq/blob/master/Makefile +do-test: + cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/django-admin test django_rq --settings=django_rq.tests.settings -v2 + +.include <bsd.port.mk> diff --git a/devel/py-dj52-django-rq/distinfo b/devel/py-dj52-django-rq/distinfo new file mode 100644 index 000000000000..9efa3412a085 --- /dev/null +++ b/devel/py-dj52-django-rq/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1747327171 +SHA256 (django_rq-3.0.1.tar.gz) = d111f436608b95a58a6960174eaf44aa021e0a4a32f83a28a7221a9a916dd1ae +SIZE (django_rq-3.0.1.tar.gz) = 53821 diff --git a/devel/py-dj52-django-rq/pkg-descr b/devel/py-dj52-django-rq/pkg-descr new file mode 100644 index 000000000000..85e24c643a23 --- /dev/null +++ b/devel/py-dj52-django-rq/pkg-descr @@ -0,0 +1,3 @@ +Django integration with RQ, a Redis based Python queuing library. Django-RQ is a +simple app that allows you to configure your queues in django's settings.py and +easily use them in your project. diff --git a/devel/py-dj52-strawberry-graphql/Makefile b/devel/py-dj52-strawberry-graphql/Makefile new file mode 100644 index 000000000000..0e5a547d0db8 --- /dev/null +++ b/devel/py-dj52-strawberry-graphql/Makefile @@ -0,0 +1,74 @@ +PORTNAME= strawberry-graphql +DISTVERSION= 0.271.0 +CATEGORIES= devel python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj52- +DISTNAME= strawberry_graphql-${DISTVERSION} + +MAINTAINER= kai@FreeBSD.org +COMMENT= Library for creating GraphQL APIs +WWW= https://github.com/strawberry-graphql/strawberry + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.6:devel/py-poetry-core@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.7.0:devel/py-python-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}graphql-core>=3.2.0<3.4.0:devel/py-graphql-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.5.0:devel/py-typing-extensions@${PY_FLAVOR} + +USES= python:3.10+ +USE_PYTHON= autoplist concurrent pep517 + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}*${PORTNAME} + +NO_ARCH= yes + +OPTIONS_DEFINE= AIOHTTP ASGI CHANNELS CLI DEBUG DEBUG-SERVER DJANGO \ + FASTAPI FLASK OPENTELEMETRY PYDANTIC + +AIOHTTP_DESC= Basic AIOHTTP integration +ASGI_DESC= Basic ASGI integration +CHANNELS_DESC= Support for Django Channels +CLI_DESC= Support for CLI commands +DEBUG-SERVER_DESC= Enable debug server +DEBUG_DESC= Generate verbose debug information +DJANGO_DESC= Basic Django integration +FASTAPI_DESC= Support for FastAPI in conjunction with GraphQLRouter +FLASK_DESC= Basic Flask integration +OPENTELEMETRY_DESC= Generate Open Telemetry compatible tracing information +PYDANTIC_DESC= Support for Pydantic models + +AIOHTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.7.4:www/py-aiohttp@${PY_FLAVOR} +ASGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multipart>=0.0.7:devel/py-multipart@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}starlette>=0.18.0:www/py-starlette@${PY_FLAVOR} +CHANNELS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asgiref>=3.2:www/py-asgiref@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj52-channels>=3.0.5:www/py-dj52-channels@${PY_FLAVOR} +CLI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcst>=1.0.0:devel/py-libcst@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rich>=12.0.0:textproc/py-rich@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}typer>=0.7.0:devel/py-typer@${PY_FLAVOR} +DEBUG-SERVER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcst>=1.0.0:devel/py-libcst@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}multipart>=0.0.7:devel/py-multipart@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rich>=12.0.0:textproc/py-rich@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}starlette>=0.18.0:www/py-starlette@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}typer>=0.7.0:devel/py-typer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}uvicorn>=0.11.6:www/py-uvicorn@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websockets>=15.0.1:devel/py-websockets@${PY_FLAVOR} +DEBUG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcst>=1.0.0:devel/py-libcst@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rich>=12.0.0:textproc/py-rich@${PY_FLAVOR} +# NB: www/py-channels (via CHANNELS) options depends on www/py-djangoXX, which +# should be taken into account when creating a port for a specific Django version. +DJANGO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asgiref>=3.2:www/py-asgiref@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django52>=3.2:www/py-django52@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-django>0:devel/py-pytest-django@${PY_FLAVOR} +FASTAPI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fastapi>=0.62.5:www/py-fastapi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}multipart>=0.0.7:devel/py-multipart@${PY_FLAVOR} +FLASK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flask>=1.1:www/py-flask@${PY_FLAVOR} +OPENTELEMETRY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opentelemetry-api<2:devel/py-opentelemetry-api@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}opentelemetry-sdk<2:devel/py-opentelemetry-sdk@${PY_FLAVOR} +# NB: Switch to devel/py-pydantic once www/py-fastapi uses it +PYDANTIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydantic2>1.6.1:devel/py-pydantic2@${PY_FLAVOR} + +.include <bsd.port.mk> diff --git a/devel/py-dj52-strawberry-graphql/distinfo b/devel/py-dj52-strawberry-graphql/distinfo new file mode 100644 index 000000000000..591e1237a446 --- /dev/null +++ b/devel/py-dj52-strawberry-graphql/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1749230708 +SHA256 (strawberry_graphql-0.271.0.tar.gz) = dfcf22c5b013915b78b64660ed40afc58081708cecce37879d4b89dac5dc356a +SIZE (strawberry_graphql-0.271.0.tar.gz) = 207945 diff --git a/devel/py-dj52-strawberry-graphql/pkg-descr b/devel/py-dj52-strawberry-graphql/pkg-descr new file mode 100644 index 000000000000..ea25df49f06d --- /dev/null +++ b/devel/py-dj52-strawberry-graphql/pkg-descr @@ -0,0 +1,23 @@ +Strawberry is a developer friendly GraphQL library for Python, designed for +modern development. + +* Type hints: Leverages Python type hints to provide a great developer + experience while creating GraphQL Libraries. + +* Async Support: Supports async/await out of the box, allowing you to write + your resolvers in a non-blocking way. + +* Extensible: Has support for schema and field extensions, allowing you to + extend the schema with custom logic. + +* Generics: Supports generics, allowing you to create reusable types that can + be used in multiple places. + +* Federation: Supports Federation, allowing you to create a federated GraphQL + schema. + +* Dataloaders: Comes with support for dataloaders, allowing you to batch + multiple queries into a single one. + +* Integrations: Has support for multiple integrations, allowing you to use it + with your favorite web framework. diff --git a/devel/universal-ctags/Makefile b/devel/universal-ctags/Makefile index b0ce28d92bc0..261598889906 100644 --- a/devel/universal-ctags/Makefile +++ b/devel/universal-ctags/Makefile @@ -1,5 +1,5 @@ PORTNAME= universal-ctags -PORTVERSION= p6.1.20250518.0 +PORTVERSION= p6.2.20250615.0 CATEGORIES= devel MAINTAINER= dereks@lifeofadishwasher.com diff --git a/devel/universal-ctags/distinfo b/devel/universal-ctags/distinfo index b91911e14870..fffc8736c114 100644 --- a/devel/universal-ctags/distinfo +++ b/devel/universal-ctags/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747604444 -SHA256 (universal-ctags-ctags-p6.1.20250518.0_GH0.tar.gz) = 176e7f2cc0f1751831679f8731c9f54902563df5c99aa2379e218d378338c43e -SIZE (universal-ctags-ctags-p6.1.20250518.0_GH0.tar.gz) = 3271151 +TIMESTAMP = 1750622285 +SHA256 (universal-ctags-ctags-p6.2.20250615.0_GH0.tar.gz) = 34a5ab1a05353de2712dd8479d959cd4ec21b0f39c400731e53ecd192d2770fc +SIZE (universal-ctags-ctags-p6.2.20250615.0_GH0.tar.gz) = 3288662 diff --git a/devel/websocketpp/Makefile b/devel/websocketpp/Makefile index 3e1cf71b16be..8e852a34e1bb 100644 --- a/devel/websocketpp/Makefile +++ b/devel/websocketpp/Makefile @@ -1,8 +1,9 @@ PORTNAME= websocketpp PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= devel -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sigsegv@radiotube.org COMMENT= Header-only implementation of the WebSocket protocol WWW= https://www.zaphoyd.com/websocketpp/ @@ -10,11 +11,15 @@ LICENSE= MIT BSD3CLAUSE ZLIB LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:insource cpe +TEST_DEPENDS= boost-libs>0:devel/boost-libs + +USES= cmake:insource,testing cpe CPE_VENDOR= zaphoyd USE_GITHUB= yes GH_ACCOUNT= zaphoyd +CMAKE_TESTING_ON= BUILD_TESTS + NO_ARCH= yes post-stage: # https://github.com/zaphoyd/websocketpp/issues/781 diff --git a/devel/websocketpp/files/patch-CMakeLists.txt b/devel/websocketpp/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..cd8749d1b099 --- /dev/null +++ b/devel/websocketpp/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2025-06-22 12:25:54 UTC ++++ CMakeLists.txt +@@ -152,7 +152,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + endif() + set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) + set (WEBSOCKETPP_BOOST_LIBS system thread) +- set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here? ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++") # todo: is libc++ really needed here? + if (NOT APPLE) + add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these? + endif () diff --git a/devel/websocketpp/files/patch-examples_echo__server__both_echo__server__both.cpp b/devel/websocketpp/files/patch-examples_echo__server__both_echo__server__both.cpp new file mode 100644 index 000000000000..62c0718d097c --- /dev/null +++ b/devel/websocketpp/files/patch-examples_echo__server__both_echo__server__both.cpp @@ -0,0 +1,11 @@ +--- examples/echo_server_both/echo_server_both.cpp.orig 2020-04-19 18:25:17 UTC ++++ examples/echo_server_both/echo_server_both.cpp +@@ -60,7 +60,7 @@ int main() { + int main() { + // set up an external io_service to run both endpoints on. This is not + // strictly necessary, but simplifies thread management a bit. +- boost::asio::io_service ios; ++ boost::asio::io_context ios; + + // set up plain endpoint + server_plain endpoint_plain; diff --git a/devel/websocketpp/files/patch-examples_external__io__service_external__io__service.cpp b/devel/websocketpp/files/patch-examples_external__io__service_external__io__service.cpp new file mode 100644 index 000000000000..8fc665c72d95 --- /dev/null +++ b/devel/websocketpp/files/patch-examples_external__io__service_external__io__service.cpp @@ -0,0 +1,11 @@ +--- examples/external_io_service/external_io_service.cpp.orig 2020-04-19 18:25:17 UTC ++++ examples/external_io_service/external_io_service.cpp +@@ -59,7 +59,7 @@ int main() { + } + + int main() { +- asio::io_service service; ++ asio::io_context service; + + // Add a TCP echo server on port 9003 + tcp_echo_server custom_http_server(service, 9003); diff --git a/devel/websocketpp/files/patch-examples_external__io__service_tcp__echo__server.hpp b/devel/websocketpp/files/patch-examples_external__io__service_tcp__echo__server.hpp new file mode 100644 index 000000000000..5496feeeba41 --- /dev/null +++ b/devel/websocketpp/files/patch-examples_external__io__service_tcp__echo__server.hpp @@ -0,0 +1,28 @@ +--- examples/external_io_service/tcp_echo_server.hpp.orig 2020-04-19 18:25:17 UTC ++++ examples/external_io_service/tcp_echo_server.hpp +@@ -44,7 +44,7 @@ struct tcp_echo_session : websocketpp::lib::enable_sha + struct tcp_echo_session : websocketpp::lib::enable_shared_from_this<tcp_echo_session> { + typedef websocketpp::lib::shared_ptr<tcp_echo_session> ptr; + +- tcp_echo_session(asio::io_service & service) : m_socket(service) {} ++ tcp_echo_session(asio::io_context & service) : m_socket(service) {} + + void start() { + m_socket.async_read_some(asio::buffer(m_buffer, sizeof(m_buffer)), +@@ -72,7 +72,7 @@ struct tcp_echo_server { + }; + + struct tcp_echo_server { +- tcp_echo_server(asio::io_service & service, short port) ++ tcp_echo_server(asio::io_context & service, short port) + : m_service(service) + , m_acceptor(service, asio::ip::tcp::endpoint(asio::ip::tcp::v6(), port)) + { +@@ -92,6 +92,6 @@ struct tcp_echo_server { + start_accept(); + } + +- asio::io_service & m_service; ++ asio::io_context & m_service; + asio::ip::tcp::acceptor m_acceptor; + }; diff --git a/devel/websocketpp/files/patch-test_endpoint_endpoint.cpp b/devel/websocketpp/files/patch-test_endpoint_endpoint.cpp new file mode 100644 index 000000000000..efa78c73fc40 --- /dev/null +++ b/devel/websocketpp/files/patch-test_endpoint_endpoint.cpp @@ -0,0 +1,22 @@ +--- test/endpoint/endpoint.cpp.orig 2020-04-19 18:25:17 UTC ++++ test/endpoint/endpoint.cpp +@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE( initialize_server_asio_external + + BOOST_AUTO_TEST_CASE( initialize_server_asio_external ) { + websocketpp::server<websocketpp::config::asio> s; +- boost::asio::io_service ios; ++ boost::asio::io_context ios; + s.init_asio(&ios); + } + +@@ -141,8 +141,8 @@ BOOST_AUTO_TEST_CASE( listen_after_listen_failure ) { + server1.init_asio(); + server2.init_asio(); + +- boost::asio::ip::tcp::endpoint ep1(boost::asio::ip::address::from_string("127.0.0.1"), 12345); +- boost::asio::ip::tcp::endpoint ep2(boost::asio::ip::address::from_string("127.0.0.1"), 23456); ++ boost::asio::ip::tcp::endpoint ep1(boost::asio::ip::make_address("127.0.0.1"), 12345); ++ boost::asio::ip::tcp::endpoint ep2(boost::asio::ip::make_address("127.0.0.1"), 23456); + + server1.listen(ep1, ec); + BOOST_CHECK(!ec); diff --git a/devel/websocketpp/files/patch-test_transport_asio_timers.cpp b/devel/websocketpp/files/patch-test_transport_asio_timers.cpp new file mode 100644 index 000000000000..33d49954446f --- /dev/null +++ b/devel/websocketpp/files/patch-test_transport_asio_timers.cpp @@ -0,0 +1,20 @@ +--- test/transport/asio/timers.cpp.orig 2020-04-19 18:25:17 UTC ++++ test/transport/asio/timers.cpp +@@ -54,7 +54,7 @@ void run_dummy_server(int port) { + using boost::asio::ip::tcp; + + try { +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port)); + tcp::socket socket(io_service); + +@@ -79,7 +79,7 @@ void run_test_timer(long value) { + + // Wait for the specified time period then fail the test + void run_test_timer(long value) { +- boost::asio::io_service ios; ++ boost::asio::io_context ios; + boost::asio::deadline_timer t(ios,boost::posix_time::milliseconds(value)); + boost::system::error_code ec; + t.wait(ec); diff --git a/devel/websocketpp/files/patch-test_transport_integration.cpp b/devel/websocketpp/files/patch-test_transport_integration.cpp new file mode 100644 index 000000000000..b3ed7f70f733 --- /dev/null +++ b/devel/websocketpp/files/patch-test_transport_integration.cpp @@ -0,0 +1,46 @@ +--- test/transport/integration.cpp.orig 2020-04-19 18:25:17 UTC ++++ test/transport/integration.cpp +@@ -221,7 +221,7 @@ void run_dummy_server(int port) { + using boost::asio::ip::tcp; + + try { +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port)); + tcp::socket socket(io_service); + +@@ -248,13 +248,12 @@ void run_dummy_client(std::string port) { + using boost::asio::ip::tcp; + + try { +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + tcp::resolver resolver(io_service); +- tcp::resolver::query query("localhost", port); +- tcp::resolver::iterator iterator = resolver.resolve(query); ++ tcp::resolver::results_type results = resolver.resolve("localhost", port); + tcp::socket socket(io_service); + +- boost::asio::connect(socket, iterator); ++ boost::asio::connect(socket, results); + for (;;) { + char data[512]; + boost::system::error_code ec; +@@ -361,7 +360,7 @@ class test_deadline_timer (public) + : m_timer(m_io_service, boost::posix_time::seconds(seconds)) + { + m_timer.async_wait(bind(&test_deadline_timer::expired, this, ::_1)); +- std::size_t (boost::asio::io_service::*run)() = &boost::asio::io_service::run; ++ std::size_t (boost::asio::io_context::*run)() = &boost::asio::io_context::run; + m_timer_thread = websocketpp::lib::thread(websocketpp::lib::bind(run, &m_io_service)); + } + ~test_deadline_timer() +@@ -379,7 +378,7 @@ class test_deadline_timer (public) + BOOST_FAIL("Test timed out"); + } + +- boost::asio::io_service m_io_service; ++ boost::asio::io_context m_io_service; + boost::asio::deadline_timer m_timer; + websocketpp::lib::thread m_timer_thread; + }; diff --git a/devel/websocketpp/files/patch-websocketpp_transport_asio_connection.hpp b/devel/websocketpp/files/patch-websocketpp_transport_asio_connection.hpp new file mode 100644 index 000000000000..30872545d7b5 --- /dev/null +++ b/devel/websocketpp/files/patch-websocketpp_transport_asio_connection.hpp @@ -0,0 +1,96 @@ +--- websocketpp/transport/asio/connection.hpp.orig 2020-04-19 18:25:17 UTC ++++ websocketpp/transport/asio/connection.hpp +@@ -86,9 +86,9 @@ class connection : public config::socket_type::socket_ + typedef typename response_type::ptr response_ptr; + + /// Type of a pointer to the Asio io_service being used +- typedef lib::asio::io_service * io_service_ptr; ++ typedef lib::asio::io_context * io_context_ptr; + /// Type of a pointer to the Asio io_service::strand being used +- typedef lib::shared_ptr<lib::asio::io_service::strand> strand_ptr; ++ typedef lib::shared_ptr<lib::asio::io_context::strand> strand_ptr; + /// Type of a pointer to the Asio timer class + typedef lib::shared_ptr<lib::asio::steady_timer> timer_ptr; + +@@ -458,11 +458,11 @@ class connection : public config::socket_type::socket_ + * + * @return Status code for the success or failure of the initialization + */ +- lib::error_code init_asio (io_service_ptr io_service) { ++ lib::error_code init_asio (io_context_ptr io_service) { + m_io_service = io_service; + + if (config::enable_multithreading) { +- m_strand.reset(new lib::asio::io_service::strand(*io_service)); ++ m_strand.reset(new lib::asio::io_context::strand(*io_service)); + } + + lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, +@@ -573,7 +573,7 @@ class connection : public config::socket_type::socket_ + lib::error_code const & ec) + { + if (ec == transport::error::operation_aborted || +- (post_timer && lib::asio::is_neg(post_timer->expires_from_now()))) ++ (post_timer && lib::asio::is_neg(post_timer->expiry() - std::chrono::steady_clock::now()))) + { + m_alog->write(log::alevel::devel,"post_init cancelled"); + return; +@@ -679,7 +679,7 @@ class connection : public config::socket_type::socket_ + // Whatever aborted it will be issuing the callback so we are safe to + // return + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(m_proxy_data->timer->expires_from_now())) ++ lib::asio::is_neg(m_proxy_data->timer->expiry() - std::chrono::steady_clock::now())) + { + m_elog->write(log::elevel::devel,"write operation aborted"); + return; +@@ -751,7 +751,7 @@ class connection : public config::socket_type::socket_ + // Whatever aborted it will be issuing the callback so we are safe to + // return + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(m_proxy_data->timer->expires_from_now())) ++ lib::asio::is_neg(m_proxy_data->timer->expiry() - std::chrono::steady_clock::now())) + { + m_elog->write(log::elevel::devel,"read operation aborted"); + return; +@@ -1012,18 +1012,18 @@ class connection : public config::socket_type::socket_ + */ + lib::error_code interrupt(interrupt_handler handler) { + if (config::enable_multithreading) { +- m_io_service->post(m_strand->wrap(handler)); ++ boost::asio::post(*m_io_service, m_strand->wrap(handler)); + } else { +- m_io_service->post(handler); ++ boost::asio::post(*m_io_service, handler); + } + return lib::error_code(); + } + + lib::error_code dispatch(dispatch_handler handler) { + if (config::enable_multithreading) { +- m_io_service->post(m_strand->wrap(handler)); ++ boost::asio::post(*m_io_service, m_strand->wrap(handler)); + } else { +- m_io_service->post(handler); ++ boost::asio::post(*m_io_service, handler); + } + return lib::error_code(); + } +@@ -1095,7 +1095,7 @@ class connection : public config::socket_type::socket_ + callback, lib::asio::error_code const & ec) + { + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(shutdown_timer->expires_from_now())) ++ lib::asio::is_neg(shutdown_timer->expiry() - std::chrono::steady_clock::now())) + { + m_alog->write(log::alevel::devel,"async_shutdown cancelled"); + return; +@@ -1172,7 +1172,7 @@ class connection : public config::socket_type::socket_ + lib::shared_ptr<proxy_data> m_proxy_data; + + // transport resources +- io_service_ptr m_io_service; ++ io_context_ptr m_io_service; + strand_ptr m_strand; + connection_hdl m_connection_hdl; + diff --git a/devel/websocketpp/files/patch-websocketpp_transport_asio_endpoint.hpp b/devel/websocketpp/files/patch-websocketpp_transport_asio_endpoint.hpp new file mode 100644 index 000000000000..2650b9e6959c --- /dev/null +++ b/devel/websocketpp/files/patch-websocketpp_transport_asio_endpoint.hpp @@ -0,0 +1,207 @@ +--- websocketpp/transport/asio/endpoint.hpp.orig 2020-04-19 18:25:17 UTC ++++ websocketpp/transport/asio/endpoint.hpp +@@ -78,7 +78,7 @@ class endpoint : public config::socket_type { (public) + typedef typename transport_con_type::ptr transport_con_ptr; + + /// Type of a pointer to the ASIO io_service being used +- typedef lib::asio::io_service * io_service_ptr; ++ typedef lib::asio::io_context * io_context_ptr; + /// Type of a shared pointer to the acceptor being used + typedef lib::shared_ptr<lib::asio::ip::tcp::acceptor> acceptor_ptr; + /// Type of a shared pointer to the resolver being used +@@ -86,7 +86,7 @@ class endpoint : public config::socket_type { (public) + /// Type of timer handle + typedef lib::shared_ptr<lib::asio::steady_timer> timer_ptr; + /// Type of a shared pointer to an io_service work object +- typedef lib::shared_ptr<lib::asio::io_service::work> work_ptr; ++ typedef lib::shared_ptr<lib::asio::executor_work_guard<lib::asio::io_context::executor_type>> work_ptr; + + /// Type of socket pre-bind handler + typedef lib::function<lib::error_code(acceptor_ptr)> tcp_pre_bind_handler; +@@ -95,7 +95,7 @@ class endpoint : public config::socket_type { (public) + explicit endpoint() + : m_io_service(NULL) + , m_external_io_service(false) +- , m_listen_backlog(lib::asio::socket_base::max_connections) ++ , m_listen_backlog(lib::asio::socket_base::max_listen_connections) + , m_reuse_addr(false) + , m_state(UNINITIALIZED) + { +@@ -135,7 +135,7 @@ class endpoint : public config::socket_type { (public) + , m_io_service(src.m_io_service) + , m_external_io_service(src.m_external_io_service) + , m_acceptor(src.m_acceptor) +- , m_listen_backlog(lib::asio::socket_base::max_connections) ++ , m_listen_backlog(lib::asio::socket_base::max_listen_connections) + , m_reuse_addr(src.m_reuse_addr) + , m_elog(src.m_elog) + , m_alog(src.m_alog) +@@ -182,7 +182,7 @@ class endpoint : public config::socket_type { (public) + * @param ptr A pointer to the io_service to use for asio events + * @param ec Set to indicate what error occurred, if any. + */ +- void init_asio(io_service_ptr ptr, lib::error_code & ec) { ++ void init_asio(io_context_ptr ptr, lib::error_code & ec) { + if (m_state != UNINITIALIZED) { + m_elog->write(log::elevel::library, + "asio::init_asio called from the wrong state"); +@@ -209,7 +209,7 @@ class endpoint : public config::socket_type { (public) + * + * @param ptr A pointer to the io_service to use for asio events + */ +- void init_asio(io_service_ptr ptr) { ++ void init_asio(io_context_ptr ptr) { + lib::error_code ec; + init_asio(ptr,ec); + if (ec) { throw exception(ec); } +@@ -230,9 +230,9 @@ class endpoint : public config::socket_type { (public) + // TODO: remove the use of auto_ptr when C++98/03 support is no longer + // necessary. + #ifdef _WEBSOCKETPP_CPP11_MEMORY_ +- lib::unique_ptr<lib::asio::io_service> service(new lib::asio::io_service()); ++ lib::unique_ptr<lib::asio::io_context> service(new lib::asio::io_context()); + #else +- lib::auto_ptr<lib::asio::io_service> service(new lib::asio::io_service()); ++ lib::auto_ptr<lib::asio::io_context> service(new lib::asio::io_context()); + #endif + init_asio(service.get(), ec); + if( !ec ) service.release(); // Call was successful, transfer ownership +@@ -252,9 +252,9 @@ class endpoint : public config::socket_type { (public) + // TODO: remove the use of auto_ptr when C++98/03 support is no longer + // necessary. + #ifdef _WEBSOCKETPP_CPP11_MEMORY_ +- lib::unique_ptr<lib::asio::io_service> service(new lib::asio::io_service()); ++ lib::unique_ptr<lib::asio::io_context> service(new lib::asio::io_context()); + #else +- lib::auto_ptr<lib::asio::io_service> service(new lib::asio::io_service()); ++ lib::auto_ptr<lib::asio::io_context> service(new lib::asio::io_context()); + #endif + init_asio( service.get() ); + // If control got this far without an exception, then ownership has successfully been taken +@@ -375,7 +375,7 @@ class endpoint : public config::socket_type { (public) + * + * @return A reference to the endpoint's io_service + */ +- lib::asio::io_service & get_io_service() { ++ lib::asio::io_context & get_io_service() { + return *m_io_service; + } + +@@ -558,9 +558,9 @@ class endpoint : public config::socket_type { (public) + { + using lib::asio::ip::tcp; + tcp::resolver r(*m_io_service); +- tcp::resolver::query query(host, service); +- tcp::resolver::iterator endpoint_iterator = r.resolve(query); +- tcp::resolver::iterator end; ++ tcp::resolver::results_type endpoints = r.resolve(host, service); ++ auto endpoint_iterator = endpoints.begin(); ++ auto end = endpoints.end(); + if (endpoint_iterator == end) { + m_elog->write(log::elevel::library, + "asio::listen could not resolve the supplied host or service"); +@@ -666,7 +666,7 @@ class endpoint : public config::socket_type { (public) + + /// wraps the reset method of the internal io_service object + void reset() { +- m_io_service->reset(); ++ m_io_service->restart(); + } + + /// wraps the stopped method of the internal io_service object +@@ -687,7 +687,7 @@ class endpoint : public config::socket_type { (public) + * @since 0.3.0 + */ + void start_perpetual() { +- m_work.reset(new lib::asio::io_service::work(*m_io_service)); ++ m_work.reset(new lib::asio::executor_work_guard<lib::asio::io_context::executor_type>(lib::asio::make_work_guard(*m_io_service))); + } + + /// Clears the endpoint's perpetual flag, allowing it to exit when empty +@@ -883,8 +883,6 @@ class endpoint : public config::socket_type { (public) + port = pu->get_port_str(); + } + +- tcp::resolver::query query(host,port); +- + if (m_alog->static_test(log::alevel::devel)) { + m_alog->write(log::alevel::devel, + "starting async DNS resolve for "+host+":"+port); +@@ -905,7 +903,7 @@ class endpoint : public config::socket_type { (public) + + if (config::enable_multithreading) { + m_resolver->async_resolve( +- query, ++ host, port, + tcon->get_strand()->wrap(lib::bind( + &type::handle_resolve, + this, +@@ -918,7 +916,7 @@ class endpoint : public config::socket_type { (public) + ); + } else { + m_resolver->async_resolve( +- query, ++ host, port, + lib::bind( + &type::handle_resolve, + this, +@@ -966,10 +964,10 @@ class endpoint : public config::socket_type { (public) + + void handle_resolve(transport_con_ptr tcon, timer_ptr dns_timer, + connect_handler callback, lib::asio::error_code const & ec, +- lib::asio::ip::tcp::resolver::iterator iterator) ++ lib::asio::ip::tcp::resolver::results_type results) + { + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(dns_timer->expires_from_now())) ++ lib::asio::is_neg(dns_timer->expiry() - std::chrono::steady_clock::now())) + { + m_alog->write(log::alevel::devel,"async_resolve cancelled"); + return; +@@ -987,8 +985,8 @@ class endpoint : public config::socket_type { (public) + std::stringstream s; + s << "Async DNS resolve successful. Results: "; + +- lib::asio::ip::tcp::resolver::iterator it, end; +- for (it = iterator; it != end; ++it) { ++ lib::asio::ip::tcp::resolver::results_type::iterator it, end; ++ for (it = results.begin(); it != results.end(); ++it) { + s << (*it).endpoint() << " "; + } + +@@ -1014,7 +1012,7 @@ class endpoint : public config::socket_type { (public) + if (config::enable_multithreading) { + lib::asio::async_connect( + tcon->get_raw_socket(), +- iterator, ++ results, + tcon->get_strand()->wrap(lib::bind( + &type::handle_connect, + this, +@@ -1027,7 +1025,7 @@ class endpoint : public config::socket_type { (public) + } else { + lib::asio::async_connect( + tcon->get_raw_socket(), +- iterator, ++ results, + lib::bind( + &type::handle_connect, + this, +@@ -1077,7 +1075,7 @@ class endpoint : public config::socket_type { (public) + connect_handler callback, lib::asio::error_code const & ec) + { + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(con_timer->expires_from_now())) ++ lib::asio::is_neg(con_timer->expiry() - std::chrono::steady_clock::now())) + { + m_alog->write(log::alevel::devel,"async_connect cancelled"); + return; +@@ -1158,7 +1156,7 @@ class endpoint : public config::socket_type { (public) + tcp_init_handler m_tcp_post_init_handler; + + // Network Resources +- io_service_ptr m_io_service; ++ io_context_ptr m_io_service; + bool m_external_io_service; + acceptor_ptr m_acceptor; + resolver_ptr m_resolver; diff --git a/devel/websocketpp/files/patch-websocketpp_transport_asio_security_none.hpp b/devel/websocketpp/files/patch-websocketpp_transport_asio_security_none.hpp new file mode 100644 index 000000000000..664d82400f5c --- /dev/null +++ b/devel/websocketpp/files/patch-websocketpp_transport_asio_security_none.hpp @@ -0,0 +1,23 @@ +--- websocketpp/transport/asio/security/none.hpp.orig 2020-04-19 18:25:17 UTC ++++ websocketpp/transport/asio/security/none.hpp +@@ -63,9 +63,9 @@ class connection : public lib::enable_shared_from_this + typedef lib::shared_ptr<type> ptr; + + /// Type of a pointer to the Asio io_service being used +- typedef lib::asio::io_service* io_service_ptr; ++ typedef lib::asio::io_context* io_context_ptr; + /// Type of a pointer to the Asio io_service strand being used +- typedef lib::shared_ptr<lib::asio::io_service::strand> strand_ptr; ++ typedef lib::shared_ptr<lib::asio::io_context::strand> strand_ptr; + /// Type of the ASIO socket being used + typedef lib::asio::ip::tcp::socket socket_type; + /// Type of a shared pointer to the socket being used. +@@ -162,7 +162,7 @@ class connection : public lib::enable_shared_from_this + * @param strand A shared pointer to the connection's asio strand + * @param is_server Whether or not the endpoint is a server or not. + */ +- lib::error_code init_asio (io_service_ptr service, strand_ptr, bool) ++ lib::error_code init_asio (io_context_ptr service, strand_ptr, bool) + { + if (m_state != UNINITIALIZED) { + return socket::make_error_code(socket::error::invalid_state); diff --git a/devel/websocketpp/files/patch-websocketpp_transport_asio_security_tls.hpp b/devel/websocketpp/files/patch-websocketpp_transport_asio_security_tls.hpp new file mode 100644 index 000000000000..427d0510b603 --- /dev/null +++ b/devel/websocketpp/files/patch-websocketpp_transport_asio_security_tls.hpp @@ -0,0 +1,32 @@ +--- websocketpp/transport/asio/security/tls.hpp.orig 2020-04-19 18:25:17 UTC ++++ websocketpp/transport/asio/security/tls.hpp +@@ -72,9 +72,9 @@ class connection : public lib::enable_shared_from_this + /// Type of a shared pointer to the ASIO socket being used + typedef lib::shared_ptr<socket_type> socket_ptr; + /// Type of a pointer to the ASIO io_service being used +- typedef lib::asio::io_service * io_service_ptr; ++ typedef lib::asio::io_context * io_context_ptr; + /// Type of a pointer to the ASIO io_service strand being used +- typedef lib::shared_ptr<lib::asio::io_service::strand> strand_ptr; ++ typedef lib::shared_ptr<lib::asio::io_context::strand> strand_ptr; + /// Type of a shared pointer to the ASIO TLS context being used + typedef lib::shared_ptr<lib::asio::ssl::context> context_ptr; + +@@ -182,7 +182,7 @@ class connection : public lib::enable_shared_from_this + * @param strand A pointer to the connection's strand + * @param is_server Whether or not the endpoint is a server or not. + */ +- lib::error_code init_asio (io_service_ptr service, strand_ptr strand, ++ lib::error_code init_asio (io_context_ptr service, strand_ptr strand, + bool is_server) + { + if (!m_tls_init_handler) { +@@ -381,7 +381,7 @@ class connection : public lib::enable_shared_from_this + } + } + +- io_service_ptr m_io_service; ++ io_context_ptr m_io_service; + strand_ptr m_strand; + context_ptr m_context; + socket_ptr m_socket; |