CVS: cvs.openbsd.org: ports

[Steven Mestdagh]

CVSROOT:/cvs
Module name:ports
Changes by: ste...@cvs.openbsd.org  2016/04/18 23:55:44

Modified files:
math/octave: Makefile distinfo 
math/octave/patches: patch-configure 
math/octave/pkg: PLIST 

Log message:
maintenance update to 4.0.1

Enable TLS > 1.0 in libetpan

[Vincent Gross]

Some people may have witnessed my struggle of the past few days to
connect claws-mail to my mail server. Long story short : server only
accepts TLS 1.2, claws-mail connects with TLS 1.0.

The culprit here is libetpan v1.6, which calls TLSv1_client_method()
before the TLS handshake. The diff below fixes the issue, claws-mail
happily synchronized my imap folders when applied.

Ok ?

---

$OpenBSD$
--- src/data-types/mailstream_ssl.c.origMon Apr 18 23:45:10 2016
+++ src/data-types/mailstream_ssl.c Mon Apr 18 23:45:32 2016
@@ -491,7 +491,7 @@ static struct mailstream_ssl_data * ssl_data_new(int f
 static struct mailstream_ssl_data * tls_data_new(int fd, time_t timeout,
   void (* callback)(struct mailstream_ssl_context * ssl_context, void * 
cb_data), void * cb_data)
 {
-  return ssl_data_new_full(fd, timeout, TLSv1_client_method(), callback, 
cb_data);
+  return ssl_data_new_full(fd, timeout, TLS_client_method(), callback, 
cb_data);
 }
 
 #else

Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

[Ian McWilliam]

Looks good so far.

make lib-depends-check

Create /usr/packages/amd64/all/samba-util-4.4.2.tgz
LIB_DEPENDS STEM->=0.10.38:devel/gettext not needed for net/samba,-util ?
LIB_DEPENDS converters/libiconv not needed for net/samba,-util ?
Link to /usr/packages/amd64/ftp/samba-util-4.4.2.tgz
Link to /usr/packages/amd64/cdrom/samba-util-4.4.2.tgz
`/usr/ports/pobj/samba-4.4.2/fake-amd64/.fake_done' is up to date.
===>  Building package for samba-docs-4.4.2
Create /usr/packages/amd64/no-arch/samba-docs-4.4.2.tgz
Link to /usr/packages/amd64/all/samba-docs-4.4.2.tgz
Link to /usr/packages/amd64/ftp/samba-docs-4.4.2.tgz
Link to /usr/packages/amd64/cdrom/samba-docs-4.4.2.tgz
Scanning: ok


ianm-openbsd:all {123} pkg_add samba-4.4.2.tgz
UNSIGNED PACKAGE file:./libffi-3.2.1p1.tgz: install anyway ? [y/N/a] a
samba-4.4.2:libffi-3.2.1p1: ok
samba-4.4.2:bzip2-1.0.6p7: ok
samba-4.4.2:python-2.7.11p0: ok
samba-4.4.2:samba-util-4.4.2: ok
samba-4.4.2:libtalloc-2.1.6: ok
samba-4.4.2:tevent-0.9.28: ok
samba-4.4.2:popt-1.16p1: ok
samba-4.4.2:ldb-1.1.26: ok
samba-4.4.2:libexecinfo-0.3v0: ok
samba-4.4.2:cyrus-sasl-2.1.26p16: ok
samba-4.4.2:openldap-client-2.4.44: ok
samba-4.4.2:openpam-20141014: ok
samba-4.4.2:libdaemon-0.14p1: ok
samba-4.4.2:dbus-1.10.8v0: ok
install-info: menu item `gdbm_load' already exists, for file `(none)'
system(/usr/bin/install-info, --info-dir=/usr/local/info, --,
/usr/local/info/gdbm.info) failed: exit(1)
samba-4.4.2:gdbm-1.11p1: ok
samba-4.4.2:dbus-daemon-launch-helper-1.10.8: ok
samba-4.4.2:pcre-8.38p0: ok
samba-4.4.2:libelf-0.8.13p3: ok
samba-4.4.2:glib2-2.48.0: ok
samba-4.4.2:avahi-0.6.31p24: ok
samba-4.4.2:gmp-5.0.2p3: ok
samba-4.4.2:libnettle-3.2: ok
samba-4.4.2:libidn-1.32p0: ok
samba-4.4.2:libtasn1-4.8: ok
samba-4.4.2:p11-kit-0.23.2p0: ok
samba-4.4.2:gnutls-3.4.11: ok
samba-4.4.2:gamin-0.1.10p21: ok
samba-4.4.2:py-dnspython-1.12.0p0: ok
samba-4.4.2:tdb-1.3.8: ok
samba-4.4.2:cups-libs-2.1.3p0: ok
samba-4.4.2: ok
The following new rcscripts were installed: /etc/rc.d/avahi_daemon
/etc/rc.d/avahi_dnsconfd /etc/rc.d/messagebus /etc/rc.d/nmbd
/etc/rc.d/samba /etc/rc.d/samba_ad_dc /etc/rc.d/saslauthd /etc/rc.d/smbd
/etc/rc.d/winbindd
See rcctl(8) for details.
Look in /usr/local/share/doc/pkg-readmes for extra documentation.
--- +python-2.7.11p0 ---
If you want to use this package as your default system python, as root
create symbolic links like so (overwriting any previous default):
 ln -sf /usr/local/bin/python2.7 /usr/local/bin/python
 ln -sf /usr/local/bin/python2.7-2to3 /usr/local/bin/2to3
 ln -sf /usr/local/bin/python2.7-config /usr/local/bin/python-config
 ln -sf /usr/local/bin/pydoc2.7  /usr/local/bin/pydoc
UNSIGNED PACKAGES: gnutls-3.4.11, popt-1.16p1, samba-util-4.4.2,
avahi-0.6.31p24, gdbm-1.11p1, tevent-0.9.28, gamin-0.1.10p21, ldb-1.1.26,
openldap-client-2.4.44, libexecinfo-0.3v0, pcre-8.38p0, libdaemon-0.14p1,
python-2.7.11p0, dbus-1.10.8v0, glib2-2.48.0, libtasn1-4.8,
dbus-daemon-launch-helper-1.10.8, libnettle-3.2, py-dnspython-1.12.0p0,
bzip2-1.0.6p7, libelf-0.8.13p3, samba-4.4.2, tdb-1.3.8, libffi-3.2.1p1,
cyrus-sasl-2.1.26p16, libtalloc-2.1.6, openpam-20141014, gmp-5.0.2p3,
libidn-1.32p0, p11-kit-0.23.2p0, cups-libs-2.1.3p0


install-info: menu item `gdbm_load' already exists, for file `(none)'
system(/usr/bin/install-info, --info-dir=/usr/local/info, --,
/usr/local/info/gdbm.info) failed: exit(1)
samba-4.4.2:gdbm-1.11p1: ok

 /usr/local/info/dir

 Programming & development tools
* gdbm_dump: gdbm_dump(gdbm).   Dump the GDBM database into a flat file.
* gdbm_load: gdbm_load(gdbm).   Load the database from a flat file.

When the gdbm package is pkg_deleted these entires are not cleaned up and
are present in the info/dir file. When reinstalling the gdbm package it
errors out.

Manually removing those entries gives us no error.

ianm-openbsd:all {126} pkg_add samba-4.4.2.tgz
UNSIGNED PACKAGE file:./python-2.7.11p0.tgz: install anyway ? [y/N/a] a
samba-4.4.2:python-2.7.11p0: ok
samba-4.4.2:tdb-1.3.8: ok
samba-4.4.2:openpam-20141014: ok
samba-4.4.2:libtalloc-2.1.6: ok
samba-4.4.2:libexecinfo-0.3v0: ok
samba-4.4.2:popt-1.16p1: ok
samba-4.4.2:tevent-0.9.28: ok
samba-4.4.2:ldb-1.1.26: ok
samba-4.4.2:samba-util-4.4.2: ok
samba-4.4.2:dbus-daemon-launch-helper-1.10.8: ok
samba-4.4.2:libdaemon-0.14p1: ok
samba-4.4.2:gdbm-1.11p1: ok
samba-4.4.2:pcre-8.38p0: ok
samba-4.4.2:libelf-0.8.13p3: ok
samba-4.4.2:glib2-2.48.0: ok
samba-4.4.2:avahi-0.6.31p24: ok
samba-4.4.2:libtasn1-4.8: ok
samba-4.4.2:p11-kit-0.23.2p0: ok
samba-4.4.2:gmp-5.0.2p3: ok
samba-4.4.2:libnettle-3.2: ok
samba-4.4.2:libidn-1.32p0: ok
samba-4.4.2:gnutls-3.4.11: ok
samba-4.4.2:cups-libs-2.1.3p0: ok
samba-4.4.2:cyrus-sasl-2.1.26p16: ok
samba-4.4.2:openldap-client-2.4.44: ok
samba-4.4.2:gamin-0.1.10p21: ok
samba-4.4.2:py-dnspython-1.12.0p0: ok
samba-4.4.2: ok
The following new rcscripts were installed: /etc/rc.d/avahi_daemon
/etc/rc.d/avahi_dnsconfd /etc/rc.d/nmbd /etc/rc.d/samba
/etc/rc.d/samba_ad_dc /etc/rc.d/saslauthd 

Re: update: sysutils/sysclean 1.3

[Sebastien Marie]

On Tue, Apr 19, 2016 at 12:38:50AM +0100, Dimitris Papastamos wrote:
> 
> Any ideas as to why all the manpages are listed when
> I run it in filename mode?
> 
> The output is:
> 
> /usr/share/man/man1/c++.1
> /usr/share/man/man1/cc.1
> /usr/share/man/man1/g++.1
> /usr/share/man/man1/lex.1
> /usr/share/man/man1/Mail.1
> .
> .
> .
> 
> this goes on for about 4k entries.
> 
> I run this on -current.  This issue isn't specific to 1.3 as
> I had the same behaviour with 1.1.  It is probably not related
> to sysclean but maybe something in base that changed?
> 

You are right: something in base have changed :)

http://anoncvs.spacehopper.org/openbsd-src/commit/?id=e61f05d590b15eded29cc16e6289e5841e040a29

lot of MLINKS has been removed from base, resulting lot of man page
removed (in fact, links to original man page).

here sysclean does the right thing: these files aren't present anymore
in a fresh install.
-- 
Sebastien Marie

Re: update: sysutils/sysclean 1.3

[Dimitris Papastamos]

On Mon, Apr 18, 2016 at 09:41:31AM +0200, Sebastien Marie wrote:
> Hi,
> 
> Here a diff for updating sysutils/sysclean to 1.3
> Special thanks to espie@ for his help in the rewrite in perl.
> 
> Comments or OK ?

Any ideas as to why all the manpages are listed when
I run it in filename mode?

The output is:

/usr/share/man/man1/c++.1
/usr/share/man/man1/cc.1
/usr/share/man/man1/g++.1
/usr/share/man/man1/lex.1
/usr/share/man/man1/Mail.1
.
.
.

this goes on for about 4k entries.

I run this on -current.  This issue isn't specific to 1.3 as
I had the same behaviour with 1.1.  It is probably not related
to sysclean but maybe something in base that changed?

Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

[Vijay Sankar]

Thank you very much for the detailed answers. I will report back with usage 
reports before next Monday. 

Sent from my iPhone

> On Apr 18, 2016, at 13:16, Jeremie Courreges-Anglas  wrote:
> 
> Vijay Sankar  writes:
> 
>> Quoting j...@wxcvbn.org:
>> 
>>> Move to latest upstream versions.
>>> 
>>> - libtalloc tests now fail intermittently, upstream seems to have
>>> introduced an unstable comparison method in pytalloc
>>> - more libraries move to the private directory
>>> - shared lib bumps still hard to get right, some of them are not tracked
>>> upstream, thus some bumps come from upstream .sigs, some from
>>> abi-compliance-checker (confirmed with nm -g).
>>> - dbus added to BDEPS, needed to build vfs_snapper; not enforced in
>>> RDEPS but dbus is brought in by avahi anyway
>>> - LDEPS and WANTLIB cleanup
>>> 
>>> Build and test reports welcome!
> 
> [...]
> 
>> Thank you very much. Patches all worked for me -- I had to manually
>> download samba and tdb but once they were available in distfiles, there
>> were no issues building the packages.
> 
> Ok.  I'm also interested in usage reports, 'cause we haven't tested
> 4.4.x yet at $DAYJOB, only 4.3.
> 
>> -rw-r--r--  3 vijay  vijay   83018 Apr 18 09:49 tdb-1.3.8.tgz
>> -rw-r--r--  3 vijay  vijay   56656 Apr 18 09:50
>> libtalloc-2.1.6.tgz
>> -rw-r--r--  3 vijay  vijay18771661 Apr 18 10:19 samba-4.4.2.tgz
>> -rw-r--r--  3 vijay  vijay  193336 Apr 18 10:19 ldb-1.1.26.tgz
>> -rw-r--r--  3 vijay  vijay   50760 Apr 18 10:19
>> tevent-0.9.28.tgz
>> -rw-r--r--  3 vijay  vijay5865 Apr 18 10:19
>> samba-util-4.4.2.tgz
>> -rw-r--r--  4 vijay  vijay  174037 Apr 18 10:19
>> samba-docs-4.4.2.tgz
>> 
>> Most probably the problems are due to my network and firewall configuration
>> and nothing to do with the Makefile but noting this below just in case it
>> is relevant.
>> 
>> With tdb,  MASTER_SITES http://samba.org/ftp/tdb/ goes to
>> https://www.samba.org/ftp/tdb/ so I am not sure if that causes the problem
>> with downloading tdb.
> 
> No, only the directory listing is redirected.  But I'll move tdb and
> talloc to https://
> 
>> 
>> With samba-4.4.2, I had the error
>> 
>> ===>  Checking files for samba-4.4.2
 Fetch https://download.samba.org/pub/samba/stable/samba-4.4.2.tar.gz
>> ftp: connect: No route to host
> 
> The problem is the samba website, which is a bit overloaded to say the
> least...
> 
 Fetch
>> https://download.samba.org/pub/samba/old-versions/samba-4.4.2.tar.gz
>> ftp: Error retrieving file: 404 Not Found
 Fetch http://ftp.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
>> ftp: Error retrieving file: 404 Not Found
 Fetch
>> ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
>> samba-4.4.2.tar.gz: No such file or directory.
 Fetch
>> http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
>> ftp: Error retrieving file: 404 Not Found
>> 
>> Thanks again,
> 
> Well, thanks for your report! :)
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 

Re: Update / name change x11/ion -> x11/notion

[Stuart Henderson]

On 2016/04/18 13:27, Christopher Zimmermann wrote:
> Hi,
> 
> ion3 has been abandoned by its upstream developer. It has been forked
> on github and is now named notion. Here's a diff for upgrading to the
> latest version of notion and changing the ports name to notion, which
> is required by a special license clause in original ion3. ok?
> 
> Christopher
> 
> 
> diff -Nru ion/Makefile notion/Makefile
> --- ion/Makefile  Mon Mar 28 19:47:27 2016
> +++ notion/Makefile   Mon Apr 18 12:53:46 2016

This is a bit of an awkward thing to send as a diff. A new tar would be
better.

> @@ -1,31 +1,36 @@
>  # $OpenBSD: Makefile,v 1.63 2016/03/27 20:53:15 naddy Exp $
>  
> -COMMENT= light, keyboard friendly window manager
> +COMMENT =static tiling, tabbing and floating window manager
>  
> -V=   20090110
> -DISTNAME=ion-3-${V}
> -PKGNAME= ion-${V}
> -CATEGORIES=  x11
> -REVISION=2
> +CATEGORIES = x11
>  
> -HOMEPAGE=http://modeemi.cs.tut.fi/~tuomov/ion/
> -MASTER_SITES=http://tuomov.iki.fi/software/dl/
> +GH_TAGNAME = 3-2015061300
> +GH_ACCOUNT =raboof
> +GH_PROJECT =notion
> +DISTNAME =  ${GH_PROJECT}-${GH_TAGNAME}
> +PKGNAME =${GH_PROJECT}-${GH_TAGNAME:S/-/./}

tabs/spaces issue in some of these lines.


> +HOMEPAGE =   http://notion.sourceforge.net/
> +
>  # LGPL
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -WANTLIB= ICE X11 m c SM Xext ${MODLUA_WANTLIB}
> -
> -MODULES= devel/gettext \
> +MODULES =devel/gettext \
>   lang/lua
> -MODLUA_SA=   Yes
>  
> -LIB_DEPENDS= ${MODLUA_LIB_DEPENDS}
> +WANTLIB =ICE m c SM X11 Xext Xinerama Xrandr ${MODLUA_WANTLIB}

WANTLIB goes just after PERMIT_*.

> -USE_GMAKE=   Yes
> -NO_TEST= Yes
> +#MODLUA_SA = Yes

why # this out? it should stay as-is, see port-modules(5).

> +#pre-configure:
> +#${SUBST_CMD} ${WRKSRC}/system-autodetect.mk

either remove this or remove the #'s.

> diff -Nru ion/pkg/PLIST notion/pkg/PLIST
> --- ion/pkg/PLIST   Mon Mar 28 19:47:27 2016
> +++ notion/pkg/PLISTWed Mar 30 14:30:49 2016

missing @pkgpath if you're trying to get it to update automatically (and
you'll need a devel/quirka entry for that too).

Re: NEW: net/syncthing

[Adam Wolk]

On Mon, 18 Apr 2016 22:01:24 +0100
Edd Barrett  wrote:

> Hi,
> 
> pkg/DESCR:
> ---8<---
> Syncthing is an application that lets you synchronize your files
> across multiple devices. This means the creation, modification or
> deletion of files on one machine will automatically be replicated to
> your other devices. We believe your data is your data alone and you
> deserve to choose where it is stored. Therefore Syncthing does not
> upload your data to the cloud but exchanges your data across your
> machines as soon as they are online at the same time.
> --->8---  
> 
> I've been using this to sync notes between my server, laptop, tablet
> and phone. Seems to work nicely.
> 
> It's a go app, but all the deps come bundled.
> 
> This port is mostly by czarkoff@ from openbsd-wip. All I have done is
> update to the latest version, add a README and test it. We agreed by
> mail that I would take MAINTAINER.
> 
> OK?
> 

Some feedback.

1.

$
portcheck hardcoded paths detected in pkg/README, consider using
SUBST_VARS and TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE net/syncthing

not sure what portcheck hates here but it does. Maybe the /var paths?

2.

The port uses GH_* variables with are not preferred when upstream
provides release tarballs and syncthing does. I have been dumb enough
to try and switch the port to use a normal MASTER_SITES. I'm attaching
a new port plus a diff so you can see the pain I went through to get it
working. It's far more uglier than GH_* vars but not subject to tag
sliding if upstream decides to move it.


3.

I added a note to README about the way I start up my syncthing
instances using crontab. I think it's a useful trick to pass on to
other people.

4.

Now that I look at it, the -version ${GH_TAGNAME} should probably
be just replaced with ${V} but I ran out of time to test this.

Regards,
Adam

diff -u syncthing-eb/Makefile syncthing/Makefile
--- syncthing-eb/Makefile   Mon Apr 18 22:53:17 2016
+++ syncthing/Makefile  Tue Apr 19 00:21:55 2016
@@ -1,10 +1,11 @@
 # $OpenBSD$
 
-GH_ACCOUNT =   syncthing
-GH_PROJECT =   syncthing
-GH_TAGNAME =   v0.12.22
 COMMENT =  open decentralized synchronization utility
 
+V =0.12.22
+DISTNAME = syncthing-${V}
+DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
+
 CATEGORIES =   net
 HOMEPAGE = https://syncthing.net/
 
@@ -15,12 +16,17 @@
 
 WANTLIB += c pthread
 
+MASTER_SITES = https://github.com/syncthing/syncthing/releases/download/v${V}/
+
+WRKSRC =   ${WRKDIR}/go/src/github.com/syncthing/syncthing
+
 MODULES =  lang/go
 MODGO_TYPE =   bin
+MODGO_SUBDIR = ${WRKDIR}/syncthing
 
 do-build:
cd ${WRKSRC} && ${MODGO_CMD} run build.go \
-   -version ${GH_TAGNAME} -no-upgrade
+   -no-upgrade
 
 do-test:
cd ${WRKSRC} && ${MODGO_CMD} run build.go test
diff -u syncthing-eb/distinfo syncthing/distinfo
--- syncthing-eb/distinfo   Sat Apr 16 15:02:13 2016
+++ syncthing/distinfo  Mon Apr 18 23:47:27 2016
@@ -1,2 +1,2 @@
-SHA256 (syncthing-0.12.22.tar.gz) = 
EEQC/NGi0CNE4yzr2fnWJJSUgn6H3dLH0B7kMUjILSo=
-SIZE (syncthing-0.12.22.tar.gz) = 4047399
+SHA256 (syncthing-source-v0.12.22.tar.gz) = 
pgsw/av5FxD0LVycLIIwhziyq20RIBTBs+IL/RLsjbg=
+SIZE (syncthing-source-v0.12.22.tar.gz) = 4816944
Common subdirectories: syncthing-eb/pkg and syncthing/pkg

syncthing-awolk.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[T . J . Townsend]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2016/04/18 16:45:10

Modified files:
www/nginx  : Makefile 
www/nginx/pkg  : DESCR 

Log message:
nginx isn't part of base anymore; remove mention of it being there.

ok sthen

NEW: net/syncthing

[Edd Barrett]

Hi,

pkg/DESCR:
---8<---
Syncthing is an application that lets you synchronize your files across
multiple devices. This means the creation, modification or deletion of
files on one machine will automatically be replicated to your other
devices. We believe your data is your data alone and you deserve to
choose where it is stored. Therefore Syncthing does not upload your data
to the cloud but exchanges your data across your machines as soon as
they are online at the same time.
--->8---

I've been using this to sync notes between my server, laptop, tablet and
phone. Seems to work nicely.

It's a go app, but all the deps come bundled.

This port is mostly by czarkoff@ from openbsd-wip. All I have done is
update to the latest version, add a README and test it. We agreed by
mail that I would take MAINTAINER.

OK?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk


syncthing.tgz
Description: application/tar-gz

print/texlive: don't embed libpotrace statically

[Edd Barrett]

Hi,

Now that graphics/potrace emits a header and library, texlive can
consume these rather than embedding its own potrace.

While we are here, blast an inaccurate comment, and update an incorrect
conflict marker.

OK?

Index: Makefile
===
RCS file: /home/edd/cvsync/ports/print/texlive/base/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile4 Apr 2016 22:57:45 -   1.81
+++ Makefile18 Apr 2016 21:04:33 -
@@ -4,7 +4,7 @@ COMMENT =   base binaries for TeXLive typ
 
 DISTNAME = texlive-${DIST_V}-source
 PKGNAME =  texlive_base-${V}
-REVISION = 2
+REVISION = 3
 
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
texlive-${DIST_V}-extra${EXTRACT_SUFX}
@@ -16,8 +16,8 @@ WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext
 WANTLIB += c cairo expat fontconfig freetype gd glib-2.0 graphite2
 WANTLIB += harfbuzz harfbuzz-icu icudata icui18n icuio icuuc intl
 WANTLIB += jpeg lcms2 m openjpeg paper pcre pixman-1 png poppler
-WANTLIB += pthread pthread-stubs stdc++ tiff vpx xcb xcb-render
-WANTLIB += xcb-shm z zzip
+WANTLIB += potrace pthread pthread-stubs stdc++ tiff vpx xcb
+WANTLIB += xcb-render xcb-shm z zzip
 
 RUN_DEPENDS =  print/ghostscript/gnu \
print/detex \
@@ -35,7 +35,8 @@ LIB_DEPENDS = graphics/png \
graphics/graphite2 \
devel/harfbuzz,-icu \
print/libpaper \
-   archivers/zziplib
+   archivers/zziplib \
+   graphics/potrace
 
 MODULES =  textproc/intltool converters/libiconv perl
 
@@ -78,7 +79,6 @@ PKG_ARGS +=   -Dxindy=1
 PKG_ARGS +=-Dxindy=0
 .endif
 
-# Do not link with system icu. TeXLive ICU is not vanilla (Yet)!
 CONFIGURE_ARGS +=  --mandir=${PREFIX}/man \
--with-system-freetype2 \
--with-system-gd \
@@ -107,11 +107,8 @@ CONFIGURE_ARGS +=  --mandir=${PREFIX}/man
--with-system-graphite2 \
--with-system-poppler \
--with-system-libpaper \
-   --with-system-zziplib
-# XXX need to hack graphics/potrace to emit a library and header.
-# Looks like you add --with-libpotrace to its CONFIGURE_ARGS. Then add a
-# LIB_DEPENDS obviously.
-#--with-system-potrace
+   --with-system-zziplib \
+   --with-system-potrace
 
 SUBST_VARS +=  TRUEPREFIX LOCALBASE
 
Index: pkg/PLIST
===
RCS file: /home/edd/cvsync/ports/print/texlive/base/pkg/PLIST,v
retrieving revision 1.28
diff -u -p -r1.28 PLIST
--- pkg/PLIST   4 Apr 2016 22:57:45 -   1.28
+++ pkg/PLIST   18 Apr 2016 20:29:54 -
@@ -2,7 +2,7 @@
 @conflict teTeX_base-*
 @conflict pdfjam-*
 @conflict ht-<2
-@conflict texlive_texmf-buildset-<2013
+@conflict texlive_texmf-buildset-<2014
 @pkgpath print/teTeX/base
 @pkgpath print/pdfjam
 @pkgpath print/teTeX/base,-fmt

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: UPDATE: herbstluftwm to 0.7.0

[Christopher Zimmermann]

On 2016-04-18 Florian Stinglmayr  wrote:
> On Mon, Apr 18, 2016 at 08:32:46PM +0200, Christopher Zimmermann
> wrote:
> > I have a finished herbstluftwm port upgrade, too.
> > You can remove the BUILD_DEPENDS and the CC=egcc in MAKE_FLAGS
> > since the gcc4 module takes care of them. Just use += for
> > assignments to LIB_DEPENDS and RUN_DEPENDS so you don't overwrite
> > the assignments made by the gcc4 module.  
> 
> Thanks for the suggestions, it's fixed in a new diff below.

OK chrisz@

> It's weird btw. Their entire code base is basically C with a few C++11
> things mixed in there.

They are rewriting the whole thing in proper C++, but as a separate
project. I guess they wanted to use the expressions they learned
there...

> > I could remove intl, m and pthread from WANTLIB, after adding
> > devel/gettext to MODULES.
> >  
> 
> naddy@ wishes to remove the devel/gettext module [1] and thus I
> cleaned up herbstluftwm while I am at it.
> 
> > a fixed RUN_DEPENDS is overkill. You may mention dmenu in a
> > MESSAGE, if you want to. I don't think it is necessary.
> >  
> 
> You are right, it isn't. It is covered well enough in herbstluftwm's
> FAQ on their homepage.
> 
> Regards,
> Florian
> 
> [1] https://marc.info/?l=openbsd-ports=145917613914938
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/herbstluftwm/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 Makefile
> --- Makefile  25 Aug 2015 13:18:28 -  1.4
> +++ Makefile  18 Apr 2016 20:22:58 -
> @@ -1,29 +1,33 @@
>  # $OpenBSD: Makefile,v 1.4 2015/08/25 13:18:28 sthen Exp $
> 
>  COMMENT =manual tiling window manager
> -DISTNAME =   herbstluftwm-0.6.2
> +DISTNAME =   herbstluftwm-0.7.0
>  CATEGORIES = x11
> -REVISION =   1
> 
>  HOMEPAGE =   http://herbstluftwm.org/
> 
> +MAINTAINER = Florian Stinglmayr 
> +
>  # BSD
>  PERMIT_PACKAGE_CDROM =   Yes
> 
> -WANTLIB += X11 Xext Xinerama c glib-2.0 pthread
> +WANTLIB += X11 Xext Xinerama c estdc++ glib-2.0 intl m pthread
> 
>  MASTER_SITES =   http://herbstluftwm.org/tarballs/
> 
> -MODULES =devel/gettext
> +MODULES =gcc4
> +
> +MODGCC4_LANGS=   c++
> +MODGCC4_ARCHS=   *
> 
> -LIB_DEPENDS =devel/glib2
> +LIB_DEPENDS +=   devel/glib2
> 
> -RUN_DEPENDS =devel/desktop-file-utils \
> +RUN_DEPENDS +=   devel/desktop-file-utils \
>   shells/bash \
>   x11/dzen2,-gadgets
> 
>  USE_GMAKE =  Yes
> -MAKE_FLAGS = CC="${CC}" LDFLAGS= VERBOSE= COLOR=0
> +MAKE_FLAGS = LDFLAGS= VERBOSE= COLOR=0
> 
>  BASEDIR =${PREFIX}/share/examples/herbstluftwm
>  FAKE_FLAGS = SYSCONFDIR="${BASEDIR}" \
> @@ -33,9 +37,5 @@ FAKE_FLAGS =SYSCONFDIR="${BASEDIR}" \
>   XSESSIONSDIR="${PREFIX}/share/applications"
> 
>  NO_TEST =Yes
> -
> -post-patch:
> - perl -pi -e "s,^#!/bin/bash,#!${LOCALBASE}/bin/bash," \
> - `grep -Rl /bin/bash ${WRKSRC}/*`
> 
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/herbstluftwm/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 distinfo
> --- distinfo  5 Apr 2014 05:42:07 -   1.2
> +++ distinfo  18 Apr 2016 20:22:58 -
> @@ -1,2 +1,2 @@
> -SHA256 (herbstluftwm-0.6.2.tar.gz) =
> qJ9cOXrufxqjs53VO8Z+KCZ58C8cC/PDPEGmCOIX8Kw= -SIZE
> (herbstluftwm-0.6.2.tar.gz) = 224191 +SHA256
> (herbstluftwm-0.7.0.tar.gz) =
> fi/8MLeRFAcjCl7rYeBEzqeFV5mRB9NyvC28PYLQric= +SIZE
> (herbstluftwm-0.7.0.tar.gz) = 247469 Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/herbstluftwm/pkg/PLIST,v retrieving revision
> 1.2 diff -u -p -u -r1.2 PLIST
> --- pkg/PLIST 5 Apr 2014 05:42:07 -   1.2
> +++ pkg/PLIST 18 Apr 2016 20:22:58 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST,v 1.2 2014/04/05 05:42:07 bcallah Exp $
> +@bin bin/dmenu_run_hlwm
>  @bin bin/herbstclient
>  @bin bin/herbstluftwm
>  @man man/man1/herbstclient.1
> @@ -7,9 +8,9 @@
>  share/applications/herbstluftwm.desktop
>  share/doc/herbstluftwm/
>  share/doc/herbstluftwm/BUGS
> +share/doc/herbstluftwm/INSTALL
>  share/doc/herbstluftwm/LICENSE
>  share/doc/herbstluftwm/NEWS
> -share/doc/herbstluftwm/README
>  share/doc/herbstluftwm/herbstclient.html
>  share/doc/herbstluftwm/herbstluftwm-tutorial.html
>  share/doc/herbstluftwm/herbstluftwm.html
> @@ -29,9 +30,12 @@ share/examples/herbstluftwm/keychain.sh
>  share/examples/herbstluftwm/lasttag.sh
>  share/examples/herbstluftwm/layout.sh
>  share/examples/herbstluftwm/loadstate.sh
> +share/examples/herbstluftwm/maximize.sh
>  share/examples/herbstluftwm/q3terminal.sh
>  share/examples/herbstluftwm/savestate.sh
>  share/examples/herbstluftwm/scratchpad.sh
> +share/examples/herbstluftwm/toggledualhead.sh
> +share/examples/herbstluftwm/windowmenu.sh
>  share/examples/herbstluftwm/wselect.sh
>  

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/04/18 14:36:51

Modified files:
infrastructure/man/man1: dpb.1 

Log message:
tweak phrasing; from mmcc@

Re: UPDATE: herbstluftwm to 0.7.0

[Florian Stinglmayr]

On Mon, Apr 18, 2016 at 08:32:46PM +0200, Christopher Zimmermann wrote:
> I have a finished herbstluftwm port upgrade, too.
> You can remove the BUILD_DEPENDS and the CC=egcc in MAKE_FLAGS since the
> gcc4 module takes care of them. Just use += for assignments to
> LIB_DEPENDS and RUN_DEPENDS so you don't overwrite the assignments
> made by the gcc4 module.

Thanks for the suggestions, it's fixed in a new diff below.

It's weird btw. Their entire code base is basically C with a few C++11
things mixed in there.

> I could remove intl, m and pthread from WANTLIB, after adding
> devel/gettext to MODULES.
>

naddy@ wishes to remove the devel/gettext module [1] and thus I cleaned
up herbstluftwm while I am at it.

> a fixed RUN_DEPENDS is overkill. You may mention dmenu in a MESSAGE, if
> you want to. I don't think it is necessary.
>

You are right, it isn't. It is covered well enough in herbstluftwm's
FAQ on their homepage.

Regards,
Florian

[1] https://marc.info/?l=openbsd-ports=145917613914938

Index: Makefile
===
RCS file: /cvs/ports/x11/herbstluftwm/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile25 Aug 2015 13:18:28 -  1.4
+++ Makefile18 Apr 2016 20:22:58 -
@@ -1,29 +1,33 @@
 # $OpenBSD: Makefile,v 1.4 2015/08/25 13:18:28 sthen Exp $

 COMMENT =  manual tiling window manager
-DISTNAME = herbstluftwm-0.6.2
+DISTNAME = herbstluftwm-0.7.0
 CATEGORIES =   x11
-REVISION = 1

 HOMEPAGE = http://herbstluftwm.org/

+MAINTAINER =   Florian Stinglmayr 
+
 # BSD
 PERMIT_PACKAGE_CDROM = Yes

-WANTLIB += X11 Xext Xinerama c glib-2.0 pthread
+WANTLIB += X11 Xext Xinerama c estdc++ glib-2.0 intl m pthread

 MASTER_SITES = http://herbstluftwm.org/tarballs/

-MODULES =  devel/gettext
+MODULES =  gcc4
+
+MODGCC4_LANGS= c++
+MODGCC4_ARCHS= *

-LIB_DEPENDS =  devel/glib2
+LIB_DEPENDS += devel/glib2

-RUN_DEPENDS =  devel/desktop-file-utils \
+RUN_DEPENDS += devel/desktop-file-utils \
shells/bash \
x11/dzen2,-gadgets

 USE_GMAKE =Yes
-MAKE_FLAGS =   CC="${CC}" LDFLAGS= VERBOSE= COLOR=0
+MAKE_FLAGS =   LDFLAGS= VERBOSE= COLOR=0

 BASEDIR =  ${PREFIX}/share/examples/herbstluftwm
 FAKE_FLAGS =   SYSCONFDIR="${BASEDIR}" \
@@ -33,9 +37,5 @@ FAKE_FLAGS =  SYSCONFDIR="${BASEDIR}" \
XSESSIONSDIR="${PREFIX}/share/applications"

 NO_TEST =  Yes
-
-post-patch:
-   perl -pi -e "s,^#!/bin/bash,#!${LOCALBASE}/bin/bash," \
-   `grep -Rl /bin/bash ${WRKSRC}/*`

 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/herbstluftwm/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo5 Apr 2014 05:42:07 -   1.2
+++ distinfo18 Apr 2016 20:22:58 -
@@ -1,2 +1,2 @@
-SHA256 (herbstluftwm-0.6.2.tar.gz) = 
qJ9cOXrufxqjs53VO8Z+KCZ58C8cC/PDPEGmCOIX8Kw=
-SIZE (herbstluftwm-0.6.2.tar.gz) = 224191
+SHA256 (herbstluftwm-0.7.0.tar.gz) = 
fi/8MLeRFAcjCl7rYeBEzqeFV5mRB9NyvC28PYLQric=
+SIZE (herbstluftwm-0.7.0.tar.gz) = 247469
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/herbstluftwm/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST   5 Apr 2014 05:42:07 -   1.2
+++ pkg/PLIST   18 Apr 2016 20:22:58 -
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.2 2014/04/05 05:42:07 bcallah Exp $
+@bin bin/dmenu_run_hlwm
 @bin bin/herbstclient
 @bin bin/herbstluftwm
 @man man/man1/herbstclient.1
@@ -7,9 +8,9 @@
 share/applications/herbstluftwm.desktop
 share/doc/herbstluftwm/
 share/doc/herbstluftwm/BUGS
+share/doc/herbstluftwm/INSTALL
 share/doc/herbstluftwm/LICENSE
 share/doc/herbstluftwm/NEWS
-share/doc/herbstluftwm/README
 share/doc/herbstluftwm/herbstclient.html
 share/doc/herbstluftwm/herbstluftwm-tutorial.html
 share/doc/herbstluftwm/herbstluftwm.html
@@ -29,9 +30,12 @@ share/examples/herbstluftwm/keychain.sh
 share/examples/herbstluftwm/lasttag.sh
 share/examples/herbstluftwm/layout.sh
 share/examples/herbstluftwm/loadstate.sh
+share/examples/herbstluftwm/maximize.sh
 share/examples/herbstluftwm/q3terminal.sh
 share/examples/herbstluftwm/savestate.sh
 share/examples/herbstluftwm/scratchpad.sh
+share/examples/herbstluftwm/toggledualhead.sh
+share/examples/herbstluftwm/windowmenu.sh
 share/examples/herbstluftwm/wselect.sh
 share/examples/herbstluftwm/xdg/
 share/examples/herbstluftwm/xdg/herbstluftwm/

UPDATE: audio/audacious 3.7.2

[Caspar Schutijser]

Hi ports@,

Below is an attempt to update audio/audacious{,-plugins} to 3.7.2.

The codebase is now C++11 so I included the gcc4 module.

Also, upstream changed back from Gtk+ 3 to Gtk+ 2:

> We have switched back to using GTK+ version 2.x by default. It has
> now been over three years since the release of GTK+ 3.0, and yet
> the "legacy" version of the toolkit provides more features relevant
> to Audacious, better cross-platform support, a more stable API, and
> lower memory usage. Audacious can still be built with GTK3 if
> desired, but we recommend the GTK2 variant for any desktop environment
> other than GNOME 3.

Source: http://audacious-media-player.org/news/32-audacious-3-6-released

So they still provide a Gtk+ 3 version (in a separate distfile) but I
followed their recommendation to switch to Gtk+ 2. I didn't test with
Gnome 3.

Feedback is appreciated.

Best regards,
Caspar Schutijser


Index: audacious/Makefile
===
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- audacious/Makefile  18 Mar 2016 21:38:22 -  1.54
+++ audacious/Makefile  18 Apr 2016 19:10:21 -
@@ -4,14 +4,13 @@ BROKEN-arm =  no atomic ops / __sync_fetc
 BROKEN-hppa =  no atomic ops / __sync_fetch_and_add_4
 BROKEN-alpha = tinylock.c:58: internal compiler error: in extract_insn, at 
recog.c:2077
 
-COMMENT =  Gtk+3 media player
+COMMENT =  Gtk+2 media player
 
-DISTNAME = audacious-3.5.2
-REVISION = 0
+DISTNAME = audacious-3.7.2
 
-SHARED_LIBS += audcore 3.0 # 1.0
-SHARED_LIBS += audgui  3.0 # 1.0
-SHARED_LIBS += audtag  2.1 # 1.0
+SHARED_LIBS += audcore 4.0 # 1.0
+SHARED_LIBS += audgui  4.0 # 1.0
+SHARED_LIBS += audtag  3.0 # 1.0
 
 CATEGORIES =   audio multimedia
 
@@ -20,10 +19,11 @@ HOMEPAGE =  http://audacious-media-playe
 # BSD
 PERMIT_PACKAGE_CDROM =Yes
 
-WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gtk-3 guess m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pthread z
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk_pixbuf-2.0 gdk-x11-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pthread z
 
 MASTER_SITES = http://distfiles.audacious-media-player.org/
 
@@ -31,10 +31,13 @@ EXTRACT_SUFX =  .tar.bz2
 
 MODULES =  devel/gettext
 
+MODULES += gcc4
+MODGCC4_ARCHS =*
+MODGCC4_LANGS =c++
+
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS =  devel/libguess>=1.2 \
-   x11/gtk+3
+LIB_DEPENDS =  x11/gtk+2
 
 MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \
LIBaudgui_VERSION=${LIBaudgui_VERSION} \
Index: audacious/distinfo
===
RCS file: /cvs/ports/audio/audacious/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- audacious/distinfo  3 Nov 2014 04:28:11 -   1.21
+++ audacious/distinfo  18 Apr 2016 19:10:21 -
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.5.2.tar.bz2) = ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
-SIZE (audacious-3.5.2.tar.bz2) = 448436
+SHA256 (audacious-3.7.2.tar.bz2) = BPnqukUizpZ05u2K/HvWtfqaHiQPgJBYn8GHT2ZZ80A=
+SIZE (audacious-3.7.2.tar.bz2) = 572437
Index: audacious/patches/patch-src_libaudcore_Makefile
===
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_libaudcore_Makefile
--- audacious/patches/patch-src_libaudcore_Makefile 3 Nov 2014 04:28:11 
-   1.7
+++ audacious/patches/patch-src_libaudcore_Makefile 18 Apr 2016 19:10:21 
-
@@ -1,9 +1,9 @@
 $OpenBSD: patch-src_libaudcore_Makefile,v 1.7 2014/11/03 04:28:11 bcallah Exp $
 src/libaudcore/Makefile.orig   Thu Oct 16 20:00:28 2014
-+++ src/libaudcore/MakefileSat Nov  1 19:11:40 2014
+--- src/libaudcore/Makefile.orig   Tue Dec 29 03:28:36 2015
 src/libaudcore/MakefileThu Mar 10 15:19:57 2016
 @@ -1,4 +1,4 @@
 -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
 +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
- LIB_MAJOR = 2
- LIB_MINOR = 0
+ LIB_MAJOR = 3
+ LIB_MINOR = 1
  
Index: audacious/patches/patch-src_libaudcore_vfs_h
===
RCS file: audacious/patches/patch-src_libaudcore_vfs_h
diff -N audacious/patches/patch-src_libaudcore_vfs_h
--- /dev/null  

Re: UPDATE: herbstluftwm to 0.7.0

[Christopher Zimmermann]

On 2016-04-18 Florian Stinglmayr  wrote:
> Hi list,
> 
> below is an update for herbstluftwm to 0.7.0 which was released
> earlier this year. Some new features are:

Hi,

I have a finished herbstluftwm port upgrade, too.
You can remove the BUILD_DEPENDS and the CC=egcc in MAKE_FLAGS since the
gcc4 module takes care of them. Just use += for assignments to
LIB_DEPENDS and RUN_DEPENDS so you don't overwrite the assignments
made by the gcc4 module. I could remove intl, m and pthread from
WANTLIB, after adding devel/gettext to MODULES.

> The port runs well for me but I have one question: dmenu_run_hlwm
> requires x11/dmenu (so RUN_DEPENDS) obviously, but the default
> herbstluftwm does not mention or use dmenu_run_hlwm. How should I
> handle this: Either with a fixed RUN_DEPENDS on dmenu_run_hlwm or
> just with a note that suggests to install dmenu if you wish to use
> dmenu_run_hlwm?

a fixed RUN_DEPENDS is overkill. You may mention dmenu in a MESSAGE, if
you want to. I don't think it is necessary.

> Also I am gladly taking maintainer for this.

great! thanks.

> Regards,
> Florian
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/herbstluftwm/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 Makefile
> --- Makefile  25 Aug 2015 13:18:28 -  1.4
> +++ Makefile  18 Apr 2016 16:45:43 -
> @@ -1,20 +1,26 @@
>  # $OpenBSD: Makefile,v 1.4 2015/08/25 13:18:28 sthen Exp $
>  
>  COMMENT =manual tiling window manager
> -DISTNAME =   herbstluftwm-0.6.2
> +DISTNAME =   herbstluftwm-0.7.0
>  CATEGORIES = x11
> -REVISION =   1
>  
>  HOMEPAGE =   http://herbstluftwm.org/
>  
> +MAINTAINER = Florian Stinglmayr 
> +
>  # BSD
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -WANTLIB += X11 Xext Xinerama c glib-2.0 pthread
> +WANTLIB += X11 Xext Xinerama c estdc++ glib-2.0 intl m pthread
>  
>  MASTER_SITES =   http://herbstluftwm.org/tarballs/
>  
> -MODULES =devel/gettext
> +MODULES =gcc4
> +
> +MODGCC4_LANGS=   c++
> +MODGCC4_ARCHS=   *
> +
> +BUILD_DEPENDS=   lang/gcc/4.9,-c++>=4.9
>  
>  LIB_DEPENDS =devel/glib2
>  
> @@ -23,7 +29,7 @@ RUN_DEPENDS =   devel/desktop-file-utils \
>   x11/dzen2,-gadgets
>  
>  USE_GMAKE =  Yes
> -MAKE_FLAGS = CC="${CC}" LDFLAGS= VERBOSE= COLOR=0
> +MAKE_FLAGS = CC="egcc" LDFLAGS= VERBOSE= COLOR=0
>  
>  BASEDIR =${PREFIX}/share/examples/herbstluftwm
>  FAKE_FLAGS = SYSCONFDIR="${BASEDIR}" \
> @@ -33,9 +39,5 @@ FAKE_FLAGS =SYSCONFDIR="${BASEDIR}" \
>   XSESSIONSDIR="${PREFIX}/share/applications"
>  
>  NO_TEST =Yes
> -
> -post-patch:
> - perl -pi -e "s,^#!/bin/bash,#!${LOCALBASE}/bin/bash," \
> - `grep -Rl /bin/bash ${WRKSRC}/*`
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/herbstluftwm/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 distinfo
> --- distinfo  5 Apr 2014 05:42:07 -   1.2
> +++ distinfo  18 Apr 2016 16:45:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (herbstluftwm-0.6.2.tar.gz) =
> qJ9cOXrufxqjs53VO8Z+KCZ58C8cC/PDPEGmCOIX8Kw= -SIZE
> (herbstluftwm-0.6.2.tar.gz) = 224191 +SHA256
> (herbstluftwm-0.7.0.tar.gz) =
> fi/8MLeRFAcjCl7rYeBEzqeFV5mRB9NyvC28PYLQric= +SIZE
> (herbstluftwm-0.7.0.tar.gz) = 247469 Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/herbstluftwm/pkg/PLIST,v retrieving revision
> 1.2 diff -u -p -u -r1.2 PLIST
> --- pkg/PLIST 5 Apr 2014 05:42:07 -   1.2
> +++ pkg/PLIST 18 Apr 2016 16:45:43 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST,v 1.2 2014/04/05 05:42:07 bcallah Exp $
> +@bin bin/dmenu_run_hlwm
>  @bin bin/herbstclient
>  @bin bin/herbstluftwm
>  @man man/man1/herbstclient.1
> @@ -7,9 +8,9 @@
>  share/applications/herbstluftwm.desktop
>  share/doc/herbstluftwm/
>  share/doc/herbstluftwm/BUGS
> +share/doc/herbstluftwm/INSTALL
>  share/doc/herbstluftwm/LICENSE
>  share/doc/herbstluftwm/NEWS
> -share/doc/herbstluftwm/README
>  share/doc/herbstluftwm/herbstclient.html
>  share/doc/herbstluftwm/herbstluftwm-tutorial.html
>  share/doc/herbstluftwm/herbstluftwm.html
> @@ -29,9 +30,12 @@ share/examples/herbstluftwm/keychain.sh
>  share/examples/herbstluftwm/lasttag.sh
>  share/examples/herbstluftwm/layout.sh
>  share/examples/herbstluftwm/loadstate.sh
> +share/examples/herbstluftwm/maximize.sh
>  share/examples/herbstluftwm/q3terminal.sh
>  share/examples/herbstluftwm/savestate.sh
>  share/examples/herbstluftwm/scratchpad.sh
> +share/examples/herbstluftwm/toggledualhead.sh
> +share/examples/herbstluftwm/windowmenu.sh
>  share/examples/herbstluftwm/wselect.sh
>  share/examples/herbstluftwm/xdg/
>  share/examples/herbstluftwm/xdg/herbstluftwm/
> 



-- 
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
2779 7F73 44FD 0736 B67A  C410 69EC 7922 34B4 2566


pgpija6K7jKxE.pgp

Re: update: sysutils/sysclean 1.3

[Amit Kulkarni]

On Mon, Apr 18, 2016 at 12:50 PM, Sebastien Marie 
wrote:

> On Mon, Apr 18, 2016 at 10:25:48AM -0500, Amit Kulkarni wrote:
> >
> > Thanks guys for the sysclean.ignore, I was going to ask for adding
> > /etc/doas.conf to the ignore :), but I can set it locally as well.
>
> The default list of expected files (files which aren't reported as
> potentially "obsolete") is taken from a default install. Anything other
> is reported (if not present in sysclean.ignore).
>
> On a standard host, it could include lot of files in /etc... but
> sysclean wouldn't have any way to know if it is a wanted file (because
> you added it and still use it), or an old file (because for example you
> don't use anymore the associated program).
>
> So, as `/etc/doas.conf' isn't installed in a default install, you have
> added it manually. So you can add it too in /etc/sysclean.ignore :)
>
> Here is the logic behind.
>
> Note that /etc/hostname.* are installed during install but are reported
> with version 1.3 (whereas 1.1 doesn't). This problem will addressed in
> upcoming 1.4.
>
> Thanks for your interest.
>

Thanks, I cleaned my machine dating back almost 3 years of upgrades, it is
now almost like new :)

CVS: cvs.openbsd.org: ports

[Ian Darwin]

CVSROOT:/cvs
Module name:ports
Changes by: i...@cvs.openbsd.org2016/04/18 12:42:30

Modified files:
devel/jenkins/devel: Makefile distinfo 
devel/jenkins/stable: Makefile distinfo 

Log message:
Update to 1.651/1.656, fixes CVS-2016-0788 to 0792, thanks Sevan Janiyan.

Re: devel/jenkins - multiple vulnerabilities

[Ian Darwin]

On Mon, Apr 18, 2016 at 02:10:56PM +0100, Sevan Janiyan wrote:
> Hello,
> Both the devel & stable releases of Jenkins in ports are vulnerable to
> CVE-2016-0788 through to 0792.

Updated, thanks.

Re: NEW: devel/gox

[Frank Groeneveld]

On Mon, Apr 18, 2016 at 08:18:51PM +0200, Frank Groeneveld wrote:
> Attached another build dependency for gitlab-ci-multi-runner: gox.
> 
> Gox is a simple, no-frills tool for Go cross compilation that behaves a
> lot like standard go build. Gox will parallelize builds for multiple 
> platforms.  Gox will also build the cross-compilation toolchain for you.
> 
> Any comments or OK's?
> 
> Thanks!
> 
> Frank

You can discard this port, we don't need it, because we can not build
the needed docker container for gitlab-ci-multi-runner on OpenBSD.
We'll have to download a binary BLOB for the container, which means we
don't need this port.

Sorry for the noise.

Frank

Re: update: sysutils/sysclean 1.3

[Marc Espie]

On Mon, Apr 18, 2016 at 07:50:53PM +0200, Sebastien Marie wrote:
> On Mon, Apr 18, 2016 at 10:25:48AM -0500, Amit Kulkarni wrote:
> > 
> > Thanks guys for the sysclean.ignore, I was going to ask for adding
> > /etc/doas.conf to the ignore :), but I can set it locally as well.
> 
> The default list of expected files (files which aren't reported as
> potentially "obsolete") is taken from a default install. Anything other
> is reported (if not present in sysclean.ignore).
> 
> On a standard host, it could include lot of files in /etc... but
> sysclean wouldn't have any way to know if it is a wanted file (because
> you added it and still use it), or an old file (because for example you
> don't use anymore the associated program).
> 
> So, as `/etc/doas.conf' isn't installed in a default install, you have
> added it manually. So you can add it too in /etc/sysclean.ignore :)

for the next version, you may want to do s,/etc/examples/,/etc,  

Those files generally belong.

Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

[Jeremie Courreges-Anglas]

Vijay Sankar  writes:

>  Quoting j...@wxcvbn.org:
>
>> Move to latest upstream versions.
>>
>> - libtalloc tests now fail intermittently, upstream seems to have
>> introduced an unstable comparison method in pytalloc
>> - more libraries move to the private directory
>> - shared lib bumps still hard to get right, some of them are not tracked
>> upstream, thus some bumps come from upstream .sigs, some from
>> abi-compliance-checker (confirmed with nm -g).
>> - dbus added to BDEPS, needed to build vfs_snapper; not enforced in
>> RDEPS but dbus is brought in by avahi anyway
>> - LDEPS and WANTLIB cleanup
>>
>> Build and test reports welcome!

[...]

> Thank you very much. Patches all worked for me -- I had to manually
> download samba and tdb but once they were available in distfiles, there
> were no issues building the packages.

Ok.  I'm also interested in usage reports, 'cause we haven't tested
4.4.x yet at $DAYJOB, only 4.3.

> -rw-r--r--  3 vijay  vijay   83018 Apr 18 09:49 tdb-1.3.8.tgz
> -rw-r--r--  3 vijay  vijay   56656 Apr 18 09:50
> libtalloc-2.1.6.tgz
> -rw-r--r--  3 vijay  vijay    18771661 Apr 18 10:19 samba-4.4.2.tgz
> -rw-r--r--  3 vijay  vijay  193336 Apr 18 10:19 ldb-1.1.26.tgz
> -rw-r--r--  3 vijay  vijay   50760 Apr 18 10:19
> tevent-0.9.28.tgz
> -rw-r--r--  3 vijay  vijay    5865 Apr 18 10:19
> samba-util-4.4.2.tgz
> -rw-r--r--  4 vijay  vijay  174037 Apr 18 10:19
> samba-docs-4.4.2.tgz
>
> Most probably the problems are due to my network and firewall configuration
> and nothing to do with the Makefile but noting this below just in case it
> is relevant.
>
> With tdb,  MASTER_SITES http://samba.org/ftp/tdb/ goes to
> https://www.samba.org/ftp/tdb/ so I am not sure if that causes the problem
> with downloading tdb.

No, only the directory listing is redirected.  But I'll move tdb and
talloc to https://

>
> With samba-4.4.2, I had the error
>
> ===>  Checking files for samba-4.4.2
>>> Fetch https://download.samba.org/pub/samba/stable/samba-4.4.2.tar.gz
> ftp: connect: No route to host

The problem is the samba website, which is a bit overloaded to say the
least...

>>> Fetch
> https://download.samba.org/pub/samba/old-versions/samba-4.4.2.tar.gz
> ftp: Error retrieving file: 404 Not Found
>>> Fetch http://ftp.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
> ftp: Error retrieving file: 404 Not Found
>>> Fetch
> ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
> samba-4.4.2.tar.gz: No such file or directory.
>>> Fetch
> http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
> ftp: Error retrieving file: 404 Not Found
>
> Thanks again,

Well, thanks for your report! :)

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

Re: NEW: devel/go-bindata

[Frank Groeneveld]

On Fri, Apr 08, 2016 at 04:32:36PM +0200, Frank Groeneveld wrote:
> Thanks to Dmitrij D. Czarkof, I hereby sent you a port for go-bindata.
> 
> A tool that can be used to embed binary data in a Go program. It is a
> build requirement for gitlab-ci-multi-runner,for which I'm planning to
> create a port.
> 
> Please let me know if this port works everywhere and whether it needs
> any changes before being committed.

Ping?

Frank


go-bindata-3.0.5.tar.gz
Description: application/tar-gz

NEW: devel/gox

[Frank Groeneveld]

Attached another build dependency for gitlab-ci-multi-runner: gox.

Gox is a simple, no-frills tool for Go cross compilation that behaves a
lot like standard go build. Gox will parallelize builds for multiple 
platforms.  Gox will also build the cross-compilation toolchain for you.

Any comments or OK's?

Thanks!

Frank


gox-0.3.0.tar.gz
Description: application/tar-gz

Re: www/otter-browser crash on startup net/libproxy / x11/qt5 related?

[Adam Wolk]

On Mon, 18 Apr 2016 19:15:53 +0200
Antoine Jacoutot  wrote:

> On Mon, Apr 18, 2016 at 07:00:35PM +0200, Adam Wolk wrote:
> > On Mon, 18 Apr 2016 17:34:28 +0200
> > Adam Wolk  wrote:
> >   
> > > On Wed, 30 Mar 2016 17:10:34 +0100
> > > Stuart Henderson  wrote:
> > >   
> > > > On 2016/03/30 15:49, Adam Wolk wrote:
> > > > > Roughly I'm interested if anyone else can confirm that they
> > > > > get otter crashing on startup by default.  
> > > > 
> > > > FWIW it's starting OK for me, with a recently updated pkg snap.
> > > > I'm not seeing any qt4 libraries being pulled in:
> > > > 
> > > 
> > > Well I now have a second qt5 port that segfaults when trying to
> > > use libproxy.
> > > 
> > > devel/zeal
> > > https://gist.github.com/mulander/84f9f577fd4489fc581c593cabd15895
> > > 
> > > Here's the interesting part though. It doesn't crash when I'm
> > > running xfce4. The segfaults happen only when I'm running gnome3
> > > (3.18.2).
> > > 
> > > Did anyone hit similar problems with qt5 based ports on Gnome?
> > > 
> > > Regards,
> > > Adam
> > >   
> > 
> > With help from sthen@ I managed to pin point the crash to a null
> > pointer dereference in libproxy.
> > 
> > The issue has been reported upstream:
> >  https://github.com/libproxy/libproxy/issues/24
> > with a patch to fix the problem:
> >  https://github.com/libproxy/libproxy/pull/25
> > 
> > I would like to suggest adding the patch to our current libproxy
> > port as the bug prevents www/otter-browser & devel/zeal from even
> > starting up on Gnome 3. It might impact more qt5 related ports when
> > ran under Gnome 3 (anything network related using libproxy).
> > 
> > Any OK's for adding the patch?  
> 
> OK for me with 2 nitpicks :
> 
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/libproxy/Makefile,v
> > retrieving revision 1.47
> > diff -u -p -r1.47 Makefile
> > --- Makefile20 Mar 2016 17:59:21 -  1.47
> > +++ Makefile18 Apr 2016 16:55:33 -
> > @@ -6,7 +6,7 @@ COMMENT-webkit= pacrunner libproxy
> > plug GH_ACCOUNT=libproxy
> >  GH_PROJECT=libproxy
> >  GH_TAGNAME=0.4.12
> > -REVISION=  0
> > +REVISION=  1  
> 
> You are bumping 2 packages here.
> Use this instead:
> REVISION-main=1
> 

Done.

> >  SUBST_VARS=GH_TAGNAME
> >  
> >  PKGNAME-main=  ${DISTNAME}
> > Index: patches/patch-libproxy_modules_ignore_ip_cpp
> > ===
> > RCS file: patches/patch-libproxy_modules_ignore_ip_cpp
> > diff -N patches/patch-libproxy_modules_ignore_ip_cpp
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-libproxy_modules_ignore_ip_cpp18 Apr 2016
> > 16:55:33 - @@ -0,0 +1,22 @@
> > +$OpenBSD$  
> 
> Just add this:
> 
> https://github.com/libproxy/libproxy/issues/24
> 
> It's enough. And people who want to know more can follow the link.
> 

Limited the info just to the link.

Committed. Let me know if something needs changes.

> > +Fix a null pointer dereference for qt5 applications when using
> > +gnome 3.
> > +
> > +Prevents a crash of the following ports on gnome 3:
> > + - devel/zeal
> > + - www/otter-browser
> > +
> > +Reported upstream with a fix:
> > + - https://github.com/libproxy/libproxy/issues/24
> > + - https://github.com/libproxy/libproxy/pull/25
> > +--- libproxy/modules/ignore_ip.cpp.origMon Apr 18 18:14:53
> > 2016  libproxy/modules/ignore_ip.cppMon Apr 18 18:15:26
> > 2016 +@@ -147,7 +147,7 @@ class ip_ignore_extension : public
> > ignore_extension { 
> > +   else
> > +   {
> > +   /* If CIDR notation was used, get
> > the netmask */ +-   if
> > (sscanf(mask.c_str(), "%d", ) == 1)
> > ++  if (ign_ip &&
> > sscanf(mask.c_str(), "%d", ) == 1)
> > +   net_ip =
> > sockaddr_from_cidr(ign_ip->sa_family, cidr);
> > +   }
> > + 
> >   
> 

Re: update: sysutils/sysclean 1.3

[Sebastien Marie]

On Mon, Apr 18, 2016 at 10:25:48AM -0500, Amit Kulkarni wrote:
> 
> Thanks guys for the sysclean.ignore, I was going to ask for adding
> /etc/doas.conf to the ignore :), but I can set it locally as well.

The default list of expected files (files which aren't reported as
potentially "obsolete") is taken from a default install. Anything other
is reported (if not present in sysclean.ignore).

On a standard host, it could include lot of files in /etc... but
sysclean wouldn't have any way to know if it is a wanted file (because
you added it and still use it), or an old file (because for example you
don't use anymore the associated program).

So, as `/etc/doas.conf' isn't installed in a default install, you have
added it manually. So you can add it too in /etc/sysclean.ignore :)

Here is the logic behind.

Note that /etc/hostname.* are installed during install but are reported
with version 1.3 (whereas 1.1 doesn't). This problem will addressed in
upcoming 1.4.

Thanks for your interest.
-- 
Sebastien Marie

Re: mailman changes

[Okan Demirmen]

On Mon 2016.04.04 at 15:22 -0400, Okan Demirmen wrote:
> On Wed 2016.03.23 at 13:27 +, Stuart Henderson wrote:
> > On 2016/03/23 08:48, Okan Demirmen wrote:
> > > I believe the cgi/mail wrapper check could actually look at the defined
> > > group membership instead.
> > 
> > Oh this is a much better approach. I was considering rewriting the check
> > to allow any one of a hardcoded list, but that's a much better idea.
> > 
> > I'm not using mailman myself but think this is a good way to do it.
> 
> dlg's comment to was use another group, _mailmanq; with that, here's an
> updated diff to go in the cgi/mail wrapper rewrite direction with a new
> group (of course mail/Makefile to be updated as well).
> 
> Summary:
> - update to 2.1.21
> - remove configure patch: hasn't been required since introducing 
>   --without-permcheck in configure
> - some of Defaults.py are now upstream defaults.
> - rewrite cgi/mail wrapper (check_caller()) to check calling uid 
>   against --with-cgi-gid/--with-mail-gid defined group.
> - no longer requires a FLAVOR for each mail/web server.
> 
> Thanks,
> Okan

Perhaps not many (any?) mailman users but myself and dlg@...maybe
another porter's point-of-view for sanity's sake :) Otherwise, I'll
move ahead.

Thanks!
Okan

> Index: user.list
> ===
> RCS file: /cvs/ports/infrastructure/db/user.list,v
> retrieving revision 1.264
> diff -u -p -r1.264 user.list
> --- user.list 4 Apr 2016 12:05:37 -   1.264
> +++ user.list 4 Apr 2016 19:07:36 -
> @@ -276,3 +276,4 @@ id  user  group   port options
>  765 _hedgewars   _hedgewars  games/hedgewars
>  766 _kibana  _kibana www/kibana
>  767 _squeezelite _squeezeliteaudio/squeezelite
> +768  _mailmanq   mail/mailman
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/mailman/Makefile,v
> retrieving revision 1.83
> diff -u -p -r1.83 Makefile
> --- Makefile  19 Mar 2016 10:31:44 -  1.83
> +++ Makefile  4 Apr 2016 19:07:25 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT= mailing list manager with web interface
>  
> -DISTNAME=mailman-2.1.20
> -REVISION=0
> +DISTNAME=mailman-2.1.21
>  CATEGORIES=  mail www
>  
>  HOMEPAGE=https://www.gnu.org/software/mailman/
> @@ -32,8 +31,6 @@ FAKE_FLAGS= DIRSETGID=":"
>  
>  # gnu still breaks the paths as prefix is actually mailman's home
>  CONFIGURE_STYLE= simple
> -# do not use --without-permcheck as this requires the mailman user and group
> -# to exist, otherwise there will be problems running mailman
>  CONFIGURE_ARGS+= --prefix='${MMHOME}' \
>   --with-mailhost=localhost.my.domain \
>   --with-python=${MODPY_BIN} \
> @@ -41,19 +38,9 @@ CONFIGURE_ARGS+=   --prefix='${MMHOME}' \
>   --with-var-prefix='${MMSPOOL}' \
>   --without-permcheck \
>   --with-username=_mailman \
> - --with-groupname=_mailman
> -
> -FLAVORS= smtpd postfix sendmail
> -FLAVOR?= smtpd
> -.if ${FLAVOR:Mpostfix}
> -CONFIGURE_ARGS+=--with-mail-gid=_mailman
> -.elif ${FLAVOR:Msendmail}
> -CONFIGURE_ARGS+=--with-mail-gid=daemon
> -.elif ${FLAVOR:Msmtpd}
> -CONFIGURE_ARGS+=--with-mail-gid=_smtpd
> -.else
> -ERRORS+="Fatal: a flavor (smtpd, postfix, sendmail) must be specified"
> -.endif
> + --with-groupname=_mailman \
> + --with-cgi-gid=_mailmanq \
> + --with-mail-gid=_mailmanq
>  
>  SCRIPTS= Mailman/Archiver/pipermail.py \
>   Mailman/Post.py \
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/mailman/distinfo,v
> retrieving revision 1.23
> diff -u -p -r1.23 distinfo
> --- distinfo  9 Apr 2015 15:37:08 -   1.23
> +++ distinfo  4 Apr 2016 19:07:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (mailman-2.1.20.tgz) = UiwrXFq5E5j9+UmolhFiwxT2MjzRv+uQfg+y2IJ3cR8=
> -SIZE (mailman-2.1.20.tgz) = 9204867
> +SHA256 (mailman-2.1.21.tgz) = /tM6GBVN6qToGiB5jIFEhe1LLl2LQs9tPVWGf/T3CEM=
> +SIZE (mailman-2.1.21.tgz) = 9266286
> Index: patches/patch-Mailman_Defaults_py_in
> ===
> RCS file: /cvs/ports/mail/mailman/patches/patch-Mailman_Defaults_py_in,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-Mailman_Defaults_py_in
> --- patches/patch-Mailman_Defaults_py_in  9 Apr 2015 15:37:08 -   
> 1.13
> +++ patches/patch-Mailman_Defaults_py_in  4 Apr 2016 19:07:25 -
> @@ -1,27 +1,12 @@
>  $OpenBSD: patch-Mailman_Defaults_py_in,v 1.13 2015/04/09 15:37:08 okan Exp $
>  Mailman/Defaults.py.in.orig  Sat Feb 28 11:41:04 2015
> -+++ Mailman/Defaults.py.in   Sun Mar 22 11:55:07 2015
> -@@ -539,7 +539,22 @@ SMTPPORT = 0  # de
> 

CVS: cvs.openbsd.org: ports

[Adam Wolk]

CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/04/18 11:44:40

Modified files:
net/libproxy   : Makefile 
Added files:
net/libproxy/patches: patch-libproxy_modules_ignore_ip_cpp 

Log message:
Add a patch to prevent a null pointer dereference in net/libproxy under Gnome

Qt5 started to use libproxy and this exposed a crashing bug on OpenBSD
when using Qt5 applications on Gnome 3.

Here's a sample backtrace:
https://gist.github.com/mulander/c03997ae7e3fe4e30af0d4f2ce2965f0

The issue is caused by an unguarded dereference of ign_ip.

Other parts of the code properly expect that sockaddr_from_string
might return null and guard against it.

Adding a proper guard prevents a segfault both in OpenBSD
www/otter-browser and devel/zeal.

Issue reported upstream in:
https://github.com/libproxy/libproxy/issues/24

OK zhuk@ aja@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/04/18 11:33:12

Modified files:
java/jna   : Makefile distinfo 
java/jna/files : jna.clj 

Log message:
update to jna-4.2.2

Re: www/otter-browser crash on startup net/libproxy / x11/qt5 related?

[Antoine Jacoutot]

On Mon, Apr 18, 2016 at 07:00:35PM +0200, Adam Wolk wrote:
> On Mon, 18 Apr 2016 17:34:28 +0200
> Adam Wolk  wrote:
> 
> > On Wed, 30 Mar 2016 17:10:34 +0100
> > Stuart Henderson  wrote:
> > 
> > > On 2016/03/30 15:49, Adam Wolk wrote:  
> > > > Roughly I'm interested if anyone else can confirm that they get
> > > > otter crashing on startup by default.
> > > 
> > > FWIW it's starting OK for me, with a recently updated pkg snap.
> > > I'm not seeing any qt4 libraries being pulled in:
> > >   
> > 
> > Well I now have a second qt5 port that segfaults when trying to use
> > libproxy.
> > 
> > devel/zeal
> > https://gist.github.com/mulander/84f9f577fd4489fc581c593cabd15895
> > 
> > Here's the interesting part though. It doesn't crash when I'm running
> > xfce4. The segfaults happen only when I'm running gnome3 (3.18.2).
> > 
> > Did anyone hit similar problems with qt5 based ports on Gnome?
> > 
> > Regards,
> > Adam
> > 
> 
> With help from sthen@ I managed to pin point the crash to a null
> pointer dereference in libproxy.
> 
> The issue has been reported upstream:
>  https://github.com/libproxy/libproxy/issues/24
> with a patch to fix the problem:
>  https://github.com/libproxy/libproxy/pull/25
> 
> I would like to suggest adding the patch to our current libproxy port
> as the bug prevents www/otter-browser & devel/zeal from even starting
> up on Gnome 3. It might impact more qt5 related ports when ran under
> Gnome 3 (anything network related using libproxy).
> 
> Any OK's for adding the patch?

OK for me with 2 nitpicks :


> Index: Makefile
> ===
> RCS file: /cvs/ports/net/libproxy/Makefile,v
> retrieving revision 1.47
> diff -u -p -r1.47 Makefile
> --- Makefile  20 Mar 2016 17:59:21 -  1.47
> +++ Makefile  18 Apr 2016 16:55:33 -
> @@ -6,7 +6,7 @@ COMMENT-webkit=   pacrunner libproxy plug
>  GH_ACCOUNT=  libproxy
>  GH_PROJECT=  libproxy
>  GH_TAGNAME=  0.4.12
> -REVISION=0
> +REVISION=1

You are bumping 2 packages here.
Use this instead:
REVISION-main=  1

>  SUBST_VARS=  GH_TAGNAME
>  
>  PKGNAME-main=${DISTNAME}
> Index: patches/patch-libproxy_modules_ignore_ip_cpp
> ===
> RCS file: patches/patch-libproxy_modules_ignore_ip_cpp
> diff -N patches/patch-libproxy_modules_ignore_ip_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-libproxy_modules_ignore_ip_cpp  18 Apr 2016 16:55:33 
> -
> @@ -0,0 +1,22 @@
> +$OpenBSD$

Just add this:

https://github.com/libproxy/libproxy/issues/24

It's enough. And people who want to know more can follow the link.

> +Fix a null pointer dereference for qt5 applications when using
> +gnome 3.
> +
> +Prevents a crash of the following ports on gnome 3:
> + - devel/zeal
> + - www/otter-browser
> +
> +Reported upstream with a fix:
> + - https://github.com/libproxy/libproxy/issues/24
> + - https://github.com/libproxy/libproxy/pull/25
> +--- libproxy/modules/ignore_ip.cpp.orig  Mon Apr 18 18:14:53 2016
>  libproxy/modules/ignore_ip.cpp   Mon Apr 18 18:15:26 2016
> +@@ -147,7 +147,7 @@ class ip_ignore_extension : public ignore_extension { 
> + else
> + {
> + /* If CIDR notation was used, get the netmask */
> +-if (sscanf(mask.c_str(), "%d", ) == 1)
> ++if (ign_ip && sscanf(mask.c_str(), "%d", ) 
> == 1)
> + net_ip = 
> sockaddr_from_cidr(ign_ip->sa_family, cidr);
> + }
> + 
> 

-- 
Antoine

UPDATE: herbstluftwm to 0.7.0

[Florian Stinglmayr]

Hi list,

below is an update for herbstluftwm to 0.7.0 which was released earlier
this year. Some new features are:

* EWMH request _NET_WM_MOVERESIZE is handled better now. At least for me
  this fixed weird drawing issues with firefox if the frame is resized.
* New command: close_and_remove
* Tags are now accessible through their index
* Native support for dmenu (through dmenu_run_hlwm)
* Post patch is no longer needed, hardcoded paths have been replaced by
  calls to /usr/bin/env.

The port runs well for me but I have one question: dmenu_run_hlwm
requires x11/dmenu (so RUN_DEPENDS) obviously, but the default
herbstluftwm does not mention or use dmenu_run_hlwm. How should I handle
this: Either with a fixed RUN_DEPENDS on dmenu_run_hlwm or just with a
note that suggests to install dmenu if you wish to use dmenu_run_hlwm?

Also I am gladly taking maintainer for this.

Regards,
Florian

Index: Makefile
===
RCS file: /cvs/ports/x11/herbstluftwm/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile25 Aug 2015 13:18:28 -  1.4
+++ Makefile18 Apr 2016 16:45:43 -
@@ -1,20 +1,26 @@
 # $OpenBSD: Makefile,v 1.4 2015/08/25 13:18:28 sthen Exp $
 
 COMMENT =  manual tiling window manager
-DISTNAME = herbstluftwm-0.6.2
+DISTNAME = herbstluftwm-0.7.0
 CATEGORIES =   x11
-REVISION = 1
 
 HOMEPAGE = http://herbstluftwm.org/
 
+MAINTAINER =   Florian Stinglmayr 
+
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += X11 Xext Xinerama c glib-2.0 pthread
+WANTLIB += X11 Xext Xinerama c estdc++ glib-2.0 intl m pthread
 
 MASTER_SITES = http://herbstluftwm.org/tarballs/
 
-MODULES =  devel/gettext
+MODULES =  gcc4
+
+MODGCC4_LANGS= c++
+MODGCC4_ARCHS= *
+
+BUILD_DEPENDS= lang/gcc/4.9,-c++>=4.9
 
 LIB_DEPENDS =  devel/glib2
 
@@ -23,7 +29,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/dzen2,-gadgets
 
 USE_GMAKE =Yes
-MAKE_FLAGS =   CC="${CC}" LDFLAGS= VERBOSE= COLOR=0
+MAKE_FLAGS =   CC="egcc" LDFLAGS= VERBOSE= COLOR=0
 
 BASEDIR =  ${PREFIX}/share/examples/herbstluftwm
 FAKE_FLAGS =   SYSCONFDIR="${BASEDIR}" \
@@ -33,9 +39,5 @@ FAKE_FLAGS =  SYSCONFDIR="${BASEDIR}" \
XSESSIONSDIR="${PREFIX}/share/applications"
 
 NO_TEST =  Yes
-
-post-patch:
-   perl -pi -e "s,^#!/bin/bash,#!${LOCALBASE}/bin/bash," \
-   `grep -Rl /bin/bash ${WRKSRC}/*`
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/herbstluftwm/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo5 Apr 2014 05:42:07 -   1.2
+++ distinfo18 Apr 2016 16:45:43 -
@@ -1,2 +1,2 @@
-SHA256 (herbstluftwm-0.6.2.tar.gz) = 
qJ9cOXrufxqjs53VO8Z+KCZ58C8cC/PDPEGmCOIX8Kw=
-SIZE (herbstluftwm-0.6.2.tar.gz) = 224191
+SHA256 (herbstluftwm-0.7.0.tar.gz) = 
fi/8MLeRFAcjCl7rYeBEzqeFV5mRB9NyvC28PYLQric=
+SIZE (herbstluftwm-0.7.0.tar.gz) = 247469
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/herbstluftwm/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST   5 Apr 2014 05:42:07 -   1.2
+++ pkg/PLIST   18 Apr 2016 16:45:43 -
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.2 2014/04/05 05:42:07 bcallah Exp $
+@bin bin/dmenu_run_hlwm
 @bin bin/herbstclient
 @bin bin/herbstluftwm
 @man man/man1/herbstclient.1
@@ -7,9 +8,9 @@
 share/applications/herbstluftwm.desktop
 share/doc/herbstluftwm/
 share/doc/herbstluftwm/BUGS
+share/doc/herbstluftwm/INSTALL
 share/doc/herbstluftwm/LICENSE
 share/doc/herbstluftwm/NEWS
-share/doc/herbstluftwm/README
 share/doc/herbstluftwm/herbstclient.html
 share/doc/herbstluftwm/herbstluftwm-tutorial.html
 share/doc/herbstluftwm/herbstluftwm.html
@@ -29,9 +30,12 @@ share/examples/herbstluftwm/keychain.sh
 share/examples/herbstluftwm/lasttag.sh
 share/examples/herbstluftwm/layout.sh
 share/examples/herbstluftwm/loadstate.sh
+share/examples/herbstluftwm/maximize.sh
 share/examples/herbstluftwm/q3terminal.sh
 share/examples/herbstluftwm/savestate.sh
 share/examples/herbstluftwm/scratchpad.sh
+share/examples/herbstluftwm/toggledualhead.sh
+share/examples/herbstluftwm/windowmenu.sh
 share/examples/herbstluftwm/wselect.sh
 share/examples/herbstluftwm/xdg/
 share/examples/herbstluftwm/xdg/herbstluftwm/

[NEW] emulators/hatari

[Frederic Cambus]

Hi ports@,

Here is a new port : emulators/hatari

Tested on amd64.

>From DESCR :

Hatari is an Atari ST/STE/TT/Falcon emulator for Linux, FreeBSD, NetBSD,
BeOS, Mac-OSX and other Systems which are supported by the SDL library.
Unlike most other open source ST emulators which try to give you a good
environment for running GEM applications, Hatari tries to emulate the
hardware as close as possible so that it is able to run most of the old
Atari games and demos.  Because of this, it may be somewhat slower than
less accurate emulators.



hatari.tar.gz
Description: application/tar-gz

Re: www/otter-browser crash on startup net/libproxy / x11/qt5 related?

[Adam Wolk]

On Mon, 18 Apr 2016 17:34:28 +0200
Adam Wolk  wrote:

> On Wed, 30 Mar 2016 17:10:34 +0100
> Stuart Henderson  wrote:
> 
> > On 2016/03/30 15:49, Adam Wolk wrote:  
> > > Roughly I'm interested if anyone else can confirm that they get
> > > otter crashing on startup by default.
> > 
> > FWIW it's starting OK for me, with a recently updated pkg snap.
> > I'm not seeing any qt4 libraries being pulled in:
> >   
> 
> Well I now have a second qt5 port that segfaults when trying to use
> libproxy.
> 
> devel/zeal
> https://gist.github.com/mulander/84f9f577fd4489fc581c593cabd15895
> 
> Here's the interesting part though. It doesn't crash when I'm running
> xfce4. The segfaults happen only when I'm running gnome3 (3.18.2).
> 
> Did anyone hit similar problems with qt5 based ports on Gnome?
> 
> Regards,
> Adam
> 

With help from sthen@ I managed to pin point the crash to a null
pointer dereference in libproxy.

The issue has been reported upstream:
 https://github.com/libproxy/libproxy/issues/24
with a patch to fix the problem:
 https://github.com/libproxy/libproxy/pull/25

I would like to suggest adding the patch to our current libproxy port
as the bug prevents www/otter-browser & devel/zeal from even starting
up on Gnome 3. It might impact more qt5 related ports when ran under
Gnome 3 (anything network related using libproxy).

Any OK's for adding the patch?

Index: Makefile
===
RCS file: /cvs/ports/net/libproxy/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile20 Mar 2016 17:59:21 -  1.47
+++ Makefile18 Apr 2016 16:55:33 -
@@ -6,7 +6,7 @@ COMMENT-webkit= pacrunner libproxy plug
 GH_ACCOUNT=libproxy
 GH_PROJECT=libproxy
 GH_TAGNAME=0.4.12
-REVISION=  0
+REVISION=  1
 SUBST_VARS=GH_TAGNAME
 
 PKGNAME-main=  ${DISTNAME}
Index: patches/patch-libproxy_modules_ignore_ip_cpp
===
RCS file: patches/patch-libproxy_modules_ignore_ip_cpp
diff -N patches/patch-libproxy_modules_ignore_ip_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libproxy_modules_ignore_ip_cpp18 Apr 2016 16:55:33 
-
@@ -0,0 +1,22 @@
+$OpenBSD$
+Fix a null pointer dereference for qt5 applications when using
+gnome 3.
+
+Prevents a crash of the following ports on gnome 3:
+ - devel/zeal
+ - www/otter-browser
+
+Reported upstream with a fix:
+ - https://github.com/libproxy/libproxy/issues/24
+ - https://github.com/libproxy/libproxy/pull/25
+--- libproxy/modules/ignore_ip.cpp.origMon Apr 18 18:14:53 2016
 libproxy/modules/ignore_ip.cpp Mon Apr 18 18:15:26 2016
+@@ -147,7 +147,7 @@ class ip_ignore_extension : public ignore_extension { 
+   else
+   {
+   /* If CIDR notation was used, get the netmask */
+-  if (sscanf(mask.c_str(), "%d", ) == 1)
++  if (ign_ip && sscanf(mask.c_str(), "%d", ) 
== 1)
+   net_ip = 
sockaddr_from_cidr(ign_ip->sa_family, cidr);
+   }
+ 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/04/18 10:57:04

Modified files:
devel/zeal : Makefile 

Log message:
- start COMMENT with lowercase letter
- remove unneeded DISTNAME
- set NO_TEST

Re: www/otter-browser crash on startup net/libproxy / x11/qt5 related?

[Adam Wolk]

On Wed, 30 Mar 2016 17:10:34 +0100
Stuart Henderson  wrote:

> On 2016/03/30 15:49, Adam Wolk wrote:
> > Roughly I'm interested if anyone else can confirm that they get
> > otter crashing on startup by default.  
> 
> FWIW it's starting OK for me, with a recently updated pkg snap.
> I'm not seeing any qt4 libraries being pulled in:
> 

Well I now have a second qt5 port that segfaults when trying to use
libproxy.

devel/zeal
https://gist.github.com/mulander/84f9f577fd4489fc581c593cabd15895

Here's the interesting part though. It doesn't crash when I'm running
xfce4. The segfaults happen only when I'm running gnome3 (3.18.2).

Did anyone hit similar problems with qt5 based ports on Gnome?

Regards,
Adam

Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

[Vijay Sankar]

 Quoting j...@wxcvbn.org:


Move to latest upstream versions.

- libtalloc tests now fail intermittently, upstream seems to have
introduced an unstable comparison method in pytalloc
- more libraries move to the private directory
- shared lib bumps still hard to get right, some of them are not tracked
upstream, thus some bumps come from upstream .sigs, some from
abi-compliance-checker (confirmed with nm -g).
- dbus added to BDEPS, needed to build vfs_snapper; not enforced in
RDEPS but dbus is brought in by avahi anyway
- LDEPS and WANTLIB cleanup

Build and test reports welcome!

Index: databases/tdb/Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- databases/tdb/Makefile        12 Apr 2016 17:38:15 -     

  1.18

+++ databases/tdb/Makefile        17 Apr 2016 20:08:11 -
@@ -2,8 +2,8 @@

COMMENT=        trivial database library

-# Keep in sync with the version bundled in net/samba4
-DISTNAME=        tdb-1.3.7
+# Keep in sync with the version bundled in net/samba
+DISTNAME=        tdb-1.3.8

SHARED_LIBS+=        tdb        4.1

@@ -32,8 +32,9 @@ LIB_DEPENDS=        ${MODPY_LIB_DEPENDS}
WAF_ARGS=        -v -j ${MAKE_JOBS}
MAKE_FLAGS=        WAF_ARGS="${WAF_ARGS}"
.for _l _v in ${SHARED_LIBS}
-MAKE_ENV +=             LIB${_l:S/-/_/g}_VERSION=${_v}
+MAKE_ENV +=        LIB${_l:S/-/_/g}_VERSION=${_v}
.endfor
+TEST_ENV=        LD_LIBRARY_PATH="${WRKSRC}/bin/default"

CONFIGURE_STYLE= simple
CONFIGURE_ARGS= --mandir="${PREFIX}/man" \
Index: databases/tdb/distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- databases/tdb/distinfo        12 Apr 2016 17:38:15 -     

  1.6

+++ databases/tdb/distinfo        17 Apr 2016 17:26:52 -
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.3.7.tar.gz) = pk2VygzAaij+0kxulSrtdmDK4EmDEIc11rwwuSUTZBI=
-SIZE (tdb-1.3.7.tar.gz) = 493847
+SHA256 (tdb-1.3.8.tar.gz) = BgWsBCfqycI79h6/2CBqB9Xs4ZhJjqsXac0M+2595rE=
+SIZE (tdb-1.3.8.tar.gz) = 494106
Index: databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py
===
RCS file:


/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py,v

retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_samba_install_py
--- databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py   
    12 Apr 2016 17:38:15 -        1.2
+++ databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py   
    17 Apr 2016 17:30:13 -
@@ -3,10 +3,13 @@ $OpenBSD: patch-buildtools_wafsamba_samb
- respect OpenBSD shared libraries versioning
- --version-script fails if specified multipled times

 buildtools/wafsamba/samba_install.py.orig        Sat Jun 13
03:00:10 2015
-+++ buildtools/wafsamba/samba_install.py        Sun Apr 10 12:24:17

2016

-@@ -117,9 +117,12 @@ def install_library(self):
+--- buildtools/wafsamba/samba_install.py.orig        Fri Nov  6
14:28:25 2015
 buildtools/wafsamba/samba_install.py        Sun Apr 17 19:30:08

2016

+@@ -116,11 +116,15 @@ def install_library(self):
+             else:
+                 inst_name    = bld.make_libname(t.target)
         elif self.vnum:
++            import sys
             vnum_base    = self.vnum.split('.')[0]
             install_name = bld.make_libname(target_name,
version=self.vnum)
-            install_link = bld.make_libname(target_name,
version=vnum_base)
@@ -21,7 +24,7 @@ $OpenBSD: patch-buildtools_wafsamba_samb
                 # only generate the dev link for non-bundled

libs

                 dev_link     = bld.make_libname(target_name)
         elif getattr(self, 'soname', ''):
-@@ -169,7 +172,7 @@ def apply_vscript(self):
+@@ -170,7 +174,7 @@ def apply_vscript(self):
     '''add version-script arguments to library build'''

     if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self,
'version_script', ''):
Index: databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
===
RCS file:
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-buildtools_wafsamba_wafsamba_py
--- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py     

 

12 Apr 2016 17:38:15 -        1.3
+++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py     

 

17 Apr 2016 17:27:06 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
- allow the library version to be overriden
- make sure we don't clobber the version that ends up in tdb.pc

 buildtools/wafsamba/wafsamba.py.orig        Tue Jul 21 22:32:32

2015

-+++ buildtools/wafsamba/wafsamba.py        Sun Apr 10 12:53:36 2016
-@@ -215,6 +215,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+--- buildtools/wafsamba/wafsamba.py.orig        Fri Nov  6 

Re: update: sysutils/sysclean 1.3

[Amit Kulkarni]

On Mon, Apr 18, 2016 at 2:41 AM, Sebastien Marie 
wrote:

> Hi,
>
> Here a diff for updating sysutils/sysclean to 1.3
> Special thanks to espie@ for his help in the rewrite in perl.
>
> Comments or OK ?
>
> Changes:
> 
>
> Major rewrite of sysclean using perl(1):
>
> - more accurate control of path walkthough (doesn't explore unknown
>   directories)
> - no more manual parsing of PKG_DB files
> - manage more accurately @sample directories
>
>
> Incompatible changes:
>
> - the format of sysclean.ignore as slighlty changed: patterns aren't
>   possible now, but just plain filenames (example file updated).
> - network configuration files (/etc/hostname.*) aren't automatically
>   ignored. You should add them to sysclean.ignore
>
> Note: this release is same as 1.2, with just example file updated to
> reflect new syntax.
>


Thanks guys for the sysclean.ignore, I was going to ask for adding
/etc/doas.conf to the ignore :), but I can set it locally as well.

CVS: cvs.openbsd.org: ports

[Adam Wolk]

CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/04/18 09:01:43

Log message:
Import devel/zeal - Simple offline API documentation browser

Zeal is an offline documentation browser inspired by Dash.  The default 
package
handles 198 various doc sets that can be downloaded and later accessed while
offline.  Users can also create their own docsets by following instructions 
for
Dash: https://kapeli.com/docsets

OK abieber@

Status:

Vendor Tag: awolk
Release Tags:   awolk_20160418

N ports/devel/zeal/distinfo
N ports/devel/zeal/Makefile
N ports/devel/zeal/pkg/PLIST
N ports/devel/zeal/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Adam Wolk]

CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/04/18 09:04:25

Modified files:
devel  : Makefile 

Log message:
Add devel/zeal to the build

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/18 07:45:49

Modified files:
devel/ccache   : Makefile distinfo 

Log message:
update to ccache-3.2.5

devel/jenkins - multiple vulnerabilities

[Sevan Janiyan]

Hello,
Both the devel & stable releases of Jenkins in ports are vulnerable to
CVE-2016-0788 through to 0792.



Sevan

NEW: First KDE 5 ports

[Vadim Zhukov]

So here it are first bits of KDE 5:

- KDE Frameworks 5.21.0 (ModemManager and NetworkManager support, obviously);
- Gpgmepp (used by KF5Wallet framework);
- Kate (as a demonstration that things do work; also, this version
behaves correctly under cwm, unlike KDE4 one).

To be unpacked in /usr/ports; it'll add devel/kf5 subtree, two subdirs
in x11/kde-applications and, also, it'll overwrite
x11/kde-applications/Makefile.inc, adding KDE5 support.

Anyone brave enough to okay? :)

--
  WBR,
  Vadim Zhukov

Update / name change x11/ion -> x11/notion

[Christopher Zimmermann]

Hi,

ion3 has been abandoned by its upstream developer. It has been forked
on github and is now named notion. Here's a diff for upgrading to the
latest version of notion and changing the ports name to notion, which
is required by a special license clause in original ion3. ok?

Christopher


diff -Nru ion/Makefile notion/Makefile
--- ion/MakefileMon Mar 28 19:47:27 2016
+++ notion/Makefile Mon Apr 18 12:53:46 2016
@@ -1,31 +1,36 @@
 # $OpenBSD: Makefile,v 1.63 2016/03/27 20:53:15 naddy Exp $
 
-COMMENT=   light, keyboard friendly window manager
+COMMENT =  static tiling, tabbing and floating window manager
 
-V= 20090110
-DISTNAME=  ion-3-${V}
-PKGNAME=   ion-${V}
-CATEGORIES=x11
-REVISION=  2
+CATEGORIES =   x11
 
-HOMEPAGE=  http://modeemi.cs.tut.fi/~tuomov/ion/
-MASTER_SITES=  http://tuomov.iki.fi/software/dl/
+GH_TAGNAME =   3-2015061300
+GH_ACCOUNT =raboof
+GH_PROJECT =notion
+DISTNAME =  ${GH_PROJECT}-${GH_TAGNAME}
+PKGNAME =  ${GH_PROJECT}-${GH_TAGNAME:S/-/./}
 
+HOMEPAGE = http://notion.sourceforge.net/
+
 # LGPL
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB=   ICE X11 m c SM Xext ${MODLUA_WANTLIB}
-
-MODULES=   devel/gettext \
+MODULES =  devel/gettext \
lang/lua
-MODLUA_SA= Yes
 
-LIB_DEPENDS=   ${MODLUA_LIB_DEPENDS}
+WANTLIB =  ICE m c SM X11 Xext Xinerama Xrandr ${MODLUA_WANTLIB}
 
-USE_GMAKE= Yes
-NO_TEST=   Yes
+#MODLUA_SA =   Yes
 
-pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/system.mk
+LIB_DEPENDS =  ${MODLUA_LIB_DEPENDS}
+RUN_DEPENDS =  ${MODLUA_RUN_DEPENDS}
+
+MAKE_ENV = LUA_VERSION=$(MODLUA_VERSION:S/.//)
+FAKE_FLAGS =   PREFIX=$(PREFIX)
+
+USE_GMAKE =Yes
+
+#pre-configure:
+#  ${SUBST_CMD} ${WRKSRC}/system-autodetect.mk
 
 .include 
diff -Nru ion/distinfo notion/distinfo
--- ion/distinfoMon Apr 29 14:40:49 2013
+++ notion/distinfo Wed Mar 30 10:40:28 2016
@@ -1,2 +1,2 @@
-SHA256 (ion-3-20090110.tar.gz) = 2vbEPmfsR3+idKV9fSAFnddvZszi7T6dtwalklTRc9o=
-SIZE (ion-3-20090110.tar.gz) = 643971
+SHA256 (notion-3-2015061300.tar.gz) = 
PJ2fNan7DRfCY7dv4o96GkoFt9YUBUVSTMHv/ZjFwwU=
+SIZE (notion-3-2015061300.tar.gz) = 797057
diff -Nru ion/patches/patch-etc_cfg_ioncore_lua 
notion/patches/patch-etc_cfg_ioncore_lua
--- ion/patches/patch-etc_cfg_ioncore_lua   Mon Apr 29 14:40:49 2013
+++ notion/patches/patch-etc_cfg_ioncore_luaThu Jan  1 01:00:00 1970
@@ -1,36 +0,0 @@
-$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.8 2013/04/29 12:40:49 gonzalo Exp $
 etc/cfg_ioncore.lua.orig   Fri Jan  9 20:19:49 2009
-+++ etc/cfg_ioncore.luaMon Apr  8 11:20:13 2013
-@@ -65,8 +65,8 @@ defbindings("WScreen", {
- kpress(META.."F9", "ioncore.create_ws(_)"),
- 
- bdoc("Display the main menu."),
--kpress(ALTMETA.."F12", "mod_query.query_menu(_, _sub, 'mainmenu', 'Main 
menu:')"),
----kpress(ALTMETA.."F12", "mod_menu.menu(_, _sub, 'mainmenu', 
{big=true})"),
-+--kpress(ALTMETA.."F12", "mod_query.query_menu(_, _sub, 'mainmenu', 'Main 
menu:')"),
-+kpress(ALTMETA.."F12", "mod_menu.menu(_, _sub, 'mainmenu', {big=true})"),
- mpress("Button3", "mod_menu.pmenu(_, _sub, 'mainmenu')"),
- 
- bdoc("Display the window list menu."),
-@@ -137,10 +137,10 @@ defbindings("WMPlex.toplevel", {
- kpress(META.."T", "WRegion.set_tagged(_sub, 'toggle')", "_sub:non-nil"),
- 
- bdoc("Query for manual page to be displayed."),
--kpress(ALTMETA.."F1", "mod_query.query_man(_, ':man')"),
-+kpress(ALTMETA.."F1", "mod_query.query_man(_, '::man')"),
- 
- bdoc("Show the Ion manual page."),
--kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"),
-+kpress(META.."F1", "ioncore.exec_on(_, '::man ion3')"),
- 
- bdoc("Run a terminal emulator."),
- kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'xterm')"),
-@@ -156,7 +156,7 @@ defbindings("WMPlex.toplevel", {
- 
- bdoc("Query for file to edit."),
- kpress(ALTMETA.."F5", 
--   "mod_query.query_editfile(_, 'run-mailcap --action=edit')"),
-+   "mod_query.query_editfile(_, ':vi')"),
- 
- bdoc("Query for file to view."),
- kpress(ALTMETA.."F6", 
diff -Nru ion/patches/patch-etc_cfg_notioncore_lua 
notion/patches/patch-etc_cfg_notioncore_lua
--- ion/patches/patch-etc_cfg_notioncore_luaThu Jan  1 01:00:00 1970
+++ notion/patches/patch-etc_cfg_notioncore_lua Mon Apr 18 12:57:39 2016
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- etc/cfg_notioncore.lua.origSat Jun 13 16:37:26 2015
 etc/cfg_notioncore.lua Wed Apr 13 23:25:21 2016
+@@ -146,10 +146,10 @@ defbindings("WMPlex.toplevel", {
+ kpress(META.."L", "notioncore.exec_on(_, 
notioncore.lookup_script('notion-lock'))"),
+ 
+ bdoc("Query for manual page to be displayed."),
+-kpress(ALTMETA.."F1", "mod_query.query_man(_, ':man')"),
++kpress(ALTMETA.."F1", "mod_query.query_man(_, '::man')"),
+ 
+ bdoc("Show the Notion manual page."),
+-kpress(META.."F1", "ioncore.exec_on(_, ':man 

Re: update: sysutils/sysclean 1.3

[Sebastien Marie]

On Mon, Apr 18, 2016 at 12:01:29PM +0200, Marc Espie wrote:
> On Mon, Apr 18, 2016 at 09:41:31AM +0200, Sebastien Marie wrote:
> > Index: pkg/DESCR
> > ===
> > RCS file: /cvs/ports/sysutils/sysclean/pkg/DESCR,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 DESCR
> > --- pkg/DESCR   12 Mar 2016 16:04:18 -  1.2
> > +++ pkg/DESCR   18 Apr 2016 07:26:05 -
> > @@ -1,4 +1,4 @@
> > -sysclean is a ksh(1) script designed to help removing obsolete files 
> > between
> > +sysclean is a perl(1) script designed to help removing obsolete files 
> > between
> >  upgrades.
> >  
> >  sysclean works by comparing a reference root directory against currently
> I don't think the language actually matters. Does it really belong in
> the DESCR ?
> 

The DESCR is taken from the man page description. As this part of the
man page has changed, I updated DESCR too.

But I agreed that it doesn't matter of lot.

I will update it for the next release.

Thanks.
-- 
Sebastien Marie

Re: update: sysutils/sysclean 1.3

[Marc Espie]

On Mon, Apr 18, 2016 at 09:41:31AM +0200, Sebastien Marie wrote:
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/sysutils/sysclean/pkg/DESCR,v
> retrieving revision 1.2
> diff -u -p -r1.2 DESCR
> --- pkg/DESCR 12 Mar 2016 16:04:18 -  1.2
> +++ pkg/DESCR 18 Apr 2016 07:26:05 -
> @@ -1,4 +1,4 @@
> -sysclean is a ksh(1) script designed to help removing obsolete files between
> +sysclean is a perl(1) script designed to help removing obsolete files between
>  upgrades.
>  
>  sysclean works by comparing a reference root directory against currently
I don't think the language actually matters. Does it really belong in
the DESCR ?

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/18 04:03:51

Modified files:
graphics/ImageMagick: Makefile distinfo 

Log message:
Update to ImageMagick 6.9.3-8. While there, set PORTROACH marker to try
and do something slightly more useful (the naming scheme doesn't work
very well with portroach, but hopefully pointing at /download/ rather
than letting it use /download/releases/ will mean it only picks up
changes to the minor release of the current version).

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/18 03:53:01

Modified files:
security/libsodium: Makefile distinfo 

Log message:
update to libsodium-1.0.10 to quieten portroach, no functional changes

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/18 03:48:09

Modified files:
net/icinga/web2: Makefile distinfo 
net/icinga/web2/pkg: PLIST 

Log message:
update to Icinga Web 2 2.3.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/18 03:45:52

Modified files:
lang/php   : Makefile.inc 
lang/php/5.4   : Makefile 
lang/php/5.5   : Makefile 
lang/php/5.6   : Makefile 
lang/php/7.0   : Makefile 
lang/php/files : DESCR-bz2 DESCR-imap DESCR-mssql 
 DESCR-sybase_ct php.conf 

Log message:
Don't hardcode 'php5' in config file and DESCRs, there is php7 now.
Reported and initial diff from Frank Groeneveld, revised by me, ok robert@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/18 03:36:03

Modified files:
net/librenms   : Makefile distinfo 
net/librenms/patches: patch-daily_sh 
  patch-includes_definitions_inc_php 
  patch-includes_polling_core_inc_php 
net/librenms/pkg: PLIST 

Log message:
update to librenms-201604

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/18 03:10:23

Modified files:
net/dhcpcd : Makefile 
Added files:
net/dhcpcd/patches: patch-dhcp6_c 

Log message:
Fix dhcpcd regression in 6.10.2: "If sla is 0, just copy the prefix and don't
set a blackhole route if end prefix is the same as the delegated prefix."
Fix from upstream, diff from LÉVAI Dániel.

CVS: cvs.openbsd.org: ports

[Sebastien Marie]

CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2016/04/18 02:34:23

Modified files:
sysutils/sysclean: Makefile distinfo 
sysutils/sysclean/pkg: DESCR 

Log message:
update sysutils/sysclean to 1.3

ok landry@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 01:57:55

Modified files:
graphics/inkscape: Makefile 
Added files:
graphics/inkscape/patches: patch-src_ui_clipboard_cpp 

Log message:
Fix build with glib2 >=2.48.0.
Drop the gettext module while here.

update: sysutils/sysclean 1.3

[Sebastien Marie]

Hi,

Here a diff for updating sysutils/sysclean to 1.3
Special thanks to espie@ for his help in the rewrite in perl.

Comments or OK ?

Changes:


Major rewrite of sysclean using perl(1):

- more accurate control of path walkthough (doesn't explore unknown
  directories)
- no more manual parsing of PKG_DB files
- manage more accurately @sample directories


Incompatible changes:

- the format of sysclean.ignore as slighlty changed: patterns aren't
  possible now, but just plain filenames (example file updated).
- network configuration files (/etc/hostname.*) aren't automatically
  ignored. You should add them to sysclean.ignore

Note: this release is same as 1.2, with just example file updated to
reflect new syntax.

-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/sysutils/sysclean/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile12 Mar 2016 16:04:18 -  1.3
+++ Makefile18 Apr 2016 07:26:05 -
@@ -2,7 +2,7 @@
 
 COMMENT =  help removing obsolete files between OpenBSD upgrades
 
-V =1.1
+V =1.3
 DISTNAME = sysclean-${V}
 
 CATEGORIES =   sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/sysclean/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo12 Mar 2016 16:04:18 -  1.3
+++ distinfo18 Apr 2016 07:26:05 -
@@ -1,2 +1,2 @@
-SHA256 (sysclean-1.1.tar.gz) = 5oZI0p6mT/sAEo8ogUbUgoscbOrZN7OuUDubEk5n53s=
-SIZE (sysclean-1.1.tar.gz) = 5012
+SHA256 (sysclean-1.3.tar.gz) = WnhZYMii1G9bBz91E7++ag/eYzGJDizp/z0VwKEpwTk=
+SIZE (sysclean-1.3.tar.gz) = 4352
Index: pkg/DESCR
===
RCS file: /cvs/ports/sysutils/sysclean/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR   12 Mar 2016 16:04:18 -  1.2
+++ pkg/DESCR   18 Apr 2016 07:26:05 -
@@ -1,4 +1,4 @@
-sysclean is a ksh(1) script designed to help removing obsolete files between
+sysclean is a perl(1) script designed to help removing obsolete files between
 upgrades.
 
 sysclean works by comparing a reference root directory against currently

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 01:15:14

Modified files:
mail/lumail/patches: patch-src_bindings_cc 

Log message:
Unbreak with glib2 >=2.48.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:52:45

Modified files:
x11/gnome/py-atspi: Makefile distinfo 

Log message:
Update to py3-atspi-2.20.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:51:49

Modified files:
x11/gnome/yelp-xsl: Makefile distinfo 

Log message:
Update to yelp-xsl-3.20.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:51:32

Modified files:
x11/gnome/themes-standard: Makefile distinfo 
x11/gnome/themes-standard/pkg: PLIST 

Log message:
Update to gnome-themes-standard-3.20.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:52:05

Modified files:
net/glib2-networking: Makefile distinfo 
net/glib2-networking/pkg: PLIST 

Log message:
Update to glib2-networking-2.48.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:52:29

Modified files:
devel/py-gobject3: Makefile distinfo 

Log message:
Update to py-gobject3-3.20.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:50:52

Modified files:
x11/gtk3mm : Makefile distinfo 
x11/gtk3mm/pkg : PLIST 

Log message:
Update to gtk3mm-3.20.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:50:02

Modified files:
x11/gtk+3  : Makefile distinfo 
x11/gtk+3/patches: patch-gtk_gtksettings_c 
x11/gtk+3/pkg  : PLIST-main 

Log message:
Update to gtk+3-3.20.3.
This starts the work on updating GNOME to version 3.20.1.
Please note that gtk+3 theme format has changed with this release and only
Adwaita will work out-of-the box. This will be worked on within the next
couple of weeks.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:51:10

Modified files:
misc/gtk3mm-documentation: Makefile distinfo 

Log message:
Update to gtk3mm-documentation-3.20.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:50:36

Modified files:
devel/pangomm  : Makefile distinfo 
devel/pangomm/pkg: PLIST 

Log message:
Update to pangomm-2.40.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:50:20

Modified files:
devel/glib2mm  : Makefile distinfo 
devel/glib2mm/pkg: PLIST 

Log message:
Update to glib2mm-2.48.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:48:30

Modified files:
x11/gnome/at-spi2-atk: Makefile distinfo 

Log message:
Update to at-spi2-atk-2.20.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:48:08

Modified files:
x11/gnome/at-spi2-core: Makefile distinfo 
x11/gnome/at-spi2-core/pkg: PLIST 

Log message:
Update to at-spi2-core-2.20.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:47:47

Modified files:
devel/pango: Makefile distinfo 
devel/pango/pkg: PLIST 

Log message:
Update to pango-1.40.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:47:23

Modified files:
graphics/gdk-pixbuf2: Makefile distinfo 
graphics/gdk-pixbuf2/pkg: PLIST 

Log message:
Update to gdk-pixbuf-2.34.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:46:30

Modified files:
devel/glib2: Makefile distinfo 
devel/glib2/pkg: PLIST 
Added files:
devel/glib2/patches: patch-gio_gioenums_h 
Removed files:
devel/glib2/patches: patch-gio_gunionvolumemonitor_c 

Log message:
Update to glib2-2.48.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/04/18 00:46:54

Modified files:
devel/atk  : Makefile distinfo 
devel/atk/pkg  : PLIST 

Log message:
Update to atk-2.20.0.