Re: remove net/sendxmpp
On Sun Jun 04, 2023 at 04:44:48PM +0200, Solène Rapenne wrote: > I'd like to remove net/sendxmpp, it's dead and not working. > > https://github.com/lhost/sendxmpp/issues > > While there, we could remove net/p5-Net-XMPP as it's only used by > net/sendxmpp. OK rsadowski to remove sendxmpp. No opinion on net/p5-Net-XMPP. > > There is a working and maintained Go alternative we could import as a > replacement https://salsa.debian.org/mdosch/go-sendxmpp >
Re: UPDATE: Dolphin 20230523
On Sun, Jun 04, 2023 at 09:45:36PM -0400, Thomas Frohwein wrote: > On Sun, Jun 04, 2023 at 04:38:17PM +0200, Sol?ne Rapenne wrote: > > On Wed, 2023-05-24 at 00:19 -0400, Brad Smith wrote: > > > Here is an update to Dolphin 20230523 snapshot. > > > > > > Rolling up 4 years worth of work. I don't see any sort of change log. > > > > > > > Nice, thanks! > > > > It builds fine on amd64, and the GUI runs. The diff looks good. I can't > > try dolphin more, but I'd be happy to commit if someone else is ok. > > > > Doesn't build here; also amd64: > > /usr/ports/pobj/dolphin-5.0.0.20230523/dolphin-5.0.0.20230523/Source/Core/Core/HW/GBACore.cpp:308:11 > : error: no member named 'currentVideoSize' in 'mCore' > m_core->currentVideoSize(m_core, , ); Try this updated diff. Looks like you have the mGBA port installed, but it's not new enough. Index: Makefile === RCS file: /home/cvs/ports/emulators/dolphin/Makefile,v retrieving revision 1.19 diff -u -p -u -p -r1.19 Makefile --- Makefile24 Apr 2023 11:40:38 - 1.19 +++ Makefile29 May 2023 06:13:54 - @@ -1,69 +1,64 @@ USE_WXNEEDED = Yes -ONLY_FOR_ARCHS = amd64 +ONLY_FOR_ARCHS = aarch64 amd64 COMMENT-main = Nintendo GameCube and Wii emulator with GUI COMMENT-nogui =Nintendo GameCube and Wii emulator -V =5.0.0.20190621 -DISTNAME = dolphin-emu-${V} -PKGNAME = dolphin-${V} -REVISION-main =4 -REVISION-nogui = 4 +V =5.0.0.20230523 +DISTNAME = dolphin-${V} +CATEGORIES = emulators +MASTER_SITES = https://comstyle.com/source/ +EXTRACT_SUFX = .tar.xz MULTI_PACKAGES = -main -nogui -.include - -GH_ACCOUNT = dolphin-emu -GH_PROJECT = dolphin -GH_COMMIT =981925a831e28d3967104e1a64dd8fa9b382660a - -CATEGORIES = emulators - # GPLv2+ PERMIT_PACKAGE = Yes cWANTLIB = EGL GL GLU ICE SDL2 SM X11 Xext Xi Xrandr avcodec \ - avformat avutil c curl hidapi-libusb iconv intl lzo2 \ - m mbedcrypto mbedtls mbedx509 miniupnpc png pthread \ - pugixml sfml-network sfml-system sndio swscale \ - usb-1.0 z ${COMPILER_LIBCXX} + avformat avutil bz2 c curl fmt hidapi-libusb iconv \ + lzma lzo2 m mbedcrypto mbedtls mbedx509 miniupnpc \ + pthread pugixml sfml-network sfml-system speexdsp \ + swscale swresample usb-1.0 zstd ${COMPILER_LIBCXX} -WANTLIB-main = ${cWANTLIB} Qt5Core Qt5Gui Qt5Widgets +WANTLIB-main = ${cWANTLIB} Qt6Core Qt6Gui Qt6Widgets WANTLIB-nogui =${cWANTLIB} -COMPILER = base-clang ports-gcc base-gcc +COMPILER = base-clang MODULES = devel/cmake -TEST_DEPENDS = devel/gtest -BUILD_DEPENDS =devel/gettext,-tools \ - devel/fmt + +COMPILER = base-clang + +BUILD_DEPENDS =devel/gettext,-tools LIB_DEPENDS-nogui =archivers/lzo2 \ + archivers/zstd \ comms/libhidapi \ converters/libiconv \ - devel/gettext,-runtime \ + devel/fmt \ devel/libusb1 \ devel/sdl2 \ graphics/ffmpeg \ - graphics/png \ multimedia/sfml \ net/curl \ net/miniupnp/miniupnpc \ security/polarssl \ textproc/pugixml LIB_DEPENDS-main = ${LIB_DEPENDS-nogui} \ - x11/qt5/qtbase + x11/qt6/qtbase RUN_DEPENDS-main = ${RUN_DEPENDS-nogui} \ devel/desktop-file-utils \ emulators/dolphin,-nogui \ x11/gtk+4,-guic -CONFIGURE_ARGS += -Dmandir:=${PREFIX}/man \ - -DENABLE_ALSA=OFF \ + +CONFIGURE_ARGS += -DENABLE_ALSA=OFF \ -DENABLE_PULSEAUDIO=OFF \ -DENABLE_LLVM=OFF \ - -DQt5_DIR="${LOCALBASE}/lib/qt5/cmake/Qt5" \ - -DUSE_DISCORD_PRESENCE=OFF -TEST_TARGET = unittests + -DENABLE_LTO=ON \ + -DENABLE_TESTS=OFF \ + -DENABLE_VULKAN=OFF \ + -DUSE_DISCORD_PRESENCE=OFF \ + -DUSE_SANITIZERS=OFF MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib Index: distinfo === RCS file: /home/cvs/ports/emulators/dolphin/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3
UPDATE: Pidgin 2.14.12
Here is an update to Pidgin 2.14.12. version 2.14.12 (12/31/2022): * Remove a string from the Romanian translation that's breaks the creation of the Windows installer. (RR 2157) (Gary Kramlich) version 2.14.11 (12/31/2022): * Add Markus "ivanhoe" Fischer to the Crazy Patch Writers! Congrats Markus! (RR 1952) (Gary Kramlich) * Fix a crash when closing a group chat with spellchk plugin enabled. (RR 1951) (Markus Fischer) * Fix network interface detection on Windows to fix broken file transfers. (PIDGIN-17123, PIDGIN-17293, PIDGIN-17516, PIDGIN-17704) (RR 2018) (Gary Kramlich) * Update the about box to point people to Discourse instead of the mailing lists. (RR 2154) (Gary Kramlich) Index: Makefile === RCS file: /home/cvs/ports/net/pidgin/Makefile,v retrieving revision 1.159 diff -u -p -u -p -r1.159 Makefile --- Makefile24 Apr 2023 11:41:24 - 1.159 +++ Makefile5 Jun 2023 02:21:35 - @@ -2,7 +2,7 @@ COMMENT-main= multi-protocol instant mes COMMENT-finch= multi-protocol instant messaging client, console client COMMENT-libpurple= multi-protocol instant messaging library -VERSION= 2.14.10 +VERSION= 2.14.12 DISTNAME= pidgin-${VERSION} PKGNAME-main= pidgin-${VERSION} PKGNAME-finch= finch-${VERSION} @@ -14,9 +14,6 @@ FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT CATEGORIES=net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/} EXTRACT_SUFX= .tar.bz2 -REVISION-finch=0 -REVISION-libpurple=0 -REVISION-main= 0 SHARED_LIBS= jabber 0.0 \ purple 7.1 \ @@ -71,7 +68,7 @@ MODGCONF2_LIBDEP= No SEPARATE_BUILD=Yes USE_GMAKE= Yes CONFIGURE_STYLE= autoreconf -AUTOCONF_VERSION= 2.69 +AUTOCONF_VERSION= 2.71 AUTOMAKE_VERSION= 1.16 CONFIGURE_ARGS+= --disable-avahi \ --disable-cap \ Index: distinfo === RCS file: /home/cvs/ports/net/pidgin/distinfo,v retrieving revision 1.55 diff -u -p -u -p -r1.55 distinfo --- distinfo27 Dec 2022 10:06:22 - 1.55 +++ distinfo5 Jun 2023 02:20:29 - @@ -1,2 +1,2 @@ -SHA256 (pidgin-2.14.10.tar.bz2) = RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA= -SIZE (pidgin-2.14.10.tar.bz2) = 8229328 +SHA256 (pidgin-2.14.12.tar.bz2) = KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc= +SIZE (pidgin-2.14.12.tar.bz2) = 8226145
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/06/04 20:16:43 Modified files: x11/dbus-tcl : Makefile distinfo Log message: Update to 3.1.
UPDATE: OpenColorIO 2.2.1
Here is an update to OpenColorIO 2.2.1. New features: PR #1659, Build the new ACES CG and Studio configs into the library itself PR #1696, Allow OCIO configs to be archived, introducing the .ocioz file format PR #1710, Convert to or from a known external color space PR #1703, Add a method to query whether a color space is linear PR #1637, Address circular build dependency between OCIO and OpenImageIO Noteworthy bug fixes and enhancements: PR #1711, Make the interchange roles required for config versions 2.2 or higher PR #1691, Add support for ICC Parametric curves type 1-4 PR #1689, Add getProcessor calls that take a NamedTransform PR #1604, Add preliminary support for ACES Metadata Files (AMF) PR #1693, Add NamedTransform support for Baking and fix crosstalk issue PR #1704, Add Built-in Transforms for ARRI LogC4 and Canon curves PR #1706, Add Python 3.11 wheels PR #1712, Fix atan2 issue with ACES viewing transforms in HLSL PR #1656, Speed up config ID hashing (replace md5 with xxhash) PR #1684, Allow ocioconvert, ociowrite, ocioperf to invert a DisplayViewTransform PR #1646, Provide scripts to facilitate building OCIO on Windows PR #1630, Improve iridas_cube parsing speed PR #1605, Add Python source distribution package for PyPI PR #1598, Add DisplayViewTransform support to Baker PR #1516, Default to C++ 14 and remove OIIO from ocioperf PR #1532, Update default branch name to "main" Index: Makefile === RCS file: /home/cvs/ports/graphics/opencolorio/Makefile,v retrieving revision 1.27 diff -u -p -u -p -r1.27 Makefile --- Makefile29 May 2023 17:44:22 - 1.27 +++ Makefile31 May 2023 21:23:15 - @@ -1,15 +1,12 @@ -ONLY_FOR_ARCHS = ${CLANG_ARCHS} - COMMENT = color management library EPOCH =1 GH_ACCOUNT = AcademySoftwareFoundation GH_PROJECT = OpenColorIO -GH_TAGNAME = v2.1.1 +GH_TAGNAME = v2.2.1 PKGNAME = ${DISTNAME:L} -REVISION = 1 -SHARED_LIBS += OpenColorIO 1.1 # 1.1.1 +SHARED_LIBS += OpenColorIO 2.0 # 1.1.1 CATEGORIES = graphics @@ -20,9 +17,9 @@ MAINTAINER = Pascal Stumpf =0.7.0 \ math/imath CONFIGURE_ARGS += -DPYTHON="${MODPY_BIN}" \ Index: distinfo === RCS file: /home/cvs/ports/graphics/opencolorio/distinfo,v retrieving revision 1.7 diff -u -p -u -p -r1.7 distinfo --- distinfo5 Mar 2022 11:30:09 - 1.7 +++ distinfo28 May 2023 10:01:23 - @@ -1,2 +1,2 @@ -SHA256 (OpenColorIO-2.1.1.tar.gz) = FuvD4PIfctvpD+YEN+uGT01N6cJV744hL4N4JPybjZw= -SIZE (OpenColorIO-2.1.1.tar.gz) = 11013141 +SHA256 (OpenColorIO-2.2.1.tar.gz) = NvJ8WIf8TlwkGAXCm4uOaHJaoFUgvKp8fshMBCK4WA4= +SIZE (OpenColorIO-2.2.1.tar.gz) = 11336775 Index: patches/patch-src_utils_NumberUtils_h === RCS file: /home/cvs/ports/graphics/opencolorio/patches/patch-src_utils_NumberUtils_h,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_utils_NumberUtils_h --- patches/patch-src_utils_NumberUtils_h 11 Mar 2022 19:22:55 - 1.4 +++ patches/patch-src_utils_NumberUtils_h 3 Jun 2023 09:24:13 - @@ -1,14 +1,27 @@ -Fix build failure - Index: src/utils/NumberUtils.h --- src/utils/NumberUtils.h.orig +++ src/utils/NumberUtils.h -@@ -140,7 +140,7 @@ really_inline from_chars_result from_chars(const char +@@ -64,8 +64,10 @@ really_inline from_chars_result from_chars(const char + double #ifdef _WIN32 - tempval = _strtol_l(first, , 0, loc.local); - #else --tempval = ::strtol_l(first, , 0, loc.local); -+tempval = ::strtoll_l(first, , 0, loc.local); + tempval = _strtod_l(first, , loc.local); +-#else ++#elif defined(__GLIBC__) || defined(_LIBCPP_VERSION) + tempval = ::strtod_l(first, , loc.local); ++#else ++tempval = ::strtod(first, ); + #endif + + if (errno != 0 && errno != EINVAL) +@@ -108,8 +110,10 @@ really_inline from_chars_result from_chars(const char + #elif __APPLE__ + // On OSX, strtod_l is for some reason drastically faster than strtof_l. + tempval = static_cast(::strtod_l(first, , loc.local)); +-#else ++#elif defined(__GLIBC__) || defined(_LIBCPP_VERSION) + tempval = ::strtof_l(first, , loc.local); ++#else ++tempval = ::strtof(first, ); #endif if (errno != 0)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2023/06/04 16:42:48 Modified files: net/curl : Makefile distinfo net/curl/patches: patch-lib_vquic_curl_ngtcp2_c Removed files: net/curl/patches: patch-configure_ac Log message: net/curl: update to 8.1.2 for http2 fix http2: fix EOF handling on uploads with auth negotiation
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 14:17:10 Modified files: editors/ne : Makefile distinfo editors/ne/patches: patch-src_makefile editors/ne/pkg : PLIST Log message: Update to ne-3.3.2 Changelog: https://ne.di.unimi.it/NEWS
Re: UPDATE: devel/dwz 0.14 => 0.15
On 6/4/2023 2:36 PM, Klemens Nanni wrote: > > Perhaps "Use local copy to break dependency cycle" to clarify that? > Then I wouldn't have asked in the first place, as I read your comment > as '' does not exist, force "xxhash.h" '' > I'll put a comment like that in the port Makefile. ~Brian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 13:40:29 Modified files: games/stockfish: Makefile distinfo games/stockfish/patches: patch-src_Makefile Log message: Update to stockfish-15.1 Changelog: https://github.com/official-stockfish/Stockfish/releases
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 12:59:42 Modified files: sysutils/ugrep : Makefile distinfo sysutils/ugrep/pkg: PLIST Log message: Update to ugrep-3.12.1 Changelog: https://github.com/Genivia/ugrep/releases
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 12:44:48 Modified files: editors/moe: Makefile distinfo editors/moe/patches: patch-configure editors/moe/pkg: PLIST Log message: Update to moe-1.13
Re: New: xclickroot
Omar Polo wrote: > On 2023/05/28 21:53:50 +0100, Alexander Arkhipov wrote: > > Hello, > > > > xclickroot is an X program for running commands on clicking the root > > window. It seems to build very cleanly, and so far I've encountered no > > problems with it. The port's tarball is attached to this letter. > > > > Any comments? Thanks. > > > > https://github.com/phillbush/xclickroot > > looks fine, thanks! > > Only one nit: it doesn't respect CFLAGS from the ports infrastructure. > When passing CFLAGS we need to add -I too because it doesn't pass > CPPFLAGS to the ${CC} invocation. > > Attaching a diff against your makefile and an updated tarball that's > OK op@ to import. > > > Cheers, > > Omar Polo > > --- Makefile.orig Mon May 29 07:51:02 2023 > +++ Makefile Mon May 29 07:52:45 2023 > @@ -13,7 +13,8 @@ > > WANTLIB += X11 c > > -MAKE_FLAGS = MANPREFIX=${TRUEPREFIX}/man > +MAKE_FLAGS = CFLAGS="${CFLAGS} -I${X11BASE}/include" \ > + MANPREFIX=${TRUEPREFIX}/man > > NO_TEST =Yes > > I've been further talking with the program's author. xclickroot is now at version 1.4.0, with improvements to the build system and pledging. I tested the port with the new Makefile, and it works fine. Sending the diff and the tarball. Thank you. Alexander --- Makefile.orig Sun Jun 4 21:18:39 2023 +++ MakefileSun Jun 4 21:15:44 2023 @@ -2,7 +2,7 @@ GH_ACCOUNT = phillbush GH_PROJECT = xclickroot -GH_TAGNAME = v1.3 +GH_TAGNAME = v1.4.0 CATEGORIES = x11 HOMEPAGE = https://github.com/phillbush/xclickroot @@ -13,8 +13,11 @@ WANTLIB += X11 c -MAKE_FLAGS = CFLAGS="${CFLAGS} -I${X11BASE}/include" \ - MANPREFIX=${TRUEPREFIX}/man +FAKE_FLAGS = PREFIX=${PREFIX} \ + MANPREFIX=${PREFIX}/man + +MAKE_FLAGS = PREFIX=${TRUEPREFIX} \ + MANPREFIX=${PREFIX}/man NO_TEST = Yes xclickroot.tar.gz Description: application/gzip
Re: UPDATE: devel/dwz 0.14 => 0.15
On Sun, Jun 04, 2023 at 07:56:59PM +0200, Theo Buehler wrote: > On Sun, Jun 04, 2023 at 05:55:02PM +, Klemens Nanni wrote: > > On Sun, Jun 04, 2023 at 05:48:24PM +, Brian Callahan wrote: > > > Hi ports -- > > > > > > Attached is an update to devel/dwz. The main benefit for us is a modest > > > speedup. > > > > > > The full announcement with changes is here: > > > https://sourceware.org/pipermail/dwz/2022q4/001385.html > > > > > > Seems OK on my end on amd64. But since dwz is integral for debug > > > packages, looking for more eyeballs. > > > > > > OK? > > > > > > ~Brian > > > > You fetch xxhash and turn it into a local include. > > Did you try adding the following as dependency instead? > > > > $ pkglocate include/xxhash.h > > xxhash-0.8.1p0:sysutils/xxhash:/usr/local/include/xxhash.h > > I think that would create a loop. xxhash has DEBUG_PACKAGES set and > dwz is needed to extract the debug info. Makes sense now, thanks :) > > > Index: patches/patch-dwz_c > > > === > > > RCS file: /cvs/ports/devel/dwz/patches/patch-dwz_c,v > > > retrieving revision 1.3 > > > diff -u -p -r1.3 patch-dwz_c > > > --- patches/patch-dwz_c 11 Mar 2022 18:50:00 - 1.3 > > > +++ patches/patch-dwz_c 29 Nov 2022 23:40:09 - > > > @@ -1,39 +1,46 @@ > > > Create error() function, Linux-ism. > > > Our libelf doesn't have some of these defines. > > > obstack is not a system header > > > +xxhash is not a system header Perhaps "Use local copy to break dependency cycle" to clarify that? Then I wouldn't have asked in the first place, as I read your comment as '' does not exist, force "xxhash.h" '' > > > +-#include > > > ++#include "xxhash.h"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 12:31:37 Modified files: sysutils/bfs : Makefile distinfo sysutils/bfs/patches: patch-Makefile sysutils/bfs/pkg: PLIST Removed files: sysutils/bfs/patches: patch-tests_tests_sh Log message: Update to bfs-2.6.3 Changelog: https://github.com/tavianator/bfs/releases
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 12:15:09 Modified files: textproc/halibut: Makefile distinfo textproc/halibut/pkg: PLIST Removed files: textproc/halibut/patches: patch-bk_paper_c patch-paper_h Log message: Update to halibut-1.3; patches go away.
Re: UPDATE: devel/dwz 0.14 => 0.15
On 6/4/2023 1:56 PM, Theo Buehler wrote: > On Sun, Jun 04, 2023 at 05:55:02PM +, Klemens Nanni wrote: >> On Sun, Jun 04, 2023 at 05:48:24PM +, Brian Callahan wrote: >>> Hi ports -- >>> >>> Attached is an update to devel/dwz. The main benefit for us is a modest >>> speedup. >>> >>> The full announcement with changes is here: >>> https://sourceware.org/pipermail/dwz/2022q4/001385.html >>> >>> Seems OK on my end on amd64. But since dwz is integral for debug >>> packages, looking for more eyeballs. >>> >>> OK? >>> >>> ~Brian >> >> You fetch xxhash and turn it into a local include. >> Did you try adding the following as dependency instead? >> >> $ pkglocate include/xxhash.h >> xxhash-0.8.1p0:sysutils/xxhash:/usr/local/include/xxhash.h > > I think that would create a loop. xxhash has DEBUG_PACKAGES set and > dwz is needed to extract the debug info. > That's correct. That's what I did things the way I did. ~Brian
Re: UPDATE: devel/dwz 0.14 => 0.15
On Sun, Jun 04, 2023 at 05:55:02PM +, Klemens Nanni wrote: > On Sun, Jun 04, 2023 at 05:48:24PM +, Brian Callahan wrote: > > Hi ports -- > > > > Attached is an update to devel/dwz. The main benefit for us is a modest > > speedup. > > > > The full announcement with changes is here: > > https://sourceware.org/pipermail/dwz/2022q4/001385.html > > > > Seems OK on my end on amd64. But since dwz is integral for debug > > packages, looking for more eyeballs. > > > > OK? > > > > ~Brian > > You fetch xxhash and turn it into a local include. > Did you try adding the following as dependency instead? > > $ pkglocate include/xxhash.h > xxhash-0.8.1p0:sysutils/xxhash:/usr/local/include/xxhash.h I think that would create a loop. xxhash has DEBUG_PACKAGES set and dwz is needed to extract the debug info. > > > > Index: Makefile > > === > > RCS file: /cvs/ports/devel/dwz/Makefile,v > > retrieving revision 1.6 > > diff -u -p -r1.6 Makefile > > --- Makefile11 Mar 2022 18:50:00 - 1.6 > > +++ Makefile29 Nov 2022 23:40:09 - > > @@ -1,5 +1,8 @@ > > COMMENT = DWARF optimization and duplicate removal tool > > -DISTNAME = dwz-0.14 > > +PKGNAME = dwz-0.15 > > +XXHASH_V = 0.8.1 > > +DISTFILES =${PKGNAME}.tar.gz:0 \ > > + xxhash-${XXHASH_V}{xxhash}.h:1 > > > > CATEGORIES = devel > > > > @@ -11,7 +14,8 @@ PERMIT_PACKAGE = Yes > > > > WANTLIB += c elf > > > > -MASTER_SITES = https://sourceware.org/ftp/dwz/releases/ > > +MASTER_SITES0 =https://sourceware.org/ftp/dwz/releases/ > > +MASTER_SITES1 = > > https://raw.githubusercontent.com/Cyan4973/xxHash/v${XXHASH_V}/ > > > > DEBUG_PACKAGES = ${BUILD_PACKAGES} > > > > @@ -25,5 +29,23 @@ WRKDIST =${WRKDIR}/dwz > > # XXX bootstrap: DEBUG_PACKAGES needs a dwz binary to work > > > > DWZ = ${WRKBUILD}/dwz > > + > > +EXTRACT_ONLY = ${PKGNAME}.tar.gz > > + > > +post-extract: > > + cp ${DISTDIR}/xxhash-${XXHASH_V}.h ${WRKSRC}/xxhash.h > > + > > +.include > > +.if ${PROPERTIES:Mlp64} > > +CFLAGS += -DNATIVE_POINTER_SIZE=8 > > +.else > > +CFLAGS += -DNATIVE_POINTER_SIZE=4 > > +.endif > > + > > +.if ${PROPERTIES:Mle} > > +CFLAGS += -DNATIVE_ENDIAN_VAL=ELFDATA2LSB > > +.else > > +CFLAGS += -DNATIVE_ENDIAN_VAL=ELFDATA2MSB > > +.endif > > > > .include > > Index: distinfo > > === > > RCS file: /cvs/ports/devel/dwz/distinfo,v > > retrieving revision 1.2 > > diff -u -p -r1.2 distinfo > > --- distinfo8 Mar 2021 16:51:11 - 1.2 > > +++ distinfo29 Nov 2022 23:40:09 - > > @@ -1,2 +1,4 @@ > > -SHA256 (dwz-0.14.tar.gz) = MwBuq4df8KB/E/yIWIPFvZUU2D7OqfGLxGtXMt3fDR8= > > -SIZE (dwz-0.14.tar.gz) = 186623 > > +SHA256 (dwz-0.15.tar.gz) = 7VnGEuIEFeaX+8RRH1J+91cAe8VvoalU5JrKHans+0Q= > > +SHA256 (xxhash-0.8.1.h) = 1PK5G1R8eQYWSRhnIaazMWCfK/hZVIWiHqYxyC7D75M= > > +SIZE (dwz-0.15.tar.gz) = 192777 > > +SIZE (xxhash-0.8.1.h) = 209646 > > Index: patches/patch-Makefile > > === > > RCS file: /cvs/ports/devel/dwz/patches/patch-Makefile,v > > retrieving revision 1.3 > > diff -u -p -r1.3 patch-Makefile > > --- patches/patch-Makefile 11 Mar 2022 18:50:00 - 1.3 > > +++ patches/patch-Makefile 29 Nov 2022 23:40:09 - > > @@ -6,31 +6,76 @@ Convert to bsd make > > Index: Makefile > > --- Makefile.orig > > +++ Makefile > > -@@ -1,20 +1,16 @@ > > +@@ -1,51 +1,21 @@ > > -ifneq ($(srcdir),) > > -VPATH = $(srcdir) > > -else > > -srcdir=$(shell pwd) > > -endif > > +- > > -CFLAGS = -O2 -g > > -DWZ_VERSION := $(shell cat $(srcdir)/VERSION) > > --override CFLAGS += -Wall -W -D_FILE_OFFSET_BITS=64 \ > > -- -DDWZ_VERSION='"$(DWZ_VERSION)"' $(shell cat $(srcdir)/COPYRIGHT_YEARS) > > +-CFLAGS_VERSION = -DDWZ_VERSION='"$(DWZ_VERSION)"' > > +-CFLAGS_COPYRIGHT = $(shell cat $(srcdir)/COPYRIGHT_YEARS) > > +-CFLAGS_COMMON = -Wall -W -D_FILE_OFFSET_BITS=64 > > +-XXH_PROG = "\#define XXH_INLINE_ALL 1\n\#include \n" > > +-XXH_INLINE_ALL_WORKS = $(shell printf $(XXH_PROG) \ > > +- | $(CC) -xc -c - -o /dev/null 2>/dev/null \ > > +- && echo -n 1) > > +-ifeq "$(XXH_INLINE_ALL_WORKS)" "1" > > +- CFLAGS_COMMON += -DXXH_INLINE_ALL=1 > > +-endif > > +- > > +-override CFLAGS += $(CFLAGS_COMMON) $(CFLAGS_VERSION) $(CFLAGS_COPYRIGHT) > > +- > > +srcdir = . > > +CFLAGS ?= -O2 -g > > +DWZ_VERSION != cat $(srcdir)/VERSION > > +CFLAGS += -DDWZ_VERSION='"$(DWZ_VERSION)"' > > +CFLAGS !+= cat $(srcdir)/COPYRIGHT_YEARS > > ++CFLAGS += -D_FILE_OFFSET_BITS=64 > > ++CFLAGS += -DXXH_INLINE_ALL=1 > > prefix = /usr > > exec_prefix = $(prefix) > > bindir = $(exec_prefix)/bin > > datarootdir = $(prefix)/share > > mandir = $(datarootdir)/man > > --OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o > > -+OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o obstack.o > > +-OBJECTS =
Re: UPDATE: devel/dwz 0.14 => 0.15
On Sun, Jun 04, 2023 at 05:48:24PM +, Brian Callahan wrote: > Hi ports -- > > Attached is an update to devel/dwz. The main benefit for us is a modest > speedup. > > The full announcement with changes is here: > https://sourceware.org/pipermail/dwz/2022q4/001385.html > > Seems OK on my end on amd64. But since dwz is integral for debug > packages, looking for more eyeballs. > > OK? > > ~Brian You fetch xxhash and turn it into a local include. Did you try adding the following as dependency instead? $ pkglocate include/xxhash.h xxhash-0.8.1p0:sysutils/xxhash:/usr/local/include/xxhash.h > Index: Makefile > === > RCS file: /cvs/ports/devel/dwz/Makefile,v > retrieving revision 1.6 > diff -u -p -r1.6 Makefile > --- Makefile 11 Mar 2022 18:50:00 - 1.6 > +++ Makefile 29 Nov 2022 23:40:09 - > @@ -1,5 +1,8 @@ > COMMENT =DWARF optimization and duplicate removal tool > -DISTNAME = dwz-0.14 > +PKGNAME =dwz-0.15 > +XXHASH_V = 0.8.1 > +DISTFILES = ${PKGNAME}.tar.gz:0 \ > + xxhash-${XXHASH_V}{xxhash}.h:1 > > CATEGORIES = devel > > @@ -11,7 +14,8 @@ PERMIT_PACKAGE =Yes > > WANTLIB += c elf > > -MASTER_SITES = https://sourceware.org/ftp/dwz/releases/ > +MASTER_SITES0 = https://sourceware.org/ftp/dwz/releases/ > +MASTER_SITES1 = > https://raw.githubusercontent.com/Cyan4973/xxHash/v${XXHASH_V}/ > > DEBUG_PACKAGES = ${BUILD_PACKAGES} > > @@ -25,5 +29,23 @@ WRKDIST = ${WRKDIR}/dwz > # XXX bootstrap: DEBUG_PACKAGES needs a dwz binary to work > > DWZ = ${WRKBUILD}/dwz > + > +EXTRACT_ONLY = ${PKGNAME}.tar.gz > + > +post-extract: > + cp ${DISTDIR}/xxhash-${XXHASH_V}.h ${WRKSRC}/xxhash.h > + > +.include > +.if ${PROPERTIES:Mlp64} > +CFLAGS +=-DNATIVE_POINTER_SIZE=8 > +.else > +CFLAGS +=-DNATIVE_POINTER_SIZE=4 > +.endif > + > +.if ${PROPERTIES:Mle} > +CFLAGS +=-DNATIVE_ENDIAN_VAL=ELFDATA2LSB > +.else > +CFLAGS +=-DNATIVE_ENDIAN_VAL=ELFDATA2MSB > +.endif > > .include > Index: distinfo > === > RCS file: /cvs/ports/devel/dwz/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 8 Mar 2021 16:51:11 - 1.2 > +++ distinfo 29 Nov 2022 23:40:09 - > @@ -1,2 +1,4 @@ > -SHA256 (dwz-0.14.tar.gz) = MwBuq4df8KB/E/yIWIPFvZUU2D7OqfGLxGtXMt3fDR8= > -SIZE (dwz-0.14.tar.gz) = 186623 > +SHA256 (dwz-0.15.tar.gz) = 7VnGEuIEFeaX+8RRH1J+91cAe8VvoalU5JrKHans+0Q= > +SHA256 (xxhash-0.8.1.h) = 1PK5G1R8eQYWSRhnIaazMWCfK/hZVIWiHqYxyC7D75M= > +SIZE (dwz-0.15.tar.gz) = 192777 > +SIZE (xxhash-0.8.1.h) = 209646 > Index: patches/patch-Makefile > === > RCS file: /cvs/ports/devel/dwz/patches/patch-Makefile,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-Makefile > --- patches/patch-Makefile11 Mar 2022 18:50:00 - 1.3 > +++ patches/patch-Makefile29 Nov 2022 23:40:09 - > @@ -6,31 +6,76 @@ Convert to bsd make > Index: Makefile > --- Makefile.orig > +++ Makefile > -@@ -1,20 +1,16 @@ > +@@ -1,51 +1,21 @@ > -ifneq ($(srcdir),) > -VPATH = $(srcdir) > -else > -srcdir=$(shell pwd) > -endif > +- > -CFLAGS = -O2 -g > -DWZ_VERSION := $(shell cat $(srcdir)/VERSION) > --override CFLAGS += -Wall -W -D_FILE_OFFSET_BITS=64 \ > ---DDWZ_VERSION='"$(DWZ_VERSION)"' $(shell cat $(srcdir)/COPYRIGHT_YEARS) > +-CFLAGS_VERSION = -DDWZ_VERSION='"$(DWZ_VERSION)"' > +-CFLAGS_COPYRIGHT = $(shell cat $(srcdir)/COPYRIGHT_YEARS) > +-CFLAGS_COMMON = -Wall -W -D_FILE_OFFSET_BITS=64 > +-XXH_PROG = "\#define XXH_INLINE_ALL 1\n\#include \n" > +-XXH_INLINE_ALL_WORKS = $(shell printf $(XXH_PROG) \ > +-| $(CC) -xc -c - -o /dev/null 2>/dev/null \ > +-&& echo -n 1) > +-ifeq "$(XXH_INLINE_ALL_WORKS)" "1" > +- CFLAGS_COMMON += -DXXH_INLINE_ALL=1 > +-endif > +- > +-override CFLAGS += $(CFLAGS_COMMON) $(CFLAGS_VERSION) $(CFLAGS_COPYRIGHT) > +- > +srcdir = . > +CFLAGS ?= -O2 -g > +DWZ_VERSION != cat $(srcdir)/VERSION > +CFLAGS += -DDWZ_VERSION='"$(DWZ_VERSION)"' > +CFLAGS !+= cat $(srcdir)/COPYRIGHT_YEARS > ++CFLAGS += -D_FILE_OFFSET_BITS=64 > ++CFLAGS += -DXXH_INLINE_ALL=1 > prefix = /usr > exec_prefix = $(prefix) > bindir = $(exec_prefix)/bin > datarootdir = $(prefix)/share > mandir = $(datarootdir)/man > --OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o > -+OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o obstack.o > +-OBJECTS = args.o dwz.o hashtab.o pool.o sha1.o dwarfnames.o > ++OBJECTS = args.o dwz.o hashtab.o pool.o sha1.o dwarfnames.o obstack.o > + LIBS=-lelf > +-ifneq "$(XXH_INLINE_ALL_WORKS)" "1" > +-LIBS += -lxxhash > +-endif > dwz: $(OBJECTS) > --$(CC) $(LDFLAGS) -o $@ $^ -lelf > -+$(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lelf > +-$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) > +-args.o: native.o > +-args.o: CFLAGS_FOR_SOURCE = \ > +-
UPDATE: devel/dwz 0.14 => 0.15
Hi ports -- Attached is an update to devel/dwz. The main benefit for us is a modest speedup. The full announcement with changes is here: https://sourceware.org/pipermail/dwz/2022q4/001385.html Seems OK on my end on amd64. But since dwz is integral for debug packages, looking for more eyeballs. OK? ~BrianIndex: Makefile === RCS file: /cvs/ports/devel/dwz/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile11 Mar 2022 18:50:00 - 1.6 +++ Makefile29 Nov 2022 23:40:09 - @@ -1,5 +1,8 @@ COMMENT = DWARF optimization and duplicate removal tool -DISTNAME = dwz-0.14 +PKGNAME = dwz-0.15 +XXHASH_V = 0.8.1 +DISTFILES =${PKGNAME}.tar.gz:0 \ + xxhash-${XXHASH_V}{xxhash}.h:1 CATEGORIES = devel @@ -11,7 +14,8 @@ PERMIT_PACKAGE = Yes WANTLIB += c elf -MASTER_SITES = https://sourceware.org/ftp/dwz/releases/ +MASTER_SITES0 =https://sourceware.org/ftp/dwz/releases/ +MASTER_SITES1 = https://raw.githubusercontent.com/Cyan4973/xxHash/v${XXHASH_V}/ DEBUG_PACKAGES = ${BUILD_PACKAGES} @@ -25,5 +29,23 @@ WRKDIST =${WRKDIR}/dwz # XXX bootstrap: DEBUG_PACKAGES needs a dwz binary to work DWZ = ${WRKBUILD}/dwz + +EXTRACT_ONLY = ${PKGNAME}.tar.gz + +post-extract: + cp ${DISTDIR}/xxhash-${XXHASH_V}.h ${WRKSRC}/xxhash.h + +.include +.if ${PROPERTIES:Mlp64} +CFLAGS += -DNATIVE_POINTER_SIZE=8 +.else +CFLAGS += -DNATIVE_POINTER_SIZE=4 +.endif + +.if ${PROPERTIES:Mle} +CFLAGS += -DNATIVE_ENDIAN_VAL=ELFDATA2LSB +.else +CFLAGS += -DNATIVE_ENDIAN_VAL=ELFDATA2MSB +.endif .include Index: distinfo === RCS file: /cvs/ports/devel/dwz/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo8 Mar 2021 16:51:11 - 1.2 +++ distinfo29 Nov 2022 23:40:09 - @@ -1,2 +1,4 @@ -SHA256 (dwz-0.14.tar.gz) = MwBuq4df8KB/E/yIWIPFvZUU2D7OqfGLxGtXMt3fDR8= -SIZE (dwz-0.14.tar.gz) = 186623 +SHA256 (dwz-0.15.tar.gz) = 7VnGEuIEFeaX+8RRH1J+91cAe8VvoalU5JrKHans+0Q= +SHA256 (xxhash-0.8.1.h) = 1PK5G1R8eQYWSRhnIaazMWCfK/hZVIWiHqYxyC7D75M= +SIZE (dwz-0.15.tar.gz) = 192777 +SIZE (xxhash-0.8.1.h) = 209646 Index: patches/patch-Makefile === RCS file: /cvs/ports/devel/dwz/patches/patch-Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-Makefile --- patches/patch-Makefile 11 Mar 2022 18:50:00 - 1.3 +++ patches/patch-Makefile 29 Nov 2022 23:40:09 - @@ -6,31 +6,76 @@ Convert to bsd make Index: Makefile --- Makefile.orig +++ Makefile -@@ -1,20 +1,16 @@ +@@ -1,51 +1,21 @@ -ifneq ($(srcdir),) -VPATH = $(srcdir) -else -srcdir=$(shell pwd) -endif +- -CFLAGS = -O2 -g -DWZ_VERSION := $(shell cat $(srcdir)/VERSION) --override CFLAGS += -Wall -W -D_FILE_OFFSET_BITS=64 \ -- -DDWZ_VERSION='"$(DWZ_VERSION)"' $(shell cat $(srcdir)/COPYRIGHT_YEARS) +-CFLAGS_VERSION = -DDWZ_VERSION='"$(DWZ_VERSION)"' +-CFLAGS_COPYRIGHT = $(shell cat $(srcdir)/COPYRIGHT_YEARS) +-CFLAGS_COMMON = -Wall -W -D_FILE_OFFSET_BITS=64 +-XXH_PROG = "\#define XXH_INLINE_ALL 1\n\#include \n" +-XXH_INLINE_ALL_WORKS = $(shell printf $(XXH_PROG) \ +- | $(CC) -xc -c - -o /dev/null 2>/dev/null \ +- && echo -n 1) +-ifeq "$(XXH_INLINE_ALL_WORKS)" "1" +- CFLAGS_COMMON += -DXXH_INLINE_ALL=1 +-endif +- +-override CFLAGS += $(CFLAGS_COMMON) $(CFLAGS_VERSION) $(CFLAGS_COPYRIGHT) +- +srcdir = . +CFLAGS ?= -O2 -g +DWZ_VERSION != cat $(srcdir)/VERSION +CFLAGS += -DDWZ_VERSION='"$(DWZ_VERSION)"' +CFLAGS !+= cat $(srcdir)/COPYRIGHT_YEARS ++CFLAGS += -D_FILE_OFFSET_BITS=64 ++CFLAGS += -DXXH_INLINE_ALL=1 prefix = /usr exec_prefix = $(prefix) bindir = $(exec_prefix)/bin datarootdir = $(prefix)/share mandir = $(datarootdir)/man --OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o -+OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o obstack.o +-OBJECTS = args.o dwz.o hashtab.o pool.o sha1.o dwarfnames.o ++OBJECTS = args.o dwz.o hashtab.o pool.o sha1.o dwarfnames.o obstack.o + LIBS=-lelf +-ifneq "$(XXH_INLINE_ALL_WORKS)" "1" +-LIBS += -lxxhash +-endif dwz: $(OBJECTS) -- $(CC) $(LDFLAGS) -o $@ $^ -lelf -+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lelf +- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) +-args.o: native.o +-args.o: CFLAGS_FOR_SOURCE = \ +- -DNATIVE_ENDIAN_VAL=$(NATIVE_ENDIAN_VAL) \ +- -DNATIVE_POINTER_SIZE=$(NATIVE_POINTER_SIZE) +-NATIVE_ENDIAN=$(shell readelf -h native.o \ +- | grep Data \ +- | sed 's/.*, //;s/ endian//') +-NATIVE_ENDIAN_LITTLE=$(findstring $(NATIVE_ENDIAN),$(findstring little,$(NATIVE_ENDIAN))) +-NATIVE_ENDIAN_BIG=$(findstring $(NATIVE_ENDIAN),$(findstring big,$(NATIVE_ENDIAN))) +-NATIVE_ENDIAN_VAL=$(if $(NATIVE_ENDIAN_LITTLE),ELFDATA2LSB,$(if $(NATIVE_ENDIAN_BIG),ELFDATA2MSB,ELFDATANONE)) +-NATIVE_POINTER_SIZE=$(shell readelf -wi
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 11:26:47 Modified files: sysutils/coreutils: Makefile distinfo sysutils/coreutils/patches: patch-Makefile_in sysutils/coreutils/pkg: PLIST Log message: Update to coreutils-9.3 Changelog: https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 11:22:16 Modified files: math/bc-gh : Makefile distinfo Log message: Update to bc-gh-6.6.0 Changelog: https://git.gavinhoward.com/gavin/bc/releases
Re: handrake fails to build (aws vs gawk)
Hi Antoine -- On 6/4/2023 12:42 PM, Antoine Jacoutot wrote: > Hi. > > It seems some configure scripts are run at build time. > If gawk is installed, it is prefered over awk but if dpb(1) junks it, then > packaging fails. > > Full log attached. > Thanks for the heads up. I added AWK=/usr/bin/awk to MAKE_ENV to prevent picking up gawk. ~Brian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 11:18:14 Modified files: multimedia/handbrake: Makefile Log message: Add AWK=/usr/bin/awk to MAKE_ENV to prevent accidentially picking up gawk. Reported by aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/04 11:07:32 Modified files: fonts/unifont : Makefile distinfo Log message: Update to unifont-15.0.05 Upstream says this is the final version to ship with TTF fonts. OTF only going forward.
Re: update productivity/vym
On Sun, 2023-05-07 at 20:12 +0200, Solène Rapenne wrote: > Le Sun, 7 May 2023 17:07:06 +0200, > Solène Rapenne a écrit : > > > I updated vym to latest version, a lot of changes, it moved to > > GitHub > > and from gmake to cmake, which simplify the port > > > > it works fine for me, I needed to add a patch to fix unzip/zip > > binaries > > path because it's hardcoded. > > > > However, all the icons are installed in /usr/local/share/icons/ > > which > > seems wrong (and portcheck reports it), but I don't know how to > > change > > the path here, a little help would be appreciated :) > > > ping
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2023/06/04 10:36:58 Modified files: audio/cozy : Makefile distinfo audio/cozy/pkg : PLIST Added files: audio/cozy/patches: patch-cozy_ui_widgets_whats_new_window_py Log message: Update to cozy-1.2.1 ok sdk@ (and thanks for your hints)
[maintainer update] devel/gopls 0.12.2
Hi, update for devel/gopls (Go language server) version 0.12.2 Changelog: https://github.com/golang/tools/releases - update Makefile, modules.inc and distinfo for this version Build and tests OK on current/amd64. Comments welcome and please commit if OK. Laurent Index: Makefile === RCS file: /cvs/ports/devel/gopls/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 25 Jan 2023 19:42:01 - 1.1.1.1 +++ Makefile 4 Jun 2023 08:18:37 - @@ -1,7 +1,7 @@ COMMENT = official Go language server developed by the Go team MODGO_MODNAME = golang.org/x/tools/gopls -MODGO_VERSION = v0.11.0 +MODGO_VERSION = v0.12.2 DISTNAME = gopls-${MODGO_VERSION} @@ -27,4 +27,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/design/*.md ${DOCDIR}/doc/design .include "modules.inc" + .include Index: distinfo === RCS file: /cvs/ports/devel/gopls/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 25 Jan 2023 19:42:01 - 1.1.1.1 +++ distinfo 4 Jun 2023 08:18:37 - @@ -1,5 +1,4 @@ SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.mod) = KAIbQYClnDmTYHqVsY4jDdC8a+pSQv/o6ou/tPT3tNc= -SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.4.1.mod) = JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0= SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.1.mod) = JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0= SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.1.zip) = b7ZY6CYhef/TTVfq72sHayXHfoshKWWbZml83tKacSE= SHA256 (go_modules/github.com/client9/misspell/@v/v0.3.4.mod) = 0bw2Ld3Zb7OkPtS5Kqq3CqbH71pQDX8JVk4+skq88Lg= @@ -47,39 +46,44 @@ SHA256 (go_modules/github.com/stretchr/t SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM= SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = u0GmArF0NF/aOSyK2D/MkyF8KFx2NplndjC+kP63peM= SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20220722155223-a9213eeb770e.mod) = KqbbzGUyHHFTSmOE7NZqsrIERkRKV3BwZjFFGY3Rnas= -SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20221031165847-c99f073a8326.mod) = AWlyQUC24fWTQogGuQZg3GxMER20/hXZIWJCRvypaug= -SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20221031165847-c99f073a8326.zip) = 0VQ98PHqzMEkcPOyzMHLCMNc3YG5u9K/R3nQAlnlaAY= -SHA256 (go_modules/golang.org/x/exp/typeparams/@v/v0.0.0-20220218215828-6cf2b201936e.mod) = SQZPK2tZROCRvGfzTutXGbAFLfczPYiHFzXT6KwHFao= -SHA256 (go_modules/golang.org/x/exp/typeparams/@v/v0.0.0-20221031165847-c99f073a8326.mod) = SQZPK2tZROCRvGfzTutXGbAFLfczPYiHFzXT6KwHFao= -SHA256 (go_modules/golang.org/x/exp/typeparams/@v/v0.0.0-20221031165847-c99f073a8326.zip) = duB2tXnpqnDGZAdW9cZvyrGgXeIUMrxb+PhD1cLlFV4= +SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20220722155223-a9213eeb770e.zip) = o+6GO16mDpfWE+IoyuZ1sYAHLRVN+jR8x6+u4xNocSM= +SHA256 (go_modules/golang.org/x/exp/typeparams/@v/v0.0.0-20221208152030-732eee02a75a.mod) = SQZPK2tZROCRvGfzTutXGbAFLfczPYiHFzXT6KwHFao= +SHA256 (go_modules/golang.org/x/exp/typeparams/@v/v0.0.0-20221212164502-fae10dda9338.mod) = SQZPK2tZROCRvGfzTutXGbAFLfczPYiHFzXT6KwHFao= +SHA256 (go_modules/golang.org/x/exp/typeparams/@v/v0.0.0-20221212164502-fae10dda9338.zip) = kGHnJiZ9+AzaxzMalJPXcORzCJoFvSwezwzwqRC5UOI= +SHA256 (go_modules/golang.org/x/mod/@v/v0.10.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ= +SHA256 (go_modules/golang.org/x/mod/@v/v0.10.0.zip) = +HZHOsJ/HG47D/+XHIT7689nDbCz6PKB4DFJ/PY2/iU= +SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220106191415-9b9b3d81d5e3.mod) = CT1MzqEdCHW3jvAJ119ua0lGy5YRNQEqZC8SVR1ISNw= SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = QtGQI/+PLq5wC8VJXzcezZmKItGbqYXQr19pkAslQIM= -SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0.mod) = mfQKUOjWDCWZrEXGzix21VSoQorNE8LGikk/ymGbT6g= SHA256 (go_modules/golang.org/x/mod/@v/v0.7.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ= -SHA256 (go_modules/golang.org/x/mod/@v/v0.7.0.zip) = JKvR2xMymHPXIDTcJ++tCcvDfTnPKLj/e7PCrcju3vc= -SHA256 (go_modules/golang.org/x/net/@v/v0.2.0.mod) = B+xkXjNT/CZz8tje5cFOuSi5wTEnpAn+PsQOq6Tb2zA= -SHA256 (go_modules/golang.org/x/net/@v/v0.2.0.zip) = Qz5kVllICHDXOMIk3uwi7mrZ7L/T5BKoqpFej45GnM0= +SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ= +SHA256 (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 07fiNv8J5jIr5IkXAhbgGNMiGGLxoFPctj5T6rhTPBc= +SHA256 (go_modules/golang.org/x/net/@v/v0.10.0.zip) = +S+bJlUiam0BWvenYnmhH7VWeOQQuFGxWPyEZUb4BzM= SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20220819030929-7fc1605a5dde.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= SHA256 (go_modules/golang.org/x/sync/@v/v0.1.0.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= -SHA256
Re: NEW: devel/bazel
On Sun, 2023-01-29 at 17:34 -0500, Matt Hildebrand wrote: > This port is now updated to Bazel 6.0.0. The port is at: > https://github.com/aldersondrive/bazel_openbsd_port > > Bazel is a polyglot build tool. > > Web site: https://bazel.build/ > > In my testing, this port works on amd64. The build fails on i386, > due to C++ code that requires a 64-bit platform. > > Feedback/suggestions are welcome. > > Thank you. > hi, thanks for your interest into porting bazel to OpenBSD I've been able to compile the port successfully, but if I run it by typing "bazel", I have the following error message: ERROR: couldn't find java at '/usr/local/bin/jdk-17/bin/java' I'm not sure why... I only have jdk-11 installed as a dependency.
remove net/sendxmpp
I'd like to remove net/sendxmpp, it's dead and not working. https://github.com/lhost/sendxmpp/issues While there, we could remove net/p5-Net-XMPP as it's only used by net/sendxmpp. There is a working and maintained Go alternative we could import as a replacement https://salsa.debian.org/mdosch/go-sendxmpp
Re: UPDATE: Dolphin 20230523
On Wed, 2023-05-24 at 00:19 -0400, Brad Smith wrote: > Here is an update to Dolphin 20230523 snapshot. > > Rolling up 4 years worth of work. I don't see any sort of change log. > Nice, thanks! It builds fine on amd64, and the GUI runs. The diff looks good. I can't try dolphin more, but I'd be happy to commit if someone else is ok.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/04 06:41:39 Modified files: security/py-tlsfuzzer: Makefile distinfo Log message: Update tlsfuzzer to 20230602
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/04 06:27:06 Modified files: security/openssl-ruby-tests: Makefile distinfo Log message: Update to openssl-ruby-tests 20230602
Re: [new] games/dsda-doom
I've updated the WIP port to version 0.26.1 Tested with doom2 iwad and mods. Apr 19, 2023, 15:54 by lu...@seninha.org: > On 2023-04-04, Lucas de Sena wrote: > >> Hi, >> >> This is a port for DSDA-Doom. >> >> DSDA-Doom is a new DOOM source port based on prboom-plus. It has extra >> tooling for demo recording and playback, with a focus on speedrunning. >> It also implements several new standards for mod and map authors alike. >> >> Noteworthy features include the hability to rewind the game; support for >> Heretic and Hexen (two games based on DOOM, but with a wizardry/medieval >> theme); and support for UMAPINFO, in which a WAD can provide meta-data >> associated to levels, such as the level author, the name of the music >> playing in the level, etc. >> >> DSDA-Doom has gained popularity among DOOM players and the users of the >> doomworld.com forums. >> >> Article on the DOOM Wiki: https://doomwiki.org/wiki/DSDA-Doom >> Post on the DoomWorld forums: https://www.doomworld.com/vb/thread/118074 >> Repository on Github: https://github.com/kraflab/dsda-doom >> >> Lucas de Sena >> > > Ping. > dsda-doom.tar.gz Description: application/gzip
Re: UPDATE: graphics/zxing
On 2023/06/04 11:01, Rafael Sadowski wrote: > On Sun Jun 04, 2023 at 09:38:46AM +0200, Rafael Sadowski wrote: > > Hi Stuart, Hi ports@, > > > > I would like to update zxing because I need zxing>=2.0 as a dependency > > for KDE Gear 23.04 (kitinerary). Looks like our zxing port is pretty > > old. The disadvantage of these update is the loss of bin/zxing. > > > > Looks like nothing depends on it expect kitinerary. > > > > Do we need BUILD_PYTHON_MODULE enabled? > > After feedback from Stuart, thanks: > > - Remove includes, shared libs ... from current port and build a static > linked zxing binary (Tests are still passed). > - Add a new port graphics/zxing-cpp (attached) Thanks, this reads good to me, I'm away atm but will test soon. > Information for inst:zxing-cpp-2.0.0 > > Comment: > C++ barcode image processing library > > Required by: > debug-zxing-cpp-2.0.0 > > Description: > ZXing-C++ ("zebra crossing") is an open-source, multi-format linear/matrix > barcode image processing library implemented in C++. > > Maintainer: Rafael Sadowski > > WWW: https://github.com/zxing-cpp/zxing-cpp > > > I think no conflicts tags are necessary. > > > > > > > If I get an okay I would commit it with the KDE Gear update. > > > > Still valid. No rush. > > > diff --git a/graphics/zxing/Makefile b/graphics/zxing/Makefile > index fae0248dc9d..26380c25cb5 100644 > --- a/graphics/zxing/Makefile > +++ b/graphics/zxing/Makefile > @@ -1,13 +1,11 @@ > COMMENT= barcode image processing library > > -SHARED_LIBS= zxing 0.0 > - > GH_ACCOUNT= glassechidna > GH_PROJECT= zxing-cpp > GH_COMMIT= e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 > > DISTNAME=zxing-20190320 > -REVISION=2 > +REVISION=3 > > MAINTAINER= Stuart Henderson > > @@ -26,12 +24,7 @@ MODULES= devel/cmake > LIB_DEPENDS= converters/libiconv > BUILD_DEPENDS= devel/cppunit > > -CONFIGURE_ARGS= -DCMAKE_LIBRARY_PATH=${LOCALBASE}/lib \ > - -DBUILD_TESTING=yes > - > -SUBST_VARS+= LIBzxing_VERSION > -pre-configure: > - ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt > +CONFIGURE_ARGS= -DBUILD_TESTING=ON > > do-test: > ${WRKBUILD}/testrunner > diff --git a/graphics/zxing/patches/patch-CMakeLists_txt > b/graphics/zxing/patches/patch-CMakeLists_txt > index d160f20f5a9..d5098c52f5a 100644 > --- a/graphics/zxing/patches/patch-CMakeLists_txt > +++ b/graphics/zxing/patches/patch-CMakeLists_txt > @@ -10,14 +10,42 @@ Index: CMakeLists.txt > if(OpenCV_FOUND) > list(APPEND LIBZXING_FILES > opencv/src/zxing/MatSource.cpp > -@@ -57,8 +57,8 @@ if(OpenCV_FOUND) > +@@ -87,20 +87,17 @@ file(GLOB_RECURSE ZXING_FILES > + add_executable(zxing ${ZXING_FILES}) > + target_link_libraries(zxing libzxing) > + > +-install(TARGETS zxing libzxing EXPORT zxing-targets > +-LIBRARY DESTINATION lib > ++install(TARGETS zxing > + RUNTIME DESTINATION bin > +-ARCHIVE DESTINATION lib > +-INCLUDES DESTINATION include > + ) > + > +-install(EXPORT zxing-targets DESTINATION lib/zxing/cmake NAMESPACE zxing::) > ++#install(EXPORT zxing-targets DESTINATION lib/zxing/cmake NAMESPACE zxing::) > + > +-install( > +-DIRECTORY core/src/zxing/ > +-DESTINATION include/zxing > +-FILES_MATCHING PATTERN "*.h" > +-) > ++#install( > ++#DIRECTORY core/src/zxing/ > ++#DESTINATION include/zxing > ++#FILES_MATCHING PATTERN "*.h" > ++#) > + > + if(OpenCV_FOUND) > + install( > +@@ -110,8 +107,8 @@ if(OpenCV_FOUND) > + ) > endif() > > - include_directories(core/src) > --add_library(libzxing ${LIBZXING_FILES}) > --set_target_properties(libzxing PROPERTIES PREFIX "") > -+add_library(libzxing SHARED ${LIBZXING_FILES}) > -+set_target_properties(libzxing PROPERTIES PREFIX "" VERSION > ${LIBzxing_VERSION}) > +-configure_file(cmake/zxing-config.cmake.in zxing-config.cmake @ONLY) > +-install(FILES ${CMAKE_BINARY_DIR}/zxing-config.cmake DESTINATION > lib/zxing/cmake) > ++#configure_file(cmake/zxing-config.cmake.in zxing-config.cmake @ONLY) > ++#install(FILES ${CMAKE_BINARY_DIR}/zxing-config.cmake DESTINATION > lib/zxing/cmake) > > - find_package(Iconv) > - if(ICONV_FOUND) > + if(BUILD_TESTING) > + # Add testrunner executable. > diff --git a/graphics/zxing/pkg/PLIST b/graphics/zxing/pkg/PLIST > index b35ccaac754..be52734c703 100644 > --- a/graphics/zxing/pkg/PLIST > +++ b/graphics/zxing/pkg/PLIST > @@ -1,130 +1 @@ > @bin bin/zxing > -include/zxing/ > -include/zxing/BarcodeFormat.h > -include/zxing/Binarizer.h > -include/zxing/BinaryBitmap.h > -include/zxing/ChecksumException.h > -include/zxing/DecodeHints.h > -include/zxing/Exception.h > -include/zxing/FormatException.h > -include/zxing/IllegalStateException.h > -include/zxing/InvertedLuminanceSource.h > -include/zxing/LuminanceSource.h > -include/zxing/MultiFormatReader.h > -include/zxing/NotFoundException.h > -include/zxing/Reader.h > -include/zxing/ReaderException.h > -include/zxing/Result.h > -include/zxing/ResultPoint.h >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/04 03:11:04 Modified files: sysutils/p5-Rex: Makefile distinfo sysutils/p5-Rex/pkg: PLIST Log message: update to rex 1.14.2; bug/doc fixes, refactoring OK solene
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/06/04 03:02:01 Modified files: devel/poedit : Makefile distinfo Log message: update devel/poedit to 3.3.1
Re: UPDATE: graphics/zxing
On Sun Jun 04, 2023 at 09:38:46AM +0200, Rafael Sadowski wrote: > Hi Stuart, Hi ports@, > > I would like to update zxing because I need zxing>=2.0 as a dependency > for KDE Gear 23.04 (kitinerary). Looks like our zxing port is pretty > old. The disadvantage of these update is the loss of bin/zxing. > > Looks like nothing depends on it expect kitinerary. > > Do we need BUILD_PYTHON_MODULE enabled? After feedback from Stuart, thanks: - Remove includes, shared libs ... from current port and build a static linked zxing binary (Tests are still passed). - Add a new port graphics/zxing-cpp (attached) Information for inst:zxing-cpp-2.0.0 Comment: C++ barcode image processing library Required by: debug-zxing-cpp-2.0.0 Description: ZXing-C++ ("zebra crossing") is an open-source, multi-format linear/matrix barcode image processing library implemented in C++. Maintainer: Rafael Sadowski WWW: https://github.com/zxing-cpp/zxing-cpp I think no conflicts tags are necessary. > > If I get an okay I would commit it with the KDE Gear update. > Still valid. No rush. diff --git a/graphics/zxing/Makefile b/graphics/zxing/Makefile index fae0248dc9d..26380c25cb5 100644 --- a/graphics/zxing/Makefile +++ b/graphics/zxing/Makefile @@ -1,13 +1,11 @@ COMMENT= barcode image processing library -SHARED_LIBS= zxing 0.0 - GH_ACCOUNT=glassechidna GH_PROJECT=zxing-cpp GH_COMMIT= e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 DISTNAME= zxing-20190320 -REVISION= 2 +REVISION= 3 MAINTAINER=Stuart Henderson @@ -26,12 +24,7 @@ MODULES= devel/cmake LIB_DEPENDS= converters/libiconv BUILD_DEPENDS= devel/cppunit -CONFIGURE_ARGS= -DCMAKE_LIBRARY_PATH=${LOCALBASE}/lib \ - -DBUILD_TESTING=yes - -SUBST_VARS+= LIBzxing_VERSION -pre-configure: - ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt +CONFIGURE_ARGS=-DBUILD_TESTING=ON do-test: ${WRKBUILD}/testrunner diff --git a/graphics/zxing/patches/patch-CMakeLists_txt b/graphics/zxing/patches/patch-CMakeLists_txt index d160f20f5a9..d5098c52f5a 100644 --- a/graphics/zxing/patches/patch-CMakeLists_txt +++ b/graphics/zxing/patches/patch-CMakeLists_txt @@ -10,14 +10,42 @@ Index: CMakeLists.txt if(OpenCV_FOUND) list(APPEND LIBZXING_FILES opencv/src/zxing/MatSource.cpp -@@ -57,8 +57,8 @@ if(OpenCV_FOUND) +@@ -87,20 +87,17 @@ file(GLOB_RECURSE ZXING_FILES + add_executable(zxing ${ZXING_FILES}) + target_link_libraries(zxing libzxing) + +-install(TARGETS zxing libzxing EXPORT zxing-targets +- LIBRARY DESTINATION lib ++install(TARGETS zxing + RUNTIME DESTINATION bin +- ARCHIVE DESTINATION lib +-INCLUDES DESTINATION include + ) + +-install(EXPORT zxing-targets DESTINATION lib/zxing/cmake NAMESPACE zxing::) ++#install(EXPORT zxing-targets DESTINATION lib/zxing/cmake NAMESPACE zxing::) + +-install( +-DIRECTORY core/src/zxing/ +-DESTINATION include/zxing +-FILES_MATCHING PATTERN "*.h" +-) ++#install( ++#DIRECTORY core/src/zxing/ ++#DESTINATION include/zxing ++#FILES_MATCHING PATTERN "*.h" ++#) + + if(OpenCV_FOUND) + install( +@@ -110,8 +107,8 @@ if(OpenCV_FOUND) + ) endif() - include_directories(core/src) --add_library(libzxing ${LIBZXING_FILES}) --set_target_properties(libzxing PROPERTIES PREFIX "") -+add_library(libzxing SHARED ${LIBZXING_FILES}) -+set_target_properties(libzxing PROPERTIES PREFIX "" VERSION ${LIBzxing_VERSION}) +-configure_file(cmake/zxing-config.cmake.in zxing-config.cmake @ONLY) +-install(FILES ${CMAKE_BINARY_DIR}/zxing-config.cmake DESTINATION lib/zxing/cmake) ++#configure_file(cmake/zxing-config.cmake.in zxing-config.cmake @ONLY) ++#install(FILES ${CMAKE_BINARY_DIR}/zxing-config.cmake DESTINATION lib/zxing/cmake) - find_package(Iconv) - if(ICONV_FOUND) + if(BUILD_TESTING) + # Add testrunner executable. diff --git a/graphics/zxing/pkg/PLIST b/graphics/zxing/pkg/PLIST index b35ccaac754..be52734c703 100644 --- a/graphics/zxing/pkg/PLIST +++ b/graphics/zxing/pkg/PLIST @@ -1,130 +1 @@ @bin bin/zxing -include/zxing/ -include/zxing/BarcodeFormat.h -include/zxing/Binarizer.h -include/zxing/BinaryBitmap.h -include/zxing/ChecksumException.h -include/zxing/DecodeHints.h -include/zxing/Exception.h -include/zxing/FormatException.h -include/zxing/IllegalStateException.h -include/zxing/InvertedLuminanceSource.h -include/zxing/LuminanceSource.h -include/zxing/MultiFormatReader.h -include/zxing/NotFoundException.h -include/zxing/Reader.h -include/zxing/ReaderException.h -include/zxing/Result.h -include/zxing/ResultPoint.h -include/zxing/ResultPointCallback.h -include/zxing/ZXing.h -include/zxing/aztec/ -include/zxing/aztec/AztecDetectorResult.h -include/zxing/aztec/AztecReader.h -include/zxing/aztec/decoder/ -include/zxing/aztec/decoder/Decoder.h -include/zxing/aztec/detector/ -include/zxing/aztec/detector/Detector.h -include/zxing/common/ -include/zxing/common/Array.h -include/zxing/common/BitArray.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/06/04 02:58:37 Modified files: productivity/minder: Makefile distinfo Log message: update productivity/minder to 1.15.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/06/04 02:37:06 Modified files: lang/clojure : Makefile distinfo Log message: update lang/clojure to 1.11.1.1347
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/04 02:15:18 Modified files: telephony/asterisk/20: Tag: OPENBSD_7_3 Makefile telephony/asterisk/20/pkg: Tag: OPENBSD_7_3 PLIST-main Log message: asterisk: fix directory group ownership, from kris at devtty one
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/04 02:11:46 Modified files: telephony/asterisk/20: Makefile telephony/asterisk/20/pkg: PLIST-main Log message: asterisk: fix directory group ownership, from kris at devtty one
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2023/06/04 01:40:34 Modified files: sysutils/fzf : Makefile distinfo modules.inc Log message: update to fzf-0.41.1 from new maintainer Laurent Cheylus, thanks
UPDATE: graphics/zxing
Hi Stuart, Hi ports@, I would like to update zxing because I need zxing>=2.0 as a dependency for KDE Gear 23.04 (kitinerary). Looks like our zxing port is pretty old. The disadvantage of these update is the loss of bin/zxing. Looks like nothing depends on it expect kitinerary. Do we need BUILD_PYTHON_MODULE enabled? If I get an okay I would commit it with the KDE Gear update. diff --git a/graphics/zxing/Makefile b/graphics/zxing/Makefile index fae0248dc9d..991ad70c90e 100644 --- a/graphics/zxing/Makefile +++ b/graphics/zxing/Makefile @@ -1,13 +1,10 @@ COMMENT= barcode image processing library -SHARED_LIBS= zxing 0.0 - -GH_ACCOUNT=glassechidna +GH_ACCOUNT=zxing-cpp GH_PROJECT=zxing-cpp -GH_COMMIT= e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 +GH_TAGNAME=v2.0.0 -DISTNAME= zxing-20190320 -REVISION= 2 +SHARED_LIBS += ZXing 0.0 # 0.0 MAINTAINER=Stuart Henderson @@ -16,24 +13,24 @@ CATEGORIES= graphics # Apache 2.0 PERMIT_PACKAGE=Yes -# uses pledge() -WANTLIB += ${COMPILER_LIBCXX} c iconv m - +# C++17 COMPILER= base-clang ports-gcc -DEBUG_PACKAGES=${BUILD_PACKAGES} +WANTLIB += ${COMPILER_LIBCXX} m + MODULES= devel/cmake -LIB_DEPENDS= converters/libiconv -BUILD_DEPENDS= devel/cppunit -CONFIGURE_ARGS= -DCMAKE_LIBRARY_PATH=${LOCALBASE}/lib \ - -DBUILD_TESTING=yes +DEBUG_PACKAGES=${BUILD_PACKAGES} + +BUILD_DEPENDS= devel/gtest + +CONFIGURE_ARGS=-DCMAKE_LIBRARY_PATH=${LOCALBASE}/lib \ + -DBUILD_UNIT_TESTS=yes -SUBST_VARS+= LIBzxing_VERSION -pre-configure: - ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt +CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON \ + -DBUILD_DEPENDENCIES=LOCAL -do-test: - ${WRKBUILD}/testrunner +# Depends on stb +CONFIGURE_ARGS += -DBUILD_EXAMPLES=OFF .include diff --git a/graphics/zxing/distinfo b/graphics/zxing/distinfo index 6555f5d2156..88f73c3e32f 100644 --- a/graphics/zxing/distinfo +++ b/graphics/zxing/distinfo @@ -1,2 +1,2 @@ -SHA256 (zxing-20190320-e0e40dde.tar.gz) = TCuGAdDjN3FDwaC7qyIBRq+fpaXino++9Chi/j04+OY= -SIZE (zxing-20190320-e0e40dde.tar.gz) = 312576 +SHA256 (zxing-cpp-2.0.0.tar.gz) = ErdrcAXDDTQmX8IDVtNA2hebC01D0sGzW8yoZ3YGn3Y= +SIZE (zxing-cpp-2.0.0.tar.gz) = 856413 diff --git a/graphics/zxing/patches/patch-CMakeLists_txt b/graphics/zxing/patches/patch-CMakeLists_txt deleted file mode 100644 index d160f20f5a9..000 --- a/graphics/zxing/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,23 +0,0 @@ -Index: CMakeLists.txt CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -45,7 +45,7 @@ else() - endif() - - # OpenCV classes --find_package(OpenCV) -+#find_package(OpenCV) - if(OpenCV_FOUND) - list(APPEND LIBZXING_FILES - opencv/src/zxing/MatSource.cpp -@@ -57,8 +57,8 @@ if(OpenCV_FOUND) - endif() - - include_directories(core/src) --add_library(libzxing ${LIBZXING_FILES}) --set_target_properties(libzxing PROPERTIES PREFIX "") -+add_library(libzxing SHARED ${LIBZXING_FILES}) -+set_target_properties(libzxing PROPERTIES PREFIX "" VERSION ${LIBzxing_VERSION}) - - find_package(Iconv) - if(ICONV_FOUND) diff --git a/graphics/zxing/patches/patch-cli_src_main_cpp b/graphics/zxing/patches/patch-cli_src_main_cpp deleted file mode 100644 index a33de9d946b..000 --- a/graphics/zxing/patches/patch-cli_src_main_cpp +++ /dev/null @@ -1,22 +0,0 @@ -Index: cli/src/main.cpp cli/src/main.cpp.orig -+++ cli/src/main.cpp -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include "ImageReaderSource.h" - #include - #include -@@ -180,6 +181,10 @@ string read_expected(string imagefilename) { - } - - int main(int argc, char** argv) { -+ if (pledge("stdio rpath", NULL) == -1) { -+cerr << "pledge" << endl; -+return 1; -+ } - if (argc <= 1) { - cout << "Usage: " << argv[0] << " [OPTION]... ..." << endl - << "Read barcodes from each IMAGE file." << endl diff --git a/graphics/zxing/pkg/PLIST b/graphics/zxing/pkg/PLIST index b35ccaac754..69226a87ff6 100644 --- a/graphics/zxing/pkg/PLIST +++ b/graphics/zxing/pkg/PLIST @@ -1,130 +1,33 @@ -@bin bin/zxing -include/zxing/ -include/zxing/BarcodeFormat.h -include/zxing/Binarizer.h -include/zxing/BinaryBitmap.h -include/zxing/ChecksumException.h -include/zxing/DecodeHints.h -include/zxing/Exception.h -include/zxing/FormatException.h -include/zxing/IllegalStateException.h -include/zxing/InvertedLuminanceSource.h -include/zxing/LuminanceSource.h -include/zxing/MultiFormatReader.h -include/zxing/NotFoundException.h -include/zxing/Reader.h -include/zxing/ReaderException.h -include/zxing/Result.h -include/zxing/ResultPoint.h -include/zxing/ResultPointCallback.h -include/zxing/ZXing.h -include/zxing/aztec/ -include/zxing/aztec/AztecDetectorResult.h -include/zxing/aztec/AztecReader.h -include/zxing/aztec/decoder/ -include/zxing/aztec/decoder/Decoder.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/04 01:18:40 Modified files: sysutils : Makefile Log message: +awscli-plugin-endpoint
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/04 01:18:08 Log message: Import awscli-plugin-endpoint-0.4 This awscli plugin provides service endpoint configuration per service on profile. ok robert@ Status: Vendor Tag: ajacoutot Release Tags: ajacoutot_20230604 N ports/sysutils/awscli-plugin-endpoint/Makefile N ports/sysutils/awscli-plugin-endpoint/distinfo N ports/sysutils/awscli-plugin-endpoint/pkg/DESCR N ports/sysutils/awscli-plugin-endpoint/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/04 00:04:15 Modified files: x11/arc-theme : Makefile.inc x11/arc-theme/solid: Makefile x11/arc-theme/transparent: Makefile Log message: Rebuild for gnome-shell 43.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/04 00:02:10 Modified files: meta/gnome : Makefile Log message: Welcome GNOME 44.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/04 00:01:44 Modified files: x11/gnome/shell: Makefile distinfo Log message: Update to gnome-shell-44.2.