aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/Makefile6
-rw-r--r--sysutils/android-file-transfer/Makefile2
-rw-r--r--sysutils/b2sum/Makefile2
-rw-r--r--sysutils/bacula9-docs/Makefile2
-rw-r--r--sysutils/bacula9-docs/distinfo6
-rw-r--r--sysutils/bacula9-server/Makefile2
-rw-r--r--sysutils/bacula9-server/distinfo6
-rw-r--r--sysutils/beats/Makefile2
-rw-r--r--sysutils/beats/distinfo6
-rw-r--r--sysutils/bsdisks/Makefile2
-rw-r--r--sysutils/cbsd/Makefile3
-rw-r--r--sysutils/cbsd/distinfo6
-rw-r--r--sysutils/clone/Makefile2
-rw-r--r--sysutils/cloudabi-utils/Makefile29
-rw-r--r--sysutils/cloudabi-utils/distinfo6
-rw-r--r--sysutils/conky/Makefile2
-rw-r--r--sysutils/consul/Makefile2
-rw-r--r--sysutils/consul/distinfo6
-rw-r--r--sysutils/consul_exporter/Makefile48
-rw-r--r--sysutils/consul_exporter/distinfo3
-rw-r--r--sysutils/consul_exporter/files/consul_exporter.in36
-rw-r--r--sysutils/consul_exporter/pkg-descr3
-rw-r--r--sysutils/dar/Makefile1
-rw-r--r--sysutils/debhelper/Makefile2
-rw-r--r--sysutils/debhelper/distinfo6
-rw-r--r--sysutils/debhelper/files/patch-Makefile18
-rw-r--r--sysutils/dmidecode/Makefile24
-rw-r--r--sysutils/dsblogoutmgr/Makefile2
-rw-r--r--sysutils/dsblogoutmgr/distinfo6
-rw-r--r--sysutils/e2fsprogs/Makefile4
-rw-r--r--sysutils/e2fsprogs/distinfo6
-rw-r--r--sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c19
-rw-r--r--sysutils/e2fsprogs/files/patch-lib_support_mkquota.c21
-rw-r--r--sysutils/entr/pkg-descr2
-rw-r--r--sysutils/eventlog/Makefile4
-rw-r--r--sysutils/facter/Makefile2
-rw-r--r--sysutils/fcron/pkg-descr4
-rw-r--r--sysutils/file/Makefile2
-rw-r--r--sysutils/file/distinfo6
-rw-r--r--sysutils/freefilesync/Makefile2
-rw-r--r--sysutils/fusefs-encfs/Makefile1
-rw-r--r--sysutils/fusefs-exfat/pkg-descr2
-rw-r--r--sysutils/fusefs-lkl/Makefile2
-rw-r--r--sysutils/fusefs-simple-mtpfs/Makefile2
-rw-r--r--sysutils/gnome-power-manager/Makefile20
-rw-r--r--sysutils/gnome-power-manager/pkg-descr2
-rw-r--r--sysutils/grub2-bhyve/Makefile2
-rw-r--r--sysutils/grub2-efi/Makefile2
-rw-r--r--sysutils/grub2-pcbsd/Makefile2
-rw-r--r--sysutils/grub2/Makefile2
-rw-r--r--sysutils/gsmartcontrol/Makefile1
-rw-r--r--sysutils/hfm/Makefile2
-rw-r--r--sysutils/immortal/Makefile4
-rw-r--r--sysutils/immortal/distinfo10
-rw-r--r--sysutils/ipdbtools/Makefile2
-rw-r--r--sysutils/kf5-baloo/Makefile1
-rw-r--r--sysutils/kf5-kwallet/Makefile1
-rw-r--r--sysutils/kshutdown-kde4/Makefile2
-rw-r--r--sysutils/libretto-config/Makefile2
-rw-r--r--sysutils/lnav/Makefile2
-rw-r--r--sysutils/logstalgia/Makefile2
-rw-r--r--sysutils/lsof/Makefile2
-rw-r--r--sysutils/lsof/distinfo6
-rw-r--r--sysutils/mate-system-monitor/Makefile1
-rw-r--r--sysutils/memtest86+/Makefile1
-rw-r--r--sysutils/n98-magerun/Makefile18
-rw-r--r--sysutils/n98-magerun/distinfo5
-rw-r--r--sysutils/nitrogen/Makefile2
-rw-r--r--sysutils/nomad/pkg-descr2
-rw-r--r--sysutils/ori/Makefile7
-rw-r--r--sysutils/ori/distinfo2
-rw-r--r--sysutils/osquery/Makefile1
-rw-r--r--sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a22
-rw-r--r--sysutils/p5-File-Which/Makefile4
-rw-r--r--sysutils/p5-File-Which/distinfo5
-rw-r--r--sysutils/packer/Makefile2
-rw-r--r--sysutils/packer/distinfo6
-rw-r--r--sysutils/parafly/Makefile2
-rw-r--r--sysutils/pesign/Makefile2
-rw-r--r--sysutils/powerdxx/Makefile1
-rw-r--r--sysutils/puppet-mode.el/Makefile2
-rw-r--r--sysutils/puppet4/Makefile2
-rw-r--r--sysutils/puppet4/distinfo6
-rw-r--r--sysutils/py-glances/Makefile2
-rw-r--r--sysutils/py-glances/distinfo6
-rw-r--r--sysutils/py-psutil/Makefile2
-rw-r--r--sysutils/py-psutil/distinfo6
-rw-r--r--sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c62
-rw-r--r--sysutils/rinse/pkg-descr4
-rw-r--r--sysutils/rubygem-capistrano/Makefile2
-rw-r--r--sysutils/rubygem-capistrano/distinfo6
-rw-r--r--sysutils/rubygem-hiera/Makefile2
-rw-r--r--sysutils/rubygem-hiera/distinfo6
-rw-r--r--sysutils/rubygem-hiera/pkg-descr2
-rw-r--r--sysutils/rubygem-hiera1/pkg-descr2
-rw-r--r--sysutils/shim/Makefile2
-rw-r--r--sysutils/spiped/Makefile1
-rw-r--r--sysutils/syslog-ng311/Makefile6
-rw-r--r--sysutils/tarsnap-gui/Makefile2
-rw-r--r--sysutils/terraform/Makefile2
-rw-r--r--sysutils/terraform/distinfo6
-rw-r--r--sysutils/uefi-edk2-bhyve/Makefile2
-rw-r--r--sysutils/wiimms/Makefile2
-rw-r--r--sysutils/znapzend/Makefile44
-rw-r--r--sysutils/znapzend/distinfo3
-rw-r--r--sysutils/znapzend/files/patch-lib_ZnapZend.pm28
-rw-r--r--sysutils/znapzend/files/znapzend.in30
-rw-r--r--sysutils/znapzend/pkg-descr10
-rw-r--r--sysutils/znapzend/pkg-plist10
109 files changed, 447 insertions, 283 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 130ce02ddb04..5912485d97f1 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -191,6 +191,7 @@
SUBDIR += consolehm
SUBDIR += consolekit2
SUBDIR += consul
+ SUBDIR += consul_exporter
SUBDIR += consul-alerts
SUBDIR += contractor
SUBDIR += copytape
@@ -1140,11 +1141,11 @@
SUBDIR += syslinux
SUBDIR += syslog-ng
SUBDIR += syslog-ng-incubator
+ SUBDIR += syslog-ng310
+ SUBDIR += syslog-ng311
SUBDIR += syslog-ng36
SUBDIR += syslog-ng37
SUBDIR += syslog-ng39
- SUBDIR += syslog-ng310
- SUBDIR += syslog-ng311
SUBDIR += syslogger
SUBDIR += sysrc
SUBDIR += system-tools-backends
@@ -1350,6 +1351,7 @@
SUBDIR += zfstools
SUBDIR += zidrav
SUBDIR += zisofs-tools
+ SUBDIR += znapzend
SUBDIR += zogftw
SUBDIR += zrep
SUBDIR += zsd
diff --git a/sysutils/android-file-transfer/Makefile b/sysutils/android-file-transfer/Makefile
index 7213ac771b23..0ac412976266 100644
--- a/sysutils/android-file-transfer/Makefile
+++ b/sysutils/android-file-transfer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= android-file-transfer
DISTVERSIONPREFIX= v
DISTVERSION= 3.2
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= sysutils
MAINTAINER= jbeich@FreeBSD.org
diff --git a/sysutils/b2sum/Makefile b/sysutils/b2sum/Makefile
index 1bb34253e33d..47638a0e7b95 100644
--- a/sysutils/b2sum/Makefile
+++ b/sysutils/b2sum/Makefile
@@ -2,7 +2,7 @@
PORTNAME= b2sum
PORTVERSION= 0.0.d${B2VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils security
MASTER_SITES= http://blake2.net/
DISTNAME= blake2_code_${B2VERSION}${EXTRACT_SUFFX}
diff --git a/sysutils/bacula9-docs/Makefile b/sysutils/bacula9-docs/Makefile
index 76c3eb4e65ef..5dc8eb089569 100644
--- a/sysutils/bacula9-docs/Makefile
+++ b/sysutils/bacula9-docs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bacula
-PORTVERSION= 9.0.3
+PORTVERSION= 9.0.4
CATEGORIES= sysutils
MASTER_SITES= SF
PKGNAMESUFFIX= 9-docs
diff --git a/sysutils/bacula9-docs/distinfo b/sysutils/bacula9-docs/distinfo
index 08297efb51ac..dfe937585db9 100644
--- a/sysutils/bacula9-docs/distinfo
+++ b/sysutils/bacula9-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503938340
-SHA256 (bacula-docs-9.0.3.tar.bz2) = 96ed36991d486f4fd5cb0734d3fa7c12f7dbcac936d0e0a87d6c25f7fa3066cb
-SIZE (bacula-docs-9.0.3.tar.bz2) = 50216652
+TIMESTAMP = 1504721203
+SHA256 (bacula-docs-9.0.4.tar.bz2) = 7f6697eb5076a33ea44b1c11ab8255e9b1b8e976757d8172af0d9d1108eac8c0
+SIZE (bacula-docs-9.0.4.tar.bz2) = 50200516
diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile
index 5f0229e6e00e..97cad239e6c8 100644
--- a/sysutils/bacula9-server/Makefile
+++ b/sysutils/bacula9-server/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bacula
-PORTVERSION= 9.0.3
+PORTVERSION= 9.0.4
PORTREVISION= 0
CATEGORIES?= sysutils
MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
diff --git a/sysutils/bacula9-server/distinfo b/sysutils/bacula9-server/distinfo
index d1dbeee54b22..db2254511209 100644
--- a/sysutils/bacula9-server/distinfo
+++ b/sysutils/bacula9-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503524082
-SHA256 (bacula-9.0.3.tar.gz) = ae8501960d43399bea13113274993637b6395d73d7d2c47f9b7a07cb4aa72251
-SIZE (bacula-9.0.3.tar.gz) = 3951688
+TIMESTAMP = 1504720901
+SHA256 (bacula-9.0.4.tar.gz) = cafa2d9a9e89a77d3b79984972487e72fb90d949269c77a74a68e97a9d28996f
+SIZE (bacula-9.0.4.tar.gz) = 3965761
diff --git a/sysutils/beats/Makefile b/sysutils/beats/Makefile
index a9a44e7384df..2f5a1b295e77 100644
--- a/sysutils/beats/Makefile
+++ b/sysutils/beats/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= beats
-PORTVERSION= 5.5.2
+PORTVERSION= 5.6.0
DISTVERSIONPREFIX=v
CATEGORIES= sysutils
diff --git a/sysutils/beats/distinfo b/sysutils/beats/distinfo
index 4afe77ba0bd8..ba395e8e1425 100644
--- a/sysutils/beats/distinfo
+++ b/sysutils/beats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503047128
-SHA256 (elastic-beats-v5.5.2_GH0.tar.gz) = 39e792324a35fe84ef9a63cd5324252bc71d1c665188e8d597e12ca170cfde7a
-SIZE (elastic-beats-v5.5.2_GH0.tar.gz) = 18075191
+TIMESTAMP = 1505234011
+SHA256 (elastic-beats-v5.6.0_GH0.tar.gz) = 7ec86da04b97fa7dcddc88250f0f7d2efd06f4ef058cc0097d1d439526b9ed44
+SIZE (elastic-beats-v5.6.0_GH0.tar.gz) = 18142573
diff --git a/sysutils/bsdisks/Makefile b/sysutils/bsdisks/Makefile
index 8818a7e91220..cea2d57a493a 100644
--- a/sysutils/bsdisks/Makefile
+++ b/sysutils/bsdisks/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bsdisks
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= https://bitbucket.org/arrowd/bsdisks/downloads/
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index c197f4ac9c8e..5c0e14e0fc2d 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,13 +1,14 @@
# $FreeBSD$
PORTNAME= cbsd
-PORTVERSION= 11.1.3
+PORTVERSION= 11.1.5
CATEGORIES= sysutils
MAINTAINER= olevole@olevole.ru
COMMENT= Yet another FreeBSD Jail and Bhyve Management Utility
LICENSE= BSD2CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rsync:net/rsync \
sudo:security/sudo \
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 78dd6b865ee5..5d5d1ba1f9e4 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504093396
-SHA256 (cbsd-cbsd-11.1.3_GH0.tar.gz) = 3d0ba2daa0242ca957fcd0ab92f7600c78dd8f2a2f5a1e1e40de0cf2ef6e93b2
-SIZE (cbsd-cbsd-11.1.3_GH0.tar.gz) = 5512823
+TIMESTAMP = 1505079759
+SHA256 (cbsd-cbsd-11.1.5_GH0.tar.gz) = 36ef007d9cf6ea991e1d81a6aff88fe5833ef62444ba68a4fa1a822f868afbed
+SIZE (cbsd-cbsd-11.1.5_GH0.tar.gz) = 5517841
diff --git a/sysutils/clone/Makefile b/sysutils/clone/Makefile
index 78ae3ea11823..6674169069e6 100644
--- a/sysutils/clone/Makefile
+++ b/sysutils/clone/Makefile
@@ -2,7 +2,7 @@
PORTNAME= clone
PORTVERSION= 1.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://cyclaero.com/public/clone/
diff --git a/sysutils/cloudabi-utils/Makefile b/sysutils/cloudabi-utils/Makefile
index 22d814d56542..fd9117dede3e 100644
--- a/sysutils/cloudabi-utils/Makefile
+++ b/sysutils/cloudabi-utils/Makefile
@@ -2,28 +2,35 @@
# $FreeBSD$
PORTNAME= cloudabi-utils
-PORTVERSION= 0.26
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX= v
+DISTVERSION= 0.30
CATEGORIES= sysutils
MAINTAINER= ed@FreeBSD.org
COMMENT= Utilities for running CloudABI programs
LICENSE= BSD2CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi
+ONLY_FOR_ARCHS= aarch64 amd64 armv6 i386
+ONLY_FOR_ARCHS_REASON= CloudABI has not yet been ported to other architectures
+
+BUILD_DEPENDS= ${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi \
+ ${LOCALBASE}/include/flower/protocol/switchboard.ad.h:net/flower \
+ ${LOCALBASE}/include/yaml2argdata/yaml_builder.h:devel/yaml2argdata
LIB_DEPENDS= libargdata.so:devel/argdata \
- libyaml.so:textproc/libyaml
+ libarpc.so:devel/arpc \
+ libyaml-cpp.so:devel/yaml-cpp
+USES= cmake localbase:ldflags pkgconfig tar:xz
+USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= NuxiNL
-ONLY_FOR_ARCHS= aarch64 amd64 armv6 i386
-ONLY_FOR_ARCHS_REASON= CloudABI has not yet been ported to other architectures
-
-USES= cmake compiler:c11 pkgconfig tar:xz
-USE_LDCONFIG= yes
+.include <bsd.port.pre.mk>
-CFLAGS+= -I${LOCALBASE}/include
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100511
+IGNORE= requires various C++17 features
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/cloudabi-utils/distinfo b/sysutils/cloudabi-utils/distinfo
index 27f65d912b00..3bd5376a78d9 100644
--- a/sysutils/cloudabi-utils/distinfo
+++ b/sysutils/cloudabi-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500995361
-SHA256 (NuxiNL-cloudabi-utils-v0.26_GH0.tar.gz) = b48449fa0623b71a25f365a2b7e7f938190d33825113c8948b19f0b9ceac350c
-SIZE (NuxiNL-cloudabi-utils-v0.26_GH0.tar.gz) = 227599
+TIMESTAMP = 1504787087
+SHA256 (NuxiNL-cloudabi-utils-v0.30_GH0.tar.gz) = 7e1483348b322dec8ce1d31202e9d635dbfdfa3a1e46f0675b5e997aa28c0a93
+SIZE (NuxiNL-cloudabi-utils-v0.30_GH0.tar.gz) = 221541
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 47dc203ce48b..9e951acc2996 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -3,7 +3,7 @@
PORTNAME= conky
PORTVERSION= 1.10.6
-PORTREVISION= 2
+PORTREVISION= 3
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 71bd95174298..1b5cd8076262 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= consul
-PORTVERSION= 0.8.5
+PORTVERSION= 0.9.3
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
diff --git a/sysutils/consul/distinfo b/sysutils/consul/distinfo
index f3b95708f0fe..4e6adc9084c5 100644
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500310152
-SHA256 (hashicorp-consul-v0.8.5_GH0.tar.gz) = 3049ac26e6226b61af2d631d5705669cadb8bf3b0c7860e169590ce1472c6b64
-SIZE (hashicorp-consul-v0.8.5_GH0.tar.gz) = 6630059
+TIMESTAMP = 1505222411
+SHA256 (hashicorp-consul-v0.9.3_GH0.tar.gz) = 69b76432203e046a8025ce13f7cc041b2308d72f07f240a57f2ba5d580fcff70
+SIZE (hashicorp-consul-v0.9.3_GH0.tar.gz) = 7278357
diff --git a/sysutils/consul_exporter/Makefile b/sysutils/consul_exporter/Makefile
new file mode 100644
index 000000000000..139d5ae64fa9
--- /dev/null
+++ b/sysutils/consul_exporter/Makefile
@@ -0,0 +1,48 @@
+# $FreeBSD$
+
+PORTNAME= consul_exporter
+PORTVERSION= 0.3.0
+DISTVERSIONPREFIX= v
+CATEGORIES= sysutils
+
+MAINTAINER= t.tom@succont.de
+COMMENT= Exporter for Consul metrics
+
+LICENSE= APACHE20
+
+BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go
+
+USES= compiler
+
+USE_GITHUB= yes
+GH_ACCOUNT= prometheus
+GH_SUBDIR= src/github.com/${GH_ACCOUNT}/consul_exporter
+
+USE_RC_SUBR= consul_exporter
+
+PLIST_FILES= bin/consul_exporter
+
+post-extract:
+ @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/
+
+do-build:
+ @cd ${WRKSRC}/src/github.com/prometheus/consul_exporter; ${SETENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \
+ -ldflags "\
+ -X github.com/prometheus/consul_exporter/version.Version=${PORTVERSION} \
+ -X github.com/prometheus/consul_exporter/version.VersionPrerelease= \
+ -X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION} \
+ " \
+ -o bin/consul_exporter
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/prometheus/consul_exporter/bin/consul_exporter ${STAGEDIR}${PREFIX}/bin/consul_exporter
+
+.include <bsd.port.pre.mk>
+
+# golang assumes that if clang is in use, it is called "clang" and not "cc". If
+# it's called "cc", go fails.
+.if ${COMPILER_TYPE} == clang
+BUILD_ENV= CC=clang
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/consul_exporter/distinfo b/sysutils/consul_exporter/distinfo
new file mode 100644
index 000000000000..8e8cb2769716
--- /dev/null
+++ b/sysutils/consul_exporter/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504964932
+SHA256 (prometheus-consul_exporter-v0.3.0_GH0.tar.gz) = 621a7fd6f50b59d6c10f2325dafcffa95ab7b1491514c1f801485b4b037e9428
+SIZE (prometheus-consul_exporter-v0.3.0_GH0.tar.gz) = 1031879
diff --git a/sysutils/consul_exporter/files/consul_exporter.in b/sysutils/consul_exporter/files/consul_exporter.in
new file mode 100644
index 000000000000..0a460d928b35
--- /dev/null
+++ b/sysutils/consul_exporter/files/consul_exporter.in
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: consul_exporter
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# consul_exporter_enable (bool): Set to NO by default.
+# Set it to YES to enable consul exporter.
+# consul_exporter_env (string): Set environment variables used with consul exporter.
+# Default is "".
+# consul_exporter_args (string): Set flags used with consul-exporter.
+# Default is "".
+
+. /etc/rc.subr
+
+name=consul_exporter
+rcvar=consul_exporter_enable
+extra_commands="reload"
+
+load_rc_config $name
+
+: ${consul_exporter_enable:="NO"}
+: ${consul_exporter_env:=""}
+: ${consul_exporter_args:=""}
+
+pidfile=/var/run/consul_exporter.pid
+procname="%%PREFIX%%/bin/consul_exporter"
+command="/usr/sbin/daemon"
+command_args="-f -p ${pidfile} /usr/bin/env ${consul_env} ${procname} ${consul_exporter_args}"
+
+run_rc_command "$1"
diff --git a/sysutils/consul_exporter/pkg-descr b/sysutils/consul_exporter/pkg-descr
new file mode 100644
index 000000000000..cb8a5481a14f
--- /dev/null
+++ b/sysutils/consul_exporter/pkg-descr
@@ -0,0 +1,3 @@
+Export Consul service health to Prometheus.
+
+WWW: https://github.com/prometheus/consul_exporter
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index a071b68811ca..c95720017a45 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dar
PORTVERSION= 2.5.11
+PORTREVISION= 1
CATEGORIES= sysutils archivers
MASTER_SITES= SF
diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile
index 068d7aed8a40..99d685c2f18f 100644
--- a/sysutils/debhelper/Makefile
+++ b/sysutils/debhelper/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= debhelper
-PORTVERSION= 10.7.2
+PORTVERSION= 10.8
CATEGORIES= sysutils
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/debhelper/distinfo b/sysutils/debhelper/distinfo
index a800de54e46a..e239ff481f4c 100644
--- a/sysutils/debhelper/distinfo
+++ b/sysutils/debhelper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501694300
-SHA256 (debhelper_10.7.2.tar.xz) = 680d7b420f513ce26b7a2056d1be94739c19729312aa9cda6532298a1485e57b
-SIZE (debhelper_10.7.2.tar.xz) = 416368
+TIMESTAMP = 1505127774
+SHA256 (debhelper_10.8.tar.xz) = 15fd4ffa30657cffab6cd7a3aeff2429a64e9c80745e96ecdedc1360f1501ab2
+SIZE (debhelper_10.8.tar.xz) = 418392
diff --git a/sysutils/debhelper/files/patch-Makefile b/sysutils/debhelper/files/patch-Makefile
index 1214367aaed3..4a204ea91f94 100644
--- a/sysutils/debhelper/files/patch-Makefile
+++ b/sysutils/debhelper/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig 2017-06-29 19:50:57 UTC
+--- Makefile.orig 2017-09-02 15:29:54 UTC
+++ Makefile
@@ -3,7 +3,7 @@ PO4A ?= po4a
POD2MAN ?= pod2man
@@ -9,7 +9,7 @@
MANPAGES=$(COMMANDS:=.1) dh.1
# Find deprecated commands by looking at their synopsis.
-@@ -109,17 +109,16 @@ endif
+@@ -118,17 +118,16 @@ endif
done;
install:
@@ -22,16 +22,16 @@
+ $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Buildsystem
install dh $(COMMANDS) $(DESTDIR)$(PREFIX)/bin
- install -m 0644 autoscripts/* $(DESTDIR)$(PREFIX)/share/debhelper/autoscripts
-- install -m 0644 Debian/Debhelper/*.pm $(DESTDIR)$(PERLLIBDIR)
+- install -m 0644 lib/Debian/Debhelper/*.pm $(DESTDIR)$(PERLLIBDIR)
+ install -m 0644 autoscripts/* $(DESTDIR)$(PREFIX)/bin
-+ install -m 0644 Debian/Debhelper/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper
++ install -m 0644 lib/Debian/Debhelper/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper
[ "$(PREFIX)" = /usr ] || \
- sed -i '/$$prefix=/s@/usr@$(PREFIX)@g' $(DESTDIR)$(PERLLIBDIR)/Dh_Lib.pm
-- install -m 0644 Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence
-- install -m 0644 Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)$(PERLLIBDIR)/Buildsystem
+- install -m 0644 lib/Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence
+- install -m 0644 lib/Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)$(PERLLIBDIR)/Buildsystem
+ sed -i '' '/$$prefix=/s@/usr@$(PREFIX)@g' $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Dh_Lib.pm
-+ install -m 0644 Debian/Debhelper/Sequence/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Sequence
-+ install -m 0644 Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Buildsystem
++ install -m 0644 lib/Debian/Debhelper/Sequence/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Sequence
++ install -m 0644 lib/Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Buildsystem
test: version
- ./run perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ && -f && -x } @ARGV' t/* t/*/*
+ MAKEFLAGS= HARNESS_OPTIONS=j$(TEST_JOBS) ./run perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ && -f && -x && m/\.t$$/ } @ARGV' t/* t/*/*
diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile
index ff9ab6ab882b..ba2af87a4c16 100644
--- a/sysutils/dmidecode/Makefile
+++ b/sysutils/dmidecode/Makefile
@@ -21,25 +21,19 @@ MAKE_ENV= DOCSDIR="${DOCSDIR}"
USES= tar:xz
PLIST_FILES= etc/periodic/daily/dmidecode \
+ man/man8/biosdecode.8.gz \
man/man8/dmidecode.8.gz \
- sbin/dmidecode
-PORTDOCS= AUTHORS CHANGELOG README
-SUB_FILES= dmidecode
-
-post-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
- ${INSTALL_SCRIPT} ${WRKDIR}/dmidecode \
- ${STAGEDIR}${PREFIX}/etc/periodic/daily
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-PLIST_FILES+= man/man8/biosdecode.8.gz \
man/man8/ownership.8.gz \
man/man8/vpddecode.8.gz \
sbin/biosdecode \
+ sbin/dmidecode \
sbin/ownership \
sbin/vpddecode
-.endif
+PORTDOCS= AUTHORS CHANGELOG README
+SUB_FILES= dmidecode
+
+post-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily/
+ ${INSTALL_SCRIPT} ${WRKDIR}/dmidecode ${STAGEDIR}${PREFIX}/etc/periodic/daily/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/dsblogoutmgr/Makefile b/sysutils/dsblogoutmgr/Makefile
index dfafc9f38511..6c174f31fe46 100644
--- a/sysutils/dsblogoutmgr/Makefile
+++ b/sysutils/dsblogoutmgr/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= dsblogoutmgr
-PORTVERSION= 1.0.1
+PORTVERSION= 1.1
CATEGORIES= sysutils
MASTER_SITES= http://freeshell.de/~mk/download/
diff --git a/sysutils/dsblogoutmgr/distinfo b/sysutils/dsblogoutmgr/distinfo
index 5364aa710891..a2d54c414abd 100644
--- a/sysutils/dsblogoutmgr/distinfo
+++ b/sysutils/dsblogoutmgr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502054848
-SHA256 (dsblogoutmgr-1.0.1.tgz) = 8fea92340ce08ce29cc5d14185f7c01ea63446b0793e97020698294347535c3f
-SIZE (dsblogoutmgr-1.0.1.tgz) = 16199
+TIMESTAMP = 1504387170
+SHA256 (dsblogoutmgr-1.1.tgz) = c7645a4457737ddf972a937428a4096ed61a0b00e8abbfb5ad580bab2668aaa5
+SIZE (dsblogoutmgr-1.1.tgz) = 16450
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 671bea906fbf..ed6222ae691a 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= e2fsprogs
-PORTVERSION= 1.43.5
-PORTREVISION?= 1
+PORTVERSION= 1.43.6
+PORTREVISION?= 0
CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index cffc116eab11..d5683c98bc81 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502496004
-SHA256 (e2fsprogs-1.43.5.tar.xz) = 261f3d9ade383fbf032a19140c9c25e998cc0f71a1ae686614fb3ae0eb955a17
-SIZE (e2fsprogs-1.43.5.tar.xz) = 5301436
+TIMESTAMP = 1505057223
+SHA256 (e2fsprogs-1.43.6.tar.xz) = c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402
+SIZE (e2fsprogs-1.43.6.tar.xz) = 5288388
diff --git a/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c b/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c
deleted file mode 100644
index 7839d1a217cd..000000000000
--- a/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 649dbee84cf208244db7195d40e7fe57ddbea57a
-Author: Matthias Andree <matthias.andree@gmx.de>
-Date: Sun Aug 27 14:09:52 2017 +0200
-
- Always obtain alignment on FreeBSD.
-
-diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
-index 64141954..65f237ef 100644
---- ./lib/ext2fs/unix_io.c
-+++ ./lib/ext2fs/unix_io.c
-@@ -636,7 +636,7 @@ static errcode_t unix_open_channel(const char *name, int fd,
- #endif
-
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-- if (io->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
-+ {
- int dio_align = ext2fs_get_dio_alignment(fd);
-
- if (io->align < dio_align)
diff --git a/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c b/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c
deleted file mode 100644
index 527ed144b662..000000000000
--- a/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/support/mkquota.c.orig 2017-07-24 19:15:39 UTC
-+++ lib/support/mkquota.c
-@@ -10,6 +10,7 @@
- #include <errno.h>
- #include <string.h>
- #include <fcntl.h>
-+#include <inttypes.h>
-
- #include "ext2fs/ext2_fs.h"
- #include "ext2fs/ext2fs.h"
-@@ -523,8 +524,8 @@ static int scan_dquots_callback(struct d
- if (dq->dq_dqb.dqb_curspace != dquot->dq_dqb.dqb_curspace ||
- dq->dq_dqb.dqb_curinodes != dquot->dq_dqb.dqb_curinodes) {
- scan_data->usage_is_inconsistent = 1;
-- fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %u:"
-- "actual (%ld, %ld) != expected (%ld, %ld)\n",
-+ fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %" PRIu32 ":"
-+ "actual (%" PRId64 ", %" PRId64 ") != expected (%" PRId64 ", %" PRId64 ")\n",
- dq->dq_id, dq->dq_dqb.dqb_curspace,
- dq->dq_dqb.dqb_curinodes,
- dquot->dq_dqb.dqb_curspace,
diff --git a/sysutils/entr/pkg-descr b/sysutils/entr/pkg-descr
index 958d5024ae4a..402cfbeb77aa 100644
--- a/sysutils/entr/pkg-descr
+++ b/sysutils/entr/pkg-descr
@@ -1,5 +1,5 @@
The Event Notify Test Runner is a general-purpose UNIX utility intended to make
rapid feedback and automated testing natural and completely ordinary by running
-arbitrary commands when files change
+arbitrary commands when files change.
WWW: http://entrproject.org/
diff --git a/sysutils/eventlog/Makefile b/sysutils/eventlog/Makefile
index a58532538445..28eb71bdda17 100644
--- a/sysutils/eventlog/Makefile
+++ b/sysutils/eventlog/Makefile
@@ -11,6 +11,10 @@ DISTFILES= ${PORTNAME}_${PORTVERSION}.tar.gz
MAINTAINER= cy@FreeBSD.org
COMMENT= Replacement of the simple syslog() API providing structure to messages
+# Reminder: Retire this port sysutils/syslog-ng310 is retired.
+# syslog-ng311 and subsequent ports make use of a private copy of
+# eventlog. sysutils/syslog-ng* is this port's only consumer.
+
GNU_CONFIGURE= yes
USES= libtool pathfix pkgconfig
USE_LDCONFIG= yes
diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile
index e68bf1cb8d81..20a913e03766 100644
--- a/sysutils/facter/Makefile
+++ b/sysutils/facter/Makefile
@@ -2,7 +2,7 @@
PORTNAME= facter
PORTVERSION= 3.8.0
-PORTREVISION?= 0
+PORTREVISION?= 2
CATEGORIES?= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/facter/
diff --git a/sysutils/fcron/pkg-descr b/sysutils/fcron/pkg-descr
index b5b3c6bd8c83..cb7ebbb0fe39 100644
--- a/sysutils/fcron/pkg-descr
+++ b/sysutils/fcron/pkg-descr
@@ -1,12 +1,12 @@
Fcron is a scheduler. It aims at replacing Vixie Cron, so it
implements most of its functionalities. But contrary to Vixie Cron,
fcron does not need your system to be up 7 days a week, 24 hours a
-day : it also works well with systems which are not running neither
+day: it also works well with systems which are not running neither
all the time nor regularly (contrary to anacrontab). To do so, fcron
allows you to use the standard mode in which you tell it to execute
one command at a given date and hour and to make it run a command
according to its time of execution, which is normally the same as
-system up time.
+system uptime.
This is the stable release.
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index ad530e1a66ff..8af622d79bc8 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= file
-PORTVERSION= 5.29
+PORTVERSION= 5.32
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.astron.com/pub/file/ \
ftp://ftp.fu-berlin.de/unix/tools/file/
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
index 95ff071fa959..a19738b22638 100644
--- a/sysutils/file/distinfo
+++ b/sysutils/file/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477544946
-SHA256 (file-5.29.tar.gz) = ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0
-SIZE (file-5.29.tar.gz) = 783919
+TIMESTAMP = 1505166042
+SHA256 (file-5.32.tar.gz) = 8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50
+SIZE (file-5.32.tar.gz) = 797025
diff --git a/sysutils/freefilesync/Makefile b/sysutils/freefilesync/Makefile
index 2f2b34024bdc..e05a6827253f 100644
--- a/sysutils/freefilesync/Makefile
+++ b/sysutils/freefilesync/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freefilesync
PORTVERSION= 8.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= https://www.freefilesync.org/download/ \
https://www.freefilesync.org/archive/
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index c6649b33749b..3813de6cd413 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= encfs
PORTVERSION= 1.9.2
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
PKGNAMEPREFIX= fusefs-
diff --git a/sysutils/fusefs-exfat/pkg-descr b/sysutils/fusefs-exfat/pkg-descr
index 859c7087241f..0e3f4d7eb60f 100644
--- a/sysutils/fusefs-exfat/pkg-descr
+++ b/sysutils/fusefs-exfat/pkg-descr
@@ -1,6 +1,6 @@
exfat-fuse is a free exFAT file system implementation with write support.
exFAT is a simple file system created by Microsoft. It is intended to
-replace FAT32 removing some of it's limitations. exFAT is a standard FS for
+replace FAT32 removing some of its limitations. exFAT is a standard FS for
SDXC memory cards.
WWW: https://github.com/relan/exfat
diff --git a/sysutils/fusefs-lkl/Makefile b/sysutils/fusefs-lkl/Makefile
index 3de07efe7176..37b3d2b91f8a 100644
--- a/sysutils/fusefs-lkl/Makefile
+++ b/sysutils/fusefs-lkl/Makefile
@@ -4,7 +4,7 @@
PORTNAME= lkl
DISTVERSIONPREFIX= v
DISTVERSION= 4.8-493
-PORTREVISION= 2
+PORTREVISION= 3
DISTVERSIONSUFFIX= -g4b77c32b1a88
CATEGORIES= sysutils
PKGNAMEPREFIX= fusefs-
diff --git a/sysutils/fusefs-simple-mtpfs/Makefile b/sysutils/fusefs-simple-mtpfs/Makefile
index 08c3916d0e37..f1b441b7eb39 100644
--- a/sysutils/fusefs-simple-mtpfs/Makefile
+++ b/sysutils/fusefs-simple-mtpfs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= simple-mtpfs
DISTVERSIONPREFIX= ${PORTNAME}-
DISTVERSION= 0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
PKGNAMEPREFIX= fusefs-
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 8e816c836364..cf9e19f3fd2f 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -10,15 +10,15 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Power management system for the GNOME Desktop
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
+#LICENSE= GPLv2+
+#LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= appstream-builder:devel/appstream-glib
LIB_DEPENDS= libupower-glib.so:sysutils/upower
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
+USES= gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig tar:xz
INSTALLS_ICONS= yes
USE_GNOME= cairo gtk30 intlhack
GNU_CONFIGURE= yes
@@ -28,19 +28,13 @@ CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \
GLIB_SCHEMAS= org.gnome.power-manager.gschema.xml
OPTIONS_DEFINE= MANPAGES
+OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
+MANPAGES_BUILD_DEPENDS= docbook2html:textproc/docbook-utils \
+ docbook-sgml>0:textproc/docbook-sgml
-.if ${PORT_OPTIONS:MMANPAGES} || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+= docbook2html:textproc/docbook-utils \
- docbook-sgml>0:textproc/docbook-sgml
-PLIST_SUB+= MAN=""
-.else
-PLIST_SUB+= MAN="@comment "
-
-post-patch:
+post-patch-MANPAGES-off:
@${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
-.endif
.include <bsd.port.mk>
diff --git a/sysutils/gnome-power-manager/pkg-descr b/sysutils/gnome-power-manager/pkg-descr
index 186c9ced498f..bf75914f2135 100644
--- a/sysutils/gnome-power-manager/pkg-descr
+++ b/sysutils/gnome-power-manager/pkg-descr
@@ -4,4 +4,4 @@ for HAL events and responds with user-configurable reactions.
Currently it supports laptop batteries and AC adapters. Its goal is to be
architecture neutral and free of polling and other hacks.
-WWW: http://projects.gnome.org/gnome-power-manager/
+WWW: https://projects.gnome.org/gnome-power-manager/
diff --git a/sysutils/grub2-bhyve/Makefile b/sysutils/grub2-bhyve/Makefile
index 7a3b646cc7ae..642c5643078a 100644
--- a/sysutils/grub2-bhyve/Makefile
+++ b/sysutils/grub2-bhyve/Makefile
@@ -4,7 +4,7 @@
PORTNAME= grub2-bhyve
DISTVERSIONPREFIX= v
DISTVERSION= 0.40
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MAINTAINER= kmoore@FreeBSD.org
diff --git a/sysutils/grub2-efi/Makefile b/sysutils/grub2-efi/Makefile
index dda392a10158..d3d1ca3d5374 100644
--- a/sysutils/grub2-efi/Makefile
+++ b/sysutils/grub2-efi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= grub2-efi
PORTVERSION= 2.02
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= sysutils
MASTER_SITES= http://www.pcbsd.org/~kris/software/ \
ftp://ftp.pcbsd.org/pub/software/
diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index 857172e58057..a0919942196c 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= grub2-pcbsd
PORTVERSION= 2.02q
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= sysutils
MASTER_SITES= http://www.pcbsd.org/~kris/software/ \
ftp://ftp.pcbsd.org/pub/software/
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 5ae82af92c2f..e23c262420ff 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= grub2
PORTVERSION= 2.00
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils
MASTER_SITES= GNU/grub
DISTNAME= grub-${PORTVERSION}
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index 90b7ee146f15..076ff82e506f 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gsmartcontrol
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
diff --git a/sysutils/hfm/Makefile b/sysutils/hfm/Makefile
index 129c00559437..5f85c2518f8e 100644
--- a/sysutils/hfm/Makefile
+++ b/sysutils/hfm/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hfm
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
diff --git a/sysutils/immortal/Makefile b/sysutils/immortal/Makefile
index aaff470e6eca..49a413196c3a 100644
--- a/sysutils/immortal/Makefile
+++ b/sysutils/immortal/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= immortal
-PORTVERSION= 0.15.0
+PORTVERSION= 0.16.0
CATEGORIES= sysutils
MAINTAINER= nbari@tequila.io
@@ -18,7 +18,7 @@ GH_TUPLE= immortal:logrotate:8591051:logrotate/src/github.com/immortal/logrotate
immortal:natcasesort:69368b7:natcasesort/src/github.com/immortal/natcasesort \
immortal:xtime:fb1aca1:xtime/src/github.com/immortal/xtime \
nbari:violetear:13cb9a6:nbari/src/github.com/nbari/violetear \
- go-yaml:yaml:25c4ec8:yaml/src/github.com/go-yaml/yaml
+ go-yaml:yaml:eb3733d:yaml/src/github.com/go-yaml/yaml
GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME}
do-build:
diff --git a/sysutils/immortal/distinfo b/sysutils/immortal/distinfo
index 24ae6abf0189..d8137b3da4a8 100644
--- a/sysutils/immortal/distinfo
+++ b/sysutils/immortal/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1501619151
-SHA256 (immortal-immortal-0.15.0_GH0.tar.gz) = bf0fa8f16f8045211a43f42001ed685959a28427a970f50db79c1a9176603b7b
-SIZE (immortal-immortal-0.15.0_GH0.tar.gz) = 32997
+TIMESTAMP = 1504985741
+SHA256 (immortal-immortal-0.16.0_GH0.tar.gz) = b540882641b904be956ac0cf3a4a9cda9c5ea709c24b68c77c3f08a1a13272b6
+SIZE (immortal-immortal-0.16.0_GH0.tar.gz) = 33521
SHA256 (immortal-logrotate-8591051_GH0.tar.gz) = c1b3b669c8dc2def4291b0798a6776b06e03d0543c8181ba09191e9a3cb1b97e
SIZE (immortal-logrotate-8591051_GH0.tar.gz) = 3786
SHA256 (immortal-multiwriter-2555774_GH0.tar.gz) = 0988932d02debf79c7928e307a812027b642da7e5cad8846604577ed56220d57
@@ -11,5 +11,5 @@ SHA256 (immortal-xtime-fb1aca1_GH0.tar.gz) = b6d7b321e2feca0ec66d19e4b2feea0be88
SIZE (immortal-xtime-fb1aca1_GH0.tar.gz) = 1104
SHA256 (nbari-violetear-13cb9a6_GH0.tar.gz) = 4b80699dada4bfbe6058fc76ff11b94588a8f736d91ca200c28fa723cc3de8e3
SIZE (nbari-violetear-13cb9a6_GH0.tar.gz) = 16387
-SHA256 (go-yaml-yaml-25c4ec8_GH0.tar.gz) = dc5116c179734068aab4a7047655051756b75b0b4d92106bd9c9016dd3683e52
-SIZE (go-yaml-yaml-25c4ec8_GH0.tar.gz) = 61310
+SHA256 (go-yaml-yaml-eb3733d_GH0.tar.gz) = d2ae44f0e31f3a13a1b89a55ceaabcbab4d588d41951fd2243739b60b10146bb
+SIZE (go-yaml-yaml-eb3733d_GH0.tar.gz) = 64686
diff --git a/sysutils/ipdbtools/Makefile b/sysutils/ipdbtools/Makefile
index 4d557b033235..902c3e1afbc0 100644
--- a/sysutils/ipdbtools/Makefile
+++ b/sysutils/ipdbtools/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ipdbtools
PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://cyclaero.com/public/ipdbtools/
diff --git a/sysutils/kf5-baloo/Makefile b/sysutils/kf5-baloo/Makefile
index 0a2a6f40a9cc..9d5ae60b1e81 100644
--- a/sysutils/kf5-baloo/Makefile
+++ b/sysutils/kf5-baloo/Makefile
@@ -3,6 +3,7 @@
PORTNAME= baloo
PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/sysutils/kf5-kwallet/Makefile b/sysutils/kf5-kwallet/Makefile
index 079626ca10ae..5f0cea4466a4 100644
--- a/sysutils/kf5-kwallet/Makefile
+++ b/sysutils/kf5-kwallet/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kwallet
PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index d3c7949f257f..f246d9fd6d90 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kshutdown
DISTVERSION= 4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils kde
MASTER_SITES= SF/${PORTNAME}/KShutdown/${DISTVERSION}/
DISTNAME= ${PORTNAME}-source-${DISTVERSION}
diff --git a/sysutils/libretto-config/Makefile b/sysutils/libretto-config/Makefile
index 3709bf8346fd..024d90cc8087 100644
--- a/sysutils/libretto-config/Makefile
+++ b/sysutils/libretto-config/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libretto-config
PORTVERSION= 1.0.b5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://club.pep.ne.jp/~ishioka/Software/Linux/libapm/
DISTNAME= libapm-linux-1.0beta5
diff --git a/sysutils/lnav/Makefile b/sysutils/lnav/Makefile
index 0c67682a00a8..dacdde161681 100644
--- a/sysutils/lnav/Makefile
+++ b/sysutils/lnav/Makefile
@@ -4,7 +4,7 @@
PORTNAME= lnav
PORTVERSION= 0.8.2
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= tom@hur.st
diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile
index d9b22d1ca326..6f0a14bcfaae 100644
--- a/sysutils/logstalgia/Makefile
+++ b/sysutils/logstalgia/Makefile
@@ -3,7 +3,7 @@
PORTNAME= logstalgia
PORTVERSION= 1.0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils www
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 3a156626b4a9..29bd2c387504 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= lsof
-DISTVERSION= 4.90M
+DISTVERSION= 4.90P
PORTEPOCH= 8
CATEGORIES= sysutils
MASTER_SITES= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index 4a9e44b258dd..52e75384d9f3 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497206529
-SHA256 (lsof_4.90M.freebsd.tar.bz2) = 629c4652e94ca1fff1eeb2a5c6c42126efab6a75978daf07f69af569ae4376eb
-SIZE (lsof_4.90M.freebsd.tar.bz2) = 488695
+TIMESTAMP = 1505085809
+SHA256 (lsof_4.90P.freebsd.tar.bz2) = 5a8f70036c3059b1c403d675d5e2641e8493cc4bf77f61893bde6e0fd3ada3b6
+SIZE (lsof_4.90P.freebsd.tar.bz2) = 488892
diff --git a/sysutils/mate-system-monitor/Makefile b/sysutils/mate-system-monitor/Makefile
index a1f5b688d8f9..def168ab817e 100644
--- a/sysutils/mate-system-monitor/Makefile
+++ b/sysutils/mate-system-monitor/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mate-system-monitor
PORTVERSION= 1.18.0
+PORTREVISION= 1
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/sysutils/memtest86+/Makefile b/sysutils/memtest86+/Makefile
index abad2803efd7..e12ea6bc408f 100644
--- a/sysutils/memtest86+/Makefile
+++ b/sysutils/memtest86+/Makefile
@@ -3,6 +3,7 @@
PORTNAME= memtest86+
PORTVERSION= 5.01
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.memtest.org/download/${PORTVERSION}/
diff --git a/sysutils/n98-magerun/Makefile b/sysutils/n98-magerun/Makefile
index f64d91664bf9..bb70f6e832c2 100644
--- a/sysutils/n98-magerun/Makefile
+++ b/sysutils/n98-magerun/Makefile
@@ -2,25 +2,31 @@
# $FreeBSD$
PORTNAME= n98-magerun
-PORTVERSION= 1.97.12
+PORTVERSION= 1.98.0
CATEGORIES= sysutils www
+MASTER_SITES= https://files.magerun.net/ \
+ https://www.freebsd.systems/files/
+EXTRACT_SUFX= .phar
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= lukasz@wasikowski.net
COMMENT= CLI tool for inspection and control of Magento installations
LICENSE= MIT
+USES= mysql:client php:cli
USE_PHP= phar bz2 simplexml pdo_mysql json zlib ctype dom posix
-USE_MYSQL= client
-USE_GITHUB= yes
-GH_ACCOUNT= netz98
+NO_ARCH= yes
NO_BUILD= yes
PLIST_FILES= sbin/n98-magerun
+do-extract:
+ @${MKDIR} ${WRKSRC}/
+ ${CP} ${_DISTDIR}/${PORTNAME}-${PORTVERSION}.phar ${WRKSRC}/
+
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.phar \
+ ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.phar \
${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
.include <bsd.port.mk>
diff --git a/sysutils/n98-magerun/distinfo b/sysutils/n98-magerun/distinfo
index 7aa3b99dd5ec..1852c0d92478 100644
--- a/sysutils/n98-magerun/distinfo
+++ b/sysutils/n98-magerun/distinfo
@@ -1,2 +1,3 @@
-SHA256 (netz98-n98-magerun-1.97.12_GH0.tar.gz) = 5fbfa0689855ecdb70592be7f3372b2f51da12457d1cb555a5a1685a07b88c05
-SIZE (netz98-n98-magerun-1.97.12_GH0.tar.gz) = 3320246
+TIMESTAMP = 1504129688
+SHA256 (n98-magerun-1.98.0.phar) = 4e48652f347a48e9b323a0b042d0a97ce1f9ffb7ff48104a9143be217cb8fe63
+SIZE (n98-magerun-1.98.0.phar) = 4611275
diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index d1edfc0e1c5b..ab16176f3103 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nitrogen
PORTVERSION= 1.5.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://projects.l3ib.org/nitrogen/files/
diff --git a/sysutils/nomad/pkg-descr b/sysutils/nomad/pkg-descr
index f1e8d36becf5..f00384935a9e 100644
--- a/sysutils/nomad/pkg-descr
+++ b/sysutils/nomad/pkg-descr
@@ -1,4 +1,4 @@
-Nomad is a cluster manager and schedular that provides a common workflow
+Nomad is a cluster manager and scheduler that provides a common workflow
to deploy applications across an infrastructure. Deploy virtualized,
containerized, or standalone application workloads across a fleet of
servers to maximize resource utilization.
diff --git a/sysutils/ori/Makefile b/sysutils/ori/Makefile
index 66634fa545b8..87c8c7e79981 100644
--- a/sysutils/ori/Makefile
+++ b/sysutils/ori/Makefile
@@ -3,17 +3,20 @@
PORTNAME= ori
PORTVERSION= 0.8.1
-PORTREVISION= 8
+PORTREVISION= 10
CATEGORIES= sysutils net
MASTER_SITES= http://cdn.bitbucket.org/orifs/ori/downloads/
+PATCH_SITES= https://bitbucket.org/orifs/ori/commits/
+PATCHFILES= 48862f2477b1/raw:-p1
+
MAINTAINER= mashti@cs.stanford.edu
COMMENT= Ori distributed file system
LIB_DEPENDS= libevent.so:devel/libevent \
libboost_date_time.so:devel/boost-libs
-USES= execinfo fuse pkgconfig scons ssl tar:xz
+USES= compiler:c++11-lib execinfo fuse pkgconfig scons ssl tar:xz
CPPFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB} -lcrypto
MAKE_ARGS= VERBOSE=1
diff --git a/sysutils/ori/distinfo b/sysutils/ori/distinfo
index 7a797c94b2e7..9fb4bfda5d0c 100644
--- a/sysutils/ori/distinfo
+++ b/sysutils/ori/distinfo
@@ -1,2 +1,4 @@
SHA256 (ori-0.8.1.tar.xz) = 8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca
SIZE (ori-0.8.1.tar.xz) = 296216
+SHA256 (48862f2477b1/raw) = ddb9ddaf155d2cb4aa611cee2c0875bd22d4a70c342b2f22a62372cd1cfd3491
+SIZE (48862f2477b1/raw) = 33199
diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile
index c613962cdb12..1e6c8f21ef23 100644
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@@ -3,6 +3,7 @@
PORTNAME= osquery
PORTVERSION= 2.7.0
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= zi@FreeBSD.org
diff --git a/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a b/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a
new file mode 100644
index 000000000000..5bd5ca6e6d83
--- /dev/null
+++ b/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a
@@ -0,0 +1,22 @@
+diff --git a/osquery/tables/networking/freebsd/routes.cpp b/osquery/tables/networking/freebsd/routes.cpp
+index 991564caf..fd7a878fa 100644
+--- osquery/tables/networking/freebsd/routes.cpp
++++ osquery/tables/networking/freebsd/routes.cpp
+@@ -18,7 +18,6 @@
+
+ #include <arpa/inet.h>
+ #include <net/if_dl.h>
+-#include <net/route.h>
+ #include <sys/sysctl.h>
+
+ #include <boost/algorithm/string/trim.hpp>
+@@ -27,6 +26,9 @@
+ #include <osquery/logger.h>
+ #include <osquery/tables.h>
+
++// Include belongs here to fix build on older fbsds.
++#include <net/route.h>
++
+ #include "osquery/tables/networking/utils.h"
+
+ namespace osquery {
diff --git a/sysutils/p5-File-Which/Makefile b/sysutils/p5-File-Which/Makefile
index d02891eb2558..444f8d3092ec 100644
--- a/sysutils/p5-File-Which/Makefile
+++ b/sysutils/p5-File-Which/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= File-Which
-PORTVERSION= 1.21
+PORTVERSION= 1.22
CATEGORIES= sysutils perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -12,7 +12,9 @@ COMMENT= Portable implementation of which(1) in Perl
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
+LICENSE_FILE= ${WRKSRC}/LICENSE
+NO_ARCH= yes
USES= perl5
USE_PERL5= configure
diff --git a/sysutils/p5-File-Which/distinfo b/sysutils/p5-File-Which/distinfo
index 109c881822fa..ec77ababd79b 100644
--- a/sysutils/p5-File-Which/distinfo
+++ b/sysutils/p5-File-Which/distinfo
@@ -1,2 +1,3 @@
-SHA256 (File-Which-1.21.tar.gz) = 9def5f10316bfd944e56b7f8a2501be1d44c288325309462aa9345e340854bcc
-SIZE (File-Which-1.21.tar.gz) = 21456
+TIMESTAMP = 1505043429
+SHA256 (File-Which-1.22.tar.gz) = e8a8ffcf96868c6879e82645db4ff9ef00c2d8a286fed21971e7280f52cf0dd4
+SIZE (File-Which-1.22.tar.gz) = 21685
diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile
index 1f6c7ffb7ffe..a211d8826ea4 100644
--- a/sysutils/packer/Makefile
+++ b/sysutils/packer/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= packer
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
diff --git a/sysutils/packer/distinfo b/sysutils/packer/distinfo
index 382691dc978b..bca111c28027 100644
--- a/sysutils/packer/distinfo
+++ b/sysutils/packer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502550554
-SHA256 (hashicorp-packer-v1.0.4_GH0.tar.gz) = a6066db69cc73f1abef3cd282b2b274a27b380b205991f94e28a4ed02fc5475d
-SIZE (hashicorp-packer-v1.0.4_GH0.tar.gz) = 4185993
+TIMESTAMP = 1505310429
+SHA256 (hashicorp-packer-v1.1.0_GH0.tar.gz) = 01a6b3e3047f0119c6d6f890d44a1e656fb0fcceb26de67e6ba00a40b7aeca99
+SIZE (hashicorp-packer-v1.1.0_GH0.tar.gz) = 5877463
diff --git a/sysutils/parafly/Makefile b/sysutils/parafly/Makefile
index c198a271d8da..11a238280037 100644
--- a/sysutils/parafly/Makefile
+++ b/sysutils/parafly/Makefile
@@ -3,7 +3,7 @@
PORTNAME= parafly
PORTVERSION= 2013.01.21
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/
DISTNAME= ${PORTNAME}-r2013-01-21
diff --git a/sysutils/pesign/Makefile b/sysutils/pesign/Makefile
index 621530c5a2a6..ca9edea6c1d0 100644
--- a/sysutils/pesign/Makefile
+++ b/sysutils/pesign/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pesign
PORTVERSION= 0.110
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/powerdxx/Makefile b/sysutils/powerdxx/Makefile
index 2d86aa8b0906..32656a966e5c 100644
--- a/sysutils/powerdxx/Makefile
+++ b/sysutils/powerdxx/Makefile
@@ -2,6 +2,7 @@
PORTNAME= powerdxx
PORTVERSION= 0.2.5
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= kami@FreeBSD.org
diff --git a/sysutils/puppet-mode.el/Makefile b/sysutils/puppet-mode.el/Makefile
index 32465346b79e..f323978d634a 100644
--- a/sysutils/puppet-mode.el/Makefile
+++ b/sysutils/puppet-mode.el/Makefile
@@ -3,7 +3,7 @@
PORTNAME= puppet-mode.el
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils elisp
MAINTAINER= demon@FreeBSD.org
diff --git a/sysutils/puppet4/Makefile b/sysutils/puppet4/Makefile
index 593a51753029..c8a726c69238 100644
--- a/sysutils/puppet4/Makefile
+++ b/sysutils/puppet4/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= puppet
-PORTVERSION= 4.10.6
+PORTVERSION= 4.10.7
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 4
diff --git a/sysutils/puppet4/distinfo b/sysutils/puppet4/distinfo
index 563b49154dd9..77e7df6035c1 100644
--- a/sysutils/puppet4/distinfo
+++ b/sysutils/puppet4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502442267
-SHA256 (puppet-4.10.6.tar.gz) = 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a
-SIZE (puppet-4.10.6.tar.gz) = 2977099
+TIMESTAMP = 1504857490
+SHA256 (puppet-4.10.7.tar.gz) = 1c99b9362018ee2c64db33fbe7b78a937c4dbfcad6a2101a689f859b0c773324
+SIZE (puppet-4.10.7.tar.gz) = 2979420
diff --git a/sysutils/py-glances/Makefile b/sysutils/py-glances/Makefile
index 45a8763bed94..1e6a62b2aab9 100644
--- a/sysutils/py-glances/Makefile
+++ b/sysutils/py-glances/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= glances
-PORTVERSION= 2.9.1
+PORTVERSION= 2.11.1
DISTVERSIONPREFIX= v
CATEGORIES= sysutils python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-glances/distinfo b/sysutils/py-glances/distinfo
index dab4f1ef7607..53f7a0de02a9 100644
--- a/sysutils/py-glances/distinfo
+++ b/sysutils/py-glances/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494207254
-SHA256 (nicolargo-glances-v2.9.1_GH0.tar.gz) = f661554a38101b84a4e3eb6980971a4e161e63ddf5eca68df6ee8b4576100985
-SIZE (nicolargo-glances-v2.9.1_GH0.tar.gz) = 5656182
+TIMESTAMP = 1505049971
+SHA256 (nicolargo-glances-v2.11.1_GH0.tar.gz) = 446a0ee6e13c0c7ceb4bc0d4868add8a02d5e3ff866de8e880bdb33dce6ab3fc
+SIZE (nicolargo-glances-v2.11.1_GH0.tar.gz) = 5677693
diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile
index 0d417e6a5f42..46bf83853cc8 100644
--- a/sysutils/py-psutil/Makefile
+++ b/sysutils/py-psutil/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= psutil
-PORTVERSION= 5.3.0
+PORTVERSION= 5.3.1
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-psutil/distinfo b/sysutils/py-psutil/distinfo
index da6a82a4f43b..9ba700f10d04 100644
--- a/sysutils/py-psutil/distinfo
+++ b/sysutils/py-psutil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504355550
-SHA256 (psutil-5.3.0.tar.gz) = a3940e06e92c84ab6e82b95dad056241beea93c3c9b1d07ddf96485079855185
-SIZE (psutil-5.3.0.tar.gz) = 397265
+TIMESTAMP = 1505043420
+SHA256 (psutil-5.3.1.tar.gz) = 12dd9c8abbad15f055e9579130035b38617020ce176f4a498b7870e6321ffa67
+SIZE (psutil-5.3.1.tar.gz) = 397075
diff --git a/sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c b/sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c
deleted file mode 100644
index b96ef2f07dd8..000000000000
--- a/sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- psutil/arch/freebsd/proc_socks.c.orig 2017-08-03 16:14:27 UTC
-+++ psutil/arch/freebsd/proc_socks.c
-@@ -136,7 +136,11 @@ psutil_search_tcplist(char *buf, struct
- if (kif->kf_sock_domain == AF_INET) {
- if (!psutil_sockaddr_matches(
- AF_INET, inp->inp_lport, &inp->inp_laddr,
-+#if __FreeBSD_version >= 1200031
-+ &kif->kf_un.kf_sock.kf_sa_local))
-+#else
- &kif->kf_sa_local))
-+#endif
- continue;
- if (!psutil_sockaddr_matches(
- AF_INET, inp->inp_fport, &inp->inp_faddr,
-@@ -145,7 +149,11 @@ psutil_search_tcplist(char *buf, struct
- } else {
- if (!psutil_sockaddr_matches(
- AF_INET6, inp->inp_lport, &inp->in6p_laddr,
-+#if __FreeBSD_version >= 1200031
-+ &kif->kf_un.kf_sock.kf_sa_local))
-+#else
- &kif->kf_sa_local))
-+#endif
- continue;
- if (!psutil_sockaddr_matches(
- AF_INET6, inp->inp_fport, &inp->in6p_faddr,
-@@ -243,7 +251,11 @@ psutil_proc_connections(PyObject *self,
- inet_ntop(
- kif->kf_sock_domain,
- psutil_sockaddr_addr(kif->kf_sock_domain,
-+#if __FreeBSD_version >= 1200031
-+ &kif->kf_un.kf_sock.kf_sa_local),
-+#else
- &kif->kf_sa_local),
-+#endif
- lip,
- sizeof(lip));
- inet_ntop(
-@@ -253,7 +265,11 @@ psutil_proc_connections(PyObject *self,
- rip,
- sizeof(rip));
- lport = htons(psutil_sockaddr_port(kif->kf_sock_domain,
-+#if __FreeBSD_version >= 1200031
-+ &kif->kf_un.kf_sock.kf_sa_local));
-+#else
- &kif->kf_sa_local));
-+#endif
- rport = htons(psutil_sockaddr_port(kif->kf_sock_domain,
- &kif->kf_sa_peer));
-
-@@ -287,7 +303,11 @@ psutil_proc_connections(PyObject *self,
- else if (kif->kf_sock_domain == AF_UNIX) {
- struct sockaddr_un *sun;
-
-+#if __FreeBSD_version >= 1200031
-+ sun = (struct sockaddr_un *)&kif->kf_un.kf_sock.kf_sa_local;
-+#else
- sun = (struct sockaddr_un *)&kif->kf_sa_local;
-+#endif
- snprintf(
- path, sizeof(path), "%.*s",
- (int)(sun->sun_len - (sizeof(*sun) - sizeof(sun->sun_path))),
diff --git a/sysutils/rinse/pkg-descr b/sysutils/rinse/pkg-descr
index 6a51e44219b8..bbe8644ba987 100644
--- a/sysutils/rinse/pkg-descr
+++ b/sysutils/rinse/pkg-descr
@@ -2,12 +2,12 @@ Rinse is a simple tool which is designed to carry out the installation
of a new RPM-based distribution.
Using rinse you can easily setup simple chroot() systems running
-different RPM-based distributions, such as Centos, Scientific Linux or
+different RPM-based distributions, such as CentOS, Scientific Linux or
openSUSE.
The purpose and usage are analogous to the 'debootstrap' utility
familiar to users of Debian GNU/Linux. It was primarily designed to
work with the xen-tools software, which creates new guest images for
-running inder the Xen hypervisor.
+running under the Xen hypervisor.
WWW: http://collab-maint.alioth.debian.org/rinse/
diff --git a/sysutils/rubygem-capistrano/Makefile b/sysutils/rubygem-capistrano/Makefile
index 24fb40353e4b..5fc0324aa8a9 100644
--- a/sysutils/rubygem-capistrano/Makefile
+++ b/sysutils/rubygem-capistrano/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= capistrano
-PORTVERSION= 3.9.0
+PORTVERSION= 3.9.1
CATEGORIES= sysutils rubygems
MASTER_SITES= RG
diff --git a/sysutils/rubygem-capistrano/distinfo b/sysutils/rubygem-capistrano/distinfo
index 9d3ae8ff4dcd..55a2de25c24b 100644
--- a/sysutils/rubygem-capistrano/distinfo
+++ b/sysutils/rubygem-capistrano/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501325095
-SHA256 (rubygem/capistrano-3.9.0.gem) = e1e9463ee478a0ad2ddbdfd7a782447d86703a495666a8bf63ee00829ccef636
-SIZE (rubygem/capistrano-3.9.0.gem) = 76800
+TIMESTAMP = 1504948362
+SHA256 (rubygem/capistrano-3.9.1.gem) = 38bc88eeab067e78af9f77b03b436083b1fdefd06930a9a2208519a14f2c0587
+SIZE (rubygem/capistrano-3.9.1.gem) = 77312
diff --git a/sysutils/rubygem-hiera/Makefile b/sysutils/rubygem-hiera/Makefile
index 9ed201aaab9d..4458d2d0f00c 100644
--- a/sysutils/rubygem-hiera/Makefile
+++ b/sysutils/rubygem-hiera/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hiera
-PORTVERSION= 3.4.0
+PORTVERSION= 3.4.1
CATEGORIES= sysutils rubygems
MASTER_SITES= RG
diff --git a/sysutils/rubygem-hiera/distinfo b/sysutils/rubygem-hiera/distinfo
index f4d74b2b141d..170e5f02c042 100644
--- a/sysutils/rubygem-hiera/distinfo
+++ b/sysutils/rubygem-hiera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498655137
-SHA256 (rubygem/hiera-3.4.0.gem) = 9d036ccd8a45594ebbb5cdc0dd79a8ff5a3a52c3c276943126f18149af302459
-SIZE (rubygem/hiera-3.4.0.gem) = 40960
+TIMESTAMP = 1505424347
+SHA256 (rubygem/hiera-3.4.1.gem) = dafd7497d62dede5bc96f3ed986479f4989a54a19b45120fb87c6b4c2a0507e3
+SIZE (rubygem/hiera-3.4.1.gem) = 41472
diff --git a/sysutils/rubygem-hiera/pkg-descr b/sysutils/rubygem-hiera/pkg-descr
index 798c23e5ab30..7e273e81b941 100644
--- a/sysutils/rubygem-hiera/pkg-descr
+++ b/sysutils/rubygem-hiera/pkg-descr
@@ -1,4 +1,4 @@
Hiera is a pluggable (YAML, JSON, Puppet) hierarchical database for
storing infrastructure representation data.
-WWW: http://projects.puppetlabs.com/projects/hiera
+WWW: https://github.com/puppetlabs/hiera
diff --git a/sysutils/rubygem-hiera1/pkg-descr b/sysutils/rubygem-hiera1/pkg-descr
index 798c23e5ab30..7e273e81b941 100644
--- a/sysutils/rubygem-hiera1/pkg-descr
+++ b/sysutils/rubygem-hiera1/pkg-descr
@@ -1,4 +1,4 @@
Hiera is a pluggable (YAML, JSON, Puppet) hierarchical database for
storing infrastructure representation data.
-WWW: http://projects.puppetlabs.com/projects/hiera
+WWW: https://github.com/puppetlabs/hiera
diff --git a/sysutils/shim/Makefile b/sysutils/shim/Makefile
index 6e9c7767eeef..edb69dfd09a3 100644
--- a/sysutils/shim/Makefile
+++ b/sysutils/shim/Makefile
@@ -3,7 +3,7 @@
PORTNAME= shim
PORTVERSION= 0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/spiped/Makefile b/sysutils/spiped/Makefile
index 3e9dd6f14803..b523ae9cfa02 100644
--- a/sysutils/spiped/Makefile
+++ b/sysutils/spiped/Makefile
@@ -2,6 +2,7 @@
PORTNAME= spiped
PORTVERSION= 1.6.0
+PORTREVISION= 1
CATEGORIES= sysutils security
MASTER_SITES= http://www.tarsnap.com/spiped/
diff --git a/sysutils/syslog-ng311/Makefile b/sysutils/syslog-ng311/Makefile
index a2ede2d5f648..759c5969491c 100644
--- a/sysutils/syslog-ng311/Makefile
+++ b/sysutils/syslog-ng311/Makefile
@@ -3,18 +3,20 @@
PORTNAME= syslog-ng
DISTVERSION= 3.11.1
+PORTREVISION= 1
CATEGORIES= sysutils
DISTFILES= syslog-ng-${DISTVERSION}.tar.gz
MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
+.if !defined(MASTERDIR)
PKGNAMESUFFIX= 311
+.endif
MAINTAINER= cy@FreeBSD.org
COMMENT= Powerful syslogd replacement
LIB_DEPENDS= libpcre.so:devel/pcre \
libuuid.so:misc/e2fsprogs-libuuid \
- libbson-1.0.so:devel/libbson \
- libevtlog.so:sysutils/eventlog
+ libbson-1.0.so:devel/libbson
BROKEN_powerpc64= fails to link: Internal error: Segmentation fault (program ld)
BROKEN_sparc64= fails to link: Internal error: Segmentation fault (program ld)
diff --git a/sysutils/tarsnap-gui/Makefile b/sysutils/tarsnap-gui/Makefile
index 5a988c1648c8..d229d6f2477d 100644
--- a/sysutils/tarsnap-gui/Makefile
+++ b/sysutils/tarsnap-gui/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tarsnap-gui
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile
index 07c309b10b01..83c0d0abca38 100644
--- a/sysutils/terraform/Makefile
+++ b/sysutils/terraform/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= terraform
-PORTVERSION= 0.10.3
+PORTVERSION= 0.10.4
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
diff --git a/sysutils/terraform/distinfo b/sysutils/terraform/distinfo
index cd764b52e3ec..84405387541a 100644
--- a/sysutils/terraform/distinfo
+++ b/sysutils/terraform/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504186880
-SHA256 (hashicorp-terraform-v0.10.3_GH0.tar.gz) = a87fd97649f6ebabac243a85a09dfb0a16dc351fb9bb799fbdf076d35734cc74
-SIZE (hashicorp-terraform-v0.10.3_GH0.tar.gz) = 8065950
+TIMESTAMP = 1504790433
+SHA256 (hashicorp-terraform-v0.10.4_GH0.tar.gz) = 284773809ae461ee306cdd70c873e624c8af51086814f8af85d679dd28caa57a
+SIZE (hashicorp-terraform-v0.10.4_GH0.tar.gz) = 8197846
diff --git a/sysutils/uefi-edk2-bhyve/Makefile b/sysutils/uefi-edk2-bhyve/Makefile
index a679c7d8727b..35c72f6a3f67 100644
--- a/sysutils/uefi-edk2-bhyve/Makefile
+++ b/sysutils/uefi-edk2-bhyve/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uefi-edk2-bhyve
PORTVERSION= 20160704
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= fabian.freyer@physik.tu-berlin.de
diff --git a/sysutils/wiimms/Makefile b/sysutils/wiimms/Makefile
index ea0c6389e264..b4a7d62e7741 100644
--- a/sysutils/wiimms/Makefile
+++ b/sysutils/wiimms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wiimms
DISTVERSION= 2.23a
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= http://gugus69.free.fr/wiimms/ \
LOCAL/martymac
diff --git a/sysutils/znapzend/Makefile b/sysutils/znapzend/Makefile
new file mode 100644
index 000000000000..4c7a95cad532
--- /dev/null
+++ b/sysutils/znapzend/Makefile
@@ -0,0 +1,44 @@
+# $FreeBSD$
+
+PORTNAME= znapzend
+PORTVERSION= 0.17.0
+DISTVERSIONPREFIX= v
+CATEGORIES= sysutils
+
+MAINTAINER= skalmanman@gmail.com
+COMMENT= ZnapZend is a ZFS centric backup tool
+
+LICENSE= GPLv3
+
+BUILD_DEPENDS= p5-Pod-Simple>=0:textproc/p5-Pod-Simple \
+ p5-IO-Pipely>=0:devel/p5-IO-Pipely \
+ p5-Mojolicious>=7.15:www/p5-Mojolicious \
+ p5-Mojo-IOLoop-ForkCall>=0.17:www/p5-Mojo-IOLoop-ForkCall \
+ p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils \
+ p5-Test-Harness>=0:devel/p5-Test-Harness \
+ mbuffer>=0:misc/mbuffer
+RUN_DEPENDS= p5-Pod-Simple>=0:textproc/p5-Pod-Simple \
+ p5-IO-Pipely>=0:devel/p5-IO-Pipely \
+ p5-Mojolicious>=7.15:www/p5-Mojolicious \
+ p5-Mojo-IOLoop-ForkCall>=0.17:www/p5-Mojo-IOLoop-ForkCall \
+ p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils \
+ p5-Test-Harness>=0:devel/p5-Test-Harness \
+ mbuffer>=0:misc/mbuffer
+
+USES= gmake autoreconf perl5
+USE_GITHUB= yes
+GH_ACCOUNT= oetiker
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --prefix=${PREFIX} --libdir=${SITE_PERL}
+CONFIGURE_ENV= PERL5LIB=${SITE_PERL}
+
+USE_RC_SUBR= znapzend
+
+pre-configure:
+ @${REINPLACE_CMD} -e '/thirdparty\/Makefile/d' ${WRKSRC}/configure.ac
+
+post-configure:
+ @${REINPLACE_CMD} -e 's/thirdparty//g' ${WRKSRC}/Makefile
+
+.include <bsd.port.mk>
diff --git a/sysutils/znapzend/distinfo b/sysutils/znapzend/distinfo
new file mode 100644
index 000000000000..83b412f6036a
--- /dev/null
+++ b/sysutils/znapzend/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1492393207
+SHA256 (oetiker-znapzend-v0.17.0_GH0.tar.gz) = e64a689babe50140b2f922c78a875dd8750e9c95dad017e231a9b747e6a7cd9e
+SIZE (oetiker-znapzend-v0.17.0_GH0.tar.gz) = 151268
diff --git a/sysutils/znapzend/files/patch-lib_ZnapZend.pm b/sysutils/znapzend/files/patch-lib_ZnapZend.pm
new file mode 100644
index 000000000000..b90590615d95
--- /dev/null
+++ b/sysutils/znapzend/files/patch-lib_ZnapZend.pm
@@ -0,0 +1,28 @@
+--- lib/ZnapZend.pm.orig 2017-02-08 07:38:40 UTC
++++ lib/ZnapZend.pm
+@@ -2,7 +2,7 @@ package ZnapZend;
+
+ use Mojo::Base -base;
+ use Mojo::IOLoop::ForkCall;
+-use Mojo::Util qw(slurp);
++use Mojo::File;
+ use Mojo::Log;
+ use ZnapZend::Config;
+ use ZnapZend::ZFS;
+@@ -571,12 +571,13 @@ my $createWorkers = sub {
+ my $daemonize = sub {
+ my $self = shift;
+ my $pidFile = $self->pidfile || $self->defaultPidFile;
++ my $pidFileFile = Mojo::File->new($pidFile);
+
+ if (-f $pidFile){
+- chomp(my $pid = slurp $pidFile);
++ chomp(my $pid = $pidFileFile->slurp);
+ #pid is not empty and is numeric
+- if ($pid && ($pid = int($pid)) && kill 0, $pid){
+- die "I Quit! Another copy of znapzend ($pid) seems to be running. See $pidFile\n";
++ if ($pid && ($pid = int($pid)) && kill 0, $pid){
++ die "I Quit! Another copy of znapzend ($pid) seems to be running. See $pidFile\n";
+ }
+ }
+ #make sure pid file is writable before forking
diff --git a/sysutils/znapzend/files/znapzend.in b/sysutils/znapzend/files/znapzend.in
new file mode 100644
index 000000000000..b85f2ea46bdd
--- /dev/null
+++ b/sysutils/znapzend/files/znapzend.in
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: znapzend
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable znapzend:
+# znapzend_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable znapzend.
+#
+
+. /etc/rc.subr
+
+name="znapzend"
+rcvar="znapzend_enable"
+
+load_rc_config $name
+
+: ${znapzend_enable="NO"}
+
+pidfile=/var/run/${name}.pid
+command=%%PREFIX%%/bin/${name}
+command_args="--daemonize --pidfile=${pidfile}"
+
+run_rc_command "$1"
+
diff --git a/sysutils/znapzend/pkg-descr b/sysutils/znapzend/pkg-descr
new file mode 100644
index 000000000000..8e1bae4e8c5a
--- /dev/null
+++ b/sysutils/znapzend/pkg-descr
@@ -0,0 +1,10 @@
+ZnapZend is a ZFS centric backup tool.
+It relies on snapshot, send and recieve to do its work.
+It has the built-in ability to manage both local
+snapshots as well as remote copies by thinning them out
+as time progresses.
+
+The ZnapZend configuration is stored as properties in
+the ZFS filesystem itself.
+
+WWW: http://www.znapzend.org
diff --git a/sysutils/znapzend/pkg-plist b/sysutils/znapzend/pkg-plist
new file mode 100644
index 000000000000..2c49c0da123c
--- /dev/null
+++ b/sysutils/znapzend/pkg-plist
@@ -0,0 +1,10 @@
+bin/znapzend
+bin/znapzendzetup
+bin/znapzendztatz
+%%SITE_PERL%%/ZnapZend.pm
+%%SITE_PERL%%/ZnapZend/Config.pm
+%%SITE_PERL%%/ZnapZend/Time.pm
+%%SITE_PERL%%/ZnapZend/ZFS.pm
+man/man1/znapzend.1.gz
+man/man1/znapzendzetup.1.gz
+man/man1/znapzendztatz.1.gz