Re: new: games/barony

[David CARLIER]

Why not but would like to take maintainer ship here. Regards.

On 1 May 2018 at 03:49, Brian Callahan  wrote:

>
> On 04/30/18 18:57, David CARLIER wrote:
>
>> A small update to install instead into ${LOCALBASE}/share/barony as
>> request
>> by @bcallah.
>>
>
> Attached is a better version with fixes and a proper pkg/README.
>
> OK?
>
> ~Brian
>
>
> On 30 April 2018 at 21:35, Brian Callahan  wrote:
>>
>> (Responding from my phone so apologies)
>>> Download the Linux version and extract it with unzip.
>>>
>>>
>>>
>>> Sent from my Verizon, Samsung Galaxy smartphone
>>>
>>>  Original message 
>>> From: David CARLIER 
>>> Date: 4/30/18 2:10 PM (GMT-05:00)
>>> To: Timo Myyrä 
>>> Cc: Solene Rapenne , OpenBSD ports 
>>> Subject: Re: new: games/barony
>>>
>>> I checked the Gog com ... do not find the folders needed to get started
>>> the
>>> game ! e.g images maps items music sounds lang ...
>>>
>>> On 30 April 2018 at 15:05, Timo Myyrä  wrote:
>>>
>>> David CARLIER  writes:

 Thanks for the feedback, in case you can always force the Debug mode
>
 via
>>>
 cmake e.g. -DCMAKE_BUILD_TYPE=Debug
> If I recall correctly you re running it into ppc arch ? Would like to
>
 see
>>>
 classic x86 archs users feedbacks too.
> Will try myself in some hours.
>
> On 30 April 2018 at 11:01, Solene Rapenne  wrote:
>
> Thomas Frohwein writes:
>>
>> On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:
>>>
>>> I tried it on amd64 - installed the package, downloaded Barony:
>>>
>> Cursed
>>>
 Edition
>>
>>> from gog.com, innoextract, then copied all the game files to
>>> /usr/local/share/games/barony. It counts through all the
>>>
>> 400-something
>>>
 assets
>>
>>> that it loads, but afterwards just exits without any error.
>>>
>>> The version on gog.com is listed as 2.0.7 and is probably
>>>
>> outdated. I
>>>
 think
>>
>>> a README with some details on this and maybe the game data folder
>>>
>> may
>>>
 be

> useful.
>>>
>>> I'll probably have to wait for an update on gog.com before being
>>>
>> able
>>>
 to test.
>>
>> GOG now has 3.1.4 version. I still can't get the game to work, using
>> latest port version.
>>
>> I did :
>>
>>  $ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
>>  $ doas rsync -av tmp/ /usr/local/share/games/barony/
>>  $ barony
>>  [12-58-43] Data path is /usr/local/share/games/barony
>>  $ echo $?
>>  $ 1
>>
>> I don't succeed having a backtrace with gdb.
>>
>> Same issue seems to happen on amd64 here.
 Haven't tested yet with debug build.

 Timo


>

Ocaml and OPAM

[Adam Steen]

Good Morning

I have recently started using ocaml and opam on OpenBSD, but some the packages 
i use need Ocaml 4.06, i use opam switch to update.

I was just wondering if anyone is working on updating Ocaml and with the soon 
to be release OPAM 2, updating opam?

I know chrisz@ looks after OPAM and avsm@ looks after ocaml.

If no one is, was just wondering the best process to update ocaml?

Cheers
Adam

NEW: devel/samurai

[Brian Callahan]

Hi ports --

Attached is a new port, devel/samurai. Samurai is a ninja-compatible 
build tool written in C.


---
pkg/DESCR:
samurai is a ninja-compatible build tool written in C99 with a focus on
simplicity, speed, and portability.

samurai implements the ninja build language through version 1.8.2. It
uses the same format for .ninja_log and .ninja_deps as ninja, currently
version 5 and 3 respectively.

It is largely feature-complete and supports most of the same options as
ninja.
---

Samurai can be used as a drop-in replacement for Ninja with CMake. 
Notably, samurai does not do the random build order thing that ninja 
does, but samurai has built everything I have thrown at it without 
issue. To make testing easy, I'm including a patch for cmake.port.mk -- 
then all you have to do is go to a port that uses cmake and add 
USE_SAMURAI=Yes to the port Makefile. Note that I am not seriously 
proposing to commit the cmake.port.mk change, unless people think that 
it'd be useful to have a backup to ninja.


OK?

~Brian



samurai.tgz
Description: Binary data
Index: cmake.port.mk
===
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.63
diff -u -p -r1.63 cmake.port.mk
--- cmake.port.mk	26 Jan 2018 13:11:14 -	1.63
+++ cmake.port.mk	1 May 2018 03:51:27 -
@@ -8,12 +8,17 @@ MAKE_ENV+=LIB${_n}_VERSION=${_v}
 .endfor
 
 USE_NINJA ?= Yes
+USE_SAMURAI ?= No
 
 # XXX: Ninja is broken on m88k
 .if ${MACHINE_ARCH} == "m88k"
 USE_NINJA = No
 .endif
 
+.if ${USE_SAMURAI:L} == "yes"
+USE_NINJA = No
+.endif
+
 .if ${USE_NINJA:L} == "yes"
 BUILD_DEPENDS += devel/ninja>=1.5.1
 _MODCMAKE_GEN = Ninja
@@ -25,6 +30,34 @@ MODCMAKE_INSTALL_TARGET = cd ${WRKBUILD}
 	${FAKE_SETUP} ${NINJA} ${NINJA_FLAGS} ${FAKE_TARGET}
 MODCMAKE_TEST_TARGET = cd ${WRKBUILD} && exec ${SETENV} ${ALL_TEST_ENV} \
 	${NINJA} ${NINJA_FLAGS} ${TEST_FLAGS} ${TEST_TARGET}
+
+.if !target(do-build)
+do-build:
+	@${MODCMAKE_BUILD_TARGET}
+.endif
+
+.if !target(do-install)
+do-install:
+	@${MODCMAKE_INSTALL_TARGET}
+.endif
+
+.if !target(do-test)
+do-test:
+	@${MODCMAKE_TEST_TARGET}
+.endif
+
+.elif ${USE_SAMURAI:L} == "yes"
+BUILD_DEPENDS += devel/samurai
+_MODCMAKE_GEN = Ninja
+SAMURAI ?= samu
+SAMURAI_FLAGS ?= -v -j ${MAKE_JOBS}
+CONFIGURE_ARGS += -DCMAKE_MAKE_PROGRAM:String=${SAMURAI}
+MODCMAKE_BUILD_TARGET = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
+	${SAMURAI} ${SAMURAI_FLAGS} ${ALL_TARGET}
+MODCMAKE_INSTALL_TARGET = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
+	${FAKE_SETUP} ${SAMURAI} ${SAMURAI_FLAGS} ${FAKE_TARGET}
+MODCMAKE_TEST_TARGET = cd ${WRKBUILD} && exec ${SETENV} ${ALL_TEST_ENV} \
+	${SAMURAI} ${SAMURAI_FLAGS} ${TEST_FLAGS} ${TEST_TARGET}
 
 .if !target(do-build)
 do-build:

Re: new: games/barony

[Brian Callahan]

On 04/30/18 18:57, David CARLIER wrote:

A small update to install instead into ${LOCALBASE}/share/barony as request
by @bcallah.


Attached is a better version with fixes and a proper pkg/README.

OK?

~Brian


On 30 April 2018 at 21:35, Brian Callahan  wrote:


(Responding from my phone so apologies)
Download the Linux version and extract it with unzip.



Sent from my Verizon, Samsung Galaxy smartphone

 Original message 
From: David CARLIER 
Date: 4/30/18 2:10 PM (GMT-05:00)
To: Timo Myyrä 
Cc: Solene Rapenne , OpenBSD ports 
Subject: Re: new: games/barony

I checked the Gog com ... do not find the folders needed to get started the
game ! e.g images maps items music sounds lang ...

On 30 April 2018 at 15:05, Timo Myyrä  wrote:


David CARLIER  writes:


Thanks for the feedback, in case you can always force the Debug mode

via

cmake e.g. -DCMAKE_BUILD_TYPE=Debug
If I recall correctly you re running it into ppc arch ? Would like to

see

classic x86 archs users feedbacks too.
Will try myself in some hours.

On 30 April 2018 at 11:01, Solene Rapenne  wrote:


Thomas Frohwein writes:


On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:

I tried it on amd64 - installed the package, downloaded Barony:

Cursed

Edition

from gog.com, innoextract, then copied all the game files to
/usr/local/share/games/barony. It counts through all the

400-something

assets

that it loads, but afterwards just exits without any error.

The version on gog.com is listed as 2.0.7 and is probably

outdated. I

think

a README with some details on this and maybe the game data folder

may

be

useful.

I'll probably have to wait for an update on gog.com before being

able

to test.

GOG now has 3.1.4 version. I still can't get the game to work, using
latest port version.

I did :

 $ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
 $ doas rsync -av tmp/ /usr/local/share/games/barony/
 $ barony
 [12-58-43] Data path is /usr/local/share/games/barony
 $ echo $?
 $ 1

I don't succeed having a backtrace with gdb.


Same issue seems to happen on amd64 here.
Haven't tested yet with debug build.

Timo





barony.tgz
Description: Binary data

[New] citra - 3DS emulator

[Thomas Frohwein]

Please find attached this port of the 3DS emulator citra. It can run homebrew
and other 3DS roms. Comes with a commandline binary (citra) and a Qt one
(citra-qt). Like many other emulators, it requires USE_WXNEEDED to run
unfortunately. Based on my testing, the emulation speed seems good for 2D
games, but 3D games run a little sluggish on this i7-6820HQ with Intel HD
Graphics 530.

A few notes on the port:

- versioning - right now based on numbering of nightly (670). Alternatives might
  be the date of the nightly, e.g. 20180427. Let me know if there's a
  preference.
- listed license information on all relevant builtin libs. Let me know if this
  is too detailed.
- I tried to disable builtin dependencies where possible, like cryptopp and
  enet.
- I can't get soundtouch from ports to work because of a type incompatibility
  short* vs. float* (same problem exists for dolphin emulator). Apparently
  these ports are set up for integer samples, while our ports version is not
  (additional information can be found here:
  https://www.surina.net/soundtouch/README.html
  under 3.1 Supported sample data formats for anyone who might be luckier than
  me in troubleshooting this).
- The inclusion of submodules follows the way it's been done with
  emulators/ppsspp.
- I disabled WebService which is for telemetry and pulls in additional
  dependencies.

I put my fastmail email address as maintainer email. I'm planning to switch all
the ports with my ymail address to this one over time. Will keep ymail address
still available for the lifecycle of 6.3.

All tests pass in 'make test'.


citra.tgz
Description: Binary data

Re: [Patch] Python for non wxallowed /usr/local

[Leonid Bobrov]

Then I beg you for patches. Good luck!

Re: [Patch] Python for non wxallowed /usr/local

[IL Ka]

I was trying to say that port maintainer added wxneded to python and fixed
issues with packages
that use WX (i.e. py- cryptography). I assume they did not work without of
it.
And now they work for python running in  /usr/local (because it is
wxallowed by default).
I am not native English speaker, so I have some problems expressing my
thoughts. Sorry.

> My patch may and will break ports which depend on W|X,
And with out of it virtualenv (one of the most used packages) is broken.

If we keep default python with wxneeded then nothing will brake, right?
And those, who need virtualenv will have ability to simply "pk_add
python3-nowx".

Now they have to rebuild python from ports disabling USE_WXNEEDED manually,
which could be cumbersome (i.e. I do not have ports on server, I need to
build package on another machine, update it etc).

>From my point of view that is what happens:
1) secuirity is slightly decreased because we run wxenabled app on
wxallowed /usr/local by default
2) one of the most popular packages is broken (virtualenv in home does not
work)

Re: [Patch] Python for non wxallowed /usr/local

[Daniel Jakots]

On Tue, 1 May 2018 03:13:23 +0300, IL Ka 
wrote:

> To fix it, I rebuild python from ports using USE_WXNEEDED=no
> It solved my problem, but I do not want to build Python from ports,
> so better solution would be to
> * Accept your patch and create 2 flavors of python
> * Or set USE_WXNEEDED=no by default

Can you stop being selfish for a minute and quit being focused on your
sole usage?

> Virtualenv is de-facto standard, it is not good to break it
> because some modules need WX.

But I guess it's perfectly fine to break other usage than yours.

Stop talking and start working on patches that would be accepted (read
sthen's email in this thread for the guidance).

Re: [Patch] Python for non wxallowed /usr/local

[mazocomp]

On Tue, May 01, 2018 at 03:13:23AM +0300, IL Ka wrote:
> Hi,
> 
> > Can you please give me a link to fix?
> Sorry, I misunderstood you.
> 
You said "thank you for fixing py-cryptography".
I didn't notice that fix.

> I run snapshot and it has wxallowed for /usr/local by default (I haven't
> touched it).
> $ grep wxallowed /etc/fstab
> 4154a363527e316f.h /usr/local ffs rw,wxallowed,nodev 1 2
> 
> python is wxneeded since 2016 in OpenBSD:
> https://github.com/openbsd/ports/blame/master/lang/python/Makefile.inc#L127
> 
> $ readelf -a $(which python3)  | grep WX
>   OPENBSD_WXNEED 0x 0x 0x
> 
> So, it now works perfectly.
> 
> But virtualenv is broken because it copies file to my home,
> and /home is not wxallowed.
> 
> I do not use any package that needs WX, so I am not able to use virtualenv
> for no good reason.
> 
> To fix it, I rebuild python from ports using USE_WXNEEDED=no
> It solved my problem, but I do not want to build Python from ports,
> so better solution would be to
> * Accept your patch and create 2 flavors of python
> * Or set USE_WXNEEDED=no by default
> 
> Virtualenv is de-facto standard, it is not good to break it
> because some modules need WX.
> 
> And enabling "wxneeded" for python generally decreases security.
> 
> >  it's better to patch W|X ports
> Yes, but is not it better to disable wxneeded and then try to patch them
> or create two flavors until they are fixed?
> 
My patch may and will break ports which depend on W|X,
so that users have to manually install wx flavor.

> Ilya.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/30 18:18:21

Modified files:
sysutils/boar  : Makefile 

Log message:
Unbreak, this needs python for building (compilall.y).
make show=BUILD_DEPENDS is a good hint when you want to make sure BDEP are
what you think they are.
Remove useless MODPY_DEFAULT_VERSION.
There are some weird @comment handling in the PLIST but that's a fight for
another day.

Re: [Patch] Python for non wxallowed /usr/local

[IL Ka]

Hi,

> Can you please give me a link to fix?
Sorry, I misunderstood you.

I run snapshot and it has wxallowed for /usr/local by default (I haven't
touched it).
$ grep wxallowed /etc/fstab
4154a363527e316f.h /usr/local ffs rw,wxallowed,nodev 1 2

python is wxneeded since 2016 in OpenBSD:
https://github.com/openbsd/ports/blame/master/lang/python/Makefile.inc#L127

$ readelf -a $(which python3)  | grep WX
  OPENBSD_WXNEED 0x 0x 0x

So, it now works perfectly.

But virtualenv is broken because it copies file to my home,
and /home is not wxallowed.

I do not use any package that needs WX, so I am not able to use virtualenv
for no good reason.

To fix it, I rebuild python from ports using USE_WXNEEDED=no
It solved my problem, but I do not want to build Python from ports,
so better solution would be to
* Accept your patch and create 2 flavors of python
* Or set USE_WXNEEDED=no by default

Virtualenv is de-facto standard, it is not good to break it
because some modules need WX.

And enabling "wxneeded" for python generally decreases security.

>  it's better to patch W|X ports
Yes, but is not it better to disable wxneeded and then try to patch them
or create two flavors until they are fixed?

Ilya.

new misc/posixtestsuite

[Alexander Bluhm]

Hi,

I would like to run the POSIX test suite within OpenBSD regress.
The easiest way to import and compile the tests seems to be a port.
Note that there are a lot of C tests that do not compile.  The build
error is not fatal, it generates just a log messages.

The package contains the sources, the build output and the successfully
created test binaries.  This allows run the tests and post process
the results.

Comment:
open POSIX test suite

Description:
The Open POSIX Test Suite is a test suite for POSIX 2001 APIs, not
tied to specific implementations.  It provides conformance, functional,
and stress testing.  Initial focus is on Threads, Clocks & Timers,
Signals, Message Queues, and Semaphores.

To run POSIX test suite on a regular basis as a OpenBSD regression
test, compile the software as a port.  All files needed to run the
tests are installed as package.  The port specific tool posixtestsuite
creates a run time environment, runs the tests, and stores the
results in the current directory.

ok?

bluhm


posixtestsuite.tgz
Description: application/tar-gz

Re: [Patch] Python for non wxallowed /usr/local

[mazocomp]

On Mon, Apr 30, 2018 at 03:22:21PM -0700, Il Ka wrote:
> Thank you for fixing  py-cryptography in /usr/local, 
> but we now have python that can't be launched from home
> (because it is not wxallowed).
> 
Hi!

Can you please give me a link to fix?
(I hope you didn't say sarcasm)

> And it breaks virtualenv:
> https://marc.info/?l=openbsd-misc=152510694522191=2
> 
> virtualenv is used by almost any python developer, and we rendered
> it to unusable, unless one mount home with wxallowed
> or rebuild python from ports disabling this option.
> 
> Even if I do not need py-cryptography I have to pay the price.
> 
> Could we please create two flavors or revert this change?
> I can create patch and send it to port maintainer.
> 
This part seems to be complicated, it's better to patch
W|X ports to get rid of USE_WXNEEDED in Python.

> 
> 
> --
> Sent from: 
> http://openbsd-archive.7691.n7.nabble.com/openbsd-user-ports-f108501.html
> 

Re: [Patch] Python for non wxallowed /usr/local

[Il Ka]

Thank you for fixing  py-cryptography in /usr/local, 
but we now have python that can't be launched from home
(because it is not wxallowed).

And it breaks virtualenv:
https://marc.info/?l=openbsd-misc=152510694522191=2

virtualenv is used by almost any python developer, and we rendered
it to unusable, unless one mount home with wxallowed
or rebuild python from ports disabling this option.

Even if I do not need py-cryptography I have to pay the price.

Could we please create two flavors or revert this change?
I can create patch and send it to port maintainer.



--
Sent from: 
http://openbsd-archive.7691.n7.nabble.com/openbsd-user-ports-f108501.html

Re: new: games/barony

[David CARLIER]

A small update to install instead into ${LOCALBASE}/share/barony as request
by @bcallah.

On 30 April 2018 at 21:35, Brian Callahan  wrote:

> (Responding from my phone so apologies)
> Download the Linux version and extract it with unzip.
>
>
>
> Sent from my Verizon, Samsung Galaxy smartphone
>
>  Original message 
> From: David CARLIER 
> Date: 4/30/18 2:10 PM (GMT-05:00)
> To: Timo Myyrä 
> Cc: Solene Rapenne , OpenBSD ports 
> Subject: Re: new: games/barony
>
> I checked the Gog com ... do not find the folders needed to get started the
> game ! e.g images maps items music sounds lang ...
>
> On 30 April 2018 at 15:05, Timo Myyrä  wrote:
>
> > David CARLIER  writes:
> >
> > > Thanks for the feedback, in case you can always force the Debug mode
> via
> > > cmake e.g. -DCMAKE_BUILD_TYPE=Debug
> > > If I recall correctly you re running it into ppc arch ? Would like to
> see
> > > classic x86 archs users feedbacks too.
> > > Will try myself in some hours.
> > >
> > > On 30 April 2018 at 11:01, Solene Rapenne  wrote:
> > >
> > >>
> > >> Thomas Frohwein writes:
> > >>
> > >> > On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:
> > >> >
> > >> > I tried it on amd64 - installed the package, downloaded Barony:
> Cursed
> > >> Edition
> > >> > from gog.com, innoextract, then copied all the game files to
> > >> > /usr/local/share/games/barony. It counts through all the
> 400-something
> > >> assets
> > >> > that it loads, but afterwards just exits without any error.
> > >> >
> > >> > The version on gog.com is listed as 2.0.7 and is probably
> outdated. I
> > >> think
> > >> > a README with some details on this and maybe the game data folder
> may
> > be
> > >> > useful.
> > >> >
> > >> > I'll probably have to wait for an update on gog.com before being
> able
> > >> to test.
> > >>
> > >> GOG now has 3.1.4 version. I still can't get the game to work, using
> > >> latest port version.
> > >>
> > >> I did :
> > >>
> > >> $ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
> > >> $ doas rsync -av tmp/ /usr/local/share/games/barony/
> > >> $ barony
> > >> [12-58-43] Data path is /usr/local/share/games/barony
> > >> $ echo $?
> > >> $ 1
> > >>
> > >> I don't succeed having a backtrace with gdb.
> > >>
> >
> > Same issue seems to happen on amd64 here.
> > Haven't tested yet with debug build.
> >
> > Timo
> >
>


barony.tar
Description: Unix tar archive

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 15:58:04

Modified files:
infrastructure/bin: update-plist 

Log message:
for now, just keep @mandir, @fontdir, etc as they are...
FS2 does not know enough yet.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 15:47:50

Modified files:
infrastructure/bin: update-plist 

Log message:
bleh the SUBST_VARS is ^BASE_PKGPATH, so don't

Re: new: games/barony

[Solene Rapenne]

David CARLIER writes:

> @bcallah found out the Linux version is ok (we both checked the windows
> version) from the previous comments all the assets are inside
> data/noarch/game subfolder
>
> On 30 April 2018 at 22:29, Solene Rapenne  wrote:
>
>>
>> David CARLIER writes:
>>
>> > I checked the Gog com ... do not find the folders needed to get started
>> the
>> > game ! e.g images maps items music sounds lang ...
>> >
>>
>> So, I assume that the port is not usable by GOG customers ? :/
>>

I saw bcallah@ mail a few minutes after sending mine. I used unzip on
the linux version, the game works! I will take a look on the port itself
now.

Re: new: games/barony

[David CARLIER]

@bcallah found out the Linux version is ok (we both checked the windows
version) from the previous comments all the assets are inside
data/noarch/game subfolder

On 30 April 2018 at 22:29, Solene Rapenne  wrote:

>
> David CARLIER writes:
>
> > I checked the Gog com ... do not find the folders needed to get started
> the
> > game ! e.g images maps items music sounds lang ...
> >
>
> So, I assume that the port is not usable by GOG customers ? :/
>

Re: new: games/barony

[Solene Rapenne]

David CARLIER writes:

> I checked the Gog com ... do not find the folders needed to get started the
> game ! e.g images maps items music sounds lang ...
>

So, I assume that the port is not usable by GOG customers ? :/

Re: new: games/barony

[David CARLIER]

I was able to run the game with the Linux version indeed thanks ! (from
data/noarch/game/* folder content)

On 30 April 2018 at 21:35, Brian Callahan  wrote:

> (Responding from my phone so apologies)
> Download the Linux version and extract it with unzip.
>
>
>
> Sent from my Verizon, Samsung Galaxy smartphone
>
>  Original message 
> From: David CARLIER 
> Date: 4/30/18 2:10 PM (GMT-05:00)
> To: Timo Myyrä 
> Cc: Solene Rapenne , OpenBSD ports 
> Subject: Re: new: games/barony
>
> I checked the Gog com ... do not find the folders needed to get started the
> game ! e.g images maps items music sounds lang ...
>
> On 30 April 2018 at 15:05, Timo Myyrä  wrote:
>
> > David CARLIER  writes:
> >
> > > Thanks for the feedback, in case you can always force the Debug mode
> via
> > > cmake e.g. -DCMAKE_BUILD_TYPE=Debug
> > > If I recall correctly you re running it into ppc arch ? Would like to
> see
> > > classic x86 archs users feedbacks too.
> > > Will try myself in some hours.
> > >
> > > On 30 April 2018 at 11:01, Solene Rapenne  wrote:
> > >
> > >>
> > >> Thomas Frohwein writes:
> > >>
> > >> > On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:
> > >> >
> > >> > I tried it on amd64 - installed the package, downloaded Barony:
> Cursed
> > >> Edition
> > >> > from gog.com, innoextract, then copied all the game files to
> > >> > /usr/local/share/games/barony. It counts through all the
> 400-something
> > >> assets
> > >> > that it loads, but afterwards just exits without any error.
> > >> >
> > >> > The version on gog.com is listed as 2.0.7 and is probably
> outdated. I
> > >> think
> > >> > a README with some details on this and maybe the game data folder
> may
> > be
> > >> > useful.
> > >> >
> > >> > I'll probably have to wait for an update on gog.com before being
> able
> > >> to test.
> > >>
> > >> GOG now has 3.1.4 version. I still can't get the game to work, using
> > >> latest port version.
> > >>
> > >> I did :
> > >>
> > >> $ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
> > >> $ doas rsync -av tmp/ /usr/local/share/games/barony/
> > >> $ barony
> > >> [12-58-43] Data path is /usr/local/share/games/barony
> > >> $ echo $?
> > >> $ 1
> > >>
> > >> I don't succeed having a backtrace with gdb.
> > >>
> >
> > Same issue seems to happen on amd64 here.
> > Haven't tested yet with debug build.
> >
> > Timo
> >
>

CVS: cvs.openbsd.org: ports

[Todd C . Miller]

CVSROOT:/cvs
Module name:ports
Changes by: mill...@cvs.openbsd.org 2018/04/30 14:55:38

Modified files:
security/sudo  : Makefile distinfo 

Log message:
Update to sudo 1.8.23

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/30 14:40:11

Modified files:
textproc/py-prettytable: Makefile 

Log message:
missing bump after PLIST ordering change

Re: new: games/barony

[Brian Callahan]

(Responding from my phone so apologies)Download the Linux version and extract 
it with unzip.


Sent from my Verizon, Samsung Galaxy smartphone
 Original message From: David CARLIER  
Date: 4/30/18  2:10 PM  (GMT-05:00) To: Timo Myyrä  
Cc: Solene Rapenne , OpenBSD ports  
Subject: Re: new: games/barony 
I checked the Gog com ... do not find the folders needed to get started the
game ! e.g images maps items music sounds lang ...

On 30 April 2018 at 15:05, Timo Myyrä  wrote:

> David CARLIER  writes:
>
> > Thanks for the feedback, in case you can always force the Debug mode via
> > cmake e.g. -DCMAKE_BUILD_TYPE=Debug
> > If I recall correctly you re running it into ppc arch ? Would like to see
> > classic x86 archs users feedbacks too.
> > Will try myself in some hours.
> >
> > On 30 April 2018 at 11:01, Solene Rapenne  wrote:
> >
> >>
> >> Thomas Frohwein writes:
> >>
> >> > On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:
> >> >
> >> > I tried it on amd64 - installed the package, downloaded Barony: Cursed
> >> Edition
> >> > from gog.com, innoextract, then copied all the game files to
> >> > /usr/local/share/games/barony. It counts through all the 400-something
> >> assets
> >> > that it loads, but afterwards just exits without any error.
> >> >
> >> > The version on gog.com is listed as 2.0.7 and is probably outdated. I
> >> think
> >> > a README with some details on this and maybe the game data folder may
> be
> >> > useful.
> >> >
> >> > I'll probably have to wait for an update on gog.com before being able
> >> to test.
> >>
> >> GOG now has 3.1.4 version. I still can't get the game to work, using
> >> latest port version.
> >>
> >> I did :
> >>
> >> $ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
> >> $ doas rsync -av tmp/ /usr/local/share/games/barony/
> >> $ barony
> >> [12-58-43] Data path is /usr/local/share/games/barony
> >> $ echo $?
> >> $ 1
> >>
> >> I don't succeed having a backtrace with gdb.
> >>
>
> Same issue seems to happen on amd64 here.
> Haven't tested yet with debug build.
>
> Timo
>

[update] libconfig 1.7.2

[Landry Breuil]

Hi,

small update with a new upstream website on github (noticed it because
the actual MASTER_SITES is a 404), i've only build-tested all the
consumers (umurmur, eliot, sslh, cvechecker and compton) and they were
fine - please test it if you actually use them !

Landry
? libconfig-1.5-libconfig++.so.10.0
? libconfig-1.5-libconfig.so.10.0
? libconfig-1.7.2-libconfig++.so.10.0
? libconfig-1.7.2-libconfig.so.10.0
Index: Makefile
===
RCS file: /cvs/ports/devel/libconfig/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile26 Jul 2017 22:45:18 -  1.18
+++ Makefile30 Apr 2018 20:15:20 -
@@ -2,22 +2,21 @@
 
 COMMENT=   library for manipulating structured configuration files
 
-DISTNAME=  libconfig-1.5
-REVISION = 1
+DISTNAME=  libconfig-1.7.2
 
-SHARED_LIBS +=  config   10.0 # 11.0
-SHARED_LIBS +=  config++ 10.0 # 11.0
+SHARED_LIBS +=  config   11.0 # 11.2
+SHARED_LIBS +=  config++ 11.0 # 11.2
 
 CATEGORIES=devel
 
-HOMEPAGE=  http://www.hyperrealm.com/libconfig/libconfig.html
+HOMEPAGE=  https://hyperrealm.github.io/libconfig/
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
-MASTER_SITES=  http://www.hyperrealm.com/libconfig/
+MASTER_SITES=  https://hyperrealm.github.io/libconfig/dist/
 
 CONFIGURE_STYLE=   gnu
 
Index: distinfo
===
RCS file: /cvs/ports/devel/libconfig/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo4 Jun 2015 05:26:17 -   1.9
+++ distinfo30 Apr 2018 20:15:20 -
@@ -1,2 +1,2 @@
-SHA256 (libconfig-1.5.tar.gz) = 4x2qOQ2ORGHIgwUS/i4Tuho9agKiMFoCQp7sYeaHA/Y=
-SIZE (libconfig-1.5.tar.gz) = 644432
+SHA256 (libconfig-1.7.2.tar.gz) = fDx6nHP/MwIIQ4bpb5A+tizgaVO7FmYjX6x0NjoW+tk=
+SIZE (libconfig-1.7.2.tar.gz) = 721362
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/libconfig/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST   22 May 2015 11:31:12 -  1.6
+++ pkg/PLIST   30 Apr 2018 20:15:20 -
@@ -2,6 +2,11 @@
 include/libconfig.h
 include/libconfig.h++
 @info info/libconfig.info
+lib/cmake/
+lib/cmake/libconfig/
+lib/cmake/libconfig/libconfigConfig.cmake
+lib/cmake/libconfig++/
+lib/cmake/libconfig++/libconfig++Config.cmake
 lib/libconfig++.a
 lib/libconfig++.la
 @lib lib/libconfig++.so.${LIBconfig++_VERSION}

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 14:15:15

Modified files:
infrastructure/bin: update-plist 

Log message:
fix cleanup, don't reverse params to add, oops

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 14:13:51

Modified files:
infrastructure/bin: update-plist 

Log message:
- introduce a few variables so that the matching code is more regular
- strip @kw from comments while creating a decent path
- DO NOT override comments from existing copied code

Re: NEW: net/frrouting

[Pierre Emeriaud]

2018-04-30 20:43 GMT+02:00 Aaron A. Glenn :
> * Stuart Henderson  [2018-04-30 12:54]:
>>
>> Same root cause for all, there are just a couple of lines that need to
>> be copied over and tweaked from the quagga port.
>>
>
> I managed to figure out alll that was wrong there, but am now presented
> with something wrong in the actual code base itself.
>
> frr# /usr/local/sbin/isisd
> 2018/04/30 17:35:00 errors: ISIS: Failure to chdir to /etc/frr/, errno: 13
> frr# /usr/local/sbin/bgpd
> 2018/04/30 17:35:02 errors: BGP: Failure to chdir to /etc/frr/, errno: 13
> frr# /usr/local/sbin/ospfd
> 2018/04/30 17:35:03 errors: OSPF: Failure to chdir to /etc/frr/, errno: 13

I had those issues with your port earlier today but only when using
rcctl, not when launching the daemons manually.

$ doas rcctl -d start frr_zebra
doing _rc_parse_conf
doing _rc_quirks
frr_zebra_flags >-f /etc/frr/zebra.conf<
doing _rc_parse_conf /var/run/rc.d/frr_zebra
doing _rc_quirks
doing rc_check
frr_zebra
doing rc_start
doing _rc_wait start
doing rc_check
2018/04/30 22:01:27 errors: ZEBRA: Failure to chdir to /etc/, errno: 13
doing _rc_rm_runfile
(failed)

$ doas /usr/local/sbin/zebra -f /etc/frr/zebra.conf
2018/04/30 22:03:11 errors: ZEBRA: if_ioctl(SIOCGIFMEDIA) failed:
Inappropriate ioctl for device
2018/04/30 22:03:11 errors: ZEBRA: if_ioctl(SIOCGIFMEDIA) failed:
Inappropriate ioctl for device
2018/04/30 22:03:11 errors: ZEBRA: if_ioctl(SIOCGIFMEDIA) failed:
Inappropriate ioctl for device
^Z[1] + Suspendeddoas /usr/local/sbin/zebra -f /etc/frr/zebra.co

$ ps aux | grep zeb
_frr  7354  0.0  0.1  1832  5156 p2  T 10:03PM0:00.02
/usr/local/sbin/zebra -f /etc/frr/zebra.conf

(same goes for bgpd, didn't tried the others).

Re: NEW: x11/kde-applications/libkdcraw

[Landry Breuil]

On Mon, Apr 30, 2018 at 08:56:32PM +0300, Vadim Zhukov wrote:
> вс, 29 апр. 2018 г., 11:04 Rafael Sadowski :
> >
> > $ cat x11/kde-applications/libkdcraw/pkg/DESCR
> > Libkdcraw is a C++ interface around LibRaw library used to decode RAW 
> > picture
> > files.
> >
> > Looks simple but it feels like a trap. libkdcraw-17.12.3 has no
> > conflicts with libkdcraw from KDE4 but we can't just commit because all
> > KDE4 applications will grep/find libkdcraw-17.12.3 instead
> > libkdcraw-4.*, which is wrong.
> >
> > Any (simple) clue?
> >
> > Ok to import?
> 
> If you're sure that libkdcraw from KF5 and KDE4 lands co-exist nicely,
> and while we have users for both, just give them different names. Say,
> name new port kf5-libkdcraw, like it's done for some items under
> devel/kf5 already.

Well, imo that's not really necessary if we have the correct use of
@option values, that both can be coinstalled etc. It's ugly to have
prefixes and suffixes everywhere in pkgnames, and makes it harder for
upgrades..

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 13:32:51

Modified files:
infrastructure/bin: update-plist 

Log message:
add annotations like @bin and friends to elements that were not tagged
properly.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 12:52:36

Modified files:
infrastructure/bin: update-plist 

Log message:
document stuff that's known to be done

Re: NEW: net/frrouting

[Aaron A. Glenn]

* Stuart Henderson  [2018-04-30 12:54]:
> 
> Same root cause for all, there are just a couple of lines that need to
> be copied over and tweaked from the quagga port.
> 

I managed to figure out alll that was wrong there, but am now presented
with something wrong in the actual code base itself.

frr# /usr/local/sbin/isisd
2018/04/30 17:35:00 errors: ISIS: Failure to chdir to /etc/frr/, errno: 13
frr# /usr/local/sbin/bgpd  
2018/04/30 17:35:02 errors: BGP: Failure to chdir to /etc/frr/, errno: 13
frr# /usr/local/sbin/ospfd
2018/04/30 17:35:03 errors: OSPF: Failure to chdir to /etc/frr/, errno: 13

ktrace shows me the getcwd(3) call returns permission denied. I am
thoroughly confused as to why

CALL chdir(0x9155366a7d3)
NAMI "/etc/frr/
CALL __getcwd(0x7f7cc6f0,1024)
RET __getcwd -1 errno 13 Permission denied


Pointers appreciated, while I read getcwd(3) & chdir(2) manpages more
carefully than I did the Porting Guide first time around...

Thanks,
Aaron

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 12:49:19

Modified files:
infrastructure/bin: update-plist 

Log message:
so eval{} was a bit strong, check why it can't be where it should

UPDATE devel/git-cola

[Björn Ketelaars]

Diff below brings git-cola to the latest version (3.1). Overview on
fixes and additions can be found at
https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst

- upstream switched to py.test to execute the test suite instead of
  nosetests
- instead of patching Makefile to make it compatible with OpenBSD's
  make just switch to gnake. The patch is too big, and too hard to
  maintain
- drop patch which has been committed upstream

make test runs successfully, and (lightly) tested on amd64.

Comments/OKs?


Index: Makefile
===
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile18 Feb 2018 11:35:48 -  1.21
+++ Makefile30 Apr 2018 18:27:59 -
@@ -2,7 +2,7 @@
 
 COMMENT =  python powered git gui
 
-MODPY_EGG_VERSION= 3.0
+MODPY_EGG_VERSION= 3.1
 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT =   git-cola
@@ -29,7 +29,9 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/py-qt4
 
 TEST_DEPENDS = devel/py-mock \
-   devel/py-nose
+   devel/py-test
+
+USE_GMAKE =Yes
 
 MODPY_ADJ_FILES= share/git-cola/bin/git-xbase
 
Index: distinfo
===
RCS file: /cvs/ports/devel/git-cola/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo18 Feb 2018 11:35:48 -  1.8
+++ distinfo30 Apr 2018 18:27:59 -
@@ -1,2 +1,2 @@
-SHA256 (git-cola-3.0.tar.gz) = YZWPmY1GGOCc4N1HNBGSGBjRPfg48yEC713tmEoNGlA=
-SIZE (git-cola-3.0.tar.gz) = 1218820
+SHA256 (git-cola-3.1.tar.gz) = p6CD+EaXpW7nyRDM/GgNNsXER8a1o1IuAb/53pFHT1c=
+SIZE (git-cola-3.1.tar.gz) = 1179782
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git-cola/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile  18 Feb 2018 11:35:48 -  1.3
+++ patches/patch-Makefile  30 Apr 2018 18:27:59 -
@@ -1,8 +1,6 @@
 $OpenBSD: patch-Makefile,v 1.3 2018/02/18 11:35:48 bket Exp $
 
-Avoid dep on gnu make
-
-Avoid use of nosetest --with-doctest as this causes a regression test to fail
+Avoid use of pytest --with-doctest as this causes a regression test to fail
 with "ImportError (Could not load inotify functions from libc)". Failure is
 caused by the doctest module testing a piece of code that is linux-only. This
 code is not used when running git-cola on OpenBSD.
@@ -10,39 +8,12 @@ code is not used when running git-cola o
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -26,9 +26,6 @@ TAR = tar
- # Flags
+@@ -53,7 +53,7 @@ ifdef V
+ else
+ QUIET = --quiet
+ endif
+-PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE) --doctest-modules
++PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE)
  FLAKE8_FLAGS = --max-line-length=80 --statistics --doctests --format=pylint
  PYLINT_FLAGS = --rcfile=.pylintrc
--ifdef color
--PYLINT_FLAGS += --output-format=colorized
--endif
- 
- # These values can be overridden on the command-line or via config.mak
- prefix = $(HOME)
-@@ -44,7 +41,6 @@ cola_app = $(CURDIR)/$(cola_app_base)
- cola_version = $(shell $(PYTHON) bin/git-cola version --brief)
- cola_dist := $(cola_base)-$(cola_version)
- 
--NOSE_FLAGS = --with-doctest
- NOSE_FLAGS += --with-id
- NOSE_FLAGS += --exclude=sphinxtogithub
- NOSE_FLAGS += --exclude=extras
-@@ -59,16 +55,7 @@ setup_args += --force
- setup_args += --install-scripts=$(bindir)
- setup_args += --record=build/MANIFEST
- setup_args += --install-lib=$(coladir)
--ifdef DESTDIR
--setup_args += --root=$(DESTDIR)
--export DESTDIR
--endif
--export prefix
--
--# If NO_VENDOR_LIBS is specified on the command line then pass it to setup.py
--ifdef NO_VENDOR_LIBS
--setup_args += --no-vendor-libs
--endif
-+setup_args += --root=$(DESTDIR)
- 
- PYTHON_DIRS = cola
- PYTHON_DIRS += test
+ ifdef color
Index: patches/patch-cola_app_py
===
RCS file: /cvs/ports/devel/git-cola/patches/patch-cola_app_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-cola_app_py
--- patches/patch-cola_app_py   18 Feb 2018 11:35:48 -  1.3
+++ patches/patch-cola_app_py   30 Apr 2018 18:27:59 -
@@ -5,7 +5,7 @@ Use ssh-askpass implementation from xeno
 Index: cola/app.py
 --- cola/app.py.orig
 +++ cola/app.py
-@@ -81,7 +81,7 @@ def setup_environment():
+@@ -86,7 +86,7 @@ def setup_environment():
  elif sys.platform == 'darwin':
  askpass = resources.share('bin', 'ssh-askpass-darwin')
  else:
Index: patches/patch-test_git_test_py
===
RCS file: patches/patch-test_git_test_py
diff -N patches/patch-test_git_test_py
--- patches/patch-test_git_test_py  18 Feb 2018 11:35:48 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 12:37:28

Modified files:
infrastructure/bin: update-plist 

Log message:
some keywords change do not happen, because we copy old objects blindly

the way to fix that is known, put a placeholder for now

CVS: cvs.openbsd.org: ports

[Edd Barrett]

CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2018/04/30 12:17:50

Modified files:
textproc   : Makefile 

Log message:
Link the python3 FLAVOR of py-prettytable.

Re: new: games/barony

[David CARLIER]

I checked the Gog com ... do not find the folders needed to get started the
game ! e.g images maps items music sounds lang ...

On 30 April 2018 at 15:05, Timo Myyrä  wrote:

> David CARLIER  writes:
>
> > Thanks for the feedback, in case you can always force the Debug mode via
> > cmake e.g. -DCMAKE_BUILD_TYPE=Debug
> > If I recall correctly you re running it into ppc arch ? Would like to see
> > classic x86 archs users feedbacks too.
> > Will try myself in some hours.
> >
> > On 30 April 2018 at 11:01, Solene Rapenne  wrote:
> >
> >>
> >> Thomas Frohwein writes:
> >>
> >> > On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:
> >> >
> >> > I tried it on amd64 - installed the package, downloaded Barony: Cursed
> >> Edition
> >> > from gog.com, innoextract, then copied all the game files to
> >> > /usr/local/share/games/barony. It counts through all the 400-something
> >> assets
> >> > that it loads, but afterwards just exits without any error.
> >> >
> >> > The version on gog.com is listed as 2.0.7 and is probably outdated. I
> >> think
> >> > a README with some details on this and maybe the game data folder may
> be
> >> > useful.
> >> >
> >> > I'll probably have to wait for an update on gog.com before being able
> >> to test.
> >>
> >> GOG now has 3.1.4 version. I still can't get the game to work, using
> >> latest port version.
> >>
> >> I did :
> >>
> >> $ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
> >> $ doas rsync -av tmp/ /usr/local/share/games/barony/
> >> $ barony
> >> [12-58-43] Data path is /usr/local/share/games/barony
> >> $ echo $?
> >> $ 1
> >>
> >> I don't succeed having a backtrace with gdb.
> >>
>
> Same issue seems to happen on amd64 here.
> Haven't tested yet with debug build.
>
> Timo
>

Re: NEW: x11/kde-applications/libkdcraw

[Vadim Zhukov]

вс, 29 апр. 2018 г., 11:04 Rafael Sadowski :
>
> $ cat x11/kde-applications/libkdcraw/pkg/DESCR
> Libkdcraw is a C++ interface around LibRaw library used to decode RAW picture
> files.
>
> Looks simple but it feels like a trap. libkdcraw-17.12.3 has no
> conflicts with libkdcraw from KDE4 but we can't just commit because all
> KDE4 applications will grep/find libkdcraw-17.12.3 instead
> libkdcraw-4.*, which is wrong.
>
> Any (simple) clue?
>
> Ok to import?

If you're sure that libkdcraw from KF5 and KDE4 lands co-exist nicely,
and while we have users for both, just give them different names. Say,
name new port kf5-libkdcraw, like it's done for some items under
devel/kf5 already.

Re: [UPDATE] games/cataclysm-dda to 20180421

[trondd]

Poke!

On Thu, April 26, 2018 8:10 pm, trondd wrote:
> Update to a recent commit with lots of updates.
> Some highlights include:
>
> Updatse to the ChestHole tileset
> New 'seeds' category
> Cash cards are finally displayed in dollars instead of cents.
> Removed prepper house as a starting location so you don't step on a
> landmine and die on your first move
> Cars now have dashboards
> Fix to low level mutations
> Translations updates
> NPCs more intelligently run from explosives
> Replaced loose pickels with jars of pickels
> Speedloaders
> More reasonable nutrition from mustard and mayonnaise
> Morale crafting speed penalty
> Play Now! mode
> Railroads
> Scope recipes
>
> Tim.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile  5 Mar 2018 09:44:06 -   1.4
> +++ Makefile  26 Apr 2018 23:32:40 -
> @@ -1,12 +1,12 @@
>  # $OpenBSD: Makefile,v 1.4 2018/03/05 09:44:06 sthen Exp $
>
>  COMMENT= rogue-like zombie survival game
> -DISTNAME=cataclysm-dda-2018.02.01
> +DISTNAME=cataclysm-dda-2018.04.21
>  CATEGORIES=  games
>
>  GH_ACCOUNT=  CleverRaven
>  GH_PROJECT=  Cataclysm-DDA
> -GH_COMMIT=   cf64a8836391ba742ce1eca500e1e0409a654d83
> +GH_COMMIT=   4f7da1ef4d04be66a9b81dec3e5470c15772bef0
>
>  HOMEPAGE=http://en.cataclysmdda.com
>  MAINTAINER=  Tim Meunier 
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  5 Mar 2018 09:44:06 -   1.3
> +++ distinfo  26 Apr 2018 23:32:40 -
> @@ -1,2 +1,2 @@
> -SHA256 (cataclysm-dda-2018.02.01-cf64a883.tar.gz) =
> PqoXPbvHznM8ezzgbiejZZ7xuyzhI+iyWlBB7bXgHTk=
> -SIZE (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = 60095165
> +SHA256 (cataclysm-dda-2018.04.21-4f7da1ef.tar.gz) =
> inUlKkXT01yZQPNk72rLYyeXYn+c9xEs4tS915L/j60=
> +SIZE (cataclysm-dda-2018.04.21-4f7da1ef.tar.gz) = 60672877
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile5 Mar 2018 09:44:06 -   1.4
> +++ patches/patch-Makefile26 Apr 2018 23:32:40 -
> @@ -37,7 +37,7 @@ Index: Makefile
>   endif
>
>   CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD
> -MP
> -@@ -407,11 +405,6 @@ ifdef MAPSIZE
> +@@ -409,11 +407,6 @@ ifdef MAPSIZE
>   CXXFLAGS += -DMAPSIZE=$(MAPSIZE)
>   endif
>
> @@ -49,7 +49,7 @@ Index: Makefile
>   PKG_CONFIG = $(CROSS)pkg-config
>   SDL2_CONFIG = $(CROSS)sdl2-config
>
> -@@ -716,7 +709,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
> +@@ -718,7 +711,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
>   .PHONY: version json-verify
>   version:
>   @( VERSION_STRING=$(VERSION) ; \
> @@ -57,7 +57,7 @@ Index: Makefile
>   [ -e "$(SRC_DIR)/version.h" ] && OLDVERSION=$$(grep VERSION
> $(SRC_DIR)/version.h|cut -d '"' -f2) ; \
>   if [ "x$$VERSION_STRING" != "x$$OLDVERSION" ]; then echo
> "#define VERSION \"$$VERSION_STRING\"" | tee
> $(SRC_DIR)/version.h ; fi \
>)
> -@@ -770,35 +762,35 @@ distclean:
> +@@ -772,35 +764,35 @@ distclean:
>   bindist: $(BINDIST)
>
>   ifeq ($(TARGETSYSTEM), LINUX)
> @@ -112,7 +112,7 @@ Index: Makefile
>   mkdir -p $(LOCALE_DIR)
>   ifdef LANGUAGES
>   LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
> -@@ -966,11 +958,6 @@ astyle: $(ASTYLED_WHITELIST)
> +@@ -968,11 +960,6 @@ astyle: $(ASTYLED_WHITELIST)
>   astyle-all: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR) $(TOOLSRC)
>   $(ASTYLE_BINARY) --options=.astylerc -n $(SOURCES) $(HEADERS)
>   $(ASTYLE_BINARY) --options=.astylerc -n $(TESTSRC) $(TESTHDR)
> Index: pkg/PFRAG.no-no_x11
> ===
> RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v
> retrieving revision 1.2
> diff -u -p -r1.2 PFRAG.no-no_x11
> --- pkg/PFRAG.no-no_x11   5 Mar 2018 09:44:06 -   1.2
> +++ pkg/PFRAG.no-no_x11   26 Apr 2018 23:32:40 -
> @@ -12,13 +12,13 @@ share/cataclysm-dda/gfx/ChestHole16Tiles
>  share/cataclysm-dda/gfx/ChestHole16Tileset/tiles.png
>  share/cataclysm-dda/gfx/ChestHole16Tileset/tiles24.png
>  share/cataclysm-dda/gfx/ChestHole16Tileset/tileset.txt
> +share/cataclysm-dda/gfx/ChestHole16Tileset/tree.png
>  share/cataclysm-dda/gfx/ChestHole32Tileset/
>  share/cataclysm-dda/gfx/ChestHole32Tileset/fallback.png
>  share/cataclysm-dda/gfx/ChestHole32Tileset/tile_config.json
>  share/cataclysm-dda/gfx/ChestHole32Tileset/tiles.png
>  

CVS: cvs.openbsd.org: ports

[Edd Barrett]

CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2018/04/30 09:52:27

Modified files:
textproc/py-prettytable: Makefile 
textproc/py-prettytable/pkg: PLIST 

Log message:
Add python3 FLAVOR to textproc/py-prettytable.

>From Sebastien Marie. OK danj@, thanks.

Re: NEW: mail/rss2email3

[Solene Rapenne]

Kaashif Hymabaccus writes:

> On Tue, Jan 16, 2018 at 12:14:10AM +, Kaashif Hymabaccus wrote:
>> Ping with a new tarball. The distinfo in the previous one is wrong.
>>
>> --
>> Kaashif Hymabaccus
>> GPG: 3E810B04
>
> Anyone interested in this? Tarball attached.

make test fails for me

Traceback (most recent call last):
  File "test/test.py", line 15, in 
import rss2email.feed as _rss2email_feed
  File "/home/ports/pobj/rss2email3-3.9/rss2email-3.9/rss2email/feed.py", line 
49, in 
import feedparser as _feedparser
ModuleNotFoundError: No module named 'feedparser'

a TEST_DEPENDS is needed here


A few changes are needed in pkg/PLIST too

- remove share/doc/rss2email3/README, because the README from pkg/README
  will be automatically put there-> share/doc/pkg-readmes/${FULLPKGNAME}
- ${MODPY_COMMENT} should be used for directories containing ${MODPY_PYCACHE}

--- pkg/PLIST.orig  Mon Apr 30 17:44:04 2018
+++ pkg/PLIST   Mon Apr 30 17:44:27 2018
@@ -3,7 +3,7 @@
 lib/python${MODPY_VERSION}/site-packages/rss2email/
 
lib/python${MODPY_VERSION}/site-packages/rss2email-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/rss2email/__init__.py
-lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
@@ -33,5 +33,3 @@
 lib/python${MODPY_VERSION}/site-packages/rss2email/version.py
 @man man/man1/r2e3.1
 share/doc/pkg-readmes/${FULLPKGNAME}
-share/doc/rss2email3/
-share/doc/rss2email3/README

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/04/30 09:25:58

Modified files:
converters/p5-JSON-MaybeXS: Makefile distinfo 

Log message:
update p5-JSON-MaybeXS to 1.004000

Re: NEW: mail/rss2email3

[Kaashif Hymabaccus]

On Tue, Jan 16, 2018 at 12:14:10AM +, Kaashif Hymabaccus wrote:
> Ping with a new tarball. The distinfo in the previous one is wrong.
> 
> -- 
> Kaashif Hymabaccus
> GPG: 3E810B04

Anyone interested in this? Tarball attached.

-- 
Kaashif Hymabaccus
GPG: 3E810B04


rss2email3.tgz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/04/30 09:20:43

Modified files:
devel/p5-Data-Random: Makefile distinfo 
devel/p5-Data-Random/pkg: PLIST 

Log message:
update p5-Data-Random to 0.13

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 08:28:21

Modified files:
infrastructure/bin: update-plist 

Log message:
- first support for samples, turns out we track them correctly already
- basic support for sampledir
- mark copied tags as found, because (duh) they've been found.
- perform more surgery on comments, so that @comment some/dir/
works as expected

(missing: mostly @group/@user/@mode)

Re: new: games/barony

[Timo Myyrä]

David CARLIER  writes:

> Thanks for the feedback, in case you can always force the Debug mode via
> cmake e.g. -DCMAKE_BUILD_TYPE=Debug
> If I recall correctly you re running it into ppc arch ? Would like to see
> classic x86 archs users feedbacks too.
> Will try myself in some hours.
>
> On 30 April 2018 at 11:01, Solene Rapenne  wrote:
>
>>
>> Thomas Frohwein writes:
>>
>> > On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:
>> >
>> > I tried it on amd64 - installed the package, downloaded Barony: Cursed
>> Edition
>> > from gog.com, innoextract, then copied all the game files to
>> > /usr/local/share/games/barony. It counts through all the 400-something
>> assets
>> > that it loads, but afterwards just exits without any error.
>> >
>> > The version on gog.com is listed as 2.0.7 and is probably outdated. I
>> think
>> > a README with some details on this and maybe the game data folder may be
>> > useful.
>> >
>> > I'll probably have to wait for an update on gog.com before being able
>> to test.
>>
>> GOG now has 3.1.4 version. I still can't get the game to work, using
>> latest port version.
>>
>> I did :
>>
>> $ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
>> $ doas rsync -av tmp/ /usr/local/share/games/barony/
>> $ barony
>> [12-58-43] Data path is /usr/local/share/games/barony
>> $ echo $?
>> $ 1
>>
>> I don't succeed having a backtrace with gdb.
>>

Same issue seems to happen on amd64 here.
Haven't tested yet with debug build.

Timo

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 07:23:37

Modified files:
infrastructure/bin: update-plist 

Log message:
create cvstags for any fragment we saw that doesn't have one already

Re: update www/sope www/sogo to 4.0.0

[Landry Breuil]

On Fri, Mar 09, 2018 at 11:55:48AM +0100, Sebastian Reitenbach wrote:
> >
> > Wouldn't it be better to use upstream's standard names? Then a simple
> > wildcard works, it matches their usual setup, and you don't have the
> > inconsistency you have here where some files are renamed with
> > -postgres and others aren't.
> 
> 
> yeah, with the loop in my updated version, I use the standard names, and
> I dropped some legacy scripts.

Can you resend the updated version ? it seems it never made it to the
list, and now that i've upgraded my work server to 6.3 i might give it a
shot..

thanks!

Re: new: games/barony

[Solène Rapenne]

Le 2018-04-30 14:08, David CARLIER a écrit :
Thanks for the feedback, in case you can always force the Debug mode 
via

cmake e.g. -DCMAKE_BUILD_TYPE=Debug
If I recall correctly you re running it into ppc arch ? Would like to 
see

classic x86 archs users feedbacks too.
Will try myself in some hours.

On 30 April 2018 at 11:01, Solene Rapenne  wrote:



Thomas Frohwein writes:

> On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:
>
> I tried it on amd64 - installed the package, downloaded Barony: Cursed
Edition
> from gog.com, innoextract, then copied all the game files to
> /usr/local/share/games/barony. It counts through all the 400-something
assets
> that it loads, but afterwards just exits without any error.
>
> The version on gog.com is listed as 2.0.7 and is probably outdated. I
think
> a README with some details on this and maybe the game data folder may be
> useful.
>
> I'll probably have to wait for an update on gog.com before being able
to test.

GOG now has 3.1.4 version. I still can't get the game to work, using
latest port version.

I did :

$ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
$ doas rsync -av tmp/ /usr/local/share/games/barony/
$ barony
[12-58-43] Data path is /usr/local/share/games/barony
$ echo $?
$ 1

I don't succeed having a backtrace with gdb.



I did use an amd64 -current system with a fresh 
/usr/local/share/games/barony

folder. I will try again with the cmake debug flags. :)

Re: NEW: net/frrouting

[Stuart Henderson]

On 2018/04/30 12:57, Pierre Emeriaud wrote:
> 2018-04-30 11:36 GMT+02:00 Aaron A. Glenn :
> > Please DO NOT install this port. Uninstalling will delete your /etc &
> > user. Charitably, I made a mistake.
> 
> Too late.
> 
> I didn't tried to uninstall it yet, and it's on a dev box, so no harm
> done, but a few things I saw:
> 
> - It chowns /etc and /var to _frr:_frr
> - pid files are directly in /var
> - conf files are placed in /etc, overwriting base routing protocol
> daemons configurations.
> - it builds and installs on -current, but doesn't work with supplied rc 
> scripts.
> 
> Thanks for trying to port FRR, but please, not this way :)
> 

Same root cause for all, there are just a couple of lines that need to
be copied over and tweaked from the quagga port.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 06:53:45

Modified files:
infrastructure/bin: update-plist 

Log message:
just keep the file name, MyFile is PkgCreate data we don't care about

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/30 06:46:22

Modified files:
mail/cyrus-imapd: Makefile distinfo 
mail/cyrus-imapd/patches: patch-Makefile_in patch-configure 
  patch-lib_imapoptions 
  patch-man_imapd_conf_5 
mail/cyrus-imapd/pkg: PLIST 

Log message:
Update to cyrus-imapd-3.0.6.

Re: NEW: net/frrouting

[Stuart Henderson]

On 2018/04/30 11:55, Landry Breuil wrote:
> On Mon, Apr 30, 2018 at 09:36:32AM +, Aaron A. Glenn wrote:
> > Please DO NOT install this port. Uninstalling will delete your /etc &
> > user. Charitably, I made a mistake.
> > 
> > DO NOT INSTALL
> > 
> > I will fix, re-test (with a pkg_delete, this time), and re-submit.
> > 
> > DO NOT INSTALL!
> 
> @extraunexec rm -rf ${LOCALSTATEDIR}/*
> @extraunexec rm -rf /var/log/frr/*
> 
> indeed, ouch.
> 

Fortunately @extraunexec is only called automatically with pkg_delete -c.

[update] www/kwebapp to 0.4.8

[Aaron Bieber]

Here is a trivial update to bring kwebapp to the latest. Upstream
changes are:

Repair header inclusion (kcgijson.h requires kcgi.h) for
  kwebapp-c-source(1). Bring up to date with newest ksql,
  which requires the default role have permission to open the
  database. 

OK?

diff --git a/www/kwebapp/Makefile b/www/kwebapp/Makefile
index 59e000f12cb..e79d4daff39 100644
--- a/www/kwebapp/Makefile
+++ b/www/kwebapp/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  web application source generator
 
-DISTNAME = kwebapp-0.4.7
+DISTNAME = kwebapp-0.4.8
 CATEGORIES =   www
 
 HOMEPAGE = https://kristaps.bsd.lv/kwebapp/
diff --git a/www/kwebapp/distinfo b/www/kwebapp/distinfo
index eefe1606a55..310b02ee749 100644
--- a/www/kwebapp/distinfo
+++ b/www/kwebapp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kwebapp-0.4.7.tar.gz) = wT2bDSw6+2NmJnccQcDeOw4D84Em1PPcOqRRzlCOF+4=
-SIZE (kwebapp-0.4.7.tar.gz) = 103325
+SHA256 (kwebapp-0.4.8.tar.gz) = jtUCIoLt66UHVngRvDSQ4bVfUXmcwNkVU9f7Qz+UplU=
+SIZE (kwebapp-0.4.8.tar.gz) = 103546

-- 
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE

Re: UPDATE: graphics/feh 2.23.1 => 2.26

[Paul Irofti]

On Sat, Apr 28, 2018 at 05:15:04PM -0400, Brian Callahan wrote:
> Hi all --
> 
> Attached is an update to graphics/feh. It fixes a bug in the version we have
> according to upstream's changelogs among other added features.
> 
> Additionally, I am hoping we can remove some patches and instead compile
> with a -std=gnu99 flag. It seems like extra work to maintain support for C89
> compilers, and even gcc-3.3.5 has the -std=gnu99 flag.
> 
> OK?

OK

> 
> ~Brian
> 

> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/feh/Makefile,v
> retrieving revision 1.89
> diff -u -p -r1.89 Makefile
> --- Makefile  11 Feb 2018 19:23:49 -  1.89
> +++ Makefile  28 Apr 2018 21:09:49 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= lightweight image viewer
>  
> -DISTNAME=feh-2.23.1
> +DISTNAME=feh-2.26
>  EXTRACT_SUFX=.tar.bz2
>  CATEGORIES=  graphics
>  FIX_EXTRACT_PERMISSIONS=Yes
> @@ -27,12 +27,13 @@ RUN_DEPENDS+= devel/desktop-file-utils \
>  TEST_DEPENDS=devel/p5-Test-Command
>  
>  CFLAGS+= -I${LOCALBASE}/include \
> - -I${X11BASE}/include
> + -I${X11BASE}/include \
> + -std=gnu99
>  LDFLAGS+=-L${LOCALBASE}/lib -L${X11BASE}/lib
>  MAKE_FLAGS=  LDFLAGS="${LDFLAGS}" \
>   man_dir="${DESTDIR}${PREFIX}/man" \
>   example_dir="${DESTDIR}${PREFIX}/share/examples/feh" \
> - exif=1
> + exif=1 verscmp=0
>  FAKE_FLAGS=  PREFIX="${PREFIX}"
>  
>  USE_GMAKE=   Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/feh/distinfo,v
> retrieving revision 1.56
> diff -u -p -r1.56 distinfo
> --- distinfo  11 Feb 2018 19:23:49 -  1.56
> +++ distinfo  28 Apr 2018 21:09:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (feh-2.23.1.tar.bz2) = m8Fk0IY9QSAb0lOiZS3O5YBqnGqLWRi7i6CfzubX6b4=
> -SIZE (feh-2.23.1.tar.bz2) = 2130373
> +SHA256 (feh-2.26.tar.bz2) = sda/3XkGDYZLjv8FuRYVO+BIAZmBSGIBJeOsMfmfbIY=
> +SIZE (feh-2.26.tar.bz2) = 2131837
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/graphics/feh/patches/patch-Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-Makefile
> --- patches/patch-Makefile11 Feb 2018 19:23:49 -  1.7
> +++ patches/patch-Makefile28 Apr 2018 21:09:49 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.7 2018/02/1
>  Index: Makefile
>  --- Makefile.orig
>  +++ Makefile
> -@@ -91,6 +91,7 @@ install-examples:
> +@@ -93,6 +93,7 @@ install-examples:
>   @echo installing examples to ${example_dir}
>   @mkdir -p ${example_dir}
>   @cp examples/* ${example_dir}
> Index: patches/patch-config_mk
> ===
> RCS file: /cvs/ports/graphics/feh/patches/patch-config_mk,v
> retrieving revision 1.9
> diff -u -p -r1.9 patch-config_mk
> --- patches/patch-config_mk   11 Feb 2018 19:23:49 -  1.9
> +++ patches/patch-config_mk   28 Apr 2018 21:09:49 -
> @@ -7,7 +7,7 @@ fix "filelist.c:253:45: error: use of un
>  Index: config.mk
>  --- config.mk.orig
>  +++ config.mk
> -@@ -35,10 +35,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
> +@@ -36,10 +36,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
>   
>   # default CFLAGS
>   CFLAGS ?= -g -O2
> Index: patches/patch-man_feh_pre
> ===
> RCS file: /cvs/ports/graphics/feh/patches/patch-man_feh_pre,v
> retrieving revision 1.41
> diff -u -p -r1.41 patch-man_feh_pre
> --- patches/patch-man_feh_pre 11 Feb 2018 19:23:49 -  1.41
> +++ patches/patch-man_feh_pre 28 Apr 2018 21:09:49 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-man_feh_pre,v 1.41 2018/
>  Index: man/feh.pre
>  --- man/feh.pre.orig
>  +++ man/feh.pre
> -@@ -1088,7 +1088,7 @@ which
> +@@ -1186,7 +1186,7 @@ which
>   defaults to
>   .Pa ~/.config/feh/ .
>   If the files are not found in that directory, it will also try
> Index: patches/patch-src_keyevents_c
> ===
> RCS file: /cvs/ports/graphics/feh/patches/patch-src_keyevents_c,v
> retrieving revision 1.17
> diff -u -p -r1.17 patch-src_keyevents_c
> --- patches/patch-src_keyevents_c 17 Mar 2018 08:30:09 -  1.17
> +++ patches/patch-src_keyevents_c 28 Apr 2018 21:09:49 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_keyevents_c,v 1.17 2
>  Index: src/keyevents.c
>  --- src/keyevents.c.orig
>  +++ src/keyevents.c
> -@@ -225,7 +225,7 @@ void init_keyevents(void) {
> +@@ -226,7 +226,7 @@ void init_keyevents(void) {
>   
>   free(confpath);
>   
> @@ -11,13 +11,3 @@ Index: src/keyevents.c
>   return;
>   
>   while (fgets(line, sizeof(line), conf)) {
> -@@ -390,7 +390,8 @@ void feh_event_handle_keypress(XEvent * ev)
> - 
> - fehkey *feh_str_to_kb(char *action)
> - {
> --for (unsigned int i = 0; 

Re: new: games/barony

[David CARLIER]

Thanks for the feedback, in case you can always force the Debug mode via
cmake e.g. -DCMAKE_BUILD_TYPE=Debug
If I recall correctly you re running it into ppc arch ? Would like to see
classic x86 archs users feedbacks too.
Will try myself in some hours.

On 30 April 2018 at 11:01, Solene Rapenne  wrote:

>
> Thomas Frohwein writes:
>
> > On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:
> >
> > I tried it on amd64 - installed the package, downloaded Barony: Cursed
> Edition
> > from gog.com, innoextract, then copied all the game files to
> > /usr/local/share/games/barony. It counts through all the 400-something
> assets
> > that it loads, but afterwards just exits without any error.
> >
> > The version on gog.com is listed as 2.0.7 and is probably outdated. I
> think
> > a README with some details on this and maybe the game data folder may be
> > useful.
> >
> > I'll probably have to wait for an update on gog.com before being able
> to test.
>
> GOG now has 3.1.4 version. I still can't get the game to work, using
> latest port version.
>
> I did :
>
> $ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
> $ doas rsync -av tmp/ /usr/local/share/games/barony/
> $ barony
> [12-58-43] Data path is /usr/local/share/games/barony
> $ echo $?
> $ 1
>
> I don't succeed having a backtrace with gdb.
>

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2018/04/30 06:06:48

Modified files:
lang/duktape   : Makefile distinfo 

Log message:
Update duktape to 2.2.1.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 06:00:12

Modified files:
infrastructure/bin: update-plist 

Log message:
make it work for gpllibs

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 05:57:40

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

Log message:
- pass DISTORIG and PATCHORIG thru so that update-plist can warn
- pass user options at the end

CVS: cvs.openbsd.org: ports

[Paul Irofti]

CVSROOT:/cvs
Module name:ports
Changes by: piro...@cvs.openbsd.org 2018/04/30 05:57:12

Modified files:
math/gnuplot   : Makefile distinfo 

Log message:
Update gnuplot to 5.2.2.

OK steven@

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 05:56:47

Modified files:
infrastructure/bin: make-plist update-plist 

Log message:
proper display for strange file names

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 05:50:01

Modified files:
infrastructure/bin: update-plist 

Log message:
oops, don't copy unknown objects twice

framework for bad suffixes

textproc/py-prettytable: add python3 FLAVOR

[Sebastien Marie]

Hi,

The following diff adds python3 flavor on textproc/py-prettytable.
It is a required dependency for www/weboob (using python3).

I added a LC_CTYPE=C.UTF-8 in TEST_ENV (when using python3), in order to
let the testsuite to pass all tests.

Without it, 1 test fails (prettytable_test.PrintJapanestTest).

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/textproc/py-prettytable/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile1 Oct 2016 11:54:17 -   1.8
+++ Makefile30 Apr 2018 11:29:36 -
@@ -15,11 +15,18 @@ HOMEPAGE =  https://code.google.com/p/pre
 
 PKG_ARCH = *
 
+FLAVOR ?=
+FLAVORS =  python3
+
 # 3 clause BSD
 PERMIT_PACKAGE_CDROM = Yes
 
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
+
+.if ${FLAVOR:Mpython3}
+TEST_ENV +=LC_CTYPE=C.UTF-8
+.endif
 
 post-install:
chmod -R a+r 
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/prettytable-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-prettytable/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   11 Aug 2012 12:12:00 -  1.1.1.1
+++ pkg/PLIST   30 Apr 2018 11:29:36 -
@@ -1,8 +1,8 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/11 12:12:00 edd Exp $
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}prettytable.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prettytable-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/prettytable-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/prettytable-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/prettytable-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 
lib/python${MODPY_VERSION}/site-packages/prettytable-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/prettytable.py
-lib/python${MODPY_VERSION}/site-packages/prettytable.pyc

Re: new: games/barony

[Solene Rapenne]

Thomas Frohwein writes:

> On Fri, Mar 30, 2018 at 12:42:36AM +0200, Solene Rapenne wrote:
>
> I tried it on amd64 - installed the package, downloaded Barony: Cursed Edition
> from gog.com, innoextract, then copied all the game files to
> /usr/local/share/games/barony. It counts through all the 400-something assets
> that it loads, but afterwards just exits without any error.
>
> The version on gog.com is listed as 2.0.7 and is probably outdated. I think
> a README with some details on this and maybe the game data folder may be
> useful.
>
> I'll probably have to wait for an update on gog.com before being able to test.

GOG now has 3.1.4 version. I still can't get the game to work, using
latest port version.

I did :

$ innoextract 'setup_barony_cursed_edition_3.1.4_(20340).exe'
$ doas rsync -av tmp/ /usr/local/share/games/barony/
$ barony
[12-58-43] Data path is /usr/local/share/games/barony
$ echo $?
$ 1

I don't succeed having a backtrace with gdb.

Re: NEW: net/frrouting

[Pierre Emeriaud]

2018-04-30 11:36 GMT+02:00 Aaron A. Glenn :
> Please DO NOT install this port. Uninstalling will delete your /etc &
> user. Charitably, I made a mistake.

Too late.

I didn't tried to uninstall it yet, and it's on a dev box, so no harm
done, but a few things I saw:

- It chowns /etc and /var to _frr:_frr
- pid files are directly in /var
- conf files are placed in /etc, overwriting base routing protocol
daemons configurations.
- it builds and installs on -current, but doesn't work with supplied rc scripts.

Thanks for trying to port FRR, but please, not this way :)

Re: update misc/most

[Solene Rapenne]

Solene Rapenne writes:

> update 5.0.0a => 5.0.0

bcallah@ pointed me out that 5.0.0a > 5.0.0, I will work to add a
PORTROACH rule in the Makefile.

Re: update lang/sbcl

[Solene Rapenne]

Josh Elsasser writes:

> On Sun, Apr 29, 2018 at 09:47:09AM +0200, Solene Rapenne wrote:
>> 
>> Josh Elsasser writes:
>> 
>> > On Fri, Apr 27, 2018 at 08:56:04PM -0700, Josh Elsasser wrote:
>> >> Patching the i386 and ppc *-arch.c files isn't necessary. However i386
>> >> didn't build for me (in a VM). I think we need to do this in
>> >> patches/patch-src_runtime_bsd-os_c:
>> 
>> Christian Weisgerber reported me that sbcl build was failing on i386
>> with 1.4.6, build log attached to the mail. Maybe sbcl is allocating too
>> much memory, I don't know... I don't have an i386 system at the moment
>> to debug this. Otherwise, next week I will be able to try sbcl on
>> powerpc arch as I am using it daily.
>> 
>
> The failure I was seeing is now fixed upstream, I'm not sure if
> naddy's has the same cause. I'm running a build in a loop under a VM
> to try and reproduce it.

I confirm it compiles fine on powerpc (macppc).

Re: NEW: net/frrouting

[Landry Breuil]

On Mon, Apr 30, 2018 at 09:36:32AM +, Aaron A. Glenn wrote:
> Please DO NOT install this port. Uninstalling will delete your /etc &
> user. Charitably, I made a mistake.
> 
> DO NOT INSTALL
> 
> I will fix, re-test (with a pkg_delete, this time), and re-submit.
> 
> DO NOT INSTALL!

@extraunexec rm -rf ${LOCALSTATEDIR}/*
@extraunexec rm -rf /var/log/frr/*

indeed, ouch.

Re: NEW: net/frrouting

[Aaron A. Glenn]

Please DO NOT install this port. Uninstalling will delete your /etc &
user. Charitably, I made a mistake.

DO NOT INSTALL

I will fix, re-test (with a pkg_delete, this time), and re-submit.

DO NOT INSTALL!

* Aaron A. Glenn  [2018-04-29 13:33]:
> Hello,
> 
> Long time listener; first time caller.
> 
> Attached is a port of FreeRangeRouting, with a snmp flavor. I have
> confirmed it builds, and the resulting package installs, successfully on
> 6.3-RELEASE/amd64. Despite my best efforts, and endless questions to
> phessler@, there is substantial chance I overlooked something.
> 
> Please let me know what, if so.
> 
> Best,
> Aaron A. Glenn

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2018/04/30 03:46:51

Modified files:
devel/apktool  : Makefile distinfo 

Log message:
bugfix update apktool to 2.3.3.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/30 03:37:15

Modified files:
security/py-M2Crypto: Makefile distinfo 

Log message:
update to py-M2Crypto-0.30.1

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/30 03:29:12

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

Log message:
okay, this time around, there will be tweakable parts...

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/30 03:17:11

Modified files:
math/gnumeric  : Makefile distinfo 
math/gnumeric/patches: patch-doc_Makefile_in 
math/gnumeric/pkg: PLIST 

Log message:
Update to gnumeric-1.12.40.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/30 03:16:53

Modified files:
devel/goffice  : Makefile distinfo 

Log message:
Update to goffice-0.10.40.

Re: [armv7 fix] Fix build lang/gcc/4.9

[Markus Hennecke]

On Mon, 30 Apr 2018, Pascal Stumpf wrote:
> Haven't managed to get my version working properly yet.  So OK for
> Markus' patch.

There is already a working version of your patch in the tree: 
https://marc.info/?l=openbsd-ports=152493359410874=2

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/30 03:09:04

Modified files:
editors/kile-kde4: Makefile 

Log message:
unbreak, yet another port depending on the removed kde4 kate

[armv7 fix] security/botan2

[Markus Hennecke]

Fixed building on armv7 by disabling neon support in configure. This has 
no effect on amd64. I tested a build there and all tests passed. 16 tests 
failed on armv7, all unable to allocate lzma memory if I remember 
correctly.

Index: Makefile
===
RCS file: /cvs/ports/security/botan2/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile12 Apr 2018 09:53:54 -  1.16
+++ Makefile30 Apr 2018 07:28:24 -
@@ -39,6 +39,7 @@ CONFIGURE_ARGS =  --with-build-dir=${WRKB
--prefix=${PREFIX} \
--distribution-info="`uname -sr`" \
--mandir=${PREFIX}/man \
+   --disable-neon \
--with-bzip2 \
--with-lzma \
--with-openssl \

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/30 01:22:26

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

Log message:
Update to remotebox-2.5.

Re: freerdp2 / remmina updates, vinagre fix

[Giovanni Bechis]

On 04/27/18 23:10, Denis Fondras wrote:
> It connects but I have some graphical glitches with freerdp2 which do not 
> appear
> with 1.2. I haven't checked further.
> 
/gdi:sw /bpp:15 parameters fixes the issue, at least /bpp:15 should be the 
default in remmina as far as I know.
https://github.com/FreeRDP/FreeRDP/issues/4111
 Cheers
  Giovanni

> On Fri, Apr 27, 2018 at 06:11:13PM +0200, Landry Breuil wrote:
>> On Fri, Apr 27, 2018 at 03:13:26PM +0200, Giovanni Bechis wrote:
>>> On Fri, Apr 27, 2018 at 02:53:54PM +0200, Landry Breuil wrote:
 On Fri, Apr 27, 2018 at 12:48:32PM +0200, Giovanni Bechis wrote:
> On 04/27/18 12:24, Landry Breuil wrote:
>> Hi,
>>
>> so here's another attempt at upgrading freerdp, based on semarie@'s work
>> in https://marc.info/?l=openbsd-ports=151591792008660=2.
>>
>> Updated for freerdp 2.0.0rc2 and remmina 1.2.0rc29, patches to fix
>> vinagre coming from https://bugzilla.gnome.org/show_bug.cgi?id=765444
>> and https://bugzilla.gnome.org/show_bug.cgi?id=774473 being used by
>> various linux distros. remotebox and krdc are just spawning xfreerdp and
>> have support for freerdp 1.1+-style arguments so should just be fine
>> too.
>>
>> Runtime tests welcome, as from the hackroom i have no access to vnc or
>> rdp stuff.
>>
>> Landry
>>
> rdp fails while 2.0.0rc1 worked, 
> -
> [12:45:59:596] [42437:d5083240] [ERROR][com.winpr.synch.timer] - 
> InitializeWaitableTimer: os specific implementation is missing
> -
> winpr/libwinpr/synch/timer.c needs some love.

 I looked at the code, and besides
 https://github.com/FreeRDP/FreeRDP/commit/9bd13c25c96610b847c4513cae5e2476f447
 i dont see how its that much different/more required than with rc1, are
 you sure this message wasnt printed with rc1 ?

>>> I double checked and, unfortunately on rc1 it works.
>>
>> Okay, so maybe we'll only update to rc1 then, until someone figures out
>> what this timer_create() stuff from posix is supposed to do and how we
>> can implement something equivalent with the apis we have.
>>
>> Here's the diff for rc1 which should be more or less equivalent to what
>> semarie@ sent in january.
>>
>> Landry
> 

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/30 01:04:16

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

Log message:
Forgot a quirks entry for the pygame->py-game renaming

Re: [armv7 fix] Fix build lang/gcc/4.9

[Pascal Stumpf]

On Mon, 23 Apr 2018 20:14:47 +0200, Jeremie Courreges-Anglas wrote:
> On Tue, Apr 17 2018, Pascal Stumpf  wrote:
> > On Mon, 16 Apr 2018 23:14:53 +0200, Jeremie Courreges-Anglas wrote:
> >> On Mon, Apr 16 2018,  wrote:
> >> > I tried to continue the build of php with the ports snapshot of today 
> >> > and ran into another gcc problem:
> >> 
> >> [...]
> >> 
> >> > /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: 
> >> > warning: equality comparison with
> >> >   extraneous parentheses [-Wparentheses-equality]
> >> > (thumb1_code)) == (
> >> > ~~~^~~~
> >> > /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: 
> >> > remove extraneous parentheses
> >> >   around the comparison to silence this warning
> >> > (thumb1_code)) == (
> >> >^
> >> > /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/arm.md:97:16: note: 
> >> > use '=' to turn this equality
> >> >   comparison into an assignment
> >> > (thumb1_code)) == (
> >> >^~
> >> >=
> >> > /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/neon.md:3486:10917: 
> >> > fatal error: bracket nesting
> >> >   level exceeded maximum of 256
> >> > /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/config/arm/neon.md:3486:10917: 
> >> > note: use -fbracket-depth=N to
> >> >   increase maximum nesting level
> >> > 33 warnings and 1 error generated.
> >> > gmake[3]: *** [Makefile:1058: insn-attrtab.o] Error 1
> >> 
> >> Well this seems to be handled by the diff in my previous mail, attached
> >> again for convenience.  gcc (FLAVOR='no_java no_ada') packages, install,
> >> and seems to run.  dpb ongoing.
> >> 
> >> Technically a clang-specific fix but it already happened with clang-5.0.
> >
> > This may be a better approach; after all, we need the flag for only one
> > file.
> 
> OTOH if a single file is affected, -fbracket-depth=n shouldn't have
> side-effects on other files...
> 
> > Currently testing on armv7, will have results by tomorrow.
> >
> > The real fix would be to test for the flag in configure, of course.
> 
> Yeah, or maybe clang should cope better with such files.  Anyway, even
> if we can probably remove gcc-4.9 from the dependency chain of a few
> more ports on arm, it would be nice to have gcc-4.9 fixed. :)
> 
> If your patch is sufficient. If not, please consider using Markus'
> patch.  ok jca@

Haven't managed to get my version working properly yet.  So OK for
Markus' patch.

> > Index: patches/patch-gcc_Makefile_in
> > ===
> > RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_Makefile_in,v
> > retrieving revision 1.1
> > diff -u -p -r1.1 patch-gcc_Makefile_in
> > --- patches/patch-gcc_Makefile_in   10 Feb 2015 22:04:54 -  1.1
> > +++ patches/patch-gcc_Makefile_in   17 Apr 2018 14:57:22 -
> > @@ -2,9 +2,23 @@ $OpenBSD: patch-gcc_Makefile_in,v 1.1 20
> >  
> >  Disable fixincludes madness
> >  
> >  gcc/Makefile.in.orig   Tue Feb  3 17:16:24 2015
> > -+++ gcc/Makefile.inTue Feb  3 17:17:57 2015
> > -@@ -2730,7 +2730,7 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \
> > +Index: gcc/Makefile.in
> > +--- gcc/Makefile.in.orig
> >  gcc/Makefile.in
> > +@@ -1944,6 +1944,12 @@ DRIVER_DEFINES = \
> > + 
> > + CFLAGS-gcc.o += $(DRIVER_DEFINES)
> > + 
> > ++ISCLANG = $(shell $CC --version | grep -c clang)
> > ++
> > ++ifeq ($(ISCLANG),1)
> > ++CFLAGS-insn-attrtab.o += -fbracket-depth=512
> > ++endif
> > ++
> > + specs.h : s-specs ; @true
> > + s-specs : Makefile
> > +   lsf="$(lang_specs_files)"; for f in $$lsf; do \
> > +@@ -2730,7 +2736,7 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \
> >   gcc_dir=`${PWD_COMMAND}` ; \
> >   export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
> >   cd $(build_objdir)/fixincludes && \
> >
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE