Re: [update] kawa-3.0

[Timo Myyrä]

Stuart Henderson  writes:

> On 2018/04/24 12:48, Timo Myyrä wrote:
>
>> Hi,
>> 
>> Could someone test if the following update to kawa works on i386 or does it
>> still fail to build.
>> 
>> Timo
>
> Happy to just try it on i386, I can always mark it broken again if it fails.
> Also now the uvm bug is fixed, it should be ok with 1200M heap so it probably
> makes sense to unconditionally set SLIB_JAVAFLAGS=-Xmx1200M.
>
> Is it ready to go otherwise?

Yeah, I think its ready to go in. Here's revised diff with heap tweak.

Timo

Index: Makefile
===
RCS file: /cvs/ports/lang/kawa/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile18 Mar 2018 13:26:46 -  1.16
+++ Makefile25 Apr 2018 19:58:21 -
@@ -1,10 +1,8 @@
 # $OpenBSD: Makefile,v 1.16 2018/03/18 13:26:46 sthen Exp $
 
-BROKEN-i386=   doesn't build reliably#'
-
 COMMENT=   Scheme and language framework for the Java platform
 
-DISTNAME=  kawa-2.4
+DISTNAME=  kawa-3.0
 CATEGORIES=lang java
 
 HOMEPAGE=  https://www.gnu.org/software/kawa/
@@ -24,7 +22,7 @@ USE_GMAKE=Yes
 AUTOCONF_VERSION=  2.69
 AUTOMAKE_VERSION=  1.15
 
-WANTLIB+=  c ncurses readline
+WANTLIB+=  c curses readline
 BUILD_DEPENDS= print/texinfo \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@@ -40,14 +38,7 @@ MAKE_FLAGS=  JAVAC=${JAVA_HOME}/bin/java
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
 
-.include 
-# fails with this on i386, fails without this on amd64, unsure about
-# other arch but lp64 is probably not a bad indicator.
-.if ${PROPERTIES:Mlp64}
 MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx1200M
-.else
-MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx800M
-.endif
 
 # use UTF-8 encoding to avoid following errors:
 # unmappable character for encoding ASCII
@@ -56,8 +47,12 @@ MAKE_ENV+=   LANG=en_US.UTF-8
 TEST_FLAGS =   DIFF=diff \
PATH=${PATH}:${JAVA_HOME}/bin
 
+# Use a bit complex xargs avoid unneeded modifications to files
+# causing build issues on i386.
 pre-patch:
find ${WRKSRC} -type f | \
-   xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'
+   xargs fgrep -l "JAR =" | \
+   xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'; \
+   touch ${WRKSRC}/configure.ac
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/lang/kawa/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo31 Aug 2017 06:33:05 -  1.4
+++ distinfo25 Apr 2018 19:58:21 -
@@ -1,2 +1,2 @@
-SHA256 (kawa-2.4.tar.gz) = FMCL6BYxoeuLiSbKI1GYyhZRVsDBeey+boONP0tHY10=
-SIZE (kawa-2.4.tar.gz) = 3285436
+SHA256 (kawa-3.0.tar.gz) = Hm6FIXvW2MKgw0eIgqRXAxTfa5UHj+exIlkRw5q/OM0=
+SIZE (kawa-3.0.tar.gz) = 3393879
Index: patches/patch-bin_kawa_sh_in
===
RCS file: patches/patch-bin_kawa_sh_in
diff -N patches/patch-bin_kawa_sh_in
--- patches/patch-bin_kawa_sh_in31 Aug 2017 06:33:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,10 +0,0 @@
-$OpenBSD: patch-bin_kawa_sh_in,v 1.1 2017/08/31 06:33:05 jasper Exp $
 bin/kawa.sh.in.origSun Apr  9 08:44:21 2017
-+++ bin/kawa.sh.in Sun Apr  9 08:44:30 2017
-@@ -1,5 +1,5 @@
- #!@KAWA_SHELL@
--thisfile=`type -p $0`
-+thisfile=`command -v $0`
- case "$thisfile" in
-   "") echo "installation error - can't find path to $0"; exit -1 ;;
-   /*) ;;
Index: patches/patch-doc_Makefile_am
===
RCS file: patches/patch-doc_Makefile_am
diff -N patches/patch-doc_Makefile_am
--- patches/patch-doc_Makefile_am   31 Aug 2017 06:33:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-doc_Makefile_am,v 1.1 2017/08/31 06:33:05 jasper Exp $
 doc/Makefile.am.orig   Sat Mar 25 12:33:43 2017
-+++ doc/Makefile.amSat Mar 25 12:34:24 2017
-@@ -29,12 +29,11 @@ TEXI2PDF = texi2pdf
- 
- man_MANS = kawa.1 qexo.1
- kawa.1: $(srcdir)/kawa.man
--  nroff -man $(srcdir)/kawa.man > tpm-kawa.1
--  mv tpm-kawa.1 kawa.1
-+  cp $(srcdir)/kawa.man kawa.1
- 
-+
- qexo.1: $(srcdir)/qexo.man
--  nroff -man $(srcdir)/qexo.man > tpm-qexo1
--  mv tpm-qexo1 qexo.1
-+  cp $(srcdir)/qexo.man qexo.1
- 
- ../kawa-doc-$(VERSION).tar.gz: kawa.info $(KAWA_HTMLDIR)/index.html kawa.pdf
-   tar cf - $(KAWA_HTMLDIR)/*.html kawa.pdf|gzip -c --best >$@
Index: patches/patch-gnu_xquery_testsuite_Makefile_am
===
RCS file: 

Re: UPDATE devel/git-cola

[Björn Ketelaars]

On Mon 30/04/2018 20:44, Björn Ketelaars wrote:
> 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?

Ping

Re: UPDATE: net/wget-1.9.5

[Björn Ketelaars]

On Sun 06/05/2018 23:01, Gleydson Soares wrote:
> update to wget-1.9.5. This update addresses a vunerability CVE-2018-0494, 
> along with
> several bug fixes.
> 
> builds and runs fine, @amd64
> OK?

I'm unable to run 'make test', log is enclosed. On 1.9.4 'make test'
runs fine.
make  check-recursive
Making check in lib
make  check-recursive
Making check in src
make  libunittest.a
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-connect.o -MD -MP -MF 
.deps/libunittest_a-connect.Tpo -c -o libunittest_a-connect.o `test -f 
'connect.c' || echo './'`connect.c
mv -f .deps/libunittest_a-connect.Tpo .deps/libunittest_a-connect.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-convert.o -MD -MP -MF 
.deps/libunittest_a-convert.Tpo -c -o libunittest_a-convert.o `test -f 
'convert.c' || echo './'`convert.c
mv -f .deps/libunittest_a-convert.Tpo .deps/libunittest_a-convert.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-cookies.o -MD -MP -MF 
.deps/libunittest_a-cookies.Tpo -c -o libunittest_a-cookies.o `test -f 
'cookies.c' || echo './'`cookies.c
mv -f .deps/libunittest_a-cookies.Tpo .deps/libunittest_a-cookies.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-ftp.o -MD -MP -MF 
.deps/libunittest_a-ftp.Tpo -c -o libunittest_a-ftp.o `test -f 'ftp.c' || echo 
'./'`ftp.c
mv -f .deps/libunittest_a-ftp.Tpo .deps/libunittest_a-ftp.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-css_.o -MD -MP -MF 
.deps/libunittest_a-css_.Tpo -c -o libunittest_a-css_.o `test -f 'css_.c' || 
echo './'`css_.c
mv -f .deps/libunittest_a-css_.Tpo .deps/libunittest_a-css_.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-css-url.o -MD -MP -MF 
.deps/libunittest_a-css-url.Tpo -c -o libunittest_a-css-url.o `test -f 
'css-url.c' || echo './'`css-url.c
mv -f .deps/libunittest_a-css-url.Tpo .deps/libunittest_a-css-url.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-ftp-basic.o -MD -MP -MF 
.deps/libunittest_a-ftp-basic.Tpo -c -o libunittest_a-ftp-basic.o `test -f 
'ftp-basic.c' || echo './'`ftp-basic.c
mv -f .deps/libunittest_a-ftp-basic.Tpo .deps/libunittest_a-ftp-basic.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-ftp-ls.o -MD -MP -MF 
.deps/libunittest_a-ftp-ls.Tpo -c -o libunittest_a-ftp-ls.o `test -f 'ftp-ls.c' 
|| echo './'`ftp-ls.c
mv -f .deps/libunittest_a-ftp-ls.Tpo .deps/libunittest_a-ftp-ls.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-hash.o -MD -MP -MF 
.deps/libunittest_a-hash.Tpo -c -o libunittest_a-hash.o `test -f 'hash.c' || 
echo './'`hash.c
mv -f .deps/libunittest_a-hash.Tpo .deps/libunittest_a-hash.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-host.o -MD -MP -MF 
.deps/libunittest_a-host.Tpo -c -o libunittest_a-host.o `test -f 'host.c' || 
echo './'`host.c
mv -f .deps/libunittest_a-host.Tpo .deps/libunittest_a-host.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 

UPDATE: net/wget-1.9.5

[Gleydson Soares]

update to wget-1.9.5. This update addresses a vunerability CVE-2018-0494, along 
with
several bug fixes.

builds and runs fine, @amd64
OK?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile
--- Makefile5 Feb 2018 09:55:57 -   1.74
+++ Makefile7 May 2018 01:46:29 -
@@ -2,7 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.19.4
+DISTNAME = wget-1.19.5
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo5 Feb 2018 09:55:57 -   1.21
+++ distinfo7 May 2018 01:46:29 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.19.4.tar.gz) = k/uWsPSKIP9b4NnZ08SphrRpy4UxMfnV/kzJzsvItbU=
-SIZE (wget-1.19.4.tar.gz) = 4310657
+SHA256 (wget-1.19.5.tar.gz) = s5ISq+GnPyso9MbLIjxzhVnKrJHW5Bam2R1LnVXJ+u4=
+SIZE (wget-1.19.5.tar.gz) = 4455797
Index: patches/patch-doc_wget_texi
===
RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
retrieving revision 1.14
diff -u -p -r1.14 patch-doc_wget_texi
--- patches/patch-doc_wget_texi 5 Feb 2018 09:55:57 -   1.14
+++ patches/patch-doc_wget_texi 7 May 2018 01:46:29 -
@@ -20,7 +20,7 @@ Index: doc/wget.texi
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
-@@ -3145,9 +3145,8 @@ commands.
+@@ -3154,9 +3154,8 @@ commands.
  @cindex location of wgetrc
  
  When initializing, Wget will look for a @dfn{global} startup file,
@@ -32,7 +32,7 @@ Index: doc/wget.texi
  
  Then it will look for the user's file.  If the environmental variable
  @code{WGETRC} is set, Wget will try to load that file.  Failing that, no
-@@ -3157,7 +3156,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
+@@ -3166,7 +3165,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
  
  The fact that user's settings are loaded after the system-wide ones
  means that in case of collision user's wgetrc @emph{overrides} the

Re: bash script in OpenBSD ports (was Re: [New] nnn-1.7)

[Stuart Henderson]

On 2018/05/06 12:48, Raul Miller wrote:
> I would like to better understand these concerns.
> 
> Coping with other people’s configurations is inherently nondeterministic —
> what’s interesting though are the significant examples. But I have a
> problem thinking up an example where this would break which would not
> already be broken. I imagine you had some in mind?

PATH is under control of the (not-necessarily-sysadmin) user.

If that is set to something not containing /usr/local/bin, it will be broken
with env, but will work if it's patched.

If PATH is set to include a directory containing something called "bash"
ahead of /usr/local/bin then it won't be using the standard version of bash
from packages.

> That said, the point with upstream should not be instant adoption but —
> where it can make sense — the possibility of eventual convergence.
> Shouldn’t it?

Upstream typically wants something that works on many OS without having
to field support requests. OS packagers typically want something that
works consistently regardless of user-settable config.

Re: [New] nnn-1.7

[Stuart Henderson]

On 2018/05/06 20:06, Ljuba Nedeljkovic wrote:
> Thank you sthen@ for reviewing the port. Attached is the port with
> suggested changes, problems that kn@ pointed out (thanks!) are
> fixed as well.

OK with me.

Re: NEW: comms/cutecom (Take 2)

[Kaashif Hymabaccus]

On Sun, May 06, 2018 at 01:39:52PM -0400, Brian Callahan wrote:
> Hi ports --
> 
> Trying to clear out my new ports queue. This was submitted back in August
> but never committed.
> Kaashif: do you still want to be MAINTAINER?
> 
> CuteCom is a graphical serial terminal written in Qt5.
> 
> ---
> pkg/DESCR:
> CuteCom is a graphical serial terminal written using Qt5, like minicom.
> It is aimed mainly at hardware developers or other people who need a
> terminal to talk to their devices.
> ---
> 
> OK?
> 
> ~Brian
> 

I do still want to be MAINTAINER, yes.

-- 
Kaashif Hymabaccus
GPG: 3E810B04

Re: NEW: mail/rss2email3

[Kaashif Hymabaccus]

On Mon, Apr 30, 2018 at 05:51:31PM +0200, Solene Rapenne wrote:
> 
> 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}

Made these changes. Tarball attached.

-- 
Kaashif Hymabaccus
GPG: 3E810B04


rss2email3.tgz
Description: Binary data

Re: NEW: x11/kde-applications/kcalc

[Elias M. Mariani]

OK, thanks for the explanation.
qt5-5.10 is not an additional requirement for Plasma?
Elias.

2018-05-06 15:22 GMT-03:00 Rafael Sadowski :
> On Sun May 06, 2018 at 03:04:54PM -0300, Elias M. Mariani wrote:
>> Hi Rafael,
>> Sorry if this is a bit offtopic, but you are moving all the apps from
>> kde4 to kde-applications?
>> This has something to do with porting kde5 or something ?
>> Thanks for the hard work.
>> Elias.
>>
>
> x11/kde-applications is the (new) home for all KDE5 applications[1]. The
> KDE projects splits into three main parts (+ Application under the roof
> of KDE like graphics/krita, graphics/digikam...):
>
> - KDE Plasma (current 5.12.5 LTS) We are far away from it unless someone
>   finish wayland for OpenBSD. (see openbsd-wip)
> - KDE Applications (current 18.04) x11/kde-applications (17.12.3 because
>   18.x depends on kf5 5.44
> - KDE Frameworks (current 5.45.0) devel/kf5 (5.43)
>
> The plan shall be replaced one by one because you can easy use the new
> KDE5 application under your KDE4 desktop environment.
>
>
> [1]: KDE Applications 17.08.3:
> - https://mirrors.dotsrc.org/kde/stable/applications/17.12.3/src/
> - https://www.kde.org/announcements/announce-applications-17.08.3.php
> - https://www.kde.org/applications/

Re: NEW: net/bitcoin

[Rafael Sadowski]

On Sun May 06, 2018 at 01:23:43PM -0400, Brian Callahan wrote:
> 
> On 05/05/18 07:29, Rafael Sadowski wrote:
> > *ping*
> > 
> > On Wed Apr 25, 2018 at 09:31:02PM +0200, Rafael Sadowski wrote:
> > > Hi ports@
> > > 
> > > Attached is a new port for bitcoin. Long time ago pascal@ started
> > > working on bitcoin in openbsd-wip. I've finished this work and run a full
> > > bitcoin node over weeks without problems so far:
> > > 
> > > https://twitter.com/sizeofvoid/status/976586173538885632
> > > 
> > > $ cat net/bitcoin/pkg/DESCR
> > > 
> > > Bitcoin is an experimental new digital currency that enables instant
> > > payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer
> > > technology to operate with no central authority: managing transactions
> > > and issuing money are carried out collectively by the network.
> > > Bitcoin is also the name of the open source software which enables
> > > the use of this currency.
> > > 
> > > Ok? Comments?
> > > 
> > > Greetings to the hackerroom.
> > > 
> > > Rafael Sadowski
> > 
> 
> It reads and builds ok, and bitcoin-qt even launches.
> I am not going to download the 200GB (!!!) that it wants me to, so that's as
> far as I can test.
> portcheck -N complains about hardcoded paths in pkg/bitcoind.rc
> 
> One thought from me: is there no hope for this to build on !CLANG_ARCHS?
> (You only have COMPILER=base-clang ports-clang). Maybe that is the right way
> to go, since I'm guessing you wouldn't want to run this on a machine that
> doesn't have clang available to it since it's probably far too slow.
> 
> In that case, you don't need that CXXFLAGS line.
> 

It doesn't build with ports-gcc and you already said it: "... you
wouldn't want to run this on a machine that doesn't have clang available
to it since it's probably far too slow."

Yes builds fine without CXXFLAGS. Ok with /var -> ${VARBASE}?

Thanks for test and review!

Re: NEW: x11/kde-applications/kcalc

[Rafael Sadowski]

On Sun May 06, 2018 at 03:04:54PM -0300, Elias M. Mariani wrote:
> Hi Rafael,
> Sorry if this is a bit offtopic, but you are moving all the apps from
> kde4 to kde-applications?
> This has something to do with porting kde5 or something ?
> Thanks for the hard work.
> Elias.
> 

x11/kde-applications is the (new) home for all KDE5 applications[1]. The
KDE projects splits into three main parts (+ Application under the roof
of KDE like graphics/krita, graphics/digikam...):

- KDE Plasma (current 5.12.5 LTS) We are far away from it unless someone
  finish wayland for OpenBSD. (see openbsd-wip)
- KDE Applications (current 18.04) x11/kde-applications (17.12.3 because
  18.x depends on kf5 5.44
- KDE Frameworks (current 5.45.0) devel/kf5 (5.43)

The plan shall be replaced one by one because you can easy use the new
KDE5 application under your KDE4 desktop environment.


[1]: KDE Applications 17.08.3:
- https://mirrors.dotsrc.org/kde/stable/applications/17.12.3/src/
- https://www.kde.org/announcements/announce-applications-17.08.3.php
- https://www.kde.org/applications/

Re: [New] nnn-1.7

[Ljuba Nedeljkovic]

Thank you sthen@ for reviewing the port. Attached is the port with
suggested changes, problems that kn@ pointed out (thanks!) are
fixed as well.

Best

On Sun, May 6, 2018 at 1:08 PM, Stuart Henderson 
wrote:

> On 2018/05/06 00:01, Ljuba Nedeljkovic wrote:
> > Attached is the port of nnn, version 1.8. Upstream is releasing
> > source tarball as a formal/proper release so GH_* are gone.
> > Patch (present in previous port submissions) is also gone since
> > upstream fixed portability issue with shell script.
> >
> > Tests/comments.suggestions are welcome.
>
> I'm no fan of this:
>
> #!/usr/bin/env bash
>
> It's not deterministic (relies on the user's PATH being set in a certain
> way), I would normally patch these to use ${LOCALBASE}/bin/bash like you
> had
> in earlier versions of your port.
>
>


-- 
If you wish to live wisely,
ignore sayings -- including this one.


nnn-1.8.tar.gz
Description: application/gzip

NEW: x11/kde-applications/dragon

[Rafael Sadowski]

Please find attached a simple replacement for x11/kde4/dragon. No
consumers are affected.

Tested with x264 + Matroska data + subtitles.

$ cat x11/kde-applications/dragon/pkg/DESCR
Dragon Player is a multimedia player where the focus is on simplicity, instead
of features. Dragon Player does one thing, and only one thing, which is playing
multimedia files. It's simple interface is designed not to get in your way and
instead empower you to simply play multimedia files.

Features

- Simple Interface
- Resuming videos: Starts playing a video where you were watching it last time
- Support for subtitles: Automatically loads subtitles with the matching name
- Video display settings (brightness, contrast)
- Due to using Solid and Phonon DragonPlayer is independent of any multimedia
  framework or hardware abstraction layer.
- Supports playing CDs and DVDs

Ok? Comments?


dragon-17.12.3.tar.gz
Description: Binary data

NEW: comms/cutecom (Take 2)

[Brian Callahan]

Hi ports --

Trying to clear out my new ports queue. This was submitted back in 
August but never committed.

Kaashif: do you still want to be MAINTAINER?

CuteCom is a graphical serial terminal written in Qt5.

---
pkg/DESCR:
CuteCom is a graphical serial terminal written using Qt5, like minicom.
It is aimed mainly at hardware developers or other people who need a
terminal to talk to their devices.
---

OK?

~Brian



cutecom.tgz
Description: Binary data

NEW: x11/kde-applications/kcalc

[Rafael Sadowski]

Please find attached a simple one by one replacement for x11/kde4/kcalc.
I see no conflicts only one RUN_DPENEDS change in productivity/kmymoney.

$ cat x11/kde-applications/kcalc/pkg/DESCR
KCalc is a calculator which offers many mathematical functions.

Ok? Comments?

Rafael Sadowski


kcalc-17.12.3.tar.gz
Description: Binary data

Re: UPDATE: telephony/baresip/{baresip,re,rem}

[Ingo Feinerer]

On Sun, May 06, 2018 at 03:34:20PM +0100, Stuart Henderson wrote:
> > > Index: baresip/Makefile
> > > ===
> > > RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v
> > > retrieving revision 1.20
> > > diff -u -p -r1.20 Makefile
> > > --- baresip/Makefile  11 Mar 2018 18:48:59 -  1.20
> > > +++ baresip/Makefile  25 Apr 2018 15:50:36 -
> > > @@ -3,7 +3,7 @@
> > >  COMMENT-main =   modular SIP User-Agent with audio and video 
> > > support
> > >  COMMENT-gtk2 =   GTK+2-based modules for baresip
> > >  
> > > -V =  0.5.8
> > > +V =  0.5.9
> > >  DISTNAME =   baresip-$V
> > >  PKGNAME-main =   baresip-$V
> > >  PKGNAME-gtk2 =   baresip-gtk2-$V
> > > @@ -14,7 +14,7 @@ WANTLIB-main += re rem sndfile sndio spa
> > >  WANTLIB-main += twolame v4l2 vpx x264 x265
> > >  
> > >  WANTLIB-gtk2 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> > > -WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype 
> > > gdk-x11-2.0
> > > +WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype fribidi 
> > > gdk-x11-2.0
> > >  WANTLIB-gtk2 += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gstapp-1.0
> > >  WANTLIB-gtk2 += gstbase-1.0 gstreamer-1.0 gtk-x11-2.0 intl mpg123 
> > > pango-1.0
> > >  WANTLIB-gtk2 += pangocairo-1.0 pangoft2-1.0 re z
> > > @@ -37,7 +37,8 @@ LIB_DEPENDS-main =  audio/gsm \
> > >   telephony/baresip/re>=0.5.7 \
> > >   telephony/baresip/rem>=0.5.2 \
> > >   telephony/spandsp
> > > -LIB_DEPENDS-gtk2 =   multimedia/gstreamer1/plugins-base \
> > > +LIB_DEPENDS-gtk2 =   devel/fribidi \
> 
> I think fribidi should only be a WANTLIB (unless baresip started
> using fribidi directly itself).

Indeed. Thanks for spotting!

> Rest reads good, did you check the shared libraries for ABI changes to
> identify whether bumps are needed?

Yes, I checked them (both reading upstream change logs and using
/usr/src/lib/check_sym).

I assume after the fribidi LIB_DEPENDS removal this implies your OK?
I'll commit the update in the next days under this assumption (or
earlier with an explicit OK).

Best regards,
Ingo

Re: NEW: net/bitcoin

[Brian Callahan]

On 05/05/18 07:29, Rafael Sadowski wrote:

*ping*

On Wed Apr 25, 2018 at 09:31:02PM +0200, Rafael Sadowski wrote:

Hi ports@

Attached is a new port for bitcoin. Long time ago pascal@ started
working on bitcoin in openbsd-wip. I've finished this work and run a full
bitcoin node over weeks without problems so far:

https://twitter.com/sizeofvoid/status/976586173538885632

$ cat net/bitcoin/pkg/DESCR

Bitcoin is an experimental new digital currency that enables instant
payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer
technology to operate with no central authority: managing transactions
and issuing money are carried out collectively by the network.
Bitcoin is also the name of the open source software which enables
the use of this currency.

Ok? Comments?

Greetings to the hackerroom.

Rafael Sadowski




It reads and builds ok, and bitcoin-qt even launches.
I am not going to download the 200GB (!!!) that it wants me to, so 
that's as far as I can test.

portcheck -N complains about hardcoded paths in pkg/bitcoind.rc

One thought from me: is there no hope for this to build on !CLANG_ARCHS? 
(You only have COMPILER=base-clang ports-clang). Maybe that is the right 
way to go, since I'm guessing you wouldn't want to run this on a machine 
that doesn't have clang available to it since it's probably far too slow.


In that case, you don't need that CXXFLAGS line.

~Brian

Re: bash script in OpenBSD ports (was Re: [New] nnn-1.7)

[Raul Miller]

I would like to better understand these concerns.

Coping with other people’s configurations is inherently nondeterministic —
what’s interesting though are the significant examples. But I have a
problem thinking up an example where this would break which would not
already be broken. I imagine you had some in mind?

That said, the point with upstream should not be instant adoption but —
where it can make sense — the possibility of eventual convergence.
Shouldn’t it?

Anyways, I am curious about this (and learning).

Thanks,

—
Raul

On Sunday, May 6, 2018, Stuart Henderson  wrote:

> On 2018/05/06 10:15, Raul Miller wrote:
> > perhaps:
> >
> > #!/usr/bin/env PATH=/bin:/usr/bin:/usr/local/bin bash
> >
> > ?
>
> it doesn't make a lot of sense doing it that way, the chances of
> upstream accepting that are pretty low so it will still need patching,
> plus you still have non-deterministic behaviour..
>
>

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/05/06 10:14:20

Modified files:
infrastructure/bin: update-plist 

Log message:
insert comes_after data into the copy process:
- unmark file as found, because it will be found again as tag
- have it tag along on the unexec that uses it

This fixes ghc's location of unregister.

NEW: x11/kde-applications/kig

[Rafael Sadowski]

Please find attached an one by one replacement for x11/kde4/kig.

$ cat x11/kde-applications/kig/pkg/DESCR
Kig is a program for exploring geometric constructions.

It is part of the KDE Education Project.

Ok? Comments?


kig-17.12.3.tar.gz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/05/06 09:56:45

Modified files:
infrastructure/bin: update-plist 

Log message:
framework for handling unexec:
- during known_object, figure out command names that must stick around
- allow copy_with_tags to be recursive (e.g., tags may have tags)

NEW: [2/2] x11/yakuake

[Rafael Sadowski]

Please read "NEW: [1/2] x11/kde-applications/konsole" for more
information.

$ cat x11/yakuake/pkg/DESCR
Yakuake is a drop-down terminal emulator based on Konsole technology.

Features:
  * Smoothly rolls down from the top of your screen
  * Tabbed interface
  * Configurable dimensions and animation speed
  * Skinnable
  * Sophisticated DCOP / D-Bus interface

Ok? Comments?

Best regards,

Rafael Sadowski


yakuake.tar.gz
Description: Binary data

NEW: [1/2] x11/kde-applications/konsole

[Rafael Sadowski]

Please find attached a quit simple replacement for x11/kde4/konsole.
This is the first of two parts. The second part replace x11/yakuake-kde4
with x11/yakuake. We need to do this in one step because yakuake-kde4
depends on konsole.

$ cat x11/kde-applications/konsole/pkg/DESCR
Konsole is an X terminal emulator for the KDE platform, allowing
users to have a convenient way to use the command line. Aside from
providing a way to use a powerful shell, Konsole also offers features
that make it easier or more pleasurable to work in the command line,
such as profile management, scrollback, and color schemes, including
translucency for effects.

Konsole also provides an embedded KPart terminal which is used by
apps such as Yakuake, Dolphin, and Kate, giving users a consistent
and familiar interface when working in the command line.


Ok? Comments?

Rafael Sadowski


konsole-17.12.3.tar.gz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/05/06 09:45:06

Modified files:
lang/ocaml-camlp5: Makefile distinfo 
lang/ocaml-camlp5/pkg: PLIST 
Added files:
lang/ocaml-camlp5/patches: patch-etc_Makefile 

Log message:
Update to ocaml-camlp5 to 7.05
diff from daniel@, who needs this for an update of lang/compcert

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/05/06 09:44:10

ports/lang/ocaml-camlp5/patches

Update of /cvs/ports/lang/ocaml-camlp5/patches
In directory cvs.openbsd.org:/tmp/cvs-serv24629/patches

Log Message:
Directory /cvs/ports/lang/ocaml-camlp5/patches added to the repository

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/05/06 09:40:15

Modified files:
infrastructure/bin: update-plist 

Log message:
write the full correct new cvstag the first time around to avoid
random discrepancies on regen

Re: UPDATE: lang/flang 5 => 6

[Brian Callahan]

On 05/05/18 08:42, Brian Callahan wrote:


On 05/02/18 00:41, Brian Callahan wrote:

Hi ports --

Finally got flang fixed for llvm-6.
It requires a new sub-port, lang/flang/libpgmath, the new Fortran 
math library that comes with flang6.


New sub-port + diff for the other 2 sub-ports attached.
Passes the NIST Fortran 77 test suite (get a copy here: 
http://www.fortran-2000.com/ArnaudRecipes/fcvs21_f95.html)


OK?

~Brian



Flang has been updated in the meantime, new patch/tarball.

~Brian



If it makes reviewing easier, this update of flang does not depend on 
the libaio_compat port I sent out. We'll handle that after this goes in, 
not before. I'd like to see flang unbroken so I can move on to adding 
arm64 support.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/05/06 09:35:47

Modified files:
archivers/gtar : Makefile 
archivers/gtar/pkg: PLIST 
Added files:
archivers/gtar/pkg: PFRAG.static 

Log message:
-static flavor should need to own its msg directories.
okay naddy@

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/05/06 09:22:12

Modified files:
graphics/feh   : Makefile distinfo 
graphics/feh/patches: patch-Makefile patch-config_mk 
  patch-man_feh_pre patch-src_keyevents_c 
Removed files:
graphics/feh/patches: patch-src_wallpaper_c 

Log message:
Update to feh-2.26
Compile with -std=gnu99 to remove some patches.
MAINTAINER timeout
ok pirofti@

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/05/06 09:15:00

Log message:
Import games/arx-libertatis, a cross-platform port of Arx Fatalis, a
first-person RPG.
Submission from Thomas Frohwein (thfr), who takes MAINTAINER, thanks!
ok sthen@

Arx Libertatis is a cross-platform, open source port of Arx Fatalis, a
2002 first-person role-playing game and dungeon crawler developed by
Arkane Studios.

Arx Fatalis (Latin for "fatal fortress") is set on a world whose sun has
failed, forcing the above-ground creatures to take refuge in
subterranean caverns. The action in Arx Fatalis takes place in one of
these large caves, where inhabitants from all races such as Trolls,
Goblins, Dwarves, Humans, etc. have made their homes on various levels
of the cave. The player awakens inside a prison cell and, after making
his escape, eventually discovers his mission is to subvert and imprison
the God of Destruction, Akbaa, who is trying to manifest itself in Arx.

Status:

Vendor Tag: bcallah
Release Tags:   bcallah_20180506

N ports/games/arx-libertatis/Makefile
N ports/games/arx-libertatis/distinfo
N ports/games/arx-libertatis/files/arx
N ports/games/arx-libertatis/patches/patch-src_core_Version_cpp_in
N ports/games/arx-libertatis/pkg/DESCR
N ports/games/arx-libertatis/pkg/PLIST
N ports/games/arx-libertatis/pkg/README

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/05/06 09:15:50

Modified files:
games  : Makefile 

Log message:
+arx-libertatis

Re: New port: arx-libertatis

[Stuart Henderson]

On 2018/05/05 10:09, Thomas Frohwein wrote:
> *ping*
> Now with NO_TEST=Yes
> 
> > It's missing NO_TEST=Yes but otherwise I'm happy with this.
> > ok for me to import, or will take oks for import.


No game files to test, but port looks good, OK sthen to import

Re: UPDATE: telephony/baresip/{baresip,re,rem}

[Stuart Henderson]

On 2018/05/06 08:19, Ingo Feinerer wrote:
> Ping (maintainer timeout)
> (original posting at https://marc.info/?l=openbsd-ports=152467183305081=2)
> 
> On Wed, Apr 25, 2018 at 05:55:44PM +0200, Ingo Feinerer wrote:
> > Hi,
> > 
> > update telephony/baresip/baresip 0.5.8 -> 0.5.9
> > update telephony/baresip/re  0.5.7 -> 0.5.8
> > update telephony/baresip/rem 0.5.2 -> 0.5.3
> > 
> > ChangeLogs:
> > 
> > http://lists.creytiv.com/pipermail/re-devel/2018-April/001186.html
> > http://lists.creytiv.com/pipermail/re-devel/2018-April/001185.html
> > http://lists.creytiv.com/pipermail/re-devel/2018-April/001184.html
> > 
> > OK?
> > 
> > Best regards,
> > Ingo
> > 
> > Index: baresip/Makefile
> > ===
> > RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v
> > retrieving revision 1.20
> > diff -u -p -r1.20 Makefile
> > --- baresip/Makefile11 Mar 2018 18:48:59 -  1.20
> > +++ baresip/Makefile25 Apr 2018 15:50:36 -
> > @@ -3,7 +3,7 @@
> >  COMMENT-main = modular SIP User-Agent with audio and video 
> > support
> >  COMMENT-gtk2 = GTK+2-based modules for baresip
> >  
> > -V =0.5.8
> > +V =0.5.9
> >  DISTNAME = baresip-$V
> >  PKGNAME-main = baresip-$V
> >  PKGNAME-gtk2 = baresip-gtk2-$V
> > @@ -14,7 +14,7 @@ WANTLIB-main += re rem sndfile sndio spa
> >  WANTLIB-main += twolame v4l2 vpx x264 x265
> >  
> >  WANTLIB-gtk2 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> > -WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype 
> > gdk-x11-2.0
> > +WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype fribidi 
> > gdk-x11-2.0
> >  WANTLIB-gtk2 += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gstapp-1.0
> >  WANTLIB-gtk2 += gstbase-1.0 gstreamer-1.0 gtk-x11-2.0 intl mpg123 pango-1.0
> >  WANTLIB-gtk2 += pangocairo-1.0 pangoft2-1.0 re z
> > @@ -37,7 +37,8 @@ LIB_DEPENDS-main =audio/gsm \
> > telephony/baresip/re>=0.5.7 \
> > telephony/baresip/rem>=0.5.2 \
> > telephony/spandsp
> > -LIB_DEPENDS-gtk2 = multimedia/gstreamer1/plugins-base \
> > +LIB_DEPENDS-gtk2 = devel/fribidi \

I think fribidi should only be a WANTLIB (unless baresip started
using fribidi directly itself).

Rest reads good, did you check the shared libraries for ABI changes to
identify whether bumps are needed?

> > +   multimedia/gstreamer1/plugins-base \
> > telephony/baresip/re>=0.5.7 \
> > x11/gtk+2,-main
> >  RUN_DEPENDS-gtk2 = telephony/baresip/baresip,-main>=$V \
> > Index: baresip/distinfo
> > ===
> > RCS file: /cvs/ports/telephony/baresip/baresip/distinfo,v
> > retrieving revision 1.14
> > diff -u -p -r1.14 distinfo
> > --- baresip/distinfo11 Mar 2018 18:48:59 -  1.14
> > +++ baresip/distinfo25 Apr 2018 15:50:36 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (baresip-0.5.8.tar.gz) = 
> > 2fEdpQ/WyTWatHhhi108EyR0qDj+n2aMJJ+dWgfyZmI=
> > -SIZE (baresip-0.5.8.tar.gz) = 584406
> > +SHA256 (baresip-0.5.9.tar.gz) = 
> > 7t3Pue+ACi2JIAi9maIj6n+pO6hYhswGPGu4HLkjbgk=
> > +SIZE (baresip-0.5.9.tar.gz) = 589680
> > Index: baresip/patches/patch-src_config_c
> > ===
> > RCS file: /cvs/ports/telephony/baresip/baresip/patches/patch-src_config_c,v
> > retrieving revision 1.13
> > diff -u -p -r1.13 patch-src_config_c
> > --- baresip/patches/patch-src_config_c  11 Mar 2018 18:48:59 -  
> > 1.13
> > +++ baresip/patches/patch-src_config_c  25 Apr 2018 15:50:36 -
> > @@ -2,16 +2,16 @@ $OpenBSD: patch-src_config_c,v 1.13 2018
> >  Index: src/config.c
> >  --- src/config.c.orig
> >  +++ src/config.c
> > -@@ -505,7 +505,7 @@ static const char *default_video_device(void)
> > - #endif
> > - 
> > +@@ -511,7 +511,7 @@ static const char *default_video_device(void)
> > + #elif defined (WIN32)
> > +   return "dshow,nil";
> >   #else
> >  -  return "v4l2,/dev/video0";
> >  +  return "v4l2,/dev/video";
> >   #endif
> >   }
> >   
> > -@@ -753,31 +753,31 @@ int config_write_template(const char *file, const 
> > stru
> > +@@ -761,31 +761,31 @@ int config_write_template(const char *file, const 
> > stru
> > (void)re_fprintf(f, "module\t\t\t" MOD_PRE "stdio" MOD_EXT "\n");
> >   #endif
> > (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "cons" MOD_EXT "\n");
> > @@ -60,7 +60,7 @@ Index: src/config.c
> > (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "plc" MOD_EXT "\n");
> >   
> > (void)re_fprintf(f, "\n# Audio driver Modules\n");
> > -@@ -796,8 +796,8 @@ int config_write_template(const char *file, const stru
> > +@@ -804,8 +804,8 @@ int config_write_template(const char *file, const stru
> > (void)re_fprintf(f, "module\t\t\t" MOD_PRE "alsa" MOD_EXT "\n");

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/05/06 08:32:41

Modified files:
lang/php/5.6   : Makefile 
lang/php/7.0   : Makefile 
lang/php/files : README-main 

Log message:
adjust README, it referred to php example config in /etc/examples/httpd.conf
which has since been removed.

Re: bash script in OpenBSD ports (was Re: [New] nnn-1.7)

[Stuart Henderson]

On 2018/05/06 10:15, Raul Miller wrote:
> perhaps:
> 
> #!/usr/bin/env PATH=/bin:/usr/bin:/usr/local/bin bash
> 
> ?

it doesn't make a lot of sense doing it that way, the chances of
upstream accepting that are pretty low so it will still need patching,
plus you still have non-deterministic behaviour..

Re: bash script in OpenBSD ports (was Re: [New] nnn-1.7)

[Raul Miller]

perhaps:

#!/usr/bin/env PATH=/bin:/usr/bin:/usr/local/bin bash

?

-- 
Raul


On Sun, May 6, 2018 at 9:59 AM, Stuart Henderson  wrote:
> On 2018/05/06 09:47, Daniel Jakots wrote:
>> On Sun, 6 May 2018 12:08:01 +0100, Stuart Henderson
>>  wrote:
>>
>> > I'm no fan of this:
>> >
>> > #!/usr/bin/env bash
>> >
>> > It's not deterministic (relies on the user's PATH being set in a
>> > certain way), I would normally patch these to use
>> > ${LOCALBASE}/bin/bash like you had in earlier versions of your port.
>>
>> We discussed this in Nantes. The reason of using env is that it's
>> portable so you can upstream the patch.
>>
>> The current situation sucks that depending on who you ask you get a
>> different answer :(
>
> We discussed it but didn't come to a conclusion...
>
> With env, it sometimes works, sometimes doesn't, depending on how
> the environment is setup - with a patch, it always works.
>
> The patches are annoying though. Maybe we need some equivalent of
> MODPY_BIN_ADJ for bash?
>

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/05/06 08:05:56

Modified files:
net/wireless   : Makefile distinfo 

Log message:
update to wireless-5, from maintainer/upstream Gregor Best

Re: Update: net/wireless v4 -> v5

[Stuart Henderson]

On 2018/05/06 15:10, Klemens Nanni wrote:
> On Sun, May 06, 2018 at 02:48:55PM +0200, Gregor Best wrote:
> > sthen to the rescue. This looks much better. I've also reshuffled a few
> > things so the variables follow the order in Makefile.template.
> Works for me (again), OK kn with ${V} instead of $V.
> 

Huh?

Re: bash script in OpenBSD ports (was Re: [New] nnn-1.7)

[Stuart Henderson]

On 2018/05/06 09:47, Daniel Jakots wrote:
> On Sun, 6 May 2018 12:08:01 +0100, Stuart Henderson
>  wrote:
> 
> > I'm no fan of this:
> > 
> > #!/usr/bin/env bash
> > 
> > It's not deterministic (relies on the user's PATH being set in a
> > certain way), I would normally patch these to use
> > ${LOCALBASE}/bin/bash like you had in earlier versions of your port.
> 
> We discussed this in Nantes. The reason of using env is that it's
> portable so you can upstream the patch.
> 
> The current situation sucks that depending on who you ask you get a
> different answer :(

We discussed it but didn't come to a conclusion...

With env, it sometimes works, sometimes doesn't, depending on how
the environment is setup - with a patch, it always works.

The patches are annoying though. Maybe we need some equivalent of
MODPY_BIN_ADJ for bash?

bash script in OpenBSD ports (was Re: [New] nnn-1.7)

[Daniel Jakots]

On Sun, 6 May 2018 12:08:01 +0100, Stuart Henderson
 wrote:

> I'm no fan of this:
> 
> #!/usr/bin/env bash
> 
> It's not deterministic (relies on the user's PATH being set in a
> certain way), I would normally patch these to use
> ${LOCALBASE}/bin/bash like you had in earlier versions of your port.

We discussed this in Nantes. The reason of using env is that it's
portable so you can upstream the patch.

The current situation sucks that depending on who you ask you get a
different answer :(

Re: Update: net/wireless v4 -> v5

[Gregor Best]

On Sun, May 06, 2018 at 03:10:19PM +0200, Klemens Nanni wrote:
> On Sun, May 06, 2018 at 02:48:55PM +0200, Gregor Best wrote:
> > sthen to the rescue. This looks much better. I've also reshuffled a few
> > things so the variables follow the order in Makefile.template.
> Works for me (again), OK kn with ${V} instead of $V.
> [...]

Thy will be done :)

-- 
Gregor

Index: net/wireless/Makefile
===
RCS file: /home/cvs/ports/net/wireless/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- net/wireless/Makefile   3 Jan 2018 23:27:01 -   1.3
+++ net/wireless/Makefile   6 May 2018 13:21:48 -
@@ -1,12 +1,15 @@
 # $OpenBSD: Makefile,v 1.3 2018/01/03 23:27:01 danj Exp $
 
 COMMENT =  automatically scan for and configure wireless networks
-GH_ACCOUNT =   farhaven
-GH_PROJECT =   wireless
-GH_TAGNAME =   v4
+
+V =5
+DISTNAME = wireless-v${V}
+PKGNAME =  wireless-${V}
 
 CATEGORIES =   net
 
+HOMEPAGE = https://github.com/farhaven/wireless
+
 MAINTAINER =   Gregor Best 
 
 # BSD
@@ -14,6 +17,8 @@ PERMIT_PACKAGE_CDROM =Yes
 
 # uses pledge
 WANTLIB =  c
+
+MASTER_SITES = https://github.com/farhaven/wireless/releases/download/v${V}/
 
 NO_TEST =  Yes
 
Index: net/wireless/distinfo
===
RCS file: /home/cvs/ports/net/wireless/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- net/wireless/distinfo   3 Jan 2018 23:27:01 -   1.2
+++ net/wireless/distinfo   6 May 2018 12:43:35 -
@@ -1,2 +1,2 @@
-SHA256 (wireless-4.tar.gz) = HXWoFCCVh2O+ykHfDHdsDjc/iBh9iQs9Rj1v3NYry1s=
-SIZE (wireless-4.tar.gz) = 9117
+SHA256 (wireless-v5.tar.gz) = DbW6RVSyQvstKemJO57yARkGpYzpNzjuL0PCTipUabA=
+SIZE (wireless-v5.tar.gz) = 9100

Re: Update: net/wireless v4 -> v5

[Klemens Nanni]

On Sun, May 06, 2018 at 02:48:55PM +0200, Gregor Best wrote:
> sthen to the rescue. This looks much better. I've also reshuffled a few
> things so the variables follow the order in Makefile.template.
Works for me (again), OK kn with ${V} instead of $V.

Re: Update: net/wireless v4 -> v5

[Gregor Best]

Hi,

On Sun, May 06, 2018 at 12:19:09PM +0100, Stuart Henderson wrote:
> [...]
> This is the way to do it:
> 
> v=4
> DISTNAME= wireless-v$V
> PKGNAME=  wireless-$V
> [...]

sthen to the rescue. This looks much better. I've also reshuffled a few
things so the variables follow the order in Makefile.template.

-- 
Gregor

Index: net/wireless/Makefile
===
RCS file: /home/cvs/ports/net/wireless/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- net/wireless/Makefile   3 Jan 2018 23:27:01 -   1.3
+++ net/wireless/Makefile   6 May 2018 12:45:48 -
@@ -1,12 +1,15 @@
 # $OpenBSD: Makefile,v 1.3 2018/01/03 23:27:01 danj Exp $
 
 COMMENT =  automatically scan for and configure wireless networks
-GH_ACCOUNT =   farhaven
-GH_PROJECT =   wireless
-GH_TAGNAME =   v4
+
+V =5
+DISTNAME = wireless-v$V
+PKGNAME =  wireless-$V
 
 CATEGORIES =   net
 
+HOMEPAGE = https://github.com/farhaven/wireless
+
 MAINTAINER =   Gregor Best 
 
 # BSD
@@ -14,6 +17,8 @@ PERMIT_PACKAGE_CDROM =Yes
 
 # uses pledge
 WANTLIB =  c
+
+MASTER_SITES = https://github.com/farhaven/wireless/releases/download/v$V/
 
 NO_TEST =  Yes
 
Index: net/wireless/distinfo
===
RCS file: /home/cvs/ports/net/wireless/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- net/wireless/distinfo   3 Jan 2018 23:27:01 -   1.2
+++ net/wireless/distinfo   6 May 2018 12:43:35 -
@@ -1,2 +1,2 @@
-SHA256 (wireless-4.tar.gz) = HXWoFCCVh2O+ykHfDHdsDjc/iBh9iQs9Rj1v3NYry1s=
-SIZE (wireless-4.tar.gz) = 9117
+SHA256 (wireless-v5.tar.gz) = DbW6RVSyQvstKemJO57yARkGpYzpNzjuL0PCTipUabA=
+SIZE (wireless-v5.tar.gz) = 9100

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/05/06 05:47:10

Modified files:
mail/neomutt   : Makefile 

Log message:
update HOMEPAGE

Re: Which port produces this build output?

[Stuart Henderson]

On 2018/05/06 01:08, Brian Callahan wrote:
> 
> 
> On 5/5/2018 4:47 PM, John Long wrote:
> > On Fri, 2018-05-04 at 12:49 -0400, Brian Callahan wrote:
> >> On 05/04/18 12:46, Stuart Henderson wrote:
> >>> On 2018/05/04 11:09, Brian Callahan wrote:
>  On 05/04/18 06:45, Solene Rapenne wrote:
> > Christian Weisgerber writes:
> >
> >> I see this splashed on my dpb window.  Apparently a port
> >> writes to
> >> /dev/tty during the build.  Any idea which one?
> >>
> >>476 loops;  25s;  139520 Kstmts; 4894 Kst/sec
> >>381 loops;  20s;  111675 Kstmts; 4891 Kst/sec
> >> 93 loops;   5s;   27261 Kstmts; 4778 Kst/sec
> > it's lang/snobol4
> >
>  Fix looks like the attached.
> >>> Rather than patching build infra to avoid the test, would it be
> >>> simpler
> >>> to use e.g. /dev/stderr instead of /dev/tty?
> >> In this case, I think no. There's no reason to run the tests during
> >> the 
> >> build. It just adds a forced minute of time to every build of
> >> snobol4. 
> >> We can still patch the test to use /dev/stderr instead of /dev/tty
> >> of 
> >> course.
> >>
> > The guy who wrote SNOBOL4 for *NIX collects timing reports from various
> > boxes and OS. So the timing report *can* be somewhat useful.
> >
> > /jl
> >
> 
> Yes I know. I've communicated with upstream and provided timing reports.
> My crappy little netbook holds the world record for slowest amd64
> machine he has a report for.
> 
> However, there's no point in having the package build machines run a
> timing report each and every time they make new packages. If a user
> wants to do it, fine. That's what `make test` is for.
> 
> ~Brian
> 

It might not be useful to do the timing run as part of a normal build,
but this is quite an intrusive patch to carry.. Do you think upstream
might accept something like that themselves? With the xsnobol4 target
it's clear there is meant to be a way to build without running tests so
perhaps it's an oversight that the install target depends on timing.out?

NEW: x11/kde-applications/umbrello

[Rafael Sadowski]

Please find attached a simple replacement for x11/kde4/umbrello. Nothing
depends on umbrello KDE4, so we can replace it one by one.

$ cat x11/kde-applications/umbrello/pkg/DESCR
Umbrello UML Modeller is a Unified Modelling Language (UML) diagram program
based on KDE Technology.

UML allows you to create diagrams of software and other systems in a standard
format to document or design the structure of your programs.

Ok? Comments?

Best regards,

Rafael Sadowski


umbrello-17.12.3.tar.gz
Description: Binary data

Re: Update: net/wireless v4 -> v5

[Stuart Henderson]

On 2018/05/06 13:13, Gregor Best wrote:
> Hi,
> 
> Klemens asked me to provide the tarball as a release asset, so that it
> won't get randomly re-created by Github's infrastructure.
> 
> The attached patch moves to an asset as the distfile. I used the weird
> DISTFILE/DISTNAME split because otherwise the version of the port would
> change from 4 to v5, and I'm not sure how that'd be handled by the ports
> infrastructure. If that'd indeed be okay, I'll provide an updated,
> smaller patch.
> 
> -- 
>   Gregor
> 
> 
> Index: net/wireless/Makefile
> ===
> RCS file: /home/cvs/ports/net/wireless/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- net/wireless/Makefile 3 Jan 2018 23:27:01 -   1.3
> +++ net/wireless/Makefile 6 May 2018 11:06:54 -
> @@ -1,9 +1,14 @@
>  # $OpenBSD: Makefile,v 1.3 2018/01/03 23:27:01 danj Exp $
>  
>  COMMENT =automatically scan for and configure wireless networks
> -GH_ACCOUNT = farhaven
> -GH_PROJECT = wireless
> -GH_TAGNAME = v4
> +
> +HOMEPAGE =   https://github.com/farhaven/wireless
> +
> +V =  5
> +
> +MASTER_SITES =   
> https://github.com/farhaven/wireless/releases/download/v$V/
> +DISTFILES =  wireless-v$V.tar.gz
> +DISTNAME =   wireless-$V
>  
>  CATEGORIES = net
>  
> Index: net/wireless/distinfo
> ===
> RCS file: /home/cvs/ports/net/wireless/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- net/wireless/distinfo 3 Jan 2018 23:27:01 -   1.2
> +++ net/wireless/distinfo 6 May 2018 11:03:51 -
> @@ -1,2 +1,2 @@
> -SHA256 (wireless-4.tar.gz) = HXWoFCCVh2O+ykHfDHdsDjc/iBh9iQs9Rj1v3NYry1s=
> -SIZE (wireless-4.tar.gz) = 9117
> +SHA256 (wireless-v5.tar.gz) = 9rz1YkU/l3Go7v916SWBPJHBSLaPuoYpHaNvPA74INY=
> +SIZE (wireless-v5.tar.gz) = 9160
> 

This is the way to do it:

v=  4
DISTNAME=   wireless-v$V
PKGNAME=wireless-$V

Re: Update: net/wireless v4 -> v5

[Gregor Best]

Hi,

Klemens asked me to provide the tarball as a release asset, so that it
won't get randomly re-created by Github's infrastructure.

The attached patch moves to an asset as the distfile. I used the weird
DISTFILE/DISTNAME split because otherwise the version of the port would
change from 4 to v5, and I'm not sure how that'd be handled by the ports
infrastructure. If that'd indeed be okay, I'll provide an updated,
smaller patch.

-- 
Gregor


Index: net/wireless/Makefile
===
RCS file: /home/cvs/ports/net/wireless/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- net/wireless/Makefile   3 Jan 2018 23:27:01 -   1.3
+++ net/wireless/Makefile   6 May 2018 11:06:54 -
@@ -1,9 +1,14 @@
 # $OpenBSD: Makefile,v 1.3 2018/01/03 23:27:01 danj Exp $
 
 COMMENT =  automatically scan for and configure wireless networks
-GH_ACCOUNT =   farhaven
-GH_PROJECT =   wireless
-GH_TAGNAME =   v4
+
+HOMEPAGE = https://github.com/farhaven/wireless
+
+V =5
+
+MASTER_SITES = https://github.com/farhaven/wireless/releases/download/v$V/
+DISTFILES =wireless-v$V.tar.gz
+DISTNAME = wireless-$V
 
 CATEGORIES =   net
 
Index: net/wireless/distinfo
===
RCS file: /home/cvs/ports/net/wireless/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- net/wireless/distinfo   3 Jan 2018 23:27:01 -   1.2
+++ net/wireless/distinfo   6 May 2018 11:03:51 -
@@ -1,2 +1,2 @@
-SHA256 (wireless-4.tar.gz) = HXWoFCCVh2O+ykHfDHdsDjc/iBh9iQs9Rj1v3NYry1s=
-SIZE (wireless-4.tar.gz) = 9117
+SHA256 (wireless-v5.tar.gz) = 9rz1YkU/l3Go7v916SWBPJHBSLaPuoYpHaNvPA74INY=
+SIZE (wireless-v5.tar.gz) = 9160

Re: [New] nnn-1.7

[Stuart Henderson]

On 2018/05/06 00:01, Ljuba Nedeljkovic wrote:
> Attached is the port of nnn, version 1.8. Upstream is releasing
> source tarball as a formal/proper release so GH_* are gone.
> Patch (present in previous port submissions) is also gone since
> upstream fixed portability issue with shell script.
> 
> Tests/comments.suggestions are welcome.

I'm no fan of this:

#!/usr/bin/env bash

It's not deterministic (relies on the user's PATH being set in a certain
way), I would normally patch these to use ${LOCALBASE}/bin/bash like you had
in earlier versions of your port.

net/tor: enable SEPARATE_BUILD

[Klemens Nanni]

Simple diff for out-of-tree builds:

$ du -sh `make show='WRKSRC WRKBUILD'`
27.8M   /tmp/pobj/tor-0.3.2.10/tor-0.3.2.10
94.4M   /tmp/pobj/tor-0.3.2.10/build-amd64

Without the symlink, it would rebuild manuals using rst2man.

OK?

Index: Makefile
===
RCS file: /cvs/ports/net/tor/Makefile,v
retrieving revision 1.112
diff -u -p -r1.112 Makefile
--- Makefile25 Apr 2018 12:54:15 -  1.112
+++ Makefile6 May 2018 10:01:17 -
@@ -17,6 +17,7 @@ WANTLIB += c crypto event_core event_ext
 MASTER_SITES=  https://www.torproject.org/dist/
 
 AUTOCONF_VERSION=2.69
+SEPARATE_BUILD=Yes
 CONFIGURE_STYLE=autoconf
 # PIE is already taken care of on a per-arch basis, and we have stack 
protection
 # anyway on FRAME_GROWS_DOWN archs.
@@ -32,5 +33,8 @@ DB_DIR=   /var/tor
 SUBST_VARS+=   DB_DIR
 
 FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples
+
+pre-build:
+   ln -sf ${WRKSRC}/doc ${WRKBUILD}/
 
 .include 

NEW: [3/3] x11/kde-applications/kalgebra

[Rafael Sadowski]

Please read "NEW: [1/3] x11/kde-applications/analitza" for more
information.

$ cat x11/kde-applications/kalgebra/pkg/DESCR
KAlgebra is a fully featured calculator that lets you plot different
types of 2D and 3D functions and to calculate easy and not so easy
calculations, such as addition, trigonometric functions or derivatives.

Ok? Comments?

Rafael Sadowksi


kalgebra-17.12.3.tar.gz
Description: Binary data

NEW: [2/3] x11/kde-applications/cantor

[Rafael Sadowski]

Please read "NEW: [1/3] x11/kde-applications/analitza" for more
information.

$ cat x11/kde-applications/cantor/pkg/DESCR
Cantor is an application that lets you use your favorite mathematical
applications from within a nice KDE-integrated Worksheet Interface. It
offers assistant dialogs for common tasks and allows you to share your
worksheets with others.

Ok? Comments?

Rafael Sadowski


cantor-17.12.3.tar.gz
Description: Binary data

NEW: [1/3] x11/kde-applications/analitza

[Rafael Sadowski]

Please find attach a tarball to replace x11/kde4/analitza. cantor and
kalgebra depends on analitza for which I also have a replacement. Please
see [2/3] and [3/3]. With all together, we can unhook
{x11/kde4/{analitza,cantor,kalgebra} and adjust meta/kde4.

I wait until I have an okay for everyone.

$ cat x11/kde-applications/analitza/pkg/DESCR
Analitza is a library that work with mathematical objects. Analitza add
mathematical features to your program, such as symbolic computations and some
numerical methods; for instance the library can parse mathematical expressions
and let you evaluate and draw them.

Ok? Comments?

Rafael Sadowski


analitza-17.12.3.tar.gz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/05/06 03:21:41

Modified files:
x11/gnome/todo/patches: 
patch-plugins_todoist_gtd-provider-todoist_c 

Log message:
Add MR URL.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/05/06 03:08:08

Modified files:
x11/gnome/todo : Makefile 
Added files:
x11/gnome/todo/patches: 
patch-plugins_todoist_gtd-provider-todoist_c 
patch-src_meson_build 

Log message:
Try to fix auto-generated gtd-vcs-identifier.h properly.
While here, fix an implicit declaration.

Re: NEW: x11/kde-applications/okteta (replacement for x11/kde4/okteta)

[Rafael Sadowski]

On Sun Apr 29, 2018 at 09:02:56AM +0200, Rafael Sadowski wrote:
> 
> I see no conflict with other application(s) so only set "@pkgpath
> x11/kde4/okteta".
> 
I was wrong! After the kate removal fallout, I took another look at it.
Please find below a simple patch to zap okteta support in kdevelop.
This should eliminate all dependencies.

Still looking for an ok ;)

Index: Makefile
===
RCS file: /cvs/ports/devel/kdevelop/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile29 Apr 2018 10:07:52 -  1.12
+++ Makefile6 May 2018 07:48:54 -
@@ -4,7 +4,7 @@ CATEGORIES =devel x11
 COMMENT =  integrated development environment for KDE 4
 KDEV_V =   4.7.1
 KDEVPLAT_V =   1.7.1
-REVISION = 3
+REVISION = 4
 DISTNAME = kdevelop-${KDEV_V}
 HOMEPAGE = http://www.kdevelop.org/
 
@@ -29,10 +29,6 @@ WANTLIB += ${KDE4LIB}/kemoticons ${KDE4L
 WANTLIB += ${KDE4LIB}/knewstuff3 ${KDE4LIB}/knotifyconfig ${KDE4LIB}/kparts
 WANTLIB += ${KDE4LIB}/kprintutils ${KDE4LIB}/ktexteditor ${KDE4LIB}/kutils
 WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils ${KDE4LIB}/plasma
-WANTLIB += ${KDE4LIB}/kasten2controllers ${KDE4LIB}/kasten2core
-WANTLIB += ${KDE4LIB}/kasten2gui ${KDE4LIB}/kasten2okteta1controllers
-WANTLIB += ${KDE4LIB}/kasten2okteta1core ${KDE4LIB}/kasten2okteta1gui
-WANTLIB += ${KDE4LIB}/okteta1core ${KDE4LIB}/okteta1gui
 WANTLIB += ${KDE4LIB}/threadweaver
 WANTLIB += kdevplatformdebugger kdevplatformdocumentation
 WANTLIB += kdevplatforminterfaces kdevplatformlanguage
@@ -53,8 +49,10 @@ RUN_DEPENDS =x11/kde-applications/kate 
x11/gtk+3,-guic \
x11/kde4/kapptemplate>=${MODKDE4_DEP_VERSION}
 
-LIB_DEPENDS =  devel/kdevplatform>=${KDEVPLAT_V} \
-   x11/kde4/okteta>=${MODKDE4_DEP_VERSION}
+LIB_DEPENDS =  devel/kdevplatform>=${KDEVPLAT_V}
+
+pre-configure:
+   rm ${WRKSRC}/cmake/modules/{FindLibOkteta.cmake,FindLibKasten.cmake}
 
 # XXX because OBJECT_DEPENDS doesn't work as it should in
 # the patch-languages_cpp_CMakeLists_txt
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/kdevelop/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST   10 Jul 2015 18:28:14 -  1.2
+++ pkg/PLIST   6 May 2018 07:48:54 -
@@ -26,7 +26,6 @@ lib/kde4/kdevkdeprovider.so
 lib/kde4/kdevmakebuilder.so
 lib/kde4/kdevmanpage.so
 lib/kde4/kdevninja.so
-lib/kde4/kdevokteta.so
 lib/kde4/kdevqthelp.so
 lib/kde4/kdevqthelp_config.so
 lib/kde4/krunner_kdevelopsessions.so
@@ -151,8 +150,6 @@ share/apps/kdevgdb/printers/qt4.py
 share/apps/kdevgdb/printers/qt4.pyc
 share/apps/kdevmanpage/
 share/apps/kdevmanpage/manpagedocumentation.css
-share/apps/kdevokteta/
-share/apps/kdevokteta/kdevokteta.rc
 share/apps/plasma/plasmoids/kdevelopsessions/
 share/apps/plasma/plasmoids/kdevelopsessions/contents/
 share/apps/plasma/plasmoids/kdevelopsessions/contents/ui/
@@ -249,7 +246,6 @@ share/kde4/services/kdevkdeprovider.desk
 share/kde4/services/kdevmakebuilder.desktop
 share/kde4/services/kdevmanpage.desktop
 share/kde4/services/kdevninja.desktop
-share/kde4/services/kdevokteta.desktop
 share/kde4/services/kdevqthelp.desktop
 share/kde4/services/kdevqthelp_config.desktop
 share/kde4/services/plasma-applet-kdevelopsessions.desktop

Re: UPDATE: telephony/baresip/{baresip,re,rem}

[Ingo Feinerer]

Ping (maintainer timeout)
(original posting at https://marc.info/?l=openbsd-ports=152467183305081=2)

On Wed, Apr 25, 2018 at 05:55:44PM +0200, Ingo Feinerer wrote:
> Hi,
> 
> update telephony/baresip/baresip 0.5.8 -> 0.5.9
> update telephony/baresip/re  0.5.7 -> 0.5.8
> update telephony/baresip/rem 0.5.2 -> 0.5.3
> 
> ChangeLogs:
> 
> http://lists.creytiv.com/pipermail/re-devel/2018-April/001186.html
> http://lists.creytiv.com/pipermail/re-devel/2018-April/001185.html
> http://lists.creytiv.com/pipermail/re-devel/2018-April/001184.html
> 
> OK?
> 
> Best regards,
> Ingo
> 
> Index: baresip/Makefile
> ===
> RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- baresip/Makefile  11 Mar 2018 18:48:59 -  1.20
> +++ baresip/Makefile  25 Apr 2018 15:50:36 -
> @@ -3,7 +3,7 @@
>  COMMENT-main =   modular SIP User-Agent with audio and video 
> support
>  COMMENT-gtk2 =   GTK+2-based modules for baresip
>  
> -V =  0.5.8
> +V =  0.5.9
>  DISTNAME =   baresip-$V
>  PKGNAME-main =   baresip-$V
>  PKGNAME-gtk2 =   baresip-gtk2-$V
> @@ -14,7 +14,7 @@ WANTLIB-main += re rem sndfile sndio spa
>  WANTLIB-main += twolame v4l2 vpx x264 x265
>  
>  WANTLIB-gtk2 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
> +WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype fribidi 
> gdk-x11-2.0
>  WANTLIB-gtk2 += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gstapp-1.0
>  WANTLIB-gtk2 += gstbase-1.0 gstreamer-1.0 gtk-x11-2.0 intl mpg123 pango-1.0
>  WANTLIB-gtk2 += pangocairo-1.0 pangoft2-1.0 re z
> @@ -37,7 +37,8 @@ LIB_DEPENDS-main =  audio/gsm \
>   telephony/baresip/re>=0.5.7 \
>   telephony/baresip/rem>=0.5.2 \
>   telephony/spandsp
> -LIB_DEPENDS-gtk2 =   multimedia/gstreamer1/plugins-base \
> +LIB_DEPENDS-gtk2 =   devel/fribidi \
> + multimedia/gstreamer1/plugins-base \
>   telephony/baresip/re>=0.5.7 \
>   x11/gtk+2,-main
>  RUN_DEPENDS-gtk2 =   telephony/baresip/baresip,-main>=$V \
> Index: baresip/distinfo
> ===
> RCS file: /cvs/ports/telephony/baresip/baresip/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- baresip/distinfo  11 Mar 2018 18:48:59 -  1.14
> +++ baresip/distinfo  25 Apr 2018 15:50:36 -
> @@ -1,2 +1,2 @@
> -SHA256 (baresip-0.5.8.tar.gz) = 2fEdpQ/WyTWatHhhi108EyR0qDj+n2aMJJ+dWgfyZmI=
> -SIZE (baresip-0.5.8.tar.gz) = 584406
> +SHA256 (baresip-0.5.9.tar.gz) = 7t3Pue+ACi2JIAi9maIj6n+pO6hYhswGPGu4HLkjbgk=
> +SIZE (baresip-0.5.9.tar.gz) = 589680
> Index: baresip/patches/patch-src_config_c
> ===
> RCS file: /cvs/ports/telephony/baresip/baresip/patches/patch-src_config_c,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-src_config_c
> --- baresip/patches/patch-src_config_c11 Mar 2018 18:48:59 -  
> 1.13
> +++ baresip/patches/patch-src_config_c25 Apr 2018 15:50:36 -
> @@ -2,16 +2,16 @@ $OpenBSD: patch-src_config_c,v 1.13 2018
>  Index: src/config.c
>  --- src/config.c.orig
>  +++ src/config.c
> -@@ -505,7 +505,7 @@ static const char *default_video_device(void)
> - #endif
> - 
> +@@ -511,7 +511,7 @@ static const char *default_video_device(void)
> + #elif defined (WIN32)
> + return "dshow,nil";
>   #else
>  -return "v4l2,/dev/video0";
>  +return "v4l2,/dev/video";
>   #endif
>   }
>   
> -@@ -753,31 +753,31 @@ int config_write_template(const char *file, const stru
> +@@ -761,31 +761,31 @@ int config_write_template(const char *file, const stru
>   (void)re_fprintf(f, "module\t\t\t" MOD_PRE "stdio" MOD_EXT "\n");
>   #endif
>   (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "cons" MOD_EXT "\n");
> @@ -60,7 +60,7 @@ Index: src/config.c
>   (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "plc" MOD_EXT "\n");
>   
>   (void)re_fprintf(f, "\n# Audio driver Modules\n");
> -@@ -796,8 +796,8 @@ int config_write_template(const char *file, const stru
> +@@ -804,8 +804,8 @@ int config_write_template(const char *file, const stru
>   (void)re_fprintf(f, "module\t\t\t" MOD_PRE "alsa" MOD_EXT "\n");
>   (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "pulse" MOD_EXT "\n");
>   #endif
> @@ -71,7 +71,7 @@ Index: src/config.c
>   (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "aubridge" MOD_EXT "\n");
>   (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "aufile" MOD_EXT "\n");
>   
> -@@ -809,9 +809,9 @@ int config_write_template(const char *file, const stru
> +@@ -817,9 +817,9 @@ int config_write_template(const char *file, const stru
>   #else
>   (void)re_fprintf(f,