Re: CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
Ok aja


—
Antoine

> On 1 Jun 2020, at 22:01, Christopher Zimmermann  wrote:
> 
> On Mon, Jun 01, 2020 at 09:35:26PM +0200, Antoine Jacoutot wrote:
>>> On Mon, Jun 01, 2020 at 12:04:50AM -0600, Christopher Zimmermann wrote:
>>> CVSROOT:/cvs
>>> Module name:ports
>>> Changes by:chr...@cvs.openbsd.org2020/06/01 00:04:50
>>> 
>>> Modified files:
>>>math/coq   : Makefile distinfo
>>>math/coq/pkg   : PFRAG.dynlink-native PFRAG.native
>>> PFRAG.no-native PLIST
>>> 
>>> Log message:
>>> Upgrade math/coq to 8.11.1
>>> 
>>> ok daniel@
>> 
>> This seems to have broken lang/compcert:
>> 
>> ===> lang/compcert
>> ===>  Generating configure for compcert-3.7
>> ===>  Configuring for compcert-3.7
>> Testing assembler support for CFI directives... yes
>> Testing linker support for '-no-pie' / '-nopie' option... yes, '-no-pie'
>> Testing Coq... version 8.11.1 -- UNSUPPORTED
>> Error: CompCert requires one of the following Coq versions: 8.11.0, 8.10.2, 
>> 8.10.1, 8.10.0, 8.9.1, 8.9.0, 8.8.2, 8.8.1, 8.8.0
>> Testing OCaml... version 4.09.0 -- good!
> 
> This was expected. I just forgot about compcert when I committed math/coq. 
> This was my fault. daniel@ ? OK to commit below patch as already done 
> upstream?
> 
> Christopher
> 
> 
> Here's the fix:
> 
> 
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/lang/compcert/patches/patch-configure,v
> retrieving revision 1.11
> diff -u -p -r1.11 patch-configure
> --- patches/patch-configure 16 Feb 2020 04:34:23 -  1.11
> +++ patches/patch-configure 1 Jun 2020 19:54:04 -
> @@ -2,6 +2,7 @@ $OpenBSD: patch-configure,v 1.11 2020/02
> 
> 1) Fixup path locations for OpenBSD
> 2) Add configuration support for macppc and aarch64 on OpenBSD
> +3) Add Coq 8.11.1 to supported coq versions
> 
> Index: configure
> --- configure.orig
> @@ -73,6 +74,15 @@ Index: configure
>  *)
>  echo "Error: invalid eabi/system '$target' for architecture 
> AArch64." 1>&2
>  echo "$usage" 1>&2
> +@@ -530,7 +550,7 @@ missingtools=false
> + echo "Testing Coq... " | tr -d '\n'
> + coq_ver=$(${COQBIN}coqc -v 2>/dev/null | sed -n -e 's/The Coq Proof 
> Assistant, version \([^ ]*\).*$/\1/p')
> + case "$coq_ver" in
> +-  8.8.0|8.8.1|8.8.2|8.9.0|8.9.1|8.10.0|8.10.1|8.10.2|8.11.0)
> ++  8.8.0|8.8.1|8.8.2|8.9.0|8.9.1|8.10.0|8.10.1|8.10.2|8.11.0|8.11.1)
> + echo "version $coq_ver -- good!";;
> +   ?*)
> + echo "version $coq_ver -- UNSUPPORTED"
> @@ -666,14 +686,14 @@ esac
>  #
>  # Generate Makefile.config
> 
> 
> 
> 
> -- 
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1



Re: purritobin-0.1.2 - new package + dependencies

2020-06-01 Thread Aisha Tammy
On 6/1/20 6:13 PM, Brian Callahan wrote:
> Hi Aisha --
> 
> ‐‐‐ Original Message ‐‐‐
> On Sunday, May 31, 2020 10:03 PM, Aisha Tammy  wrote:
> 
>> Hi,
>>
>> I've attached the port again, with a few more fixes.
>>
>> Would love to see this added.
>>
>> A few words about this port:
>>
>> It is a minimalistic pastebin client which allows you to also
>>
>> paste encrypted texts and has a simple javascript decryptor frontend.
>>
>> It is asynchronous and allows you to limit the paste size and a
>>
>> location where the pastes are stored.
>>
>> It uses unveil and pledge to make sure that only the necessary
>>
>> folders and permissions are used.
>>
>> Really hope this can be added and would love to get any advice about
>>
>> how to improve this port :)
>>
>> Aisha
> 
> Thanks for the ports. I've attached improved versions of the ports
> that address what I'll talk about in this email. I'll take each
> separately.
> 
> usockets:
> * I see that it compiles with -std=c11, so we need to have a
>   COMPILER=base-clang ports-gcc line.
> * The Makefile has some -O3 lines, so those go. It also has some -flto
>   lines. I don't believe all our archs can support -flto at the moment
>   so I removed them too.
> * I am not sure why you create and install a shared version of this
>   library. It seems like upstream intends for this to be statically
>   linked into executables. Indeed, you don't even use the shared
>   version of the library in PurritoBin, so I think it can go.
> * Your patch to the Makefile causes everything to be recompiled at
>   fake time.
> * Not related to your port, but too bad that we are stuck using libuv
>   (it can use kqueue but it uses extensions from FreeBSD that we don't
>   have).
> 
OMG thank you so much.
I really appreciate all your help :)
I'm still new to the whole C/C++ packaging and linking and everything 
so I just gave all the options possible.

Yea, I had to look around for using EVFILT_USER not being present :(
before I had to start using libuv.
Someone had tried to port it at some point but I don't think 
it went anywhere.

> uwebsockets:
> * Upstream claims this is a web server so I moved the category to www.
>   Devel is quite full. Otherwise this port is quite straightforward.
> 
> purritobin:
> * Since you're using the static version of usocket, we can simplify
>   your depends lists.
> 
Thanks again for all of this.

Aisha

> ~Brian
> 



Re: Update lang/ecl to 20.4.24

2020-06-01 Thread Timo Myyrä
On Sun, May 31, 2020, at 10:43, Ingo Feinerer wrote:
> On Sat, May 30, 2020 at 08:32:23AM -0700, Josh Elsasser wrote:
> > Maxima needs an upstream patch to build with ecl 20.4.24. This should
> > be safe to commit now, before updating ecl.
> > 
> > diff --git a/math/maxima/patches/patch-lisp-utils_defsystem_lisp 
> > b/math/maxima/patches/patch-lisp-utils_defsystem_lisp
> > new file mode 100644
> > index 000..b3fd1683402
> > --- /dev/null
> > +++ b/math/maxima/patches/patch-lisp-utils_defsystem_lisp
> > @@ -0,0 +1,17 @@
> > +$OpenBSD$
> > +
> > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021
> > +Fix for Bug #3629, to compile with ECL 20.4.24
> > +
> > +Index: lisp-utils/defsystem.lisp
> > +--- lisp-utils/defsystem.lisp.orig
> >  lisp-utils/defsystem.lisp
> > +@@ -4152,7 +4152,7 @@ the system definition, if provided."
> > +   #+:ecl
> > +   (progn
> > + (ext:package-lock "CL" nil)
> > +-(setf (symbol-function 'lisp:require)
> > ++(setf (symbol-function 'cl:require)
> > +   (symbol-function 'new-require))
> > + (ext:package-lock "CL" t))
> > +   #+:lispworks
> > diff --git a/math/maxima/patches/patch-src_maxima_system 
> > b/math/maxima/patches/patch-src_maxima_system
> > new file mode 100644
> > index 000..5d651aa002e
> > --- /dev/null
> > +++ b/math/maxima/patches/patch-src_maxima_system
> > @@ -0,0 +1,18 @@
> > +$OpenBSD$
> > +
> > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021
> > +Fix for Bug #3629, to compile with ECL 20.4.24
> > +
> > +Index: src/maxima.system
> > +--- src/maxima.system.orig
> >  src/maxima.system
> > +@@ -80,8 +80,7 @@
> > + (let ((x (symbol-value (find-symbol 
> > "*AUTOCONF-LD-FLAGS*"
> > + (find-package 
> > "MAXIMA")
> > +   (if (and x (not (string= x ""))) (list x)))
> > +-:epilogue-code '(progn (require :defsystem)
> > +-   (cl-user::run)))
> > ++:epilogue-code '(progn (cl-user::run)))
> > + 
> > + (defun maxima-binary-pathname ()
> > +   #+clisp
> 
> Committed. Thanks for the patch!
> 
> Best regards,
> Ingo
> 
>

Did you get the maxima tests to run as well? I didn't have success yet with 
those although the compilation worked.

Timo



Re: purritobin-0.1.2 - new package + dependencies

2020-06-01 Thread Brian Callahan
Hi Aisha --

‐‐‐ Original Message ‐‐‐
On Sunday, May 31, 2020 10:03 PM, Aisha Tammy  wrote:

> Hi,
>
> I've attached the port again, with a few more fixes.
>
> Would love to see this added.
>
> A few words about this port:
>
> It is a minimalistic pastebin client which allows you to also
>
> paste encrypted texts and has a simple javascript decryptor frontend.
>
> It is asynchronous and allows you to limit the paste size and a
>
> location where the pastes are stored.
>
> It uses unveil and pledge to make sure that only the necessary
>
> folders and permissions are used.
>
> Really hope this can be added and would love to get any advice about
>
> how to improve this port :)
>
> Aisha

Thanks for the ports. I've attached improved versions of the ports
that address what I'll talk about in this email. I'll take each
separately.

usockets:
* I see that it compiles with -std=c11, so we need to have a
  COMPILER=base-clang ports-gcc line.
* The Makefile has some -O3 lines, so those go. It also has some -flto
  lines. I don't believe all our archs can support -flto at the moment
  so I removed them too.
* I am not sure why you create and install a shared version of this
  library. It seems like upstream intends for this to be statically
  linked into executables. Indeed, you don't even use the shared
  version of the library in PurritoBin, so I think it can go.
* Your patch to the Makefile causes everything to be recompiled at
  fake time.
* Not related to your port, but too bad that we are stuck using libuv
  (it can use kqueue but it uses extensions from FreeBSD that we don't
  have).

uwebsockets:
* Upstream claims this is a web server so I moved the category to www.
  Devel is quite full. Otherwise this port is quite straightforward.

purritobin:
* Since you're using the static version of usocket, we can simplify
  your depends lists.

~Brian



usockets.tgz
Description: application/compressed-tar


uwebsockets.tgz
Description: application/compressed-tar


purritobin.tgz
Description: application/compressed-tar


ok? games/sauerbraten diff add ppc

2020-06-01 Thread alexjf
Tested on current, barely playable on my machine but works fine.

Index: games/sauerbraten/Makefile
===
RCS file: /cvs/ports/games/sauerbraten/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- games/sauerbraten/Makefile  14 Jul 2019 02:16:51 -  1.8
+++ games/sauerbraten/Makefile  1 Jun 2020 22:25:16 -
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile,v 1.8 2019/07/14 02:16:51 naddy Exp $

-ONLY_FOR_ARCHS=i386 amd64
+ONLY_FOR_ARCHS=i386 amd64 macppc

 COMMENT-main=  sauerbraten client
 COMMENT-data=  sauerbraten data



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2020/06/01 15:59:54

Modified files:
audio/mpg123   : Makefile distinfo 
audio/mpg123/pkg: PLIST 

Log message:
Update to feature release 1.26.1.
In addition to many smaller changes, this adds libsyn123, a signal
generation and format conversion library.



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Kurt Miller
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/06/01 15:44:49

Modified files:
devel/gdb  : Makefile 
Added files:
devel/gdb/patches: patch-gdb_amd64obsd-tdep_c 

Log message:
Fix backtrace across signals on amd64

The 'Apply the retpoline transformation to indirect jumps in the
raw ASM' commit in 6.4 added an instruction to the sigcode.
This fixes the offset to look for sigreturn and mantains
backward compat.

maintainer timeout



new: lang/microscheme

2020-06-01 Thread James Turner
Attached is a new port for lang/microscheme. I plan on using this to
run a scheme based firmware on my atreus keyboard [0]. oks?

Information for inst:microscheme-0.9.4

Comment:
scheme subset for atmel microcontrollers

Description:
Microscheme is a Scheme subset designed for Atmel microcontrollers,
especially as found on Arduino boards.

Maintainer: James Turner 

WWW: https://ryansuchocki.github.io/microscheme/

[0] https://git.sr.ht/~technomancy/menelaus


microscheme-0.9.4.tar
Description: Unix tar archive


CVS: cvs.openbsd.org: ports

2020-06-01 Thread Joerg Jung
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/06/01 15:24:48

Modified files:
textproc/cloc  : Makefile distinfo 

Log message:
update to cloc-1.86



Re: UPDATE: games/uhexen2 1.5.9

2020-06-01 Thread Edd Barrett
On Mon, Jun 01, 2020 at 09:30:34PM +0100, Edd Barrett wrote:
> Just me?

Right, after many attempts, finally got the distfile.

Small tweaks:
 - Update pkg README about case sensitiveness of pak files.
 - patch-hw_utils_hwmaster_Makefile: no need to append nothing to vars.
 - patch-engine_hexen2_Makefile: tweak patch comment.

New patch below. What do you think? I reckon it's good to go.


Index: Makefile
===
RCS file: /cvs/ports/games/uhexen2/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:46:26 -  1.9
+++ Makefile31 May 2020 13:45:20 -
@@ -2,13 +2,12 @@
 
 COMMENT =  Hexen II: Hammer of Thyrion
 
-V =1.5.8
+V =1.5.9
 DISTNAME = hexen2source-${V}
 PKGNAME =  uhexen2-${V}
 EXTRACT_SUFX = .tgz
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
hexen2-${V}-linux-i586.tgz
-REVISION = 2
 
 CATEGORIES =   games
 HOMEPAGE = http://uhexen2.sourceforge.net/
Index: distinfo
===
RCS file: /cvs/ports/games/uhexen2/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo31 Dec 2016 10:48:00 -  1.2
+++ distinfo31 May 2020 13:45:20 -
@@ -1,4 +1,4 @@
-SHA256 (hexen2-1.5.8-linux-i586.tgz) = 
D2aTVlfAxPPjmy8IcZ/l+Sa+K5VNxYM0pl7eslDVFgM=
-SHA256 (hexen2source-1.5.8.tgz) = ++bQW0oQuC0YF/rszBiZapOybQgU/k5fbnXZSGJmBGM=
-SIZE (hexen2-1.5.8-linux-i586.tgz) = 4631311
-SIZE (hexen2source-1.5.8.tgz) = 2473776
+SHA256 (hexen2-1.5.9-linux-i586.tgz) = 
lmvSP10gvtjKyjNG5R/m8mRf3h66sqy4htQ14504ASs=
+SHA256 (hexen2source-1.5.9.tgz) = KqhMFBqCD5CHhQqs82hKX3HENEKLxXVFiZ7aG5oow+A=
+SIZE (hexen2-1.5.9-linux-i586.tgz) = 4633437
+SIZE (hexen2source-1.5.9.tgz) = 2529121
Index: patches/patch-engine_hexen2_Makefile
===
RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexen2_Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-engine_hexen2_Makefile
--- patches/patch-engine_hexen2_Makefile20 Nov 2018 21:41:00 -  
1.3
+++ patches/patch-engine_hexen2_Makefile1 Jun 2020 21:00:45 -
@@ -1,34 +1,36 @@
 $OpenBSD: patch-engine_hexen2_Makefile,v 1.3 2018/11/20 21:41:00 naddy Exp $
 
-Use standard optimisations.
+Disable internal timidity. Use standard optimisations.
 
 Index: engine/hexen2/Makefile
 --- engine/hexen2/Makefile.orig
 +++ engine/hexen2/Makefile
-@@ -133,7 +133,7 @@ USE_CODEC_MODPLUG=no
+@@ -136,7 +136,7 @@ USE_CODEC_XMP=no
  USE_CODEC_UMX=no
  # either timidity (preferred) or wildmidi (both possible
  # but not needed nor meaningful)
 -USE_CODEC_TIMIDITY=yes
 +USE_CODEC_TIMIDITY=no
  USE_CODEC_WILDMIDI=no
- # compile timidity with DLS instruments support? (no:
- # the dls code isn't good enough and isn't used in unix
-@@ -194,12 +194,7 @@ endif
- # Overrides for the default CPUFLAGS
+ # which library to use for mp3 decoding: mad or mpg123
+ MP3LIB=mad
+@@ -198,15 +198,6 @@ endif
  CPUFLAGS=$(CPU_X86)
  
--CFLAGS += -g -Wall
+ CFLAGS += -Wall
 -CFLAGS += $(CPUFLAGS)
--ifndef DEBUG
+-ifdef DEBUG
+-CFLAGS += -g
+-else
 -# optimization flags
--CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer
+-CFLAGS += -O2 -DNDEBUG=1 -ffast-math
+-# NOTE: -fomit-frame-pointer is broken with ancient gcc versions!!
+-CFLAGS += -fomit-frame-pointer
 -endif
-+CFLAGS += -Wall
  
  CPPFLAGS=
  LDFLAGS =
-@@ -384,6 +379,9 @@ ifeq ($(TARGET_OS),unix)
+@@ -405,6 +396,9 @@ ifeq ($(TARGET_OS),unix)
  # common unix:
  
  NASMFLAGS=-f elf -d_NO_PREFIX
Index: patches/patch-engine_hexen2_server_Makefile
===
RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexen2_server_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-engine_hexen2_server_Makefile
--- patches/patch-engine_hexen2_server_Makefile 31 Dec 2016 10:48:00 -  
1.2
+++ patches/patch-engine_hexen2_server_Makefile 31 May 2020 13:45:20 -
@@ -2,19 +2,22 @@ $OpenBSD: patch-engine_hexen2_server_Mak
 
 Use standard optimisations.
 
 engine/hexen2/server/Makefile.orig Mon Jul 25 06:35:24 2016
-+++ engine/hexen2/server/Makefile  Sat Dec 31 20:44:08 2016
-@@ -66,12 +66,7 @@ endif
- # Overrides for the default CPUFLAGS
+Index: engine/hexen2/server/Makefile
+--- engine/hexen2/server/Makefile.orig
 engine/hexen2/server/Makefile
+@@ -67,15 +67,6 @@ endif
  CPUFLAGS=$(CPU_X86)
  
--CFLAGS += -g -Wall
+ CFLAGS += -Wall
 -CFLAGS += $(CPUFLAGS)
--ifndef DEBUG
+-ifdef DEBUG
+-CFLAGS += -g
+-else
 -# optimization flags
--CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer
+-CFLAGS += -O2 -DNDEBUG=1 -ffast-math
+-# NOTE: -fomit-frame-pointer is broken with ancient gcc versions!!
+-CFLAGS += -fomit-frame-pointer
 -endif
-+CFLAGS += -Wall
  
  CPPFLAGS=
  LDFLAGS 

Re: UPDATE: games/uhexen2 1.5.9

2020-06-01 Thread Stuart Henderson
On 2020/06/01 21:30, Edd Barrett wrote:
> On Sun, May 31, 2020 at 03:07:12PM +0100, Edd Barrett wrote:
> > On Thu, May 28, 2020 at 04:18:04PM -0500, Paul Valencia wrote:
> > > ping.
> > 
> > This looks for the most part fine. I was unable to test because fetching the
> > tarball seems to be timing out (possible issues at sourceforge?).
> 
> I'm still unable to fetch the distfile. Tried from three different
> machines in the UK, no cigar.
> 
> Just me?
> 
> -- 
> Best Regards
> Edd Barrett
> 
> http://www.theunixzoo.co.uk
> 

The default mirror picked by sourceforge seems broken, you can fetch it from
https://netix.dl.sourceforge.net/project/uhexen2/Hammer%20of%20Thyrion/1.5.9/Source/hexen2source-1.5.9.tgz




CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 14:56:22

Modified files:
net/librenms   : Makefile 
Removed files:
net/librenms/patches: patch-LibreNMS_queuemanager_py 
  patch-LibreNMS_service_py 

Log message:
librenms: switch dependency from py-mysqlclient to py-pymysql and
drop related patches



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 14:54:46

Modified files:
databases  : Makefile 

Log message:
+py-pymsql,python3



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 14:53:57

Log message:
import databases/py-pymysql, tweak/ok jca@

PyMySQL is a pure-Python MySQL client library, based on PEP 249.
Most public APIs are compatible with mysqlclient and MySQLdb.

If you would like to use "sha256_password" or "caching_sha2_password"
for authentication, you need to also install the py3-cryptography
package.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20200601

N ports/databases/py-pymysql/Makefile
N ports/databases/py-pymysql/distinfo
N ports/databases/py-pymysql/pkg/DESCR
N ports/databases/py-pymysql/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 14:44:22

Modified files:
sysutils/snmp_exporter: Makefile distinfo 

Log message:
snmp_exporter: sync distinfo, add a reminder to the comment
reported by naddy



Re: NEW: databases/py-pymysql

2020-06-01 Thread Jeremie Courreges-Anglas
On Mon, Jun 01 2020, Stuart Henderson  wrote:
> This is a maintained pure-Python mysql/mariadb client library.
> The new version of LibreNMS wants it (I can patch around that, but
> it seems useful to have anyway). I chose not to force the optional
> dependency on py-rsa because pulls in the fairly large (and not
> pure-Python) py-cryptography.

Leaving py-cryptography out of rundeps makes sense to me, mariadb (which
is our primary target) doesn't implement those auth methods server-side.

> OK to import?

ok jca@ with the point below addressed.

> --
> PyMySQL is a pure-Python MySQL client library, based on PEP 249.
> Most public APIs are compatible with mysqlclient and MySQLdb.
>
> If you would like to use "sha256_password" or "caching_sha2_password"
> for authentication, you need to also install the ${MODPY_PY_PREFIX}rsa
> package.
> --

--8<--
russell /usr/ports/pobj/py-pymysql-0.9.3-python3/PyMySQL-0.9.3$ grep -C1 rsa  
setup.py
extras_require={
"rsa": ["cryptography"],
},
-->8--

"rsa" is the name of the extra functionality of PyMySQL which depends on
the cryptography module.  So I think you should mention py-cryptography in
pkg/DESCR, not py-rsa.

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



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Joerg Jung
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/06/01 14:37:14

Modified files:
x11/dmenu  : Makefile 

Log message:
take over baton from kn and add myself as maintainer

"feel free to go ahead" kn



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Joerg Jung
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/06/01 14:35:35

Modified files:
x11/dwm: Makefile 

Log message:
take over baton from kn and add myself as maintainer

"feel free to go ahead" kn



Re: UPDATE: games/uhexen2 1.5.9

2020-06-01 Thread Edd Barrett
On Sun, May 31, 2020 at 03:07:12PM +0100, Edd Barrett wrote:
> On Thu, May 28, 2020 at 04:18:04PM -0500, Paul Valencia wrote:
> > ping.
> 
> This looks for the most part fine. I was unable to test because fetching the
> tarball seems to be timing out (possible issues at sourceforge?).

I'm still unable to fetch the distfile. Tried from three different
machines in the UK, no cigar.

Just me?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2020/06/01 14:11:43

Modified files:
net/dbip   : Makefile.inc 
net/dbip/asn   : distinfo 
net/dbip/city  : distinfo 
net/dbip/country: distinfo 

Log message:
Update dbip to 2020-06.



Re: CVS: cvs.openbsd.org: ports

2020-06-01 Thread Christopher Zimmermann

On Mon, Jun 01, 2020 at 09:35:26PM +0200, Antoine Jacoutot wrote:

On Mon, Jun 01, 2020 at 12:04:50AM -0600, Christopher Zimmermann wrote:

CVSROOT:/cvs
Module name:ports
Changes by: chr...@cvs.openbsd.org  2020/06/01 00:04:50

Modified files:
math/coq   : Makefile distinfo
math/coq/pkg   : PFRAG.dynlink-native PFRAG.native
 PFRAG.no-native PLIST

Log message:
Upgrade math/coq to 8.11.1

ok daniel@


This seems to have broken lang/compcert:

===> lang/compcert
===>  Generating configure for compcert-3.7
===>  Configuring for compcert-3.7
Testing assembler support for CFI directives... yes
Testing linker support for '-no-pie' / '-nopie' option... yes, '-no-pie'
Testing Coq... version 8.11.1 -- UNSUPPORTED
Error: CompCert requires one of the following Coq versions: 8.11.0, 8.10.2, 
8.10.1, 8.10.0, 8.9.1, 8.9.0, 8.8.2, 8.8.1, 8.8.0
Testing OCaml... version 4.09.0 -- good!


This was expected. I just forgot about compcert when I committed 
math/coq. This was my fault. daniel@ ? OK to commit below patch as 
already done upstream?


Christopher


Here's the fix:


Index: patches/patch-configure
===
RCS file: /cvs/ports/lang/compcert/patches/patch-configure,v
retrieving revision 1.11
diff -u -p -r1.11 patch-configure
--- patches/patch-configure 16 Feb 2020 04:34:23 -  1.11
+++ patches/patch-configure 1 Jun 2020 19:54:04 -
@@ -2,6 +2,7 @@ $OpenBSD: patch-configure,v 1.11 2020/02

 1) Fixup path locations for OpenBSD
 2) Add configuration support for macppc and aarch64 on OpenBSD
+3) Add Coq 8.11.1 to supported coq versions

 Index: configure
 --- configure.orig
@@ -73,6 +74,15 @@ Index: configure
  *)
  echo "Error: invalid eabi/system '$target' for architecture AArch64." 
1>&2
  echo "$usage" 1>&2
+@@ -530,7 +550,7 @@ missingtools=false
+ echo "Testing Coq... " | tr -d '\n'
+ coq_ver=$(${COQBIN}coqc -v 2>/dev/null | sed -n -e 's/The Coq Proof 
Assistant, version \([^ ]*\).*$/\1/p')
+ case "$coq_ver" in
+-  8.8.0|8.8.1|8.8.2|8.9.0|8.9.1|8.10.0|8.10.1|8.10.2|8.11.0)
++  8.8.0|8.8.1|8.8.2|8.9.0|8.9.1|8.10.0|8.10.1|8.10.2|8.11.0|8.11.1)
+ echo "version $coq_ver -- good!";;
+   ?*)
+ echo "version $coq_ver -- UNSUPPORTED"
 @@ -666,14 +686,14 @@ esac
  #
  # Generate Makefile.config




--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1



Re: CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
On Mon, Jun 01, 2020 at 12:04:50AM -0600, Christopher Zimmermann wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   chr...@cvs.openbsd.org  2020/06/01 00:04:50
> 
> Modified files:
>   math/coq   : Makefile distinfo 
>   math/coq/pkg   : PFRAG.dynlink-native PFRAG.native 
>PFRAG.no-native PLIST 
> 
> Log message:
> Upgrade math/coq to 8.11.1
> 
> ok daniel@

This seems to have broken lang/compcert:

===> lang/compcert
===>  Generating configure for compcert-3.7
===>  Configuring for compcert-3.7
Testing assembler support for CFI directives... yes
Testing linker support for '-no-pie' / '-nopie' option... yes, '-no-pie'
Testing Coq... version 8.11.1 -- UNSUPPORTED
Error: CompCert requires one of the following Coq versions: 8.11.0, 8.10.2, 
8.10.1, 8.10.0, 8.9.1, 8.9.0, 8.8.2, 8.8.1, 8.8.0
Testing OCaml... version 4.09.0 -- good!



-- 
Antoine



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/06/01 12:27:57

Modified files:
www/youtube-dl : Makefile distinfo 

Log message:
Update to ytdl 2020.05.29

Use youtube-dl.org as MASTER_SITES (yt-dl.org has expired TLS certs)



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Juan Francisco Cantero Hurtado
CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2020/06/01 11:01:07

Modified files:
lang/cython: Makefile distinfo 
lang/cython/pkg: PLIST 

Log message:
Update to cython 0.29.19.



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2020/06/01 10:33:05

Modified files:
shells/bash-completion: Makefile 
shells/bash-completion/pkg: PLIST 

Log message:
fix misspelled SYSCONFDIR in plist



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/06/01 10:23:29

Modified files:
sysutils/ruby-puppet/6: Makefile 
sysutils/ruby-puppet/6/pkg: PLIST 

Log message:
Add missing "@option is-branch"

Noted by sthen, thanks!

Previous tarballs of this port already had it, but the imported version
lacked it, oops.



Re: [update] devel/libtermkey

2020-06-01 Thread Edd Barrett
On Sun, May 31, 2020 at 08:34:39PM -0500, Matthew Martin wrote:
> unibilium.h and termkey.h are unchanged in the updates save for a bump
> to TERMKEY_VERSION_MINOR in the latter.

Fine.

So I'm happy to commit termkey and unibilium if someone is willing to
OK.

Anyone?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Charlene Wendling
CVSROOT:/cvs
Module name:ports
Changes by: c...@cvs.openbsd.org2020/06/01 10:07:05

Modified files:
games/ioquake3 : Makefile 
games/ioquake3/patches: patch-Makefile 
games/ioquake3/pkg: README 
Added files:
games/ioquake3/patches: patch-code_qcommon_q_platform_h 

Log message:
ioquake3: add macppc support and documentation, improve QUAKE_ARCH definition

>From Alex Free , with input and hints from espie@,
sthen@, landry@ and me.

OK abieber@ (maintainer) and kirby@



Re: NOW IN CURRENT: shotcut

2020-06-01 Thread Theo Buehler
So tracey figured out it was a missing runtime dependency.

pkg_add mlt-gpl2

should fix the issue.



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 09:48:28

Modified files:
multimedia/shotcut: Makefile 

Log message:
shotcut: RUN_DEPENDS on multimedia/mlt,-gpl2 to avoid crash when opening
files. found by tracey@.



Re: NOW IN CURRENT: shotcut

2020-06-01 Thread Marc Espie
The big issue is reproducibility.

I can get shotcut to crash *eventually* with something that does not look
anywhere like what you guys are getting,

but by default, it starts perfectly fine and I have no trouble reading
videos nor playing with the timeline.

Haven't figured out what's different yet.

I'm aware of a bug in webvfx, but that only affects exporting videos is
webvfx is present, so way way way down the line.



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 09:01:26

Modified files:
net/librenms   : Makefile distinfo 
net/librenms/patches: patch-LibreNMS_Config_php 
  patch-_env_example patch-daily_sh 
  patch-misc_config_definitions_json 
net/librenms/pkg: PLIST 
Added files:
net/librenms/patches: patch-LibreNMS_queuemanager_py 
  patch-LibreNMS_service_py 

Log message:
update to librenms-1.64



NEW: databases/py-pymysql

2020-06-01 Thread Stuart Henderson
This is a maintained pure-Python mysql/mariadb client library.
The new version of LibreNMS wants it (I can patch around that, but
it seems useful to have anyway). I chose not to force the optional
dependency on py-rsa because pulls in the fairly large (and not
pure-Python) py-cryptography.

OK to import?


--
PyMySQL is a pure-Python MySQL client library, based on PEP 249.
Most public APIs are compatible with mysqlclient and MySQLdb.

If you would like to use "sha256_password" or "caching_sha2_password"
for authentication, you need to also install the ${MODPY_PY_PREFIX}rsa
package.
--


py-pymysql.tgz
Description: application/tar-gz


Re: NOW IN CURRENT: shotcut

2020-06-01 Thread prx
* Theo Buehler  le [01-06-2020 16:36:47 +0200]:
> On Mon, Jun 01, 2020 at 03:20:34PM +0200, prx wrote:
> > Hi,
> > after trying the new shotcut port, I wonder if there is any tip to read
> > video files with it. Do you convert to any format befort importing into
> > shotcut?
> > 
> > Find attached messages printed by shotcut recorded with script(1).
> > 
> > It always crash when I import a file on my machine. Below a few lines
> > that may be relevant.
> > 
> > $ sysctl -n kern.version
> > OpenBSD 6.7-current (GENERIC.MP) #234: Sun May 31 23:53:53 MDT 2020
> >  dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> > 
> > $ gdb -q shotcut shotcut.core
> > [...]
> > #0  0x01df2d3928c1 in mlt_consumer_stop () from
> > /usr/local/lib/libmlt.so.3.2
> > 
> > bt full
> > #0  0x01df2d3928c1 in mlt_consumer_stop () from 
> > /usr/local/lib/libmlt.so.3.2
> > No symbol table info available.
> 

> You will need to "pkg_add debug-mlt debug-shotcut gdb" and run egdb (not
> gdb) to make this backtrace more useful.
> 

Ok, good to know. Find attached the new backtrace. Sorry for my lack of
knowledge.

> I suspected it was due to a missing dbus, but unfortunately running
> shotcut under a dbus didn't help in my case.
> 
Indeed, I have dbus started in my .xsession.

Please let me know if I can give better report.

Regards.


Script started on Mon Jun  1 16:54:19 2020
]2;prx@moria (ttyp5) - /home/prx]1;prx@moria (ttyp5)16:54 | 
/home:62% /usr/local:60% | ~
(0) prx@moria:$ script shotcut.logless 
shotcut.log  xclip -i shotcut.logless 
shotcut.logegdb -q shotcut 
shotcut.core

[?1034hReading symbols from shotcut...Reading symbols from 
/usr/local/bin/.debug/shotcut.dbg...done.
done.
[New process 230794]
[New process 183056]
[New process 609873]
[New process 557418]
[New process 291327]
[New process 341049]
[New process 476516]
[New process 149423]
[New process 565477]
[New process 191524]
[New process 525710]
[New process 153257]
[New process 419446]
Core was generated by `shotcut'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0  mlt_consumer_stop (self=0x0) at mlt_consumer.c:1644
1644mlt_consumer.c: No such file or directory.
[Current thread is 1 (process 230794)]
(gdb) bt full
#0  mlt_consumer_stop (self=0x0) at mlt_consumer.c:1644
properties = 0x0
priv = 
#1  0x0ecdd88620a4 in Mlt::Controller::closeConsumer (this=0xed00d897830)
at 
/usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/mltcontroller.cpp:205
No locals.
#2  0x0ecdd88a0160 in Mlt::GLWidget::reconfigure (this=, 
isMulti=)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/glwidget.cpp:707
error = 
#3  0x0ecdd889f9d6 in Mlt::GLWidget::setProducer (this=0xed00d897800, 
producer=, isMulti=)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/glwidget.cpp:620
error = 
#4  0x0ecdd8838d10 in MainWindow::open (this=0xed011911c00, 
producer=0xed07a302bc0)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/mainwindow.cpp:926
ok = 
screen = 
#5  0x0ecdd883c747 in MainWindow::open (this=0xed011911c00, url=..., 
properties=0x0)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/mainwindow.cpp:1321
props = 
modified = 
checker = 
info = 
#6  0x0ecdd883dbcd in MainWindow::openVideo (this=0xed011911c00)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/mainwindow.cpp:1375
path = {static null = {}, d = 0xed025b25d80}
#7  0x0ed039ecc477 in QMetaObject::activate(QObject*, int, int, void**) ()
   from /usr/local/lib/qt5/libQt5Core.so.3.0
No symbol table info available.
#8  0x0ed039ecbb3a in QMetaObject::activate(QObject*, QMetaObject const*, 
int, void**) ()
   from /usr/local/lib/qt5/libQt5Core.so.3.0
No symbol table info available.
#9  0x0ed07f121b3d in QAction::triggered(bool) () from 
/usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#10 0x0ed07f1218d7 in QAction::activate(QAction::ActionEvent) ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#11 0x0ed07f124fb1 in ?? () from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#12 0x0ed07f44a21d in QToolButton::nextCheckState() ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#13 0x0ed07f2c5f2c in ?? () from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#14 0x0ed07f2c7939 in QAbstractButton::mouseReleaseEvent(QMouseEvent*) ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#15 0x0ed07f449a81 in QToolButton::mouseReleaseEvent(QMouseEvent*) ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#16 

Re: NOW IN CURRENT: shotcut

2020-06-01 Thread Stefan Hagen
Marc Espie wrote:
> On Mon, Jun 01, 2020 at 03:20:34PM +0200, prx wrote:
> > Hi,
> > after trying the new shotcut port, I wonder if there is any tip to read
> > video files with it. Do you convert to any format befort importing into
> > shotcut?
> > 
> > Find attached messages printed by shotcut recorded with script(1).
> 
> eval `dbus-launch --sh-syntax --exit-with-session`
> 
> in my .xsession for ages, so I haven't even noticed.
> 
> This might help, and there will be further fixes.

Hmm, i have the same behavior and dbus was already running. I didn't have the
--sh-syntyx toggle. But adding it made no difference.

Stacktrace with debug-shortcut and debug-mlt below.

puffy ~> tail -1 .xsession
/usr/local/bin/dbus-launch --sh-syntax --exit-with-session 
/usr/local/bin/spectrwm

puffy ~/work> shotcut test.mp4
[...]
[Debug  ]  "test.mp4"
[Debug  ]  begin
[Debug  ]  end
[h264 @ 0x9b97b5e] Reinit context to 1920x1088, pix_fmt: yuv420p
[h264 @ 0x9b96bb97800] Reinit context to 1920x1088, pix_fmt: yuv420p
[mov,mp4,m4a,3gp,3g2,mj2 @ 0x9b96bba3000] Value 1.00 for parameter
'seekable' out of range [-1 - 0]
[h264 @ 0x9b981c35000] Reinit context to 1920x1088, pix_fmt: yuv420p
[Debug  ]  [producer avformat] audio: total_streams 1 max_stream 1
total_channels 2 max_channels 2
[AVIOContext @ 0x9b9908bca00] Statistics: 599671 bytes read, 2 seeks
[AVIOContext @ 0x9ba20e41000] Statistics: 599671 bytes read, 2 seeks
[AVIOContext @ 0x9b9fa0a1600] Statistics: 599671 bytes read, 2 seeks
[mov,mp4,m4a,3gp,3g2,mj2 @ 0x9b9fa33a000] Value 1.00 for parameter
'seekable' out of range [-1 - 0]
[h264 @ 0x9b9835c2000] Reinit context to 1920x1088, pix_fmt: yuv420p
[h264 @ 0x9b9b6a25800] Reinit context to 1920x1088, pix_fmt: yuv420p
[mov,mp4,m4a,3gp,3g2,mj2 @ 0x9b9835c2800] Value 1.00 for parameter
'seekable' out of range [-1 - 0]
[h264 @ 0x9b9fa33a800] Reinit context to 1920x1088, pix_fmt: yuv420p
[AVIOContext @ 0x9b9fa336a00] Statistics: 599671 bytes read, 2 seeks
[Debug  ]  [producer avformat] "/home/sdk/work/test.mp4" checking
VFR: pkt.duration 3600
[h264 @ 0x9b9835c8000] Reinit context to 1920x1088, pix_fmt: yuv420p
[Debug  ]  1920 x 1080
[Debug  ]  2
[Debug  ]  2
Segmentation fault (core dumped)

puffy ~/work> egdb /usr/local/bin/shotcut shotcut.core
[...]
(gdb) bt full
#0  mlt_consumer_stop (self=0x0) at mlt_consumer.c:1644
properties = 0x0
priv = 
#1  0x01f6aca620a4 in Mlt::Controller::closeConsumer (this=0x1f8f4f1c030)
at 
/usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/mltcontroller.cpp:205
No locals.
#2  0x01f6acaa0160 in Mlt::GLWidget::reconfigure (this=, 
isMulti=)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/glwidget.cpp:707
error = 
#3  0x01f6aca9f9d6 in Mlt::GLWidget::setProducer (this=0x1f8f4f1c000, 
producer=,
isMulti=)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/glwidget.cpp:620
error = 
#4  0x01f6aca38d10 in MainWindow::open (this=0x1f9383efe00, 
producer=0x1f8f0cabc00)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/mainwindow.cpp:926
ok = 
screen = 
#5  0x01f6aca3c747 in MainWindow::open (this=0x1f9383efe00, url=..., 
properties=0x0)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/mainwindow.cpp:1321
props = 
modified = 
checker = 
info = 
#6  0x01f6aca3d204 in MainWindow::openMultiple (this=0x1f9383efe00, 
paths=...)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/mainwindow.cpp:1347
No locals.
#7  0x01f6aca266f4 in main (argc=2, argv=)
at /usr/obj/ports/shotcut-20.04.12/shotcut-20.04.12/src/main.cpp:347
a = { = {}, mainWindow = 0x1f9383efe00,
  qtTranslator = , qtBaseTranslator = ,
  shotcutTranslator = ,
  resourceArg = {> = {> = 
{}, {
p = {static shared_null = {ref = {atomic = {
_q_value = {> = 
{> = {__a_ = -1}, }, }}}, alloc = 0, begin = 0, end = 0,
array = {0x0}}, d = 0x1f93ac03220}, d = 0x1f93ac03220}}, 
},
  isFullScreen = false, appDirArg = {static null = {},
d = 0x1f98586f540 }}
result = 
splash = 

HTH,
Stefan



Re: update math/coq 8.11.1 supporting OCaml 4.10 - sparc64 testing needed

2020-06-01 Thread Jeremie Courreges-Anglas
On Wed, May 27 2020, Christopher Zimmermann  wrote:
> On May 27, 2020 2:20:54 AM GMT+02:00, Jeremie Courreges-Anglas 
>  wrote:
>>On Mon, May 25 2020, Daniel Dickman  wrote:
 On May 25, 2020, at 5:11 AM, Christopher Zimmermann
>> wrote:
 
 testing needed
 Reply-To:
 In-Reply-To: <20a364d1-d8bc-441f-9814-ebe7dfc02...@gmail.com>
 
> On Sun, May 24, 2020 at 05:23:25PM -0400, Daniel Dickman wrote:
> Jeremie reported a problem on sparc64. Is it addressed in the diff
>>below?
> 
> https://marc.info/?t=15819679343=1=2
 
 No. I forgot about this. Chances are it got fixed with Coq 8.11.1,
>>but I don't have access to sparc64 hardware. Who could test on sparc64
>>?
>>>
>>> I have a sparc64 box but it’s slow. I’ll get it started but someone
>>with a faster box will definitely beat me to it.
>>
>>Everything looks fine on sparc64, 
>
> That's great. Thanks!
>
>>except the lang/compcert change:
>>ONLY_FOR_ARCHS should be set before ".include ", else
>>it
>>is ignored.  Actually, ".include " isn't needed,
>>bsd.port.mk already includes that file, so please drop this line.
>>
>>Christopher: there's a new camlp4 release upstream with support for
>>ocaml-4.10.  Diff below tested on sparc64, if you want to pick it up.
>>Maybe you should drop MAINTAINER for this port?
>
> I would rather drop the port. We moved everything to camlp5 afaict.

The last time ocamlp4 was discussed it was pointed out that net/mldonkey
still uses it.  Upstream mldonkey handled the 4.09 and 4.10 releases:

  https://github.com/camlp4/camlp4/releases

> But if anyone wants to take maintainership, that's fine with me. I'm also ok 
> with your diff. Plist didn't change I would suspect.
>
>>ok jca@ for this ocaml update,

I should have mentioned that since camlp4 releases are tightly coupled
with OCaml releases, I have reverted the update to camlp4-4.10.

(Error message was: This version of Camlp4 is for OCaml 4.10 but you are
using OCaml 4.09.0.)

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



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/06/01 08:38:19

Modified files:
security/gnutls: Makefile distinfo 

Log message:
Handle AddTrust External Root CA certificate expiration; from upstream.



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/06/01 08:38:30

Modified files:
security/gnutls: Tag: OPENBSD_6_7 Makefile distinfo 

Log message:
Handle AddTrust External Root CA certificate expiration; from upstream.



Re: NOW IN CURRENT: shotcut

2020-06-01 Thread Theo Buehler
On Mon, Jun 01, 2020 at 03:20:34PM +0200, prx wrote:
> Hi,
> after trying the new shotcut port, I wonder if there is any tip to read
> video files with it. Do you convert to any format befort importing into
> shotcut?
> 
> Find attached messages printed by shotcut recorded with script(1).
> 
> It always crash when I import a file on my machine. Below a few lines
> that may be relevant.
> 
>   $ sysctl -n kern.version
>   OpenBSD 6.7-current (GENERIC.MP) #234: Sun May 31 23:53:53 MDT 2020
>dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> 
>   $ gdb -q shotcut shotcut.core
>   [...]
>   #0  0x01df2d3928c1 in mlt_consumer_stop () from
>   /usr/local/lib/libmlt.so.3.2
> 
>   bt full
>   #0  0x01df2d3928c1 in mlt_consumer_stop () from 
> /usr/local/lib/libmlt.so.3.2
>   No symbol table info available.

You will need to "pkg_add debug-mlt debug-shotcut gdb" and run egdb (not
gdb) to make this backtrace more useful.

I saw similar symptoms with a crash in mlt_consumer_stop() (espie has
the details). The crash was an obvious null dereference whenever I tried
to open a movie file in any format, but what's unclear is why it happens
on some systems and not on others. Working around the null deref didn't
make shotcut work, so we are still as wise as before.

I suspected it was due to a missing dbus, but unfortunately running
shotcut under a dbus didn't help in my case.

I looked at the ktrace as well but that didn't really show anything
obviously suspicious either.



Re: NOW IN CURRENT: shotcut

2020-06-01 Thread Marc Espie
On Mon, Jun 01, 2020 at 03:20:34PM +0200, prx wrote:
> Hi,
> after trying the new shotcut port, I wonder if there is any tip to read
> video files with it. Do you convert to any format befort importing into
> shotcut?
> 
> Find attached messages printed by shotcut recorded with script(1).

This doesn't help at all.
you need egdb and debug- packages to have relevant messages these days.

That said, I've had reports of this from other sources.

It seems you definitely want to have dbus running first.
I've had 

eval `dbus-launch --sh-syntax --exit-with-session`

in my .xsession for ages, so I haven't even noticed.

This might help, and there will be further fixes.




CVS: cvs.openbsd.org: ports

2020-06-01 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/06/01 08:20:48

Modified files:
lang/ocaml-camlp4: Makefile distinfo 
Added files:
lang/ocaml-camlp4/patches: patch-configure 

Log message:
Revert update to camlp4-4.10+1

Requires ocaml-4.10, just patching the configure script isn't enough.



Re: x11/dmenu: drop fonts/terminus-font from RUN_DEPENDS

2020-06-01 Thread Chris Bennett
On Sun, May 31, 2020 at 10:43:20PM +0200, Joerg Jung wrote:
> 
> IMHO this includes keeping Terminus, despite upstream dropped it long 
> time ago already. So, I’m not in favor of the proposed patch, but would
> not object, if you insist on moving on this way.
> 

My only problem is that I like Terminus, but not the particular version
automatically used. So I add that my one beforehand.
But this issue comes up in many other ports, so I am fine with any
decision. I already have to manually step in anyways.

-- 
Chris Bennett




CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 07:57:56

Modified files:
sysutils/snmp_exporter: Makefile distinfo 
sysutils/snmp_exporter/patches: patch-generator_Makefile 
sysutils/snmp_exporter/pkg: PLIST 

Log message:
update to snmp_exporter-0.18.0



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Jonathan Gray
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/06/01 07:49:25

Modified files:
sysutils/dtb   : Makefile distinfo 
sysutils/dtb/pkg: PLIST 

Log message:
update dtb to linux 5.7



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 07:44:41

Modified files:
textproc/solr  : Makefile distinfo 

Log message:
update to solr-8.5.2



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 07:42:19

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

Log message:
last update added uriMakeOwner* functions, bump SHARED_LIBS
use GH_* while there (and SUBST_VARS to stop plist changing every time)



Re: NOW IN CURRENT: shotcut

2020-06-01 Thread prx
Hi,
after trying the new shotcut port, I wonder if there is any tip to read
video files with it. Do you convert to any format befort importing into
shotcut?

Find attached messages printed by shotcut recorded with script(1).

It always crash when I import a file on my machine. Below a few lines
that may be relevant.

$ sysctl -n kern.version
OpenBSD 6.7-current (GENERIC.MP) #234: Sun May 31 23:53:53 MDT 2020
 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

$ gdb -q shotcut shotcut.core
[...]
#0  0x01df2d3928c1 in mlt_consumer_stop () from
/usr/local/lib/libmlt.so.3.2

bt full
#0  0x01df2d3928c1 in mlt_consumer_stop () from 
/usr/local/lib/libmlt.so.3.2
No symbol table info available.
#1  0x01dd14e620a4 in QList::operator= () from 
/usr/local/bin/shotcut
No symbol table info available.
#2  0x01dd14ea0160 in QList::operator= () from 
/usr/local/bin/shotcut
No symbol table info available.
#3  0x01dd14e9f9d6 in QList::operator= () from 
/usr/local/bin/shotcut
No symbol table info available.
#4  0x01dd14e38d10 in QList::detach_helper () from 
/usr/local/bin/shotcut
No symbol table info available.
#5  0x01dd14e3c747 in QList::detach_helper () from 
/usr/local/bin/shotcut
No symbol table info available.
#6  0x01dd14e3dbcd in QList::detach_helper () from 
/usr/local/bin/shotcut
No symbol table info available.
#7  0x01dfba548477 in QMetaObject::activate () from 
/usr/local/lib/qt5/libQt5Core.so.3.0
No symbol table info available.
#8  0x01dfba547b3a in QMetaObject::activate () from 
/usr/local/lib/qt5/libQt5Core.so.3.0
No symbol table info available.
#9  0x01dfc13f6b3d in QAction::triggered () from 
/usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#10 0x01dfc13f68d7 in QAction::activate () from 
/usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#11 0x01dfc13f9fb1 in QAction::qt_metacall () from 
/usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#12 0x01dfc171f21d in QToolButton::nextCheckState ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#13 0x01dfc159af2c in QAbstractButton::isCheckable ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#14 0x01dfc159c939 in QAbstractButton::mouseReleaseEvent ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#15 0x01dfc171ea81 in QToolButton::mouseReleaseEvent ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#16 0x01dfc146dd49 in QWidget::event () from 
/usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#17 0x01dfc159c720 in QAbstractButton::event () from 
/usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#18 0x01dfc171f2d9 in QToolButton::event () from 
/usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#19 0x01dfc1408e3d in QApplicationPrivate::notify_helper ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#20 0x01dfc140b94c in QApplication::notify () from 
/usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#21 0x01dfba4d90fd in QCoreApplication::notifyInternal2 ()
   from /usr/local/lib/qt5/libQt5Core.so.3.0
No symbol table info available.
#22 0x01dfba4d9e69 in QCoreApplication::sendSpontaneousEvent ()
   from /usr/local/lib/qt5/libQt5Core.so.3.0
No symbol table info available.
#23 0x01dfc1409cc0 in QApplicationPrivate::sendMouseEvent ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.

#24 0x01dfc14a9698 in QDesktopWidget::qt_metacall ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#25 0x01dfc14a7d0f in QDesktopWidget::qt_metacall ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#26 0x01dfc1408e3d in QApplicationPrivate::notify_helper ()
   from /usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#27 0x01dfc140aec9 in QApplication::notify () from 
/usr/local/lib/qt5/libQt5Widgets.so.3.0
No symbol table info available.
#28 0x01dfba4d90fd in QCoreApplication::notifyInternal2 ()
   from /usr/local/lib/qt5/libQt5Core.so.3.0
No symbol table info available.
#29 0x01dfba4d9e69 in 

Re: games/ioquake3 cvs current diffs adding ppc support

2020-06-01 Thread Alex Free
>
> You're right.
>
> > other than that it also looks good to me.
> >
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/ioquake3/Makefile,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 Makefile
> --- Makefile  12 Jul 2019 20:46:19 -  1.25
> +++ Makefile  1 Jun 2020 07:58:25 -
> @@ -1,7 +1,7 @@
>  # $OpenBSD: Makefile,v 1.25 2019/07/12 20:46:19 sthen Exp $
>
>  BROKEN-i386= need to free up a register
> -ONLY_FOR_ARCHS= amd64 i386
> +ONLY_FOR_ARCHS= amd64 i386 macppc
>
>  COMMENT= clone of the original Quake III Arena
>
> @@ -33,7 +33,7 @@ ALL_TARGET= "release"
>  USE_GMAKE=   Yes
>  NO_TEST= Yes
>
> -QUAKE_ARCH=  ${ARCH:S/amd64/x86_64/:S/i386/x86/}
> +QUAKE_ARCH=  ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/macppc/ppc/}
>  SUBST_VARS+= QUAKE_ARCH
>
>  do-install:
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/games/ioquake3/patches/patch-Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-Makefile
> --- patches/patch-Makefile16 Apr 2018 13:12:22 -  1.2
> +++ patches/patch-Makefile1 Jun 2020 07:58:25 -
> @@ -3,7 +3,16 @@ $OpenBSD: patch-Makefile,v 1.2 2018/04/1
>  Index: Makefile
>  --- Makefile.orig
>  +++ Makefile
> -@@ -743,16 +743,16 @@ ifeq ($(PLATFORM),openbsd)
> +@@ -4,7 +4,7 @@
> + # GNU Make required
> + #
> + COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]' 
> '[:lower:]' | sed -e 's/\//_/g')
> +-COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 
> 's/^arm.*/arm/')
> ++COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 
> 's/macppc/ppc/' | sed -e 's/^arm.*/arm/')
> +
> + ifeq ($(COMPILE_PLATFORM),sunos)
> +   # Solaris uname and GNU uname differ
> +@@ -769,16 +769,16 @@ ifeq ($(PLATFORM),openbsd)
>   -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
> CLIENT_CFLAGS += $(SDL_CFLAGS)
>
> @@ -23,7 +32,7 @@ Index: Makefile
>   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
>   HAVE_VM_COMPILED=true
> else
> -@@ -1525,7 +1525,6 @@ Q3CPPOBJ = \
> +@@ -1562,7 +1562,6 @@ Q3CPPOBJ = \
> $(B)/tools/cpp/eval.o \
> $(B)/tools/cpp/include.o \
> $(B)/tools/cpp/hideset.o \
> Index: patches/patch-code_qcommon_q_platform_h
> ===
> RCS file: patches/patch-code_qcommon_q_platform_h
> diff -N patches/patch-code_qcommon_q_platform_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-code_qcommon_q_platform_h   1 Jun 2020 07:58:25 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: code/qcommon/q_platform.h
> +--- code/qcommon/q_platform.h.orig
>  code/qcommon/q_platform.h
> +@@ -223,6 +223,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> +
> + #ifdef __i386__
> + #define ARCH_STRING "x86"
> ++#elif defined __ppc__
> ++#define ARCH_STRING "ppc"
> + #elif defined __amd64__
> + #undef idx64
> + #define idx64 1
> Index: pkg/README
> ===
> RCS file: /cvs/ports/games/ioquake3/pkg/README,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 README
> --- pkg/README4 Sep 2018 12:46:13 -   1.5
> +++ pkg/README1 Jun 2020 07:58:25 -
> @@ -19,3 +19,44 @@ rcctl enable ioq3ded && rcctl set ioq3de
>
>  For more information on the dedicated server see here:
>  http://wiki.ioquake3.org/Sys_Admin_Guide#Configuration_Files
> +
> +Macppc specifics
> +
> +
> +Additional configuration may be required, as noted below.
> +
> +OpenGL renderer
> +---
> +
> +The opengl2 renderer is not available on many of the supported graphics cards
> +and will prevent ioquake3 from starting with the default configuration.
> +Specifiying seta cl_renderer "opengl1" in the config file will allow use of 
> the
> +opengl1 renderer.
> +
> +16-bit textures
> +---
> +
> +Graphical issues occur when using 16-bit textures on the Radeon 9200, 9600, 
> and
> +9700. 32-bit textures should be used if this happens.
> +
> +Radeon 9700
> +---
> +
> +Weapons and fonts will not appear without specifying seta r_hdr "0" in the
> +config file. The Radeon 9200 and 9600 do not have this issue.
> +
> +Extensions should also be turned off by specifying seta r_allowExtensions "0"
> +in the config file.
> +
> +Radeon 9200
> +---
> +
> +Fullscreen requires the X11 resolution to match the one specified in the
> +ioquake3 config file. This has been tested in FVWM and Window Maker, and only
> +Window Maker displays fullscreen correctly out of the 2.
> +
> +The fastest graphics preset should be used in ioquake3. Resolution can then 
> be
> +modified from there for a playable game.
> +
> +The main menu in ioquake3 has poor performance that other parts of the game 
> do
> +not suffer from.
>
>
>
>

Excellent, thank you @charlene!



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/06/01 06:42:31

Modified files:
misc/osinfo/libosinfo: Makefile 

Log message:
Missong BDEP on textproc/gtk-doc.

spotted by naddy@



Re: Update: fonts/iosevka-fonts 2.3.3 -> 3.0.1

2020-06-01 Thread Stuart Henderson
On 2020/06/01 11:00, Edd Barrett wrote:
> Hi Chris,
> 
> On Mon, Jun 01, 2020 at 10:04:22AM +0100, Chris Rawnsley wrote:
> > FYI v2's term became v3's fixed. v3's term is more like v2's TermLig
> 
> That's fine.
> 
> > I got frustrated with CVS and just produced the patch by diff-ing two
> > directories.  Hope that's okay.
> 
> That should be OK, but it'd be better to use a diff out of cvs though.

Or git with the conversion at github.com/openbsd/ports.

> > This version includes slab for the purposes of just showing how subdir
> > can work in this context. You can easily remove SUBDIR += slab from
> > Makefile and the slab directory so that just the default family is in
> > the update.
> 
> Sorry to be a pain, but can you send a diff which does only the
> update and without any structural changes to the port directories.
> 
> As soon as you start moving things around in the ports tree, there are
> implications for `pkg_add -u` (you would at least need some @pkgpath
> markers in PLISTs). We don't want to get involved in that just yet.
> 
> > Another change was to use the ttc files instead of ttf. That results in
> > a much smaller footprint overall. Let me know if this is unacceptable.
> 
> I don't know much about ttc fonts. Are they as widely supported as ttf?
> If you want to replace ttf with ttc, at the very least they should work
> with freetype/fontconfig and thus with common applications like xterm,
> gimp, inkscape etc.

ttc files hold a collection of ttf, and allow sharing common glyphs which
can save a bunch of space. They have been supported by freetype/fontconfig
for many years and there shouldn't be a problem using them.



Re: Update: fonts/iosevka-fonts 2.3.3 -> 3.0.1

2020-06-01 Thread Chris Rawnsley
On Mon, 1 Jun 2020, at 11:00, Edd Barrett wrote:
> That should be OK, but it'd be better to use a diff out of cvs though.

Of course and it's something that I will need to do some
self-development on. I might flip-flop if I can't get it to work for
me.


> Sorry to be a pain, but can you send a diff which does only the
> update and without any structural changes to the port directories.
> 
> As soon as you start moving things around in the ports tree, there are
> implications for `pkg_add -u` (you would at least need some @pkgpath
> markers in PLISTs). We don't want to get involved in that just yet.

Sure, new patch attached. As you are going for a more conservative
upgrade I will also keep ttf as the format for now.

I have a concern that this may cause confusion given -term being renamed
to -fixed. Is there a mechanism to handle this in ports for those doing
a `pkg_add -u`? i.e. those upgrading iosevka-term receive a note about
probably wanting iosevka-fixed.


> I don't know much about ttc fonts. Are they as widely supported as ttf?
> If you want to replace ttf with ttc, at the very least they should work
> with freetype/fontconfig and thus with common applications like xterm,
> gimp, inkscape etc.

I had similar reservations but I've used fc-match(1), fc-list(1),
Firefox, Gimp and OpenOffice and all have worked with ttc.

TTC is similar to TTF with the C standing for collection. It therefore
results in a lot fewer files. Take, for example iosevka-regular.ttc,
here is the fc-list output:

iosevka-regular.ttc: Iosevka,Iosevka Extended Oblique:style=Extended 
Oblique,Regular
iosevka-regular.ttc: Iosevka,Iosevka Extended:style=Extended Italic,Italic
iosevka-regular.ttc: Iosevka,Iosevka Extended:style=Extended,Regular
iosevka-regular.ttc: Iosevka,Iosevka Oblique:style=Oblique,Regular
iosevka-regular.ttc: Iosevka:style=Italic
iosevka-regular.ttc: Iosevka:style=Regular

The shared structure also seems to have the nice benefit of large disk
space savings.

Patch follows.


Index: Makefile
===
RCS file: /cvs/ports/fonts/iosevka-fonts/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile6 Mar 2020 19:32:35 -   1.1.1.1
+++ Makefile1 Jun 2020 12:05:42 -
@@ -3,7 +3,7 @@
 COMMENT-main = slender typeface for code (default variant)
 COMMENT-term = slender typeface for code (term variant)
 
-V =2.3.3
+V =3.0.1
 PKGNAME =  iosevka-fonts-default-${V}
 PKGNAME-main = ${PKGNAME}
 PKGNAME-term = iosevka-fonts-term-${V}
@@ -12,8 +12,8 @@ PKGNAME-term =iosevka-fonts-term-${V}
 # variant (for general use) and the 'term' variant (designed for monospace
 # terminals), but more could be added later if need be. See the releases page
 # on Github for a complete list.
-DISTFILES =01-iosevka-${V}${EXTRACT_SUFX} \
-   02-iosevka-term-${V}${EXTRACT_SUFX}
+DISTFILES =ttf-iosevka-${V}${EXTRACT_SUFX} \
+   ttf-iosevka-term-${V}${EXTRACT_SUFX}
 
 CATEGORIES =   fonts x11
 
Index: distinfo
===
RCS file: /cvs/ports/fonts/iosevka-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo6 Mar 2020 19:32:35 -   1.1.1.1
+++ distinfo1 Jun 2020 12:05:42 -
@@ -1,4 +1,4 @@
-SHA256 (01-iosevka-2.3.3.zip) = zI3jyld7ih1JR9zN//ggUELkefAiOldN41kn4T9Qb5A=
-SHA256 (02-iosevka-term-2.3.3.zip) = 
APzmF0BfzNf79zFtrdP2s8yx4nbykQ6anN4S4/BYtNc=
-SIZE (01-iosevka-2.3.3.zip) = 20624208
-SIZE (02-iosevka-term-2.3.3.zip) = 16093865
+SHA256 (ttf-iosevka-3.0.1.zip) = IkQjAvkPV6F0pru7DHlxvDei5KT2bHy30RRHqrcHL60=
+SHA256 (ttf-iosevka-term-3.0.1.zip) = 
u6MwLYU09iOscg5lvGFT8uYbJHLOGvPau5r7RraaEkE=
+SIZE (ttf-iosevka-3.0.1.zip) = 51994994
+SIZE (ttf-iosevka-term-3.0.1.zip) = 51924935
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/fonts/iosevka-fonts/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main  6 Mar 2020 19:32:35 -   1.1.1.1
+++ pkg/PLIST-main  1 Jun 2020 12:05:42 -
@@ -4,6 +4,33 @@ share/fonts/
 share/fonts/iosevka/iosevka-bold.ttf
 share/fonts/iosevka/iosevka-bolditalic.ttf
 share/fonts/iosevka/iosevka-boldoblique.ttf
+share/fonts/iosevka/iosevka-extended.ttf
+share/fonts/iosevka/iosevka-extendedbold.ttf
+share/fonts/iosevka/iosevka-extendedbolditalic.ttf
+share/fonts/iosevka/iosevka-extendedboldoblique.ttf
+share/fonts/iosevka/iosevka-extendedextrabold.ttf
+share/fonts/iosevka/iosevka-extendedextrabolditalic.ttf
+share/fonts/iosevka/iosevka-extendedextraboldoblique.ttf
+share/fonts/iosevka/iosevka-extendedextralight.ttf
+share/fonts/iosevka/iosevka-extendedextralightitalic.ttf
+share/fonts/iosevka/iosevka-extendedextralightoblique.ttf

CVS: cvs.openbsd.org: ports

2020-06-01 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/06/01 05:25:38

Modified files:
devel/py3c/patches: patch-Makefile 

Log message:
Add link to PR, and sync patch

ok stsp@ (maintainer)



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/06/01 05:14:00

Modified files:
x11/gnome/gjs  : Makefile distinfo 

Log message:
update to gjs-1.64.3



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/06/01 04:52:04

Modified files:
net/isc-bind   : Tag: OPENBSD_6_7 Makefile 
net/isc-bind/files: Tag: OPENBSD_6_7 named.conf root.hint 

Log message:
isc-bind (6.7-stable): use absolute not relative paths in sample config,
relative paths have $directory prepended. drop root.hint from sample config
as a clue not to use it. update root.hint file for people who are using
it anyway. handled differently in -current (by removing most of the sample
config instead).



Re: sparc64 bulk build report

2020-06-01 Thread Stuart Henderson
On 2020/06/01 11:50, Solene Rapenne wrote:
> On Mon, 1 Jun 2020 10:42:03 +0100
> Stuart Henderson :
> 
> > A summary of the failures:
> > 
> > On 2020/06/01 02:30, k...@openbsd.org wrote:
> > > http://build-failures.rhaalovely.net/sparc64/2020-05-29/games/wrath.log
> > >  
> > 
> > cc1: error: unrecognized command line option "-msse2"
> 
> Is this because -msse2 doesn't exist on sparc64?

SSE/SSE2 only exist on i386/amd64. The code has support for building
without these but the makefile doesn't cope. This probably fixes it.

Index: Makefile
===
RCS file: /cvs/ports/games/wrath/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile25 May 2020 16:08:41 -  1.1.1.1
+++ Makefile1 Jun 2020 10:21:37 -
@@ -24,6 +24,10 @@ MAKE_FLAGS = CC="${CC}" \
CFLAGS_LIBJPEG="-I${LOCALBASE}/include 
-DLINK_TO_LIBJPEG" \
CPUOPTIMIZATIONS="${CFLAGS}"
 
+.if !(${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386)
+MAKE_FLAGS +=  CFLAGS_SSE= CFLAGS_SSE2=
+.endif
+
 USE_GMAKE =Yes
 
 NO_TEST =  Yes

> There is no chance someone play this game on sparc64 even if it could
> run, it requires good graphics performance.
> 
> would this be fine?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/wrath/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile  25 May 2020 16:08:41 -  1.1.1.1
> +++ Makefile  1 Jun 2020 09:50:22 -
> @@ -1,5 +1,7 @@
>  # $OpenBSD: Makefile,v 1.1.1.1 2020/05/25 16:08:41 solene Exp $
>  
> +BROKEN-sparc64 =cc1: error: unrecognized command line option "-msse2"
> +
>  COMMENT =client of wrath-darkplaces engine
>  
>  DISTNAME =   wrath-0.0.0.20200228

It will be broken on other archs too.

AFAIK the general policy is to build ports as long as they build even
if they are useless on an architecture. (I don't agree with that policy
but it is what we have done historically)... if that is not the case then
there are quite a lot of other ports that could be disabled to save time
in bulk builds :)



Re: Update: fonts/iosevka-fonts 2.3.3 -> 3.0.1

2020-06-01 Thread Edd Barrett
Hi Chris,

On Mon, Jun 01, 2020 at 10:04:22AM +0100, Chris Rawnsley wrote:
> FYI v2's term became v3's fixed. v3's term is more like v2's TermLig

That's fine.

> I got frustrated with CVS and just produced the patch by diff-ing two
> directories.  Hope that's okay.

That should be OK, but it'd be better to use a diff out of cvs though.

> This version includes slab for the purposes of just showing how subdir
> can work in this context. You can easily remove SUBDIR += slab from
> Makefile and the slab directory so that just the default family is in
> the update.

Sorry to be a pain, but can you send a diff which does only the
update and without any structural changes to the port directories.

As soon as you start moving things around in the ports tree, there are
implications for `pkg_add -u` (you would at least need some @pkgpath
markers in PLISTs). We don't want to get involved in that just yet.

> Another change was to use the ttc files instead of ttf. That results in
> a much smaller footprint overall. Let me know if this is unacceptable.

I don't know much about ttc fonts. Are they as widely supported as ttf?
If you want to replace ttf with ttc, at the very least they should work
with freetype/fontconfig and thus with common applications like xterm,
gimp, inkscape etc.

Thanks

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: sparc64 bulk build report

2020-06-01 Thread Solene Rapenne
On Mon, 1 Jun 2020 10:42:03 +0100
Stuart Henderson :

> A summary of the failures:
> 
> On 2020/06/01 02:30, k...@openbsd.org wrote:
> > http://build-failures.rhaalovely.net/sparc64/2020-05-29/games/wrath.log
> >  
> 
> cc1: error: unrecognized command line option "-msse2"

Is this because -msse2 doesn't exist on sparc64?

There is no chance someone play this game on sparc64 even if it could
run, it requires good graphics performance.

would this be fine?


Index: Makefile
===
RCS file: /cvs/ports/games/wrath/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile25 May 2020 16:08:41 -  1.1.1.1
+++ Makefile1 Jun 2020 09:50:22 -
@@ -1,5 +1,7 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2020/05/25 16:08:41 solene Exp $
 
+BROKEN-sparc64 =cc1: error: unrecognized command line option "-msse2"
+
 COMMENT =  client of wrath-darkplaces engine
 
 DISTNAME = wrath-0.0.0.20200228



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/06/01 03:47:53

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py3-botocore-1.16.19.



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/06/01 03:48:24

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.18.69.



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/06/01 03:48:07

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.13.19.



Re: sparc64 bulk build report

2020-06-01 Thread Stuart Henderson
A summary of the failures:

On 2020/06/01 02:30, k...@openbsd.org wrote:
> Build failures: 12
> http://build-failures.rhaalovely.net/sparc64/2020-05-29/benchmarks/hyperfine.log
> http://build-failures.rhaalovely.net/sparc64/2020-05-29/devel/snare.log

SIGSEGV in rust compiler.

> http://build-failures.rhaalovely.net/sparc64/2020-05-29/books/AsteriskTFOT.log

weird, this one built OK, no errors in log (all the port does is install a pdf)

> http://build-failures.rhaalovely.net/sparc64/2020-05-29/games/wrath.log

cc1: error: unrecognized command line option "-msse2"

> http://build-failures.rhaalovely.net/sparc64/2020-05-29/lang/hashlink.log

In file included from src/gc.c:22:
src/hl.h:247:9: error: unknown type name 'char16_t'

> http://build-failures.rhaalovely.net/sparc64/2020-05-29/mail/geary.log
> http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/gnome/seahorse.log

error: 'for' loop initial declaration used outside C99 mode

> http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/gnome/builder.log

../gnome-builder-3.36.0/src/libide/core/ide-context.c:165: undefined reference 
to `peas_engine_get_default'
../gnome-builder-3.36.0/src/libide/core/ide-context.c:165: undefined reference 
to `peas_extension_set_new'
../gnome-builder-3.36.0/src/libide/core/ide-context.c:179: undefined reference 
to `peas_extension_set_foreach'

> http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/gtk+4,-cups.log

redundant declarations (mkstemp, mktemp, truncate, etc) between stdlib.h and 
unistd.h,
our system headers are not clean enough for -Werror=redundant-decls

> http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/kde4/libkexiv2.log

/usr/obj/ports/libkexiv2-4.14.3/build-sparc64/lib/libkexiv2.so.51.0: undefined 
reference to `testVersion'

> http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/qt5/qtwebengine.log

QtWebEngine can only be built for x86, x86-64, ARM, Aarch64, and MIPSel 
architectures.

> http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/spice-gtk.log

devel/spice-protocol update -

/usr/local/include/spice-1/spice/enums.h:374: error: expected ',' or '}' before 
'__attribute__'



Re: Update: fonts/iosevka-fonts 2.3.3 -> 3.0.1

2020-06-01 Thread Chris Rawnsley
Hi Edd,

On Sun, 31 May 2020, at 09:39, Edd Barrett wrote:
> I'm indifferent as to whether we use subdirs or multi-packages, but I'd 
> appreciate the update commit being separate from adding more families.
> 
> Perhaps we can do the update to 3.0.1 first?

Sure.


> (FWIW: I use only the term variant of this font -- that's the one I 
> expected most users to want too)

FYI v2's term became v3's fixed. v3's term is more like v2's TermLig

I got frustrated with CVS and just produced the patch by diff-ing two
directories.  Hope that's okay.

This version includes slab for the purposes of just showing how subdir
can work in this context. You can easily remove SUBDIR += slab from
Makefile and the slab directory so that just the default family is in
the update.

Another change was to use the ttc files instead of ttf. That results in
a much smaller footprint overall. Let me know if this is unacceptable.

It looks like adding new families will be pretty clean with this
approach.


diff -uNpr ports_cvs/fonts/iosevka/Makefile 
ports_cvs_mytree/fonts/iosevka/Makefile
--- ports_cvs/fonts/iosevka/MakefileThu Jan  1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/Makefile Mon Jun  1 09:46:49 2020
@@ -0,0 +1,7 @@
+# $OpenBSD$
+
+SUBDIR =
+SUBDIR += main
+SUBDIR += slab
+
+.include 
diff -uNpr ports_cvs/fonts/iosevka/Makefile.inc 
ports_cvs_mytree/fonts/iosevka/Makefile.inc
--- ports_cvs/fonts/iosevka/Makefile.incThu Jan  1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/Makefile.inc Mon Jun  1 09:46:49 2020
@@ -0,0 +1,33 @@
+# $OpenBSD$
+
+V ?=   3.0.1
+DISTNAME ?=iosevka${IOSEVKA_FAMILY}-${V}
+REVISION ?=0
+
+DISTFILES ?=   ttc-${DISTNAME}${EXTRACT_SUFX}
+
+CATEGORIES ?=  fonts
+
+HOMEPAGE ?=https://typeof.net/Iosevka/
+
+MAINTAINER ?=  Edd Barrett 
+
+# SIL OFL 1.1
+PERMIT_PACKAGE ?=  Yes
+
+MASTER_SITES ?=
https://github.com/be5invis/iosevka/releases/download/v${V}/
+EXTRACT_SUFX ?=.zip
+
+NO_BUILD ?=Yes
+NO_TEST ?= Yes
+
+# distfile is a zip bomb.
+WRKDIST =  ${WRKDIR}
+
+PKG_ARCH ?=*
+
+FONTDIR ?= ${PREFIX}/share/fonts/iosevka
+
+do-install:
+   ${INSTALL_DATA_DIR} ${FONTDIR}
+   ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR}
diff -uNpr ports_cvs/fonts/iosevka/main/Makefile 
ports_cvs_mytree/fonts/iosevka/main/Makefile
--- ports_cvs/fonts/iosevka/main/Makefile   Thu Jan  1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/main/MakefileMon Jun  1 09:46:49 2020
@@ -0,0 +1,5 @@
+# $OpenBSD$
+
+COMMENT =  slender typeface for code (default family)
+
+.include 
diff -uNpr ports_cvs/fonts/iosevka/main/distinfo 
ports_cvs_mytree/fonts/iosevka/main/distinfo
--- ports_cvs/fonts/iosevka/main/distinfo   Thu Jan  1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/main/distinfoMon Jun  1 09:46:49 2020
@@ -0,0 +1,2 @@
+SHA256 (ttc-iosevka-3.0.1.zip) = XmYZjHH15Lass4P6ryUK8iUUZTQhY7LY7iyxVJldhE8=
+SIZE (ttc-iosevka-3.0.1.zip) = 14481971
diff -uNpr ports_cvs/fonts/iosevka/main/pkg/DESCR 
ports_cvs_mytree/fonts/iosevka/main/pkg/DESCR
--- ports_cvs/fonts/iosevka/main/pkg/DESCR  Thu Jan  1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/main/pkg/DESCR   Mon Jun  1 09:46:49 2020
@@ -0,0 +1,17 @@
+Coders' typeface, built from code.
+
+The default family which comes with two further variants: terminal and fixed.
+
+  - Iosevka comes with ligatures. Various symbols, like arrows and geometric,
+are wide (2-column).
+
+  - Iosevka Term is a narrower variant focusing on terminal uses. Arrows and
+geometric symbols will be narrow to follow typical terminal usages.
+
+  - Iosevka Fixed is an exact monospace font without ligatures and wide
+glyphs. Since some environments cannot interpret Iosevka or Iosevka Term
+as monospace, and have difficulties with ligatures included, you can use
+Iosevka Fixed as an alternative.
+
+Included are weights 1-9 with italic, oblique and extended styles as well as
+various stylistic sets that can be enabled by toggling font features.
diff -uNpr ports_cvs/fonts/iosevka/main/pkg/PLIST 
ports_cvs_mytree/fonts/iosevka/main/pkg/PLIST
--- ports_cvs/fonts/iosevka/main/pkg/PLIST  Thu Jan  1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/main/pkg/PLIST   Mon Jun  1 09:46:49 2020
@@ -0,0 +1,12 @@
+@comment $OpenBSD$
+share/fonts/
+@fontdir share/fonts/iosevka/
+share/fonts/iosevka/iosevka-bold.ttc
+share/fonts/iosevka/iosevka-extrabold.ttc
+share/fonts/iosevka/iosevka-extralight.ttc
+share/fonts/iosevka/iosevka-heavy.ttc
+share/fonts/iosevka/iosevka-light.ttc
+share/fonts/iosevka/iosevka-medium.ttc
+share/fonts/iosevka/iosevka-regular.ttc
+share/fonts/iosevka/iosevka-semibold.ttc
+share/fonts/iosevka/iosevka-thin.ttc
diff -uNpr ports_cvs/fonts/iosevka/slab/Makefile 
ports_cvs_mytree/fonts/iosevka/slab/Makefile
--- ports_cvs/fonts/iosevka/slab/Makefile  

[new package] mutt-wizard - automated configuration manager for neomutt

2020-06-01 Thread Aisha Tammy
Hi,
This is quite a handy package for autoconfiguration of neomutt
and other utilities. I'm hoping we can get it so that a lot of the
newcomers who want to use neomutt won't be that daunted by the dotfiles.

I've attached the port but upstream doesn't make any tagged releases, so 
I've made it using a dated format. I'm not sure what the proper method is
when adding versions to such packages.

PS: upstream calls it mutt-wizard but it needs neomutt as told by upstream.

Aisha


mutt-wizard-0.0.20200531.tar.gz
Description: application/gzip


CVS: cvs.openbsd.org: ports

2020-06-01 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2020/06/01 02:41:36

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

Log message:
fix some PORTS_PRIVSEP tidbits:
UPDATE_COOKIES and BULK_COOKIES are not generated by dpb, but if you
build stuff manually and use dpb, they can happen, and you will see error
messages in dpb logs (trying to remove them as _pbuild), so give them
to _pbuild/tweak fix-extract-permissions accordingly.

Also fix an old feature where you can force UPDATE_COOKIES into WRKDIR
which got broken a long time ago.

Thanks to solene@ for tests



sparc64 bulk build report

2020-06-01 Thread kmos
Bulk build on sparc64-0.ports.openbsd.org

Started : Fri May 29 10:30:03 MDT 2020
Finished: Mon Jun  1 02:30:24 MDT 2020
Duration: 2 Days 16 hours 0 minutes

Built using OpenBSD 6.7-current (GENERIC.MP) #0: Fri May 29 09:21:18 MDT 2020

Built 9872 packages

Number of packages built each day:
May 29: 6865
May 30: 2118
May 31: 885
Jun 1: 4



Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2020-05-29/summary.log

Build failures: 12
http://build-failures.rhaalovely.net/sparc64/2020-05-29/benchmarks/hyperfine.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/books/AsteriskTFOT.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/devel/snare.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/games/wrath.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/lang/hashlink.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/mail/geary.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/gnome/builder.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/gnome/seahorse.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/gtk+4,-cups.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/kde4/libkexiv2.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/qt5/qtwebengine.log
http://build-failures.rhaalovely.net/sparc64/2020-05-29/x11/spice-gtk.log

Recurrent failures:
 failures/benchmarks/hyperfine.log
 failures/devel/snare.log
 failures/games/wrath.log
 failures/lang/hashlink.log
 failures/mail/geary.log
 failures/x11/gnome/seahorse.log
 failures/x11/gtk+4,-cups.log
 failures/x11/kde4/libkexiv2.log
 failures/x11/qt5/qtwebengine.log

New failures:
+failures/books/AsteriskTFOT.log
+failures/x11/spice-gtk.log

Resolved failures:
-failures/graphics/krita.log
-failures/lang/elixir.log
-failures/x11/kde4/runtime,-locale.log

Packages newly built:
+audio/libgpod,
+audio/libgpod,,-python
+cad/klogic
+databases/py-ldap,python3
+devel/py-deprecation,python3
+devel/py-filetype,python3
+devel/py3c
+devel/ruby-colored2
+devel/ruby-colored2,ruby26
+graphics/krita
+lang/elixir
+mail/courier-authlib,,-ldap
+mail/courier-authlib,,-main
+mail/courier-authlib,,-mysql
+mail/courier-authlib,,-pgsql
+mail/courier-authlib,,-userdb
+mail/maildrop,postfix
+meta/kde4,,-admin
+meta/kde4,,-extras
+meta/kde4,,-games
+meta/kde4,,-network
+meta/kde4,-admin
+meta/kde4,-extras
+meta/kde4,-games
+meta/kde4,-network
+multimedia/shotcut
+productivity/kmymoney
+x11/kde4/amor
+x11/kde4/audiocd-kio
+x11/kde4/ffmpegthumbs
+x11/kde4/graphics-mobipocket
+x11/kde4/graphics-thumbnailers
+x11/kde4/jovie
+x11/kde4/kaccessible
+x11/kde4/kgamma
+x11/kde4/kgpg
+x11/kde4/kopete
+x11/kde4/kopete,-main
+x11/kde4/kpat
+x11/kde4/kppp
+x11/kde4/kscd
+x11/kde4/kuser
+x11/kde4/mplayerthumbs
+x11/kde4/pairs
+x11/kde4/pim
+x11/kde4/pim-runtime
+x11/kde4/runtime
+x11/kde4/runtime,
+x11/kde4/runtime,,-locale
+x11/kde4/runtime,,-main
+x11/kde4/runtime,-locale
+x11/kde4/runtime,-main
+x11/kde4/superkaramba
+x11/kde4/svgpart

Packages not built this time:
-devel/ruby-colored,ruby26
-games/freeciv,,-client
-sysutils/virt-manager
-x11/gnome/vinagre
-x11/gtksourceviewmm3
-x11/remmina
-x11/spice-gtk
-x11/virt-viewer



Re: games/ioquake3 cvs current diffs adding ppc support

2020-06-01 Thread Marc Espie
On Mon, Jun 01, 2020 at 09:38:32AM +0200, Landry Breuil wrote:
> On Mon, Jun 01, 2020 at 09:27:25AM +0200, Charlene Wendling wrote:
> > On Mon, 1 Jun 2020 05:24:19 +0200
> > Alex Free wrote:
> 
> 
> > +.if ${MACHINE_ARCH} == "powerpc"
> > +QUAKE_ARCH=ppc
> > +.else
> >  QUAKE_ARCH=${ARCH:S/amd64/x86_64/:S/i386/x86/}
> > +.endif
> >  SUBST_VARS+=   QUAKE_ARCH
> 
> Cosmetic comment here: i think instead of the .if .else dance, you can
> probably append :S/macppc/ppc to the existing QUAKE_ARCH assignation,
> since you already something similar in the patch-Makefile...
> 
> other than that it also looks good to me.
> 
> 
I tend to prefer look-up tables for that, and with make internals they're even
slightly more efficient

QUAKE_ARCH-amd64 =  x86_64
QUAKE_ARCH-i386 =   x86
QUAKE_ARCH-powerpc =ppc
QUAKE_ARCH-${MACHINE_ARCH} ?= ${MACHINE_ARCH}
QUAKE_ARCH =${QUAKE_ARCH-${MACHINE_ARCH}}



Re: [NEW] sysutils/fluent-bit

2020-06-01 Thread Masato Asou
From: Stuart Henderson 
Date: 2020-05-27 10:38:26

> On 2020/05/27 07:47, Landry Breuil wrote:
>> On Wed, May 27, 2020 at 01:48:55PM +0900, Masato Asou wrote:
>> > Hi,
>> > 
>> > This is a new port sysutils/fluent-bit.  Fluent bit is a Log Processor
>> > and Forwarder.
>> 
>> Great stuff, i think i had a look at it some years ago and it looked
>> very-linuxy/not that much portable.. nice that you made it.
>> 
>> some notes:
>> * why USE_NINJA=No ?
> 
> Couple of reasons. One is that they don't want the full path in traces and are
> using some gmake-specific mess to define __FILENAME__ with the 'base' source
> directory stripped off (that's easily avoided by using __FILE__ instead).
> Another is that they bundle various dependencies and are building them by
> calling $(MAKE). Also some of those dependencies use gmake-specific things.



I've applied your patch.

How about this patch.
--
ASOU Masato


fluent-bit.tgz
Description: Binary data


CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/06/01 02:04:58

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

Log message:
Update to uriparser-0.9.4.



Re: games/ioquake3 cvs current diffs adding ppc support

2020-06-01 Thread Landry Breuil
On Mon, Jun 01, 2020 at 09:27:25AM +0200, Charlene Wendling wrote:
> On Mon, 1 Jun 2020 05:24:19 +0200
> Alex Free wrote:


> +.if ${MACHINE_ARCH} == "powerpc"
> +QUAKE_ARCH=  ppc
> +.else
>  QUAKE_ARCH=  ${ARCH:S/amd64/x86_64/:S/i386/x86/}
> +.endif
>  SUBST_VARS+= QUAKE_ARCH

Cosmetic comment here: i think instead of the .if .else dance, you can
probably append :S/macppc/ppc to the existing QUAKE_ARCH assignation,
since you already something similar in the patch-Makefile...

other than that it also looks good to me.



Re: games/ioquake3 cvs current diffs adding ppc support

2020-06-01 Thread Charlene Wendling
On Mon, 1 Jun 2020 05:24:19 +0200
Alex Free wrote:

> > Sent: Sunday, May 31, 2020 at 10:43 AM
> > From: "Charlene Wendling" 
> > To: "Kirill Bychkov" 
> > Cc: "Alex Free" , "Landry Breuil"
> > , ports@openbsd.org, abie...@openbsd.org
> > Subject: Re: games/ioquake3 cvs current diffs adding ppc support
> >
> > Huh, looks my mail never made it to ports@ :D 
> > 
> > On Sun, 31 May 2020 09:43:46 +0300
> > Kirill Bychkov wrote:
> > 
> > > On Sun, May 31, 2020 02:28, Alex Free wrote:
> > > >> Sent: Saturday, May 30, 2020 at 9:45 PM
> > > >> From: "Charlene Wendling" 
> > > >> To: "Landry Breuil" 
> > > >> Cc: "Alex Free" , ports@openbsd.org,
> > > >> abie...@openbsd.org Subject: Re: games/ioquake3 cvs current
> > > >> diffs adding ppc support
> > > >>
> > > >> Hi,
> > > >>
> > > >> On Sat, 30 May 2020 09:36:25 +0200
> > > >> Landry Breuil wrote:
> > > >>
> > > >> > On Sat, May 30, 2020 at 09:09:13AM +0200, Alex Free wrote:
> > > >> > > Successfully built and tested against current.
> > > >> > >
> > > >> > > Let me know if I can do anything else to make this happen.
> > > >> > >
> > > >> > > A new file named patch-code_qcommon_q_platform_h contains
> > > >> > > the following immediately below.
> > > >> >
> > > >> > note that you can do a cvs add of that new file, and cvs diff
> > > >> > will show it.
> > > >> >
> > > >> > > Below are the CVS diffs.
> > > >> >
> > > >> > usually, when sending a diff for a port, you to the cvs diff
> > > >> > from the port directory, otherwise the person applying it
> > > >> > will have to cd to /usr or use patch -p2 in that case.
> > > >> >
> > > >> > those are not strong remarks, your diff itself is fine, it's
> > > >> > just 'best practice to get used to' if you plan to send more
> > > >> > diffs (which are always welcome!)
> > > >>
> > > >> ^ Agreed :)
> > > >>
> > > >> It builds fine on macppc indeed, there are font glitches, but i
> > > >> don't have much time to fiddle with q3config.cfg since i can't
> > > >> read options. It requires to disable HDR at least to have
> > > >> proper weapons/font textures with my Radeon 9700.
> > > 
> > > Hi,
> > > I see weapons, main menu (when option is highlighted) and console
> > > on my G5 with Radeon 9600 Pro.
> > > ok kirby@
> > > 
> > > >>
> > > >> Alex, if you had the issue and know what is needed to make
> > > >> glitches disappear, we should add it to pkg/README :)
> > > >>
> > > >> OK cwen@ either way, here is the diff as we usually expect it
> > > >> by the way.
> > > >>
> > > >> Charl?ne.
> > > >>
> > > >>
> > 
> > [diff was here]
> > 
> > > > Thank you all for informing me of how to submit things
> > > > correctly. I greatly appreciate the correct format for the
> > > > patches submitted here.
> > > >
> > > > As for the font issues, I only have one powerpc machine with
> > > > graphics acceleration support in OpenBSD 6.7. Mach64 DRI was
> > > > dropped years ago.
> > > >
> > > > My one machine has a Radeon 9200 32MB graphics card so I had to
> > > > change the renderer to opengl1 in q3cfg.cfg using the text
> > > > below.
> > > >
> > > > seta cl_renderer "opengl1"
> > > >
> > > > Also, fullscreen is scaled incorrectly on my card, it is in the
> > > > corner of the screen and not completely visible. Windowed mode
> > > > works fine, I have it set in q3cfg.cfg using the text below.
> > > >
> > > > seta r_fullscreen "0"
> > > >
> > > > As I believe we are using different renderers (9700 supports
> > > > OpenGL2.0 AFAIK), maybe the opengl1 renderer will work better? I
> > > > haven?t had any font issues on my OpenGL 1.3 card, just the
> > > > fullscreen one which I work around by setting xrandr -s 640x480.
> > > >
> > > > Another thing I think might be important, on my radeon 9200 I
> > > > have to use the fastest preset for a playable game. Resolution
> > > > can be then be changed.
> > > >
> > > > Is this good to include in the readme? I can submit a new patch
> > > > for an updated readme if that is what should be done next.
> > 
> > I think we should add a subsection that details that. See
> > /usr/ports/infrastructure/templates/README.template for the
> > format we're using.
> > 
> > It works 100% fine in fullscreen here with the standard
> > configuration and:
> > 
> > seta cl_renderer "opengl1"
> > seta r_allowExtensions "0"
> > seta r_hdr "0"
> > 
> > I can get 40-ish fps with that. The tricky part when setting up
> > graphics settings is to remember to use 32-bit depth and textures,
> > otherwise it's a complete mess.
> > 
> > I'm replying to your next mail while here:
> > 
> > > Thank you all for testing and helping in the process. What’s
> > > the next step to get this into ports? Everything works as
> > > expected, some graphics cards just need a few tweaks in the
> > > config file that should be documented.
> > 
> > Once we have a final diff that everyone agree upon, we've to wait
> > for abieber@ that maintains the port to be OK with it/commit it.
> > 
> > 
> 
> I’ve created a patch for the readme, does it cover 

CVS: cvs.openbsd.org: ports

2020-06-01 Thread Giovanni Bechis
CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2020/06/01 01:25:32

Modified files:
mail/courier-imap: Makefile distinfo 

Log message:
update to 5.0.10



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Giovanni Bechis
CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2020/06/01 01:17:28

Modified files:
mail/courier-authlib: Makefile distinfo 
mail/courier-authlib/patches: patch-Makefile_in 

Log message:
update to 0.70.0



Re: x11/dmenu: drop fonts/terminus-font from RUN_DEPENDS

2020-06-01 Thread Chris Rawnsley
On Sun, 31 May 2020, at 21:43, Joerg Jung wrote:
> IMHO this includes keeping Terminus, despite upstream dropped it long 
> time ago already. So, I’m not in favor of the proposed patch, but would
> not object, if you insist on moving on this way.

My preference is for a maintained port and a happy maintainer over what
style choices are ultimately chosen. I am happy to let things be.



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Christopher Zimmermann
CVSROOT:/cvs
Module name:ports
Changes by: chr...@cvs.openbsd.org  2020/06/01 00:51:19

Modified files:
lang/ocaml-camlp4: Makefile distinfo 
Removed files:
lang/ocaml-camlp4/patches: patch-configure 

Log message:
Update lang/ocaml-camlp4 for OCaml 4.10

ok jca@



CVS: cvs.openbsd.org: ports

2020-06-01 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/06/01 00:37:04

Modified files:
x11/gnome/gjs  : Makefile 
x11/gnome/gjs/patches: patch-meson_build 

Log message:
Tweak patch, no-undefined should not be used: it should default to the
value of b_lundef in meson(1).



Re: suckless font configuration

2020-06-01 Thread Christopher Zimmermann

On Sun, May 31, 2020 at 10:43:20PM +0200, Joerg Jung wrote:



Am 31.05.2020 um 15:49 schrieb Klemens Nanni :
Let's do one thing at a time, if others later decide to change colors
they can do so, I'd like to fix the fonts due the implied dependencies,
all else I'd like to leave the any future porter/MAINTAINER.


This topic comes up every few months for either of the suckless ports,
see archives.  Developers (e.g. tedu and myself), who are actively using
dwm have stated that they prefer to keep color patches (across suckless
ports) instead of following the randomly changing upstream colors -
think of it as principal of least surprise after upgrades.

IMHO this includes keeping Terminus, despite upstream dropped it long
time ago already. So, I’m not in favor of the proposed patch, but would
not object, if you insist on moving on this way.

Either way, I can take care of maintaining DWM.


While fixing another font issue (bitmap fonts in gtk vim with new 
pango), I figured out how to force a font upon a select program by 
fontconfig. This might be used to "configure" suckless ports at least 
fontwise.

This is how its done in `~/.fonts.conf`:

```



gvim


Ttyp0


15



```

I believe there is also a st patch to use X resources for configuration.

Christopher


--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1


CVS: cvs.openbsd.org: ports

2020-06-01 Thread Christopher Zimmermann
CVSROOT:/cvs
Module name:ports
Changes by: chr...@cvs.openbsd.org  2020/06/01 00:04:50

Modified files:
math/coq   : Makefile distinfo 
math/coq/pkg   : PFRAG.dynlink-native PFRAG.native 
 PFRAG.no-native PLIST 

Log message:
Upgrade math/coq to 8.11.1

ok daniel@



Re: purritobin-0.1.2 - new package + dependencies

2020-06-01 Thread Aisha Tammy
Hi, 

  I've attached the port again, with a few more fixes.

Would love to see this added.



A few words about this port:

  It is a minimalistic pastebin client which allows you to also 

paste encrypted texts and has a simple javascript decryptor frontend.

It is asynchronous and allows you to limit the paste size and a

location where the pastes are stored.

It uses unveil and pledge to make sure that only the necessary 

folders and permissions are used.



Really hope this can be added and would love to get any advice about

how to improve this port :)



Aisha


purritobin-0.2.1.tar.gz
Description: application/gzip


uwebsockets-0.17.6.tar.gz
Description: application/gzip


usockets-0.4.0.tar.gz
Description: application/gzip