CVS: cvs.openbsd.org: ports

2019-04-16 Thread Remi Pointel
CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2019/04/16 23:56:58

Modified files:
devel/py-xlsxwriter: Makefile distinfo 

Log message:
update XlsxWriter to 1.1.6.



UPDATE: math/fftw3

2019-04-16 Thread Rafael Sadowski
Simple update after naddy@'s GCC report.

- Tested with base clang, gcc8 and without installed /usr/bin/gcc.
- No shared lib changes (check_sym)

>From changelog (http://www.fftw.org/release-notes.html):

Fixed AVX, AVX2 for gcc-8.

"By default, FFTW 3.3.7 was broken with gcc-8. AVX and AVX2 code assumed
that the compiler honors the distinction between +0 and -0, but gcc-8
-ffast-math does not. The default CFLAGS included -ffast-math . This
release ensures that FFTW works with gcc-8 -ffast-math , and removes
-ffast-math from the default CFLAGS for good measure."

OK?

Index: Makefile
===
RCS file: /cvs/ports/math/fftw3/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile4 Nov 2017 10:29:35 -   1.33
+++ Makefile17 Apr 2019 05:21:12 -
@@ -3,7 +3,7 @@
 COMMENT-main=  C routines for computing the Discrete Fourier Transform
 COMMENT-common=common files for the fftw3 packages
 
-V= 3.3.7
+V= 3.3.8
 DISTNAME=  fftw-${V}
 PKGNAME=   fftw3-${V}
 FULLPKGNAME-main=  fftw3-${V}
Index: distinfo
===
RCS file: /cvs/ports/math/fftw3/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo4 Nov 2017 10:29:35 -   1.10
+++ distinfo17 Apr 2019 05:21:12 -
@@ -1,2 +1,2 @@
-SHA256 (fftw-3.3.7.tar.gz) = O2Cbf+ulIw6PbdjSRd2++sMkxaauQYaUdnDZrCzSVXM=
-SIZE (fftw-3.3.7.tar.gz) = 4105807
+SHA256 (fftw-3.3.8.tar.gz) = YRMmL26Sxb1HTyh1+hsBBUxK1QQPaw2nwDyYgh2a4wM=
+SIZE (fftw-3.3.8.tar.gz) = 4110137
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/math/fftw3/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST-main
--- pkg/PLIST-main  23 Mar 2016 21:14:58 -  1.3
+++ pkg/PLIST-main  17 Apr 2019 05:21:12 -
@@ -1,3 +1,7 @@
 @comment $OpenBSD: PLIST-main,v 1.3 2016/03/23 21:14:58 naddy Exp $
 %%double%%
+lib/cmake/
+lib/cmake/fftw3/
+lib/cmake/fftw3/FFTW3Config.cmake
+lib/cmake/fftw3/FFTW3ConfigVersion.cmake
 %%float%%



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Jonathan Gray
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2019/04/16 20:24:57

Modified files:
sysutils/raspberrypi-firmware: Makefile distinfo 

Log message:
update to 1.20190401



gnucash 3.5 use after free crash when closing account tab

2019-04-16 Thread myportslist20190323
Hi, ports, gnucash crashes for me with use after free error whenever
I close an account tab. It runs fine otherwise.

This started months ago for me while running current around the
time of 6.4. I'm sorry to be so late in reporting it. It happens
on three different machines. I've uninstalled and reinstalled
gnucash and tried it from many snapshots. It happens even if I
create a new gnucash file, open a few tabs, then try closing one
(this is what I do in the example below).

Please let me know if I can provide further information. Thanks for
your help!

johannesv$ gnucash --version

GnuCash 3.5
Build ID: 3.5+(2019-03-30)

johannesv$ sysctl kern.version

kern.version=OpenBSD 6.5 (GENERIC.MP) #849: Wed Apr 10 04:03:54 MDT 2019
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP


# Here I start gnucash, open a couple tabs, then try to close one:

johannesv$ gnucash
gnucash(97036) in free(): use after free 0xd5f9774d80
Abort trap (core dumped)

# with gdb and (gdb) bt:

johannesv$ gdb gnucash -c gnucash.core
GNU gdb 6.3
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB.  Type "show warranty" for details.
This GDB was configured as "amd64-unknown-openbsd6.5"...
(no debugging symbols found)

Core was generated by `gnucash'.
Program terminated with signal 6, Aborted.
Reading symbols from /usr/lib/libpthread.so.26.1...done.
Loaded symbols for /usr/lib/libpthread.so.26.1
Loaded symbols for /usr/local/bin/gnucash
Reading symbols from /usr/local/lib/libgnc-gnome.so.1.0...done.
Loaded symbols for /usr/local/lib/libgnc-gnome.so.1.0
Reading symbols from /usr/local/lib/libguile-2.2.so.0.2...done.
Loaded symbols for /usr/local/lib/libguile-2.2.so.0.2
Reading symbols from /usr/local/lib/libgc.so.4.0...done.
Loaded symbols for /usr/local/lib/libgc.so.4.0
Reading symbols from /usr/local/lib/libglib-2.0.so.4201.1...done.
Loaded symbols for /usr/local/lib/libglib-2.0.so.4201.1
Reading symbols from /usr/local/lib/libintl.so.6.0...done.
Loaded symbols for /usr/local/lib/libintl.so.6.0
Reading symbols from /usr/local/lib/libgtk-3.so.2201.0...done.
Loaded symbols for /usr/local/lib/libgtk-3.so.2201.0
Reading symbols from /usr/local/lib/libgdk-3.so.2201.1...done.
Loaded symbols for /usr/local/lib/libgdk-3.so.2201.1
Reading symbols from /usr/local/lib/libpangocairo-1.0.so.3800.1...done.
Loaded symbols for /usr/local/lib/libpangocairo-1.0.so.3800.1
Reading symbols from /usr/local/lib/libpango-1.0.so.3800.2...done.
Loaded symbols for /usr/local/lib/libpango-1.0.so.3800.2
Reading symbols from /usr/local/lib/libatk-1.0.so.21809.2...done.
Loaded symbols for /usr/local/lib/libatk-1.0.so.21809.2
Reading symbols from /usr/local/lib/libcairo-gobject.so.2.0...done.
Loaded symbols for /usr/local/lib/libcairo-gobject.so.2.0
Reading symbols from /usr/local/lib/libcairo.so.13.0...done.
Loaded symbols for /usr/local/lib/libcairo.so.13.0
Reading symbols from /usr/local/lib/libgdk_pixbuf-2.0.so.3200.1...done.
Loaded symbols for /usr/local/lib/libgdk_pixbuf-2.0.so.3200.1
Reading symbols from /usr/local/lib/libgio-2.0.so.4200.8...done.
Loaded symbols for /usr/local/lib/libgio-2.0.so.4200.8
Reading symbols from /usr/local/lib/libgobject-2.0.so.4200.8...done.
Loaded symbols for /usr/local/lib/libgobject-2.0.so.4200.8
Reading symbols from /usr/local/lib/gnucash/libgncmod-ledger-core.so...done.
Loaded symbols for /usr/local/lib/gnucash/libgncmod-ledger-core.so
Reading symbols from /usr/local/lib/gnucash/libgncmod-report-gnome.so...done.
Loaded symbols for /usr/local/lib/gnucash/libgncmod-report-gnome.so
Reading symbols from /usr/local/lib/gnucash/libgncmod-html.so...done.
Loaded symbols for /usr/local/lib/gnucash/libgncmod-html.so
Reading symbols from /usr/local/lib/libwebkit2gtk-4.0.so.3.0...done.
Loaded symbols for /usr/local/lib/libwebkit2gtk-4.0.so.3.0
Reading symbols from /usr/local/lib/libsoup-2.4.so.10.2...done.
Loaded symbols for /usr/local/lib/libsoup-2.4.so.10.2
Reading symbols from /usr/local/lib/libjavascriptcoregtk-4.0.so.3.0...done.
Loaded symbols for /usr/local/lib/libjavascriptcoregtk-4.0.so.3.0
Reading symbols from /usr/local/lib/gnucash/libgncmod-report-system.so...done.
Loaded symbols for /usr/local/lib/gnucash/libgncmod-report-system.so
Reading symbols from /usr/local/lib/gnucash/libgncmod-register-gnome.so...done.
Loaded symbols for /usr/local/lib/gnucash/libgncmod-register-gnome.so
Reading symbols from /usr/local/lib/gnucash/libgncmod-register-core.so...done.
Loaded symbols for /usr/local/lib/gnucash/libgncmod-register-core.so
Reading symbols from /usr/local/lib/gnucash/libgncmod-gnome-search.so...done.
Loaded symbols for /usr/local/lib/gnucash/libgncmod-gnome-search.so
Reading symbols from /usr/local/lib/gnucash/libgncmod-gnome-utils.so...done.
Loaded symbols for 

Re: More ports that break without /usr/bin/gcc

2019-04-16 Thread Daniel Dickman



> On Apr 16, 2019, at 5:47 PM, Christian Weisgerber  wrote:
> 
> I removed /usr/bin/gcc and ran a test build on amd64.  These ports
> broke because they have calls to "gcc" hardcoded somewhere:
> 
> lang/compcert

this one’s an easy fix. i’ll take care of it.

> lang/nim
> math/fftw3
> misc/rocrail
> 
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de
> 



More ports that break without /usr/bin/gcc

2019-04-16 Thread Christian Weisgerber
I removed /usr/bin/gcc and ran a test build on amd64.  These ports
broke because they have calls to "gcc" hardcoded somewhere:

lang/compcert
lang/nim
math/fftw3
misc/rocrail

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



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2019/04/16 14:48:28

Modified files:
security   : Makefile 

Log message:
hook up pixiewps and reaver



Re: NEW: devel/llvm (Extra Clang Tools)

2019-04-16 Thread Rafael Sadowski
On Tue Apr 02, 2019 at 11:08:13AM +0200, Jeremie Courreges-Anglas wrote:
> On Mon, Apr 01 2019, Rafael Sadowski  wrote:
> > On Mon Apr 01, 2019 at 12:04:38PM +0200, Jeremie Courreges-Anglas wrote:
> >> On Mon, Apr 01 2019, Rafael Sadowski  wrote:
> >> > Enable clang extra tools in devel/llvm to provide some useful C/C++
> >> > tools. I started with the extra tools because we don't have an C++ 
> >> > Language
> >> > Server Protocol (LSP) server in the tree but I want to play with it.
> >> >
> >> > However, build and works fine on amd64. Notable changes:
> >> >
> >> > - Zap all ":Bool" tags in cmake configure args. It's 2019 and cmake is
> >> >   smart enough.
> >> 
> >> I'm no cmake guru, what do the cmake authors/best practices say here?
> >
> > https://cmake.org/cmake/help/v3.6/manual/cmake.1.html See -D:
> >
> > "If the : portion is given it must be one of the types specified
> > by the set() command documentation for its CACHE signature."
> >
> > Okay this is useless in almost all our cases because what we do is to
> > modify an option()[1] and NOT a set() with a type.
> >
> > For example, LLVM_ENABLE_RTTI is in llvm defined as:
> >
> >  option(LLVM_ENABLE_RTTI "Enable run time type information" OFF)
> >
> > and we can read the following in [1]:
> >
> > "Provide an option for the user to select as ON or OFF. If no initial
> > value is provided, OFF is used."
> >
> > I see no type hint. So the best practices should be:
> >
> > Use ON and OFF without a type!
> > ^^
> >
> > This is the reason why other stuff works also:
> >
> > From logical-expressions:
> > $
> >
> > Converts string to 0 or 1 according to the rules of the if()
> > command. Evaluates to 0 if any of the following is true:
> >
> > - string is empty,
> > - string is a case-insensitive equal of 0, FALSE, OFF, N, NO, IGNORE, 
> > or NOTFOUND, or
> > - string ends in the suffix -NOTFOUND (case-sensitive).
> >
> > Otherwise evaluates to 1.
> >
> > 1: https://cmake.org/cmake/help/v3.0/command/option.html?highlight=option
> > 2: 
> > https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#logical-expressions
> 
> Hmmk so using just ON/OFF just looks cleaner.  Unless someone goes on
> a rampage to unify all cmake CONFIGURE_ARGS in the tree, I'd prefer to
> minimize churn and keep llvm consistent.
> 
> >> 
> >> > - Set CLANG_ENABLE_STATIC_ANALYZER=True, CLANG_INCLUDE_TESTS=True to
> >> >   build clang-tidy and enable test. (It is ignored if the folder extra
> >> >   don't exists)
> >> > - Adjust WANTLIB
> >> >
> >> > Comments? OK?
> >> 
> >> In this port I'm caring mostly about what is actually used by the ports
> >> tree.  So if the extras subpackage breaks somehow, expect me to disable
> >> it, not to fix it.
> >
> > I'll take care of -extras
> 
> We still need to ensure that -extras builds reliably, and that it builds
> on non-amd64.  That's the main reason why I prefer to postpone this
> after 6.5.
> 
> >> 
> >> You say you "want to play with it".  Do you have an actual use case?
> >> I think it's too late to add "extra" stuff in this release cycle.
> >
> > Clang-tidy and clangd worked-out-of box with qt-creator and a camke+c/c++
> > project.
> >
> > My future use-case is clangd+vim = c++ autocomplete. But qt-creator
> > proves to me that it works, now.
> >
> >> 
> >> Comments inline,
> >> 
> >
> > New diff with Stuart'S notes. Thanks Stuart.
> 
> Stuart also had valid points about DESCR and PLIST. ;)
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 

New diff with following changes:

- Rename extras to clang-extras
- More generic aka. lazy DESCR
- Sorted PLIST


Index: Makefile
===
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.216
diff -u -p -u -p -r1.216 Makefile
--- Makefile9 Mar 2019 06:18:11 -   1.216
+++ Makefile16 Apr 2019 20:42:06 -
@@ -8,9 +8,10 @@ ONLY_FOR_ARCHS = ${LLVM_ARCHS}
 
 DPB_PROPERTIES = parallel
 
-MULTI_PACKAGES =   -main -python -lldb
+MULTI_PACKAGES =   -main -python -lldb -clang-extras
 COMMENT-main = modular, fast C/C++/ObjC compiler, static analyzer and tools
 COMMENT-lldb = LLDB debugger
+COMMENT-clang-extras = clang extra tools
 COMMENT-python =   Python bindings for Clang
 
 LLVM_V =   7.0.1
@@ -20,13 +21,15 @@ PKGSPEC-main =  llvm-=${LLVM_V}
 PKGNAME-main = llvm-${LLVM_V}
 PKGNAME-python =   py-llvm-${LLVM_V}
 PKGNAME-lldb = lldb-${LLVM_V}
+PKGNAME-clang-extras = clang-extras-${LLVM_V}
 REVISION-main =9
 REVISION-lldb =0
 CATEGORIES =   devel
 DISTFILES =llvm-${LLVM_V}.src${EXTRACT_SUFX} \
cfe-${LLVM_V}.src${EXTRACT_SUFX} \
lld-${LLVM_V}.src${EXTRACT_SUFX} \
-   lldb-${LLVM_V}.src${EXTRACT_SUFX}
+   lldb-${LLVM_V}.src${EXTRACT_SUFX} \
+   clang-tools-extra-${LLVM_V}.src${EXTRACT_SUFX}
 

CVS: cvs.openbsd.org: ports

2019-04-16 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2019/04/16 14:45:43

Log message:
import reaver

Reaver implements a brute force attack against Wifi Protected Setup
(WPS) registrar PINs in order to recover WPA/WPA2 passphrases, as
described in Brute forcing Wi-Fi Protected Setup When poor design meets
poor implementation. by Stefan Viehboeck.  Reaver has been designed to
be a robust and practical attack against Wi-Fi Protected Setup (WPS)
registrar PINs in order to recover WPA/WPA2 passphrases and has been
tested against a wide variety of access points and WPS implementations.
Depending on the target's Access Point (AP), to recover the plain text
WPA/WPA2 passphrase the average amount of time for the transitional
online brute force method is between 4-10 hours. In practice, it will
generally take half this time to guess the correct WPS pin and recover
the passphrase. When using the offline attack, if the AP is vulnerable,
it may take only a matter of seconds to minutes.

feedback and OK already some time ago sthen@, gonzalo@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20190416

N ports/security/reaver/Makefile
N ports/security/reaver/distinfo
N ports/security/reaver/patches/patch-src_80211_c
N ports/security/reaver/patches/patch-src_builder_c
N ports/security/reaver/patches/patch-src_iface_c
N ports/security/reaver/patches/patch-src_lwe_iwlib_h
N ports/security/reaver/patches/patch-src_config_mak_in
N ports/security/reaver/pkg/DESCR
N ports/security/reaver/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2019/04/16 14:38:52

Log message:
import pixiewps:

Pixiewps is a tool written in C used to bruteforce offline the WPS PIN
exploiting the low or non-existing entropy of some software
implementations, the so-called "pixie-dust attack" discovered by
Dominique Bongard in summer 2014. It is meant for educational purposes
only.

As opposed to the traditional online brute-force attack, implemented in
tools like Reaver or Bully which aim to recover the pin in a few hours,
this method can get the PIN in only a matter of seconds or minutes,
depending on the target, if vulnerable.

feedback and OK already a while ago sthen@, gonzalo@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20190416

N ports/security/pixiewps/Makefile
N ports/security/pixiewps/distinfo
N ports/security/pixiewps/pkg/DESCR
N ports/security/pixiewps/pkg/PLIST

No conflicts created by this import



Fwd: NEW: textproc/pecl-yaml

2019-04-16 Thread Stuart Henderson
Any OKs? thanks!

--- Begin Message ---

pecl-yaml provides PHP support for YAML 1.1 (YAML Ain't Markup Language)
serialization using the LibYAML library.


OK to import?



pecl-yaml.tgz
Description: application/tar-gz
--- End Message ---


Re: [MAINTAINER] Drop maintainership on personal ports

2019-04-16 Thread Stuart Henderson
On 2019/04/16 20:43, Donovan Watteau wrote:
> Hi,
> 
> I'd like to stop being the MAINTAINER of the following ports:
> 
> archivers/innoextract
> audio/cmus
> audio/flac123
> audio/libdiscid
> editors/elvis
> games/golly
> games/teeworlds
> misc/reprepro (this one can probably be just removed)
> sysutils/dosfstools
> 
> (I just don't have the desire to contribute through mailing-lists,
> bumping/pinging stuff and so on, nowadays.)
> 
> People wishing to maintain them can find some update proposals on
> ports@. Feel free to email me if you have any question about the way I
> was maintaining them.
> 
> Thanks to everyone who gave me their time here, over the years!
> 
> Cheers,
> Donovan
> 

Thanks, I've reset MAINTAINER on these.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2019/04/16 14:19:02

Modified files:
archivers/innoextract: Makefile 
audio/cmus : Makefile 
audio/flac123  : Makefile 
audio/libdiscid: Makefile 
editors/elvis  : Makefile 
games/golly: Makefile 
games/teeworlds: Makefile 
misc/reprepro  : Makefile 
sysutils/dosfstools: Makefile 

Log message:
drop Donovan Watteau as maintainer as requested
(plus a little COMPILER tidying while there)



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2019/04/16 14:13:09

Modified files:
geo/osm2pgsql  : Makefile 
geo/qlandkartegt: Makefile 
geo/spatialite : Makefile.inc 
geo/spatialite/gis: Makefile 
geo/spatialite/gui: Makefile 
geo/mapserver  : Makefile 
geo/libosmium  : Makefile 
geo/merkaartor : Makefile 
comms/xastir   : Makefile 

Log message:
Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 to CFLAGS/CXXFLAGS where
appropriate in various devel/proj consumers to fix build with upcoming
proj 6 update, which will be commited in a month or so.

Thx to https://github.com/OSGeo/proj.4/wiki/proj.h-adoption-status for
linking the various upstream issues about it.



UPDATE: multimedia/mlt

2019-04-16 Thread Rafael Sadowski
Update mlt to 6.14.0. This update will not fix our issues with
x11/kde-applications/kdenlive but it doesn't make it any worse!

OK?


RS

Index: Makefile
===
RCS file: /cvs/ports/multimedia/mlt/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile10 Mar 2019 12:17:07 -  1.20
+++ Makefile16 Apr 2019 19:28:21 -
@@ -2,12 +2,10 @@
 
 COMMENT-main = multimedia transformations framework
 COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION =  6.12.0
+VERSION =  6.14.0
 DISTNAME = mlt-${VERSION}
 PKGNAME-main = ${DISTNAME}
 PKGNAME-gpl2 = mlt-gpl2-${VERSION}
-REVISION-gpl2 =1
-REVISION-main =1
 
 # XXX versions should be kept in sync together
 SHARED_LIBS =  mlt 3.0
@@ -23,13 +21,16 @@ MAINTAINER =Rafael Sadowski https://github.com/mltframework/mlt/releases/download/v${VERSION}/
 
@@ -72,7 +73,6 @@ CONFIGURE_ARGS =  --mandir=${PREFIX}/man 
--disable-kino \
--disable-swfdec \
--enable-gpl
-
 post-install:
${INSTALL_MAN} ${WRKSRC}/docs/melt.1 ${PREFIX}/man/man1/
 
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mlt/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo2 Jan 2019 14:14:05 -   1.5
+++ distinfo16 Apr 2019 19:28:21 -
@@ -1,2 +1,2 @@
-SHA256 (mlt-6.12.0.tar.gz) = BTBFBOHcIf6ebDQZC3D6OOa9zoU0BBZu5+BQS2eN3A8=
-SIZE (mlt-6.12.0.tar.gz) = 1395646
+SHA256 (mlt-6.14.0.tar.gz) = n88l6t/yiu6imnHGfPc7NXOpE0QkxW3idTTyJHwqfGs=
+SIZE (mlt-6.14.0.tar.gz) = 1413015
Index: patches/patch-configure
===
RCS file: /cvs/ports/multimedia/mlt/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 28 May 2015 12:01:15 -  1.2
+++ patches/patch-configure 16 Apr 2019 19:28:21 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-configure,v 1.2 2015/05/28 12:01:15 jca Exp $
 configure.orig Sun Jun 29 22:23:17 2014
-+++ configure  Tue May 26 19:19:08 2015
-@@ -122,6 +122,13 @@ build_config()
+Index: configure
+--- configure.orig
 configure
+@@ -124,6 +124,13 @@ build_config()
echo "RDYNAMIC=-rdynamic"
echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
;;
@@ -13,5 +14,5 @@ $OpenBSD: patch-configure,v 1.2 2015/05/
 +  echo "LDFLAGS+=-Wl,--as-needed"
 +  ;;
MinGW)
-   [ "$optimisations" = "true" ] &&
-   echo "OPTIMISATIONS+=-ffast-math"
+   [ "$windeploy" = false ] &&
+   echo "CFLAGS+=-DNODEPLOY"
Index: patches/patch-src_framework_Makefile
===
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_framework_Makefile
--- patches/patch-src_framework_Makefile29 Jul 2018 15:05:35 -  
1.2
+++ patches/patch-src_framework_Makefile16 Apr 2019 19:28:21 -
@@ -36,10 +36,10 @@ Index: src/framework/Makefile
  
  depend:   $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -116,6 +120,8 @@ install:
-   install -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \
-   install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt.dll ; \
-   install -m 644 libmlt.def $(DESTDIR)$(libdir) ; \
+@@ -121,6 +125,8 @@ install:
+   install -m 755 $(TARGET) 
"$(DESTDIR)$(bindir)/libmlt.dll" ; \
+   fi; \
+   install -m 644 libmlt.def "$(DESTDIR)$(libdir)" ; \
 +  elif [ "$(targetos)" = "OpenBSD" ]; then \
 +  install -m 444 $(TARGET) $(DESTDIR)$(libdir) ; \
else \
Index: patches/patch-src_framework_mlt_property_h
===
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_mlt_property_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_framework_mlt_property_h
--- patches/patch-src_framework_mlt_property_h  29 Jul 2018 15:05:35 -  
1.2
+++ patches/patch-src_framework_mlt_property_h  16 Apr 2019 19:28:21 -
@@ -3,12 +3,9 @@ $OpenBSD: patch-src_framework_mlt_proper
 Index: src/framework/mlt_property.h
 --- src/framework/mlt_property.h.orig
 +++ src/framework/mlt_property.h
-@@ -32,8 +32,11 @@
- 
- #if (defined(__GLIBC__) && !defined(__APPLE__)) || HAVE_LOCALE_H
+@@ -34,6 +34,9 @@
  #  include 
--#elif defined(__APPLE__) || (__FreeBSD_version >= 900506)
-+#elif defined(__APPLE__) || defined(__FreeBSD_version) && (__FreeBSD_version 
>= 900506)
+ #elif defined(__APPLE__) || 

Re: UPDATE: multimedia/mkvtoolnix (multimedia/libmatroska, textproc/libebml)

2019-04-16 Thread Rafael Sadowski
On Mon Apr 15, 2019 at 10:18:20PM -0400, Brad Smith wrote:
> On 4/15/2019 4:00 PM, Rafael Sadowski wrote:
> 
> > Please find attached update diffs for the following ports:
> > 
> > - multimedia/libmatroska
> > - textproc/libebml
> > 
> > Simple updates to the latest stable versions. Both projects switched to
> > cmake as build-system.
> > 
> > - multimedia/mkvtoolnix
> > 
> > As always nothing special but depends on the new libmatroska and libebml
> > versions.
> > 
> > Comments? OK?
> I have had updates for libmatroska and libebml sitting in my tree for awhile
> now. I'm
> a little annoyed at the half baked CMake conversion.
> 
> https://github.com/Matroska-Org/libmatroska/issues/17
> 
> Is there anyone that knows CMake well that might be able to take a look at
> what is
> there and fix the CMake bits so both shared and static libs are built?
> 

I accepted the challenge. ;) New diff attached with an option to build
and install shared and static libs.

Tested with all combinations. Feel free to push it upstream.

OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/libebml/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile24 Oct 2018 14:28:11 -  1.22
+++ Makefile16 Apr 2019 19:10:32 -
@@ -2,13 +2,12 @@
 
 COMMENT=   Extensible Binary Meta Language library
 
-DISTNAME=  libebml-1.3.5
+DISTNAME=  libebml-1.3.7
 CATEGORIES=textproc
 MASTER_SITES=  https://dl.matroska.org/downloads/libebml/
 EXTRACT_SUFX=  .tar.xz
-REVISION=  0
 
-SHARED_LIBS=   ebml3.1
+SHARED_LIBS=   ebml3.2
 
 HOMEPAGE=  http://www.matroska.org/
 
@@ -17,10 +16,12 @@ MAINTAINER= Brad Smith 
Index: distinfo
===
RCS file: /cvs/ports/textproc/libebml/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo4 Sep 2017 08:01:05 -   1.12
+++ distinfo16 Apr 2019 19:10:32 -
@@ -1,2 +1,2 @@
-SHA256 (libebml-1.3.5.tar.xz) = 2BhBP2B0LC8Da6b1gsXgMg0Sv/7BsPwPwXo5i28EqgA=
-SIZE (libebml-1.3.5.tar.xz) = 274184
+SHA256 (libebml-1.3.7.tar.xz) = 4yRMh/WE1/yMNxiBprewZYPMBB+I4uP66aIV2cpY6fQ=
+SIZE (libebml-1.3.7.tar.xz) = 69460
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt16 Apr 2019 19:10:32 -
@@ -0,0 +1,106 @@
+$OpenBSD$
+
+Add options for building and installing shared, static libraries
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -4,6 +4,8 @@ project(ebml VERSION 1.3.7)
+ 
+ option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF)
+ option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" 
OFF)
++option(DISABLE_SHARED_LIBS "Disable build and install shared libraries" OFF)
++option(DISABLE_STATIC_LIBS "Disable build and install static libraries" OFF)
+ 
+ include(GNUInstallDirs)
+ 
+@@ -63,40 +65,54 @@ set(libebml_PUBLIC_HEADERS
+ 
+ set(libebml_C_PUBLIC_HEADERS ebml/c/libebml_t.h)
+ 
+-add_library(ebml ${libebml_SOURCES} ${libebml_PUBLIC_HEADERS} 
${libebml_C_PUBLIC_HEADERS})
+-if(WIN32)
+-  include(CheckIncludeFile)
+-  check_include_file(winapifamily.h HAVE_WINAPIFAMILY_H)
+-  if(HAVE_WINAPIFAMILY_H)
+-target_compile_definitions(ebml PUBLIC HAVE_WINAPIFAMILY_H)
+-  endif()
++foreach (TYPE IN ITEMS STATIC SHARED)
++  if (NOT DISABLE_${TYPE}_LIBS)
++string (TOLOWER "${TYPE}" type)
++add_library(ebml-${type} ${TYPE} ${libebml_SOURCES} 
${libebml_PUBLIC_HEADERS} ${libebml_C_PUBLIC_HEADERS})
++set_target_properties(ebml-${type} PROPERTIES
++  VERSION 4.0.0
++  SOVERSION 4)
++target_include_directories(ebml-${type} PUBLIC
++  $
++  $)
++if(MSVC)
++  target_compile_definitions(ebml-${type} PRIVATE _CRT_SECURE_NO_WARNINGS)
++endif()
++if(WIN32)
++  include(CheckIncludeFile)
++  check_include_file(winapifamily.h HAVE_WINAPIFAMILY_H)
++  if(HAVE_WINAPIFAMILY_H)
++target_compile_definitions(ebml-${type} PUBLIC HAVE_WINAPIFAMILY_H)
++  endif()
+ endif()
+-set_target_properties(ebml PROPERTIES
+-  VERSION 4.0.0
+-  SOVERSION 4)
+-target_include_directories(ebml PUBLIC
+-  $
+-  $)
+-if(MSVC)
+-  target_compile_definitions(ebml PRIVATE _CRT_SECURE_NO_WARNINGS)
+-endif()
+-if(BUILD_SHARED_LIBS)
+-  set_target_properties(ebml
++  endif()
++endforeach()
++
++if(NOT DISABLE_SHARED_LIBS)
++  set_target_properties(ebml-shared
+ PROPERTIES
+ DEFINE_SYMBOL "EBML_DLL_EXPORT"
+ C_VISIBILITY_PRESET hidden
+-VISIBILITY_INLINES_HIDDEN 1)
+-  target_compile_definitions(ebml
++VISIBILITY_INLINES_HIDDEN 1
++OUTPUT_NAME ebml)
++  target_compile_definitions(ebml-shared
+ PUBLIC EBML_DLL
+ PRIVATE EBML_DLL_EXPORT)
++  install(TARGETS ebml-shared
++

CVS: cvs.openbsd.org: ports

2019-04-16 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2019/04/16 12:48:47

Modified files:
net/samba  : Tag: OPENBSD_6_4 Makefile distinfo 
net/samba/patches: Tag: OPENBSD_6_4 patch-source3_wscript 
net/samba/pkg  : Tag: OPENBSD_6_4 PLIST-ldb PLIST-main 
 samba_ad_dc.rc 
Added files:
net/samba/patches: Tag: OPENBSD_6_4 patch-source3_wscript_build 

Log message:
SECURITY update to samba-4.8.11

Fixes:
- CVE-2019-3880 (Save registry file outside share as unprivileged user)

Release notes:
https://www.samba.org/samba/history/samba-4.8.11.html

6.4 tests by Ian McWilliam



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2019/04/16 12:45:41

Modified files:
security/nss   : Makefile 
security/nss/patches: patch-nss_coreconf_OpenBSD_mk 
Removed files:
security/nss/patches: patch-nss_lib_freebl_alghmac_h 
  patch-nss_lib_freebl_blapi_h 

Log message:
Use ld(1) version scripts to fix symbol conflicts (hopefully) for good

Remove the symbol renaming workaround.  Use version scripts as done on
Linux and FreeBSD to hide internal symbols (eg HMAC_Update) that
conflict with libcrypto.

Tested in a bul by ajacoutot@, ok sthen@ naddy@, no objection landry@
(maintainer)



[MAINTAINER] Drop maintainership on personal ports

2019-04-16 Thread Donovan Watteau
Hi,

I'd like to stop being the MAINTAINER of the following ports:

archivers/innoextract
audio/cmus
audio/flac123
audio/libdiscid
editors/elvis
games/golly
games/teeworlds
misc/reprepro (this one can probably be just removed)
sysutils/dosfstools

(I just don't have the desire to contribute through mailing-lists,
bumping/pinging stuff and so on, nowadays.)

People wishing to maintain them can find some update proposals on
ports@. Feel free to email me if you have any question about the way I
was maintaining them.

Thanks to everyone who gave me their time here, over the years!

Cheers,
Donovan



[macppc/ports-gcc-8 arm] Fix security/libnipper

2019-04-16 Thread Charlene Wendling


> http://build-failures.rhaalovely.net/aarch64/2019-04-12/security/libnipper.log

Same issue with ports-gcc-8 on macppc.

Bad things come in threes, it's yet another roll your own base64
implementation that doesn't build on archs where char is unsigned
by default.

It has been tested successfully on macppc.

Any comment? 

Charlène. 


Index: Makefile
===
RCS file: /cvs/ports/security/libnipper/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile24 Oct 2018 14:28:10 -  1.22
+++ Makefile16 Apr 2019 16:26:42 -
@@ -3,7 +3,7 @@
 COMMENT =  library for nipper
 
 DISTNAME = libnipper-0.12.6
-REVISION = 6
+REVISION = 7
 CATEGORIES =   security net
 
 SHARED_LIBS =  nipper 0.0
Index: patches/patch-device_crypto_crypto-base64_cpp
===
RCS file: 
/cvs/ports/security/libnipper/patches/patch-device_crypto_crypto-base64_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-device_crypto_crypto-base64_cpp
--- patches/patch-device_crypto_crypto-base64_cpp   20 Sep 2008 20:26:05 
-  1.1.1.1
+++ patches/patch-device_crypto_crypto-base64_cpp   16 Apr 2019 16:26:42 
-
@@ -1,8 +1,20 @@
-let it build with base gcc
-
 $OpenBSD: patch-device_crypto_crypto-base64_cpp,v 1.1.1.1 2008/09/20 20:26:05 
steven Exp $
 device/crypto/crypto-base64.cpp.orig   Sun Sep  7 23:03:17 2008
-+++ device/crypto/crypto-base64.cppSun Sep  7 23:03:17 2008
+
+Hunk #1: let it build on archs where char is unsigned by default (ppc, arm)
+Hunk #2: let it build with base gcc
+
+Index: device/crypto/crypto-base64.cpp
+--- device/crypto/crypto-base64.cpp.orig
 device/crypto/crypto-base64.cpp
+@@ -36,7 +36,7 @@
+ 
+ // See RFC3548 for details of Base64 Encode / Decode standards
+ 
+-static const char base64string[] = {62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 
57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, 
-1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 
44, 45, 46, 47, 48, 49, 50, 51};
++static const signed char base64string[] = {62, -1, -1, -1, 63, 52, 53, 54, 
55, 56, 57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 
8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, 
-1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 
42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
+ 
+ 
+ // Base64 character check
 @@ -110,9 +110,9 @@ const char *Device::base64Decode(const char *encodedSt
offset++;
  






Re: devel/libuv: Enable on hppa (touches most archs)

2019-04-16 Thread Charlene Wendling
Hi,

On Mon, 15 Apr 2019 15:08:50 -0400
Brian Callahan  wrote:

> Hi ports --

> Tests on sparc64 and macppc and mips64* would be nice as a layer of
> safety.
> 
> OK for libuv?
> 
> ~Brian
> 
> [0] https://gcc.gnu.org/wiki/Atomic/GCCMM
> 

As you know i'm running that diff on macppc/ports-gcc-8.3. I have: 

- built libuv: it works fine
- rebuilt cmake: it works fine as well
- built some ports with it that requires cmake like devel/libnipper
  without issues (i don't know if it's relevant in that case).

In any case i'll report problems that may arise from that change,
as i'm still going on checking for possible gcc-8.3 regressions
on macppc, but so far so good :)

Charlène. 



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Charlene Wendling
CVSROOT:/cvs
Module name:ports
Changes by: c...@cvs.openbsd.org2019/04/16 10:09:45

Modified files:
games/dungeon-crawl: Makefile 
Added files:
games/dungeon-crawl/patches: patch-source_direct_cc 
 patch-source_mon-util_h 

Log message:
dungeon-crawl: fix narrowing conversion error on archs where char is
unsigned by default (ppc, arm). Tested on macppc where it fixes the
build with gcc-8.

OK phessler@



[macppc/ports-gcc-8 arm] Fix graphics/freeimage

2019-04-16 Thread Charlene Wendling


> http://build-failures.rhaalovely.net/aarch64/2019-04-12/graphics/freeimage.log

It's broken as well with ports-gcc-8 on macppc.

Again it's a narrowing issue on unsigned-char-by-default archs.

Once fixed, it builds fine on macppc, and is still good on amd64. 

Any comments? 


Charlène.


Index: Makefile
===
RCS file: /cvs/ports/graphics/freeimage/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile19 Nov 2018 18:46:16 -  1.13
+++ Makefile16 Apr 2019 15:23:20 -
@@ -4,7 +4,7 @@ COMMENT=c++ library for common image f
 
 DISTNAME=  FreeImage3152
 PKGNAME=   freeimage-3.15.2
-REVISION = 6
+REVISION=  7
 CATEGORIES=graphics
 
 SHARED_LIBS+=  freeimage   2.0
Index: patches/patch-Source_LibRawLite_internal_dcraw_common_cpp
===
RCS file: 
/cvs/ports/graphics/freeimage/patches/patch-Source_LibRawLite_internal_dcraw_common_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Source_LibRawLite_internal_dcraw_common_cpp
--- patches/patch-Source_LibRawLite_internal_dcraw_common_cpp   7 Apr 2018 
09:07:59 -   1.1
+++ patches/patch-Source_LibRawLite_internal_dcraw_common_cpp   16 Apr 2019 
15:23:20 -
@@ -1,10 +1,21 @@
 $OpenBSD: patch-Source_LibRawLite_internal_dcraw_common_cpp,v 1.1 2018/04/07 
09:07:59 rsadowski Exp $
 
-fix clang 6.0 build
+Hunk #1: fix the build when char is unsigned by default (ppc, arm)
+
+fix clang>=6 build
 
 Index: Source/LibRawLite/internal/dcraw_common.cpp
 --- Source/LibRawLite/internal/dcraw_common.cpp.orig
 +++ Source/LibRawLite/internal/dcraw_common.cpp
+@@ -2368,7 +2368,7 @@ void CLASS quicktake_100_load_raw()
+ 
+ void CLASS kodak_radc_load_raw()
+ {
+-  static const char src[] = {
++  static const signed char src[] = {
+ 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
+ 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
+ 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
 @@ -3917,7 +3917,7 @@ void CLASS lin_interpolate()
   */
  void CLASS vng_interpolate()



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2019/04/16 09:35:30

Added files:
devel/arm-none-eabi/gdb/patches: patch-etc_texi2pod_pl 
devel/avr/gcc/patches: patch-contrib_texi2pod_pl 
devel/avr32/binutils/patches: patch-etc_texi2pod_pl 
devel/avr32/gcc/patches: patch-contrib_texi2pod_pl 
devel/avr32/gcc-bootstrap/patches: patch-contrib_texi2pod_pl 
devel/msp430/binutils/patches: patch-etc_texi2pod_pl 
devel/msp430/gcc/patches: patch-contrib_texi2pod_pl 
lang/classpath/patches: patch-doc_texi2pod_pl 
lang/gcc/4.9/patches: patch-contrib_texi2pod_pl 
  patch-libjava_classpath_doc_texi2pod_pl 
lang/gpc/patches: patch-contrib_texi2pod_pl 

Log message:
fix warning and future error about unescaped left brace in perl regex



Re: UPDATE sysutils/ddrescue

2019-04-16 Thread Björn Ketelaars
On Fri 15/03/2019 05:39, Björn Ketelaars wrote:
> ddrescue received an update. Changelog indicates no big changes:
>   * Added new option '--command-mode'.
>   * Implemented mapfile backup.
>   * ddrescue.texi: Documented final contents of bad areas in outfile.
>   * configure: Accept appending to CXXFLAGS, 'CXXFLAGS+=OPTIONS'.
> 
> Release announcement can be found at
> http://lists.gnu.org/archive/html/info-gnu/2019-02/msg00012.html
> 
> Make test runs successfully on amd64, and (lightly) tested while trying
> to save some data from a dying device.
> 
> OK?

Ping...



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2019/04/16 09:30:31

Modified files:
geo/openbsd-developers: Makefile 
geo/openbsd-developers/files: OpenBSD 

Log message:
Adding myself to the list.

OK phessler



Re: update dnscrypt-proxy 2.0.19 -> 2.0.22

2019-04-16 Thread Björn Ketelaars
On Mon 15/04/2019 22:38, Nam Nguyen wrote:
> Stuart Henderson writes:
> 
> > Too late for 6.5 but this looks good for post unlock.
> 
> Björn Ketelaars writes:
> 
> > On Sat 06/04/2019 02:19, Nam Nguyen wrote:
> >> Here is an update for dnscrypt-proxy 2.0.22 (released April 1, 2019).
> >
> > I have a similar diff in my tree, and contacted ${MAINTAINER} two weeks
> > ago. Unfortunately I did not receive a reply.
> >
> > OK bket@
> >
> > I will commit your diff later today...unless someone beats me to it.
> 
> Thank you for reviewing it. May I also take maintainership of
> dnscrypt-proxy? The current maintainer, who is also the upstream
> developer, has not been that responsive and has not provided diffs for
> several updates.

Diff has been committed.

Concerning taking over maintainership: I would like to propose to
discuss it with the current maintainer. In my experience most
maintainers who lack time to review diffs do have the time to answer a
mail from someone who is offering support (read: willing to take over
maintainership).



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2019/04/16 09:26:11

Modified files:
net/dnscrypt-proxy: Makefile distinfo 
net/dnscrypt-proxy/patches: 

patch-dnscrypt-proxy_example-dnscrypt-proxy_toml 

Log message:
Update to dnscrypt-proxy-2.0.22.

Diff from Nam Nguyen . Thanks!



Update: geo/openbsd-developers

2019-04-16 Thread Kurt Mosiejczuk
Adding myself to the list.

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/geo/openbsd-developers/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile14 Feb 2019 14:04:57 -  1.164
+++ Makefile11 Apr 2019 05:27:20 -
@@ -4,7 +4,7 @@ CATEGORIES= geo
 COMMENT=   geographic location of past and present OpenBSD 
developers
 
 DISTNAME=  openbsd-developers-2.0
-REVISION=  31
+REVISION=  32
 
 DISTFILES=
 HOMEPAGE=  https://www.openbsd.org/
Index: files/OpenBSD
===
RCS file: /cvs/ports/geo/openbsd-developers/files/OpenBSD,v
retrieving revision 1.161
diff -u -p -r1.161 OpenBSD
--- files/OpenBSD   14 Feb 2019 14:04:57 -  1.161
+++ files/OpenBSD   11 Apr 2019 05:27:20 -
@@ -54,6 +54,7 @@
 42.49538   -82.89954   "nick"  # Nick Holland
 43.0277-86.13  "dhill" # David Hill
 43.064216  -89.406185  "wcmaier"   # Will Maier
+43.05027   -77.40483   "kmos"  # Kurt Mosiejczuk
 43.1   -77.46  "pamela"# Pamela Mosiejczuk
 43.240537  5.384159"pea"   # Pierre-Emmanuel Andre
 43.30  5.37"aanriot"   # Alexandre Anriot



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2019/04/16 07:12:26

Modified files:
net/py-aiodns  : Makefile 

Log message:
devel/py-typing does nothing for Python >= 3.5.x. Remove it as a
dependency for the python3 flavor. While here, notate that we cannot
update to aiodns >=2.0.0 if we want a python 3 flavor and update
MAINTAINER.



[macppc/ports-gcc-8 arm] Fix games/dungeon-crawl

2019-04-16 Thread Charlene Wendling
Hi ports,

> http://build-failures.rhaalovely.net/aarch64/2019-04-12/games/dungeon-crawl.log

The code doesn't take account of archs where char is unsigned by
default. This also occurs with ports-gcc-8 on macppc. 

I've quick fixed the "faulty" code, it builds on macppc, i played a bit
without issues. 

Any comment? 


Charlène. 


Index: Makefile
===
RCS file: /cvs/ports/games/dungeon-crawl/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile25 Nov 2018 21:06:38 -  1.12
+++ Makefile16 Apr 2019 12:39:31 -
@@ -9,7 +9,7 @@ DISTNAME=   dc400b26-src
 EXTRACT_SUFX=  .tbz2
 V= 4.0.0b26
 PKGNAME=   dungeon-crawl-$V
-REVISION = 4
+REVISION = 5
 
 BUILD_DEPENDS+=archivers/bzip2
 
Index: patches/patch-source_direct_cc
===
RCS file: patches/patch-source_direct_cc
diff -N patches/patch-source_direct_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-source_direct_cc  16 Apr 2019 12:39:31 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+ppc, arm: fix the build where char is unsigned by default
+
+Index: source/direct.cc
+--- source/direct.cc.orig
 source/direct.cc
+@@ -44,8 +44,8 @@
+ 
+ // x and y offsets in the following order:
+ // SW, S, SE, W, E, NW, N, NE
+-static const char xcomp[9] = { -1, 0, 1, -1, 0, 1, -1, 0, 1 };
+-static const char ycomp[9] = { 1, 1, 1, 0, 0, 0, -1, -1, -1 };
++static const signed char xcomp[9] = { -1, 0, 1, -1, 0, 1, -1, 0, 1 };
++static const signed char ycomp[9] = { 1, 1, 1, 0, 0, 0, -1, -1, -1 };
+ static const char dirchars[19] = { "b1j2n3h4.5l6y7k8u9" };
+ static const char DOSidiocy[10] = { "OPQKSMGHI" };
+ static const char *aim_prompt = "Aim (move cursor or -/+/=, change mode with 
CTRL-F, select with . or >)";
Index: patches/patch-source_mon-util_h
===
RCS file: patches/patch-source_mon-util_h
diff -N patches/patch-source_mon-util_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-source_mon-util_h 16 Apr 2019 12:39:31 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+ppc, arm: fix build where char is unsigned by default
+
+Index: source/mon-util.h
+--- source/mon-util.h.orig
 source/mon-util.h
+@@ -115,7 +115,7 @@ struct monsterentry
+ 
+ unsigned short charclass PACKED; //
+ 
+-char holiness PACKED;   // -1=holy,0=normal,1=undead,2=very very evil
++signed char holiness PACKED;   // -1=holy,0=normal,1=undead,2=very 
very evil
+ 
+ short resist_magic PACKED;  // (positive is ??)
+ // max damage in a turn is total of these four?
+@@ -144,7 +144,7 @@ struct monsterentry
+ // 0=no zombie, 1=small zombie (z) 107, 2=_BIG_ zombie (Z) 108
+ char zombie_size PACKED;
+   // 0-12: see above, -1=random one of (0-7)
+-char shouts PACKED;
++signed char shouts PACKED;
+   // AI things?
+ char intel PACKED;  // 0=none, 1=worst...4=best
+ 



Re: UPDATE security/keyringer 0.5.4

2019-04-16 Thread Mikolaj Kucharski
On Thu, Apr 11, 2019 at 08:16:02PM +0200, Grégoire Jadi wrote:
> Mikolaj Kucharski  writes:
> 
> > Hi,
> 
> Hi Mikolaj,
> 
> Thanks for the patch and sorry for the long delay.
> 
> The patch looks fine and works for my usecases.
> 
> However, I can't generate a working gpg key with `genkeys gpg'. The gpg
> passphrase is generated, the pub key too. But, the private key is empty.
> The following command returns nothing:
> 
> keyringer  decrypt mygpg
> 
> Is that expected? Does it works for you?
> 
> 
> Best,
> 

No, it doesn't work for me too, however I think I'm facing even
different issue. With 0.5.3, I had problem mentioned in changelog, now I
see something different. I'm not sure is the problem with keyringer,
bash or I'm doing something wrong, as I see empty public and private
exported keyfile after:

  keyringer mytestkeyring genkeys gpg examplefile examplehost outputfile

I also see bash.core in current working directory and I've stopped there
as I don't have time to dive deeper into this.

I want to look more into keyringer, but I don't have enough time at
present, to do proper analysis. Sorry :/

-- 
Regards,
 Mikolaj



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2019/04/16 05:40:18

Modified files:
lang/erlang: Makefile.inc 
lang/erlang/16 : Makefile 
lang/erlang/16/pkg: PLIST-main PLIST-wx 
lang/erlang/17 : Makefile 
lang/erlang/17/pkg: PLIST-main PLIST-wx 
lang/erlang/18 : Makefile 
lang/erlang/18/pkg: PLIST-main PLIST-wx 
lang/erlang/19 : Makefile 
lang/erlang/19/pkg: PLIST-main PLIST-wx 
lang/erlang/21 : Makefile 
lang/erlang/21/pkg: PLIST-main PLIST-wx 

Log message:
Rename lang/erlang ports makefile variables used by "gen-versions" and
in PLISTs to avoid a conflict with "COMPILER" used in bsd.port.mk,
remove a hackish workaround, and allow COMPILER to be used as intended.

Use COMPILER to build with ports-gcc on !base-clang arches, needed with
-wx on these arches.

ok cwen@



Re: [ports-gcc-8] Unbreak lang/erlang/*

2019-04-16 Thread Charlene Wendling
On Mon, 15 Apr 2019 15:39:56 +0100
Stuart Henderson  wrote:

> On 2019/04/15 13:34, Stuart Henderson wrote:
> > There are two approaches -
> > 
> > - either we can just get rid of the mechanism completely (it isn't
> > used consistently; compare 19/pkg/PLIST-main with the others).
> > Upside: simple. Downside: bigger PLIST diffs between Erlang updates.
> > 
> > - or we can rename the variables used (prefix with E_ or something),
> > either just COMPILER to reduce PLIST churn, or all of them.
> > 
> > I'm leaning towards the first one. Builds ongoing ...
> > 
> 
> I went for the second in the end to reduce infrastructure changes.
> 
> 

Awesome, your diff allowed to build all Erlang versions on
macppc/ports-gcc-8 without issues :) Thanks again!

OK cwen@



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:55:22

Modified files:
www/webkitgtk4 : Makefile distinfo 
Added files:
www/webkitgtk4/patches: patch-Source_cmake_FindSSE2_cmake 

Log message:
SECURITY update to webkitgtk4-2.24.1.
https://webkitgtk.org/security/WSA-2019-0002.html



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:17:11

Modified files:
net/py-smbc: Makefile distinfo 
net/py-smbc/pkg: PLIST 

Log message:
Update to py-smbc-1.0.16.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:16:14

Modified files:
print/py-cups  : Makefile distinfo 
print/py-cups/patches: patch-setup_py 

Log message:
Update to py-cups-1.9.74.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:15:29

Modified files:
www/py-bokeh   : Makefile distinfo 
www/py-bokeh/pkg: PLIST 

Log message:
Update to py-bokeh-1.1.0.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:14:44

Modified files:
sysutils/serf  : Makefile distinfo 

Log message:
Update to (hashicorp-)serf-0.8.3.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:13:53

Modified files:
devel/meson: Makefile 
Added files:
devel/meson/patches: 
 patch-test_cases_common_190_openmp_meson_build 

Log message:
Fix up a few more regress tests.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:12:00

Modified files:
graphics/graphene: Makefile distinfo 

Log message:
Update to graphene-1.8.6.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:11:32

Modified files:
multimedia/gstreamer1/plugins-base: Makefile 

Log message:
Sync WANTLIB.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:11:11

Modified files:
x11/gtk+3  : Makefile distinfo 
Removed files:
x11/gtk+3/patches: patch-configure 

Log message:
Update to gtk+3-3.24.8.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:09:53

Modified files:
devel/libnotify: Makefile distinfo 
devel/libnotify/pkg: PLIST 

Log message:
Update to libnotify-0.7.8.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:08:37

Modified files:
textproc/libical: Makefile 
textproc/libical/pkg: PLIST-glib PLIST-main 

Log message:
Move the share/gir-1.0/ directory to the proper subpackage.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:07:32

Modified files:
www/libcroco   : Makefile distinfo 

Log message:
Update to libcroco-0.6.13.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:06:42

Modified files:
sysutils/amazon-ssm-agent: Makefile distinfo 
sysutils/amazon-ssm-agent/patches: 
   
patch-agent_appconfig_constants_unix_go 

Log message:
Update to amazon-ssm-agent-2.3.539.0.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:06:07

Modified files:
sysutils/amazon-ecs-cli: Makefile distinfo 

Log message:
Update to ecs-cli-1.14.0.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 02:05:12

Modified files:
print/cups-filters: Makefile distinfo 

Log message:
Update to cups-filters-1.22.5.



CVS: cvs.openbsd.org: ports

2019-04-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/04/16 01:56:26

Modified files:
devel/meson: meson.port.mk 
multimedia/dav1d: Makefile 

Log message:
Re-enable the assembly code on aarch64 now that it builds Ok.

from Brad (maintainer)



UPDATE: Nextcloud-15.0.7

2019-04-16 Thread Gonzalo L. Rodriguez
Hello,

Update for Nextcloud to 15.0.7:

https://nextcloud.com/changelog/

OK? Comments?

Cheers.-

-- 

- gonzalo
Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile11 Mar 2019 15:43:46 -  1.36
+++ Makefile16 Apr 2019 07:22:07 -
@@ -2,10 +2,9 @@
 
 COMMENT=   easy and universal access to shared and/or personal 
files
 
-V= 15.0.5
+V= 15.0.7
 DISTNAME=  nextcloud-${V}
 EXTRACT_SUFX=  .tar.bz2
-REVISION=  1
 
 CATEGORIES=www
 
Index: distinfo
===
RCS file: /cvs/ports/www/nextcloud/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo5 Mar 2019 08:54:40 -   1.22
+++ distinfo16 Apr 2019 07:22:07 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloud-15.0.5.tar.bz2) = 
RmGGm3l6NAzZZ6uz2+aTGzdUNOCkRIA0aifM1zJQuYg=
-SIZE (nextcloud-15.0.5.tar.bz2) = 56489515
+SHA256 (nextcloud-15.0.7.tar.bz2) = 
PmFYlR+nIBDM1Q2+rAXY3xYhg/e7xiocbIntcIH6nUk=
+SIZE (nextcloud-15.0.7.tar.bz2) = 56417492
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST   5 Mar 2019 08:54:40 -   1.25
+++ pkg/PLIST   16 Apr 2019 07:22:08 -
@@ -6164,7 +6164,6 @@ nextcloud/apps/federatedfilesharing/css/
 nextcloud/apps/federatedfilesharing/img/
 nextcloud/apps/federatedfilesharing/img/social-diaspora.svg
 nextcloud/apps/federatedfilesharing/img/social-facebook.svg
-nextcloud/apps/federatedfilesharing/img/social-googleplus.svg
 nextcloud/apps/federatedfilesharing/img/social-twitter.svg
 nextcloud/apps/federatedfilesharing/js/
 nextcloud/apps/federatedfilesharing/js/external.js
@@ -9260,8 +9259,6 @@ nextcloud/apps/firstrunwizard/js/activat
 nextcloud/apps/firstrunwizard/js/firstrunwizard.js
 nextcloud/apps/firstrunwizard/js/jquery.colorbox.js
 nextcloud/apps/firstrunwizard/l10n/
-nextcloud/apps/firstrunwizard/l10n/ast.js
-nextcloud/apps/firstrunwizard/l10n/ast.json
 nextcloud/apps/firstrunwizard/l10n/bg.js
 nextcloud/apps/firstrunwizard/l10n/bg.json
 nextcloud/apps/firstrunwizard/l10n/bn_IN.php
@@ -9283,8 +9280,6 @@ nextcloud/apps/firstrunwizard/l10n/eo.js
 nextcloud/apps/firstrunwizard/l10n/eo.json
 nextcloud/apps/firstrunwizard/l10n/es.js
 nextcloud/apps/firstrunwizard/l10n/es.json
-nextcloud/apps/firstrunwizard/l10n/es_419.js
-nextcloud/apps/firstrunwizard/l10n/es_419.json
 nextcloud/apps/firstrunwizard/l10n/es_CL.js
 nextcloud/apps/firstrunwizard/l10n/es_CL.json
 nextcloud/apps/firstrunwizard/l10n/es_CO.js
@@ -9297,26 +9292,10 @@ nextcloud/apps/firstrunwizard/l10n/es_EC
 nextcloud/apps/firstrunwizard/l10n/es_EC.json
 nextcloud/apps/firstrunwizard/l10n/es_GT.js
 nextcloud/apps/firstrunwizard/l10n/es_GT.json
-nextcloud/apps/firstrunwizard/l10n/es_HN.js
-nextcloud/apps/firstrunwizard/l10n/es_HN.json
 nextcloud/apps/firstrunwizard/l10n/es_MX.js
 nextcloud/apps/firstrunwizard/l10n/es_MX.json
-nextcloud/apps/firstrunwizard/l10n/es_NI.js
-nextcloud/apps/firstrunwizard/l10n/es_NI.json
-nextcloud/apps/firstrunwizard/l10n/es_PA.js
-nextcloud/apps/firstrunwizard/l10n/es_PA.json
-nextcloud/apps/firstrunwizard/l10n/es_PE.js
-nextcloud/apps/firstrunwizard/l10n/es_PE.json
-nextcloud/apps/firstrunwizard/l10n/es_PR.js
-nextcloud/apps/firstrunwizard/l10n/es_PR.json
-nextcloud/apps/firstrunwizard/l10n/es_PY.js
-nextcloud/apps/firstrunwizard/l10n/es_PY.json
 nextcloud/apps/firstrunwizard/l10n/es_SV.js
 nextcloud/apps/firstrunwizard/l10n/es_SV.json
-nextcloud/apps/firstrunwizard/l10n/es_UY.js
-nextcloud/apps/firstrunwizard/l10n/es_UY.json
-nextcloud/apps/firstrunwizard/l10n/et_EE.js
-nextcloud/apps/firstrunwizard/l10n/et_EE.json
 nextcloud/apps/firstrunwizard/l10n/eu.js
 nextcloud/apps/firstrunwizard/l10n/eu.json
 nextcloud/apps/firstrunwizard/l10n/fi.js
@@ -9335,11 +9314,7 @@ nextcloud/apps/firstrunwizard/l10n/it.js
 nextcloud/apps/firstrunwizard/l10n/it.json
 nextcloud/apps/firstrunwizard/l10n/ja.js
 nextcloud/apps/firstrunwizard/l10n/ja.json
-nextcloud/apps/firstrunwizard/l10n/ka_GE.js
-nextcloud/apps/firstrunwizard/l10n/ka_GE.json
 nextcloud/apps/firstrunwizard/l10n/km.php
-nextcloud/apps/firstrunwizard/l10n/ko.js
-nextcloud/apps/firstrunwizard/l10n/ko.json
 nextcloud/apps/firstrunwizard/l10n/ku_IQ.php
 nextcloud/apps/firstrunwizard/l10n/lt_LT.js
 nextcloud/apps/firstrunwizard/l10n/lt_LT.json
@@ -9359,8 +9334,6 @@ nextcloud/apps/firstrunwizard/l10n/sk.js
 nextcloud/apps/firstrunwizard/l10n/sk.json
 nextcloud/apps/firstrunwizard/l10n/sl.js
 nextcloud/apps/firstrunwizard/l10n/sl.json
-nextcloud/apps/firstrunwizard/l10n/sq.js
-nextcloud/apps/firstrunwizard/l10n/sq.json
 nextcloud/apps/firstrunwizard/l10n/sr.js
 nextcloud/apps/firstrunwizard/l10n/sr.json
 

Re: UPDATE: multimedia/mkvtoolnix (multimedia/libmatroska, textproc/libebml)

2019-04-16 Thread Stuart Henderson
See devel/jansson. I'm not convinced it's worth doing unless there's a 
particular reason (in the case of jansson it was because something 
chroot'ed was using it).


--
Sent from a phone, apologies for poor formatting.

On 16 April 2019 03:18:43 Brad Smith  wrote:


On 4/15/2019 4:00 PM, Rafael Sadowski wrote:


Please find attached update diffs for the following ports:

- multimedia/libmatroska
- textproc/libebml

Simple updates to the latest stable versions. Both projects switched to
cmake as build-system.

- multimedia/mkvtoolnix

As always nothing special but depends on the new libmatroska and libebml
versions.

Comments? OK?

I have had updates for libmatroska and libebml sitting in my tree for
awhile now. I'm
a little annoyed at the half baked CMake conversion.

https://github.com/Matroska-Org/libmatroska/issues/17

Is there anyone that knows CMake well that might be able to take a look
at what is
there and fix the CMake bits so both shared and static libs are built?






www/ap2-mod_perl patch

2019-04-16 Thread Giovanni Bechis
Hi,
ap2-mod_perl builds ok without this patch, is this still needed for !amd64 
archs ?
 Cheers
  Giovanni
Index: Makefile
===
RCS file: /var/cvs/ports/www/ap2-mod_perl/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile28 Mar 2019 12:39:02 -  1.44
+++ Makefile8 Apr 2019 06:57:29 -
@@ -4,7 +4,7 @@ COMMENT=module that embeds a Perl inter
 
 DISTNAME=  mod_perl-2.0.10
 PKGNAME=   ap2-${DISTNAME:S/-rc/rc/}
-REVISION=  0
+REVISION=  1
 CATEGORIES=www net
 
 MODULES=   cpan
Index: patches/patch-src_modules_perl_modperl_common_util_h
===
RCS file: patches/patch-src_modules_perl_modperl_common_util_h
diff -N patches/patch-src_modules_perl_modperl_common_util_h
--- patches/patch-src_modules_perl_modperl_common_util_h9 Jan 2018 
20:45:42 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_modules_perl_modperl_common_util_h,v 1.1 2018/01/09 
20:45:42 sthen Exp $
-
-https://marc.info/?l=apache-modperl=143930336811571=2
-
-Index: src/modules/perl/modperl_common_util.h
 src/modules/perl/modperl_common_util.h.orig
-+++ src/modules/perl/modperl_common_util.h
-@@ -19,7 +19,7 @@
- #ifndef MODPERL_COMMON_UTIL_H
- #define MODPERL_COMMON_UTIL_H
- 
--#ifdef MP_DEBUG
-+#if defined(MP_DEBUG) || defined(__clang__)
- #define MP_INLINE
- #else
- #define MP_INLINE APR_INLINE


signature.asc
Description: PGP signature


Re: games/xonotic: lowercase package and program

2019-04-16 Thread Anthony J. Bentley
Klemens Nanni writes:
> Requested by many;  successfully tested by manually running
>
>   # TRUSTED_PKG_PATH=/usr/ports/package/amd64/all pkg_add -Dsnap -u
>   quirks-3.124->3.125: ok
>   Collision in Xonotic-0.8.2->xonotic-0.8.2p0+xonotic-data-0.8.2p0: the f
> ollowing files already exist
>   /usr/local/share/xonotic/data/font-unifont-20170401.pk3 (Xonoti
> c-data-0.8.2 and xonotic-data-0.8.2p0)
>   /usr/local/share/xonotic/data/font-xolonium-20170401.pk3 (Xonot
> ic-data-0.8.2 and xonotic-data-0.8.2p0)
>   /usr/local/share/xonotic/data/xonotic-20170401-data.pk3 (Xonoti
> c-data-0.8.2 and xonotic-data-0.8.2p0)
>   /usr/local/share/xonotic/data/xonotic-20170401-maps.pk3 (Xonoti
> c-data-0.8.2 and xonotic-data-0.8.2p0)
>   /usr/local/share/xonotic/data/xonotic-20170401-music.pk3 (Xonot
> ic-data-0.8.2 and xonotic-data-0.8.2p0)
>   /usr/local/share/xonotic/data/xonotic-20170401-nexcompat.pk3 (X
> onotic-data-0.8.2 and xonotic-data-0.8.2p0)

I didn't get these messages, perhaps because of the changes below.

>   Xonotic-0.8.2+Xonotic-data-0.8.2->xonotic-0.8.2p0+xonotic-data-
> 0.8.2p0 forward dependencies:
>   | Dependencies of Xonotic-server-0.8.2 on Xonotic-data-* don't match
>   Merging Xonotic-server-0.8.2->xonotic-server-0.8.2p0 (ok)
>   Xonotic-0.8.2+Xonotic-data-0.8.2+Xonotic-server-0.8.2->xonotic-0.8.2p0+
> xonotic-data-0.8.2p0+xonotic-server-0.8.2p0: ok
>   Read shared items: ok
>   Couldn't find updates for [...]
>
> Did I miss anything? OK?
>
> Index: devel/quirks/Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.731
> diff -u -p -r1.731 Makefile
> --- devel/quirks/Makefile 3 Apr 2019 15:02:19 -   1.731
> +++ devel/quirks/Makefile 14 Apr 2019 21:22:18 -
> @@ -5,7 +5,7 @@ CATEGORIES =  devel databases
>  DISTFILES =
>  
>  # API.rev
> -PKGNAME =quirks-3.124
> +PKGNAME =quirks-3.125
>  PKG_ARCH =   *
>  MAINTAINER = Marc Espie 
>  
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.748
> diff -u -p -r1.748 Quirks.pm
> --- devel/quirks/files/Quirks.pm  3 Apr 2019 15:02:19 -   1.748
> +++ devel/quirks/files/Quirks.pm  14 Apr 2019 21:23:06 -
> @@ -326,6 +326,9 @@ my $stem_extensions = {
>   'py-zeroconf' => 'py3-zeroconf',
>   'digikam' => 'digikam-kde4',
>   'apertium-sv-da' => 'apertium-swe-dan',

Put a 6.6 comment here.

> + 'Xonotic' => 'xonotic',
> + 'Xonotic-data' => 'xonotic-data',
> + 'Xonotic-server' => 'xonotic-server',
>  };
>  
>  my $obsolete_reason = {
> (snip)
> Index: games/xonotic/pkg/PLIST-data
> ===
> RCS file: /cvs/ports/games/xonotic/pkg/PLIST-data,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-data
> --- games/xonotic/pkg/PLIST-data  5 Dec 2018 15:53:53 -   1.1.1.1
> +++ games/xonotic/pkg/PLIST-data  17 Mar 2019 23:16:00 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-data,v 1.1.1.1 2018/12/05 15:53:53 kn Exp $
> +@conflict Xonotic-*

According to pkg_create(1) this is a pkgspec. From my reading of
packages-specs(7), this needs to have the full stem, so Xonotic-data-*.
Ditto for server.

>  share/xonotic/
>  share/xonotic/data/
>  share/xonotic/data/font-unifont-20170401.pk3