CVS: cvs.openbsd.org: ports

2018-12-28 Thread Paul Irofti
CVSROOT:/cvs
Module name:ports
Changes by: piro...@cvs.openbsd.org 2018/12/29 00:48:36

Modified files:
math/libcerf   : Makefile distinfo 

Log message:
Update libcerf to 1.11

The authors wiped libcerf-1.10 from the face of the earth in 1984-style.

http://apps.jcns.fz-juelich.de/src/libcerf/CHANGELOG

Just because you have a defect doesn't mean you have to remove the distfile!
This is the craziest release strategy I encountered!

Hope this one lasts. If this keeps going I will just remove the port. It is just
a soft-dependency of gnuplot.

Noticed by naddy@, thanks!



Re: [NEW] textproc/xsv-0.13

2018-12-28 Thread Charles A Daniels
Any update on getting xsv merged? Are there further changes I need to
make to it?

~ Charles



Re: update/fix: devel/boost

2018-12-28 Thread Antoine Jacoutot
I agree with Stuart. We're not Debian. We don't subpackage by default. If we 
do, there needs to be a good reason.


On December 28, 2018 8:04:51 PM GMT+01:00, Stuart Henderson 
 wrote:
>On 2018/12/28 19:30, Rafael Sadowski wrote:
>> On Fri Dec 28, 2018 at 02:31:49PM +, Stuart Henderson wrote:
>> > Why subpackage this?
>> 
>> Because nobody needs boost-build to run/build any ports. Let's be
>> unfair, nobody needs boost-build except *maybe* a handful user.
>
>If it was something huge then it would make sense. But really I don't
>see the point in splitting it, it's got to be pretty small, I haven't
>looked at the size of the new files but I can't imagine the whole thing
>can be more than a MB or so can it? Less if the two identical files
>b2 and bjam were hardlinked together.
>
>> Doas another subpackge hurts?
>
>Yes, it's extra scaffolding and extra risk of getting things wrong
>both in the port itself, and in ports which might end up needing it
>in the future.
>
>I'm not going to insist but I really don't see a good reason to split
>it. But if you are going to split it anyway see comments inline.;
>
>> > -- 
>> > Sent from a phone, apologies for poor formatting.
>> > 
>> > On 28 December 2018 13:41:22 Rafael Sadowski
> wrote:
>> > 
>> > > Hi all!
>> > > 
>> > > Our boost.build executables b2 and bjam are useless without the
>*.jam
>> > > stuff. The diff below want to fix the situation withe a third
>> > > sub-package named "build".
>> > > 
>> > > do-install bits from NetBSD and DESCR from FreeBSD.
>> > > Noticed by Ivan Krylov via openbsd@freenode. Thanks!
>> > > 
>> > > Comments, OK?
>> > > 
>> > > Rafael Sadowski
>> > > 
>> 
>> New diff with a compileall.py call at the end of the do-install step,
>> after feedback from semarie@ and aja@ Thanks!
>> 
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/boost/Makefile,v
>> retrieving revision 1.79
>> diff -u -p -u -p -r1.79 Makefile
>> --- Makefile 24 Dec 2018 23:34:27 -  1.79
>> +++ Makefile 28 Dec 2018 18:18:16 -
>> @@ -2,6 +2,7 @@
>>  
>>  COMMENT-main=   free peer-reviewed portable C++ source libraries
>>  COMMENT-md= machine-dependent libraries for boost
>> +COMMENT-build=  extensible cross-platform build tool suite
>>  
>>  # XXX if updating, try to remove
>-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
>>  # XXX in archivers/innoextract
>> @@ -9,7 +10,8 @@ VERSION=1.66.0
>>  DISTNAME=   boost_${VERSION:S/./_/g}
>>  PKGNAME-main=   boost-${VERSION}
>>  PKGNAME-md= boost-md-${VERSION}
>> -REVISION-main=  1
>> +PKGNAME-build=  boost-build-${VERSION}
>> +REVISION-main=  2
>>  CATEGORIES= devel
>>  MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=boost/}
>>  EXTRACT_SUFX=   .tar.bz2
>> @@ -76,7 +78,7 @@ WANTLIB += ${COMPILER_LIBCXX} bz2 c icud
>>  
>>  COMPILER= base-clang ports-gcc
>>  
>> -MULTI_PACKAGES= -main -md
>> +MULTI_PACKAGES= -main -md -build
>>  
>>  MODULES=lang/python
>>  MODPY_RUNDEP=   No
>> @@ -167,12 +169,22 @@ do-build:
>>  ./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_3}\
>>  
>>  do-install:
>> -${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam}
>\
>> -${PREFIX}/bin
>>  ${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
>>  @cd ${WRKSRC} && \
>>  find boost -type d -exec ${INSTALL_DATA_DIR} 
>> ${PREFIX}/include/{}
>\;
>>  @cd ${WRKSRC} && \
>>  find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {}
>${PREFIX}/include/{} \;
>> +# -build
>> +${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam}
>\
>> +${PREFIX}/bin
>> +${INSTALL_DATA_DIR} ${PREFIX}/share/boost-build
>> +@cd ${WRKSRC}/tools/build/src && \
>> +pax -r -w -p pm -s ':^./engine.*$$::' \
>> +-s ':^.*\.orig$$::' . ${PREFIX}/share/boost-build
>> +${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
>> +${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
>> +${PREFIX}/share/examples/boost-build
>> +${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
>> +${PREFIX}/share/boost-build/
>>  
>>  .include 
>> Index: pkg/DESCR-build
>> ===
>> RCS file: pkg/DESCR-build
>> diff -N pkg/DESCR-build
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ pkg/DESCR-build  28 Dec 2018 18:18:16 -
>> @@ -0,0 +1,7 @@
>> +Boost.Build is an easy way to build C++ projects, everywhere. You
>name you
>> +executables and libraries and list their sources.
>
>"You name *your* executables"...
>
>> +
>> +Boost.Build takes care about compiling your sources with right
>options,
>
>"with the right options"
>
>> +creating static and shared libraries, making executables, and other
>chores --
>> +whether you're using gcc, msvc, or a dozen more supported C++
>compilers -- on
>> +Windows, OSX, Linux and commercial UNIX 

[update] shells/fish to 3.0.0

2018-12-28 Thread Aaron Bieber
Hola,

This one feels good! We ditch _all_ the patches as they were
upstream'd!

Tests fine here.

OK?

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 2db11d1d80c..21fa78254eb 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -2,9 +2,8 @@

 COMMENT =  friendly interactive shell

-V =2.7.1
+V =3.0.0
 DISTNAME = fish-$V
-REVISION = 1

 CATEGORIES =   shells

diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index ca248f6ada2..de50069365a 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fish-2.7.1.tar.gz) = 5CuxnHWGNWkFpYV4GQvnkt+WD6gd417/scpaWpgfDFo=
-SIZE (fish-2.7.1.tar.gz) = 5760550
+SHA256 (fish-3.0.0.tar.gz) = 6p3TYUuwNGgpznMZQ3xqk+Ph3947f2pGm1Q7DSxo8s8=
+SIZE (fish-3.0.0.tar.gz) = 6472393
diff --git a/shells/fish/patches/patch-configure_ac 
b/shells/fish/patches/patch-configure_ac
deleted file mode 100644
index 4891699c3a3..000
--- a/shells/fish/patches/patch-configure_ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2018/04/08 22:49:23 abieber Exp $
-
-https://github.com/fish-shell/fish-shell/pull/4685
-
-Index: configure.ac
 configure.ac.orig
-+++ configure.ac
-@@ -402,6 +402,15 @@ AC_TRY_LINK( [ #include  ],
-  [AC_MSG_RESULT(no)],
-  )
-
-+AC_MSG_CHECKING([for std::make_unique])
-+AC_TRY_LINK( [ #include  ],
-+ [ std::unique_ptr foo = std::make_unique(); ],
-+ [ AC_MSG_RESULT(yes)
-+   AC_DEFINE(HAVE_STD__MAKE_UNIQUE, 1, Define to 1 if you have 
the `std::make_unique' function.)
-+ ],
-+ [AC_MSG_RESULT(no)],
-+ )
-+
- if test x$local_gettext != xno; then
-   AC_CHECK_FUNCS( gettext )
-
diff --git a/shells/fish/patches/patch-share_completions_pfctl_fish 
b/shells/fish/patches/patch-share_completions_pfctl_fish
deleted file mode 100644
index 7a7b8d763c7..000
--- a/shells/fish/patches/patch-share_completions_pfctl_fish
+++ /dev/null
@@ -1,41 +0,0 @@
-$OpenBSD: patch-share_completions_pfctl_fish,v 1.1.1.1 2017/12/16 05:14:32 
abieber Exp $
-
-This can be removed when 3.0 is released:
-https://github.com/fish-shell/fish-shell/pull/4584/
-
-Index: share/completions/pfctl.fish
 share/completions/pfctl.fish.orig
-+++ share/completions/pfctl.fish
-@@ -0,0 +1,32 @@
-+complete -c pfctl -s s --description 'Show a filter parameter by modifier' 
-xa \
-+  'queue\t"Show loaded queue definitions" \
-+  rules\t"Show loaded filter rules" \
-+  Anchors\t"Show anchors attached to main ruleset" \
-+  states\t"Show state table"
-+  Sources\t"Show source tracking table" \
-+  info\t"Show filter information" \
-+  labels\t"Show stats of labeled filter rules" \
-+  timeouts\t"Show global timeouts" \
-+  memory\t"Show pool memory hard limits" \
-+  Tables\t"Show the list of tables" \
-+  osfp\t"Show a list of OS fingerprints" \
-+  Interfaces\t"List PF interfaces/drivers" \
-+  all\t"Everything."'
-+complete -c pfctl -s F --description 'Flush filter params specified by mod' 
-xa \
-+  'rules\t"Flush filter rules" \
-+  states\t"Flush state table" \
-+  Sources\t"Flush source tracking table" \
-+  info\t"Flush filter information" \
-+  Tables\t"Flush the tables" \
-+  ospf\t"Flush the passive OS fingerprints" \
-+  all\t"Flush everything"'
-+complete -c pfctl -s T --description 'Table command' -xa \
-+  'kill\t"Kill a table." \
-+  flush\t"Flush addresses of a table" \
-+  add\t"Add one or more addresses in table" \
-+  delete\t"Delete one or more addresses from a table" \
-+  expire\t"Delete addresses where stats cleared > N seconds" \
-+  replace\t"Replace the addresses of the table" \
-+  show\t"Show the contents of a table" \
-+  test\t"Test if the given addresses match a table" \
-+  zero\t"Clear all the stats of a table"'
diff --git a/shells/fish/patches/patch-share_completions_pkg_add_fish 
b/shells/fish/patches/patch-share_completions_pkg_add_fish
deleted file mode 100644
index b12a7c4ca60..000
--- a/shells/fish/patches/patch-share_completions_pkg_add_fish
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-share_completions_pkg_add_fish,v 1.1.1.1 2017/12/16 05:14:32 
abieber Exp $
-
-This can be removed when 3.0 is released:
-https://github.com/fish-shell/fish-shell/pull/4584/
-
-Index: share/completions/pkg_add.fish
 share/completions/pkg_add.fish.orig
-+++ share/completions/pkg_add.fish
-@@ -0,0 +1,9 @@
-+#completion for pkg_add
-+
-+complete -c pkg_add -o D -d 'failsafe to overwrite' -xa 'allversions arch 
checksum dontmerge donttie downgrade installed libdepends nonroot paranoid 
repair scripts SIGNER snap unsigned updatedepends'
-+complete -c pkg_add -o V -d 'Turn on stats'
-+complete -c pkg_add -o a -d 'Automated package installation'
-+complete -c pkg_add -o h -d 'Print help'
-+complete -c 

[UPDATE] devel/p5-Sub-Identify 0.12 -> 0.14

2018-12-28 Thread Charlene Wendling
Hi ports, Andrew,

This update makes Sub::Identify tests pass with the future Perl 5.28.
It's the sole change out of standardizing Changes itself [1].

Port wise it's a simple version bump. 

Testing: 

- 'make test' passes on amd64 and macppc (XS module)
- There are 180 consumers, i've found no failures due to this update
  [2] (if you wonder about libreoffice logs, i had to build it
  separately due to mfs limits and it has no test suite anyway). 


Any comments or feedback? 

Charlène. 


[1] https://metacpan.org/changes/distribution/Sub-Identify
[2] https://transfer.sh/95OfF/p5-Sub-Identify.tgz

Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Sub-Identify/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile25 Nov 2016 23:43:22 -  1.15
+++ Makefile27 Dec 2018 22:28:24 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.15 2016/11/25 23:43:22 afresh1 Exp $
 
 COMMENT =  retrieve names of code references
-DISTNAME = Sub-Identify-0.12
+DISTNAME = Sub-Identify-0.14
 CATEGORIES =   devel
 
 MAINTAINER =   Andrew Fresh 
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Sub-Identify/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo25 Nov 2016 23:43:22 -  1.5
+++ distinfo27 Dec 2018 22:28:24 -
@@ -1,2 +1,2 @@
-SHA256 (Sub-Identify-0.12.tar.gz) = 
g7t4WmYRO0qWbbCkGG/R3QeYes2stFArHhVY+Bfd6CU=
-SIZE (Sub-Identify-0.12.tar.gz) = 52414
+SHA256 (Sub-Identify-0.14.tar.gz) = 
Bo0nIIZRTdHoQrakCxvtuv7mOQDlsIiQ72cAA53vrW8=
+SIZE (Sub-Identify-0.14.tar.gz) = 53135



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Juan Francisco Cantero Hurtado
CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2018/12/28 15:04:59

Modified files:
emulators/gr-lida: Makefile distinfo 
emulators/gr-lida/patches: patch-gr-lida_pro 
   patch-src_funciones_cpp 
Added files:
emulators/gr-lida/patches: patch-3rdparty_osdab-zip_zip_p_h 

Log message:
Change gr-lida to qt5 and poppler-qt5. Works for me on amd64.

Remove COMPILER and qtbase (from rsadowski@).



Re: update/fix: devel/boost

2018-12-28 Thread Stuart Henderson

Ok with me.
--
Sent from a phone, apologies for poor formatting.

On 28 December 2018 20:02:51 Rafael Sadowski  wrote:


On Fri Dec 28, 2018 at 07:04:51PM +, Stuart Henderson wrote:

On 2018/12/28 19:30, Rafael Sadowski wrote:
> On Fri Dec 28, 2018 at 02:31:49PM +, Stuart Henderson wrote:
> > Why subpackage this?
>
> Because nobody needs boost-build to run/build any ports. Let's be
> unfair, nobody needs boost-build except *maybe* a handful user.

If it was something huge then it would make sense. But really I don't
see the point in splitting it, it's got to be pretty small, I haven't
looked at the size of the new files but I can't imagine the whole thing
can be more than a MB or so can it? Less if the two identical files
b2 and bjam were hardlinked together.

> Doas another subpackge hurts?

Yes, it's extra scaffolding and extra risk of getting things wrong
both in the port itself, and in ports which might end up needing it
in the future.

I'm not going to insist but I really don't see a good reason to split
it. But if you are going to split it anyway see comments inline.;



Those are of course good points and it does not have to be for me
necessarily a subpackage. Below a diff without -build subpackage.

package fine for me. OK?

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile24 Dec 2018 23:34:27 -  1.79
+++ Makefile28 Dec 2018 19:56:58 -
@@ -9,7 +9,7 @@ VERSION=1.66.0
DISTNAME=   boost_${VERSION:S/./_/g}
PKGNAME-main=   boost-${VERSION}
PKGNAME-md= boost-md-${VERSION}
-REVISION-main= 1
+REVISION-main= 2
CATEGORIES= devel
MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=boost/}
EXTRACT_SUFX=   .tar.bz2
@@ -167,12 +167,23 @@ do-build:
./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_3}\

do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
-   ${PREFIX}/bin
+   # Libs and includes:
${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
@cd ${WRKSRC} && \
find boost -type d -exec ${INSTALL_DATA_DIR} 
${PREFIX}/include/{} \;
@cd ${WRKSRC} && \
		find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {} 
${PREFIX}/include/{} \;

+   # boost-build:
+   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
+   ${PREFIX}/bin
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/boost-build
+   @cd ${WRKSRC}/tools/build/src && \
+   pax -r -w -p pm -s ':^./engine.*$$::' \
+   -s ':^.*\.orig$$::' . ${PREFIX}/share/boost-build
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
+   ${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
+   ${PREFIX}/share/examples/boost-build
+   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+   ${PREFIX}/share/boost-build/

.include 
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/boost/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST-main
--- pkg/PLIST-main  13 Dec 2018 19:52:46 -  1.6
+++ pkg/PLIST-main  28 Dec 2018 19:56:59 -
@@ -14160,3 +14160,362 @@ lib/libboost_wserialization-mt.a
@lib lib/libboost_wserialization-mt.so.${LIBboost_wserialization-mt_VERSION}
lib/libboost_wserialization.a
@lib lib/libboost_wserialization.so.${LIBboost_wserialization_VERSION}
+share/boost-build/
+share/boost-build/__init__.py
+share/boost-build/__init__.pyc
+share/boost-build/bootstrap.jam
+share/boost-build/build/
+share/boost-build/build-system.jam
+share/boost-build/build/__init__.py
+share/boost-build/build/__init__.pyc
+share/boost-build/build/ac.jam
+share/boost-build/build/alias.jam
+share/boost-build/build/alias.py
+share/boost-build/build/alias.pyc
+share/boost-build/build/build-request.jam
+share/boost-build/build/build_request.py
+share/boost-build/build/build_request.pyc
+share/boost-build/build/config-cache.jam
+share/boost-build/build/configure.jam
+share/boost-build/build/configure.py
+share/boost-build/build/configure.pyc
+share/boost-build/build/engine.py
+share/boost-build/build/engine.pyc
+share/boost-build/build/errors.py
+share/boost-build/build/errors.pyc
+share/boost-build/build/feature.jam
+share/boost-build/build/feature.py
+share/boost-build/build/feature.pyc
+share/boost-build/build/generators.jam
+share/boost-build/build/generators.py
+share/boost-build/build/generators.pyc
+share/boost-build/build/project.jam
+share/boost-build/build/project.py
+share/boost-build/build/project.pyc
+share/boost-build/build/property-set.jam
+share/boost-build/build/property.jam
+share/boost-build/build/property.py
+share/boost-build/build/property.pyc
+share/boost-build/build/property_set.py
+share/boost-build/build/property_set.pyc

CVS: cvs.openbsd.org: ports

2018-12-28 Thread Matthias Kilian
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2018/12/28 13:58:02

Modified files:
graphics/pdf2djvu: Makefile 

Log message:
Forgot to bump revision.



Re: graphics/gdcm and poppler-0.72.0

2018-12-28 Thread Matthias Kilian
On Fri, Dec 28, 2018 at 09:03:39AM +0100, Antoine Jacoutot wrote:
> > let gdcm build with poppler-0.72.0.
> >
> > Build and runtime tests both against the old (0.61.1) and new
> > (0.72.2) poppler are welcome.
> 
> Fails to build with old poppler (0.61.1) on amd64:

Tanks for testing, anyway.

Then I have to commit the patches after the poppler update. Not
real problem.

CIao,
Kili



Re: update/fix: devel/boost

2018-12-28 Thread Rafael Sadowski
On Fri Dec 28, 2018 at 07:04:51PM +, Stuart Henderson wrote:
> On 2018/12/28 19:30, Rafael Sadowski wrote:
> > On Fri Dec 28, 2018 at 02:31:49PM +, Stuart Henderson wrote:
> > > Why subpackage this?
> > 
> > Because nobody needs boost-build to run/build any ports. Let's be
> > unfair, nobody needs boost-build except *maybe* a handful user.
> 
> If it was something huge then it would make sense. But really I don't
> see the point in splitting it, it's got to be pretty small, I haven't
> looked at the size of the new files but I can't imagine the whole thing
> can be more than a MB or so can it? Less if the two identical files
> b2 and bjam were hardlinked together.
> 
> > Doas another subpackge hurts?
> 
> Yes, it's extra scaffolding and extra risk of getting things wrong
> both in the port itself, and in ports which might end up needing it
> in the future.
> 
> I'm not going to insist but I really don't see a good reason to split
> it. But if you are going to split it anyway see comments inline.;
> 

Those are of course good points and it does not have to be for me
necessarily a subpackage. Below a diff without -build subpackage.

package fine for me. OK?

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile24 Dec 2018 23:34:27 -  1.79
+++ Makefile28 Dec 2018 19:56:58 -
@@ -9,7 +9,7 @@ VERSION=1.66.0
 DISTNAME=  boost_${VERSION:S/./_/g}
 PKGNAME-main=  boost-${VERSION}
 PKGNAME-md=boost-md-${VERSION}
-REVISION-main= 1
+REVISION-main= 2
 CATEGORIES=devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=boost/}
 EXTRACT_SUFX=  .tar.bz2
@@ -167,12 +167,23 @@ do-build:
./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_3}\
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
-   ${PREFIX}/bin
+   # Libs and includes:
${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
@cd ${WRKSRC} && \
find boost -type d -exec ${INSTALL_DATA_DIR} 
${PREFIX}/include/{} \;
@cd ${WRKSRC} && \
find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {} 
${PREFIX}/include/{} \;
+   # boost-build:
+   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
+   ${PREFIX}/bin
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/boost-build
+   @cd ${WRKSRC}/tools/build/src && \
+   pax -r -w -p pm -s ':^./engine.*$$::' \
+   -s ':^.*\.orig$$::' . ${PREFIX}/share/boost-build
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
+   ${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
+   ${PREFIX}/share/examples/boost-build
+   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+   ${PREFIX}/share/boost-build/
 
 .include 
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/boost/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST-main
--- pkg/PLIST-main  13 Dec 2018 19:52:46 -  1.6
+++ pkg/PLIST-main  28 Dec 2018 19:56:59 -
@@ -14160,3 +14160,362 @@ lib/libboost_wserialization-mt.a
 @lib lib/libboost_wserialization-mt.so.${LIBboost_wserialization-mt_VERSION}
 lib/libboost_wserialization.a
 @lib lib/libboost_wserialization.so.${LIBboost_wserialization_VERSION}
+share/boost-build/
+share/boost-build/__init__.py
+share/boost-build/__init__.pyc
+share/boost-build/bootstrap.jam
+share/boost-build/build/
+share/boost-build/build-system.jam
+share/boost-build/build/__init__.py
+share/boost-build/build/__init__.pyc
+share/boost-build/build/ac.jam
+share/boost-build/build/alias.jam
+share/boost-build/build/alias.py
+share/boost-build/build/alias.pyc
+share/boost-build/build/build-request.jam
+share/boost-build/build/build_request.py
+share/boost-build/build/build_request.pyc
+share/boost-build/build/config-cache.jam
+share/boost-build/build/configure.jam
+share/boost-build/build/configure.py
+share/boost-build/build/configure.pyc
+share/boost-build/build/engine.py
+share/boost-build/build/engine.pyc
+share/boost-build/build/errors.py
+share/boost-build/build/errors.pyc
+share/boost-build/build/feature.jam
+share/boost-build/build/feature.py
+share/boost-build/build/feature.pyc
+share/boost-build/build/generators.jam
+share/boost-build/build/generators.py
+share/boost-build/build/generators.pyc
+share/boost-build/build/project.jam
+share/boost-build/build/project.py
+share/boost-build/build/project.pyc
+share/boost-build/build/property-set.jam
+share/boost-build/build/property.jam
+share/boost-build/build/property.py
+share/boost-build/build/property.pyc
+share/boost-build/build/property_set.py
+share/boost-build/build/property_set.pyc
+share/boost-build/build/readme.txt
+share/boost-build/build/scanner.jam

CVS: cvs.openbsd.org: ports

2018-12-28 Thread Matthias Kilian
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2018/12/28 12:59:50

Added files:
graphics/pdf2djvu/patches: patch-pdf-backend_cc 
   patch-pdf-backend_hh 
   patch-pdf-unicode_cc 
   patch-pdf2djvu_cc 

Log message:
Let it build with old and new poppler (0.61.1 and 0.72.2).

ok juanfra@ (maintainer), also build-tested by aja@



Re: UPDATE: math/hdf5

2018-12-28 Thread Paul Irofti
> The 1.10 branch includes changes in the HDF5 storage format
> (https://portal.hdfgroup.org/display/HDF5/New+Features+in+HDF5+Release+1.10)
> and expands the API of various shared libraries.

HDF claims that the new format is compatible with the old one and it
does not break applications still linking with 1.8.

  "If an application built on HDF5 Release 1.10 avoids use of the new
  features and does not request use of the latest format, applications
  built on HDF5 Release 1.8.x will be able to read files the first
  application created. In addition, applications originally written for
  use with HDF5 Release 1.8.x can be linked against a suitably configured
  HDF5 Release 1.10.x library, thus taking advantage of performance
  improvements in 1.10."

> I see no obstacles for 1.10.x but did not have time to investigate large
> applications like Octave for compatibility problems.

Octave seems fine with newer versions.

  https://hg.savannah.gnu.org/hgweb/octave/file/442632888649/configure.ac#l1484

> As long as
> https://portal.hdfgroup.org/display/HDF5/HDF5 lists 1.8.x as a current
> release and since nobody has complained so far I just did not invest
> time for this big update.

Sure, no pressure. Go ahead with your change. I was just curious.



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/12/28 12:28:37

Modified files:
archivers/zstd : Makefile distinfo 
archivers/zstd/patches: patch-lib_Makefile 
Removed files:
archivers/zstd/patches: patch-programs_Makefile 

Log message:
Update to zstd-1.3.8.

Bump major of SHARED_LIBS as symbols have been removed. Consumers have
been build tested. Run tested in combination with libarchive and
borgbackup.

OK sthen@



Re: CVS: cvs.openbsd.org: ports

2018-12-28 Thread Stuart Henderson
On 2018/12/23 08:05, Kirill Bychkov wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ki...@cvs.openbsd.org   2018/12/23 08:05:07
>=20
> Modified files:
>   net/munin  : Makefile distinfo=20
>   net/munin/patches: patch-Makefile patch-Makefile_config=20
>  patch-plugins_node_d_postfix_mailstats_in=20
>=20
> Log message:
> update to munin-2.0.44
>=20

Failed in i386 bulk, it looks like it's doing something which triggered a
segfault in gmake:

=2E..
cd common && /usr/bin/perl Build code
gmake substitute-build-defaults-inline
gmake[1]: Entering directory '/usr/obj/ports/munin-2.0.44/munin-2.0.44'
Makefile:78: warning: overriding recipe for target '.java.class'
gmake: *** [Makefile:328: build-common-defaults-stamp] Segmentation fault (=
core dumped)
*** Error 2 in net/munin (/usr/ports/infrastructure/mk/bsd.port.mk:2786 '/u=
sr/obj/ports/munin-2.0.44/.build_done')
=3D=3D=3D> Exiting net/munin,-main with an error
=2E..

sthen@i386[/usr/obj/ports/munin-2.0.44] sudo gdb /usr/local/bin/gmake ./mun=
in-2.0.44/gmake.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 condition=
s.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB.  Type "show warranty" for details.
This GDB was configured as "i386-unknown-openbsd6.4"...(no debugging symbol=
s found)

Core was generated by `gmake'.
Program terminated with signal 11, Segmentation fault.
(no debugging symbols found)
Loaded symbols for /usr/local/bin/gmake
Reading symbols from /usr/local/lib/libintl.so.6.0...(no debugging symbols =
found)...done.
Loaded symbols for /usr/local/lib/libintl.so.6.0
Reading symbols from /usr/local/lib/libiconv.so.6.0...(no debugging symbols=
 found)...done.
Loaded symbols for /usr/local/lib/libiconv.so.6.0
Reading symbols from /usr/lib/libc.so.93.0...done.
Loaded symbols for /usr/lib/libc.so.93.0
Reading symbols from /usr/libexec/ld.so...done.
Loaded symbols for /usr/libexec/ld.so
#0  _libc_strlen (
str=3D0x68edeb00 '' ...) at /usr/src/lib/libc/string=
/strlen.c:39
39  for (s =3D str; *s; ++s)
(gdb) bt=20
#0  _libc_strlen (str=3D0x68edeb00 '' ...) at /usr/src/l=
ib/libc/string/strlen.c:39
#1  0x14d2fc4b in error () from /usr/local/bin/gmake
#2  0x14d33d3f in parse_file_seq () from /usr/local/bin/gmake
#3  0x14d31620 in eval_buffer () from /usr/local/bin/gmake
#4  0x14d30713 in read_all_makefiles () from /usr/local/bin/gmake
#5  0x14d30303 in read_all_makefiles () from /usr/local/bin/gmake
#6  0x14d2b971 in main () from /usr/local/bin/gmake
Current language:  auto; currently minimal
(gdb)=20




Full log below:


>>> Building on i386 under net/munin,-main
 BDEPENDS =3D [devel/p5-Module-Build;devel/gmake]
 DIST =3D [net/munin,-server:munin-2.0.44.tar.gz]
 FULLPKGNAME =3D munin-node-2.0.44
 RDEPENDS =3D 
[devel/p5-List-MoreUtils;net/p5-Net-CIDR;net/p5-IO-Socket-IN=
ET6;sysutils/logtail;devel/p5-Net-Server;devel/p5-Log-Log4perl]
(Junk lock obtained for i386 at 1545933672)
>>> Running depends in net/munin,-main at 1545933672
   last junk was in textproc/pinfo
/usr/sbin/pkg_add -aI -Drepair p5-Module-Build-0.4224
was: /usr/sbin/pkg_add -aI -Drepair gmake-4.2.1 p5-Module-Build-0.4224
/usr/sbin/pkg_add -aI -Drepair p5-Module-Build-0.4224
>>> Running show-prepare-results in net/munin,-main at 1545933673
=3D=3D=3D> net/munin,-main
=3D=3D=3D> munin-node-2.0.44 depends on: p5-Module-Build-* -> p5-Module-Bui=
ld-0.4224
=3D=3D=3D> munin-node-2.0.44 depends on: gmake-* -> gmake-4.2.1
gmake-4.2.1
p5-Module-Build-0.4224
(Junk lock released for i386 at 1545933674)
distfiles size=3D2258278
>>> Running build in net/munin,-main at 1545933674
=3D=3D=3D> net/munin,-main
=3D=3D=3D>  Checking files for munin-2.0.44
`/mnt/distfiles/munin-2.0.44.tar.gz' is up to date.
=3D=3D=3D>  Extracting for munin-2.0.44
cp -Rp /usr/obj/ports/munin-2.0.44/munin-2.0.44/plugins/node.d.freebsd /usr=
/obj/ports/munin-2.0.44/munin-2.0.44/plugins/node.d.openbsd
cp -p /usr/obj/ports/munin-2.0.44/munin-2.0.44/plugins/node.d.netbsd/uptime=
=2Ein /usr/obj/ports/munin-2.0.44/munin-2.0.44/plugins/node.d.openbsd
cp -p /usr/obj/ports/munin-2.0.44/munin-2.0.44/plugins/node.d.netbsd/memory=
=2Ein /usr/obj/ports/munin-2.0.44/munin-2.0.44/plugins/node.d.openbsd
/usr/bin/perl /usr/ports/infrastructure/bin/pkg_subst -DMODPY_PYCACHE=3D -D=
MODPY_COMMENT=3D\"@comment\ \" -DMODPY_ABI3SO=3D -DMODPY_PYC_MAGIC_TAG=3D -=
DMODPY_BIN=3D/usr/local/bin/python2.7 -DMODPY_EGG_VERSION=3D -DMODPY_VERSIO=
N=3D2.7 -DMODPY_BIN_SUFFIX=3D -DMODPY_PY_PREFIX=3Dpy- -DMODPY_PYOEXTENSION=
=3Dpyo -DMODRUBY_RELDOCDIR=3Dshare/doc/ruby25 -DMODRUBY_RELEXAMPLEDIR=3Dsha=
re/examples/ruby25 -DMODRUBY_SITEARCHDIR=3Dlib/ruby/site_ruby/2.5/i386-open=
bsd -DMODRUBY_SITEDIR=3Dlib/ruby/site_ruby/2.5 -DMODRUBY_LIBREV=3D2.5 -DMOD=
RUBY_ARCH=3Di386-openbsd 

Re: CVS: cvs.openbsd.org: ports

2018-12-28 Thread Stuart Henderson
On 2018/12/22 05:17, Robert Nagy wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rob...@cvs.openbsd.org  2018/12/22 05:17:49
> 
> Modified files:
>   mail/kopano: Makefile.inc 
>   mail/kopano/core: Makefile distinfo 
>   mail/kopano/core/pkg: PLIST-main 
> 
> Log message:
> update to 8.7.80.355
> 

Fails with ld.bfd:

libtool: link: c++ -Wall -Wmissing-declarations -std=c++14 -Wno-variadic-macros 
-O2 -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden 
-Wno-sign-compare -O2 -pipe -o tests/.libs/zcpmd5 tests/zcpmd5.o  -L./.libs 
-lkcutil -L/usr/local/lib -lpthread -lcurl -lnghttp2 -lz -licui18n -licuuc 
-licudata -ljsoncpp -lHX -lssl -lcrypto -pthread -Wl,-rpath,/usr/local/lib
/usr/local/lib/libicui18n.so.14.0: warning: strcat() is almost always misused, 
please use strlcat()
./.libs/libkcutil.so.0.0: warning: strcpy() is almost always misused, please 
use strlcpy()
/usr/local/lib/libcurl.so.25.19: warning: sprintf() is often misused, please 
use snprintf()
/usr/local/lib/libHX.so.0.0: warning: rand() may return deterministic values, 
is that what you want?
./.libs/libkcutil.so.0.0: undefined reference to `libiconv_open'
./.libs/libkcutil.so.0.0: undefined reference to `libiconv_close'
./.libs/libkcutil.so.0.0: undefined reference to 
`libintl_bind_textdomain_codeset'
./.libs/libkcutil.so.0.0: undefined reference to `libintl_dcgettext'
./.libs/libkcutil.so.0.0: undefined reference to `libiconv'
c++: error: linker command failed with exit code 1 (use -v to see invocation)




Re: security/wpa_supplicant: Reassoc on NWID change

2018-12-28 Thread Stuart Henderson
On 2018/12/28 19:05, Peter Hessler wrote:
> I gave this a spin, and seems to work in my testing.
> 
> I did a few suspend/resumes, manual if down/up, forced a chan NN, and
> walked around to do some roaming between 8 bssids.  Recovery took a
> short period of time, but was as expected.
> 
> OK

I'm OK with committing and tweaking later, but ...

> :++   for (offset = 0; offset < n;) {
> :++   rtm = (struct rt_msghdr *)(rtmmsg + offset);
> :++
> :++   if ((size_t)(n - offset) < sizeof(rtm->rtm_msglen) ||
> :++   (n - offset) < rtm->rtm_msglen ||
> :++   rtm->rtm_version != RTM_VERSION)
> :++   goto done;
> :++   offset += rtm->rtm_msglen;

... I'm pretty sure "rtm->rtm_version != RTM_VERSION" should "continue"
as well.

> :++
> :++   if (rtm->rtm_index != drv->ifindex)
> :++   continue;
> :++
> :++   switch (rtm->rtm_type) {
> :++   case RTM_80211INFO:
> :++   ifie = &((struct if_ieee80211_msghdr *)rtm)->ifim_ifie;
> :++   wpa_driver_openbsd_rtmsg_80211(ifie, drv);
> :++   break;
> :++   case RTM_IFINFO:
> :++   wpa_driver_openbsd_rtmsg_ifinfo(rtm, drv);
> :++   break;
> :++   default:
> :++   wpa_printf(MSG_ERROR, "Unexpected route message of type"
> :++  " %d received", rtm->rtm_type);
> :++   break;
> :++   }
> :++   }
> :++
> :++done:
> :++   os_free(rtmmsg);
> :++}
> :++
> :++static void *
> :++wpa_driver_openbsd_init(void *ctx, const char *ifname) {
> :+struct openbsd_driver_data *drv;
> :++   unsigned int rtfilter = ROUTE_FILTER(RTM_80211INFO) | \
> :++   ROUTE_FILTER(RTM_IFINFO);
> :+ 
> :+drv = os_zalloc(sizeof(*drv));
> :+if (drv == NULL)
> :+@@ -103,9 +207,26 @@ wpa_driver_openbsd_init(void *ctx, const char *ifname)
> :+if (drv->sock < 0)
> :+goto fail;
> :+ 
> :++
> :++   drv->rtsock = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC);
> :++   if (drv->rtsock < 0)
> :++   goto fail;
> :++   if (setsockopt(drv->rtsock, PF_ROUTE, ROUTE_MSGFILTER,
> :++  , sizeof(rtfilter)) == -1)
> :++   goto fail;
> :++
> :+drv->ctx = ctx;
> :+os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname));
> :+ 
> :++   drv->ifindex = if_nametoindex(drv->ifname);
> :++   if (drv->ifindex == 0) /* No interface with that name */
> :++   goto fail;
> :++
> :++   drv->nwid_len = wpa_driver_openbsd_get_ssid(drv, drv->nwid);
> :++   wpa_driver_openbsd_get_bssid(drv, drv->addr);
> :++
> :++   eloop_register_read_sock(drv->rtsock, wpa_driver_openbsd_event_receive,
> :++NULL, drv);
> :+return drv;
> :+ 
> :+ fail:
> :+@@ -119,7 +240,11 @@ wpa_driver_openbsd_deinit(void *priv)
> :+ {
> :+struct openbsd_driver_data *drv = priv;
> :+ 
> :++   eloop_unregister_read_sock(drv->rtsock);
> :++
> :+close(drv->sock);
> :++   close(drv->rtsock);
> :++
> :+os_free(drv);
> :+ }
> :+ 
> :
> 
> -- 
> The camel has a single hump;
> The dromedary two;
> Or else the other way around.
> I'm never sure.  Are you?
>   -- Ogden Nash



Re: update/fix: devel/boost

2018-12-28 Thread Stuart Henderson
On 2018/12/28 19:30, Rafael Sadowski wrote:
> On Fri Dec 28, 2018 at 02:31:49PM +, Stuart Henderson wrote:
> > Why subpackage this?
> 
> Because nobody needs boost-build to run/build any ports. Let's be
> unfair, nobody needs boost-build except *maybe* a handful user.

If it was something huge then it would make sense. But really I don't
see the point in splitting it, it's got to be pretty small, I haven't
looked at the size of the new files but I can't imagine the whole thing
can be more than a MB or so can it? Less if the two identical files
b2 and bjam were hardlinked together.

> Doas another subpackge hurts?

Yes, it's extra scaffolding and extra risk of getting things wrong
both in the port itself, and in ports which might end up needing it
in the future.

I'm not going to insist but I really don't see a good reason to split
it. But if you are going to split it anyway see comments inline.;

> > -- 
> > Sent from a phone, apologies for poor formatting.
> > 
> > On 28 December 2018 13:41:22 Rafael Sadowski  wrote:
> > 
> > > Hi all!
> > > 
> > > Our boost.build executables b2 and bjam are useless without the *.jam
> > > stuff. The diff below want to fix the situation withe a third
> > > sub-package named "build".
> > > 
> > > do-install bits from NetBSD and DESCR from FreeBSD.
> > > Noticed by Ivan Krylov via openbsd@freenode. Thanks!
> > > 
> > > Comments, OK?
> > > 
> > > Rafael Sadowski
> > > 
> 
> New diff with a compileall.py call at the end of the do-install step,
> after feedback from semarie@ and aja@ Thanks!
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/boost/Makefile,v
> retrieving revision 1.79
> diff -u -p -u -p -r1.79 Makefile
> --- Makefile  24 Dec 2018 23:34:27 -  1.79
> +++ Makefile  28 Dec 2018 18:18:16 -
> @@ -2,6 +2,7 @@
>  
>  COMMENT-main=free peer-reviewed portable C++ source libraries
>  COMMENT-md=  machine-dependent libraries for boost
> +COMMENT-build=   extensible cross-platform build tool suite
>  
>  # XXX if updating, try to remove -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
>  # XXX in archivers/innoextract
> @@ -9,7 +10,8 @@ VERSION= 1.66.0
>  DISTNAME=boost_${VERSION:S/./_/g}
>  PKGNAME-main=boost-${VERSION}
>  PKGNAME-md=  boost-md-${VERSION}
> -REVISION-main=   1
> +PKGNAME-build=   boost-build-${VERSION}
> +REVISION-main=   2
>  CATEGORIES=  devel
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=boost/}
>  EXTRACT_SUFX=.tar.bz2
> @@ -76,7 +78,7 @@ WANTLIB += ${COMPILER_LIBCXX} bz2 c icud
>  
>  COMPILER= base-clang ports-gcc
>  
> -MULTI_PACKAGES=  -main -md
> +MULTI_PACKAGES=  -main -md -build
>  
>  MODULES= lang/python
>  MODPY_RUNDEP=No
> @@ -167,12 +169,22 @@ do-build:
>   ./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_3}\
>  
>  do-install:
> - ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
> - ${PREFIX}/bin
>   ${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
>   @cd ${WRKSRC} && \
>   find boost -type d -exec ${INSTALL_DATA_DIR} 
> ${PREFIX}/include/{} \;
>   @cd ${WRKSRC} && \
>   find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {} 
> ${PREFIX}/include/{} \;
> + # -build
> + ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
> + ${PREFIX}/bin
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/boost-build
> + @cd ${WRKSRC}/tools/build/src && \
> + pax -r -w -p pm -s ':^./engine.*$$::' \
> + -s ':^.*\.orig$$::' . ${PREFIX}/share/boost-build
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
> + ${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
> + ${PREFIX}/share/examples/boost-build
> + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> + ${PREFIX}/share/boost-build/
>  
>  .include 
> Index: pkg/DESCR-build
> ===
> RCS file: pkg/DESCR-build
> diff -N pkg/DESCR-build
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/DESCR-build   28 Dec 2018 18:18:16 -
> @@ -0,0 +1,7 @@
> +Boost.Build is an easy way to build C++ projects, everywhere. You name you
> +executables and libraries and list their sources.

"You name *your* executables"...

> +
> +Boost.Build takes care about compiling your sources with right options,

"with the right options"

> +creating static and shared libraries, making executables, and other chores --
> +whether you're using gcc, msvc, or a dozen more supported C++ compilers -- on
> +Windows, OSX, Linux and commercial UNIX systems.
> Index: pkg/PLIST-build
> ===
> RCS file: pkg/PLIST-build
> diff -N pkg/PLIST-build
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/PLIST-build   28 Dec 2018 18:18:16 -
> @@ -0,0 +1,362 @@
> +@comment 

CVS: cvs.openbsd.org: ports

2018-12-28 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/12/28 12:02:40

Modified files:
editors/ktikz  : Makefile distinfo 
editors/ktikz/pkg: PLIST 
Removed files:
editors/ktikz/patches: patch-app_app_pro patch-qtikz_pro 

Log message:
Update to ktikz 0.12

switches to qt5, so that's one less consumer for poppler-qt4..

ok pirofti@ (maintainer)



UPDATE archivers/zstd

2018-12-28 Thread Björn Ketelaars
Enclosed diff brings zstd to 1.3.8, which introduces a couple of new
features. Changelog can be found at
https://raw.githubusercontent.com/facebook/zstd/master/CHANGELOG

Major of SHARED_LIBS has been bumped as symbols have been removed. A
patch has been dropped as issue has been addressed upstream.

Build tested the consumers, and run tested in combination with
libarchive and borgbackup. 'make test' runs successfully.

OK?


Index: zstd/Makefile
===
RCS file: /cvs/ports/archivers/zstd/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- zstd/Makefile   24 Oct 2018 04:58:20 -  1.21
+++ zstd/Makefile   28 Dec 2018 18:49:48 -
@@ -2,10 +2,10 @@
 
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.3.7
+V =1.3.8
 DISTNAME = zstd-${V}
 
-SHARED_LIBS =  zstd1.2 # 1.3.6
+SHARED_LIBS =  zstd2.0 # 1.3.8
 
 CATEGORIES =   archivers
 
Index: zstd/distinfo
===
RCS file: /cvs/ports/archivers/zstd/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- zstd/distinfo   24 Oct 2018 04:58:20 -  1.13
+++ zstd/distinfo   28 Dec 2018 18:49:48 -
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.3.7.tar.gz) = MnfyNt8Mpu2uAa6E6GVHAADFo0hFiP1bw9hph3/TVz0=
-SIZE (zstd-1.3.7.tar.gz) = 1813285
+SHA256 (zstd-1.3.8.tar.gz) = KT+gBN+s++kLQmYMR0kg/ycJPj+2yZ97duYIOyHW1I4=
+SIZE (zstd-1.3.8.tar.gz) = 1862954
Index: zstd/patches/patch-lib_Makefile
===
RCS file: /cvs/ports/archivers/zstd/patches/patch-lib_Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_Makefile
--- zstd/patches/patch-lib_Makefile 16 Oct 2018 14:56:34 -  1.3
+++ zstd/patches/patch-lib_Makefile 28 Dec 2018 18:49:48 -
@@ -3,16 +3,7 @@ $OpenBSD: patch-lib_Makefile,v 1.3 2018/
 Index: lib/Makefile
 --- lib/Makefile.orig
 +++ lib/Makefile
-@@ -31,7 +31,7 @@ DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Ws
- CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
- FLAGS= $(CPPFLAGS) $(CFLAGS)
- 
--GREP = grep --color=never
-+GREP = grep
- 
- ZSTDCOMMON_FILES := $(sort $(wildcard common/*.c))
- ZSTDCOMP_FILES := $(sort $(wildcard compress/*.c))
-@@ -90,10 +90,10 @@ ifeq ($(shell uname), Darwin)
+@@ -125,10 +125,10 @@ ifeq ($(shell uname), Darwin)
SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
SONAME_FLAGS = -install_name $(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) 
-compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
  else
@@ -25,7 +16,7 @@ Index: lib/Makefile
  endif
  
  
-@@ -106,7 +106,7 @@ all: lib
+@@ -141,7 +141,7 @@ all: lib
  libzstd.a: ARFLAGS = rcs
  libzstd.a: $(ZSTD_OBJ)
@echo compiling static library
@@ -34,7 +25,7 @@ Index: lib/Makefile
  
  libzstd.a-mt: CPPFLAGS += -DZSTD_MULTITHREAD
  libzstd.a-mt: libzstd.a
-@@ -125,7 +125,7 @@ LIBZSTD = libzstd.$(SHARED_EXT_VER)
+@@ -160,7 +160,7 @@ LIBZSTD = libzstd.$(SHARED_EXT_VER)
  $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
  $(LIBZSTD): $(ZSTD_FILES)
@echo compiling dynamic library $(LIBVER)
@@ -43,7 +34,7 @@ Index: lib/Makefile
@echo creating versioned links
@ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
@ln -sf $@ libzstd.$(SHARED_EXT)
-@@ -221,8 +221,6 @@ install-shared: libzstd
+@@ -256,8 +256,6 @@ install-shared: libzstd
@echo Installing shared library
@$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
@$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
Index: zstd/patches/patch-programs_Makefile
===
RCS file: zstd/patches/patch-programs_Makefile
diff -N zstd/patches/patch-programs_Makefile
--- zstd/patches/patch-programs_Makefile16 Oct 2018 14:56:34 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-programs_Makefile,v 1.1 2018/10/16 14:56:34 bket Exp $
-
-Index: programs/Makefile
 programs/Makefile.orig
-+++ programs/Makefile
-@@ -29,7 +29,7 @@ LIBVER  := $(shell echo $(LIBVER_SCRIPT))
- 
- ZSTD_VERSION = $(LIBVER)
- 
--GREP = grep --color=never
-+GREP = grep
- 
- ifeq ($(shell $(CC) -v 2>&1 | $(GREP) -c "gcc version "), 1)
- ALIGN_LOOP = -falign-loops=32



Re: UPDATE: math/hdf5

2018-12-28 Thread Ingo Feinerer
On Fri, Dec 28, 2018 at 06:34:23PM +0200, Paul Irofti wrote:
> On Fri, Dec 28, 2018 at 12:07:32PM +0100, Ingo Feinerer wrote:
> > update math/hdf5 1.8.20 -> 1.8.21
> 
> Why are we avoiding the 1.10 branch? OK otherwise.

The 1.10 branch includes changes in the HDF5 storage format
(https://portal.hdfgroup.org/display/HDF5/New+Features+in+HDF5+Release+1.10)
and expands the API of various shared libraries.

I see no obstacles for 1.10.x but did not have time to investigate large
applications like Octave for compatibility problems. As long as
https://portal.hdfgroup.org/display/HDF5/HDF5 lists 1.8.x as a current
release and since nobody has complained so far I just did not invest
time for this big update.

Best regards,
Ingo



Re: [WIP/NEW] 1oom - Master of Orion 1 engine

2018-12-28 Thread Brian Callahan




On 11/25/18 11:09 AM, Brian Callahan wrote:



On 11/24/18 5:26 PM, Max Fillinger wrote:

On Fri, Nov 23, 2018 at 09:40:41PM -0500, Brian Callahan wrote:


On 11/23/18 7:05 PM, Max Fillinger wrote:

Thanks for your help!


* No MAINTAINER--do you want it?
What does that entail?  I want to keep this port working and up to 
date,

if I can.  But I won't be any help if someone has, for example, a
problem on a non-i386/amd64 platform.

* Made the building of your fixbugs.pbx more sane and in the 
appropriate
places for the port. I added a comment explaining why we have a 
post-build

and post-install.
Your comment in the Makefile seems a bit misleading. fixbugs.pbx is 
for

when you *don't* want the bugs of the original game.  I'd suggest
something like:

# Create patch file to allow the user to disable bug-compatibility 
with

# the original game.


Alright, that's my misunderstanding of what the file does then.

~Brian


Here's a new archive, essentially the same as before but with me written
in as MAINTAINER and the comment fixed.


Sure. I'm ok with this.

~Brian


Ping.



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Ingo Feinerer
CVSROOT:/cvs
Module name:ports
Changes by: feine...@cvs.openbsd.org2018/12/28 11:41:34

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

Log message:
Add math/hdf5 to CVE table



UPDATE: textproc/p5-LaTeXML 0.8.3_7

2018-12-28 Thread Paul Irofti
Hi,

Here is a trivial update for p5-LaTeXML. OK?

Paul


Index: Makefile
===
RCS file: /cvs/ports/textproc/p5-LaTeXML/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile1 Jul 2018 09:02:41 -   1.5
+++ Makefile28 Dec 2018 18:38:41 -
@@ -4,9 +4,8 @@ COMMENT =   LaTeX to XML/HTML/MathML Conve
 
 MODULES =  cpan
 PKG_ARCH = *
-DISTNAME = LaTeXML-0.8.2_3
+DISTNAME = LaTeXML-0.8.3_7
 CATEGORIES =   textproc
-REVISION = 0
 
 # perl
 PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/textproc/p5-LaTeXML/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo4 May 2018 11:12:46 -   1.2
+++ distinfo28 Dec 2018 18:38:41 -
@@ -1,2 +1,2 @@
-SHA256 (LaTeXML-0.8.2_3.tar.gz) = HXEWJ4p+8He52gDlXQVlWnQ5NTdKOCMzP2/xdob+Mew=
-SIZE (LaTeXML-0.8.2_3.tar.gz) = 8220515
+SHA256 (LaTeXML-0.8.3_7.tar.gz) = XoUOCkyGrvxftnpdo32/FuNEKTkQ4S/+8MgfX/h6Aa4=
+SIZE (LaTeXML-0.8.3_7.tar.gz) = 10704544
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/p5-LaTeXML/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   1 Jul 2018 09:02:41 -   1.3
+++ pkg/PLIST   28 Dec 2018 18:38:41 -
@@ -21,6 +21,7 @@ ${P5SITE}/LaTeXML/Common/Error.pm
 ${P5SITE}/LaTeXML/Common/Float.pm
 ${P5SITE}/LaTeXML/Common/Font.pm
 ${P5SITE}/LaTeXML/Common/Glue.pm
+${P5SITE}/LaTeXML/Common/Locator.pm
 ${P5SITE}/LaTeXML/Common/Model/
 ${P5SITE}/LaTeXML/Common/Model.pm
 ${P5SITE}/LaTeXML/Common/Model/DTD.pm
@@ -53,6 +54,7 @@ ${P5SITE}/LaTeXML/Core/Definition/Primit
 ${P5SITE}/LaTeXML/Core/Definition/Register.pm
 ${P5SITE}/LaTeXML/Core/Document.pm
 ${P5SITE}/LaTeXML/Core/Gullet.pm
+${P5SITE}/LaTeXML/Core/KeyVal.pm
 ${P5SITE}/LaTeXML/Core/KeyVals.pm
 ${P5SITE}/LaTeXML/Core/List.pm
 ${P5SITE}/LaTeXML/Core/Mouth/
@@ -81,6 +83,7 @@ ${P5SITE}/LaTeXML/Package/
 ${P5SITE}/LaTeXML/Package.pm
 ${P5SITE}/LaTeXML/Package/AmSTeX.pool.ltxml
 ${P5SITE}/LaTeXML/Package/BibTeX.pool.ltxml
+${P5SITE}/LaTeXML/Package/IEEEtran.cls.ltxml
 ${P5SITE}/LaTeXML/Package/JHEP.cls.ltxml
 ${P5SITE}/LaTeXML/Package/JHEP2.cls.ltxml
 ${P5SITE}/LaTeXML/Package/JHEP3.cls.ltxml
@@ -99,13 +102,19 @@ ${P5SITE}/LaTeXML/Package/aasms.sty.ltxm
 ${P5SITE}/LaTeXML/Package/aaspp.sty.ltxml
 ${P5SITE}/LaTeXML/Package/aastex.cls.ltxml
 ${P5SITE}/LaTeXML/Package/aastex.sty.ltxml
+${P5SITE}/LaTeXML/Package/aastex6.cls.ltxml
+${P5SITE}/LaTeXML/Package/aastex61.cls.ltxml
+${P5SITE}/LaTeXML/Package/accents.sty.ltxml
+${P5SITE}/LaTeXML/Package/acmart.cls.ltxml
 ${P5SITE}/LaTeXML/Package/acronym.sty.ltxml
 ${P5SITE}/LaTeXML/Package/ae.sty.ltxml
+${P5SITE}/LaTeXML/Package/aecompl.sty.ltxml
 ${P5SITE}/LaTeXML/Package/afterpage.sty.ltxml
 ${P5SITE}/LaTeXML/Package/algc.sty.ltxml
 ${P5SITE}/LaTeXML/Package/algcompatible.sty.ltxml
 ${P5SITE}/LaTeXML/Package/algmatlab.sty.ltxml
 ${P5SITE}/LaTeXML/Package/algorithm.sty.ltxml
+${P5SITE}/LaTeXML/Package/algorithm2e.sty.ltxml
 ${P5SITE}/LaTeXML/Package/algorithmic.sty.ltxml
 ${P5SITE}/LaTeXML/Package/algorithmicx.sty.ltxml
 ${P5SITE}/LaTeXML/Package/algpascal.sty.ltxml
@@ -133,6 +142,7 @@ ${P5SITE}/LaTeXML/Package/amstext.sty.lt
 ${P5SITE}/LaTeXML/Package/amsthm.sty.ltxml
 ${P5SITE}/LaTeXML/Package/amsxtra.sty.ltxml
 ${P5SITE}/LaTeXML/Package/apjfonts.sty.ltxml
+${P5SITE}/LaTeXML/Package/appendix.sty.ltxml
 ${P5SITE}/LaTeXML/Package/applemac.def.ltxml
 ${P5SITE}/LaTeXML/Package/array.sty.ltxml
 ${P5SITE}/LaTeXML/Package/article.cls.ltxml
@@ -154,12 +164,14 @@ ${P5SITE}/LaTeXML/Package/breakurl.sty.l
 ${P5SITE}/LaTeXML/Package/calc.sty.ltxml
 ${P5SITE}/LaTeXML/Package/cancel.sty.ltxml
 ${P5SITE}/LaTeXML/Package/caption.sty.ltxml
+${P5SITE}/LaTeXML/Package/cases.sty.ltxml
 ${P5SITE}/LaTeXML/Package/ccfonts.sty.ltxml
 ${P5SITE}/LaTeXML/Package/chancery.sty.ltxml
 ${P5SITE}/LaTeXML/Package/charter.sty.ltxml
 ${P5SITE}/LaTeXML/Package/circuitikz.sty.ltxml
 ${P5SITE}/LaTeXML/Package/cite.sty.ltxml
 ${P5SITE}/LaTeXML/Package/citesort.sty.ltxml
+${P5SITE}/LaTeXML/Package/cleveref.sty.ltxml
 ${P5SITE}/LaTeXML/Package/cmbright.sty.ltxml
 ${P5SITE}/LaTeXML/Package/color.sty.ltxml
 ${P5SITE}/LaTeXML/Package/colordvi.sty.ltxml
@@ -170,6 +182,8 @@ ${P5SITE}/LaTeXML/Package/courier.sty.lt
 ${P5SITE}/LaTeXML/Package/cp852.def.ltxml
 ${P5SITE}/LaTeXML/Package/crop.sty.ltxml
 ${P5SITE}/LaTeXML/Package/cropmark.sty.ltxml
+${P5SITE}/LaTeXML/Package/csquotes.def.ltxml
+${P5SITE}/LaTeXML/Package/csquotes.sty.ltxml
 ${P5SITE}/LaTeXML/Package/dcolumn.sty.ltxml
 ${P5SITE}/LaTeXML/Package/deluxetable.sty.ltxml
 ${P5SITE}/LaTeXML/Package/doublespace.sty.ltxml
@@ -180,16 +194,21 @@ ${P5SITE}/LaTeXML/Package/elsart.cls.ltx
 ${P5SITE}/LaTeXML/Package/elsart.sty.ltxml
 ${P5SITE}/LaTeXML/Package/elsart_support.sty.ltxml
 

CVS: cvs.openbsd.org: ports

2018-12-28 Thread Ingo Feinerer
CVSROOT:/cvs
Module name:ports
Changes by: feine...@cvs.openbsd.org2018/12/28 11:39:49

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

Log message:
Update to HDF5 1.8.21

OK pirofti@



Re: update/fix: devel/boost

2018-12-28 Thread Rafael Sadowski
On Fri Dec 28, 2018 at 02:31:49PM +, Stuart Henderson wrote:
> Why subpackage this?

Because nobody needs boost-build to run/build any ports. Let's be
unfair, nobody needs boost-build except *maybe* a handful user.

Doas another subpackge hurts?

> -- 
> Sent from a phone, apologies for poor formatting.
> 
> On 28 December 2018 13:41:22 Rafael Sadowski  wrote:
> 
> > Hi all!
> > 
> > Our boost.build executables b2 and bjam are useless without the *.jam
> > stuff. The diff below want to fix the situation withe a third
> > sub-package named "build".
> > 
> > do-install bits from NetBSD and DESCR from FreeBSD.
> > Noticed by Ivan Krylov via openbsd@freenode. Thanks!
> > 
> > Comments, OK?
> > 
> > Rafael Sadowski
> > 

New diff with a compileall.py call at the end of the do-install step,
after feedback from semarie@ and aja@ Thanks!

Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile24 Dec 2018 23:34:27 -  1.79
+++ Makefile28 Dec 2018 18:18:16 -
@@ -2,6 +2,7 @@
 
 COMMENT-main=  free peer-reviewed portable C++ source libraries
 COMMENT-md=machine-dependent libraries for boost
+COMMENT-build= extensible cross-platform build tool suite
 
 # XXX if updating, try to remove -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
 # XXX in archivers/innoextract
@@ -9,7 +10,8 @@ VERSION=   1.66.0
 DISTNAME=  boost_${VERSION:S/./_/g}
 PKGNAME-main=  boost-${VERSION}
 PKGNAME-md=boost-md-${VERSION}
-REVISION-main= 1
+PKGNAME-build= boost-build-${VERSION}
+REVISION-main= 2
 CATEGORIES=devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=boost/}
 EXTRACT_SUFX=  .tar.bz2
@@ -76,7 +78,7 @@ WANTLIB += ${COMPILER_LIBCXX} bz2 c icud
 
 COMPILER= base-clang ports-gcc
 
-MULTI_PACKAGES=-main -md
+MULTI_PACKAGES=-main -md -build
 
 MODULES=   lang/python
 MODPY_RUNDEP=  No
@@ -167,12 +169,22 @@ do-build:
./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_3}\
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
-   ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
@cd ${WRKSRC} && \
find boost -type d -exec ${INSTALL_DATA_DIR} 
${PREFIX}/include/{} \;
@cd ${WRKSRC} && \
find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {} 
${PREFIX}/include/{} \;
+   # -build
+   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
+   ${PREFIX}/bin
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/boost-build
+   @cd ${WRKSRC}/tools/build/src && \
+   pax -r -w -p pm -s ':^./engine.*$$::' \
+   -s ':^.*\.orig$$::' . ${PREFIX}/share/boost-build
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
+   ${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
+   ${PREFIX}/share/examples/boost-build
+   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+   ${PREFIX}/share/boost-build/
 
 .include 
Index: pkg/DESCR-build
===
RCS file: pkg/DESCR-build
diff -N pkg/DESCR-build
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR-build 28 Dec 2018 18:18:16 -
@@ -0,0 +1,7 @@
+Boost.Build is an easy way to build C++ projects, everywhere. You name you
+executables and libraries and list their sources.
+
+Boost.Build takes care about compiling your sources with right options,
+creating static and shared libraries, making executables, and other chores --
+whether you're using gcc, msvc, or a dozen more supported C++ compilers -- on
+Windows, OSX, Linux and commercial UNIX systems.
Index: pkg/PLIST-build
===
RCS file: pkg/PLIST-build
diff -N pkg/PLIST-build
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/PLIST-build 28 Dec 2018 18:18:16 -
@@ -0,0 +1,362 @@
+@comment $OpenBSD: PLIST-build,v$
+@bin bin/b2
+@bin bin/bjam
+share/boost-build/
+share/boost-build/__init__.py
+share/boost-build/__init__.pyc
+share/boost-build/bootstrap.jam
+share/boost-build/build/
+share/boost-build/build-system.jam
+share/boost-build/build/__init__.py
+share/boost-build/build/__init__.pyc
+share/boost-build/build/ac.jam
+share/boost-build/build/alias.jam
+share/boost-build/build/alias.py
+share/boost-build/build/alias.pyc
+share/boost-build/build/build-request.jam
+share/boost-build/build/build_request.py
+share/boost-build/build/build_request.pyc
+share/boost-build/build/config-cache.jam
+share/boost-build/build/configure.jam
+share/boost-build/build/configure.py
+share/boost-build/build/configure.pyc
+share/boost-build/build/engine.py
+share/boost-build/build/engine.pyc
+share/boost-build/build/errors.py
+share/boost-build/build/errors.pyc
+share/boost-build/build/feature.jam

[Update] sdl2-2.0.9 with fix for HID Dpad usage

2018-12-28 Thread Thomas Frohwein
Hi,

Please find attached update to sdl2-2.0.9 with a fix for the missing 
XBox 360 gamepad/XInput D-pad functionality. I kept it together because
the diff isn't overly long or complicated, but if preferred I'd be
happy to split it into 2 separate diffs.

1.
The update to 2.0.9 is trivial. Some new additions to API for sensors
and joystick/gamecontroller. I tested launching and brief application
use/gameplay with the following SDL2 ports without any issues: 
- milkytracker
- citra
- dolphin
- mednafen
- mgba
- fnaify (multiple FNA games)
- 0ad
- barony
- endless-sky
- lugaru
- megaglest
- scummvm
- sdl-jstest

Per release notes and from looking at the lib with nm, only additions
to API, therefore bumping only minor. Official release notes here:

https://discourse.libsdl.org/t/sdl-2-0-9-released/25228

The local diffs to SDL_x11sym.h and SDL_x11keyboard.c have been merged
upstream and are therefore removed.

2.
The D-pad of the Xbox 360 controller and its family of generally
compatible controllers doesn't hasn't worked with SDL applications so
far. I dug into the SDL2 backend code and found that with legacy
(DInput) controllers, the D-pad works because SDL2 recognizes the
usage as a hat switch and reads the numerical value that represents
the position of the hat switch.
The Xbox 360 controller on the other hand contains for individual D-pad
button usages in its report descriptor that are not picked up by SDL2.

This diff adds recognition of a D-pad (as a hat) to the backend. The
individual D-pad button presses are converted into SDL's internal
representation of the hat position with dpad_to_sdl().

Tested and works with sdl2-jstest (from sdl-jstest package) and several
FNA games (Owlboy, Rogue Legacy), both with my Xbox 360 controller and
the Logitech F310 in XInput mode.

The D-pad diff has been sent to upstream:
https://bugzilla.libsdl.org/show_bug.cgi?id=4436

The Xbox 360 controller and Logitech F310 (XInput mode) button layout
and axis directions can be set to the standard layout on other
platforms with the following env var:

$ export 
SDL_GAMECONTROLLERCONFIG="none,X360,a:b7,b:b8,back:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b2,lefttrigger:a2,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b3,righttrigger:a5,rightx:a3,righty:a4~,start:b0,x:b9,y:b10,"

ok?

Index: Makefile
===
RCS file: /cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile29 Oct 2018 05:39:49 -  1.23
+++ Makefile28 Dec 2018 17:38:53 -
@@ -4,14 +4,13 @@ COMMENT=  cross-platform multimedia libra
 BROKEN-hppa=   src/atomic/SDL_spinlock.c:101:2: error: \
#error Please implement for your platform.
 
-V= 2.0.8
+V= 2.0.9
 DISTNAME=  SDL2-${V}
 PKGNAME=   sdl2-${V}
 CATEGORIES=devel
 MASTER_SITES=  https://www.libsdl.org/release/
-REVISION=  1
 
-SHARED_LIBS=   SDL20.5 # 0.8
+SHARED_LIBS=   SDL20.6 # 0.9
 
 HOMEPAGE=  https://www.libsdl.org/
 
Index: distinfo
===
RCS file: /cvs/ports/devel/sdl2/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo11 Mar 2018 22:40:20 -  1.7
+++ distinfo28 Dec 2018 17:38:53 -
@@ -1,2 +1,2 @@
-SHA256 (SDL2-2.0.8.tar.gz) = 7cd8VzCGYdV26EM0TYY44CWngYv/c/j7+rCcPF/Qkuw=
-SIZE (SDL2-2.0.8.tar.gz) = 4909017
+SHA256 (SDL2-2.0.9.tar.gz) = JVGG3GduzQwdvxDsiizF1oabUHnYo4GUwq7N/1SzJLE=
+SIZE (SDL2-2.0.9.tar.gz) = 5246942
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/sdl2/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in   11 Mar 2018 22:40:20 -  1.5
+++ patches/patch-Makefile_in   28 Dec 2018 17:38:53 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2018/0
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -122,7 +122,7 @@ LT_AGE  = @LT_AGE@
+@@ -123,7 +123,7 @@ LT_AGE  = @LT_AGE@
  LT_CURRENT  = @LT_CURRENT@
  LT_RELEASE  = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
Index: patches/patch-src_SDL_c
===
RCS file: /cvs/ports/devel/sdl2/patches/patch-src_SDL_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_SDL_c
--- patches/patch-src_SDL_c 7 Jan 2018 22:56:46 -   1.1
+++ patches/patch-src_SDL_c 28 Dec 2018 17:38:53 -
@@ -7,7 +7,7 @@ until OpenBSD support has been rolled ou
 Index: src/SDL.c
 --- src/SDL.c.orig
 +++ src/SDL.c
-@@ -227,8 +227,6 @@ SDL_InitSubSystem(Uint32 flags)
+@@ -228,8 +228,6 @@ SDL_InitSubSystem(Uint32 flags)
  }
  }
  SDL_PrivateSubsystemRefCountIncr(SDL_INIT_HAPTIC);
@@ -16,7 +16,7 @@ Index: src/SDL.c
  #endif
  }
  
-@@ -425,7 +423,7 @@ 

Re: security/wpa_supplicant: Reassoc on NWID change

2018-12-28 Thread Peter Hessler
I gave this a spin, and seems to work in my testing.

I did a few suspend/resumes, manual if down/up, forced a chan NN, and
walked around to do some roaming between 8 bssids.  Recovery took a
short period of time, but was as expected.

OK


On 2018 Dec 28 (Fri) at 17:15:48 +0100 (+0100), Gregor Best wrote:
:
:Peter pointed out that my previous patch doesn't apply. Sorry for that,
:a fixed one is below my signature.
:
:--
:   Gregor
:
:Index: Makefile
:===
:RCS file: /home/cvs/ports/security/wpa_supplicant/Makefile,v
:retrieving revision 1.39
:diff -u -p -r1.39 Makefile
:--- Makefile   24 Oct 2018 17:16:19 -  1.39
:+++ Makefile   25 Dec 2018 23:19:24 -
:@@ -3,7 +3,7 @@
: COMMENT=  IEEE 802.1X supplicant
: 
: DISTNAME= wpa_supplicant-2.6
:-REVISION= 4
:+REVISION= 5
: CATEGORIES=   security net
: 
: HOMEPAGE= http://w1.fi/wpa_supplicant/
:Index: patches/patch-src_drivers_driver_openbsd_c
:===
:RCS file: 
/home/cvs/ports/security/wpa_supplicant/patches/patch-src_drivers_driver_openbsd_c,v
:retrieving revision 1.5
:diff -u -p -r1.5 patch-src_drivers_driver_openbsd_c
:--- patches/patch-src_drivers_driver_openbsd_c 17 May 2016 08:29:27 -  
1.5
:+++ patches/patch-src_drivers_driver_openbsd_c 25 Dec 2018 23:05:46 -
:@@ -1,24 +1,187 @@
: $OpenBSD: patch-src_drivers_driver_openbsd_c,v 1.5 2016/05/17 08:29:27 dcoppa 
Exp $
: 
:-Fix includes
:+Fix includes and react to NWID changes and suspend/resume.
: 
: src/drivers/driver_openbsd.c.orig Sun Sep 27 21:02:05 2015
:-+++ src/drivers/driver_openbsd.c  Mon Sep 28 09:51:53 2015
:-@@ -9,13 +9,14 @@
:+Index: src/drivers/driver_openbsd.c
:+--- src/drivers/driver_openbsd.c.orig
: src/drivers/driver_openbsd.c
:+@@ -9,19 +9,34 @@
:  #include "includes.h"
:  #include 
:  
: +#include "common.h"
: +#include "driver.h"
:++#include "eloop.h"
: +
:++#include 
:  #include 
: +#include 
:++#include 
:  #include 
:  #include 
:  #include 
:--
:+ 
: -#include "common.h"
: -#include "driver.h"
:++#define RTM_BUFSZ 2048
:  
:  struct openbsd_driver_data {
:-  char ifname[IFNAMSIZ + 1];
:+- char ifname[IFNAMSIZ + 1];
:+  void *ctx;
:+ 
:+- int sock;   /* open socket for 802.11 ioctls */
:++ char ifname[IFNAMSIZ + 1];
:++ int ifindex;  /* Ifindex of the configured interface */
:++
:++ int sock; /* open socket for 802.11 ioctls */
:++ int rtsock;   /* routing socket for interface state messages */
:++
:++ /* These fields are used to track the last seen (and associated) access
:++   point to determine whether we should kick off an association 
event */
:++ int nwid_len; /* Length of last seen SSID (as per routing message) */
:++ char nwid[IEEE80211_NWID_LEN]; /* Last seen SSID (per routing msg) */
:++ char addr[IEEE80211_ADDR_LEN]; /* Last seen BSSID (per routing msg) */
:+ };
:+ 
:+ 
:+@@ -90,10 +105,99 @@ wpa_driver_openbsd_set_key(const char *ifname, void *p
:+  return 0;
:+ }
:+ 
:+-static void *
:+-wpa_driver_openbsd_init(void *ctx, const char *ifname)
:++static void
:++wpa_driver_openbsd_rtmsg_80211(struct if_ieee80211_data *ifie,
:++ struct openbsd_driver_data *drv) {
:++ if ((ifie->ifie_nwid_len != drv->nwid_len) ||
:++ (os_memcmp(drv->nwid, ifie->ifie_nwid, ifie->ifie_nwid_len)) ||
:++ (os_memcmp(drv->addr, ifie->ifie_addr, IEEE80211_ADDR_LEN))) {
:++ wpa_printf(MSG_INFO, "SSID changed");
:++ os_memcpy(drv->addr, ifie->ifie_addr, IEEE80211_ADDR_LEN);
:++
:++ os_memcpy(drv->nwid, ifie->ifie_nwid, ifie->ifie_nwid_len);
:++ drv->nwid_len = ifie->ifie_nwid_len;
:++
:++ wpa_supplicant_event(drv->ctx, EVENT_ASSOC, NULL);
:++ }
:++}
:++
:++static void
:++wpa_driver_openbsd_rtmsg_ifinfo(struct rt_msghdr *rtm,
:++ struct openbsd_driver_data *drv) {
:++ /* This is here so we can react to suspend/resume.
:++
:++This is a bit rough, sometimes there are two or more IFINFOs
:++notifying us that the device just got "up" again. It doesn't
:++seem to hurt to issue multiple EVENT_ASSOC in those cases
:++though.
:++ */
:++
:++ if (rtm->rtm_flags & RTF_UP)
:++ wpa_supplicant_event(drv->ctx, EVENT_ASSOC, NULL);
:++}
:++
:++static void
:++wpa_driver_openbsd_event_receive(int sock, void *global, void *sock_ctx)
:+ {
:++ struct openbsd_driver_data *drv = sock_ctx;
:++ struct rt_msghdr *rtm;
:++ struct if_ieee80211_data *ifie;
:++ char *rtmmsg;
:++ ssize_t n;
:++ off_t offset;
:++
:++ rtmmsg = os_zalloc(RTM_BUFSZ);
:++ if (rtmmsg == NULL) {
:++ wpa_printf(MSG_ERROR, "Can't allocate space for routing msgs");
:++ return;
:++ }
:++
:++ do {
:++ n = read(sock, rtmmsg, RTM_BUFSZ);
:++ } while (n == -1 && errno == 

CVS: cvs.openbsd.org: ports

2018-12-28 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/12/28 10:32:36

Modified files:
databases/lmdb : Makefile distinfo 
databases/lmdb/patches: patch-mdb_c 

Log message:
Update to lmdb-0.9.23



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/12/28 10:28:00

Modified files:
databases/lmdb : Makefile 
databases/lmdb/patches: patch-mdb_c 

Log message:
Simplify MDB_WRITEMAP patch



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/12/28 10:26:09

Modified files:
databases/lmdb : Makefile 
databases/lmdb/patches: patch-mdb_c 

Log message:
Fix up patch: in mdb_env_open, don't clobber flags already set in env



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/12/28 09:35:51

Modified files:
devel/samurai  : Makefile distinfo 

Log message:
Update to samurai-0.5
Changelog: https://github.com/michaelforney/samurai/releases/tag/0.5



Re: UPDATE: math/hdf5

2018-12-28 Thread Paul Irofti
On Fri, Dec 28, 2018 at 12:07:32PM +0100, Ingo Feinerer wrote:
> Hi,
> 
> update math/hdf5 1.8.20 -> 1.8.21
> 
> This update addresses CVE-2017-17505, CVE-2017-17506, CVE-2017-17508 and
> CVE-2017-17509.
> 
> Summary of changes:
> https://www.hdfgroup.org/2018/06/release-of-hdf5-1-8-21-newsletter-161/
> 
> Note that https://support.hdfgroup.org/ftp/HDF5/current18/src/ still only
> shows 1.8.20 but the backup master site has the new version.
> 
> Shared libraries were bumped after comparing old and new versions with
> /usr/src/lib/check_sym and by investigating
> https://portal.hdfgroup.org/display/support/HDF5%201.8.21#compatibility.
> 
> OK?

Why are we avoiding the 1.10 branch? OK otherwise.

> 
> Best regards,
> Ingo
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.677
> diff -u -p -r1.677 Makefile
> --- Makefile  27 Dec 2018 21:31:16 -  1.677
> +++ Makefile  28 Dec 2018 10:30:53 -
> @@ -5,7 +5,7 @@ CATEGORIES =  devel databases
>  DISTFILES =
>  
>  # API.rev
> -PKGNAME =quirks-3.70
> +PKGNAME =quirks-3.71
>  PKG_ARCH =   *
>  MAINTAINER = Marc Espie 
>  
> Index: files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.691
> diff -u -p -r1.691 Quirks.pm
> --- files/Quirks.pm   27 Dec 2018 21:31:16 -  1.691
> +++ files/Quirks.pm   28 Dec 2018 10:30:53 -
> @@ -1257,6 +1257,7 @@ my $cve = {
>   'mail/exim' => 'exim-<4.83',
>   'mail/p5-Mail-SpamAssassin' => 'p5-Mail-SpamAssassin-<3.4.2',
>   'mail/roundcubemail' => 'roundcubemail-<1.3.8',
> + 'math/hdf5' => 'hdf5-<1.8.21',
>   'net/curl' => 'curl-<7.62.0',
>   'net/haproxy' => 'haproxy-<1.8.16',
>   'net/icecast' => 'icecast-<2.4.4',
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/hdf5/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile  24 Oct 2018 14:28:07 -  1.16
> +++ Makefile  28 Dec 2018 11:03:54 -
> @@ -2,14 +2,13 @@
>  
>  COMMENT =Hierarchical Data Format 5 Technology suite
>  
> -V =  1.8.20
> +V =  1.8.21
>  DISTNAME =   hdf5-${V}
> -REVISION =   0
>  
> -SHARED_LIBS +=   hdf51.1 # 13.1
> -SHARED_LIBS +=   hdf5_cpp4.1 # 15.0
> -SHARED_LIBS +=   hdf5_hl 1.1 # 12.1
> -SHARED_LIBS +=   hdf5_hl_cpp 2.0 # 12.1
> +SHARED_LIBS +=   hdf51.2 # 13.2
> +SHARED_LIBS +=   hdf5_cpp5.0 # 16.0
> +SHARED_LIBS +=   hdf5_hl 1.1 # 12.2
> +SHARED_LIBS +=   hdf5_hl_cpp 2.0 # 12.2
>  
>  CATEGORIES = math
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/hdf5/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo  7 Dec 2017 06:13:45 -   1.6
> +++ distinfo  28 Dec 2018 11:03:54 -
> @@ -1,2 +1,2 @@
> -SHA256 (hdf5-1.8.20.tar.gz) = btZgzNK8RaqAjqcuCPM8xkAJ6d1OOjcrU0OLIQMS6Nk=
> -SIZE (hdf5-1.8.20.tar.gz) = 12475267
> +SHA256 (hdf5-1.8.21.tar.gz) = h9jILrpc92bZfNBsBU9GOcEEnEreqjp593+L03T4Dzc=
> +SIZE (hdf5-1.8.21.tar.gz) = 9113482
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/math/hdf5/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 7 Dec 2017 06:13:45 -   1.3
> +++ pkg/PLIST 28 Dec 2018 11:03:54 -
> @@ -19,6 +19,7 @@ bin/h5redeploy
>  @bin bin/h5unjam
>  include/H5ACpublic.h
>  include/H5AbstractDs.h
> +include/H5AcreatProp.h
>  include/H5Apublic.h
>  include/H5ArrayType.h
>  include/H5AtomType.h
> @@ -65,6 +66,7 @@ include/H5IntType.h
>  include/H5Ipublic.h
>  include/H5LTpublic.h
>  include/H5LaccProp.h
> +include/H5LcreatProp.h
>  include/H5Library.h
>  include/H5Location.h
>  include/H5Lpublic.h
> @@ -82,6 +84,7 @@ include/H5PropList.h
>  include/H5Rpublic.h
>  include/H5Spublic.h
>  include/H5StrType.h
> +include/H5StrcreatProp.h
>  include/H5TBpublic.h
>  include/H5Tpublic.h
>  include/H5VarLenType.h



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Paul Irofti
CVSROOT:/cvs
Module name:ports
Changes by: piro...@cvs.openbsd.org 2018/12/28 09:28:44

Modified files:
math/libcerf   : Makefile distinfo 
math/libcerf/pkg: PLIST 
Added files:
math/libcerf/patches: patch-man_CMakeLists_txt 

Log message:
Update libcerf to 1.10

This comes with a couple of important changes among which a major library
bump and a migration from autoconf to cmake. More details here:

http://apps.jcns.fz-juelich.de/src/libcerf/CHANGELOG

Also patched the manpage install directory.

Tested with gnuplot and all seems fine.



Re: NEW: games/bstone

2018-12-28 Thread Brian Callahan



On 12/26/18 6:52 PM, Brian Callahan wrote:



On 12/26/18 6:43 PM, Jonathan Gray wrote:

On Wed, Dec 26, 2018 at 06:06:14PM -0500, Brian Callahan wrote:


On 12/26/18 6:00 PM, Jonathan Gray wrote:

On Wed, Dec 26, 2018 at 09:24:18AM -0500, Brian Callahan wrote:

On 12/25/18 6:26 PM, Jonathan Gray wrote:

On Tue, Dec 25, 2018 at 10:35:02AM -0500, Brian Callahan wrote:

Hi ports --

Attached is a new port, games/bstone. BStone is a source port of 
Blake Stone

FPS game series engine.

---
pkg/DESCR:
BStone is a source port of the Blake Stone game series games 
Aliens of

Gold and Planet Strike.

Features:
* High resolution rendering of the world (extended vanilla engine)
* Modern and vanilla controls
* Customizable control bindings
* Separate volume control for sound effects and music

Note that while this package is open source, the games are not. 
You must

purchase at least one of the games in order to use this package.

Aliens of Gold shareware worked when I tried a while ago.

You're right. Minor wording tweaks to note that.

~Brian

Doesn't build on amd64 here

===>  Checking files for bstone-1.1.9.1
`/usr/ports/distfiles/bstone-1.1.9.1-48c286fb.tar.gz' is up to date.

(SHA256) bstone-1.1.9.1-48c286fb.tar.gz: OK

===> bstone-1.1.9.1 depends on: cmake-* -> cmake-3.10.2p1v0
===> bstone-1.1.9.1 depends on: ninja->=1.5.1 -> ninja-1.8.2p0
===> bstone-1.1.9.1 depends on: sdl2-* -> sdl2-2.0.8p1
===>  Verifying specs:  c++ c++abi pthread SDL2 c m
===>  found c++.2.0 c++abi.0.1 pthread.25.1 SDL2.0.5 c.93.0 m.10.1
===>  Extracting for bstone-1.1.9.1
===>  Patching for bstone-1.1.9.1
===>   Applying OpenBSD patch patch-src_CMakeLists_txt
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD$
|
|Install binary to the correct location.
|We don't need to install these text files.
|
|Index: src/CMakeLists.txt
|--- src/CMakeLists.txt.orig
|+++ src/CMakeLists.txt
--
Patching file src/CMakeLists.txt using Plan A...
Hunk #1 succeeded at 358.
done
===>   Applying OpenBSD patch patch-src_jm_free_cpp
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD$
|
|Prevent segfault during intro movies.
|
|Index: src/jm_free.cpp
|--- src/jm_free.cpp.orig
|+++ src/jm_free.cpp
--
Patching file src/jm_free.cpp using Plan A...
Hunk #1 succeeded at 948.
done
===>   Applying OpenBSD patch patch-src_jm_tp_cpp
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD$
|
|Prevent segfault on level load.
|
|Index: src/jm_tp.cpp
|--- src/jm_tp.cpp.orig
|+++ src/jm_tp.cpp
--
Patching file src/jm_tp.cpp using Plan A...
Hunk #1 succeeded at 3360.
done
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
===>  Generating configure for bstone-1.1.9.1
===>  Configuring for bstone-1.1.9.1
-- The CXX compiler identification is Clang 6.0.0
-- Check for working CXX compiler: 
/usr/ports/pobj/bstone-1.1.9.1/bin/c++
-- Check for working CXX compiler: 
/usr/ports/pobj/bstone-1.1.9.1/bin/c++ -- works

-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Looking for C++ include pthread.h
-- Looking for C++ include pthread.h - found
-- Looking for pthread_create
-- Looking for pthread_create - found
-- Found Threads: TRUE
-- Found SDL: 
/usr/local/lib/libSDL2main.a;/usr/local/lib/libSDL2.so.0.5

-- Configuring done
-- Generating done
-- Build files have been written to: 
/usr/ports/pobj/bstone-1.1.9.1/build-amd64

===>  Building for bstone-1.1.9.1
[1/65] /usr/ports/pobj/bstone-1.1.9.1/bin/c++ 
-I/usr/ports/pobj/bstone-1.1.9.1/bstone-48c286fb1012f6faa9dbf4b0f237e2b19ce01ac5/src/dosbox 
-O2 -pipe -DNDEBUG   -std=c++11 -MD -MT 
CMakeFiles/bstone.dir/bstone_sha1.cpp.o -MF 
CMakeFiles/bstone.dir/bstone_sha1.cpp.o.d -o 
CMakeFiles/bstone.dir/bstone_sha1.cpp.o -c 
/usr/ports/pobj/bstone-1.1.9.1/bstone-48c286fb1012f6faa9dbf4b0f237e2b19ce01ac5/src/bstone_sha1.cpp
[2/65] /usr/ports/pobj/bstone-1.1.9.1/bin/c++ 
-I/usr/ports/pobj/bstone-1.1.9.1/bstone-48c286fb1012f6faa9dbf4b0f237e2b19ce01ac5/src/dosbox 
-O2 -pipe -DNDEBUG   -std=c++11 -MD -MT 
CMakeFiles/bstone.dir/bstone_sprite_cache.cpp.o -MF 
CMakeFiles/bstone.dir/bstone_sprite_cache.cpp.o.d -o 
CMakeFiles/bstone.dir/bstone_sprite_cache.cpp.o -c 
/usr/ports/pobj/bstone-1.1.9.1/bstone-48c286fb1012f6faa9dbf4b0f237e2b19ce01ac5/src/bstone_sprite_cache.cpp
[3/65] /usr/ports/pobj/bstone-1.1.9.1/bin/c++ 
-I/usr/ports/pobj/bstone-1.1.9.1/bstone-48c286fb1012f6faa9dbf4b0f237e2b19ce01ac5/src/dosbox 
-O2 -pipe -DNDEBUG   -std=c++11 -MD -MT 
CMakeFiles/bstone.dir/3d_agent.cpp.o -MF 
CMakeFiles/bstone.dir/3d_agent.cpp.o.d -o 
CMakeFiles/bstone.dir/3d_agent.cpp.o -c 

Re: security/wpa_supplicant: Reassoc on NWID change

2018-12-28 Thread Gregor Best


Peter pointed out that my previous patch doesn't apply. Sorry for that,
a fixed one is below my signature.

--
Gregor

Index: Makefile
===
RCS file: /home/cvs/ports/security/wpa_supplicant/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile24 Oct 2018 17:16:19 -  1.39
+++ Makefile25 Dec 2018 23:19:24 -
@@ -3,7 +3,7 @@
 COMMENT=   IEEE 802.1X supplicant
 
 DISTNAME=  wpa_supplicant-2.6
-REVISION=  4
+REVISION=  5
 CATEGORIES=security net
 
 HOMEPAGE=  http://w1.fi/wpa_supplicant/
Index: patches/patch-src_drivers_driver_openbsd_c
===
RCS file: 
/home/cvs/ports/security/wpa_supplicant/patches/patch-src_drivers_driver_openbsd_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_drivers_driver_openbsd_c
--- patches/patch-src_drivers_driver_openbsd_c  17 May 2016 08:29:27 -  
1.5
+++ patches/patch-src_drivers_driver_openbsd_c  25 Dec 2018 23:05:46 -
@@ -1,24 +1,187 @@
 $OpenBSD: patch-src_drivers_driver_openbsd_c,v 1.5 2016/05/17 08:29:27 dcoppa 
Exp $
 
-Fix includes
+Fix includes and react to NWID changes and suspend/resume.
 
 src/drivers/driver_openbsd.c.orig  Sun Sep 27 21:02:05 2015
-+++ src/drivers/driver_openbsd.c   Mon Sep 28 09:51:53 2015
-@@ -9,13 +9,14 @@
+Index: src/drivers/driver_openbsd.c
+--- src/drivers/driver_openbsd.c.orig
 src/drivers/driver_openbsd.c
+@@ -9,19 +9,34 @@
  #include "includes.h"
  #include 
  
 +#include "common.h"
 +#include "driver.h"
++#include "eloop.h"
 +
++#include 
  #include 
 +#include 
++#include 
  #include 
  #include 
  #include 
--
+ 
 -#include "common.h"
 -#include "driver.h"
++#define RTM_BUFSZ 2048
  
  struct openbsd_driver_data {
-   char ifname[IFNAMSIZ + 1];
+-  char ifname[IFNAMSIZ + 1];
+   void *ctx;
+ 
+-  int sock;   /* open socket for 802.11 ioctls */
++  char ifname[IFNAMSIZ + 1];
++  int ifindex;  /* Ifindex of the configured interface */
++
++  int sock; /* open socket for 802.11 ioctls */
++  int rtsock;   /* routing socket for interface state messages */
++
++  /* These fields are used to track the last seen (and associated) access
++   point to determine whether we should kick off an association event 
*/
++  int nwid_len; /* Length of last seen SSID (as per routing message) */
++  char nwid[IEEE80211_NWID_LEN]; /* Last seen SSID (per routing msg) */
++  char addr[IEEE80211_ADDR_LEN]; /* Last seen BSSID (per routing msg) */
+ };
+ 
+ 
+@@ -90,10 +105,99 @@ wpa_driver_openbsd_set_key(const char *ifname, void *p
+   return 0;
+ }
+ 
+-static void *
+-wpa_driver_openbsd_init(void *ctx, const char *ifname)
++static void
++wpa_driver_openbsd_rtmsg_80211(struct if_ieee80211_data *ifie,
++  struct openbsd_driver_data *drv) {
++  if ((ifie->ifie_nwid_len != drv->nwid_len) ||
++  (os_memcmp(drv->nwid, ifie->ifie_nwid, ifie->ifie_nwid_len)) ||
++  (os_memcmp(drv->addr, ifie->ifie_addr, IEEE80211_ADDR_LEN))) {
++  wpa_printf(MSG_INFO, "SSID changed");
++  os_memcpy(drv->addr, ifie->ifie_addr, IEEE80211_ADDR_LEN);
++
++  os_memcpy(drv->nwid, ifie->ifie_nwid, ifie->ifie_nwid_len);
++  drv->nwid_len = ifie->ifie_nwid_len;
++
++  wpa_supplicant_event(drv->ctx, EVENT_ASSOC, NULL);
++  }
++}
++
++static void
++wpa_driver_openbsd_rtmsg_ifinfo(struct rt_msghdr *rtm,
++  struct openbsd_driver_data *drv) {
++  /* This is here so we can react to suspend/resume.
++
++ This is a bit rough, sometimes there are two or more IFINFOs
++ notifying us that the device just got "up" again. It doesn't
++ seem to hurt to issue multiple EVENT_ASSOC in those cases
++ though.
++  */
++
++  if (rtm->rtm_flags & RTF_UP)
++  wpa_supplicant_event(drv->ctx, EVENT_ASSOC, NULL);
++}
++
++static void
++wpa_driver_openbsd_event_receive(int sock, void *global, void *sock_ctx)
+ {
++  struct openbsd_driver_data *drv = sock_ctx;
++  struct rt_msghdr *rtm;
++  struct if_ieee80211_data *ifie;
++  char *rtmmsg;
++  ssize_t n;
++  off_t offset;
++
++  rtmmsg = os_zalloc(RTM_BUFSZ);
++  if (rtmmsg == NULL) {
++  wpa_printf(MSG_ERROR, "Can't allocate space for routing msgs");
++  return;
++  }
++
++  do {
++  n = read(sock, rtmmsg, RTM_BUFSZ);
++  } while (n == -1 && errno == EINTR);
++
++  if (n == -1) {
++  wpa_printf(MSG_ERROR, "Failed to read from routing socket: %s",
++ strerror(errno));
++  goto done;
++  }
++
++  for (offset = 0; offset < n;) {
++  rtm = (struct rt_msghdr *)(rtmmsg + offset);
++
++  if ((size_t)(n - offset) < sizeof(rtm->rtm_msglen) ||
++  

[M. UPDATE] net/qbittorrent 4.1.4 -> 4.1.5

2018-12-28 Thread Elias M. Mariani
Changelog:
https://github.com/qbittorrent/qBittorrent/blob/release-4.1.5/Changelog

Pretty straightforward patch.
(the patches were updated to match new files)
Nothing significant to say...

Tested both net/qbittorrent/qbittorrent and
net/qbittorrent/qbittorrent-nox on amd64.

Comments, OK?

Elias.


qbittorrent-4.1.5.diff
Description: Binary data


Re: UPDATE: x11/i3

2018-12-28 Thread Theo Buehler
+dcoppa

On Thu, Dec 27, 2018 at 08:35:09PM +0100, Rafael Sadowski wrote:
> Simple update to the latest version 4.16.
> 
> Works fine on amd64, OK?

Tested on macppc and amd64. Works fine, thanks. Please reinstate/port
the hunks you lost in i3-nagbar/main.c and man/i3.man.

With that:

ok tb
(provided dcoppa is fine with it/doesn't object)



Re: update/fix: devel/boost

2018-12-28 Thread Stuart Henderson

Why subpackage this?
--
Sent from a phone, apologies for poor formatting.

On 28 December 2018 13:41:22 Rafael Sadowski  wrote:


Hi all!

Our boost.build executables b2 and bjam are useless without the *.jam
stuff. The diff below want to fix the situation withe a third
sub-package named "build".

do-install bits from NetBSD and DESCR from FreeBSD.
Noticed by Ivan Krylov via openbsd@freenode. Thanks!

Comments, OK?

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile24 Dec 2018 23:34:27 -  1.79
+++ Makefile28 Dec 2018 10:39:12 -
@@ -2,6 +2,7 @@

COMMENT-main=   free peer-reviewed portable C++ source libraries
COMMENT-md= machine-dependent libraries for boost
+COMMENT-build= extensible cross-platform build tool suite

# XXX if updating, try to remove -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
# XXX in archivers/innoextract
@@ -9,7 +10,8 @@ VERSION=   1.66.0
DISTNAME=   boost_${VERSION:S/./_/g}
PKGNAME-main=   boost-${VERSION}
PKGNAME-md= boost-md-${VERSION}
-REVISION-main= 1
+PKGNAME-build= boost-build-${VERSION}
+REVISION-main= 2
CATEGORIES= devel
MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=boost/}
EXTRACT_SUFX=   .tar.bz2
@@ -76,7 +78,7 @@ WANTLIB += ${COMPILER_LIBCXX} bz2 c icud

COMPILER= base-clang ports-gcc

-MULTI_PACKAGES=-main -md
+MULTI_PACKAGES=-main -md -build

MODULES=lang/python
MODPY_RUNDEP=   No
@@ -167,12 +169,20 @@ do-build:
./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_3}\

do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
-   ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
@cd ${WRKSRC} && \
find boost -type d -exec ${INSTALL_DATA_DIR} 
${PREFIX}/include/{} \;
@cd ${WRKSRC} && \
		find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {} 
${PREFIX}/include/{} \;

+   # -build
+   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
+   ${PREFIX}/bin
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/boost-build
+   @cd ${WRKSRC}/tools/build/src && \
+   pax -r -w -p pm -s ':^./engine.*$$::' \
+   -s ':^.*\.orig$$::' . ${PREFIX}/share/boost-build
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
+   ${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
+   ${PREFIX}/share/examples/boost-build

.include 
Index: pkg/DESCR-build
===
RCS file: pkg/DESCR-build
diff -N pkg/DESCR-build
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR-build 28 Dec 2018 10:39:12 -
@@ -0,0 +1,7 @@
+Boost.Build is an easy way to build C++ projects, everywhere. You name you
+executables and libraries and list their sources.
+
+Boost.Build takes care about compiling your sources with right options,
+creating static and shared libraries, making executables, and other chores --
+whether you're using gcc, msvc, or a dozen more supported C++ compilers -- on
+Windows, OSX, Linux and commercial UNIX systems.
Index: pkg/PLIST-build
===
RCS file: pkg/PLIST-build
diff -N pkg/PLIST-build
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/PLIST-build 28 Dec 2018 10:39:12 -
@@ -0,0 +1,297 @@
+@comment $OpenBSD: PLIST-build,v$
+@bin bin/b2
+@bin bin/bjam
+share/boost-build/
+share/boost-build/__init__.py
+share/boost-build/bootstrap.jam
+share/boost-build/build/
+share/boost-build/build-system.jam
+share/boost-build/build/__init__.py
+share/boost-build/build/ac.jam
+share/boost-build/build/alias.jam
+share/boost-build/build/alias.py
+share/boost-build/build/build-request.jam
+share/boost-build/build/build_request.py
+share/boost-build/build/config-cache.jam
+share/boost-build/build/configure.jam
+share/boost-build/build/configure.py
+share/boost-build/build/engine.py
+share/boost-build/build/errors.py
+share/boost-build/build/feature.jam
+share/boost-build/build/feature.py
+share/boost-build/build/generators.jam
+share/boost-build/build/generators.py
+share/boost-build/build/project.jam
+share/boost-build/build/project.py
+share/boost-build/build/property-set.jam
+share/boost-build/build/property.jam
+share/boost-build/build/property.py
+share/boost-build/build/property_set.py
+share/boost-build/build/readme.txt
+share/boost-build/build/scanner.jam
+share/boost-build/build/scanner.py
+share/boost-build/build/targets.jam
+share/boost-build/build/targets.py
+share/boost-build/build/toolset.jam
+share/boost-build/build/toolset.py
+share/boost-build/build/type.jam
+share/boost-build/build/type.py
+share/boost-build/build/version.jam
+share/boost-build/build/version.py
+share/boost-build/build/virtual-target.jam

update/fix: devel/boost

2018-12-28 Thread Rafael Sadowski
Hi all!

Our boost.build executables b2 and bjam are useless without the *.jam
stuff. The diff below want to fix the situation withe a third
sub-package named "build".

do-install bits from NetBSD and DESCR from FreeBSD.
Noticed by Ivan Krylov via openbsd@freenode. Thanks!

Comments, OK?

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile24 Dec 2018 23:34:27 -  1.79
+++ Makefile28 Dec 2018 10:39:12 -
@@ -2,6 +2,7 @@
 
 COMMENT-main=  free peer-reviewed portable C++ source libraries
 COMMENT-md=machine-dependent libraries for boost
+COMMENT-build= extensible cross-platform build tool suite
 
 # XXX if updating, try to remove -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
 # XXX in archivers/innoextract
@@ -9,7 +10,8 @@ VERSION=   1.66.0
 DISTNAME=  boost_${VERSION:S/./_/g}
 PKGNAME-main=  boost-${VERSION}
 PKGNAME-md=boost-md-${VERSION}
-REVISION-main= 1
+PKGNAME-build= boost-build-${VERSION}
+REVISION-main= 2
 CATEGORIES=devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=boost/}
 EXTRACT_SUFX=  .tar.bz2
@@ -76,7 +78,7 @@ WANTLIB += ${COMPILER_LIBCXX} bz2 c icud
 
 COMPILER= base-clang ports-gcc
 
-MULTI_PACKAGES=-main -md
+MULTI_PACKAGES=-main -md -build
 
 MODULES=   lang/python
 MODPY_RUNDEP=  No
@@ -167,12 +169,20 @@ do-build:
./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_3}\
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
-   ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
@cd ${WRKSRC} && \
find boost -type d -exec ${INSTALL_DATA_DIR} 
${PREFIX}/include/{} \;
@cd ${WRKSRC} && \
find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {} 
${PREFIX}/include/{} \;
+   # -build
+   ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
+   ${PREFIX}/bin
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/boost-build
+   @cd ${WRKSRC}/tools/build/src && \
+   pax -r -w -p pm -s ':^./engine.*$$::' \
+   -s ':^.*\.orig$$::' . ${PREFIX}/share/boost-build
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
+   ${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
+   ${PREFIX}/share/examples/boost-build
 
 .include 
Index: pkg/DESCR-build
===
RCS file: pkg/DESCR-build
diff -N pkg/DESCR-build
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR-build 28 Dec 2018 10:39:12 -
@@ -0,0 +1,7 @@
+Boost.Build is an easy way to build C++ projects, everywhere. You name you
+executables and libraries and list their sources.
+
+Boost.Build takes care about compiling your sources with right options,
+creating static and shared libraries, making executables, and other chores --
+whether you're using gcc, msvc, or a dozen more supported C++ compilers -- on
+Windows, OSX, Linux and commercial UNIX systems.
Index: pkg/PLIST-build
===
RCS file: pkg/PLIST-build
diff -N pkg/PLIST-build
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/PLIST-build 28 Dec 2018 10:39:12 -
@@ -0,0 +1,297 @@
+@comment $OpenBSD: PLIST-build,v$
+@bin bin/b2
+@bin bin/bjam
+share/boost-build/
+share/boost-build/__init__.py
+share/boost-build/bootstrap.jam
+share/boost-build/build/
+share/boost-build/build-system.jam
+share/boost-build/build/__init__.py
+share/boost-build/build/ac.jam
+share/boost-build/build/alias.jam
+share/boost-build/build/alias.py
+share/boost-build/build/build-request.jam
+share/boost-build/build/build_request.py
+share/boost-build/build/config-cache.jam
+share/boost-build/build/configure.jam
+share/boost-build/build/configure.py
+share/boost-build/build/engine.py
+share/boost-build/build/errors.py
+share/boost-build/build/feature.jam
+share/boost-build/build/feature.py
+share/boost-build/build/generators.jam
+share/boost-build/build/generators.py
+share/boost-build/build/project.jam
+share/boost-build/build/project.py
+share/boost-build/build/property-set.jam
+share/boost-build/build/property.jam
+share/boost-build/build/property.py
+share/boost-build/build/property_set.py
+share/boost-build/build/readme.txt
+share/boost-build/build/scanner.jam
+share/boost-build/build/scanner.py
+share/boost-build/build/targets.jam
+share/boost-build/build/targets.py
+share/boost-build/build/toolset.jam
+share/boost-build/build/toolset.py
+share/boost-build/build/type.jam
+share/boost-build/build/type.py
+share/boost-build/build/version.jam
+share/boost-build/build/version.py
+share/boost-build/build/virtual-target.jam
+share/boost-build/build/virtual_target.py
+share/boost-build/build_system.py
+share/boost-build/contrib/

[update] OfflineIMAP v7.2.2

2018-12-28 Thread Remi Locherer
Hi porters,

OfflineIMAP v7.2.2 was released few days ago. It can now renew the token
for OAUTHw and SSL config options are now more consistent.

Changelog:
https://www.offlineimap.org/doc/Changelog.html#offlineimap-v722-2018-12-22

OK?

Remi


Index: Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile25 Jun 2018 21:55:52 -  1.51
+++ Makefile28 Dec 2018 12:33:50 -
@@ -2,7 +2,7 @@
 
 COMMENT=   powerful IMAP/Maildir synchronization and reader support
 
-MODPY_EGG_VERSION = 7.2.1
+MODPY_EGG_VERSION = 7.2.2
 DISTNAME = offlineimap-v${MODPY_EGG_VERSION}
 PKGNAME =  offlineimap-${MODPY_EGG_VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.38
diff -u -p -r1.38 distinfo
--- distinfo25 Jun 2018 21:55:52 -  1.38
+++ distinfo28 Dec 2018 12:34:27 -
@@ -1,2 +1,2 @@
-SHA256 (offlineimap-v7.2.1.tar.gz) = 
RWuzq5U/bQLK4LYX0fV3Pwx1AMLTJSb+Eu4eRqDW7Bo=
-SIZE (offlineimap-v7.2.1.tar.gz) = 735626
+SHA256 (offlineimap-v7.2.2.tar.gz) = 
BqK1OIB5MPV84s4X3L0VGY0O/4+OIByWBwxmQnbCklc=
+SIZE (offlineimap-v7.2.2.tar.gz) = 736642
Index: patches/patch-offlineimap_conf
===
RCS file: /cvs/ports/mail/offlineimap/patches/patch-offlineimap_conf,v
retrieving revision 1.11
diff -u -p -r1.11 patch-offlineimap_conf
--- patches/patch-offlineimap_conf  11 Apr 2018 06:33:53 -  1.11
+++ patches/patch-offlineimap_conf  8 Dec 2018 22:19:57 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-offlineimap_conf,v 1.11 
 Index: offlineimap.conf
 --- offlineimap.conf.orig
 +++ offlineimap.conf
-@@ -766,7 +766,7 @@ remotehost = examplehost
+@@ -765,7 +765,7 @@ remotehost = examplehost
  # You can also use fingerprint verification via cert_fingerprint.
  # See below for more verbose explanation.
  #



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/12/28 05:28:17

Modified files:
sysutils/terraform/provider-alicloud: Makefile distinfo 
sysutils/terraform/provider-aws: Makefile distinfo 

Log message:
Update terraform providers.



[NEW] devel/cjose

2018-12-28 Thread YASUOKA Masahiko
Hi,

I'd like to add devel/cjose.  It's a C library of JOSE (JavaScript
Object Signing and Encryption).  JOSE is used in "OpenID connect"
protocol.

The original diff is written by my colleague, Naoaki Hoshi.

ok?


cjose.tar.gz
Description: Binary data


[new] net/libupnpp

2018-12-28 Thread Pascal Stumpf
Libupnpp is a C++ wrapper for libupnp, a.k.a Portable UPnP, which
is a direct descendant of the Open Source SDK released by Intel in
support of UPnP development.

Libupnpp can be used to implement UPnP devices and services, or
Control Points.

The Control Point side of libupnpp, which is documented here, allows
a C++ program to discover UPnP devices, and exchange commands and
status with them.

The library has a number of predefined modules for controlling
specific AVTransport or OpenHome audio services, and it is relatively
easy to add modules for other services externally (the internal
modules have no more access to library internals than an external
module would).


OK?


libupnpp.tgz
Description: libupnpp.tgz


UPDATE: math/hdf5

2018-12-28 Thread Ingo Feinerer
Hi,

update math/hdf5 1.8.20 -> 1.8.21

This update addresses CVE-2017-17505, CVE-2017-17506, CVE-2017-17508 and
CVE-2017-17509.

Summary of changes:
https://www.hdfgroup.org/2018/06/release-of-hdf5-1-8-21-newsletter-161/

Note that https://support.hdfgroup.org/ftp/HDF5/current18/src/ still only
shows 1.8.20 but the backup master site has the new version.

Shared libraries were bumped after comparing old and new versions with
/usr/src/lib/check_sym and by investigating
https://portal.hdfgroup.org/display/support/HDF5%201.8.21#compatibility.

OK?

Best regards,
Ingo

Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.677
diff -u -p -r1.677 Makefile
--- Makefile27 Dec 2018 21:31:16 -  1.677
+++ Makefile28 Dec 2018 10:30:53 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.70
+PKGNAME =  quirks-3.71
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.691
diff -u -p -r1.691 Quirks.pm
--- files/Quirks.pm 27 Dec 2018 21:31:16 -  1.691
+++ files/Quirks.pm 28 Dec 2018 10:30:53 -
@@ -1257,6 +1257,7 @@ my $cve = {
'mail/exim' => 'exim-<4.83',
'mail/p5-Mail-SpamAssassin' => 'p5-Mail-SpamAssassin-<3.4.2',
'mail/roundcubemail' => 'roundcubemail-<1.3.8',
+   'math/hdf5' => 'hdf5-<1.8.21',
'net/curl' => 'curl-<7.62.0',
'net/haproxy' => 'haproxy-<1.8.16',
'net/icecast' => 'icecast-<2.4.4',


Index: Makefile
===
RCS file: /cvs/ports/math/hdf5/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile24 Oct 2018 14:28:07 -  1.16
+++ Makefile28 Dec 2018 11:03:54 -
@@ -2,14 +2,13 @@
 
 COMMENT =  Hierarchical Data Format 5 Technology suite
 
-V =1.8.20
+V =1.8.21
 DISTNAME = hdf5-${V}
-REVISION = 0
 
-SHARED_LIBS += hdf51.1 # 13.1
-SHARED_LIBS += hdf5_cpp4.1 # 15.0
-SHARED_LIBS += hdf5_hl 1.1 # 12.1
-SHARED_LIBS += hdf5_hl_cpp 2.0 # 12.1
+SHARED_LIBS += hdf51.2 # 13.2
+SHARED_LIBS += hdf5_cpp5.0 # 16.0
+SHARED_LIBS += hdf5_hl 1.1 # 12.2
+SHARED_LIBS += hdf5_hl_cpp 2.0 # 12.2
 
 CATEGORIES =   math
 
Index: distinfo
===
RCS file: /cvs/ports/math/hdf5/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo7 Dec 2017 06:13:45 -   1.6
+++ distinfo28 Dec 2018 11:03:54 -
@@ -1,2 +1,2 @@
-SHA256 (hdf5-1.8.20.tar.gz) = btZgzNK8RaqAjqcuCPM8xkAJ6d1OOjcrU0OLIQMS6Nk=
-SIZE (hdf5-1.8.20.tar.gz) = 12475267
+SHA256 (hdf5-1.8.21.tar.gz) = h9jILrpc92bZfNBsBU9GOcEEnEreqjp593+L03T4Dzc=
+SIZE (hdf5-1.8.21.tar.gz) = 9113482
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/hdf5/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   7 Dec 2017 06:13:45 -   1.3
+++ pkg/PLIST   28 Dec 2018 11:03:54 -
@@ -19,6 +19,7 @@ bin/h5redeploy
 @bin bin/h5unjam
 include/H5ACpublic.h
 include/H5AbstractDs.h
+include/H5AcreatProp.h
 include/H5Apublic.h
 include/H5ArrayType.h
 include/H5AtomType.h
@@ -65,6 +66,7 @@ include/H5IntType.h
 include/H5Ipublic.h
 include/H5LTpublic.h
 include/H5LaccProp.h
+include/H5LcreatProp.h
 include/H5Library.h
 include/H5Location.h
 include/H5Lpublic.h
@@ -82,6 +84,7 @@ include/H5PropList.h
 include/H5Rpublic.h
 include/H5Spublic.h
 include/H5StrType.h
+include/H5StrcreatProp.h
 include/H5TBpublic.h
 include/H5Tpublic.h
 include/H5VarLenType.h



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/12/28 03:48:57

Modified files:
databases/sqlports/files: Sql.pm 

Log message:
allow multi-line stringize (for expr) and indent each accordingly
allow view columns to double as group-by entries, because it's often
the case



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/12/28 02:25:01

Modified files:
devel/intellij : Makefile 
Added files:
devel/intellij/patches: patch-bin_idea_sh 

Log message:
Avoid egrep(1) noise at the application start

OK Caspar Schutijser (maintainer)



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/12/28 02:01:53

Modified files:
geo/qgis   : Makefile distinfo 
geo/qgis/patches: patch-src_app_qgisapp_cpp 
geo/qgis/pkg   : PLIST 

Log message:
Update to qgis 3.4.3.



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/12/28 01:53:59

Modified files:
geo/gdal   : Makefile distinfo 
geo/gdal/patches: patch-swig_perl_GNUmakefile 
  patch-swig_python_GNUmakefile 
  patch-swig_python_setup_py 
geo/gdal/pkg   : PLIST-main PLIST-python 
Added files:
geo/gdal/patches: patch-autotest_conftest.py 
  patch-port_cpl_vsisimple_cpp 

Log message:
Update to gdal 2.4.0.

See https://trac.osgeo.org/gdal/wiki/Release/2.4.0-News

Upstream switched to pytest for tests, adjust accordingly and add a
patch that worksaround the fact that pytest 3.6 is required (cf
OSGeo/gdal#1165)

Add another temporary patch as we dont have RLIMIT_AS (cf
OSGeo/gdal#1163)

tested in a bulk build without fallout.



Re: UPDATE: textproc/lowdown

2018-12-28 Thread Anton Lindqvist
On Wed, Dec 26, 2018 at 04:14:18PM -0800, Bryan Vyhmeister wrote:
> On Wed, Dec 26, 2018 at 09:31:48PM +0100, Anton Lindqvist wrote:
> > Hi,
> > Trivial update to latest version from maintainer; changelog can be found
> > here[1]. While here, configure arguments must be passed as arguments and
> > not using env.
> > 
> > Anyone willing to replace me as the maintainer?
> > 
> > Comments? OK?
> > 
> > [1] https://kristaps.bsd.lv/lowdown/archive.html
> 
> I did some brief testing on amd64 and all seems to work fine. I am happy
> to take maintainer also. Here is your diff plus the maintainer change.

Thanks, consider it done.



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Anton Lindqvist
CVSROOT:/cvs
Module name:ports
Changes by: an...@cvs.openbsd.org   2018/12/28 01:22:48

Modified files:
textproc/lowdown: Makefile 

Log message:
Pass maintainership along to Bryan Vyhmeister.



CVS: cvs.openbsd.org: ports

2018-12-28 Thread Anton Lindqvist
CVSROOT:/cvs
Module name:ports
Changes by: an...@cvs.openbsd.org   2018/12/28 01:19:32

Modified files:
textproc/lowdown: Makefile distinfo 

Log message:
Update to lowdown-0.4.2.

ok bentley@



Re: graphics/gdcm and poppler-0.72.0

2018-12-28 Thread Antoine Jacoutot
On Thu, Dec 27, 2018 at 10:28:56PM +0100, Matthias Kilian wrote:
> Hi,
>=20
> let gdcm build with poppler-0.72.0.
>=20
> Build and runtime tests both against the old (0.61.1) and new
> (0.72.2) poppler are welcome.
>=20
> If it still builds and works with the old poppler, this could be
> committed before the poppler update.

Fails to build with old poppler (0.61.1) on amd64:


[98/409] /hack/objdirs/pobj/gdcm-2.8.8/bin/c++   -ISource/Common -I/hack/ob=
jdirs/pobj/gdcm-2.8.8/gdcm-2.8.8/Source/Common -I/hack/objdirs/pobj/gdcm-2.=
8.8/gdcm-2.8.8/Source/DataStructureAndEncodingDefinition -I/hack/objdirs/po=
bj/gdcm-2.8.8/gdcm-2.8.8/Source/MediaStorageAndFileFormat -I/hack/objdirs/p=
obj/gdcm-2.8.8/gdcm-2.8.8/Source/InformationObjectDefinition -I/hack/objdir=
s/pobj/gdcm-2.8.8/gdcm-2.8.8/Source/MessageExchangeDefinition -I/hack/objdi=
rs/pobj/gdcm-2.8.8/gdcm-2.8.8/Source/DataDictionary -I/hack/objdirs/pobj/gd=
cm-2.8.8/gdcm-2.8.8/Utilities -I/hack/objdirs/pobj/gdcm-2.8.8/gdcm-2.8.8/Ut=
ilities/socketxx -I/hack/objdirs/pobj/gdcm-2.8.8/gdcm-2.8.8/Utilities/socke=
txx/socket++ -IUtilities/socketxx/socket++ -I/usr/local/include -I/usr/loca=
l/include/poppler -I/usr/local/include/libxml2 -I/usr/local/include/openjp2=
 -O2 -pipe  -std=3Dc++11 -DNDEBUG   -DLIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PAR=
AM -DLIBPOPPLER_CATALOG_HAS_STRUCTTREEROOT -DLIBPOPPLER_NEW_OBJECT_API -MD =
-MT Applications/Cxx/CMakeFiles/gdcmpdf.dir/gdcmpdf.cxx.o -MF Applications/=
Cxx/CMakeFiles/gdcmpdf.dir/gdcmpdf.cxx.o.d -o Applications/Cxx/CMakeFiles/g=
dcmpdf.dir/gdcmpdf.cxx.o -c /hack/objdirs/pobj/gdcm-2.8.8/gdcm-2.8.8/Applic=
ations/Cxx/gdcmpdf.cxx
FAILED: Applications/Cxx/CMakeFiles/gdcmpdf.dir/gdcmpdf.cxx.o=20
/hack/objdirs/pobj/gdcm-2.8.8/bin/c++   -ISource/Common -I/hack/objdirs/pob=
j/gdcm-2.8.8/gdcm-2.8.8/Source/Common -I/hack/objdirs/pobj/gdcm-2.8.8/gdcm-=
2.8.8/Source/DataStructureAndEncodingDefinition -I/hack/objdirs/pobj/gdcm-2=
=2E8.8/gdcm-2.8.8/Source/MediaStorageAndFileFormat -I/hack/objdirs/pobj/gdc=
m-2.8.8/gdcm-2.8.8/Source/InformationObjectDefinition -I/hack/objdirs/pobj/=
gdcm-2.8.8/gdcm-2.8.8/Source/MessageExchangeDefinition -I/hack/objdirs/pobj=
/gdcm-2.8.8/gdcm-2.8.8/Source/DataDictionary -I/hack/objdirs/pobj/gdcm-2.8.=
8/gdcm-2.8.8/Utilities -I/hack/objdirs/pobj/gdcm-2.8.8/gdcm-2.8.8/Utilities=
/socketxx -I/hack/objdirs/pobj/gdcm-2.8.8/gdcm-2.8.8/Utilities/socketxx/soc=
ket++ -IUtilities/socketxx/socket++ -I/usr/local/include -I/usr/local/inclu=
de/poppler -I/usr/local/include/libxml2 -I/usr/local/include/openjp2 -O2 -p=
ipe  -std=3Dc++11 -DNDEBUG   -DLIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM -DLI=
BPOPPLER_CATALOG_HAS_STRUCTTREEROOT -DLIBPOPPLER_NEW_OBJECT_API -MD -MT App=
lications/Cxx/CMakeFiles/gdcmpdf.dir/gdcmpdf.cxx.o -MF Applications/Cxx/CMa=
keFiles/gdcmpdf.dir/gdcmpdf.cxx.o.d -o Applications/Cxx/CMakeFiles/gdcmpdf.=
dir/gdcmpdf.cxx.o -c /hack/objdirs/pobj/gdcm-2.8.8/gdcm-2.8.8/Applications/=
Cxx/gdcmpdf.cxx
/hack/objdirs/pobj/gdcm-2.8.8/gdcm-2.8.8/Applications/Cxx/gdcmpdf.cxx:53:13=
: error: no member named 'c_str' in 'GooString'
s =3D gs->c_str();
~~  ^
/hack/objdirs/pobj/gdcm-2.8.8/gdcm-2.8.8/Applications/Cxx/gdcmpdf.cxx:453:1=
4: warning: bool literal returned from 'main' [-Wmain]
  if( !res ) return false;
 ^  ~
1 warning and 1 error generated.
ninja: build stopped: subcommand failed.





> Index: patches/patch-Applications_Cxx_gdcminfo_cxx
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: patches/patch-Applications_Cxx_gdcminfo_cxx
> diff -N patches/patch-Applications_Cxx_gdcminfo_cxx
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Applications_Cxx_gdcminfo_cxx   27 Dec 2018 21:23:01 
> -
> @@ -0,0 +1,40 @@
> +$OpenBSD$
> +
> +Fix for newer poppler.
> +
> +Index: Applications/Cxx/gdcminfo.cxx
> +--- Applications/Cxx/gdcminfo.cxx.orig
>  Applications/Cxx/gdcminfo.cxx
> +@@ -202,7 +202,7 @@ static std::string getInfoDate(Dict *infoDict, const=
 c
> + #endif
> + {
> + const GooString* gs =3D obj.getString();
> +-s =3D gs->getCString();
> ++s =3D gs->c_str();
> + if (s[0] =3D=3D 'D' && s[1] =3D=3D ':')
> +   {
> +   s +=3D 2;
> +@@ -258,7 +258,7 @@ static std::string getInfoString(Dict *infoDict, con=
st
> + {
> +   Object obj;
> +   const GooString *s1;
> +-  GBool isUnicode;
> ++  bool isUnicode;
> +   Unicode u;
> +   char buf[8];
> +   int i, n;
> +@@ -274,12 +274,12 @@ static std::string getInfoString(Dict *infoDict, c=
onst
> + if ((s1->getChar(0) & 0xff) =3D=3D 0xfe &&
> +   (s1->getChar(1) & 0xff) =3D=3D 0xff)
> +   {
> +-  isUnicode =3D gTrue;
> ++  isUnicode =3D true;
> +   i =3D 2;
> +   }
> + else
> +   {
> +-  isUnicode =3D gFalse;
> ++  isUnicode =3D false;
> +   i =3D 0;
> +   }
> + while (i <