Re: CVS: cvs.openbsd.org: ports

2020-03-28 Thread Landry Breuil
On Sat, Mar 28, 2020 at 12:19:31PM -0600, Landry Breuil wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   lan...@cvs.openbsd.org  2020/03/28 12:19:31
> 
> Modified files:
>   graphics/displaz: Makefile 
> 
> Log message:
> Fix build after lastools update by adding LASLIB_INCLUDE_DIRS to
> CONFIGURE_ARGS and adapting LASLIB_LIBRARY.
> 
> build breakage reported by naddy@, thanks !

And also reported by sthen@, sorry for the breakage ..



Re: CVS: cvs.openbsd.org: ports

2020-03-28 Thread Stuart Henderson
On 2020/03/26 02:23, Landry Breuil wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   lan...@cvs.openbsd.org  2020/03/26 02:23:53
> 
> Modified files:
>   converters/lastools: Makefile distinfo 
>   converters/lastools/pkg: PLIST 
> Added files:
>   converters/lastools/patches: patch-src_CMakeLists_txt 
> 
> Log message:
> Update to a newer lastools github snapshot.
> 
> Use provided cmake build plumbing, allows for much nicer port Makefile.
> Now installs headers in the proper directory, and cmake goo for
> potential detection by consumers.
> 

displaz build fails like this:

  Could NOT find LASlib (missing: LASLIB_INCLUDE_DIRS)
Call Stack (most recent call first):
  /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:393 
(_FPHSA_FAILURE_MESSAGE)
  cmake/FindLASlib.cmake:21 (find_package_handle_standard_args)

haven't 100% confirmed it is the lastools commit which does it, but it seems 
likely.



Re: CVS: cvs.openbsd.org: ports

2020-03-26 Thread Kurt Mosiejczuk
On Tue, Mar 24, 2020 at 09:26:27AM -0600, Kurt Mosiejczuk wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2020/03/24 09:26:27

> Modified files:
>   net/dleyna/server: Makefile 
> Added files:
>   net/dleyna/server/patches: patch-libdleyna_server_upnp_c 
>  patch-test_dbus_dms-info_c 

> Log message:
> Fix build for sparc64 by pulling in an upstream patch that hasn't been
> released yet.

> ok jca@

This is also ok ajacoutot@



Re: CVS: cvs.openbsd.org: ports

2020-03-25 Thread Stuart Henderson
On 2020/03/25 20:37, Adam Wolk wrote:
> On Wed, Mar 25, 2020 at 03:53:10PM +0100, Antoine Jacoutot wrote:
> > On Tue, Mar 24, 2020 at 11:58:12AM -0600, Solene Rapenne wrote:
> > > CVSROOT:  /cvs
> > > Module name:  ports
> > > Changes by:   sol...@cvs.openbsd.org  2020/03/24 11:58:12
> > > 
> > > Modified files:
> > >   games/yquake2  : Makefile distinfo 
> > >   games/yquake2/pkg: PLIST 
> > > 
> > > Log message:
> > > Update to yquake-7.43
> > > 
> > > ok awolk@
> > > 
> > 
> > Does not build.
> > 
> 
> Apparently both of us had net/curl present, curl
> is optional and dlopened in multiplayer that is why
> it's not picked up by make port-lib-depends-check.
> 
> I added it to LIB_DEPENDS and WANTLIB, I'm bumping
> REVISION as this package was buildable on hosts
> that had net/curl present and could be installed.
> 
> OK to commit?


If it doesn't show in port-lib-depends-check then please add a comment
to say that it is dlopen()d, otherwise it will likely get removed again
if someone sweeps the tree for wantlib fixes.


> ? yquake2-7.43p0.diff
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/yquake2/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile  24 Mar 2020 17:58:12 -  1.20
> +++ Makefile  25 Mar 2020 19:33:20 -
> @@ -8,6 +8,7 @@ V=7.43
>  PKGNAME= ${N}-${V}
>  DISTNAME=quake2-${V}
>  CATEGORIES=  games
> +REVISION=0
>  
>  HOMEPAGE=https://www.yamagi.org/quake2/
>  MAINTAINER=  Adam Wolk 
> @@ -17,10 +18,11 @@ EXTRACT_SUFX= .tar.xz
>  # GPLv2
>  PERMIT_PACKAGE=  Yes
>  
> -WANTLIB +=   GL SDL2 c m openal pthread
> +WANTLIB +=   GL SDL2 c curl m openal pthread
>  
>  LIB_DEPENDS= audio/openal \
> - devel/sdl2
> + devel/sdl2 \
> + net/curl
>  
>  MAKE_ENV+=   VERBOSE=1
>  USE_GMAKE=   Yes



Re: CVS: cvs.openbsd.org: ports

2020-03-25 Thread Adam Wolk
On Wed, Mar 25, 2020 at 10:06:07PM +0100, Jeremie Courreges-Anglas wrote:
> On Wed, Mar 25 2020, Adam Wolk  wrote:
> > On Wed, Mar 25, 2020 at 03:53:10PM +0100, Antoine Jacoutot wrote:
> >> On Tue, Mar 24, 2020 at 11:58:12AM -0600, Solene Rapenne wrote:
> >> > CVSROOT: /cvs
> >> > Module name: ports
> >> > Changes by:  sol...@cvs.openbsd.org  2020/03/24 11:58:12
> >> > 
> >> > Modified files:
> >> >  games/yquake2  : Makefile distinfo 
> >> >  games/yquake2/pkg: PLIST 
> >> > 
> >> > Log message:
> >> > Update to yquake-7.43
> >> > 
> >> > ok awolk@
> >> > 
> >> 
> >> Does not build.
> >> 
> >
> > Apparently both of us had net/curl present, curl
> > is optional and dlopened in multiplayer that is why
> > it's not picked up by make port-lib-depends-check.
> >
> > I added it to LIB_DEPENDS and WANTLIB, I'm bumping
> > REVISION as this package was buildable on hosts
> > that had net/curl present and could be installed.
> >
> > OK to commit?
> 
> ok jca@
> 

Committed thanks.

> BTW this port could (in a subsequent step) switch to a cmake-based
> build.  PLIST isn't affected, and stuff like libGLU or openal is
> explicitely linked in.
> 

I will try to whizz up some time this weekend but no promises.
If someone else wants to tackle it earlier I'll gladly test and review.

Regards,
Adam



Re: CVS: cvs.openbsd.org: ports

2020-03-25 Thread Jeremie Courreges-Anglas
On Wed, Mar 25 2020, Adam Wolk  wrote:
> On Wed, Mar 25, 2020 at 03:53:10PM +0100, Antoine Jacoutot wrote:
>> On Tue, Mar 24, 2020 at 11:58:12AM -0600, Solene Rapenne wrote:
>> > CVSROOT:   /cvs
>> > Module name:   ports
>> > Changes by:sol...@cvs.openbsd.org  2020/03/24 11:58:12
>> > 
>> > Modified files:
>> >games/yquake2  : Makefile distinfo 
>> >games/yquake2/pkg: PLIST 
>> > 
>> > Log message:
>> > Update to yquake-7.43
>> > 
>> > ok awolk@
>> > 
>> 
>> Does not build.
>> 
>
> Apparently both of us had net/curl present, curl
> is optional and dlopened in multiplayer that is why
> it's not picked up by make port-lib-depends-check.
>
> I added it to LIB_DEPENDS and WANTLIB, I'm bumping
> REVISION as this package was buildable on hosts
> that had net/curl present and could be installed.
>
> OK to commit?

ok jca@

BTW this port could (in a subsequent step) switch to a cmake-based
build.  PLIST isn't affected, and stuff like libGLU or openal is
explicitely linked in.

> ? yquake2-7.43p0.diff
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/yquake2/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile  24 Mar 2020 17:58:12 -  1.20
> +++ Makefile  25 Mar 2020 19:33:20 -
> @@ -8,6 +8,7 @@ V=7.43
>  PKGNAME= ${N}-${V}
>  DISTNAME=quake2-${V}
>  CATEGORIES=  games
> +REVISION=0
>  
>  HOMEPAGE=https://www.yamagi.org/quake2/
>  MAINTAINER=  Adam Wolk 
> @@ -17,10 +18,11 @@ EXTRACT_SUFX= .tar.xz
>  # GPLv2
>  PERMIT_PACKAGE=  Yes
>  
> -WANTLIB +=   GL SDL2 c m openal pthread
> +WANTLIB +=   GL SDL2 c curl m openal pthread
>  
>  LIB_DEPENDS= audio/openal \
> - devel/sdl2
> + devel/sdl2 \
> + net/curl
>  
>  MAKE_ENV+=   VERBOSE=1
>  USE_GMAKE=   Yes
>

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



Re: CVS: cvs.openbsd.org: ports

2020-03-25 Thread Adam Wolk
On Wed, Mar 25, 2020 at 03:53:10PM +0100, Antoine Jacoutot wrote:
> On Tue, Mar 24, 2020 at 11:58:12AM -0600, Solene Rapenne wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: sol...@cvs.openbsd.org  2020/03/24 11:58:12
> > 
> > Modified files:
> > games/yquake2  : Makefile distinfo 
> > games/yquake2/pkg: PLIST 
> > 
> > Log message:
> > Update to yquake-7.43
> > 
> > ok awolk@
> > 
> 
> Does not build.
> 

Apparently both of us had net/curl present, curl
is optional and dlopened in multiplayer that is why
it's not picked up by make port-lib-depends-check.

I added it to LIB_DEPENDS and WANTLIB, I'm bumping
REVISION as this package was buildable on hosts
that had net/curl present and could be installed.

OK to commit?
? yquake2-7.43p0.diff
Index: Makefile
===
RCS file: /cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile24 Mar 2020 17:58:12 -  1.20
+++ Makefile25 Mar 2020 19:33:20 -
@@ -8,6 +8,7 @@ V=  7.43
 PKGNAME=   ${N}-${V}
 DISTNAME=  quake2-${V}
 CATEGORIES=games
+REVISION=  0
 
 HOMEPAGE=  https://www.yamagi.org/quake2/
 MAINTAINER=Adam Wolk 
@@ -17,10 +18,11 @@ EXTRACT_SUFX=   .tar.xz
 # GPLv2
 PERMIT_PACKAGE=Yes
 
-WANTLIB += GL SDL2 c m openal pthread
+WANTLIB += GL SDL2 c curl m openal pthread
 
 LIB_DEPENDS=   audio/openal \
-   devel/sdl2
+   devel/sdl2 \
+   net/curl
 
 MAKE_ENV+= VERBOSE=1
 USE_GMAKE= Yes


Re: CVS: cvs.openbsd.org: ports

2020-03-25 Thread Antoine Jacoutot
On Tue, Mar 24, 2020 at 11:58:12AM -0600, Solene Rapenne wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sol...@cvs.openbsd.org  2020/03/24 11:58:12
> 
> Modified files:
>   games/yquake2  : Makefile distinfo 
>   games/yquake2/pkg: PLIST 
> 
> Log message:
> Update to yquake-7.43
> 
> ok awolk@
> 

Does not build.

>>> Running build in games/yquake2 at 1585147827.68
===> games/yquake2
===>  Checking files for yquake2-7.43
`/exopi-cvs/ports/distfiles/quake2-7.43.tar.xz' is up to date.
>> (SHA256) quake2-7.43.tar.xz: OK
===>  Extracting for yquake2-7.43
===>  Patching for yquake2-7.43
===>  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 yquake2-7.43
===>  Configuring for yquake2-7.43
===>  Building for yquake2-7.43
Build configuration

WITH_OPENAL = yes
WITH_SYSTEMWIDE = yes
WITH_SYSTEMDIR = /usr/local/share/yquake2


===> Building quake2
mkdir -p release
gmake release/quake2
gmake[1]: Entering directory '/exopi-obj/pobj/yquake2-7.43/quake2-7.43'
===> CC src/backends/generic/misc.c
mkdir -p build/client/src/backends/generic
cc -c -std=gnu99 -O2 -fno-strict-aliasing -Wall -pipe -g -ggdb -MMD -fwrapv 
-Wno-missing-braces -DYQ2OSTYPE=\"OpenBSD\" -DYQ2ARCH=\"x86_64\" -mfpmath=sse 
-DSYSTEMWIDE -DSYSTEMDIR=\"/usr/local/share/yquake2\" -fvisibility=hidden 
-Wno-unused-result -DUSE_CURL -DUSE_OPENAL 
-DDEFAULT_OPENAL_DRIVER='"libopenal.so"' -I/usr/local/include 
-I/usr/local/include/SDL2 -I/usr/X11R6/include -D_REENTRANT 
-I/usr/X11R6/include -DIOAPI_NO_64 -DNOUNCRYPT -I/usr/local/include -o 
build/client/src/backends/generic/misc.o src/backends/generic/misc.c
src/backends/generic/misc.c:130:2: warning: "SetExecutablePath() is 
unimplemented on this platform" [-W#warnings]
#warning "SetExecutablePath() is unimplemented on this platform"
 ^
1 warning generated.
===> CC src/client/cl_cin.c
mkdir -p build/client/src/client
cc -c -std=gnu99 -O2 -fno-strict-aliasing -Wall -pipe -g -ggdb -MMD -fwrapv 
-Wno-missing-braces -DYQ2OSTYPE=\"OpenBSD\" -DYQ2ARCH=\"x86_64\" -mfpmath=sse 
-DSYSTEMWIDE -DSYSTEMDIR=\"/usr/local/share/yquake2\" -fvisibility=hidden 
-Wno-unused-result -DUSE_CURL -DUSE_OPENAL 
-DDEFAULT_OPENAL_DRIVER='"libopenal.so"' -I/usr/local/include 
-I/usr/local/include/SDL2 -I/usr/X11R6/include -D_REENTRANT 
-I/usr/X11R6/include -DIOAPI_NO_64 -DNOUNCRYPT -I/usr/local/include -o 
build/client/src/client/cl_cin.o src/client/cl_cin.c
In file included from src/client/cl_cin.c:28:
In file included from src/client/header/client.h:52:
src/client/header/../curl/header/download.h:35:10: fatal error: 'curl/curl.h' 
file not found
#include 
 ^
1 error generated.
gmake[1]: *** [Makefile:379: build/client/src/client/cl_cin.o] Error 1
gmake[1]: Leaving directory '/exopi-obj/pobj/yquake2-7.43/quake2-7.43'
gmake: *** [Makefile:368: client] Error 2
*** Error 2 in games/yquake2 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2891 
'/exopi-obj/pobj/yquake2-7.43/.build_done': @cd /exopi-obj...)
*** Error 2 in games/yquake2 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2557 'build': 
@lock=yquake2-7.43;  export _LOCKS_HELD=" yquake2...)
===> Exiting games/yquake2 with an error

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2020-03-23 Thread Marc Espie
On Mon, Mar 23, 2020 at 12:22:59PM -0600, Brian Callahan wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   bcal...@cvs.openbsd.org 2020/03/23 12:22:59
> 
> Log message:
> Import devel/dwz, a DWARF optimization and duplicate removal tool.
> tweaks and ok espie@
> 
> dwz is a program that attempts to optimize DWARF debugging information
> contained in ELF shared libraries and ELF executables for size, by
> replacing DWARF information representation with equivalent smaller
> representation where possible and by reducing the amount of duplication
> using techniques from DWARF standard appendix E - creating
> DW_TAG_partial_unit compilation units (CUs) for duplicated information
> and using DW_TAG_imported_unit to import it into each CU that needs it.

Eventually (soon), we'll test whether dwz works correctly with
DEBUG_PACKAGES...

That should alleviate some of the pressure on the mirrors.



Re: CVS: cvs.openbsd.org: ports

2020-03-20 Thread Elias M. Mariani
Wrong mail picking...
THIS should be:
Unhook py-rope from Makefile.

On Fri, Mar 20, 2020 at 8:40 AM Elias M. Mariani  wrote:
>
> CVSROOT:/cvs
> Module name:ports
> Changes by: mari...@cvs.openbsd.org 2020/03/20 05:39:36
>
> Modified files:
> devel  : Makefile
>
> Log message:
> Add quirk for py-rope.
>



Re: CVS: cvs.openbsd.org: ports

2020-03-20 Thread Elias M. Mariani
This should be:
Unhook py-rope from Makefile.

On Sat, Mar 7, 2020 at 10:32 PM Elias M. Mariani  wrote:
>
> CVSROOT:/cvs
> Module name:ports
> Changes by: mari...@cvs.openbsd.org 2020/03/07 18:32:16
>
> Modified files:
> devel  : Makefile
>
> Log message:
> Unhook py-wurlitzer from Makefile.
>



Re: CVS: cvs.openbsd.org: ports

2020-03-19 Thread Matthias Kilian
On Thu, Mar 19, 2020 at 03:32:58PM -0600, Matthias Kilian wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2020/03/19 15:32:58
> 
> Modified files:
>   lang/ghc   : Makefile distinfo 
> Removed files:
>   lang/ghc/patches: patch-libffi_ghc_mk 
> 
> Log message:
> Remove unneeded patch-libffi_ghc_mk.

Sorry, this was ment to only remove the libffi patch, the other changes
should have go in as a second commit "Use ghc 8.6 for bootstrap, cut gcc
dependency."

Ciao,
Kili



Re: CVS: cvs.openbsd.org: ports

2020-03-18 Thread Jeremie Courreges-Anglas
On Wed, Mar 18 2020, Jeremie Courreges-Anglas  wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   j...@cvs.openbsd.org2020/03/18 07:45:04
>
> Modified files:
>   sysutils/sleuthkit: Makefile 
>
> Log message:
> Switch HOMEPAGE to https, and zap bogus whitespace

That was ok rpointel@ (maintainer)

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



Re: CVS: cvs.openbsd.org: ports

2020-03-17 Thread Antoine Jacoutot
On Mon, Mar 16, 2020 at 12:06:29PM -0600, Martin Reindl wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   mar...@cvs.openbsd.org  2020/03/16 12:06:29
> 
> Modified files:
>   math/py-cftime : Makefile distinfo 
> 
> Log message:
> Update to py-cftime 1.1.1.

>>> Building on exopi-4 under math/py-cftime
 BDEPENDS = 
[lang/cython,python3;devel/py-setuptools,python3;lang/python/3.7]
 DIST = [math/py-cftime:cftime-1.1.1.tar.gz]
 FULLPKGNAME = py3-cftime-1.1.1
 RDEPENDS = 
[math/netcdf;lang/python/3.7;devel/py-setuptools,python3;lang/cython,python3]
(Junk lock obtained for exopi-4 at 1584453629.00)
>>> Running depends in math/py-cftime at 1584453629.10
   last junk was in multimedia/gstreamer-0.10/core
/usr/sbin/pkg_add -aI -Drepair py3-cython-0.29.14 py3-setuptools-41.6.0v0 
python-3.7.6p1
was: /usr/sbin/pkg_add -aI -Drepair py3-cython-0.29.14 py3-setuptools-41.6.0v0 
python-3.7.6p1
/usr/sbin/pkg_add -aI -Drepair py3-cython-0.29.14 py3-setuptools-41.6.0v0 
python-3.7.6p1
>>> Running show-prepare-results in math/py-cftime at 1584453634.02
===> math/py-cftime
===> py3-cftime-1.1.1 depends on: py3-cython-* -> py3-cython-0.29.14
===> py3-cftime-1.1.1 depends on: python->=3.7,<3.8 -> python-3.7.6p1
===> py3-cftime-1.1.1 depends on: py3-setuptools->=39.0.1v0 -> 
py3-setuptools-41.6.0v0
===>  Verifying specs:  pthread python3.7m
===>  found pthread.26.1 python3.7m.0.0
py3-cython-0.29.14
py3-setuptools-41.6.0v0
python-3.7.6p1
(Junk lock released for exopi-4 at 1584453635.06)
distfiles size=48710
>>> Running build in math/py-cftime at 1584453635.15
===> math/py-cftime
===>  Checking files for py3-cftime-1.1.1
`/exopi-cvs/ports/distfiles/cftime-1.1.1.tar.gz' is up to date.
>> (SHA256) cftime-1.1.1.tar.gz: OK
===>  Extracting for py3-cftime-1.1.1
===>  Patching for py3-cftime-1.1.1
===>  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 py3-cftime-1.1.1
===>  Configuring for py3-cftime-1.1.1
===>  Building for py3-cftime-1.1.1
Traceback (most recent call last):
  File "./setup.py", line 5, in 
import numpy
ModuleNotFoundError: No module named 'numpy'
Traceback (most recent call last):
  File "./setup.py", line 5, in 
import numpy
ModuleNotFoundError: No module named 'numpy'
*** Error 1 in math/py-cftime (/exopi-cvs/ports/lang/python/python.port.mk:250 
'do-build': @: ;cd /exopi-obj/pobj/py-cftime-1.1.1/cftime-1.1...)
*** Error 2 in math/py-cftime 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2879 
'/exopi-obj/pobj/py-cftime-1.1.1/.build_done': @cd /exopi...)
*** Error 2 in math/py-cftime 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2549 'build': 
@lock=py3-cftime-1.1.1;  export _LOCKS_HELD=" py...)
===> Exiting math/py-cftime with an error
*** Error 1 in /exopi-cvs/ports (infrastructure/mk/bsd.port.subdir.mk:137 
'build': @: ${echo_msg:=echo};  : ${target:=build};  for i in ; do...)
>>> Ended at 1584453636.09
Error: job failed with 512 on exopi-4 at 1584453636


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2020-03-17 Thread Antoine Jacoutot
On Mon, Mar 16, 2020 at 05:22:17PM -0600, Brian Callahan wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   bcal...@cvs.openbsd.org 2020/03/16 17:22:17
> 
> Modified files:
>   editors/featherpad: Makefile distinfo 
>   editors/featherpad/pkg: PLIST 
> 
> Log message:
> Update featherpad to 0.13.1
> The important changelog bits are here:
> https://github.com/tsujan/FeatherPad/releases/tag/V0.13.0

===>  Checking files for featherpad-0.13.1
>> No size recorded for FeatherPad-0.13.1.tar.gz
*** Error 1 in . (/hack/cvs/ports/infrastructure/mk/bsd.port.mk:3111 
'/hack/cvs/ports/distfiles/FeatherPad-0.13.1.tar.gz': @lock=FeatherPad-...)
*** Error 2 in . (/hack/cvs/ports/infrastructure/mk/bsd.port.mk:2423 
'_internal-fetch': @cd /usr/ports/editors/featherpad && PKGPATH=editors...)
*** Error 2 in . (/hack/cvs/ports/infrastructure/mk/bsd.port.mk:2628 
'/hack/objdirs/pobj/featherpad-0.13.1/.extract_done': @cd /usr/ports/ed...)
*** Error 2 in /usr/ports/editors/featherpad 
(/hack/cvs/ports/infrastructure/mk/bsd.port.mk:2549 'all': 
@lock=featherpad-0.13.1;  export _LO...)
> 

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2020-03-16 Thread Alexandre Ratchov
On Mon, Mar 16, 2020 at 08:54:45AM -0600, Alexandre Ratchov wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ratc...@cvs.openbsd.org 2020/03/16 08:54:45
> 
> Modified files:
>   x11/i3status   : Makefile 
> Added files:
>   x11/i3status/patches: patch-Makefile_am patch-configure_ac 
> patch-include_i3status_h 
> patch-src_print_volume_c patch-src_sndio_c 
> Removed files:
>   x11/i3status/patches: patch-Makefile_in 
> 
> Log message:
> Use the new sioctl_open(3) API to display current audio level.
> 
> Now the programm displays the current sndiod master volume level,
> which is present on any device and always corresponds to the device
> programs are playing on.
> 

Sorry, forgot to mention this is OK rsadowski@ for this one too.



Re: CVS: cvs.openbsd.org: ports

2020-03-16 Thread Alexandre Ratchov
On Mon, Mar 16, 2020 at 08:50:57AM -0600, Alexandre Ratchov wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ratc...@cvs.openbsd.org 2020/03/16 08:50:57
> 
> Modified files:
>   sysutils/tray-app: Makefile 
>   sysutils/tray-app/patches: patch-sound_Makefile 
> Added files:
>   sysutils/tray-app/patches: patch-sound_sound_c 
> 
> Log message:
> Use the new sioctl_open(3) API to display current audio level.
> 
> Now the programm displays and controls the sndiod master volume knob,
> which is present on any device and always corresponds to the device
> programs are playing on.
> 

Sorry, forgot to mention this is OK rsadowski@.



Re: CVS: cvs.openbsd.org: ports

2020-03-16 Thread Solene Rapenne
On Mon, Mar 16, 2020 at 07:43:38AM -0600, Solene Rapenne wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sol...@cvs.openbsd.org  2020/03/16 07:43:38
> 
> Removed files:
>   net/ejabberd   : Makefile distinfo 
>   net/ejabberd/patches: patch-src_Makefile_in 
> patch-src_ejabberd_c2s_erl 
> patch-src_ejabberd_cfg_example 
> patch-src_ejabberdctl_template 
>   net/ejabberd/pkg: DESCR PLIST README ejabberd.rc 
> 
> Log message:
> Remove net/ejabberd
> 
> our version is very old and lagging behind upstream
> no one volunteered to update it in one year time window
> 
> ok jca@ jasper@
> 

was also ok bcallah@



Re: CVS: cvs.openbsd.org: ports

2020-03-13 Thread Stuart Henderson
On 2020/03/14 01:20, Jeremie Courreges-Anglas wrote:
> On Fri, Mar 13 2020, Stuart Henderson  wrote:
> > On 2020/03/12 08:53, Raphael Graf wrote:
> >> CVSROOT:   /cvs
> >> Module name:   ports
> >> Changes by:ra...@cvs.openbsd.org   2020/03/12 08:53:00
> >> 
> >> Modified files:
> >>audio/vamp-plugin-sdk: Makefile distinfo 
> >>audio/vamp-plugin-sdk/patches: patch-Makefile_in 
> >>   patch-pkgconfig_vamp-hostsdk_pc_in 
> >>audio/vamp-plugin-sdk/pkg: PLIST 
> >> 
> >> Log message:
> >> update to vamp-plugin-sdk-2.9.0, help and ok jca@
> >> 
> >
> > configure: error: libsndfile not found - cannot build example Vamp host!
> 
> Thanks, and sorry for missing this.  I just moved libsndfile to
> BUILD_DEPENDS, it's only used to build the test program.
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Thanks :)



Re: CVS: cvs.openbsd.org: ports

2020-03-13 Thread Jeremie Courreges-Anglas
On Fri, Mar 13 2020, Stuart Henderson  wrote:
> On 2020/03/12 08:53, Raphael Graf wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by:  ra...@cvs.openbsd.org   2020/03/12 08:53:00
>> 
>> Modified files:
>>  audio/vamp-plugin-sdk: Makefile distinfo 
>>  audio/vamp-plugin-sdk/patches: patch-Makefile_in 
>> patch-pkgconfig_vamp-hostsdk_pc_in 
>>  audio/vamp-plugin-sdk/pkg: PLIST 
>> 
>> Log message:
>> update to vamp-plugin-sdk-2.9.0, help and ok jca@
>> 
>
> configure: error: libsndfile not found - cannot build example Vamp host!

Thanks, and sorry for missing this.  I just moved libsndfile to
BUILD_DEPENDS, it's only used to build the test program.

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



Re: CVS: cvs.openbsd.org: ports

2020-03-13 Thread Stuart Henderson
On 2020/03/12 08:53, Raphael Graf wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ra...@cvs.openbsd.org   2020/03/12 08:53:00
> 
> Modified files:
>   audio/vamp-plugin-sdk: Makefile distinfo 
>   audio/vamp-plugin-sdk/patches: patch-Makefile_in 
>  patch-pkgconfig_vamp-hostsdk_pc_in 
>   audio/vamp-plugin-sdk/pkg: PLIST 
> 
> Log message:
> update to vamp-plugin-sdk-2.9.0, help and ok jca@
> 

configure: error: libsndfile not found - cannot build example Vamp host!




Re: CVS: cvs.openbsd.org: ports

2020-03-10 Thread Paco Esteban
On Tue, 10 Mar 2020, Paco Esteban wrote:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   p...@cvs.openbsd.org2020/03/10 03:20:06
> 
> Modified files:
>   www/hugo   : Makefile distinfo 
> 
> Log message:
> update www/hugo to latest version (0.67.0)
> 

Forgot to mention, this is ok jca@

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: CVS: cvs.openbsd.org: ports

2020-03-06 Thread Bjorn Ketelaars
On Fri 06/03/2020 23:50, Bjorn Ketelaars wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   b...@cvs.openbsd.org2020/03/06 23:50:43
> 
> Modified files:
>   devel/quirks   : Makefile 
>   devel/quirks/files: Quirks.pm 
>   math   : Makefile 
>   math/py-sympy  : Makefile 
>   math/py-sympy/pkg: PLIST 
> 
> Log message:
> Remove python2 FLAVOR, migrate to python3 by default
> 
> +add quirk

Forgot to mention OK daniel@ (MAINTAINER)



Re: CVS: cvs.openbsd.org: ports

2020-03-06 Thread Jeremie Courreges-Anglas
On Fri, Mar 06 2020, Christian Weisgerber  wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   na...@cvs.openbsd.org   2020/03/06 15:22:03
>
> Modified files:
>   devel/llvm : Makefile 
>
> Log message:
> bump the remaining subpackages; all PLISTs changed

sigh, obviously.  Sorry folks, and thank you naddy for fixing it.

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



Re: CVS: cvs.openbsd.org: ports

2020-03-03 Thread Stuart Henderson
On 2020/03/01 15:08, Brian Callahan wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   bcal...@cvs.openbsd.org 2020/03/01 15:08:29
> 
> Modified files:
>   devel/flatzebra: Makefile distinfo 
>   devel/flatzebra/patches: patch-Makefile_in 
>   devel/flatzebra/pkg: PLIST 
>   games/afternoonstalker: Makefile distinfo 
>   games/afternoonstalker/patches: patch-Makefile_in 
>   games/batrachians: Makefile distinfo 
>   games/batrachians/patches: patch-Makefile_in 
>   games/burgerspace: Makefile distinfo 
>   games/burgerspace/patches: patch-Makefile_in 
>   games/cosmosmash: Makefile distinfo 
>   games/cosmosmash/patches: patch-Makefile_in 
>   games/quadrupleback: Makefile distinfo 
>   games/quadrupleback/pkg: PLIST 
> Removed files:
>   devel/flatzebra/patches: patch-src_flatzebra_GameEngine_h 
>   games/afternoonstalker/patches: patch-src_Makefile_in 
>   games/batrachians/patches: patch-src_Makefile_in 
>   games/burgerspace/patches: patch-src_server_cpp 
>   games/quadrupleback/patches: patch-src_Makefile_in 
> 
> Log message:
> Update devel/flatzilla to 0.1.7 and update all its dependent games to their
> latest versions as well (which all depend on the new flatzilla).
> ok naddy@
> 

None of the distfiles fetch.

http://sarrazip.com/dev/batrachians-0.1.7.tar.gz redirects to
https://perso.b2b2c.ca/~sarrazip/ (index page only).

I have also guessed at
https://perso.b2b2c.ca/~sarrazip/batrachians-0.1.7.tar.gz but this
does not exist either.

Same problem for education/verbiste which is not part of this set but
is from the same author.




Re: CVS: cvs.openbsd.org: ports

2020-03-01 Thread Theo Buehler
On Sun, Mar 01, 2020 at 10:05:40PM +, Stuart Henderson wrote:
> On 2020/02/29 00:57, Theo Buehler wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: t...@cvs.openbsd.org2020/02/29 00:57:47
> > 
> > Log message:
> > import py-tlsfuzzer
> > 
> > ok kmos
> > 
> > Fuzzer and test suite for TLS implementations (SSLv2-TLSv1.3).  Provides
> > ready-to-use scripts testing for many vulnerabilities (ROBOT, DROWN, 
> > etc.)
> > and general standards conformity (RFC 5246, RFC 7627, RFC 7905, etc.)
> > Early alpha version - no API stability guarantees.
> > 
> > Status:
> > 
> > Vendor Tag: tb
> > Release Tags:   tb_20200229
> > 
> > N ports/security/py-tlsfuzzer/Makefile
> > N ports/security/py-tlsfuzzer/distinfo
> > N ports/security/py-tlsfuzzer/pkg/DESCR
> > N ports/security/py-tlsfuzzer/pkg/PLIST
> > 
> > No conflicts created by this import
> > 
> 
> Broken here:
> 
> Compiling 
> '/pobj/py-tlsfuzzer-20200215-python3/fake-i386-python3/usr/local/share/tlsfuzzer/scripts/test-zero-length-data.py'...
> Listing '/usr/local/lib/python37.zip'...
> Can't list '/usr/local/lib/python37.zip'
> Listing '/usr/local/lib/python3.7'...
> Listing '/usr/local/lib/python3.7/lib-dynload'...
> Listing '/usr/local/lib/python3.7/site-packages'...
> Compiling '/usr/local/lib/python3.7/site-packages/libproxy.py'...
> *** PermissionError: [Errno 13] Permission denied: 
> '/usr/local/lib/python3.7/site-packages/__pycache__/libproxy.cpython-37.pyc.1149386640'
> 
> Full log attached.
> 

Sorry about that. Patch below makes sure that the byte-code compilation
doesn't descend into the site-packages. Unless I hear objections, I'm
going to commit it in a few hours.

Index: Makefile
===
RCS file: /var/cvs/ports/security/py-tlsfuzzer/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile29 Feb 2020 07:57:47 -  1.1.1.1
+++ Makefile2 Mar 2020 04:30:38 -
@@ -39,6 +39,6 @@ SCRIPTS_DIR = ${PREFIX}/share/tlsfuzzer/
 post-install:
${INSTALL_DATA_DIR} ${SCRIPTS_DIR}
cd ${WRKSRC}/scripts && pax -rw . ${SCRIPTS_DIR}
-   cd ${SCRIPTS_DIR} && ${MODPY_BIN} -m compileall
+   ${MODPY_BIN} -m compileall ${SCRIPTS_DIR}
 
 .include 



Re: CVS: cvs.openbsd.org: ports

2020-03-01 Thread Stuart Henderson
On 2020/02/29 00:57, Theo Buehler wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2020/02/29 00:57:47
> 
> Log message:
> import py-tlsfuzzer
> 
> ok kmos
> 
> Fuzzer and test suite for TLS implementations (SSLv2-TLSv1.3).  Provides
> ready-to-use scripts testing for many vulnerabilities (ROBOT, DROWN, etc.)
> and general standards conformity (RFC 5246, RFC 7627, RFC 7905, etc.)
> Early alpha version - no API stability guarantees.
> 
> Status:
> 
> Vendor Tag:   tb
> Release Tags: tb_20200229
> 
> N ports/security/py-tlsfuzzer/Makefile
> N ports/security/py-tlsfuzzer/distinfo
> N ports/security/py-tlsfuzzer/pkg/DESCR
> N ports/security/py-tlsfuzzer/pkg/PLIST
> 
> No conflicts created by this import
> 

Broken here:

Compiling 
'/pobj/py-tlsfuzzer-20200215-python3/fake-i386-python3/usr/local/share/tlsfuzzer/scripts/test-zero-length-data.py'...
Listing '/usr/local/lib/python37.zip'...
Can't list '/usr/local/lib/python37.zip'
Listing '/usr/local/lib/python3.7'...
Listing '/usr/local/lib/python3.7/lib-dynload'...
Listing '/usr/local/lib/python3.7/site-packages'...
Compiling '/usr/local/lib/python3.7/site-packages/libproxy.py'...
*** PermissionError: [Errno 13] Permission denied: 
'/usr/local/lib/python3.7/site-packages/__pycache__/libproxy.cpython-37.pyc.1149386640'

Full log attached.

>>> Building on localhost under security/py-tlsfuzzer,python3
 BDEPENDS = [lang/python/3.7]
 DIST = 
[security/py-tlsfuzzer,python3:tlsfuzzer-20200215-64a76682.tar.gz]
 FULLPKGNAME = py3-tlsfuzzer-20200215
 RDEPENDS = 
[net/py-tlslite-ng,python3;security/py-ecdsa,python3;lang/python/3.7]
(Junk lock failure for localhost at 1583067345.05397)
Received IO
(Junk lock obtained for localhost at 1583067345.22)
Received IO
Woken up security/py-tlsfuzzer,python3
Woken up security/py-tlsfuzzer,python3
Woken up security/py-tlsfuzzer,python3
Woken up security/py-tlsfuzzer,python3
>>> Running show-prepare-results in security/py-tlsfuzzer,python3 at 
>>> 1583067346.06
===> security/py-tlsfuzzer,python3
===> py3-tlsfuzzer-20200215 depends on: python->=3.7,<3.8 -> python-3.7.6p1
===>  Verifying specs:  python3.7m
===>  found python3.7m.0.0
python-3.7.6p1
(Junk lock released for localhost at 1583067346.29)
distfiles size=4718150
>>> Running patch in security/py-tlsfuzzer,python3 at 1583067346.33
===> security/py-tlsfuzzer,python3
===>  Checking files for py3-tlsfuzzer-20200215
`/mnt/distfiles/tlsfuzzer-20200215-64a76682.tar.gz' is up to date.
>> (SHA256) tlsfuzzer-20200215-64a76682.tar.gz: OK
===>  Extracting for py3-tlsfuzzer-20200215
===>  Patching for py3-tlsfuzzer-20200215
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
>>> Running configure in security/py-tlsfuzzer,python3 at 1583067346.67
===> security/py-tlsfuzzer,python3
===>  Generating configure for py3-tlsfuzzer-20200215
===>  Configuring for py3-tlsfuzzer-20200215
>>> Running build in security/py-tlsfuzzer,python3 at 1583067346.81
===> security/py-tlsfuzzer,python3
===>  Building for py3-tlsfuzzer-20200215
running build
running build_py
creating 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib
creating 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
copying tlsfuzzer/__init__.py -> 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
copying tlsfuzzer/expect.py -> 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
copying tlsfuzzer/fuzzers.py -> 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
copying tlsfuzzer/handshake_helpers.py -> 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
copying tlsfuzzer/helpers.py -> 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
copying tlsfuzzer/messages.py -> 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
copying tlsfuzzer/runner.py -> 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
copying tlsfuzzer/scanner.py -> 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
copying tlsfuzzer/tree.py -> 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
>>> Running fake in security/py-tlsfuzzer,python3 at 1583067347.03
===> security/py-tlsfuzzer,python3
===>  Faking installation for py3-tlsfuzzer-20200215
cd 
/pobj/py-tlsfuzzer-20200215-python3/tlsfuzzer-64a76682530f70de17360eba86ae146e4f534217/lib/tlsfuzzer
 && ln -fs 

Re: CVS: cvs.openbsd.org: ports

2020-03-01 Thread Antoine Jacoutot
On Sun, Mar 01, 2020 at 03:01:04AM -0700, Antoine Jacoutot wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ajacou...@cvs.openbsd.org   2020/03/01 03:01:04
> 
> Modified files:
>   x11/mplayer: Makefile distinfo 
>   x11/mplayer/patches: patch-DOCS_man_en_mplayer_1 patch-configure 
>   x11/mplayer/pkg: PLIST 
> 
> Log message:
> Update to mplayer-20200229.

I forgot to mention this was from Brad (maintainer), thanks.

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2020-02-27 Thread Bjorn Ketelaars
On Wed 26/02/2020 02:09, Paco Esteban wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   p...@cvs.openbsd.org2020/02/26 02:09:00
> 
> Modified files:
>   sysutils/py-prometheus_client: Makefile 
>   sysutils/py-prometheus_client/pkg: PLIST 
> 
> Log message:
> Migrate to python3 only
> 
> ok bket@, kmos@
> 

$ cvs diff -r1.1.1.1 -r 1.2 PLIST
Index: PLIST
===
RCS file: /cvs/ports/sysutils/py-prometheus_client/pkg/PLIST,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- PLIST   29 Apr 2019 13:05:01 -  1.1.1.1
+++ PLIST   26 Feb 2020 09:09:00 -  1.2
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/29 13:05:01 bket Exp $
+@comment $OpenBSD: PLIST,v 1.2 2020/02/26 09:09:00 paco Exp $
+@conflict sysutils/py-prometheus_client-*

Conflict marker is wrong. It should be '@conflict py-prometheus_client-*'.
Sorry, I should have noticed this earlier...



Re: CVS: cvs.openbsd.org: ports

2020-02-26 Thread Kurt Mosiejczuk
On Fri, Feb 21, 2020 at 07:36:28PM -0700, Thomas Frohwein wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2020/02/21 19:36:28
> 
> Modified files:
>   lang/haxe  : Makefile distinfo 
>   lang/haxe/patches: patch-libs_extc_process_stubs_c 
>  patch-libs_extlib-leftovers_uTF8_ml 
> Added files:
>   lang/haxe/files: ptmap-META 
>   lang/haxe/patches: patch-ocamldeps_gen_Makefile 
>  patch-ocamldeps_gen_src_dune 
>  patch-ocamldeps_gen_src_gen_ml 
>  patch-ocamldeps_ocaml-migrate-parsetree_Makefile 
>  patch-ocamldeps_ocaml-sha_Makefile 
>  patch-ocamldeps_ocaml-sha_bitfn_h 
>  patch-ocamldeps_ocaml-sha_sha1_ml 
>  patch-ocamldeps_ocaml-sha_sha256_ml 
>  patch-ocamldeps_ppx_derivers_Makefile 
>  patch-ocamldeps_ppx_tools_versioned_Makefile 
>  patch-ocamldeps_sedlex_Makefile 
>  
> patch-ocamldeps_sedlex_src_generator_gen_unicode_ml_inc 
>  patch-ocamldeps_sedlex_src_lib_dune 
>  patch-sha512_ml 

> Log message:
> unbreak lang/haxe by building OCaml BDEPS with the port
> builds and runs fine on amd64
> builds fine for bcallah@, too, who also pointed out missing BDP devel/dune
> thanks!

http://build-failures.rhaalovely.net/sparc64/2020-02-23/lang/haxe.log

I suspect this is missing a BDEP on ocaml itself.

--Kurt



Re: CVS: cvs.openbsd.org: ports

2020-02-25 Thread Stuart Henderson
On 2020/02/17 11:17, Pavel Korovin wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   p...@cvs.openbsd.org2020/02/17 11:17:42
> 
> Modified files:
>   sysutils/ansible: Makefile distinfo 
>   sysutils/ansible/pkg: PLIST-html 
> 
> Log message:
> Update ansible 2.9.4 -> 2.9.5
> Changelog: 
> https://github.com/ansible/ansible/blob/stable-2.9/changelogs/CHANGELOG-v2.9.rst#v2-9-5
> 

I have a packaging problem with the -html subpackage, not all documents are
generated - it seems that more of the runtime dependencies are required at
build time. I propose to add them all as build dependencies rather than try
to figure out the minimal set, this should reduce the risk of it happening
in the future.

OK?


Index: Makefile
===
RCS file: /cvs/ports/sysutils/ansible/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile17 Feb 2020 18:17:42 -  1.119
+++ Makefile25 Feb 2020 13:59:57 -
@@ -25,10 +25,10 @@ MODULES =   lang/python
 MODPY_SETUPTOOLS = Yes
 MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
-BUILD_DEPENDS =devel/py-straight.plugin${MODPY_FLAVOR} \
+BUILD_DEPENDS =${RUN_DEPENDS} \
+   devel/py-straight.plugin${MODPY_FLAVOR} \
textproc/py-sphinx${MODPY_FLAVOR} \
-   textproc/py-sphinx-notfound-page${MODPY_FLAVOR} \
-   textproc/py-yaml${MODPY_FLAVOR}
+   textproc/py-sphinx-notfound-page${MODPY_FLAVOR}
 RUN_DEPENDS =  net/py-netaddr${MODPY_FLAVOR} \
security/py-cryptodome${MODPY_FLAVOR} \
security/py-paramiko${MODPY_FLAVOR} \



Re: CVS: cvs.openbsd.org: ports

2020-02-25 Thread Antoine Jacoutot
On Mon, Feb 24, 2020 at 04:24:40PM -0700, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2020/02/24 16:24:40
> 
> Modified files:
>   graphics/gimp/stable: Makefile 
>   graphics/gimp/stable/pkg: PLIST 
> 
> Log message:
> build GIMP with HEIF support

That makes gimp indirectly depend on Qt right?
Do we want that?

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2020-02-21 Thread Stuart Henderson
On 2020/02/22 00:30, Antoine Jacoutot wrote:
> On Fri, Feb 21, 2020 at 08:32:07AM -0700, Rafael Sadowski wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: rsadow...@cvs.openbsd.org   2020/02/21 08:32:07
> > 
> > Modified files:
> > editors/teaqt  : Makefile distinfo 
> > editors/teaqt/pkg: DESCR PLIST 
> > Added files:
> > editors/teaqt/patches: patch-CMakeLists_txt 
> > Removed files:
> > editors/teaqt/patches: patch-spellchecker_cpp patch-src_pro 
> > 
> > Log message:
> > Update tea-qt to 50.0.4 (Qt4 to Qt5 switch)
> > 
> > Tweaks from sthen@, input and OK landry.
> 
> Didn't the PKGNAME change from teaqt to tea-qt?
> 
> -- 
> Antoine

Oh sorry I missed the -, fixing now.
 



Re: CVS: cvs.openbsd.org: ports

2020-02-21 Thread Antoine Jacoutot
On Fri, Feb 21, 2020 at 08:32:07AM -0700, Rafael Sadowski wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rsadow...@cvs.openbsd.org   2020/02/21 08:32:07
> 
> Modified files:
>   editors/teaqt  : Makefile distinfo 
>   editors/teaqt/pkg: DESCR PLIST 
> Added files:
>   editors/teaqt/patches: patch-CMakeLists_txt 
> Removed files:
>   editors/teaqt/patches: patch-spellchecker_cpp patch-src_pro 
> 
> Log message:
> Update tea-qt to 50.0.4 (Qt4 to Qt5 switch)
> 
> Tweaks from sthen@, input and OK landry.

Didn't the PKGNAME change from teaqt to tea-qt?

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2020-02-20 Thread Kurt Mosiejczuk
On Thu, Feb 20, 2020 at 07:58:39AM -0700, James Turner wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   jtur...@cvs.openbsd.org 2020/02/20 07:58:39

> Added files:
>   sysutils/slant/patches: patch-slant-cgi_c 

> Log message:
> Fix slant build after recent update. Broken so no need to bump. Pointed out 
> by kurt.

That's kmos, actually :)

--Kurt



Re: CVS: cvs.openbsd.org: ports

2020-02-15 Thread Rafael Sadowski
On Sat Feb 15, 2020 at 01:06:43AM -0700, Rafael Sadowski wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rsadow...@cvs.openbsd.org   2020/02/15 01:06:43
> 
> Modified files:
>   devel  : Makefile 
> Removed files:
>   devel/bouml: Makefile distinfo 
>   devel/bouml/patches: patch-Makefile patch-src_JavaCat_Class_cpp 
>patch-src_ProjectControl_BrowserNode_cpp 
>   devel/bouml/pkg: DESCR-docs DESCR-main PLIST-docs PLIST-main 
> 
> Log message:
> Remove devel/bouml
> 
> Upstream has decide to go its own way[1]. Qt3, no update since 10 years.
> It's time to go.
> 
> [1] https://marc.info/?l=openbsd-ports&m=157934986528326&w=2
> 
ok thfr@



Re: CVS: cvs.openbsd.org: ports

2020-02-13 Thread Stuart Henderson
On 2020/02/13 15:19, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2020/02/13 15:19:35
> 
> Modified files:
>   devel/gtest: distinfo 
>   editors/featherpad: Makefile distinfo 
>   editors/texworks: Makefile distinfo 
>   infrastructure/mk: bsd.port.mk 
>   misc/feathernotes: Makefile distinfo 
>   x11/paper-icon-theme: Makefile distinfo 
>   misc/open62541 : distinfo Makefile 
> 
> Log message:
> be smarter about GH_TAGNAME; when generating the default DISTNAME, only
> strip a leading "v" when it's followed by what looks like a version number,
> also have it handle a few other common names seen in ports. likewise when
> stripping 'v' from the default WRKDIST, also allow 'V', but only if
> followed by digits (which seems a better match to what github are doing).
> 
> update the few ports which _require_ updates to match this change.
> 
> been through a bulk on i386 (plus I've diffed "make dump-vars" run in
> in all ports having GH_TAGNAME before+after applying the patch), ok jca
> 

there will be others where some manual DISTNAME or WRKDIST setting can
be removed as they will now match the default - I'll look at removing
those when I'm bored sometime, or if someone else fancies taking a look
then be my guest :)



Re: CVS: cvs.openbsd.org: ports

2020-02-11 Thread Kurt Mosiejczuk
On Tue, Feb 11, 2020 at 06:43:38AM -0700, Kurt Mosiejczuk wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2020/02/11 06:43:38
> 
> Modified files:
>   lang/janet : Makefile 
> 
> Log message:
> Mark lang/janet BROKEN-sparc64
> 
> It has never built on sparc64
> 
This was ok sthen@



Re: CVS: cvs.openbsd.org: ports

2020-02-10 Thread Solene Rapenne
On Mon, Feb 10, 2020 at 03:42:09PM -0700, Solene Rapenne wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sol...@cvs.openbsd.org  2020/02/10 15:42:09
> 
> Log message:
> import bitlbee-mastodon
> 
> original port from cwen@
> tweaks by cwen@ and sthen@
> 
> ok cwen@ sthen@
> 
> Status:
> 
> Vendor Tag:   solene
> Release Tags: solene_20200210
> 
> N ports/net/bitlbee-mastodon/Makefile
> N ports/net/bitlbee-mastodon/distinfo
> N ports/net/bitlbee-mastodon/pkg/DESCR
> N ports/net/bitlbee-mastodon/pkg/PLIST
> N ports/net/bitlbee-mastodon/patches/patch-doc_Makefile_am
> 
> No conflicts created by this import
> 

forgot to include DESCR

This Bitlbee plugin allows you to communicate with Mastodon instances, using
your favourite IRC client. Mastodon is a decentralized, free and open-source
microblogging network that implements the ActivityPub protocol.

You'll need an account on a Mastodon instance to use this plugin.



Re: CVS: cvs.openbsd.org: ports

2020-02-09 Thread Alexander Bluhm
On Sun, Feb 09, 2020 at 03:28:11PM -0700, Alexander Bluhm wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   bl...@cvs.openbsd.org   2020/02/09 15:28:11
>
> Log message:
> import p5-MooseX-Attribute-Chained 1.0.3
> OK afresh1@ cwen@

from wen heping



Re: CVS: cvs.openbsd.org: ports

2020-02-09 Thread Antoine Jacoutot
On Sun, Feb 09, 2020 at 10:28:52AM +0100, Antoine Jacoutot wrote:
> On Sat, Feb 08, 2020 at 06:45:05PM -0700, Aaron Bieber wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: abie...@cvs.openbsd.org 2020/02/08 18:45:05
> > 
> > Log message:
> > Import ogvt aka OpenBSD Gnupg-signature Verification Tool.
> > 
> > OK kn@
> > 
> > Status:
> > 
> > Vendor Tag: abieber
> > Release Tags:   abieber_20200208
> > 
> > N ports/security/ogvt/Makefile
> > N ports/security/ogvt/distinfo
> > N ports/security/ogvt/pkg/DESCR
> > N ports/security/ogvt/pkg/PLIST
> > N ports/security/ogvt/files/pubkey
> > 
> > No conflicts created by this import
> 
> Hi.
> 
> MODGO_TYPE =bin
> => that's the default, not sure it's useful to explicitely put it
> 
> Quick question, what is the pubkey in files for?

And also, this:

$ cd /usr/ports/security/ogvt/ && make fetch
===>  Checking files for ogvt-1.0.0
>> Fetch https://deftly.net/dist/archive/v1.0.0.tar.gz
ftp: Error retrieving https://deftly.net/dist/archive/v1.0.0.tar.gz: 404 Not 
Found


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2020-02-09 Thread Antoine Jacoutot
On Sat, Feb 08, 2020 at 06:45:05PM -0700, Aaron Bieber wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   abie...@cvs.openbsd.org 2020/02/08 18:45:05
> 
> Log message:
> Import ogvt aka OpenBSD Gnupg-signature Verification Tool.
> 
> OK kn@
> 
> Status:
> 
> Vendor Tag:   abieber
> Release Tags: abieber_20200208
> 
> N ports/security/ogvt/Makefile
> N ports/security/ogvt/distinfo
> N ports/security/ogvt/pkg/DESCR
> N ports/security/ogvt/pkg/PLIST
> N ports/security/ogvt/files/pubkey
> 
> No conflicts created by this import

Hi.

MODGO_TYPE =bin
=> that's the default, not sure it's useful to explicitely put it

Quick question, what is the pubkey in files for?

Thanks.

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2020-02-06 Thread Jeremy Evans
On 02/06 02:18, Kurt Mosiejczuk wrote:
> On Thu, Feb 06, 2020 at 07:26:35AM -0700, Jeremy Evans wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: jer...@cvs.openbsd.org  2020/02/06 07:26:35
> > 
> > Added files:
> > databases/pg_statsinfo: 
> > 
> > patch-src_drivers_postgresql_PostgresqlTypes_cpp 
> > patch-src_sql_drivers_psql_qsql_psql_cpp 
> 
> > Log message:
> > Add patches missed earlier to allow building with PostgreSQL 12
> 
> It is actually patch-agent_lib_libstatsinfo_c that is failing to apply
> properly on my sparc64 build.

Sorry about that.  Looks like the changes in that patch were also not
committed.  Fixed now.

Thanks,
Jeremy



Re: CVS: cvs.openbsd.org: ports

2020-02-06 Thread Kurt Mosiejczuk
On Thu, Feb 06, 2020 at 07:26:35AM -0700, Jeremy Evans wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   jer...@cvs.openbsd.org  2020/02/06 07:26:35
> 
> Added files:
>   databases/pg_statsinfo: 
>   
> patch-src_drivers_postgresql_PostgresqlTypes_cpp 
>   patch-src_sql_drivers_psql_qsql_psql_cpp 

> Log message:
> Add patches missed earlier to allow building with PostgreSQL 12

It is actually patch-agent_lib_libstatsinfo_c that is failing to apply
properly on my sparc64 build.

--Kurt



Re: CVS: cvs.openbsd.org: ports

2020-02-04 Thread Charlène Wendling
On Tue, 4 Feb 2020 15:54:09 -0700 (MST)
Charlene Wendling wrote:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   c...@cvs.openbsd.org2020/02/04 15:54:09
> 
> Modified files:
>   games/frozen-bubble: Makefile 
> Added files:
>   games/frozen-bubble/patches: patch-c_stuff_fb_c_stuff_xs 
>patch-c_stuff_lib_FBLE_pm 
>patch-frozen-bubble 
> 
> Log message:
> Add various fixes to frozen-bubble:
> 
> - allow building with base-clang (from gkoehler@, thanks!)

> - remove BROKEN-{amd64,i386} after gkoehler@'s p5-SDL fix
^ Wrong, actually the BROKEN lines were removed in the p5-SDL
commit/Makefile. But frozen-bubble is unbroken on these archs for
real.

> - replace various use of my() in false conditionals, it's fatal
> with Perl 5.30
> - deinterlace some PNGs to silence some libpng warnings
> 
> OK gkoehler@ afresh1@ (who tested on sparc64 and i386)
> 



Re: CVS: cvs.openbsd.org: ports

2020-02-04 Thread Stuart Henderson
On 2020/02/04 04:28, Edd Barrett wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   e...@cvs.openbsd.org2020/02/04 04:28:03
> 
> Modified files:
>   mail/extsmail  : Makefile distinfo 
> 
> Log message:
> Update mail/extsmail to version 2.4.
> 
> From MAINTAINER Laurence Tratt.
> 
> OK sthen@.
> 
> Thanks
> 

that was "go ahead" sthen@ which isn't exactly the same thing as "ok" :)



Re: CVS: cvs.openbsd.org: ports

2020-01-29 Thread Andrew Hewus Fresh
This was actually an update to 0.30, copied the wrong line.

On Wed, Jan 29, 2020 at 08:45:45PM -0700, Andrew Fresh wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   afre...@cvs.openbsd.org 2020/01/29 20:45:45
> 
> Modified files:
>   www/p5-Dancer2 : Makefile distinfo 
>   www/p5-Dancer2/pkg: PLIST 
> 
> Log message:
> Update www/p5-Dancer2 to 0.208001
> 
> From wen heping 
> OK cwen@
> 



Re: CVS: cvs.openbsd.org: ports

2020-01-25 Thread Stuart Henderson
On 2020/01/25 14:24, Solene Rapenne wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sol...@cvs.openbsd.org  2020/01/25 14:24:51
> 
> Modified files:
>   net/unifi  : Makefile.inc 
> 
> Log message:
> A message was displayed to suggest building with FETCH_PACKAGES=Yes but
> it reports an error as the new correct syntax is FETCH_PACKAGES=
> 
> issue reported on irc by pi94
> 

Thanks. They could also email the maintainer rather than report on irc :)



Re: CVS: cvs.openbsd.org: ports

2020-01-24 Thread Stuart Henderson
On 2020/01/24 01:55, Kurt Mosiejczuk wrote:
> On Wed, Jan 22, 2020 at 09:11:55AM -0700, Stuart Henderson wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: st...@cvs.openbsd.org   2020/01/22 09:11:55
> 
> > Modified files:
> > net/isc-dhcp   : Makefile distinfo 
> > net/isc-dhcp/patches: patch-bind_Makefile_in 
> >   patch-client_Makefile_in 
> > net/isc-dhcp/pkg: PLIST-main PLIST-omapi 
> > Added files:
> > net/isc-dhcp/patches: patch-keama_confparse_c patch-keama_data_c 
> >   patch-keama_eval_c patch-keama_keama_c 
> >   patch-keama_keama_h 
> > Removed files:
> > net/isc-dhcp/patches: patch-common_socket_c 
> 
> > Log message:
> > update to isc-dhcp-4.4.2 and build the new "keama" tool (Kea migration 
> > assistant)
> 
> This failed in the new sparc64 build I'm running. Adding a
> COMPILER = base-clang ports-gcc line to Makefile fixes it.
> 
> --Kurt

Should have guessed! Thanks, I'll add that and COMPILER_LANGS.



Re: CVS: cvs.openbsd.org: ports

2020-01-23 Thread Kurt Mosiejczuk
On Wed, Jan 22, 2020 at 09:11:55AM -0700, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2020/01/22 09:11:55

> Modified files:
>   net/isc-dhcp   : Makefile distinfo 
>   net/isc-dhcp/patches: patch-bind_Makefile_in 
> patch-client_Makefile_in 
>   net/isc-dhcp/pkg: PLIST-main PLIST-omapi 
> Added files:
>   net/isc-dhcp/patches: patch-keama_confparse_c patch-keama_data_c 
> patch-keama_eval_c patch-keama_keama_c 
> patch-keama_keama_h 
> Removed files:
>   net/isc-dhcp/patches: patch-common_socket_c 

> Log message:
> update to isc-dhcp-4.4.2 and build the new "keama" tool (Kea migration 
> assistant)

This failed in the new sparc64 build I'm running. Adding a
COMPILER = base-clang ports-gcc line to Makefile fixes it.

--Kurt



Re: CVS: cvs.openbsd.org: ports

2020-01-21 Thread Kurt Miller
On Tue, 2020-01-21 at 09:32 +0100, Landry Breuil wrote:
> On Tue, Jan 21, 2020 at 07:48:27AM +0100, Landry Breuil wrote:
> > 
> > On Mon, Jan 20, 2020 at 04:32:01PM -0700, Kurt Miller wrote:
> > > 
> > > CVSROOT:  /cvs
> > > Module name:  ports
> > > Changes by:   k...@cvs.openbsd.org2020/01/20 16:32:01
> > > 
> > > Added files:
> > >   benchmarks/fio : Makefile distinfo 
> > >   benchmarks/fio/pkg: DESCR PLIST 
> > > 
> > > Log message:
> > > fio is a IO benchmarking tool that can simulate various user defined
> > > workloads. fio will spawn a number of threads or processes doing a
> > > particular type of IO action as specified by the user.  It takes a
> > > number of global parameters, each inherited by the thread unless other
> > > parameters given to them overriding that setting.  The typical use of
> > > fio is to write a job file matching the IO load one wants to simulate.
> > Fwiw it conflicts with geo/py-fiona, which also installs bin/fio in the
> > default python2 flavor. Either set the @conflict markers or rename the
> > benchmarks/fio binary to something else in post-install..
> > 
> > [07:46] c64:/usr/ports/benchmarks/fio/ $doas pkg_add py-fiona
> > [07:47] c64:/usr/ports/benchmarks/fio/ $make install
> > ===>  Installing fio-3.17 from /usr/ports/packages/amd64/all/
> > Collision in fio-3.17: the following files already exist
> > /usr/local/bin/fio (py-fiona-1.8.11p0 and fio-3.17)
> > Couldn't install fio-3.17
> > 
> > i *think* pkg_create was supposed to warn about such conflicts but maybe
> > that felt into the cracks.
> (thanks semarie@) you need pkglocatedb to be installed, and then make
> update-plist rightfully complains:
> 
> ===>  Updating plist for fio-3.17
> Reading existing plist for fio-3.17
> Scanning /usr/obj/ports/fio-3.17/fake-amd64
> Removing .debug artefacts
> Figuring out tie points
> Tieing loose objects
> Copying objects
> Looking for unregistered conflicts
> Warning: fio-3.17 conflicts with py-fiona-1.8.11p0 
> (geo/py-fiona):/usr/local/bin/fio

Ah yea, I didn't have pkglocatedb installed. Thanks for caching this
and thanks to sthen@ for the quick fix.

-Kurt



Re: CVS: cvs.openbsd.org: ports

2020-01-21 Thread Landry Breuil
On Tue, Jan 21, 2020 at 07:48:27AM +0100, Landry Breuil wrote:
> On Mon, Jan 20, 2020 at 04:32:01PM -0700, Kurt Miller wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: k...@cvs.openbsd.org2020/01/20 16:32:01
> > 
> > Added files:
> > benchmarks/fio : Makefile distinfo 
> > benchmarks/fio/pkg: DESCR PLIST 
> > 
> > Log message:
> > fio is a IO benchmarking tool that can simulate various user defined
> > workloads. fio will spawn a number of threads or processes doing a
> > particular type of IO action as specified by the user.  It takes a
> > number of global parameters, each inherited by the thread unless other
> > parameters given to them overriding that setting.  The typical use of
> > fio is to write a job file matching the IO load one wants to simulate.
> 
> Fwiw it conflicts with geo/py-fiona, which also installs bin/fio in the
> default python2 flavor. Either set the @conflict markers or rename the
> benchmarks/fio binary to something else in post-install..
> 
> [07:46] c64:/usr/ports/benchmarks/fio/ $doas pkg_add py-fiona
> [07:47] c64:/usr/ports/benchmarks/fio/ $make install
> ===>  Installing fio-3.17 from /usr/ports/packages/amd64/all/
> Collision in fio-3.17: the following files already exist
> /usr/local/bin/fio (py-fiona-1.8.11p0 and fio-3.17)
> Couldn't install fio-3.17
> 
> i *think* pkg_create was supposed to warn about such conflicts but maybe
> that felt into the cracks.

(thanks semarie@) you need pkglocatedb to be installed, and then make
update-plist rightfully complains:

===>  Updating plist for fio-3.17
Reading existing plist for fio-3.17
Scanning /usr/obj/ports/fio-3.17/fake-amd64
Removing .debug artefacts
Figuring out tie points
Tieing loose objects
Copying objects
Looking for unregistered conflicts
Warning: fio-3.17 conflicts with py-fiona-1.8.11p0 
(geo/py-fiona):/usr/local/bin/fio



Re: CVS: cvs.openbsd.org: ports

2020-01-20 Thread Landry Breuil
On Mon, Jan 20, 2020 at 04:32:01PM -0700, Kurt Miller wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2020/01/20 16:32:01
> 
> Added files:
>   benchmarks/fio : Makefile distinfo 
>   benchmarks/fio/pkg: DESCR PLIST 
> 
> Log message:
> fio is a IO benchmarking tool that can simulate various user defined
> workloads. fio will spawn a number of threads or processes doing a
> particular type of IO action as specified by the user.  It takes a
> number of global parameters, each inherited by the thread unless other
> parameters given to them overriding that setting.  The typical use of
> fio is to write a job file matching the IO load one wants to simulate.

Fwiw it conflicts with geo/py-fiona, which also installs bin/fio in the
default python2 flavor. Either set the @conflict markers or rename the
benchmarks/fio binary to something else in post-install..

[07:46] c64:/usr/ports/benchmarks/fio/ $doas pkg_add py-fiona
[07:47] c64:/usr/ports/benchmarks/fio/ $make install
===>  Installing fio-3.17 from /usr/ports/packages/amd64/all/
Collision in fio-3.17: the following files already exist
/usr/local/bin/fio (py-fiona-1.8.11p0 and fio-3.17)
Couldn't install fio-3.17

i *think* pkg_create was supposed to warn about such conflicts but maybe
that felt into the cracks.

Landry



Re: CVS: cvs.openbsd.org: ports

2020-01-19 Thread Stuart Henderson
On 2020/01/19 16:18, Rafael Sadowski wrote:
> On Sun Jan 19, 2020 at 02:05:29PM +, Stuart Henderson wrote:
> > On 2020/01/18 02:04, Rafael Sadowski wrote:
> > > CVSROOT:  /cvs
> > > Module name:  ports
> > > Changes by:   rsadow...@cvs.openbsd.org   2020/01/18 02:04:59
> > > 
> > > Modified files:
> > >   graphics/opencv: Makefile distinfo 
> > >   graphics/opencv/patches: patch-cmake_OpenCVFindLibsGrfmt_cmake 
> > >patch-modules_core_src_system_cpp 
> > >   graphics/opencv/pkg: PLIST-java PLIST-main 
> > > Removed files:
> > >   graphics/opencv/patches: patch-CMakeLists_txt 
> > >patch-cmake_OpenCVFindLibsVideo_cmake 
> > > 
> > > Log message:
> > > Update opencv to 4.2
> > > 
> > > CMake renames like off to OFF and so one.
> > > 
> > 
> > Fails to package:
> > 
> 
> Here is a quick fix to unbreak opencv.
> 
> - Remove deprecated option ENABLE_SSE3.
> - Disable ADE (gapi) support because this requires to download ADE
>   during configure.
> 
> Sorry for the noise. OK?

Please bump REVISION as well.

Looking at the CPU feature detection, they have "baseline" which is minimum
required, and "dispatched" which is various other ones built in, then it
should do runtime detection. I haven't verified that but it seems likely
to work so I think your diff that just removes ENABLE_SSE3=OFF is correct.
(Docs at https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options).

OK with the bump.

> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/opencv/Makefile,v
> retrieving revision 1.55
> diff -u -p -u -p -r1.55 Makefile
> --- Makefile  18 Jan 2020 09:04:59 -  1.55
> +++ Makefile  19 Jan 2020 15:09:40 -
> @@ -24,7 +24,7 @@ DISTFILES = opencv-{opencv/archive/}${V
>  .for i in opencv_calib3d opencv_core opencv_features2d \
>opencv_flann opencv_highgui opencv_imgproc opencv_ml opencv_objdetect \
>opencv_photo opencv_stitching opencv_video opencv_imgcodecs \
> -  opencv_videoio opencv_dnn opencv_gapi
> +  opencv_videoio opencv_dnn
>  SHARED_LIBS += $i 6.0
>  .endfor
>  
> @@ -95,10 +95,10 @@ CONFIGURE_ARGS =  -DBUILD_DOCS=OFF \
>   -DBUILD_ITT=OFF \
>   -DBUILD_PERF_TESTS=OFF \
>   -DBUILD_TESTS=OFF \
> - -DENABLE_SSE3=OFF \
>   -DINSTALL_PYTHON_EXAMPLES=OFF \
>   -DINSTALL_TESTS=OFF \
>   -DWITH_1394=OFF \
> + -DWITH_ADE=OFF \
>   -DWITH_CUDA=OFF \
>   -DWITH_EIGEN=OFF \
>   -DWITH_IPP=OFF \
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-main,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 PLIST-main
> --- pkg/PLIST-main18 Jan 2020 09:04:59 -  1.10
> +++ pkg/PLIST-main19 Jan 2020 15:09:40 -
> @@ -193,77 +193,6 @@ include/opencv4/opencv2/flann/sampling.h
>  include/opencv4/opencv2/flann/saving.h
>  include/opencv4/opencv2/flann/simplex_downhill.h
>  include/opencv4/opencv2/flann/timer.h
> -include/opencv4/opencv2/gapi/
> -include/opencv4/opencv2/gapi.hpp
> -include/opencv4/opencv2/gapi/core.hpp
> -include/opencv4/opencv2/gapi/cpu/
> -include/opencv4/opencv2/gapi/cpu/core.hpp
> -include/opencv4/opencv2/gapi/cpu/gcpukernel.hpp
> -include/opencv4/opencv2/gapi/cpu/imgproc.hpp
> -include/opencv4/opencv2/gapi/fluid/
> -include/opencv4/opencv2/gapi/fluid/core.hpp
> -include/opencv4/opencv2/gapi/fluid/gfluidbuffer.hpp
> -include/opencv4/opencv2/gapi/fluid/gfluidkernel.hpp
> -include/opencv4/opencv2/gapi/fluid/imgproc.hpp
> -include/opencv4/opencv2/gapi/garg.hpp
> -include/opencv4/opencv2/gapi/garray.hpp
> -include/opencv4/opencv2/gapi/gasync_context.hpp
> -include/opencv4/opencv2/gapi/gcall.hpp
> -include/opencv4/opencv2/gapi/gcommon.hpp
> -include/opencv4/opencv2/gapi/gcompiled.hpp
> -include/opencv4/opencv2/gapi/gcompiled_async.hpp
> -include/opencv4/opencv2/gapi/gcompoundkernel.hpp
> -include/opencv4/opencv2/gapi/gcomputation.hpp
> -include/opencv4/opencv2/gapi/gcomputation_async.hpp
> -include/opencv4/opencv2/gapi/gkernel.hpp
> -include/opencv4/opencv2/gapi/gmat.hpp
> -include/opencv4/opencv2/gapi/gmetaarg.hpp
> -include/opencv4/opencv2/gapi/gproto.hpp
> -include/opencv4/opencv2/gapi/gpu/
> -include/opencv4/opencv2/gapi/gpu/core.hpp
> -include/opencv4/opencv2/gapi/gpu/ggpukernel.hpp
> -include/opencv4/opencv2/gapi/gpu/imgproc.hpp
> -include/opencv4/opencv2/gapi/gscalar.hpp
> -include/opencv4/opencv2/gapi/gstreaming.hpp
> -include/opencv4/opencv2/gapi/gtransform.hpp
> -include/opencv4/opencv2/gapi/gtype_traits.hpp
> -include/opencv4/opencv2/gapi/gtyped.hpp
> -include/opencv4/opencv2/gapi/imgproc.hpp
> -include/opencv4/opencv2/gapi/infer/
> -include/opencv4/opencv2/gapi/infer.hpp
> -include/opencv4/opencv2/gapi/infe

Re: CVS: cvs.openbsd.org: ports

2020-01-19 Thread Rafael Sadowski
On Sun Jan 19, 2020 at 02:05:29PM +, Stuart Henderson wrote:
> On 2020/01/18 02:04, Rafael Sadowski wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: rsadow...@cvs.openbsd.org   2020/01/18 02:04:59
> > 
> > Modified files:
> > graphics/opencv: Makefile distinfo 
> > graphics/opencv/patches: patch-cmake_OpenCVFindLibsGrfmt_cmake 
> >  patch-modules_core_src_system_cpp 
> > graphics/opencv/pkg: PLIST-java PLIST-main 
> > Removed files:
> > graphics/opencv/patches: patch-CMakeLists_txt 
> >  patch-cmake_OpenCVFindLibsVideo_cmake 
> > 
> > Log message:
> > Update opencv to 4.2
> > 
> > CMake renames like off to OFF and so one.
> > 
> 
> Fails to package:
> 

Here is a quick fix to unbreak opencv.

- Remove deprecated option ENABLE_SSE3.
- Disable ADE (gapi) support because this requires to download ADE
  during configure.

Sorry for the noise. OK?

Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 Makefile
--- Makefile18 Jan 2020 09:04:59 -  1.55
+++ Makefile19 Jan 2020 15:09:40 -
@@ -24,7 +24,7 @@ DISTFILES =   opencv-{opencv/archive/}${V
 .for i in opencv_calib3d opencv_core opencv_features2d \
   opencv_flann opencv_highgui opencv_imgproc opencv_ml opencv_objdetect \
   opencv_photo opencv_stitching opencv_video opencv_imgcodecs \
-  opencv_videoio opencv_dnn opencv_gapi
+  opencv_videoio opencv_dnn
 SHARED_LIBS += $i 6.0
 .endfor
 
@@ -95,10 +95,10 @@ CONFIGURE_ARGS =-DBUILD_DOCS=OFF \
-DBUILD_ITT=OFF \
-DBUILD_PERF_TESTS=OFF \
-DBUILD_TESTS=OFF \
-   -DENABLE_SSE3=OFF \
-DINSTALL_PYTHON_EXAMPLES=OFF \
-DINSTALL_TESTS=OFF \
-DWITH_1394=OFF \
+   -DWITH_ADE=OFF \
-DWITH_CUDA=OFF \
-DWITH_EIGEN=OFF \
-DWITH_IPP=OFF \
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST-main
--- pkg/PLIST-main  18 Jan 2020 09:04:59 -  1.10
+++ pkg/PLIST-main  19 Jan 2020 15:09:40 -
@@ -193,77 +193,6 @@ include/opencv4/opencv2/flann/sampling.h
 include/opencv4/opencv2/flann/saving.h
 include/opencv4/opencv2/flann/simplex_downhill.h
 include/opencv4/opencv2/flann/timer.h
-include/opencv4/opencv2/gapi/
-include/opencv4/opencv2/gapi.hpp
-include/opencv4/opencv2/gapi/core.hpp
-include/opencv4/opencv2/gapi/cpu/
-include/opencv4/opencv2/gapi/cpu/core.hpp
-include/opencv4/opencv2/gapi/cpu/gcpukernel.hpp
-include/opencv4/opencv2/gapi/cpu/imgproc.hpp
-include/opencv4/opencv2/gapi/fluid/
-include/opencv4/opencv2/gapi/fluid/core.hpp
-include/opencv4/opencv2/gapi/fluid/gfluidbuffer.hpp
-include/opencv4/opencv2/gapi/fluid/gfluidkernel.hpp
-include/opencv4/opencv2/gapi/fluid/imgproc.hpp
-include/opencv4/opencv2/gapi/garg.hpp
-include/opencv4/opencv2/gapi/garray.hpp
-include/opencv4/opencv2/gapi/gasync_context.hpp
-include/opencv4/opencv2/gapi/gcall.hpp
-include/opencv4/opencv2/gapi/gcommon.hpp
-include/opencv4/opencv2/gapi/gcompiled.hpp
-include/opencv4/opencv2/gapi/gcompiled_async.hpp
-include/opencv4/opencv2/gapi/gcompoundkernel.hpp
-include/opencv4/opencv2/gapi/gcomputation.hpp
-include/opencv4/opencv2/gapi/gcomputation_async.hpp
-include/opencv4/opencv2/gapi/gkernel.hpp
-include/opencv4/opencv2/gapi/gmat.hpp
-include/opencv4/opencv2/gapi/gmetaarg.hpp
-include/opencv4/opencv2/gapi/gproto.hpp
-include/opencv4/opencv2/gapi/gpu/
-include/opencv4/opencv2/gapi/gpu/core.hpp
-include/opencv4/opencv2/gapi/gpu/ggpukernel.hpp
-include/opencv4/opencv2/gapi/gpu/imgproc.hpp
-include/opencv4/opencv2/gapi/gscalar.hpp
-include/opencv4/opencv2/gapi/gstreaming.hpp
-include/opencv4/opencv2/gapi/gtransform.hpp
-include/opencv4/opencv2/gapi/gtype_traits.hpp
-include/opencv4/opencv2/gapi/gtyped.hpp
-include/opencv4/opencv2/gapi/imgproc.hpp
-include/opencv4/opencv2/gapi/infer/
-include/opencv4/opencv2/gapi/infer.hpp
-include/opencv4/opencv2/gapi/infer/ie.hpp
-include/opencv4/opencv2/gapi/ocl/
-include/opencv4/opencv2/gapi/ocl/core.hpp
-include/opencv4/opencv2/gapi/ocl/goclkernel.hpp
-include/opencv4/opencv2/gapi/ocl/imgproc.hpp
-include/opencv4/opencv2/gapi/opencv_includes.hpp
-include/opencv4/opencv2/gapi/operators.hpp
-include/opencv4/opencv2/gapi/own/
-include/opencv4/opencv2/gapi/own/assert.hpp
-include/opencv4/opencv2/gapi/own/convert.hpp
-include/opencv4/opencv2/gapi/own/cvdefs.hpp
-include/opencv4/opencv2/gapi/own/exports.hpp
-include/opencv4/opencv2/gapi/own/mat.hpp
-include/opencv4/opencv2/gapi/own/saturate.hpp
-include/opencv4/opencv2/gapi/own/scalar.hpp
-include/opencv4/ope

Re: CVS: cvs.openbsd.org: ports

2020-01-19 Thread Thomas Frohwein
On Sun, Jan 19, 2020 at 02:04:40PM +, Stuart Henderson wrote:
[...]
> ocamlfind ocamlopt -safe-string -a -o extc.cmxa -package extlib extc.ml 
> process.ml
> File "extc.ml", line 1:
> Error: Corrupted compilation unit description
>/pobj/haxe-4.0.5/haxe-4.0.5/ocamldeps/extlib/IO.cmx
[...]

It looks like this is because the bundled OCaml deps in
ocamldeps/extlib contain binary-compiled parts in the .cmx files [1].
My bad, I thought this was only interpreted code.

I'm going to look into a better solution; possibly adding ports for
the dependencies rather than bundling.

I propose either setting the port to ONLY_FOR_ARCHS=amd64 as in the
diff below, or BROKEN until I've found a better way to address this.

[1] gleaned from https://caml.inria.fr/pub/docs/manual-ocaml/native.html

Index: Makefile
===
RCS file: /cvs/ports/lang/haxe/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile18 Jan 2020 00:31:05 -  1.1.1.1
+++ Makefile19 Jan 2020 15:11:30 -
@@ -1,5 +1,6 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2020/01/18 00:31:05 thfr Exp $
 
+ONLY_FOR_ARCHS =   amd64   # uses binary-compiled bundled OCaml deps
 COMMENT =  toolkit for the Haxe programming language
 
 V =4.0.5



Re: CVS: cvs.openbsd.org: ports

2020-01-19 Thread Stuart Henderson
Note these:

> -- WARNING: Option ENABLE_SSE3='OFF' is deprecated and should not be used 
> anymore
> --  Behaviour of this option is not backward compatible
> --  Refer to 'CPU_BASELINE'/'CPU_DISPATCH' CMake options documentation

> -- ADE: Download: v0.1.1f.zip
> -- Try 1 failed
> -- 
> ===
>   Couldn't download files from the Internet.
>   Please check the Internet access on this host.
> ===
> 
> CMake Warning at cmake/OpenCVDownload.cmake:202 (message):
>   ADE: Download failed: 6;"Couldn't resolve host name"
> 
>   For details please refer to the download log file:
> 
>   /pobj/opencv-4.2.0/build-i386/CMakeDownloadLog.txt
> 
> Call Stack (most recent call first):
>   modules/gapi/cmake/DownloadADE.cmake:10 (ocv_download)
>   modules/gapi/cmake/init.cmake:19 (include)
>   cmake/OpenCVModule.cmake:312 (include)
>   cmake/OpenCVModule.cmake:375 (_add_modules_1)
>   modules/CMakeLists.txt:7 (ocv_glob_modules)



Re: CVS: cvs.openbsd.org: ports

2020-01-19 Thread Stuart Henderson
On 2020/01/17 17:31, Thomas Frohwein wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2020/01/17 17:31:05
> 
> Log message:
> import lang/haxe
> ok abieber@
> 
> DESCR:
> Haxe consists of a high-level, open source programming language and a 
> compiler.
> It allows compilation of programs, written using an ECMAScript-oriented 
> syntax,
> to multiple target languages. Employing proper abstraction, it is 
> possible to
> maintain a single code-base which compiles to multiple targets.
> 
> Haxe is strongly typed but the typing system can be subverted where 
> required.
> Utilizing type information, the Haxe type system can detect errors at
> compile-time which would only be noticeable at run-time in the target 
> language.
> Furthermore, type information can be used by the compiler to generate 
> optimized
> and robust code.
> 
> Status:
> 
> Vendor Tag:   thfr
> Release Tags: thfr_20200117
> 
> N ports/lang/haxe/Makefile
> N ports/lang/haxe/distinfo
> N ports/lang/haxe/patches/patch-libs_extc_process_stubs_c
> N ports/lang/haxe/patches/patch-src_compiler_main_ml
> N ports/lang/haxe/patches/patch-libs_extlib-leftovers_uTF8_ml
> N ports/lang/haxe/pkg/DESCR
> N ports/lang/haxe/pkg/PLIST
> 
> No conflicts created by this import
> 


Fails on i386:

>>> Building on i386-2 under lang/haxe
 BDEPENDS = 
[devel/gmake;sysutils/findlib;archivers/xz;lang/nekovm;devel/pcre;lang/ocaml;devel/boehm-gc;devel/ocaml-ocamlbuild;lang/ocaml-camlp5]
 DIST = [lang/haxe:haxe-4.0.5.tar.xz]
 FULLPKGNAME = haxe-4.0.5
 RDEPENDS = [lang/ocaml;devel/pcre;lang/nekovm;devel/boehm-gc]
(Junk lock failure for i386-2 at 1579427965.67921)
Received IO
(Junk lock obtained for i386-2 at 1579427966.74)
Received IO
Woken up lang/haxe
>>> Running depends in lang/haxe at 1579427967.32
   last junk was in www/youtube-dl
/usr/sbin/pkg_add -aI -Drepair boehm-gc-7.6.0p4 findlib-1.8.1p1 gmake-4.2.1p4 
nekovm-2.3.0p0 ocaml-4.09.0 ocaml-camlp5-7.08p1 ocamlbuild-0.14.0p1 pcre-8.41p2
was: /usr/sbin/pkg_add -aI -Drepair boehm-gc-7.6.0p4 findlib-1.8.1p1 
gmake-4.2.1p4 nekovm-2.3.0p0 ocaml-4.09.0 ocaml-camlp5-7.08p1 
ocamlbuild-0.14.0p1 pcre-8.41p2 xz-5.2.4
/usr/sbin/pkg_add -aI -Drepair boehm-gc-7.6.0p4 findlib-1.8.1p1 gmake-4.2.1p4 
nekovm-2.3.0p0 ocaml-4.09.0 ocaml-camlp5-7.08p1 ocamlbuild-0.14.0p1 pcre-8.41p2
>>> Running show-prepare-results in lang/haxe at 1579427979.25
===> lang/haxe
===> haxe-4.0.5 depends on: ocamlbuild-* -> ocamlbuild-0.14.0p1
===> haxe-4.0.5 depends on: nekovm-* -> nekovm-2.3.0p0
===> haxe-4.0.5 depends on: ocaml-camlp5-* -> ocaml-camlp5-7.08p1
===> haxe-4.0.5 depends on: findlib-* -> findlib-1.8.1p1
===> haxe-4.0.5 depends on: ocaml-=4.09.0 -> ocaml-4.09.0
===> haxe-4.0.5 depends on: gmake-* -> gmake-4.2.1p4
===> haxe-4.0.5 depends on: xz-* -> xz-5.2.4
===> haxe-4.0.5 depends on: boehm-gc-* -> boehm-gc-7.6.0p4
===> haxe-4.0.5 depends on: pcre-* -> pcre-8.41p2
===>  Verifying specs:  c gc m neko pcre pthread z
===>  found c.96.0 gc.4.0 m.10.1 neko.0.0 pcre.3.0 pthread.26.1 z.5.0
boehm-gc-7.6.0p4
findlib-1.8.1p1
gmake-4.2.1p4
nekovm-2.3.0p0
ocaml-4.09.0
ocaml-camlp5-7.08p1
ocamlbuild-0.14.0p1
pcre-8.41p2
xz-5.2.4
Don't run junk because nojunk in games/openclonk
(Junk lock released for i386-2 at 1579427980.25)
distfiles size=38784960
>>> Running patch in lang/haxe at 1579427980.29
===> lang/haxe
===>  Checking files for haxe-4.0.5
`/mnt/distfiles/haxe-4.0.5.tar.xz' is up to date.
>> (SHA256) haxe-4.0.5.tar.xz: OK
===>  Extracting for haxe-4.0.5
===>  Patching for haxe-4.0.5
===>   Applying OpenBSD patch patch-libs_extc_process_stubs_c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-libs_extc_process_stubs_c,v 1.1.1.1 2020/01/18 00:31:05 thfr 
Exp $
|
|Index: libs/extc/process_stubs.c
|--- libs/extc/process_stubs.c.orig
|+++ libs/extc/process_stubs.c
--
Patching file libs/extc/process_stubs.c using Plan A...
Hunk #1 succeeded at 37.
done
===>   Applying OpenBSD patch patch-libs_extlib-leftovers_uTF8_ml
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-libs_extlib-leftovers_uTF8_ml,v 1.1.1.1 2020/01/18 00:31:05 
thfr Exp $
|
|Index: libs/extlib-leftovers/uTF8.ml
|--- libs/extlib-leftovers/uTF8.ml.orig
|+++ libs/extlib-leftovers/uTF8.ml
--
Patching file libs/extlib-leftovers/uTF8.ml using Plan A...
Hunk #1 succeeded at 177.
done
===>   Applying OpenBSD patch patch-src_compiler_main_ml
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-src_compiler_main_ml,v 1.1.1.1 2020/01/18 00:31:05 thfr Exp $
|
|path to hashlink version
|
|Index: src/compiler/main.ml
|--- src/compiler/main.ml.orig
|+++ src/c

Re: CVS: cvs.openbsd.org: ports

2020-01-18 Thread Edd Barrett
On Sat, Jan 18, 2020 at 04:51:13AM -0700, Edd Barrett wrote:
> Update sysutils/fzf to version 0.20.0 and install shell support files.

I should also mention that abieber@ asked to be removed from MAINTAINER.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: CVS: cvs.openbsd.org: ports

2020-01-10 Thread Brian Callahan




On 2020-01-10 10:03, Brian Callahan wrote:

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/01/10 08:03:23

Modified files:
math/bcal  : Makefile distinfo
math/bcal/patches: patch-Makefile patch-bcal_1
Removed files:
math/bcal/patches: patch-src_bcal_c

Log message:
Update to bcal-2.2
Changelog: https://github.com/jarun/bcal/releases/tag/v2.2



Also added debug packages



Re: CVS: cvs.openbsd.org: ports

2020-01-02 Thread Bjorn Ketelaars
On Thu 02/01/2020 12:33, Antoine Jacoutot wrote:
> On Sun, Dec 29, 2019 at 12:28:22AM -0700, Bjorn Ketelaars wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: b...@cvs.openbsd.org2019/12/29 00:28:22
> > 
> > Modified files:
> > net/ocserv : Makefile distinfo 
> > net/ocserv/patches: patch-configure_ac patch-doc_sample_config 
> > 
> > Log message:
> > Update to ocserv-0.12.6
> > 
> > Changelog: https://ocserv.gitlab.io/www/changelog.html
> 
> Does not build for me.

My bad, maxminddb is used when available [0], and libmaxminddb got
picked up in your build.

Fix has been committed.

[0] 
https://github.com/openconnect/ocserv/commit/960032e065e20789669bf6c79599a2b74b837a73



Re: CVS: cvs.openbsd.org: ports

2020-01-02 Thread Stuart Henderson
Either libmaxminddb support needs to be disabled, or list it as a 
dependency *and* set COMPILER=base-clang ports-gcc  / COMPILER_LANGS=C


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

On 2 January 2020 11:34:06 Antoine Jacoutot  wrote:


On Sun, Dec 29, 2019 at 12:28:22AM -0700, Bjorn Ketelaars wrote:

CVSROOT: /cvs
Module name: ports
Changes by: b...@cvs.openbsd.org 2019/12/29 00:28:22

Modified files:
net/ocserv : Makefile distinfo
net/ocserv/patches: patch-configure_ac patch-doc_sample_config

Log message:
Update to ocserv-0.12.6

Changelog: https://ocserv.gitlab.io/www/changelog.html


Does not build for me.



Building on exopi-3 under net/ocserv
 BDEPENDS = 
 [textproc/ruby-ronn;lang/ruby/2.6;archivers/xz;security/oath-toolkit;net/radcli;devel/protobuf-c;textproc/groff;devel/metaauto;devel/autoconf/2.69;textproc/gsed;security/gnutls;devel/libtalloc;archivers/lz4;security/openpam;devel/libev]

 DIST = [net/ocserv:ocserv-0.12.6.tar.xz]
 FULLPKGNAME = ocserv-0.12.6
 RDEPENDS = 
 [devel/libtalloc;archivers/lz4;security/gnutls;net/radcli;devel/libev;security/openpam;security/oath-toolkit;lang/ruby/2.6;devel/protobuf-c]

(Junk lock failure for exopi-3 at 1577916492.47238)
Received IO
(Junk lock obtained for exopi-3 at 1577916497.42)
Received IO
Woken up net/ocserv
Woken up net/ocserv
Woken up net/ocserv

Running depends in net/ocserv at 1577916499.68

  last junk was in x11/gnome/gedit-plugins
/usr/sbin/pkg_add -aI -Drepair autoconf-2.69p2 gnutls-3.6.11.1 
groff-1.22.4p3 gsed-4.2.2p3 libev-4.27 libtalloc-2.1.16 lz4-1.9.2 
metaauto-1.0p3 oath-toolkit-2.6.2p1 openpam-20141014 protobuf-c-1.3.2 
radcli-1.2.11 ruby-2.6.5p1 ruby26-ronn-0.7.3p4
was: /usr/sbin/pkg_add -aI -Drepair autoconf-2.69p2 gnutls-3.6.11.1 
groff-1.22.4p3 gsed-4.2.2p3 libev-4.27 libtalloc-2.1.16 lz4-1.9.2 
metaauto-1.0p3 oath-toolkit-2.6.2p1 openpam-20141014 protobuf-c-1.3.2 
radcli-1.2.11 ruby-2.6.5p1 ruby26-ronn-0.7.3p4 xz-5.2.4
/usr/sbin/pkg_add -aI -Drepair autoconf-2.69p2 gnutls-3.6.11.1 
groff-1.22.4p3 gsed-4.2.2p3 libev-4.27 libtalloc-2.1.16 lz4-1.9.2 
metaauto-1.0p3 oath-toolkit-2.6.2p1 openpam-20141014 protobuf-c-1.3.2 
radcli-1.2.11 ruby-2.6.5p1 ruby26-ronn-0.7.3p4

--- +ruby-2.6.5p1 ---
If you want to use this package as your default system ruby, as root
create symbolic links like so (overwriting any previous default):
ln -sf /usr/local/bin/ruby26 /usr/local/bin/ruby
ln -sf /usr/local/bin/erb26 /usr/local/bin/erb
ln -sf /usr/local/bin/irb26 /usr/local/bin/irb
ln -sf /usr/local/bin/rdoc26 /usr/local/bin/rdoc
ln -sf /usr/local/bin/ri26 /usr/local/bin/ri
ln -sf /usr/local/bin/rake26 /usr/local/bin/rake
ln -sf /usr/local/bin/gem26 /usr/local/bin/gem
ln -sf /usr/local/bin/bundle26 /usr/local/bin/bundle
ln -sf /usr/local/bin/bundler26 /usr/local/bin/bundler

Running show-prepare-results in net/ocserv at 1577916517.60

===> net/ocserv
===> ocserv-0.12.6 depends on: groff-* -> groff-1.22.4p3
===> ocserv-0.12.6 depends on: gsed-* -> gsed-4.2.2p3
===> ocserv-0.12.6 depends on: ruby26-ronn-* -> ruby26-ronn-0.7.3p4
===> ocserv-0.12.6 depends on: ruby->=2.6,<2.7 -> ruby-2.6.5p1
===> ocserv-0.12.6 depends on: metaauto-* -> metaauto-1.0p3
===> ocserv-0.12.6 depends on: autoconf-2.69 -> autoconf-2.69p2
===> ocserv-0.12.6 depends on: xz-* -> xz-5.2.4
===> ocserv-0.12.6 depends on: lz4-* -> lz4-1.9.2
===> ocserv-0.12.6 depends on: libev-* -> libev-4.27
===> ocserv-0.12.6 depends on: libtalloc-* -> libtalloc-2.1.16
===> ocserv-0.12.6 depends on: protobuf-c-* -> protobuf-c-1.3.2
===> ocserv-0.12.6 depends on: radcli->=1.2.5 -> radcli-1.2.11
===> ocserv-0.12.6 depends on: gnutls-* -> gnutls-3.6.11.1
===> ocserv-0.12.6 depends on: oath-toolkit-* -> oath-toolkit-2.6.2p1
===> ocserv-0.12.6 depends on: openpam-* -> openpam-20141014
===>  Verifying specs:  c curses ev gnutls lz4 m nettle oath pam protobuf-c 
radcli readline talloc
===>  found c.96.0 curses.14.0 ev.3.1 gnutls.46.3 lz4.3.0 m.10.1 nettle.5.0 
oath.0.2 pam.5.0 protobuf-c.2.0 radcli.0.3 readline.4.0 talloc.1.1

autoconf-2.69p2
gnutls-3.6.11.1
groff-1.22.4p3
gsed-4.2.2p3
libev-4.27
libtalloc-2.1.16
lz4-1.9.2
metaauto-1.0p3
oath-toolkit-2.6.2p1
openpam-20141014
protobuf-c-1.3.2
radcli-1.2.11
ruby-2.6.5p1
ruby26-ronn-0.7.3p4
xz-5.2.4
Don't run junk because nojunk in www/hs-html
(Junk lock released for exopi-3 at 1577916521.27)
Woken up geo/pgrouting
distfiles size=766648

Running patch in net/ocserv at 1577916521.37

===> net/ocserv
===>  Checking files for ocserv-0.12.6
`/exopi-cvs/ports/distfiles/ocserv-0.12.6.tar.xz' is up to date.

(SHA256) ocserv-0.12.6.tar.xz: OK

===>  Extracting for ocserv-0.12.6
find /exopi-obj/pobj/ocserv-0.12.6/ocserv-0.12.6/tests -type f -perm -+x 
-exec  sed -i 's,#!/bin/bash,#!/usr/local/bin/bash,' {} +
sed -i 's,/usr/sbin/openconnect,/usr/local/sbin/openconnect,'  
/exopi-obj/pobj/ocserv-0.12.6/ocserv-0.12.6/tests/common.sh
sed -i 's,/etc/ocserv,/etc/ocserv,'  
/exopi-obj/pobj/ocserv-0.12.6/ocserv-0.12.6/doc/ocserv.8.md  
/exopi-obj/pob

Re: CVS: cvs.openbsd.org: ports

2020-01-02 Thread Antoine Jacoutot
On Sun, Dec 29, 2019 at 12:28:22AM -0700, Bjorn Ketelaars wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   b...@cvs.openbsd.org2019/12/29 00:28:22
> 
> Modified files:
>   net/ocserv : Makefile distinfo 
>   net/ocserv/patches: patch-configure_ac patch-doc_sample_config 
> 
> Log message:
> Update to ocserv-0.12.6
> 
> Changelog: https://ocserv.gitlab.io/www/changelog.html

Does not build for me.


>>> Building on exopi-3 under net/ocserv
 BDEPENDS = 
[textproc/ruby-ronn;lang/ruby/2.6;archivers/xz;security/oath-toolkit;net/radcli;devel/protobuf-c;textproc/groff;devel/metaauto;devel/autoconf/2.69;textproc/gsed;security/gnutls;devel/libtalloc;archivers/lz4;security/openpam;devel/libev]
 DIST = [net/ocserv:ocserv-0.12.6.tar.xz]
 FULLPKGNAME = ocserv-0.12.6
 RDEPENDS = 
[devel/libtalloc;archivers/lz4;security/gnutls;net/radcli;devel/libev;security/openpam;security/oath-toolkit;lang/ruby/2.6;devel/protobuf-c]
(Junk lock failure for exopi-3 at 1577916492.47238)
Received IO
(Junk lock obtained for exopi-3 at 1577916497.42)
Received IO
Woken up net/ocserv
Woken up net/ocserv
Woken up net/ocserv
>>> Running depends in net/ocserv at 1577916499.68
   last junk was in x11/gnome/gedit-plugins
/usr/sbin/pkg_add -aI -Drepair autoconf-2.69p2 gnutls-3.6.11.1 groff-1.22.4p3 
gsed-4.2.2p3 libev-4.27 libtalloc-2.1.16 lz4-1.9.2 metaauto-1.0p3 
oath-toolkit-2.6.2p1 openpam-20141014 protobuf-c-1.3.2 radcli-1.2.11 
ruby-2.6.5p1 ruby26-ronn-0.7.3p4
was: /usr/sbin/pkg_add -aI -Drepair autoconf-2.69p2 gnutls-3.6.11.1 
groff-1.22.4p3 gsed-4.2.2p3 libev-4.27 libtalloc-2.1.16 lz4-1.9.2 
metaauto-1.0p3 oath-toolkit-2.6.2p1 openpam-20141014 protobuf-c-1.3.2 
radcli-1.2.11 ruby-2.6.5p1 ruby26-ronn-0.7.3p4 xz-5.2.4
/usr/sbin/pkg_add -aI -Drepair autoconf-2.69p2 gnutls-3.6.11.1 groff-1.22.4p3 
gsed-4.2.2p3 libev-4.27 libtalloc-2.1.16 lz4-1.9.2 metaauto-1.0p3 
oath-toolkit-2.6.2p1 openpam-20141014 protobuf-c-1.3.2 radcli-1.2.11 
ruby-2.6.5p1 ruby26-ronn-0.7.3p4
--- +ruby-2.6.5p1 ---
If you want to use this package as your default system ruby, as root
create symbolic links like so (overwriting any previous default):
 ln -sf /usr/local/bin/ruby26 /usr/local/bin/ruby
 ln -sf /usr/local/bin/erb26 /usr/local/bin/erb
 ln -sf /usr/local/bin/irb26 /usr/local/bin/irb
 ln -sf /usr/local/bin/rdoc26 /usr/local/bin/rdoc
 ln -sf /usr/local/bin/ri26 /usr/local/bin/ri
 ln -sf /usr/local/bin/rake26 /usr/local/bin/rake
 ln -sf /usr/local/bin/gem26 /usr/local/bin/gem
 ln -sf /usr/local/bin/bundle26 /usr/local/bin/bundle
 ln -sf /usr/local/bin/bundler26 /usr/local/bin/bundler
>>> Running show-prepare-results in net/ocserv at 1577916517.60
===> net/ocserv
===> ocserv-0.12.6 depends on: groff-* -> groff-1.22.4p3
===> ocserv-0.12.6 depends on: gsed-* -> gsed-4.2.2p3
===> ocserv-0.12.6 depends on: ruby26-ronn-* -> ruby26-ronn-0.7.3p4
===> ocserv-0.12.6 depends on: ruby->=2.6,<2.7 -> ruby-2.6.5p1
===> ocserv-0.12.6 depends on: metaauto-* -> metaauto-1.0p3
===> ocserv-0.12.6 depends on: autoconf-2.69 -> autoconf-2.69p2
===> ocserv-0.12.6 depends on: xz-* -> xz-5.2.4
===> ocserv-0.12.6 depends on: lz4-* -> lz4-1.9.2
===> ocserv-0.12.6 depends on: libev-* -> libev-4.27
===> ocserv-0.12.6 depends on: libtalloc-* -> libtalloc-2.1.16
===> ocserv-0.12.6 depends on: protobuf-c-* -> protobuf-c-1.3.2
===> ocserv-0.12.6 depends on: radcli->=1.2.5 -> radcli-1.2.11
===> ocserv-0.12.6 depends on: gnutls-* -> gnutls-3.6.11.1
===> ocserv-0.12.6 depends on: oath-toolkit-* -> oath-toolkit-2.6.2p1
===> ocserv-0.12.6 depends on: openpam-* -> openpam-20141014
===>  Verifying specs:  c curses ev gnutls lz4 m nettle oath pam protobuf-c 
radcli readline talloc
===>  found c.96.0 curses.14.0 ev.3.1 gnutls.46.3 lz4.3.0 m.10.1 nettle.5.0 
oath.0.2 pam.5.0 protobuf-c.2.0 radcli.0.3 readline.4.0 talloc.1.1
autoconf-2.69p2
gnutls-3.6.11.1
groff-1.22.4p3
gsed-4.2.2p3
libev-4.27
libtalloc-2.1.16
lz4-1.9.2
metaauto-1.0p3
oath-toolkit-2.6.2p1
openpam-20141014
protobuf-c-1.3.2
radcli-1.2.11
ruby-2.6.5p1
ruby26-ronn-0.7.3p4
xz-5.2.4
Don't run junk because nojunk in www/hs-html
(Junk lock released for exopi-3 at 1577916521.27)
Woken up geo/pgrouting
distfiles size=766648
>>> Running patch in net/ocserv at 1577916521.37
===> net/ocserv
===>  Checking files for ocserv-0.12.6
`/exopi-cvs/ports/distfiles/ocserv-0.12.6.tar.xz' is up to date.
>> (SHA256) ocserv-0.12.6.tar.xz: OK
===>  Extracting for ocserv-0.12.6
find /exopi-obj/pobj/ocserv-0.12.6/ocserv-0.12.6/tests -type f -perm -+x -exec  
sed -i 's,#!/bin/bash,#!/usr/local/bin/bash,' {} +
sed -i 's,/usr/sbin/openconnect,/usr/local/sbin/openconnect,'  
/exopi-obj/pobj/ocserv-0.12.6/ocserv-0.12.6/tests/common.sh
sed -i 's,/etc/ocserv,/etc/ocserv,'  
/exopi-obj/pobj/ocserv-0.12.6/ocserv-0.12.6/doc/ocserv.8.md  
/exopi-obj/pobj/ocserv-0.12.6/ocserv-0.12.6/doc/sample.config  
/exopi-obj/pobj/ocserv-0.12.6/ocserv-0.12.6/src/ocpasswd/ocpasswd.c
sed -i 's,/usr/bin/ocserv-fw,/etc/ocs

Re: CVS: cvs.openbsd.org: ports

2019-12-28 Thread Stuart Henderson
On 2019/12/28 10:20, Otto Moerbeek wrote:
> On Fri, Dec 27, 2019 at 10:20:35AM -0700, Stuart Henderson wrote:
> 
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: st...@cvs.openbsd.org   2019/12/27 10:20:35
> > 
> > Modified files:
> > x11/gnome/bijiben: Makefile 
> > x11/gnome/mutter: Makefile 
> > x11/gnome/recipes: Makefile 
> > x11/gnome/shell: Makefile 
> > x11/gnome/tracker: Makefile 
> > 
> > Log message:
> > Some GNOME ports had pre-build stages to cope with random build ordering
> > done by devel/ninja. Remove them as they are no longer necessary now
> > that kurt@ has modified ninja to use a deque rather than using a build
> > order dependent on pointer addresses (which due to our malloc were
> > randomised).  ok ajacoutot@
> > 
> 
> I like to stress that the ninja "fix" is hiding dependency problems.
> Randomization of heap addresses should not have an impact. I do
> understand this is needed atm to get workable bulk builds, but this
> commit message sends the message" randomizatioon is bad because it
> breaks things". 
> 
> In my view, randomizaion is good *because* it breaks (already broken)
> things.
> 
>   -Otto
> 

Realistically these will never get fixed unless upstream ninja has a
"build in random order" mode that is frequently used (this was proposed
in https://github.com/ninja-build/ninja/issues/232#issue-3475124)
because users on other OS just don't see any problems.

The above ports were persistent cases but I have been seeing random
failures due to this in nearly every bulk build (the machines are
continually building, so this is 3 or 4 times a week).

The lines removed in the above commit include links to PRs in GNOME
that have been open for ages with no activity. I think robert@ has
had similar success (i.e. none) in getting these fixed in chromium
too. Unless upstream developers have a way to see the problems for
themselves on other OS they are understandably treated as quite
low priority (often you can just restart the build and everything
works).

There is another issue with the randomisation - for "real" build
failures that start to appear after some successful builds (often due
to either changes in base that broke ports, or builds which vary
depending on what other software was installed) one of the most
useful tools for figuring out the problem is diffing build logs
from a successful build. That's no use with random build ordering.



Re: CVS: cvs.openbsd.org: ports

2019-12-28 Thread Otto Moerbeek
On Fri, Dec 27, 2019 at 10:20:35AM -0700, Stuart Henderson wrote:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2019/12/27 10:20:35
> 
> Modified files:
>   x11/gnome/bijiben: Makefile 
>   x11/gnome/mutter: Makefile 
>   x11/gnome/recipes: Makefile 
>   x11/gnome/shell: Makefile 
>   x11/gnome/tracker: Makefile 
> 
> Log message:
> Some GNOME ports had pre-build stages to cope with random build ordering
> done by devel/ninja. Remove them as they are no longer necessary now
> that kurt@ has modified ninja to use a deque rather than using a build
> order dependent on pointer addresses (which due to our malloc were
> randomised).  ok ajacoutot@
> 

I like to stress that the ninja "fix" is hiding dependency problems.
Randomization of heap addresses should not have an impact. I do
understand this is needed atm to get workable bulk builds, but this
commit message sends the message" randomizatioon is bad because it
breaks things". 

In my view, randomizaion is good *because* it breaks (already broken)
things.

-Otto



Re: CVS: cvs.openbsd.org: ports

2019-12-27 Thread Jan Beich
Antoine Jacoutot  writes:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ajacou...@cvs.openbsd.org   2019/12/25 08:48:26
>
> Modified files:
>   multimedia/mpv : Makefile 
>   x11/vlc: Makefile 
> Added files:
>   x11/vlc/patches: 
>patch-modules_video_output_opengl_fragment_shaders_c 
>patch-modules_video_output_opengl_vout_helper_c 
>patch-modules_video_output_opengl_vout_helper_h 
>
> Log message:
> Enable libplacebo support.
>
> from Brad

mpv doesn't use libplacebo outside of --gpu-api=vulkan but OpenBSD Ports
for both mpv and libplacebo disable Vulkan.

vlc is different. Vulkan output is slated for 4.0 while 3.0 uses
libplacebo for HDR tone mapping on OpenGL output.



Re: CVS: cvs.openbsd.org: ports

2019-12-26 Thread Giovanni Bechis
On Thu, Dec 26, 2019 at 10:13:30AM +, Stuart Henderson wrote:
> On 2019/12/26 01:44, Giovanni Bechis wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: giova...@cvs.openbsd.org2019/12/26 01:44:33
> > 
> > Modified files:
> > mail/opensmtpd-extras: Makefile 
> > 
> > Log message:
> > autohell needs libtoolize(1)
> > spotted by ajacoutot@
> > 
> 
> That should be a BUILD_DEPENDS not USE_LIBTOOL, but it's simplest
> to use CONFIGURE_STYLE=autoreconf which adds it automatically.
> Diff bumps AUTOMAKE_VERSION as well, I don't think the old one
> is needed.
> 
reads well.
ok giovanni@
 Cheers
  Giovanni

> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/opensmtpd-extras/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile  26 Dec 2019 08:44:33 -  1.31
> +++ Makefile  26 Dec 2019 10:10:11 -
> @@ -13,7 +13,7 @@ PKGNAME-mysql=  opensmtpd-extras-mysql-$
>  PKGNAME-pgsql=   opensmtpd-extras-pgsql-${V}
>  PKGNAME-python=  opensmtpd-extras-python-${V}
>  PKGNAME-redis=   opensmtpd-extras-redis-${V}
> -REVISION=1
> +REVISION=2
>  EPOCH=   0
>  
>  CATEGORIES=  mail
> @@ -51,10 +51,9 @@ BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPEND
>  ${MODGNU_AUTOMAKE_DEPENDS}
>  
>  AUTOCONF_VERSION=2.69
> -AUTOMAKE_VERSION=1.13
> -# bootstrap needs libtoolize
> -USE_LIBTOOL= gnu
> -CONFIGURE_STYLE= autoconf automake
> +AUTOMAKE_VERSION=1.16
> +CONFIGURE_STYLE= autoreconf
> +AUTORECONF=  sh bootstrap
>  CONFIGURE_ARGS=  --mandir=${PREFIX}/man \
>   --libexecdir=${PREFIX}/libexec \
>   --sysconfdir=${SYSCONFDIR}/mail \
> @@ -77,9 +76,5 @@ CONFIGURE_ARGS= --mandir=${PREFIX}/man 
>   --with-table-socketmap \
>   --with-table-sqlite \
>   --with-table-stub
> -
> -post-patch:
> - cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh bootstrap
>  
>  .include 
> 
> 


signature.asc
Description: PGP signature


Re: CVS: cvs.openbsd.org: ports

2019-12-26 Thread Jeremie Courreges-Anglas
On Thu, Dec 26 2019, Stuart Henderson  wrote:
> On 2019/12/26 01:44, Giovanni Bechis wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by:  giova...@cvs.openbsd.org2019/12/26 01:44:33
>> 
>> Modified files:
>>  mail/opensmtpd-extras: Makefile 
>> 
>> Log message:
>> autohell needs libtoolize(1)
>> spotted by ajacoutot@
>> 
>
> That should be a BUILD_DEPENDS not USE_LIBTOOL, but it's simplest
> to use CONFIGURE_STYLE=autoreconf which adds it automatically.
> Diff bumps AUTOMAKE_VERSION as well, I don't think the old one
> is needed.

LGTM, ok jca@

> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/opensmtpd-extras/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile  26 Dec 2019 08:44:33 -  1.31
> +++ Makefile  26 Dec 2019 10:10:11 -
> @@ -13,7 +13,7 @@ PKGNAME-mysql=  opensmtpd-extras-mysql-$
>  PKGNAME-pgsql=   opensmtpd-extras-pgsql-${V}
>  PKGNAME-python=  opensmtpd-extras-python-${V}
>  PKGNAME-redis=   opensmtpd-extras-redis-${V}
> -REVISION=1
> +REVISION=2
>  EPOCH=   0
>  
>  CATEGORIES=  mail
> @@ -51,10 +51,9 @@ BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPEND
>  ${MODGNU_AUTOMAKE_DEPENDS}
>  
>  AUTOCONF_VERSION=2.69
> -AUTOMAKE_VERSION=1.13
> -# bootstrap needs libtoolize
> -USE_LIBTOOL= gnu
> -CONFIGURE_STYLE= autoconf automake
> +AUTOMAKE_VERSION=1.16
> +CONFIGURE_STYLE= autoreconf
> +AUTORECONF=  sh bootstrap
>  CONFIGURE_ARGS=  --mandir=${PREFIX}/man \
>   --libexecdir=${PREFIX}/libexec \
>   --sysconfdir=${SYSCONFDIR}/mail \
> @@ -77,9 +76,5 @@ CONFIGURE_ARGS= --mandir=${PREFIX}/man 
>   --with-table-socketmap \
>   --with-table-sqlite \
>   --with-table-stub
> -
> -post-patch:
> - cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh bootstrap
>  
>  .include 
>
>

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



Re: CVS: cvs.openbsd.org: ports

2019-12-26 Thread Stuart Henderson
On 2019/12/26 01:44, Giovanni Bechis wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   giova...@cvs.openbsd.org2019/12/26 01:44:33
> 
> Modified files:
>   mail/opensmtpd-extras: Makefile 
> 
> Log message:
> autohell needs libtoolize(1)
> spotted by ajacoutot@
> 

That should be a BUILD_DEPENDS not USE_LIBTOOL, but it's simplest
to use CONFIGURE_STYLE=autoreconf which adds it automatically.
Diff bumps AUTOMAKE_VERSION as well, I don't think the old one
is needed.

Index: Makefile
===
RCS file: /cvs/ports/mail/opensmtpd-extras/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile26 Dec 2019 08:44:33 -  1.31
+++ Makefile26 Dec 2019 10:10:11 -
@@ -13,7 +13,7 @@ PKGNAME-mysql=opensmtpd-extras-mysql-$
 PKGNAME-pgsql= opensmtpd-extras-pgsql-${V}
 PKGNAME-python=opensmtpd-extras-python-${V}
 PKGNAME-redis= opensmtpd-extras-redis-${V}
-REVISION=  1
+REVISION=  2
 EPOCH= 0
 
 CATEGORIES=mail
@@ -51,10 +51,9 @@ BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPEND
 ${MODGNU_AUTOMAKE_DEPENDS}
 
 AUTOCONF_VERSION=  2.69
-AUTOMAKE_VERSION=  1.13
-# bootstrap needs libtoolize
-USE_LIBTOOL=   gnu
-CONFIGURE_STYLE=   autoconf automake
+AUTOMAKE_VERSION=  1.16
+CONFIGURE_STYLE=   autoreconf
+AUTORECONF=sh bootstrap
 CONFIGURE_ARGS=--mandir=${PREFIX}/man \
--libexecdir=${PREFIX}/libexec \
--sysconfdir=${SYSCONFDIR}/mail \
@@ -77,9 +76,5 @@ CONFIGURE_ARGS=   --mandir=${PREFIX}/man 
--with-table-socketmap \
--with-table-sqlite \
--with-table-stub
-
-post-patch:
-   cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh bootstrap
 
 .include 




Re: CVS: cvs.openbsd.org: ports

2019-12-26 Thread Jeremie Courreges-Anglas
On Thu, Dec 26 2019, Giovanni Bechis  wrote:
> On Thu, Dec 26, 2019 at 09:14:12AM +0100, Antoine Jacoutot wrote:
>> On Mon, Dec 23, 2019 at 12:50:32AM -0700, Giovanni Bechis wrote:
>> > CVSROOT:   /cvs
>> > Module name:   ports
>> > Changes by:giova...@cvs.openbsd.org2019/12/23 00:50:32
>> > 
>> > Modified files:
>> >mail/opensmtpd-extras: Makefile 
>> > 
>> > Log message:
>> > add missing build dependency
>> > spotted by kili@, ok jung@
>> 
>> It fails to build for me:
>> 
>> ===>  Patching for opensmtpd-extras-6.6.0
>> cd /exopi-obj/pobj/opensmtpd-extras-6.6.0/OpenSMTPD-extras-6.6.0 && env 
>> AUTOCONF_VERSION=2.69  AUTOMAKE_VERSION=1.13 sh bootstrap
>> bootstrap: you need libtool
>> *** Error 1 in mail/opensmtpd-extras (Makefile:81 'post-patch')
>> *** Error 1 in mail/opensmtpd-extras 
>> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2769 
>> '/exopi-obj/pobj/opensmtpd-extras-6.6.0/.patch_done')
>> *** Error 1 in mail/opensmtpd-extras 
>> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2556 'patch')
>> ===> Exiting mail/opensmtpd-extras,-main with an error
>> *** Error 1 in /exopi-cvs/ports (infrastructure/mk/bsd.port.subdir.mk:137 
>> 'patch')
>> 
> quick fix committed,
> I think upstream should get rid of libtoolize or provide a pregenerated 
> Makefile, jung@ ?

This uses automake so ''make dist'' should prepare a proper release
tarball with generated configure/Makefile.in/libtool goo.

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


signature.asc
Description: PGP signature


Re: CVS: cvs.openbsd.org: ports

2019-12-26 Thread Giovanni Bechis
On Thu, Dec 26, 2019 at 09:14:12AM +0100, Antoine Jacoutot wrote:
> On Mon, Dec 23, 2019 at 12:50:32AM -0700, Giovanni Bechis wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: giova...@cvs.openbsd.org2019/12/23 00:50:32
> > 
> > Modified files:
> > mail/opensmtpd-extras: Makefile 
> > 
> > Log message:
> > add missing build dependency
> > spotted by kili@, ok jung@
> 
> It fails to build for me:
> 
> ===>  Patching for opensmtpd-extras-6.6.0
> cd /exopi-obj/pobj/opensmtpd-extras-6.6.0/OpenSMTPD-extras-6.6.0 && env 
> AUTOCONF_VERSION=2.69  AUTOMAKE_VERSION=1.13 sh bootstrap
> bootstrap: you need libtool
> *** Error 1 in mail/opensmtpd-extras (Makefile:81 'post-patch')
> *** Error 1 in mail/opensmtpd-extras 
> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2769 
> '/exopi-obj/pobj/opensmtpd-extras-6.6.0/.patch_done')
> *** Error 1 in mail/opensmtpd-extras 
> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2556 'patch')
> ===> Exiting mail/opensmtpd-extras,-main with an error
> *** Error 1 in /exopi-cvs/ports (infrastructure/mk/bsd.port.subdir.mk:137 
> 'patch')
> 
quick fix committed,
I think upstream should get rid of libtoolize or provide a pregenerated 
Makefile, jung@ ?

 Giovanni


signature.asc
Description: PGP signature


Re: CVS: cvs.openbsd.org: ports

2019-12-26 Thread Antoine Jacoutot
On Mon, Dec 23, 2019 at 12:50:32AM -0700, Giovanni Bechis wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   giova...@cvs.openbsd.org2019/12/23 00:50:32
> 
> Modified files:
>   mail/opensmtpd-extras: Makefile 
> 
> Log message:
> add missing build dependency
> spotted by kili@, ok jung@

It fails to build for me:

===>  Patching for opensmtpd-extras-6.6.0
cd /exopi-obj/pobj/opensmtpd-extras-6.6.0/OpenSMTPD-extras-6.6.0 && env 
AUTOCONF_VERSION=2.69  AUTOMAKE_VERSION=1.13 sh bootstrap
bootstrap: you need libtool
*** Error 1 in mail/opensmtpd-extras (Makefile:81 'post-patch')
*** Error 1 in mail/opensmtpd-extras 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2769 
'/exopi-obj/pobj/opensmtpd-extras-6.6.0/.patch_done')
*** Error 1 in mail/opensmtpd-extras 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2556 'patch')
===> Exiting mail/opensmtpd-extras,-main with an error
*** Error 1 in /exopi-cvs/ports (infrastructure/mk/bsd.port.subdir.mk:137 
'patch')


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2019-12-26 Thread Antoine Jacoutot
On Wed, Dec 25, 2019 at 08:00:12AM -0700, Martin Reindl wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   mar...@cvs.openbsd.org  2019/12/25 08:00:12
> 
> Modified files:
>   math/grace : Makefile 
>   math/grace/pkg : DESCR PLIST 
> 
> Log message:
> build with fftw and netcdf support by default, leaving no_x11 as the only
> flavor
> 
> input sthen@
> ok jca@

That broke it.

===>  Building package for grace-5.1.15p9-no_x11
Create /exopi-cvs/ports/packages/amd64/all/grace-5.1.15p9-no_x11.tgz
Creating package grace-5.1.15p9-no_x11

reading plist| 
checking dependencies| 
checking dependencies|devel/t1lib  
checking dependencies|graphics/jpeg
checking dependencies|graphics/png 
checking dependencies|graphics/tiff
checking dependencies|math/fftw
checking dependencies|math/netcdf  
checking dependencies|print/pdflib 
checksumming|  
checksumming| | 0% 
checksumming| | 1% 
checksumming|*| 1% 
checksumming|*| 2% 
checksumming|**   | 3% 
checksumming|**   | 4% 
checksumming|***  | 5% 
checksumming| | 6% 
checksumming| | 7% 
checksumming|*| 8% 
checksumming|*| 9% 
checksumming|**   | 9% 
checksumming|**   | 10%
checksumming|***  | 11%
checksumming|***  | 12%
checksumming| | 13%
checksumming|*| 14%
checksumming|*| 15%
checksumming|**   | 16%
Error: 
/exopi-obj/pobj/grace-5.1.15-no_x11/fake-amd64-no_x11/usr/local/bin/xmgrace 
does not exist
Error: 
/exopi-obj/pobj/grace-5.1.15-no_x11/fake-amd64-no_x11/usr/local/grace/bin/xmgrace
 does not exist
Error: 
/exopi-obj/pobj/grace-5.1.15-no_x11/fake-amd64-no_x11/usr/local/man/man1/xmgrace.1
 does not exist
pkg_create: can't continue
*** Error 1 in math/grace (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2098 
'/exopi-cvs/ports/packages/amd64/all/grace-5.1.15p9-no_x11.tgz')
*** Error 1 in math/grace (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2577 
'_internal-package')
*** Error 1 in math/grace (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2556 
'package')


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2019-12-25 Thread Bryan Linton
On 2019-12-25 11:28:20, Jeremie Courreges-Anglas  wrote:
> On Tue, Dec 24 2019, Bryan Linton  wrote:
> > On 2019-12-22 09:05:42, Frederic Cambus  wrote:
> >> CVSROOT:   /cvs
> >> Module name:   ports
> >> Changes by:fcam...@cvs.openbsd.org 2019/12/22 09:05:42
> >> 
> >> Modified files:
> >>productivity/ledger: Makefile distinfo 
> >>productivity/ledger/patches: patch-src_CMakeLists_txt 
> >>productivity/ledger/pkg: PLIST 
> >> Removed files:
> >>productivity/ledger/patches: patch-src_item_h 
> >> 
> >> Log message:
> >> Update ledger to 3.1.3.
> >> 
> >> This fixes CVE-2017-2807, CVE-2017-2808, CVE-2017-12481, CVE-2017-12482.
> >> 
> >> OK jca@, Sergey Bronnikov (MAINTAINER)
> >> 
> >
> > This update causes ledger to segfault when processing commodities.
> >
> > I can reproduce this with a file consisting of the following
> > snippet from ledger's manual.
> >
> > -8<--
> >
> > 9/29  Get some stuff at the Inn
> > Places:Black's Tavern   -3 Apples
> > Places:Black's Tavern   -5 Steaks
> > EverQuest:Inventory
> >
> > -8<--
> >
> > To reproduce, simply copy the above 4 lines to a file and run
> > ledger.  E.g. "ledger --file test.txt balance"
> >
> > If I remove the commodities from my (much longer) journal, ledger
> > works fine when dealing with cash transactions so the bug must be
> > specific to commodities.
> >
> > Can anyone else reproduce this?
> 
> Using your testcase, nope:
> 
> --8<--
> ritchie ~/tmp$ ledger -f testcase  balance; echo "status: $?"; ledger 
> --version | head -n1
> 3 Apples
> 5 Steaks  EverQuest:Inventory
>-3 Apples
>-5 Steaks  Places:Black's Tavern
> 
>0
> status: 0
> Ledger 3.1.3-20190331, the command-line accounting tool
> -->8--
> 

It must have been a hiccup with my system then.

I updated packages again, removed old .libs-* packages, and
rebuilt ledger and now I can no longer reproduce it either.

Apologies for the false alarm.  And many thanks to the maintainers
of ledger for keeping it up to date!

-- 
Bryan



Re: CVS: cvs.openbsd.org: ports

2019-12-25 Thread Jeremie Courreges-Anglas
On Tue, Dec 24 2019, Bryan Linton  wrote:
> On 2019-12-22 09:05:42, Frederic Cambus  wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by:  fcam...@cvs.openbsd.org 2019/12/22 09:05:42
>> 
>> Modified files:
>>  productivity/ledger: Makefile distinfo 
>>  productivity/ledger/patches: patch-src_CMakeLists_txt 
>>  productivity/ledger/pkg: PLIST 
>> Removed files:
>>  productivity/ledger/patches: patch-src_item_h 
>> 
>> Log message:
>> Update ledger to 3.1.3.
>> 
>> This fixes CVE-2017-2807, CVE-2017-2808, CVE-2017-12481, CVE-2017-12482.
>> 
>> OK jca@, Sergey Bronnikov (MAINTAINER)
>> 
>
> This update causes ledger to segfault when processing commodities.
>
> I can reproduce this with a file consisting of the following
> snippet from ledger's manual.
>
> -8<--
>
> 9/29  Get some stuff at the Inn
>   Places:Black's Tavern   -3 Apples
>   Places:Black's Tavern   -5 Steaks
>   EverQuest:Inventory
>
> -8<--
>
> To reproduce, simply copy the above 4 lines to a file and run
> ledger.  E.g. "ledger --file test.txt balance"
>
> If I remove the commodities from my (much longer) journal, ledger
> works fine when dealing with cash transactions so the bug must be
> specific to commodities.
>
> Can anyone else reproduce this?

Using your testcase, nope:

--8<--
ritchie ~/tmp$ ledger -f testcase  balance; echo "status: $?"; ledger --version 
| head -n1
3 Apples
5 Steaks  EverQuest:Inventory
   -3 Apples
   -5 Steaks  Places:Black's Tavern

   0
status: 0
Ledger 3.1.3-20190331, the command-line accounting tool
-->8--


> Unfortunately, I don't see any commits in ledger's GitHub that
> stand out as fixing this issue.  I do see several commits to
> commodity handling in between the previous 3.1.1 release and the
> current 3.1.3 release.  However, I don't currently have time to
> attempt to bisect this.
>
> Backtrace follows.
>
> % sysctl kern.version
> kern.version=OpenBSD 6.6-current (GENERIC.MP) #559: Sun Dec 22 23:03:43 MST 
> 2019
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>
> % ledger bal
> zsh: segmentation fault (core dumped)  ledger bal
>
> % egdb `which ledger` ledger.core
> GNU gdb (GDB) 7.12.1
> Copyright (C) 2017 Free Software Foundation, Inc.
> License GPLv3+: GNU GPL version 3 or later 
> This is free software: you are free to change and redistribute it.
> There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
> and "show warranty" for details.
> This GDB was configured as "x86_64-unknown-openbsd6.6".
> Type "show configuration" for configuration details.
> For bug reporting instructions, please see:
> .
> Find the GDB manual and other documentation resources online at:
> .
> For help, type "help".
> Type "apropos word" to search for commands related to "word"...
> Reading symbols from /usr/local/bin/ledger...done.
> [New process 605898]
> Core was generated by `ledger'.
> Program terminated with signal SIGSEGV, Segmentation fault.
> #0  0x00dbd4413389 in 
> std::__1::__hash_table ledger::amount_t>, std::__1::__unordered_map_hasher std::__1::__hash_value_type, 
> std::__1::hash, true>, 
> std::__1::__unordered_map_equal std::__1::__hash_value_type, 
> std::__1::equal_to, true>, 
> std::__1::allocator ledger::amount_t> > >::__deallocate_node (this=0xddd5619520, __np=0x2)
> at /usr/include/c++/v1/__hash_table:1584
> 1584__next_pointer __next = __np->__next_;
> (gdb) bt
> #0  0x00dbd4413389 in 
> std::__1::__hash_table ledger::amount_t>, std::__1::__unordered_map_hasher std::__1::__hash_value_type, 
> std::__1::hash, true>, 
> std::__1::__unordered_map_equal std::__1::__hash_value_type, 
> std::__1::equal_to, true>, 
> std::__1::allocator ledger::amount_t> > >::__deallocate_node (this=0xddd5619520, __np=0x2)
> at /usr/include/c++/v1/__hash_table:1584
> #1  0x00dbd441332c in 
> std::__1::__hash_table ledger::amount_t>, std::__1::__unordered_map_hasher std::__1::__hash_value_type, 
> std::__1::hash, true>, 
> std::__1::__unordered_map_equal std::__1::__hash_value_type, 
> std::__1::equal_to, true>, 
> std::__1::allocator ledger::amount_t> > >::~__hash_table (this=0xddd5619520)
> at /usr/include/c++/v1/__hash_table:1540
> #2  0x00dbd44132cf in std::__1::unordered_map ledger::amount_t, std::__1::hash, 
> std::__1::equal_to, 
> std::__1::allocator ledger::amount_t> > >::~unordered_map (this=0xddd5619520)
> at /usr/include/c++/v1/unordered_map:842
> #3  0x00dbd441328f in ledger::balance_t::~balance_t (this=0xddd5619520)
> at /usr/obj/ports/ledger-3.1.3/ledger-3.1.3/src/balance.h:140
> #4  0x00dbd4413144 in boost::checked_delete 
> (x=0xddd5619520)
> at /usr/local/include/boost/core/checked_delete.hpp:34
> #5  0x000

Re: CVS: cvs.openbsd.org: ports

2019-12-23 Thread Bryan Linton
On 2019-12-22 09:05:42, Frederic Cambus  wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   fcam...@cvs.openbsd.org 2019/12/22 09:05:42
> 
> Modified files:
>   productivity/ledger: Makefile distinfo 
>   productivity/ledger/patches: patch-src_CMakeLists_txt 
>   productivity/ledger/pkg: PLIST 
> Removed files:
>   productivity/ledger/patches: patch-src_item_h 
> 
> Log message:
> Update ledger to 3.1.3.
> 
> This fixes CVE-2017-2807, CVE-2017-2808, CVE-2017-12481, CVE-2017-12482.
> 
> OK jca@, Sergey Bronnikov (MAINTAINER)
> 

This update causes ledger to segfault when processing commodities.

I can reproduce this with a file consisting of the following
snippet from ledger's manual.

-8<--

9/29  Get some stuff at the Inn
Places:Black's Tavern   -3 Apples
Places:Black's Tavern   -5 Steaks
EverQuest:Inventory

-8<--

To reproduce, simply copy the above 4 lines to a file and run
ledger.  E.g. "ledger --file test.txt balance"

If I remove the commodities from my (much longer) journal, ledger
works fine when dealing with cash transactions so the bug must be
specific to commodities.

Can anyone else reproduce this?

Unfortunately, I don't see any commits in ledger's GitHub that
stand out as fixing this issue.  I do see several commits to
commodity handling in between the previous 3.1.1 release and the
current 3.1.3 release.  However, I don't currently have time to
attempt to bisect this.

Backtrace follows.

% sysctl kern.version
kern.version=OpenBSD 6.6-current (GENERIC.MP) #559: Sun Dec 22 23:03:43 MST 2019
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

% ledger bal
zsh: segmentation fault (core dumped)  ledger bal

% egdb `which ledger` ledger.core
GNU gdb (GDB) 7.12.1
Copyright (C) 2017 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-unknown-openbsd6.6".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.
For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from /usr/local/bin/ledger...done.
[New process 605898]
Core was generated by `ledger'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0  0x00dbd4413389 in 
std::__1::__hash_table, std::__1::__unordered_map_hasher, 
std::__1::hash, true>, 
std::__1::__unordered_map_equal, 
std::__1::equal_to, true>, 
std::__1::allocator > >::__deallocate_node (this=0xddd5619520, __np=0x2)
at /usr/include/c++/v1/__hash_table:1584
1584__next_pointer __next = __np->__next_;
(gdb) bt
#0  0x00dbd4413389 in 
std::__1::__hash_table, std::__1::__unordered_map_hasher, 
std::__1::hash, true>, 
std::__1::__unordered_map_equal, 
std::__1::equal_to, true>, 
std::__1::allocator > >::__deallocate_node (this=0xddd5619520, __np=0x2)
at /usr/include/c++/v1/__hash_table:1584
#1  0x00dbd441332c in 
std::__1::__hash_table, std::__1::__unordered_map_hasher, 
std::__1::hash, true>, 
std::__1::__unordered_map_equal, 
std::__1::equal_to, true>, 
std::__1::allocator > >::~__hash_table (this=0xddd5619520)
at /usr/include/c++/v1/__hash_table:1540
#2  0x00dbd44132cf in std::__1::unordered_map, 
std::__1::equal_to, 
std::__1::allocator > >::~unordered_map (this=0xddd5619520)
at /usr/include/c++/v1/unordered_map:842
#3  0x00dbd441328f in ledger::balance_t::~balance_t (this=0xddd5619520)
at /usr/obj/ports/ledger-3.1.3/ledger-3.1.3/src/balance.h:140
#4  0x00dbd4413144 in boost::checked_delete 
(x=0xddd5619520)
at /usr/local/include/boost/core/checked_delete.hpp:34
#5  0x00dbd44130b2 in ledger::value_t::storage_t::destroy 
(this=0xde5ab16300)
at /usr/obj/ports/ledger-3.1.3/ledger-3.1.3/src/value.h:219
#6  0x00dbd4412ff6 in ledger::value_t::storage_t::~storage_t 
(this=0xde5ab16300)
at /usr/obj/ports/ledger-3.1.3/ledger-3.1.3/src/value.h:172
#7  0x00dbd4412fa4 in boost::checked_delete (x=0xde5ab16300)
at /usr/local/include/boost/core/checked_delete.hpp:34
#8  0x00dbd4412f4c in ledger::value_t::storage_t::release 
(this=0xde5ab16300)
at /usr/obj/ports/ledger-3.1.3/ledger-3.1.3/src/value.h:203
#9  0x00dbd4412eef in ledger::intrusive_ptr_release 
(storage_ptr=0xde5ab16300)
at /usr/obj/ports/ledger-3.1.3/ledger-3.1.3/src/value.h:210
#10 0x00dbd4404977 in 
boost::intrusive_ptr::~intrusive_ptr (
this=0x7f7dc510) at 
/usr/local/include/boost/smart_ptr/intrusive_ptr.hpp:98
#11 0x00de062bcf76 in ledger::xact_base_t::finalize() () 

Re: CVS: cvs.openbsd.org: ports

2019-12-20 Thread Kurt Mosiejczuk
On Mon, Dec 16, 2019 at 08:49:04AM -0700, Antoine Jacoutot wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ajacou...@cvs.openbsd.org   2019/12/16 08:49:04
> 
> Modified files:
>   devel/pango: Makefile distinfo 
>   devel/pango/pkg: PLIST 
> Added files:
>   devel/pango/patches: patch-utils_meson_build 
> Removed files:
>   devel/pango/patches: patch-configure_ac patch-pango_break-thai_c 
>patch-pango_pango-bidi-type_c 
>patch-pango_pangofc-shape_c 
> 
> Log message:
> Major update to pango-1.44.7.

This broke most of the tree for sparc64.

http://build-failures.rhaalovely.net/sparc64/2019-12-18/devel/pango.log
http://build-failures.rhaalovely.net/sparc64/2019-12-18/summary.log

--Kurt



Re: CVS: cvs.openbsd.org: ports

2019-12-18 Thread Stuart Henderson
On 2019/12/16 05:54, Frederic Cambus wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   fcam...@cvs.openbsd.org 2019/12/16 05:54:30
> 
> Modified files:
>   audio/ocp  : Makefile distinfo 
>   audio/ocp/pkg  : PLIST 
> Removed files:
>   audio/ocp/patches: patch-config_h_in patch-configure 
>  patch-stuff_poutput-sdl_c 
> 
> Log message:
> Update ocp to 0.2.1.
> 
> This version now uses SDL2.
> 

Fails on i386:

cc -O2 -pipe -I/usr/local/include -L/usr/local/lib 
-I/usr/local/include/libbinio -fPIC -Wall -I.././ -O mixasm.c -o mixasm.o -c
cc: warning: argument unused during compilation: '-L/usr/local/lib' 
[-Wunused-command-line-argument]
mixasm.c:94:16: warning: unknown attribute 'optimize' ignored 
[-Wunknown-attributes]
__attribute__((optimize("-fno-omit-frame-pointer"))) /* we use the stack, so we 
need all access to go via EBP, not ESP */
   ^
error: this directive must appear between .cfi_startproc and .cfi_endproc 
directives
error: Unfinished frame!
1 warning and 2 errors generated.



Re: CVS: cvs.openbsd.org: ports

2019-12-13 Thread Stuart Henderson

If this is just for the bundled installer can that just be patched away?

I would test that, but despite seeing the version requirement I'm not 
seeing things broken as a result, at least I can "make test" or import 
botocore or build/run awscli with dateutil 2.8.1 installed and I don't see 
errors.


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

On 13 December 2019 06:44:42 Pavel Korovin  wrote:


On 12/12, Jasper Lievisse Adriaanse wrote:

CVSROOT: /cvs
Module name: ports
Changes by: jas...@cvs.openbsd.org 2019/12/12 09:21:23


Modified files:
devel/py-dateutil: Makefile distinfo
devel/py-dateutil/patches: patch-dateutil_test_test_parser_py


Log message:
update to py-dateutil-2.8.1


This breaks net/py-botocore, check py-dateutil version requirement hardcoded in
${MODPY_SITEPKG}/botocore-1.13.34-py3.7.egg-info/requires.txt:
python-dateutil<2.8.1,>=2.1

For more info on botocore, see here:
https://github.com/boto/botocore/issues/1872
https://github.com/boto/botocore/commit/e87e7a745fd972815b235a9ee685232745aa94f9#diff-380c6a8ebbbce17d55d50ef17d3cf906

--
With best regards,
Pavel Korovin






Re: CVS: cvs.openbsd.org: ports

2019-12-12 Thread Pavel Korovin
On 12/12, Jasper Lievisse Adriaanse wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   jas...@cvs.openbsd.org  2019/12/12 09:21:23
> 
> Modified files:
>   devel/py-dateutil: Makefile distinfo 
>   devel/py-dateutil/patches: patch-dateutil_test_test_parser_py 
> 
> Log message:
> update to py-dateutil-2.8.1
> 

This breaks net/py-botocore, check py-dateutil version requirement hardcoded in
${MODPY_SITEPKG}/botocore-1.13.34-py3.7.egg-info/requires.txt:
python-dateutil<2.8.1,>=2.1

For more info on botocore, see here:
https://github.com/boto/botocore/issues/1872
https://github.com/boto/botocore/commit/e87e7a745fd972815b235a9ee685232745aa94f9#diff-380c6a8ebbbce17d55d50ef17d3cf906

-- 
With best regards,
Pavel Korovin



Re: CVS: cvs.openbsd.org: ports

2019-11-30 Thread Kurt Mosiejczuk
On Sat, Nov 30, 2019 at 11:11:46AM -0700, Kurt Mosiejczuk wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2019/11/30 11:11:46

> Modified files:
>   infrastructure/templates: mk.conf.template 

> Log message:
> Add the common misspelling "MODPY_TEST" (should be "MODPY_PYTEST") to the
> poisoned misspellings to help point out when the typo happens.

> ok phessler

This was also ok jca



Re: CVS: cvs.openbsd.org: ports

2019-11-30 Thread Stuart Henderson
Oh, we didn't when I built it :-) great, we can probably update gimp again
then, I'll take a look soon.


On 2019/11/30 11:51, Antoine Jacoutot wrote:
> Hmm. Don’t we have the most recent babl and all geglXY versions in tree 
> already?
> 
> 
> —
> Antoine
> 
> > On 29 Nov 2019, at 12:16, Stuart Henderson  wrote:
> > 
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by:st...@cvs.openbsd.org2019/11/29 05:15:46
> > 
> > Modified files:
> >graphics/gimp/stable: Makefile distinfo 
> >graphics/gimp/stable/patches: patch-app_core_gimptagcache_c 
> >  patch-etc_Makefile_in 
> >graphics/gimp/stable/pkg: PLIST 
> > Removed files:
> >graphics/gimp/stable/patches: patch-app_Makefile_in 
> >  patch-plug-ins_common_Makefile_in 
> >  patch-tools_gimp-mkenums 
> >  patch-tools_pdbgen_enumgen_pl 
> > 
> > Log message:
> > major update to gimp-2.10.12.
> > 
> > based on an earlier update to 2.10.6 from giovanni@, ok giovanni@
> > 
> > This isn't the latest (2.10.14 requires gegl/babl updates and they're
> > more than a simple version update as they've now moved the build to
> > meson) but is much newer than we had before.
> > 
> > deskew and lqr (external plugins) still work OK for me. I did see a
> > segfault once but hadn't built with debug symbols at the time and
> > haven't been able to replicate it; I've enabled DEBUG_PACKAGES so if
> > somebody else runs into that they can obtain a backtrace more easily.
> > 
> 



Re: CVS: cvs.openbsd.org: ports

2019-11-30 Thread Antoine Jacoutot
Hmm. Don’t we have the most recent babl and all geglXY versions in tree already?


—
Antoine

> On 29 Nov 2019, at 12:16, Stuart Henderson  wrote:
> 
> CVSROOT:/cvs
> Module name:ports
> Changes by:st...@cvs.openbsd.org2019/11/29 05:15:46
> 
> Modified files:
>graphics/gimp/stable: Makefile distinfo 
>graphics/gimp/stable/patches: patch-app_core_gimptagcache_c 
>  patch-etc_Makefile_in 
>graphics/gimp/stable/pkg: PLIST 
> Removed files:
>graphics/gimp/stable/patches: patch-app_Makefile_in 
>  patch-plug-ins_common_Makefile_in 
>  patch-tools_gimp-mkenums 
>  patch-tools_pdbgen_enumgen_pl 
> 
> Log message:
> major update to gimp-2.10.12.
> 
> based on an earlier update to 2.10.6 from giovanni@, ok giovanni@
> 
> This isn't the latest (2.10.14 requires gegl/babl updates and they're
> more than a simple version update as they've now moved the build to
> meson) but is much newer than we had before.
> 
> deskew and lqr (external plugins) still work OK for me. I did see a
> segfault once but hadn't built with debug symbols at the time and
> haven't been able to replicate it; I've enabled DEBUG_PACKAGES so if
> somebody else runs into that they can obtain a backtrace more easily.
> 



Re: CVS: cvs.openbsd.org: ports

2019-11-27 Thread Stuart Henderson
On 2019/11/23 19:59, Thomas Frohwein wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2019/11/23 19:59:19
> 
> Log message:
> Import lang/nekovm, a build dependency for upcoming haxe port.
> 
> ok bentley@ who also identified a missing ifdef
> 
> DESCR:
> Neko is a high-level dynamically typed programming language. It can be 
> used as
> an embedded scripting language. It has been designed to provide a common 
> runtime
> for several different languages. Learning and using Neko is very easy. 
> You can
> easily extend the language with C libraries. You can also write 
> generators from
> your own language to Neko and then use the Neko Runtime to compile, run, 
> and
> access existing libraries.
> 
> Status:
> 
> Vendor Tag:   thfr
> Release Tags: thfr_20191123
> 
> N ports/lang/nekovm/Makefile
> N ports/lang/nekovm/distinfo
> N ports/lang/nekovm/patches/patch-vm_main_c
> N ports/lang/nekovm/patches/patch-CMakeLists_txt
> N ports/lang/nekovm/patches/patch-libs_common_socket_c
> N ports/lang/nekovm/patches/patch-libs_std_socket_c
> N ports/lang/nekovm/pkg/DESCR
> N ports/lang/nekovm/pkg/PLIST
> 
> No conflicts created by this import
> 

build segfaults on i386:

[42/55] /usr/local/bin/cmake -E cmake_symlink_library bin/libneko.so.0.0 
bin/libneko.so.0.0 bin/libneko.so && :
[43/55] : && /pobj/nekovm-2.3.0/bin/cc -fPIC -O2 -pipe -DNDEBUG   -shared  -o 
bin/std.ndll libs/std/CMakeFiles/std.ndl
l.dir/buffer.c.o libs/std/CMakeFiles/std.ndll.dir/date.c.o 
libs/std/CMakeFiles/std.ndll.dir/file.c.o libs/std/CMakeFil
es/std.ndll.dir/init.c.o libs/std/CMakeFiles/std.ndll.dir/int32.c.o 
libs/std/CMakeFiles/std.ndll.dir/math.c.o libs/std
/CMakeFiles/std.ndll.dir/string.c.o libs/std/CMakeFiles/std.ndll.dir/random.c.o 
libs/std/CMakeFiles/std.ndll.dir/seria
lize.c.o libs/std/CMakeFiles/std.ndll.dir/socket.c.o 
libs/std/CMakeFiles/std.ndll.dir/sys.c.o libs/std/CMakeFiles/std.
ndll.dir/xml.c.o libs/std/CMakeFiles/std.ndll.dir/module.c.o 
libs/std/CMakeFiles/std.ndll.dir/md5.c.o libs/std/CMakeFi
les/std.ndll.dir/unicode.c.o libs/std/CMakeFiles/std.ndll.dir/utf8.c.o 
libs/std/CMakeFiles/std.ndll.dir/memory.c.o lib
s/std/CMakeFiles/std.ndll.dir/misc.c.o 
libs/std/CMakeFiles/std.ndll.dir/thread.c.o libs/std/CMakeFiles/std.ndll.dir/pr
ocess.c.o libs/std/CMakeFiles/std.ndll.dir/elf_update.c.o -L/usr/local/lib  
-L/usr/X11R6/lib  -L/pobj/nekovm-2.3.0/bui
ld-i386/bin -Wl,-z,origin,-rpath,"\$ORIGIN:/usr/local/lib:/usr/X11R6/lib" 
bin/libsha1.a -lneko -lgc -lm -lpthread -Wl,
-rpath-link,/usr/X11R6/lib:/usr/local/lib && :
[44/55] : && /pobj/nekovm-2.3.0/bin/cc -fPIC -O2 -pipe -DNDEBUG   -shared  -o 
bin/zlib.ndll libs/zlib/CMakeFiles/zlib.
ndll.dir/zlib.c.o -L/usr/local/lib  -L/usr/X11R6/lib  
-L/pobj/nekovm-2.3.0/build-i386/bin -Wl,-z,origin,-rpath,"\$ORIG
IN:/usr/local/lib:/usr/X11R6/lib" -lneko -lz -lgc -lm -lpthread 
-Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && :
[45/55] : && /pobj/nekovm-2.3.0/bin/cc -O2 -pipe -DNDEBUG   
CMakeFiles/nekovm.dir/vm/stats.c.o CMakeFiles/nekovm.dir/v
m/main.c.o  -o bin/neko -L/usr/local/lib  -L/usr/X11R6/lib  
-L/pobj/nekovm-2.3.0/build-i386/bin -Wl,-z,origin,-rpath,"
\$ORIGIN:/usr/local/lib:/usr/X11R6/lib" -lneko -lgc -lm -lpthread 
-Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && :  
[46/55] cd /pobj/nekovm-2.3.0/neko-2-3-0/src && /usr/local/bin/cmake -E copy 
../boot/nekoc.n /pobj/nekovm-2.3.0/build-
i386/bin && /usr/local/bin/cmake -E copy ../boot/nekoml.n 
/pobj/nekovm-2.3.0/build-i386/bin
[47/55] cd /pobj/nekovm-2.3.0/neko-2-3-0/src && 
LD_LIBRARY_PATH=/pobj/nekovm-2.3.0/build-i386/bin NEKOPATH=/pobj/nekov
m-2.3.0/build-i386/bin /pobj/nekovm-2.3.0/build-i386/bin/neko 
/pobj/nekovm-2.3.0/build-i386/bin/nekoc.n tools/nekoboot
.neko && /usr/local/bin/cmake -E copy tools/nekoboot.n 
/pobj/nekovm-2.3.0/build-i386/bin
FAILED: bin/nekoboot.n  
  
cd /pobj/nekovm-2.3.0/neko-2-3-0/src && 
LD_LIBRARY_PATH=/pobj/nekovm-2.3.0/build-i386/bin NEKOPATH=/pobj/nekovm-2.3.0/
build-i386/bin /pobj/nekovm-2.3.0/build-i386/bin/neko 
/pobj/nekovm-2.3.0/build-i386/bin/nekoc.n tools/nekoboot.neko &&
 /usr/local/bin/cmake -E copy tools/nekoboot.n 
/pobj/nekovm-2.3.0/build-i386/bin  
Segmentation fault (core dumped)
  
ninja: build stopped: subcommand failed.
  
*** Error 1 in lang/nekovm (/usr/ports/devel/cmake/cmake.port.mk:34 'do-build': 
@cd /pobj/nekovm-2.3.0/build-i386 && e
xec /usr/bin/env -i LI...)  
  
*** Error 1 in lang/nekovm (/usr/ports/infrastructure/mk/bsd.port.mk:2872 
'/pob

Re: CVS: cvs.openbsd.org: ports

2019-11-26 Thread Jasper Lievisse Adriaanse



> On 26 Nov 2019, at 10:28, Stuart Henderson  wrote:
> 
> On 2019/10/30 06:41, Jasper Lievisse Adriaanse wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by:  jas...@cvs.openbsd.org  2019/10/30 06:41:46
>> 
>> Modified files:
>>  security/suricata: Makefile distinfo 
>>  security/suricata/patches: patch-suricata_yaml_in 
>>  security/suricata/pkg: PLIST 
>> Removed files:
>>  security/suricata/patches: patch-configure_ac 
>> patch-src_suricata_c 
>> patch-src_util-error_c 
>> patch-src_util-error_h 
>> patch-src_util-logopenfile_c 
>> patch-src_util-privs_c 
>> patch-src_util-privs_h 
>> 
>> patch-suricata-update_suricata_update_config_py 
>> 
>> Log message:
>> - update to suricata-5.0.0
>> - switch to python3
>> 
>> from gonzalo@ with some small tweaks by me
>> 
> 
> This depends on sphinx,python3 but actually tries to run
> sphinx-build (python 2 version).

Thanks, I’ve just committed the fix.



Re: CVS: cvs.openbsd.org: ports

2019-11-26 Thread Stuart Henderson
On 2019/11/24 11:42, Aaron Bieber wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   abie...@cvs.openbsd.org 2019/11/24 11:42:29
> 
> Modified files:
>   lang/node  : Makefile distinfo 
>   lang/node/patches: patch-Makefile patch-common_gypi 
>  patch-deps_npm_bin_node-gyp-bin_node-gyp 
>  patch-deps_npm_lib_npm_js 
>  
> patch-deps_npm_node_modules_node-gyp_gyp_pylib_gyp_generator_make_py 
>  
> patch-deps_npm_node_modules_node-gyp_gyp_pylib_gyp_generator_ninja_py 
>  patch-deps_npm_node_modules_node-gyp_lib_build_js 
>  patch-deps_npm_node_modules_node-gyp_lib_install_js 
>  patch-deps_openssl_config_Makefile 
>  patch-deps_openssl_config_bn_conf_no-asm_h 
>  patch-deps_openssl_config_dso_conf_no-asm_h 
>  patch-deps_openssl_config_generate_gypi_pl 
>  patch-deps_openssl_config_opensslconf_no-asm_h 
>  
> patch-deps_v8_src_base_utils_random-number-generator_cc 
>  patch-lib_module_js patch-node_gypi 
>  patch-tools_icu_icu-generic_gyp 
>  patch-tools_test_py 
>   lang/node/pkg  : PLIST 
> Added files:
>   lang/node/patches: 
>  
> patch-deps_npm_node_modules_node-gyp_lib_find-python_js 
>  patch-deps_v8_src_logging_log-utils_h 
> Removed files:
>   lang/node/patches: 
>  
> patch-deps_npm_node_modules_node-gyp_lib_configure_js 
>  patch-deps_uv_src_unix_openbsd_c 
>  patch-deps_v8_src_log-utils_h 
>  patch-deps_v8_src_wasm_wasm-code-manager_cc 
> 
> Log message:
> Bump node to 12.3.1, the latest LTS.
> 
> Changelog here:
> - 
> https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.13.1
> 
> OK robert@
> 

This seems to have broken sysutils/facetta

> cd .
> /usr/local/go/pkg/tool/openbsd_386/link -o $WORK/b001/exe/a.out -importcfg 
> $WORK/b001/importcfg.link -buildmode=exe 
> -buildid=kufrBEdYaCLK5Rafm5It/mjl5-_VuE-FzrZYJ0gjX/jX13PzWaYP9s-gVoG4xA/kufrBEdYaCLK5Rafm5It
>  -s -w -X main.version=0.4.1 -X main.buildDate=2019-11-25 -X main.buildHash= 
> -extld=cc $WORK/b001/_pkg_.a
> /usr/local/go/pkg/tool/openbsd_386/buildid -w $WORK/b001/exe/a.out # internal
> mkdir -p build/facette-openbsd-386/bin/
> cp $WORK/b001/exe/a.out build/facette-openbsd-386/bin/facette
> rm -r $WORK/b001/
> result: ok
> build: Building assets...
> fs.js:27
> const { Math, Object } = primordials;
>  ^
> 
> ReferenceError: primordials is not defined
> at fs.js:27:26
> at req_ (/pobj/facette-0.4.1/node_modules/natives/index.js:143:24)
> at Object.req [as require] 
> (/pobj/facette-0.4.1/node_modules/natives/index.js:55:10)
> at Object. 
> (/pobj/facette-0.4.1/node_modules/graceful-fs/fs.js:1:37)
> at Module._compile (internal/modules/cjs/loader.js:959:30)
> at Object.Module._extensions..js (internal/modules/cjs/loader.js:995:10)
> at Module.load (internal/modules/cjs/loader.js:815:32)
> at Function.Module._load (internal/modules/cjs/loader.js:727:14)
> at Module.require (internal/modules/cjs/loader.js:852:19)
> at require (internal/modules/cjs/helpers.js:74:18)
> result: fail
> gmake: *** [Makefile:88: build-assets] Error 1
> *** Error 2 in sysutils/facette 
> (/usr/ports/infrastructure/mk/bsd.port.mk:2871 
> '/pobj/facette-0.4.1/.build_done')



Re: CVS: cvs.openbsd.org: ports

2019-11-26 Thread Stuart Henderson
On 2019/10/30 06:41, Jasper Lievisse Adriaanse wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   jas...@cvs.openbsd.org  2019/10/30 06:41:46
> 
> Modified files:
>   security/suricata: Makefile distinfo 
>   security/suricata/patches: patch-suricata_yaml_in 
>   security/suricata/pkg: PLIST 
> Removed files:
>   security/suricata/patches: patch-configure_ac 
>  patch-src_suricata_c 
>  patch-src_util-error_c 
>  patch-src_util-error_h 
>  patch-src_util-logopenfile_c 
>  patch-src_util-privs_c 
>  patch-src_util-privs_h 
>  
> patch-suricata-update_suricata_update_config_py 
> 
> Log message:
> - update to suricata-5.0.0
> - switch to python3
> 
> from gonzalo@ with some small tweaks by me
> 

This depends on sphinx,python3 but actually tries to run
sphinx-build (python 2 version).



Re: CVS: cvs.openbsd.org: ports

2019-11-24 Thread James Turner
So sysutils/slant still requires it as a build depend. I just updated it
so it pulls ksql directly and probably links against sqlbox.
Once slant gets a new release which no longer has a depend on ksql it can
probably be removed.
On Nov 24, 2019 10:51 AM, Stuart Henderson  wrote:

  On 2019/11/23 21:56, James Turner wrote:
  > CVSROOT: /cvs
  > Module name: ports
  > Changes by: jtur...@cvs.openbsd.org 2019/11/23 21:56:57
  >
  > Modified files:
  > www/openradtool: Makefile
  >
  > Log message:
  > openradtool now depends on databases/sqlbox not databases/ksql.
  Bump
  >

  Is there any point keeping ksql now?


Re: CVS: cvs.openbsd.org: ports

2019-11-24 Thread Stuart Henderson
On 2019/11/23 21:56, James Turner wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   jtur...@cvs.openbsd.org 2019/11/23 21:56:57
> 
> Modified files:
>   www/openradtool: Makefile 
> 
> Log message:
> openradtool now depends on databases/sqlbox not databases/ksql. Bump
> 

Is there any point keeping ksql now?



Re: CVS: cvs.openbsd.org: ports

2019-11-24 Thread Stuart Henderson
On 2019/11/24 11:56, Charlène Wendling wrote:
> (cvs did not abort on blank commit message as i expected)

Exit the editor without saving (leave the original file unchanged)
if you want to abort a commit.



Re: CVS: cvs.openbsd.org: ports

2019-11-24 Thread Charlène Wendling
On Sun, 24 Nov 2019 03:53:42 -0700 (MST)
Charlene Wendling wrote:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   c...@cvs.openbsd.org2019/11/24 03:53:42
> 
> Modified files:
>   devel/libvterm/patches: patch-bin_vterm-ctrl_c 
> Added files:
>   devel/libvterm/patches: patch-Makefile 
> 
> Log message:
> 
> 

(cvs did not abort on blank commit message as i expected)

libvterm: drop `-Wpedantic' so it still builds on base-gcc archs with
the default compiler. While here, convert a git-styled patch to what
cvs(1) expect, making update-patches(1) happy.

OK edd@ (maintainer)



Re: CVS: cvs.openbsd.org: ports

2019-11-21 Thread Jeremy Evans
On Thu, Nov 21, 2019 at 1:11 AM Sebastian Reitenbach 
wrote:

> CVSROOT:/cvs
> Module name:ports
> Changes by: sebas...@cvs.openbsd.org2019/11/21 02:11:21
>
> Modified files:
> databases/ruby-hiera-eyaml: Makefile distinfo
> databases/ruby-hiera-eyaml/pkg: PLIST
>
> Log message:
> Update 3.0.0 -> 3.1.1
> while there, get rid of GEM_BIN_SUFFIX from the executable
>

This makes the ruby26 and ruby25 FLAVORs conflict:

Collision in ruby25-hiera-eyaml-3.1.1: the following files already exist
/usr/local/bin/eyaml (ruby26-hiera-eyaml-3.1.1 and
ruby25-hiera-eyaml-3.1.1)

You either need to revert this or set:

  MODRUBY_HANDLE_FLAVORS= No

In which case the package name changes to hiera-eyaml

Thanks,
Jeremy


Re: CVS: cvs.openbsd.org: ports

2019-11-20 Thread Stuart Henderson
On 2019/11/20 21:57, Antoine Jacoutot wrote:
> On Wed, Nov 20, 2019 at 12:00:25PM -0700, Stuart Henderson wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: st...@cvs.openbsd.org   2019/11/20 12:00:25
> > 
> > Modified files:
> > security/clamav: Makefile distinfo 
> > security/clamav/patches: patch-clamd_Makefile_in 
> >  patch-database_Makefile_in 
> >  patch-libclamav_Makefile_in 
> >  patch-unit_tests_Makefile_in 
> > security/clamav/pkg: clamd.rc 
> > Added files:
> > security/clamav/patches: patch-libclamav_bytecode_vm_c 
> > Removed files:
> > security/clamav/patches: patch-configure_ac 
> > 
> > Log message:
> > update to clamav-0.102.1, lower daemon_timeout
> 
> It's fasterer now?

Ooh yes.

# time rcctl start clamd
clamd(ok)
0m34.26s real 0m31.63s user 0m02.68s system

- Signature load time is significantly reduced by changing to a more efficient
  algorithm for loading signature patterns and allocating the AC trie.
  Patch courtesy of Alberto Wu.



Re: CVS: cvs.openbsd.org: ports

2019-11-20 Thread Antoine Jacoutot
On Wed, Nov 20, 2019 at 12:00:25PM -0700, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2019/11/20 12:00:25
> 
> Modified files:
>   security/clamav: Makefile distinfo 
>   security/clamav/patches: patch-clamd_Makefile_in 
>patch-database_Makefile_in 
>patch-libclamav_Makefile_in 
>patch-unit_tests_Makefile_in 
>   security/clamav/pkg: clamd.rc 
> Added files:
>   security/clamav/patches: patch-libclamav_bytecode_vm_c 
> Removed files:
>   security/clamav/patches: patch-configure_ac 
> 
> Log message:
> update to clamav-0.102.1, lower daemon_timeout

It's fasterer now?

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2019-11-20 Thread Otto Moerbeek
On Wed, Nov 20, 2019 at 12:31:11PM -0700, Otto Moerbeek wrote:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   o...@cvs.openbsd.org2019/11/20 12:31:11
> 
> Modified files:
>   net/dnsdist: Makefile distinfo 
> Removed files:
>   net/dnsdist/patches: patch-configure_ac 
> 
> Log message:
> Update to dnsdist 1.4.0. Most important features: improved support
> for serving DoT and new support for serving DoH.
> 

Should have mentioned: ok sthen@



Re: CVS: cvs.openbsd.org: ports

2019-11-17 Thread Frederic Cambus
On Sun, Nov 17, 2019 at 10:23:53PM +, Stuart Henderson wrote:

> I have this failure on i386.

> ===>  Building for xfig-3.2.7bp0

[...]

> fig2dev -L xbm -S 4 ../splash-image/spl_bckgnd.fig  | sed '1,3 
> s/noname/spl_bckgnd/; 3 s/char/unsigned &/' > splash.xbm
> sh: -q: not found
> depbase=`echo w_icons.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`; cc 
> -DHAVE_CONFIG_H -I. -I..  -I/usr/X11R6/include  -DXAW_INTERNATIONALIZATION 
> -DNDEBUG -DXFIGLIBDIR="\"/usr/local/lib/X11/xfig\""  
> -DOBJLIBDIR="\"/usr/local/lib/X11/xfig/Libraries\"" 
> -DXFIGDOCDIR="\"/usr/local/share/doc/xfig\""  -I/usr/local/include 
> -I/usr/X11R6/include  -O2 -pipe -MT w_icons.o -MD -MP -MF $depbase.Tpo -c -o 
> w_icons.o w_icons.c && mv -f $depbase.Tpo $depbase.Po
> fig2dev: broken pipe when trying to create image
> command was:  -q -dSAFER -r80 -g631x211 -dTextAlphaBits=4 
> -dGraphicsAlphaBits=4 -sDEVICE=ppmraw -o - - | { ppmtopgm | pgmtopbm | 
> pbmtoxbm; } 2>/tmp//f2derrorxYi8Us

So the issue is that print/transfig needed print/ghostscript/gnu also
as a BUILD_DEPENDS. I commited a patch a few hours ago which should fix
the issue.

Without it, GSEXE ended up being empty and every operation relying
on the ghostscript binary failed. In xfig, one file was not generated
by fig2dev because of this, causing the build failure.



Re: CVS: cvs.openbsd.org: ports

2019-11-17 Thread Stuart Henderson
On 2019/11/13 08:26, Frederic Cambus wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   fcam...@cvs.openbsd.org 2019/11/13 08:26:47
> 
> Modified files:
>   graphics/xfig  : Makefile distinfo 
>   graphics/xfig/patches: patch-src_d_text_c 
>   graphics/xfig/pkg: PLIST 
> Removed files:
>   graphics/xfig/patches: patch-e_chop_c patch-w_intersect_c 
>  patch-w_keyboard_c patch-w_snap_c 
> 
> Log message:
> Update xfig to 3.2.7b.
> 
> We can now drop all patches for the  includes.
> 
> OK rsadowski@
> 

I have this failure on i386.


>>> Building on i386-3 under graphics/xfig
 BDEPENDS = 
[archivers/xz;graphics/png;print/transfig;textproc/groff;x11/Xaw3d;graphics/jpeg]
 DIST = [graphics/xfig:xfig-3.2.7b.tar.xz]
 FULLPKGNAME = xfig-3.2.7bp0
 RDEPENDS = 
[devel/desktop-file-utils;x11/Xaw3d;graphics/jpeg;textproc/xpdf;graphics/png;print/transfig]
(Junk lock obtained for i386-3 at 1574028852.81)
>>> Running depends in graphics/xfig at 1574028852.86
   last junk was in graphics/drawpile
/usr/sbin/pkg_add -aI -Drepair Xaw3d-1.6.3 groff-1.22.4p0 jpeg-2.0.3v0 
png-1.6.37 transfig-3.2.7b
was: /usr/sbin/pkg_add -aI -Drepair Xaw3d-1.6.3 groff-1.22.4p0 jpeg-2.0.3v0 
png-1.6.37 transfig-3.2.7b xz-5.2.4
/usr/sbin/pkg_add -aI -Drepair Xaw3d-1.6.3 groff-1.22.4p0 jpeg-2.0.3v0 
png-1.6.37 transfig-3.2.7b
New and changed readme(s):
/usr/local/share/doc/pkg-readmes/groff
--- +ghostscript-fonts-8.11p3 ---
You may wish to update your font path for /usr/local/share/fonts/ghostscript
>>> Running show-prepare-results in graphics/xfig at 1574028873.48
===> graphics/xfig
===> xfig-3.2.7bp0 depends on: transfig-* -> transfig-3.2.7b
===> xfig-3.2.7bp0 depends on: groff->=1.21 -> groff-1.22.4p0
===> xfig-3.2.7bp0 depends on: xz-* -> xz-5.2.4
===> xfig-3.2.7bp0 depends on: jpeg-* -> jpeg-2.0.3v0
===> xfig-3.2.7bp0 depends on: png-* -> png-1.6.37
===> xfig-3.2.7bp0 depends on: Xaw3d->=1.6 -> Xaw3d-1.6.3
===>  Verifying specs:  X11 Xaw3d Xpm Xt c jpeg m png
===>  found X11.17.0 Xaw3d.12.0 Xpm.9.0 Xt.11.0 c.96.0 jpeg.70.0 m.10.1 png.18.0
Xaw3d-1.6.3
groff-1.22.4p0
jpeg-2.0.3v0
png-1.6.37
transfig-3.2.7b
xz-5.2.4
(Junk lock released for i386-3 at 1574028875.92)
distfiles size=5059984
checksum for /mnt/distfiles/xfig-3.2.7b.tar.xz: UNKNOWN (uncached)
>>> Running checksum in graphics/xfig at 1574028875.95
checksum for /mnt/distfiles/xfig-3.2.7b.tar.xz: OK
Warning: unable to close filehandle $fh properly: Stale NFS file handle during 
global destruction.
>>> Running build in graphics/xfig at 1574028876.62
===> graphics/xfig
===>  Checking files for xfig-3.2.7bp0
`/mnt/distfiles/xfig-3.2.7b.tar.xz' is up to date.
>> (SHA256) xfig-3.2.7b.tar.xz: OK
===>  Extracting for xfig-3.2.7bp0
===>  Patching for xfig-3.2.7bp0
===>   Applying OpenBSD patch patch-fig_h
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-fig_h,v 1.4 2017/02/01 10:09:58 kirby Exp $
|--- src/fig.h.orig Mon Jun 20 22:29:39 2016
|+++ src/fig.h  Thu Dec 22 12:32:54 2016
--
Patching file src/fig.h using Plan A...
Hunk #1 succeeded at 149.
done
===>   Applying OpenBSD patch patch-src_d_text_c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-src_d_text_c,v 1.2 2019/11/13 15:26:47 fcambus Exp $
|
|Index: src/d_text.c
|--- src/d_text.c.orig
|+++ src/d_text.c
--
Patching file src/d_text.c using Plan A...
Hunk #1 succeeded at 2166.
done
===>   Applying OpenBSD patch patch-u_error_c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-u_error_c,v 1.2 2017/02/01 10:09:58 kirby Exp $
|
|Avoids null deref->segfault->core seen if you exit by closing the window.
|
|--- src/u_error.c.orig Thu May  5 00:05:10 2016
|+++ src/u_error.c  Thu Dec 22 12:22:20 2016
--
Patching file src/u_error.c using Plan A...
Hunk #1 succeeded at 65.
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 xfig-3.2.7bp0
===>  Configuring for xfig-3.2.7bp0
Using /pobj/xfig-3.2.7b/config.site (generated)
configure: WARNING: unrecognized options: --disable-gtk-doc
configure: loading site script /pobj/xfig-3.2.7b/config.site
checking for a BSD-compatible install... /pobj/xfig-3.2.7b/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... mkdir -p
checking for gawk... (cached) awk
checking whether make sets $(MAKE)... (cached) yes
checking whether make supports nested variables... yes
checking for gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of exe

Re: CVS: cvs.openbsd.org: ports

2019-11-16 Thread Kurt Mosiejczuk
On Sat, Nov 16, 2019 at 09:16:16PM -0700, Kurt Mosiejczuk wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2019/11/16 21:16:16
> 
> Modified files:
>   www/py-soupsieve: Makefile distinfo 
> 
> Log message:
> Update www/py-soupsieve 4.7.1 -> 4.8.1

> From Paco Esteban. Thanks yet again!

Got version numbers mixed up with the next update from Paco Esteban.

This went from 1.9.2 to 1.9.5



Re: CVS: cvs.openbsd.org: ports

2019-11-16 Thread Antoine Jacoutot
On Sat, Nov 16, 2019 at 10:47:28AM -0700, Antoine Jacoutot wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ajacou...@cvs.openbsd.org   2019/11/16 10:47:28
> 
> Modified files:
>   devel  : Makefile 
> Removed files:
>   devel/goffice08: Makefile distinfo 
>   devel/goffice08/patches: patch-configure 
>patch-docs_reference_Makefile_in 
>patch-goffice_utils_regutf8_c 
>   devel/goffice08/pkg: DESCR PLIST 
> 
> Log message:
> Remove goffice08, last consumer is gone (devel/goffice08).

Last consumer was productivity/grisbi

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2019-11-14 Thread Stuart Henderson
On 2019/11/14 14:43, Klemens Nanni wrote:
> mandoc: ./reposync.1:69:5: STYLE: possible typo in section name: Sh EXAMPLE 
> instead of EXAMPLES

That was intentional as there is only one example.



<    5   6   7   8   9   10   11   12   13   14   >