CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/02/02 16:01:30

Modified files:
net/icinga/web2: Makefile 

Log message:
Adjust icingaweb2 dependencies; don't force pecl-imagick, it's only needed
for exporting graphs to PDF.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/02/02 14:38:08

Modified files:
net/icinga/web2-module-director: Makefile distinfo 
net/icinga/web2-module-director/pkg: PLIST 

Log message:
update to icingaweb2-module-director-1.3.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/02/02 14:36:33

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

Log message:
update to icingaweb2-2.4.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/02/02 14:36:18

Modified files:
net/icinga/core2: Makefile distinfo 
net/icinga/core2/patches: patch-CMakeLists_txt 
  patch-config_h_cmake 
  patch-lib_base_CMakeLists_txt 
net/icinga/core2/pkg: PLIST-main PLIST-mysql PLIST-pgsql 
  README-main 
Added files:
net/icinga/core2/patches: patch-lib_base_loader_cpp 

Log message:
update to icinga2-2.6.1

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/02/02 14:34:34

Modified files:
www/sogo   : Makefile distinfo 
www/sogo/pkg   : PLIST 

Log message:
Minor update to 2.3.19, also works for Davide Gerhard rainbow at irh it
Tighten version dependency to www/sope, as proposed by and discussed by Davide

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/02/02 14:32:53

Modified files:
www/sope   : Makefile distinfo 

Log message:
Minor update to 2.3.19, also works for Davide Gerhard rainbow at irh it

x11/kde4 without Doxygen docs

[Rafael Sadowski]

Hi All,

remove doxygen as BUILD_DEPEND from kde4. Yes there are some doxygen files in
kde4/runtime and kde4/nepomuk-core but no CMake task or similar.

Tested with no PLIST changes (no relevant change).

Kind regards,

Rafael


Index: nepomuk-core/Makefile
===
RCS file: /cvs/ports/x11/kde4/nepomuk-core/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- nepomuk-core/Makefile   28 May 2015 10:17:30 -  1.10
+++ nepomuk-core/Makefile   2 Feb 2017 20:12:39 -
@@ -23,8 +23,7 @@ WANTLIB += sopranoserver tag
 
 MODKDE4_USE =  libs
 
-BUILD_DEPENDS =devel/doxygen \
-   misc/shared-desktop-ontologies>=0.10.51
+BUILD_DEPENDS =misc/shared-desktop-ontologies>=0.10.51
 
 RUN_DEPENDS =  devel/desktop-file-utils \
misc/shared-desktop-ontologies>=0.10.51
Index: runtime/Makefile
===
RCS file: /cvs/ports/x11/kde4/runtime/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- runtime/Makefile22 Sep 2015 21:48:25 -  1.31
+++ runtime/Makefile2 Feb 2017 20:12:39 -
@@ -48,7 +48,6 @@ MODKDE4_USE = pim libs
 
 BUILD_DEPENDS =archivers/bzip2 \
archivers/xz \
-   devel/doxygen \
${MODKDE4_DEP_DIR}/nepomuk-core>=${MODKDE4_DEP_VERSION}
 
 RUN_DEPENDS-locale =

Re: remove claws-mail-htmlviewer

[Daniel Jakots]

On Thu, 2 Feb 2017 10:23:49 -0500, Daniel Jakots 
wrote:

> new diff attached.

For real this time. (thanks Landry)Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.435
diff -u -p -r1.435 Makefile
--- Makefile	31 Jan 2017 21:53:07 -	1.435
+++ Makefile	2 Feb 2017 15:21:56 -
@@ -5,7 +5,7 @@ CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-2.280
+PKGNAME =	quirks-2.281
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie 
 
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.447
diff -u -p -r1.447 Quirks.pm
--- files/Quirks.pm	31 Jan 2017 21:53:07 -	1.447
+++ files/Quirks.pm	2 Feb 2017 15:21:56 -
@@ -409,6 +409,7 @@ my $stem_extensions = {
 	'py-ripe.atlas.tools' => 'ripe.atlas.tools',
 	'u-boot' => 'u-boot-arm',
 	'ja-w3m' => 'w3m',
+	'markdown' => 'py-markdown',
 };
 
 my $obsolete_reason = {
@@ -905,6 +906,7 @@ my $obsolete_reason = {
 	'rednotebook' => 5,
 	'py-webkitgtk' => 2,
 	'xombrero' => 3,
+	'claws-mail-htmlviewer' => 2,
 };
 
 # reasons for obsolete packages

Re: NEW: sysutils/ripgrep 0.4.0

[Landry Breuil]

On Mon, Jan 16, 2017 at 05:33:43PM +0100, Sebastien Marie wrote:
> Hi,
> 
> ripgrep is a rust program that comes in the spirit of The Silver
> Searcher.
> 
> From https://github.com/BurntSushi/ripgrep:
> 
> ripgrep is a line oriented search tool that combines the usability of
> The Silver Searcher (an ack clone) with the raw speed of GNU grep.
> ripgrep works by recursively searching your current directory for a
> regex pattern.

Two minor nits portswise:
- if you @comment out the bash-completion/zsh subdirs, and for some
  reason you dont have bash or zsh installed, installation of the
package should fail... similar ports like the_silver_searcher and
pdfgrep dont do this.
- the DISTFILES stuff feels awkward but i guess you have no other
  option..
- would CATEGORIES be better as 'textproc sysutils' and import the port
  in textproc/ subdir like the_silver_searcher or ack ?

Other than that, looks okay to import. And sorry for the long delay
reviewing this...

Landry

remove claws-mail-htmlviewer

[Daniel Jakots]

Hi,

First read the mail from Landry about webkit if needed [1]. I talked
with upstream about it, they told me that first they'd need to move
claws-mail to gtk3 and then it would be possible to depends on a newer
and less vulnerable webkit. So let's remove the subpackage htmlviewer
so we can get rid of it. While diving into configure, I disabled a few
things that seems useless (thus bumping main revision).

I'm not totally sure about what I did so I appreciate any review (and
test if you use claws-mail).

I also attach the quirks diff, of course, but don't care about the
py-markdown chunk, I was just too lazy to remove it from my tree etc.

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

Comments? OK?

Cheers,
DanielIndex: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.435
diff -u -p -r1.435 Makefile
--- Makefile	31 Jan 2017 21:53:07 -	1.435
+++ Makefile	2 Feb 2017 14:58:15 -
@@ -5,7 +5,7 @@ CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-2.280
+PKGNAME =	quirks-2.281
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie 
 
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.447
diff -u -p -r1.447 Quirks.pm
--- files/Quirks.pm	31 Jan 2017 21:53:07 -	1.447
+++ files/Quirks.pm	2 Feb 2017 14:58:15 -
@@ -409,6 +409,7 @@ my $stem_extensions = {
 	'py-ripe.atlas.tools' => 'ripe.atlas.tools',
 	'u-boot' => 'u-boot-arm',
 	'ja-w3m' => 'w3m',
+	'markdown' => 'py-markdown',
 };
 
 my $obsolete_reason = {
@@ -905,6 +906,7 @@ my $obsolete_reason = {
 	'rednotebook' => 5,
 	'py-webkitgtk' => 2,
 	'xombrero' => 3,
+	'claws-mail-htmlviewe' => 2,
 };
 
 # reasons for obsolete packages
Index: Makefile
===
RCS file: /cvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.96
diff -u -p -r1.96 Makefile
--- Makefile	17 Dec 2016 20:43:36 -	1.96
+++ Makefile	2 Feb 2017 15:10:53 -
@@ -4,7 +4,6 @@ COMMENT-main=		mail and news client
 COMMENT-bogofilter=	bogofilter plugin
 COMMENT-clamav=		clamav plugin
 COMMENT-spamassassin=	spamassassin plugin
-COMMENT-htmlviewer=	fancy htmlviewer plugin
 COMMENT-pdfviewer=	pdfviewer plugin
 COMMENT-gdata=		gdata plugin
 
@@ -13,9 +12,9 @@ DISTNAME=		claws-mail-${V}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-bogofilter=	claws-mail-bogofilter-${V}
 PKGNAME-spamassassin=	claws-mail-spamassassin-${V}
-PKGNAME-htmlviewer=	claws-mail-htmlviewer-${V}
 PKGNAME-pdfviewer=	claws-mail-pdfviewer-${V}
 PKGNAME-gdata=		claws-mail-gdata-${V}
+REVISION-main=		0
 REVISION-pdfviewer=	0
 
 CATEGORIES=		mail news
@@ -30,7 +29,7 @@ MASTER_SITES=		http://www.claws-mail.org
 
 DIST_SUBDIR=		claws
 
-MULTI_PACKAGES=		-main -bogofilter -spamassassin -htmlviewer -pdfviewer -gdata
+MULTI_PACKAGES=		-main -bogofilter -spamassassin -pdfviewer -gdata
 FLAVORS=		jpilot ldap
 FLAVOR?=
 
@@ -62,15 +61,6 @@ WANTLIB-gdata += gck-1 gcr-base-3 gcrypt
 WANTLIB-gdata += lzma nspr4 nss3 oauth p11-kit plc4 plds4 smime3 softokn3
 WANTLIB-gdata += soup-2.4 sqlite3 ssl3 xml2
 
-WANTLIB-htmlviewer =  ${WANTLIB}
-WANTLIB-htmlviewer += EGL GL ICE SM X11-xcb Xt Xxf86vm drm enchant gbm gcrypt
-WANTLIB-htmlviewer += glapi gpg-error gstapp-1.0 gstaudio-1.0 gstbase-1.0
-WANTLIB-htmlviewer += gstfft-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0
-WANTLIB-htmlviewer += gstvideo-1.0 harfbuzz-icu icudata icui18n icuuc
-WANTLIB-htmlviewer += javascriptcoregtk-1.0 jpeg lzma orc-0.4 secret-1
-WANTLIB-htmlviewer += soup-2.4 soup-gnome-2.4 sqlite3 stdc++ webkitgtk-1.0
-WANTLIB-htmlviewer += webp xcb-dri2 xcb-glx xcb-xfixes xml2 xslt
-
 WANTLIB-pdfviewer =  ${WANTLIB}
 WANTLIB-pdfviewer += jpeg lcms2 openjp2 poppler poppler-glib tiff
 
@@ -91,11 +81,7 @@ LIB_DEPENDS-main=	${LIB_DEPENDS} \
 			audio/libcanberra,-gtk \
 			devel/libnotify \
 			security/gnutls>=2.2 \
-			security/gpgme \
-			x11/dbus-glib
-
-LIB_DEPENDS-htmlviewer=	${LIB_DEPENDS} \
-			www/webkit>=2.0.0
+			security/gpgme
 
 LIB_DEPENDS-pdfviewer=	${LIB_DEPENDS} \
 			print/poppler
@@ -107,8 +93,12 @@ LIB_DEPENDS-gdata=	${LIB_DEPENDS} \
 #python tries to dlopen libpython2.7.so
 CONFIGURE_ARGS+=	--disable-acpi_notifier-plugin \
 			--disable-compface \
+			--disable-dbus \
+			--disable-fancy-plugin \
 			--disable-geolocation-plugin \
+			--disable-networkmanager \
 			--disable-python-plugin \
+			--disable-valgrind \
 			--enable-new-addrbook
 
 MODULES=		devel/gettext
Index: pkg/DESCR-htmlviewer
===
RCS file: pkg/DESCR-htmlviewer
diff -N pkg/DESCR-htmlviewer
--- pkg/DESCR-htmlviewer	25 Sep 2013 08:03:16 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1 +0,0 @@
-Claws Mail plugin for rendering HTML using WebKit.
Index: pkg/PLIST-htmlviewer

Re: remove claws-mail-htmlviewer

[Daniel Jakots]

On Thu, 2 Feb 2017 16:20:40 +0100, Landry Breuil 
wrote:

> On Thu, Feb 02, 2017 at 10:17:52AM -0500, Daniel Jakots wrote:
> > Hi,
> > 
> > First read the mail from Landry about webkit if needed [1]. I talked
> > with upstream about it, they told me that first they'd need to move
> > claws-mail to gtk3 and then it would be possible to depends on a
> > newer and less vulnerable webkit. So let's remove the subpackage
> > htmlviewer so we can get rid of it. While diving into configure, I
> > disabled a few things that seems useless (thus bumping main
> > revision).
> > 
> > I'm not totally sure about what I did so I appreciate any review
> > (and test if you use claws-mail).
> > 
> > I also attach the quirks diff, of course, but don't care about the
> > py-markdown chunk, I was just too lazy to remove it from my tree
> > etc.  
> 
> You have a typo in the quirks diff - other than that, reads ok and
> makes sense for now. HTML e-mail is evil anyway :)
> Would be glad to see upstream claws-mail move to Gtk3, but i dont have
> much hope on that...

Indeed, new diff attached.
Thanks for the ok, waiting a bit longer to give people time for more
reviews/tests.

Re: remove claws-mail-htmlviewer

[Landry Breuil]

On Thu, Feb 02, 2017 at 10:17:52AM -0500, Daniel Jakots wrote:
> Hi,
> 
> First read the mail from Landry about webkit if needed [1]. I talked
> with upstream about it, they told me that first they'd need to move
> claws-mail to gtk3 and then it would be possible to depends on a newer
> and less vulnerable webkit. So let's remove the subpackage htmlviewer
> so we can get rid of it. While diving into configure, I disabled a few
> things that seems useless (thus bumping main revision).
> 
> I'm not totally sure about what I did so I appreciate any review (and
> test if you use claws-mail).
> 
> I also attach the quirks diff, of course, but don't care about the
> py-markdown chunk, I was just too lazy to remove it from my tree etc.

You have a typo in the quirks diff - other than that, reads ok and makes
sense for now. HTML e-mail is evil anyway :)
Would be glad to see upstream claws-mail move to Gtk3, but i dont have
much hope on that...

Landry

Re: NEW: net/nagios/check_pf

[Sebastian Reitenbach]

On Thursday, February 2, 2017 15:25 CET, Stuart Henderson 
 wrote:

> On 2017/02/02 14:58, Sebastian Reitenbach wrote:
> > Hi,
> >
> > attached a new simple port to check the amount of entries in
> > the PF state table. Works as advertized to me.
> >
> > Comments/Feedback or even OKs welcome.
> >
> > cheers,
> > Sebastian
>
> : This plugin needs to be able to open the pf(4) pseudo-device, which is
> : mode 600 by default.  If 'nagios' is the only thing that needs access to it,
> : you can change the group of the device and make it mode 640.
> :
> : # chgrp nagios /dev/pf
> : # chmod 640 /dev/pf
>
> There is no way on earth I'd give Nagios-quality code access to /dev/pf.
> I'd recommend running snmpd and doing this instead.
>
> /usr/local/libexec/nagios/check_snmp -H localhost \
>   -o OPENBSD-PF-MIB::pfStateCount.0 -P 2c -C public -w 800 -c 1000
>

That indeed works like a charm, thanks for the cluestick, should have checked 
before.
please disregard adding this port.

Sebastian

Re: NEW: net/nagios/check_pf

[Stuart Henderson]

On 2017/02/02 14:58, Sebastian Reitenbach wrote:
> Hi,
> 
> attached a new simple port to check the amount of entries in
> the PF state table. Works as advertized to me.
> 
> Comments/Feedback or even OKs welcome.
> 
> cheers,
> Sebastian

: This plugin needs to be able to open the pf(4) pseudo-device, which is
: mode 600 by default.  If 'nagios' is the only thing that needs access to it,
: you can change the group of the device and make it mode 640.
: 
: # chgrp nagios /dev/pf
: # chmod 640 /dev/pf

There is no way on earth I'd give Nagios-quality code access to /dev/pf.
I'd recommend running snmpd and doing this instead.

/usr/local/libexec/nagios/check_snmp -H localhost \
-o OPENBSD-PF-MIB::pfStateCount.0 -P 2c -C public -w 800 -c 1000

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
telephony/asterisk: Makefile 
Added files:
telephony/asterisk/patches: patch-main_audiohook_c 

Log message:
Patch to raise level of Asterisk's "Read factory %p and write factory %p
both fail to provide %zu samples" debug message which is triggering very
frequently, so that it's possible to get debug level 5 messages without
flattening the box.

Re: www/composer: Fix "out of memory" error

[Stuart Henderson]

On 2017/02/01 23:21, Leo Unglaub wrote:
> Hey friends,
> when using composer on a normal or large size project it happens very
> quickly that composer runs out or memory. It's recommended to set the
> PHP memory_limit for composer only to -1. I added you a diff.
> 
> Documentation on the projects website:
> https://getcomposer.org/doc/articles/troubleshooting.md#memory-limit-errors
> 
> Hopefully this is OK for you.
> Greetings
> Leo

Thanks, commmitted with some formatting changes and a REVISION bump.


> > diff --git a/www/composer/files/composer b/www/composer/files/composer
> > index 9a7e9000c10..5daeb992db9 100644
> > --- a/www/composer/files/composer
> > +++ b/www/composer/files/composer
> > @@ -1,2 +1,2 @@
> >  #!/bin/sh
> > -exec ${MODPHP_BIN} -d allow_url_fopen=1 -d 
> > suhosin.executor.include.whitelist=phar ${TRUEPREFIX}/libexec/composer.phar 
> > "$@"
> > +exec ${MODPHP_BIN} -d memory_limit=-1 -d allow_url_fopen=1 -d 
> > suhosin.executor.include.whitelist=phar ${TRUEPREFIX}/libexec/composer.phar 
> > "$@"
> 

NEW: net/nagios/check_pf

[Sebastian Reitenbach]

Hi,

attached a new simple port to check the amount of entries in
the PF state table. Works as advertized to me.

Comments/Feedback or even OKs welcome.

cheers,
Sebastian


check_pf.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
www/composer   : Makefile 
www/composer/files: composer 

Log message:
Set memory_limit=-1 in the wrapper script for composer CLI.
Requested by Leo Unglaub.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/02/02 06:55:58

Modified files:
graphics/darktable: Makefile distinfo 

Log message:
update to darktable-2.2.3.

Disable OpenCL tests as they cause clang to be picked up during configure,
causing problems if DPB junks it (found by naddy).

(darktable needs to be built with ports gcc for TLS emulation, otherwise
I'd just switch it to clang instead..)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/02/02 05:58:33

Modified files:
graphics   : Makefile 

Log message:
Link digikam-kde4 to the build properly. It was already pulled in via
meta/kde4/Makefile but that's not enough to get listed in INDEX.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/02/02 05:57:13

Modified files:
graphics/digikam-kde4/patches: 
   patch-extra_libkgeomap_CMakeLists_txt 
   patch-extra_kipi-plugins_CMakeLists_txt 

Log message:
regen patches

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/02/02 05:57:28

Modified files:
graphics/digikam-kde4: Makefile 
Added files:
graphics/digikam-kde4/patches: 
   
patch-core_libs_dimg_filters_lens_lensfuniface_h 

Log message:
backport upstream patch to fix digikam-kde4 with newer lensfun.
diff from rsadowski with minor tweak in patch comment by me.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/02/02 05:49:14

Modified files:
www: Makefile 

Log message:
remove midori,gtk3 - it's now the default

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/02/02 05:48:37

Modified files:
www/midori : Makefile 
www/midori/pkg : PLIST 
Removed files:
www/midori/pkg : PFRAG.no-gtk3 

Log message:
Remove gtk3 flavor and build by default against gtk3 and webkitgtk4,
even if the latter was touted upstream as 'HALF_BRO_INCOM_WEBKIT2' it
somewhat works, and allows us to stop depending on www/webkit. Upstream
isn't very much alive sadly..

based on a diff from Davide Gerhard.

Remove www/vimb?

[Frederic Cambus]

Hi ports@,

Following the discussion on www/webkit [1], and as pointed out by
semarie [2], vimb is currently stuck to the deprecated version of
WebKit. There have been a few commits upstream to keep working on
the webkit2 branch, so there is hope to see the transition happen
at some point. Meanwhile, I think we should remove the port until
that happens.

Comments? OK?

[1] https://marc.info/?l=openbsd-ports=148585584015126=2
[2] https://marc.info/?l=openbsd-ports=148593656726106=2

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2017/02/02 05:04:43

Modified files:
mail/claws-mail/patches: patch-configure_ac 

Log message:
Regen patch

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2017/02/02 04:30:10

Modified files:
infrastructure/templates: network.conf.template 

Log message:
MASTER_SITE_OPENBSD http -> https. OK bentley@ phessler@.

Re: MASTER_SITE_OPENBSD http -> https ?

[Peter Hessler]

OK


On 2017 Feb 02 (Thu) at 03:30:38 +0100 (+0100), Juan Francisco Cantero Hurtado 
wrote:
:OK?
:
:Index: infrastructure/templates/network.conf.template
:===
:RCS file: /cvs/ports/infrastructure/templates/network.conf.template,v
:retrieving revision 1.209
:diff -u -p -r1.209 network.conf.template
:--- infrastructure/templates/network.conf.template 1 Oct 2016 13:56:26 
-   1.209
:+++ infrastructure/templates/network.conf.template 2 Feb 2017 02:25:51 
-
:@@ -10,9 +10,9 @@
: 
: # List of OpenBSD sites
: MASTER_SITE_OPENBSD ?= \
:-  http://ftp.openbsd.org/pub/OpenBSD/distfiles/ \
:+  https://ftp.openbsd.org/pub/OpenBSD/distfiles/ \
:   ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles/ \
:-  http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles/
:+  https://ftp.fr.openbsd.org/pub/OpenBSD/distfiles/
: 
: # Default OpenBSD backup site
: _MASTER_SITE_OPENBSD ?=   ${MASTER_SITE_OPENBSD:=${DIST_SUBDIR}/}
:

-- 
When the going gets tough, the tough get empirical
-- Jon Carroll

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/02/02 01:02:50

Modified files:
lang/rust  : Makefile 
Added files:
lang/rust/patches: patch-src_llvm_cmake_modules_AddLLVM_cmake 
   patch-src_llvm_include_llvm_Support_Threading_h 
   patch-src_llvm_lib_CodeGen_TargetLoweringBase_cpp 
   patch-src_llvm_lib_Support_Unix_Signals_inc 

Log message:
Temporarly switch rust to build with embedded llvm.

rust doesnt build yet with llvm 4.0, which should be soon updated in the
portstree. Upstream rust support for llvm 4.0 is in the pipe.

>From semarie@

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2017/02/02 01:00:43

Modified files:
x11/i3status   : Makefile 
Added files:
x11/i3status/patches: patch-src_print_battery_info_c 

Log message:
Suppress printing :00 seconds of remaining battery lifetime, as apm(4)'s
estimate only has a granularity of minutes.

ok jasper