Re: [UPDATE] sysutils/rancid

[Pavel Korovin]

On 11/15, Stuart Henderson wrote:
> Except for special situations (e.g. what we have in autoconf), an @conflict
> on the same port doesn't make sense.
> 
> > +@ask-update rancid-<3v0 Make sure router.db files use new fields separator 
> > before upgrading
> 
> I think either MESSAGE *or* @ask-update is enough. ask-update is quite

Stuart, thank you for your comments!
I agree that MESSAGE should be enough.

Please see the updated patch with your suggestions applied and some more
cleanups, like removal of Looking Glass configs (I don't see any reason
to keep it while corresponding scripts were removed in the first place),
relocation of misc example files from ${PREFIX}/share to
${PREFIX}/share/examples and commenting out several man pages for which
corresponding binaries were removed.

-- 
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rancid/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile15 May 2013 09:49:40 -  1.17
+++ Makefile16 Nov 2016 01:58:05 -
@@ -2,8 +2,9 @@
 
 COMMENT =  Really Awesome New Cisco confIg Differ
 
-DISTNAME = rancid-2.3.8
-REVISION = 0
+DISTNAME = rancid-3.5.1
+DISTPATCH =1
+PKGNAME =  ${DISTNAME}pl${DISTPATCH}
 EPOCH =0
 CATEGORIES =   sysutils
 
@@ -19,20 +20,19 @@ WANTLIB =   c util
 
 MASTER_SITES = ftp://ftp.shrubbery.net/pub/rancid/
 
+PATCHFILES =   ${DISTNAME}.p${DISTPATCH}.gz
+
 RUN_DEPENDS =  lang/expect
 BUILD_DEPENDS =${RUN_DEPENDS}
 
 LOCALSTATEDIR =${BASELOCALSTATEDIR}/rancid
 
-AUTOMAKE_VERSION =  1.8
-CONFIGURE_STYLE =  automake
+CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --prefix=${PREFIX} \
--disable-mk-localstatedir
 
+MAKE_FLAGS =   sysconfdir=${BASESYSCONFDIR}/rancid
+FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/rancid
 USE_GMAKE =yes
-USE_GROFF =Yes
-
-pre-configure:
-   @cp ${FILESDIR}/fnlogin.in ${WRKSRC}/bin/fnlogin.in
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rancid/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:15:14 -  1.6
+++ distinfo16 Nov 2016 01:58:05 -
@@ -1,2 +1,4 @@
-SHA256 (rancid-2.3.8.tar.gz) = RORMh6IpaNUinAHWCqRpYNoCOiSEbu9D+ePI1w/Vs/s=
-SIZE (rancid-2.3.8.tar.gz) = 379908
+SHA256 (rancid-3.5.1.p1.gz) = GqbR11OkR4dA3jbeTn8Zmiio1ZZ/iAfShCHJ4yogAPQ=
+SHA256 (rancid-3.5.1.tar.gz) = 82V5MNbr+FWs2WHJrK3v+wUM2e15gJ+tXbHB917PxxE=
+SIZE (rancid-3.5.1.p1.gz) = 202
+SIZE (rancid-3.5.1.tar.gz) = 501561
Index: files/fnlogin.in
===
RCS file: files/fnlogin.in
diff -N files/fnlogin.in
--- files/fnlogin.in16 Dec 2008 21:07:55 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,544 +0,0 @@
-#! @EXPECT_PATH@ --
-##
-## $Id: fnlogin.in,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
-##
-## rancid 2.3.2a7
-## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
-## All rights reserved.
-##
-## This software may be freely copied, modified and redistributed
-## without fee for non-commerical purposes provided that this license
-## remains intact and unmodified with any RANCID distribution.
-##
-## There is no warranty or other guarantee of fitness of this software.
-## It is provided solely "as is".  The author(s) disclaim(s) all
-## responsibility and liability with respect to this software's usage
-## or its effect upon hardware, computer systems, other software, or
-## anything else.
-##
-## Except where noted otherwise, rancid was written by and is maintained by
-## Henry Kilmer, John Heasley, Andrew Partan, Pete Whiting, and Austin Schutz.
-##
-#
-# The login expect scripts were based on Erik Sherk's gwtn, by permission.
-# Netscreen hacks implemented by Stephen Gill .
-#
-# nlogin - netscreen login
-#
-# Most options are intuitive for logging into a netscreen firewall.
-#
-# Misc notes
-#  netscreen does not have the concept of "enable", once logged in, a
-#  users permissions can not change.
-
-# Usage line
-set usage "Usage: $argv0 \[-c command\] \[-Evar=x\] \[-f cloginrc-file\] \
-\[-p user-password\] \
-\[-s script-file\] \[-t timeout\] \[-u username\] \
-\[-v vty-password\] \[-x command-file\] \
-\[-y ssh_cypher_type\] router \[router...\]\n"
-
-# env(CLOGIN) may contain:
-#  x == do not set xterm banner or name
-
-# Password file
-set password_file $env(HOME)/.cloginrc
-# Default is to login to the firewall
-set do_command 0
-set do_script 0
-# The default is to look in the password file to find the passwords.  This
-# tracks if we receive them on the command line.
-set do_passwd 1
-set do_enapasswd 1
-
-# Find the user in the ENV, or use the unix userid.
-if {[ info exists env(CISCO_USER) ]} {
-set default_user $env(CISCO_USER)
-} elseif {[ info 

Re: [NEW] games/ags

[David Meier]

Hello

I've moved build flags to the ports Makefile to get rid of 
OpenBSD specific Makefile-defs file.

Ok?

On 11/13/16 19:42, David Meier wrote:
> AGS (Adventure Game Studio) engine is the engine used to run games made
> with the Adventure Game Studio IDE.
> To play a game, one need to download a game made with AGS (e.g. from
> http://www.adventuregamestudio.co.uk/site/games/)
> 
> Web: https://github.com/adventuregamestudio/ags
> 
> Comments? Ok?
> Feedback welcome.


ags.tar.gz
Description: ags.tar.gz

Re: new: sysutils/htop

[Ian Sutton]

On Tue, Nov 15, 2016 at 04:29:46PM -0500, Ian Sutton wrote:
> I am happy to take over maintainership. I will investigate these issues
> and incorporate your patches in a mail to follow. I'll try to get some
> coredumps & fix extant issues too.

And here is the mail with tarball.

On Sat, Nov 05, 2016 at 10:24:23AM +0100, Landry Breuil wrote:
> given that it runs for example on macppc.. ok to import with that line
> zapped.

zapped

On Sat, Nov 05, 2016 at 12:03:32PM +0100, Juan Francisco Cantero Hurtado wrote:
> Random crashes and double frees. Run the program with MALLOC_OPTIONS=F.

I'll fix any that I find
 
> If you take the maintainership, I will import the port.

Happy to do this, although I do not have a CVS account

> A few comments:
> 
> - Remove the extra space at the end of DESCR.
> - Change "This is htop, an interactive" to "htop is an interactive" in
>   DESCR.
> - Remove the second phrase in DESCR. Users don't need to know what are
>   the dependencies of the packages.

Fixed these three

> - Look the Makefile in my old port and copy the ALL_TARGET and
>   INSTALL_STRIP lines to your Makefile, with the comment included.

Added

Ian


htop-2.0.2.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2016/11/15 15:01:15

Modified files:
www/mozilla-firefox: Makefile distinfo 
www/mozilla-firefox/pkg: PLIST 
www/firefox-i18n: Makefile.inc distinfo 

Log message:
Update to firefox 50.0.

See https://www.mozilla.org/en-US/firefox/50.0/releasenotes/
and https://www.mozilla.org/en-US/security/advisories/mfsa2016-89/

Switch back to build against systemwide sqlite3 coming from the
ports-tree. Remove the build goo for macppc|sparc64|alpha, it's unlikely
this will ever come back...

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2016/11/15 14:53:47

Modified files:
www/firefox-esr: Makefile distinfo 
www/firefox-esr-i18n: Makefile.inc distinfo 

Log message:
Update to firefox-esr 45.5.0.

See https://www.mozilla.org/en-US/firefox/45.5.0/releasenotes/ and
https://www.mozilla.org/en-US/security/advisories/mfsa2016-90/

Re: new: sysutils/htop

[Ian Sutton]

On Sat, Nov 05, 2016 at 12:03:32PM +0100, Juan Francisco Cantero Hurtado wrote:
> On Sat, Nov 05, 2016 at 06:09:43AM -0400, Ian Sutton wrote:
> > On Sat, Nov 05, 2016 at 10:24:23AM +0100, Landry Breuil wrote:
> > > given that it runs for example on macppc.. ok to import with that line
> > > zapped.
> > 
> > zapped
> > 
> > On Sat, Nov 05, 2016 at 10:24:27AM +0100, Daniel Jakots wrote:
> > > You probably want to look at what juanfra@ already did: 
> > > https://github.com/jasperla/openbsd-wip/tree/master/sysutils/htop
> > 
> > hmm -- what's causing the commit hesitation?
> 
> Random crashes and double frees. Run the program with MALLOC_OPTIONS=F.
> 
> If you take the maintainership, I will import the port.
> 
> A few comments:
> 
> - Remove the extra space at the end of DESCR.
> - Change "This is htop, an interactive" to "htop is an interactive" in
>   DESCR.
> - Remove the second phrase in DESCR. Users don't need to know what are
>   the dependencies of the packages.
> - Look the Makefile in my old port and copy the ALL_TARGET and
>   INSTALL_STRIP lines to your Makefile, with the comment included.


Hi,

I am happy to take over maintainership. I will investigate these issues
and incorporate your patches in a mail to follow. I'll try to get some
coredumps & fix extant issues too.

Ian

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/11/15 13:35:30

Modified files:
multimedia/gstreamer-0.10/plugins-bad: Makefile 
multimedia/gstreamer-0.10/plugins-bad/pkg: PLIST-main 
Removed files:
multimedia/gstreamer-0.10/plugins-bad/patches: 
   patch-gst_nsf_gstnsf_c 
   patch-gst_nsf_nsf_c 
   patch-gst_nsf_nsf_h 

Log message:
Disable NSF plugin, due to security concerns.

OK ajacoutot@

ggstreamer-plugins-bad: disable NSF

[David Coppa]

Hi!

Even if OpenBSD shouldn't be vulnerable, the plugin itself is bugged
(and not so useful either):

http://scarybeastsecurity.blogspot.it/2016/11/0day-exploit-compromising-linux-desktop.html

So, why not disabling it?

Ubuntu did the same:

https://bugs.launchpad.net/ubuntu/+source/gst-plugins-bad0.10/+bug/1641700

Cheers,
David

Index: Makefile
===
RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/Makefile,v
retrieving revision 1.93
diff -u -p -u -p -r1.93 Makefile
--- Makefile4 Nov 2016 11:35:19 -   1.93
+++ Makefile15 Nov 2016 19:43:54 -
@@ -12,7 +12,7 @@ PKGNAME-main= gstreamer-plugins-bad-${V
 PKGNAME-neon=  gstreamer-neon-${V}
 PKGNAME-mjpeg= gstreamer-mjpeg-${V}
 
-REVISION-main= 24
+REVISION-main= 25
 REVISION-mjpeg=10
 REVISION-neon= 11
 
@@ -101,6 +101,7 @@ CONFIGURE_ARGS= --disable-acm \
--disable-musicbrainz \
--disable-mythtv \
--disable-nas \
+   --disable-nsf \
--disable-ofa \
--disable-openal \
--disable-opencv \
Index: patches/patch-gst_nsf_gstnsf_c
===
RCS file: patches/patch-gst_nsf_gstnsf_c
diff -N patches/patch-gst_nsf_gstnsf_c
--- patches/patch-gst_nsf_gstnsf_c  6 Sep 2012 14:30:59 -   1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gst_nsf_gstnsf_c,v 1.5 2012/09/06 14:30:59 ajacoutot Exp $
-
-nsf_init -> gstnsf_init to prevent symbol conflict with security/nss
-
 gst/nsf/gstnsf.c.orig  Fri Dec 30 19:24:33 2011
-+++ gst/nsf/gstnsf.c   Mon Mar  5 14:44:23 2012
-@@ -168,7 +168,7 @@ gst_nsfdec_class_init (GstNsfDec * klass)
-   GST_DEBUG_CATEGORY_INIT (nsfdec_debug, "nsfdec", 0,
-   "NES sound file (nsf) decoder");
- 
--  nsf_init ();
-+  gstnsf_init ();
- }
- 
- static void
Index: patches/patch-gst_nsf_nsf_c
===
RCS file: patches/patch-gst_nsf_nsf_c
diff -N patches/patch-gst_nsf_nsf_c
--- patches/patch-gst_nsf_nsf_c 6 Sep 2012 14:30:59 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gst_nsf_nsf_c,v 1.2 2012/09/06 14:30:59 ajacoutot Exp $
-
-nsf_init -> gstnsf_init to prevent symbol conflict with security/nss
-
 gst/nsf/nsf.c.orig Thu Nov 27 13:08:14 2008
-+++ gst/nsf/nsf.c  Thu Nov 27 13:08:46 2008
-@@ -376,7 +376,7 @@ nes_shutdown (nsf_t * nsf)
- }
- 
- int
--nsf_init (void)
-+gstnsf_init (void)
- {
-   nes6502_init ();
-   return 0;
Index: patches/patch-gst_nsf_nsf_h
===
RCS file: patches/patch-gst_nsf_nsf_h
diff -N patches/patch-gst_nsf_nsf_h
--- patches/patch-gst_nsf_nsf_h 6 Sep 2012 14:30:59 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gst_nsf_nsf_h,v 1.2 2012/09/06 14:30:59 ajacoutot Exp $
-
-nsf_init -> gstnsf_init to prevent symbol conflict with security/nss
-
 gst/nsf/nsf.h.orig Thu Nov 27 13:08:22 2008
-+++ gst/nsf/nsf.h  Thu Nov 27 13:08:56 2008
-@@ -132,7 +132,7 @@ struct nsf_loader_t {
- };
- 
- /* Function prototypes */
--extern int nsf_init(void);
-+extern int gstnsf_init(void);
- 
- extern nsf_t * nsf_load_extended(struct nsf_loader_t * loader);
- extern nsf_t *nsf_load(const char *filename, void *source, int length);
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 PLIST-main
--- pkg/PLIST-main  23 Apr 2015 11:55:02 -  1.25
+++ pkg/PLIST-main  15 Nov 2016 19:43:54 -
@@ -100,7 +100,6 @@ lib/gstreamer-${VERSION}/libgstmpegvideo
 lib/gstreamer-${VERSION}/libgstmusepack.so
 lib/gstreamer-${VERSION}/libgstmve.so
 lib/gstreamer-${VERSION}/libgstmxf.so
-lib/gstreamer-${VERSION}/libgstnsf.so
 lib/gstreamer-${VERSION}/libgstnuvdemux.so
 lib/gstreamer-${VERSION}/libgstopus.so
 lib/gstreamer-${VERSION}/libgstpatchdetect.so

UPDATE: x11/tellico-kde4

[Rafael Sadowski]

Hi ports@,

here's an update that brings x11/tellico-kde4 up to the stable latest
version. All patches from upstream are not more necessary. All
regression tests passed on amd64.

Kind regards,

Rafael Sadowski

Index: Makefile
===
RCS file: /cvs/ports/x11/tellico-kde4/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile8 Nov 2016 14:23:59 -   1.9
+++ Makefile15 Nov 2016 18:13:57 -
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.9 2016/11/08 14:23:59 sthen Exp $
 
 COMMENT =  organizer for book/music/video collections for KDE4
-DISTNAME = tellico-2.3.10
-REVISION = 2
+DISTNAME = tellico-2.3.11
 
 CATEGORIES =   productivity x11
 HOMEPAGE = http://tellico-project.org/
@@ -26,7 +25,7 @@ MASTER_SITES =http://tellico-project.or
 EXTRACT_SUFX = .tar.bz2
 
 MODULES =  devel/gettext x11/kde4 multimedia/phonon lang/python
-MODKDE4_USE =  pim
+MODKDE4_USE =  pim
 
 BUILD_DEPENDS =${MODKDE4_DEP_DIR}/libkcompactdisc
 
Index: distinfo
===
RCS file: /cvs/ports/x11/tellico-kde4/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo2 May 2015 15:30:31 -   1.2
+++ distinfo15 Nov 2016 18:13:57 -
@@ -1,2 +1,2 @@
-SHA256 (tellico-2.3.10.tar.bz2) = 6RYQH4a2+EO4W+QuhUWqdEHNSWy7m4FZDi4L0DpY+qo=
-SIZE (tellico-2.3.10.tar.bz2) = 4877384
+SHA256 (tellico-2.3.11.tar.bz2) = MGR1b24WYtBzhcN/WCGg9r6LIrbeytF9aFJTYBbKISg=
+SIZE (tellico-2.3.11.tar.bz2) = 5174873
Index: patches/patch-src_fetch_allocinefetcher_cpp
===
RCS file: patches/patch-src_fetch_allocinefetcher_cpp
diff -N patches/patch-src_fetch_allocinefetcher_cpp
--- patches/patch-src_fetch_allocinefetcher_cpp 2 May 2015 15:30:31 -   
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@
-$OpenBSD: patch-src_fetch_allocinefetcher_cpp,v 1.1 2015/05/02 15:30:31 zhuk 
Exp $
-Be sure to download image data in fetchers before setting field
-(upstream 2510d692).
 src/fetch/allocinefetcher.cpp.orig Sun Feb 15 22:23:56 2015
-+++ src/fetch/allocinefetcher.cpp  Sat May  2 18:10:19 2015
-@@ -25,6 +25,7 @@
- #include 
- #include "allocinefetcher.h"
- #include "../collections/videocollection.h"
-+#include "../images/imagefactory.h"
- #include "../entry.h"
- #include "../gui/guiproxy.h"
- #include "../tellico_utils.h"
-@@ -219,6 +220,17 @@ Tellico::Data::EntryPtr AbstractAllocineFetcher::fetch
-   }
-   populateEntry(entry, result);
- #endif
-+
-+  // image might still be a URL
-+  const QString image_id = entry->field(QLatin1String("cover"));
-+  if(image_id.contains(QLatin1Char('/'))) {
-+const QString id = ImageFactory::addImage(image_id, true /* quiet */);
-+if(id.isEmpty()) {
-+  message(i18n("The cover image could not be loaded."), 
MessageHandler::Warning);
-+}
-+// empty image ID is ok
-+entry->setField(QLatin1String("cover"), id);
-+  }
- 
-   // don't want to include id
-   entry->collection()->removeField(QLatin1String("allocine-code"));
Index: patches/patch-src_fetch_discogsfetcher_cpp
===
RCS file: patches/patch-src_fetch_discogsfetcher_cpp
diff -N patches/patch-src_fetch_discogsfetcher_cpp
--- patches/patch-src_fetch_discogsfetcher_cpp  2 May 2015 15:30:31 -   
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,93 +0,0 @@
-$OpenBSD: patch-src_fetch_discogsfetcher_cpp,v 1.1 2015/05/02 15:30:31 zhuk 
Exp $
-1. Unbreak build (upstream d4a7f2b2).
-2. Unbreak fetching Discogs images (upstream 61c9b539).
-3. Be sure to download image data in fetchers before setting field
-  (upstream 2510d692).
 src/fetch/discogsfetcher.cpp.orig  Sun Feb 15 22:23:56 2015
-+++ src/fetch/discogsfetcher.cpp   Sat May  2 18:16:23 2015
-@@ -25,6 +25,7 @@
- #include 
- #include "discogsfetcher.h"
- #include "../collections/musiccollection.h"
-+#include "../images/imagefactory.h"
- #include "../gui/guiproxy.h"
- #include "../core/filehandler.h"
- #include "../tellico_utils.h"
-@@ -117,7 +118,6 @@ void DiscogsFetcher::search() {
- case Keyword:
-   u.setPath(QLatin1String("/database/search"));
-   u.addQueryItem(QLatin1String("q"), request().value);
--  //u.addQueryItem(QLatin1String("type"), QLatin1String("all"));
-   break;
- 
- case Raw:
-@@ -187,6 +187,17 @@ Tellico::Data::EntryPtr DiscogsFetcher::fetchEntryHook
-   }
- #endif
- 
-+  const QString image_id = entry->field(QLatin1String("cover"));
-+  // if it's still a url, we need to load it
-+  if(image_id.contains(QLatin1Char('/'))) {
-+const QString id = ImageFactory::addImage(image_id, true /* quiet */);
-+if(id.isEmpty()) {
-+  message(i18n("The cover image could not be loaded."), 
MessageHandler::Warning);
-+}
-+// empty image ID is ok
-+

Re: [NEW] textproc/distribution

[Rafael Sadowski]

On Mon Nov 14, 2016 at 03:54:30PM -0500, Taylor Stearns wrote:
> On Fri, Nov 04, 2016 at 05:52:49PM -0400, Taylor Stearns wrote:
> > On Thu, Jun 16, 2016 at 07:28:43PM -0400, Taylor Stearns wrote:
> > > A small but very handy Perl script that I use myself frequently, so made 
> > > a port of
> > > it. Upstream is https://github.com/philovivero/distribution
> > > Looking for feedback or Ok. Thanks!
> > > 
> > > $ cat distribution/pkg/DESCR
> > > Short, simple, direct scripts for creating character-based graphs in a 
> > > command
> > > terminal.
> > > 
> > > It was originally for generating histograms (a distribution of the 
> > > frequency of
> > > input tokens) but it has since been expanded to generate time-series 
> > > graphs (or,
> > > in fact, graphs with any arbitrary "x-axis") as well.
> > > 
> > 
> > Attached is an update to version 1.3 of 'textproc/distribution'. Tests
> > are now enabled in the Makefile, and a few bugs fixed upstream. Any
> > takers? I find that this little utility is one of the first things I
> > install on a new system.
> > 
> > -Taylor
> 
> Hi all, can anybody provide feedback on this port or commit it?
> 

Only runtime tests with some examples from `distribution --help`.  The
port looks also good to me.

Kind regards,

Rafael Sadowski

lang/gcc/4.9: libgmp trouble and gnat.socket fix

[Tobias Ulmer]

This diff works in combination with the libmpc bump

---

Require mpfr and libmpc versions that match the bootstrap.
Adjust GNAT.Socket package to our struct sockaddr layout.

Index: Makefile
===
RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.9/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile15 Nov 2016 10:04:58 -  1.45
+++ Makefile15 Nov 2016 16:53:13 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = amd64 arm hppa i386 mip
 DPB_PROPERTIES = parallel
 
 V = 4.9.4
-REVISION = 3
+REVISION = 4
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
 
@@ -208,8 +208,8 @@ WANTLIB-ada =   ${WANTLIB} pthread util
 WANTLIB-libs = m pthread
 
 LIB_DEPENDS += devel/gmp>=6.1.1 \
-   devel/mpfr \
-   devel/libmpc
+   devel/mpfr>=3.1.5 \
+   devel/libmpc>=0.9p2
 LIB_DEPENDS-libs =
 
 .if ${MACHINE_ARCH:Mamd64}
Index: patches/patch-gcc_ada_gsocket_h
===
RCS file: patches/patch-gcc_ada_gsocket_h
diff -N patches/patch-gcc_ada_gsocket_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_ada_gsocket_h 15 Nov 2016 16:53:13 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix GNAT.Socket package
+
+--- gcc/ada/gsocket.h.orig Tue Nov 15 10:22:51 2016
 gcc/ada/gsocket.h  Tue Nov 15 10:24:52 2016
+@@ -236,7 +236,8 @@
+ # endif
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__vxworks) || defined(__rtems__)
++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__vxworks) || \
++defined(__rtems__)
+ # define Has_Sockaddr_Len 1
+ #else
+ # define Has_Sockaddr_Len 0

devel/libmpc: bump to catch gmp update

[Tobias Ulmer]

The current libmpc package links against old versions of gmp and mpfr.

Gcc 4.9 bootstrap links against the new gmp and mpfr (and libmpc).

The resulting linker warning confuses gcc's configure script, disables
Ada and breaks the build.
---

Step one is to bump mpc and update WANTLIB for good measure

Index: Makefile
===
RCS file: /home/vcs/cvs/openbsd/ports/devel/libmpc/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile16 Mar 2015 18:07:42 -  1.8
+++ Makefile15 Nov 2016 16:37:22 -
@@ -5,7 +5,7 @@ COMMENT=complex numbers math library
 V= 0.9
 DISTNAME=  mpc-${V}
 PKGNAME=   libmpc-${V}
-REVISION=  1
+REVISION=  2
 SHARED_LIBS=   mpc 0.1 # 2.0
 
 CATEGORIES=devel math
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes
 
 LIB_DEPENDS=   devel/mpfr \
devel/gmp
-WANTLIB=   mpfr>=1.0 gmp>=9.0 m
+WANTLIB=   mpfr>=1.2 gmp>=10.0 m
 
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ARGS=--with-mpfr=${LOCALBASE} \

Update lang/ruby to 2.2.6 and 2.3.2

[Jeremy Evans]

This updates ruby 2.2 and 2.3 to the latest releases.

Release announcements at:

https://www.ruby-lang.org/en/news/2016/11/15/ruby-2-2-6-released/
https://www.ruby-lang.org/en/news/2016/11/15/ruby-2-3-2-released/

I'm minor bumping the shared lib due to new exported function
in both cases.

I'll be doing some more testing on this, but unless something comes
up or I here objections, I'll be committing this in a couple days.

Thanks,
Jeremy

Index: 2.2/Makefile
===
RCS file: /cvs/ports/lang/ruby/2.2/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- 2.2/Makefile4 Nov 2016 17:03:29 -   1.18
+++ 2.2/Makefile15 Nov 2016 16:00:00 -
@@ -5,17 +5,16 @@ COMMENT-gdbm =gdbm interface for ruby
 COMMENT-tk =   tk interface for ruby
 COMMENT-ri_docs =  ri documentation files for ruby
 
-VERSION =  2.2.5
+VERSION =  2.2.6
 RUBYLIBREV =   2.2
 DISTNAME = ruby-${VERSION}
 
-SHARED_LIBS =  ruby22  1.1
+SHARED_LIBS =  ruby22  1.2
 PKGNAME-main = ruby-${VERSION}
 PKGNAME-gdbm = ruby22-gdbm-${VERSION}
 PKGNAME-tk =   ruby22-tk-${VERSION}
 PKGNAME-ri_docs =  ruby22-ri_docs-${VERSION}
 
-REVISION-main =3
 PKG_ARCH-ri_docs = *
 WANTLIB-ri_docs =  # empty
 
Index: 2.2/distinfo
===
RCS file: /cvs/ports/lang/ruby/2.2/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- 2.2/distinfo30 Apr 2016 14:18:12 -  1.6
+++ 2.2/distinfo15 Nov 2016 16:00:39 -
@@ -1,2 +1,2 @@
-SHA256 (ruby-2.2.5.tar.gz) = MMSzFpekyk6gyNuK0wz0XmaQoPCWh+XUg8kzwDyjNeM=
-SIZE (ruby-2.2.5.tar.gz) = 16654395
+SHA256 (ruby-2.2.6.tar.gz) = 3o4ZJ5HLFX1hDEipqf9ufxnWfOhgUv6uYrguNoLMZ18=
+SIZE (ruby-2.2.6.tar.gz) = 16663387
Index: 2.2/patches/patch-common_mk
===
RCS file: /cvs/ports/lang/ruby/2.2/patches/patch-common_mk,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-common_mk
--- 2.2/patches/patch-common_mk 8 Jan 2015 18:48:32 -   1.1.1.1
+++ 2.2/patches/patch-common_mk 15 Nov 2016 16:01:26 -
@@ -2,18 +2,18 @@ $OpenBSD: patch-common_mk,v 1.1.1.1 2015
 
 Don't regenerate rdoc documentation during install.
 
 common.mk.orig Tue Dec 23 18:56:32 2014
-+++ common.mk  Tue Dec 30 00:56:35 2014
-@@ -184,7 +184,7 @@ $(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(
+--- common.mk.orig Mon Aug 15 23:03:51 2016
 common.mk  Tue Nov 15 08:01:21 2016
+@@ -186,7 +186,7 @@ $(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(
  configure-ext: $(EXTS_MK)
  
  build-ext: $(EXTS_MK)
 -  $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" 
LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
 +  $(Q)$(MAKE) -f $(EXTS_MK) V=1 $(MFLAGS) libdir="$(libdir)" 
LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
-   ENCOBJS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
+   EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
  
  prog: program wprogram
-@@ -407,7 +407,7 @@ dont-install-man: $(PREP)
+@@ -409,7 +409,7 @@ dont-install-man: $(PREP)
  post-no-install-man::
@$(NULLCMD)
  
Index: 2.2/patches/patch-compile_c
===
RCS file: /cvs/ports/lang/ruby/2.2/patches/patch-compile_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-compile_c
--- 2.2/patches/patch-compile_c 8 Jan 2015 18:48:32 -   1.1.1.1
+++ 2.2/patches/patch-compile_c 15 Nov 2016 16:01:26 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-compile_c,v 1.1.1.1 2015
 
 Disable peephole optimizer on sparc64, since it occasionally segfaults.
 
 compile.c.orig Fri Dec 19 03:02:10 2014
-+++ compile.c  Tue Dec 30 00:56:35 2014
-@@ -1822,6 +1822,9 @@ static int
+--- compile.c.orig Tue Aug 16 05:14:41 2016
 compile.c  Tue Nov 15 08:00:46 2016
+@@ -1865,6 +1865,9 @@ static int
  iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int 
do_tailcallopt)
  {
  INSN *iobj = (INSN *)list;
Index: 2.2/patches/patch-configure
===
RCS file: /cvs/ports/lang/ruby/2.2/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- 2.2/patches/patch-configure 8 Jan 2015 18:48:32 -   1.1.1.1
+++ 2.2/patches/patch-configure 12 Jul 2016 18:24:48 -
@@ -5,9 +5,9 @@ Fix so name, checking for DOT and DOXYGE
 Override the arch setting to remove OpenBSD version from it,
 so ports don't have to be bumped when OpenBSD version changes.
 
 configure.orig Thu Dec 25 00:44:47 2014
-+++ configure  Tue Dec 30 00:56:35 2014
-@@ -22359,7 +22359,7 @@ esac
+--- configure.orig Mon Apr 25 21:51:48 2016
 configure  Tue Jul 12 11:24:45 2016
+@@ -22475,7 +22475,7 @@ esac
openbsd*|mirbsd*) :
  
SOLIBS='$(LIBS)'

Update lang/jruby 9.1.6.0

[Jeremy Evans]

This updates JRuby to the latest release.  Release announcement at
http://jruby.org/2016/11/09/jruby-9-1-6-0.html

Tested on amd64, the only supported arch.

Will be committing in a couple days unless I hear objections.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile19 Sep 2016 21:38:39 -  1.59
+++ Makefile9 Nov 2016 23:02:34 -
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS = amd64
 
 COMMENT =  pure-Java implementation of the Ruby language
 
-V =9.1.5.0
+V =9.1.6.0
 DISTNAME = jruby-bin-${V}
 PKGNAME =  jruby-${V}
 CATEGORIES =   lang lang/ruby
Index: distinfo
===
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.38
diff -u -p -r1.38 distinfo
--- distinfo19 Sep 2016 21:38:39 -  1.38
+++ distinfo9 Nov 2016 23:05:51 -
@@ -1,6 +1,6 @@
 SHA256 (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) = 
xK/m48Z/YA+fg4yFJqcRxceFnT0F98y255Ju9eSE7b0=
-SHA256 (jruby-bin-9.1.5.0.tar.gz) = 
KOTzrvu0SXxcXtwEJGd4szBRBcPT1t4RvgZ4Jsxbt2Y=
+SHA256 (jruby-bin-9.1.6.0.tar.gz) = 
oy3FS4CqAGkyNlTga4T9zqB302AexUIIpnxLlp82m4k=
 SHA256 (jruby-launcher-1.1.1-java.gem) = 
0iJ3vtg6aMTK/AIJdpLChL3TSVYqpbp89chB4ywVlOE=
 SIZE (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) = 1759433
-SIZE (jruby-bin-9.1.5.0.tar.gz) = 31874967
+SIZE (jruby-bin-9.1.6.0.tar.gz) = 33112323
 SIZE (jruby-launcher-1.1.1-java.gem) = 56832
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
retrieving revision 1.34
diff -u -p -r1.34 PLIST
--- pkg/PLIST   19 Sep 2016 21:38:39 -  1.34
+++ pkg/PLIST   9 Nov 2016 23:14:24 -
@@ -40,6 +40,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
 jruby/lib/ruby/gems/1.8/specifications/default/did_you_mean-1.0.1.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/jar-dependencies-0.3.5.gemspec
 
jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.9.17-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/jruby-readline-1.1.1-java.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/json-1.8.3-java.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/minitest-5.4.1.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/net-telnet-0.1.1.gemspec
@@ -150,6 +151,7 @@ jruby/lib/ruby/stdlib/ffi/platform/
 jruby/lib/ruby/stdlib/ffi/platform.rb
 jruby/lib/ruby/stdlib/ffi/platform/errno.rb.ffi
 jruby/lib/ruby/stdlib/ffi/platform/etc.rb.ffi
+jruby/lib/ruby/stdlib/ffi/platform/fcntl-flock.rb.ffi
 jruby/lib/ruby/stdlib/ffi/platform/fcntl.rb.ffi
 jruby/lib/ruby/stdlib/ffi/platform/socket.rb.ffi
 jruby/lib/ruby/stdlib/ffi/platform/stat.rb.ffi
@@ -1063,6 +1065,7 @@ jruby/lib/ruby/stdlib/rubygems/resolver/
 
jruby/lib/ruby/stdlib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
 
jruby/lib/ruby/stdlib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
 
jruby/lib/ruby/stdlib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
+jruby/lib/ruby/stdlib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
 
jruby/lib/ruby/stdlib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
 
jruby/lib/ruby/stdlib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
 
jruby/lib/ruby/stdlib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
@@ -1310,6 +1313,7 @@ jruby/lib/ruby/truffle/jruby+truffle/lib
 jruby/lib/ruby/truffle/jruby+truffle/lib/truffle/actionpack_exclusions.yaml
 jruby/lib/ruby/truffle/jruby+truffle/lib/truffle/config.rb
 jruby/lib/ruby/truffle/jruby+truffle/lib/truffle/exclude_rspec_examples.rb
+jruby/lib/ruby/truffle/jruby+truffle/lib/truffle/railties_exclusions.yaml
 jruby/lib/ruby/truffle/jruby+truffle/lib/truffle/runner.rb
 jruby/lib/ruby/truffle/mri/
 jruby/lib/ruby/truffle/mri/English.rb
@@ -1585,6 +1589,124 @@ jruby/lib/ruby/truffle/mri/rake/thread_p
 jruby/lib/ruby/truffle/mri/rake/trace_output.rb
 jruby/lib/ruby/truffle/mri/rake/version.rb
 jruby/lib/ruby/truffle/mri/rake/win32.rb
+jruby/lib/ruby/truffle/mri/rdoc/
+jruby/lib/ruby/truffle/mri/rdoc.rb
+jruby/lib/ruby/truffle/mri/rdoc/alias.rb
+jruby/lib/ruby/truffle/mri/rdoc/anon_class.rb
+jruby/lib/ruby/truffle/mri/rdoc/any_method.rb
+jruby/lib/ruby/truffle/mri/rdoc/attr.rb
+jruby/lib/ruby/truffle/mri/rdoc/class_module.rb
+jruby/lib/ruby/truffle/mri/rdoc/code_object.rb
+jruby/lib/ruby/truffle/mri/rdoc/code_objects.rb
+jruby/lib/ruby/truffle/mri/rdoc/comment.rb
+jruby/lib/ruby/truffle/mri/rdoc/constant.rb
+jruby/lib/ruby/truffle/mri/rdoc/context/
+jruby/lib/ruby/truffle/mri/rdoc/context.rb
+jruby/lib/ruby/truffle/mri/rdoc/context/section.rb
+jruby/lib/ruby/truffle/mri/rdoc/cross_reference.rb
+jruby/lib/ruby/truffle/mri/rdoc/encoding.rb

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/11/15 07:01:05

Modified files:
net/arp-scan   : Makefile distinfo 

Log message:
update mac vendors

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2016/11/15 05:51:02

Modified files:
devel/apktool  : Makefile distinfo 

Log message:
small update of apktool to 2.2.1.

Re: [UPDATE] sysutils/rancid

[Pavel Korovin]

On 11/15, Stuart Henderson wrote:
> > +@conflict rancid-<3v0
> 
> Except for special situations (e.g. what we have in autoconf), an @conflict
> on the same port doesn't make sense.
> 
> > +@ask-update rancid-<3v0 Make sure router.db files use new fields separator 
> > before upgrading
> 
> I think either MESSAGE *or* @ask-update is enough. ask-update is quite
> annoying so I'd rather restrict it for use in special cases (like postgresql,
> where  there is significant extra hassle if you
> don't dump before the package gets updated) and stick to just MESSAGE.

Frankly, I'm not sure now: I switched to rancid v3 about 2 years ago.
I payed attention to upgrade issues when upgraded from v2 and at
that time I concluded that @ask-update is fair: the problem with rancid is
that it is called from cron(8); if it's blindly upgraded and the configuration
is not corrected, the CVS tree it uses for storing device configs will be 
broken.

Do you think having @ask-update along with the MESSAGE is too much
hassle?

-- 
With best regards,
Pavel Korovin

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/11/15 05:24:19

Modified files:
net/freeradius3: Makefile distinfo 
net/freeradius3/pkg: PLIST-main 

Log message:
update to freeradius-3.0.12

Re: text renering in gd

[Jordon]

> On Nov 15, 2016, at 2:56 AM, Stuart Henderson  wrote:
> 
> On 2016/11/14 17:15, Jordon wrote:
>> I am working on getting a little hobby project to build in openbsd and have 
>> encountered some issues.
>> I have successfully built this in OS X and FreeBSD.  It needs clang and gd.
>> 
>> I’m pretty sure I am running a recent snapshot.  I have gd-2.1.1p3 
>> installed.  When I try to build, I get this:
>> 
>> /usr/local/lib/libgd.so.21.1: warning: warning: rand() may return 
>> deterministic values, is that what you want?
>> /usr/local/lib/libgd.so.21.1: warning: warning: strcpy() is almost always 
>> misused, please use strlcpy()
>> /usr/bin/ld: warning: libfreetype.so.27.0, needed by 
>> /usr/local/lib/libgd.so.21.1, not found (try using -rpath or -rpath-link)
>> /usr/bin/ld: warning: libfontconfig.so.11.0, needed by 
>> /usr/local/lib/libgd.so.21.1, not found (try using -rpath or -rpath-link)
>> /usr/bin/ld: warning: libpthread-stubs.so.2.0, needed by 
>> /usr/local/lib/libgd.so.21.1, not found (try using -rpath or -rpath-link)
> 
> libpthread-stubs hasn't been touched recently, so we can rule out the
> possibility of X and packages being out of sync.
> 
> You probably forgot -L/usr/X11R6/lib in LDFLAGS.
> 

That is exactly what happened - on the other system I built this on, it was 
/usr/local/lib
Got it working.  Thanks!

Jordon

Re: lang/gcc/4.9: update dependency on gmp

[Tobias Ulmer]

There seems to be a bigger problem with the amd64 adastrap (at least).

I have another fix that will bump the package anyways, may as well look
into that at the same time

Re: [UPDATE] sysutils/collectd + [NEW] sysutils/riemann-c-client

[Stuart Henderson]

On 2016/11/15 11:05, Landry Breuil wrote:
> On Mon, Nov 14, 2016 at 08:34:34PM +0300, Pavel Korovin wrote:
> > Sorry, forgot to cvs delete before diff.
> > The correct diff for sysutils/collectd attached.
> 
> Nice work! If someone can ok the riemann-c client port, i'll try to test
> & commit this in the coming days.
> 
> Landry
> 

I'm seeing this from port-lib-depends-check,

riemann-c-client-1.9.1(sysutils/riemann-c-client):
Extra:  m.10 stdc++.57

Tests need a patch-Makefile_am to remove -ldl, but then they seem to hang
burning cpu without making any syscalls:

$OpenBSD$
--- Makefile.am.origTue Nov 15 10:18:56 2016
+++ Makefile.am Tue Nov 15 10:19:10 2016
@@ -83,7 +83,7 @@ AM_TESTS_ENVIRONMENT  = \
 TESTS_ENVIRONMENT  ?= ${AM_TESTS_ENVIRONMENT}
 
 tests/check_%: CFLAGS += ${CHECK_CFLAGS}
-tests/check_%: LDADD += ${CHECK_LIBS} -ldl
+tests/check_%: LDADD += ${CHECK_LIBS}
 tests/check_%: LDFLAGS += -no-install
 
 check_PROGRAMS = ${TESTS}

Re: [UPDATE] sysutils/collectd + [NEW] sysutils/riemann-c-client

[Pavel Korovin]

On 11/15, Landry Breuil wrote:
> Nice work! If someone can ok the riemann-c client port, i'll try to test
> & commit this in the coming days.

Landry, regarding testing it with Riemann/graphite, I have it in
production for a long time, I eat my own dog food in this case.
It's a pity nobody have any interest in Riemann port and some other ports I
keep posting to ports@... I hate to have uncommitted stuff in $mystuff.

-- 
With best regards,
Pavel Korovin

Re: [UPDATE] sysutils/collectd + [NEW] sysutils/riemann-c-client

[Landry Breuil]

On Mon, Nov 14, 2016 at 08:34:34PM +0300, Pavel Korovin wrote:
> Sorry, forgot to cvs delete before diff.
> The correct diff for sysutils/collectd attached.

Nice work! If someone can ok the riemann-c client port, i'll try to test
& commit this in the coming days.

Landry

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/11/15 03:04:58

Modified files:
lang/gcc/4.9   : Makefile 

Log message:
bump LIB_DEPENDS for adastrap/gmp update
from tobiasu, ok dcoppa (+ REVISION bump from me)

Re: lang/gcc/4.9: update dependency on gmp

[David Coppa]

Il 15 novembre 2016 10:52:10 CET, Tobias Ulmer  ha scritto:
>The respun adastrap has introduced a hard dependency on gmp 6.1.1,
>save people some debug time:
>
>Index: Makefile
>===
>RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.9/Makefile,v
>retrieving revision 1.44
>diff -u -p -r1.44 Makefile
>--- Makefile   11 Nov 2016 20:13:43 -  1.44
>+++ Makefile   15 Nov 2016 09:47:21 -
>@@ -207,7 +207,7 @@ WANTLIB-main = ${WANTLIB}
> WANTLIB-ada = ${WANTLIB} pthread util
> WANTLIB-libs =m pthread
> 
>-LIB_DEPENDS +=devel/gmp>=4.2 \
>+LIB_DEPENDS +=devel/gmp>=6.1.1 \
>   devel/mpfr \
>   devel/libmpc
> LIB_DEPENDS-libs =

Ok with me.

lang/gcc/4.9: update dependency on gmp

[Tobias Ulmer]

The respun adastrap has introduced a hard dependency on gmp 6.1.1,
save people some debug time:

Index: Makefile
===
RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.9/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile11 Nov 2016 20:13:43 -  1.44
+++ Makefile15 Nov 2016 09:47:21 -
@@ -207,7 +207,7 @@ WANTLIB-main =  ${WANTLIB}
 WANTLIB-ada =  ${WANTLIB} pthread util
 WANTLIB-libs = m pthread
 
-LIB_DEPENDS += devel/gmp>=4.2 \
+LIB_DEPENDS += devel/gmp>=6.1.1 \
devel/mpfr \
devel/libmpc
 LIB_DEPENDS-libs =

Re: [UPDATE] sysutils/rancid

[Stuart Henderson]

> -DISTNAME =   rancid-2.3.8
> -REVISION =   0
> +DISTNAME =   rancid-3.5.1
> +DISTPATCH =  1
> +PKGNAME =${DISTNAME}pl${DISTPATCH}

Yep, the pl bits ar reasonable.

> @@ -18,21 +19,21 @@ PERMIT_PACKAGE_FTP =  Yes
>  WANTLIB =c util
>  
>  MASTER_SITES =   ftp://ftp.shrubbery.net/pub/rancid/
> +MASTER_SITES0 =  ftp://ftp.shrubbery.net/pub/rancid/
> +
> +PATCHFILES = ${DISTNAME}.p${DISTPATCH}.gz:0

No need for MASTER_SITES0 as it's the same, just remove ":0".

> Index: pkg/MESSAGE
> ===
> RCS file: pkg/MESSAGE
> diff -N pkg/MESSAGE
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/MESSAGE   14 Nov 2016 19:38:28 -
> @@ -0,0 +1,7 @@
> +If you are upgrading from rancid-<3, please note that router.db field
> +separator has been changed from ':' to ';' to avoid conflict with IPv6
> +addresses. Replace the field separator in router.db files before running
> +rancid.
> +
> +The configuration files location is changed from ${SYSCONFDIR} to
> +${SYSCONFDIR}/rancid.

> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/rancid/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 8 Jun 2012 13:59:08 -   1.7
> +++ pkg/PLIST 14 Nov 2016 19:38:28 -
> @@ -1,19 +1,25 @@
>  @comment $OpenBSD: PLIST,v 1.7 2012/06/08 13:59:08 pea Exp $
>  @conflict par-*
> +@conflict rancid-<3v0

Except for special situations (e.g. what we have in autoconf), an @conflict
on the same port doesn't make sense.

> +@ask-update rancid-<3v0 Make sure router.db files use new fields separator 
> before upgrading

I think either MESSAGE *or* @ask-update is enough. ask-update is quite
annoying so I'd rather restrict it for use in special cases (like postgresql,
where  there is significant extra hassle if you
don't dump before the package gets updated) and stick to just MESSAGE.

Re: text renering in gd

[Stuart Henderson]

On 2016/11/14 17:15, Jordon wrote:
> I am working on getting a little hobby project to build in openbsd and have 
> encountered some issues.
> I have successfully built this in OS X and FreeBSD.  It needs clang and gd.
> 
> I’m pretty sure I am running a recent snapshot.  I have gd-2.1.1p3 installed. 
>  When I try to build, I get this:
> 
> /usr/local/lib/libgd.so.21.1: warning: warning: rand() may return 
> deterministic values, is that what you want?
> /usr/local/lib/libgd.so.21.1: warning: warning: strcpy() is almost always 
> misused, please use strlcpy()
> /usr/bin/ld: warning: libfreetype.so.27.0, needed by 
> /usr/local/lib/libgd.so.21.1, not found (try using -rpath or -rpath-link)
> /usr/bin/ld: warning: libfontconfig.so.11.0, needed by 
> /usr/local/lib/libgd.so.21.1, not found (try using -rpath or -rpath-link)
> /usr/bin/ld: warning: libpthread-stubs.so.2.0, needed by 
> /usr/local/lib/libgd.so.21.1, not found (try using -rpath or -rpath-link)

libpthread-stubs hasn't been touched recently, so we can rule out the
possibility of X and packages being out of sync.

You probably forgot -L/usr/X11R6/lib in LDFLAGS.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/15 01:50:33

Modified files:
security/libgpg-error: Makefile distinfo 

Log message:
Update to libgpg-error-1.25.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/15 01:48:28

Modified files:
x11/gnome/builder: Makefile 
x11/gnome/builder/patches: 
   
patch-libide_subprocess_ide-subprocess-launcher_c 

Log message:
Finally fix the terminal applet; from upstream.

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/11/15 01:29:43

Modified files:
devel/py-uncompyle6: Makefile distinfo 
devel/py-uncompyle6/pkg: PLIST 

Log message:
Update to py-uncompyle6 2.9.5

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/11/15 01:23:50

Modified files:
devel/flake8   : Makefile distinfo 
devel/flake8/pkg: PLIST 
Removed files:
devel/flake8/patches: patch-setup_py 

Log message:
Update to flake8 3.2.0

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/11/15 01:22:49

Modified files:
devel/py-codestyle: Makefile distinfo 

Log message:
Update to py-codestyle 2.2.0