Re: [-CURRENT] Microphone does not work in firefox anymore
On Thu, May 21, 2020 at 02:32:01PM +0200, Andrea Biscuola wrote: > Hi Solene > > > Ok, I tried the website you posted and everything is fine. The mic works ok. > However, we use tools for work such as hangouts and bigbluebutton for > teleconferencing and there, the microphone still doesn't works. ok, so something else to try ... can you locally revert/remove patches/patch-media_libcubeb_src_cubeb_sndio_c and check if this helps ? This was recently changed by ratchov@ to fix *some* recordings, and im pretty sure he tested many sites with it. Landry
Re: [-CURRENT] Microphone does not work in firefox anymore
On Fri, May 22, 2020 at 04:53:13PM +0200, Landry Breuil wrote: > On Fri, May 22, 2020 at 05:05:38AM +0200, Jan Beich wrote: > > a...@abiscuola.com writes: > > > > > Hi all. > > > > > > I installed the latest snapshot and, suddenly, the microphone > > > stopped working in firefox. > > > > Does it happen since nss 3.52 update? If so ask landry@ to apply > > https://hg.mozilla.org/mozilla-central/rev/463069687b3d > > > > See https://bugzilla.mozilla.org/show_bug.cgi?id=1636632 > > Well, what a shitshow. I dont use 76 (only 77beta here) and wont have > time to actually test this helps, but if one can confirm the attached > port patch fixes webrtc on 76 (and 68esr, if it's broken) then yes i'll > sure apply it. From my understanding of the FreeBSD bug, it's also > broken on esr ? Can someone test and confirm the patch needs also > backporting there ? Well, i'm puzzled, because from my own testing here on a freshly updated -current, i have no issue with webrtc testing (recording cam & mic) on https://www.webrtc-experiment.com/RecordRTC/, both with firefox-76.0 and esr 68.8.0, and that with nss 3.52. I dont have libs lying around from nss 3.51.. so, sure i can backport that commit, but it'd be nice to understand why this fails for some (many?) and not for me. So please someone else confirm that this fixes the issue for them :) Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2020/05/22 20:44:01 Modified files: mail/t-prot: Makefile Log message: Clean up t-prot Makefile No package change, suggestions from sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2020/05/22 16:31:45 Modified files: lang/racket-minimal: Makefile Log message: Unbreak no_jit flavor on amd64. Spotted by aja@ and naddy@.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/05/22 16:02:39 Modified files: textproc/nfoview: Makefile distinfo textproc/nfoview/pkg: PLIST Log message: Update to nfoview-1.28 Changelog: https://github.com/otsaloma/nfoview/releases/tag/1.28
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/05/22 15:57:26 Log message: Import fonts/cascadia-code, a programming/terminal font from Microsoft. ok bentley@ Cascadia Code is a monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the terminal. Status: Vendor Tag: bcallah Release Tags: bcallah_20200522 N ports/fonts/cascadia-code/Makefile N ports/fonts/cascadia-code/distinfo N ports/fonts/cascadia-code/pkg/PLIST N ports/fonts/cascadia-code/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/05/22 15:57:52 Modified files: fonts : Makefile Log message: +cascadia-code
Re: UPDATE: net/prosody 0.11.5 from maintainer
Stuart Henderson wrote: > I would just use the common idiom used by other ports. If there is a > problem with that then I guess they'll all need fixing in a sweep. Okey, updated patch in here. It still runs OK in my server. -Lucas Index: Makefile === RCS file: /home/cvs/ports/net/prosody/Makefile,v retrieving revision 1.56 diff -u -p -r1.56 Makefile --- Makefile15 Mar 2020 19:04:25 - 1.56 +++ Makefile22 May 2020 21:35:28 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.56 2020/03/15 19:04:25 solene Exp $ COMMENT= communications server for Jabber/XMPP written in Lua -DISTNAME= prosody-0.11.4 +DISTNAME= prosody-0.11.5 CATEGORIES=net MASTER_SITES= https://prosody.im/downloads/source/ Index: distinfo === RCS file: /home/cvs/ports/net/prosody/distinfo,v retrieving revision 1.17 diff -u -p -r1.17 distinfo --- distinfo15 Mar 2020 19:04:25 - 1.17 +++ distinfo22 May 2020 21:35:28 - @@ -1,2 +1,2 @@ -SHA256 (prosody-0.11.4.tar.gz) = tfJvo0PH8y9iQnIdaZHLNfXSoo0r9Z0rwympQFI3BP0= -SIZE (prosody-0.11.4.tar.gz) = 423518 +SHA256 (prosody-0.11.5.tar.gz) = Vfi9ZdXSr2HMc5vWFk5CBwEeDS0mDN5YMHHJDY2FQIs= +SIZE (prosody-0.11.5.tar.gz) = 425122 Index: patches/patch-prosody_cfg_lua_dist === RCS file: /home/cvs/ports/net/prosody/patches/patch-prosody_cfg_lua_dist,v retrieving revision 1.8 diff -u -p -r1.8 patch-prosody_cfg_lua_dist --- patches/patch-prosody_cfg_lua_dist 7 Feb 2019 19:23:39 - 1.8 +++ patches/patch-prosody_cfg_lua_dist 22 May 2020 21:35:28 - @@ -2,7 +2,7 @@ $OpenBSD: patch-prosody_cfg_lua_dist,v 1 Index: prosody.cfg.lua.dist --- prosody.cfg.lua.dist.orig +++ prosody.cfg.lua.dist -@@ -23,6 +23,14 @@ +@@ -23,6 +23,13 @@ -- Example: admins = { "us...@example.com", "us...@example.net" } admins = { } @@ -11,13 +11,12 @@ Index: prosody.cfg.lua.dist +prosody_group = "_prosody" + +-- Enable POSIX-only options -+daemonize = true +pidfile = "/var/prosody/prosody.pid" + -- Enable use of libevent for better performance under high load -- For more information see: https://prosody.im/doc/libevent --use_libevent = true -@@ -153,8 +161,8 @@ archive_expires_after = "1w" -- Remove archived messag +@@ -153,8 +160,8 @@ archive_expires_after = "1w" -- Remove archived messag -- Logging configuration -- For advanced logging see https://prosody.im/doc/logging log = { Index: pkg/prosody.rc === RCS file: /home/cvs/ports/net/prosody/pkg/prosody.rc,v retrieving revision 1.4 diff -u -p -r1.4 prosody.rc --- pkg/prosody.rc 11 Jan 2018 19:27:07 - 1.4 +++ pkg/prosody.rc 22 May 2020 21:36:00 - @@ -2,22 +2,18 @@ # # $OpenBSD: prosody.rc,v 1.4 2018/01/11 19:27:07 rpe Exp $ -daemon="${TRUEPREFIX}/sbin/prosodyctl" -daemon_flags="start" +daemon="${TRUEPREFIX}/sbin/prosody -D" daemon_user="_prosody" . /etc/rc.d/rc.subr -rc_reload=NO +pexp="${MODLUA_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}}" + rc_usercheck=NO rc_check() { # return 1 is needed: prosodyctl returns a higher error code on failure ${TRUEPREFIX}/sbin/prosodyctl status || return 1 -} - -rc_stop() { - ${TRUEPREFIX}/sbin/prosodyctl stop } rc_cmd $1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2020/05/22 15:51:39 Modified files: emulators : Makefile Log message: +sameboy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2020/05/22 15:49:48 Log message: Import sameboy-0.12.3 and libretro-sameboy-0.12.3. SameBoy is a SDL-based Nintendo Game Boy and Game Boy Color emulator. SameBoy is extremely accurate and includes a wide range of powerful debugging features, making it ideal for both casual players and developers. In addition to accuracy and developer capabilities, SameBoy has all the features one would expect from an emulator, from save states to scaling filters. libretro-sameboy provides a Nintendo Game Boy and Game Boy Color emulation core to the RetroArch emulator frontend, based on SameBoy. ok stsp@ thfr@ bcallah@ Status: Vendor Tag: bentley Release Tags: bentley_20200522 N ports/emulators/sameboy/Makefile N ports/emulators/sameboy/distinfo N ports/emulators/sameboy/patches/patch-Makefile N ports/emulators/sameboy/patches/patch-libretro_Makefile N ports/emulators/sameboy/pkg/DESCR-libretro N ports/emulators/sameboy/pkg/PLIST-main N ports/emulators/sameboy/pkg/PLIST-libretro N ports/emulators/sameboy/pkg/DESCR-main No conflicts created by this import
Re: NEW: fonts/cascadia-code
Brian Callahan writes: > > I'd prefer if you included OTF too (but leave out WOFF2). > > > > Can you lowercase /usr/local/share/fonts/Cascadia? The vast majority of > > fonts (all but seven by my count) lowercase it. > > Sure we can do that. Attached. One more thing. Setting FONTTYPES only makes sense if you're using the default do-install from the font module, and this port doesn't. Remove FONTTYPES and the port's ok with me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 14:12:11 Modified files: devel/qt-creator: Makefile Log message: Unbreak qt-creator, qtwebengine missing in lib depends, spotted by aja Move qtwebengine form run_* to lib_depends. Sort and also add qtwebchannel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/22 13:58:14 Modified files: databases : Makefile sysutils/ruby-puppet: Makefile Makefile.inc Removed files: sysutils/ruby-puppet/4: Makefile distinfo sysutils/ruby-puppet/4/patches: patch-ext_rack_config_ru patch-lib_puppet_defaults_rb patch-lib_puppet_provider_package_gem_rb patch-lib_puppet_provider_package_openbsd_rb patch-lib_puppet_provider_package_pip_rb patch-lib_puppet_provider_service_openbsd_rb patch-lib_puppet_rb patch-lib_puppet_reference_configuration_rb patch-lib_puppet_type_package_rb patch-lib_puppet_util_run_mode_rb sysutils/ruby-puppet/4/pkg: PLIST databases/puppetdb4: Makefile distinfo databases/puppetdb4/patches: patch-Makefile patch-ext_bin_puppetdb patch-ext_cli_ssl-setup patch-ext_config_conf_d_config_ini patch-ext_config_conf_d_jetty_ini databases/puppetdb4/pkg: DESCR-main DESCR-plugin PLIST-main PLIST-plugin README-main puppetdb.rc Log message: Remove Puppet 4 Open Source Puppet 4 LTS reached EOL in october 2018, Puppet 5 (client, master as well as puppetdb) have been in our tree for years, Puppet 6 (client and master, not yet puppetdb) were recently imported. Users should long have upgraded to version 5 by now; see https://puppet.com/docs/puppet/5.5/upgrade_minor.html for upgrade details. OK bcallah
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2020/05/22 13:56:41 Modified files: x11/lablgtk3 : Makefile distinfo x11/lablgtk3/pkg: PFRAG.native PLIST Removed files: x11/lablgtk3/patches: patch-src_Makefile Log message: update x11/lablgtk3 to 3.1.0 ok krw@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2020/05/22 13:31:20 Modified files: sysutils/opam : Makefile distinfo sysutils/opam/pkg: PLIST Log message: Update sysutils/opam to 2.0.7 ok krw@, avsm@
Re: NEW: emulators/sameboy
Hi Anthony -- ‐‐‐ Original Message ‐‐‐ On Friday, May 22, 2020 7:06 AM, Anthony J. Bentley wrote: > Hi, > > SameBoy is a SDL-based Nintendo Game Boy and Game Boy Color emulator. > SameBoy is extremely accurate and includes a wide range of powerful > debugging features, making it ideal for both casual players and developers. > In addition to accuracy and developer capabilities, SameBoy has all the > features one would expect from an emulator, from save states to scaling > filters. > > libretro-sameboy provides a Nintendo Game Boy and Game Boy Color emulation > core to the RetroArch emulator frontend, based on SameBoy. > > SameBoy is to my knowledge the most accurate Game Boy emulator > in existence. It is certainly more accurate than Gambatte, the > most accurate emulator in our tree. And unlike Gambatte, SameBoy > is actively maintained. > > For general usage I still usually recommend mgba, as it is quite > accurate (more than enough for people just playing games) and has a > fairly strong pledge on OpenBSD. But SameBoy is an important emulator > for anyone doing Game Boy development. > > I previously submitted this about a year ago. At the time I mentioned > issues with audio speed, but I can no longer reproduce those problems. > In addition, upstream has integrated my portability patches. > > ok? > > -- > > Anthony J. Bentley A few thoughts: 1. It is using -std=gnu11, so we need a COMPILER=base-clang ports-gcc line otherwise it will fail on base-gcc archs. 2. There is a -Werror in Makefile and a hardcoded -O2 in libretro/Makefile that are worth removing. 3. When I ran `make port-lib-depends-check`, it said LIB_DEPENDS devel/sdl2 not needed for emulators/sameboy,-libretro ? Changing LIB_DEPENDS to LIB_DEPENDS-main makes the warning go away. ~Brian
Re: maintainer update: www/hugo
Hello Aham, On Fri, 22 May 2020, Aham Brahmasmi wrote: > Namaste Paco, > > Would it be possible for us to fetch and build hugo directly from the > authoritative Github source, replacing https://e1e0.net/dist/? That's definitely on my list, but I did not try portgen for go ports yet. I will, eventually. But, if you want this to happen sooner, send a diff and I'll be happy to test it :-) > I ask this because, if I am not wrong, @abieber has recently updated > [1] the portgen code with the following message: > > .. > With this a port can be easily generated for Go applications that > support Go modules (there will be a go.mod file in the root of the > project). > .. > > Namaste Aaron, > > Thank you for your patience [2]. > > If I am not wrong, you specifically tested building hugo with the > patch while working on it. Unfortunately, I could not determine > whether the committed patch can build hugo or not. Cheers, -- Paco Esteban. 0x5818130B8A6DBC03
[update] x11/st -> 0.8.3
Hi, Here's an update to a recently released version of st, they added a couple of terminfo entries since last version so PLIST needed an update. Comments? OK? Index: Makefile === RCS file: /cvs/ports/x11/st/Makefile,v retrieving revision 1.20 diff -u -p -u -r1.20 Makefile --- Makefile12 Jul 2019 20:51:22 - 1.20 +++ Makefile22 May 2020 18:19:44 - @@ -2,7 +2,7 @@ COMMENT= simple X terminal -V= 0.8.2 +V= 0.8.3 DISTNAME= st-${V} CATEGORIES=x11 Index: distinfo === RCS file: /cvs/ports/x11/st/distinfo,v retrieving revision 1.12 diff -u -p -u -r1.12 distinfo --- distinfo10 Feb 2019 21:55:24 - 1.12 +++ distinfo22 May 2020 18:19:44 - @@ -1,2 +1,2 @@ -SHA256 (st-0.8.2.tar.gz) = rrdOEKoR7TZOG8xjWoGlIxGQk+Y779LyMfiwcFsVvzU= -SIZE (st-0.8.2.tar.gz) = 44788 +SHA256 (st-0.8.3.tar.gz) = k5rj2iN+fJSJaUhTwgXHy9XyovDBf+QaB0d/HfjihVI= +SIZE (st-0.8.3.tar.gz) = 46292 Index: pkg/PLIST === RCS file: /cvs/ports/x11/st/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -r1.2 PLIST --- pkg/PLIST 10 Jun 2014 07:14:50 - 1.2 +++ pkg/PLIST 22 May 2020 18:19:44 - @@ -5,5 +5,8 @@ share/terminfo/ share/terminfo/s/ share/terminfo/s/st share/terminfo/s/st-256color +share/terminfo/s/st-bs +share/terminfo/s/st-bs-256color share/terminfo/s/st-meta share/terminfo/s/st-meta-256color +share/terminfo/s/st-mono
Re: maintainer update: www/hugo
On Fri May 22, 2020 at 08:17:47PM +0200, Aham Brahmasmi wrote: > Would it be possible for us to fetch and build hugo directly from the > authoritative Github source, replacing https://e1e0.net/dist/? > I would love to test a diff.
Re: maintainer update: www/hugo
> Sent: Friday, May 22, 2020 at 10:04 AM > From: "Paco Esteban" > To: "Rafael Sadowski" > Cc: "Todd C. Miller" , ports@openbsd.org > Subject: Re: maintainer update: www/hugo > > On Fri, 22 May 2020, Rafael Sadowski wrote: > > > On Thu May 21, 2020 at 02:52:24PM -0600, Todd C. Miller wrote: > > > On Thu, 21 May 2020 21:03:37 +0200, Paco Esteban wrote: > > > > > > > For now it does not work for me with the patch you sent. I get: > > > > > > > > # > > > > github.com/gohugoio/hugo/vendor/github.com/bep/golibsass/internal/libsass > > > > c99func.c:2:10: fatal error: '../../libsass_src/src/c99func.c' file not > > > > found > > > > > > > > I'll take a deeper look tomorrow probably. > > > > That could be useful for SASS themes users. FLAVOR note is missing in > > pkg/DESCR. The diff below builds fine. > > It builds now and works with one of the SASS themes I've found. > I added the flavor description, diff at the end. > > Thank you Todd and Rafael. > > Comments ? ok ? > > Index: Makefile > === > RCS file: /home/cvs/ports/www/hugo/Makefile,v > retrieving revision 1.20 > diff -u -p -r1.20 Makefile > --- Makefile 21 May 2020 16:37:44 - 1.20 > +++ Makefile 22 May 2020 07:51:18 - > @@ -26,6 +26,16 @@ ALL_TARGET = github.com/gohugoio/hugo > > SEPARATE_BUILD = Yes > > +FLAVORS =extended > +FLAVOR ?= > + > +.if ${FLAVOR:Mextended} > +MODGO_FLAGS += --tags extended > +LIB_DEPENDS += www/libsass > +WANTLIB += sass > +MAKE_ENV += CGO_CPPFLAGS='-I${LOCALBASE}/include -DUSE_LIBSASS_SRC' > CGO_LDFLAGS='-L${LOCALBASE}/lib -lsass' > +.endif > + > post-build: > cd ${MODGO_WORKSPACE}/bin/ && ./hugo gen man > > Index: pkg/DESCR > === > RCS file: /home/cvs/ports/www/hugo/pkg/DESCR,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 DESCR > --- pkg/DESCR 11 Jun 2018 21:17:14 - 1.1.1.1 > +++ pkg/DESCR 22 May 2020 07:56:30 - > @@ -4,3 +4,7 @@ Hugo takes a directory with content and > them into a full HTML website. > > Hugo relies on Markdown files with front matter for metadata. > + > +Flavors: > + extended- build hugo extended version with Sass/SCSS > + support amongst others > > -- > Paco Esteban. > 0x5818130B8A6DBC03 Namaste Paco, Would it be possible for us to fetch and build hugo directly from the authoritative Github source, replacing https://e1e0.net/dist/? I ask this because, if I am not wrong, @abieber has recently updated [1] the portgen code with the following message: ... With this a port can be easily generated for Go applications that support Go modules (there will be a go.mod file in the root of the project). ... Namaste Aaron, Thank you for your patience [2]. If I am not wrong, you specifically tested building hugo with the patch while working on it. Unfortunately, I could not determine whether the committed patch can build hugo or not. Dhanyavaad, ab [1] - https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/infrastructure/bin/portgen?rev=1.2=text/x-cvsweb-markup [2] - https://marc.info/?t=15758306843=1=2 -|-|-|-|-|-|-|--
Re: kibana packaging error?
That was already my 2nd mirror. Some more logs are below. Apologies for gmail line wrapping. At first I couldn't seem to get any good results for an online install. Interestingly, I noticed a difference in which file it gave up on. I then downloaded the package by hand from two "mismatching" mirrors - ftp.openbsd.org and ftp.usa.openbsd.org; the tarballs had the same hash and installed successfully. After uninstalling kibana, I reproduced the error using ftp.openbsd.org again, which stopped on the same file. I then tried ftp.usa.openbsd.org once more to see which file it would abort on, and it installed successfully! All the other packages I upgraded before worked fine. However odd, this does seem like a transient issue and everything seems to be working now. Thanks. --david Ustar [ http://openbsd.mirror.constant.com/pub/OpenBSD/6.7/packages/amd64/kibana-7.6.2p0.tgz][kibana/built_assets/.cache/ui_bundles/babel/4dad92d69dac191979403a18d857c08f.json]: Premature end of archive Adjusting sha for /usr/local/kibana/built_assets/.cache/ui_bundles/babel/pkg.mlhtdhDUez from B10NC1pNMmmYa876UTzOy93Eq+ax5xv93V54+rno9DI= to 47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= Ustar [ https://ftp.eu.openbsd.org/pub/OpenBSD/6.7/packages/amd64/kibana-7.6.2p0.tgz][kibana/built_assets/.cache/ui_bundles/babel/257905c4bda367e90d95911c2a12de5f.json]: Premature end of archive Adjusting sha for /usr/local/kibana/built_assets/.cache/ui_bundles/babel/pkg.ZRI7Ijk12A from x7S5xP19b2uE+MI0b7hdAjCwLv5bP2B9mR1FC4OTKzI= to 47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= Ustar [ https://ftp.openbsd.org/pub/OpenBSD/6.7/packages/amd64/kibana-7.6.2p0.tgz][kibana/built_assets/.cache/ui_bundles/babel/257905c4bda367e90d95911c2a12de5f.json]: Premature end of archive Adjusting sha for /usr/local/kibana/built_assets/.cache/ui_bundles/babel/pkg.dU9JIvegM5 from x7S5xP19b2uE+MI0b7hdAjCwLv5bP2B9mR1FC4OTKzI= to 47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= On Fri, May 22, 2020 at 11:58 AM Stuart Henderson wrote: > On 2020/05/22 11:26, David Higgs wrote: > > When trying to upgrade as well as install from scratch on syspatched 6.7, > > getting the following error: > > > > Ustar [ > > > https://ftp.usa.openbsd.org/pub/OpenBSD/6.7/packages/amd64/kibana-7.6.2p0.tgz][kibana/built_assets/.cache/ui_bundles/babel/1b207b01982111599a66e80aff127976.json > ]: > > Premature end of archive > > Adjusting sha for > > /usr/local/kibana/built_assets/.cache/ui_bundles/babel/pkg.S7ooW3mhmB > from > > 23ASaA1aqwBOaaWIC6nv6l7uVEKroBqqvZT8wP7vRQk= to > > 47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= > > pkg_add: Installation of kibana-7.6.2p0 failed, partial installation > > recorded as partial-kibana-7.6.2p0 > > > > I can build a package locally, but am happy to wait for a fix if this is > a > > temporary mirroring hiccup. > > > > Thanks! > > > > --david > > The built package is OK, this looks like a transient problem fetching > from that mirror. Try a different mirror, or try downloading by hand and > installing from the downloaded file (set PKG_PATH). > >
Re: NEW: fonts/cascadia-code
‐‐‐ Original Message ‐‐‐ On Friday, May 22, 2020 7:10 AM, Anthony J. Bentley wrote: > Brian Callahan writes: > > > Attached is a new port, fonts/cascadia-code. Cascadia Code is a > > programming/terminal font from Microsoft. > > > > pkg/DESCR: > > Cascadia Code is a monospaced font that includes programming ligatures > > and is designed to enhance the modern look and feel of the terminal. > > > > --- > > > > It is a new dependency of textproc/nfoview. I chose only to install > > the TTF version of the font (it also contains OTF and WOFF2 versions). > > I'd prefer if you included OTF too (but leave out WOFF2). > > Can you lowercase /usr/local/share/fonts/Cascadia? The vast majority of > fonts (all but seven by my count) lowercase it. > > - > > Anthony J. Bentley Sure we can do that. Attached. ~Brian cascadia-code.tgz Description: application/compressed-tar
Re: maintainer update: www/hugo
On Fri, 22 May 2020 10:04:03 +0200, Paco Esteban wrote: > It builds now and works with one of the SASS themes I've found. > I added the flavor description, diff at the end. Looks good to me. Thanks! - todd
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/05/22 10:48:20 Modified files: net/synapse: Makefile distinfo net/synapse/pkg: PLIST Log message: Update to synapse 1.13. >From MAINTAINER Renaud Allard, ok abieber@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/22 10:47:26 Modified files: games/py-minecraft-launcher-lib: Makefile distinfo games/py-minecraft-launcher-lib/pkg: PLIST Log message: Update py-minecraft-launcher-lib 0.5 -> 1.0 This drops "beta" and "do not use in production" language in the documentation. The library also gains the ability to set or reset one's minecraft skin. Also, it can be used to query native libraries for a platform.
Re: kibana packaging error?
On 2020/05/22 11:26, David Higgs wrote: > When trying to upgrade as well as install from scratch on syspatched 6.7, > getting the following error: > > Ustar [ > https://ftp.usa.openbsd.org/pub/OpenBSD/6.7/packages/amd64/kibana-7.6.2p0.tgz][kibana/built_assets/.cache/ui_bundles/babel/1b207b01982111599a66e80aff127976.json]: > Premature end of archive > Adjusting sha for > /usr/local/kibana/built_assets/.cache/ui_bundles/babel/pkg.S7ooW3mhmB from > 23ASaA1aqwBOaaWIC6nv6l7uVEKroBqqvZT8wP7vRQk= to > 47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= > pkg_add: Installation of kibana-7.6.2p0 failed, partial installation > recorded as partial-kibana-7.6.2p0 > > I can build a package locally, but am happy to wait for a fix if this is a > temporary mirroring hiccup. > > Thanks! > > --david The built package is OK, this looks like a transient problem fetching from that mirror. Try a different mirror, or try downloading by hand and installing from the downloaded file (set PKG_PATH).
kibana packaging error?
When trying to upgrade as well as install from scratch on syspatched 6.7, getting the following error: Ustar [ https://ftp.usa.openbsd.org/pub/OpenBSD/6.7/packages/amd64/kibana-7.6.2p0.tgz][kibana/built_assets/.cache/ui_bundles/babel/1b207b01982111599a66e80aff127976.json]: Premature end of archive Adjusting sha for /usr/local/kibana/built_assets/.cache/ui_bundles/babel/pkg.S7ooW3mhmB from 23ASaA1aqwBOaaWIC6nv6l7uVEKroBqqvZT8wP7vRQk= to 47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= pkg_add: Installation of kibana-7.6.2p0 failed, partial installation recorded as partial-kibana-7.6.2p0 I can build a package locally, but am happy to wait for a fix if this is a temporary mirroring hiccup. Thanks! --david
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/22 09:47:32 Modified files: graphics/azpainter: Makefile Log message: Add "-std=gnu99" to CFLAGS so azpainter will build with base-gcc. Fixes building on sparc64 "Sounds good" bcallah@ (maintainer)
Re: NEW: emulators/sameboy
On Fri, May 22, 2020 at 05:06:44AM -0600, Anthony J. Bentley wrote: [...] > features one would expect from an emulator, from save states to scaling > filters. Save states work - they create a .s[0-9] file and I have successfully loaded a save. > libretro-sameboy provides a Nintendo Game Boy and Game Boy Color emulation > core to the RetroArch emulator frontend, based on SameBoy. I have only tested the sameboy binary, not the libretro core. [...] > I previously submitted this about a year ago. At the time I mentioned > issues with audio speed, but I can no longer reproduce those problems. I do get slightly distorted/stuttery audio. Not a gamebreaker and I stop noticing it after a few minutes, but definitely there. [...] > ok? Fullscreen works, and so does the gamepad (XBox 360 controller), with the caveat that up and down on the left stick are reversed and there doesn't seem to be a way to flip axes. The D-pad works fine, however. I tested it with 2 GameBoy Color ROMS including the free puzzler Snakebird.gb [1] with no issues other than audio distortion and the reversed Y axis on the gamepad. ok thfr@ [1] https://fb1.itch.io/snakebirdgb
Re: [fix/update] puppet 6 update to 6.15 to fix package-with-flavor bugs
On Fri, May 22, 2020 at 11:15:12PM +1000, Arthur Barton wrote: > Attached patches nicely against a clean checkout. It does now, thanks. > Ah okay - removed in the new diff It would not do any harm leaving REVISION, but since both version and revision end up in the package's name and we're doing an update, there's little point in going puppet-6.{14 -> 15}.0p0 - REVISION ("p0") should be dropped for newer versions because it indicates changes during the same version. I committed your diff after removing another empty patch, see CVS log for details.
[sparc64/base-gcc] Fix build of graphics/azpainter
azpainter fails to build with base-gcc unless "-std=gnu99" is specified. This patch does that and fixed the build. ok? --Kurt Index: Makefile === RCS file: /cvs/ports/graphics/azpainter/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile20 May 2020 17:06:29 - 1.2 +++ Makefile22 May 2020 14:20:23 - @@ -29,6 +29,8 @@ RUN_DEPENDS = devel/desktop-file-utils \ CONFIGURE_STYLE = simple CONFIGURE_ARGS = CC="${CC}" +CFLAGS += -std=gnu99 + USE_GMAKE =Yes NO_TEST = Yes
Re: [update] net/synapse -> 1.13.0
Renaud Allard writes: > Hello, > > Here is a diff for net/synapse to v1.13.0 > > Regards I have the same diff here! Running just fine. OK abieber@ -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/22 09:23:37 Modified files: sysutils/ruby-puppet/6: Makefile distinfo sysutils/ruby-puppet/6/patches: patch-lib_puppet_defaults_rb patch-lib_puppet_provider_package_gem_rb patch-lib_puppet_provider_package_openbsd_rb patch-lib_puppet_provider_package_pip3_rb patch-lib_puppet_provider_package_pip_rb sysutils/ruby-puppet/6/pkg: PLIST Log message: Update to Puppet 6.15.0 This also fixes flavour handling in package resources. Diff from Arthur Barton, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/22 09:21:12 Removed files: sysutils/ruby-puppet/6/patches: patch-lib_puppet_type_package_rb Log message: Remove patch that does nothing (except removing an empty line)
Re: UPDATE audacious-4.0.3
On Thu 14/05/2020 21:56, Bjorn Ketelaars wrote: > Diff below updates audio/audacious-{player,plugins} and meta/audacious > to 4.0.3. Changes: > https://audacious-media-player.org/news/48-audacious-4-0-3-released > > Run tested on amd64. > > Comments/OK? Ping Diff enclosed for your convenience. diff --git audio/audacious/Makefile.inc audio/audacious/Makefile.inc index 2e3e84ecc4c..a1dcb433f3b 100644 --- audio/audacious/Makefile.inc +++ audio/audacious/Makefile.inc @@ -1,7 +1,7 @@ # $OpenBSD: Makefile.inc,v 1.2 2020/04/16 11:01:10 bket Exp $ # Do not forget to sync meta/audacious -VERSION = 4.0.2 +VERSION = 4.0.3 CATEGORIES = audio multimedia diff --git audio/audacious/player/distinfo audio/audacious/player/distinfo index 3df2559bb75..8b60136e91a 100644 --- audio/audacious/player/distinfo +++ audio/audacious/player/distinfo @@ -1,2 +1,2 @@ -SHA256 (audacious-4.0.2.tar.bz2) = GKUr2fH5bRe/da1tQLBgL8KYme8szZ0qZynfpfx/Wmc= -SIZE (audacious-4.0.2.tar.bz2) = 576407 +SHA256 (audacious-4.0.3.tar.bz2) = 8wF3xRhX8yrGK4pNeehKsZuvZg2ks1q7chXciiMfdtY= +SIZE (audacious-4.0.3.tar.bz2) = 577512 diff --git audio/audacious/plugins/Makefile audio/audacious/plugins/Makefile index ac65177668c..13fab2de163 100644 --- audio/audacious/plugins/Makefile +++ audio/audacious/plugins/Makefile @@ -58,7 +58,6 @@ CONFIGURE_ARGS += --disable-alsa \ --disable-qt \ --disable-sdlout \ --disable-sid \ - --disable-streamtuner \ --enable-gtk CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" diff --git audio/audacious/plugins/distinfo audio/audacious/plugins/distinfo index 0b508f23c5c..a8e95837c66 100644 --- audio/audacious/plugins/distinfo +++ audio/audacious/plugins/distinfo @@ -1,2 +1,2 @@ -SHA256 (audacious-plugins-4.0.2.tar.bz2) = WeQy7p/4+QvDxWN4lD6nMHJCE1D3GyDVjuJWjM1K+SA= -SIZE (audacious-plugins-4.0.2.tar.bz2) = 1752042 +SHA256 (audacious-plugins-4.0.3.tar.bz2) = 4qiPXKw+/gPu27jTIMobuTAHiM5mBW0s66YOsA+K75c= +SIZE (audacious-plugins-4.0.3.tar.bz2) = 1759123 diff --git audio/audacious/plugins/patches/patch-configure audio/audacious/plugins/patches/patch-configure index 63af64a4623..f5978aacc06 100644 --- audio/audacious/plugins/patches/patch-configure +++ audio/audacious/plugins/patches/patch-configure @@ -7,7 +7,7 @@ polluted very early on, breaking most of the checks using AC_CHECK_LIB. Index: configure --- configure.orig +++ configure -@@ -10179,8 +10179,6 @@ $as_echo "yes" >&6; } +@@ -10280,8 +10280,6 @@ $as_echo "yes" >&6; } fi @@ -16,7 +16,7 @@ Index: configure if test $HAVE_DARWIN = yes ; then -@@ -15421,6 +15419,8 @@ as_fn_error () +@@ -15522,6 +15520,8 @@ as_fn_error () as_fn_exit $as_status } # as_fn_error diff --git meta/audacious/Makefile meta/audacious/Makefile index c7a9884a6bc..972a16b0b53 100644 --- meta/audacious/Makefile +++ meta/audacious/Makefile @@ -2,7 +2,7 @@ COMMENT = audacious meta-package -VERSION = 4.0.2 +VERSION = 4.0.3 PKGNAME = audacious-${VERSION} RUN_DEPENDS= audio/audacious/player>=${VERSION} \
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/22 09:07:39 Modified files: net/py-smbc: Makefile distinfo Log message: Update to py3-smbc-1.0.22.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/22 09:00:52 Modified files: sysutils/ruby-puppet/4: Makefile sysutils/ruby-puppet/5: Makefile sysutils/ruby-puppet/6: Makefile Log message: Use FAKE_FLAGS not ALL_FAKE_FLAGS to unbreak MAKE_JOBS usage ALL_FAKE_FLAGS (usually put after MAKE_PROGRAM) is used in do-install, but as list of environment variables: $ make -p | grep -e ^PARALLEL_MAKE_FLAGS -e FAKE_FLAGS ALL_FAKE_FLAGS = ... ${FAKE_FLAGS} ${PARALLEL_MAKE_FLAGS} FAKE_FLAGS = HOME=${WKRDIR}/home PARALLEL_MAKE_FLAGS = -j${MAKE_JOBS} @cd ${WRKSRC} && ${ALL_FAKE_FLAGS} ${RUBY} install.rb ... This means having MAKE_JOBS set causes "make install" to fail because "-jN" is used as environment variable. Use FAKE_FLAGS in do-install instead to fix this.
Re: Remove Puppet 4
On Sun, May 17, 2020 at 03:16:05PM +0200, Klemens Nanni wrote: > Long past EOL according to upstream[0], Puppet 5 is in the tree and > should be used while Puppet 6 out long already but only now about to hit > around our tree. > > Anyone still using Puppet 4? Why? > Upgrading will require manual work for the Puppet configuration, so I > see no sensible way in providing an upgrade path. > > 0: > https://puppet.com/docs/pe/2017.3/component_versions_in_recent_pe_releases.html > > Feedback? OK? Anyone? Now that Puppet 6 is in the tree and working fine so far, version 4 has no real reason to be packaged and/or used.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/22 08:54:02 Modified files: net/inetsim: Makefile distinfo Removed files: net/inetsim/patches: patch-lib_INetSim_FTP_pm patch-lib_INetSim_HTTP_pm patch-lib_INetSim_Log_pm patch-lib_INetSim_POP3_pm patch-lib_INetSim_SMTP_pm patch-lib_INetSim_TFTP_pm patch-lib_INetSim_pm Log message: update to inetsim-1.3.2
Re: [-CURRENT] Microphone does not work in firefox anymore
On Fri, May 22, 2020 at 05:05:38AM +0200, Jan Beich wrote: > a...@abiscuola.com writes: > > > Hi all. > > > > I installed the latest snapshot and, suddenly, the microphone > > stopped working in firefox. > > Does it happen since nss 3.52 update? If so ask landry@ to apply > https://hg.mozilla.org/mozilla-central/rev/463069687b3d > > See https://bugzilla.mozilla.org/show_bug.cgi?id=1636632 Well, what a shitshow. I dont use 76 (only 77beta here) and wont have time to actually test this helps, but if one can confirm the attached port patch fixes webrtc on 76 (and 68esr, if it's broken) then yes i'll sure apply it. From my understanding of the FreeBSD bug, it's also broken on esr ? Can someone test and confirm the patch needs also backporting there ? Thanks jan! Landry ? fx-bug1624128.diff ? notes-sandbox ? patch-configure_py ? patches-cubebremote ? patches-debugvideo ? pledge-59.diff ? wippy3 Index: Makefile === RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v retrieving revision 1.423 diff -u -r1.423 Makefile --- Makefile4 May 2020 14:57:18 - 1.423 +++ Makefile22 May 2020 14:52:18 - @@ -9,6 +9,7 @@ MOZILLA_BRANCH = release MOZILLA_PROJECT = firefox MOZILLA_CODENAME = browser +REVISION = 0 WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/b[0-9]*//} HOMEPAGE = https://www.mozilla.org/firefox/ Index: patches/patch-dom_crypto_WebCryptoTask_cpp === RCS file: patches/patch-dom_crypto_WebCryptoTask_cpp diff -N patches/patch-dom_crypto_WebCryptoTask_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-dom_crypto_WebCryptoTask_cpp 22 May 2020 14:52:18 - @@ -0,0 +1,19 @@ +$OpenBSD$ + +backport https://hg.mozilla.org/mozilla-central/rev/463069687b3d +fixes webrtc w/ nss 3.52 +cf https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246363 +cf https://bugzilla.mozilla.org/show_bug.cgi?id=1636632 +cf https://bugzilla.mozilla.org/show_bug.cgi?id=1624128 + +Index: dom/crypto/WebCryptoTask.cpp +--- dom/crypto/WebCryptoTask.cpp.orig dom/crypto/WebCryptoTask.cpp +@@ -600,6 +600,7 @@ class AesTask : public ReturnArrayBufferViewTask, publ + case CKM_AES_GCM: + gcmParams.pIv = mIv.Elements(); + gcmParams.ulIvLen = mIv.Length(); ++gcmParams.ulIvBits = gcmParams.ulIvLen * 8; + gcmParams.pAAD = mAad.Elements(); + gcmParams.ulAADLen = mAad.Length(); + gcmParams.ulTagBits = mTagLength; Index: patches/patch-netwerk_srtp_src_crypto_cipher_aes_gcm_nss_c === RCS file: patches/patch-netwerk_srtp_src_crypto_cipher_aes_gcm_nss_c diff -N patches/patch-netwerk_srtp_src_crypto_cipher_aes_gcm_nss_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-netwerk_srtp_src_crypto_cipher_aes_gcm_nss_c 22 May 2020 14:52:18 - @@ -0,0 +1,19 @@ +$OpenBSD$ + +backport https://hg.mozilla.org/mozilla-central/rev/463069687b3d +fixes webrtc w/ nss 3.52 +cf https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246363 +cf https://bugzilla.mozilla.org/show_bug.cgi?id=1636632 +cf https://bugzilla.mozilla.org/show_bug.cgi?id=1624128 + +Index: netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c +--- netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c.orig netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c +@@ -271,6 +271,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(vo + + c->params.pIv = c->iv; + c->params.ulIvLen = GCM_IV_LEN; ++c->params.ulIvBits = GCM_IV_LEN * 8; + c->params.pAAD = c->aad; + c->params.ulAADLen = c->aad_size; + Index: patches/patch-security_manager_ssl_OSKeyStore_cpp === RCS file: patches/patch-security_manager_ssl_OSKeyStore_cpp diff -N patches/patch-security_manager_ssl_OSKeyStore_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-security_manager_ssl_OSKeyStore_cpp 22 May 2020 14:52:18 - @@ -0,0 +1,19 @@ +$OpenBSD$ + +backport https://hg.mozilla.org/mozilla-central/rev/463069687b3d +fixes webrtc w/ nss 3.52 +cf https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246363 +cf https://bugzilla.mozilla.org/show_bug.cgi?id=1636632 +cf https://bugzilla.mozilla.org/show_bug.cgi?id=1624128 + +Index: security/manager/ssl/OSKeyStore.cpp +--- security/manager/ssl/OSKeyStore.cpp.orig security/manager/ssl/OSKeyStore.cpp +@@ -663,6 +663,7 @@ nsresult AbstractOSKeyStore::DoCipher(const UniquePK11 + CK_GCM_PARAMS gcm_params; + gcm_params.pIv = const_cast(ivp); + gcm_params.ulIvLen = mIVLength; ++ gcm_params.ulIvBits = gcm_params.ulIvLen * 8; + gcm_params.ulTagBits = 128; + gcm_params.pAAD = nullptr; + gcm_params.ulAADLen = 0; Index: patches/patch-third_party_prio_moz_build === RCS file: patches/patch-third_party_prio_moz_build diff -N
Re: [NEW] games/wrath
On Thu, May 21, 2020 at 09:00:11PM +0200, Solene Rapenne wrote: [...] > > > Thanks for your input. > > > > indeed, the prefix 0.0.0 make sense in that case you showed me others > > ports do the same. > > > > I'm ok to import it. Anyone else ok? > > > > ping > It's a nice and simple port. Note that this is an Early Access title that is in development and not really released yet, meaning the game and engine may change substantially. It may be worth asking upstream to make actual releases with stable source tarballs, although the phrasing on the GitHub page makes me concerned that we should probably not expect too much cooperation: "It'll be updated with every Steam/GOG update that changes the binaries. Pull requests to this repository are not accepted." I played through part of the first level and everything seems to work fine. ok thfr@
Re: [update] textproc/lowdown to 0.6.5
On Fri, 22 May 2020, Lucas Raab wrote: > Hello, > > Fresh off the heels of the 0.6.4 update is 0.6.5. > > Changelog: https://kristaps.bsd.lv/lowdown/archive.html Builds and works for me on amd64. The pkg-config(1) addition is a nice touch. ok paco -- Paco Esteban. 0x5818130B8A6DBC03
Re: FindInotify devel/kf5/extra-cmake-modules
On Fri, May 22, 2020 at 03:46:52PM +0200, Rafael Sadowski wrote: > On Fri May 22, 2020 at 08:57:21AM +0100, Stuart Henderson wrote: > > IIRC it's installed there on purpose, exactly so that it is not > > automatically picked up. > > > > Fair enough, here another try. Just help cmake if inotify is required > "find_package(inotify REQUIRED)". This make porting consumer less > painful. Why not move libinotify in its intended location? > Rafael > > Index: Makefile > === > RCS file: /cvs/ports/devel/kf5/extra-cmake-modules/Makefile,v > retrieving revision 1.9 > diff -u -p -u -p -r1.9 Makefile > --- Makefile 30 Mar 2020 15:00:38 - 1.9 > +++ Makefile 22 May 2020 13:45:52 - > @@ -3,7 +3,7 @@ > COMMENT =CMake modules required by KDE5 > DISTNAME = extra-cmake-modules-${VERSION} > HOMEPAGE = > https://projects.kde.org/projects/kdesupport/extra-cmake-modules > -REVISION = 1 > +REVISION = 2 > > WANTLIB- = > > @@ -21,6 +21,9 @@ PKG_ARCH = * > > # use depleted > CONFIGURE_ARGS +=-DMAN_INSTALL_DIR=${PREFIX}/man > + > +post-patch: > + ${SUBST_CMD} ${WRKSRC}/find-modules/FindInotify.cmake > > post-install: > ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ > Index: patches/patch-find-modules_FindInotify_cmake > === > RCS file: patches/patch-find-modules_FindInotify_cmake > diff -N patches/patch-find-modules_FindInotify_cmake > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-find-modules_FindInotify_cmake 22 May 2020 13:45:52 > - > @@ -0,0 +1,33 @@ > +$OpenBSD$ > + > +If inotify is required, help cmake to find it. > + > +Index: find-modules/FindInotify.cmake > +--- find-modules/FindInotify.cmake.orig > find-modules/FindInotify.cmake > +@@ -48,7 +48,11 @@ > + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + > #= > + > +-find_path(Inotify_INCLUDE_DIRS sys/inotify.h) > ++if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND Inotify_FIND_REQUIRED) > ++find_path(Inotify_INCLUDE_DIRS NAMES sys/inotify.h PATHS > ${LOCALBASE}/include/inotify NO_DEFAULT_PATH) > ++else() > ++find_path(Inotify_INCLUDE_DIRS sys/inotify.h) > ++endif() > + > + if(Inotify_INCLUDE_DIRS) > + # On Linux there is no library to link against, on the BSDs there is. > +@@ -58,7 +62,11 @@ if(Inotify_INCLUDE_DIRS) > + set(Inotify_LIBRARIES "") > + set(Inotify_INCLUDE_DIRS "") > + else() > +-find_library(Inotify_LIBRARIES NAMES inotify) > ++if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND Inotify_FIND_REQUIRED) > ++find_library(Inotify_LIBRARIES NAMES inotify PATHS > ${LOCALBASE}/lib/inotify NO_DEFAULT_PATH) > ++else() > ++find_library(Inotify_LIBRARIES NAMES inotify) > ++endif() > + include(FindPackageHandleStandardArgs) > + find_package_handle_standard_args(Inotify > + FOUND_VAR > -- Antoine
[update] textproc/lowdown to 0.6.5
Hello, Fresh off the heels of the 0.6.4 update is 0.6.5. Changelog: https://kristaps.bsd.lv/lowdown/archive.html Index: Makefile === RCS file: /cvs/ports/textproc/lowdown/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile17 May 2020 13:31:10 - 1.20 +++ Makefile22 May 2020 14:08:37 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.20 2020/05/17 13:31:10 kn Exp $ COMMENT = simple markdown translator -DISTNAME = lowdown-0.6.4 +DISTNAME = lowdown-0.6.5 CATEGORIES = textproc HOMEPAGE = https://kristaps.bsd.lv/lowdown/ Index: distinfo === RCS file: /cvs/ports/textproc/lowdown/distinfo,v retrieving revision 1.17 diff -u -p -r1.17 distinfo --- distinfo17 May 2020 13:31:10 - 1.17 +++ distinfo22 May 2020 14:08:37 - @@ -1,2 +1,2 @@ -SHA256 (lowdown-0.6.4.tar.gz) = EPftZ5/jJMAAs7I0955bEolbpCISgH0kKv3Eja0Tjno= -SIZE (lowdown-0.6.4.tar.gz) = 154971 +SHA256 (lowdown-0.6.5.tar.gz) = Bd5KyS2qo+jtmrvr3B7DJa3PxqmqL7RisknIZR0geFI= +SIZE (lowdown-0.6.5.tar.gz) = 172871 Index: pkg/PLIST === RCS file: /cvs/ports/textproc/lowdown/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 22 Feb 2020 11:29:17 - 1.7 +++ pkg/PLIST 22 May 2020 14:08:37 - @@ -3,6 +3,7 @@ @bin bin/lowdown-diff include/lowdown.h @static-lib lib/liblowdown.a +lib/pkgconfig/lowdown.pc @man man/man1/lowdown.1 @man man/man3/lowdown.3 @man man/man3/lowdown_buf.3
Re: sysutils/u-boot: Various u-boot changes
On Tue, 2020-05-19 at 15:03 -0400, Kurt Miller wrote: > On Tue, 2020-05-19 at 11:21 +1000, Jonathan Gray wrote: > > > > On Mon, May 18, 2020 at 08:09:21PM -0400, k...@intricatesoftware.com wrote: > > > > > > > > > Various u-boot changes: > > > * Rockchip now outputs a single image that combines idbloader.img > > > and u-boot.itb called u-boot-rockchip.bin. It gets written at > > > block 64. For example: > > > dd if=u-boot-rockchip.bin of=/dev/sdXc seek=64 > > > * Fix rock64 gen3 SPL boot hang. Submitted upstream and awaiting > > > review. Tested on both gen2 and gen3 boards. > > > * Enable PCIe gen2 on rockpro64. I've been running with this > > > since December and tested various PCIe boards. > > > > > > okay? > > This looks fine, but isn't there also a PFRAG.arm change needed for > > tinker-rk3288? > Thank you, good catch. I have added that now. I'm going to hold off > a little bit on this. The rock64 u-boot maintainer is having an issue > with his gen2 board with my gen3 fix (mine works with this but his > didn't). Upstream reviews completed now. The testing issue was that he was using ATF 2.1 with the old BL31_BASE. I committed this with the pkg/PFRAG.arm correction you noted. > > > > > > > > > > > > > > > Index: Makefile > > > === > > > RCS file: /cvs/ports/sysutils/u-boot/Makefile,v > > > retrieving revision 1.68 > > > diff -u -p -u -r1.68 Makefile > > > --- Makefile 15 May 2020 12:53:13 - 1.68 > > > +++ Makefile 18 May 2020 22:11:35 - > > > @@ -8,6 +8,7 @@ FLAVOR?= arm > > > > > > COMMENT= U-Boot firmware > > > VERSION= 2020.04 > > > +REVISION=0 > > > DISTNAME=u-boot-${VERSION} > > > PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//} > > > FULLPKGNAME= ${PKGNAME} > > > @@ -148,6 +149,7 @@ FILES=\ > > > u-boot-spl.kwb \ > > > u-boot-with-spl.bin \ > > > u-boot.itb \ > > > + u-boot-rockchip.bin \ > > > idbloader.img \ > > > spl/sunxi-spl.bin \ > > > > > > Index: patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi > > > === > > > RCS file: patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi > > > diff -N patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi > > > --- /dev/null 1 Jan 1970 00:00:00 - > > > +++ patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi 18 May 2020 > > > 22:11:35 - > > > @@ -0,0 +1,35 @@ > > > +$OpenBSD$ > > > + > > > +Fix gen3 SPL boot hang > > > + > > > +Index: arch/arm/dts/rk3328-rock64-u-boot.dtsi > > > +--- arch/arm/dts/rk3328-rock64-u-boot.dtsi.orig > > > arch/arm/dts/rk3328-rock64-u-boot.dtsi > > > +@@ -11,6 +11,27 @@ > > > + }; > > > + }; > > > + > > > ++ { > > > ++u-boot,dm-spl; > > > ++}; > > > ++ > > > ++ { > > > ++u-boot,dm-spl; > > > ++}; > > > ++ > > > ++_gpio { > > > ++u-boot,dm-spl; > > > ++}; > > > ++ > > > ++_pull_up_4ma { > > > ++u-boot,dm-spl; > > > ++}; > > > ++ > > > + _host0_xhci { > > > + status = "okay"; > > > ++}; > > > ++ > > > ++/* Need this and all the pinctrl/gpio stuff above to set pinmux */ > > > ++_sd { > > > ++u-boot,dm-spl; > > > + }; > > > Index: patches/patch-arch_arm_dts_rk3399-rockpro64_dts > > > === > > > RCS file: > > > /cvs/ports/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-rockpro64_dts,v > > > retrieving revision 1.4 > > > diff -u -p -u -r1.4 patch-arch_arm_dts_rk3399-rockpro64_dts > > > --- patches/patch-arch_arm_dts_rk3399-rockpro64_dts 17 Jan 2020 > > > 14:24:42 - 1.4 > > > +++ patches/patch-arch_arm_dts_rk3399-rockpro64_dts 18 May 2020 > > > 22:11:35 - > > > @@ -1,5 +1,7 @@ > > > $OpenBSD: patch-arch_arm_dts_rk3399-rockpro64_dts,v 1.4 2020/01/17 > > > 14:24:42 kurt Exp $ > > > > > > +Set baud rate, enable fan control and PCIe gen2. > > > + > > > Index: arch/arm/dts/rk3399-rockpro64.dts > > > --- arch/arm/dts/rk3399-rockpro64.dts.orig > > > +++ arch/arm/dts/rk3399-rockpro64.dts > > > @@ -20,7 +22,15 @@ Index: arch/arm/dts/rk3399-rockpro64.dts > > > #cooling-cells = <2>; > > > fan-supply = <_dcin>; > > > pwms = < 0 5 0>; > > > -@@ -750,4 +751,43 @@ > > > +@@ -522,6 +523,7 @@ > > > + > > > + { > > > + ep-gpios = < RK_PD4 GPIO_ACTIVE_HIGH>; > > > ++max-link-speed = <2>; > > > + num-lanes = <4>; > > > + pinctrl-names = "default"; > > > + pinctrl-0 = <_perst>; > > > +@@ -750,4 +752,43 @@ > > > > > > _mmu { > > > status = "okay"; > > > Index: patches/patch-configs_rock64-rk3328_defconfig > > > === > > > RCS file: > > > /cvs/ports/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig,v > > > retrieving revision 1.2 > > > diff -u -p -u -r1.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/22 07:51:09 Modified files: sysutils/u-boot: Makefile sysutils/u-boot/patches: patch-arch_arm_dts_rk3399-rockpro64_dts patch-configs_rock64-rk3328_defconfig sysutils/u-boot/pkg: PFRAG.aarch64 PFRAG.arm Added files: sysutils/u-boot/patches: patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi Log message: Various u-boot changes: * Rockchip now outputs a single image that combines idbloader.img and u-boot.itb called u-boot-rockchip.bin. It gets written at block 64. For example: dd if=u-boot-rockchip.bin of=/dev/sdXc seek=64 * Fix rock64 gen3 SPL boot hang. Reviewed upstream. Tested on both gen2 and gen3 boards. * Enable PCIe gen2 on rockpro64. I've been running with this since December and tested various PCIe boards. okay jsg@
extend PORTS_PRIVSEP
While working manually on dpb goo, I found out BULK_COOKIES_DIR and UPDATE_COOKIES_DIR are not handled (this results in error messages at the end of logs, actually, not actual errors, since this is behind a -rm -f Also, the empty(UPDATE_COOKIES_DIR) goo is wrong Could you test/check, please ? Index: bsd.port.mk === RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v retrieving revision 1.1536 diff -u -p -r1.1536 bsd.port.mk --- bsd.port.mk 20 May 2020 12:57:10 - 1.1536 +++ bsd.port.mk 22 May 2020 13:47:51 - @@ -2069,6 +2069,7 @@ fix-permissions: fi . for d in ${LOCKDIR} ${PACKAGE_REPOSITORY} \ ${PACKAGE_REPOSITORY}/${MACHINE_ARCH} \ + ${BULK_COOKIES_DIR} ${UPDATE_COOKIES_DIR} \ ${PLIST_REPOSITORY} ${WRKOBJDIR} @b=`id -gn ${BUILD_USER}`; \ echo "give $d to ${BUILD_USER}:$$b"; \ @@ -2156,7 +2157,7 @@ ${_pkg_cookie${_S}}: ${_PBUILD} mv ${_TMP_REPO}$$pkgname ${_PKG_REPO${_S}}$$p; \ done # End of PACKAGE. - @-rm -f ${_BULK_COOKIE} ${_UPDATE_COOKIE${_S}} ${_FUPDATE_COOKIE${_S}} + @-${_PBUILD} rm -f ${_BULK_COOKIE} ${_UPDATE_COOKIE${_S}} ${_FUPDATE_COOKIE${_S}} . endif @@ -2179,9 +2180,9 @@ ${_INSTALL_COOKIE${_S}}: ${_UPDATE_COOKIE${_S}}: @${_MAKE} _internal-package . if empty(UPDATE_COOKIES_DIR) - @${_MAKE} ${WRKDIR} + @test -d ${WRKDIR} || ${_MAKE} ${_WRKDIR_COOKIE} . else - @mkdir -p ${UPDATE_COOKIES_DIR} + @${_PBUILD} mkdir -p ${UPDATE_COOKIES_DIR} . endif @${ECHO_MSG} "===> Updating for ${FULLPKGNAME${_S}}" @b=$$(cd ${.CURDIR} && SUBPACKAGE=${_S} ${MAKE} print-plist|sed -ne '/^@pkgpath /s,,-e ,p'); \ @@ -2193,20 +2194,20 @@ ${_UPDATE_COOKIE${_S}}: ${ECHO_MSG} "Upgrading from $$a"; \ ${SETENV} ${_TERM_ENV} ${_SUDO_PKG_ADD_LOCAL} ${_PKG_ADD_AUTO} -r ${_PKG_ADD_FORCE} ${PKGFILE${_S}};; \ esac - @${_MAKE_COOKIE} $@ + @${_PBUILD} ${_MAKE_COOKIE} $@ ${_FUPDATE_COOKIE${_S}}: @${_MAKE} _internal-package @cd ${.CURDIR} && SUBPACKAGE=${_S} _DEPENDS_TARGET=package PKGPATH=${PKGPATH} \ exec ${MAKE} _internal-install-depends . if empty(UPDATE_COOKIES_DIR) - @${_MAKE} ${WRKDIR} + @test -d ${WRKDIR} || ${_MAKE} ${_WRKDIR_COOKIE} . else - @mkdir -p ${UPDATE_COOKIES_DIR} + @${_PBUILD} mkdir -p ${UPDATE_COOKIES_DIR} . endif @${ECHO_MSG} "===> Updating/installing for ${FULLPKGNAME${_S}}" @${SETENV} ${_TERM_ENV} ${_SUDO_PKG_ADD_LOCAL} ${_PKG_ADD_AUTO} -r ${_PKG_ADD_FORCE} ${PKGFILE${_S}} - @${_MAKE_COOKIE} $@ + @${_PBUILD} ${_MAKE_COOKIE} $@ .endfor .PRECIOUS: ${_PACKAGE_COOKIES} ${_INSTALL_COOKIES} @@ -2612,7 +2613,7 @@ _internal-package: ${_BULK_COOKIE}: @${_cache_fragment}; cd ${.CURDIR} && ${MAKE} _internal-package-only - @mkdir -p ${BULK_COOKIES_DIR} + @${_PBUILD} mkdir -p ${BULK_COOKIES_DIR} .for _i in ${BULK_TARGETS_${PKGPATH}} @${ECHO_MSG} "===> Running ${_i}" @${_MAKE} ${_i} ${BULK_FLAGS} @@ -2621,7 +2622,7 @@ ${_BULK_COOKIE}: @${BULK_DO_${PKGPATH}} .endif @${_MAKE} _internal-clean - @${_MAKE_COOKIE} $@ + @${_PBUILD} ${_MAKE_COOKIE} $@ # The real targets. Note that some parts always get run, some parts can be # disabled, and there are hooks to override behavior. @@ -3249,13 +3250,13 @@ _internal-clean: .if ${_clean:Mpackages} || ${_clean:Mpackage} && ${_clean:Msub} ${_PBUILD} rm -f ${_PACKAGE_COOKIES} ${_WRKDEBUG}/Makefile ${_PFETCH} rm -f ${_CACHE_PACKAGE_COOKIES} - rm -f ${_UPDATE_COOKIES} + ${_PBUILD} rm -f ${_UPDATE_COOKIES} .elif ${_clean:Mpackage} ${_PBUILD} rm -f ${_PACKAGE_COOKIES${SUBPACKAGE}} ${_DBG_PACKAGE_COOKIE${SUBPACKAGE}} - rm -f ${_UPDATE_COOKIE${SUBPACKAGE}} + ${_PBUILD} rm -f ${_UPDATE_COOKIE${SUBPACKAGE}} .endif .if ${_clean:Mbulk} - rm -f ${_BULK_COOKIE} + ${_PBUILD} rm -f ${_BULK_COOKIE} .endif .if ${_clean:Mplist} . if !empty(_PLIST_DB)
Re: FindInotify devel/kf5/extra-cmake-modules
On Fri May 22, 2020 at 08:57:21AM +0100, Stuart Henderson wrote: > IIRC it's installed there on purpose, exactly so that it is not > automatically picked up. > Fair enough, here another try. Just help cmake if inotify is required "find_package(inotify REQUIRED)". This make porting consumer less painful. Rafael Index: Makefile === RCS file: /cvs/ports/devel/kf5/extra-cmake-modules/Makefile,v retrieving revision 1.9 diff -u -p -u -p -r1.9 Makefile --- Makefile30 Mar 2020 15:00:38 - 1.9 +++ Makefile22 May 2020 13:45:52 - @@ -3,7 +3,7 @@ COMMENT = CMake modules required by KDE5 DISTNAME = extra-cmake-modules-${VERSION} HOMEPAGE = https://projects.kde.org/projects/kdesupport/extra-cmake-modules -REVISION = 1 +REVISION = 2 WANTLIB- = @@ -21,6 +21,9 @@ PKG_ARCH =* # use depleted CONFIGURE_ARGS += -DMAN_INSTALL_DIR=${PREFIX}/man + +post-patch: + ${SUBST_CMD} ${WRKSRC}/find-modules/FindInotify.cmake post-install: ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ Index: patches/patch-find-modules_FindInotify_cmake === RCS file: patches/patch-find-modules_FindInotify_cmake diff -N patches/patch-find-modules_FindInotify_cmake --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-find-modules_FindInotify_cmake22 May 2020 13:45:52 - @@ -0,0 +1,33 @@ +$OpenBSD$ + +If inotify is required, help cmake to find it. + +Index: find-modules/FindInotify.cmake +--- find-modules/FindInotify.cmake.orig find-modules/FindInotify.cmake +@@ -48,7 +48,11 @@ + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #= + +-find_path(Inotify_INCLUDE_DIRS sys/inotify.h) ++if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND Inotify_FIND_REQUIRED) ++find_path(Inotify_INCLUDE_DIRS NAMES sys/inotify.h PATHS ${LOCALBASE}/include/inotify NO_DEFAULT_PATH) ++else() ++find_path(Inotify_INCLUDE_DIRS sys/inotify.h) ++endif() + + if(Inotify_INCLUDE_DIRS) + # On Linux there is no library to link against, on the BSDs there is. +@@ -58,7 +62,11 @@ if(Inotify_INCLUDE_DIRS) + set(Inotify_LIBRARIES "") + set(Inotify_INCLUDE_DIRS "") + else() +-find_library(Inotify_LIBRARIES NAMES inotify) ++if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND Inotify_FIND_REQUIRED) ++find_library(Inotify_LIBRARIES NAMES inotify PATHS ${LOCALBASE}/lib/inotify NO_DEFAULT_PATH) ++else() ++find_library(Inotify_LIBRARIES NAMES inotify) ++endif() + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Inotify + FOUND_VAR
Re: [fix/update] puppet 6 update to 6.15 to fix package-with-flavor bugs
On Fri, May 22, 2020, at 18:38, Klemens Nanni wrote: > On Fri, May 22, 2020 at 04:30:53PM +1000, Arthur Barton wrote: > > Attached is an update to the new puppet 6 port, taking it to version 6.15.0 > Unfortunately, your patch partially fails to apply; did you test it > against a clean CVS checkout? Attached patches nicely against a clean checkout. > > I was already working on a 6.15 update so its attached here, with some > > further updates to the package provider. > REVISION should be removed when you update VERSION/DISTNAME. Ah okay - removed in the new diff > > This really needs testing as its playing with bits of the provider that I > > don't touch, and its a pretty brutal fix whereby the package name is set to > > 'packagename--' if no flavor or %branch is specified, to ensure it only > > matches the empty flavor. > I think adding "--" is fine, `pkg_info -m -z' does it as well and this > is the canonical way to get a list of installed packages such that they > can be installed on another system. -- Arthur Barton arth...@igniferous.net puppet-6.15.diff Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/22 06:31:41 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.13.15.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/22 06:31:58 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.18.65.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/22 06:31:28 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.16.15.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/22 06:29:57 Modified files: graphics/shotwell: Makefile distinfo graphics/shotwell/pkg: PLIST Log message: Update to shotwell-0.30.10.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/22 05:42:54 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Add CVE quirks for powerdns_recursor, isc-bind, dovecot and tomcat
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/22 05:27:54 Modified files: devel/quirks : Makefile devel/quirks/pkg: DESCR Log message: Update DESCR wrt. pkg_add(1) always installing quirks
Re: FindInotify devel/kf5/extra-cmake-modules
On 2020/05/22 12:10, Antoine Jacoutot wrote: > On Fri, May 22, 2020 at 08:57:21AM +0100, Stuart Henderson wrote: > > IIRC it's installed there on purpose, exactly so that it is not > > automatically picked up. > > Indeed. > But should we change the rule now and install it under the default path? I don't think this is something to be taken likely. As you know, libinotify has different behaviour than linux inotify. It feels like the problem with high FD use is manageable while it's opt-in and only a few ports are involved, but if this is turned on for all ports that want it we'll at least need to look closer into how they all behave. Also we don't know how some programs will cope with the various inotify events that aren't supported by libinotify. I've made a list of ports with "inotify" in build log and not in the port directory, it's not totally accurate but gives a reasonable picture - obviously this doesn't mean that all of these ports will start using it but it's a starting point of places where we'd need to look if we do decide this is useful. Compared to the work involved in looking at all of these (and future ports), and possibly having to patch to disable libinotify in some cases (which is often harder than patching a port to allow it to find files in an unusual location), it feels like patching the few ports that do really need libinotify is less work and easier work. comms/smstools databases/tdb devel/clang-tools-extra devel/glib2 devel/kf5/extra-cmake-modules devel/kf5/kcoreaddons devel/libev devel/libivykis devel/libtalloc devel/p5-EV devel/p5-File-ChangeNotify devel/py-gevent devel/spidermonkey60 devel/spidermonkey68 editors/emacs games/mirrormagic games/openclonk graphics/feh lang/mono mail/dovecot mail/extsmail mail/mozilla-thunderbird mail/mutt mail/neomutt mail/rspamd math/graphviz net/avahi net/coredns net/dnsmasq net/gdnsd net/ruby-eventmachine net/samba net/transmission sysutils/conky sysutils/consolekit sysutils/coreutils sysutils/direvent sysutils/logfmon sysutils/rsyslog sysutils/ruby-libvirt sysutils/syslog-ng telephony/asterisk textproc/calibre textproc/wkhtmltopdf www/firefox-esr www/mozilla-firefox www/tor-browser/browser x11/dbus x11/e17/ecore x11/e17/eio x11/e17/evas x11/ede/lib x11/emelfm2 x11/gnome/vfs2 x11/kde/libs3 x11/kde4/baloo x11/kde4/pim x11/kde4/workspace x11/qt4 x11/rox-filer x11/rxvt-unicode
Re: NEW: fonts/cascadia-code
Brian Callahan writes: > Attached is a new port, fonts/cascadia-code. Cascadia Code is a > programming/terminal font from Microsoft. > > --- > pkg/DESCR: > Cascadia Code is a monospaced font that includes programming ligatures > and is designed to enhance the modern look and feel of the terminal. > --- > > It is a new dependency of textproc/nfoview. I chose only to install > the TTF version of the font (it also contains OTF and WOFF2 versions). I'd prefer if you included OTF too (but leave out WOFF2). Can you lowercase /usr/local/share/fonts/Cascadia? The vast majority of fonts (all but seven by my count) lowercase it. -- Anthony J. Bentley
NEW: emulators/sameboy
Hi, SameBoy is a SDL-based Nintendo Game Boy and Game Boy Color emulator. SameBoy is extremely accurate and includes a wide range of powerful debugging features, making it ideal for both casual players and developers. In addition to accuracy and developer capabilities, SameBoy has all the features one would expect from an emulator, from save states to scaling filters. libretro-sameboy provides a Nintendo Game Boy and Game Boy Color emulation core to the RetroArch emulator frontend, based on SameBoy. SameBoy is to my knowledge the most accurate Game Boy emulator in existence. It is certainly more accurate than Gambatte, the most accurate emulator in our tree. And unlike Gambatte, SameBoy is actively maintained. For general usage I still usually recommend mgba, as it is quite accurate (more than enough for people just playing games) and has a fairly strong pledge on OpenBSD. But SameBoy is an important emulator for anyone doing Game Boy development. I previously submitted this about a year ago. At the time I mentioned issues with audio speed, but I can no longer reproduce those problems. In addition, upstream has integrated my portability patches. ok? -- Anthony J. Bentley sameboy.tar.gz Description: sameboy.tar.gz
Re: FindInotify devel/kf5/extra-cmake-modules
On Fri, May 22, 2020 at 08:57:21AM +0100, Stuart Henderson wrote: > IIRC it's installed there on purpose, exactly so that it is not > automatically picked up. Indeed. But should we change the rule now and install it under the default path? > On 22 May 2020 07:28:55 Rafael Sadowski wrote: > > > Simple patch to fix FindInotify. CMake needs some help to find > > "sys/inotify.h" and libinotify because we do not install it under > > LOCALBASE/{include,lib}. > > > > OK? > > > > Index: Makefile > > === > > RCS file: /cvs/ports/devel/kf5/extra-cmake-modules/Makefile,v > > retrieving revision 1.9 > > diff -u -p -u -p -r1.9 Makefile > > --- Makefile30 Mar 2020 15:00:38 - 1.9 > > +++ Makefile22 May 2020 06:25:00 - > > @@ -3,7 +3,7 @@ > > COMMENT = CMake modules required by KDE5 > > DISTNAME = extra-cmake-modules-${VERSION} > > HOMEPAGE = > > https://projects.kde.org/projects/kdesupport/extra-cmake-modules > > -REVISION = 1 > > +REVISION = 2 > > > > WANTLIB- = > > > > @@ -21,6 +21,9 @@ PKG_ARCH =* > > > > # use depleted > > CONFIGURE_ARGS += -DMAN_INSTALL_DIR=${PREFIX}/man > > + > > +post-patch: > > + ${SUBST_CMD} ${WRKSRC}/find-modules/FindInotify.cmake > > > > post-install: > > ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ > > Index: patches/patch-find-modules_FindInotify_cmake > > === > > RCS file: patches/patch-find-modules_FindInotify_cmake > > diff -N patches/patch-find-modules_FindInotify_cmake > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ patches/patch-find-modules_FindInotify_cmake22 May 2020 06:25:00 > > - > > @@ -0,0 +1,25 @@ > > +$OpenBSD$ > > + > > +inotify is not installed in the standard path > > + > > +Index: find-modules/FindInotify.cmake > > +--- find-modules/FindInotify.cmake.orig > > find-modules/FindInotify.cmake > > +@@ -48,7 +48,7 @@ > > + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > + > > #= > > + > > +-find_path(Inotify_INCLUDE_DIRS sys/inotify.h) > > ++find_path(Inotify_INCLUDE_DIRS NAMES sys/inotify.h PATHS > > ${LOCALBASE}/include/inotify NO_DEFAULT_PATH) > > + > > + if(Inotify_INCLUDE_DIRS) > > + # On Linux there is no library to link against, on the BSDs there is. > > +@@ -58,7 +58,7 @@ if(Inotify_INCLUDE_DIRS) > > + set(Inotify_LIBRARIES "") > > + set(Inotify_INCLUDE_DIRS "") > > + else() > > +-find_library(Inotify_LIBRARIES NAMES inotify) > > ++find_library(Inotify_LIBRARIES NAMES inotify PATHS > > ${LOCALBASE}/lib/inotify NO_DEFAULT_PATH) > > + include(FindPackageHandleStandardArgs) > > + find_package_handle_standard_args(Inotify > > + FOUND_VAR > > > -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 03:56:17 Modified files: devel/qt-creator: Makefile distinfo devel/qt-creator/pkg: PLIST Removed files: devel/qt-creator/patches: patch-src_plugins_qtsupport_baseqtversion_cpp Log message: Update qt-creator to 4.12.1
UPDATE: security/qca-qt5
Update qca-qt5 to 2.3.0 - Rmove useless botan patch. We have not activate the botan plugin. - Sync LibreSSL patches from Stefan Strog - Bump shared lib version, symbols were removed Index: Makefile === RCS file: /cvs/ports/security/qca-qt5/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- Makefile28 Nov 2019 17:44:07 - 1.6 +++ Makefile22 May 2020 09:40:06 - @@ -2,12 +2,12 @@ # separate port for Qt5 because it's too different from Qt4 case COMMENT = Qt Cryptographic Architecture -V =2.2.1 +V =2.3.0 DISTNAME = qca-${V} PKGNAME = qca-qt5-${V} CATEGORIES = security -SHARED_LIBS = qca-qt5 0.1 +SHARED_LIBS = qca-qt5 1.0 HOMEPAGE = https://userbase.kde.org/QCA @@ -32,8 +32,7 @@ CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX= -DBUILD_PLUGINS="none" \ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \ -DQCA_SUFFIX=qt5 \ - -Dqca_CERTSTORE=/etc/ssl/cert.pem \ - -DQT4_BUILD=OFF + -Dqca_CERTSTORE=/etc/ssl/cert.pem # Enable plugins (qca checks for "yes") CONFIGURE_ARGS += -DWITH_ossl_PLUGIN=yes Index: distinfo === RCS file: /cvs/ports/security/qca-qt5/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo28 Nov 2019 17:44:07 - 1.2 +++ distinfo22 May 2020 09:40:06 - @@ -1,2 +1,2 @@ -SHA256 (qca-2.2.1.tar.xz) = 1xbS2OPtjZW72wYfAwgdfQMiBvdGowpNKdchlvUOewI= -SIZE (qca-2.2.1.tar.xz) = 691676 +SHA256 (qca-2.3.0.tar.xz) = HWjvQaG2Hcl4a+uSOmiQKmJ2p3zO1eXqf/mF7xE5Mtc= +SIZE (qca-2.3.0.tar.xz) = 729504 Index: patches/patch-plugins_qca-botan_CMakeLists_txt === RCS file: patches/patch-plugins_qca-botan_CMakeLists_txt diff -N patches/patch-plugins_qca-botan_CMakeLists_txt --- patches/patch-plugins_qca-botan_CMakeLists_txt 28 Nov 2019 17:44:07 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-plugins_qca-botan_CMakeLists_txt,v 1.1 2019/11/28 17:44:07 rsadowski Exp $ - -Fix qca-botan linking. - -Index: plugins/qca-botan/CMakeLists.txt plugins/qca-botan/CMakeLists.txt.orig -+++ plugins/qca-botan/CMakeLists.txt -@@ -16,6 +16,7 @@ if(BOTAN_FOUND) - set_property(TARGET qca-botan PROPERTY SUFFIX ".dylib") - endif() - -+ target_link_directories(qca-botan PRIVATE ${BOTAN_LIBRARY_DIRS}) - target_link_libraries(qca-botan ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${BOTAN_LIBRARIES}) - - if(NOT DEVELOPER_MODE) Index: patches/patch-plugins_qca-ossl_ossl110-compat_h === RCS file: patches/patch-plugins_qca-ossl_ossl110-compat_h diff -N patches/patch-plugins_qca-ossl_ossl110-compat_h --- patches/patch-plugins_qca-ossl_ossl110-compat_h 28 Nov 2019 17:44:07 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,30 +0,0 @@ -$OpenBSD: patch-plugins_qca-ossl_ossl110-compat_h,v 1.1 2019/11/28 17:44:07 rsadowski Exp $ - -LibreSSL 3.0.x support from Stefan Strogin - -Index: plugins/qca-ossl/ossl110-compat.h plugins/qca-ossl/ossl110-compat.h.orig -+++ plugins/qca-ossl/ossl110-compat.h -@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int - return 1; - } - --static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m, --unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa)) --{ --if (!meth) return 0; --meth->rsa_sign = sign; --return 1; --} -- --static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m, --unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa)) --{ --if (!meth) return 0; --meth->rsa_verify = verify; --return 1; --} -- - static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa)) - { - if (!meth) return 0; Index: patches/patch-plugins_qca-ossl_qca-ossl_cpp === RCS file: /cvs/ports/security/qca-qt5/patches/patch-plugins_qca-ossl_qca-ossl_cpp,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-plugins_qca-ossl_qca-ossl_cpp --- patches/patch-plugins_qca-ossl_qca-ossl_cpp 28 Nov 2019 17:44:07 - 1.1 +++ patches/patch-plugins_qca-ossl_qca-ossl_cpp 22 May 2020 09:40:06 - @@ -5,36 +5,54 @@ LibreSSL 3.0.x support from Stefan Strog Index: plugins/qca-ossl/qca-ossl.cpp --- plugins/qca-ossl/qca-ossl.cpp.orig +++ plugins/qca-ossl/qca-ossl.cpp -@@ -62,12 +62,12 @@ - #endif - - // OpenSSL 1.1.0 compatibility macros --#ifdef OSSL_110 -+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER) - #define M_ASN1_IA5STRING_new()
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/22 03:38:37 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-293.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2020/05/22 02:51:24 Modified files: devel/valgrind : Makefile devel/valgrind/patches: patch-coregrind_m_syswrap_syswrap_openbsd_c Log message: Fix Valgrind reports invalid write. ok jca@
Re: [fix/update] puppet 6 update to 6.15 to fix package-with-flavor bugs
On Fri, May 22, 2020 at 04:30:53PM +1000, Arthur Barton wrote: > Attached is an update to the new puppet 6 port, taking it to version 6.15.0 Unfortunately, your patch partially fails to apply; did you test it against a clean CVS checkout? > kn@ identified and fixed some bugs with the puppet 6.14 package to fix > 'package ensure => latest' & 'service enabled => false', and also found some > bugs with the handling of package flavors. > > For the existing 6.14 package in the tree, installing a package that has > flavors without specifying a flavor fails, if the flavor has a higher patch > number. Thanks, this looks like fixing it. > I was already working on a 6.15 update so its attached here, with some > further updates to the package provider. REVISION should be removed when you update VERSION/DISTNAME. > This really needs testing as its playing with bits of the provider that I > don't touch, and its a pretty brutal fix whereby the package name is set to > 'packagename--' if no flavor or %branch is specified, to ensure it only > matches the empty flavor. I think adding "--" is fine, `pkg_info -m -z' does it as well and this is the canonical way to get a list of installed packages such that they can be installed on another system.
Re: maintainer update: www/hugo
On Fri, 22 May 2020, Rafael Sadowski wrote: > On Thu May 21, 2020 at 02:52:24PM -0600, Todd C. Miller wrote: > > On Thu, 21 May 2020 21:03:37 +0200, Paco Esteban wrote: > > > > > For now it does not work for me with the patch you sent. I get: > > > > > > # > > > github.com/gohugoio/hugo/vendor/github.com/bep/golibsass/internal/libsass > > > c99func.c:2:10: fatal error: '../../libsass_src/src/c99func.c' file not > > > found > > > > > > I'll take a deeper look tomorrow probably. > > That could be useful for SASS themes users. FLAVOR note is missing in > pkg/DESCR. The diff below builds fine. It builds now and works with one of the SASS themes I've found. I added the flavor description, diff at the end. Thank you Todd and Rafael. Comments ? ok ? Index: Makefile === RCS file: /home/cvs/ports/www/hugo/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile21 May 2020 16:37:44 - 1.20 +++ Makefile22 May 2020 07:51:18 - @@ -26,6 +26,16 @@ ALL_TARGET = github.com/gohugoio/hugo SEPARATE_BUILD = Yes +FLAVORS = extended +FLAVOR ?= + +.if ${FLAVOR:Mextended} +MODGO_FLAGS += --tags extended +LIB_DEPENDS += www/libsass +WANTLIB += sass +MAKE_ENV +=CGO_CPPFLAGS='-I${LOCALBASE}/include -DUSE_LIBSASS_SRC' CGO_LDFLAGS='-L${LOCALBASE}/lib -lsass' +.endif + post-build: cd ${MODGO_WORKSPACE}/bin/ && ./hugo gen man Index: pkg/DESCR === RCS file: /home/cvs/ports/www/hugo/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 DESCR --- pkg/DESCR 11 Jun 2018 21:17:14 - 1.1.1.1 +++ pkg/DESCR 22 May 2020 07:56:30 - @@ -4,3 +4,7 @@ Hugo takes a directory with content and them into a full HTML website. Hugo relies on Markdown files with front matter for metadata. + +Flavors: + extended- build hugo extended version with Sass/SCSS + support amongst others -- Paco Esteban. 0x5818130B8A6DBC03
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/22 01:59:40 Modified files: www/qutebrowser: Makefile Log message: add missing RDEPS, based on a diff by rsadowski@
Re: FindInotify devel/kf5/extra-cmake-modules
IIRC it's installed there on purpose, exactly so that it is not automatically picked up. On 22 May 2020 07:28:55 Rafael Sadowski wrote: Simple patch to fix FindInotify. CMake needs some help to find "sys/inotify.h" and libinotify because we do not install it under LOCALBASE/{include,lib}. OK? Index: Makefile === RCS file: /cvs/ports/devel/kf5/extra-cmake-modules/Makefile,v retrieving revision 1.9 diff -u -p -u -p -r1.9 Makefile --- Makefile30 Mar 2020 15:00:38 - 1.9 +++ Makefile22 May 2020 06:25:00 - @@ -3,7 +3,7 @@ COMMENT = CMake modules required by KDE5 DISTNAME = extra-cmake-modules-${VERSION} HOMEPAGE = https://projects.kde.org/projects/kdesupport/extra-cmake-modules -REVISION = 1 +REVISION = 2 WANTLIB- = @@ -21,6 +21,9 @@ PKG_ARCH =* # use depleted CONFIGURE_ARGS += -DMAN_INSTALL_DIR=${PREFIX}/man + +post-patch: + ${SUBST_CMD} ${WRKSRC}/find-modules/FindInotify.cmake post-install: ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ Index: patches/patch-find-modules_FindInotify_cmake === RCS file: patches/patch-find-modules_FindInotify_cmake diff -N patches/patch-find-modules_FindInotify_cmake --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-find-modules_FindInotify_cmake22 May 2020 06:25:00 - @@ -0,0 +1,25 @@ +$OpenBSD$ + +inotify is not installed in the standard path + +Index: find-modules/FindInotify.cmake +--- find-modules/FindInotify.cmake.orig find-modules/FindInotify.cmake +@@ -48,7 +48,7 @@ + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #= + +-find_path(Inotify_INCLUDE_DIRS sys/inotify.h) ++find_path(Inotify_INCLUDE_DIRS NAMES sys/inotify.h PATHS ${LOCALBASE}/include/inotify NO_DEFAULT_PATH) + + if(Inotify_INCLUDE_DIRS) + # On Linux there is no library to link against, on the BSDs there is. +@@ -58,7 +58,7 @@ if(Inotify_INCLUDE_DIRS) + set(Inotify_LIBRARIES "") + set(Inotify_INCLUDE_DIRS "") + else() +-find_library(Inotify_LIBRARIES NAMES inotify) ++find_library(Inotify_LIBRARIES NAMES inotify PATHS ${LOCALBASE}/lib/inotify NO_DEFAULT_PATH) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Inotify + FOUND_VAR
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/22 01:53:20 Modified files: www/qutebrowser: Makefile distinfo www/qutebrowser/pkg: PLIST Log message: update to qutebrowser-1.11.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 01:47:40 Modified files: www: Makefile Log message: add py-qtwebengine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 01:34:47 Modified files: x11/kde-applications/marble: Makefile x11/kde-applications/marble/pkg: PLIST Log message: Switch from qtwebkit to qtwebengine support in marble
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 01:34:07 Modified files: www/otter-browser: Makefile Log message: Force otter-browser to use qtwebkit instead qtwebengine Otter is the only browser really working on macppc.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 01:34:12 Modified files: x11/kde-applications/kalgebra: Makefile x11/kde-applications/kalgebra/pkg: PLIST Log message: Switch from qtwebkit to qtwebengine support in marble
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 01:33:58 Modified files: graphics/digikam: Makefile Added files: graphics/digikam/patches: patch-core_tests_webservices_o2_CMakeLists_txt Log message: Switch from qtwebkit to qtwebengine support in digikam
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 01:33:47 Modified files: x11/qt5: Makefile qt5.port.mk Log message: Enable x11/qt5/{qtwebengine,qtwebglplugin,qtwebview,docs}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 01:34:01 Modified files: devel/qt-creator: Makefile devel/qt-creator/pkg: PLIST Log message: Switch from qtwebkit to qtwebengine support in qt-creator
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/22 01:34:05 Modified files: geo/gpsbabel : Makefile Log message: Switch from qtwebkit to qtwebengine support in gpsbabel
Re: maintainer update: www/hugo
On Thu May 21, 2020 at 02:52:24PM -0600, Todd C. Miller wrote: > On Thu, 21 May 2020 21:03:37 +0200, Paco Esteban wrote: > > > For now it does not work for me with the patch you sent. I get: > > > > # github.com/gohugoio/hugo/vendor/github.com/bep/golibsass/internal/libsass > > c99func.c:2:10: fatal error: '../../libsass_src/src/c99func.c' file not > > found > > > > I'll take a deeper look tomorrow probably. That could be useful for SASS themes users. FLAVOR note is missing in pkg/DESCR. The diff below builds fine. Rafael > > Looks like they changed the name of the define in a newer version > of hugo. The following works for me. > > - todd > > Index: Makefile > === > RCS file: /cvs/ports/www/hugo/Makefile,v > retrieving revision 1.20 > diff -u -p -u -r1.20 Makefile > --- Makefile 21 May 2020 16:37:44 - 1.20 > +++ Makefile 21 May 2020 20:48:23 - > @@ -26,6 +26,16 @@ ALL_TARGET = github.com/gohugoio/hugo > > SEPARATE_BUILD = Yes > > +FLAVORS =extended > +FLAVOR ?= > + > +.if ${FLAVOR:Mextended} > +MODGO_FLAGS += --tags extended > +LIB_DEPENDS += www/libsass > +WANTLIB += sass > +MAKE_ENV += CGO_CPPFLAGS='-I${LOCALBASE}/include -DUSE_LIBSASS_SRC' > CGO_LDFLAGS='-L${LOCALBASE}/lib -lsass' > +.endif > + > post-build: > cd ${MODGO_WORKSPACE}/bin/ && ./hugo gen man > >
[fix/update] puppet 6 update to 6.15 to fix package-with-flavor bugs
Hi Ports@ Attached is an update to the new puppet 6 port, taking it to version 6.15.0 kn@ identified and fixed some bugs with the puppet 6.14 package to fix 'package ensure => latest' & 'service enabled => false', and also found some bugs with the handling of package flavors. For the existing 6.14 package in the tree, installing a package that has flavors without specifying a flavor fails, if the flavor has a higher patch number. I was already working on a 6.15 update so its attached here, with some further updates to the package provider. This really needs testing as its playing with bits of the provider that I don't touch, and its a pretty brutal fix whereby the package name is set to 'packagename--' if no flavor or %branch is specified, to ensure it only matches the empty flavor. The attached update works for throwing a few things at it puppet resource package zabbix-proxy ensure=present flavor=sqlite3 puppet resource package screen ensure=absent puppet resource package python%3.7 ensure=latest but it could use more testing, especially if there are more complex package chains Thanks, Arthur -- Arthur Barton arth...@igniferous.net puppet-6.diff Description: Binary data
FindInotify devel/kf5/extra-cmake-modules
Simple patch to fix FindInotify. CMake needs some help to find "sys/inotify.h" and libinotify because we do not install it under LOCALBASE/{include,lib}. OK? Index: Makefile === RCS file: /cvs/ports/devel/kf5/extra-cmake-modules/Makefile,v retrieving revision 1.9 diff -u -p -u -p -r1.9 Makefile --- Makefile30 Mar 2020 15:00:38 - 1.9 +++ Makefile22 May 2020 06:25:00 - @@ -3,7 +3,7 @@ COMMENT = CMake modules required by KDE5 DISTNAME = extra-cmake-modules-${VERSION} HOMEPAGE = https://projects.kde.org/projects/kdesupport/extra-cmake-modules -REVISION = 1 +REVISION = 2 WANTLIB- = @@ -21,6 +21,9 @@ PKG_ARCH =* # use depleted CONFIGURE_ARGS += -DMAN_INSTALL_DIR=${PREFIX}/man + +post-patch: + ${SUBST_CMD} ${WRKSRC}/find-modules/FindInotify.cmake post-install: ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ Index: patches/patch-find-modules_FindInotify_cmake === RCS file: patches/patch-find-modules_FindInotify_cmake diff -N patches/patch-find-modules_FindInotify_cmake --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-find-modules_FindInotify_cmake22 May 2020 06:25:00 - @@ -0,0 +1,25 @@ +$OpenBSD$ + +inotify is not installed in the standard path + +Index: find-modules/FindInotify.cmake +--- find-modules/FindInotify.cmake.orig find-modules/FindInotify.cmake +@@ -48,7 +48,7 @@ + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #= + +-find_path(Inotify_INCLUDE_DIRS sys/inotify.h) ++find_path(Inotify_INCLUDE_DIRS NAMES sys/inotify.h PATHS ${LOCALBASE}/include/inotify NO_DEFAULT_PATH) + + if(Inotify_INCLUDE_DIRS) + # On Linux there is no library to link against, on the BSDs there is. +@@ -58,7 +58,7 @@ if(Inotify_INCLUDE_DIRS) + set(Inotify_LIBRARIES "") + set(Inotify_INCLUDE_DIRS "") + else() +-find_library(Inotify_LIBRARIES NAMES inotify) ++find_library(Inotify_LIBRARIES NAMES inotify PATHS ${LOCALBASE}/lib/inotify NO_DEFAULT_PATH) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Inotify + FOUND_VAR