UPDATE: sysutils/kubectl

2021-12-14 Thread Rafael Sadowski
OK?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/kubectl/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile10 Dec 2021 06:45:14 -  1.12
+++ Makefile15 Dec 2021 06:21:55 -
@@ -4,7 +4,7 @@ COMMENT =   command line tool for control
 
 GH_ACCOUNT =   kubernetes
 GH_PROJECT =   kubernetes
-V =1.22.4
+V =1.23.0
 GH_TAGNAME =   v${V}
 PKGNAME =  kubectl-${V}
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/kubectl/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo10 Dec 2021 06:45:14 -  1.11
+++ distinfo15 Dec 2021 06:21:55 -
@@ -1,2 +1,2 @@
-SHA256 (kubernetes-1.22.4.tar.gz) = 
ev03vIbg0rQrKQKqMd2hNSJESGxr7BP4AYpO6B71Juo=
-SIZE (kubernetes-1.22.4.tar.gz) = 36022946
+SHA256 (kubernetes-1.23.0.tar.gz) = 
W0ony/BnWl1eUiilh5W8dqDsE99xrVtCPKokC+8sV00=
+SIZE (kubernetes-1.23.0.tar.gz) = 39918408



Re: mpv sndio backend

2021-12-14 Thread Alexandre Ratchov
On Tue, Dec 14, 2021 at 10:45:26PM +, Klemens Nanni wrote:
> On Sat, Dec 11, 2021 at 10:29:25AM +, Klemens Nanni wrote:
> > On Tue, Dec 07, 2021 at 07:07:08PM -0500, Brad Smith wrote:
> > > Here is another attempt at a sndio backend for mpv.
> > > 
> > > Looking for some testers.
> > 
> > OK kn if anyone wants to commit.
> 
> Anyone wants to OK this so I can commit?
> 

I've reviewed this backend and used it for weeks

ok ratchov@



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/12/14 22:39:26

Modified files:
x11/kde-applications: Makefile 

Log message:
Hook KDE kipi-plugins, kirigami-gallery, kontrast, kopeninghours

OK abieber@



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/12/14 22:38:41

Modified files:
x11/kde-applications/kopeninghours: Makefile 
x11/kde-applications/kopeninghours/pkg: PLIST 

Log message:
Fix uncompiled py file

Spotted by abieber@



Re: lang/racket-minimal: update to v8.3

2021-12-14 Thread James Cook
On Tue, Dec 14, 2021 at 09:44:03PM +0100, Juan Francisco Cantero Hurtado wrote:
> On Tue, 14 Dec 2021 14:18:39 +
> James Cook  wrote:
> 
> > On Tue, Dec 14, 2021 at 10:11:12AM +0100, Denis Fondras wrote:
> > > Le Tue, Dec 14, 2021 at 05:27:26AM +, James Cook a écrit :  
> > > > On Sun, Nov 28, 2021 at 10:46:28AM +0100, Denis Fondras wrote:  
> > > > > Straightforward update to v8.3  
> > > > 
> > > > It looks like the update to 8.3 broke the "raco exe" command.
> > > >   
> > > 
> > > I am surprised it ever worked. Minimal installation does not seem
> > > to provide it.  
> > 
> > Oops, sorry for the noise. After "raco pkg install compiler" I have
> > the raco exe command. And conversely, with 8.2, if I delete
> > ~/.local/share/racket, the "raco exe" command also stops working, so
> > this is nothing new.
> > 
> 
> You have something wrong in your config (or you changed the defaults).
> Our racket-minimal doesn't install files in ~/.local/share/racket.

I just did a little experiment. On a brand new vm running current,
"raco pkg install base" causes ~/.local/share/racket to be created. Is
that unexpected?

My steps:

1. Installed the latest snapshot on a new virtual machine.
2. As root, pkg_add racket-minimal. (At the prompt, I chose
   "racket-minimal-8.3" rather than the no-jit flavour.)
3. As non-root, "raco pkg install base".

Result: in the non-root user's home dir, there's now
~/.local/share/racket/8.3

Based on that experiment, it does not seem strange to me that my
existing system had ~/.local/share/racket. And it has not caused me any
trouble. Am I doing something wrong?

-- 
James



Re: lang/sbcl update

2021-12-14 Thread George Koehler
On Wed, 8 Dec 2021 23:50:33 +0100
Solene Rapenne  wrote:

> new update, we are really lagging behind :/
> 
> same problems with test, one failing in normal flavor
> and two fails with threads flavor.

solene, your update to sbcl-2.1.11 is ok gkoehler@

I packaged both flavors of 2.1.11 on powerpc.  I ran "make test" on
the threads flavor and got a longer list of failures on powerpc; my
list is below. (I don't have an old "make test" to compare.)  One of
the tests got stuck; I killed it with SIGTERM.

--George

Status:
 Expected failure:   array.pure.lisp / CHECK-BOUND-SIGNED-BOUND-NOTES
 Expected failure:   compiler-2.pure.lisp / DEDUPLICATED-FDEFNS
 Expected failure:   compiler.pure.lisp / (ODDP BIGNUM NO-CONSING)
 Expected failure:   compiler.pure.lisp / (LOGTEST BIGNUM NO-CONSING)
 Failure:compiler.pure.lisp / REDUCING-CONSTANTS
 Failure:compiler.pure.lisp / REDUCING-CONSTANTS.2
 Expected failure:   float.pure.lisp / (ADDITION-OVERFLOW BUG-372)
 Expected failure:   float.pure.lisp / (ADDITION-OVERFLOW BUG-372 TAKE-2)
 Expected failure:   hash.pure.lisp / SXHASH-ON-DISPLACED-STRING
 Skipped (broken):   interface.pure.lisp / 
RESTART-BOGUS-ARG-TO-VALUES-LIST-ERROR
 Failure:interface.pure.lisp / NO-V0P-EX1STSP-IN-BUILD
 Expected failure:   random.pure.lisp / FLOAT-NO-CONSING
 Expected failure:   selfbuild-output.pure.lisp / 
MAKE-LIST-%MAKE-LIST-NOT-CALLED
 Failure:unicode-misc.pure.lisp / (CL-CASE-INVERTIBILITY)
 Expected failure:   block-compile.impure.lisp / 
BLOCK-DEFCONSTANT-HAIRY-EQNESS-TEST
 Expected failure:   compiler.impure.lisp / BUG-308921
 Expected failure:   compiler.impure.lisp / FTYPE-RETURN-TYPE-CONFLICT
 Unexpected success: debug.impure.lisp / (TRACE ENCAPSULATE NIL)
 Unexpected success: debug.impure.lisp / (TRACE ENCAPSULATE NIL RECURSIVE)
 Expected failure:   debug.impure.lisp / PROPERLY-TAGGED-P-INTERNAL
 Expected failure:   dynamic-extent.impure.lisp / DX-COMPILER-NOTES
 Expected failure:   fopcompiler.impure.lisp / 
FOPCOMPILER-DEPRECATED-VAR-WARNING
 Expected failure:   full-eval.impure.lisp / INLINE-FUN-CAPTURES-DECL
 Invalid exit status: gc.impure.lisp
 Skipped (broken):   gethash-concurrency.impure.lisp / (HASH-TABLE 
UNSYNCHRONIZED)
 Failure:hash-table.impure.lisp / HASH-TABLE-ITERATOR-NO-NOTES
 Failure:kill-non-lisp-thread.impure.lisp / KILL-NON-LISP-THREAD
 Failure:make-thread.impure.lisp / EXPECTED-GC-ROOTS
 Expected failure:   packages.impure.lisp / USE-PACKAGE-CONFLICT-SET
 Expected failure:   packages.impure.lisp / IMPORT-SINGLE-CONFLICT
 Skipped (broken):   threads.impure.lisp / BACKTRACE
 Skipped (broken):   timer.impure.lisp / (TIMER PARALLEL-UNSCHEDULE)
 Expected failure:   walk.impure.lisp / (WALK MULTIPLE-VALUE-BIND)
 Expected failure:   walk.impure.lisp / (WALK MULTIPLE-VALUE-BIND SPECIAL)
 (64 tests skipped for this combination of platform and features)
test failed, expected 104 return code, got 1

> Index: Makefile
> ===
> RCS file: /home/reposync/ports/lang/sbcl/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile  28 May 2021 16:23:31 -  1.46
> +++ Makefile  8 Dec 2021 22:22:02 -
> @@ -25,7 +25,7 @@ USE_WXNEEDED =  Yes
>  
>  COMMENT= compiler and runtime system for ANSI Common Lisp
>  
> -V =  2.1.4
> +V =  2.1.11
>  DISTNAME=sbcl-${V}-source
>  PKGNAME= sbcl-${V}
>  WRKDIST= ${WRKDIR}/sbcl-${V}
> Index: distinfo
> ===
> RCS file: /home/reposync/ports/lang/sbcl/distinfo,v
> retrieving revision 1.20
> diff -u -p -r1.20 distinfo
> --- distinfo  28 May 2021 16:23:31 -  1.20
> +++ distinfo  8 Dec 2021 22:23:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (sbcl-2.1.4-source.tar.bz2) = 
> mSYOI0b80irlVG4VuvUImdyzt1psdMx8yEk3iJnvvRE=
> -SIZE (sbcl-2.1.4-source.tar.bz2) = 6550812
> +SHA256 (sbcl-2.1.11-source.tar.bz2) = 
> v8FIHef9vfru8qsPDo6E79NDQz3qjSHPvqiwFGy9/v0=
> +SIZE (sbcl-2.1.11-source.tar.bz2) = 6687529
> Index: pkg/PLIST
> ===
> RCS file: /home/reposync/ports/lang/sbcl/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- pkg/PLIST 13 May 2019 12:58:58 -  1.12
> +++ pkg/PLIST 8 Dec 2021 22:22:16 -
> @@ -21,6 +21,8 @@ lib/sbcl/contrib/sb-executable.asd
>  lib/sbcl/contrib/sb-executable.fasl
>  lib/sbcl/contrib/sb-gmp.asd
>  lib/sbcl/contrib/sb-gmp.fasl
> +lib/sbcl/contrib/sb-graph.asd
> +lib/sbcl/contrib/sb-graph.fasl
>  lib/sbcl/contrib/sb-grovel.asd
>  lib/sbcl/contrib/sb-grovel.fasl
>  lib/sbcl/contrib/sb-introspect.asd
> 


-- 
George Koehler 



Re: security/ghidra - replace log4j

2021-12-14 Thread Lawrence Teo
On Tue, Dec 14, 2021 at 10:45:52AM +, Stuart Henderson wrote:
> On 2021/12/14 00:12, Lawrence Teo wrote:
> > The latest Ghidra release 10.1 has a fix for the log4j vulnerability;
> > however, updating the port to that version is very complex and
> > unfortunately I do not have enough time to work on it at the moment.
> > 
> > As a workaround, this diff updates the log4j jar files in
> > security/ghidra to 2.15.0.  I was about to fetch the log4j jar files
> > from https://logging.apache.org/log4j/2.x/download.html when I noticed
> > sthen's net/unifi update which fetches them from spacehopper.org
> > instead.  This diff uses the latter approach.
> > 
> > ok?
> 
> Ah I switched unifi over to using the proper distfiles from apache.org
> before I read your mail, the ones I mirrored came from a newer version of
> unifi. You can use them if you like but I can't vouch for exactly what's
> in them other than "ubiquiti thought they were OK" - hashes differ
> into the upstream release (I didn't look further to what was changed
> inbetween them).

Thank you for your feedback.  I decided to use the ones from apache.org
as well (2.16.0).  I have committed the fix.


> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/security/ghidra/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- Makefile19 Jul 2020 01:29:23 -  1.8
> > +++ Makefile14 Dec 2021 04:43:32 -
> > @@ -7,6 +7,7 @@ COMMENT =   software reverse engineering (
> >  
> >  VERSION =  9.1.2
> >  GHIDRA_DATE =  20200212
> > +REVISION = 0
> >  
> >  GH_ACCOUNT =   NationalSecurityAgency
> >  GH_PROJECT =   ghidra
> > @@ -27,6 +28,7 @@ WANTLIB +=c m ${COMPILER_LIBCXX}
> >  MASTER_SITES0 =${HOMEPAGE}
> >  MASTER_SITES1 =
> > https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
> >  MASTER_SITES2 =https://repo.maven.apache.org/maven2/
> > +MASTER_SITES3 =https://spacehopper.org/mirrors/
> >  
> >  EXTRACT_SUFX = .zip
> >  
> > @@ -37,6 +39,7 @@ JMOCKIT_VER = 1.44
> >  JSON_SIMPLE_VER =  1.1.1
> >  JUNIT_VER =4.12
> >  YAJSW_VER =12.12
> > +LOG4J_VER =2.15.0
> >  
> >  # Note that ST4-${ST4_VER}.jar is only needed during build for antlr; it 
> > is not
> >  # needed at runtime and therefore does not need to be packed.
> > @@ -51,6 +54,8 @@ DISTFILES =   ${DISTNAME}.tar.gz
> >  DISTFILES +=   
> > ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0
> >  DISTFILES +=   yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1
> >  DISTFILES +=   ${JAR_DISTFILES:C/$/:2/}
> > +DISTFILES +=   log4j-api-${LOG4J_VER}.jar:3
> > +DISTFILES +=   log4j-core-${LOG4J_VER}.jar:3
> >  
> >  EXTRACT_ONLY = ${DISTNAME}.tar.gz
> >  
> > @@ -138,5 +143,10 @@ do-install:
> > ln -s ${TRUEPREFIX}/share/java/ghidra/ghidraRun ${PREFIX}/bin/ghidraRun
> > ${INSTALL_SCRIPT} 
> > ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh \
> > ${PREFIX}/share/java/ghidra/support/launch.sh
> > +   rm -f 
> > ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/log4j-{api,core}-*.jar
> > +   ${INSTALL_DATA} ${FULLDISTDIR}/log4j-api-${LOG4J_VER}.jar \
> > +   ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/
> > +   ${INSTALL_DATA} ${FULLDISTDIR}/log4j-core-${LOG4J_VER}.jar \
> > +   ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/
> >  
> >  .include 
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/security/ghidra/distinfo,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 distinfo
> > --- distinfo19 Jul 2020 01:29:23 -  1.4
> > +++ distinfo14 Dec 2021 04:43:32 -
> > @@ -6,6 +6,8 @@ SHA256 (javacc-5.0.jar) = cRExYbyM9mQVFV
> >  SHA256 (jmockit-1.44.jar) = GXSZN1EzMkhCbdusNwpgSUTt9mXBPUakxelz5N2PqUo=
> >  SHA256 (json-simple-1.1.1.jar) = 
> > TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=
> >  SHA256 (junit-4.12.jar) = WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=
> > +SHA256 (log4j-api-2.15.0.jar) = 
> > yMM+fo4FSW2uac8MqsjDCSz/2TehZFJukpItLVZtClU=
> > +SHA256 (log4j-core-2.15.0.jar) = 
> > QZqFEolZcbe09PM+Yg02ElTlyVUrkEsEdLCd3UpqIgs=
> >  SHA256 (yajsw-stable-12.12.zip) = 
> > E5j8sek6uxmZLE+gbX/ldYqrtMRXgdfvMGxvV8p6cyE=
> >  SIZE (ST4-4.1.jar) = 253043
> >  SIZE (ghidra-9.1.2.tar.gz) = 59623429
> > @@ -15,4 +17,6 @@ SIZE (javacc-5.0.jar) = 298569
> >  SIZE (jmockit-1.44.jar) = 757982
> >  SIZE (json-simple-1.1.1.jar) = 23931
> >  SIZE (junit-4.12.jar) = 314932
> > +SIZE (log4j-api-2.15.0.jar) = 301804
> > +SIZE (log4j-core-2.15.0.jar) = 1789769
> >  SIZE (yajsw-stable-12.12.zip) = 25051676
> > Index: pkg/PLIST
> > ===
> > RCS 

CVS: cvs.openbsd.org: ports

2021-12-14 Thread Lawrence Teo
CVSROOT:/cvs
Module name:ports
Changes by: l...@cvs.openbsd.org2021/12/14 20:22:19

Modified files:
security/ghidra: Makefile distinfo 
security/ghidra/pkg: PLIST 

Log message:
Replace Ghidra's log4j jar files with the latest release 2.16.0 from ASF.

Feedback on earlier diff from sthen@ and Bastian Wessling



Re: question about BUILD, RUN and TEST DEPENDS

2021-12-14 Thread Andrew Hewus Fresh
On Tue, Dec 14, 2021 at 11:30:31AM -0800, Chris Bennett wrote:
> On Tue, Dec 14, 2021 at 10:17:43AM -0800, Andrew Hewus Fresh wrote:
> > I really don't follow quite what "something like this" is, so I'm
> > probably going to answer the wrong question.
> > 
> > My guess as to the question is, how do you decide what to put into the
> > different *_DEPENDS?
> 
> Close enough and a good set of answers.
> One question was how to properly deal with BUILD_DEPENDS having two of
> the same depends that RUN_DEPENDS has.
> Assuming that build and run must have those two, but that the extra
> RUN_DEPENDS are only for running and not for building.
> (Which I'm able to ask more properly after this reply from you, thanks)
> 
> Leave as-is?

RUN_DEPENDS don't get installed during BUILD and BUILD_DEPENDS don't get
installed during RUN, so if it's needed in both places it needs to be in
both places.

I usually comment-out the "extra" BUILD_DEPENDS, remove them and see if
it still builds and test pass.  For perl ports this is usually fine and
failures are obvious, and as I said, the "extra" BUILD_DEPENDS are
usually because previously perl didn't have the concept of TEST_DEPENDS.
portgen has some magic to move things that match "Test" to the
TEST_DEPENDS because it is so common. For things that aren't perl, it
depends.


> > 
> > For perl ports, I generally start with what the author added to their
> > META files, which is reflected in what portgen(1) does.  It used to be
> > perl didn't separate BUILD from TEST depends, so lots of modules still
> > don't do that, so sometimes it makes sense to move them around.
> 
> Helpful. I have a sneaking suspicion that understanding the perl
> building process may require knowing what was done in the past, in order to
> understand what and why the present is the way it is now.
> (I.E. my father had to learn the past government regulations in order to
> make any sense of what the new regulations were for a job he had.
> Despite the fact that the old regulations were gone, but influential to
> the new.)

There are a few, primarily due to trying to replace MakeMaker, but most of
that knowledge is not needed often.



> > > 2. More important, why is that the right way?
> > >I would like to know where to look in which code for ports process to
> > >get a better understanding of how this plays out.
> > 
> > This is not "official", but it is my best practices for what to put in
> > each of these.
> > 
> > BUILD_DEPENDS are the minimum list of dependencies needed to
> > successfully and repeatable build a package.  The fewer you can have,
> > the faster bulk builds go.
> 
> So if there are no build depends other then the port itself, this would
> be left out?
> But if there are run depends in order to use it only, would
> BUILD_DEPENDS=${RUN_DEPENDS} get used or not?

If it will build without, leave it out.
(If it builds differently, that's a different matter)
Usually BUILD_DEPENDS=${RUN_DEPENDS} is unnecessary, but some things
check for dependencies before they will do the build.


> > 
> > TEST_DEPENDS are the maximum list of dependencies to get the best test
> > coverage.  Sometimes it isn't worth porting a whole set of extra
> > dependencies just for a single optional test, so there is a balance.
> 
> I had a port committed that needed one single line from 
> print/texlive/texmf,-full for testing.
> 
> I see you are the maintainer now for it. p5-LaTeX-Driver
> That is a requirement for the few perl ports that didn't get in for
> LedgerSMB a long time ago.

Good tests are hard to write and sometimes mean you need a big
dependency.  Usually it's only the person doing updates that runs the
tests at the moment so large dependencies there aren't a significant
problem, although if I had unlimited free time I'd have a ports-tree
smoker.



> 
> > 
> > RUN_DEPENDS are the dependencies that give the person installing the
> > best experience.  If there is some large dependency that is for a seldom
> > used feature that has useful error messages that make it clear you need
> > to install additional dependencies if you try to use it, then you
> > probably can leave it out.  Otherwise, if it makes the port more usable,
> > probably add it.
> 
> I had a port submitted (can't remember if it was committed),which had no
> run dependencies, but I was advised to add a message to note which
> packages ought to be added in order to make any use of it.
> 
> So this would be the motivation for something like neomutt and
> neomutt-notmuch. Most people would just use neomutt, but enough people
> also want notmuch included, that adding a flavor was worth it.

Correct, sometimes a flavor is worth it, just for dependencies.


-- 
andrew

($do || !$do) && undef($try) ;  # Master of Perl, Yoda is.  H?



Re: update the minios

2021-12-14 Thread Daniel Jakots
On Sun, 12 Dec 2021 15:06:49 -0500, Daniel Jakots  wrote:

> Here's a diff to update the minio ports to their latest releases.
> While here, I take maintainership so I'll commit future updates
> directly. It's been hard to get someone to review my diffs so I think
> it's better for everyone involved.

That's been committed.



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Daniel Jakots
CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2021/12/14 17:36:51

Modified files:
net/minio/client: Makefile distinfo modules.inc 

Log message:
Update to minioc-0.20211209

ok denis



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Daniel Jakots
CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2021/12/14 17:36:10

Modified files:
net/minio/server: Makefile distinfo modules.inc 

Log message:
Update to minio-0.20211210

ok denis



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Daniel Jakots
CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2021/12/14 17:35:30

Modified files:
net/minio  : Makefile.inc 

Log message:
Take maintainer

ok denis



Re: multimedia/libv4l: ship headers in -compat package

2021-12-14 Thread Antoine Jacoutot
These error cases you are mentioning will happen in bulk as soon as something 
depend on the compact subpackage 

—
Antoine

> On 15 Dec 2021, at 00:55, Klemens Nanni  wrote:
> 
> On Wed, Dec 15, 2021 at 12:49:39AM +0100, Antoine Jacoutot wrote:
>> Do we need to sub package? Can’t we include everything in main?
> 
> I have no idea if ports suddenly pick up the new headers and/or whether
> there are any other side effects.
> 
> Subpackages seemed cleaner and explicit;  they avoid these error cases
> and it'll be clear which port are actually using the linux compat layer.
> 
>> Anyway the change from libv4l to libv4l,-main is not needed as it’s the 
>> default. 
> 
> I changed it to be explicit as is done with other ,-main packages as
> well, but yes, you could just leave it.
> 
> 
 On 14 Dec 2021, at 13:50, Klemens Nanni  wrote:
>>> 
>>> Video4Linux headers are required for an ongoing porting effort;
>>> FreeBSD has a dedicated port for this that reaches back to their libv4l
>>> port it seems, which looks practically identical to our MULTI_PACKAGES.
>>> 
>>> I just package the headers that are needed in their own subpackage.
>>> The actual libv4l package remains unchanged except that its FULLPKGPATH
>>> now has "-main", hence bumping all consumers.
>>> 
>>> Feedback? OK?
>>> 
>>> Index: x11/vlc/Makefile
>>> ===
>>> RCS file: /cvs/ports/x11/vlc/Makefile,v
>>> retrieving revision 1.252
>>> diff -u -p -r1.252 Makefile
>>> --- x11/vlc/Makefile3 Sep 2021 11:47:42 -1.252
>>> +++ x11/vlc/Makefile14 Dec 2021 12:20:13 -
>>> @@ -7,7 +7,7 @@ V=3.0.14
>>> DISTNAME=vlc-${V}
>>> PKGNAME-main=${DISTNAME}
>>> PKGNAME-jack=vlc-jack-${V}
>>> -REVISION-main=1
>>> +REVISION-main=2
>>> REVISION-jack=0
>>> CATEGORIES=x11
>>> MASTER_SITES=https://download.videolan.org/pub/videolan/vlc/${V}/
>>> @@ -90,7 +90,7 @@ LIB_DEPENDS-main= ${MODQT5_LIB_DEPENDS} 
>>>   multimedia/libbluray \
>>>   multimedia/libdvdnav \
>>>   multimedia/libmatroska \
>>> -multimedia/libv4l \
>>> +multimedia/libv4l,-main \
>>>   multimedia/x264 \
>>>   multimedia/x265 \
>>>   net/avahi,-libs \
>>> Index: telephony/linphone/mediastreamer2/Makefile
>>> ===
>>> RCS file: /cvs/ports/telephony/linphone/mediastreamer2/Makefile,v
>>> retrieving revision 1.6
>>> diff -u -p -r1.6 Makefile
>>> --- telephony/linphone/mediastreamer2/Makefile26 Jul 2021 07:08:32 
>>> -1.6
>>> +++ telephony/linphone/mediastreamer2/Makefile14 Dec 2021 12:20:13 -
>>> @@ -3,7 +3,7 @@
>>> COMMENT =streaming engine for voice/video telephony applications
>>> 
>>> MODULE =mediastreamer2
>>> -REVISION =1
>>> +REVISION =2
>>> 
>>> SHARED_LIBS += mediastreamer 0.0 # 11
>>> 
>>> @@ -26,7 +26,7 @@ LIB_DEPENDS =telephony/linphone/bctoolb
>>>   telephony/linphone/ortp \
>>>   telephony/linphone/bzrtp \
>>>   telephony/bcg729 \
>>> -multimedia/libv4l \
>>> +multimedia/libv4l,-main \
>>>   multimedia/libvpx \
>>>   multimedia/libtheora \
>>>   security/libsrtp>=2.3.0p2 \
>>> Index: telephony/baresip/baresip/Makefile
>>> ===
>>> RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v
>>> retrieving revision 1.29
>>> diff -u -p -r1.29 Makefile
>>> --- telephony/baresip/baresip/Makefile20 Jun 2021 12:13:52 -1.29
>>> +++ telephony/baresip/baresip/Makefile14 Dec 2021 12:20:13 -
>>> @@ -6,6 +6,7 @@ COMMENT-gtk =GTK+-based modules for ba
>>> GH_ACCOUNT =baresip
>>> GH_PROJECT =baresip
>>> GH_TAGNAME =v1.1.0
>>> +REVISION-main =0
>>> REVISION-gtk =0
>>> PKGNAME-main =baresip-${GH_TAGNAME:C/^v//}
>>> PKGNAME-gtk =baresip-gtk-${GH_TAGNAME:C/^v//}
>>> @@ -28,7 +29,7 @@ LIB_DEPENDS-main =audio/gsm \
>>>   audio/twolame \
>>>   graphics/ffmpeg \
>>>   graphics/png \
>>> -multimedia/libv4l \
>>> +multimedia/libv4l,-main \
>>>   multimedia/libvpx>=1.3.0 \
>>>   net/mosquitto \
>>>   telephony/baresip/re>=2.0.1 \
>>> Index: net/utox/Makefile
>>> ===
>>> RCS file: /cvs/ports/net/utox/Makefile,v
>>> retrieving revision 1.11
>>> diff -u -p -r1.11 Makefile
>>> --- net/utox/Makefile14 Oct 2021 16:52:03 -1.11
>>> +++ net/utox/Makefile14 Dec 2021 12:20:13 -
>>> @@ -8,6 +8,7 @@ DISTNAME =uTox-${V}-full
>>> PKGNAME =utox-${V}
>>> MASTER_SITES =https://github.com/uTox/uTox/releases/download/v${V}/
>>> FIX_EXTRACT_PERMISSIONS = Yes
>>> +REVISION =0
>>> 
>>> CATEGORIES =net
>>> 
>>> @@ -25,7 +26,7 @@ RUN_DEPENDS =devel/desktop-file-utils \
>>>   x11/gtk+3,-guic
>>> 
>>> LIB_DEPENDS +=audio/openal \
>>> -

Re: multimedia/libv4l: ship headers in -compat package

2021-12-14 Thread Klemens Nanni
On Wed, Dec 15, 2021 at 12:49:39AM +0100, Antoine Jacoutot wrote:
> Do we need to sub package? Can’t we include everything in main?

I have no idea if ports suddenly pick up the new headers and/or whether
there are any other side effects.

Subpackages seemed cleaner and explicit;  they avoid these error cases
and it'll be clear which port are actually using the linux compat layer.

> Anyway the change from libv4l to libv4l,-main is not needed as it’s the 
> default. 

I changed it to be explicit as is done with other ,-main packages as
well, but yes, you could just leave it.


> > On 14 Dec 2021, at 13:50, Klemens Nanni  wrote:
> > 
> > Video4Linux headers are required for an ongoing porting effort;
> > FreeBSD has a dedicated port for this that reaches back to their libv4l
> > port it seems, which looks practically identical to our MULTI_PACKAGES.
> > 
> > I just package the headers that are needed in their own subpackage.
> > The actual libv4l package remains unchanged except that its FULLPKGPATH
> > now has "-main", hence bumping all consumers.
> > 
> > Feedback? OK?
> > 
> > Index: x11/vlc/Makefile
> > ===
> > RCS file: /cvs/ports/x11/vlc/Makefile,v
> > retrieving revision 1.252
> > diff -u -p -r1.252 Makefile
> > --- x11/vlc/Makefile3 Sep 2021 11:47:42 -1.252
> > +++ x11/vlc/Makefile14 Dec 2021 12:20:13 -
> > @@ -7,7 +7,7 @@ V=3.0.14
> > DISTNAME=vlc-${V}
> > PKGNAME-main=${DISTNAME}
> > PKGNAME-jack=vlc-jack-${V}
> > -REVISION-main=1
> > +REVISION-main=2
> > REVISION-jack=0
> > CATEGORIES=x11
> > MASTER_SITES=https://download.videolan.org/pub/videolan/vlc/${V}/
> > @@ -90,7 +90,7 @@ LIB_DEPENDS-main= ${MODQT5_LIB_DEPENDS} 
> >multimedia/libbluray \
> >multimedia/libdvdnav \
> >multimedia/libmatroska \
> > -multimedia/libv4l \
> > +multimedia/libv4l,-main \
> >multimedia/x264 \
> >multimedia/x265 \
> >net/avahi,-libs \
> > Index: telephony/linphone/mediastreamer2/Makefile
> > ===
> > RCS file: /cvs/ports/telephony/linphone/mediastreamer2/Makefile,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 Makefile
> > --- telephony/linphone/mediastreamer2/Makefile26 Jul 2021 07:08:32 
> > -1.6
> > +++ telephony/linphone/mediastreamer2/Makefile14 Dec 2021 12:20:13 -
> > @@ -3,7 +3,7 @@
> > COMMENT =streaming engine for voice/video telephony applications
> > 
> > MODULE =mediastreamer2
> > -REVISION =1
> > +REVISION =2
> > 
> > SHARED_LIBS += mediastreamer 0.0 # 11
> > 
> > @@ -26,7 +26,7 @@ LIB_DEPENDS =telephony/linphone/bctoolb
> >telephony/linphone/ortp \
> >telephony/linphone/bzrtp \
> >telephony/bcg729 \
> > -multimedia/libv4l \
> > +multimedia/libv4l,-main \
> >multimedia/libvpx \
> >multimedia/libtheora \
> >security/libsrtp>=2.3.0p2 \
> > Index: telephony/baresip/baresip/Makefile
> > ===
> > RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v
> > retrieving revision 1.29
> > diff -u -p -r1.29 Makefile
> > --- telephony/baresip/baresip/Makefile20 Jun 2021 12:13:52 -1.29
> > +++ telephony/baresip/baresip/Makefile14 Dec 2021 12:20:13 -
> > @@ -6,6 +6,7 @@ COMMENT-gtk =GTK+-based modules for ba
> > GH_ACCOUNT =baresip
> > GH_PROJECT =baresip
> > GH_TAGNAME =v1.1.0
> > +REVISION-main =0
> > REVISION-gtk =0
> > PKGNAME-main =baresip-${GH_TAGNAME:C/^v//}
> > PKGNAME-gtk =baresip-gtk-${GH_TAGNAME:C/^v//}
> > @@ -28,7 +29,7 @@ LIB_DEPENDS-main =audio/gsm \
> >audio/twolame \
> >graphics/ffmpeg \
> >graphics/png \
> > -multimedia/libv4l \
> > +multimedia/libv4l,-main \
> >multimedia/libvpx>=1.3.0 \
> >net/mosquitto \
> >telephony/baresip/re>=2.0.1 \
> > Index: net/utox/Makefile
> > ===
> > RCS file: /cvs/ports/net/utox/Makefile,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 Makefile
> > --- net/utox/Makefile14 Oct 2021 16:52:03 -1.11
> > +++ net/utox/Makefile14 Dec 2021 12:20:13 -
> > @@ -8,6 +8,7 @@ DISTNAME =uTox-${V}-full
> > PKGNAME =utox-${V}
> > MASTER_SITES =https://github.com/uTox/uTox/releases/download/v${V}/
> > FIX_EXTRACT_PERMISSIONS = Yes
> > +REVISION =0
> > 
> > CATEGORIES =net
> > 
> > @@ -25,7 +26,7 @@ RUN_DEPENDS =devel/desktop-file-utils \
> >x11/gtk+3,-guic
> > 
> > LIB_DEPENDS +=audio/openal \
> > -multimedia/libv4l \
> > +multimedia/libv4l,-main \
> >x11/dbus \
> >net/toxcore
> > 
> > Index: multimedia/xine-lib/Makefile
> > 

Re: multimedia/libv4l: ship headers in -compat package

2021-12-14 Thread Antoine Jacoutot
Do we need to sub package? Can’t we include everything in main?
Anyway the change from libv4l to libv4l,-main is not needed as it’s the 
default. 


—
Antoine

> On 14 Dec 2021, at 13:50, Klemens Nanni  wrote:
> 
> Video4Linux headers are required for an ongoing porting effort;
> FreeBSD has a dedicated port for this that reaches back to their libv4l
> port it seems, which looks practically identical to our MULTI_PACKAGES.
> 
> I just package the headers that are needed in their own subpackage.
> The actual libv4l package remains unchanged except that its FULLPKGPATH
> now has "-main", hence bumping all consumers.
> 
> Feedback? OK?
> 
> Index: x11/vlc/Makefile
> ===
> RCS file: /cvs/ports/x11/vlc/Makefile,v
> retrieving revision 1.252
> diff -u -p -r1.252 Makefile
> --- x11/vlc/Makefile3 Sep 2021 11:47:42 -1.252
> +++ x11/vlc/Makefile14 Dec 2021 12:20:13 -
> @@ -7,7 +7,7 @@ V=3.0.14
> DISTNAME=vlc-${V}
> PKGNAME-main=${DISTNAME}
> PKGNAME-jack=vlc-jack-${V}
> -REVISION-main=1
> +REVISION-main=2
> REVISION-jack=0
> CATEGORIES=x11
> MASTER_SITES=https://download.videolan.org/pub/videolan/vlc/${V}/
> @@ -90,7 +90,7 @@ LIB_DEPENDS-main= ${MODQT5_LIB_DEPENDS} 
>multimedia/libbluray \
>multimedia/libdvdnav \
>multimedia/libmatroska \
> -multimedia/libv4l \
> +multimedia/libv4l,-main \
>multimedia/x264 \
>multimedia/x265 \
>net/avahi,-libs \
> Index: telephony/linphone/mediastreamer2/Makefile
> ===
> RCS file: /cvs/ports/telephony/linphone/mediastreamer2/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- telephony/linphone/mediastreamer2/Makefile26 Jul 2021 07:08:32 -  
>   1.6
> +++ telephony/linphone/mediastreamer2/Makefile14 Dec 2021 12:20:13 -
> @@ -3,7 +3,7 @@
> COMMENT =streaming engine for voice/video telephony applications
> 
> MODULE =mediastreamer2
> -REVISION =1
> +REVISION =2
> 
> SHARED_LIBS += mediastreamer 0.0 # 11
> 
> @@ -26,7 +26,7 @@ LIB_DEPENDS =telephony/linphone/bctoolb
>telephony/linphone/ortp \
>telephony/linphone/bzrtp \
>telephony/bcg729 \
> -multimedia/libv4l \
> +multimedia/libv4l,-main \
>multimedia/libvpx \
>multimedia/libtheora \
>security/libsrtp>=2.3.0p2 \
> Index: telephony/baresip/baresip/Makefile
> ===
> RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- telephony/baresip/baresip/Makefile20 Jun 2021 12:13:52 -1.29
> +++ telephony/baresip/baresip/Makefile14 Dec 2021 12:20:13 -
> @@ -6,6 +6,7 @@ COMMENT-gtk =GTK+-based modules for ba
> GH_ACCOUNT =baresip
> GH_PROJECT =baresip
> GH_TAGNAME =v1.1.0
> +REVISION-main =0
> REVISION-gtk =0
> PKGNAME-main =baresip-${GH_TAGNAME:C/^v//}
> PKGNAME-gtk =baresip-gtk-${GH_TAGNAME:C/^v//}
> @@ -28,7 +29,7 @@ LIB_DEPENDS-main =audio/gsm \
>audio/twolame \
>graphics/ffmpeg \
>graphics/png \
> -multimedia/libv4l \
> +multimedia/libv4l,-main \
>multimedia/libvpx>=1.3.0 \
>net/mosquitto \
>telephony/baresip/re>=2.0.1 \
> Index: net/utox/Makefile
> ===
> RCS file: /cvs/ports/net/utox/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- net/utox/Makefile14 Oct 2021 16:52:03 -1.11
> +++ net/utox/Makefile14 Dec 2021 12:20:13 -
> @@ -8,6 +8,7 @@ DISTNAME =uTox-${V}-full
> PKGNAME =utox-${V}
> MASTER_SITES =https://github.com/uTox/uTox/releases/download/v${V}/
> FIX_EXTRACT_PERMISSIONS = Yes
> +REVISION =0
> 
> CATEGORIES =net
> 
> @@ -25,7 +26,7 @@ RUN_DEPENDS =devel/desktop-file-utils \
>x11/gtk+3,-guic
> 
> LIB_DEPENDS +=audio/openal \
> -multimedia/libv4l \
> +multimedia/libv4l,-main \
>x11/dbus \
>net/toxcore
> 
> Index: multimedia/xine-lib/Makefile
> ===
> RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
> retrieving revision 1.148
> diff -u -p -r1.148 Makefile
> --- multimedia/xine-lib/Makefile8 Jul 2021 10:43:26 -1.148
> +++ multimedia/xine-lib/Makefile14 Dec 2021 12:20:13 -
> @@ -3,7 +3,7 @@
> COMMENT=multimedia decoding library
> 
> DISTNAME=xine-lib-1.2.11
> -REVISION=0
> +REVISION=1
> CATEGORIES=multimedia
> MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=xine/}
> EXTRACT_SUFX=.tar.xz
> @@ -55,7 +55,7 @@ LIB_DEPENDS=audio/flac \
>multimedia/libbluray>=0.8.0 \
>multimedia/libdvdnav \
>  

CVS: cvs.openbsd.org: ports

2021-12-14 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/12/14 16:20:56

Modified files:
multimedia/mpv : Makefile 
multimedia/mpv/patches: patch-audio_out_ao_c 
patch-audio_out_ao_sndio_c patch-wscript 
patch-wscript_build_py 

Log message:
Reinstate the sndio backend

>From Brad, tested by many.
OK bcallah op



Re: mpv sndio backend

2021-12-14 Thread Omar Polo
On 14 December 2021 23:45:26 CET, Klemens Nanni  wrote:
>On Sat, Dec 11, 2021 at 10:29:25AM +, Klemens Nanni wrote:
>> On Tue, Dec 07, 2021 at 07:07:08PM -0500, Brad Smith wrote:
>> > Here is another attempt at a sndio backend for mpv.
>> > 
>> > Looking for some testers.
>> 
>> OK kn if anyone wants to commit.
>
>Anyone wants to OK this so I can commit?
>

I've been using this extensively over the past days and everything works fine, 
nothing to report.

ok op@
-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.



Re: lang/racket-minimal: update to v8.3

2021-12-14 Thread Juan Francisco Cantero Hurtado
On Tue, Dec 14, 2021 at 09:44:03PM +0100, Juan Francisco Cantero Hurtado wrote:
> On Tue, 14 Dec 2021 14:18:39 +
> James Cook  wrote:
> 
> > On Tue, Dec 14, 2021 at 10:11:12AM +0100, Denis Fondras wrote:
> > > Le Tue, Dec 14, 2021 at 05:27:26AM +, James Cook a écrit :  
> > > > On Sun, Nov 28, 2021 at 10:46:28AM +0100, Denis Fondras wrote:  
> > > > > Straightforward update to v8.3  
> > > > 
> > > > It looks like the update to 8.3 broke the "raco exe" command.
> > > >   
> > > 
> > > I am surprised it ever worked. Minimal installation does not seem
> > > to provide it.  
> > 
> > Oops, sorry for the noise. After "raco pkg install compiler" I have
> > the raco exe command. And conversely, with 8.2, if I delete
> > ~/.local/share/racket, the "raco exe" command also stops working, so
> > this is nothing new.
> > 
> 
> You have something wrong in your config (or you changed the defaults).
> Our racket-minimal doesn't install files in ~/.local/share/racket.
> 
> My suggestion:
> $ doas pkg_delete racket-minimal
> $ doas rm -rf /etc/racket /usr/local/lib/racket /usr/local/share/racket
> $ rm -rf $HOME/.racketrc $HOME/.racket

And rm -rf $HOME/.local/share/racket

> $ doas pkg_add racket-minimal
> 
> And then follow the instructions in
> /usr/local/share/doc/pkg-readmes/racket-minimal to install the
> main-distribution.
> 
> -- 
> Juan Francisco Cantero Hurtado http://juanfra.info
> 

-- 
Juan Francisco Cantero Hurtado http://juanfra.info



Re: mpv sndio backend

2021-12-14 Thread Klemens Nanni
On Sat, Dec 11, 2021 at 10:29:25AM +, Klemens Nanni wrote:
> On Tue, Dec 07, 2021 at 07:07:08PM -0500, Brad Smith wrote:
> > Here is another attempt at a sndio backend for mpv.
> > 
> > Looking for some testers.
> 
> OK kn if anyone wants to commit.

Anyone wants to OK this so I can commit?



Re: enable KDE kipi-plugins, kirigami-gallery, kontrast, kopeninghours

2021-12-14 Thread Aaron Bieber


Rafael Sadowski  writes:

> OK to hook these ports not accepted by an OK?  They were tested by Yifei
> Zhan and me. I would now like to unlock you after all.
>
> OK?

kopeninghours complains about the uncompiled py file. Other then that
they all build / look fine. OK abieber@ with the py fix.

>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/kde-applications/Makefile,v
> retrieving revision 1.66
> diff -u -p -r1.66 Makefile
> --- Makefile  30 Nov 2021 17:23:07 -  1.66
> +++ Makefile  14 Dec 2021 18:29:06 -
> @@ -94,6 +94,7 @@
>   SUBDIR += kdegraphics-mobipocket
>   SUBDIR += kdegraphics-thumbnailers
>   SUBDIR += kolourpaint
> + SUBDIR += kontrast
>   SUBDIR += kruler
>   SUBDIR += okular
>   SUBDIR += spectacle
> @@ -161,6 +162,7 @@
>   SUBDIR += kdf
>   SUBDIR += kfloppy
>   SUBDIR += kgpg
> + SUBDIR += kipi-plugins
>   SUBDIR += kteatime
>   SUBDIR += ktimer
>   SUBDIR += kwalletmanager
> @@ -204,9 +206,11 @@
>   SUBDIR += kdeedu-data
>   SUBDIR += kidentitymanagement
>   SUBDIR += kimap
> + SUBDIR += kirigami-gallery
>   SUBDIR += kitinerary
>   SUBDIR += kldap
>   SUBDIR += kmbox
> + SUBDIR += kopeninghours
>   SUBDIR += kmime
>   SUBDIR += kontactinterface
>   #SUBDIR += kpat
> @@ -252,10 +256,6 @@
>   # x11/yakuake
>  
>   # TODO
> - # kipi-plugins
> - # kirigami-gallery
> - # kontrast
> - # kopeninghours
>   # kosmindoormap
>   # kpmcore
>   # kpublictransport



Re: lang/racket-minimal: update to v8.3

2021-12-14 Thread Juan Francisco Cantero Hurtado
On Tue, 14 Dec 2021 14:18:39 +
James Cook  wrote:

> On Tue, Dec 14, 2021 at 10:11:12AM +0100, Denis Fondras wrote:
> > Le Tue, Dec 14, 2021 at 05:27:26AM +, James Cook a écrit :  
> > > On Sun, Nov 28, 2021 at 10:46:28AM +0100, Denis Fondras wrote:  
> > > > Straightforward update to v8.3  
> > > 
> > > It looks like the update to 8.3 broke the "raco exe" command.
> > >   
> > 
> > I am surprised it ever worked. Minimal installation does not seem
> > to provide it.  
> 
> Oops, sorry for the noise. After "raco pkg install compiler" I have
> the raco exe command. And conversely, with 8.2, if I delete
> ~/.local/share/racket, the "raco exe" command also stops working, so
> this is nothing new.
> 

You have something wrong in your config (or you changed the defaults).
Our racket-minimal doesn't install files in ~/.local/share/racket.

My suggestion:
$ doas pkg_delete racket-minimal
$ doas rm -rf /etc/racket /usr/local/lib/racket /usr/local/share/racket
$ rm -rf $HOME/.racketrc $HOME/.racket
$ doas pkg_add racket-minimal

And then follow the instructions in
/usr/local/share/doc/pkg-readmes/racket-minimal to install the
main-distribution.

-- 
Juan Francisco Cantero Hurtado http://juanfra.info



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Juan Francisco Cantero Hurtado
CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2021/12/14 14:56:59

Modified files:
lang/gambit: Makefile 

Log message:
Move gambit back to clang. The change to ports-gcc breaks gerbil.



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/12/14 14:09:55

Modified files:
devel/qbs  : Makefile distinfo 
devel/qbs/patches: patch-src_app_qbs-setup-qt_setupqt_cpp 
devel/qbs/pkg  : PLIST 

Log message:
Update Qbs to 1.21.0

Changelog:
https://github.com/qbs/qbs/commit/e08c3eedcddbc18b251f56f7158353d8cbec2c81



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2021/12/14 14:01:52

Modified files:
net/syncthing  : Makefile distinfo 
net/syncthing/patches: patch-build_go 

Log message:
net/syncthing: simple update to version 1.18.5.

https://github.com/syncthing/syncthing/releases/tag/v1.18.5



Re: question about BUILD, RUN and TEST DEPENDS

2021-12-14 Thread Chris Bennett
On Tue, Dec 14, 2021 at 10:17:43AM -0800, Andrew Hewus Fresh wrote:
> I really don't follow quite what "something like this" is, so I'm
> probably going to answer the wrong question.
> 
> My guess as to the question is, how do you decide what to put into the
> different *_DEPENDS?

Close enough and a good set of answers.
One question was how to properly deal with BUILD_DEPENDS having two of
the same depends that RUN_DEPENDS has.
Assuming that build and run must have those two, but that the extra
RUN_DEPENDS are only for running and not for building.
(Which I'm able to ask more properly after this reply from you, thanks)

Leave as-is?

> 
> For perl ports, I generally start with what the author added to their
> META files, which is reflected in what portgen(1) does.  It used to be
> perl didn't separate BUILD from TEST depends, so lots of modules still
> don't do that, so sometimes it makes sense to move them around.

Helpful. I have a sneaking suspicion that understanding the perl
building process may require knowing what was done in the past, in order to
understand what and why the present is the way it is now.
(I.E. my father had to learn the past government regulations in order to
make any sense of what the new regulations were for a job he had.
Despite the fact that the old regulations were gone, but influential to
the new.)

> 
> 
> > 2. More important, why is that the right way?
> >I would like to know where to look in which code for ports process to
> >  get a better understanding of how this plays out.
> 
> This is not "official", but it is my best practices for what to put in
> each of these.
> 
> BUILD_DEPENDS are the minimum list of dependencies needed to
> successfully and repeatable build a package.  The fewer you can have,
> the faster bulk builds go.

So if there are no build depends other then the port itself, this would
be left out?
But if there are run depends in order to use it only, would
BUILD_DEPENDS=${RUN_DEPENDS} get used or not?

> 
> TEST_DEPENDS are the maximum list of dependencies to get the best test
> coverage.  Sometimes it isn't worth porting a whole set of extra
> dependencies just for a single optional test, so there is a balance.

I had a port committed that needed one single line from 
print/texlive/texmf,-full for testing.

I see you are the maintainer now for it. p5-LaTeX-Driver
That is a requirement for the few perl ports that didn't get in for
LedgerSMB a long time ago.

> 
> RUN_DEPENDS are the dependencies that give the person installing the
> best experience.  If there is some large dependency that is for a seldom
> used feature that has useful error messages that make it clear you need
> to install additional dependencies if you try to use it, then you
> probably can leave it out.  Otherwise, if it makes the port more usable,
> probably add it.

I had a port submitted (can't remember if it was committed),which had no
run dependencies, but I was advised to add a message to note which
packages ought to be added in order to make any use of it.

So this would be the motivation for something like neomutt and
neomutt-notmuch. Most people would just use neomutt, but enough people
also want notmuch included, that adding a flavor was worth it.

> 
> 
> 
> > If I can only get one answer, question 2 would be far preferred.
> > Any help better than copy/paste would be great.
> > I would like to move beyond the idiot level of porting.
> > I want to fully understand the answer to question 1 by looking at the
> > OpenBSD porting code and knowing also what is done a certain way:
> > "just because that's SOP, no intrinsic reason"
> > 
> > 
> > BUILD_DEPENDS = devel/p5-Test-Compile>=1.2.1 \
> > devel/p5-Test-Pod>=1.48
> > 
> > RUN_DEPENDS =   devel/p5-Algorithm-Diff>=1.1903 \
> > devel/p5-Test-Compile>=1.2.1 \
> > devel/p5-Test-Pod>=1.48 \
> > textproc/p5-Regexp-Common>=201331301
> > 
> > TEST_DEPENDS = devel/p5-Test-Pod>=1.48
> > 
> > -- 
> > Chris Bennett
> > 
> > 
> 
> -- 
> andrew
> 
> At the source of every error which is blamed on the computer, you
> will find at least two human errors, including the error of blaming
> it on the computer.

-- 
Thanks,
Chris



enable KDE kipi-plugins, kirigami-gallery, kontrast, kopeninghours

2021-12-14 Thread Rafael Sadowski
OK to hook these ports not accepted by an OK?  They were tested by Yifei
Zhan and me. I would now like to unlock you after all.

OK?

Index: Makefile
===
RCS file: /cvs/ports/x11/kde-applications/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile30 Nov 2021 17:23:07 -  1.66
+++ Makefile14 Dec 2021 18:29:06 -
@@ -94,6 +94,7 @@
  SUBDIR += kdegraphics-mobipocket
  SUBDIR += kdegraphics-thumbnailers
  SUBDIR += kolourpaint
+ SUBDIR += kontrast
  SUBDIR += kruler
  SUBDIR += okular
  SUBDIR += spectacle
@@ -161,6 +162,7 @@
  SUBDIR += kdf
  SUBDIR += kfloppy
  SUBDIR += kgpg
+ SUBDIR += kipi-plugins
  SUBDIR += kteatime
  SUBDIR += ktimer
  SUBDIR += kwalletmanager
@@ -204,9 +206,11 @@
  SUBDIR += kdeedu-data
  SUBDIR += kidentitymanagement
  SUBDIR += kimap
+ SUBDIR += kirigami-gallery
  SUBDIR += kitinerary
  SUBDIR += kldap
  SUBDIR += kmbox
+ SUBDIR += kopeninghours
  SUBDIR += kmime
  SUBDIR += kontactinterface
  #SUBDIR += kpat
@@ -252,10 +256,6 @@
  # x11/yakuake
 
  # TODO
- # kipi-plugins
- # kirigami-gallery
- # kontrast
- # kopeninghours
  # kosmindoormap
  # kpmcore
  # kpublictransport



Re: question about BUILD, RUN and TEST DEPENDS

2021-12-14 Thread Andrew Hewus Fresh
On Tue, Dec 14, 2021 at 10:01:04AM -0800, Chris Bennett wrote:
> Hi.
> 
> I have a mountain of good and bad versions of many single ports stored
> that I wanted to go through and discard the garbage from.
> 
> I needed to see what I could find that would let me diff these different
> versions of Makefiles, DESCR, etc.
> 
> I saw one CPAN Perl module that I wasn't clear about, so I did a portgen on
> it. After looking for a test depend I also saw what would be added.
> I don't intend to port this in or probably use it either.
> Please ignore what these depends below are in particular.
> 
> I have 2 questions about this.
> 1. What is the correct way to write up something like this?

I really don't follow quite what "something like this" is, so I'm
probably going to answer the wrong question.

My guess as to the question is, how do you decide what to put into the
different *_DEPENDS?

For perl ports, I generally start with what the author added to their
META files, which is reflected in what portgen(1) does.  It used to be
perl didn't separate BUILD from TEST depends, so lots of modules still
don't do that, so sometimes it makes sense to move them around.


> 2. More important, why is that the right way?
>I would like to know where to look in which code for ports process to
>get a better understanding of how this plays out.

This is not "official", but it is my best practices for what to put in
each of these.

BUILD_DEPENDS are the minimum list of dependencies needed to
successfully and repeatable build a package.  The fewer you can have,
the faster bulk builds go.

TEST_DEPENDS are the maximum list of dependencies to get the best test
coverage.  Sometimes it isn't worth porting a whole set of extra
dependencies just for a single optional test, so there is a balance.

RUN_DEPENDS are the dependencies that give the person installing the
best experience.  If there is some large dependency that is for a seldom
used feature that has useful error messages that make it clear you need
to install additional dependencies if you try to use it, then you
probably can leave it out.  Otherwise, if it makes the port more usable,
probably add it.



> If I can only get one answer, question 2 would be far preferred.
> Any help better than copy/paste would be great.
> I would like to move beyond the idiot level of porting.
> I want to fully understand the answer to question 1 by looking at the
> OpenBSD porting code and knowing also what is done a certain way:
> "just because that's SOP, no intrinsic reason"
> 
> 
> BUILD_DEPENDS =   devel/p5-Test-Compile>=1.2.1 \
>   devel/p5-Test-Pod>=1.48
> 
> RUN_DEPENDS = devel/p5-Algorithm-Diff>=1.1903 \
>   devel/p5-Test-Compile>=1.2.1 \
>   devel/p5-Test-Pod>=1.48 \
>   textproc/p5-Regexp-Common>=201331301
> 
> TEST_DEPENDS = devel/p5-Test-Pod>=1.48
> 
> -- 
> Chris Bennett
> 
> 

-- 
andrew

At the source of every error which is blamed on the computer, you
will find at least two human errors, including the error of blaming
it on the computer.



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 11:16:54

Modified files:
security/openssl/3.0: Makefile distinfo 
security/openssl/3.0/patches: patch-Configurations_10-main_conf 
  patch-Configurations_unix-Makefile_tmpl 
security/openssl/3.0/pkg: PLIST 

Log message:
update to openssl-3.0.1

https://www.openssl.org/news/secadv/20211214.txt
Invalid handling of X509_verify_cert() internal errors in libssl (CVE-2021-4044)



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/12/14 11:16:52

Modified files:
devel/kf5  : Makefile 

Log message:
+kquickcharts



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/12/14 11:16:12

Log message:
Import kquickcharts-5.88.0

Comment:
QtQuick module providing high-performance charts

Description:
The Quick Charts module provides a set of charts that can be used from 
QtQuick
applications. They are intended to be used for both simple display of data 
as
well as continuous display of high-volume data (often referred to as 
plotters).
The charts use a system called distance fields for their accelerated 
rendering,
which provides ways of using the GPU for rendering 2D shapes without loss of
quality.

Maintainer: Rafael Sadowski 

WWW: https://api.kde.org/frameworks/kquickcharts/html/index.html

OK abieber@ Thanks

Status:

Vendor Tag: rsadowski
Release Tags:   rsadowski_20211214

N ports/devel/kf5/kquickcharts/Makefile
N ports/devel/kf5/kquickcharts/distinfo
N ports/devel/kf5/kquickcharts/pkg/DESCR
N ports/devel/kf5/kquickcharts/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/12/14 11:09:21

Modified files:
devel/kf5  : Makefile 

Log message:
Add missing kcalendarcore hook



question about BUILD, RUN and TEST DEPENDS

2021-12-14 Thread Chris Bennett
Hi.

I have a mountain of good and bad versions of many single ports stored
that I wanted to go through and discard the garbage from.

I needed to see what I could find that would let me diff these different
versions of Makefiles, DESCR, etc.

I saw one CPAN Perl module that I wasn't clear about, so I did a portgen on
it. After looking for a test depend I also saw what would be added.
I don't intend to port this in or probably use it either.
Please ignore what these depends below are in particular.

I have 2 questions about this.
1. What is the correct way to write up something like this?
2. More important, why is that the right way?
   I would like to know where to look in which code for ports process to
 get a better understanding of how this plays out.

If I can only get one answer, question 2 would be far preferred.
Any help better than copy/paste would be great.
I would like to move beyond the idiot level of porting.
I want to fully understand the answer to question 1 by looking at the
OpenBSD porting code and knowing also what is done a certain way:
"just because that's SOP, no intrinsic reason"


BUILD_DEPENDS = devel/p5-Test-Compile>=1.2.1 \
devel/p5-Test-Pod>=1.48

RUN_DEPENDS =   devel/p5-Algorithm-Diff>=1.1903 \
devel/p5-Test-Compile>=1.2.1 \
devel/p5-Test-Pod>=1.48 \
textproc/p5-Regexp-Common>=201331301

TEST_DEPENDS = devel/p5-Test-Pod>=1.48

-- 
Chris Bennett




CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 10:40:50

Modified files:
security/sslscan: Makefile 

Log message:
bump sslscan for openssl update (static linked)



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 10:40:08

Modified files:
security/openssl/1.1: Makefile distinfo 
security/openssl/1.1/pkg: PLIST 

Log message:
update to openssl-1.1.1m



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Joel Sing
CVSROOT:/cvs
Module name:ports
Changes by: js...@cvs.openbsd.org   2021/12/14 10:22:19

Modified files:
lang/go: Makefile distinfo 
lang/go/patches: patch-src_runtime_sys_openbsd2_go 
 patch-src_syscall_exec_unix_go 
lang/go/pkg: PLIST 

Log message:
Update lang/go to 1.17.5.



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2021/12/14 09:13:10

Modified files:
x11/xfce4/terminal: Makefile distinfo 

Log message:
x11/xfce4/terminal: update to 0.9.1

cf https://mail.xfce.org/pipermail/xfce-announce/2021-October/001073.html
and https://mail.xfce.org/pipermail/xfce-announce/2021-December/001082.html



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/12/14 09:03:45

Modified files:
graphics/opencsg: Makefile 

Log message:
Set MODQT_DEPS to No and add BDEP x11/qt5/qttools,-main

This explicit BDEP x11/qt5/qttools,-main will hopefully help
in the bulk build.

Spotted by Antoine, thanks



Re: CVS: cvs.openbsd.org: ports

2021-12-14 Thread Antoine Jacoutot
On Mon, Dec 13, 2021 at 11:23:58AM -0700, Rafael Sadowski wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rsadow...@cvs.openbsd.org   2021/12/13 11:23:58
> 
> Modified files:
>   graphics/opencsg: Makefile 
> 
> Log message:
> Remove unneeded x11/qt5/qtbase,-main dependency by set MODQT_DEPS to No

===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
===>  Generating configure for opencsg-1.4.2p1
===>  Configuring for opencsg-1.4.2p1
/usr/bin/perl /exopi-cvs/ports/infrastructure/bin/pkg_subst -DMODQT5_COMMENT= 
-DLIBopencsg_VERSION=1.0 -DARCH=amd64 -DBASE_PKGPATH=graphics/opencsg 
-DFLAVOR_EXT= -DFULLPKGNAME=opencsg-1.4.2p1 -DHOMEPAGE=http://www.opencsg.org/ 
-DLOCALBASE=/usr/local -DLOCALSTATEDIR=/var -DMACHINE_ARCH=amd64 
-DMAINTAINER=The\ OpenBSD\ ports\ mailing-list\ \ 
-DPREFIX=/usr/local -DRCDIR=/etc/rc.d -DSYSCONFDIR=/etc -DTRUEPREFIX=/usr/local 
-DX11BASE=/usr/X11R6 -DPKGSTEM=opencsg -i -B /exopi-obj/pobj/opencsg-1.4.2 
/exopi-obj/pobj/opencsg-1.4.2/OpenCSG-1.4.2/src/src.pro
/usr/local/bin/qmake-qt5 PREFIX=/usr/local QMAKE_CFLAGS=-O2 -pipe   
QMAKE_CFLAGS_RELEASE=-O2 -pipe   QMAKE_CXX=c++ QMAKE_CXXFLAGS=-O2 -pipe   
QMAKE_CXXFLAGS_RELEASE=-O2 -pipe   QMAKE_LFLAGS= QMAKE_LFLAGS_RELEASE= 
-recursive /exopi-obj/pobj/opencsg-1.4.2/OpenCSG-1.4.2/src/./src.pro
env: /usr/local/bin/qmake-qt5: No such file or directory
*** Error 127 in graphics/opencsg 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2909 'do-configure': @ cd 
/exopi-obj/pobj/opencsg-1.4.2/Op...)
*** Error 2 in graphics/opencsg 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2929 
'/exopi-obj/pobj/opencsg-1.4.2/.configure_done': @cd /e...)
*** Error 2 in graphics/opencsg 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2594 'build': 
@lock=opencsg-1.4.2p1;  export _LOCKS_HELD=" o...)
===> Exiting graphics/opencsg with an error



-- 
Antoine



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2021/12/14 07:21:41

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
forgot to add gen to the list of introspected TARGETS



Re: lang/racket-minimal: update to v8.3

2021-12-14 Thread James Cook
On Tue, Dec 14, 2021 at 10:11:12AM +0100, Denis Fondras wrote:
> Le Tue, Dec 14, 2021 at 05:27:26AM +, James Cook a écrit :
> > On Sun, Nov 28, 2021 at 10:46:28AM +0100, Denis Fondras wrote:
> > > Straightforward update to v8.3
> > 
> > It looks like the update to 8.3 broke the "raco exe" command.
> > 
> 
> I am surprised it ever worked. Minimal installation does not seem to provide 
> it.

Oops, sorry for the noise. After "raco pkg install compiler" I have the
raco exe command. And conversely, with 8.2, if I delete
~/.local/share/racket, the "raco exe" command also stops working, so
this is nothing new.

-- 
James



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/12/14 06:26:12

Modified files:
devel/xtensa-esp32-elf/gdb: Makefile 

Log message:
xtensa-esp32-elf/gdb picks up gsed, so depend on it like ../gcc



multimedia/libv4l: ship headers in -compat package

2021-12-14 Thread Klemens Nanni
Video4Linux headers are required for an ongoing porting effort;
FreeBSD has a dedicated port for this that reaches back to their libv4l
port it seems, which looks practically identical to our MULTI_PACKAGES.

I just package the headers that are needed in their own subpackage.
The actual libv4l package remains unchanged except that its FULLPKGPATH
now has "-main", hence bumping all consumers.

Feedback? OK?

Index: x11/vlc/Makefile
===
RCS file: /cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.252
diff -u -p -r1.252 Makefile
--- x11/vlc/Makefile3 Sep 2021 11:47:42 -   1.252
+++ x11/vlc/Makefile14 Dec 2021 12:20:13 -
@@ -7,7 +7,7 @@ V=  3.0.14
 DISTNAME=  vlc-${V}
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-jack=  vlc-jack-${V}
-REVISION-main= 1
+REVISION-main= 2
 REVISION-jack= 0
 CATEGORIES=x11
 MASTER_SITES=  https://download.videolan.org/pub/videolan/vlc/${V}/
@@ -90,7 +90,7 @@ LIB_DEPENDS-main= ${MODQT5_LIB_DEPENDS} 
multimedia/libbluray \
multimedia/libdvdnav \
multimedia/libmatroska \
-   multimedia/libv4l \
+   multimedia/libv4l,-main \
multimedia/x264 \
multimedia/x265 \
net/avahi,-libs \
Index: telephony/linphone/mediastreamer2/Makefile
===
RCS file: /cvs/ports/telephony/linphone/mediastreamer2/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- telephony/linphone/mediastreamer2/Makefile  26 Jul 2021 07:08:32 -  
1.6
+++ telephony/linphone/mediastreamer2/Makefile  14 Dec 2021 12:20:13 -
@@ -3,7 +3,7 @@
 COMMENT =  streaming engine for voice/video telephony applications
 
 MODULE =   mediastreamer2
-REVISION = 1
+REVISION = 2
 
 SHARED_LIBS += mediastreamer 0.0 # 11
 
@@ -26,7 +26,7 @@ LIB_DEPENDS = telephony/linphone/bctoolb
telephony/linphone/ortp \
telephony/linphone/bzrtp \
telephony/bcg729 \
-   multimedia/libv4l \
+   multimedia/libv4l,-main \
multimedia/libvpx \
multimedia/libtheora \
security/libsrtp>=2.3.0p2 \
Index: telephony/baresip/baresip/Makefile
===
RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- telephony/baresip/baresip/Makefile  20 Jun 2021 12:13:52 -  1.29
+++ telephony/baresip/baresip/Makefile  14 Dec 2021 12:20:13 -
@@ -6,6 +6,7 @@ COMMENT-gtk =   GTK+-based modules for ba
 GH_ACCOUNT =   baresip
 GH_PROJECT =   baresip
 GH_TAGNAME =   v1.1.0
+REVISION-main =0
 REVISION-gtk = 0
 PKGNAME-main = baresip-${GH_TAGNAME:C/^v//}
 PKGNAME-gtk =  baresip-gtk-${GH_TAGNAME:C/^v//}
@@ -28,7 +29,7 @@ LIB_DEPENDS-main =audio/gsm \
audio/twolame \
graphics/ffmpeg \
graphics/png \
-   multimedia/libv4l \
+   multimedia/libv4l,-main \
multimedia/libvpx>=1.3.0 \
net/mosquitto \
telephony/baresip/re>=2.0.1 \
Index: net/utox/Makefile
===
RCS file: /cvs/ports/net/utox/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- net/utox/Makefile   14 Oct 2021 16:52:03 -  1.11
+++ net/utox/Makefile   14 Dec 2021 12:20:13 -
@@ -8,6 +8,7 @@ DISTNAME =  uTox-${V}-full
 PKGNAME =  utox-${V}
 MASTER_SITES = https://github.com/uTox/uTox/releases/download/v${V}/
 FIX_EXTRACT_PERMISSIONS = Yes
+REVISION = 0
 
 CATEGORIES =   net
 
@@ -25,7 +26,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
 
 LIB_DEPENDS += audio/openal \
-   multimedia/libv4l \
+   multimedia/libv4l,-main \
x11/dbus \
net/toxcore
 
Index: multimedia/xine-lib/Makefile
===
RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.148
diff -u -p -r1.148 Makefile
--- multimedia/xine-lib/Makefile8 Jul 2021 10:43:26 -   1.148
+++ multimedia/xine-lib/Makefile14 Dec 2021 12:20:13 -
@@ -3,7 +3,7 @@
 COMMENT=   multimedia decoding library
 
 DISTNAME=  xine-lib-1.2.11
-REVISION=  0
+REVISION=  1
 CATEGORIES=multimedia
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=  .tar.xz
@@ -55,7 +55,7 @@ LIB_DEPENDS=  audio/flac \
multimedia/libbluray>=0.8.0 \
multimedia/libdvdnav \
multimedia/libtheora \
-   multimedia/libv4l \
+   multimedia/libv4l,-main \

CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 04:36:09

Modified files:
net/unifi  : Tag: OPENBSD_7_0 Makefile.inc 
net/unifi/5.14 : Tag: OPENBSD_7_0 Makefile distinfo 
net/unifi/5.14/pkg: Tag: OPENBSD_7_0 PLIST 
net/unifi/5.6/pkg: Tag: OPENBSD_7_0 PLIST 
net/unifi/6.0  : Tag: OPENBSD_7_0 Makefile distinfo 
net/unifi/6.0/pkg: Tag: OPENBSD_7_0 PLIST 
net/unifi/6.1  : Tag: OPENBSD_7_0 Makefile distinfo 
net/unifi/6.1/pkg: Tag: OPENBSD_7_0 PLIST 
net/unifi/6.2  : Tag: OPENBSD_7_0 Makefile distinfo 
net/unifi/6.2/pkg: Tag: OPENBSD_7_0 PLIST 

Log message:
replace log4j versions in unifi versions in -stable



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 04:29:58

Modified files:
net/wireshark  : Makefile 

Log message:
wireshark: doc changed from asciidoc to asciidoctor; thanks to
Mark Patruck for reporting build failure and sending the log



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Sebastien Marie
CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2021/12/14 03:57:11

Modified files:
lang/rust  : Makefile 
lang/rust/pkg  : PLIST-main 
Added files:
lang/rust/patches: patch-src_bootstrap_builder_rs 
Removed files:
lang/rust/patches: patch-src_bootstrap_config_rs 

Log message:
lang/rust: add a run depends on devel/llvm

rustc want to ship a llvm-dwp binary (just copied from llvm install). replace 
it by a link, and add run depends on devel/llvm.
the binary doesn't work without devel/llvm as it is dynamically linked.

while here, do some Makefile cleanup, and enable rpath on binaries (bootstrap 
and build simplification).



Re: security/ghidra - replace log4j

2021-12-14 Thread Stuart Henderson
On 2021/12/14 00:12, Lawrence Teo wrote:
> The latest Ghidra release 10.1 has a fix for the log4j vulnerability;
> however, updating the port to that version is very complex and
> unfortunately I do not have enough time to work on it at the moment.
> 
> As a workaround, this diff updates the log4j jar files in
> security/ghidra to 2.15.0.  I was about to fetch the log4j jar files
> from https://logging.apache.org/log4j/2.x/download.html when I noticed
> sthen's net/unifi update which fetches them from spacehopper.org
> instead.  This diff uses the latter approach.
> 
> ok?

Ah I switched unifi over to using the proper distfiles from apache.org
before I read your mail, the ones I mirrored came from a newer version of
unifi. You can use them if you like but I can't vouch for exactly what's
in them other than "ubiquiti thought they were OK" - hashes differ
into the upstream release (I didn't look further to what was changed
inbetween them).


> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/ghidra/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile  19 Jul 2020 01:29:23 -  1.8
> +++ Makefile  14 Dec 2021 04:43:32 -
> @@ -7,6 +7,7 @@ COMMENT = software reverse engineering (
>  
>  VERSION =9.1.2
>  GHIDRA_DATE =20200212
> +REVISION =   0
>  
>  GH_ACCOUNT = NationalSecurityAgency
>  GH_PROJECT = ghidra
> @@ -27,6 +28,7 @@ WANTLIB +=  c m ${COMPILER_LIBCXX}
>  MASTER_SITES0 =  ${HOMEPAGE}
>  MASTER_SITES1 =  
> https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/
>  MASTER_SITES2 =  https://repo.maven.apache.org/maven2/
> +MASTER_SITES3 =  https://spacehopper.org/mirrors/
>  
>  EXTRACT_SUFX =   .zip
>  
> @@ -37,6 +39,7 @@ JMOCKIT_VER =   1.44
>  JSON_SIMPLE_VER =1.1.1
>  JUNIT_VER =  4.12
>  YAJSW_VER =  12.12
> +LOG4J_VER =  2.15.0
>  
>  # Note that ST4-${ST4_VER}.jar is only needed during build for antlr; it is 
> not
>  # needed at runtime and therefore does not need to be packed.
> @@ -51,6 +54,8 @@ DISTFILES = ${DISTNAME}.tar.gz
>  DISTFILES += ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0
>  DISTFILES += yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1
>  DISTFILES += ${JAR_DISTFILES:C/$/:2/}
> +DISTFILES += log4j-api-${LOG4J_VER}.jar:3
> +DISTFILES += log4j-core-${LOG4J_VER}.jar:3
>  
>  EXTRACT_ONLY =   ${DISTNAME}.tar.gz
>  
> @@ -138,5 +143,10 @@ do-install:
>   ln -s ${TRUEPREFIX}/share/java/ghidra/ghidraRun ${PREFIX}/bin/ghidraRun
>   ${INSTALL_SCRIPT} 
> ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh \
>   ${PREFIX}/share/java/ghidra/support/launch.sh
> + rm -f 
> ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/log4j-{api,core}-*.jar
> + ${INSTALL_DATA} ${FULLDISTDIR}/log4j-api-${LOG4J_VER}.jar \
> + ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/
> + ${INSTALL_DATA} ${FULLDISTDIR}/log4j-core-${LOG4J_VER}.jar \
> + ${PREFIX}/share/java/ghidra/Ghidra/Framework/Generic/lib/
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/ghidra/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo  19 Jul 2020 01:29:23 -  1.4
> +++ distinfo  14 Dec 2021 04:43:32 -
> @@ -6,6 +6,8 @@ SHA256 (javacc-5.0.jar) = cRExYbyM9mQVFV
>  SHA256 (jmockit-1.44.jar) = GXSZN1EzMkhCbdusNwpgSUTt9mXBPUakxelz5N2PqUo=
>  SHA256 (json-simple-1.1.1.jar) = TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=
>  SHA256 (junit-4.12.jar) = WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=
> +SHA256 (log4j-api-2.15.0.jar) = yMM+fo4FSW2uac8MqsjDCSz/2TehZFJukpItLVZtClU=
> +SHA256 (log4j-core-2.15.0.jar) = QZqFEolZcbe09PM+Yg02ElTlyVUrkEsEdLCd3UpqIgs=
>  SHA256 (yajsw-stable-12.12.zip) = 
> E5j8sek6uxmZLE+gbX/ldYqrtMRXgdfvMGxvV8p6cyE=
>  SIZE (ST4-4.1.jar) = 253043
>  SIZE (ghidra-9.1.2.tar.gz) = 59623429
> @@ -15,4 +17,6 @@ SIZE (javacc-5.0.jar) = 298569
>  SIZE (jmockit-1.44.jar) = 757982
>  SIZE (json-simple-1.1.1.jar) = 23931
>  SIZE (junit-4.12.jar) = 314932
> +SIZE (log4j-api-2.15.0.jar) = 301804
> +SIZE (log4j-core-2.15.0.jar) = 1789769
>  SIZE (yajsw-stable-12.12.zip) = 25051676
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/security/ghidra/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 19 Jul 2020 01:29:23 -  1.4
> +++ pkg/PLIST 14 Dec 2021 04:43:34 -
> @@ -2304,8 +2304,8 @@ share/java/ghidra/Ghidra/Framework/Gener
>  share/java/ghidra/Ghidra/Framework/Generic/lib/commons-lang3-3.9.jar
>  share/java/ghidra/Ghidra/Framework/Generic/lib/guava-19.0.jar
>  

CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 03:40:27

Modified files:
mail/msmtp : Tag: OPENBSD_7_0 Makefile distinfo 

Log message:
update to msmtp-1.8.19, from Xiyue Deng (who is dropping maintainer)

"Fixed a security problem in msmtpd: mail addresses starting with '-'
could be interpreted as options of the pipe command."



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 03:39:50

Modified files:
mail/msmtp : Makefile distinfo 

Log message:
update to msmtp-1.8.19, from Xiyue Deng (who is dropping maintainer)

"Fixed a security problem in msmtpd: mail addresses starting with '-'
could be interpreted as options of the pipe command."



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 03:36:26

Modified files:
www/p5-CGI-Fast: Makefile distinfo 

Log message:
update to p5-CGI-Fast-2.16, from maintainer Mikolaj Kucharski
no change for us, it just fixes a test on cygwin



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2021/12/14 03:32:46

Removed files:
www/seamonkey/patches: 
   patch-third__party_rust_packed__simd_src_lib.rs 

Log message:
www/seamonkey: remove merged patch

upstream probably applied the rust fix patch and i didnt recheck between
my 2.53.10 build and .1, spotted by sthen@



Re: [UPDATE] editors/neovim 0.5.1->0.6.0

2021-12-14 Thread Edd Barrett
On Sat, Dec 11, 2021 at 07:06:46PM -0700, Evan Fiddes wrote:
> Hi all!
> 
> This is my very first try at a contribution to OpenBSD, please let me know
> if anything needs improvement.

It's not a bad first attempt :)

For obscure reasons, we have to link some dependencies statically into neovim.
Those have to be updated along with neovim too (see LUV_VER and LUAJIT_VER in
the Makefile).

One of the static deps requires an update to devel/libuv. Me and paco@ are
working on this at the moment. Should have a diff for you to test soonish.

Thanks

-- 
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 03:09:15

Modified files:
net/unifi  : Makefile.inc 
net/unifi/5.14 : Makefile distinfo 
net/unifi/5.6  : Makefile 
net/unifi/6.0  : Makefile distinfo 

Log message:
unifi: switch log4j replacement to the proper upstream tar from ASF
rather than the local mirrored version extracted from unifi 6.5.54.
files differ so REVISION bumped.



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Omar Polo
CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2021/12/14 02:42:35

Modified files:
databases/pspg : Makefile distinfo 

Log message:
update pspg to 5.5.3

fixes a crash when highlighting of odd records is used together with
progressive load.



Re: lang/racket-minimal: update to v8.3

2021-12-14 Thread Denis Fondras
Le Tue, Dec 14, 2021 at 05:27:26AM +, James Cook a écrit :
> On Sun, Nov 28, 2021 at 10:46:28AM +0100, Denis Fondras wrote:
> > Straightforward update to v8.3
> 
> It looks like the update to 8.3 broke the "raco exe" command.
> 

I am surprised it ever worked. Minimal installation does not seem to provide it.



Re: [UPDATE] editors/neovim 0.5.1->0.6.0

2021-12-14 Thread Paco Esteban
On Mon, 13 Dec 2021, Laurence Tratt wrote:

> On Sat, Dec 11, 2021 at 07:06:46PM -0700, Evan Fiddes wrote:
> 
> Hello Evan,
> 
> > This bumps the neovim version to 0.6.0 the most current release. See patch
> > notes[0] for a detailed breakdown.
> > 
> > [0] https://github.com/neovim/neovim/releases/tag/v0.6.0
> 
> I had a small leading whitespace issue with your patch, which might be a
> MIME encoding thing. Otherwise, the update looks good, applies, and neovim
> 0.6.0 so far seems to be working well!

On the port Makefile, edd@ states that the versions of LuaJIT and luv
have to be pinned to specific versions listed on the source code.

This patch does not update those.  I'm not sure of the consequences of
this, but I guess strange runtime errors would be common.

My attempts until now hit a linker issue, I'll send a patch when I fix
that unless somebody beats me to it.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2021-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/12/14 01:09:52

Modified files:
math/calc  : Makefile distinfo 
math/calc/pkg  : PLIST 

Log message:
update to calc-2.14.0.13



Re: Update p5-CGI-Fast to 2.16

2021-12-14 Thread Mikolaj Kucharski
Ping

On Mon, Nov 22, 2021 at 09:39:37PM +, Mikolaj Kucharski wrote:
> Hi,
> 
> Update addresses https://github.com/leejo/cgi-fast/issues/20 and should
> not affect OpenBSD:
> 
> https://github.com/leejo/cgi-fast/compare/v2.15...v2.16
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/p5-CGI-Fast/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 Makefile
> --- Makefile  3 Jul 2020 21:45:55 -   1.5
> +++ Makefile  22 Nov 2021 21:37:59 -
> @@ -1,9 +1,8 @@
>  # $OpenBSD: Makefile,v 1.5 2020/07/03 21:45:55 sthen Exp $
>  
>  COMMENT =CGI interface for FastCGI
> -DISTNAME =   CGI-Fast-2.15
> +DISTNAME =   CGI-Fast-2.16
>  CATEGORIES = www
> -REVISION =   0
>  
>  MAINTAINER = Mikolaj Kucharski 
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/p5-CGI-Fast/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -r1.3 distinfo
> --- distinfo  10 May 2019 15:42:08 -  1.3
> +++ distinfo  22 Nov 2021 21:37:59 -
> @@ -1,2 +1,2 @@
> -SHA256 (CGI-Fast-2.15.tar.gz) = 5TQt89xZPt+3JMev6FCxoO51P01zP1GT4DewRjPf7s4=
> -SIZE (CGI-Fast-2.15.tar.gz) = 9277
> +SHA256 (CGI-Fast-2.16.tar.gz) = AiPX+RuAA3ud/183NgZAtx9dyNvZiaBZPV0i8/c8s9Q=
> +SIZE (CGI-Fast-2.16.tar.gz) = 9310
> 

-- 
Regards,
 Mikolaj