CVS: cvs.openbsd.org: ports

2020-08-24 Thread Remi Locherer
CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2020/08/24 23:48:54

Modified files:
sysutils/librelp: Makefile distinfo 
sysutils/librelp/pkg: PLIST 
Removed files:
sysutils/librelp/patches: patch-src_tcp_c 

Log message:
Update to librelp 1.6.0

ok sthen@



Re: [update] biology/bioperl (and related ports)

2020-08-24 Thread Andrew Hewus Fresh
On Thu, Aug 20, 2020 at 12:20:32PM +0200, Charlene Wendling wrote:
> Hi,
> 
> Our current bioperl related ports are old, and we had to patch
> them already to deal with Perl changes. So i'm proposing an update here
> to 1.7.7 to avoid dealing with emergency fixes at a large scale.
> 
> These updates and new ports will not totally replace what bioperl used
> to provide, see [0] for an exhaustive list of what it implies.
> 
> There are backward incompatibilities, and a lot of inter dependencies,
> so you need all these ports at once, since bioperl has been split in
> many modules. This also means that conflict markers had to be sprinkled
> around, as hinted by update-plist(1).
> 
> Updates are in the diff below, new ports are attached.
> 
> biology/bioperl   => PASS
> biology/p5-Bio-ASN1-EntrezGene=> PASS
> biology/p5-Bio-Cluster=> NEW, PASS
> biology/p5-Bio-Variation  => NEW, PASS
> biology/p5-Bio-DB-NCBIHelper  => NEW, PASS, NETWORK
> biology/p5-Bio-DB-EMBL=> NEW, PASS, NETWORK
> 
> (NETWORK ones requires network for testing if you use PORTS_PRIVSEP)
> 
> There are no other ports depending on bioperl.
> 
> Comments/feedback are welcome,

OK afresh1@

not sure if there's something to be done about the network tests, but it
did throw me off for a minute.


> 
> Charlène.
> 
> 
> [0] https://metacpan.org/changes/distribution/BioPerl#L71
> 
> 
> Index: bioperl/Makefile
> ===
> RCS file: /cvs/ports/biology/bioperl/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- bioperl/Makefile  12 Jul 2019 20:43:43 -  1.21
> +++ bioperl/Makefile  20 Aug 2020 10:11:28 -
> @@ -2,68 +2,51 @@
>  
>  COMMENT= perl tools for bioinformatics
>  
> -DISTNAME=BioPerl-1.6.924
> -REVISION=1
> +DISTNAME=BioPerl-1.7.7
>  PKGNAME= ${DISTNAME:L}# No p5-prefix here.
>  CATEGORIES=  biology
>  
>  HOMEPAGE=https://bioperl.org/
>  
> -# perl
> +# Perl
>  PERMIT_PACKAGE=  Yes
>  
> -CPAN_AUTHOR= CJFIELDS
> -
>  MODULES= cpan
> -PKG_ARCH=*
> +
> +CPAN_AUTHOR= CJFIELDS
>  MODCPAN_EXAMPLES=Yes
>  MODCPAN_EXAMPLES_DIR=${PREFIX}/share/examples/bioperl/
>  
> -CONFIGURE_STYLE= modbuild
> +RUN_DEPENDS= devel/p5-Data-Stag \
> + devel/p5-Error \
> + devel/p5-Graph \
> + devel/p5-IO-String \
> + devel/p5-IO-stringy \
> + devel/p5-IPC-Run \
> + devel/p5-List-MoreUtils \
> + devel/p5-Module-Build \
> + devel/p5-Set-Scalar \
> + devel/p5-Test-Most \
> + devel/p5-Test-RequiresInternet \
> + devel/p5-YAML \
> + textproc/p5-Libxml \
> + textproc/p5-XML-DOM \
> + textproc/p5-XML-DOM-XPath \
> + textproc/p5-XML-LibXML \
> + textproc/p5-XML-SAX \
> + textproc/p5-XML-SAX-Base \
> + textproc/p5-XML-SAX-Writer \
> + textproc/p5-XML-Twig \
> + textproc/p5-XML-Writer \
> + www/p5-HTTP-Message \
> + www/p5-URI \
> + www/p5-libwww
> +TEST_DEPENDS=devel/p5-Test-Memory-Cycle \
> + devel/p5-Test-Weaken
>  
> -BUILD_DEPENDS=   ${RUN_DEPENDS}
> -RUN_DEPENDS= biology/AcePerl \
> - databases/p5-DBD-mysql \
> - converters/p5-Convert-Binary-C \
> - devel/p5-Algorithm-Munkres \
> - devel/p5-Array-Compare \
> - devel/p5-Class-AutoClass \
> - devel/p5-Clone \
> - devel/p5-Data-Stag \
> - devel/p5-Graph \
> - devel/p5-IO-String \
> - devel/p5-IO-stringy \
> - devel/p5-Set-Scalar \
> - devel/p5-Test-Exception \
> - devel/p5-Tree-DAG_Node \
> - graphics/p5-GD \
> - graphics/p5-GD-SVG \
> - graphics/p5-SVG-Graph \
> - math/p5-GraphViz \
> - misc/p5-Spreadsheet-ParseExcel \
> - misc/p5-Spreadsheet-WriteExcel \
> - textproc/p5-XML-DOM \
> - textproc/p5-Libxml \
> - textproc/p5-XML-DOM-XPath \
> - textproc/p5-XML-Parser \
> - textproc/p5-XML-SAX-Writer \
> - textproc/p5-XML-Simple \
> - textproc/p5-XML-Twig \
> - textproc/p5-XML-Writer \
> - www/p5-CGI \
> - www/p5-HTML-Parser \
> - www/p5-SOAP-Lite \
> - www/p5-URI \
> - www/p5-libwww
> -TEST_DEPENDS=devel/p5-Test-Most \
> - www/p5-HTML-TableExtract
> -
> -MAKE_ENV +=  

Re: OpenBSD 6.7-stable Python 3.7 update

2020-08-24 Thread Kurt Mosiejczuk
On Mon, Aug 24, 2020 at 11:22:55PM +, Ian McWilliam wrote:
> This looks like the Makefile update is missing for the Python 3.7 update 
> under 6.7-stable.

> Obtaining OpenBSD-6.7-stable ports tree.
> P devel/quirks/Makefile
> P devel/quirks/files/Quirks.pm
> U lang/python/3.7/distinfo
> P lang/python/3.7/pkg/PLIST-idle
> P lang/python/3.7/pkg/PLIST-main
> P lang/python/3.7/pkg/PLIST-tests

Yup. Thanks. I've fixed it now.

(patch got kicked out multiple places since we didn't backport the 3.7.8
update. I fixed all the rejects but the Makefile... :) )

--Kurt



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/08/24 18:16:01

Modified files:
lang/python/3.7: Tag: OPENBSD_6_7 Makefile 

Log message:
Managed to miss the Makefile. Pointed out by Ian McWilliam.



OpenBSD 6.7-stable Python 3.7 update

2020-08-24 Thread Ian McWilliam
This looks like the Makefile update is missing for the Python 3.7 update under 
6.7-stable.

Obtaining OpenBSD-6.7-stable ports tree.
P devel/quirks/Makefile
P devel/quirks/files/Quirks.pm
U lang/python/3.7/distinfo
P lang/python/3.7/pkg/PLIST-idle
P lang/python/3.7/pkg/PLIST-main
P lang/python/3.7/pkg/PLIST-tests

Ian McWilliam


Re: i386 ports build report

2020-08-24 Thread Christian Weisgerber
Stuart Henderson:

> build failures: 7
> devel/cutter

Here's a fix.  If I understand the code correctly, this struct
element is assigned an iterator over a std::unordered_map.
I have confirmed that cutter builds with this on i386.

Index: Makefile
===
RCS file: /cvs/ports/devel/cutter/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile14 Aug 2020 17:15:56 -  1.7
+++ Makefile24 Aug 2020 22:47:57 -
@@ -5,6 +5,7 @@ COMMENT =   RE platform powered by radare2
 GH_ACCOUNT =   radareorg
 GH_PROJECT =   cutter
 GH_TAGNAME =   v1.11.1
+REVISION = 0
 
 CATEGORIES =   devel
 
Index: patches/patch-src_widgets_GraphGridLayout_cpp
===
RCS file: patches/patch-src_widgets_GraphGridLayout_cpp
diff -N patches/patch-src_widgets_GraphGridLayout_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_widgets_GraphGridLayout_cpp   24 Aug 2020 22:47:57 
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/widgets/GraphGridLayout.cpp
+--- src/widgets/GraphGridLayout.cpp.orig
 src/widgets/GraphGridLayout.cpp
+@@ -526,7 +526,7 @@ void GraphGridLayout::calculateEdgeMainColumn(GraphGri
+ // to contain blocks above sweep line and query for nearest column which 
isn't blocked by a block.
+ 
+ struct Event {
+-size_t blockId;
++ut64 blockId;
+ size_t edgeId;
+ int row;
+ enum Type {

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



CVS: cvs.openbsd.org: ports

2020-08-24 Thread George Koehler
CVSROOT:/cvs
Module name:ports
Changes by: gkoeh...@cvs.openbsd.org2020/08/24 15:41:21

Modified files:
net/clic   : Makefile distinfo 

Log message:
Update to clic-1.1.5

Committing this for solene@, who did all the work.  The update is
necessary to use clic with ecl-20.4.24.



CVS: cvs.openbsd.org: ports

2020-08-24 Thread George Koehler
CVSROOT:/cvs
Module name:ports
Changes by: gkoeh...@cvs.openbsd.org2020/08/24 15:38:06

Modified files:
lang/ecl   : Makefile distinfo 
lang/ecl/patches: patch-src_Makefile_in patch-src_configure 
lang/ecl/pkg   : PLIST 
Added files:
lang/ecl/patches: patch-src_c_package_d 
Removed files:
lang/ecl/patches: patch-src_c_ffi_d patch-src_c_numbers_atan_d 

Log message:
Update to ecl-20.4.24

>From Josh Elsasser; thank you!  I'm adding patch-src_c_package_d (from
Daniel Kochmaski) to work around a SIGSEGV on 64-bit big-endian
platforms, so I can have Common Lisp on powerpc64.  Josh Elsasser
built ecl on mips64 and sparc64.



CVS: cvs.openbsd.org: ports

2020-08-24 Thread George Koehler
CVSROOT:/cvs
Module name:ports
Changes by: gkoeh...@cvs.openbsd.org2020/08/24 15:31:13

Modified files:
devel/boehm-gc : Makefile 
devel/boehm-gc/patches: patch-include_private_gcconfig_h 

patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h 

Log message:
Patch boehm-gc to avoid sbrk, fix powerpc64, help sparc64.

Add AO_fetch_compare_and_swap for sparc64, because lang/ecl 20.4.24
will need it.  Thanks to kmos@ for discovering this problem, and to
Josh Elsasser for building this diff on a sparc64.



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2020/08/24 15:08:02

Modified files:
misc/open62541 : Makefile 
misc/open62541/patches: patch-arch_network_tcp_c 
Added files:
misc/open62541/patches: 

patch-tests_testing-plugins_testing_networklayers_c 

Log message:
Backport fix from upstream.



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2020/08/24 13:35:33

Modified files:
misc/p5-OPCUA-Open62541: Makefile distinfo 

Log message:
update p5-OPCUA-Open62541 to 0.023



UPDATE: gnupg-2.2.21 and (libksba-1.4.0)

2020-08-24 Thread Edd Barrett
Hi,

Attached are updates to gpg2 and libksba. The ksba update isn't strictly
necessary for the gpg update, but we may as well.

For gpg, the sendmail patch is no longer needed, as there is now a
configure check.

For libksba, although the header only adds new constants and prototypes,
diffing nm(1) output suggests some symbols have disappeared, hence the
major SHARED_LIBS bump.

All tests pass, but I'll do a mulk [0] to check it doesn't obviously
break anything.

Comments? OK?


[0] mini-bulk, as coined by abieber@ :P

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile5 Jul 2020 10:10:38 -   1.68
+++ Makefile24 Aug 2020 18:27:54 -
@@ -2,7 +2,7 @@
 
 COMMENT =  GNU privacy guard - a free PGP replacement
 
-DISTNAME = gnupg-2.2.20
+DISTNAME = gnupg-2.2.21
 CATEGORIES =   security
 
 # don't mix up dependencies with gnupg1
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo5 Jul 2020 10:10:38 -   1.32
+++ distinfo24 Aug 2020 18:28:01 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.20.tar.bz2) = BKfJ1It0w5kWjugnDlSFiN2+UiGMM3cD1/Bjc9MmyjA=
-SIZE (gnupg-2.2.20.tar.bz2) = 6786913
+SHA256 (gnupg-2.2.21.tar.bz2) = YegyePtfpzNmWKi3OrJvN51BJ1uxx8bmlN2fmm6Oduw=
+SIZE (gnupg-2.2.21.tar.bz2) = 6813160
Index: patches/patch-tools_send-mail_c
===
RCS file: patches/patch-tools_send-mail_c
diff -N patches/patch-tools_send-mail_c
--- patches/patch-tools_send-mail_c 27 Apr 2020 19:22:54 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-tools_send-mail_c,v 1.1 2020/04/27 19:22:54 naddy Exp $
-
-Index: tools/send-mail.c
 tools/send-mail.c.orig
-+++ tools/send-mail.c
-@@ -33,7 +33,7 @@ static gpg_error_t
- run_sendmail (estream_t data)
- {
-   gpg_error_t err;
--  const char pgmname[] = "/usr/lib/sendmail";
-+  const char pgmname[] = "/usr/sbin/sendmail";
-   const char *argv[3];
- 
-   argv[0] = "-oi";
Index: Makefile
===
RCS file: /cvs/ports/security/libksba/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile12 Jul 2019 21:15:35 -  1.21
+++ Makefile24 Aug 2020 18:58:28 -
@@ -2,11 +2,10 @@
 
 COMMENT =  X.509 library
 
-DISTNAME = libksba-1.3.5
-REVISION = 2
+DISTNAME = libksba-1.4.0
 CATEGORIES =   security
 
-SHARED_LIBS =  ksba 0.2# 19.6
+SHARED_LIBS =  ksba 1.0# 20.0
 
 MASTER_SITES = ${MASTER_SITE_GNUPG:=libksba/}
 
Index: distinfo
===
RCS file: /cvs/ports/security/libksba/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo19 Sep 2016 17:04:55 -  1.6
+++ distinfo24 Aug 2020 18:39:21 -
@@ -1,2 +1,2 @@
-SHA256 (libksba-1.3.5.tar.bz2) = QURP16b/c6ea2XKPmF5xybqM0+XlM1jnDV8GbTXBo0A=
-SIZE (libksba-1.3.5.tar.bz2) = 620649
+SHA256 (libksba-1.4.0.tar.bz2) = v+ao6R/w9U2KMpUU20BmZwAMsgcjjt7Um1mXYb/KQbY=
+SIZE (libksba-1.4.0.tar.bz2) = 651319
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/libksba/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   16 Mar 2015 18:07:54 -  1.2
+++ pkg/PLIST   24 Aug 2020 18:40:32 -
@@ -2,7 +2,8 @@
 bin/ksba-config
 include/ksba.h
 @info info/ksba.info
-lib/libksba.a
+@static-lib lib/libksba.a
 lib/libksba.la
 @lib lib/libksba.so.${LIBksba_VERSION}
+lib/pkgconfig/ksba.pc
 share/aclocal/ksba.m4


Re: i386 failures

2020-08-24 Thread Brian Callahan


On Monday, August 24, 2020 8:34 AM, Stuart Henderson  
wrote:

> On 2020/08/19 02:03, Brian Callahan wrote:
>
> > On Tuesday, August 18, 2020 1:59 PM, Christian Weisgerber 
> > na...@mips.inka.de wrote:
> >
> > > On 2020-08-18, Stuart Henderson s...@spacehopper.org wrote:
> > >
> > > > build failures: 12
> > >
> > > These are the actual i386 failures:
> > >
> > > > audio/mscore: out of memory linking
> >
> > If musescore is built on i386 with -Oz instead of -O2, then the link
> > is successful.
> > I was able to create a working MuseScore on i386 (via vmm, X11
> > accessed via TigerVNC) with this tweak. Though I'm not sure how
> > desirable it is.
> > ~Brian
>
> I don't mind whether it's fixed or marked BROKEN but currently it is
> taking an hour of build time every time and it fails reliably so it would
> be good to get something done.
>
> Thanks :)

Alright then. I committed a fix.

~Brian



Re: games/godot: add sndio backend

2020-08-24 Thread Stuart Henderson
On 2020/08/24 20:19, Omar Polo wrote:

quick comments on these two:

>  - it's better to bundle the code in ${FILESDIR} and copy it in
>post-extract (what I'm currently doing) or have patches against
>/dev/null?  I think the first option is more clear

yes, FILESDIR. the files could do with copyright notices and license.

>  - the $OpenBSD$ cvs tag on the sources is correct?  portcheck doesn't
>complain, but I've never done this before so I'm not sure.

yes.



games/godot: add sndio backend

2020-08-24 Thread Omar Polo


Hello ports@,

Here's a second try at adding a working audio backend to Godot.  It took
me some time but now I think it's ready.  It was fun, and even if I
didn't knew anything about audio handling, I have learned something.
The sio_open manpage in particular was incredibly helpful at explaining
the various concept.

You can find attached a patch to add a sndio driver.  I'm also taking up
the maintainership as previously discussed off-list with Thomas.

Riccardo (cc'd) and me have been testing this for a week.  We've tested
with Oddventure, Hive Time and some hobby projects.  Oddventure crashes
regularly at some point (after ~ 15-20 minutes of gameplay), but it does
so regardless of the sndio patch.  As a test, I've been able to play for
roughly 25-30 minutes at Hive Time with SIO_ERROR^1 set without having
xruns, so I'm quite confident the driver isn't utterly broken.

As Thomas suggested, it would be nice to upstream this patch but as I'm
not able to compile and run the engine from the master branch I'm
refraining to for the moment.  In the meantime, it would be nice to have
this tested by a wider audience and, possibly, also committed :)

Some notes (and questions) about the patch:

 - it's better to bundle the code in ${FILESDIR} and copy it in
   post-extract (what I'm currently doing) or have patches against
   /dev/null?  I think the first option is more clear

 - the $OpenBSD$ cvs tag on the sources is correct?  portcheck doesn't
   complain, but I've never done this before so I'm not sure.

 - the driver only implements the minimum necessary in order to play
   sounds: other audio driver also let the user change the device and
   some driver (e.g. pulseaudio) also support recording audio.  Adding
   support for recording shouldn't be difficult, but I don't know a
   single game that requires this.  Switching audio device at runtime
   doesn't seem too much useful to me, but I think I can implement it
   eventually

 - (I'm a noob when it comes to audio stuff so apologies) it's better
   SIO_SYNC or SIO_IGNORE for a game?  SIO_IGNORE makes the device
   pauses during overruns and underruns, while SIO_SYNC makes the device
   discard the samples on overrun and then play the same amount of
   silence later.

 - in the main loop in AudioDriverSndio::thread_func I'm not checking
   the return of sio_open/sio_close: this is deliberate.  It's to keep
   the code simple, as if an error occurs during the open/close we'll
   notice it eventually some lines after on sio_write and exit there.

 - while other driver fills sample_in with zeroes when there is nothing
   to play, doing so with sndio would make the whole engine sluggish.
   The was_active + sio_open/close dance is due to that.  I don't have
   an explanation for that, and I've got the idea from the sndio
   website[2]

 - (please remember that I don't have any prior experience with audio
   stuff) every other audio driver has a loop like
for ( ... ) {
ad->samples_out.write[i] = ad->samples_in[i] >> 16;
}
   I don't know why it's needed to shift every sample but, hey, everyone
   is doing it and so am I :)

Sorry for the long email and, as always, comments are more than welcome!


[1]: SIO_ERROR makes sndio terminate on overrun.  If you want to try,
you can decomment the line with ``par.xrun = SIO_ERROR;'' in
audio_driver_sndio.cpp

[2]: http://www.sndio.org/tips.html#section_7


Index: Makefile
===
RCS file: /cvs/ports/games/godot/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile18 Aug 2020 17:39:30 -  1.14
+++ Makefile24 Aug 2020 17:59:45 -
@@ -6,9 +6,9 @@ V = 3.2.2
 DISTNAME = godot-${V}-stable
 PKGNAME =  godot-${V}
 CATEGORIES =   games
-REVISION = 0
+REVISION = 1
 HOMEPAGE = https://godotengine.org/
-MAINTAINER =   Thomas Frohwein 
+MAINTAINER =   Omar Polo 
 
 # MIT
 PERMIT_PACKAGE =   Yes
@@ -16,7 +16,7 @@ PERMIT_PACKAGE =  Yes
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender c enet execinfo freetype intl m mbedtls mbedcrypto
-WANTLIB += mbedx509 mpcdec ogg opus opusfile png theora theoradec
+WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio theora theoradec
 WANTLIB += vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
 
 COMPILER = base-clang ports-gcc base-gcc
@@ -72,6 +72,8 @@ LIB_DEPENDS = archivers/zstd \
 
 NO_TEST =  Yes
 
+LDFLAGS += -lsndio
+
 .if ${MACHINE_ARCH:Mhppa}
 LDFLAGS += -latomic
 WANTLIB += atomic
@@ -83,6 +85,9 @@ CFLAGS +=  -mlongcall
 CXXFLAGS +=-mlongcall
 LDFLAGS += -Wl,--relax
 .endif
+
+post-extract:
+   cp -R ${FILESDIR}/sndio ${WRKDIST}/drivers
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
Index: files/sndio/SCsub

CVS: cvs.openbsd.org: ports

2020-08-24 Thread James Turner
CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2020/08/24 11:41:52

Modified files:
www/openradtool: Makefile distinfo 
www/openradtool/pkg: PLIST 

Log message:
Update openradtool to 0.10.0



Re: Fix devel/cgdb build on mips64

2020-08-24 Thread Jeremie Courreges-Anglas
On Mon, Aug 24 2020, Visa Hankala  wrote:
> Build of devel/cgdb fails on mips64:
>
> /pobj/cgdb-0.7.1/cgdb-0.7.1/lib/tgdb/gdbwire.c:1692:24: error: expected member
>   name or ';' after declaration specifiers
> gdbwire_mi_pstate *mips;
> ~  ^
> :310:14: note: expanded from here
> #define mips 1
>  ^
>
> `mips' is one of the platform's builtin macros that GCC 4.2.1 has
> defined when in GNU C mode. This has been carried to clang.
>
> The patch below works around the issue by undefining the macro. This
> helps at least when building on octeon.
>
> OK?

ok jca@, suggestion below

> Index: Makefile
> ===
> RCS file: ports/devel/cgdb/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- Makefile  11 Nov 2019 20:08:25 -  1.11
> +++ Makefile  24 Aug 2020 14:44:54 -
> @@ -29,4 +29,8 @@ CONFIGURE_ENV=  LDFLAGS="-L${LOCALBASE}/
>  
>  AUTOCONF_VERSION=2.69
>  
> +.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"

Maybe add a comment like
# Avoid clash with identifier in source code

> +CFLAGS+= -Umips
> +.endif
> +
>  .include 
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/08/24 10:28:30

Modified files:
security/gpgme : Makefile distinfo 
security/gpgme/patches: patch-lang_cpp_tests_Makefile_in 
patch-lang_qt_tests_Makefile_in 
security/gpgme/pkg: PLIST-main PLIST-qt 
Added files:
security/gpgme/patches: 
patch-lang_cpp_src_GpgmeppConfig_cmake_in_in 
patch-lang_qt_src_QGpgmeConfig_cmake_in_in 

Log message:
update to gpgme-1.14.0



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/08/24 09:23:14

Modified files:
lang/gpc   : Makefile 

Log message:
Add mips64 to the NOT_FOR_ARCHS list. MIPS support is incomplete.
Setting this as to not waste visa@'s time doing bulk builds. We have begun
to fix things, but more work needs to be done and I need to dig out my
octeon machine in order to finish things.



Re: NEW: security/libmodsecurity

2020-08-24 Thread Stuart Henderson
On 2020/08/24 14:28, Matthias Pitzl wrote:
> Hello,
> 
> This new port is needed for adding ModSecurity support to nginx.
> 
> Excerpt from github:
>  ModSecurity is an open source, cross platform web application firewall (WAF)
>  engine for Apache, IIS and Nginx that is developed by Trustwave's SpiderLabs.
>  It has a robust event-based programming language which provides protection 
> from
>  a range of attacks against web applications and allows for HTTP traffic
>  monitoring, logging and real-time analys...
> 
> I will send an updated diff for adding the libmodsecurity connector to nginx
> too.
> 
> I've sent this port a few weeks ago but haven't got an OK or further feedback
> except from Stuart.
> 
> Greetings,
> Matthias

Diff below with the following:

- omit SEPARATE_BUILD=no, it's the default
- -std=c++11 is used in build so base-gcc doesn't work
- some things are compiled with -O3 [...] $CFLAGS, remove -O3
- regen plist

... also, this (not addressed in my diff) - there's "checking for PCRE
JIT... yes" - I think this it should not be enabling this, IIRC pcre's
jit isn't W^X friendly - looks like pcre maybe giving the wrong answer
when the autoconf check is testing for this.



diff e72775d84068ee980f1030295480628dd5f900eb /usr/ports/mystuff
blob - c563f91f488e9752604bcca7d1d861562ba9c12d
file + security/libmodsecurity/Makefile
--- security/libmodsecurity/Makefile
+++ security/libmodsecurity/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES =
https://github.com/SpiderLabs/ModSecur
 
 PERMIT_PACKAGE =   Yes
 
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
 
 LIB_DEPENDS =  converters/libiconv \
devel/libyajl \
@@ -28,9 +28,8 @@ LIB_DEPENDS = converters/libiconv \
net/libmaxminddb \
textproc/libxml
 
-USE_GMAKE =yes
+USE_GMAKE =Yes
 CONFIGURE_STYLE =  gnu
-SEPARATE_BUILD =   no
 
 CONFIGURE_ARGS =   --without-lmdb \
--without-ssdeep \
blob - /dev/null
file + security/libmodsecurity/patches/patch-src_Makefile_in
--- security/libmodsecurity/patches/patch-src_Makefile_in
+++ security/libmodsecurity/patches/patch-src_Makefile_in
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/Makefile.in
+--- src/Makefile.in.orig
 src/Makefile.in
+@@ -1153,7 +1153,6 @@ libmodsecurity_la_CPPFLAGS = \
+   -g \
+   -I../others \
+   -fPIC \
+-  -O3 \
+   -I../headers \
+   $(GEOIP_CFLAGS) \
+   $(GLOBAL_CPPFLAGS) \
blob - /dev/null
file + security/libmodsecurity/patches/patch-src_parser_Makefile_in
--- security/libmodsecurity/patches/patch-src_parser_Makefile_in
+++ security/libmodsecurity/patches/patch-src_parser_Makefile_in
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/parser/Makefile.in
+--- src/parser/Makefile.in.orig
 src/parser/Makefile.in
+@@ -475,7 +475,6 @@ libmodsec_parser_la_CPPFLAGS = \
+   -I.. \
+   -g \
+   -fPIC \
+-  -O3 \
+   $(GEOIP_CFLAGS) \
+   $(GLOBAL_CPPFLAGS) \
+   $(MODSEC_NO_LOGS) \
blob - fbd57c2002681256215c6e356baff41cab80e237
file + security/libmodsecurity/pkg/PLIST
--- security/libmodsecurity/pkg/PLIST
+++ security/libmodsecurity/pkg/PLIST
@@ -21,10 +21,9 @@ include/modsecurity/rules_properties.h
 include/modsecurity/transaction.h
 include/modsecurity/variable_origin.h
 include/modsecurity/variable_value.h
-lib/pkgconfig/modsecurity.pc
-modsecurity/
 @static-lib lib/libmodsecurity.a
 lib/libmodsecurity.la
+@lib lib/libmodsecurity.so.${LIBmodsecurity_VERSION}
+lib/pkgconfig/modsecurity.pc
 share/modsecurity/
 share/modsecurity/unicode.mapping
-@lib lib/libmodsecurity.so.${LIBmodsecurity_VERSION}



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/08/24 09:10:21

Modified files:
devel/quirks   : Tag: OPENBSD_6_7 Makefile 
devel/quirks/files: Tag: OPENBSD_6_7 Quirks.pm 

Log message:
cve quirk for Python 3.7.9 for -stable



mips64 bulk build report

2020-08-24 Thread visa
bulk build on octeon.ports.openbsd.org
started on  Sat Aug 15 14:43:35 UTC 2020
finished at Mon Aug 24 13:59:52 UTC 2020
lasted 09D23h16m
done with kern.version=OpenBSD 6.7-current (GENERIC.MP) #9: Sat Aug 15 14:12:24 
UTC 2020

built packages:9419
Aug 15:2251
Aug 16:776
Aug 17:619
Aug 18:460
Aug 19:626
Aug 20:453
Aug 21:391
Aug 22:607
Aug 23:1151
Aug 24:2084


build failures: 50
http://build-failures.rhaalovely.net/mips64/2020-08-15/cad/netgen.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/chinese/libchewing.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/chinese/libpinyin.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/databases/postgresql-pllua.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/devel/coccinelle.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/devel/py-llvmlite,python3.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/devel/py-unicorn,python3.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/devel/pygame,python3.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/devel/rttr.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/devel/sdcc.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/emulators/mednafen.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/emulators/openmsx.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/games/astromenace.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/games/eduke32.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/games/freeorion.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/games/fs2open.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/games/hyperrogue.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/games/valyriatear.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/geo/gpstk.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/geo/pdal.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/geo/pgrouting.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/graphics/babl.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/graphics/enblend-enfuse.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/graphics/openimageio.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/inputmethods/scim-fcitx.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/lang/STk.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/lang/gforth.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/lang/gpc.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/lang/librep.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/lang/pfe.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/lang/squeak/vm.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/math/coq.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/math/gbc.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/math/mlpack,-main.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/math/ntl.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/multimedia/assimp.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/multimedia/synfigstudio.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/net/gtk-gnutella.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/net/utox.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/plan9/drawterm.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/print/scribus.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/productivity/aqbanking.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/security/botan2.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/shells/ksh93.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/sysutils/libvirt.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/sysutils/u-boot,aarch64.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/x11/e17/elementary.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/x11/gnome/totem.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/x11/qt5/qtscript,,-main.log
http://build-failures.rhaalovely.net/mips64/2020-08-15/x11/qt5/qtwebkit.log



Fix devel/cgdb build on mips64

2020-08-24 Thread Visa Hankala
Build of devel/cgdb fails on mips64:

/pobj/cgdb-0.7.1/cgdb-0.7.1/lib/tgdb/gdbwire.c:1692:24: error: expected member
  name or ';' after declaration specifiers
gdbwire_mi_pstate *mips;
~  ^
:310:14: note: expanded from here
#define mips 1
 ^

`mips' is one of the platform's builtin macros that GCC 4.2.1 has
defined when in GNU C mode. This has been carried to clang.

The patch below works around the issue by undefining the macro. This
helps at least when building on octeon.

OK?

Index: Makefile
===
RCS file: ports/devel/cgdb/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile11 Nov 2019 20:08:25 -  1.11
+++ Makefile24 Aug 2020 14:44:54 -
@@ -29,4 +29,8 @@ CONFIGURE_ENV=LDFLAGS="-L${LOCALBASE}/
 
 AUTOCONF_VERSION=  2.69
 
+.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
+CFLAGS+=   -Umips
+.endif
+
 .include 



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/08/24 09:04:29

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Add cve quirk for Python 3.7.9



Re: [update patch] gnuchess 6.2.5 -> 6.2.7

2020-08-24 Thread Rafael Sadowski
On Mon Aug 24, 2020 at 02:00:48PM +0200, Martin Ziemer wrote:
> This patch updates gnuchess from 6.2.5 to 6.2.7.
> 
> Since i saw there is no maintainer, i also added myself as maintainer.
> 
> Tested on two amd64 systems.
> 
> 

Hi Martin,

you missed to update plist. I also switched URL to HTTPS.
New diff below, otherwise it looks good.

Rafael

Index: Makefile
===
RCS file: /cvs/ports/games/gnuchess/Makefile,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 Makefile
--- Makefile12 Jul 2019 20:46:18 -  1.47
+++ Makefile24 Aug 2020 15:01:21 -
@@ -2,13 +2,14 @@
 
 COMMENT=   chess program
 
-DISTNAME=  gnuchess-6.2.5
+DISTNAME=  gnuchess-6.2.7
 DISTFILES= ${DISTNAME}.tar.gz book_1.02.pgn.gz
-REVISION=  2
 
 CATEGORIES=games
-HOMEPAGE=  http://www.gnu.org/software/chess/
+HOMEPAGE=  https://www.gnu.org/software/chess/
 MASTER_SITES=  ${MASTER_SITE_GNU:=chess/}
+
+MAINTAINER =   Martin Ziemer 
 
 # GPLv3+
 PERMIT_PACKAGE=Yes
Index: distinfo
===
RCS file: /cvs/ports/games/gnuchess/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo3 Nov 2017 00:43:49 -   1.13
+++ distinfo24 Aug 2020 15:01:21 -
@@ -1,4 +1,4 @@
 SHA256 (book_1.02.pgn.gz) = 3qx37bBhpZJJoZ3rA9o0nK4FHlJSemy1r4CNk5jTLUQ=
-SHA256 (gnuchess-6.2.5.tar.gz) = mpnpYzVXBsqzIJnRQLaY7aneFk685ApUILG5dy3QSAI=
+SHA256 (gnuchess-6.2.7.tar.gz) = 5TZnWmGr6C5huRn2t4Z1VEHZ/NTCHhyC+55TQN0imEY=
 SIZE (book_1.02.pgn.gz) = 26265281
-SIZE (gnuchess-6.2.5.tar.gz) = 782359
+SIZE (gnuchess-6.2.7.tar.gz) = 802863
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/gnuchess/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- pkg/PLIST   3 Nov 2017 00:43:49 -   1.12
+++ pkg/PLIST   24 Aug 2020 15:01:21 -
@@ -22,6 +22,7 @@ share/locale/eo/LC_MESSAGES/gnuchess.mo
 share/locale/es/LC_MESSAGES/gnuchess.mo
 share/locale/fr/LC_MESSAGES/gnuchess.mo
 share/locale/gl/LC_MESSAGES/gnuchess.mo
+share/locale/it/LC_MESSAGES/gnuchess.mo
 share/locale/nb/LC_MESSAGES/gnuchess.mo
 share/locale/nl/LC_MESSAGES/gnuchess.mo
 share/locale/pt_BR/LC_MESSAGES/gnuchess.mo



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/08/24 09:01:21

Modified files:
lang/python/3.7: Tag: OPENBSD_6_7 distinfo 
lang/python/3.7/pkg: Tag: OPENBSD_6_7 PLIST-idle PLIST-main 
 PLIST-tests 

Log message:
Security update to Python 3.7.9

Release notes:
https://docs.python.org/release/3.7.9/whatsnew/changelog.html#changelog

ok sthen



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/08/24 09:00:29

Modified files:
lang/python/3.7: Makefile distinfo 
lang/python/3.7/pkg: PLIST-idle PLIST-main PLIST-tests 

Log message:
Security update to Python 3.7.9

Release notes:
https://docs.python.org/release/3.7.9/whatsnew/changelog.html#changelog

ok sthen



Re: [update patch] gnuchess 6.2.5 -> 6.2.7

2020-08-24 Thread Hiltjo Posthuma
On Mon, Aug 24, 2020 at 02:00:48PM +0200, Martin Ziemer wrote:
> This patch updates gnuchess from 6.2.5 to 6.2.7.
> 
> Since i saw there is no maintainer, i also added myself as maintainer.
> 
> Tested on two amd64 systems.
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/gnuchess/Makefile,v
> retrieving revision 1.47
> diff -u -p -r1.47 Makefile
> --- Makefile  12 Jul 2019 20:46:18 -  1.47
> +++ Makefile  24 Aug 2020 11:56:27 -
> @@ -2,13 +2,14 @@
>  
>  COMMENT= chess program
>  
> -DISTNAME=gnuchess-6.2.5
> +DISTNAME=gnuchess-6.2.7
>  DISTFILES=   ${DISTNAME}.tar.gz book_1.02.pgn.gz
> -REVISION=2
>  
>  CATEGORIES=  games
>  HOMEPAGE=http://www.gnu.org/software/chess/
>  MASTER_SITES=${MASTER_SITE_GNU:=chess/}
> +
> +MAINTAINER = Martin Ziemer 
>  
>  # GPLv3+
>  PERMIT_PACKAGE=  Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/gnuchess/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo  3 Nov 2017 00:43:49 -   1.13
> +++ distinfo  24 Aug 2020 11:56:27 -
> @@ -1,4 +1,4 @@
>  SHA256 (book_1.02.pgn.gz) = 3qx37bBhpZJJoZ3rA9o0nK4FHlJSemy1r4CNk5jTLUQ=
> -SHA256 (gnuchess-6.2.5.tar.gz) = mpnpYzVXBsqzIJnRQLaY7aneFk685ApUILG5dy3QSAI=
> +SHA256 (gnuchess-6.2.7.tar.gz) = 5TZnWmGr6C5huRn2t4Z1VEHZ/NTCHhyC+55TQN0imEY=
>  SIZE (book_1.02.pgn.gz) = 26265281
> -SIZE (gnuchess-6.2.5.tar.gz) = 782359
> +SIZE (gnuchess-6.2.7.tar.gz) = 802863
> 

Hi,

I also sent this bump on 27 July. The patch looks good, thanks.

-- 
Kind regards,
Hiltjo



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/08/24 08:29:02

Modified files:
audio/mscore   : Makefile 

Log message:
Use -Oz on i386 to ensure that the linker doesn't run out of memory when
linking musescore.

>From sthen@'s i386 build logs



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/08/24 08:09:54

Modified files:
multimedia/mlt : Makefile distinfo 
multimedia/mlt/patches: patch-src_framework_Makefile 
patch-src_framework_mlt_property_c 
patch-src_mlt++_Makefile 
patch-src_modules_avformat_producer_avformat_c 
multimedia/mlt/pkg: PLIST-gpl2 PLIST-main 

Log message:
Update mlt to 6.22.1

Drop me as maintainer.

ok tracey@



Re: UPDATE: multimedia/mlt

2020-08-24 Thread Tracey Emery
On Sun, Aug 23, 2020 at 09:14:54PM +0200, Rafael Sadowski wrote:
> Simple update to the latest stable version.
> 
> - Update mlt from 6.20 to 6.22
> - Drop maintainer
> 
> OK?

Shotcut still seems happy. ok tracey@

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/mlt/Makefile,v
> retrieving revision 1.26
> diff -u -p -u -p -r1.26 Makefile
> --- Makefile  20 May 2020 09:17:03 -  1.26
> +++ Makefile  23 Aug 2020 19:14:20 -
> @@ -2,11 +2,10 @@
>  
>  COMMENT-main =   multimedia transformations framework
>  COMMENT-gpl2 =   GPLv2-licensed modules for mlt
> -VERSION =6.20.0
> +VERSION =6.22.1
>  DISTNAME =   mlt-${VERSION}
>  PKGNAME-main =   ${DISTNAME}
>  PKGNAME-gpl2 =   mlt-gpl2-${VERSION}
> -REVISION =   0
>  
>  # XXX versions should be kept in sync together
>  SHARED_LIBS =mlt 3.2
> @@ -15,8 +14,6 @@ SHARED_LIBS +=  mlt++   3.2
>  CATEGORIES = multimedia devel
>  HOMEPAGE =   https://www.mltframework.org/
>  DEBUG_PACKAGES = ${BUILD_PACKAGES}
> -
> -MAINTAINER = Rafael Sadowski 
>  
>  # GPLv2+, LGPLv2.1+
>  # Actually, qimage module could be under GPLv3+ if one more object
> Index: distinfo
> ===
> RCS file: /cvs/ports/multimedia/mlt/distinfo,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 distinfo
> --- distinfo  18 May 2020 10:33:17 -  1.8
> +++ distinfo  23 Aug 2020 19:14:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (mlt-6.20.0.tar.gz) = qyEeJ8BsBoj5y+LXTcBiNiTvdepPlO6pFc3DExlr4t0=
> -SIZE (mlt-6.20.0.tar.gz) = 1446137
> +SHA256 (mlt-6.22.1.tar.gz) = o9698LiBHw0gyQLMPfPQXa19P/NtHbFsCnM40NWYmZg=
> +SIZE (mlt-6.22.1.tar.gz) = 1343746
> Index: patches/patch-src_framework_Makefile
> ===
> RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-src_framework_Makefile
> --- patches/patch-src_framework_Makefile  18 May 2020 10:33:17 -  
> 1.4
> +++ patches/patch-src_framework_Makefile  23 Aug 2020 19:14:20 -
> @@ -20,7 +20,7 @@ Index: src/framework/Makefile
>   else
>   NAME = libmlt$(LIBSUF)
>   TARGET = $(NAME).$(version)
> -@@ -98,10 +100,12 @@ all:$(TARGET)
> +@@ -100,10 +102,12 @@ all:   $(TARGET)
>   
>   $(TARGET): $(OBJS)
>   $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
> @@ -36,7 +36,7 @@ Index: src/framework/Makefile
>   
>   depend: $(SRCS)
>   $(CC) -MM $(CFLAGS) $^ 1>.depend
> -@@ -123,6 +127,8 @@ install:
> +@@ -125,6 +129,8 @@ install:
>   install -m 755 $(TARGET) 
> "$(DESTDIR)$(bindir)/libmlt.dll" ; \
>   fi; \
>   install -m 644 libmlt.def "$(DESTDIR)$(libdir)" ; \
> Index: patches/patch-src_framework_mlt_property_c
> ===
> RCS file: 
> /cvs/ports/multimedia/mlt/patches/patch-src_framework_mlt_property_c,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-src_framework_mlt_property_c
> --- patches/patch-src_framework_mlt_property_c20 May 2020 09:17:04 
> -  1.3
> +++ patches/patch-src_framework_mlt_property_c23 Aug 2020 19:14:20 
> -
> @@ -22,7 +22,7 @@ Index: src/framework/mlt_property.c
>   return self;
>   }
>   
> -@@ -292,7 +296,7 @@ static int time_clock_to_frames( mlt_property self, co
> +@@ -311,7 +315,7 @@ static int time_clock_to_frames( mlt_property self, co
>   s = copy;
>   pos = strrchr( s, ':' );
>   
> @@ -31,7 +31,7 @@ Index: src/framework/mlt_property.c
>   char *orig_localename = NULL;
>   if ( locale )
>   {
> -@@ -334,7 +338,7 @@ static int time_clock_to_frames( mlt_property self, co
> +@@ -353,7 +357,7 @@ static int time_clock_to_frames( mlt_property self, co
>   seconds = strtod( s, NULL );
>   }
>   
> @@ -40,7 +40,7 @@ Index: src/framework/mlt_property.c
>   if ( locale ) {
>   // Restore the current locale
>   setlocale( LC_NUMERIC, orig_localename );
> -@@ -510,7 +514,7 @@ static double mlt_property_atof( mlt_property self, do
> +@@ -529,7 +533,7 @@ static double mlt_property_atof( mlt_property self, do
>   if ( locale )
>   result = strtod_l( value, , locale );
>   else
> @@ -49,7 +49,7 @@ Index: src/framework/mlt_property.c
>   char *orig_localename = NULL;
>   if ( locale ) {
>   // Protect damaging the global locale from a temporary 
> locale on another thread.
> -@@ -528,7 +532,7 @@ static double mlt_property_atof( mlt_property self, do
> +@@ -547,7 +551,7 @@ static double mlt_property_atof( mlt_property self, do
>   if ( end && end[0] == '%' )
>  

Re: UPDATE: nextcloudclient-3.0.0

2020-08-24 Thread Stuart Henderson
On 2020/08/24 09:46, Adriano Barbosa wrote:
> The diff does not include the deleted (and unnecessary) patches. What’s the
> proper way to submit it? Could not find it on faq/doc yet (still looking
>  for).
> 
> Sorry for the mistake and thanks in advance.
> 
> Em seg, 24 de ago de 2020 às 07:58, Adriano Barbosa 
> escreveu:
> 
> > Hi,
> >
> > update for nextcloudclient v3.0.0.
> >
> > Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.0.0
> >
> >
> >
> > OK?
> >
> >
> >
> > --
> >
> > Adriano Barbosa
> >
> > --
> Adriano Barbosa
> Sent from my phone. Sorry for typos.

cvs rm $somefile
cvs diff -uNp



Re: UPDATE: nextcloudclient-3.0.0

2020-08-24 Thread Adriano Barbosa
Thanks Stuart and Landry for the help.
Corrected diff attached.

Em seg., 24 de ago. de 2020 às 09:47, Adriano Barbosa
 escreveu:
>
> The diff does not include the deleted (and unnecessary) patches. What’s the 
> proper way to submit it? Could not find it on faq/doc yet (still looking  
> for).
>
> Sorry for the mistake and thanks in advance.
>
> Em seg, 24 de ago de 2020 às 07:58, Adriano Barbosa  
> escreveu:
>>
>> Hi,
>>
>> update for nextcloudclient v3.0.0.
>>
>> Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.0.0
>>
>>
>>
>> OK?
>>
>>
>>
>> --
>>
>> Adriano Barbosa
>>
> --
> Adriano Barbosa
> Sent from my phone. Sorry for typos.



-- 
Adriano Barbosa
Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile	12 Jul 2020 07:02:35 -	1.7
+++ Makefile	24 Aug 2020 13:57:13 -
@@ -2,7 +2,7 @@
 
 COMMENT =	desktop sync client for Nextcloud
 
-V =		2.6.5
+V =		3.0.0
 DISTNAME =	nextcloudclient-${V}
 
 GH_ACCOUNT =	nextcloud
@@ -24,6 +24,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
 WANTLIB += Qt5Network Qt5Widgets Qt5Xml c crypto m qt5keychain
 WANTLIB += sqlite3 ssl z lib/inotify/inotify
+WANTLIB += Qt5Svg Qt5Quick Qt5QuickControls2
 
 MODULES =		devel/cmake \
 			x11/qt5
@@ -38,7 +39,9 @@ RUN_DEPENDS =		devel/desktop-file-utils 
 
 LIB_DEPENDS =		databases/sqlite3 \
 			devel/libinotify \
-			security/qtkeychain
+			security/qtkeychain \
+			x11/qt5/qtsvg \
+			x11/qt5/qtquickcontrols2
 
 CONFIGURE_ARGS =	-DBUILD_SHELL_INTEGRATION_NAUTILUS=OFF \
 			-DBUILD_SHELL_INTEGRATION_DOLPHIN=OFF \
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo	12 Jul 2020 07:02:35 -	1.5
+++ distinfo	24 Aug 2020 13:57:13 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-2.6.5.tar.gz) = k1OF/wcXSk2FwtTtpNBprrSqjQ5ohlss+KJMqMyIMog=
-SIZE (nextcloudclient-2.6.5.tar.gz) = 19134736
+SHA256 (nextcloudclient-3.0.0.tar.gz) = +Zv0Z8W7S2U11B8YZ0P3v8ezdqxYT4n+o+FSDSrq1/c=
+SIZE (nextcloudclient-3.0.0.tar.gz) = 19060293
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt	12 Jul 2020 07:02:35 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2020/07/12 07:02:35 rsadowski Exp $
-
-- Drop Git
-- Stop searching for PdfLatex and disable docs
-- Remove APPLICATION_SHORTNAME from install path to avoid upper-case names
-
-Index: CMakeLists.txt
 CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -61,10 +61,6 @@ include(GNUInstallDirs)
- include(DefineInstallationPaths)
- include(GenerateExportHeader)
- 
--include(GetGitRevisionDescription)
--
--get_git_head_revision(GIT_REFSPEC GIT_SHA1)
--
- add_definitions(
- -DQT_USE_QSTRINGBUILDER
- -DQT_MESSAGELOGCONTEXT #enable function name and line number in debug output
-@@ -191,7 +187,7 @@ if(BUILD_CLIENT)
- find_package(INotify)
- endif()
- find_package(Sphinx)
--find_package(PdfLatex)
-+#find_package(PdfLatex)
- find_package(OpenSSL 1.1 REQUIRED )
- 
-find_package(ZLIB REQUIRED)
-@@ -238,8 +234,8 @@ if(BUILD_CLIENT)
- add_subdirectory(src)
- if(NOT BUILD_LIBRARIES_ONLY)
- add_subdirectory(man)
--add_subdirectory(doc)
--add_subdirectory(doc/dev)
-+	#add_subdirectory(doc)
-+	#add_subdirectory(doc/dev)
- if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
- add_subdirectory(admin)
- endif(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
Index: patches/patch-src_CMakeLists_txt
===
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt	16 Nov 2019 10:27:43 -	1.1.1.1
+++ patches/patch-src_CMakeLists_txt	24 Aug 2020 13:57:13 -
@@ -7,8 +7,8 @@ Index: src/CMakeLists.txt
  
  set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
  
--find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
-+find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent REQUIRED)
- if (Qt5Core_VERSION VERSION_LESS 5.9.0)
- message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
- endif()
+-find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
++find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED)
+ 
+ if(NOT TOKEN_AUTH_ONLY)
+ find_package(Qt5Keychain REQUIRED)
Index: patches/patch-src_gui_CMakeLists_txt

Re: UPDATE: nextcloudclient-3.0.0

2020-08-24 Thread Landry Breuil
On Mon, Aug 24, 2020 at 09:46:58AM -0400, Adriano Barbosa wrote:
> The diff does not include the deleted (and unnecessary) patches. What’s the
> proper way to submit it? Could not find it on faq/doc yet (still looking
>  for).
> 
> Sorry for the mistake and thanks in advance.

cvs rm -f patches/patch-* (after a cvs up to resurrect the patches from
your local checkout) should include the patch removal in cvs diff.



Re: UPDATE: nextcloudclient-3.0.0

2020-08-24 Thread Adriano Barbosa
The diff does not include the deleted (and unnecessary) patches. What’s the
proper way to submit it? Could not find it on faq/doc yet (still looking
 for).

Sorry for the mistake and thanks in advance.

Em seg, 24 de ago de 2020 às 07:58, Adriano Barbosa 
escreveu:

> Hi,
>
> update for nextcloudclient v3.0.0.
>
> Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.0.0
>
>
>
> OK?
>
>
>
> --
>
> Adriano Barbosa
>
> --
Adriano Barbosa
Sent from my phone. Sorry for typos.


CVS: cvs.openbsd.org: ports

2020-08-24 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/08/24 07:42:26

Modified files:
inputmethods/anthy: Makefile 
inputmethods/anthy/patches: patch-src-util_anthy_el 

Log message:
Unbreak anthy.el with emacs-27.1

anthy.el was still using old-style backquotes, which trigger warnings
since emacs-22.2 and are finally treated as errors in emacs-27.1.

Failure in bulk builds reported by ajacoutot@



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/08/24 07:39:01

Modified files:
www/squid  : Makefile 

Log message:
www/squid: fiddle with LIB_KRB5_LIBS to let it find gssapi
partly from Matthias Pitzl



[update patch] bitrot 0.9.2 -> 1.0.0

2020-08-24 Thread Martin Ziemer
This patch updates bitrot from 0.9.2 to 1.0.0.

Had to change python Version to 3.x because 2.x had no
concurrent.futures.

Tested on two amd64 systems.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/bitrot/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile12 Jul 2019 20:49:40 -  1.5
+++ Makefile24 Aug 2020 12:58:48 -
@@ -2,7 +2,7 @@
 
 COMMENT =  detects when files bit-rot
 
-MODPY_EGG_VERSION =0.9.2
+MODPY_EGG_VERSION =1.0.0
 DISTNAME = bitrot-${MODPY_EGG_VERSION}
 
 CATEGORIES =   sysutils
@@ -16,6 +16,7 @@ PERMIT_PACKAGE =  Yes
 
 MODPY_PI = Yes
 MODULES =  lang/python
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
 MODPY_SETUPTOOLS=  Yes
 
 NO_TEST =  Yes
Index: distinfo
===
RCS file: /cvs/ports/sysutils/bitrot/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo7 Feb 2018 14:04:48 -   1.3
+++ distinfo24 Aug 2020 12:58:48 -
@@ -1,2 +1,2 @@
-SHA256 (bitrot-0.9.2.tar.gz) = +AQUhSrgrDPkfn1IjaaxMzJzL1eZnRYK5VvU1QDhRwY=
-SIZE (bitrot-0.9.2.tar.gz) = 9699
+SHA256 (bitrot-1.0.0.tar.gz) = D6C7coP/YtjUwhW2RszyjihnEJxiWRNcht5Xe/rzQZE=
+SIZE (bitrot-1.0.0.tar.gz) = 11556
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/bitrot/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   12 Aug 2016 23:15:46 -  1.1.1.1
+++ pkg/PLIST   24 Aug 2020 12:58:48 -
@@ -1,12 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2016/08/12 23:15:46 juanfra Exp $
 bin/bitrot
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}bitrot.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bitrot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/bitrot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/bitrot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/bitrot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 
lib/python${MODPY_VERSION}/site-packages/bitrot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/bitrot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/bitrot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/bitrot.py
-lib/python${MODPY_VERSION}/site-packages/bitrot.pyc
 share/doc/bitrot/
 share/doc/bitrot/README.rst



[PATCH] www/nginx - Add ModSecurit connector module

2020-08-24 Thread Matthias Pitzl
Hello,

The following patch adds the ModSecurity connector module to nginx.
This module uses my previously sent libmodsecurity.

By moving the module sources into the nginx source directory in the pre-patch
stage, the configure run accepts the libmodsecurity with 0.0 as version without
any real patching of the connector module itself.

I'm not sure, if the pseudo flavor for this is really needed.

PS: I've already sent the diff some weeks ago.
This is an updated version against the last version of nginx in the tree.

Greetings,
Matthias


Index: www/nginx/Makefile
===
RCS file: /mount/cvsdev/openbsd/cvs/ports/www/nginx/Makefile,v
retrieving revision 1.145
diff -u -p -u -r1.145 Makefile
--- www/nginx/Makefile  27 Jul 2020 14:33:15 -  1.145
+++ www/nginx/Makefile  24 Aug 2020 12:36:17 -
@@ -16,6 +16,7 @@ COMMENT-perl= nginx perl scripting modu
 COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
 COMMENT-rtmp=  nginx module for RTMP streaming
 COMMENT-securelink=nginx HMAC secure link module
+COMMENT-modsecurity3=  nginx module for ModSecurity
 
 VERSION=   1.18.0
 DISTNAME=  nginx-${VERSION}
@@ -25,6 +26,7 @@ REVISION-main=0
 REVISION-xslt= 0
 
 VERSION-rtmp=  1.2.1
+VERSION-modsecurity3=  1.0.1
 
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-image_filter=  nginx-image_filter-${VERSION}
@@ -40,6 +42,7 @@ PKGNAME-perl= nginx-perl-${VERSION}
 PKGNAME-passenger= nginx-passenger-${VERSION}
 PKGNAME-rtmp=  nginx-rtmp-${VERSION}
 PKGNAME-securelink=nginx-securelink-${VERSION}
+PKGNAME-modsecurity3=  nginx-modsecurity3-${VERSION}
 
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
@@ -57,7 +60,8 @@ _GH_MODS= \
arutnginx-rtmp-module   v${VERSION-rtmp} \
simpl   ngx_devel_kit   v0.3.0 \
leevngx_http_geoip2_module  3.3 \
-   nginx-modules   ngx_http_hmac_secure_link_module 
48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+   nginx-modules   ngx_http_hmac_secure_link_module 
48c4625fbbf51ed5a95bfec23fa444f6c3702e50 \
+   SpiderLabs  ModSecurity-nginx   v${VERSION-modsecurity3}
 
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -74,10 +78,10 @@ MULTI_PACKAGES =-main -naxsi -perl ${MO
 
 MODULE_PACKAGES =  -image_filter -geoip2 -xslt -mailproxy -stream \
-passenger -headers_more -ldap_auth -lua -rtmp \
-   -securelink
+   -securelink -modsecurity3
 
 FLAVOR ?=
-PSEUDO_FLAVORS =   no_lua no_passenger
+PSEUDO_FLAVORS =   no_lua no_passenger no_modsecurity3
 
 COMPILER = base-clang ports-gcc base-gcc
 
@@ -97,6 +101,7 @@ WANTLIB-headers_more=
 WANTLIB-perl=  c m perl
 WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
 WANTLIB-securelink=crypto
+WANTLIB-modsecurity3=  modsecurity
 
 LIB_DEPENDS-main=  devel/pcre
 LIB_DEPENDS-xslt=  textproc/libxml \
@@ -107,6 +112,7 @@ LIB_DEPENDS-ldap_auth=  databases/openlda
 LIB_DEPENDS-lua=   ${MODLUA_LIB_DEPENDS}
 LIB_DEPENDS-rtmp=
 LIB_DEPENDS-securelink=
+LIB_DEPENDS-modsecurity3=  security/libmodsecurity
 
 MODLUA_RUNDEP= No
 RUN_DEPENDS=   www/nginx,-main=${VERSION}
@@ -154,6 +160,12 @@ CONFIGURE_ARGS+=   --add-dynamic-module=${
 CONFIGURE_ARGS+=   
--add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
 .endif
 
+.if ${BUILD_PACKAGES:M-modsecurity3}
+CONFIGURE_ENV+=MODSECURITY_LIB=${PREFIX}/lib \
+   MODSECURITY_INC=${PREFIX}/include/modsecurity
+CONFIGURE_ARGS+=   --add-dynamic-module=${WRKSRC}/ModSecurity-nginx
+.endif
+
 CONFIGURE_ARGS+=   --prefix=${NGINX_DIR} \
--conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
@@ -198,7 +210,7 @@ ALL_TARGET=
 pre-patch:
 .for i in headers-more-nginx-module lua-nginx-module naxsi \
nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
-   ngx_http_hmac_secure_link_module
+   ngx_http_hmac_secure_link_module ModSecurity-nginx
cd ${WRKSRC} && mv ../$i-* $i
 .endfor
 
Index: www/nginx/distinfo
===
RCS file: /mount/cvsdev/openbsd/cvs/ports/www/nginx/distinfo,v
retrieving revision 1.75
diff -u -p -u -r1.75 distinfo
--- www/nginx/distinfo  27 Jul 2020 14:33:15 -  1.75
+++ www/nginx/distinfo  24 Aug 2020 11:08:44 -
@@ -1,3 +1,4 @@
+SHA256 (ModSecurity-nginx-v1.0.1.tar.gz) = 
yWmnhlm7R8hJKd4LmtwfjFEqUeyd07Fiy1aK4ijT1Z4=
 SHA256 (headers-more-nginx-module-v0.33.tar.gz) = 
o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
 SHA256 (lua-nginx-module-v0.10.11.tar.gz) = 

Re: i386 failures

2020-08-24 Thread Stuart Henderson
On 2020/08/19 02:03, Brian Callahan wrote:
> 
> On Tuesday, August 18, 2020 1:59 PM, Christian Weisgerber 
>  wrote:
> 
> > On 2020-08-18, Stuart Henderson s...@spacehopper.org wrote:
> >
> > > build failures: 12
> >
> > These are the actual i386 failures:
> >
> > > audio/mscore: out of memory linking
> 
> If musescore is built on i386 with -Oz instead of -O2, then the link
> is successful.
> 
> I was able to create a working MuseScore on i386 (via vmm, X11
> accessed via TigerVNC) with this tweak. Though I'm not sure how
> desirable it is.
> 
> ~Brian
> 

I don't mind whether it's fixed or marked BROKEN but currently it is
taking an hour of build time every time and it fails reliably so it would
be good to get something done.

Thanks :)



NEW: security/libmodsecurity

2020-08-24 Thread Matthias Pitzl
Hello,

This new port is needed for adding ModSecurity support to nginx.

Excerpt from github:
 ModSecurity is an open source, cross platform web application firewall (WAF)
 engine for Apache, IIS and Nginx that is developed by Trustwave's SpiderLabs.
 It has a robust event-based programming language which provides protection from
 a range of attacks against web applications and allows for HTTP traffic
 monitoring, logging and real-time analys...

I will send an updated diff for adding the libmodsecurity connector to nginx
too.

I've sent this port a few weeks ago but haven't got an OK or further feedback
except from Stuart.

Greetings,
Matthias


libmodsecurity.tgz
Description: application/gzip


Restructure games/uqm

2020-08-24 Thread Anthony J. Bentley
Hi,

A few years ago I restructured games/openttd to split the music and
graphics into independent packages. This has made the port much easier
to manage.

Attached is a games/uqm port restructured in a similar way. Aside 
from ease of porting, this is also done out of necessity: upstream has
released new data packages (side note: consisting in rather large part 
of fixes and improvements submitted by yours truly) but no new source 
release. So the packages need to be versioned independently, which is 
a hassle with the current structure.

I made other changes to DESCR, added a README, and merged the four 
subpackages -remix1, -remix2, -remix3, -remix4 into a single uqm-remix 
package. Keeping them separate doesn't make sense because they're not 
independently controlled in the game options--it's all or nothing.

I intend to commit this in a few days.

-- 
Anthony J. Bentley


uqm.tar.gz
Description: uqm.tar.gz
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1021
diff -u -p -r1.1021 Makefile
--- Makefile23 Aug 2020 08:14:50 -  1.1021
+++ Makefile24 Aug 2020 11:34:50 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.413
+PKGNAME =  quirks-3.414
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1039
diff -u -p -r1.1039 Quirks.pm
--- files/Quirks.pm 23 Aug 2020 08:14:50 -  1.1039
+++ files/Quirks.pm 24 Aug 2020 11:34:51 -
@@ -467,6 +467,10 @@ my $stem_extensions = {
'iosevka-fonts-default' => 'iosevka',
'iosevka-fonts-term' => 'iosevka',
'py-distutils-extra' => 'py3-distutils-extra',
+   'uqm-remix1' => 'uqm-remix',
+   'uqm-remix2' => 'uqm-remix',
+   'uqm-remix3' => 'uqm-remix',
+   'uqm-remix4' => 'uqm-remix',
 };
 
 my $obsolete_reason = {


[update patch] gnuchess 6.2.5 -> 6.2.7

2020-08-24 Thread Martin Ziemer
This patch updates gnuchess from 6.2.5 to 6.2.7.

Since i saw there is no maintainer, i also added myself as maintainer.

Tested on two amd64 systems.


Index: Makefile
===
RCS file: /cvs/ports/games/gnuchess/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile12 Jul 2019 20:46:18 -  1.47
+++ Makefile24 Aug 2020 11:56:27 -
@@ -2,13 +2,14 @@
 
 COMMENT=   chess program
 
-DISTNAME=  gnuchess-6.2.5
+DISTNAME=  gnuchess-6.2.7
 DISTFILES= ${DISTNAME}.tar.gz book_1.02.pgn.gz
-REVISION=  2
 
 CATEGORIES=games
 HOMEPAGE=  http://www.gnu.org/software/chess/
 MASTER_SITES=  ${MASTER_SITE_GNU:=chess/}
+
+MAINTAINER =   Martin Ziemer 
 
 # GPLv3+
 PERMIT_PACKAGE=Yes
Index: distinfo
===
RCS file: /cvs/ports/games/gnuchess/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo3 Nov 2017 00:43:49 -   1.13
+++ distinfo24 Aug 2020 11:56:27 -
@@ -1,4 +1,4 @@
 SHA256 (book_1.02.pgn.gz) = 3qx37bBhpZJJoZ3rA9o0nK4FHlJSemy1r4CNk5jTLUQ=
-SHA256 (gnuchess-6.2.5.tar.gz) = mpnpYzVXBsqzIJnRQLaY7aneFk685ApUILG5dy3QSAI=
+SHA256 (gnuchess-6.2.7.tar.gz) = 5TZnWmGr6C5huRn2t4Z1VEHZ/NTCHhyC+55TQN0imEY=
 SIZE (book_1.02.pgn.gz) = 26265281
-SIZE (gnuchess-6.2.5.tar.gz) = 782359
+SIZE (gnuchess-6.2.7.tar.gz) = 802863



UPDATE: nextcloudclient-3.0.0

2020-08-24 Thread Adriano Barbosa
Hi,
update for nextcloudclient v3.0.0.
Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.0.0

OK?

-- 
Adriano Barbosa
Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile	12 Jul 2020 07:02:35 -	1.7
+++ Makefile	24 Aug 2020 11:50:10 -
@@ -2,7 +2,7 @@
 
 COMMENT =	desktop sync client for Nextcloud
 
-V =		2.6.5
+V =		3.0.0
 DISTNAME =	nextcloudclient-${V}
 
 GH_ACCOUNT =	nextcloud
@@ -24,6 +24,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
 WANTLIB += Qt5Network Qt5Widgets Qt5Xml c crypto m qt5keychain
 WANTLIB += sqlite3 ssl z lib/inotify/inotify
+WANTLIB += Qt5Svg Qt5Quick Qt5QuickControls2
 
 MODULES =		devel/cmake \
 			x11/qt5
@@ -38,7 +39,9 @@ RUN_DEPENDS =		devel/desktop-file-utils 
 
 LIB_DEPENDS =		databases/sqlite3 \
 			devel/libinotify \
-			security/qtkeychain
+			security/qtkeychain \
+			x11/qt5/qtsvg \
+			x11/qt5/qtquickcontrols2
 
 CONFIGURE_ARGS =	-DBUILD_SHELL_INTEGRATION_NAUTILUS=OFF \
 			-DBUILD_SHELL_INTEGRATION_DOLPHIN=OFF \
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	12 Jul 2020 07:02:35 -	1.5
+++ distinfo	24 Aug 2020 11:50:10 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-2.6.5.tar.gz) = k1OF/wcXSk2FwtTtpNBprrSqjQ5ohlss+KJMqMyIMog=
-SIZE (nextcloudclient-2.6.5.tar.gz) = 19134736
+SHA256 (nextcloudclient-3.0.0.tar.gz) = +Zv0Z8W7S2U11B8YZ0P3v8ezdqxYT4n+o+FSDSrq1/c=
+SIZE (nextcloudclient-3.0.0.tar.gz) = 19060293
Index: patches/patch-src_CMakeLists_txt
===
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt	16 Nov 2019 10:27:43 -	1.1.1.1
+++ patches/patch-src_CMakeLists_txt	24 Aug 2020 11:50:10 -
@@ -7,8 +7,8 @@ Index: src/CMakeLists.txt
  
  set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
  
--find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
-+find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent REQUIRED)
- if (Qt5Core_VERSION VERSION_LESS 5.9.0)
- message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
- endif()
+-find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
++find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED)
+ 
+ if(NOT TOKEN_AUTH_ONLY)
+ find_package(Qt5Keychain REQUIRED)
Index: patches/patch-src_gui_CMakeLists_txt
===
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_gui_CMakeLists_txt
--- patches/patch-src_gui_CMakeLists_txt	12 Jul 2020 07:02:35 -	1.3
+++ patches/patch-src_gui_CMakeLists_txt	24 Aug 2020 11:50:10 -
@@ -3,10 +3,10 @@ $OpenBSD: patch-src_gui_CMakeLists_txt,v
 Index: src/gui/CMakeLists.txt
 --- src/gui/CMakeLists.txt.orig
 +++ src/gui/CMakeLists.txt
-@@ -38,14 +38,12 @@ set(client_UI_SRCS
- addcertificatedialog.ui
- proxyauthdialog.ui
+@@ -40,14 +40,12 @@ set(client_UI_SRCS
  mnemonicdialog.ui
+ tray/Window.qml
+ tray/UserLine.qml
 -wizard/flow2authwidget.ui
  wizard/owncloudadvancedsetuppage.ui
  wizard/owncloudconnectionmethoddialog.ui
@@ -18,7 +18,7 @@ Index: src/gui/CMakeLists.txt
  )
  
  set(client_SRCS
-@@ -110,23 +108,16 @@ set(client_SRCS
+@@ -111,23 +109,16 @@ set(client_SRCS
  creds/credentialsfactory.cpp
  creds/httpcredentialsgui.cpp
  creds/oauth.cpp
@@ -42,12 +42,12 @@ Index: src/gui/CMakeLists.txt
  wizard/slideshow.cpp
  )
  
-@@ -313,7 +304,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPE
+@@ -314,7 +305,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPE
  set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
  INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
  
--target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
-+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml)
+-target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2)
  target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
  IF(BUILD_UPDATER)
  target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
Index: 

CVS: cvs.openbsd.org: ports

2020-08-24 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/08/24 04:23:58

Modified files:
net/lftp   : Makefile distinfo 
net/lftp/patches: patch-configure patch-lib_vasnprintf_c 
Added files:
net/lftp/patches: patch-src_lftp_ssl_cc 

Log message:
Update lftp to 4.9.2

OK sthen@



Re: Remove emulators/gambatte,-qt

2020-08-24 Thread Anthony J. Bentley
Hi Rafael,

Rafael Sadowski writes:
> +PKGNAME= gambatte-$V
> +REVISION=5

Spaces please.

> +#.include 

Drop the comment.

> +@conflict gambatte-<=0.5.0.571p4

No need to mark a conflict when the pkgname is identical, right?

-- 
Anthony J. Bentley



Re: something broke net/syncthing

2020-08-24 Thread Aaron Bieber


On Mon, Aug 24, 2020, at 3:38 AM, Stuart Henderson wrote:
> On 2020/08/22 00:12, Edd Barrett wrote:
> > On Sat, Aug 22, 2020 at 12:03:38AM +0100, Edd Barrett wrote:
> > > -WANTLIB += c pthread
> > 
> > I think I may have been wrong to remove this, even though `make
> > port-lib-depends-check` is happy.
> > 
> > Is that right Stuart?
> 
> You'll need to ask someone familiar with go. One of the problems with
> go ports is there is no mechanism to trigger updates when the compiler
> itself is updated (which will usually result in the built packages
> changing).
> 
> We don't really want a run dependency on the compiler but there's no
> other way to say "update this package when the compiler is updated"
> as there's no library dependency (the usual trigger for this..)
> 
>

Fwiw, jsing has a branch of upstream Go that makes the transition to using libc 
:
( https://github.com/4a6f656c/go/tree/openbsd-syscall , 
https://github.com/golang/go/issues/36435 )
Maybe we keep the wantlib until this is in our tree? Less work down the line 
maybe.



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/08/24 03:47:06

Modified files:
graphics/darktable: Makefile distinfo 
graphics/darktable/patches: patch-src_is_supported_platform_h 
graphics/darktable/pkg: PLIST 
Added files:
graphics/darktable/patches: patch-CMakeLists_txt 

patch-src_external_rawspeed_cmake_src-dependencies_cmake 

Log message:
update to darktable 3.2.1, from Asher Pasha with a few tweaks, ok rsadowski



Re: something broke net/syncthing

2020-08-24 Thread Stuart Henderson
On 2020/08/22 00:12, Edd Barrett wrote:
> On Sat, Aug 22, 2020 at 12:03:38AM +0100, Edd Barrett wrote:
> > -WANTLIB += c pthread
> 
> I think I may have been wrong to remove this, even though `make
> port-lib-depends-check` is happy.
> 
> Is that right Stuart?

You'll need to ask someone familiar with go. One of the problems with
go ports is there is no mechanism to trigger updates when the compiler
itself is updated (which will usually result in the built packages
changing).

We don't really want a run dependency on the compiler but there's no
other way to say "update this package when the compiler is updated"
as there's no library dependency (the usual trigger for this..)



Re: UPDATE fonts/work-sans-2.010

2020-08-24 Thread Anthony J. Bentley
George Rosamond writes:
> Update from 1.6 to 2.010.

Thanks, committed.

> No more OTFs, just TTFs.

Strange, but that's what upstream says in the readme, so I guess that's
just the way it is.



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Anthony J . Bentley
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2020/08/24 03:36:21

Modified files:
fonts/work-sans: Makefile distinfo 
fonts/work-sans/pkg: PLIST 

Log message:
Update to work-sans-2.010.

>From George Rosamond (maintainer); thanks!



Re: [NEW] x11/qtpass - A frontend for password-store

2020-08-24 Thread Stefan Hagen
Stefan Hagen wrote:
> Hello,
> 
> this is QtPass, a graphical front-end for pass (security/password-store).
> It comes quite handy to restructure (rename/move) password files in a 
> grown password-store.
> 
> It can use the pass utiltiy as well as the gpg/git/pwgen tools directly.

I decided to move it to the security category.
Updated port attached.

OK?

Best Regards,
Stefan


qtpass-1.3.2.tgz
Description: application/tar-gz


CVS: cvs.openbsd.org: ports

2020-08-24 Thread Jonathan Gray
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/08/24 02:59:51

Modified files:
sysutils/raspberrypi-firmware: Makefile distinfo 
sysutils/raspberrypi-firmware/pkg: PLIST 

Log message:
update to 1.20200811



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/08/24 02:01:49

Modified files:
productivity/gnucash: Makefile distinfo 
productivity/gnucash/pkg: PLIST 
Added files:
productivity/gnucash/patches: 
  
patch-gnucash_gnome-utils_gnc-component-manager_c 
  
patch-gnucash_gnome-utils_gnc-main-window_c 
Removed files:
productivity/gnucash/patches: 
  
patch-gnucash_gnome-utils_gnc-tree-view-account_c 
  
patch-gnucash_gnome-utils_gnc-tree-view-owner_c 

Log message:
Update to gnucash-4.1.



A bundle of patches to update p5-Catalyst ports

2020-08-24 Thread wen heping
Hi, ports@:

Here is a bundle of patches to update p5-Catalyst ports.
I include all these patches into 2 file.

1)new-ports-for-catalyst.tar.gz
This file include 22 new ports which required by the update of Catalyst:
www/p5-Catalyst-ActionRole-ACL
www/p5-Catalyst-Controller-ActionRole
www/p5-Catalyst-Authentication-Credential-HTTP
www/p5-Catalyst-Model-Adaptor
www/p5-Catalyst-Plugin-Session-Store-DBIC
www/p5-Catalyst-Plugin-Session-Store-Delegate
mail/p5-Catalyst-View-Email
www/p5-CatalystX-LeakChecker
www/p5-CatalystX-InjectComponent
www/p5-CatalystX-Profile
www/p5-CatalystX-REPL
devel/p5-Devel-LexAlias
devel/p5-Devel-REPL
devel/p5-MooseX-Object-Pluggable
devel/p5-Lexical-Persistence
devel/p5-Devel-StackTrace-WithLexicals
devel/p5-Carp-REPL
www/p5-HTML-FormHandler
www/p5-CatalystX-SimpleLogin
devel/p5-MooseX-RelatedClassRoles
www/p5-HTML-FormFu-MultiForm
textproc/p5-YAML-LibYAML


2) catalyst.diff.txt
This is the patch to update 16 exist Catalyst ports:
www/p5-Catalyst-Runtime
www/p5-Catalyst-Devel
devel/catalyst
www/p5-Catalyst-Plugin-Session
security/p5-Catalyst-Authentication-Store-DBIx-Class
www/p5-Catalyst-Controller-HTML-FormFu
devel/p5-Catalyst-Manual
databases/p5-Catalyst-Model-DBI
databases/p5-Catalyst-Model-DBIC-Schema
security/p5-Catalyst-Plugin-Authentication
www/p5-Catalyst-Plugin-Cache
www/p5-Catalyst-Plugin-ConfigLoader
devel/p5-Catalyst-Plugin-StackTrace
www/p5-Catalyst-Plugin-SubRequest
textproc/p5-Catalyst-View-TT
devel/p5-Test-WWW-Mechanize-Catalyst

All build well and all tests excerpt for two passed on my amd64-current
system.

Cheers !
wen
Index: www/p5-Catalyst-Runtime/Makefile
===
RCS file: /cvs/ports/www/p5-Catalyst-Runtime/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- www/p5-Catalyst-Runtime/Makefile12 Jul 2019 20:50:52 -  1.28
+++ www/p5-Catalyst-Runtime/Makefile24 Aug 2020 07:50:51 -
@@ -1,61 +1,60 @@
 # $OpenBSD: Makefile,v 1.28 2019/07/12 20:50:52 sthen Exp $
 
-COMMENT=   MVC Web Application Framework
+COMMENT=   elegant MVC Web Application Framework
 
 MODULES=   cpan
 PKG_ARCH=  *
-DISTNAME=  Catalyst-Runtime-5.90006
-REVISION=  2
+DISTNAME=  Catalyst-Runtime-5.90126
 CATEGORIES=www
 
 HOMEPAGE=  http://www.catalystframework.org/
 
-# Artistic + GPL
+# Perl
 PERMIT_PACKAGE=Yes
 
 BUILD_DEPENDS= devel/p5-Task-Weaken
 
-RUN_DEPENDS=   devel/p5-namespace-autoclean \
-   devel/p5-namespace-clean \
-   devel/p5-B-Hooks-EndOfScope>=0.08 \
+RUN_DEPENDS=   converters/p5-JSON-MaybeXS>=1.0 \
devel/p5-Class-C3-Adopt-NEXT>=0.07 \
-   devel/p5-Class-Load \
+   devel/p5-Class-Load>=0.12 \
devel/p5-Data-Dump \
devel/p5-Data-OptList \
-   devel/p5-List-MoreUtils \
+   devel/p5-Hash-MultiValue \
devel/p5-MRO-Compat \
-   devel/p5-Module-Pluggable \
-   devel/p5-Moose>=2.1204 \
+   devel/p5-Module-Pluggable>=4.7 \
+   devel/p5-Moose>=1.03 \
devel/p5-MooseX-Emulate-Class-Accessor-Fast>=0.00903 \
-   devel/p5-MooseX-Getopt>=0.30 \
-   devel/p5-MooseX-MethodAttributes>=0.25 \
+   devel/p5-MooseX-Getopt>=0.48 \
+   devel/p5-MooseX-MethodAttributes>=0.24 \
devel/p5-MooseX-Role-WithOverloading>=0.09 \
-   devel/p5-MooseX-Types \
-   devel/p5-MooseX-Types-Common \
-   devel/p5-MooseX-Types-LoadableClass \
devel/p5-Path-Class>=0.09 \
-   www/p5-Plack \
-   www/p5-Plack-Middleware-ReverseProxy \
-   www/p5-Plack-Test-ExternalServer \
+   devel/p5-Safe-Isa \
+   devel/p5-Stream-Buffered \
devel/p5-Sub-Exporter \
-   devel/p5-Tree-Simple \
+   devel/p5-Task-Weaken \
+   devel/p5-Tree-Simple>=1.15 \
devel/p5-Tree-Simple-VisitorFactory \
-   devel/p5-Try-Tiny \
-   textproc/p5-String-RewritePrefix \
-   textproc/p5-Text-SimpleTable \
-   www/p5-CGI-Simple \
+   devel/p5-Try-Tiny>=0.17 \
+   devel/p5-namespace-clean>=0.23 \
+   textproc/p5-PerlIO-utf8_strict \
+   textproc/p5-String-RewritePrefix>=0.004 \
+   textproc/p5-Text-SimpleTable>=0.03 \
+   www/p5-CGI-Struct \
+   www/p5-CGI-Simple>=1.109 \
www/p5-HTML-Parser \
-   www/p5-HTTP-Body \
-   www/p5-URI \
-   www/p5-HTTP-Request-AsCGI>=1.0 \
-   www/p5-libwww>=5.805
-
-TEST_DEPENDS=devel/p5-Class-Data-Inheritable \
-   devel/p5-MooseX-Daemonize \
-   devel/p5-Test-Exception \
-   devel/p5-YAML \
-   www/fcgi \
-  

CVS: cvs.openbsd.org: ports

2020-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/08/24 00:38:39

Modified files:
sysutils/menulibre: Makefile 
textproc/catfish: Makefile 
x11/screenkey  : Makefile 

Log message:
Dumb me, fix path to gettext-tools



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/08/24 00:15:04

Modified files:
devel/doxygen  : Makefile distinfo 
devel/doxygen/patches: patch-doc_CMakeLists_txt 

Log message:
Update doxygen to 1.8.19



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/08/24 00:14:25

Modified files:
devel/doxygen-gui: Makefile distinfo 

Log message:
Update doxygen-gui to 1.8.19



CVS: cvs.openbsd.org: ports

2020-08-24 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2020/08/24 00:02:46

Modified files:
geo/qgis   : Makefile distinfo 

Log message:
Update to qgis 3.14.15 (Pi)



[UPDATE] audio/picard 2.3.1 -> 2.4.2

2020-08-24 Thread Stefan Hagen
Hello,

this an udapte for audio/piacard from version 2.3.1 to 2.4.2.

Port changes:
- update port version
- removed revision
- added new dependency devel/py-dateutil

Application changes:
- https://picard.musicbrainz.org/changelog/

portcheck: ok
port-lib-depends-check: ok
manual test (amd64): ok

OK?

Best Regards,
Stefan


Index: audio/picard/Makefile
===
RCS file: /cvs/ports/audio/picard/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- audio/picard/Makefile   3 Jul 2020 21:12:34 -   1.35
+++ audio/picard/Makefile   24 Aug 2020 05:53:18 -
@@ -2,9 +2,8 @@
 
 COMMENT =  automatic audio files tagger using the MusicBrainz database
 
-MODPY_EGG_VERSION =2.3.1
+MODPY_EGG_VERSION =2.4.2
 DISTNAME = picard-${MODPY_EGG_VERSION}
-REVISION = 0
 
 CATEGORIES =   audio
 
@@ -26,6 +25,7 @@ MODPY_VERSION =   ${MODPY_DEFAULT_VERSION
 BUILD_DEPENDS =devel/gettext,-tools
 
 RUN_DEPENDS =  audio/chromaprint \
+   devel/py-dateutil${MODPY_FLAVOR} \
audio/py-discid${MODPY_FLAVOR} \
audio/py-mutagen${MODPY_FLAVOR} \
devel/desktop-file-utils \
Index: audio/picard/distinfo
===
RCS file: /cvs/ports/audio/picard/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- audio/picard/distinfo   20 Mar 2020 06:35:34 -  1.7
+++ audio/picard/distinfo   24 Aug 2020 05:53:18 -
@@ -1,2 +1,2 @@
-SHA256 (picard-2.3.1.tar.gz) = x9K9BaEBggssJg89B0vHRp3qvqgAwT5tx/+SwY93BWw=
-SIZE (picard-2.3.1.tar.gz) = 3072618
+SHA256 (picard-2.4.2.tar.gz) = snn1UkmeFTsQ7oG7IROMBiMSTrDeOidFcZruRPP9cQk=
+SIZE (picard-2.4.2.tar.gz) = 3373590
Index: audio/picard/pkg/PLIST
===
RCS file: /cvs/ports/audio/picard/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- audio/picard/pkg/PLIST  20 Mar 2020 06:35:34 -  1.8
+++ audio/picard/pkg/PLIST  24 Aug 2020 05:53:18 -
@@ -27,7 +27,6 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}pluginmanager.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}releasegroup.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}script.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}similarity.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}tagger.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}track.${MODPY_PYC_MAGIC_TAG}pyc
@@ -81,10 +80,12 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/${MODPY_PYCACHE}caa.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/${MODPY_PYCACHE}caa_release_group.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/${MODPY_PYCACHE}local.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/${MODPY_PYCACHE}provider.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/${MODPY_PYCACHE}whitelist.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/caa.py
 
lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/caa_release_group.py
 lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/local.py
+lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/provider.py
 lib/python${MODPY_VERSION}/site-packages/picard/coverart/providers/whitelist.py
 lib/python${MODPY_VERSION}/site-packages/picard/coverart/utils.py
 lib/python${MODPY_VERSION}/site-packages/picard/dataobj.py
@@ -100,6 +101,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}id3.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}midi.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}mp4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}vorbis.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}wav.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/picard/formats/ac3.py
@@ -120,6 +122,7 @@ lib/python${MODPY_VERSION}/site-packages