CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/11/02 18:43:49

Modified files:
games/gnuchess : Makefile distinfo 
games/gnuchess/pkg: PLIST 

Log message:
Upgrade to gnuchess-6.2.5

Drop unneeded pthread override while here.

Re: new: security/hs-ed25519

[Matthias Kilian]

On Fri, Nov 03, 2017 at 12:09:18AM +0100, Matthias Kilian wrote:
> I'd loke to import this new port (and two addtitional ports I'll
> send soon). It's a requirement for newer versions of cabal-install.
> 
> Unffortunately, it's rpobably already out-of-date, and it probably
> doesn't build with the ghc in our tree, but I'm not going to send
> patches for ghc (only 8.0 so far) and hundreds of other ports. So
> all I ask for is wether it's ok to import it (portswise).

To avoid any confusion: this (and the other two new hs-ports) will
not yet be hooked into security/Makefile, because this can't be
done before lang/ghc and a couple of other hs-ports get updated.

Some tependencies in the new ports don't yet match (for example,
hs-tar>=0.5,<0.6, used in hs-hackage-security, as jca@ pointed out
to me).

Ciao,
KIli

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/11/02 17:46:37

Modified files:
net/samba  : Makefile 

Log message:
Using lld for samba alone is not enough, remove tentative fix

eg sysutils/usmb doesn't link, and using lld for all samba consumers
seems a bit far-fetched.

ok sthen@

devel/gmp and malloc.conf -> S

[Jeremie Courreges-Anglas]

So gmp has this configure test that fails (fatal failure) with strict
malloc options.  It's supposed to catch buggy compilers, but it relies
on malloc returning zeroed memory.  Using calloc fixes the test.
automake and libtool don't seem to be needed after the .m4 patch.

ok?


Index: Makefile
===
RCS file: /d/cvs/ports/devel/gmp/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile26 Jul 2017 22:45:17 -  1.35
+++ Makefile2 Nov 2017 22:59:47 -
@@ -21,7 +21,8 @@ WANTLIB=  m ${COMPILER_LIBCXX}
 MASTER_SITES=  https://gmplib.org/download/gmp/ \
${MASTER_SITE_GNU:=gmp/}
 
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=autoconf
+AUTOCONF_VERSION=2.69
 CONFIGURE_ARGS=--enable-cxx
 # Don't try to optimize for the local CPU submodel
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-unknown-openbsd${OSrev}
Index: patches/patch-acinclude_m4
===
RCS file: patches/patch-acinclude_m4
diff -N patches/patch-acinclude_m4
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-acinclude_m4  2 Nov 2017 23:38:37 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Zero out the memory before testing for overwrite bug.
+
+Index: acinclude.m4
+--- acinclude.m4.orig
 acinclude.m4
+@@ -741,7 +741,7 @@ main ()
+   long i;
+   for (i = 0; i < 88 + 1; i++)
+ a[i] = ~0L;
+-  r = malloc (1 * sizeof (unsigned long));
++  r = calloc (1, sizeof (unsigned long));
+   r2 = r;
+   for (i = 0; i < 528; i += 23)
+ {


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

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2017/11/02 17:34:23

Modified files:
security/keepassxc: Makefile distinfo 
security/keepassxc/pkg: PLIST 

Log message:
Update keepassxc to 2.2.2

Changelog: https://github.com/keepassxreboot/keepassxc/releases/tag/2.2.2

new: security/hs-hackage-security

[Matthias Kilian]

Hi,

third and last new requirement for cabal-install.

ok (portswise)?

pkg/DESCR:

The hackage security library provides both server and client utilities
for securing the Hackage package server (http://hackage.haskell.org/).
It is based on The Update Framework (http://theupdateframework.com/),
a set of recommendations developed by security researchers at various
universities in the US as well as developers on the Tor project
(https://www.torproject.org/).

The current implementation supports only index signing, thereby
enabling untrusted mirrors. It does not yet provide facilities for
author package signing.

Ciao,

Kili


security_hs-hackage-security.tgz
Description: application/tar-gz

new: security/hs-cryptohash-sha256

[Matthias Kilian]

Hi,

next requirement for a newer cabal-install.

ok (portswise) to import?

pkg/DESCR:

A practical incremental and one-pass, pure API to the SHA-256 hash
algorithm (including HMAC support) with performance close to the
fastest implementations available in other languages.

The implementation is made in C with a haskell FFI wrapper that
hides the C implementation.


Ciao,
Kili


security_hs-cryptohash-sha256.tgz
Description: application/tar-gz

new: security/hs-ed25519

[Matthias Kilian]

Hi,

I'd loke to import this new port (and two addtitional ports I'll
send soon). It's a requirement for newer versions of cabal-install.

Unffortunately, it's rpobably already out-of-date, and it probably
doesn't build with the ghc in our tree, but I'm not going to send
patches for ghc (only 8.0 so far) and hundreds of other ports. So
all I ask for is wether it's ok to import it (portswise).

pkg/DESCR:

This package provides a simple, fast, self-contained copy of the
Ed25519 public-key signature system with a clean interface. It also
includes support for detached signatures, and thorough documentation
on the design and implementation, including usage guidelines.

Ciao,
Kili


security_hs-ed25519.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/11/02 16:52:29

Modified files:
security/openssl: Makefile distinfo 
security/openssl/pkg: PLIST 

Log message:
update to openssl-1.0.2m

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 16:46:27

Modified files:
games/bastet   : Makefile distinfo 

Log message:
Update to bastet-0.43.2.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/11/02 16:45:33

Modified files:
devel/spidermonkey52: Makefile 
Added files:
devel/spidermonkey52/patches: patch-config_gcc_hidden_h 

Log message:
Toggle symbol visibility, otherwise certain symbols are marked as local
which are actually supposed to be used (e.g. by gjs).

UPDATE: games/chromium-bsu

[Anthony J. Bentley]

Hi,

Here's an update to chromium-bsu-0.9.16.1.

For the life of me I can't figure out why glpng detection has started
failing or how to fix it. But as glpng's latest release was 17 years
ago, I'm perfectly happy to drop it as a renderer in favor of SDL2.

ok?

-- 
Anthony J. Bentley
Index: Makefile
===
RCS file: /cvs/ports/games/chromium-bsu/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile26 Jul 2017 22:45:20 -  1.10
+++ Makefile2 Nov 2017 22:31:13 -
@@ -1,32 +1,32 @@
 # $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:20 sthen Exp $
 
 COMMENT =  fast paced arcade-style space shooter
-DISTNAME = chromium-bsu-0.9.15.1
+DISTNAME = chromium-bsu-0.9.16.1
 CATEGORIES =   games x11
 HOMEPAGE = http://chromium-bsu.sourceforge.net/
-REVISION = 3
 
 # Clarified Artistic License
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += GL GLU SDL SDL_image alut c fontconfig freetype ftgl glpng
-WANTLIB += jpeg m openal png pthread ${COMPILER_LIBCXX} tiff webp z
+WANTLIB += GL GLU SDL2 SDL2_image alut c fontconfig freetype ftgl
+WANTLIB += m openal pthread ${COMPILER_LIBCXX} z
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=chromium-bsu/}
 
+USE_GMAKE =Yes
+
 MODULES =  devel/gettext
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS =  graphics/ftgl   \
-   graphics/glpng  \
-   audio/freealut  \
-   devel/sdl-image
+LIB_DEPENDS =  graphics/ftgl \
+   devel/sdl2-image \
+   audio/freealut
 
 SEPARATE_BUILD =   Yes
 
 CONFIGURE_STYLE =  gnu
-CONFIGURE_ENV =LDFLAGS="$$(pkg-config --libs sdl libpng) 
-liconv" \
-   CPPFLAGS="-pthread"
+CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include 
-I${X11BASE}/include" \
+   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 NO_TEST =  Yes
 
Index: distinfo
===
RCS file: /cvs/ports/games/chromium-bsu/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo4 Jun 2013 22:07:32 -   1.2
+++ distinfo2 Nov 2017 22:31:13 -
@@ -1,2 +1,2 @@
-SHA256 (chromium-bsu-0.9.15.1.tar.gz) = 
hhtNwBtmLz09A6jiDnaxtKvTNpEOBbdw5ubfDOKshAU=
-SIZE (chromium-bsu-0.9.15.1.tar.gz) = 1689634
+SHA256 (chromium-bsu-0.9.16.1.tar.gz) = 
ocFBo00ZpZYHroEWahmGTrjITPhrFVRi/tMabVbhYko=
+SIZE (chromium-bsu-0.9.16.1.tar.gz) = 1709898
Index: patches/patch-misc_Makefile_in
===
RCS file: patches/patch-misc_Makefile_in
diff -N patches/patch-misc_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-misc_Makefile_in  2 Nov 2017 22:31:13 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: misc/Makefile.in
+--- misc/Makefile.in.orig
 misc/Makefile.in
+@@ -609,7 +609,7 @@ uninstall-man: uninstall-man6
+   msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@
+ 
+ chromium-bsu.png: $(top_srcdir)/data/png/hero.png
+-  cp -a $< $@
++  cp $< $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: patches/patch-src_MainSDL_Event_cpp
===
RCS file: patches/patch-src_MainSDL_Event_cpp
diff -N patches/patch-src_MainSDL_Event_cpp
--- patches/patch-src_MainSDL_Event_cpp 4 May 2017 22:09:18 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_MainSDL_Event_cpp,v 1.1 2017/05/04 22:09:18 espie Exp $
-
-Index: src/MainSDL_Event.cpp
 src/MainSDL_Event.cpp.orig
-+++ src/MainSDL_Event.cpp
-@@ -18,6 +18,7 @@
- 
- #include 
- #include 
-+#include 
- #include 
- 
- #include "Config.h"
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/chromium-bsu/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   4 Jun 2013 22:07:33 -   1.3
+++ pkg/PLIST   2 Nov 2017 22:31:13 -
@@ -81,7 +81,7 @@ share/chromium-bsu/wav/music_game.wav
 share/chromium-bsu/wav/music_menu.wav
 share/chromium-bsu/wav/power.wav
 share/doc/chromium-bsu/
-share/doc/chromium-bsu/faq.htm
+share/doc/chromium-bsu/faq.html
 share/doc/chromium-bsu/images/
 share/doc/chromium-bsu/images/heroAmmo00.jpg
 share/doc/chromium-bsu/images/heroAmmo01.jpg
@@ -90,17 +90,14 @@ share/doc/chromium-bsu/images/powerUp00.
 share/doc/chromium-bsu/images/powerUp01.jpg
 share/doc/chromium-bsu/images/powerUp02.jpg
 share/doc/chromium-bsu/images/useItem00.jpg
-share/doc/chromium-bsu/info.htm
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/64x64/
-share/icons/hicolor/64x64/apps/

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 16:26:02

Removed files:
fonts/ja-mplus-ttf: Makefile distinfo 
fonts/ja-mplus-ttf/pkg: DESCR PLIST 

Log message:
Remove ja-mplus-ttf.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 16:24:09

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

Log message:
ja-mplus-ttf -> mixfont-mplus-ipa

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/11/02 16:24:14

Modified files:
comms/amtterm  : Makefile 

Log message:
replace gettext MODULES

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 16:23:35

Modified files:
fonts  : Makefile 

Log message:
-ja-mplus-ttf,+mixfont-mplus-ipa

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 16:22:37

Log message:
Reimport the incorrectly named ja-mplus-ttf as correct mixfont-mplus-ipa.

ok sthen@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20171102

N ports/fonts/mixfont-mplus-ipa/Makefile
N ports/fonts/mixfont-mplus-ipa/distinfo
N ports/fonts/mixfont-mplus-ipa/pkg/DESCR
N ports/fonts/mixfont-mplus-ipa/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/11/02 16:07:13

Modified files:
editors/vim: Makefile distinfo 
editors/vim/patches: patch-src_configure_ac 

Log message:
update to a newer vim snapshot, replace devel/gettext MODULES, add missing
WANTLIB+=elf for the gtk flavour.

Re: UPDATE: php revamp

[Antoine Jacoutot]

On Thu, Nov 02, 2017 at 09:30:34PM +, Stuart Henderson wrote:
> On 2017/11/02 21:41, Tom Van Looy wrote:
> > Hi
> > 
> > Martijn did a very good job with this. This makes OpenBSD's PHP setup 
> > incredibly better. I
> > tested yesterdays patch and it works fine (I had trouble with the other 
> > ones). I built
> > everything and tested 7.1, 7.0, 5.6 with cli and fpm + extensions (opcache, 
> > curl, intl, etc.).
> > 
> > So, looks good. I hope it gets committed soon. Thanks Marijn!
> > 
> > Tom Van Looy
> > 
> > 
> 
> It's a matter of opinion. I will cope but I really don't like the 
> FreeBSD-style
> micro splitting.

+1

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2017/11/02 15:51:59

Modified files:
databases/iodbc: Makefile 
net/rrdtool: Makefile 
sysutils/nut   : Makefile 

Log message:
replace gettext module; ok sthen@

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/11/02 15:43:44

Removed files:
meta/haskell-platform: Makefile 
meta/haskell-platform/pkg: DESCR PLIST 

Log message:
Remove meta/haskell-platform.

It's just in the way, especially newer releases which now
require stack, which pulls in too many dependencies.

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/11/02 15:42:11

Modified files:
meta   : Makefile 

Log message:
Unhook meta/haskell-platform.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2017/11/02 15:41:57

Modified files:
x11/gtk+3  : Makefile 

Log message:
remove undefined variables

Ruby extension gem updates

[Jeremy Evans]

This diff updates our ruby gem extension ports to their latest versions,
for the 15 ports that weren't already at their latest version.

For the gems that include tests, the tests pass.  For other gems, I've
tried to test them manually where I could.  I maintain about half of
these gems, and the other half are unmaintained.

I've checked and the dependencies of these ports should still work
with these updated versions.

These changes are mostly routine.  The most significant change is
the removal of the gcc4 module from capybara-webkit, since it now
seems to work fine without that.

I plan to do some more testing of the database ports, but the rest
of these I plan to commit in a day or so unless I hear objections.

After a review of the extension ports, I would also like to remove
audio/ruby-id3lib.  It hasn't been updated in about 7.5 years, and
users should be able to switch to audio/ruby-taglib for similar
features. OKs for removing that?

Thanks,
Jeremy

Index: databases/ruby-mysql2/Makefile
===
RCS file: /cvs/ports/databases/ruby-mysql2/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- databases/ruby-mysql2/Makefile  4 Nov 2016 21:29:27 -   1.23
+++ databases/ruby-mysql2/Makefile  2 Nov 2017 16:34:44 -
@@ -2,7 +2,7 @@
 
 COMMENT=   modern, simple and very fast MySQL library for Ruby
 
-DISTNAME=  mysql2-0.4.5
+DISTNAME=  mysql2-0.4.9
 CATEGORIES=databases
 
 HOMEPAGE=  https://github.com/brianmario/mysql2
Index: databases/ruby-mysql2/distinfo
===
RCS file: /cvs/ports/databases/ruby-mysql2/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- databases/ruby-mysql2/distinfo  4 Nov 2016 21:29:27 -   1.10
+++ databases/ruby-mysql2/distinfo  2 Nov 2017 16:34:54 -
@@ -1,2 +1,2 @@
-SHA256 (mysql2-0.4.5.gem) = lGlnPQkSJTdWmoppYTb2m43YJf6Clt+a8lybNG43Cc4=
-SIZE (mysql2-0.4.5.gem) = 76288
+SHA256 (mysql2-0.4.9.gem) = iviz07WqM9imhqHKofis2SmMvrQLCfjCR1puz5CxpiI=
+SIZE (mysql2-0.4.9.gem) = 77312
Index: databases/ruby-pg/Makefile
===
RCS file: /cvs/ports/databases/ruby-pg/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- databases/ruby-pg/Makefile  4 Apr 2017 21:40:40 -   1.34
+++ databases/ruby-pg/Makefile  2 Nov 2017 16:37:55 -
@@ -2,7 +2,7 @@
 
 COMMENT =  PostgreSQL database interface for ruby
 
-DISTNAME = pg-0.20.0
+DISTNAME = pg-0.21.0
 CATEGORIES =   databases
 
 MAINTAINER =   Jeremy Evans 
Index: databases/ruby-pg/distinfo
===
RCS file: /cvs/ports/databases/ruby-pg/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- databases/ruby-pg/distinfo  4 Apr 2017 21:40:40 -   1.20
+++ databases/ruby-pg/distinfo  2 Nov 2017 16:38:02 -
@@ -1,2 +1,2 @@
-SHA256 (pg-0.20.0.gem) = hV96D4souy73HBs7BWEr5VFFLb3CdRmQjl05oyV/rA8=
-SIZE (pg-0.20.0.gem) = 230400
+SHA256 (pg-0.21.0.gem) = ELfMBXgiNvuEDCR6TsuFn0t3ABQWd04WRskRxrFWcAM=
+SIZE (pg-0.21.0.gem) = 214016
Index: databases/ruby-pg/pkg/PLIST
===
RCS file: /cvs/ports/databases/ruby-pg/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 PLIST
--- databases/ruby-pg/pkg/PLIST 8 Jan 2015 19:00:19 -   1.13
+++ databases/ruby-pg/pkg/PLIST 2 Nov 2017 16:39:03 -
@@ -22,31 +22,13 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/pg/basic
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg/coder.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg/connection.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg/constants.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/pg/deprecated_constants.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg/exceptions.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg/result.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg/text_decoder.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg/text_encoder.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg/type_map_by_column.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg_ext.so
-${GEM_LIB}/gems/${DISTNAME}/sample/
-${GEM_LIB}/gems/${DISTNAME}/sample/array_insert.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/async_api.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/async_copyto.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/async_mixed.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/check_conn.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/copyfrom.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/copyto.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/cursor.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/disk_usage_report.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/issue-119.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/losample.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/minimal-testcase.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/notify_wait.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/pg_statistics.rb
-${GEM_LIB}/gems/${DISTNAME}/sample/replication_monitor.rb

Re: UPDATE: php revamp

[Stuart Henderson]

On 2017/11/02 21:41, Tom Van Looy wrote:
> Hi
> 
> Martijn did a very good job with this. This makes OpenBSD's PHP setup 
> incredibly better. I
> tested yesterdays patch and it works fine (I had trouble with the other 
> ones). I built
> everything and tested 7.1, 7.0, 5.6 with cli and fpm + extensions (opcache, 
> curl, intl, etc.).
> 
> So, looks good. I hope it gets committed soon. Thanks Marijn!
> 
> Tom Van Looy
> 
> 

It's a matter of opinion. I will cope but I really don't like the FreeBSD-style
micro splitting.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 14:49:18

Modified files:
devel/py-asn1-modules: Makefile distinfo 

Log message:
Update to py-asn1-modules-0.1.5.

Re: UPDATE: php revamp

[Tom Van Looy]

Hi

Martijn did a very good job with this. This makes OpenBSD's PHP setup
incredibly better. I tested yesterdays patch and it works fine (I had
trouble with the other ones). I built everything and tested 7.1, 7.0, 5.6
with cli and fpm + extensions (opcache, curl, intl, etc.).

So, looks good. I hope it gets committed soon. Thanks Marijn!

Tom Van Looy

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 14:23:19

Modified files:
fonts/overpass : Makefile distinfo 
fonts/overpass/pkg: PLIST 

Log message:
Update to overpass-3.0.2.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/11/02 13:56:29

Modified files:
net/samba  : Makefile 

Log message:
Hopefully fix samba, still using lld; looks like previous commit wasn't enough

Also bump -util just to be safe.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/11/02 13:22:40

Modified files:
audio/mpd  : Makefile 
audio/mpd/patches: patch-doc_mpdconf_example 
audio/mpd/pkg  : mpd.rc 

Log message:
Two "bind_to_address" tweaks for mpd

- listen on "localhost" instead of "127.0.0.1"; helps with "family
inet6 inet4" in resolv.conf
- install /var/run/mpd in the rc script, and mention /var/run/mpd/socket
in the example config (ncmpc can use it by default)

ok dcoppa@ (maintainer)

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2017/11/02 12:47:44

Modified files:
net/wget   : Tag: OPENBSD_6_2 Makefile 
Added files:
net/wget/patches: Tag: OPENBSD_6_2 patch-src_http_c 
  patch-src_retr_c 

Log message:
Security for CVE-2017-13089 and CVE-2017-13090.

"Fix stack overflow in HTTP protocol handling (CVE-2017-13089)"
http://git.savannah.gnu.org/cgit/wget.git/commit/?id=d892291fb8ace4c3b734ea5125770989c215df3f

"Fix heap overflow in HTTP protocol handling (CVE-2017-13090)"
http://git.savannah.gnu.org/cgit/wget.git/commit/?id=ba6b44f6745b14dce414761a8e4b35d31b176bba

ok sthen@

UPDATE: sysutils/syslog-ng

[Steven Mestdagh]

seems to be fine on amd64.  comments welcome.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.57
diff -u -p -u -r1.57 Makefile
--- Makefile13 Jun 2017 00:22:33 -  1.57
+++ Makefile2 Nov 2017 18:40:53 -
@@ -1,11 +1,10 @@
 # $OpenBSD: Makefile,v 1.57 2017/06/13 00:22:33 schwarze Exp $
 
-COMMENT=   syslogd replacement
+COMMENT=   log management solution
 
-V =3.9.1
-REL =  3.9
+V =3.12.1
+REL =  3.12
 DISTNAME = syslog-ng-$V
-REVISION = 0
 CATEGORIES =   sysutils
 
 MAINTAINER =   Steven Mestdagh 
@@ -17,8 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes
 
 MASTER_SITES = 
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
 
-SHARED_LIBS =  syslog-ng   4.0 \
-   syslog-ng-${REL}4.0
+SHARED_LIBS =  syslog-ng   5.0 \
+   syslog-ng-${REL}5.0
 
 MODULES =  devel/gettext
 
@@ -36,6 +35,7 @@ LIB_DEPENDS = devel/glib2 \
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --disable-tcp-wrapper \
+   --with-module-dir=${PREFIX}/lib/syslog-ng \
--with-pidfile-dir=/var/run \
--enable-json \
--with-mongoc=no \
@@ -54,7 +54,10 @@ CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/
OPENSSL_LIBS="-lssl -lcrypto" 
 # json-c only installs libjson-c.pc; syslog-ng checks for libjson.pc
 CONFIGURE_ENV +=   JSON_C_CFLAGS="`pkg-config json-c --cflags`" \
-   JSON_C_LIBS="`pkg-config json-c --libs`"
+   JSON_C_LIBS="`pkg-config json-c --libs`" \
+   EVTLOG_LIBS="-L${LOCALBASE}/lib -levtlog" \
+   EVTLOG_CFLAGS="-I${LOCALBASE}/include/eventlog"
+
 USE_GMAKE =Yes
 
 SYSCONFDIR =   ${BASESYSCONFDIR}/syslog-ng
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.25
diff -u -p -u -r1.25 distinfo
--- distinfo8 Jun 2017 18:19:37 -   1.25
+++ distinfo2 Nov 2017 18:40:53 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.9.1.tar.gz) = VniFalUK55Bhj6venRRH+TLOepCA1V3Kj8XfEgLHChc=
-SIZE (syslog-ng-3.9.1.tar.gz) = 8312677
+SHA256 (syslog-ng-3.12.1.tar.gz) = EtKsuOKS0WBo3rrn+aaZ55HKSXVA0ogzppSpoczXj0M=
+SIZE (syslog-ng-3.12.1.tar.gz) = 8905646
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.10
diff -u -p -u -r1.10 syslog-ng.conf
--- files/syslog-ng.conf8 Jun 2017 18:19:37 -   1.10
+++ files/syslog-ng.conf2 Nov 2017 18:40:53 -
@@ -1,8 +1,7 @@
 # syslog-ng configuration file for OpenBSD.
-# This should provide the same behavior as OpenBSD's syslog.conf(5).
-# 2010-07-18 ste...@openbsd.org
+# This should provide behavior similar to OpenBSD's syslog.conf(5).
 
-@version: 3.9
+@version: 3.12
 
 options { 
use_dns(no);
@@ -12,15 +11,9 @@ options { 
 
 source s_local {
unix-dgram ("/dev/log");
-   unix-dgram ("/var/empty/dev/log");
internal();
 };
-#source s_local_all {
-#  unix-dgram ("/dev/log");
-#  unix-dgram ("/var/empty/dev/log");
-#  unix-dgram ("/var/www/dev/log");
-#  internal();
-#};
+
 #source s_net {
 #  udp(port(514));
 #};
@@ -108,7 +101,6 @@ log { source(s_local); filter(f_daemonin
 log { source(s_local); filter(f_ftpinfo);  destination(d_xferlog); };
 log { source(s_local); filter(f_lprdebug); destination(d_lpderrs); };
 log { source(s_local); filter(f_mailinfo); destination(d_maillog); };
-#log { source(s_local); filter(f_uucpinfo);destination(d_uucplog); };
 
 # Uncomment this line to send "important" messages to the system
 # console: be aware that this could create lots of output.
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-Makefile_in
--- patches/patch-Makefile_in   8 Jun 2017 18:19:37 -   1.10
+++ patches/patch-Makefile_in   2 Nov 2017 18:40:53 -
@@ -1,8 +1,52 @@
 $OpenBSD: patch-Makefile_in,v 1.10 2017/06/08 18:19:37 steven Exp $
-temporary hack until libtool is fixed.
 Makefile.in.orig   Wed Dec 21 16:00:32 2016
-+++ Makefile.inSun Feb  5 23:53:33 2017
-@@ -6203,7 +6203,7 @@ lib/str-repr/lib_libsyslog_ng_la-encode.lo:  \
+- temporary hack until libtool is fixed.
+- work around different getent API, adapted from
+https://github.com/balabit/syslog-ng/commit/8b33cbe143b00d6af72cb5145fecd67e6158a9dd
+- avoid rebuilding libeventlog, already in devel/eventlog
+
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 12:33:52

Modified files:
fonts  : Makefile 

Log message:
+vlgothic

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 12:31:59

Modified files:
devel  : Makefile 

Log message:
+xtensa-elf

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 12:30:58

Log message:
Import xtensa-elf-gcc and xtensa-elf-binutils.

ok stsp@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20171102

N ports/devel/xtensa-elf/Makefile
N ports/devel/xtensa-elf/Makefile.inc
N ports/devel/xtensa-elf/binutils/Makefile
N ports/devel/xtensa-elf/binutils/distinfo
N ports/devel/xtensa-elf/binutils/pkg/DESCR
N ports/devel/xtensa-elf/binutils/pkg/PLIST
N ports/devel/xtensa-elf/binutils/patches/patch-bfd_xtensa-modules_c
N ports/devel/xtensa-elf/binutils/patches/patch-gas_config_tc-xtensa_c
N ports/devel/xtensa-elf/binutils/patches/patch-include_xtensa-config_h
N ports/devel/xtensa-elf/gcc/Makefile
N ports/devel/xtensa-elf/gcc/distinfo
N ports/devel/xtensa-elf/gcc/pkg/DESCR
N ports/devel/xtensa-elf/gcc/pkg/PLIST
N ports/devel/xtensa-elf/gcc/patches/patch-libcc1_connection_cc
N ports/devel/xtensa-elf/gcc/patches/patch-gcc_config_xtensa_xtensa_c
N ports/devel/xtensa-elf/gcc/patches/patch-include_xtensa-config_h

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/11/02 12:19:53

Log message:
Import vlgothic-20141206.

VLGothic and VLPGothic are a Japanese TrueType font family from Vine Linux.
It consists of kanji, kana and alphanumeric characters from the M+ fonts;
some kanji from the Sazanami Gothic font; and remaining kanji produced by
Daisuke Suzuki of Project Vine.

From Sasano Takayoshi (thanks!). ok sthen@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20171102

N ports/fonts/vlgothic/Makefile
N ports/fonts/vlgothic/distinfo
N ports/fonts/vlgothic/pkg/DESCR
N ports/fonts/vlgothic/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/11/02 12:16:08

Modified files:
x11/gnome/screenshot/patches: patch-src_meson_build 

Log message:
merged

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 11:54:16

Modified files:
devel/p5-libintl: Makefile distinfo 

Log message:
Update to p5-libintl-1.27.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 11:52:52

Modified files:
devel/p5-Glib-Object-Introspection: Makefile distinfo 

Log message:
Update to p5-Glib-Object-Introspection-0.043.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2017/11/02 11:52:26

Modified files:
print/ghostscript/gnu: Makefile 

Log message:
replace gettext module and sync wantlib; ok kili@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 11:51:10

Modified files:
devel/p5-Glib2 : Makefile distinfo 

Log message:
Update to p5-Glib2-1.326.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2017/11/02 11:50:55

Modified files:
devel/subversion: Makefile 

Log message:
replace gettext module; ok stsp@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/11/02 11:50:45

Modified files:
textproc/pdfpc : Makefile distinfo 
textproc/pdfpc/pkg: PLIST 
Added files:
textproc/pdfpc/patches: patch-src_CMakeLists_txt 

Log message:
update to pdfpc-4.1

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/11/02 11:46:00

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

Log message:
update to borgmatic-1.1.9

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 11:46:04

Modified files:
sysutils/terraform/provider-azurerm: Makefile distinfo 

Log message:
Update to terraform-provider-azurerm-0.3.2.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/11/02 11:43:04

Modified files:
sysutils/consul-template: Makefile distinfo 
sysutils/consul-template/pkg: PLIST 

Log message:
update to consul-template-0.19.4

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/11/02 11:40:54

Modified files:
net/samba  : Makefile 

Log message:
build samba with -fuse-ld=lld on CLANG_ARCHS, ok jca@ jca@ jca@

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2017/11/02 11:38:19

Modified files:
sysutils/libfvde: Makefile distinfo 

Log message:
update libfvde to 20170930.
ok benoit@

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2017/11/02 10:53:35

Modified files:
education/verbiste: Makefile distinfo 

Log message:
maintenance update to 0.1.45 (C++11 fixes)

Re: UPDATE: math/plplot

[Steven Mestdagh]

Steven Mestdagh [2017-11-02, 15:41:25]:
> a long overdue update.  comments / ok?

better without the gettext module, as pointed out by naddy.

Index: Makefile
===
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.58
diff -u -p -u -r1.58 Makefile
--- Makefile26 Jul 2017 22:45:26 -  1.58
+++ Makefile2 Nov 2017 16:24:53 -
@@ -2,22 +2,20 @@
 
 COMMENT-main = advanced 2D and 3D scientific plotting library
 COMMENT-c++ =  C++ interface to plplot
-COMMENT-f77 =  Fortran 77 interface to plplot
+COMMENT-fortran =  Fortran 77 interface to plplot
 
-VERSION =  5.8.0
+VERSION =  5.13.0
 DISTNAME = plplot-${VERSION}
-SHARED_LIBS =  csirocsa3.0 \
-   plplotcxxd  12.0\
-   plplotd 13.0\
-   plplotf77cd 11.0\
-   plplotf77d  11.0
+SHARED_LIBS =  csirocsa4.0 \
+   csironn 0.0 \
+   plplot  15.0\
+   plplotcxx   13.0\
+   plplotfortran   0.0 \
+   qsastime0.0
 
 PKGNAME-main = ${DISTNAME}
 PKGNAME-c++ =  plplot-c++-${VERSION}
-PKGNAME-f77 =  plplot-f77-${VERSION}
-REVISION-main =10
-REVISION-c++ = 11
-REVISION-f77 = 13
+PKGNAME-fortran =  plplot-fortran-${VERSION}
 
 CATEGORIES =   math graphics
 
@@ -30,10 +28,9 @@ PERMIT_PACKAGE_CDROM =   Yes
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=plplot/}
 
-MODULES =  devel/gettext \
-   fortran
+MODULES =  fortran
 
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
 
 BUILD_DEPENDS =print/ghostscript/gnu-fonts \
${MODFORTRAN_BUILD_DEPENDS}
@@ -42,51 +39,54 @@ myRUN_DEPENDS = print/ghostscript/gnu-fo
 
 MODULES += devel/cmake
 
-# Until such time as the cmake ninja generator supports fortran
+# Until the cmake ninja generator supports fortran
 USE_NINJA =No
 
-CONFIGURE_ARGS =   -D ENABLE_java=OFF \
-   -D ENABLE_f77=ON \
-   -D ENABLE_f95=OFF \
-   -D ENABLE_itcl=OFF \
+CONFIGURE_ARGS =   -D ENABLE_ada=OFF \
+   -D ENABLE_cxx=ON \
+   -D ENABLE_d=OFF \
+   -D ENABLE_fortran=ON \
+   -D ENABLE_java=OFF \
+   -D ENABLE_lua=OFF \
+   -D ENABLE_ocaml=OFF \
+   -D ENABLE_octave=OFF \
-D ENABLE_pdl=OFF \
-D ENABLE_python=OFF \
-   -D PLD_gcw=OFF \
+   -D ENABLE_qt=OFF \
+   -D ENABLE_pyqt4=OFF \
-D ENABLE_tcl=OFF \
+   -D ENABLE_itcl=OFF \
-D ENABLE_tk=OFF \
-   -D ENABLE_wxwidgets=OFF \
-   -D ENABLE_gnome2=OFF \
-   -D ENABLE_octave=OFF \
-   -D PLD_wxwidgets=OFF
+   -D ENABLE_itk=OFF \
+   -D ENABLE_wxwidgets=OFF
 
 DOCSRC =   ${WRKSRC}/doc/docbook/src
 
-MULTI_PACKAGES =   -main -c++ -f77
+MULTI_PACKAGES =   -main -c++ -fortran
 
-myWANTLIB += ICE SM X11 Xext cairo fontconfig freetype gd glib-2.0
-myWANTLIB += gobject-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-myWANTLIB += png z ${MODGETTEXT_WANTLIB}
+myWANTLIB += ICE SM X11 Xext cairo glib-2.0
+myWANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0
+myWANTLIB += qhull intl ltdl
 
 WANTLIB-main = ${myWANTLIB} c pthread
-WANTLIB-c++ =  ${myWANTLIB} csirocsa plplotd ${COMPILER_LIBCXX}
-WANTLIB-f77 += ${myWANTLIB} csirocsa plplotd ${MODFORTRAN_WANTLIB}
+WANTLIB-c++ =  plplot m ${COMPILER_LIBCXX}
+WANTLIB-fortran = plplot m ${MODFORTRAN_WANTLIB}
 
 myLIB_DEPENDS =devel/glib2 \
+   devel/gettext \
devel/pango \
graphics/cairo \
-   graphics/gd \
-   ${MODGETTEXT_LIB_DEPENDS}
+   math/qhull \
+   devel/libtool,-ltdl
 
 LIB_DEPENDS-main = ${myLIB_DEPENDS}
-LIB_DEPENDS-c++ =  math/plplot,-main \
-   ${myLIB_DEPENDS}
-LIB_DEPENDS-f77 =  math/plplot,-main \
-   ${myLIB_DEPENDS} \
+LIB_DEPENDS-c++ =  math/plplot,-main
+LIB_DEPENDS-fortran =  math/plplot,-main \
${MODFORTRAN_LIB_DEPENDS}
 
 RUN_DEPENDS-main = ${myRUN_DEPENDS}
 RUN_DEPENDS-c++ =
-RUN_DEPENDS-f77 =
+RUN_DEPENDS-fortran =
 
 pre-configure:
@sed -i 's/3plplot/3/g' ${DOCSRC}/*.3plplot
Index: distinfo
===
RCS file: /cvs/ports/math/plplot/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo17 Mar 2014 23:21:43 -  1.5
+++ distinfo2 Nov 2017 16:24:53 -
@@ -1,2 

[UPDATE] sysutils/libfvde

[Remi Pointel]

Hi,

this is the diff to update libfvde to latest release.

Ok?

Cheers,

Remi.Index: Makefile
===
RCS file: /cvs/ports/sysutils/libfvde/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile	12 Feb 2017 06:58:29 -	1.1.1.1
+++ Makefile	2 Nov 2017 16:17:01 -
@@ -2,11 +2,11 @@
 
 COMMENT =	library and tools to access FileVault Drive Encryption
 
-VERSION = 	20160918
+VERSION = 	20170930
 DISTNAME =	libfvde-experimental-${VERSION}
 PKGNAME =	${DISTNAME:S/-experimental//}
 
-SHARED_LIBS +=  fvde   0.0 # 1.0
+SHARED_LIBS +=  fvde   0.1 # 1.0
 
 CATEGORIES =	sysutils security
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/libfvde/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo	12 Feb 2017 06:58:29 -	1.1.1.1
+++ distinfo	2 Nov 2017 16:17:01 -
@@ -1,2 +1,2 @@
-SHA256 (libfvde-experimental-20160918.tar.gz) = aGOumRFjrAaJlCAdxFAoYnqOYAdt1XS3z1lLXzMCQq8=
-SIZE (libfvde-experimental-20160918.tar.gz) = 1643264
+SHA256 (libfvde-experimental-20170930.tar.gz) = Bph/0zh1MdPnflInnEBjUw36L6V0/+VsoZp+B0cCqRM=
+SIZE (libfvde-experimental-20170930.tar.gz) = 1678823

UPDATE: databases/pgpool

[Sebastian Benoit]

Hi,

this updates pgpool from 3.2.12 to 3.6.6.

Yesterdays 3.6.7 requires OpenSSL 1.1 or at least some patching, so i would
like to get this commited first before taking care of openssl and postgres
10).

ok?

/Benno

Index: Makefile
===
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile4 Apr 2016 22:57:45 -   1.7
+++ Makefile10 Oct 2017 14:43:08 -
@@ -2,8 +2,7 @@
 
 COMMENT=   connection pool server for PostgreSQL
 
-DISTNAME=  pgpool-II-3.2.12
-REVISION=  0
+DISTNAME=  pgpool-II-3.6.6
 
 CATEGORIES=databases
 
@@ -21,7 +20,7 @@ MASTER_SITES= http://www.pgpool.net/med
 WANTLIB=   c crypto m pq ssl pthread
 
 CONFIGURE_STYLE=   gnu
-CONFIGURE_ARGS=--with-openssl 
+CONFIGURE_ARGS=--with-openssl
 
 USE_GMAKE= Yes
 FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples/pgpool-II/
@@ -30,11 +29,12 @@ BUILD_DEPENDS = databases/postgresql,-s
 LIB_DEPENDS =  databases/postgresql
 
 post-install:
-   @cd ${WRKSRC}/sql/pgpool-regclass && \
+   @cd ${WRKSRC}/src/sql/pgpool-regclass && \
env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-f ${MAKE_FILE} ${ALL_TARGET} && \
env -i ${MAKE_ENV} \
PREFIX=${WRKINST}${PREFIX} ${DESTDIRNAME}=${WRKINST} 
TRUEPREFIX=${PREFIX} \
${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
+   ${INSTALL_MAN} ${WRKDIST}/./doc/src/sgml/man8/pgpool.8 
${PREFIX}/man/man8/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo4 Oct 2015 20:22:21 -   1.5
+++ distinfo10 Oct 2017 14:43:08 -
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.2.12.tar.gz) = 2ynh2OUX9qoDTehobSpAqPtCtWJOEXrKV3DIBWysbog=
-SIZE (pgpool-II-3.2.12.tar.gz) = 1626485
+SHA256 (pgpool-II-3.6.6.tar.gz) = X72sFKB7T0yr74vSJL4fuwdw2apHMdj6eQWHjcTCL7w=
+SIZE (pgpool-II-3.6.6.tar.gz) = 3171264
Index: patches/patch-pool_lobj_c
===
RCS file: patches/patch-pool_lobj_c
diff -N patches/patch-pool_lobj_c
--- patches/patch-pool_lobj_c   21 Dec 2011 15:51:04 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_lobj_c,v 1.1.1.1 2011/12/21 15:51:04 pea Exp $
 pool_lobj.c.orig   Thu Nov 24 15:43:49 2011
-+++ pool_lobj.cThu Nov 24 15:44:02 2011
-@@ -27,6 +27,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "pool.h"
- #include "pool_lobj.h"
Index: patches/patch-pool_memqcache_c
===
RCS file: patches/patch-pool_memqcache_c
diff -N patches/patch-pool_memqcache_c
--- patches/patch-pool_memqcache_c  24 Sep 2012 19:39:59 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_memqcache_c,v 1.1 2012/09/24 19:39:59 pea Exp $
 pool_memqcache.c.orig  Sun Sep 16 12:23:15 2012
-+++ pool_memqcache.c   Sun Sep 16 12:23:26 2012
-@@ -36,6 +36,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef USE_MEMCACHED
- #include 
Index: patches/patch-pool_select_walker_c
===
RCS file: patches/patch-pool_select_walker_c
diff -N patches/patch-pool_select_walker_c
--- patches/patch-pool_select_walker_c  24 Sep 2012 19:39:59 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_select_walker_c,v 1.1 2012/09/24 19:39:59 pea Exp $
 pool_select_walker.c.orig  Sun Sep 16 12:30:03 2012
-+++ pool_select_walker.c   Sun Sep 16 12:30:16 2012
-@@ -22,6 +22,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "pool.h"
- #include "pool_config.h"
Index: patches/patch-src_include_watchdog_wd_utils_h
===
RCS file: patches/patch-src_include_watchdog_wd_utils_h
diff -N patches/patch-src_include_watchdog_wd_utils_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_include_watchdog_wd_utils_h   10 Oct 2017 14:43:08 
-
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/include/watchdog/wd_utils.h
+--- src/include/watchdog/wd_utils.h.orig
 src/include/watchdog/wd_utils.h
+@@ -26,6 +26,7 @@
+ #define WD_UTILS_H
+ 
+ #include 
++#include 
+ #include "parser/pg_list.h"
+ 
+ #define WD_NG (0)
Index: patches/patch-src_pcp_con_pcp_worker_c
===
RCS file: patches/patch-src_pcp_con_pcp_worker_c
diff -N patches/patch-src_pcp_con_pcp_worker_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_pcp_con_pcp_worker_c  10 Oct 2017 14:43:08 -
@@ -0,0 +1,16 @@

CVS: cvs.openbsd.org: ports

[Robert Peichaer]

CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2017/11/02 10:04:14

Modified files:
devel  : Makefile 

Log message:
add expect-lite

CVS: cvs.openbsd.org: ports

[Robert Peichaer]

CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2017/11/02 10:02:01

Log message:
Import expect-lite-4.9.0

Comment:
mature, quick and easy command line automation tool

Description:

Written in expect, it is designed to directly map an interactive
terminal session into an automation script.

expect-lite scripts use special character(s) at the beginning of
each line to indicate the action. Basic expect-lite scripts can be
created by simply cutting and pasting text from a terminal window
into a script, and adding '>' '<' characters.

No knowledge of expect is required!

OK sthen@

Status:

Vendor Tag: rpe
Release Tags:   rpe_20171102

N ports/devel/expect-lite/Makefile
N ports/devel/expect-lite/distinfo
N ports/devel/expect-lite/pkg/PLIST
N ports/devel/expect-lite/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 09:54:25

Added files:
devel/xdg-user-dirs/patches: patch-Makefile_in 

Log message:
fix link

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 09:48:44

Modified files:
devel/meson: meson.port.mk 

Log message:
Add --sharedstatedir="/var/db".

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 09:46:39

Modified files:
devel/meson: meson.port.mk 

Log message:
Add support for ${LOCALSTATEDIR}.

Re: Help update port 'mail/mlmmj' to the latest 1.3.0

[Zhang Huangbin]

> On Nov 2, 2017, at 4:21 PM, viq  wrote:
> 
> Ah, then you need `cvs rm` for each of the patch files.

Thanks for the instruction. Here’s the full patch.



mlmmj-1.3.0.patch
Description: Binary data



Zhang Huangbin, founder of iRedMail project: http://www.iredmail.org/
Time zone: GMT+8 (China/Beijing).
Available on Telegram: https://t.me/iredmail

NEW: devel/xtensa-elf

[Anthony J. Bentley]

Hi,

Attached is a port for a new cross-compiler, xtensa-elf-gcc, in order
to eventually compile some firmwares.

ok?

-- 
Anthony J. Bentley


xtensa-elf.tar.gz
Description: GNU Zip compressed data

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/11/02 09:29:38

Modified files:
x11/gnome/bijiben: Makefile distinfo 
x11/gnome/bijiben/pkg: PLIST 

Log message:
update to bijiben-3.26.2

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 09:27:16

Modified files:
x11/gnome/initial-setup: Makefile distinfo 
x11/gnome/initial-setup/patches: patch-configure_ac 
 patch-gnome-initial-setup_Makefile_in 
 
patch-gnome-initial-setup_gnome-initial-setup_c 
 
patch-gnome-initial-setup_pages_Makefile_in 
 
patch-gnome-initial-setup_pages_account_Makefile_in 
 
patch-gnome-initial-setup_pages_password_Makefile_in 

Log message:
Update to gnome-initial-setup-3.26.0.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 09:22:00

Modified files:
comms/minimodem: Makefile 

Log message:
fix bogus link line.

Re: UPDATE: devel/libivykis

[Antoine Jacoutot]

On Thu, Nov 02, 2017 at 03:07:45PM +, Steven Mestdagh wrote:
> update to a version used by newer syslog-ng

OK


> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libivykis/Makefile,v
> retrieving revision 1.7
> diff -u -p -u -r1.7 Makefile
> --- Makefile  25 Jul 2015 08:18:20 -  1.7
> +++ Makefile  2 Nov 2017 14:52:26 -
> @@ -2,11 +2,11 @@
>  
>  COMMENT =asynchronous I/O readiness notification library
>  
> -V =  0.36.3
> +V =  0.42
>  DISTNAME =   ivykis-$V
>  PKGNAME =lib${DISTNAME}
>  
> -SHARED_LIBS =ivykis  1.0
> +SHARED_LIBS =ivykis  2.0
>  
>  CATEGORIES = devel
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/libivykis/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 distinfo
> --- distinfo  25 Jul 2015 08:18:20 -  1.4
> +++ distinfo  2 Nov 2017 14:52:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (ivykis-0.36.3.tar.gz) = qnDlSHz20cmWH0h9ULGNFqkh3fRPvc0iZemFvrrEIj0=
> -SIZE (ivykis-0.36.3.tar.gz) = 401979
> +SHA256 (ivykis-0.42.tar.gz) = 9jxNuUW+aa/U0S/zAsJtY5mpG8ivqjS+VkQbtIYgqbI=
> +SIZE (ivykis-0.42.tar.gz) = 649882
> 

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 09:13:37

Modified files:
devel/meson: meson.port.mk 

Log message:
Update comment.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 09:10:07

Modified files:
games/pacman-arena: Makefile 

Log message:
explicitly link with -lm as the main program requires it.
fixes link with lld.

UPDATE: devel/libivykis

[Steven Mestdagh]

update to a version used by newer syslog-ng

Index: Makefile
===
RCS file: /cvs/ports/devel/libivykis/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- Makefile25 Jul 2015 08:18:20 -  1.7
+++ Makefile2 Nov 2017 14:52:26 -
@@ -2,11 +2,11 @@
 
 COMMENT =  asynchronous I/O readiness notification library
 
-V =0.36.3
+V =0.42
 DISTNAME = ivykis-$V
 PKGNAME =  lib${DISTNAME}
 
-SHARED_LIBS =  ivykis  1.0
+SHARED_LIBS =  ivykis  2.0
 
 CATEGORIES =   devel
 
Index: distinfo
===
RCS file: /cvs/ports/devel/libivykis/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo25 Jul 2015 08:18:20 -  1.4
+++ distinfo2 Nov 2017 14:52:26 -
@@ -1,2 +1,2 @@
-SHA256 (ivykis-0.36.3.tar.gz) = qnDlSHz20cmWH0h9ULGNFqkh3fRPvc0iZemFvrrEIj0=
-SIZE (ivykis-0.36.3.tar.gz) = 401979
+SHA256 (ivykis-0.42.tar.gz) = 9jxNuUW+aa/U0S/zAsJtY5mpG8ivqjS+VkQbtIYgqbI=
+SIZE (ivykis-0.42.tar.gz) = 649882

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 09:04:18

Modified files:
games/f1spirit : Makefile 

Log message:
if using C++ just say it!
this game's build system is moronic.
fixes link with lld

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2017/11/02 09:00:21

Modified files:
devel/p5-File-Find-Object: Makefile 

Log message:
Portroach must skip versions that follow a different schema.

Re: UPDATE: net/wget -current,-stable (CVE-2017-13089, CVE-2017-13090)

[Rafael Sadowski]

On Tue Oct 31, 2017 at 01:02:44PM +0100, Rafael Sadowski wrote:
> On Tue Oct 31, 2017 at 12:20:26PM +0100, Rafael Sadowski wrote:
> > Hi All,
> > 
> > Update Wget to the latest stable version 1.19.1. This version includes
> > the following CVE patches:
> > 
> > "Fix stack overflow in HTTP protocol handling (CVE-2017-13089)"
> > http://git.savannah.gnu.org/cgit/wget.git/commit/?id=d892291fb8ace4c3b734ea5125770989c215df3f
> > 
> > "Fix heap overflow in HTTP protocol handling (CVE-2017-13090)"
> > http://git.savannah.gnu.org/cgit/wget.git/commit/?id=ba6b44f6745b14dce414761a8e4b35d31b176bba
> > 
> > 1.19.1 provide only .tar.lz and tar.gz. Since we don't support *.lz, I
> > have decided to *.gz
> > 
> > Also please find attached a diff for -stable.
> > 
> 
> Forget the attachment, so here it is inline:
> 

*ping-stable*

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/wget/Makefile,v
> retrieving revision 1.72
> diff -u -p -u -p -r1.72 Makefile
> --- Makefile  22 Feb 2017 02:49:25 -  1.72
> +++ Makefile  31 Oct 2017 11:09:04 -
> @@ -4,6 +4,7 @@ COMMENT = retrieve files from the web vi
>  
>  DISTNAME =   wget-1.19.1
>  CATEGORIES = net
> +REVISION =   0
>  
>  HOMEPAGE =   https://www.gnu.org/software/wget/
>  
> Index: patches/patch-src_http_c
> ===
> RCS file: patches/patch-src_http_c
> diff -N patches/patch-src_http_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_http_c  31 Oct 2017 11:09:04 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +Fix stack overflow in HTTP protocol handling (CVE-2017-13089)
> +Commit from upstream d892291fb8ace4c3b734ea5125770989c215df3f
> +Index: src/http.c
> +--- src/http.c.orig
>  src/http.c
> +@@ -973,6 +973,9 @@ skip_short_body (int fd, wgint contlen, bool chunked)
> +   remaining_chunk_size = strtol (line, , 16);
> +   xfree (line);
> + 
> ++  if (remaining_chunk_size < 0)
> ++  return false;
> ++
> +   if (remaining_chunk_size == 0)
> + {
> +   line = fd_read_line (fd);
> Index: patches/patch-src_retr_c
> ===
> RCS file: patches/patch-src_retr_c
> diff -N patches/patch-src_retr_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_retr_c  31 Oct 2017 11:09:04 -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +Fix heap overflow in HTTP protocol handling (CVE-2017-13090)
> +Commit from upstream ba6b44f6745b14dce414761a8e4b35d31b176bba
> +Index: src/retr.c
> +--- src/retr.c.orig
>  src/retr.c
> +@@ -320,6 +320,12 @@ fd_read_body (const char *downloaded_filename, int fd,
> +   remaining_chunk_size = strtol (line, , 16);
> +   xfree (line);
> + 
> ++  if (remaining_chunk_size < 0)
> ++  {
> ++  ret = -1;
> ++  break;
> ++  }
> ++
> +   if (remaining_chunk_size == 0)
> + {
> +   ret = 0;
> 

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/11/02 08:47:16

Modified files:
databases/puppetdb4: Makefile 

Log message:
remove the MODRUBY_FLAVOR dependency to puppet again, it doesn't have
a flavor, BAD BAD /ME, I ok'ed that before

noticed by naddy@

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 08:47:06

Modified files:
games/egoboo/patches: patch-game_Makefile_unix 

Log message:
explicitly link with -lm, as the main program uses it.
fixes link with lld

alpha bulk build report

[phessler]

bulk build on alpha-1.ports.openbsd.org
started on  Thu Oct 19 04:05:42 MDT 2017
finished at Thu Nov 2 08:43:39 MDT 2017
lasted 14D21h37m
done with kern.version=OpenBSD 6.2-current (GENERIC.MP) #145: Wed Oct 18 
11:30:21 MDT 2017

built packages:7305
Oct 19:731
Oct 20:12
Oct 21:546
Oct 22:366
Oct 23:381
Oct 24:259
Oct 25:224
Oct 26:288
Oct 27:339
Oct 28:317
Oct 29:430
Oct 30:367
Oct 31:489
Nov 1:1163
Nov 2:1392



build failures: 21
http://build-failures.rhaalovely.net//alpha/2017-10-19/archivers/woff2.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/cad/openscad.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/databases/py-psycopg2,python3.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/devel/gtest.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/devel/reposurgeon.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/devel/spidermonkey38.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/emulators/vice.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/fonts/fira-fonts.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/graphics/freeimage.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/lang/gcc/4.6.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/lang/mruby.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/lang/verilator.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/math/p5-Math-Pari.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/net/freeradius3.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/net/owncloudclient.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/net/powerdns.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/net/telegram-purple.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/print/poppler.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/telephony/asterisk.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/textproc/link-grammar,-main.log
http://build-failures.rhaalovely.net//alpha/2017-10-19/x11/tint2.log

recurrent failures
 failures/cad/openscad.log
 failures/databases/py-psycopg2,python3.log
 failures/devel/gtest.log
 failures/devel/reposurgeon.log
 failures/devel/spidermonkey38.log
 failures/emulators/vice.log
 failures/graphics/freeimage.log
 failures/lang/mruby.log
 failures/math/p5-Math-Pari.log
 failures/net/freeradius3.log
 failures/net/owncloudclient.log
new failures
+++ ls-failures Thu Nov  2 08:44:03 2017
+failures/archivers/woff2.log
+failures/fonts/fira-fonts.log
+failures/lang/gcc/4.6.log
+failures/lang/verilator.log
resolved failures
--- ../old/alpha/last//ls-failures  Mon Oct 16 15:14:10 2017
-failures/lang/gcc/4.6,-c++.log
Base libs:
c.90.0 crypto.42.0

X libs:

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 08:43:40

Modified files:
x11/gnome/settings-daemon: Makefile distinfo 

Log message:
Update to gnome-settings-daemon-3.26.2.

UPDATE: math/plplot

[Steven Mestdagh]

a long overdue update.  comments / ok?

Index: Makefile
===
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.58
diff -u -p -u -r1.58 Makefile
--- Makefile26 Jul 2017 22:45:26 -  1.58
+++ Makefile2 Nov 2017 14:39:24 -
@@ -2,22 +2,20 @@
 
 COMMENT-main = advanced 2D and 3D scientific plotting library
 COMMENT-c++ =  C++ interface to plplot
-COMMENT-f77 =  Fortran 77 interface to plplot
+COMMENT-fortran =  Fortran 77 interface to plplot
 
-VERSION =  5.8.0
+VERSION =  5.13.0
 DISTNAME = plplot-${VERSION}
-SHARED_LIBS =  csirocsa3.0 \
-   plplotcxxd  12.0\
-   plplotd 13.0\
-   plplotf77cd 11.0\
-   plplotf77d  11.0
+SHARED_LIBS =  csirocsa4.0 \
+   csironn 0.0 \
+   plplot  15.0\
+   plplotcxx   13.0\
+   plplotfortran   0.0 \
+   qsastime0.0
 
 PKGNAME-main = ${DISTNAME}
 PKGNAME-c++ =  plplot-c++-${VERSION}
-PKGNAME-f77 =  plplot-f77-${VERSION}
-REVISION-main =10
-REVISION-c++ = 11
-REVISION-f77 = 13
+PKGNAME-fortran =  plplot-fortran-${VERSION}
 
 CATEGORIES =   math graphics
 
@@ -33,7 +31,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORGE
 MODULES =  devel/gettext \
fortran
 
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
 
 BUILD_DEPENDS =print/ghostscript/gnu-fonts \
${MODFORTRAN_BUILD_DEPENDS}
@@ -42,51 +40,54 @@ myRUN_DEPENDS = print/ghostscript/gnu-fo
 
 MODULES += devel/cmake
 
-# Until such time as the cmake ninja generator supports fortran
+# Until the cmake ninja generator supports fortran
 USE_NINJA =No
 
-CONFIGURE_ARGS =   -D ENABLE_java=OFF \
-   -D ENABLE_f77=ON \
-   -D ENABLE_f95=OFF \
-   -D ENABLE_itcl=OFF \
+CONFIGURE_ARGS =   -D ENABLE_ada=OFF \
+   -D ENABLE_cxx=ON \
+   -D ENABLE_d=OFF \
+   -D ENABLE_fortran=ON \
+   -D ENABLE_java=OFF \
+   -D ENABLE_lua=OFF \
+   -D ENABLE_ocaml=OFF \
+   -D ENABLE_octave=OFF \
-D ENABLE_pdl=OFF \
-D ENABLE_python=OFF \
-   -D PLD_gcw=OFF \
+   -D ENABLE_qt=OFF \
+   -D ENABLE_pyqt4=OFF \
-D ENABLE_tcl=OFF \
+   -D ENABLE_itcl=OFF \
-D ENABLE_tk=OFF \
-   -D ENABLE_wxwidgets=OFF \
-   -D ENABLE_gnome2=OFF \
-   -D ENABLE_octave=OFF \
-   -D PLD_wxwidgets=OFF
+   -D ENABLE_itk=OFF \
+   -D ENABLE_wxwidgets=OFF
 
 DOCSRC =   ${WRKSRC}/doc/docbook/src
 
-MULTI_PACKAGES =   -main -c++ -f77
+MULTI_PACKAGES =   -main -c++ -fortran
 
-myWANTLIB += ICE SM X11 Xext cairo fontconfig freetype gd glib-2.0
-myWANTLIB += gobject-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-myWANTLIB += png z ${MODGETTEXT_WANTLIB}
+myWANTLIB += ICE SM X11 Xext cairo glib-2.0
+myWANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0
+myWANTLIB += qhull ${MODGETTEXT_WANTLIB} ltdl
 
 WANTLIB-main = ${myWANTLIB} c pthread
-WANTLIB-c++ =  ${myWANTLIB} csirocsa plplotd ${COMPILER_LIBCXX}
-WANTLIB-f77 += ${myWANTLIB} csirocsa plplotd ${MODFORTRAN_WANTLIB}
+WANTLIB-c++ =  plplot m ${COMPILER_LIBCXX}
+WANTLIB-fortran = plplot m ${MODFORTRAN_WANTLIB}
 
 myLIB_DEPENDS =devel/glib2 \
devel/pango \
graphics/cairo \
-   graphics/gd \
+   math/qhull \
+   devel/libtool,-ltdl \
${MODGETTEXT_LIB_DEPENDS}
 
 LIB_DEPENDS-main = ${myLIB_DEPENDS}
-LIB_DEPENDS-c++ =  math/plplot,-main \
-   ${myLIB_DEPENDS}
-LIB_DEPENDS-f77 =  math/plplot,-main \
-   ${myLIB_DEPENDS} \
+LIB_DEPENDS-c++ =  math/plplot,-main
+LIB_DEPENDS-fortran =  math/plplot,-main \
${MODFORTRAN_LIB_DEPENDS}
 
 RUN_DEPENDS-main = ${myRUN_DEPENDS}
 RUN_DEPENDS-c++ =
-RUN_DEPENDS-f77 =
+RUN_DEPENDS-fortran =
 
 pre-configure:
@sed -i 's/3plplot/3/g' ${DOCSRC}/*.3plplot
Index: distinfo
===
RCS file: /cvs/ports/math/plplot/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo17 Mar 2014 23:21:43 -  1.5
+++ distinfo2 Nov 2017 14:39:24 -
@@ -1,2 +1,2 @@
-SHA256 (plplot-5.8.0.tar.gz) = WVvMAhtBW6GRl5WGVD+VKF8D9bVO139FKXaomtKFCHc=
-SIZE (plplot-5.8.0.tar.gz) = 7582217
+SHA256 (plplot-5.13.0.tar.gz) = 

Re: add python2 and python3 links

[Antoine Jacoutot]

On Thu, Nov 02, 2017 at 01:51:09PM +, Antoine Jacoutot wrote:
> Hi.
> 
> We have never provided a default 'python' utility with our packages and for
> good reasons. That said, I would really like if we could provide a default
> symlink to the default major versions of python. That is: python2 and python3.
> The rational behind this is that a lot of upstreams have "fixed" their 
> hardcoded
> shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or 
> #!/usr/bin/env python3.
> This would allow us to drop lots of patches, substitutions and MODPY_ADJ_FILES
> from our ports tree and make things easier for us in general.
> 
> People willing to use another version as the default major are pretty much on
> their own but that's already the case today since we have substituting
> everything anyway.
> 
> I am putting this into a bulk right now...
> What do you guys think?

Better diff after rpointel's feedback.
Uncomment a few more things to be consistent with what everyone else does.
Going into a bulk soonish.


Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.123
diff -u -p -r1.123 Makefile.inc
--- Makefile.inc16 Jul 2017 19:18:59 -  1.123
+++ Makefile.inc2 Nov 2017 14:40:13 -
@@ -158,6 +158,8 @@ post-install:
@sed -e "s,@VERSION@,${VERSION},g" -e "s,@LOCALBASE@,${LOCALBASE},g" \
${FILESDIR}/idle > ${WRKSRC}/idle
${INSTALL_SCRIPT} ${WRKSRC}/idle ${PREFIX}/bin/idle${VERSION}
+   cd ${PREFIX}/bin && ln -sf idle${VERSION} idle${VERSION:R}
+   mv ${PREFIX}/bin/pydoc ${PREFIX}/bin/pydoc2
@cd ${WRKSRC}; tar -cf - Tools | (cd ${PREFIX}/lib/python${VERSION}; \
tar -xf -)
${INSTALL_SCRIPT} ${WRKSRC}/Tools/scripts/2to3 \
Index: 2.7/Makefile
===
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- 2.7/Makefile20 Sep 2017 18:44:48 -  1.53
+++ 2.7/Makefile2 Nov 2017 14:40:13 -
@@ -9,6 +9,8 @@ VERSION =   2.7
 PATCHLEVEL =   .14
 SHARED_LIBS =  python2.7 0.0
 VERSION_SPEC = >=2.7,<2.8
+REVISION-main =0
+REVISION-idle =0
 
 CONFIGURE_ARGS += --with-ensurepip=no
 
Index: 2.7/pkg/PLIST-idle
===
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-idle,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-idle
--- 2.7/pkg/PLIST-idle  3 Jul 2016 18:16:00 -   1.8
+++ 2.7/pkg/PLIST-idle  2 Nov 2017 14:40:13 -
@@ -3,6 +3,7 @@
 @option is-branch
 @conflict python-idle->=2.7,<2.8
 @comment bin/idle
+bin/idle2
 bin/idle2.7
 lib/python2.7/idlelib/
 lib/python2.7/idlelib/AutoComplete.py
Index: 2.7/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST-main
--- 2.7/pkg/PLIST-main  20 Sep 2017 18:44:48 -  1.20
+++ 2.7/pkg/PLIST-main  2 Nov 2017 14:40:13 -
@@ -7,13 +7,14 @@
 @pkgpath lang/python/2.7,-bz2
 @pkgpath lang/python/2.7,-sqlite
 @pkgpath lang/python/2.7,-expat
-@comment bin/2to3
 @comment bin/pydoc
+@comment bin/2to3
+bin/pydoc2
 bin/pydoc2.7
 @comment bin/python
 @comment bin/python-config
-@comment bin/python2
-@comment bin/python2-config
+bin/python2
+bin/python2-config
 @bin bin/python2.7
 bin/python2.7-2to3
 bin/python2.7-config
@@ -2497,7 +2498,7 @@ lib/python2.7/zipfile.py
 lib/python2.7/zipfile.pyc
 lib/python2.7/zipfile.pyo
 @comment man/man1/python.1
-@comment man/man1/python2.1
+@man man/man1/python2.1
 @man man/man1/python2.7.1
 share/doc/python2.7/
 share/doc/python2.7/CHANGES.OpenBSD
Index: 3.6/Makefile
===
RCS file: /cvs/ports/lang/python/3.6/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- 3.6/Makefile15 Oct 2017 16:31:45 -  1.6
+++ 3.6/Makefile2 Nov 2017 14:40:13 -
@@ -9,6 +9,8 @@ VERSION =   3.6
 PATCHLEVEL =   .3
 SHARED_LIBS =  python3.6m 0.0
 VERSION_SPEC = >=3.6,<3.7
+REVISION-main =0
+REVISION-idle =0
 
 CONFIGURE_ARGS +=  --with-ensurepip=no
 
Index: 3.6/pkg/PLIST-idle
===
RCS file: /cvs/ports/lang/python/3.6/pkg/PLIST-idle,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-idle
--- 3.6/pkg/PLIST-idle  15 Oct 2017 16:31:45 -  1.2
+++ 3.6/pkg/PLIST-idle  2 Nov 2017 14:40:13 -
@@ -3,7 +3,7 @@
 @option is-branch
 @conflict python-idle->=3.6,<3.7
 @pkgpath lang/python3/3.6,-idle
-@comment bin/idle3
+bin/idle3
 bin/idle3.6
 lib/python3.6/idlelib/
 lib/python3.6/idlelib/CREDITS.txt
Index: 3.6/pkg/PLIST-main

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 08:36:24

Modified files:
games/clonekeen: Makefile 

Log message:
game explicitly uses -lm, don't get it accidentally from sdl
fixes link with lld

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/11/02 08:32:37

Modified files:
devel/cmake: cmake.port.mk 

Log message:
add a !defined(CONFIGURE_ARGS) check to unbreak cmake things that don't
set CONFIGURE_ARGS, reported by jca@, thanks!

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 08:29:30

Modified files:
games/bomberclone: Makefile 

Log message:
do like solaris does, explicitly link with -lm, because bomberclone
uses it directly. Fixes link with lld.

Re: add python2 and python3 links

[Stuart Henderson]

On 2017/11/02 15:11, Antoine Jacoutot wrote:
> On Thu, Nov 02, 2017 at 02:10:21PM +, Stuart Henderson wrote:
> > On 2017/11/02 14:51, Antoine Jacoutot wrote:
> > > Hi.
> > > 
> > > We have never provided a default 'python' utility with our packages and 
> > > for
> > > good reasons. That said, I would really like if we could provide a default
> > > symlink to the default major versions of python. That is: python2 and 
> > > python3.
> > > The rational behind this is that a lot of upstreams have "fixed" their 
> > > hardcoded
> > > shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or 
> > > #!/usr/bin/env python3.
> > > This would allow us to drop lots of patches, substitutions and 
> > > MODPY_ADJ_FILES
> > > from our ports tree and make things easier for us in general.
> > > 
> > > People willing to use another version as the default major are pretty 
> > > much on
> > > their own but that's already the case today since we have substituting
> > > everything anyway.
> > > 
> > > I am putting this into a bulk right now...
> > > What do you guys think?
> > 
> > Sounds sane to me. Some users may already have their own symlink that 
> > they'll
> > have to remove first before they update.
> > 
> > Related: what does anyone think about moving these?
> > 
> > lang/python/2.7 -> lang/python/2
> > lang/python/3.6 -> lang/python/3
> > 
> > The further split used to be helpful in the days of 2.4/5/6/7 when they 
> > language
> > changed all the time, but it doesn't seem particularly useful these days, 
> > and makes
> > version updates (like 3.4 to 3.6) harder due to the bumps.
> 
> I fullu support this move. It'll bring us closer to everyone does.

I realised now that it doesn't actually help with bumps because the library 
filenames
change :(

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2017/11/02 08:20:59

Modified files:
devel/p5-Test-Deep-JSON: Makefile distinfo 
devel/p5-Test-Deep-JSON/pkg: DESCR 

Log message:
update p5-Test-Deep-JSON to 0.04
module moved from Module::Build to Module::Build::Tiny
OK maintainer Matthias Pitzl

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/11/02 08:19:25

Modified files:
x11/gnome/totem: Makefile distinfo 
x11/gnome/totem/pkg: PLIST 

Log message:
Update to totem-3.26.0.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 08:14:37

Modified files:
games/beret/patches: patch-Makefile 

Log message:
correct link with lld

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2017/11/02 08:13:39

Modified files:
databases/puppetdb4: Makefile 

Log message:
Bump plugin subpackage after ruby default version change

Also, use MODRUBY_FLAVOR for the ruby library dependency to ensure the
correct ruby version is used.

noticed by naddy@
OK sebastia@

Re: add python2 and python3 links

[Antoine Jacoutot]

On Thu, Nov 02, 2017 at 02:10:21PM +, Stuart Henderson wrote:
> On 2017/11/02 14:51, Antoine Jacoutot wrote:
> > Hi.
> > 
> > We have never provided a default 'python' utility with our packages and for
> > good reasons. That said, I would really like if we could provide a default
> > symlink to the default major versions of python. That is: python2 and 
> > python3.
> > The rational behind this is that a lot of upstreams have "fixed" their 
> > hardcoded
> > shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or 
> > #!/usr/bin/env python3.
> > This would allow us to drop lots of patches, substitutions and 
> > MODPY_ADJ_FILES
> > from our ports tree and make things easier for us in general.
> > 
> > People willing to use another version as the default major are pretty much 
> > on
> > their own but that's already the case today since we have substituting
> > everything anyway.
> > 
> > I am putting this into a bulk right now...
> > What do you guys think?
> 
> Sounds sane to me. Some users may already have their own symlink that they'll
> have to remove first before they update.
> 
> Related: what does anyone think about moving these?
> 
>   lang/python/2.7 -> lang/python/2
>   lang/python/3.6 -> lang/python/3
> 
> The further split used to be helpful in the days of 2.4/5/6/7 when they 
> language
> changed all the time, but it doesn't seem particularly useful these days, and 
> makes
> version updates (like 3.4 to 3.6) harder due to the bumps.

I fullu support this move. It'll bring us closer to everyone does.

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 08:11:08

Modified files:
games/ace  : Makefile 

Log message:
configure bogosity: set BUILD_CC to avoid linking with gcc when using clang

Re: add python2 and python3 links

[Stuart Henderson]

On 2017/11/02 14:51, Antoine Jacoutot wrote:
> Hi.
> 
> We have never provided a default 'python' utility with our packages and for
> good reasons. That said, I would really like if we could provide a default
> symlink to the default major versions of python. That is: python2 and python3.
> The rational behind this is that a lot of upstreams have "fixed" their 
> hardcoded
> shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or 
> #!/usr/bin/env python3.
> This would allow us to drop lots of patches, substitutions and MODPY_ADJ_FILES
> from our ports tree and make things easier for us in general.
> 
> People willing to use another version as the default major are pretty much on
> their own but that's already the case today since we have substituting
> everything anyway.
> 
> I am putting this into a bulk right now...
> What do you guys think?

Sounds sane to me. Some users may already have their own symlink that they'll
have to remove first before they update.

Related: what does anyone think about moving these?

lang/python/2.7 -> lang/python/2
lang/python/3.6 -> lang/python/3

The further split used to be helpful in the days of 2.4/5/6/7 when they language
changed all the time, but it doesn't seem particularly useful these days, and 
makes
version updates (like 3.4 to 3.6) harder due to the bumps.

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2017/11/02 08:08:18

Modified files:
www/nginx  : Makefile 

Log message:
Bump passenger subpackage and allow it to work with ruby 2.4.

noticed by naddy@

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2017/11/02 08:06:46

Modified files:
sysutils/libfsntfs: Makefile distinfo 

Log message:
update libfsntfs to 20170315.
ok and inputs from benoit@.

Re: add python2 and python3 links

[Antoine Jacoutot]

On Thu, Nov 02, 2017 at 02:05:22PM +, Daniel Jakots wrote:
> On Thu, 2 Nov 2017 14:51:09 +0100, Antoine Jacoutot
>  wrote:
> 
> > +.if ${VERSION} == "2.7" || ${VERSION} == "3.6"
> 
> Wouldn't it be better to use MODPY_DEFAULT_VERSION_2 and
> MODPY_DEFAULT_VERSION_3?

python does not use these.
Anyway I have a better diff pending after rpointel feedback.

-- 
Antoine

Re: add python2 and python3 links

[Daniel Jakots]

On Thu, 2 Nov 2017 14:51:09 +0100, Antoine Jacoutot
 wrote:

> +.if ${VERSION} == "2.7" || ${VERSION} == "3.6"

Wouldn't it be better to use MODPY_DEFAULT_VERSION_2 and
MODPY_DEFAULT_VERSION_3?

Cheers,
Daniel

Update xapian from 1.2.15 to 1.4.5

[Jeremy Evans]

This updates xapian from 1.2.15 to 1.4.5.  Among other things, it
adds support for getting snippets in search results.

This also enables the ruby bindings for xapian and builds a
package for them.  I've tested the ruby binding on amd64 and it
appears to work correctly including the use of the new snippets
feature.

Looks like the perl module changed from Search/Xapian to just
Xapian.

In xapian-core, I had to disable the use of timer_create, as the
related code actually depends on sigevent(7) which I don't think
is currently supported.

OKs?

Thanks,
Jeremy

Index: databases/xapian-bindings/Makefile
===
RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- databases/xapian-bindings/Makefile  23 Sep 2017 10:53:07 -  1.7
+++ databases/xapian-bindings/Makefile  2 Nov 2017 13:41:57 -
@@ -2,18 +2,19 @@
 
 COMMENT-main=  perl bindings for Xapian
 COMMENT-python=python bindings for Xapian
+COMMENT-ruby=  ruby bindings for Xapian
 
-V= 1.2.15
+V= 1.4.5
 DISTNAME=  xapian-bindings-${V}
-REVISION-main =3
-REVISION-python = 1
 
 PKGNAME-main=  xapian-bindings-perl-${V}
 PKGNAME-python=xapian-bindings-python-${V}
+PKGNAME-ruby=  ruby${MODRUBY_BINREV}-xapian-${V}
 
-MODULES=   lang/python
+MODULES=   lang/python \
+   lang/ruby
 
-MULTI_PACKAGES=-main -python
+MULTI_PACKAGES=-main -python -ruby
 
 CATEGORIES=databases textproc
 
@@ -23,16 +24,24 @@ HOMEPAGE=   http://xapian.org/
 PERMIT_PACKAGE_CDROM=  Yes
 
 MASTER_SITES=  http://oligarchy.co.uk/xapian/${V}/
+EXTRACT_SUFX=  .tar.xz
 
 LIB_DEPENDS=   databases/xapian-core
 
 WANTLIB += ${COMPILER_LIBCXX} m uuid z xapian
 WANTLIB-main = ${WANTLIB} c perl
 
+RUN_DEPENDS-ruby = ${MODRUBY_RUN_DEPENDS}
+SUBST_VARS+=   MODRUBY_BINREV
+
 AUTOCONF_VERSION=  2.68
 CONFIGURE_STYLE=   autoconf
-CONFIGURE_ARGS=--without-php --without-ruby \
+CONFIGURE_ENV= RUBY="${RUBY}" RDOC="${RUBY:S/ruby/rdoc/}"
+CONFIGURE_ARGS=--without-php \
--without-tcl --without-csharp \
--without-java --without-lua
+
+post-install:
+   mv ${PREFIX}/share/doc/xapian-bindings/ruby{,${MODRUBY_BINREV}}
 
 .include 
Index: databases/xapian-bindings/distinfo
===
RCS file: /cvs/ports/databases/xapian-bindings/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- databases/xapian-bindings/distinfo  5 Apr 2015 21:41:02 -   1.1.1.1
+++ databases/xapian-bindings/distinfo  2 Nov 2017 13:20:41 -
@@ -1,2 +1,2 @@
-SHA256 (xapian-bindings-1.2.15.tar.gz) = 
idMMvTjc+52eD8zI5Lp9ZFL/rUWvs/HpYUo74KOjPnc=
-SIZE (xapian-bindings-1.2.15.tar.gz) = 1484058
+SHA256 (xapian-bindings-1.4.5.tar.xz) = 
ZHiGcwpxvMDp9mb81wK3FB1OmoLhCF5E60RwYk4anTM=
+SIZE (xapian-bindings-1.4.5.tar.xz) = 1118884
Index: databases/xapian-bindings/patches/patch-perl_Makefile_in
===
RCS file: /cvs/ports/databases/xapian-bindings/patches/patch-perl_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-perl_Makefile_in
--- databases/xapian-bindings/patches/patch-perl_Makefile_in5 Apr 2015 
21:41:02 -   1.1.1.1
+++ databases/xapian-bindings/patches/patch-perl_Makefile_in2 Nov 2017 
13:23:16 -
@@ -1,12 +1,13 @@
 $OpenBSD: patch-perl_Makefile_in,v 1.1.1.1 2015/04/05 21:41:02 robert Exp $
 perl/Makefile.in.orig  Sun Apr  5 20:52:56 2015
-+++ perl/Makefile.in   Sun Apr  5 20:53:06 2015
-@@ -966,7 +966,7 @@ clean-local:
+Index: perl/Makefile.in
+--- perl/Makefile.in.orig
 perl/Makefile.in
+@@ -1480,7 +1480,7 @@ clean-local:
  
- auto/Search/Xapian/Xapian$(PERL_SO): Xapian.la
-   @$(MKDIR_P) auto/Search/Xapian
+ auto/Xapian/Xapian$(PERL_SO): Xapian.la
+   @$(MKDIR_P) auto/Xapian
 -  $(LIBTOOL) --config > libtoolconfig.tmp
 +  $(LIBTOOL) --config | grep -v pic > libtoolconfig.tmp
-   . ./libtoolconfig.tmp; cp "$$objdir/Xapian$(PERL_SO)" auto/Search/Xapian
+   . ./libtoolconfig.tmp; cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian
rm -f libtoolconfig.tmp
  
Index: databases/xapian-bindings/patches/patch-python_Makefile_in
===
RCS file: 
/cvs/ports/databases/xapian-bindings/patches/patch-python_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-python_Makefile_in
--- databases/xapian-bindings/patches/patch-python_Makefile_in  5 Apr 2015 
21:41:02 -   1.1.1.1
+++ databases/xapian-bindings/patches/patch-python_Makefile_in  2 Nov 2017 
13:23:16 -
@@ -1,12 +1,13 @@
 $OpenBSD: patch-python_Makefile_in,v 1.1.1.1 2015/04/05 21:41:02 robert Exp $
 python/Makefile.in.origSun Apr  5 

add python2 and python3 links

[Antoine Jacoutot]

Hi.

We have never provided a default 'python' utility with our packages and for
good reasons. That said, I would really like if we could provide a default
symlink to the default major versions of python. That is: python2 and python3.
The rational behind this is that a lot of upstreams have "fixed" their hardcoded
shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or 
#!/usr/bin/env python3.
This would allow us to drop lots of patches, substitutions and MODPY_ADJ_FILES
from our ports tree and make things easier for us in general.

People willing to use another version as the default major are pretty much on
their own but that's already the case today since we have substituting
everything anyway.

I am putting this into a bulk right now...
What do you guys think?


Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.123
diff -u -p -u -p -r1.123 Makefile.inc
--- Makefile.inc16 Jul 2017 19:18:59 -  1.123
+++ Makefile.inc2 Nov 2017 13:49:47 -
@@ -167,6 +167,12 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/CHANGES.OpenBSD \
${PREFIX}/share/doc/python${VERSION}/CHANGES.OpenBSD
 
+# add a link to the *default* python versions
+.if ${VERSION} == "2.7" || ${VERSION} == "3.6"
+   cd ${PREFIX} && ln -sf python${VERSION} python${VERSION:R}
+.endif
+
+
 TEST_TARGET=   test
 TEST_FLAGS="EXTRATESTOPTS=-w"
 # Some regress tests write to $HOME
Index: 2.7/Makefile
===
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 Makefile
--- 2.7/Makefile20 Sep 2017 18:44:48 -  1.53
+++ 2.7/Makefile2 Nov 2017 13:49:47 -
@@ -9,6 +9,7 @@ VERSION =   2.7
 PATCHLEVEL =   .14
 SHARED_LIBS =  python2.7 0.0
 VERSION_SPEC = >=2.7,<2.8
+REVISION = 0
 
 CONFIGURE_ARGS += --with-ensurepip=no
 
Index: 2.7/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 PLIST-main
--- 2.7/pkg/PLIST-main  20 Sep 2017 18:44:48 -  1.20
+++ 2.7/pkg/PLIST-main  2 Nov 2017 13:49:47 -
@@ -14,6 +14,7 @@ bin/pydoc2.7
 @comment bin/python-config
 @comment bin/python2
 @comment bin/python2-config
+bin/python2
 @bin bin/python2.7
 bin/python2.7-2to3
 bin/python2.7-config
Index: 3.6/Makefile
===
RCS file: /cvs/ports/lang/python/3.6/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- 3.6/Makefile15 Oct 2017 16:31:45 -  1.6
+++ 3.6/Makefile2 Nov 2017 13:49:47 -
@@ -9,6 +9,7 @@ VERSION =   3.6
 PATCHLEVEL =   .3
 SHARED_LIBS =  python3.6m 0.0
 VERSION_SPEC = >=3.6,<3.7
+REVISION = 0
 
 CONFIGURE_ARGS +=  --with-ensurepip=no
 
Index: 3.6/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.6/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST-main
--- 3.6/pkg/PLIST-main  15 Oct 2017 16:31:45 -  1.4
+++ 3.6/pkg/PLIST-main  2 Nov 2017 13:49:47 -
@@ -10,6 +10,7 @@ bin/2to3-3.6
 bin/pydoc3.6
 @comment @bin bin/python3
 @comment bin/python3-config
+bin/python3
 @bin bin/python3.6
 bin/python3.6-config
 @bin bin/python3.6m


-- 
Antoine

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/11/02 07:47:22

Modified files:
security/letsencrypt: Makefile.inc 
security/letsencrypt/client: distinfo 
security/letsencrypt/py-acme: distinfo 

Log message:
update to certbot-0.19.0

Re: security/gpgme (needs help)

[Nigel Taylor]

Should you promote gpgme-qt to be the default flavor over others

FLAVOR ?=

should default to no_qt no_python2 no_python3, that is the default as
before. Building with qt should be an extra, in fact use of this sort of
complex PSEUDO_FLAVOR causes problems especially with something as large
as qt5, which means dpb can't be used for build a subset of packages.

I dpb tries to build security/gpgme,no_qt,no_py2,no_py3,-main as
effectively used by all current ports using gpgme which would have to be
changed in the ports tree.

The existing dpb xxx/yyy or list that built a subset of packages, this
change on seeing reference to security/gpgme will build not only the
packages as before, but all the packages for the included modules, that
is python2 and sub packages, python3 and sub packages, and the whole of qt5.

This is enforcing qt5 on those who don't want and don't need qt5.

python2 / python3 I can live with. qt5 I can live without.

For those wanting a small light weight system, qt5 - everywhere -
everything just isn't what they want.

Just why should if we want a small light weight system should we need to
go around adding in no_qt,no_py2,no_py3,-main to everything? Maybe here
also there would be less objections on my part if dpb didn't try to
build every possible flavor, until it does. I suggest using a separate
security/qt-gpgme and security/gpgme

also strictly python2 and python3 flavor should default to no_qt rather
than with qt5. The main choice for python isn't qt5 it's Tk, and a Tk
flavor of gpgme would tie in with the use of python2/3.

Littering qt5 around just about everything is bad as is the whole qt
mind set of having to put anything and everything into it's own wrappers.



On 11/01/17 16:53, Rafael Sadowski wrote:
> Hi porters,
> 
> I need help with the gpgme update. Special thing here, I need the Qt
> bindings because kde-applications/gpgmepp is dead and all dependent
> programs work with gpgme-qt now.
> 
> But I always trap into the following link issue:
> 
> libtool: link: cc -shared -fPIC -DPIC -o .libs/libgpgme.so.20.0 
> -I/usr/local/include -O2 -pipe -Wall -Wcast-align -Wshadow 
> -Wstrict-prototypes .libs/conversion.o .libs/b64dec.o .libs/get-env.o 
> .libs/parsetlv.o .libs/mbox-util.o .libs/data.o .libs/data-fd.o 
> .libs/data-stream.o .libs/data-mem.o .libs/data-user.o .libs/data-compat.o 
> .libs/data-identify.o .libs/signers.o .libs/sig-notation.o .libs/wait.o 
> .libs/wait-global.o .libs/wait-private.o .libs/wait-user.o .libs/op-support.o 
> .libs/encrypt.o .libs/encrypt-sign.o .libs/decrypt.o .libs/decrypt-verify.o 
> .libs/verify.o .libs/sign.o .libs/passphrase.o .libs/progress.o .libs/key.o 
> .libs/keylist.o .libs/keysign.o .libs/trust-item.o .libs/trustlist.o 
> .libs/tofupolicy.o .libs/import.o .libs/export.o .libs/genkey.o 
> .libs/delete.o .libs/edit.o .libs/getauditlog.o .libs/opassuan.o 
> .libs/passwd.o .libs/spawn.o .libs/assuan-support.o .libs/engine.o 
> .libs/engine-gpg.o .libs/status-table.o .libs/engine-gpgsm.o 
> .libs/engine-assuan.o .libs/engine-gpgconf.o .libs/engine-uiserver.o 
> .libs/engine-g13.o .libs/vfs-mount.o .libs/vfs-create.o .libs/engine-spawn.o 
> .libs/gpgconf.o .libs/queryswdb.o .libs/posix-util.o .libs/posix-io.o 
> .libs/dirinfo.o .libs/debug.o .libs/gpgme.o .libs/version.o .libs/error.o 
> .libs/ath.o -L.libs -lassuan -lgpg-error -lintl -liconv
> libtool: link: ar cru .libs/libgpgme.a conversion.o b64dec.o get-env.o 
> parsetlv.o mbox-util.o data.o data-fd.o data-stream.o data-mem.o data-user.o 
> data-compat.o data-identify.o signers.o sig-notation.o wait.o wait-global.o 
> wait-private.o wait-user.o op-support.o encrypt.o encrypt-sign.o decrypt.o 
> decrypt-verify.o verify.o sign.o passphrase.o progress.o key.o keylist.o 
> keysign.o trust-item.o trustlist.o tofupolicy.o import.o export.o genkey.o 
> delete.o edit.o getauditlog.o opassuan.o passwd.o spawn.o assuan-support.o 
> engine.o engine-gpg.o status-table.o engine-gpgsm.o engine-assuan.o 
> engine-gpgconf.o engine-uiserver.o engine-g13.o vfs-mount.o vfs-create.o 
> engine-spawn.o gpgconf.o queryswdb.o posix-util.o posix-io.o dirinfo.o 
> debug.o gpgme.o version.o error.o ath.o
> libtool: link: ranlib .libs/libgpgme.a
> cc -DHAVE_CONFIG_H -I. -I..   -I/usr/local/include -I/usr/local/include  -O2 
> -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT gpgme-tool.o -MD 
> -MP -MF .deps/gpgme-tool.Tpo -c -o gpgme-tool.o gpgme-tool.c
> mv -f .deps/gpgme-tool.Tpo .deps/gpgme-tool.Po
> cc -DHAVE_CONFIG_H -I. -I..   -I/usr/local/include -I/usr/local/include  -O2 
> -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT argparse.o -MD -MP 
> -MF .deps/argparse.Tpo -c -o argparse.o argparse.c   
> mv -f .deps/argparse.Tpo .deps/argparse.Po
> c++ gpgme-tool.o argparse.o libgpgme.la -lassuan -L/usr/local/lib -lgpg-error
> libgpgme.la: file not recognized: File format not recognized
> c++: error: linker command failed with exit code 1 (use -v to see invocation)
> 
> Help, Feedback 

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 07:34:08

Modified files:
editors/ted: Makefile 

Log message:
avoid auto-detecting gcc during build (bitmap configure), explicitly pass
CC thru env.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/11/02 07:15:23

Modified files:
audio/paulstretch/patches: patch-compile_linux_kissfft_sh 

Log message:
if compile script fails, fail

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/11/02 07:13:54

Modified files:
net/librenms   : Makefile distinfo 
net/librenms/pkg: PLIST 

Log message:
update to librenms-1.33.01, regression fix for ping-only devices

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/11/02 07:11:09

Modified files:
net/nagios/check_postgres: Makefile distinfo 
net/nagios/check_postgres/patches: patch-check_postgres_pl 
net/nagios/check_postgres/pkg: PLIST 

Log message:
update to check_postgres-2.23.0

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/11/02 07:09:26

Modified files:
audio/paulstretch: Makefile 
Added files:
audio/paulstretch/patches: patch-compile_linux_kissfft_sh 

Log message:
Patch forgotten in previous, oops

[UPDATE] sysutils/libfsntfs

[Remi Pointel]

Hi,

this is the diff to update libfsntfs to latest release.

Ok?

Cheers,

Remi.Index: Makefile
===
RCS file: /cvs/ports/sysutils/libfsntfs/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile	12 Feb 2017 10:57:34 -	1.1.1.1
+++ Makefile	2 Nov 2017 12:57:46 -
@@ -2,7 +2,7 @@
 
 COMMENT =	library and tools to access NTFS
 
-VERSION = 	20160418
+VERSION = 	20170315
 DISTNAME =	libfsntfs-experimental-${VERSION}
 PKGNAME =	${DISTNAME:S/-experimental//}
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/libfsntfs/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo	12 Feb 2017 10:57:34 -	1.1.1.1
+++ distinfo	2 Nov 2017 12:57:46 -
@@ -1,2 +1,2 @@
-SHA256 (libfsntfs-experimental-20160418.tar.gz) = 8SXMZtFqXRBguPCh+Nv2uNiAcP7nPP/rysDs3FiGCJM=
-SIZE (libfsntfs-experimental-20160418.tar.gz) = 1652286
+SHA256 (libfsntfs-experimental-20170315.tar.gz) = 928+zzAuUAIQ0qb7ZvQK9g1SCwn7W5RibU6lgDnj/4U=
+SIZE (libfsntfs-experimental-20170315.tar.gz) = 1685861