update: net/bitlbee 3.4.0 -> 3.5.1

[Klemens Nanni]

See the official changelog[0] for more information. Especially TLS>1.0
support[1] should make it into 6.1 imho.

Documentation does not depend on textproc/xmlto anymore, a single
help.txt is now produced through a python script in BitlBee's build
process.

Even though I'm running the latest snapshot and keep the ports tree in
sync, the following erros still occur (output redecated):

$ make package
Error Libraries in packing-lists...
--W glib-2.0.4200.3
--W gmodule-2.0.4200.3
+-W glib-2.0.4200.4
+-W gmodule-2.0.4200.4
$ make PKG_CREATE_NO_CHECKS=yes package
file:/usr/ports/packages/amd64/tmp/bitlbee-3.5.1p0.tgz: \
  unsigned package (signify(1) doesn't see old-style signatures)
Fatal error: Bad package \
  /usr/ports/packages/amd64/tmp/bitlbee-3.5.1p0.tgz

I couldn't more information besides "sync your tree" on the first one;
the package should probably not be signed on my machine either. Can
anyone provide more information on this? Reading the official
documentation, guides and manual pages I wasn't able to fix this myself.


0: https://www.bitlbee.org/main.php/changelog.html
1: 
https://github.com/bitlbee/bitlbee/commit/82e55d202f8152c25b8daa48d1960eede3eee312
Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile19 Jul 2015 08:22:14 -  1.58
+++ Makefile9 Apr 2017 11:22:09 -
@@ -1,46 +1,45 @@
 # $OpenBSD: Makefile,v 1.58 2015/07/19 08:22:14 jca Exp $
 
-COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
+COMMENT =  IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
 
-DISTNAME=  bitlbee-3.4
-REVISION=  0
-CATEGORIES=net
+DISTNAME = bitlbee-3.5.1
+REVISION = 0
+CATEGORIES =   net
 
-HOMEPAGE=  http://bitlbee.org/
+HOMEPAGE = https://bitlbee.org/
 
-MAINTAINER=Tom Doherty 
+MAINTAINER =   Tom Doherty 
 
 # GPLv2
-PERMIT_PACKAGE_CDROM=  Yes
+PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += c m pthread glib-2.0 gmodule-2.0 ssl crypto
 
-MASTER_SITES=  http://get.bitlbee.org/src/
+MASTER_SITES = https://get.bitlbee.org/src/
 
-MODULES=   devel/gettext
+MODULES =  devel/gettext
 
-DB_DIR?=   /var/bitlbee
-ETCDIR=${SYSCONFDIR}/bitlbee
-EXAMPLEDIR=${PREFIX}/share/examples/bitlbee
-DOCS=  ${WRKSRC}/doc/user-guide/user-guide.html
-DOCDIR=${PREFIX}/share/doc/bitlbee/
+DB_DIR ?=  /var/bitlbee
+ETCDIR =   ${SYSCONFDIR}/bitlbee
+EXAMPLEDIR =   ${PREFIX}/share/examples/bitlbee
+DOCS = ${WRKSRC}/doc/user-guide/help.txt
+DOCDIR =   ${PREFIX}/share/doc/bitlbee/
 
-BUILD_DEPENDS= textproc/xmlto
-LIB_DEPENDS=   devel/glib2
+LIB_DEPENDS =  devel/glib2
 
-CONFIGURE_STYLE=   simple
-CONFIGURE_ARGS+=   --bindir=${PREFIX}/libexec \
+CONFIGURE_STYLE =  simple
+CONFIGURE_ARGS +=  --bindir=${PREFIX}/libexec \
--mandir=${PREFIX}/man \
--config=${DB_DIR} \
--etcdir=${ETCDIR} \
--ssl=openssl \
--pie=0
 
-USE_GMAKE= Yes
-MAKE_ENV=  "CC=${CC}" "CFLAGS=${CFLAGS}"
-FAKE_FLAGS=ETCDIR=${EXAMPLEDIR}
-FAKE_TARGET=   install install-etc
-SUBST_VARS=DB_DIR
+USE_GMAKE =Yes
+MAKE_ENV = "CC=${CC}" "CFLAGS=${CFLAGS}"
+FAKE_FLAGS =   ETCDIR=${EXAMPLEDIR}
+FAKE_TARGET =  install install-etc
+SUBST_VARS =   DB_DIR
 
 FLAVORS =  libpurple otr
 FLAVOR ?=
@@ -56,12 +55,12 @@ LIB_DEPENDS +=  security/libotr>=4.0.0 s
 WANTLIB += gcrypt otr
 .endif
 
-NO_TEST=   Yes
+NO_TEST =  Yes
 
 # don't hide compile command lines
 pre-configure:
-   find ${WRKSRC} -name Makefile | \
-   xargs perl -pi -e 's,@\$$\(CC\),\$$(CC),g'
+   find ${WRKSRC} -type f -name Makefile -exec \
+   sed -ie '/$$(CC)/s,@,,' {} +
 
 post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo13 May 2015 19:01:10 -  1.27
+++ distinfo9 Apr 2017 11:22:09 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.4.tar.gz) = zrrWRrv9F8gJI3QyRAOf2XDjyifowbfPhyYi53MjnV4=
-SIZE (bitlbee-3.4.tar.gz) = 761027
+SHA256 (bitlbee-3.5.1.tar.gz) = ljbX/Ynrs3VsE6mjOHc2ym1WzPZuwFgNUS8Hsh2w+mk=
+SIZE (bitlbee-3.5.1.tar.gz) = 680351
Index: pkg/DESCR

net/glib2-networking: Remove systemd service

[Klemens Nanni]

Stumbled across /usr/local/lib/systemd/ the other day, so here's the
clean up.

The configure script has no knob for it so simply remove the files in
post-install.

`make plist' works fine and also strips two old directories.

Feedback? Comments?

Index: Makefile
===
RCS file: /cvs/ports/net/glib2-networking/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile26 Jul 2017 22:45:27 -  1.48
+++ Makefile31 Jul 2017 16:58:29 -
@@ -5,7 +5,7 @@ COMMENT=network-related gio modules fo
 GNOME_VERSION= 2.50.0
 GNOME_PROJECT= glib-networking
 PKGNAME=   glib2-networking-${GNOME_VERSION}
-REVISION=  3
+REVISION=  4
 
 CATEGORIES=net
 
@@ -36,5 +36,6 @@ TEST_IS_INTERACTIVE=  x11
 
 post-install:
rm ${PREFIX}/lib/gio/modules/*.{a,la}
+   rm -rf ${PREFIX}/lib/systemd
 
 .include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/glib2-networking/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST   8 Apr 2017 10:39:22 -   1.20
+++ pkg/PLIST   31 Jul 2017 16:58:29 -
@@ -2,9 +2,6 @@
 lib/gio/modules/libgiognomeproxy.so
 lib/gio/modules/libgiognutls.so
 lib/gio/modules/libgiolibproxy.so
-lib/systemd/
-lib/systemd/user/
-lib/systemd/user/glib-pacrunner.service
 @bin libexec/glib-pacrunner
 share/dbus-1/
 share/dbus-1/services/
@@ -31,8 +28,6 @@ share/locale/eu/LC_MESSAGES/glib-network
 share/locale/fa/LC_MESSAGES/glib-networking.mo
 share/locale/fi/LC_MESSAGES/glib-networking.mo
 share/locale/fr/LC_MESSAGES/glib-networking.mo
-share/locale/fur/
-share/locale/fur/LC_MESSAGES/
 share/locale/fur/LC_MESSAGES/glib-networking.mo
 share/locale/gd/LC_MESSAGES/glib-networking.mo
 share/locale/gl/LC_MESSAGES/glib-networking.mo

Re: net/glib2-networking: Remove systemd service

[Klemens Nanni]

On Mon, Jul 31, 2017 at 07:08:02PM +0200, Antoine Jacoutot wrote:
> On Mon, Jul 31, 2017 at 06:53:14PM +0200, Klemens Nanni wrote:
> > Stumbled across /usr/local/lib/systemd/ the other day, so here's the
> > clean up.
> > 
> > The configure script has no knob for it so simply remove the files in
> > post-install.
> > 
> > `make plist' works fine and also strips two old directories.
> > 
> > Feedback? Comments?
> 
> There are multiple instances on this in ports. They do no harm imho and may be
> useful for reference.
Manuals and documentation are for reference, these service files are
just confusing and useless imho.

We have indeed quite a few systemd specific (service) files laying
around; I don't see the point in leaving them: Why not keeping local
installations clean? Surely they're "harmless" but I find systemd
(service) files simply confusing and useless on my OpenBSD machines.

Re: net/glib2-networking: Remove systemd service

[Klemens Nanni]

On Mon, Jul 31, 2017 at 07:33:14PM +0200, Antoine Jacoutot wrote:
> On Mon, Jul 31, 2017 at 07:21:45PM +0200, Klemens Nanni wrote:
> > On Mon, Jul 31, 2017 at 07:08:02PM +0200, Antoine Jacoutot wrote:
> > > On Mon, Jul 31, 2017 at 06:53:14PM +0200, Klemens Nanni wrote:
> > > > Stumbled across /usr/local/lib/systemd/ the other day, so here's the
> > > > clean up.
> > > > 
> > > > The configure script has no knob for it so simply remove the files in
> > > > post-install.
> > > > 
> > > > `make plist' works fine and also strips two old directories.
> > > > 
> > > > Feedback? Comments?
> > > 
> > > There are multiple instances on this in ports. They do no harm imho and 
> > > may be
> > > useful for reference.
> > Manuals and documentation are for reference, these service files are
> > just confusing and useless imho.
> > 
> > We have indeed quite a few systemd specific (service) files laying
> > around; I don't see the point in leaving them: Why not keeping local
> > installations clean? Surely they're "harmless" but I find systemd
> > (service) files simply confusing and useless on my OpenBSD machines.
> 
> Can you also clean all the Linux, AIX, Solaris etc. documentation from
> /usr/local/share/doc/* please. From all ports. Same with all man pages that
> ports install and that have reference to system V, systemd, openrc, /proc or
> in general things that don't apply to OpenBSD.
> I am sorry but what you say makes no sense.
> 
> $ find /usr/local/lib/systemd/ | wc
>   15  15 783
> $ du -sh /usr/local/lib/systemd/
> 30.0K   /usr/local/lib/systemd/
> 
> OMG it's huge and not clean!!!
It's just your argument I don't get/agree with: Instead of starting to
clean things up you're not doing anything at all because there's more
to clean anyway?

Of course getting rid of every misplaced/unsupported/whatever bit seems
utopian but not doing it where easily possible seems illogical to me.

Re: net/glib2-networking: Remove systemd service

[Klemens Nanni]

On Mon, Jul 31, 2017 at 08:33:34PM +0200, Marc Espie wrote:
> On Mon, Jul 31, 2017 at 08:20:31PM +0200, Klemens Nanni wrote:
> > On Mon, Jul 31, 2017 at 08:07:17PM +0200, Ingo Schwarze wrote:
> > > Klemens Nanni wrote on Mon, Jul 31, 2017 at 07:52:25PM +0200:
> > > 
> > > > It's just your argument I don't get/agree with: Instead of starting to
> > > > clean things up you're not doing anything at all
> > > 
> > > Saying that ajacoutot@ "is not doing anything at all" is a weird
> > > statement indeed and could be misunderstood.  ;-)
> > I meant this generally, nothing personal or anything, agreed. Read:
> > "Start cleaning bit by bit rather than nothing".
> 
> How much have you contributed to our ports tree ?
> 
> How many things has Antoine contributed ?
> 
> More importantly, how many fuck-ups from other people has he fixed already.
> 
> I think you can do better, in terms of apologies...
Never meant to be personal against anyone or to play down anything you
guys are pulling here, don't get me wrong.

Sorry for the noise, I guess; keep up the good work!

Re: net/glib2-networking: Remove systemd service

[Klemens Nanni]

On Mon, Jul 31, 2017 at 08:07:17PM +0200, Ingo Schwarze wrote:
> Klemens Nanni wrote on Mon, Jul 31, 2017 at 07:52:25PM +0200:
> 
> > It's just your argument I don't get/agree with: Instead of starting to
> > clean things up you're not doing anything at all
> 
> Saying that ajacoutot@ "is not doing anything at all" is a weird
> statement indeed and could be misunderstood.  ;-)
I meant this generally, nothing personal or anything, agreed. Read:
"Start cleaning bit by bit rather than nothing".

> > because there's more to clean anyway?
> 
> He is saying that it is a huge effort for no benefit, and that it
> is a waste of time.  Of his time, too, by the way.
> 
> Besides, his argument that being able to look up documentation and
> even tiny service files for other operating systems on OpenBSD may
> occasionally be useful is not without merit either.
> 
> Tweak third-party software where necessary, but as little as possible.
That's me seeing things differently then, I guess. Probably also because
I've not been there (yet) to consider things like that as waste of (my)
time.

Thanks for your input ajacoutot@ and ingo@ :-)

Re: NEW: x11/screenkey

[Klemens Nanni]

On Wed, Aug 16, 2017 at 12:00:38AM +0100, Kaashif Hymabaccus wrote:
> Hello ports@,
> 
> Please find attached a port for x11/screenkey.
> 
> pkg/DESCR:
> Screencast tool to display your keypresses, inspired by Screenflick.
> Supports several keyboard translation methods, multiple monitors,
> dynamic recording control, repeat keypress compression and more.
> 
> portcheck gives me a warning:
> 
> > translation file(s) found without devel/gettext dependency in RUN_DEPENDS
> 
> But this is a Python program, Python has a built in module for
> gettext, so there is no need to depend on devel/gettext.
> 
> Thoughts? I don't have much experience with Python, so I probably got
> some of the PLIST stuff wrong.
You should use MODPY_EGG_VERSION and MODPY_SETUPTOOLS,
see port-modules(5).

textproc/intltool is missing as BUILD_DEPENDS.

SEPARATE_BUILD should be set.

I think DESCR's first line would read better if it was a proper sentence.

This port looks useful, especially when it comes to screen recording.
Thanks for porting it!

Re: NEW net/mininet

[Klemens Nanni]

On Mon, Aug 14, 2017 at 02:30:27PM -0700, Ayaka Koshibe wrote:
> Apologies, wrong attachment - correct one attached.
> 
> On Mon, Aug 14, 2017 at 2:25 PM, Ayaka Koshibe  wrote:
> > I've addressed the comments - updates attached.
> >
So now the description, which I read before installing a package, is
referring to the package's content for more details. I meant something
along the lines of "heavily patched - here be dragons" so users know
this before installing it.

> >> `make test' says "Ran 0 tests in 0.000s"; that's not intentional, is it?
> >
> > The regression tests are intentionally empty, since they involve
> > destructive actions like creating/destroying interfaces.
I see.

Here are some more comments; sorry for splitting this into two mails,
I've been looking into it more closely just now;

MODPY_EGG_VERSION must be set as described in port-modules(5), make sure
to have PLIST updated accordingly.

devel/pep8 is not used and can thus be removed as BUILD_DEPENDS.

PREFIX should be used instead of LOCALBASE for setting *DIR as you've
already done in the pre-install target.

You can set SEPARATE_BUILD, but then README.md must not be installed
from WRKBUILD anymore.

Example files go under /usr/local/share/examples/mininet, not the
python site-packages directory.

Why do you patch files such as the INSTALL-* ones if they're aren't used
or installed anyway?

Why are the platform specific files under freebsd/ and linux/ which are
known not to work for us obviously installed?


Minor style nits:

Indenting the broken help2man line (by four spaces) makes it easier to
read and distinguish from another command itself.

I'd also insert a newline before the bsd.port.mk include.


Thanks for your work on this port, I'm looking forward to it!

Re: UPDATE: mail/isync 1.2.1 to 1.2.2

[Klemens Nanni]

On Wed, Aug 09, 2017 at 11:33:09PM -0400, Daniel Jakots wrote:
> On Thu, 10 Aug 2017 02:53:59 +0200, Klemens Nanni <k...@posteo.org>
> wrote:
> 
> > > I'm not entirely sure yet whether the introduced patch to get
> > > X509_OBJECT_get0_X509() and X509_STORE_get0_objects() working is the
> > > way to go, maybe someone more knowledgable about OpenSSL internals
> > > can comment/fix this?
> 
> > +-# if OPENSSL_VERSION_NUMBER < 0x1010L
> > ++/*# if OPENSSL_VERSION_NUMBER < 0x1010L*/
> 
> That's not the best way to fix it. Here's an updated diff that also
> addresses the fact it doesn't build with gcc4.2:
> 
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c: In function 'map_name':
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c:526: error: #pragma GCC 
> diagnostic not allowed inside functions
> 
> Cheers,
> Daniel
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/isync/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile  20 Dec 2015 09:59:22 -  1.30
> +++ Makefile  10 Aug 2017 03:26:41 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= synchronize IMAP4 and maildir mailboxes
>  
> -DISTNAME=isync-1.2.1
> +DISTNAME=isync-1.2.2
>  CATEGORIES=  mail
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=isync/}
>  
> @@ -12,6 +12,8 @@ HOMEPAGE=   http://isync.sourceforge.net/
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  WANTLIB= c crypto db sasl2 ssl z
> +
> +COMPILER=clang gcc
>  
>  LIB_DEPENDS= databases/db/v4 \
>   security/cyrus-sasl2
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/isync/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo  20 Dec 2015 09:59:22 -  1.11
> +++ distinfo  10 Aug 2017 03:26:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (isync-1.2.1.tar.gz) = 5xbeKMmgjmJKA1yq45AvzztRFVO+XWFRehM+A6o1Mq4=
> -SIZE (isync-1.2.1.tar.gz) = 281990
> +SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
> +SIZE (isync-1.2.2.tar.gz) = 285745
> Index: patches/patch-src_socket_c
> ===
> RCS file: patches/patch-src_socket_c
> diff -N patches/patch-src_socket_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_socket_c10 Aug 2017 03:26:45 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/socket.c
> +--- src/socket.c.orig
>  src/socket.c
> +@@ -40,7 +40,7 @@
> + # include 
> + # include 
> + # include 
> +-# if OPENSSL_VERSION_NUMBER < 0x1010L
> ++# if OPENSSL_VERSION_NUMBER < 0x1010L || 
> defined(LIBRESSL_VERSION_NUMBER)
> + #  define X509_OBJECT_get0_X509(o) ((o)->data.x509)
> + #  define X509_STORE_get0_objects(o) ((o)->objs)
> + # endif
> 
Ah, I see. That's much better, thanks.

Does anyone want to commit this?

Re: NEW net/mininet

[Klemens Nanni]

On Sun, Aug 13, 2017 at 02:33:19PM -0700, Ayaka Koshibe wrote:
> Mininet creates a realistic virtual network, running real kernel, switch
> and application code, on a single machine (VM, cloud or native), in
> seconds, with a single command
> 
> Because you can easily interact with your network using the Mininet CLI
> (and API), customize it, share it with others, or deploy it on real
> hardware, Mininet is useful for development, teaching, and research.
> 
> OK?
Have you run portcheck? Trailing whitespace and .swp file laying around.
You're also missing "c" as WANTLIB.

I'd also put the porting bits from README into DESCR so users know
beforehand.

`make test' says "Ran 0 tests in 0.000s"; that's not intentional, is it?

What about mn.1 and mnexec.1? They're not showing up in PLIST and trying
to build them with `make m{n,exec}.1' complains about config.mk missing.

Re: clang breakage: memtest86+

[Klemens Nanni]

On Thu, Aug 10, 2017 at 03:21:13PM -0400, Jeremie Courreges-Anglas wrote:
> 
> I've cooked a diff to allow building memtest86+ with clang.  Great.  The
> problem is that I just get a black screen on this x61 laptop (the only
> noticeable thing is that the cursor stays in the middle of the screen).
> 
> The only problem is, I get the same result with a build with base gcc.
> 
> Could people please apply the diff below, build and install memtest86+,
> and then test it?  Just type
> 
>   > boot memtest
> 
> at the boot(8) prompt.
> 
> Years ago I had tested this on an x240 machine, and I blamed the failure
> on my laptop being too recent.  But maybe that stuff is plain broken
> since years.
> 
> Both i386 and amd64 could be tested, btw.  Thanks in advance.
> 
> PS: earlier I had tried to update the port to the latest version but
> didn't get it to build.  Maybe this time...
> 
> 
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/sysutils/memtest86+/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  4 Feb 2014 10:14:52 -   1.10
> +++ Makefile  10 Aug 2017 07:37:10 -
> @@ -3,6 +3,9 @@
>  
>  ONLY_FOR_ARCHS=  amd64 i386
>  
> +# XXX base gcc
> +CC=  /usr/bin/gcc
> +
>  COMMENT= thorough, stand alone memory test
>  VERSION= 4.20
>  DISTNAME=memtest86+-${VERSION}
Works fine here with your patch on my amd64 X230.

Any particular reasons we're still at 4.20 instead of 5.01?

Re: new: sysutils/rover

[Klemens Nanni]

On Thu, Jul 20, 2017 at 01:53:34AM +0200, Klemens Nanni wrote:
> Here's rover[1], a simple file browser for the terminal.
> 
> The main goal is to provide a faster way to explore a file system from
> the terminal, compared to what's possible by using cd, ls, etc. Rover
> has vi-like key bindings for navigation and can open files in $PAGER and
> $EDITOR. Basic file system operations are also implemented (see rover(1)
> for details). Rover is designed to be simple, fast and portable.
> 
> Tested successfully on amd64.
> 
> Feedback? Comments?
> 
> 1:https://github.com/lecram/rover
ping.

mail/neomutt: Add slang flavor

[Klemens Nanni]

I was missing the slang flavor when trying neomutt over mutt so here it
is.

--with-curses can be safely dropped as it's the default.

Feedback? Comments?

Index: Makefile
===
RCS file: /cvs/ports/mail/neomutt/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile14 Jul 2017 21:16:20 -  1.16
+++ Makefile19 Jul 2017 12:56:14 -
@@ -23,7 +23,7 @@ LIB_DEPENDS+= devel/gettext \
 BUILD_DEPENDS+=textproc/docbook-xsl \
www/lynx
 
-FLAVORS=   gpgme sasl
+FLAVORS=   gpgme sasl slang
 FLAVOR?=
 
 FLAVOR_COMMA=  ${FLAVOR_EXT:S/-/,/g}
@@ -39,7 +39,6 @@ CONFIGURE_ARGS+= --disable-fcntl \
--enable-flock \
--disable-notmuch \
--mandir=${PREFIX}/man \
-   --with-curses \
--with-docdir="${PREFIX}/share/doc/neomutt" \
--without-tokyocabinet \
--without-gdbm \
@@ -64,6 +63,12 @@ WANTLIB+=assuan gpg-error gpgme
 CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
 LIB_DEPENDS+=  security/cyrus-sasl2
 WANTLIB+=  sasl2
+.endif
+
+.if ${FLAVOR:Mslang}
+CONFIGURE_ARGS+= --with-slang="${PREFIX}"
+LIB_DEPENDS+=  devel/libslang
+WANTLIB+=  m termlib slang>=14
 .endif
 
 .include 

Re: mail/neomutt: Add slang flavor

[Klemens Nanni]

On Wed, Jul 19, 2017 at 02:15:03PM +0100, Stuart Henderson wrote:
> On 2017/07/19 15:06, Klemens Nanni wrote:
> > I was missing the slang flavor when trying neomutt over mutt so here it
> > is.
> > 
> > --with-curses can be safely dropped as it's the default.
> > 
> > Feedback? Comments?
> 
> I think neomutt already has enough build flavours..
When building with ncurses, binding ^O won't work unless you disable it
in the controlling terminal:

$ stty -a | fgrep ^O
cchars: discard = ^O; dsusp = ^Y; eof = ^D; eol = ;
$ stty discard undef

This happens for both mutt and neomutt with at least xterm and st as
well.

I don't see why mutt should have a slang flavor but not neomutt. As it
was the case for me, this might break the migration for other users as
well.

new: sysutils/rover

[Klemens Nanni]

Here's rover[1], a simple file browser for the terminal.

The main goal is to provide a faster way to explore a file system from
the terminal, compared to what's possible by using cd, ls, etc. Rover
has vi-like key bindings for navigation and can open files in $PAGER and
$EDITOR. Basic file system operations are also implemented (see rover(1)
for details). Rover is designed to be simple, fast and portable.

Tested successfully on amd64.

Feedback? Comments?

1:  https://github.com/lecram/rover


rover.tgz
Description: application/tar-gz

Re: Fix manual page section for devel/libmagic

[Klemens Nanni]

On Thu, Jun 29, 2017 at 03:49:19AM +0200, Jeremie Courreges-Anglas wrote:

Well spotted; I have committed a fix.

Some problems with your submission:
- consistency is good but no need to submit changes for minor whitespace
 issues.  *Especially* for SHARED_LIBS and WANTLIB, which tend to be
 copy/pasted.

bcallah on #openbsd-daily also mentioned not to change whitespaces in
Makefiles; noted, thanks.

- since the manpage isn't installed in section 4 any more, you need to
 update the PLIST with ''make plist''.  Else ''make package'' will
 fail.

My fault, forgot to include/attach the PLIST diff as well.

- since the change you propose changes the content of the package, you
 should bump REVISION (here, set it to 0).

Fair point.

Here's an updated diff that also fixes two typos in DESCR.


Index: Makefile
===
RCS file: /cvs/ports/devel/libmagic/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile16 Jun 2016 15:35:02 -  1.29
+++ Makefile29 Jun 2017 02:11:41 -
@@ -6,6 +6,7 @@ COMMENT=library to determine file type
V=  5.28
DISTNAME=   file-${V}
PKGNAME=libmagic-${V}
+REVISION=  1

SHARED_LIBS +=  magic4.2  # 1.0

@@ -20,6 +21,7 @@ WANTLIB += z

MASTER_SITES=   ftp://ftp.astron.com/pub/file/

-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=--enable-fsect-man5=yes

.include 
Index: pkg/DESCR
===
RCS file: /cvs/ports/devel/libmagic/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   14 Apr 2006 17:02:58 -  1.1.1.1
+++ pkg/DESCR   29 Jun 2017 02:11:42 -
@@ -1,4 +1,4 @@
-libmagic is a library to which attempts to classify files. There ar
+libmagic is a library which attempts to classify files. There are
three sets of tests, performed in the following order:

- filesystem tests
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/libmagic/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   29 Sep 2013 23:29:24 -  1.5
+++ pkg/PLIST   29 Jun 2017 02:11:42 -
@@ -6,5 +6,5 @@ lib/libmagic.la
@lib lib/libmagic.so.${LIBmagic_VERSION}
@comment @man man/man1/file.1
@man man/man3/libmagic.3
-@man man/man4/magic.4
+@man man/man5/magic.5
share/misc/magic.mgc

Fix manual page section for devel/libmagic

[Klemens Nanni]

Manual page sections on Debian:

4   Special files (usually found in /dev)
5   File formats and conventions eg /etc/passwd

and on OpenBSD:

4 Device driver.
5 File formats.

libmagic would install "magic – file command's magic pattern file" into
section 4 according to linux behaviour, this patch puts it into 5.

While here, consistently use tabs instead for make variables.

Feedback/OK?

Index: Makefile
===
RCS file: /cvs/ports/devel/libmagic/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile16 Jun 2016 15:35:02 -  1.29
+++ Makefile29 Jun 2017 00:22:43 -
@@ -7,7 +7,7 @@ V=  5.28
DISTNAME=   file-${V}
PKGNAME=libmagic-${V}

-SHARED_LIBS +=  magic4.2  # 1.0
+SHARED_LIBS+=  magic 4.2 # 1.0

CATEGORIES= sysutils devel

@@ -16,10 +16,11 @@ HOMEPAGE=   ftp://ftp.astron.com/pub/file/
# BSD
PERMIT_PACKAGE_CDROM=   Yes

-WANTLIB += z
+WANTLIB+=  z

MASTER_SITES=   ftp://ftp.astron.com/pub/file/

-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=--enable-fsect-man5=yes

.include 

NEW: mail/notmuch 0.25

[Klemens Nanni]

notmuch[1] is "just an email system" for thread-based index, search
and tagging that easily handles large amounts of messages.

It can be used with MUAs and editors like mutt or Emacs to enhance
functionality.

Previous porting attempts[2] were taken into consideration; this port
provides two packages -main and -emacs as well as the pseudo flavor
no_emacs so people can avoid the Emacs stuff at build and install time.

Ruby is still being picked up automatically by the configure script,
how about putting this into another package or flavor as well?

As already pointed out by jca@ there are some issues left with zlib that
may need fixing on our side.

Attached you can also find logs for failed tests. I'm also looking for
Ruby users to test notmuch; currently the Ruby tests are still skipped:

786/854 tests passed.
6 broken tests failed as expected.
62 tests failed.

Comments? Feedback?

1:  https://notmuchmail.org
2:  http://marc.info/?l=openbsd-ports=148502456832483


notmuch.tgz
Description: application/tar-gz


failed-log.gz
Description: application/gunzip

UPDATE: mail/isync 1.2.1 to 1.2.2

[Klemens Nanni]

1.2.1 is over two years old, 1.2.2 was released this week.

I'm not entirely sure yet whether the introduced patch to get
X509_OBJECT_get0_X509() and X509_STORE_get0_objects() working is the way
to go, maybe someone more knowledgable about OpenSSL internals can
comment/fix this?

Other than that a trivial version bump suffices, test still passes and
mbsync works as expected.

Comments? Feedback?


isync.tgz
Description: application/tar-gz

Re: UPDATE: mail/isync 1.2.1 to 1.2.2

[Klemens Nanni]

On Thu, Aug 10, 2017 at 01:17:07AM +0200, Klemens Nanni wrote:
> On Wed, Aug 09, 2017 at 06:53:47PM -0400, Daniel Jakots wrote:
> > On Wed, 9 Aug 2017 23:58:33 +0200, Klemens Nanni <k...@posteo.org> wrote:
> > 
> > > Other than that a trivial version bump suffices
> > 
> > Then can you please send a diff rather than a .tgz?
> I sent a tarball since the new patch wouldn't be included in the diff.
> 
> Here's the inlined diff with the patch attached.
RTFM...

Index: Makefile
===
RCS file: /cvs/ports/mail/isync/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile20 Dec 2015 09:59:22 -  1.30
+++ Makefile10 Aug 2017 00:53:30 -
@@ -2,7 +2,7 @@
 
 COMMENT=   synchronize IMAP4 and maildir mailboxes
 
-DISTNAME=  isync-1.2.1
+DISTNAME=  isync-1.2.2
 CATEGORIES=mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=isync/}
 
Index: distinfo
===
RCS file: /cvs/ports/mail/isync/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo20 Dec 2015 09:59:22 -  1.11
+++ distinfo10 Aug 2017 00:53:30 -
@@ -1,2 +1,2 @@
-SHA256 (isync-1.2.1.tar.gz) = 5xbeKMmgjmJKA1yq45AvzztRFVO+XWFRehM+A6o1Mq4=
-SIZE (isync-1.2.1.tar.gz) = 281990
+SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
+SIZE (isync-1.2.2.tar.gz) = 285745
Index: patches/patch-src_socket_c
===
RCS file: patches/patch-src_socket_c
diff -N patches/patch-src_socket_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_socket_c  10 Aug 2017 00:53:30 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: src/socket.c
+--- src/socket.c.orig
 src/socket.c
+@@ -40,10 +40,10 @@
+ # include 
+ # include 
+ # include 
+-# if OPENSSL_VERSION_NUMBER < 0x1010L
++/*# if OPENSSL_VERSION_NUMBER < 0x1010L*/
+ #  define X509_OBJECT_get0_X509(o) ((o)->data.x509)
+ #  define X509_STORE_get0_objects(o) ((o)->objs)
+-# endif
++/*# endif*/
+ #endif
+ 
+ enum {

Re: UPDATE: mail/isync 1.2.1 to 1.2.2

[Klemens Nanni]

On Wed, Aug 09, 2017 at 06:53:47PM -0400, Daniel Jakots wrote:
> On Wed, 9 Aug 2017 23:58:33 +0200, Klemens Nanni <k...@posteo.org> wrote:
> 
> > Other than that a trivial version bump suffices
> 
> Then can you please send a diff rather than a .tgz?
I sent a tarball since the new patch wouldn't be included in the diff.

Here's the inlined diff with the patch attached.

? patches/patch-src_socket_c
Index: Makefile
===
RCS file: /cvs/ports/mail/isync/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile20 Dec 2015 09:59:22 -  1.30
+++ Makefile9 Aug 2017 23:11:42 -
@@ -2,7 +2,7 @@
 
 COMMENT=   synchronize IMAP4 and maildir mailboxes
 
-DISTNAME=  isync-1.2.1
+DISTNAME=  isync-1.2.2
 CATEGORIES=mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=isync/}
 
Index: distinfo
===
RCS file: /cvs/ports/mail/isync/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo20 Dec 2015 09:59:22 -  1.11
+++ distinfo9 Aug 2017 23:11:42 -
@@ -1,2 +1,2 @@
-SHA256 (isync-1.2.1.tar.gz) = 5xbeKMmgjmJKA1yq45AvzztRFVO+XWFRehM+A6o1Mq4=
-SIZE (isync-1.2.1.tar.gz) = 281990
+SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
+SIZE (isync-1.2.2.tar.gz) = 285745

$OpenBSD$

Index: src/socket.c
--- src/socket.c.orig
+++ src/socket.c
@@ -40,10 +40,10 @@
 # include 
 # include 
 # include 
-# if OPENSSL_VERSION_NUMBER < 0x1010L
+/*# if OPENSSL_VERSION_NUMBER < 0x1010L*/
 #  define X509_OBJECT_get0_X509(o) ((o)->data.x509)
 #  define X509_STORE_get0_objects(o) ((o)->objs)
-# endif
+/*# endif*/
 #endif
 
 enum {

Re: NEW: mail/notmuch 0.25

[Klemens Nanni]

On Wed, Aug 09, 2017 at 07:29:19PM +0200, Klemens Nanni wrote:
> notmuch[1] is "just an email system" for thread-based index, search
> and tagging that easily handles large amounts of messages.
> 
> It can be used with MUAs and editors like mutt or Emacs to enhance
> functionality.
> 
> Previous porting attempts[2] were taken into consideration; this port
> provides two packages -main and -emacs as well as the pseudo flavor
> no_emacs so people can avoid the Emacs stuff at build and install time.
> 
> Ruby is still being picked up automatically by the configure script,
> how about putting this into another package or flavor as well?
> 
> As already pointed out by jca@ there are some issues left with zlib that
> may need fixing on our side.
> 
> Attached you can also find logs for failed tests. I'm also looking for
> Ruby users to test notmuch; currently the Ruby tests are still skipped:
> 
>   786/854 tests passed.
>   6 broken tests failed as expected.
>   62 tests failed.
> 
> Comments? Feedback?
> 
> 1:https://notmuchmail.org
> 2:http://marc.info/?l=openbsd-ports=148502456832483
Bump. Has anyone used or tested this so far?

Re: update: net/bitlbee

[Klemens Nanni]

On Fri, May 26, 2017 at 05:32:08PM +0200, Michal Mazurek wrote:
For what it's worth, my patch[0] in early april has some additional
changes that could be merged.

0:  http://marc.info/?l=openbsd-ports=149174357820533=2


Thanks, fixed version:

Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile19 Jul 2015 08:22:14 -  1.58
+++ Makefile26 May 2017 15:30:26 -
@@ -2,8 +2,7 @@

COMMENT=IRC proxy to connect to AIM, ICQ, Jabber and Yahoo

-DISTNAME=  bitlbee-3.4
-REVISION=  0
+DISTNAME=  bitlbee-3.5.1
CATEGORIES= net

HOMEPAGE=   http://bitlbee.org/
@@ -13,7 +12,7 @@ MAINTAINER=   Tom Doherty 

UPDATE: misc/dvtm

[Klemens Nanni]

No need to manually include ,  does that. This
was probably done because -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
would cause __BSD_VISIBLE to be undefined which in turn would prevent
SIGWINCH from being defined.

-D_XOPEN_SOURCE_EXTENDED is needed, otherwise the compiler will warn
about implicitly defined addnwstr(3).

When unhiding ${CC} in Makefile, remove the corresponding @echo line
to avoid duplicate output such as

CC dvtm.c
cc -c -O2 -pipe ... dvtm.c

Feedback/OK?

Index: patches/patch-Makefile
===
RCS file: /cvs/ports/misc/dvtm/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  28 Dec 2015 16:18:53 -  1.2
+++ patches/patch-Makefile  5 Jun 2017 14:41:03 -
@@ -1,20 +1,17 @@
-$OpenBSD: patch-Makefile,v 1.2 2015/12/28 16:18:53 jasper Exp $
-
-- Don't hide the compile commands.
-
 Makefile.orig  Thu Feb 19 17:51:23 2015
-+++ Makefile   Mon Dec 28 17:10:19 2015
-@@ -16,13 +16,13 @@ config.h:
+--- Makefile.orig  Sun Jun  4 15:30:02 2017
 Makefile   Sun Jun  4 15:30:30 2017
+@@ -15,14 +15,12 @@ config.h:
+   cp config.def.h config.h
 
 .c.o:

-   @echo CC $<
+-  @echo CC $<
-   @${CC} -c ${CFLAGS} $<
+   ${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.h config.mk
 
 dvtm: ${OBJ}

-   @echo CC -o $@
+-  @echo CC -o $@
-   @${CC} -o $@ ${OBJ} ${LDFLAGS}
+   ${CC} -o $@ ${OBJ} ${LDFLAGS}
 
Index: patches/patch-config_mk

===
RCS file: /cvs/ports/misc/dvtm/patches/patch-config_mk,v
retrieving revision 1.8
diff -u -p -r1.8 patch-config_mk
--- patches/patch-config_mk 28 Dec 2015 16:18:53 -  1.8
+++ patches/patch-config_mk 5 Jun 2017 14:41:03 -
@@ -1,14 +1,11 @@
-$OpenBSD: patch-config_mk,v 1.8 2015/12/28 16:18:53 jasper Exp $
 config.mk.orig Thu Feb 19 17:51:23 2015
-+++ config.mk  Mon Dec 28 16:58:31 2015
-@@ -3,15 +3,14 @@ VERSION = 0.14
+--- config.mk.orig Mon Jun  5 02:23:44 2017
 config.mk  Mon Jun  5 02:24:41 2017
+@@ -3,15 +3,13 @@ VERSION = 0.15
 
 # Customize below to fit your system
 
-PREFIX ?= /usr/local

-MANPREFIX = ${PREFIX}/share/man
-+#PREFIX ?= /usr/local
-+#MANPREFIX = ${PREFIX}/share/man
 # specify your systems terminfo directory
 # leave empty to install into your home folder
 TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
@@ -16,6 +13,7 @@ $OpenBSD: patch-config_mk,v 1.8 2015/12/
 INCS = -I.
 LIBS = -lc -lutil -lncursesw
-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 
-D_XOPEN_SOURCE_EXTENDED
++CPPFLAGS = -D_XOPEN_SOURCE_EXTENDED
 CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
 LDFLAGS += ${LIBS}
 
Index: patches/patch-dvtm_c

===
RCS file: /cvs/ports/misc/dvtm/patches/patch-dvtm_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-dvtm_c
--- patches/patch-dvtm_c28 Dec 2015 16:18:53 -  1.3
+++ patches/patch-dvtm_c5 Jun 2017 14:41:03 -
@@ -1,22 +1,6 @@
-$OpenBSD: patch-dvtm_c,v 1.3 2015/12/28 16:18:53 jasper Exp $
-
-Add sys/signal.h for SIGWINCH
-
 dvtm.c.origMon Dec 28 16:40:33 2015
-+++ dvtm.c Mon Dec 28 16:57:53 2015
-@@ -36,6 +36,11 @@
- #endif
- #include "vt.h"
- 
-+/* Needed for SIGWINCH */

-+#ifdef __OpenBSD__
-+#include 
-+#endif
-+
- #ifdef PDCURSES
- int ESCDELAY;
- #endif
-@@ -164,8 +169,12 @@ typedef struct {
+--- dvtm.c.origSun Jun  4 15:30:02 2017
 dvtm.c Sun Jun  4 15:30:30 2017
+@@ -165,8 +165,12 @@ typedef struct {
 } Editor;
 
 #define LENGTH(arr) (sizeof(arr) / sizeof((arr)[0]))

UPDATE: devel/tor to 0.3.1.7

[Klemens Nanni]

0.3.0.11 fixed CVE-2017-0380, TROVE-2017-008 (only affects onion
services with SafeLogging set to 0).

Directory traffic can now be compressed, pkg-config is used to detect
zstd and lzma at bulid time.

There are lots of other important changes, see
https://blog.torproject.org/tor-0317-now-released for a full changelog.

My hidden services and clients continue to work after this update, both
on running -CURRENT on amd64.

Tests pass on amd64:

=
Testsuite summary for tor 0.3.1.7
=
# TOTAL: 18
# PASS:  12
# SKIP:  6
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
=

More testing and feedback welcome.


diff --git a/net/tor/Makefile b/net/tor/Makefile
index d52a055a49c..9940071a792 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   anonymity service using onion routing
 
-DISTNAME=  tor-0.3.0.10
+DISTNAME=  tor-0.3.1.7
 CATEGORIES=net
 HOMEPAGE=  https://www.torproject.org/
 
diff --git a/net/tor/distinfo b/net/tor/distinfo
index fc49e8413e6..5fc453345cf 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tor-0.3.0.10.tar.gz) = mo5uSaFoja5k3KEPhKQU7JpPOT+yJWrijgwuMjkYWrE=
-SIZE (tor-0.3.0.10.tar.gz) = 5845205
+SHA256 (tor-0.3.1.7.tar.gz) = HfXdSJS7L14NyWxGaVUUY1PPM6xQzZl8/Bso6j7ZwI8=
+SIZE (tor-0.3.1.7.tar.gz) = 6058284

Re: UPDATE: mail/isync to 1.3.0

[Klemens Nanni]

On Mon, Oct 09, 2017 at 09:21:29PM +, Klemens Nanni wrote:
> Simple version bump to the new feature release, including the following
> notable changes amongst other bug fixes:
> 
> - Network timeout handling
> - Support for proper Maildir++ and a Maildir sub-folder naming style
>   without extra dots
> - Support for TLS client certificates
> - Support for recovering from baseless UID validity changes
> - option DisableExtension for working around IMAP (server) bugs
> 
> Maildir sub-folders now require their naming style to be specified, I've
> copied the "Compatibility concerns" verbatim from upstream into MESSAGE,
> so users who upgrade can avoid fetching duplicate Maildirs upon first
> sync after the update.
> 
> Tested successfully on my daily amd64 machines during the last few days.
> 
> Feedback?
> 
> 
> diff --git a/mail/isync/Makefile b/mail/isync/Makefile
> index 4a14632eafc..7a1083ba215 100644
> --- a/mail/isync/Makefile
> +++ b/mail/isync/Makefile
> @@ -2,11 +2,11 @@
>  
>  COMMENT= synchronize IMAP4 and maildir mailboxes
>  
> -DISTNAME=isync-1.2.2
> +DISTNAME=isync-1.3.0
>  CATEGORIES=  mail
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=isync/}
>  
> -HOMEPAGE=http://isync.sourceforge.net/
> +HOMEPAGE=https://isync.sourceforge.net/
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
> diff --git a/mail/isync/distinfo b/mail/isync/distinfo
> index 42716ff1a4e..9d38087baac 100644
> --- a/mail/isync/distinfo
> +++ b/mail/isync/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
> -SIZE (isync-1.2.2.tar.gz) = 285745
> +SHA256 (isync-1.3.0.tar.gz) = jV9YOXbjEZcFvbon+k/JYugH/1mW8k81SVcXj/ppfJw=
> +SIZE (isync-1.3.0.tar.gz) = 309459
> diff --git a/mail/isync/pkg/MESSAGE b/mail/isync/pkg/MESSAGE
> index 18c9fe60aa0..d5dcd36e35a 100644
> --- a/mail/isync/pkg/MESSAGE
> +++ b/mail/isync/pkg/MESSAGE
> @@ -1,3 +1,4 @@
> -Configuration format has changed; consult manual page for details.
> +If you have Maildir sub-folders, you need to update the configuration to
> +specify the naming style, see the SubFolders option im mbsync(1).
>  
>  The "isync" wrapper is deprecated and will be removed in future versions.
> diff --git a/mail/isync/pkg/PLIST b/mail/isync/pkg/PLIST
> index 736d788b5d8..6b794b99a53 100644
> --- a/mail/isync/pkg/PLIST
> +++ b/mail/isync/pkg/PLIST
> @@ -1,7 +1,7 @@
>  @comment $OpenBSD: PLIST,v 1.7 2015/04/03 18:51:46 czarkoff Exp $
> -bin/get-cert
>  @bin bin/isync
>  @bin bin/mbsync
> +bin/mbsync-get-cert
>  @bin bin/mdconvert
>  @man man/man1/isync.1
>  @man man/man1/mbsync.1
> 
One week bump. Anyone else running 1.3.0?

Re: UPDATE: mail/isync to 1.3.0

[Klemens Nanni]

On Mon, Oct 16, 2017 at 06:04:52PM -0400, Daniel Jakots wrote:
> On Mon, 9 Oct 2017 23:21:29 +0200, Klemens Nanni <k...@posteo.org> wrote:
> 
> > -HOMEPAGE=  http://isync.sourceforge.net/
> > +HOMEPAGE=  https://isync.sourceforge.net/
> 
> It doesn't work here.
> 
> $ curl -I http://isync.sourceforge.net/
> HTTP/1.1 200 OK
> [...]
> $ curl -I https://isync.sourceforge.net/
> curl: (7) Failed to connect to isync.sourceforge.net port 443:
> Connection refused
> 
> 
> > diff --git a/mail/isync/pkg/MESSAGE b/mail/isync/pkg/MESSAGE
> > index 18c9fe60aa0..d5dcd36e35a 100644
> > --- a/mail/isync/pkg/MESSAGE
> > +++ b/mail/isync/pkg/MESSAGE
> > @@ -1,3 +1,4 @@
> > -Configuration format has changed; consult manual page for details.
> > +If you have Maildir sub-folders, you need to update the
> > configuration to +specify the naming style, see the SubFolders option
> > im mbsync(1).
> 
> I'm not sure about the use of MESSAGE this way. Anyone cares to comment?
> 
My bad, it was https://sourceforge.net/projects/isync/files/isync/ that
had working TLS, not isync.sourceforge.net.

Updated diff below.

diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 4a14632eafc..d0fcb6fd016 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   synchronize IMAP4 and maildir mailboxes
 
-DISTNAME=  isync-1.2.2
+DISTNAME=  isync-1.3.0
 CATEGORIES=mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=isync/}
 
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index 42716ff1a4e..9d38087baac 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,2 +1,2 @@
-SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
-SIZE (isync-1.2.2.tar.gz) = 285745
+SHA256 (isync-1.3.0.tar.gz) = jV9YOXbjEZcFvbon+k/JYugH/1mW8k81SVcXj/ppfJw=
+SIZE (isync-1.3.0.tar.gz) = 309459
diff --git a/mail/isync/pkg/MESSAGE b/mail/isync/pkg/MESSAGE
index 18c9fe60aa0..d5dcd36e35a 100644
--- a/mail/isync/pkg/MESSAGE
+++ b/mail/isync/pkg/MESSAGE
@@ -1,3 +1,4 @@
-Configuration format has changed; consult manual page for details.
+If you have Maildir sub-folders, you need to update the configuration to
+specify the naming style, see the SubFolders option im mbsync(1).
 
 The "isync" wrapper is deprecated and will be removed in future versions.
diff --git a/mail/isync/pkg/PLIST b/mail/isync/pkg/PLIST
index 736d788b5d8..6b794b99a53 100644
--- a/mail/isync/pkg/PLIST
+++ b/mail/isync/pkg/PLIST
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.7 2015/04/03 18:51:46 czarkoff Exp $
-bin/get-cert
 @bin bin/isync
 @bin bin/mbsync
+bin/mbsync-get-cert
 @bin bin/mdconvert
 @man man/man1/isync.1
 @man man/man1/mbsync.1

Re: UPDATE: devel/tor to 0.3.1.7

[Klemens Nanni]

On Wed, Sep 27, 2017 at 01:12:12PM +, Pascal Stumpf wrote:
> This now picks up liblzma when installed.  I think we want to disable
> that unless someone really needs the feature.  Thoughts?
Fair enough, zstd alone will do the job. From the changelog:

Because lzma is computationally expensive, it's only used for
documents that can be compressed once and served many times.

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/tor/Makefile,v
> retrieving revision 1.105
> diff -u -p -r1.105 Makefile
> --- Makefile  3 Aug 2017 12:21:26 -   1.105
> +++ Makefile  27 Sep 2017 13:11:40 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= anonymity service using onion routing
>  
> -DISTNAME=tor-0.3.0.10
> +DISTNAME=tor-0.3.1.7
>  CATEGORIES=  net
>  HOMEPAGE=https://www.torproject.org/
>  
> @@ -20,7 +20,8 @@ CONFIGURE_STYLE=gnu
>  # anyway on FRAME_GROWS_DOWN archs.
>  CONFIGURE_ARGS=  --with-ssl-dir=/usr \
>   --with-libevent-dir="${LOCALBASE}" \
> - --disable-gcc-hardening
> + --disable-gcc-hardening \
> + --disable-lzma
>  CONFIGURE_ENV+=ac_cv_member_struct_ssl_method_st_get_cipher_by_char=no
>  
>  LIB_DEPENDS= devel/libevent2
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/tor/distinfo,v
> retrieving revision 1.86
> diff -u -p -r1.86 distinfo
> --- distinfo  3 Aug 2017 12:21:26 -   1.86
> +++ distinfo  27 Sep 2017 13:11:40 -
> @@ -1,2 +1,2 @@
> -SHA256 (tor-0.3.0.10.tar.gz) = mo5uSaFoja5k3KEPhKQU7JpPOT+yJWrijgwuMjkYWrE=
> -SIZE (tor-0.3.0.10.tar.gz) = 5845205
> +SHA256 (tor-0.3.1.7.tar.gz) = HfXdSJS7L14NyWxGaVUUY1PPM6xQzZl8/Bso6j7ZwI8=
> +SIZE (tor-0.3.1.7.tar.gz) = 6058284
> 
Fine with me.

UPDATE: mail/isync to 1.3.0

[Klemens Nanni]

Simple version bump to the new feature release, including the following
notable changes amongst other bug fixes:

- Network timeout handling
- Support for proper Maildir++ and a Maildir sub-folder naming style
  without extra dots
- Support for TLS client certificates
- Support for recovering from baseless UID validity changes
- option DisableExtension for working around IMAP (server) bugs

Maildir sub-folders now require their naming style to be specified, I've
copied the "Compatibility concerns" verbatim from upstream into MESSAGE,
so users who upgrade can avoid fetching duplicate Maildirs upon first
sync after the update.

Tested successfully on my daily amd64 machines during the last few days.

Feedback?


diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 4a14632eafc..7a1083ba215 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -2,11 +2,11 @@
 
 COMMENT=   synchronize IMAP4 and maildir mailboxes
 
-DISTNAME=  isync-1.2.2
+DISTNAME=  isync-1.3.0
 CATEGORIES=mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=isync/}
 
-HOMEPAGE=  http://isync.sourceforge.net/
+HOMEPAGE=  https://isync.sourceforge.net/
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index 42716ff1a4e..9d38087baac 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,2 +1,2 @@
-SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
-SIZE (isync-1.2.2.tar.gz) = 285745
+SHA256 (isync-1.3.0.tar.gz) = jV9YOXbjEZcFvbon+k/JYugH/1mW8k81SVcXj/ppfJw=
+SIZE (isync-1.3.0.tar.gz) = 309459
diff --git a/mail/isync/pkg/MESSAGE b/mail/isync/pkg/MESSAGE
index 18c9fe60aa0..d5dcd36e35a 100644
--- a/mail/isync/pkg/MESSAGE
+++ b/mail/isync/pkg/MESSAGE
@@ -1,3 +1,4 @@
-Configuration format has changed; consult manual page for details.
+If you have Maildir sub-folders, you need to update the configuration to
+specify the naming style, see the SubFolders option im mbsync(1).
 
 The "isync" wrapper is deprecated and will be removed in future versions.
diff --git a/mail/isync/pkg/PLIST b/mail/isync/pkg/PLIST
index 736d788b5d8..6b794b99a53 100644
--- a/mail/isync/pkg/PLIST
+++ b/mail/isync/pkg/PLIST
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.7 2015/04/03 18:51:46 czarkoff Exp $
-bin/get-cert
 @bin bin/isync
 @bin bin/mbsync
+bin/mbsync-get-cert
 @bin bin/mdconvert
 @man man/man1/isync.1
 @man man/man1/mbsync.1

[UPDATE] audio/ncmpc 0.28 -> 0.29

[Klemens Nanni]

Here's a simple update to the bug fix release:

* fix crash after losing MPD connection
* fix crash after DNS lookup error

While here, switch sites to HTTPS and shorten shell parameter expansion
a bit.

Both 0.28 and 0.29 don't actually run tests, do we want to set NO_TEST?

$ make -s test
===>  Regression tests for ncmpc-0.29v0
ninja: Entering directory `/usr/obj/ports/ncmpc-0.29/build-amd64'
[0/1] Running all tests.
No tests defined.


Feedback? Any takers?

diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index 3c7296f6a35..0a9ff2799af 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -2,13 +2,12 @@
 
 COMMENT=   curses based frontend for mpd
 
-VER=   0.28
+VER=   0.29
 DISTNAME=  ncmpc-${VER}
 EPOCH= 0
 CATEGORIES=audio
-REVISION=  0
 
-HOMEPAGE=  http://www.musicpd.org/clients/ncmpc/
+HOMEPAGE=  https://www.musicpd.org/clients/ncmpc/
 
 MAINTAINER=David Coppa 
 
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB=   c glib-2.0 intl mpdclient>=1 ncursesw
 
-MASTER_SITES=  http://www.musicpd.org/download/ncmpc/${VER:R}/
+MASTER_SITES=  https://www.musicpd.org/download/ncmpc/${VER:R}/
 
 EXTRACT_SUFX=  .tar.xz
 
@@ -42,7 +41,7 @@ CONFIGURE_ENV=CPP=${CPP} \
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ncmpc
-   mv ${PREFIX}/share/doc/ncmpc/{config.sample,keys.sample,ncmpc.lirc} \
+   mv ${PREFIX}/share/doc/ncmpc/{{config,keys}.sample,ncmpc.lirc} \
${PREFIX}/share/examples/ncmpc/
 
 .include 
diff --git a/audio/ncmpc/distinfo b/audio/ncmpc/distinfo
index b503f98aac7..d44cc8162fb 100644
--- a/audio/ncmpc/distinfo
+++ b/audio/ncmpc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpc-0.28.tar.xz) = 9m5bb++Dvf2js++vP7rWpNjEe7GztoEL7UTT41sAeAQ=
-SIZE (ncmpc-0.28.tar.xz) = 233724
+SHA256 (ncmpc-0.29.tar.xz) = 72iptnFyOD6oDuRleQFRCUM/oFhyiBLSsOvt5mDYXxI=
+SIZE (ncmpc-0.29.tar.xz) = 233876
diff --git a/audio/ncmpc/patches/patch-meson_build 
b/audio/ncmpc/patches/patch-meson_build
index 9c5bf14598f..6807cf7c69a 100644
--- a/audio/ncmpc/patches/patch-meson_build
+++ b/audio/ncmpc/patches/patch-meson_build
@@ -3,7 +3,7 @@ $OpenBSD: patch-meson_build,v 1.1 2017/09/26 09:55:07 dcoppa 
Exp $
 Index: meson.build
 --- meson.build.orig
 +++ meson.build
-@@ -55,73 +55,11 @@ conf.set('ENABLE_ASYNC_CONNECT', async_connect)
+@@ -55,78 +55,11 @@ conf.set('ENABLE_ASYNC_CONNECT', async_connect)
  
  conf.set('ENABLE_MULTIBYTE', get_option('multibyte'))
  
@@ -26,6 +26,11 @@ Index: meson.build
 -if curses_dep.found()
 -  curses = 'ncurses'
 -else
+-  curses_dep = cc.find_library('ncursesw', required: false)
+-  if not curses_dep.found()
+-curses_dep = cc.find_library('ncurses')
+-  endif
+-
 -  # TODO: find other curses implementation (pdcurses?)
 -endif
 -  endif
@@ -81,7 +86,7 @@ Index: meson.build
  enable_lirc = get_option('lirc')
  if enable_lirc == 'false'
enable_lirc = false
-@@ -142,7 +80,7 @@ else
+@@ -147,7 +80,7 @@ else
  endif
  conf.set('ENABLE_LIRC', enable_lirc)
  
@@ -90,7 +95,7 @@ Index: meson.build
  
  common_cflags = [
# for getaddrinfo() and sigaction() with glibc
-@@ -350,7 +288,6 @@ ncmpc = executable('ncmpc',
+@@ -359,7 +292,6 @@ ncmpc = executable('ncmpc',
include_directories: inc,
dependencies: [
  glib_dep,

Re: [UPDATE] audio/ncmpc 0.28 -> 0.29

[Klemens Nanni]

On Wed, Nov 15, 2017 at 11:27:35PM +0100, Klemens Nanni wrote:
> Both 0.28 and 0.29 don't actually run tests, do we want to set NO_TEST?
> 
>   $ make -s test
>   ===>  Regression tests for ncmpc-0.29v0
>   ninja: Entering directory `/usr/obj/ports/ncmpc-0.29/build-amd64'
>   [0/1] Running all tests.
>   No tests defined.
Rephrasing since NO_TEST=Yes is not an option: There are test targets
defined in build.ninja but it doesn't seem to run the actual test.

I'm no ninja/meson expert so how should we handle this? `make test'
yielding no tests and returning zero seems broken to me.

[NEW] sysutils/UEFITool

[Klemens Nanni]

Hey ports@,

https://github.com/LongSoft/UEFITool is very useful when it comes to
analysing firmware images and often used in to extract certain regions
required to build coreboot images.

pkg/DESCR (from the homepage):

UEFITool is a cross-platform open source application written in C++/Qt,
that parses UEFI-compatible firmware image into a tree structure,
verifies image's integrity and provides a GUI to manipulate image's
elements.  Project development started in the middle of 2013 because of
the lack of cross-platform open source utilities for tinkering with UEFI
images.

Upstream uses A44 as tagname so I stripped the A in PKGNAME.

Only UEFITool is the only one of three projects listed in
MODQMAKE_PROJECTS. The other ones aren't required and also fail to build
due to missing includes (didn't spend much time trying to fix it).

Runs fine on my X230. Feedback? Anyone willing to commit?


uefitool.tgz
Description: application/tar-gz

Re: [UPDATE] graphics/sxiv 2.3.1 -> 24

[Klemens Nanni]

On Tue, Nov 21, 2017 at 11:15:38AM +0100, Klemens Nanni wrote:
> On Tue, Nov 21, 2017 at 01:44:44AM -0700, Anthony J. Bentley wrote:
> > Klemens Nanni writes:
> > > On Mon, Nov 06, 2017 at 02:21:41AM +0100, Klemens Nanni wrote:
> > > > Hey ports@,
> > > > 
> > > > here's a simple diff updating sxiv to the newest release; Yes, upstream
> > > > jumped from 2.3.1 to 24 not 2.4. These are mostly mechanical changes,
> > > > I've also updated the description as upstream did.
> > > > (snip)
> > > > -MAKE_FLAGS =   CC=${CC} MANPREFIX=${PREFIX}/man \
> > > > -   CFLAGS="${CFLAGS} -I${X11BASE}/include 
> > > > -I${PREFIX}/include" \
> > > > -   LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 
> > > > -lImlib2 -lexif
> > >  -lgif"
> > > > +MAKE_FLAGS =   CC=${CC} \
> > > > +   PREFIX=${PREFIX} \
> > 
> > No need to set PREFIX.
> PREFIX is hard coded to /usr/local in sxiv's Makefile and MANPATH uses
> it so why not letting users set PREFIX as they wish? Not passing it via
> MAKE_FLAGS would honor the user's PREFIX for MANPATH only.
> 
> > Also, I set V=1 so we can actually see the compiler commands.
> > 
> > > > +   CFLAGS="${CFLAGS} -I${X11BASE}/include 
> > > > -I${X11BASE}/include/fre
> > > etype2 -I${LOCALBASE}/include -I${LOCALBASE}/include/inotify" \
> > > > +   LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib 
> > > > -L${LOC
> > > ALBASE}/lib/inotify -lX11 -lXft -lImlib2 -lexif -linotify -lgif 
> > > -Wl,-rpath ${
> > > LOCALBASE}/lib/inotify"
> > 
> > Couple things. Existing LDFLAGS don't need to be passed to LDFLAGS,
> > because unlike CFLAGS it's not a standard variable likely to be in
> > mk.conf. Also, sxiv uses LDLIBS for the -l chain so we don't have to
> > repeat it.
> Thanks, that's better.
> > 
> > > >  post-install:
> > > > -   cd ${WRKSRC}/icon && make install
> > > > +   make -C ${WRKSRC}/icon install
> > 
> > No need for a cosmetic change like this...
> > 
> > 
> > Here's a (very) slightly modified version of your diff per above. I
> > don't understand the inotify stuff, but it matches what existing ports
> > do, so...
> Using inotify sxiv can automatically reload the currently displayed
> image if it changes on disk.
Bump; I'd like to get this in.

Anthony's diff seems fine but I still prefer to set PREFIX when we also
set MANPREFIX so here's his diff with that on top.

Does anyone want to commit any of the two versions?

diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile
index eeb5fd17888..560018d753c 100644
--- a/graphics/sxiv/Makefile
+++ b/graphics/sxiv/Makefile
@@ -1,11 +1,10 @@
 # $OpenBSD: Makefile,v 1.10 2017/05/06 13:45:49 fcambus Exp $
 
-COMMENT =  simple (or small or suckless) X Image Viewer
+COMMENT =  simple X Image Viewer
 
 GH_PROJECT =   sxiv
 GH_ACCOUNT =   muennich
-GH_TAGNAME =   v1.3.2
-REVISION = 0
+GH_TAGNAME =   v24
 
 CATEGORIES =   graphics x11
 
@@ -14,17 +13,21 @@ MAINTAINER =Matthew Via <v...@matthewvia.info>
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += Imlib2 exif gif X11 c
+WANTLIB += Imlib2 X11 Xft c exif gif lib/inotify/inotify
 
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
 
-LIB_DEPENDS =  graphics/imlib2 \
+LIB_DEPENDS =  devel/libinotify \
+   graphics/imlib2 \
graphics/libexif
 
-MAKE_FLAGS =   CC=${CC} MANPREFIX=${PREFIX}/man \
-   CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \
-   LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif 
-lgif"
+MAKE_FLAGS =   CC="${CC}" \
+   V=1 \
+   PREFIX=${PREFIX} \
+   MANPREFIX=${PREFIX}/man \
+   CFLAGS="${CFLAGS} -I${X11BASE}/include 
-I${X11BASE}/include/freetype2 -I${LOCALBASE}/include 
-I${LOCALBASE}/include/inotify" \
+   LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib 
-L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath ${LOCALBASE}/lib/inotify"
 
 NO_TEST =  Yes
 
diff --git a/graphics/sxiv/distinfo b/graphics/sxiv/distinfo
index 78b5985c9ec..dcf76b04c13 100644
--- a/graphics/sxiv/distinfo
+++ b/graphics/sxiv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sxiv-1.3.2.tar.gz) = n1No3o8PV+eOvgLLUxoxEHqZPydpzsUbzI1w9cZotlM=
-SIZE (sxiv-1.3.2.tar.gz) = 46560
+SHA256 (sxiv-24.tar.gz) = UR3EXRKWKvnDHDBozmvKS4MqYmOUaye+/qSaSM8BkRA=
+SIZE (sxiv-24.tar.gz) = 47148
diff --git a/graphics/sxiv/patches/patch-Makefile 
b/gr

[UPDATE] lang/go 1.9.1 -> 1.9.2

[Klemens Nanni]

Here's a simple version bump.

I already mailed jsing@ who asked for i386 testers so I'm just
forwarding it.

Can anyone test this on on their i386 machine? amd64 builds and passes
successfully:

ALL TESTS PASSED
9m38.97s real13m01.27s user12m31.48s system

All my applications continue to work as usual.

Feedback?

diff --git a/lang/go/Makefile b/lang/go/Makefile
index f7ddf512436..498eee90dff 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =${GO_ARCHS}
 
 COMMENT =  Go programming language
 
-VERSION =  1.9.1
+VERSION =  1.9.2
 EXTRACT_SUFX = .src.tar.gz
 DISTNAME = go${VERSION}
 PKGNAME =  go-${VERSION}
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 83ab5420444..398711cf73a 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,2 +1,2 @@
-SHA256 (go1.9.1.src.tar.gz) = qEr8ncfWT+D6hNTXNeLs4jgxoiEXtQ2vx1wUhPHLVQ4=
-SIZE (go1.9.1.src.tar.gz) = 16377700
+SHA256 (go1.9.2.src.tar.gz) = Zl8YS/isiZhs/VpEYHNpdvYLV99rMgrXGtTO9TuxQ9w=
+SIZE (go1.9.2.src.tar.gz) = 16383591
diff --git a/lang/go/patches/patch-src_cmd_go_go_test_go 
b/lang/go/patches/patch-src_cmd_go_go_test_go
index d6f02a10d7c..9bedbed4eb7 100644
--- a/lang/go/patches/patch-src_cmd_go_go_test_go
+++ b/lang/go/patches/patch-src_cmd_go_go_test_go
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_cmd_go_go_test_go,v 1.2 2017/09/03 15:42:25 
jsing Exp $
 Index: src/cmd/go/go_test.go
 --- src/cmd/go/go_test.go.orig
 +++ src/cmd/go/go_test.go
-@@ -3475,6 +3475,9 @@ func TestCgoConsistentResults(t *testing.T) {
+@@ -3493,6 +3493,9 @@ func TestCgoConsistentResults(t *testing.T) {
switch runtime.GOOS {
case "freebsd":
testenv.SkipFlaky(t, 15405)
diff --git a/lang/go/pkg/PLIST b/lang/go/pkg/PLIST
index cf6a784f85a..64827841d0e 100644
--- a/lang/go/pkg/PLIST
+++ b/lang/go/pkg/PLIST
@@ -304,6 +304,8 @@ go/misc/cgo/test/issue20266/
 go/misc/cgo/test/issue20266.go
 go/misc/cgo/test/issue20266/issue20266.h
 go/misc/cgo/test/issue20369.go
+go/misc/cgo/test/issue21668.go
+go/misc/cgo/test/issue21708.go
 go/misc/cgo/test/issue2462.go
 go/misc/cgo/test/issue3250.go
 go/misc/cgo/test/issue3250w.go
@@ -3728,6 +3730,7 @@ go/src/internal/nettrace/nettrace.go
 go/src/internal/poll/
 go/src/internal/poll/export_posix_test.go
 go/src/internal/poll/export_test.go
+go/src/internal/poll/export_windows_test.go
 go/src/internal/poll/fd.go
 go/src/internal/poll/fd_io_plan9.go
 go/src/internal/poll/fd_mutex.go
@@ -3739,6 +3742,7 @@ go/src/internal/poll/fd_posix.go
 go/src/internal/poll/fd_posix_test.go
 go/src/internal/poll/fd_unix.go
 go/src/internal/poll/fd_windows.go
+go/src/internal/poll/fd_windows_test.go
 go/src/internal/poll/hook_cloexec.go
 go/src/internal/poll/hook_unix.go
 go/src/internal/poll/hook_windows.go
@@ -7209,6 +7213,9 @@ go/test/fixedbugs/issue21120.dir/a.go
 go/test/fixedbugs/issue21120.dir/b.go
 go/test/fixedbugs/issue21120.dir/main.go
 go/test/fixedbugs/issue21120.go
+go/test/fixedbugs/issue21655.go
+go/test/fixedbugs/issue21963.go
+go/test/fixedbugs/issue22083.go
 go/test/fixedbugs/issue2615.go
 go/test/fixedbugs/issue3552.dir/
 go/test/fixedbugs/issue3552.dir/one.go

[UPDATE] www/youtube-dl 2017.10.07 -> 2017.11.15

[Klemens Nanni]

Simple version bump, here are the test results from my amd64 machine:

[...]
Ran 2242 tests in 5972.530s

FAILED (errors=568, failures=333)

Feedback? Any takers?

diff --git a/www/youtube-dl/Makefile b/www/youtube-dl/Makefile
index f3e4ba9daf1..96023bd5674 100644
--- a/www/youtube-dl/Makefile
+++ b/www/youtube-dl/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  CLI program to download videos from YouTube and other sites
 
-VERSION =  2017.10.07
+VERSION =  2017.11.15
 MODPY_EGG_VERSION =${VERSION:S/.0/./g}
 
 DISTNAME = youtube-dl-${VERSION}
diff --git a/www/youtube-dl/distinfo b/www/youtube-dl/distinfo
index a4d02a19036..9fb729b24e6 100644
--- a/www/youtube-dl/distinfo
+++ b/www/youtube-dl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (youtube-dl-2017.10.07.tar.gz) = 
2aiTUIfB4vozB1lK4V8enqD4Z26CX6Z2pQo6PUcbuoM=
-SIZE (youtube-dl-2017.10.07.tar.gz) = 2816312
+SHA256 (youtube-dl-2017.11.15.tar.gz) = 
iLF3uqrQzq/ElrvveQwks1Jyy9lSfitk9TYTGq0EDOg=
+SIZE (youtube-dl-2017.11.15.tar.gz) = 2834012
diff --git a/www/youtube-dl/pkg/PLIST b/www/youtube-dl/pkg/PLIST
index 37cee20f64f..1d33b862fa5 100644
--- a/www/youtube-dl/pkg/PLIST
+++ b/www/youtube-dl/pkg/PLIST
@@ -459,6 +459,8 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/freshlive.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/freshlive.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funimation.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funimation.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funk.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funk.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funnyordie.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funnyordie.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fusion.py
@@ -489,6 +491,8 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/giantbomb.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/giantbomb.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/giga.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/giga.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gigya.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gigya.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/glide.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/glide.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/globo.py
@@ -777,8 +781,6 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/myspass.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/myspass.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/myvi.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/myvi.pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/myvideo.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/myvideo.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/myvidster.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/myvidster.pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/nationalgeographic.py
@@ -1079,6 +1081,8 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/sendtonews.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/sendtonews.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/servingsys.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/servingsys.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/servus.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/servus.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/sexu.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/sexu.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/shahid.py
@@ -1099,6 +1103,8 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/skysports.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/skysports.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/slideshare.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/slideshare.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/slideslive.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/slideslive.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/slutload.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/slutload.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/smotri.py
@@ -1305,8 +1311,6 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/twentyfourvideo.py
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/twentyfourvideo.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/twentymin.py
 

Re: [update] mail/nmh

[Klemens Nanni]

On Sun, Nov 26, 2017 at 12:01:50PM +0100, Pascal Stumpf wrote:
> Update nmh to 1.7.  I've been using this for the past few days without
> problems (no-sasl) and lightly tested the sasl FLAVOR.
Lightly tested w/o SASL on an amd64 machine, works fine.

> This version now supports OAuth, but that pulls in curl and nghttp2.  I
> have chosen to disable it.  Is anyone planning on using this?  If so, it
> could probably be folded into the sasl FLAVOR.
Sounds good to me.

> Some executables have moved from libexec/ to libexec/nmh.  I think this
> is a bit cleaner, but it requires the user to adjust their
> fetchmail/fdm/MTA config if they use slocal(1).
> 
> ok?

You can set SEPARATE_BUILD=Yes.

Re: [UPDATE] www/varnish 5.2.0 -> 5.2.1

[Klemens Nanni]

On Wed, Nov 22, 2017 at 11:03:51AM +, Stuart Henderson wrote:
> On 2017/11/22 11:47, Klemens Nanni wrote:
> > On Wed, Nov 15, 2017 at 05:14:11PM +0100, Klemens Nanni wrote:
> > > This is a security update[0] fixing a data leak:
> > > 
> > >   A wrong if statement in the varnishd source code means that
> > >   synthetic objects in stevedores which over-allocate, may leak up
> > >   to page size of data from a malloc(3) memory allocation.
> > > 
> > >   In a unpredictable percentage of the cases where this condition
> > >   arises, a segmentation fault will happen instead.
> > > 
> > > Tests continue to pass:
> > > 
> > >   # TOTAL: 636
> > >   # PASS:  630
> > >   # SKIP:  5
> > >   # XFAIL: 0
> > >   # FAIL:  1
> > >   # XPASS: 0
> > >   # ERROR: 0
> > > 
> > >   FAIL tests/u0.vtc (exit status: 2)
> > > 
> > > Removed TEST_TARGET=check as it's default. I also replaced cp with
> > > ${INSTALL_DATA} post-install and pointed users to 5.2 docs.
> > > 
> > > Since Varnish compiles .vsc files to C using python with 2.7 specific
> > > code (import StringIO), I added lang/python and explicity set
> > > MODPY_VERSION=2.7.
> > > 
> > > Feedback? Does anyone want to commit this?
> > > 
> > > 0: https://varnish-cache.org/releases/rel5.2.1.html#rel5-2-1
> > > 
> > > diff --git a/www/varnish/Makefile b/www/varnish/Makefile
> > > index b0fa5029ab4..5cf58670364 100644
> > > --- a/www/varnish/Makefile
> > > +++ b/www/varnish/Makefile
> > > @@ -2,7 +2,7 @@
> > >  
> > >  COMMENT =high-performance HTTP accelerator
> > >  
> > > -DISTNAME =   varnish-5.2.0
> > > +DISTNAME =   varnish-5.2.1
> > >  
> > >  CATEGORIES = www
> > >  
> > > @@ -16,12 +16,16 @@ MAINTAINER =  Jim Razmus II 
> > > <j...@openbsd.org> \
> > >  # BSD
> > >  PERMIT_PACKAGE_CDROM =   Yes
> > >  
> > > -MASTER_SITES =  https://varnish-cache.org/_downloads/
> > > +MASTER_SITES =  ${HOMEPAGE}_downloads/
> 
> We stopped doing that, it's annoying if you want to copy the URL from
> Makefile and open it in a browser.
> 
> > >  EXTRACT_SUFX =   .tgz
> > >  
> > >  WANTLIB += c execinfo m ncursesw pcre pthread readline termcap
> > >  
> > > +MODULES =lang/python
> > > +
> > > +MODPY_VERSION =  2.7
> > > +
> > >  BUILD_DEPENDS =  ${MODGNU_AUTOCONF_DEPENDS} \
> > >   ${MODGNU_AUTOMAKE_DEPENDS} \
> > >   devel/libtool \
> > > @@ -30,6 +34,8 @@ LIB_DEPENDS =   devel/pcre
> > >  # The internal backtrace implementation fails to build with -Werror on 
> > > arm/hppa
> > >  LIB_DEPENDS +=   devel/libexecinfo
> > >  
> > > +MODPY_RUNDEP =   No
> > > +
> > >  WRKDIST =${WRKDIR}/${DISTNAME}
> > >  USE_GMAKE =  Yes
> > >  CONFIGURE_STYLE =gnu
> > > @@ -38,7 +44,7 @@ AUTOMAKE_VERSION =  1.15
> > >  CONFIGURE_ENV =  CPPFLAGS="-I${LOCALBASE}/include" \
> > >   LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
> > >  
> > > -TEST_TARGET =check
> > > +MODPY_ADJ_FILES =lib/lib*/*.py
> > >  
> > >  post-patch:
> > >   cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> > > @@ -47,7 +53,7 @@ post-patch:
> > >  post-install:
> > >   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/varnish
> > >   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/varnish
> > > - cp ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
> > > + ${INSTALL_DATA} ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
> > >   ${PREFIX}/share/examples/varnish
> > >   rm -f ${PREFIX}/lib/varnish/{vmods,}/*.{a,la}
> > >  
> > > diff --git a/www/varnish/distinfo b/www/varnish/distinfo
> > > index f7dc351f783..cdba07a9889 100644
> > > --- a/www/varnish/distinfo
> > > +++ b/www/varnish/distinfo
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (varnish-5.2.0.tgz) = zEgmoEgPSSaNOZYwnkt+RlFR6aUjzPjq1JnsV1FJ9H4=
> > > -SIZE (varnish-5.2.0.tgz) = 2828867
> > > +SHA256 (varnish-5.2.1.tgz) = uEUsnXjBb3jIz9HBoeaWUjv2S3chwzAVDcwIUkWQFLM=
> > > +SIZE (varnish-5.

Re: [UPDATE] www/varnish 5.2.0 -> 5.2.1

[Klemens Nanni]

On Wed, Nov 15, 2017 at 05:14:11PM +0100, Klemens Nanni wrote:
> This is a security update[0] fixing a data leak:
> 
>   A wrong if statement in the varnishd source code means that
>   synthetic objects in stevedores which over-allocate, may leak up
>   to page size of data from a malloc(3) memory allocation.
> 
>   In a unpredictable percentage of the cases where this condition
>   arises, a segmentation fault will happen instead.
> 
> Tests continue to pass:
> 
>   # TOTAL: 636
>   # PASS:  630
>   # SKIP:  5
>   # XFAIL: 0
>   # FAIL:  1
>   # XPASS: 0
>   # ERROR: 0
> 
>   FAIL tests/u0.vtc (exit status: 2)
> 
> Removed TEST_TARGET=check as it's default. I also replaced cp with
> ${INSTALL_DATA} post-install and pointed users to 5.2 docs.
> 
> Since Varnish compiles .vsc files to C using python with 2.7 specific
> code (import StringIO), I added lang/python and explicity set
> MODPY_VERSION=2.7.
> 
> Feedback? Does anyone want to commit this?
> 
> 0: https://varnish-cache.org/releases/rel5.2.1.html#rel5-2-1
> 
> diff --git a/www/varnish/Makefile b/www/varnish/Makefile
> index b0fa5029ab4..5cf58670364 100644
> --- a/www/varnish/Makefile
> +++ b/www/varnish/Makefile
> @@ -2,7 +2,7 @@
>  
>  COMMENT =high-performance HTTP accelerator
>  
> -DISTNAME =   varnish-5.2.0
> +DISTNAME =   varnish-5.2.1
>  
>  CATEGORIES = www
>  
> @@ -16,12 +16,16 @@ MAINTAINER =  Jim Razmus II 
> <j...@openbsd.org> \
>  # BSD
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -MASTER_SITES =  https://varnish-cache.org/_downloads/
> +MASTER_SITES =  ${HOMEPAGE}_downloads/
>  
>  EXTRACT_SUFX =   .tgz
>  
>  WANTLIB += c execinfo m ncursesw pcre pthread readline termcap
>  
> +MODULES =lang/python
> +
> +MODPY_VERSION =  2.7
> +
>  BUILD_DEPENDS =  ${MODGNU_AUTOCONF_DEPENDS} \
>   ${MODGNU_AUTOMAKE_DEPENDS} \
>   devel/libtool \
> @@ -30,6 +34,8 @@ LIB_DEPENDS =   devel/pcre
>  # The internal backtrace implementation fails to build with -Werror on 
> arm/hppa
>  LIB_DEPENDS +=   devel/libexecinfo
>  
> +MODPY_RUNDEP =   No
> +
>  WRKDIST =${WRKDIR}/${DISTNAME}
>  USE_GMAKE =  Yes
>  CONFIGURE_STYLE =gnu
> @@ -38,7 +44,7 @@ AUTOMAKE_VERSION =  1.15
>  CONFIGURE_ENV =  CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
>  
> -TEST_TARGET =check
> +MODPY_ADJ_FILES =lib/lib*/*.py
>  
>  post-patch:
>   cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> @@ -47,7 +53,7 @@ post-patch:
>  post-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/varnish
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/varnish
> - cp ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
> + ${INSTALL_DATA} ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
>   ${PREFIX}/share/examples/varnish
>   rm -f ${PREFIX}/lib/varnish/{vmods,}/*.{a,la}
>  
> diff --git a/www/varnish/distinfo b/www/varnish/distinfo
> index f7dc351f783..cdba07a9889 100644
> --- a/www/varnish/distinfo
> +++ b/www/varnish/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (varnish-5.2.0.tgz) = zEgmoEgPSSaNOZYwnkt+RlFR6aUjzPjq1JnsV1FJ9H4=
> -SIZE (varnish-5.2.0.tgz) = 2828867
> +SHA256 (varnish-5.2.1.tgz) = uEUsnXjBb3jIz9HBoeaWUjv2S3chwzAVDcwIUkWQFLM=
> +SIZE (varnish-5.2.1.tgz) = 2827676
> diff --git a/www/varnish/pkg/MESSAGE b/www/varnish/pkg/MESSAGE
> index 5f50b1bbf2a..ce02efaef87 100644
> --- a/www/varnish/pkg/MESSAGE
> +++ b/www/varnish/pkg/MESSAGE
> @@ -5,4 +5,4 @@ or the following link for more information:
>  
>  and for further information:
>  
> - https://www.varnish-cache.org/docs/5.0/
> + https://www.varnish-cache.org/docs/5.2/
> 
One week bump, neither of the two maintainers have replied so far.

I can take of the python 2.7 bits in another diff so the next
revision/release won't depend on 2.7 anymore.

Re: NEW: net/py-aggregate6

[Klemens Nanni]

On Thu, Nov 30, 2017 at 03:25:31PM +, Job Snijders wrote:
> On Thu, Nov 30, 2017 at 01:53:35PM +0100, Klemens Nanni wrote:
> > devel/py-radix has no FLAVORS, 
> 
> You may need to update your ports tree, I updated py-radix yesterday.
Ah, my bad.

> > portcheck(1) tells you that.
> 
> Sorry, I'm not familiar with 'portcheck', where can I find more
> information? 
You can find both the script and it's manual under
/usr/ports/infrastructure/, the porting guide also refers to it.

> > I'd also suggest turning the -python3 FLAVOR into a simple
> > MODPY_VERSION=${MODPY_DEFAULT_VERSION_3} so we can avoid future Python
> > 2 ports.
> 
> Yeah I was struggling a bit what to do in this regard. With python3 the
> aggregate6 code performs slightly better compared to python2. Ideally
> the 'aggregate6' cli tool points to the python3 interpreter, and the
> python2 version is available as 'aggregate6-2' or something.
I'm sill in favor of just dropping the -2 flavor completely simply to
encourage Python 3 usage. Otherwise I'm afraid that Python 2 versions
keep lingering around for way too long.

> However I purposefully wrote aggregate6 in such a way that it can work
> in both python2 and python3 environments to enable broader
> applicability.
Fair point with regards to portability but not when it comes to new
ports. These are just my to cents, I'm happy to hear from others.

Attached is a diff on top of your tarball to ship it as Python 3 only,
only lightly tested.

--- Makefile.orig   Thu Nov 30 13:09:25 2017
+++ MakefileThu Nov 30 17:18:38 2017
@@ -10,33 +10,24 @@
 
 HOMEPAGE=  https://github.com/job/aggregate6/
 
-MAINTAINER =   Job Snijders <j...@openbsd.org>
+MAINTAINER=Job Snijders <j...@openbsd.org>
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
+MODULES=   lang/python
+
 MODPY_PI=  Yes
 MODPY_SETUPTOOLS=  Yes
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
 
-FLAVORS=   python3
-FLAVOR?=
-
-MODULES=   lang/python
-
-RUN_DEPENDS=   devel/py-radix${MODPY_FLAVOR}
-
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS+=  devel/py-future \
+RUN_DEPENDS=   devel/py-future \
+   devel/py-radix${MODPY_FLAVOR} \
net/py-ipaddress
-.endif
 
 TEST_DEPENDS=  ${RUN_DEPENDS} \
devel/py-coverage${MODPY_FLAVOR} \
devel/py-mock${MODPY_FLAVOR} \
devel/py-nose${MODPY_FLAVOR}
-
-post-install:
-   mv ${PREFIX}/bin/aggregate6{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/man/man7/aggregate6{,${MODPY_BIN_SUFFIX}}.7
 
 .include 

Re: NEW: net/aggregate6 (Was: net/py-aggregate6)

[Klemens Nanni]

On Thu, Nov 30, 2017 at 06:51:28PM +, Job Snijders wrote:
> Attached is a python3-only version of the ports files for the tool. I
> renamed it to simply 'aggregate6' as per suggestion from sthen@
Looks good to me :)

Re: NEW: net/py-aggregate6

[Klemens Nanni]

On Thu, Nov 30, 2017 at 12:19:07PM +, Job Snijders wrote:
> Dear all,
> 
> py-aggregate6 is a python replacement for the net/aggregate tool. It's
> faster, and capable of optimising lists of IPv6 prefixes. It can also be
> used as python library.
Quite handy, thanks.

devel/py-radix has no FLAVORS, portcheck(1) tells you that.

I'd also suggest turning the -python3 FLAVOR into a simple
MODPY_VERSION=${MODPY_DEFAULT_VERSION_3} so we can avoid future Python 2
ports.

[UPDATE] net/tor 3.1.8 -> 3.1.9

[Klemens Nanni]

This release fixes several bugs and security issues:
https://blog.torproject.org/new-stable-tor-releases-security-fixes-0319-03013-02914-02817-02516

Continues to work fine on my amd64 machine, tests pass:

# TOTAL: 18
# PASS:  12
# SKIP:  6
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0

diff --git a/net/tor/Makefile b/net/tor/Makefile
index d1506992a51..6e5756c1d56 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   anonymity service using onion routing
 
-DISTNAME=  tor-0.3.1.8
+DISTNAME=  tor-0.3.1.9
 CATEGORIES=net
 HOMEPAGE=  https://www.torproject.org/
 
diff --git a/net/tor/distinfo b/net/tor/distinfo
index ba2789f6054..008a6fad1b3 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tor-0.3.1.8.tar.gz) = ffYpiGCln0EP+IKc95BaUMizqQlNUahVNgO0AeS1saE=
-SIZE (tor-0.3.1.8.tar.gz) = 6073611
+SHA256 (tor-0.3.1.9.tar.gz) = bhsE94kOeC/VYBSg3lB15KsptSo12Lyh9rgMk/WPPSY=
+SIZE (tor-0.3.1.9.tar.gz) = 6092702

Re: [MAINTAINER UPDATE] x11/lumina-1.4.0p1

[Klemens Nanni]

On Thu, Dec 14, 2017 at 04:00:47PM +, Bryan C. Everly wrote:
>  RUN_DEPENDS= devel/desktop-file-utils \
> + devel/git \
I took a quick look after your last patch but wasn't sure: Is that
required for this Gitter chat thing?

Re: [new] minio server/client

[Klemens Nanni]

On Wed, Dec 13, 2017 at 04:39:57PM +0100, Landry Breuil wrote:
> Starting from this i dunno if it warrants a readme or a MESSAGE, you
> just need to go fetch the access/secret keys in the config file after
> first startup, and maybe bump maxfiles limits for minio (as advised on
> https://github.com/minio/minio-service - the sysv init script bumps to
> 8k)
Users should know how to use minio, I'd say it's fine without
further explanation.

$ portcheck
Makefile.inc does not have $OpenBSD$ RCS tag at the top
hardcoded paths detected in server/pkg/minio.rc, consider \
using SUBST_VARS and TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE
net/minio

s,/var,${VARBASE},

Re: [NEW] net/toot

[Klemens Nanni]

On Sun, Nov 19, 2017 at 09:24:42PM +0100, Klemens Nanni wrote:
> On Sun, Nov 19, 2017 at 02:54:46PM +0100, Klemens Nanni wrote:
> Take three after some feedback now also using Python 3 to avoid new
> ports still depending on Python 2.
> 
> The s,©,(C), patch for README.rst is now required as setup.py reads the
> readme file for its long description but chokes on it. I've already
> mailed the developer about it.
Upstream released new 0.15.1 three days ago with minor bugfixes
including this diff.

> Feedback? Any takers?
Bump.

The curses interface works for me when my terminal is big enough, so 
there's that; still expirmental but critical at all, though.

I'll take responsibility as maintainer.


toot.tgz
Description: application/tar-gz

Re: Retire devel/arm-elf?

[Klemens Nanni]

On Wed, Dec 13, 2017 at 08:09:38PM +0100, Jeremie Courreges-Anglas wrote:
> 
> devel/arm-elf/gcc has been marked as broken almost three years ago,
> devel/arm-elf/newlib depends on it.  I doubt that gdb and binutils alone
> are useful, especially since the ARM ecosystem moved to a newer ABI.
> 
> ok to remove?
Working with microprocessors without a compiler is certainly annoying.
as and ld are useful though when preparing things for the lab and
stepping through code with gdb is required all the time so having those
tools around can definitely be worth it.

But in the end it's still an incomplete toolchain which forces you onto
other platforms one way or another, so I don't object to remove it even
though I'm using it.

Re: [NEW] sysutils/UEFITool 0.22.1

[Klemens Nanni]

On Tue, Nov 14, 2017 at 10:27:40PM +0100, Klemens Nanni wrote:
> https://github.com/LongSoft/UEFITool is very useful when it comes to
> analysing firmware images and often used in to extract certain regions
> required to build coreboot images.
> 
> pkg/DESCR (from the homepage):
> 
> UEFITool is a cross-platform open source application written in C++/Qt,
> that parses UEFI-compatible firmware image into a tree structure,
> verifies image's integrity and provides a GUI to manipulate image's
> elements.  Project development started in the middle of 2013 because of
> the lack of cross-platform open source utilities for tinkering with UEFI
> images.
> 
> Upstream uses A44 as tagname so I stripped the A in PKGNAME.
Now as stable release actually without the alpha prefix.

> Only UEFITool is the only one of three projects listed in
> MODQMAKE_PROJECTS. The other ones aren't required and also fail to build
> due to missing includes (didn't spend much time trying to fix it).
MODQMAKE_PROJECTS defaults to . anyway so just leave it, this builds
UEFITool only.

> Runs fine on my X230. Feedback? Anyone willing to commit?
Continues to work for me on amd64, I can extract and reflash images
successfully.

I will also be responsible for this port as maintainer.

Any reviewers or takers even?


uefitool.tgz
Description: application/tar-gz

Re: Retire devel/arm-elf?

[Klemens Nanni]

On Thu, Dec 14, 2017 at 01:15:02AM +0100, Jeremie Courreges-Anglas wrote:
> On Wed, Dec 13 2017, Klemens Nanni <k...@posteo.org> wrote:
> > On Wed, Dec 13, 2017 at 08:09:38PM +0100, Jeremie Courreges-Anglas wrote:
> >> 
> >> devel/arm-elf/gcc has been marked as broken almost three years ago,
> >> devel/arm-elf/newlib depends on it.  I doubt that gdb and binutils alone
> >> are useful, especially since the ARM ecosystem moved to a newer ABI.
> >> 
> >> ok to remove?
> > Working with microprocessors without a compiler is certainly annoying.
> > as and ld are useful though when preparing things for the lab and
> > stepping through code with gdb is required all the time so having those
> > tools around can definitely be worth it.
> 
> I can understand how running gdb from a regular machine makes sense,
> given the size of gdb these days.  But binutils when you have no
> compiler...
Exactly.

> > But in the end it's still an incomplete toolchain which forces you onto
> > other platforms one way or another, so I don't object to remove it even
> > though I'm using it.
> 
> Just to make it crystal clear: you are using arm-elf-binutils-2.20 and
> arm-elf-gdb-7.1, not arm-none-eabi-binutils-2.27 and
> arm-none-eabi-gdb-7.9.1, right?  I'm not versed enough in ARM stuff to
> know whether arm-elf is still relevant these days.
Yes, arm-elf-binutils-2.20p1 and arm-elf-gdb-7.1p2.

> My concern is to avoid stuff rotting for years in the ports tree, not to
> prevent people from having useful tools at hand.  Maybe updating to newer
> upstream versions would be doable?  (Or mybe adding an arm-elf
> FLAVOR to devel/arm-none-eabi?)
I'd prefer updates to removal sure, but the most useful tool is already
lacking so wiping devel/arm-elf (until it's fixed) won't hurt, I guess.

Re: [NEW] textproc/pup

[Klemens Nanni]

On Fri, Nov 10, 2017 at 11:28:54PM +0100, Klemens Nanni wrote:
> Hey,
> 
> here's pup, a small but very helpful utility written in Go; pkg/DESCR:
> 
>   pup is a command line tool for processing HTML. It reads from
>   stdin, prints to stdout, and allows the user to filter parts of
>   the page using CSS selectors:
>   
>   
> https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_started/Selectors
>   
>   Inspired by http://stedolan.github.io/jq/, pup aims to be a fast
>   and flexible way of exploring HTML from the terminal.
> 
> Running just fine on my amd64 machine, tests pass.
> 
> The port is really simple and only packages the actual binary (no
> upstream manual page).
> 
> Feedback, comments?
Any takers?

[NEW] sysutils/xbattmon

[Klemens Nanni]

Hey,

xbattmon is a simple battery monitor for X pretty similiar to
sysutils/xbattbar but actively maintained.

It draws a colorized bar on the edge of your screen, that blinks on
critical battery level.

Upstream ships our strtonum.c for all platforms but I patched it to use
our libc's one.

Feedback? Anyone willing to commit this?


xbattmon.tgz
Description: application/tar-gz

[UPDATE] sysutils/entr 3.7 -> 3.9

[Klemens Nanni]

Straight forward update, all tests pass and entr continues to work fine
on my amd64 machine.

Feedback? Does anyone want to commit this?

diff --git a/sysutils/entr/Makefile b/sysutils/entr/Makefile
index 49bdd79fa1d..ca6691145c1 100644
--- a/sysutils/entr/Makefile
+++ b/sysutils/entr/Makefile
@@ -2,8 +2,8 @@
 
 COMMENT =  run arbitrary commands when files change
 
-DISTNAME = entr-3.7
-REV =  c5b62bde107d
+DISTNAME = entr-3.9
+REV =  332fd96a324a
 
 CATEGORIES =   sysutils
 
diff --git a/sysutils/entr/distinfo b/sysutils/entr/distinfo
index bffb20b029b..1bbea369779 100644
--- a/sysutils/entr/distinfo
+++ b/sysutils/entr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (entr-3.7.tar.gz) = lO/VDI9+nVaQYNXe6/Nmw1ZegegUqzMrlz1ymPqOoi8=
-SIZE (entr-3.7.tar.gz) = 23326
+SHA256 (entr-3.9.tar.gz) = AtePGK5TDmS/u52OAlCWL4WUbhCFDdBliZ0DrxXyaHY=
+SIZE (entr-3.9.tar.gz) = 24554

[UPDATE] sysutils/mdp 1.0.9 -> 1.0.10

[Klemens Nanni]

Another trivial version bump adding support for github flavored markdown.

I've also ditched VERSION and DISTNAME since GH_* take care of that.

Any takers?

diff --git a/textproc/mdp/Makefile b/textproc/mdp/Makefile
index c02c4c6aa22..578d932ecf4 100644
--- a/textproc/mdp/Makefile
+++ b/textproc/mdp/Makefile
@@ -2,12 +2,9 @@
 
 COMMENT =  command-line based markdown presentation tool
 
-VERSION =  1.0.9
-DISTNAME = mdp-${VERSION}
-
 GH_ACCOUNT =   visit1985
 GH_PROJECT =   mdp
-GH_TAGNAME =   ${VERSION}
+GH_TAGNAME =   1.0.10
 
 CATEGORIES =   textproc
 
diff --git a/textproc/mdp/distinfo b/textproc/mdp/distinfo
index e69461c814c..4035efec226 100644
--- a/textproc/mdp/distinfo
+++ b/textproc/mdp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mdp-1.0.9.tar.gz) = iT4TqaYaibrPKe4UG9n26JNXEDI3AePTZYSku5DhNy0=
-SIZE (mdp-1.0.9.tar.gz) = 36877
+SHA256 (mdp-1.0.10.tar.gz) = c4TBujK9jksRNCVw0hRBZaYGgkmbTLVOUMjrMWTPq8U=
+SIZE (mdp-1.0.10.tar.gz) = 37502

[UPDATE] sysutils/dfc 3.1.0 -> 3.1.1

[Klemens Nanni]

This a bugfix release:

- fix a typo in the compilation instructions in the readme file
- fix an old bug (4+ years) which messed up colors in HTML export when a
  configuration file is used
- fix a bug which prevented some file systems to be displayed when the
  filtering option was used
- fix a bad implicit fallthrough

Continues to work fine on my amd64 machine.

Feedback?

diff --git a/sysutils/dfc/Makefile b/sysutils/dfc/Makefile
index d41b5169845..983750a1996 100644
--- a/sysutils/dfc/Makefile
+++ b/sysutils/dfc/Makefile
@@ -2,11 +2,10 @@
 
 COMMENT =  display file system space usage using graph and colors
 
-DISTNAME = dfc-3.1.0
+DISTNAME = dfc-3.1.1
 CATEGORIES =   sysutils
-REVISION = 0
 
-MASTER_SITES = https://projects.gw-computing.net/attachments/download/614/
+MASTER_SITES = https://projects.gw-computing.net/attachments/download/615/
 HOMEPAGE = https://projects.gw-computing.net/projects/dfc
 
 # BSD
diff --git a/sysutils/dfc/distinfo b/sysutils/dfc/distinfo
index 0bb706d1904..42f31e1bbc0 100644
--- a/sysutils/dfc/distinfo
+++ b/sysutils/dfc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dfc-3.1.0.tar.gz) = itmLoaloWhvzOi07jyc33t72AZVD0Z0bXr0Xg750D+s=
-SIZE (dfc-3.1.0.tar.gz) = 52459
+SHA256 (dfc-3.1.1.tar.gz) = liRm53QH3VvnFaQf/FClT851iniDFUbwOmuyguhpLlQ=
+SIZE (dfc-3.1.1.tar.gz) = 52709

Re: [UPDATE] sysutils/dfc 3.1.0 -> 3.1.1

[Klemens Nanni]

On Sun, Nov 12, 2017 at 03:02:11AM -0500, Brian Callahan wrote:
> 
> On 11/11/17 23:38, Klemens Nanni wrote:
> > This a bugfix release:
> > 
> > - fix a typo in the compilation instructions in the readme file
> > - fix an old bug (4+ years) which messed up colors in HTML export when a
> >configuration file is used
> > - fix a bug which prevented some file systems to be displayed when the
> >filtering option was used
> > - fix a bad implicit fallthrough
> > 
> > Continues to work fine on my amd64 machine.
> > 
> > Feedback?
> 
> We're not doing the gettext MODULE any more, so you'll need to fix that. It
> uses libintl and libiconv, so you'll have to remove devel/gettext from
> MODULES and put it in LDEPS and resync WANTLIB.
> 
> It looks like this port also uses msgfmt, so you'll have to add a BDEP on
> devel/gettext-tools as well.
> 
> When I ran 'make update-patches', the patches were regen'd.
Thanks, should've indeed handled gettext.

Updated diff below. Feedback?


diff --git a/sysutils/dfc/Makefile b/sysutils/dfc/Makefile
index d41b5169845..ae1f98cbd62 100644
--- a/sysutils/dfc/Makefile
+++ b/sysutils/dfc/Makefile
@@ -2,18 +2,22 @@
 
 COMMENT =  display file system space usage using graph and colors
 
-DISTNAME = dfc-3.1.0
+DISTNAME = dfc-3.1.1
 CATEGORIES =   sysutils
-REVISION = 0
 
-MASTER_SITES = https://projects.gw-computing.net/attachments/download/614/
+MASTER_SITES = https://projects.gw-computing.net/attachments/download/615/
 HOMEPAGE = https://projects.gw-computing.net/projects/dfc
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
-MODULES =  devel/cmake devel/gettext
-WANTLIB =  c m
+MODULES =  devel/cmake
+WANTLIB =  c iconv intl m
+
+BUILD_DEPENDS =devel/gettext-tools
+LIB_DEPENDS =  converters/libiconv \
+   devel/gettext
+
 NO_TEST =  Yes
 
 CONFIGURE_ARGS =-DXDG_CONFIG_DIR=${PREFIX}/share/examples \
diff --git a/sysutils/dfc/distinfo b/sysutils/dfc/distinfo
index 0bb706d1904..42f31e1bbc0 100644
--- a/sysutils/dfc/distinfo
+++ b/sysutils/dfc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dfc-3.1.0.tar.gz) = itmLoaloWhvzOi07jyc33t72AZVD0Z0bXr0Xg750D+s=
-SIZE (dfc-3.1.0.tar.gz) = 52459
+SHA256 (dfc-3.1.1.tar.gz) = liRm53QH3VvnFaQf/FClT851iniDFUbwOmuyguhpLlQ=
+SIZE (dfc-3.1.1.tar.gz) = 52709
diff --git a/sysutils/dfc/patches/patch-CMakeLists_txt 
b/sysutils/dfc/patches/patch-CMakeLists_txt
index bfc526d7ff1..4619270a541 100644
--- a/sysutils/dfc/patches/patch-CMakeLists_txt
+++ b/sysutils/dfc/patches/patch-CMakeLists_txt
@@ -1,7 +1,8 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.3 2017/05/23 09:00:53 benoit Exp $
 CMakeLists.txt.origSun Apr  9 11:36:02 2017
-+++ CMakeLists.txt Tue May 23 10:21:03 2017
-@@ -104,6 +104,7 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -104,6 +104,7 @@ endif()
  
  # Check for libintl
  find_package(Libintl)
@@ -9,7 +10,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2017/05/23 09:00:53 
benoit Exp $
  if (LIBINTL_FOUND)
  option(NLS_ENABLED "Translation support with gettext" on)
  else()
-@@ -191,7 +192,7 @@
+@@ -191,7 +192,7 @@ if(NLS_ENABLED)
  add_subdirectory(po)
  
  include_directories(${LIBINTL_INCLUDE_DIR})
diff --git a/sysutils/dfc/patches/patch-src_platform_services-bsd_c 
b/sysutils/dfc/patches/patch-src_platform_services-bsd_c
index a709f24d064..3e1c1c767cd 100644
--- a/sysutils/dfc/patches/patch-src_platform_services-bsd_c
+++ b/sysutils/dfc/patches/patch-src_platform_services-bsd_c
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_platform_services-bsd_c,v 1.1 2017/05/23 09:00:53 benoit 
Exp $
 src/platform/services-bsd.c.orig   Tue May 23 10:28:40 2017
-+++ src/platform/services-bsd.cTue May 23 10:29:07 2017
-@@ -73,7 +73,7 @@
+Index: src/platform/services-bsd.c
+--- src/platform/services-bsd.c.orig
 src/platform/services-bsd.c
+@@ -73,7 +73,7 @@ typedef struct statfs statst;
   * df(1) manual page. However, df and df -a have the same output on 2 machines
   * on which I could test. Use this workaround for now.
   */

[NEW] textproc/pup

[Klemens Nanni]

Hey,

here's pup, a small but very helpful utility written in Go; pkg/DESCR:

pup is a command line tool for processing HTML. It reads from
stdin, prints to stdout, and allows the user to filter parts of
the page using CSS selectors:


https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_started/Selectors

Inspired by http://stedolan.github.io/jq/, pup aims to be a fast
and flexible way of exploring HTML from the terminal.

Running just fine on my amd64 machine, tests pass.

The port is really simple and only packages the actual binary (no
upstream manual page).

Feedback, comments?


pup.tgz
Description: application/tar-gz

Re: [UPDATE] sysutils/mdp 1.0.9 -> 1.0.10

[Klemens Nanni]

On Sun, Nov 12, 2017 at 03:08:44AM -0500, Brian Callahan wrote:
> 
> On 11/11/17 23:14, Klemens Nanni wrote:
> > Another trivial version bump adding support for github flavored markdown.
> > 
> > I've also ditched VERSION and DISTNAME since GH_* take care of that.
> > 
> > Any takers?
> 
> Not directly in your diff, but the post-install routine seems very strange
> to me. There are definitely better ways of installing a man page to
> ${PREFIX}/man than to first install to ${PREFIX}/share/man, then mv from
> ${PREFIX}/share/man to ${PREFIX}/man and rmdir ${PREFIX}/share/man. You
> should consider selecting a better approach.
I did consider replacing that with a new do-install target or patched
Makefile to fix the MANPATH but left it as is in order to keep the diff
minimal.

Here's a new diff using do-install as this shortest way of properlu
dealing with paths and permissions it seeems.


diff --git a/textproc/mdp/Makefile b/textproc/mdp/Makefile
index c02c4c6aa22..eb4748b524a 100644
--- a/textproc/mdp/Makefile
+++ b/textproc/mdp/Makefile
@@ -2,12 +2,9 @@
 
 COMMENT =  command-line based markdown presentation tool
 
-VERSION =  1.0.9
-DISTNAME = mdp-${VERSION}
-
 GH_ACCOUNT =   visit1985
 GH_PROJECT =   mdp
-GH_TAGNAME =   ${VERSION}
+GH_TAGNAME =   1.0.10
 
 CATEGORIES =   textproc
 
@@ -20,10 +17,10 @@ MAKE_FLAGS =PREFIX=${PREFIX}
 
 USE_GMAKE =Yes
 
-post-install:
-   mv ${PREFIX}/share/man/* ${PREFIX}/man/
-   rmdir ${PREFIX}/share/man
-
 NO_TEST =  Yes
 
+do-install:
+   ${INSTALL_PROGRAM} ${WRKSRC}/mdp ${PREFIX}/bin
+   ${INSTALL_MAN} ${WRKSRC}/mdp.1 ${PREFIX}/man/man1/
+
 .include 
diff --git a/textproc/mdp/distinfo b/textproc/mdp/distinfo
index e69461c814c..4035efec226 100644
--- a/textproc/mdp/distinfo
+++ b/textproc/mdp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mdp-1.0.9.tar.gz) = iT4TqaYaibrPKe4UG9n26JNXEDI3AePTZYSku5DhNy0=
-SIZE (mdp-1.0.9.tar.gz) = 36877
+SHA256 (mdp-1.0.10.tar.gz) = c4TBujK9jksRNCVw0hRBZaYGgkmbTLVOUMjrMWTPq8U=
+SIZE (mdp-1.0.10.tar.gz) = 37502

Re: net/corebird 1.5.1 => 1.7.3

[Klemens Nanni]

On Mon, Nov 20, 2017 at 08:15:13PM +0100, Adam Wolk wrote:
> On Wed, Nov 08, 2017 at 09:43:01PM +0100, Adam Wolk wrote:
> > Hi ports@
> > 
> > attaching a trivial bump for net/corebird
> > testedo n amd64 current.
> > 
> > Port changes:
> >  - dropping dependency on librest
> >  - dropping wantlib on soup-gnome
> >  - appdata changed it's dwelling place
> >  - setting HOME for tests and interactive
> >causing all tests to finally pass
> > 
> > Feedback, OK's?
> [...]
> 
> Corebird 1.7.3 has been recently released with support for 280 characters
> change on Twitter and a few other tweaks. Updated diff and upstream
> changelog below:
> [...]
Port builds and starts fine for me, I don't have a Twitter account to
actually test it, though. Still some feedback:

- DESCR's first sentence is missing a full stop
- HOMEPAGE supports HTTPS
- SEPARATE_BUILD=Yes can be set
- TEST and TEST_INTERACTIVE have inconsistent spacing around =

Re: [UPDATE] graphics/sxiv 2.3.1 -> 24

[Klemens Nanni]

On Tue, Nov 21, 2017 at 01:44:44AM -0700, Anthony J. Bentley wrote:
> Klemens Nanni writes:
> > On Mon, Nov 06, 2017 at 02:21:41AM +0100, Klemens Nanni wrote:
> > > Hey ports@,
> > > 
> > > here's a simple diff updating sxiv to the newest release; Yes, upstream
> > > jumped from 2.3.1 to 24 not 2.4. These are mostly mechanical changes,
> > > I've also updated the description as upstream did.
> > > (snip)
> > > -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \
> > > - CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \
> > > - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif
> >  -lgif"
> > > +MAKE_FLAGS = CC=${CC} \
> > > + PREFIX=${PREFIX} \
> 
> No need to set PREFIX.
PREFIX is hard coded to /usr/local in sxiv's Makefile and MANPATH uses
it so why not letting users set PREFIX as they wish? Not passing it via
MAKE_FLAGS would honor the user's PREFIX for MANPATH only.

> Also, I set V=1 so we can actually see the compiler commands.
> 
> > > + CFLAGS="${CFLAGS} -I${X11BASE}/include -I${X11BASE}/include/fre
> > etype2 -I${LOCALBASE}/include -I${LOCALBASE}/include/inotify" \
> > > + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib -L${LOC
> > ALBASE}/lib/inotify -lX11 -lXft -lImlib2 -lexif -linotify -lgif -Wl,-rpath 
> > ${
> > LOCALBASE}/lib/inotify"
> 
> Couple things. Existing LDFLAGS don't need to be passed to LDFLAGS,
> because unlike CFLAGS it's not a standard variable likely to be in
> mk.conf. Also, sxiv uses LDLIBS for the -l chain so we don't have to
> repeat it.
Thanks, that's better.
> 
> > >  post-install:
> > > - cd ${WRKSRC}/icon && make install
> > > + make -C ${WRKSRC}/icon install
> 
> No need for a cosmetic change like this...
> 
> 
> Here's a (very) slightly modified version of your diff per above. I
> don't understand the inotify stuff, but it matches what existing ports
> do, so...
Using inotify sxiv can automatically reload the currently displayed
image if it changes on disk.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/sxiv/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  6 May 2017 13:45:49 -   1.10
> +++ Makefile  21 Nov 2017 08:39:17 -
> @@ -1,11 +1,10 @@
>  # $OpenBSD: Makefile,v 1.10 2017/05/06 13:45:49 fcambus Exp $
>  
> -COMMENT =simple (or small or suckless) X Image Viewer
> +COMMENT =simple X Image Viewer
>  
>  GH_PROJECT = sxiv
>  GH_ACCOUNT = muennich
> -GH_TAGNAME = v1.3.2
> -REVISION =   0
> +GH_TAGNAME = v24
>  
>  CATEGORIES = graphics x11
>  
> @@ -14,17 +13,20 @@ MAINTAINER =  Matthew Via <via@matthewvia
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -WANTLIB +=   Imlib2 exif gif X11 c
> +WANTLIB +=   Imlib2 X11 Xft c exif gif lib/inotify/inotify
>  
>  RUN_DEPENDS =devel/desktop-file-utils \
>   x11/gtk+3,-guic
>  
> -LIB_DEPENDS =graphics/imlib2 \
> +LIB_DEPENDS =devel/libinotify \
> + graphics/imlib2 \
>   graphics/libexif
>  
> -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \
> - CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \
> - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif 
> -lgif"
> +MAKE_FLAGS = CC="${CC}" \
> + V=1 \
> + MANPREFIX=${PREFIX}/man \
> + CFLAGS="${CFLAGS} -I${X11BASE}/include 
> -I${X11BASE}/include/freetype2 -I${LOCALBASE}/include 
> -I${LOCALBASE}/include/inotify" \
> + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib 
> -L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath ${LOCALBASE}/lib/inotify"
>  
>  NO_TEST =Yes
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/sxiv/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  24 Dec 2015 21:54:09 -  1.5
> +++ distinfo  21 Nov 2017 08:39:17 -
> @@ -1,2 +1,2 @@
> -SHA256 (sxiv-1.3.2.tar.gz) = n1No3o8PV+eOvgLLUxoxEHqZPydpzsUbzI1w9cZotlM=
> -SIZE (sxiv-1.3.2.tar.gz) = 46560
> +SHA256 (sxiv-24.tar.gz) = UR3EXRKWKvnDHDBozmvKS4MqYmOUaye+/qSaSM8BkRA=
> +SIZE (sxiv-24.tar.gz) = 47148
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/graphics/sxiv/patches/patch-Makefile,v
> retrieving revision 1.4
> diff

Re: [NEW] net/toot

[Klemens Nanni]

... and the actual port attached.


toot.tgz
Description: application/tar-gz

[NEW] net/toot

[Klemens Nanni]

Hey ports@,

$ pkg_info toot
Information for inst:toot-0.15.0

Comment:
interact with Mastodon social networks from the command line

Description:
toot lets you read, post and manage accounts on Mastadon social
networks. It supports logging in through both your webbrowser
and the console with optional two factor authentication. Toots
can be pasted directly via standard input.

Maintainer: The OpenBSD ports mailing-list 

WWW: https://github.com/ihabunek/toot

I can read and post fine, haven't tested 2FA though. The experimental
timeline app using curses doesn't work for be, be a normal
`toot timeline' does its job just perfectly.

Feedback? Anyone willing to commit?

Re: [NEW] net/toot

[Klemens Nanni]

On Sun, Nov 19, 2017 at 02:25:36PM +0100, Klemens Nanni wrote:
> ... and the actual port attached.
Sorry for the noise, this was the first tarball missing the test bits
so here they are as diff ontop. 16/16 tests pass.

diff --git a/net/toot/Makefile b/net/toot/Makefile
index f38387217b3..cd812b07f0a 100644
--- a/net/toot/Makefile
+++ b/net/toot/Makefile
@@ -17,7 +17,12 @@ MODULES =lang/python
 RUN_DEPENDS =  devel/py-future>=0.16 \
www/py-beautifulsoup4>=4.5.0,<5.0 \
www/py-requests>=2.13,<3.0
+TEST_DEPENDS = devel/py-test>=3.0.0 \
+   devel/py-test-cov>=2.4.0
 
 MODPY_SETUPTOOLS = Yes
 
+do-test:
+   make -C ${WRKSRC} coverage
+
 .include 

Re: [UPDATE] audio/ncmpc 0.28 -> 0.29

[Klemens Nanni]

On Sun, Nov 19, 2017 at 07:34:13PM +0100, Jeremie Courreges-Anglas wrote:
> On Sun, Nov 19 2017, Klemens Nanni <k...@posteo.org> wrote:
> > On Sun, Nov 19, 2017 at 06:20:55PM +0100, Jeremie Courreges-Anglas wrote:
> >> On Wed, Nov 15 2017, Klemens Nanni <k...@posteo.org> wrote:
> >> > On Wed, Nov 15, 2017 at 11:27:35PM +0100, Klemens Nanni wrote:
> >> >> Both 0.28 and 0.29 don't actually run tests, do we want to set NO_TEST?
> >> >> 
> >> >> $ make -s test
> >> >> ===>  Regression tests for ncmpc-0.29v0
> >> >> ninja: Entering directory 
> >> >> `/usr/obj/ports/ncmpc-0.29/build-amd64'
> >> >> [0/1] Running all tests.
> >> >> No tests defined.
> >> > Rephrasing since NO_TEST=Yes is not an option:
> 
> Hah, I overlooked this part in your previous mail...
> 
> >> > There are test targets
> >> > defined in build.ninja but it doesn't seem to run the actual test.
> >> >
> >> > I'm no ninja/meson expert so how should we handle this? `make test'
> >> > yielding no tests and returning zero seems broken to me.
> >> 
> >> It's fine, see NO_TEST in bsd.port.mk(5).
> 
> ... thus my answer may sound a bit redundant.
> 
> > "It should be left alone for ports with empty regression tests, and for
> > ports with failing tests" reads to me as "do not set NO_TEST" in this
> > particular case; where am I wrong?
> 
> You're not wrong, you shouldn't use NO_TEST=Yes.  Just deal with it?  :)
> 
> Updated diff that drops the meson patches.  curses and color support
> seem to be properly detected.  The tarball diff between 0.28 and 0.29 is
> pretty short:
> 
>   https://pbot.rmdir.de/qKjDT9I7l8tYQsfw3wOAiA
> 
> The "fix crash after losing MPD connection" change appears effective
> here.
> 
> The post-install tweak looks like a question of taste though, I may
> strip it before I commit the diff below (unless David shows up before
> the usual 7 days timeout).
> 
> 
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/audio/ncmpc/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- Makefile  28 Oct 2017 13:28:06 -  1.36
> +++ Makefile  19 Nov 2017 18:04:14 -
> @@ -2,13 +2,12 @@
>  
>  COMMENT= curses based frontend for mpd
>  
> -VER= 0.28
> +VER= 0.29
>  DISTNAME=ncmpc-${VER}
>  EPOCH=   0
>  CATEGORIES=  audio
> -REVISION=0
>  
> -HOMEPAGE=http://www.musicpd.org/clients/ncmpc/
> +HOMEPAGE=https://www.musicpd.org/clients/ncmpc/
>  
>  MAINTAINER=  David Coppa <dco...@openbsd.org>
>  
> @@ -17,7 +16,7 @@ PERMIT_PACKAGE_CDROM=   Yes
>  
>  WANTLIB= c glib-2.0 intl mpdclient>=1 ncursesw
>  
> -MASTER_SITES=http://www.musicpd.org/download/ncmpc/${VER:R}/
> +MASTER_SITES=https://www.musicpd.org/download/ncmpc/${VER:R}/
>  
>  EXTRACT_SUFX=.tar.xz
>  
> @@ -29,9 +28,7 @@ LIB_DEPENDS=devel/gettext \
>   devel/glib2 \
>   audio/libmpdclient>=2.4
>  
> -CONFIGURE_ARGS=  -Dcolors=ncursesw \
> - -Dcurses=ncursesw \
> - -Dlirc=false \
> +CONFIGURE_ARGS=  -Dlirc=false \
>   -Dlocale=true \
>   -Dmouse=true
>  CONFIGURE_ENV=   CPP=${CPP} \
> @@ -42,7 +39,7 @@ CONFIGURE_ENV=  CPP=${CPP} \
>  
>  post-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ncmpc
> - mv ${PREFIX}/share/doc/ncmpc/{config.sample,keys.sample,ncmpc.lirc} \
> + mv ${PREFIX}/share/doc/ncmpc/{{config,keys}.sample,ncmpc.lirc} \
>   ${PREFIX}/share/examples/ncmpc/
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /d/cvs/ports/audio/ncmpc/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo  26 Sep 2017 09:55:07 -  1.14
> +++ distinfo  19 Nov 2017 17:49:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (ncmpc-0.28.tar.xz) = 9m5bb++Dvf2js++vP7rWpNjEe7GztoEL7UTT41sAeAQ=
> -SIZE (ncmpc-0.28.tar.xz) = 233724
> +SHA256 (ncmpc-0.29.tar.xz) = 72iptnFyOD6oDuRleQFRCUM/oFhyiBLSsOvt5mDYXxI=
> +SIZE (ncmpc-0.29.tar.xz) = 233876
> Index: patches/patch-meson_build
> 

Re: [UPDATE] audio/ncmpc 0.28 -> 0.29

[Klemens Nanni]

On Sun, Nov 19, 2017 at 06:20:55PM +0100, Jeremie Courreges-Anglas wrote:
> On Wed, Nov 15 2017, Klemens Nanni <k...@posteo.org> wrote:
> > On Wed, Nov 15, 2017 at 11:27:35PM +0100, Klemens Nanni wrote:
> >> Both 0.28 and 0.29 don't actually run tests, do we want to set NO_TEST?
> >> 
> >>$ make -s test
> >>===>  Regression tests for ncmpc-0.29v0
> >>ninja: Entering directory `/usr/obj/ports/ncmpc-0.29/build-amd64'
> >>[0/1] Running all tests.
> >>No tests defined.
> > Rephrasing since NO_TEST=Yes is not an option: There are test targets
> > defined in build.ninja but it doesn't seem to run the actual test.
> >
> > I'm no ninja/meson expert so how should we handle this? `make test'
> > yielding no tests and returning zero seems broken to me.
> 
> It's fine, see NO_TEST in bsd.port.mk(5).
"It should be left alone for ports with empty regression tests, and for
ports with failing tests" reads to me as "do not set NO_TEST" in this
particular case; where am I wrong?

Re: [NEW] net/toot

[Klemens Nanni]

On Sun, Nov 19, 2017 at 02:54:46PM +0100, Klemens Nanni wrote:
> On Sun, Nov 19, 2017 at 02:25:36PM +0100, Klemens Nanni wrote:
> > ... and the actual port attached.
> Sorry for the noise, this was the first tarball missing the test bits
> so here they are as diff ontop. 16/16 tests pass.
Take three after some feedback now also using Python 3 to avoid new
ports still depending on Python 2.

The s,©,(C), patch for README.rst is now required as setup.py reads the
readme file for its long description but chokes on it. I've already
mailed the developer about it.

Feedback? Any takers?


toot.tgz
Description: application/tar-gz

Re: [UPDATE] graphics/sxiv 2.3.1 -> 24

[Klemens Nanni]

On Mon, Nov 06, 2017 at 02:21:41AM +0100, Klemens Nanni wrote:
> Hey ports@,
> 
> here's a simple diff updating sxiv to the newest release; Yes, upstream
> jumped from 2.3.1 to 24 not 2.4. These are mostly mechanical changes,
> I've also updated the description as upstream did.
> 
> Changes:
> 
> - Automatically reload the current image whenever it changes
> - Support embedding into other X windows with -e (e.g. tabbed)
> - New option -p prevents sxiv from creating cache and temporary files
> - Simpler mouse mappings, the most basic features are accessible with
>   the mouse only (navigate, zoom, pan)
> 
> sxiv now uses freetype2 and inotify, tested successfully on amd64.
> 
> Feedback, comments?
> 
> ---
>  graphics/sxiv/Makefile   | 20 ---
>  graphics/sxiv/distinfo   |  4 +--
>  graphics/sxiv/patches/patch-Makefile | 48 
> ++--
>  graphics/sxiv/patches/patch-sxiv_1   | 11 +
>  graphics/sxiv/pkg/DESCR  | 12 -
>  5 files changed, 37 insertions(+), 58 deletions(-)
> 
> diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile
> index eeb5fd17888..d6a636ac9b0 100644
> --- a/graphics/sxiv/Makefile
> +++ b/graphics/sxiv/Makefile
> @@ -1,11 +1,10 @@
>  # $OpenBSD: Makefile,v 1.10 2017/05/06 13:45:49 fcambus Exp $
>  
> -COMMENT =simple (or small or suckless) X Image Viewer
> +COMMENT =simple X Image Viewer
>  
>  GH_PROJECT = sxiv
>  GH_ACCOUNT = muennich
> -GH_TAGNAME = v1.3.2
> -REVISION =   0
> +GH_TAGNAME = v24
>  
>  CATEGORIES = graphics x11
>  
> @@ -14,22 +13,25 @@ MAINTAINER =  Matthew Via <v...@matthewvia.info>
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -WANTLIB +=   Imlib2 exif gif X11 c
> +WANTLIB +=   Imlib2 X11 Xft c exif gif lib/inotify/inotify
>  
>  RUN_DEPENDS =devel/desktop-file-utils \
>   x11/gtk+3,-guic
>  
> -LIB_DEPENDS =graphics/imlib2 \
> +LIB_DEPENDS =devel/libinotify \
> + graphics/imlib2 \
>   graphics/libexif
>  
> -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \
> - CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \
> - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif 
> -lgif"
> +MAKE_FLAGS = CC=${CC} \
> + PREFIX=${PREFIX} \
> + MANPREFIX=${PREFIX}/man \
> + CFLAGS="${CFLAGS} -I${X11BASE}/include 
> -I${X11BASE}/include/freetype2 -I${LOCALBASE}/include 
> -I${LOCALBASE}/include/inotify" \
> + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib 
> -L${LOCALBASE}/lib/inotify -lX11 -lXft -lImlib2 -lexif -linotify -lgif 
> -Wl,-rpath ${LOCALBASE}/lib/inotify"
>  
>  NO_TEST =Yes
>  
>  post-install:
> - cd ${WRKSRC}/icon && make install
> + make -C ${WRKSRC}/icon install
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
>   ${INSTALL_DATA} ${WRKSRC}/sxiv.desktop ${PREFIX}/share/applications
>  
> diff --git a/graphics/sxiv/distinfo b/graphics/sxiv/distinfo
> index 78b5985c9ec..dcf76b04c13 100644
> --- a/graphics/sxiv/distinfo
> +++ b/graphics/sxiv/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (sxiv-1.3.2.tar.gz) = n1No3o8PV+eOvgLLUxoxEHqZPydpzsUbzI1w9cZotlM=
> -SIZE (sxiv-1.3.2.tar.gz) = 46560
> +SHA256 (sxiv-24.tar.gz) = UR3EXRKWKvnDHDBozmvKS4MqYmOUaye+/qSaSM8BkRA=
> +SIZE (sxiv-24.tar.gz) = 47148
> diff --git a/graphics/sxiv/patches/patch-Makefile 
> b/graphics/sxiv/patches/patch-Makefile
> index af27a365942..717afe06ea5 100644
> --- a/graphics/sxiv/patches/patch-Makefile
> +++ b/graphics/sxiv/patches/patch-Makefile
> @@ -1,53 +1,31 @@
>  $OpenBSD: patch-Makefile,v 1.4 2015/12/24 21:54:09 mmcc Exp $
>  Makefile.origSun Dec 20 07:21:25 2015
> -+++ Makefile Wed Dec 23 20:01:02 2015
> -@@ -11,11 +11,11 @@ LIBS  := -lX11 -lImlib2
> - 
> - # optional dependencies:
> - # giflib: gif animations
> --CPPFLAGS += -DHAVE_GIFLIB
> --LIBS += -lgif
> -+CPPFLAGS += -DHAVE_GIFLIB
> -+LIBS += -lgif
> - # libexif: jpeg auto-orientation, exif thumbnails
> --CPPFLAGS += -DHAVE_LIBEXIF
> --LIBS += -lexif
> -+CPPFLAGS += -DHAVE_LIBEXIF
> -+LIBS += -lexif
> - 
> - 
> - .PHONY: clean install uninstall
> -@@ -30,7 +30,7 @@ $(OBJ): Makefile
> - 
> - -include $(DEP)
> - 
> --%.o: %.c
> -+.c.o:
> - $(CC) $(CFLAGS) $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -MMD -MP -c -o $@ 
> $<
> - 
> - config.h:
> -@@ -43,15 +43,15 @@ clean:
> - rm -f $(OBJ) $(DEP) sxiv
> +Index: Makefile
> +--- Makefile.orig
>  Make

Drop gettext MODULE from www/snownews

[Klemens Nanni]

Feedback? Any takers?

diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 46ee8da64dc..fe4171ca87f 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   text mode rss newsreader
 DISTNAME=  snownews-1.5.12
-REVISION=  2
+REVISION=  3
 CATEGORIES=www
 MASTER_SITES=  ${HOMEPAGE}download/
 
@@ -13,14 +13,15 @@ MAINTAINER= David Cathcart 
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB += c crypto m ncurses pthread lzma xml2>=7.10 z
+WANTLIB += c crypto iconv intl m ncurses pthread lzma xml2>=7.10 z
 
 NO_TEST=   Yes
 USE_GMAKE= Yes
 
-MODULES=   devel/gettext
+BUILD_DEPENDS= devel/gettext-tools
 RUN_DEPENDS=   textproc/p5-XML-LibXML
-LIB_DEPENDS=   textproc/libxml
+LIB_DEPENDS=   devel/gettext \
+   textproc/libxml
 
 MAKE_ENV+= EXTRA_CFLAGS="${CFLAGS}"
 MAKE_FLAGS+=   CC="${CC}"

[UPDATE] www/varnish 5.2.0 -> 5.2.1

[Klemens Nanni]

This is a security update[0] fixing a data leak:

A wrong if statement in the varnishd source code means that
synthetic objects in stevedores which over-allocate, may leak up
to page size of data from a malloc(3) memory allocation.

In a unpredictable percentage of the cases where this condition
arises, a segmentation fault will happen instead.

Tests continue to pass:

# TOTAL: 636
# PASS:  630
# SKIP:  5
# XFAIL: 0
# FAIL:  1
# XPASS: 0
# ERROR: 0

FAIL tests/u0.vtc (exit status: 2)

Removed TEST_TARGET=check as it's default. I also replaced cp with
${INSTALL_DATA} post-install and pointed users to 5.2 docs.

Since Varnish compiles .vsc files to C using python with 2.7 specific
code (import StringIO), I added lang/python and explicity set
MODPY_VERSION=2.7.

Feedback? Does anyone want to commit this?

0: https://varnish-cache.org/releases/rel5.2.1.html#rel5-2-1

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index b0fa5029ab4..5cf58670364 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  high-performance HTTP accelerator
 
-DISTNAME = varnish-5.2.0
+DISTNAME = varnish-5.2.1
 
 CATEGORIES =   www
 
@@ -16,12 +16,16 @@ MAINTAINER =Jim Razmus II 
 \
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES =  https://varnish-cache.org/_downloads/
+MASTER_SITES =  ${HOMEPAGE}_downloads/
 
 EXTRACT_SUFX = .tgz
 
 WANTLIB += c execinfo m ncursesw pcre pthread readline termcap
 
+MODULES =  lang/python
+
+MODPY_VERSION =2.7
+
 BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool \
@@ -30,6 +34,8 @@ LIB_DEPENDS = devel/pcre
 # The internal backtrace implementation fails to build with -Werror on arm/hppa
 LIB_DEPENDS += devel/libexecinfo
 
+MODPY_RUNDEP = No
+
 WRKDIST =  ${WRKDIR}/${DISTNAME}
 USE_GMAKE =Yes
 CONFIGURE_STYLE =  gnu
@@ -38,7 +44,7 @@ AUTOMAKE_VERSION =1.15
 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
-TEST_TARGET =  check
+MODPY_ADJ_FILES =  lib/lib*/*.py
 
 post-patch:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
@@ -47,7 +53,7 @@ post-patch:
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/varnish
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/varnish
-   cp ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
+   ${INSTALL_DATA} ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
${PREFIX}/share/examples/varnish
rm -f ${PREFIX}/lib/varnish/{vmods,}/*.{a,la}
 
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index f7dc351f783..cdba07a9889 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (varnish-5.2.0.tgz) = zEgmoEgPSSaNOZYwnkt+RlFR6aUjzPjq1JnsV1FJ9H4=
-SIZE (varnish-5.2.0.tgz) = 2828867
+SHA256 (varnish-5.2.1.tgz) = uEUsnXjBb3jIz9HBoeaWUjv2S3chwzAVDcwIUkWQFLM=
+SIZE (varnish-5.2.1.tgz) = 2827676
diff --git a/www/varnish/pkg/MESSAGE b/www/varnish/pkg/MESSAGE
index 5f50b1bbf2a..ce02efaef87 100644
--- a/www/varnish/pkg/MESSAGE
+++ b/www/varnish/pkg/MESSAGE
@@ -5,4 +5,4 @@ or the following link for more information:
 
 and for further information:
 
-   https://www.varnish-cache.org/docs/5.0/
+   https://www.varnish-cache.org/docs/5.2/

[UPDATE] www/varnish to 5.2.1

[Klemens Nanni]

This is a security update[0] fixing a data leak:

A wrong if statement in the varnishd source code means that
synthetic objects in stevedores which over-allocate, may leak up
to page size of data from a malloc(3) memory allocation.

In a unpredictable percentage of the cases where this condition
arises, a segmentation fault will happen instead.

Tests continue to pass as before (full log attached):

# TOTAL: 636
# PASS:  630
# SKIP:  5
# XFAIL: 0
# FAIL:  1
# XPASS: 0
# ERROR: 0

I also removed TEST_TARGET=check as it's the default, used
${INSTALL_DATA} instead of cp in post-install and pointed users to 5.2
instead of 5.0 docs.

Varnish uses python scripts to compile .vsc into C so I added
lang/python with MODPY_VERSION=2.7 explicity since it's importing
StringIO which appearantly became io.StringIO in 3.0 and higher.

Feedback? Does anyone want to commit this?

0: https://varnish-cache.org/releases/rel5.2.1.html#rel5-2-1

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index b0fa5029ab4..5cf58670364 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  high-performance HTTP accelerator
 
-DISTNAME = varnish-5.2.0
+DISTNAME = varnish-5.2.1
 
 CATEGORIES =   www
 
@@ -16,12 +16,16 @@ MAINTAINER =Jim Razmus II 
 \
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES =  https://varnish-cache.org/_downloads/
+MASTER_SITES =  ${HOMEPAGE}_downloads/
 
 EXTRACT_SUFX = .tgz
 
 WANTLIB += c execinfo m ncursesw pcre pthread readline termcap
 
+MODULES =  lang/python
+
+MODPY_VERSION =2.7
+
 BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool \
@@ -30,6 +34,8 @@ LIB_DEPENDS = devel/pcre
 # The internal backtrace implementation fails to build with -Werror on arm/hppa
 LIB_DEPENDS += devel/libexecinfo
 
+MODPY_RUNDEP = No
+
 WRKDIST =  ${WRKDIR}/${DISTNAME}
 USE_GMAKE =Yes
 CONFIGURE_STYLE =  gnu
@@ -38,7 +44,7 @@ AUTOMAKE_VERSION =1.15
 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
-TEST_TARGET =  check
+MODPY_ADJ_FILES =  lib/lib*/*.py
 
 post-patch:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
@@ -47,7 +53,7 @@ post-patch:
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/varnish
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/varnish
-   cp ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
+   ${INSTALL_DATA} ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
${PREFIX}/share/examples/varnish
rm -f ${PREFIX}/lib/varnish/{vmods,}/*.{a,la}
 
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index f7dc351f783..cdba07a9889 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (varnish-5.2.0.tgz) = zEgmoEgPSSaNOZYwnkt+RlFR6aUjzPjq1JnsV1FJ9H4=
-SIZE (varnish-5.2.0.tgz) = 2828867
+SHA256 (varnish-5.2.1.tgz) = uEUsnXjBb3jIz9HBoeaWUjv2S3chwzAVDcwIUkWQFLM=
+SIZE (varnish-5.2.1.tgz) = 2827676
diff --git a/www/varnish/pkg/MESSAGE b/www/varnish/pkg/MESSAGE
index 5f50b1bbf2a..ce02efaef87 100644
--- a/www/varnish/pkg/MESSAGE
+++ b/www/varnish/pkg/MESSAGE
@@ -5,4 +5,4 @@ or the following link for more information:
 
 and for further information:
 
-   https://www.varnish-cache.org/docs/5.0/
+   https://www.varnish-cache.org/docs/5.2/

===
   Varnish 5.2.1: bin/varnishtest/test-suite.log
===

# TOTAL: 636
# PASS:  630
# SKIP:  5
# XFAIL: 0
# FAIL:  1
# XPASS: 0
# ERROR: 0

.. contents:: :depth: 2

SKIP: tests/a00014
==

 top   0.0 extmacro def 
pwd=/usr/obj/ports/varnish-5.2.1/varnish-5.2.1/bin/varnishtest
 top   0.0 extmacro def localhost=127.0.0.1
 top   0.0 extmacro def bad_backend=127.0.0.1 45991
 top   0.0 extmacro def bad_ip=192.0.2.255
 top   0.0 extmacro def topbuild=/usr/obj/ports/varnish-5.2.1/varnish-5.2.1
 top   0.0 macro def tmpdir=/tmp/vtc.615.05f97f59
*top   0.0 TEST ./tests/a00014.vtc starting
**   top   0.0 === varnishtest "Custom feature verification"
*top   0.0 TEST Custom feature verification
**   top   0.0 === feature cmd true
**   top   0.0 === feature cmd false
*top   0.0 SKIPPING test, lacking feature: false
*top   0.0 RESETTING after ./tests/a00014.vtc
*top   0.0 TEST ./tests/a00014.vtc completed
#top  TEST ./tests/a00014.vtc skipped (0.004)
SKIP tests/a00014.vtc (exit status: 77)

SKIP: tests/a02022
==

 top   0.0 extmacro def 
pwd=/usr/obj/ports/varnish-5.2.1/varnish-5.2.1/bin/varnishtest
 top   

Re: [NEW] sysutils/xbattmon

[Klemens Nanni]

On Sun, Nov 12, 2017 at 07:06:44PM +0100, Steven Mestdagh wrote:
> Klemens Nanni [2017-11-11, 17:02:53]:
> > Hey,
> > 
> > xbattmon is a simple battery monitor for X pretty similiar to
> > sysutils/xbattbar but actively maintained.
> > 
> > It draws a colorized bar on the edge of your screen, that blinks on
> > critical battery level.
> > 
> > Upstream ships our strtonum.c for all platforms but I patched it to use
> > our libc's one.
> > 
> > Feedback? Anyone willing to commit this?
> 
> The patch for config.bsd.mk is not needed, you can just use MAKE_FLAGS.
> I've adapted this port accordingly, see attached.
Sure thing, I went for the patch as that's often done across various
x11/*/patches/patch-config_mk as well.

Thanks!

[UPDATE] graphics/sxiv 2.3.1 -> 24

[Klemens Nanni]

Hey ports@,

here's a simple diff updating sxiv to the newest release; Yes, upstream
jumped from 2.3.1 to 24 not 2.4. These are mostly mechanical changes,
I've also updated the description as upstream did.

Changes:

- Automatically reload the current image whenever it changes
- Support embedding into other X windows with -e (e.g. tabbed)
- New option -p prevents sxiv from creating cache and temporary files
- Simpler mouse mappings, the most basic features are accessible with
  the mouse only (navigate, zoom, pan)

sxiv now uses freetype2 and inotify, tested successfully on amd64.

Feedback, comments?

---
 graphics/sxiv/Makefile   | 20 ---
 graphics/sxiv/distinfo   |  4 +--
 graphics/sxiv/patches/patch-Makefile | 48 ++--
 graphics/sxiv/patches/patch-sxiv_1   | 11 +
 graphics/sxiv/pkg/DESCR  | 12 -
 5 files changed, 37 insertions(+), 58 deletions(-)

diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile
index eeb5fd17888..d6a636ac9b0 100644
--- a/graphics/sxiv/Makefile
+++ b/graphics/sxiv/Makefile
@@ -1,11 +1,10 @@
 # $OpenBSD: Makefile,v 1.10 2017/05/06 13:45:49 fcambus Exp $
 
-COMMENT =  simple (or small or suckless) X Image Viewer
+COMMENT =  simple X Image Viewer
 
 GH_PROJECT =   sxiv
 GH_ACCOUNT =   muennich
-GH_TAGNAME =   v1.3.2
-REVISION = 0
+GH_TAGNAME =   v24
 
 CATEGORIES =   graphics x11
 
@@ -14,22 +13,25 @@ MAINTAINER =Matthew Via 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += Imlib2 exif gif X11 c
+WANTLIB += Imlib2 X11 Xft c exif gif lib/inotify/inotify
 
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
 
-LIB_DEPENDS =  graphics/imlib2 \
+LIB_DEPENDS =  devel/libinotify \
+   graphics/imlib2 \
graphics/libexif
 
-MAKE_FLAGS =   CC=${CC} MANPREFIX=${PREFIX}/man \
-   CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \
-   LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif 
-lgif"
+MAKE_FLAGS =   CC=${CC} \
+   PREFIX=${PREFIX} \
+   MANPREFIX=${PREFIX}/man \
+   CFLAGS="${CFLAGS} -I${X11BASE}/include 
-I${X11BASE}/include/freetype2 -I${LOCALBASE}/include 
-I${LOCALBASE}/include/inotify" \
+   LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib 
-L${LOCALBASE}/lib/inotify -lX11 -lXft -lImlib2 -lexif -linotify -lgif 
-Wl,-rpath ${LOCALBASE}/lib/inotify"
 
 NO_TEST =  Yes
 
 post-install:
-   cd ${WRKSRC}/icon && make install
+   make -C ${WRKSRC}/icon install
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/sxiv.desktop ${PREFIX}/share/applications
 
diff --git a/graphics/sxiv/distinfo b/graphics/sxiv/distinfo
index 78b5985c9ec..dcf76b04c13 100644
--- a/graphics/sxiv/distinfo
+++ b/graphics/sxiv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sxiv-1.3.2.tar.gz) = n1No3o8PV+eOvgLLUxoxEHqZPydpzsUbzI1w9cZotlM=
-SIZE (sxiv-1.3.2.tar.gz) = 46560
+SHA256 (sxiv-24.tar.gz) = UR3EXRKWKvnDHDBozmvKS4MqYmOUaye+/qSaSM8BkRA=
+SIZE (sxiv-24.tar.gz) = 47148
diff --git a/graphics/sxiv/patches/patch-Makefile 
b/graphics/sxiv/patches/patch-Makefile
index af27a365942..717afe06ea5 100644
--- a/graphics/sxiv/patches/patch-Makefile
+++ b/graphics/sxiv/patches/patch-Makefile
@@ -1,53 +1,31 @@
 $OpenBSD: patch-Makefile,v 1.4 2015/12/24 21:54:09 mmcc Exp $
 Makefile.orig  Sun Dec 20 07:21:25 2015
-+++ Makefile   Wed Dec 23 20:01:02 2015
-@@ -11,11 +11,11 @@ LIBS  := -lX11 -lImlib2
- 
- # optional dependencies:
- # giflib: gif animations
--  CPPFLAGS += -DHAVE_GIFLIB
--  LIBS += -lgif
-+CPPFLAGS += -DHAVE_GIFLIB
-+LIBS += -lgif
- # libexif: jpeg auto-orientation, exif thumbnails
--  CPPFLAGS += -DHAVE_LIBEXIF
--  LIBS += -lexif
-+CPPFLAGS += -DHAVE_LIBEXIF
-+LIBS += -lexif
- 
- 
- .PHONY: clean install uninstall
-@@ -30,7 +30,7 @@ $(OBJ): Makefile
- 
- -include $(DEP)
- 
--%.o: %.c
-+.c.o:
-   $(CC) $(CFLAGS) $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -MMD -MP -c -o $@ 
$<
- 
- config.h:
-@@ -43,15 +43,15 @@ clean:
-   rm -f $(OBJ) $(DEP) sxiv
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -60,19 +60,13 @@ clean:
+   rm -f *.o sxiv
  
  install: all
+-  @echo "INSTALL bin/sxiv"
 -  mkdir -p $(DESTDIR)$(PREFIX)/bin
 -  cp sxiv $(DESTDIR)$(PREFIX)/bin/
 -  chmod 755 $(DESTDIR)$(PREFIX)/bin/sxiv
+-  @echo "INSTALL sxiv.1"
 -  mkdir -p $(DESTDIR)$(MANPREFIX)/man1
--  sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 > 
$(DESTDIR)$(MANPREFIX)/man1/sxiv.1
+-  sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 \
+-  >$(DESTDIR)$(MANPREFIX)/man1/sxiv.1
 -  chmod 644 $(DESTDIR)$(MANPREFIX)/man1/sxiv.1
+-  @echo "INSTALL share/sxiv/"
 -  mkdir -p $(DESTDIR)$(PREFIX)/share/sxiv/exec
 -  cp exec/* $(DESTDIR)$(PREFIX)/share/sxiv/exec/
 -  

[NEW] textproc/loccount

[Klemens Nanni]

Hey ports@,

here's https://gitlab.com/esr/loccount/, from DESCR:

loccount is a re-implementation of David A. Wheeler's sloccount tool in
Go.  It is faster and handles more different languages. Because it's one
source file in Go, it is easier to maintain and extend than the
multi-file, multi-language implementation of the original.

The algorithms are largely unchanged and can be expected to produce
identical numbers for languages supported by both tools.  Python is an
exception; loccount corrects buggy counting of single-quote multiline
literals in sloccount 2.26.

Tested on amd64, here's an example:

$ time loccount /usr/src/sys
all  2010138 (100.00%) in 5939 files
c1943636 (96.69%) in 2762 files
asm58178 (2.89%) in 254 files
makefile3023 (0.15%) in 207 files
awk 2096 (0.10%) in 18 files
yacc1654 (0.08%) in 2 files
shell738 (0.04%) in 8 files
lex  560 (0.03%) in 2 files
m4   175 (0.01%) in 1 files
perl  70 (0.00%) in 2 files
ada8 (0.00%) in 1 files
0m02.69s real 0m06.07s user 0m01.15s system

Feedback, comments?


loccount.tgz
Description: application/tar-gz

Re: [UPDATE] archivers/fuse-zip

[Klemens Nanni]

On Tue, Dec 05, 2017 at 10:43:51PM +0100, Antoine Jacoutot wrote:
> On Tue, Dec 05, 2017 at 09:39:44PM +0000, Klemens Nanni wrote:
> > On Tue, Dec 05, 2017 at 07:17:33AM +0800, Helg wrote:
> > > Hi ports@,
> > > 
> > > Update from 0.4.2 => 0.4.4
> > > 
> > > I've been working with the developer of fuse-zip to add the FUSE mknod
> > > operation. This is now mandatory for FUSE ports on OpenbSD after I
> > > removed the incorrect implementation of create from the kernel and
> > > libfuse.
> > > 
> > > This version also fixes an "off-by-one" bug that caused fuse-zip to fail
> > > with either a Segementation fault of Bus error when copying a sparse
> > > file.
> > > 
> > > License has changed from LGPL to GPL.
> > > 
> > > ok?
> > I find it confusing to symlink gmake in do-configure instead of
> > pre-build or so. In fact, this is only required for the test suite as
> > the main Makefile uses $(MAKE).
> > 
> > Attached diff changes that besides adding TEST_TARGET=check (as already
> > mentioned by jca@).
> > 
> > I also removed the CVS tag hunk from your PLIST diff.
> > 
> > diff --git a/archivers/fuse-zip/Makefile b/archivers/fuse-zip/Makefile
> > index 62e32780149..f6f46c37af8 100644
> > --- a/archivers/fuse-zip/Makefile
> > +++ b/archivers/fuse-zip/Makefile
> > @@ -2,13 +2,13 @@
> >  
> >  COMMENT =  navigate zip archives through FUSE
> >  
> > -DISTNAME = fuse-zip-0.4.2
> > +DISTNAME = fuse-zip-0.4.4
> >  
> >  CATEGORIES =   archivers
> >  
> >  HOMEPAGE = https://bitbucket.org/agalanin/fuse-zip
> >  
> > -# LGPLv3+
> > +# GPLv3+
> >  PERMIT_PACKAGE_CDROM = Yes
> >  
> >  WANTLIB += c fuse m ${COMPILER_LIBCXX} z zip
> > @@ -23,8 +23,10 @@ FAKE_FLAGS = 
> > INSTALLPREFIX="${WRKINST}${PREFIX}"
> >  
> >  USE_GMAKE =Yes
> >  
> > -do-configure:
> > -   ln -s ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
> > +TEST_TARGET =  check
> > +
> > +pre-test:
> > +   ln -sf ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
> 
> Ugly.
> Can't you use ${MAKE_PROGRAM} instead?
${LOCALBASE}/bin/${MAKE_PROGRAM} only works for USE_GMAKE=Yes anyway
which is just as ugly.

tests/Makefile should simply use/pick up the make program used for the
main Makefile.

Re: [UPDATE] archivers/fuse-zip

[Klemens Nanni]

On Tue, Dec 05, 2017 at 07:17:33AM +0800, Helg wrote:
> Hi ports@,
> 
> Update from 0.4.2 => 0.4.4
> 
> I've been working with the developer of fuse-zip to add the FUSE mknod
> operation. This is now mandatory for FUSE ports on OpenbSD after I
> removed the incorrect implementation of create from the kernel and
> libfuse.
> 
> This version also fixes an "off-by-one" bug that caused fuse-zip to fail
> with either a Segementation fault of Bus error when copying a sparse
> file.
> 
> License has changed from LGPL to GPL.
> 
> ok?
I find it confusing to symlink gmake in do-configure instead of
pre-build or so. In fact, this is only required for the test suite as
the main Makefile uses $(MAKE).

Attached diff changes that besides adding TEST_TARGET=check (as already
mentioned by jca@).

I also removed the CVS tag hunk from your PLIST diff.

diff --git a/archivers/fuse-zip/Makefile b/archivers/fuse-zip/Makefile
index 62e32780149..f6f46c37af8 100644
--- a/archivers/fuse-zip/Makefile
+++ b/archivers/fuse-zip/Makefile
@@ -2,13 +2,13 @@
 
 COMMENT =  navigate zip archives through FUSE
 
-DISTNAME = fuse-zip-0.4.2
+DISTNAME = fuse-zip-0.4.4
 
 CATEGORIES =   archivers
 
 HOMEPAGE = https://bitbucket.org/agalanin/fuse-zip
 
-# LGPLv3+
+# GPLv3+
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += c fuse m ${COMPILER_LIBCXX} z zip
@@ -23,8 +23,10 @@ FAKE_FLAGS = INSTALLPREFIX="${WRKINST}${PREFIX}"
 
 USE_GMAKE =Yes
 
-do-configure:
-   ln -s ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
+TEST_TARGET =  check
+
+pre-test:
+   ln -sf ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
 
 post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/fuse-zip ${PREFIX}/bin
diff --git a/archivers/fuse-zip/distinfo b/archivers/fuse-zip/distinfo
index f22a25f677a..6e52da6b426 100644
--- a/archivers/fuse-zip/distinfo
+++ b/archivers/fuse-zip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fuse-zip-0.4.2.tar.gz) = PU7hE9THkYrTxmD4CIRz1fq/Z7NHb+8W7H9b2KQYL9w=
-SIZE (fuse-zip-0.4.2.tar.gz) = 672323
+SHA256 (fuse-zip-0.4.4.tar.gz) = xGSmPKfMFu73wUA2/gmCPKnZag71MOJ0hFBEpUQOR9I=
+SIZE (fuse-zip-0.4.4.tar.gz) = 687132
diff --git a/archivers/fuse-zip/pkg/PLIST b/archivers/fuse-zip/pkg/PLIST
index 195d6cafe8c..2e6c01d97f9 100644
--- a/archivers/fuse-zip/pkg/PLIST
+++ b/archivers/fuse-zip/pkg/PLIST
@@ -2,5 +2,5 @@
 @bin bin/fuse-zip
 @man man/man1/fuse-zip.1
 share/doc/fuse-zip/
-share/doc/fuse-zip/README
+share/doc/fuse-zip/README.md
 share/doc/fuse-zip/changelog

Re: [UPDATE] www/youtube-dl 2017.10.07 -> 2017.11.26

[Klemens Nanni]

On Sat, Nov 25, 2017 at 11:49:12PM +0100, Klemens Nanni wrote:
> Simple version bump, here are the test results from my amd64 machine:
> 
>   [...]
>   Ran 2242 tests in 5972.530s
>   
>   FAILED (errors=568, failures=333)
> 
> Feedback? Any takers?
Bump, here goes the new release which came out in the meantime.

If noone objects I'd like to add a Python 3 flavor (in a separate diff).
Feedback?

 www/youtube-dl/Makefile  |  2 +-
 www/youtube-dl/distinfo  |  4 ++--
 www/youtube-dl/pkg/PLIST | 26 --
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/www/youtube-dl/Makefile b/www/youtube-dl/Makefile
index f3e4ba9daf1..c435056ef9c 100644
--- a/www/youtube-dl/Makefile
+++ b/www/youtube-dl/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  CLI program to download videos from YouTube and other sites
 
-VERSION =  2017.10.07
+VERSION =  2017.11.26
 MODPY_EGG_VERSION =${VERSION:S/.0/./g}
 
 DISTNAME = youtube-dl-${VERSION}
diff --git a/www/youtube-dl/distinfo b/www/youtube-dl/distinfo
index a4d02a19036..0d7387cef42 100644
--- a/www/youtube-dl/distinfo
+++ b/www/youtube-dl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (youtube-dl-2017.10.07.tar.gz) = 
2aiTUIfB4vozB1lK4V8enqD4Z26CX6Z2pQo6PUcbuoM=
-SIZE (youtube-dl-2017.10.07.tar.gz) = 2816312
+SHA256 (youtube-dl-2017.11.26.tar.gz) = 
R9MK7InNJFa37nAmxmwO5PVqt9JwDESvJ74OAGJ9LVo=
+SIZE (youtube-dl-2017.11.26.tar.gz) = 2839867
diff --git a/www/youtube-dl/pkg/PLIST b/www/youtube-dl/pkg/PLIST
index 37cee20f64f..82cbec83bd5 100644
--- a/www/youtube-dl/pkg/PLIST
+++ b/www/youtube-dl/pkg/PLIST
@@ -413,16 +413,12 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fczenit.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fczenit.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/filmon.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/filmon.pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/firstpost.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/firstpost.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/firsttv.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/firsttv.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fivemin.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fivemin.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fivetv.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fivetv.pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fktv.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fktv.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/flickr.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/flickr.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/flipagram.py
@@ -459,6 +455,8 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/freshlive.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/freshlive.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funimation.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funimation.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funk.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funk.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funnyordie.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funnyordie.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/fusion.py
@@ -469,8 +467,6 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gameinformer.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gameinformer.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gameone.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gameone.pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gamersyde.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gamersyde.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gamespot.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gamespot.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gamestar.py
@@ -489,6 +485,8 @@ 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/giantbomb.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/giantbomb.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/giga.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/giga.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gigya.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/gigya.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/glide.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/glide.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/globo.py
@@ -693

Re: [NEW] textproc/loccount

[Klemens Nanni]

On Thu, Nov 09, 2017 at 12:11:05AM +0100, Klemens Nanni wrote:
> Hey ports@,
> 
> here's https://gitlab.com/esr/loccount/, from DESCR:
> 
> loccount is a re-implementation of David A. Wheeler's sloccount tool in
> Go.  It is faster and handles more different languages. Because it's one
> source file in Go, it is easier to maintain and extend than the
> multi-file, multi-language implementation of the original.
> 
> The algorithms are largely unchanged and can be expected to produce
> identical numbers for languages supported by both tools.  Python is an
> exception; loccount corrects buggy counting of single-quote multiline
> literals in sloccount 2.26.
> 
> Tested on amd64, here's an example:
> 
>   $ time loccount /usr/src/sys
>   all  2010138 (100.00%) in 5939 files
>   c1943636 (96.69%) in 2762 files
>   asm58178 (2.89%) in 254 files
>   makefile3023 (0.15%) in 207 files
>   awk 2096 (0.10%) in 18 files
>   yacc1654 (0.08%) in 2 files
>   shell738 (0.04%) in 8 files
>   lex  560 (0.03%) in 2 files
>   m4   175 (0.01%) in 1 files
>   perl  70 (0.00%) in 2 files
>   ada8 (0.00%) in 1 files
>   0m02.69s real 0m06.07s user 0m01.15s system
> 
> Feedback, comments?
Anyone willing to commit this? It still works fine after the lang/go
1.9.2 update, I'm using it regularily.

[UPDATE] devel/git 2.5.0 -> 2.5.1

[Klemens Nanni]

Simple update including various fixes, changelog since 2.5.0:
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.15.1.txt

While here, switch HOMEPAGE to HTTPS.

Tests pass on amd64:

fixed   2
success 16486
failed  0
broken  223
total   17013

Feedback? Any takers?

diff --git a/devel/git/Makefile b/devel/git/Makefile
index bd314fb5595..0c074effda6 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -4,7 +4,7 @@ COMMENT-main =  GIT - Tree History Storage Tool
 COMMENT-svn =  GIT - subversion interoperability tools
 COMMENT-x11 =  GIT - graphical tools
 
-V =2.15.0
+V =2.15.1
 REVISION-main =0
 DISTNAME = git-${V}
 PKGNAME-main = ${DISTNAME}
@@ -12,7 +12,7 @@ PKGNAME-svn = git-svn-${V}
 PKGNAME-x11 =  git-x11-${V}
 CATEGORIES =   devel
 
-HOMEPAGE = http://git-scm.com/
+HOMEPAGE = https://git-scm.com/
 
 MAINTAINER =   Benoit Lecocq 
 
diff --git a/devel/git/distinfo b/devel/git/distinfo
index ee700f50c28..e9a3ef36b52 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,4 +1,4 @@
-SHA256 (git-2.15.0.tar.gz) = JXYsxQEDpqBmXEbqM86wV47uAcGbagj9OT6GCMy9s9o=
-SHA256 (git-manpages-2.15.0.tar.gz) = 
OxuevwLUqm50G+zR7ZMZWXSIdD+Tn9qzuJTsUtJUCO8=
-SIZE (git-2.15.0.tar.gz) = 7188145
-SIZE (git-manpages-2.15.0.tar.gz) = 671471
+SHA256 (git-2.15.1.tar.gz) = hfyoeBqDyWum2zhMwapqXuHjRHRrr6wcvh8P5tEQnIQ=
+SHA256 (git-manpages-2.15.1.tar.gz) = 
RyRUxJTJp/UK04Bgw+7DcvYX3mVLIPPrO+WfwXpoP6E=
+SIZE (git-2.15.1.tar.gz) = 7190225
+SIZE (git-manpages-2.15.1.tar.gz) = 671818
diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile
index 7dbd1ec970c..910b275ceef 100644
--- a/devel/git/patches/patch-Makefile
+++ b/devel/git/patches/patch-Makefile
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.74 2017/11/08 09:17:14 benoit Exp $
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -2435,7 +2435,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2436,7 +2436,7 @@ export TEST_NO_MALLOC_CHECK
  
  ### Testing rules
  
diff --git a/devel/git/patches/patch-config_mak_uname 
b/devel/git/patches/patch-config_mak_uname
index c65904e25d0..503962e99bb 100644
--- a/devel/git/patches/patch-config_mak_uname
+++ b/devel/git/patches/patch-config_mak_uname
@@ -5,7 +5,7 @@ OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD
 Index: config.mak.uname
 --- config.mak.uname.orig
 +++ config.mak.uname
-@@ -211,6 +211,7 @@ endif
+@@ -212,6 +212,7 @@ endif
  ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
diff --git a/devel/git/patches/patch-t_test-lib_sh 
b/devel/git/patches/patch-t_test-lib_sh
index 7605404a9d4..b03ff9daf04 100644
--- a/devel/git/patches/patch-t_test-lib_sh
+++ b/devel/git/patches/patch-t_test-lib_sh
@@ -20,7 +20,7 @@ Index: t/test-lib.sh
  # if --tee was passed, write the output not only to the terminal, but
  # additionally to the file test-results/$BASENAME.out, too.
  case "$GIT_TEST_TEE_STARTED, $* " in
-@@ -1014,6 +1019,15 @@ case $uname_s in
+@@ -1015,6 +1020,15 @@ case $uname_s in
test_set_prereq CYGWIN
test_set_prereq SED_STRIPS_CR
test_set_prereq GREP_STRIPS_CR

Re: [NEW] textproc/loccount

[Klemens Nanni]

On Sat, Dec 02, 2017 at 09:26:43PM +, Stuart Henderson wrote:
> On 2017/12/02 01:59, Klemens Nanni wrote:
> > Will "# statically linked" suffice?
> 
> Yes.

> > How about this diff on top of my tarball?
> 
> Please send updated tarballs for changes to a new port - a diff in the
> accompanying mail can help to explain changes, but it's better not to
> ask reviewers to dig through old mails to assemble the whole thing.
New tarball attached incorporating all your feedback.
 
> This still makes the whole file revolve around the fact that it's a
> reimplementation of sloccount. That's really of minor interest to DESCR,
> the primary function is to say what the package does - if the details of
> a similar program are needed at all then one paragraph at the bottom
> should suffice?
Point taken.

> (Something like "loccount is a re-implementation of David A. Wheeler's
> sloccount tool in Go. The algorithms are largely unchanged and, bugs
> excepted, can be expected to produce identical numbers for languages
> supported by both tools." perhaps ..)
I slightly rephrased your suggestion and described how it works/what it
does.


loccount.tgz
Description: application/tar-gz

Re: [UPDATE] graphics/sxiv 2.3.1 -> 24

[Klemens Nanni]

On Mon, Nov 27, 2017 at 08:28:29PM +0100, Klemens Nanni wrote:
> On Tue, Nov 21, 2017 at 11:15:38AM +0100, Klemens Nanni wrote:
> > On Tue, Nov 21, 2017 at 01:44:44AM -0700, Anthony J. Bentley wrote:
> > > Klemens Nanni writes:
> > > > On Mon, Nov 06, 2017 at 02:21:41AM +0100, Klemens Nanni wrote:
> > > > > Hey ports@,
> > > > > 
> > > > > here's a simple diff updating sxiv to the newest release; Yes, 
> > > > > upstream
> > > > > jumped from 2.3.1 to 24 not 2.4. These are mostly mechanical changes,
> > > > > I've also updated the description as upstream did.
> > > > > (snip)
> > > > > -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \
> > > > > - CFLAGS="${CFLAGS} -I${X11BASE}/include 
> > > > > -I${PREFIX}/include" \
> > > > > - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 
> > > > > -lImlib2 -lexif
> > > >  -lgif"
> > > > > +MAKE_FLAGS = CC=${CC} \
> > > > > + PREFIX=${PREFIX} \
> > > 
> > > No need to set PREFIX.
> > PREFIX is hard coded to /usr/local in sxiv's Makefile and MANPATH uses
> > it so why not letting users set PREFIX as they wish? Not passing it via
> > MAKE_FLAGS would honor the user's PREFIX for MANPATH only.
> > 
> > > Also, I set V=1 so we can actually see the compiler commands.
> > > 
> > > > > + CFLAGS="${CFLAGS} -I${X11BASE}/include 
> > > > > -I${X11BASE}/include/fre
> > > > etype2 -I${LOCALBASE}/include -I${LOCALBASE}/include/inotify" \
> > > > > + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib 
> > > > > -L${LOC
> > > > ALBASE}/lib/inotify -lX11 -lXft -lImlib2 -lexif -linotify -lgif 
> > > > -Wl,-rpath ${
> > > > LOCALBASE}/lib/inotify"
> > > 
> > > Couple things. Existing LDFLAGS don't need to be passed to LDFLAGS,
> > > because unlike CFLAGS it's not a standard variable likely to be in
> > > mk.conf. Also, sxiv uses LDLIBS for the -l chain so we don't have to
> > > repeat it.
> > Thanks, that's better.
> > > 
> > > > >  post-install:
> > > > > - cd ${WRKSRC}/icon && make install
> > > > > + make -C ${WRKSRC}/icon install
> > > 
> > > No need for a cosmetic change like this...
> > > 
> > > 
> > > Here's a (very) slightly modified version of your diff per above. I
> > > don't understand the inotify stuff, but it matches what existing ports
> > > do, so...
> > Using inotify sxiv can automatically reload the currently displayed
> > image if it changes on disk.
> Bump; I'd like to get this in.
> 
> Anthony's diff seems fine but I still prefer to set PREFIX when we also
> set MANPREFIX so here's his diff with that on top.
> 
> Does anyone want to commit any of the two versions?
> 
> diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile
> index eeb5fd17888..560018d753c 100644
> --- a/graphics/sxiv/Makefile
> +++ b/graphics/sxiv/Makefile
> @@ -1,11 +1,10 @@
>  # $OpenBSD: Makefile,v 1.10 2017/05/06 13:45:49 fcambus Exp $
>  
> -COMMENT =simple (or small or suckless) X Image Viewer
> +COMMENT =simple X Image Viewer
>  
>  GH_PROJECT = sxiv
>  GH_ACCOUNT = muennich
> -GH_TAGNAME = v1.3.2
> -REVISION =   0
> +GH_TAGNAME = v24
>  
>  CATEGORIES = graphics x11
>  
> @@ -14,17 +13,21 @@ MAINTAINER =  Matthew Via <v...@matthewvia.info>
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -WANTLIB +=   Imlib2 exif gif X11 c
> +WANTLIB +=   Imlib2 X11 Xft c exif gif lib/inotify/inotify
>  
>  RUN_DEPENDS =devel/desktop-file-utils \
>   x11/gtk+3,-guic
>  
> -LIB_DEPENDS =graphics/imlib2 \
> +LIB_DEPENDS =devel/libinotify \
> + graphics/imlib2 \
>   graphics/libexif
>  
> -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \
> - CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \
> - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif 
> -lgif"
> +MAKE_FLAGS = CC="${CC}" \
> + V=1 \
> + PREFIX=${PREFIX} \
> + MANPREFIX=${PREFIX}/man \
> + CFLAGS="${CFLAGS} -I${X11BASE}/include 
> -I${X11BASE}/include/freetype2 -I${LOCALBASE}/include 
> -I${LOCALBASE}/include/inotify" \
> + LDFLAGS=&

Re: [NEW] editors/vis

[Klemens Nanni]

On Sun, Dec 10, 2017 at 07:01:11PM -0500, Brian Callahan wrote:
> Attached is an updated port, combining both of your ports.
> I made both of you MAINTAINER, you can share.
Looks good to me, thanks for fixing -Os.

> As for this port conflicting with vis(1), I don't really mind.
> 
> /home/brian $ which vis
> /usr/bin/vis
> 
> even after installing the port, which I think is correct. Set this port to
> an alias in your shell. I assume that's how a lot of people are going to run
> it anyway, something like:
> alias vi='/usr/local/bin/vis'
Most probably, but renaming was done to prevent conflicts regardless of
aliases and PATH. If this too much however, I won't object.

> However, the line and column display on the bottom right corner is very
> broken here. You two should fix that and resubmit.
What does "very broken" mean? Both column and row index have always been
correct for me. Please describe your problem in detail.

Re: [NEW] editors/vis

[Klemens Nanni]

On Sun, Dec 10, 2017 at 08:11:56PM -0500, Brian Callahan wrote:
> This is not some famous piece of software like the GNU coreutils, where
> accidentally using the base utility vs. the GNU utility could really matter.
Fair enough, I'm happy with a simpler port.

> They bleed into each other.
> When I load vis by itself, I get:
> 0% 1, 1
> When I press i to enter insert mode, it becomes:
> 0% 1, 1  1
> Then if I type, say, "OpenBSD" it shows:
> 100% 1, 1 71
> Let's say I finish the sentence and now I wrote "OpenBSD is an operating
> system." it will display:
> 100% 1, 10311
> Now let's say I press Enter to move to the next line, it says:
> 97% 2, 0311
> 
> I would say this is very broken. This is within tmux, which limited testing
> suggests makes a difference, but there are still bleeding issues when not in
> tmux. Specifically, outside of tmux, pressing i in a blank file still
> produces
> 0% 1, 1  1
I cannot reproduce this at all, whether in tmux or not. vis works fine
for me in both xterm and st.

Re: [NEW] net/onionshare

[Klemens Nanni]

On Wed, Dec 06, 2017 at 05:26:32PM -0600, attila wrote:
> > $ cat pkg/DESCR
> > Tool for sharing files of any size anonymously over the Tor public
> > anonymity network.
> > 
> > It works by starting a web server, making it accessible as a Tor onion
> > service, and generating an unguessable URL to access and download the
> > files. It doesn't require setting up a server on the internet somewhere
> > or using a third party file-sharing service. The file on your own
> > computer and use a Tor onion service to make it temporarily accessible
> > over the internet. The other user just needs to use Tor Browser to
This is not a proper sentence.
> > download the file from you.
> 
> Ping w/updated port attached that depends on the newly renamed
> net/py-stem3.

You should zap V and PKGNAME, set GH_TAGNAME=v1.1 and move GH_* right
beneath COMMENT; see infrastructure/templates/Makefile.template.

RUN_DEPENDS lacks net/tor.
onionshare-gui still starts but python will dump core when
/usr/local/bin/tor is missing. It also mentions our net/tor package as
"Tor that is bundled with OpenShare" which is misleading.

TEST_DEPENDS lacks net/py-stem and www/py-frozen-flask.

Otherwise at least the CLI version works for me. It would be nice imho
to split CLI and GUI into separate FLAVORS if possible.

Re: [NEW] editors/vis

[Klemens Nanni]

On Thu, Dec 07, 2017 at 11:45:16PM -0800, Carolyn Saunders wrote:
> I just made a rudimentary port of vis, "[a] vi-like editor based on Plan
> 9's structural regular expressions," which can be found at
> https://github.com/martanne/vis. However, it exposes the binary "vis"
> which conflicts with another program in OpenBSD's base. How should this
> be rectified?  This is my first port so I'm still unfamiliar with the
> way this is usually handled.
I've been sitting on my unfinished vis port for way too long, thanks for
bringing it up again.

Some comments inline and my port attached as it's finally ready for
submission.

The version number in your port directory name should be stripped.

> V =   0.4
> GH_ACCOUNT =  martanne
> GH_PROJECT =  vis
> GH_TAGNAME =  v${V}
> 
> DISTNAME =vis-${V}
GH_* is all you need here; zap V, DISTNAME is set automatically.

> MAKE_FLAGS =  BINDIR="${TRUPREFIX}/bin" \
> 
> CONFIGURE_STYLE=  simple
> CONFIGURE_ARGS=   --mandir="${TRUEPREFIX}/man"
Why not just --prefix=${PREFIX} --mandif=${PREFIX}/man?

> NO_TEST=  Yes
vis has a test suite and it should be used. Running it through our ports
framework even revealed a libtermkey bug when TERM is unset.


My port works fine on amd64, I've been using it as my main editor
exclusively for over a year now. All tests pass.

Feedback?


vis.tgz
Description: application/tar-gz

Re: [NEW] textproc/loccount

[Klemens Nanni]

On Fri, Dec 01, 2017 at 02:26:06PM +, Stuart Henderson wrote:
> : COMMENT =   Faster Go re-implementation of sloccount for more 
> languages
> 
> just describe what it does rather than say things like "faster
> reimplementation" and "more". in particular it's quite useless to
> have a package comparing itself with something else that isn't in
> packages.
Fair points, I've updated COMMENTS and simply included SLOCCount's
description from https://www.dwheeler.com/sloccount/ (mostly matching
what benno@ used) in DESCR.

> : WANTLIB =   c pthread
> 
> loccount-1.1(textproc/loccount):
> Extra:  c.92 pthread.25
> 
> if you're adding WANTLIB in the hope that it triggers an update in a 
> statically
> linked program, add a comment explaining why, otherwise it is likely to be 
> removed
> in a WANTLIB sync.
Will "# statically linked" suffice?

> : MODULES =   lang/go
> 
> there doesn't seem much advantage to using the lang/go module when
> you're not using the go build scaffolding.
> 
> : ALL_TARGET =${HOMEPAGE:https://%=%}
> 
> this is a bit obtuse, if you were actually using it, it would be simpler
> to just use the string.
> 
> but you're not actually using it.
Yeah, I started with MODULES=lang/go basically and made it "work"...

> : WRKSRC =${MODGO_WORKSPACE}/src/${ALL_TARGET}
> : 
> : do-build:
> : make -C ${WRKSRC} loccount{,.1}
> : 
> : do-test:
> : make -C ${WRKSRC} check
> 
> normally ${MAKE_PROGRAM} rather than calling make directly, but seems
> simpler to get rid of the MODULES and have something like this instead
> 
> BUILD_DEPENDS =   textproc/asciidoc \
>   lang/go
> 
> ALL_TARGET =  loccount loccount.1
> 
> do-install:
>   ${INSTALL_PROGRAM} ${WRKSRC}/loccount-$V-* ${PREFIX}/bin/loccount
>   ${INSTALL_MAN} ${WRKSRC}/loccount.1 ${PREFIX}/man/man1/
> 
... or not. This port is made around it's Makefile not the Go build
environment as seen in my MODULES approach; I went through this multiple
times now and ditching it in favor of BUILD_DEPENDS is indeed clearer.

How about this diff on top of my tarball?

The symlink in post-build makes the test work and avoids -${V}-* in
install.

Thanks a lot for your feedback!

---
 textproc/loccount/Makefile  | 19 ---
 textproc/loccount/pkg/DESCR | 19 +++
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/textproc/loccount/Makefile b/textproc/loccount/Makefile
index 8a8319e83eb..a263287844a 100644
--- a/textproc/loccount/Makefile
+++ b/textproc/loccount/Makefile
@@ -1,6 +1,6 @@
 # $OpenBSD: $
 
-COMMENT =  Faster Go re-implementation of sloccount for more 
languages
+COMMENT =  Count lines of codes in many languages
 
 V =1.1
 DISTNAME = loccount-${V}
@@ -16,20 +16,17 @@ MASTER_SITES =  ${HOMEPAGE}/repository/
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
+# statically linked
 WANTLIB =  c pthread
 
-MODULES =  lang/go
+BUILD_DEPENDS =lang/go \
+   textproc/asciidoc
 
-BUILD_DEPENDS =textproc/asciidoc
+ALL_TARGET =   loccount{,.1}
+TEST_TARGET =  check
 
-ALL_TARGET =   ${HOMEPAGE:https://%=%}
-WRKSRC =   ${MODGO_WORKSPACE}/src/${ALL_TARGET}
-
-do-build:
-   make -C ${WRKSRC} loccount{,.1}
-
-do-test:
-   make -C ${WRKSRC} check
+post-build:
+   ln -sf ${WRKBUILD}/loccount{-${V}-*,}
 
 do-install:
${INSTALL_PROGRAM} ${WRKSRC}/loccount ${PREFIX}/bin/
diff --git a/textproc/loccount/pkg/DESCR b/textproc/loccount/pkg/DESCR
index 798b459ddb7..8f58a059091 100644
--- a/textproc/loccount/pkg/DESCR
+++ b/textproc/loccount/pkg/DESCR
@@ -6,3 +6,22 @@ implementation of the original.
 The algorithms are largely unchanged and can be expected to produce identical
 numbers for languages supported by both tools.  Python is an exception; 
loccount
 corrects buggy counting of single-quote multiline literals in sloccount 2.26.
+
+
+SLOCCount includes a number of heuristics, so it can automatically detect file
+types, even those that don't use the "standard" extensions, and conversely, it
+can detect many files that have a standard extension but aren't really of that
+type. The SLOC counters have enough smarts to handle oddities of several
+languages. For example, SLOCCount examines assembly language files, determines
+the comment scheme, and then correctly counts the lines automatically. It also
+correctly handles language constructs that are often mishandled by other tools,
+such as Python's constant strings when used as comments and Perl's "perlpod"
+documentation.
+
+SLOCCount will even automatically estimate the effort, time, and money it would
+take to develop the software (if it was developed as traditional proprietary
+software). Without options, it will use the basic COCOMO model, which makes
+these estimates solely 

Re: [NEW] textproc/loccount

[Klemens Nanni]

On Sun, Dec 03, 2017 at 11:57:16AM +, Stuart Henderson wrote:
> What I am saying is, the DESCR file is first and foremost there to
> describe what the thing does. That is what should be first in the file.
> Your rewritten DESCR still has "loccount is a re-implementation of David A.
> Wheeler's sloccount tool in Go" at the top of the file.
Take three first describing the port and then mentioning sloccount.

I also flipped the order of mentioning of JSON and cost estimation to
avoid misinterpretation: only SLOCs may be emitted in JSON while the
costs stay as they are.


loccount.tgz
Description: application/tar-gz

Re: lang/go: Makefile improvements

[Klemens Nanni]

On Fri, May 04, 2018 at 04:11:51AM +1000, Joel Sing wrote:
> On Saturday 07 April 2018 00:34:10 Klemens Nanni wrote:
> > On Sat, Apr 07, 2018 at 12:11:38AM +0200, Klemens Nanni wrote:
> > > This cleans up some whitespace nits, makes more use of defined variables
> > > where appropiate and simplifies the do-install target my reducing
> > > duplicate code. Also avoid walking the tree twice for every directory by
> > > combining two finds into one.
> > > 
> > > No changes in built or installed files.
> > > 
> > > Feedback? OK?
> > 
> > I missed the GOBIN sync from lang/go-bootstrap, updated diff.
> 
> I presume 'make PLIST' is the same?
> 
> ok jsing@ with s/GOBIN/GOTOOLS/ and the other chunk reverted (or indented).
Updated diff with GOTOOLS and proper indentation.

OK?

After that's in, I'll take care of go-1.10.2.

> >  GOCFG =/${GOOS}_${GOARCH}
> > +GOBIN =pkg/tool/${GOCFG}
> 
> I don't like GOBIN being used here - GOBIN has a special meaning in Go (like 
> GOPATH and GOROOT), so we should avoid this. Also, if anything this is the 
> tools directory, not the bin directory - GOTOOLS would probably work.

> >  do-test:
> > @cd ${WRKSRC} && \
> > ulimit -n 256 -d 2097152 && \
> > -   PATH=${WRKDIST}/bin:${PATH} GOROOT=${WRKDIST} GOCACHE=off 
> > ./run.bash
> > +   PATH=${WRKDIST}/bin:${PATH} \
> > +   GOROOT=${WRKDIST} \
> > +   GOCACHE=off \
> > +   ./run.bash
> 
> IMO this is a regression, since it now makes it difficult to read and tell 
> which 
> command the env vars are for. If you really want to do this it should be 
> indented such that the continuations are obvious.

Index: Makefile
===
RCS file: /cvs/ports/lang/go/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile6 Apr 2018 13:01:39 -   1.52
+++ Makefile5 May 2018 13:37:23 -
@@ -23,7 +23,8 @@ WANTLIB = c pthread
 
 MASTER_SITES = https://golang.org/dl/
 
-BUILD_DEPENDS =lang/go-bootstrap shells/bash
+BUILD_DEPENDS =lang/go-bootstrap \
+   shells/bash
 
 SEPARATE_BUILD =   simple
 CONFIGURE_STYLE =  None
@@ -34,10 +35,10 @@ WRKSRC =${WRKDIST}/src
 
 INSTALL_STRIP =
 
-GOOS = openbsd
+GOOS = openbsd
 GOARCH =   unknown
-GOROOT =   ${PREFIX}/go
-GOROOT_BOOTSTRAP = ${PREFIX}/go/bootstrap
+GOROOT =   ${PREFIX}/go
+GOROOT_BOOTSTRAP = ${GOROOT}/bootstrap
 
 .if ${MACHINE_ARCH} == "amd64"
 GOARCH =   amd64
@@ -46,6 +47,7 @@ GOARCH =  386
 .endif
 
 GOCFG =/${GOOS}_${GOARCH}
+GOTOOLS =  pkg/tool/${GOCFG}
 
 do-configure:
 .  if ${GOARCH} == "unknown"
@@ -53,7 +55,6 @@ do-configure:
@exit 1
 .  endif
 
-
 do-build:
@cd ${WRKSRC} && \
CC="${CC}" \
@@ -62,42 +63,36 @@ do-build:
GOBIN=${WRKDIST}/bin \
GOROOT_FINAL=${GOROOT} \
GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP} \
-   ./make.bash --no-banner
+   ./make.bash --no-banner
 
 do-test:
@cd ${WRKSRC} && \
ulimit -n 256 -d 2097152 && \
-   PATH=${WRKDIST}/bin:${PATH} GOROOT=${WRKDIST} GOCACHE=off 
./run.bash
+   PATH=${WRKDIST}/bin:${PATH} \
+   GOROOT=${WRKDIST} \
+   GOCACHE=off \
+   ./run.bash
 
 do-install:
-   ${INSTALL_PROGRAM_DIR} ${GOROOT}
-
${INSTALL_PROGRAM_DIR} ${GOROOT}/bin
-   ${INSTALL_PROGRAM} -p ${WRKDIST}/bin/go{,fmt} ${GOROOT}/bin
 
-   @cd ${PREFIX}/bin && \
-   ln -sf ../go/bin/go go
-   @cd ${PREFIX}/bin && \
-   ln -sf ../go/bin/gofmt gofmt
-
-   @cd ${WRKDIST} && \
-   find . -type f -maxdepth 1 \
-   -exec ${INSTALL_DATA} -p {} \
-   ${GOROOT} \;
+.  for prog in go gofmt
+   ${INSTALL_PROGRAM} -p ${WRKDIST}/bin/${prog} ${GOROOT}/bin
+   @ln -s ../go/bin/${prog} ${PREFIX}/bin/${prog}
+.  endfor
+
+   find ${WRKDIST} -maxdepth 1 -type f \
+   -exec ${INSTALL_DATA} -p {} ${GOROOT} \;
 
 .  for dir in api doc lib misc src pkg/include pkg/${GOCFG} test
-   @cd ${WRKDIST} && \
+   cd ${WRKDIST} && \
find ${dir} -type d \
-   -exec ${INSTALL_DATA_DIR} \
-   ${GOROOT}/{} \;
-   @cd ${WRKDIST}

Re: lang/go-bootstrap: Makefile improvements

[Klemens Nanni]

On Fri, May 04, 2018 at 04:14:20AM +1000, Joel Sing wrote:
> On Saturday 07 April 2018 01:04:59 Klemens Nanni wrote:
> > Same thing as with lang/go: Simplify do-install, combine finds,
> > fix space/tab mixtures.
> > 
> > Feedback? OK?
Updated diff after feedback from jsing@.

OK?

> > +GOBIN =pkg/tool/${GOCFG}
> 
> GOTOOLS
Done.

> >  do-test:
> > @cd ${WRKSRC} && \
> > ulimit -n 256 -d 2097152 && \
> > -   PATH=${WRKDIST}/bin:${PATH} GOROOT=${WRKDIST} ./run.bash
> > +   PATH=${WRKDIST}/bin:${PATH} \
> > +   GOROOT=${WRKDIST} \
> > +   ./run.bash
> 
> Same comment re readability - either revert, or indent such that it is 
> obvious 
> what the env is for.
Indented as done in the lang/go diff as well.

> > -.  for dir in doc include lib misc src pkg
> > -   @cd ${WRKDIST} && \
> > -   find ${dir} -type d \
> > -   -exec ${INSTALL_DATA_DIR} \
> > -   ${GOROOT}/{} \;
> > -   @cd ${WRKDIST} && \
> > -   find ${dir} ! -name \*.orig -type f \
> > -   -exec ${INSTALL_DATA} -p {} \
> > -   ${GOROOT}/{} \;
> > -.  endfor
> > +   @find ${WRKDIST} -maxdepth 1 -type f ! -name .git\* ! -name .hg\* \
> > +   -exec ${INSTALL_DATA} -p {} ${GOROOT} \;
> > +
> > +.for dir in doc include lib misc src pkg
> > +   cd ${WRKDIST} && \
> > +   find ${dir} -type d \
> > +   -exec ${INSTALL_DATA_DIR} ${GOROOT}/{} \; \
> > +   -o -type f ! -name \*.orig \
> > +   -exec ${INSTALL_DATA} -p {} ${GOROOT}/{} \;
> > +.endfor
> 
> Indentation appears messed up here - it should be for.
Done.

Index: Makefile
===
RCS file: /cvs/ports/lang/go-bootstrap/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile5 Apr 2018 17:47:30 -   1.9
+++ Makefile5 May 2018 13:45:34 -
@@ -6,19 +6,19 @@ COMMENT = Go programming language
 
 VERSION =  1.4
 RELEASE =  20171003
-DISTNAME = go${VERSION}-bootstrap-${RELEASE}
-PKGNAME =  go-bootstrap-${VERSION}.${RELEASE}
+DISTNAME = go${VERSION}-bootstrap-${RELEASE}
+PKGNAME =  go-bootstrap-${VERSION}.${RELEASE}
 CATEGORIES =   lang
 REVISION = 0
 
 HOMEPAGE = https://golang.org/
 
-MAINTAINER =   Joel Sing <js...@openbsd.org>
+MAINTAINER =   Joel Sing <js...@openbsd.org>
 
 # software: BSD, documentation: CC-BY-3.0
 PERMIT_PACKAGE_CDROM = bootstrap only
 PERMIT_PACKAGE_FTP =   bootstrap only
-PERMIT_DISTFILES_FTP =  bootstrap only
+PERMIT_DISTFILES_FTP = bootstrap only
 
 WANTLIB =  c m pthread
 
@@ -35,9 +35,9 @@ WRKSRC =  ${WRKDIST}/src
 
 INSTALL_STRIP =
 
-GOOS = openbsd
+GOOS = openbsd
 GOARCH =   unknown
-GOROOT =   ${PREFIX}/go/bootstrap
+GOROOT =   ${PREFIX}/go/bootstrap
 
 .if ${MACHINE_ARCH} == "amd64"
 GOARCH =   amd64
@@ -50,11 +50,13 @@ EXEPREFIX = 8
 PKG_ARGS +=-Damd64=0
 PKG_ARGS +=-Di386=1
 .else
-PKG_ARGS +=-Damd64=0 -Di386=0
+PKG_ARGS +=-Damd64=0
+PKG_ARGS +=-Di386=0
 .endif
 
 GOCFG =/${GOOS}_${GOARCH}
 GOEXE =${GOCFG}/${EXEPREFIX}
+GOTOOLS =  pkg/tool/${GOCFG}
 
 do-configure:
 .  if ${GOARCH} == "unknown"
@@ -62,7 +64,6 @@ do-configure:
@exit 1
 .  endif
 
-
 do-build:
@cd ${WRKSRC} && \
CC="${CC}" \
@@ -75,7 +76,9 @@ do-build:
 do-test:
@cd ${WRKSRC} && \
ulimit -n 256 -d 2097152 && \
-   PATH=${WRKDIST}/bin:${PATH} GOROOT=${WRKDIST} ./run.bash
+   PATH=${WRKDIST}/bin:${PATH} \
+   GOROOT=${WRKDIST} \
+   ./run.bash
 
 do-install:
${INSTALL_PROGRAM_DIR} ${GOROOT}
@@ -83,25 +86,19 @@ do-install:
${INSTALL_PROGRAM_DIR} ${GOROOT}/bin
${INSTALL_PROGRAM} -p ${WRKDIST}/bin/go{,fmt} ${GOROOT}/bin
 
-   @cd ${WRKDIST} && \
-   find . ! -name .git\* ! -name .hg\* -type f -maxdepth 1 \
-   -exec ${INSTALL_DATA} -p {} \
-   ${GOROOT} \;
+   @find ${WRKDIST} -maxdepth 1 -type f ! -name .git\* ! -name .hg\* \
+   -exec ${INSTALL_DATA} -p {} ${GOROOT} \;
 
 .  for dir in doc include lib misc src pkg
-   @cd ${WRKDI

Re: net/isync: use pledge

[Klemens Nanni]

On Tue, May 08, 2018 at 12:39:12PM -0600, Theo de Raadt wrote:
> >On Tue, May 08, 2018 at 05:06:19PM +0200, Jeremie Courreges-Anglas wrote:
> >> hitch and isync would be the first programs to use this pattern.
> >> I'm not sure it makes it easier to *think* about promises made in
> >> a program, and I don't see a reason to go down that road.
> >drop_promises() was introduced to simplify scenarios such as
> >
> > if (a)
> > if (b)
> > pledge("w")
> > else
> > pledge("x")
> > else
> > if (b)
> > pledge("y")
> > else
> > pledge("z")
> >
> >Pledge's semantics forgid dropping a single promise while keeping
> >everything else. drop_promise() aids in keeping track of pledge mainly
> >for programs that weren't designed with priviledge separation in mind.
> >
> >After all it's just a string so why not working with it? It's far away
> >from being a dirty hack. And even if it's unusual or new, it gets the
> >job done.
> 
> You may think it is easier in one respect.
> 
> But later, if you look at your last invocation, how do you tell what
> pledges remain?
> 
> Well, you don't.
> 
> By making it very clear what are dropping, you make it vague *what remains*.
Yes, that's the (obvious) trade-off I made.

> And *what remains* is the meat of the matter, because that's the kernel
> featureset the program may play again.

So here's a diff for pledging isync the same way as before but without
drop_promises.

Index: Makefile
===
RCS file: /cvs/ports/mail/isync/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile17 Nov 2017 00:22:39 -  1.33
+++ Makefile8 May 2018 20:02:51 -
@@ -3,14 +3,19 @@
 COMMENT=   synchronize IMAP4 and maildir mailboxes
 
 DISTNAME=  isync-1.3.0
+REVISION=  0
+
 CATEGORIES=mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=isync/}
 
 HOMEPAGE=  http://isync.sourceforge.net/
 
-# GPLv2
+MAINTAINER=Klemens Nanni <k...@openbsd.org>
+
+# GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
 
+# uses pledge()
 WANTLIB= c crypto db sasl2 ssl z
 
 COMPILER=  base-clang ports-clang ports-gcc
@@ -20,7 +25,7 @@ LIB_DEPENDS=  databases/db/v4 \
 
 SEPARATE_BUILD=Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+=CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db4 
-g" \
+CONFIGURE_ENV+=CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db4" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
Index: patches/patch-src_drv_imap_c
===
RCS file: patches/patch-src_drv_imap_c
diff -N patches/patch-src_drv_imap_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_drv_imap_c8 May 2018 20:02:51 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/drv_imap.c
+--- src/drv_imap.c.orig
 src/drv_imap.c
+@@ -41,6 +41,8 @@
+ # include 
+ #endif
+ 
++extern int needs_proc_exec;
++
+ #ifdef HAVE_LIBSSL
+ enum { SSL_None, SSL_STARTTLS, SSL_IMAPS };
+ #endif
+@@ -3267,6 +3269,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
+   }
+   acc_opt = 1;
+   }
++  if (server->sconf.tunnel || server->pass_cmd)
++  needs_proc_exec = 1;
+   if (store)
+   type = "IMAP store", name = store->gen.name;
+   else
Index: patches/patch-src_main_c
===
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_main_c8 May 2018 20:02:51 -
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+Index: src/main.c
+--- src/main.c.orig
 src/main.c
+@@ -120,6 +120,8 @@ PACKAGE " " VERSION " - mailbox synchronizer\n"
+   exit( code );
+ }
+ 
++int needs_proc_exec = 0;
++
+ static void ATTR_PRINTFLIKE(1, 2)
+ debug( const char *msg, ... )
+ {
+@@ -716,6 +718,29 @@ main( int argc, char **argv )
+ 
+   if (load_config( config, pseudo ))
+   return 1;
++
++  if (mvars->list) {
++  if (needs_proc_exec) {
++  if (pledge("stdio rpath inet flock dns getpw proc exec"
++  " prot_exec", NULL) == -1)
++  sys_error("pledge\n");
++  } else {
++  if (pledge("stdio rpath inet flock dns getpw"
++  " prot_exec",
++  NU

Re: [BUG] net/mininet man page

[Klemens Nanni]

On Wed, May 09, 2018 at 04:35:11PM +0100, Stuart Henderson wrote:
> On 2018/05/09 16:59, Ingo Schwarze wrote:
> > Log message:
> > Trivially fix the mn(1) manual page by using the correct path
> > to the input file when autogenerating, and bump.
> > Obvious bug reported by Leonid Bobrov  on 
> > ports@.
> 
> Looks like this was fallout from the SEPARATE_BUILD change, btw.
Yes. This was my oversight, sorry.

With SEPARATE_BUILD=no, WRKBUILD was equal to WRKSRC so the command to
fill the manual page would work. After my diff the manual page would
still be created but with that error message instead, so I didn't spot
it by looking at PLIST changes and but not at `man mn' afterwards.

Re: UPDATE archivers/brotli

[Klemens Nanni]

On Fri, Apr 27, 2018 at 11:43:37AM +0200, Björn Ketelaars wrote:
> Maintainer timeout:
> 
> Enclosed a diff for bringing brotli to the latest version (1.0.4), which
> brings some improvements, and fixes some issues. An overview on the
> changes can be found at https://github.com/google/brotli/releases
> 
> Minor number of 2 of the 3 shared libs require a bump as symbols have
> been added.
> 
> make test runs successfully. Consumers have been build tested.
> 
> Comments/OK?
OK

Re: UPATE: devel/py-astroid 1.4.9 -> 1.6.3

[Klemens Nanni]

On Thu, Apr 26, 2018 at 08:11:26PM +0200, Klemens Nanni wrote:
> On Sat, Feb 03, 2018 at 11:10:20AM +0100, Klemens Nanni wrote:
> > Here's an update for astroid, the only consumer is devel/pylint which
> > is in need for an update as well.
> > 
> > Committing astroid without pylint will break things but I'd like to get
> > my diff out... maybe someone beats me to updating pylint?
> > 
> > astroid.org is for sale so remove HOMEPAGE.
> > 
> > Test results seem ok here on amd64:
> > 
> > Ran 765 tests in 10.948s
> > 
> > FAILED (errors=2, skipped=64, expected failures=9)
> > *** Error 1 in . (Makefile:30 'do-test')
> Updated diff with some minor nit I already forgot, pylint update follows
> so I'm looking for Feedback/OKs now.
sthen spotted some MODPY_COMMENT errors, jca pointed out to just bump it
to the latest version.

OK?

Index: Makefile
===
RCS file: /cvs/ports/devel/py-astroid/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile3 Jan 2017 19:19:48 -   1.6
+++ Makefile27 Apr 2018 10:04:42 -
@@ -1,14 +1,11 @@
 # $OpenBSD: Makefile,v 1.6 2017/01/03 19:19:48 landry Exp $
 
-COMMENT =  common base representation of Python source code
+COMMENT =  abstract syntax tree for Python with inference support
 
-MODPY_EGG_VERSION =1.4.9
+MODPY_EGG_VERSION =1.6.3
 DISTNAME = astroid-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   devel
-REVISION = 0
-
-HOMEPAGE = http://www.astroid.org/
 
 MAINTAINER =   Alexandr Shadchin <shadc...@openbsd.org>
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-astroid/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo19 Dec 2016 09:17:58 -  1.4
+++ distinfo27 Apr 2018 10:04:42 -
@@ -1,2 +1,2 @@
-SHA256 (astroid-1.4.9.tar.gz) = pIPniRzjoG2t/Gy5CVsJOKyliUDUNXbXLkUCtIDAhdc=
-SIZE (astroid-1.4.9.tar.gz) = 189315
+SHA256 (astroid-1.6.3.tar.gz) = Nc+uR6rBnHtAe3CVQQ6JXoNvIoXM8SIDNq+6dEzExfI=
+SIZE (astroid-1.6.3.tar.gz) = 254828
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-astroid/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   13 Jun 2016 10:59:57 -  1.2
+++ pkg/PLIST   27 Apr 2018 10:04:42 -
@@ -1,5 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.2 2016/06/13 10:59:57 shadchin Exp $
 @pkgpath devel/py-logilab-astng
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
 lib/python${MODPY_VERSION}/site-packages/astroid/
 
lib/python${MODPY_VERSION}/site-packages/astroid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/astroid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -20,6 +22,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}inference.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
@@ -40,33 +43,78 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/astroid/bases.py
 lib/python${MODPY_VERSION}/site-packages/astroid/brain/
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_attrs.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_builtin_inference.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_collections.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_curses.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_dateutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_fstrings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_functools.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_gi.${MODPY_PYC_

Re: your mail

[Klemens Nanni]

On Wed, Apr 25, 2018 at 08:54:46PM +0200, Sebastian Benoit wrote:
> ok?
OK

Re: UPDATE: graphics/cfdg 3.0.9 => 3.0.11

[Klemens Nanni]

Can you please use spaces or tabs consistently in WANTLIB (and squash
both lines into one)?

Further comments inline.

On Wed, Apr 25, 2018 at 05:05:05PM -0400, Brian Callahan wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/cfdg/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile  16 Nov 2017 23:20:38 -  1.20
> +++ Makefile  25 Apr 2018 21:03:43 -
> @@ -2,17 +2,14 @@
>  
>  COMMENT =Context Free Design Grammar
>  
> -VERSION =3.0.9
> +VERSION =3.0.11
>  DISTNAME =   ContextFreeSource${VERSION}
>  PKGNAME =cfdg-${VERSION}
> -REVISION =   0
>  
>  CATEGORIES = graphics
>  
>  HOMEPAGE =   http://www.contextfreeart.org/
Has TLS, so does MASTER_SITES.

> -MAINTAINER = jared r r spiegel 
> -
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> @@ -30,7 +27,8 @@ COMPILER =  base-clang ports-gcc
>  
>  USE_GMAKE =  Yes
>  
> -WRKDIST =${WRKDIR}/context-free-${VERSION}
> +# 3.0.11 is a bad tarball...
> +WRKDIST =${WRKDIR}
>  
>  MAKE_ENV +=  CPPFLAGS="${CFLAGS}"
>  MAKE_FLAGS = CXX=c++ CC=c++ COMPILER_LIBCXX="${LIBCXX}"
Why is c++ hardcoded here?

> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/cfdg/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  1 Dec 2015 08:16:15 -   1.5
> +++ distinfo  25 Apr 2018 21:03:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (ContextFreeSource3.0.9.tgz) = 
> VALtqBZuPQQnpodIeEANs02qJA1fuEoAFYrEbL6NF8s=
> -SIZE (ContextFreeSource3.0.9.tgz) = 8072254
> +SHA256 (ContextFreeSource3.0.11.tgz) = 
> RmDRxdufQtMeCVVz1nAoJ925yn+X7DBNY6NpTx/knR4=
> +SIZE (ContextFreeSource3.0.11.tgz) = 3007073
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/graphics/cfdg/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile2 May 2017 15:39:54 -   1.4
> +++ patches/patch-Makefile25 Apr 2018 21:03:43 -
> @@ -35,8 +35,8 @@ Index: Makefile
>   #
>   
>   CPPFLAGS += $(patsubst %,-I%,$(INC_DIRS))
> --CPPFLAGS += -O3 -Wall -march=native -Wno-parentheses -std=c++0x
> -+CPPFLAGS += -Wall -Wno-parentheses -std=c++0x
> +-CPPFLAGS += -O3 -Wall -Wextra -march=native -Wno-parentheses -std=c++14
> ++CPPFLAGS += -Wall -Wextra -Wno-parentheses -std=c++14
>   #CPPFLAGS += -g
>   
>   # Add this for clang
> Index: patches/patch-runtests_sh
> ===
> RCS file: patches/patch-runtests_sh
> diff -N patches/patch-runtests_sh
> --- patches/patch-runtests_sh 1 Dec 2015 08:16:16 -   1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-runtests_sh,v 1.1 2015/12/01 08:16:16 jasper Exp $
> -
> -https://github.com/MtnViewJohn/context-free/pull/5
> -
>  runtests.sh.orig Wed Nov 25 09:55:19 2015
> -+++ runtests.sh  Wed Nov 25 09:55:24 2015
> -@@ -1,4 +1,4 @@
> --#!/bin/bash
> -+#!/bin/sh
> - 
> - mkdir output
> - for file in input/tests/*.cfdg input/*.cfdg ; do echo -n "$file "; if 
> ./cfdg -Pq "$file" output/test.png ; then echo '   pass' ; : ; else echo '
>   FAIL' ; break; fi ; done

NEW: security/hitch (pledged)

[Klemens Nanni]

I've been working on hitch every now and then for the last few months,
upstream has merged all my (OpenBSD related) fixes so it's time for a
port:

$ pi hitch
Information for inst:hitch-1.4.8

Comment:
libev-based high performance TLS proxy

Description:
Hitch is libev-based high performance TLS proxy designed to handle 10s 
of
thousands of connections efficiently on multicore machines.

It supports ALPN, SNI, PROXY protocol, automatic OCSP stapling as well 
as
seamless configuration reloads of certificates and listen endpoints.

Maintainer: Klemens Nanni <k...@openbsd.org>

WWW: https://hitch-tls.org

It's working fine for me on amd64. All tests pass altough two of them
might leave a background job running, which I'll deal with in the future.

pledge(2) has been incorporated, some corners can definitely be
tightened, but for now I'd like to hear some feedback.


hitch.tgz
Description: Binary data

Re: [new] devel/lua-openbsd

[Klemens Nanni]

On Fri, Apr 27, 2018 at 12:04:52PM -0600, Aaron Bieber wrote:
> Here is a port of the excellent lua-openbsd library from Florian
> Stinglmayr. It exposes the following to lua:
> 
>  o pledge()
>  o arc4random()
>  o arc4random_uniform()
> 
> I have been using pledge() from this lib for some time to pledge
> AwesomeWM.
> 
> The port itself was also built by Florian (with a few modifications from
> myself).
Nice port.

> OK to import?
OK

Re: UPDATE: graphics/cfdg 3.0.9 => 3.0.11

[Klemens Nanni]

On Fri, Apr 27, 2018 at 10:35:41AM -0400, Brian Callahan wrote:
> Updated diff.
OK

Re: NEW: security/hitch (pledged)

[Klemens Nanni]

Updated tarball with a proper hitch.rc this time.

The main process is now pledged only if hitch doesn't chroot(2). I
cannot simply hoist the call yet.


hitch2.tgz
Description: Binary data

Re: UPDATE: graphics/farbfeld 3 -> 4

[Klemens Nanni]

On Sat, Apr 28, 2018 at 12:07:14AM +0100, Kaashif Hymabaccus wrote:
> On Sat, Apr 14, 2018 at 01:03:09AM +0200, Klemens Nanni wrote:
> >
> > [...]
> >
> > Now that you're rolling your own do-install, this hunk is obsolete.
> >
> > [...]
> > 
> > CC is already passed in MAKE_ENV, this can go, too.
> > 
> 
> Addressed these comments. Also there was a hardcoded -Os in the CFLAGS
> I patched out.
> 
> I took out passing CC in MAKE_ENV since the farbfeld makefile is set
> to use "cc" in config.mk, which is already linked to the right
> compiler so there's no need to fix it.
Looks all good to me.

Any OKs to commit this?

Re: UPDATE: devel/pylint 1.6.5 -> 1.8.4

[Klemens Nanni]

On Fri, Apr 27, 2018 at 07:27:48PM +0200, Daniel Jakots wrote:
> On Fri, 27 Apr 2018 12:10:03 +0200, Klemens Nanni <k...@openbsd.org>
> wrote:
> 
> > On Thu, Apr 26, 2018 at 08:15:10PM +0200, Klemens Nanni wrote:
> > > Finally picked up that old diff. Tests on amd64 say
> > > 
> > >   Ran 4 test cases in 1.18s (1.07s CPU)
> > >   All 28 modules OK
> > > 
> > > Upstream ditched their GUI quite some ago.
> 
> You'll need some quirks for the pkg change, can you show them please?

Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.593
diff -u -p -r1.593 Makefile
--- Makefile28 Apr 2018 10:13:48 -  1.593
+++ Makefile28 Apr 2018 11:58:52 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-2.437
+PKGNAME =  quirks-2.438
 PKG_ARCH = *
 MAINTAINER =   Marc Espie <es...@openbsd.org>
 
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.606
diff -u -p -r1.606 Quirks.pm
--- files/Quirks.pm 28 Apr 2018 10:13:48 -  1.606
+++ files/Quirks.pm 28 Apr 2018 11:58:52 -
@@ -1287,6 +1287,8 @@ my $obsolete_reason = {
'gtkglextmm' => 3,
'goocanvas' => 3,
'osm2go' => 6,
+   'pylint-gui' => 3,
+   'pylint3-gui' => 3,
 };
 
 # reasons for obsolete packages

Re: Update to py-flask-0.12.3

[Klemens Nanni]

On Sat, Apr 28, 2018 at 11:45:51AM +0200, Daniel Jakots wrote:
> 2 days ago flask released two new versions, 0.12.3 and 1.0.0. They
> both includes a security fix:
> 
> > Flask previously decoded incoming JSON bytes using the content type
> > of the request. Although JSON should only be encoded as UTF-8, Flask
> > was more lenient. However, Python includes non-text related encodings
> > that could result in unexpected memory use by a request.
> > 
> > Flask will now detect the encoding of incoming JSON data as one of
> > the supported UTF encodings, and will not allow arbitrary encodings
> > from the request.
> 
> 0.12.3 has less differences with our version so I'd like to go for it
> first and then a bit later move to 1.0.0 (deps need to be updated
> first).
> 
> To create the docs it needs a new requirement and I'm not sure it's
> really worth it so I simply removed them. We can also get rid of the
> patches.
> 
> Comments? OK?
> I'll probably commit it to -stable as well.
I'm fine with this to do the security update but would like to see
them back in the package starting with 1.0.0 again.

One test fails, did it pass previously? See test.log attached.

2 failed, 392 passed, 3 skipped, 1 error in 11.69 seconds

So OK kn for your second 0.12.3 update diff.
cd /tmp/pobj/py-flask-0.12.3-python3/Flask-0.12.3 && LC_ALL=C.UTF-8 
/usr/local/bin/python3.6 -m pytest tests
= test session starts ==
platform openbsd6 -- Python 3.6.5, pytest-3.1.2, py-1.4.34, pluggy-0.4.0
benchmark: 3.0.0 (defaults: timer=time.perf_counter disable_gc=False 
min_rounds=5 min_time=5.00us max_time=1.00s calibration_precision=10 
warmup=False warmup_iterations=10)
rootdir: /tmp/pobj/py-flask-0.12.3-python3/Flask-0.12.3, inifile: setup.cfg
plugins: xdist-1.16.0, httpbin-0.2.3, cov-2.5.1, benchmark-3.0.0
collected 397 items

tests/test_appctx.py 
tests/test_basic.py 
E...
tests/test_blueprints.py ..
tests/test_cli.py ..
tests/test_config.py 
tests/test_deprecations.py ..
tests/test_ext.py .F
tests/test_helpers.py 
.
tests/test_instance_config.py ...s
tests/test_regression.py ..F
tests/test_reqctx.py ...ss
tests/test_signals.py ...
tests/test_subclassing.py .
tests/test_templating.py ..
tests/test_testing.py ...
tests/test_user_error_handler.py 
tests/test_views.py 

 ERRORS 
_ ERROR at teardown of test_session_expiration _

recwarn = WarningsRecorder(record=True)

@pytest.yield_fixture(autouse=True)
def catch_deprecation_warnings(recwarn):
yield
gc.collect()
>   assert not recwarn.list
E   assert not []
E+  where [] = 
WarningsRecorder(record=True).list

tests/conftest.py:134: AssertionError
=== FAILURES ===
___ test_no_error_swallowing ___

flaskext_broken = None

def test_no_error_swallowing(flaskext_broken):
with pytest.raises(ImportError) as excinfo:
import flask.ext.broken

>   assert excinfo.type is ImportError
E   AssertionError: assert  is ImportError
E+  where  = .type

tests/test_ext.py:183: AssertionError
 test_aborting _

def test_aborting():
class Foo(Exception):
whatever = 42
app = flask.Flask(__name__)
app.testing = True

@app.errorhandler(Foo)
def handle_foo(e):
return str(e.whatever)

@app.route('/')
def index():
raise flask.abort(flask.redirect(flask.url_for('test')))

@app.route('/test')
def test():
raise Foo()

with app.test_client() as c:
rv = c.get('/')
>   assert rv.headers['Location'] == 'http://localhost/test'
E   AssertionError: assert '/test' == 'http://localhost/test'
E - /test
E + http://localhost/test

tests/test_regression.py:100: AssertionError
== 2 failed, 392 passed, 3 skipped, 1 error in 11.69 seconds ===
*** Error 1 in . (Makefile:45 'do-test')

security/opensc: Switch GH_* to stable /release/ MASTER_SITES

[Klemens Nanni]

Looking at OpenSC due to naddy's lld mail, this came up first.

The release tarball now preships a configure script, but I refrained
from touching the configure target for now since `autoreconf' or at
least aclocal in particular is still neccessary. GNU auto* wizards, what
do you say?

While here, `find | xargs' can be turned into a simple `find -delete'.

opensc works as before, no observed runtime changes so far.

Feedback?

Index: Makefile
===
RCS file: /cvs/ports/security/opensc/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile18 Feb 2018 10:35:31 -  1.45
+++ Makefile9 May 2018 21:06:37 -
@@ -2,14 +2,10 @@
 
 COMMENT=   set of libraries and utilities to access smart cards
 
-VERSION=   0.17.0
-DISTNAME=  OpenSC-${VERSION}
-PKGNAME=   opensc-${VERSION}
+V= 0.17.0
+DISTNAME=  opensc-${V}
 REVISION=  2
-GH_ACCOUNT=OpenSC
-GH_PROJECT=${GH_ACCOUNT}
-GH_TAGNAME=${VERSION}
-SUBST_VARS +=  GH_TAGNAME
+SUBST_VARS +=  V
 
 SHARED_LIBS +=  opensc 6.0 # 5.0
 SHARED_LIBS += smm-local 2.0   # 5.0
@@ -25,6 +21,8 @@ PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB=   c crypto ncurses pthread readline z
 
+MASTER_SITES=  https://github.com/OpenSC/OpenSC/releases/download/${V}/
+
 BUILD_DEPENDS= devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
@@ -57,7 +55,6 @@ post-install:
${SUBST_CMD} -c -m 0644 -o ${BINOWN} -g ${BINGRP} \
${FILESDIR}/libopensc.pc \
${PREFIX}/lib/pkgconfig/libopensc.pc
-   @find ${PREFIX}/lib/pkcs11/ -name '*.la' -print0 | \
-   xargs -0r rm -f
+   @find ${PREFIX}/lib/pkcs11/ -name '*.la' -delete
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/security/opensc/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo16 Aug 2017 14:39:07 -  1.12
+++ distinfo7 May 2018 21:32:31 -
@@ -1,2 +1,2 @@
-SHA256 (OpenSC-0.17.0.tar.gz) = AHxGIq/CJbjXob6lT1Mlr/pEF/TheqoDJWqp9MJXgv0=
-SIZE (OpenSC-0.17.0.tar.gz) = 1407652
+SHA256 (opensc-0.17.0.tar.gz) = vnPGgWhnq0ch5qmufbqOiQxfFp8KLLtL81Tg8wqUgwA=
+SIZE (opensc-0.17.0.tar.gz) = 1950547
Index: files/libopensc.pc
===
RCS file: /cvs/ports/security/opensc/files/libopensc.pc,v
retrieving revision 1.1
diff -u -p -r1.1 libopensc.pc
--- files/libopensc.pc  16 Aug 2017 14:39:07 -  1.1
+++ files/libopensc.pc  7 May 2018 21:54:23 -
@@ -5,6 +5,6 @@ includedir=${prefix}/include
 
 Name: libopensc
 Description: OpenSC smartcard framework
-Version: ${GH_TAGNAME}
+Version: ${V}
 Libs: -L${libdir} -lopensc
 Cflags: -I${includedir}