*/*: sync with upstream

Taken from: FreeBSD
2016-06-25 11:18:08 +02:00 · 2016-06-25 11:18:08 +02:00 · b719757b70
parent abaf2ee8e2
commit b719757b70
112 changed files with 7617 additions and 1442 deletions
--- a/benchmarks/himenobench/Makefile
+++ b/benchmarks/himenobench/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	himenobench
 PORTVERSION=	2015.07.09
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://accc.riken.jp/wp-content/uploads/2015/07/
 DISTFILES=	himenobmtxp_xl.zip himenobmtxp_l.zip \
@ -23,7 +24,6 @@ USES=		dos2unix fortran zip
 DOS2UNIX_GLOB=	*.c *.f
 NO_WRKSUBDIR=	yes

-
 OPTIONS_DEFINE=		ICC OPTIMIZED_CFLAGS
 OPTIONS_SUB=		yes

--- a/benchmarks/himenobench/pkg-plist
+++ b/benchmarks/himenobench/pkg-plist
@ -1,4 +1,4 @@
-%%NO_IFC%%bin/himenobmtxp
+bin/himenobmtxp
 bin/himenobmtxp_l
 bin/himenobmtxp_m
 bin/himenobmtxp_s
@ -12,7 +12,3 @@ bin/himenobmtxps_ss
 %%ICC%%bin/himenobmtxps_m.icc
 %%ICC%%bin/himenobmtxps_s.icc
 %%ICC%%bin/himenobmtxps_ss.icc
-%%IFC%%bin/himenobmtxp.ifc
-%%IFC%%bin/himenobmtxp_l.ifc
-%%IFC%%bin/himenobmtxp_m.ifc
-%%IFC%%bin/himenobmtxp_s.ifc
--- a/benchmarks/imb/Makefile
+++ b/benchmarks/imb/Makefile
@ -16,7 +16,6 @@ COMMENT=	Intel MPI Benchmark
 WRKSRC=		${WRKDIR}/IMB_3.0/src/
 USES=		dos2unix gmake
 MAKEFILE=	make_mpich
-ALL_TARGET=	all
 # Intel hardcodes -O3 in make_mpich.  Replacing it with system defaults
 # would make it impossible to compare benchmark results with other systems.
 # By putting it here we make it easier for somebody to change it, if they
@ -40,12 +39,14 @@ OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich2
 OPENMPI_MAKE_ENV_OFF=	MPI_HOME=${LOCALBASE}

 do-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKDIR}/IMB_3.0/doc/IMB_ug-3.0.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKDIR}/IMB_3.0/license/license.txt ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKDIR}/IMB_3.0/license/use-of-trademark-license.txt \
-		${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} IMB-EXT IMB-IO IMB-MPI1 \
 		${STAGEDIR}${PREFIX}/bin)

+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/IMB_3.0/doc/IMB_ug-3.0.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/IMB_3.0/license/license.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/IMB_3.0/license/use-of-trademark-license.txt \
+		${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@ -11,7 +11,7 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NCBI development toolkit, including BLAST 2 and GenBank/Entrez support

-OPTIONS_DEFINE=	DOCS
+LIB_DEPENDS=	libpng.so:graphics/png

 USES=		iconv motif
 MAKE_JOBS_UNSAFE=	yes
@ -51,6 +51,8 @@ MAN_FILES=	Psequin.1 asn2ff.1 asn2idx.1 asn2xml.1 asndhuff.1 \
 MAN_LINKS=	bl2seq blastall blastcl3 blastpgp impala megablast \
 		seedtop rpsblast

+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/make/makedis.csh
@ -94,6 +96,8 @@ do-install:
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/data && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR})
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc && ${TAR} --exclude man -cf - .) | \
 		(cd ${STAGEDIR}${DOCSDIR} && ${TAR} --unlink -xf -)
--- a/comms/tkscanfax/Makefile
+++ b/comms/tkscanfax/Makefile
@ -25,10 +25,10 @@ post-patch:
 		's|/usr/local/lib|${PREFIX}/lib|g'

 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}${TKSCANFAXDIR}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}${TKSCANFAXDIR})
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${TKSCANFAXDIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${TKSCANFAXDIR})
 .for file in tkfax tkscan
-	${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}${TKSCANFAXDIR}/${file}
+	${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/${TKSCANFAXDIR}/${file}
 	${LN} -sf ../${TKSCANFAXDIR}/${file} ${STAGEDIR}${PREFIX}/bin
 .endfor

--- a/databases/luasql-mysql/Makefile
+++ b/databases/luasql-mysql/Makefile
@ -16,7 +16,8 @@ LICENSE=	MIT
 USE_GITHUB=	yes
 GH_ACCOUNT=	keplerproject

-USES=		lua gmake
+USES=		lua gmake dos2unix
+DOS2UNIX_FILES=	src/*.c
 ALL_TARGET=	${LUASQL_DRIVER}

 LUASQL_DRIVER?=	mysql
--- a/databases/luasql-mysql/files/patch-src_ls__firebird.c
+++ b/databases/luasql-mysql/files/patch-src_ls__firebird.c
@ -0,0 +1,11 @@
+--- src/ls_firebird.c.orig	2016-06-24 14:06:19 UTC
+++ src/ls_firebird.c
+@@ -6,7 +6,7 @@
+ 
+ #include <ibase.h>	/* The Firebird API*/
+ #include <time.h>	/* For managing time values */
+-#include <malloc.h>
+#include <stdlib.h>
+ #include <string.h>
+ 
+ /* Lua API */
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@ -65,7 +65,6 @@ post-patch:
 		${WRKSRC}/lib/App/Cilly/TempFile.pm
 	@${REINPLACE_CMD} '/MACHDEPCC/ s|gcc|${CC}|' ${WRKSRC}/Makefile.in

-
 pre-install:
 	@${STRIP_CMD} ${WRKSRC}/bin/cilly.native

@ -81,10 +80,12 @@ do-install:
 		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/CIL/App)
 	(cd ${WRKSRC}/lib && ${INSTALL_DATA} ${LIBBINS} \
 		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/CIL)
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${RM} -rf ${WRKSRC}/doc/cilcode.tmp
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 # Remove orphan dir created by bsd.ocaml.mk
 	-@${RMDIR} -p ${STAGEDIR}${OCAMLFIND_DESTDIR}

+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${RM} -rf ${WRKSRC}/doc/cilcode.tmp
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+
 .include <bsd.port.mk>
--- a/devel/erlang-jobs/Makefile
+++ b/devel/erlang-jobs/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jobs
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-

--- a/devel/erlang-jobs/distinfo
+++ b/devel/erlang-jobs/distinfo
@ -1,2 +1,3 @@
-SHA256 (uwiger-jobs-0.4_GH0.tar.gz) = 61034a3215c62c69988982599f1fd2e66910548badd450e49220c453809e65d5
-SIZE (uwiger-jobs-0.4_GH0.tar.gz) = 830736
+TIMESTAMP = 1466849228
+SHA256 (uwiger-jobs-0.5_GH0.tar.gz) = 30ea172f42c605d75bef0e58c5eece51def64bbdde9169135e51a92e0639cf59
+SIZE (uwiger-jobs-0.5_GH0.tar.gz) = 831271
--- a/devel/erlang-jobs/files/patch-rebar.config
+++ b/devel/erlang-jobs/files/patch-rebar.config
@ -1,15 +1,20 @@
--- rebar.config.orig	2016-02-10 21:35:23 UTC
+--- rebar.config.orig	2016-06-24 23:50:49 UTC
 +++ rebar.config
-@@ -8,12 +8,6 @@
+@@ -8,8 +8,6 @@
 {clean_files, ["*~","*/*~","*/*.xfm","test/*.beam"]}.
 
 {deps, [
-        {meck, ".*",
-         {git, "git://github.com/eproxus/meck.git", "0.8.2"}},
 -        {parse_trans, ".*",
-         {git, "git://github.com/uwiger/parse_trans.git", "2.8"}},
-	{edown, ".*",
-         {git, "git://github.com/uwiger/edown.git", "0.5"}}
+-         {git, "git://github.com/uwiger/parse_trans.git", {tag, "3.0"}}}
        ]}.
 
- {edoc_opts, [{doclet, edown_doclet},
+ {profiles,
+@@ -30,8 +28,6 @@
+    [
+     {deps,
+      [
+-      {meck, ".*",
+-       {git, "git://github.com/eproxus/meck.git", "0.8.2"}}
+      ]}
+    ]}
+  ]}.
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gdb
 PORTVERSION=	7.11.1
-#PORTREVISION=	2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU

@ -38,7 +38,7 @@ ONLY_FOR_ARCHS=	i386 amd64 powerpc powerpc64 armv6	# untested elsewhere, might w

 OPTIONS_DEFINE=	DEBUG EXPAT GDB_LINK GUILE KGDB PYTHON TUI

-OPTIONS_DEFAULT=	GDB_LINK KGDB TUI PORT_READLINE
+OPTIONS_DEFAULT=	GDB_LINK KGDB PYTHON TUI PORT_READLINE

 OPTIONS_SINGLE=	READLINE
 OPTIONS_SINGLE_READLINE=	BASE_READLINE BUNDLED_READLINE PORT_READLINE
--- a/devel/hyperscan/distinfo
+++ b/devel/hyperscan/distinfo
@ -1,3 +1,4 @@
+TIMESTAMP = 1466593149
 SHA256 (01org-hyperscan-v4.2.0_GH0.tar.gz) = d06d8f31a62e5d2903a8ccf07696e02cadf4de2024dc3b558d410d913c81dbef
 SIZE (01org-hyperscan-v4.2.0_GH0.tar.gz) = 1362515
 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
--- a/devel/hyperscan/files/patch-src-rose-rose_build_misc.cpp
+++ b/devel/hyperscan/files/patch-src-rose-rose_build_misc.cpp
@ -0,0 +1,11 @@
+--- src/rose/rose_build_misc.cpp.orig	2016-06-24 12:15:55.919040000 +0100
+++ src/rose/rose_build_misc.cpp	2016-06-24 12:16:42.747695000 +0100
+@@ -880,7 +880,7 @@
+ class OutfixAllReports : public boost::static_visitor<set<ReportID>> {
+ public:
+     set<ReportID> operator()(const boost::blank &) const {
+-        return {};
+        return set<ReportID>();
+     }
+ 
+     template<class T>
--- a/devel/ocaml-res/Makefile
+++ b/devel/ocaml-res/Makefile
@ -10,7 +10,8 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically Resizing Contiguous Memory for OCaml

-LICENSE=	LGPL21
+LICENSE=	LGPL20+ # source says LGPL20+, COPYING says LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING.txt

 USE_OCAML=	yes
 USE_OCAML_FINDLIB=yes
@ -29,14 +30,14 @@ PORTEXAMPLES=	*

 OPTIONS_DEFINE=	DOCS EXAMPLES

-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS.txt CHANGES.txt README.md TODO.md
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples && ${INSTALL_DATA} *.ml \
-		${STAGEDIR}${EXAMPLESDIR})
+	${INSTALL_DATA} ${WRKSRC}/examples/*.ml ${STAGEDIR}${EXAMPLESDIR}

 .include <bsd.port.mk>
--- a/devel/p5-Test-Moose-More/Makefile
+++ b/devel/p5-Test-Moose-More/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	Test-Moose-More
-PORTVERSION=	0.037
+PORTVERSION=	0.038
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -19,9 +19,11 @@ BUILD_DEPENDS=	p5-Data-OptList>=0:devel/p5-Data-OptList \
 		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-aliased>=0:devel/p5-aliased \
-		p5-Perl-Version>=0:devel/p5-Perl-Version
+		p5-Perl-Version>=0:devel/p5-Perl-Version \
+		p5-Test-CheckDeps>=0:devel/p5-Test-CheckDeps

 USES=		perl5
 USE_PERL5=	configure
+NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/devel/p5-Test-Moose-More/distinfo
+++ b/devel/p5-Test-Moose-More/distinfo
@ -1,2 +1,3 @@
-SHA256 (Test-Moose-More-0.037.tar.gz) = cb726bc7741729f45764c204d271a2d15a232e205a80661b8b7249e701d7bfc1
-SIZE (Test-Moose-More-0.037.tar.gz) = 44173
+TIMESTAMP = 1466791763
+SHA256 (Test-Moose-More-0.038.tar.gz) = b0a47db90fa1a4affae61c021aaeee5069618976484cca90d5932e53a691bea6
+SIZE (Test-Moose-More-0.038.tar.gz) = 44526
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qtcreator
 DISTVERSION=	4.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
 DISTNAME=	qt-creator-opensource-src-${DISTVERSION}
--- a/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h
+++ b/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h
@ -1,4 +1,4 @@
--- src/plugins/projectexplorer/runconfiguration.h.orig	2016-06-21 13:37:35 UTC
+--- src/plugins/projectexplorer/runconfiguration.h.orig	2016-06-24 12:44:00 UTC
 +++ src/plugins/projectexplorer/runconfiguration.h
@@ -159,6 +159,7 @@ public:
     virtual ~ClonableConcept() = default;
@ -8,7 +8,7 @@
 };
 
 template <class T>
-@@ -168,11 +169,14 @@ public:
+@@ -168,11 +169,16 @@ public:
     ClonableModel(const T &data) : m_data(data) { }
     ~ClonableModel() Q_DECL_NOEXCEPT { } // gcc 4.7.3
     ClonableConcept *clone() const override { return new ClonableModel(*this); }
@ -18,6 +18,8 @@
     {
 -        auto that = dynamic_cast<const ClonableModel<T> *>(other.get());
 -        return that && m_data == that->m_data;
+        if (!other.get())
+            return false;
 +        if (other->typeId() != typeId())
 +            return false;
 +        auto that = static_cast<const ClonableModel<T> *>(other.get());
@ -25,7 +27,7 @@
     }
 
     T m_data;
-@@ -189,7 +193,7 @@ public:
+@@ -189,7 +195,7 @@ public:
     void operator=(Runnable other) { d = std::move(other.d); }
 
     template <class T> bool is() const {
@ -34,7 +36,7 @@
     }
 
     template <class T> const T &as() const {
-@@ -213,7 +217,7 @@ public:
+@@ -213,7 +219,7 @@ public:
     void operator=(Connection other) { d = std::move(other.d); }
 
     template <class T> bool is() const {
--- a/emulators/klh10/Makefile
+++ b/emulators/klh10/Makefile
@ -16,8 +16,6 @@ ONLY_FOR_ARCHS=	i386
 BUILD_WRKSRC=	${WRKSRC}/bld/fbx86
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

-OPTIONS_DEFINE=	DOCS
-
 # someday add support for base-kl and base-ks targets
 MAKE_ENV=		KLH10_HOME="${DATADIR}"
 ALL_TARGET=		base-ks-its
@ -77,6 +75,8 @@ KSITS_DOCS=		Intro.txt \
 			utils.txt \
 			vtape.txt

+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|logf |log_f |g ; \
@ -86,38 +86,32 @@ post-patch:

 do-install:
 .for i in ${KSITS_NATIVE_PROGS}
-	cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} ${i} \
-		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	@ ${MKDIR} ${STAGEDIR}${KSITS_DRIVER_DIR}
+	@${MKDIR} ${STAGEDIR}${KSITS_DRIVER_DIR}
 .for i in ${KSITS_EM_DRIVERS} ${KSITS_EM_SDRIVERS}
-	cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} ${i} \
-		${STAGEDIR}${KSITS_DRIVER_DIR}
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${i} ${STAGEDIR}${KSITS_DRIVER_DIR}
 .endfor
-	@ ${MKDIR} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for i in ${KSITS_EM_DAT}
-	cd ${WRKSRC}/run/ksits && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/run/ksits/${i} ${STAGEDIR}${DATADIR}
 .endfor
-	@ ${MKDIR} ${STAGEDIR}${DATADIR}/flushed
-	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${FILESDIR} && ${INSTALL_DATA} PDPs \
-		${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/run/ksits && ${INSTALL_DATA} README \
-		${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/flushed
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/PDPs ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/run/ksits/README ${STAGEDIR}${DOCSDIR}
 .for i in ${KSITS_DOCS}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/adm
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/adm
 .for i in ${KSITS_PUBADM}
-	cd ${WRKSRC}/run/ksits/pubits/adm && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DOCSDIR}/pubits/adm
+	${INSTALL_DATA} ${WRKSRC}/run/ksits/pubits/adm/${i} ${STAGEDIR}${DOCSDIR}/pubits/adm
 .endfor
-	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/doc
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/doc
 .for i in ${KSITS_PUBDOC}
-	cd ${WRKSRC}/run/ksits/pubits/doc && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DOCSDIR}/pubits/doc
+	${INSTALL_DATA} ${WRKSRC}/run/ksits/pubits/doc/${i} ${STAGEDIR}${DOCSDIR}/pubits/doc
 .endfor

 .include <bsd.port.mk>
--- a/emulators/qemu-cheri/Makefile.snapshot
+++ b/emulators/qemu-cheri/Makefile.snapshot
@ -4,6 +4,6 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-SNAPDATE=	20160610
+SNAPDATE=	20160624

-QEMU_COMMIT=		09b76d7d846b439c2af66947ed688f23e42ccc0a
+QEMU_COMMIT=		b66b366a43c99eb7a1cffbd66f707aadbed56a5c
--- a/emulators/qemu-cheri/distinfo
+++ b/emulators/qemu-cheri/distinfo
@ -1,2 +1,2 @@
-SHA256 (CTSRD-CHERI-qemu-0.d20160610-09b76d7d846b439c2af66947ed688f23e42ccc0a_GH0.tar.gz) = 48d5fbe96de648bbc5fadf8dd996b8f24f04d7767b8e1138598704ffa9759f70
-SIZE (CTSRD-CHERI-qemu-0.d20160610-09b76d7d846b439c2af66947ed688f23e42ccc0a_GH0.tar.gz) = 11147193
+SHA256 (CTSRD-CHERI-qemu-0.d20160624-b66b366a43c99eb7a1cffbd66f707aadbed56a5c_GH0.tar.gz) = 8d444b2f9a926ecbce6ddf0afd274f6e7da4eac5a5026e83c6e7ea360a0426c2
+SIZE (CTSRD-CHERI-qemu-0.d20160624-b66b366a43c99eb7a1cffbd66f707aadbed56a5c_GH0.tar.gz) = 11147400
--- a/emulators/xhomer/Makefile
+++ b/emulators/xhomer/Makefile
@ -14,21 +14,28 @@ COMMENT=	Emulator for the DEC Pro 350 computer
 USES=		gmake tar:tgz
 USE_XORG=	xt sm ice xext x11
 ALL_TARGET=	clean xhomer
-INSTALL_TARGET=
+INSTALL_TARGET=	# empty
 CFLAGS+=	-Wall -ffloat-store
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message

-PLIST_FILES=	bin/xhomer %%EXAMPLESDIR%%/xhomer.cfg
+SUB_FILES=	pkg-message
+
+PLIST_FILES=	bin/xhomer
 PORTDOCS=	README LICENSE SIMH
+PORTEXAMPLES=	xhomer.cfg

 MAKE_JOBS_UNSAFE=	yes

+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/xhomer ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/xhomer.cfg ${STAGEDIR}${EXAMPLESDIR}

 .include <bsd.port.mk>
--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -132,6 +132,7 @@
    SUBDIR += digikam-kde4
    SUBDIR += digikam-kde4-doc
    SUBDIR += digikam-kde4-l10n
+    SUBDIR += dilay
    SUBDIR += ditaa
    SUBDIR += djview4
    SUBDIR += djview4-qt4
--- a/graphics/dilay/Makefile
+++ b/graphics/dilay/Makefile
@ -0,0 +1,33 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME=	dilay
+PORTVERSION=	1.5.0
+CATEGORIES=	graphics
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	3D sculpting application
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	abau
+
+USES=		compiler:c++14-lang gmake qmake
+USE_CXXSTD=	c++14
+USE_GL=		gl
+USE_QT5=	core gui opengl widgets xml buildtools_build
+
+# Workaround for: Parallel build fails (https://github.com/abau/dilay/issues/19)
+MAKE_JOBS_UNSAFE=yes
+# Workaround for: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210327
+QMAKE_ARGS+=	QMAKE_CXXFLAGS_CXX11=
+
+PLIST_FILES=	bin/dilay
+
+BROKEN_FreeBSD_9=	does not build on FreeBSD < 10: "unordered_set" not found
+
+.include <bsd.port.mk>
--- a/graphics/dilay/distinfo
+++ b/graphics/dilay/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1465955512
+SHA256 (abau-dilay-1.5.0_GH0.tar.gz) = 43e159848b15b731663d06f5b3f0a05b5ff36c6dfce9e855eb9f5b1a0807ea66
+SIZE (abau-dilay-1.5.0_GH0.tar.gz) = 145167
--- a/graphics/dilay/pkg-descr
+++ b/graphics/dilay/pkg-descr
@ -0,0 +1,6 @@
+Dilay is a 3D sculpting application that provides an intuitive workflow
+using a number of powerful modeling tools. As each tool locally subdivides
+the mesh where more details are required, Dilay allows artists to rapidly
+create complex meshes.
+
+WWW: http://abau.org/dilay
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@ -10,40 +10,31 @@ MASTER_SITES=	GNU
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU spreadsheet for X11 and terminals

-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		bison perl5
+USES=		bison localbase perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-x --without-xlt --without-SciPlot
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lintl
 MAKE_ENV+=	DESTDIR=${STAGEDIR}

 INFO=		oleo

 OPTIONS_DEFINE=	MOTIF NLS
+OPTIONS_SUB=	yes

-.include <bsd.port.options.mk>
+MOTIF_LIB_DEPENDS=	libplot.so:graphics/plotutils \
+			libXbae.so:x11-toolkits/xbae \
+			libXmHTML.so:x11-toolkits/xmhtml
+MOTIF_USES=		motif
+MOTIF_CONFIGURE_WITH=	motif
+MOTIF_USE_OFF=		XORG=xt,ice,sm

-.if ${PORT_OPTIONS:MMOTIF}
-LIB_DEPENDS+=	libplot.so:graphics/plotutils \
-		libXbae.so:x11-toolkits/xbae \
-		libXmHTML.so:x11-toolkits/xmhtml
-USES+=		motif
-CONFIGURE_ARGS+=	--with-motif
-.else
-USE_XORG=	xt ice sm
-CONFIGURE_ARGS+=	--without-motif
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB=	NLS="@comment "
-.endif
+NLS_USES=		gettext
+NLS_LIBS=		-lintl
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES_OFF=		gettext-tools

 post-patch:
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
--- a/math/p5-Math-Int128/Makefile
+++ b/math/p5-Math-Int128/Makefile
@ -23,7 +23,7 @@ NOT_FOR_ARCHS=	i386 armv6
 .include <bsd.port.pre.mk>

 # need clang 3.2+ or GCC 4.4+
-.if exists(/usr/bin/clang) && ${OSVERSION} > 901505
+.if exists(/usr/bin/clang)
 CC=	/usr/bin/clang
 .else
 USE_GCC=	yes
--- a/misc/Makefile
+++ b/misc/Makefile
@ -380,6 +380,7 @@
    SUBDIR += py-qt4-doc
    SUBDIR += py-qt5-demo
    SUBDIR += py-qt5-doc
+    SUBDIR += py-socli
    SUBDIR += py-spdx
    SUBDIR += py-spdx-lookup
    SUBDIR += py-tqdm
--- a/misc/py-socli/Makefile
+++ b/misc/py-socli/Makefile
@ -0,0 +1,24 @@
+# Created by: Carlos J. Puga Medina <cpm@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	socli
+PORTVERSION=	1.3a
+CATEGORIES=	misc python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	cpm@FreeBSD.org
+COMMENT=	Stack overflow command line interface
+
+LICENSE=	BSD3CLAUSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup4>=0:textproc/py-beautifulsoup4 \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
+
+USES=		python:3 zip
+USE_PYTHON=	autoplist distutils
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//g}
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/misc/py-socli/distinfo
+++ b/misc/py-socli/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1466691313
+SHA256 (socli-1.3a.zip) = 1bfecc38132e51c140179b44999b964a87ef6a23989fb3b8d8024b739dd1bafa
+SIZE (socli-1.3a.zip) = 5463
--- a/misc/py-socli/pkg-descr
+++ b/misc/py-socli/pkg-descr
@ -0,0 +1,4 @@
+Stack overflow command line client written in python. Using SoCLI you can
+search and browse stack overflow without leaving the terminal.
+
+WWW: https://pypi.python.org/pypi/socli/
--- a/multimedia/plexmediaserver-plexpass/Makefile
+++ b/multimedia/plexmediaserver-plexpass/Makefile
@ -1,13 +1,13 @@
 # Created by: KalleDK <plexmaintainer@k-moeller.dk>
 # $FreeBSD$

-PORTVERSION=	0.9.17.3.2239
+PORTVERSION=	1.0.0.2261
 PORTREVISION=	0
 PKGNAMESUFFIX=	-plexpass

 MAINTAINER=	feld@FreeBSD.org

-PLEX_BUILD=	fe07491
+PLEX_BUILD=	a17e99e

 USE_RC_SUBR=	${PORTNAME}_plexpass

--- a/multimedia/plexmediaserver-plexpass/distinfo
+++ b/multimedia/plexmediaserver-plexpass/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1466606914
-SHA256 (PlexMediaServer-0.9.17.3.2239-fe07491-freebsd-amd64.tar.bz2) = eaf4840997ac83783877f670b61d2eb42174d4d64bb300eec4be6360012ac22d
-SIZE (PlexMediaServer-0.9.17.3.2239-fe07491-freebsd-amd64.tar.bz2) = 82016200
+TIMESTAMP = 1466775424
+SHA256 (PlexMediaServer-1.0.0.2261-a17e99e-freebsd-amd64.tar.bz2) = 35edb4a6fc23a8f1e01235d5afaf122206a3862f4254eeb8b9a280458b085cbc
+SIZE (PlexMediaServer-1.0.0.2261-a17e99e-freebsd-amd64.tar.bz2) = 82431026
--- a/multimedia/plexmediaserver-plexpass/pkg-plist
+++ b/multimedia/plexmediaserver-plexpass/pkg-plist
@ -1255,6 +1255,15 @@
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexThemeMusic.bundle/Contents/Resources/icon-default.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexThemeMusic.bundle/Contents/VERSION
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexThemeMusic.bundle/README.md
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexVevo.bundle/.gitignore
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexVevo.bundle/Contents/Code/__init__.py
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexVevo.bundle/Contents/DefaultPrefs.json
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexVevo.bundle/Contents/Info.plist
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexVevo.bundle/Contents/Resources/attribution.png
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexVevo.bundle/Contents/Resources/icon-default.jpg
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexVevo.bundle/Contents/Services/ServiceInfo.plist
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexVevo.bundle/Contents/Services/URL/VEVO/ServiceCode.pys
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/PlexVevo.bundle/Contents/VERSION
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Scanners.bundle/.gitignore
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Scanners.bundle/Contents/Info.plist
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Scanners.bundle/Contents/Resources/Common/AudioFiles.py
@ -1356,13 +1365,14 @@
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/TheTVDB.bundle/Contents/VERSION
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/TheTVDB.bundle/README.md
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Info.plist
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/css/main.17dc895a940c1a1ff2112611a5d346e6.css
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/css/main.v3.8a15495ac101fa04d0fdd60953ffe6e0.css
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/css/main.6f2ab52fa24ee9930ee495e06d294ddd.css
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/css/main.v3.98432f91c10077f507d0733d02bf9df1.css
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/favicon-mask.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/favicon.ico
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/base/plex-logo.96faf245690b14fdd33eccd3294ac57f.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/base/plex-pass.e73cc397459c4930e842b86b27d05eb9.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/base/pms-logo.70f6a544befb024685e4a294f6e5505e.svg
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/base/posters/avatar-560.9f88d7ebc3a9659a9e1ee1b471e72951.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/base/posters/square.f5415a2d8a1fccd963e88194af15ddc0.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/base/vendor-logos/lyricfind.0752dd542f235693d1fdaecbfcf339a3.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/blank.png
@ -1435,18 +1445,19 @@
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/queue/bookmarklet-steps-ie.3cbda4e75b0dd0e186e0c24999ab0d1d.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/queue/bookmarklet-steps.abc5147d9257f0ec59f7b2257db9cb8f.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/queue/email-links.f1b12dd82ea85b39a4c0fa07dd6df095.png
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/setup/setup-devices.4c444242863ca1234c65de48ef80a5e8.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/upsell/upsell-camera-upload.c292737601a4452f02cb86a5ff46cd7f.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/upsell/upsell-cloud-sync.58594567e630cc4dae0ad42b6573f225.svg
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/upsell/upsell-forum.a35de654d388b5416cd87ddd45e904f7.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/upsell/upsell-gracenote.47143d9a798b6044bb41469630e662db.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/upsell/upsell-mobile-sync.6a66674e2cb992f1134481602860f06f.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/upsell/upsell-trailers-extras.1ad0852cbe3bde7198f897afd6bc14dd.svg
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/upsell/upsell-vevo.5dc7dc8cf83733aeeb7519a500dab286.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/vendor-logos/gracenote.18089cb7063ad397523859fa93f2d54c.svg
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/vendor-logos/vevo.0aa36b37d6a9aedfe67df4c5ff2ae8e0.svg
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/index.html
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main.64626698ddf4e9a7e118.js
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/manifest.41a0b9187a1b9e94d122.js
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors.9e967496c0f98e36a534.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main.680e756a4530d9e6abed.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/manifest.e03b68e82ebe9b435e8b.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors.aaa70f9e87699b781838.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/zxcvbn.c9ed0d9139df193d94df.js
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/mp3/null.2036f08ba858d37814b7f6982d26414a.mp3
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/setup.html
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/swf/jwplayer/jwplayer.swf
@ -2411,6 +2422,8 @@
 %%DATADIR%%/Resources/start.sh
 %%DATADIR%%/Resources/themoviedb-combiner-movies.xml
 %%DATADIR%%/Resources/thetvdb-combiner-shows.xml
+%%DATADIR%%/Resources/vevo-thumb.png
+%%DATADIR%%/Resources/vevo.png
 %%DATADIR%%/libavcodec.so.57
 %%DATADIR%%/libavformat.so.57
 %%DATADIR%%/libavutil.so.55
--- a/multimedia/plexmediaserver/Makefile
+++ b/multimedia/plexmediaserver/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	plexmediaserver
-PORTVERSION?=	0.9.16.6.1993
+PORTVERSION?=	1.0.0.2261
 PORTREVISION?=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	https://downloads.plexapp.com/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/ \
@ -13,7 +13,7 @@ MAINTAINER?=	feld@FreeBSD.org
 COMMENT=	Plex Media Server component

 USES=		cpe tar:bzip2
-PLEX_BUILD?=	5089475
+PLEX_BUILD?=	a17e99e
 NO_BUILD=	yes
 WRKSRC=	${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}

--- a/multimedia/plexmediaserver/distinfo
+++ b/multimedia/plexmediaserver/distinfo
@ -1,2 +1,3 @@
-SHA256 (PlexMediaServer-0.9.16.6.1993-5089475-freebsd-amd64.tar.bz2) = 1000b799775e61537aeec649f111853589022a0f733a4073ea219e99b2b0a5ea
-SIZE (PlexMediaServer-0.9.16.6.1993-5089475-freebsd-amd64.tar.bz2) = 97837423
+TIMESTAMP = 1466779023
+SHA256 (PlexMediaServer-1.0.0.2261-a17e99e-freebsd-amd64.tar.bz2) = 35edb4a6fc23a8f1e01235d5afaf122206a3862f4254eeb8b9a280458b085cbc
+SIZE (PlexMediaServer-1.0.0.2261-a17e99e-freebsd-amd64.tar.bz2) = 82431026
--- a/multimedia/plexmediaserver/pkg-plist
+++ b/multimedia/plexmediaserver/pkg-plist
--- a/net-im/Makefile
+++ b/net-im/Makefile
@ -15,6 +15,7 @@
    SUBDIR += convey
    SUBDIR += corebird
    SUBDIR += cutegram
+    SUBDIR += diligent
    SUBDIR += echat
    SUBDIR += ejabberd
    SUBDIR += ekiga
--- a/net-im/diligent/Makefile
+++ b/net-im/diligent/Makefile
@ -0,0 +1,38 @@
+# Created by: Kris Moore <kmoore@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	diligent
+PORTVERSION=	0.2.5
+DISTVERSIONPREFIX=	v
+CATEGORIES=	net-im
+
+MAINTAINER=	kmoore@FreeBSD.org
+COMMENT=	Unofficial Qt Slack client
+
+LICENSE=	LGPL3
+
+LIB_DEPENDS=	libQt5WebKitWidgets.so:www/webkit-qt5
+
+USE_LDCONFIG=	yes
+USE_QT5=	core gui network svg linguist \
+		buildtools x11extras widgets
+USE_GL+=	gl
+USES=		compiler:c++11-lang qmake tar:xz
+
+QMAKE_ARGS=	CONFIG+="configure"
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	trueos
+GH_PROJECT=	diligent
+PLIST_FILES=	bin/diligent \
+		share/applications/diligent.desktop \
+		share/icons/diligent.png
+SUB_FILES=      diligent.desktop
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/diligent ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKDIR}/${SUB_FILES} ${STAGEDIR}${PREFIX}/share/applications/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
+	${INSTALL_DATA} ${WRKSRC}/images/png/Slack.png ${STAGEDIR}${PREFIX}/share/icons/diligent.png
+
+.include <bsd.port.mk>
--- a/net-im/diligent/distinfo
+++ b/net-im/diligent/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1466813589
+SHA256 (trueos-diligent-v0.2.5_GH0.tar.gz) = d424d28bfbdcd7d1f6d92195acf284ce5143ae885b2530c19995f9a59c4c5d17
+SIZE (trueos-diligent-v0.2.5_GH0.tar.gz) = 3350897
--- a/net-im/diligent/files/diligent.desktop.in
+++ b/net-im/diligent/files/diligent.desktop.in
@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Diligent
+GenericName=Slack Client
+Comment=A simple Qt5 based Slack Client
+Exec=%%PREFIX%%/bin/diligent
+Icon=%%PREFIX%%/share/icons/diligent.png
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Application;Network;
--- a/net-im/diligent/pkg-descr
+++ b/net-im/diligent/pkg-descr
@ -0,0 +1,3 @@
+Diligent is unofficial cross-platform desktop client for Slack.
+
+WWW: https://github.com/trueos/diligent
--- a/net/Makefile
+++ b/net/Makefile
@ -246,6 +246,7 @@
    SUBDIR += ifstat
    SUBDIR += ifstated
    SUBDIR += igmpproxy
+    SUBDIR += iipsrv
    SUBDIR += ilbc
    SUBDIR += imapproxy
    SUBDIR += intel-ixl-kmod
--- a/net/iipsrv/Makefile
+++ b/net/iipsrv/Makefile
@ -0,0 +1,38 @@
+# $FreeBSD$
+
+PORTNAME=	iipsrv
+PORTVERSION=	1.0
+DISTVERSIONPREFIX=	${PORTNAME}-
+CATEGORIES=	net
+
+MAINTAINER=	me@skylord.ru
+COMMENT=	IIP (Internet Imaging Protocol) FastCGI server
+
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	libtiff.so:graphics/tiff
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	ruven
+
+USES=		autoreconf jpeg libtool
+
+GNU_CONFIGURE=	yes
+
+USE_RC_SUBR=	${PORTNAME}
+
+PLIST_FILES=	bin/iipsrv.fcgi \
+		man/man8/iipsrv.8.gz
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|noinst_PROGRAMS|bin_PROGRAMS|g' \
+		${WRKSRC}/src/Makefile.am
+	@${REINPLACE_CMD} -e 's|include_HEADERS|noinst_HEADERS|g' \
+		${WRKSRC}/fcgi/Makefile.am
+	@${REINPLACE_CMD} -e 's|include_HEADERS|noinst_HEADERS|g' \
+		${WRKSRC}/fcgi/include/Makefile.am
+
+pre-configure:
+	@(cd ${WRKSRC} && ./autogen.sh)
+
+.include <bsd.port.mk>
--- a/net/iipsrv/distinfo
+++ b/net/iipsrv/distinfo
@ -0,0 +1,2 @@
+SHA256 (ruven-iipsrv-iipsrv-1.0_GH0.tar.gz) = 9156e80a855b36c5c0eb0707a3ea0ba95ec3a52d118d548af51eb2ef9e5e2f85
+SIZE (ruven-iipsrv-iipsrv-1.0_GH0.tar.gz) = 553962
--- a/net/iipsrv/files/iipsrv.in
+++ b/net/iipsrv/files/iipsrv.in
@ -0,0 +1,99 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: iipsrv
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable iipsrv:
+# iipsrv_(instance_)?enable (bool):	Set to "NO" by default.
+#			Set it to "YES" to enable iipsrv.
+# iipsrv_(instance_)?flags (str):	Custom additional arguments to be passed
+#			to iipsrv. Default to "--bind 127.0.0.1:9111".
+# iipsrv_(instance_)?pidfile (str): Custum PID file path and name.
+#			Default to "/var/run/iipsrv.${instance}.pid".
+# iipsrv_(instance_)?user (str): User to run iipsrv as
+#			Default to "nobody".
+# iipsrv_(instance_)?config (str): Config file with environment
+#			variables (default empty).
+# iipsrv_instances (str): Set to "" by default. 
+#			If defined, list of instances to enable
+
+. /etc/rc.subr
+
+name="iipsrv"
+rcvar=iipsrv_enable
+
+load_rc_config $name
+
+: ${iipsrv_enable="NO"}
+: ${iipsrv_flags="--bind 127.0.0.1:9111"}
+: ${iipsrv_pidfile="/var/run/iipsrv.pid"}
+: ${iipsrv_user="nobody"}
+
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/bin/iipsrv.fcgi"
+start_precmd="${name}_prestart"
+
+if [ -n "$2" ]; then
+	instance="$2"
+	load_rc_config ${name}_${instance}
+	case "$iipsrv_instances" in
+	"$2 "*|*" $2 "*|*" $2"|"$2")
+		eval iipsrv_flags="\${iipsrv_${instance}_flags:-\"${iipsrv_flags}\"}"
+		eval iipsrv_config="\${iipsrv_${instance}_config:-\"${iipsrv_config}\"}"
+		eval iipsrv_user="\${iipsrv_${instance}_user:-\"${iipsrv_user}\"}"
+		eval iipsrv_pidfile="\${iipsrv_${instance}_pidfile:-\"/var/run/iipsrv.${instance}.pid\"}"
+	;;
+	*)
+		err 1 "$2 not found in iipsrv_instances" ;;
+	esac
+else
+	if [ -n "${iipsrv_instances}" -a -n "$1" ]; then
+		for instance in ${iipsrv_instances}; do
+			eval _enable="\${iipsrv_${instance}_enable}"
+			case "${_enable:-${iipsrv_enable}}" in
+			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+				continue
+			;;
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+			;;
+			*)
+				if [ -z "$_enable" ]; then
+					_var=iipsrv_enable
+				else
+					_var=iipsrv_${instance}_enable
+				fi
+				warn "Bad value" \
+					"'${_enable:-${iipsrv_enable}}'" \
+					"for ${_var}. " \
+					"Instance ${instance} skipped."
+				continue
+			;;
+			esac
+			echo "===> iipsrv instance: ${instance}"
+			if %%PREFIX%%/etc/rc.d/iipsrv $1 ${instance}; then
+				success="${instance} ${success}"
+			else
+				failed="${instance} (${retcode}) ${failed}"
+			fi
+		done
+		exit 0
+	fi
+fi
+
+
+pidfile=$iipsrv_pidfile
+daemon_user=$iipsrv_user
+iipsrv_flags="-p ${iipsrv_pidfile} -u ${daemon_user} ${procname} ${iipsrv_flags}"
+iipsrv_user=""
+
+iipsrv_prestart()
+{
+	if [ -n "${iipsrv_config}" -a -r ${iipsrv_config} ]; then
+		command="/usr/bin/env `grep -v '\s*#' ${iipsrv_config} | tr '\n' ' '` ${command}"
+	fi
+}
+
+run_rc_command "$1"
--- a/net/iipsrv/pkg-descr
+++ b/net/iipsrv/pkg-descr
@ -0,0 +1,9 @@
+IIPImage is an advanced high-performance feature-rich image
+server system for web-based streamed viewing and zooming of
+ultra high-resolution images with low processor and memory
+requirements. The system can handle gigapixel size images as
+well as advanced image features such as 8/16/32 bits per
+channel, CIELAB colorimetric images and scientific imagery
+such as multispectral images and digital elevation maps.
+
+WWW: http://iipimage.sourceforge.net/
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@ -2,11 +2,9 @@
 # $FreeBSD$

 PORTNAME=	libvncserver
-PORTVERSION=	0.9.9
-PORTREVISION=	12
+PORTVERSION=	0.9.10
+DISTVERSIONPREFIX=	LibVNCServer-
 CATEGORIES=	net devel
-MASTER_SITES=	SF
-DISTNAME=	LibVNCServer-${PORTVERSION}

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provide an easy API to a custom vnc server
@ -15,33 +13,36 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	libpng.so:graphics/png

-USES=		jpeg libtool pathfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	LibVNC
+
+USES=		autoreconf jpeg libtool pathfix pkgconfig
+PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--without-x
 INSTALL_TARGET=	install-strip

-OPTIONS_DEFINE=	GNUTLS OPENSSL GCRYPT IPV6
-OPTIONS_DEFAULT=OPENSSL
-GCRYPT_DESC=	libgcrypt support
+OPTIONS_DEFINE=		GCRYPT IPV6
+OPTIONS_SINGLE=		SSL
+OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
+OPTIONS_DEFAULT=	OPENSSL
+GCRYPT_DESC=		libgcrypt support

+GNUTLS_IMPLIES=		GCRYPT
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls

 OPENSSL_CONFIGURE_WITH=	crypto ssl
 OPENSSL_USE=		OPENSSL=yes

-GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+			libgpg-error.so:security/libgpg-error
 GCRYPT_CONFIGURE_WITH=	gcrypt

 IPV6_CONFIGURE_WITH=	ipv6

-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^SUBDIRS/s|x11vnc||g' ${WRKSRC}/Makefile.in
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb

--- a/net/libvncserver/distinfo
+++ b/net/libvncserver/distinfo
@ -1,2 +1,3 @@
-SHA256 (LibVNCServer-0.9.9.tar.gz) = cf060d3525c2fb92be2fa18bbc697fb355592b52484e60745f3bcac5c3f803f9
-SIZE (LibVNCServer-0.9.9.tar.gz) = 1678609
+TIMESTAMP = 1466709748
+SHA256 (LibVNC-libvncserver-LibVNCServer-0.9.10_GH0.tar.gz) = ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7
+SIZE (LibVNC-libvncserver-LibVNCServer-0.9.10_GH0.tar.gz) = 1415191
--- a/net/libvncserver/files/patch-configure
+++ b/net/libvncserver/files/patch-configure
@ -1,10 +0,0 @@
--- ./configure.orig	2011-10-14 10:10:19.219720000 +0200
-+++ ./configure	2011-10-14 10:16:40.505588294 +0200
-@@ -22008,7 +22008,6 @@
- 
- 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lws2_32" >&5
- $as_echo_n "checking for getaddrinfo in -lws2_32... " >&6; }
-		        LIBS="$LIBS -lws2_32"
- 		        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ws2tcpip.h>
--- a/net/libvncserver/files/patch-libvncserver__sockets.c
+++ b/net/libvncserver/files/patch-libvncserver__sockets.c
@ -1,14 +0,0 @@
--- ./libvncserver/sockets.c.orig	2012-05-04 16:19:00.000000000 +0200
-+++ ./libvncserver/sockets.c	2012-06-07 01:13:31.179964830 +0200
-@@ -402,9 +402,9 @@
-       rfbLogPerror("rfbProcessNewConnection: error in select");
-       return FALSE;
-     }
-    if (FD_ISSET(rfbScreen->listenSock, &listen_fds)) 
-+    if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds))
-       chosen_listen_sock = rfbScreen->listenSock;
-    if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds)) 
-+    if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
-       chosen_listen_sock = rfbScreen->listen6Sock;
- 
-     if ((sock = accept(chosen_listen_sock,
--- a/net/libvncserver/files/patch-libvncserver_rfbregion.c
+++ b/net/libvncserver/files/patch-libvncserver_rfbregion.c
@ -1,11 +0,0 @@
--- ./libvncserver/rfbregion.c.orig	2014-07-01 23:00:03.428441834 +1000
-+++ ./libvncserver/rfbregion.c	2014-07-01 23:00:14.275274256 +1000
-@@ -751,7 +751,7 @@
-       i->ptrSize += DEFSTEP;
-       i->sPtrs = (sraSpan**)realloc(i->sPtrs, sizeof(sraSpan*)*i->ptrSize);
-     }
-    i->ptrPos =+ 2;
-+    i->ptrPos += 2;
-     if(sraReverse(i)) {
-       i->sPtrs[i->ptrPos]   =   i->sPtrs[i->ptrPos-2]->subspan->back._prev;
-       i->sPtrs[i->ptrPos+1] = &(i->sPtrs[i->ptrPos-2]->subspan->front);
--- a/net/libvncserver/pkg-descr
+++ b/net/libvncserver/pkg-descr
@ -1,4 +1,4 @@
 LibVNCServer is ripped out of Xvnc to provide an easy API to write one's own
 vnc server.

-WWW: http://libvncserver.sourceforge.net/
+WWW: http://libvnc.github.io/
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	pkg
-DISTVERSION=	1.8.99.7
+DISTVERSION=	1.8.99.8
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1466630077
-SHA256 (pkg-1.8.99.7.tar.xz) = 947fce640497755b7078c84b2c5494a2f11cdaca54ded345942cacd8ac3b1532
-SIZE (pkg-1.8.99.7.tar.xz) = 1946500
+TIMESTAMP = 1466854093
+SHA256 (pkg-1.8.99.8.tar.xz) = d862fa85e429dd1af5d81a9830b48ee6ad35d62842bbc5fa19eed7b18f5dc1ab
+SIZE (pkg-1.8.99.8.tar.xz) = 1912256
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@ -1,8 +1,8 @@
 # $FreeBSD$

 PORTNAME=	poudriere
-DISTVERSION=	3.1.99.20160611
-PORTREVISION=	0
+DISTVERSION=	3.1.99.20160624
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
@ -18,7 +18,7 @@ CONFLICTS_INSTALL=	poudriere-[0-9]*

 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-GH_TAGNAME=	3.0-1669-g5d15cfe
+GH_TAGNAME=	3.0-1677-g146fc3f
 #DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}

 GNU_CONFIGURE=	yes
--- a/ports-mgmt/poudriere-devel/distinfo
+++ b/ports-mgmt/poudriere-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1465683008
-SHA256 (freebsd-poudriere-3.1.99.20160611-3.0-1669-g5d15cfe_GH0.tar.gz) = 40a4908b31c23d66ada30910a7f5afaddad2405034e0fc238e597b75784bf7da
-SIZE (freebsd-poudriere-3.1.99.20160611-3.0-1669-g5d15cfe_GH0.tar.gz) = 2938245
+TIMESTAMP = 1466783382
+SHA256 (freebsd-poudriere-3.1.99.20160624-3.0-1677-g146fc3f_GH0.tar.gz) = 7f8071d836dd8770d098514059604eca898d06ce99f71bff082d168aa6fa6906
+SIZE (freebsd-poudriere-3.1.99.20160624-3.0-1677-g146fc3f_GH0.tar.gz) = 2939889
--- a/ports-mgmt/poudriere-devel/files/patch-mkdir-vp
+++ b/ports-mgmt/poudriere-devel/files/patch-mkdir-vp
@ -0,0 +1,19 @@
+commit e7a21685d30fc183b46cd7c5e0f134ce3a6126fc
+Author: Bryan Drewery <bryan@shatow.net>
+Date:   Fri Jun 24 08:52:08 2016 -0700
+
+    Don't use -v for mkdir
+
+diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh
+index 00eecca..75c02b7 100755
+--- src/share/poudriere/common.sh
+++ src/share/poudriere/common.sh
+@@ -1179,7 +1179,7 @@ do_jail_mounts() {
+ 
+ 	fi
+ 	echo ${nullpaths} | tr ' ' '\n' | sed -e "s,^/,${mnt}/," | \
+-	    xargs mkdir -vp
+	    xargs mkdir -p
+ 	for nullpath in ${nullpaths}; do
+ 		[ -d "${from}${nullpath}" -a "${from}" != "${mnt}" ] && \
+ 		    ${NULLMOUNT} -o ro "${from}${nullpath}" "${mnt}${nullpath}"
--- a/ports-mgmt/poudriere/Makefile
+++ b/ports-mgmt/poudriere/Makefile
@ -1,8 +1,8 @@
 # $FreeBSD$

 PORTNAME=	poudriere
-DISTVERSION=	3.1.13
-PORTREVISION=	0
+DISTVERSION=	3.1.14
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
--- a/ports-mgmt/poudriere/distinfo
+++ b/ports-mgmt/poudriere/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1466612100
-SHA256 (freebsd-poudriere-3.1.13_GH0.tar.gz) = c88fc62b63f095862f1ec7c3406bb3b56d0d835f613f9d55e9ce8967e8d53e21
-SIZE (freebsd-poudriere-3.1.13_GH0.tar.gz) = 2833905
+TIMESTAMP = 1466783271
+SHA256 (freebsd-poudriere-3.1.14_GH0.tar.gz) = 2442511b1898f514bd22087bf05e9693fa78c2c1e9f214581da8ab6d437882e9
+SIZE (freebsd-poudriere-3.1.14_GH0.tar.gz) = 2834745
--- a/ports-mgmt/poudriere/files/patch-mkdir-vp
+++ b/ports-mgmt/poudriere/files/patch-mkdir-vp
@ -0,0 +1,19 @@
+commit e7a21685d30fc183b46cd7c5e0f134ce3a6126fc
+Author: Bryan Drewery <bryan@shatow.net>
+Date:   Fri Jun 24 08:52:08 2016 -0700
+
+    Don't use -v for mkdir
+
+diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh
+index 00eecca..75c02b7 100755
+--- src/share/poudriere/common.sh
+++ src/share/poudriere/common.sh
+@@ -1179,7 +1179,7 @@ do_jail_mounts() {
+ 
+ 	fi
+ 	echo ${nullpaths} | tr ' ' '\n' | sed -e "s,^/,${mnt}/," | \
+-	    xargs mkdir -vp
+	    xargs mkdir -p
+ 	for nullpath in ${nullpaths}; do
+ 		[ -d "${from}${nullpath}" -a "${from}" != "${mnt}" ] && \
+ 		    ${NULLMOUNT} -o ro "${from}${nullpath}" "${mnt}${nullpath}"
--- a/security/Makefile
+++ b/security/Makefile
@ -108,6 +108,7 @@
    SUBDIR += dirmngr
    SUBDIR += distcache
    SUBDIR += dmitry
+    SUBDIR += doas
    SUBDIR += doorman
    SUBDIR += doscan
    SUBDIR += dradis
@ -1153,6 +1154,7 @@
    SUBDIR += yersinia
    SUBDIR += ykclient
    SUBDIR += ykpers
+    SUBDIR += yubico-piv-tool
    SUBDIR += yubikey-personalization-gui
    SUBDIR += zebedee
    SUBDIR += zenmap
--- a/security/doas/Makefile
+++ b/security/doas/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	doas
-PORTVERSION=	5.9
+PORTVERSION=	5.9p1
 CATEGORIES=	security

 MAINTAINER=	jsmith@resonatingmedia.com
@ -12,9 +12,10 @@ LICENSE=	ISCL
 USE_GITHUB=	yes
 GH_ACCOUNT=	slicer69
 GH_PROJECT=	doas
-GH_TAGNAME=	e6f1456
+GH_TAGNAME=	720db72

 BINMODE=	4755
+ETCDIR=	${PREFIX}/etc

 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/doas \
--- a/security/doas/distinfo
+++ b/security/doas/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1466641283
-SHA256 (slicer69-doas-5.9-e6f1456_GH0.tar.gz) = 304008cfca04b8825393d3cf50b6085842b36c2668fda81d24bf16e56a042c49
-SIZE (slicer69-doas-5.9-e6f1456_GH0.tar.gz) = 10469
+TIMESTAMP = 1466854791
+SHA256 (slicer69-doas-5.9p1-720db72_GH0.tar.gz) = 4bfa5cfc18400de3280917588affe49d177a46d9cc3d4367e8b7150eb6fbb2f1
+SIZE (slicer69-doas-5.9p1-720db72_GH0.tar.gz) = 10735
--- a/security/doas/files/patch-Makefile
+++ b/security/doas/files/patch-Makefile
@ -1,11 +0,0 @@
--- Makefile.orig	2016-06-22 22:59:03 UTC
-+++ Makefile
-@@ -3,7 +3,7 @@ YC?=yacc
- BIN=doas
- PREFIX?=/usr/local
- OBJECTS=doas.o env.o execvpe.o y.tab.o
-CFLAG+= -DUSE_PAM
-+CFLAG+= -DUSE_PAM -DDOAS_CONF=\"${PREFIX}/etc/doas.conf\"
- LFLAG+= -lpam
- 
- all: $(OBJECTS)
--- a/security/doas/files/patch-doas.c
+++ b/security/doas/files/patch-doas.c
@ -1,11 +0,0 @@
--- doas.c.orig	2016-06-22 22:59:03 UTC
-+++ doas.c
-@@ -324,7 +324,7 @@ main(int argc, char **argv)
- 	int pam_silent = PAM_SILENT;
- #endif
- 
-	parseconfig("/usr/local/etc/doas.conf", 1);
-+	parseconfig(DOAS_CONF, 1);
- 
- 	/* cmdline is used only for logging, no need to abort on truncate */
- 	(void) strlcpy(cmdline, argv[0], sizeof(cmdline));
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	nss
-PORTVERSION=	3.24
+PORTVERSION=	3.25
 #DISTVERSIONSUFFIX=	-with-ckbi-1.98
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@ -1,2 +1,2 @@
-SHA256 (nss-3.24.tar.gz) = 2f0841492f91cca473b73dec6cab9cf765a485e032d48d2e8ae7261e54c419ed
-SIZE (nss-3.24.tar.gz) = 7307782
+SHA256 (nss-3.25.tar.gz) = 5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359
+SIZE (nss-3.25.tar.gz) = 7338238
--- a/security/py-certbot/pkg-descr
+++ b/security/py-certbot/pkg-descr
@ -13,4 +13,4 @@ The tool will prove domain control to the CA and submit a CSR
 If domain control has been proven, a certificate will get issued and
 the tool will automatically install it.

-WWW: https://github.com/letsencrypt/letsencrypt
+WWW: https://github.com/certbot/certbot
--- a/security/py-certbot/pkg-message
+++ b/security/py-certbot/pkg-message
@ -9,7 +9,7 @@ is not the letsencrypt-auto bootstrap/wrapper script.

 To obtain certificates, use the 'certonly' command as follows:

- # sudo letsencrypt --server <server-URL> certonly
+ # sudo certbot --server <server-URL> certonly

 Note: The client currently requires the ability to bind on TCP port 80. If
 you have a server running on this port, it will need to be temporarily stopped
--- a/security/yubico-piv-tool/Makefile
+++ b/security/yubico-piv-tool/Makefile
@ -0,0 +1,41 @@
+# $FreeBSD$
+
+PORTNAME=	yubico-piv-tool
+PORTVERSION=	1.4.0
+#PORTREVISION=	0
+CATEGORIES=	security
+MASTER_SITES=	https://developers.yubico.com/yubico-piv-tool/Releases/
+
+MAINTAINER=	ume@FreeBSD.org
+COMMENT=	Yubico PIV tool
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
+
+USES=		libtool pathfix pkgconfig
+USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	OPENSSL_CFLAGS="$(OPENSSL_CFLAGS)" \
+		OPENSSL_LIBS="-L$(OPENSSLLIB) -lcrypto"
+OPENSSL_CFLAGS=-I$(OPENSSLINC)
+
+PLIST_FILES=	bin/yubico-piv-tool \
+		include/ykcs11/ykcs11-version.h \
+		include/ykpiv/ykpiv-version.h \
+		include/ykpiv/ykpiv.h \
+		lib/libykcs11.a \
+		lib/libykcs11.so \
+		lib/libykcs11.so.1 \
+		lib/libykcs11.so.1.3.2 \
+		lib/libykpiv.a \
+		lib/libykpiv.so \
+		lib/libykpiv.so.1 \
+		lib/libykpiv.so.1.3.2 \
+		libdata/pkgconfig/ykcs11.pc \
+		libdata/pkgconfig/ykpiv.pc \
+		man/man1/yubico-piv-tool.1.gz
+
+.include <bsd.port.mk>
--- a/security/yubico-piv-tool/distinfo
+++ b/security/yubico-piv-tool/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1466749908
+SHA256 (yubico-piv-tool-1.4.0.tar.gz) = 009dbea4256a7a49820962da22eb872e8d21b9126f92787a50bc896dd5d477df
+SIZE (yubico-piv-tool-1.4.0.tar.gz) = 516045
--- a/security/yubico-piv-tool/pkg-descr
+++ b/security/yubico-piv-tool/pkg-descr
@ -0,0 +1,8 @@
+The Yubico PIV tool is used for interacting with the Privilege and
+Identification Card (PIV) application on a YubiKey.
+
+With it you may generate keys on the device, importing keys and
+certificates, and create certificate requests, and other operations. A
+shared library and a command-line tool is included.
+
+WWW: https://developers.yubico.com/yubico-piv-tool/
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@ -3,10 +3,9 @@

 PORTNAME=	zsh
 DISTVERSION=	5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells
-MASTER_SITES=	\
-		http://www.zsh.org/pub/:doc \
+MASTER_SITES=	http://www.zsh.org/pub/:doc \
 		http://www.zsh.org/pub/ \
 		SF \
 		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc
@ -25,6 +24,7 @@ MAKE_JOBS_UNSAFE=	yes
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-bsdtar
 ZSH_VER=	${PORTVERSION}
 PLIST_SUB+=	ZSH_VER="${ZSH_VER}"
+SUB_FILES=	pkg-message

 USES=		iconv ncurses shebangfix tar:xz

@ -46,7 +46,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include -DBOOL_DEFINED
 LDFLAGS+=	-L${LOCALBASE}/lib -Wl,--as-needed
 CONFIGURE_ENV+=	zsh_cv_sys_path_dev_fd=no
 CONFIGURE_ARGS=	--with-tcsetpgrp \
-		--enable-function-subdirs --enable-multibyte \
+		--enable-function-subdirs \
+		--enable-multibyte \
 		--sysconfdir=${PREFIX}/etc

 DOCS=		LICENCE META-FAQ README \
@ -60,7 +61,7 @@ PORTEXAMPLES=	zlogin zshenv zshrc
 #EXTRA_COMPLETION_FILES=	_sockstat
 #EXTRA_COMPLETION_DIR=	Completion/BSD/Command

-OPTIONS_DEFINE=	GDBM MEM SECURE_FREE MAILDIR PCRE STATIC DEBUG \
+OPTIONS_DEFINE=	DEBUG ETCDIR GDBM MAILDIR MEM PCRE SECURE_FREE STATIC \
 		DOCS EXAMPLES
 OPTIONS_DEFAULT=SECURE_FREE MAILDIR
 OPTIONS_SUB=	yes
@ -73,13 +74,16 @@ GDBM_DESC=		Enable GDBM support (GPL)
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ENABLE=	gdbm

-MAILDIR_DESC=		Enable support for Maildirs in MAIL(PATH)
+ETCDIR_DESC=		System-wide defaults in /etc (instead of $${PREFIX}/etc)
+ETCDIR_CONFIGURE_OFF=	--enable-etcdir=${PREFIX}/etc
+
+MAILDIR_DESC=			Enable support for Maildirs in MAIL(PATH)
 MAILDIR_CONFIGURE_ENABLE=	maildir-support

 MEM_DESC=		Enable zsh-mem options
 MEM_CONFIGURE_ENABLE=	zsh-mem

-SECURE_FREE_DESC=	Enable zsh-secure-free
+SECURE_FREE_DESC=		Enable zsh-secure-free
 SECURE_FREE_CONFIGURE_ENABLE=	zsh-secure-free

 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
--- a/shells/zsh/files/pkg-message.in
+++ b/shells/zsh/files/pkg-message.in
@ -0,0 +1,10 @@
+==========================================================
+
+By default, zsh looks for system-wide defaults in
+%%PREFIX%%/etc.
+
+If you previously set up /etc/zprofile, /etc/zshenv, etc.,
+either move them to %%PREFIX%%/etc or rebuild zsh with the
+ETCDIR option enabled.
+
+==========================================================
--- a/sysutils/py-supervisor/Makefile
+++ b/sysutils/py-supervisor/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	supervisor
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.3.0
 PORTEPOCH=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
--- a/sysutils/py-supervisor/distinfo
+++ b/sysutils/py-supervisor/distinfo
@ -1,2 +1,3 @@
-SHA256 (supervisor-3.0.tar.gz) = 82aac54c5760b6a4f4c28dda203714e362a68b4a9ba8549fa65955998e3a2212
-SIZE (supervisor-3.0.tar.gz) = 459820
+TIMESTAMP = 1465394448
+SHA256 (supervisor-3.3.0.tar.gz) = 3176fb8a78c60164020e252e4a2b50b039cfec1f410b4562a843b66186188652
+SIZE (supervisor-3.3.0.tar.gz) = 416329
--- a/sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py
+++ b/sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py
@ -1,71 +1,85 @@
--- supervisor/tests/test_options.py.old	2013-08-23 15:04:37.000000000 +0400
-+++ supervisor/tests/test_options.py	2013-08-23 15:07:45.000000000 +0400
-@@ -56,12 +56,12 @@
-                     short='p:', long='other=', handler=integer)
-         return options
+--- supervisor/tests/test_options.py.orig	2016-05-14 21:19:49.000000000 +0300
+++ supervisor/tests/test_options.py	2016-06-08 17:05:08.114929000 +0300
+@@ -157,15 +157,15 @@ class OptionTests(unittest.TestCase):
+             short=False,
+             )
 
 -    def test_searchpaths(self):
 -        options = self._makeOptions()
-        self.assertEquals(len(options.searchpaths), 5)
-        self.assertTrue('supervisord.conf' in options.searchpaths)
-        self.assertTrue('etc/supervisord.conf' in options.searchpaths)
-        self.assertTrue('/etc/supervisord.conf' in options.searchpaths)
+-        self.assertEqual(len(options.searchpaths), 6)
+-        self.assertEqual(options.searchpaths[-4:], [
+-            'supervisord.conf',
+-            'etc/supervisord.conf',
+-            '/etc/supervisord.conf',
+-            '/etc/supervisor/supervisord.conf',
+-            ])
 +#    def test_searchpaths(self):
 +#        options = self._makeOptions()
-+#        self.assertEquals(len(options.searchpaths), 5)
-+#        self.assertTrue('supervisord.conf' in options.searchpaths)
-+#        self.assertTrue('etc/supervisord.conf' in options.searchpaths)
-+#        self.assertTrue('/etc/supervisord.conf' in options.searchpaths)
+#        self.assertEqual(len(options.searchpaths), 6)
+#        self.assertEqual(options.searchpaths[-4:], [
+#            'supervisord.conf',
+#            'etc/supervisord.conf',
+#            '/etc/supervisord.conf',
+#            '/etc/supervisor/supervisord.conf',
+#            ])
 
     def test_options_and_args_order(self):
         # Only config file exists
-@@ -209,15 +209,15 @@
-         else:
-             self.fail("expected exception")
+@@ -352,17 +352,17 @@ class ClientOptionsTests(unittest.TestCa
+         except ValueError, exc:
+             self.assertTrue("could not find config file" in exc.args[0])
 
-        tempf = tempfile.NamedTemporaryFile()
-        os.chmod(tempf.name, 0) # Removing read perms
+-    def test_read_config_unreadable(self):
+-        instance = self._makeOne()
+-        def dummy_open(fn, mode):
+-            raise IOError(errno.EACCES, 'Permission denied: %s' % fn)
+-        instance.open = dummy_open
+-
 -        try:
-            instance.read_config(tempf.name)
-        except ValueError, e:
-            self.assertTrue("could not read config file" in str(e))
-        else:
+-            instance.read_config(__file__)
 -            self.fail("expected exception")
-        tempf.close()
-+#        tempf = tempfile.NamedTemporaryFile()
-+#        os.chmod(tempf.name, 0) # Removing read perms
+-        except ValueError, exc:
+-            self.assertTrue("could not read config file" in exc.args[0])
+#    def test_read_config_unreadable(self):
+#        instance = self._makeOne()
+#        def dummy_open(fn, mode):
+#            raise IOError(errno.EACCES, 'Permission denied: %s' % fn)
+#        instance.open = dummy_open
+
 +#        try:
-+#            instance.read_config(tempf.name)
-+#        except ValueError, e:
-+#            self.assertTrue("could not read config file" in str(e))
-+#        else:
+#            instance.read_config(__file__)
 +#            self.fail("expected exception")
-+#        tempf.close()
+#        except ValueError, exc:
+#            self.assertTrue("could not read config file" in exc.args[0])
 
-     def test_options_unixsocket_cli(self):
-         from StringIO import StringIO
-@@ -616,15 +616,15 @@
-         else:
-             self.fail("expected exception")
+     def test_read_config_no_supervisord_section_raises_valueerror(self):
+         instance = self._makeOne()
+@@ -803,17 +803,17 @@ class ServerOptionsTests(unittest.TestCa
+         except ValueError, exc:
+             self.assertTrue("could not find config file" in exc.args[0])
 
-        tempf = tempfile.NamedTemporaryFile()
-        os.chmod(tempf.name, 0) # Removing read perms
+-    def test_read_config_unreadable(self):
+-        instance = self._makeOne()
+-        def dummy_open(fn, mode):
+-            raise IOError(errno.EACCES, 'Permission denied: %s' % fn)
+-        instance.open = dummy_open
+-
 -        try:
-            instance.read_config(tempf.name)
-        except ValueError, e:
-            self.assertTrue("could not read config file" in str(e))
-        else:
-            self.fail("expected exception")
-        tempf.close()
-+#        tempf = tempfile.NamedTemporaryFile()
-+#        os.chmod(tempf.name, 0) # Removing read perms
+-            instance.read_config(__file__)
+-            self.fail("nothing raised")
+-        except ValueError, exc:
+-            self.assertTrue("could not read config file" in exc.args[0])
+#    def test_read_config_unreadable(self):
+#        instance = self._makeOne()
+#        def dummy_open(fn, mode):
+#            raise IOError(errno.EACCES, 'Permission denied: %s' % fn)
+#        instance.open = dummy_open
+
 +#        try:
-+#            instance.read_config(tempf.name)
-+#        except ValueError, e:
-+#            self.assertTrue("could not read config file" in str(e))
-+#        else:
-+#            self.fail("expected exception")
-+#        tempf.close()
+#            instance.read_config(__file__)
+#            self.fail("nothing raised")
+#        except ValueError, exc:
+#            self.assertTrue("could not read config file" in exc.args[0])
 
-     def test_readFile_failed(self):
-         from supervisor.options import readFile
+     def test_read_config_malformed_config_file_raises_valueerror(self):
+         instance = self._makeOne()
--- a/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py
+++ b/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py
@ -1,13 +1,18 @@
--- supervisor/tests/test_supervisorctl.py.old	2013-05-27 06:39:09.000000000 +0400
-+++ supervisor/tests/test_supervisorctl.py	2013-08-23 15:06:11.000000000 +0400
-@@ -889,19 +889,19 @@
+--- supervisor/tests/test_supervisorctl.py.orig	2016-06-08 17:08:09.404989000 +0300
+++ supervisor/tests/test_supervisorctl.py	2016-06-08 17:08:32.361939000 +0300
+@@ -1562,23 +1562,23 @@ class TestDefaultControllerPlugin(unitte
         val = plugin.ctl.stdout.getvalue()
-         self.failUnless(val.startswith('Error: bad argument wrong'), val)
+         self.assertTrue(val.startswith('Error: bad argument wrong'), val)
 
-    def test_maintail_dashf(self):
+-    def _dont_test_maintail_dashf(self):
+#    def _dont_test_maintail_dashf(self):
+         # https://github.com/Supervisor/supervisor/issues/285
+         # TODO: Refactor so we can test more of maintail -f than just a
+         # connect error, and fix this test so it passes on FreeBSD.
 -        plugin = self._makeOne()
 -        plugin.listener = DummyListener()
 -        result = plugin.do_maintail('-f')
+-        self.assertEqual(result, None)
 -        errors = plugin.listener.errors
 -        self.assertEqual(len(errors), 1)
 -        error = errors[0]
@ -17,10 +22,10 @@
 -                         'http://localhost:65532/mainlogtail')
 -        for msg in ('Cannot connect', 'socket.error'):
 -            self.assertTrue(msg in error[1])
-+#    def test_maintail_dashf(self):
 +#        plugin = self._makeOne()
 +#        plugin.listener = DummyListener()
 +#        result = plugin.do_maintail('-f')
+#        self.assertEqual(result, None)
 +#        errors = plugin.listener.errors
 +#        self.assertEqual(len(errors), 1)
 +#        error = errors[0]
@ -31,5 +36,5 @@
 +#        for msg in ('Cannot connect', 'socket.error'):
 +#            self.assertTrue(msg in error[1])
 
-     def test_maintail_nobytes(self):
+     def test_maintail_bad_modifier(self):
         plugin = self._makeOne()
--- a/sysutils/py-supervisor/files/patch-supervisor_options.py
+++ b/sysutils/py-supervisor/files/patch-supervisor_options.py
@ -1,14 +1,17 @@
--- supervisor/options.py.orig	2013-06-20 21:00:12.000000000 +0400
-+++ supervisor/options.py	2013-08-08 14:41:08.000000000 +0400
-@@ -99,10 +99,7 @@
+--- supervisor/options.py.orig	2016-06-08 17:09:41.213297000 +0300
+++ supervisor/options.py	2016-06-08 17:10:18.970354000 +0300
+@@ -96,13 +96,7 @@ class Options:
         self.add("configfile", None, "c:", "configuration=")
 
         here = os.path.dirname(os.path.dirname(sys.argv[0]))
 -        searchpaths = [os.path.join(here, 'etc', 'supervisord.conf'),
 -                       os.path.join(here, 'supervisord.conf'),
-                       'supervisord.conf', 'etc/supervisord.conf',
-                       '/etc/supervisord.conf']
-+        searchpaths = [ '/usr/local/etc/supervisord.conf' ]
+-                       'supervisord.conf',
+-                       'etc/supervisord.conf',
+-                       '/etc/supervisord.conf',
+-                       '/etc/supervisor/supervisord.conf',
+-                       ]
+        searchpaths = [ '%%PREFIX%%/etc/supervisord.conf' ]
         self.searchpaths = searchpaths
 
-     def default_configfile(self):
+         self.environ_expansions = {}
--- a/textproc/Makefile
+++ b/textproc/Makefile
@ -1219,6 +1219,7 @@
    SUBDIR += py-acora
    SUBDIR += py-alabaster
    SUBDIR += py-asv
+    SUBDIR += py-beautifulsoup4
    SUBDIR += py-bugzillatools
    SUBDIR += py-chardet
    SUBDIR += py-cloud_sptheme
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	XML-LibXML
-PORTVERSION=	2.0125
+PORTVERSION=	2.0126
 PORTEPOCH=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
--- a/textproc/p5-XML-LibXML/distinfo
+++ b/textproc/p5-XML-LibXML/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1466520145
-SHA256 (XML-LibXML-2.0125.tar.gz) = 01407fe313893dabb138a817897277dbdabcd0cbcbaca4628a16b7cb6fd86bd7
-SIZE (XML-LibXML-2.0125.tar.gz) = 465206
+TIMESTAMP = 1466792096
+SHA256 (XML-LibXML-2.0126.tar.gz) = 0e735ab72e2ba77070a58a737fd6c61fa6aa198527abc59a5d5627f0650a60af
+SIZE (XML-LibXML-2.0126.tar.gz) = 465800
--- a/textproc/pugixml/Makefile
+++ b/textproc/pugixml/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	pugixml
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.7
 CATEGORIES=	textproc
 MASTER_SITES=	http://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/

--- a/textproc/pugixml/distinfo
+++ b/textproc/pugixml/distinfo
@ -1,2 +1,2 @@
-SHA256 (pugixml-1.6.tar.gz) = 473705c496d45ee6a74f73622b175dfb5dde0de372c4dc61a5acb964516cd9de
-SIZE (pugixml-1.6.tar.gz) = 346616
+SHA256 (pugixml-1.7.tar.gz) = fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca
+SIZE (pugixml-1.7.tar.gz) = 354472
--- a/textproc/pugixml/files/patch-scripts_CMakeLists.txt
+++ b/textproc/pugixml/files/patch-scripts_CMakeLists.txt
@ -1,18 +1,23 @@
--- scripts/CMakeLists.txt.orig	2015-03-25 03:19:09 UTC
-+++ scripts/CMakeLists.txt
-@@ -16,19 +16,16 @@ if(DEFINED BUILD_DEFINES)
- 	add_definitions(${BUILD_DEFINES})
+--- scripts/CMakeLists.txt.orig	2015-10-19 06:15:50.000000000 +0300
+++ scripts/CMakeLists.txt	2016-06-20 22:08:33.133152000 +0300
+@@ -19,27 +19,19 @@
+ 	endforeach()
 endif()
 
 -if(BUILD_SHARED_LIBS)
-    add_library(pugixml SHARED ${SOURCES})
+-	add_library(pugixml SHARED ${SOURCES})
 -else()
-    add_library(pugixml STATIC ${SOURCES})
+-	add_library(pugixml STATIC ${SOURCES})
+-endif()
+-
+-# Enable C++11 long long for compilers that are capable of it
+-if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
+-	target_compile_features(pugixml PUBLIC cxx_long_long_type)
 -endif()
 +add_library(pugixml SHARED ${SOURCES})
 +add_library(pugixml_static STATIC ${SOURCES})
 
- set_target_properties(pugixml PROPERTIES VERSION 1.6 SOVERSION 1)
+ set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1)
 +set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml)
 
 -install(TARGETS pugixml EXPORT pugixml-config 
@ -24,3 +29,6 @@
 
 install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 -install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+ 
+ if(BUILD_TESTS)
+ 	file(GLOB TEST_SOURCES ../tests/*.cpp)
--- a/textproc/pugixml/pkg-plist
+++ b/textproc/pugixml/pkg-plist
@ -3,4 +3,4 @@ include/pugixml.hpp
 lib/libpugixml.a
 lib/libpugixml.so
 lib/libpugixml.so.1
-lib/libpugixml.so.1.6
+lib/libpugixml.so.1.7
--- a/textproc/py-beautifulsoup4/Makefile
+++ b/textproc/py-beautifulsoup4/Makefile
@ -0,0 +1,35 @@
+# Created by: Carlos J. Puga Medina <cpm@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	beautifulsoup4
+PORTVERSION=	4.4.1
+CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	cpm@FreeBSD.org
+COMMENT=	Python screen-scraping library
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
+
+OPTIONS_DEFINE=	DOCS
+
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+DOCS_PORTDOCS=	*
+DOCS_VARS=	PYDISTUTILS_BUILD_TARGET=build_ext
+
+USES=		python:3
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+post-build-DOCS-on:
+	(cd ${WRKSRC}/doc ; ${MAKE} html)
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/build/html && \
+	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")
+
+.include <bsd.port.mk>
--- a/textproc/py-beautifulsoup4/distinfo
+++ b/textproc/py-beautifulsoup4/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1466692802
+SHA256 (beautifulsoup4-4.4.1.tar.gz) = 87d4013d0625d4789a4f56b8d79a04d5ce6db1152bb65f1d39744f7709a366b4
+SIZE (beautifulsoup4-4.4.1.tar.gz) = 152140
--- a/textproc/py-beautifulsoup4/pkg-descr
+++ b/textproc/py-beautifulsoup4/pkg-descr
@ -0,0 +1,18 @@
+Beautiful Soup is a Python library designed for quick turnaround projects like
+screen-scraping.
+
+Three features make it powerful:
+
+1. Beautiful Soup provides a few simple methods and Pythonic idioms for
+navigating, searching, and modifying a parse tree: a toolkit for dissecting
+a document and extracting what you need. It doesn't take much code to write
+an application.
+2. Beautiful Soup automatically converts incoming documents to Unicode and
+outgoing documents to UTF-8. You don't have to think about encodings, unless
+the document doesn't specify an encoding and Beautiful Soup can't detect one.
+Then you just have to specify the original encoding.
+3. Beautiful Soup sits on top of popular Python parsers like lxml and html5lib,
+allowing you to try out different parsing strategies or trade speed for
+flexibility.
+
+WWW: https://www.crummy.com/software/BeautifulSoup/
--- a/www/Makefile
+++ b/www/Makefile
@ -212,6 +212,7 @@
    SUBDIR += gpx2map
    SUBDIR += grafana
    SUBDIR += grafana2
+    SUBDIR += grafana3
    SUBDIR += grails
    SUBDIR += graylog-web-interface
    SUBDIR += gregarius
@ -1812,6 +1813,7 @@
    SUBDIR += red5
    SUBDIR += redaxo
    SUBDIR += redmine
+    SUBDIR += redmine-a_common_libs
    SUBDIR += redmine-backlogs
    SUBDIR += redmine-basecamp
    SUBDIR += redmine-default_assign
@ -1822,6 +1824,7 @@
    SUBDIR += redmine-qa_contact
    SUBDIR += redmine-redcarpet_formatter
    SUBDIR += redmine-sidebar_hide
+    SUBDIR += redmine-single_auth
    SUBDIR += redmine-stuff_to_do
    SUBDIR += redmine-wiki_notes
    SUBDIR += rejik
--- a/www/grafana3/Makefile
+++ b/www/grafana3/Makefile
@ -0,0 +1,256 @@
+# $FreeBSD$
+
+PORTNAME=	grafana3
+PORTVERSION=	3.0.4
+DISTVERSIONPREFIX=	v
+CATEGORIES=	www
+
+MAINTAINER=	john@pcbsd.org
+COMMENT=	Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+
+ONLY_FOR_ARCHS=	i386 amd64
+
+USE_RC_SUBR=	grafana3
+
+USES=	compiler
+
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	grafana BurntSushi:toml Unknwon:com aws:aws_sdk_go \
+	bmizerany:assert bradfitz:gomemcache codegangsta:cli \
+	davecgh:go_spew fatih:color franela:goreq go-ini:ini go-ldap:ldap \
+	go-macaron:binding,gzip,inject,session go-sql-driver:mysql \
+	go-stack:stack go-xorm:core,xorm gorilla:websocket gosimple:slug \
+	hashicorp:go_version inconshreveable:log15 jmespath:go_jmespath \
+	jtolds:gls klauspost:compress,cpuid,crc32 kr:pretty,text lib:pq \
+	mattn:go_colorable,go_isatty,go_sqlite3 rainycape:unidecode \
+	smartystreets:goconvey streadway:amqp golang:net,oauth2,sys \
+	go-asn1-ber:asn1_ber go-bufio:bufio go-macaron:macaron \
+	go-redis:redis jhixson74:grafana_public
+
+GH_PROJECT=	grafana toml:toml com:com aws-sdk-go:aws_sdk_go \
+	assert:assert gomemcache:gomemcache cli:cli go-spew:go_spew \
+	color:color goreq:goreq ini:ini ldap:ldap binding:binding \
+	gzip:gzip inject:inject session:session mysql:mysql stack:stack \
+	core:core xorm:xorm websocket:websocket slug:slug \
+	go-version:go_version log15:log15 go-jmespath:go_jmespath gls:gls \
+	compress:compress cpuid:cpuid crc32:crc32 pretty:pretty text:text \
+	pq:pq go-colorable:go_colorable go-isatty:go_isatty \
+	go-sqlite3:go_sqlite3 unidecode:unidecode goconvey:goconvey \
+	amqp:amqp net:net oauth2:oauth2 sys:sys asn1-ber:asn1_ber \
+	bufio:bufio macaron:macaron redis:redis grafana_public:grafana_public
+
+GH_TAGNAME=	0daadc9 v0.2.0:toml v1:com v1.1.36:aws_sdk_go \
+	release.r60:assert release.r60:gomemcache v1.17.0:cli \
+	5215b55:go_spew v0.1:color fc08df6:goreq v1.12.0:ini v2.3.0:ldap \
+	bd00823:binding cad1c65:gzip c5ab7bf:inject 66031fc:session \
+	v1.2:mysql v1.5.2:stack v0.5.3:core v0.5.3:xorm v1.0.0:websocket \
+	v1.0:slug 0181db4:go_version v2.11:log15  0b12d6b:go_jmespath \
+	v4.2.0:gls v1.0:compress v1.0:cpuid v1.0:crc32 add1dbc:pretty \
+	7cafcd8:text e2402a7:pq v0.0.5:go_colorable v0.0.1:go_isatty \
+	v1.1.0:go_sqlite3 cb7f23e:unidecode c53abc9:goconvey 2e25825:amqp \
+	bc3663d:net 65a8d08:oauth2 62bee03:sys v1:asn1_ber v1:bufio \
+	v1:macaron v2:redis v3.0.4:grafana_public
+
+GRAFANA_USER?=	grafana
+GRAFANA_GROUP?=	grafana
+
+USERS=	${GRAFANA_USER}
+GROUPS=	${GRAFANA_GROUP}
+
+GRAFANAHOMEDIR= ${PREFIX}/share/grafana/
+GRAFANADATADIR= /var/db/${PORTNAME}/
+GRAFANALOGDIR=  /var/log/${PORTNAME}/
+GRAFANAPIDDIR=  /var/run/${PORTNAME}/
+GRAFANAPLUGINDIR= /var/db/${PORTNAME}/plugins
+GRAFANADASHBOARDDIR= /var/db/${PORTNAME}/dashboards
+
+SUB_FILES=  grafana3 grafana3.conf
+SUB_LIST+=  GRAFANA_USER=${GRAFANA_USER} \
+    GRAFANA_GROUP=${GRAFANA_GROUP} \
+    GRAFANADATADIR=${GRAFANADATADIR} \
+    GRAFANALOGDIR=${GRAFANALOGDIR} \
+    GRAFANAPIDDIR=${GRAFANAPIDDIR} \
+    GRAFANAHOMEDIR=${GRAFANAHOMEDIR} \
+	GRAFANAPLUGINDIR=${GRAFANAPLUGINDIR} \
+	GRAFANADASHBOARDDIR=${GRAFANADASHBOARDDIR}
+
+PLIST_SUB+=	GRAFANAHOMEDIR=${GRAFANAHOMEDIR}
+
+STRIP=
+
+post-extract:
+	@${MKDIR} ${WRKSRC}/src/github.com/grafana/grafana
+.for src in .bowerrc .bra.toml .editorconfig .github .gitignore .hooks \
+	.jscs.json .jsfmtrc .jshintrc appveyor.yml benchmarks bower.json \
+	build.go CHANGELOG.md circle.yml conf docker docs emails examples \
+	Godeps Gruntfile.js karma.conf.js latest.json LICENSE.md Makefile \
+	NOTICE.md package.json packaging pkg public README.md symlink_git_hooks.sh \
+	tasks test.sh tests trigger_grafana_packer.sh tsconfig.json \
+	tsd.json tslint.json vendor
+	@${MV} ${WRKSRC}/${src} \
+		${WRKSRC}/src/github.com/grafana/grafana
+.endfor
+	@${MKDIR} ${WRKSRC}/src/github.com/BurntSushi
+	@${MKDIR} ${WRKSRC}/src/github.com/Unknwon
+	@${MKDIR} ${WRKSRC}/src/github.com/aws
+	@${MKDIR} ${WRKSRC}/src/github.com/bmizerany
+	@${MKDIR} ${WRKSRC}/src/github.com/bradfitz
+	@${MKDIR} ${WRKSRC}/src/github.com/codegangsta
+	@${MKDIR} ${WRKSRC}/src/github.com/davecgh
+	@${MKDIR} ${WRKSRC}/src/github.com/fatih
+	@${MKDIR} ${WRKSRC}/src/github.com/franela
+	@${MKDIR} ${WRKSRC}/src/github.com/go-ini
+	@${MKDIR} ${WRKSRC}/src/github.com/go-ldap
+	@${MKDIR} ${WRKSRC}/src/github.com/go-macaron
+	@${MKDIR} ${WRKSRC}/src/github.com/go-sql-driver
+	@${MKDIR} ${WRKSRC}/src/github.com/go-stack
+	@${MKDIR} ${WRKSRC}/src/github.com/go-xorm
+	@${MKDIR} ${WRKSRC}/src/github.com/gorilla
+	@${MKDIR} ${WRKSRC}/src/github.com/gosimple
+	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp
+	@${MKDIR} ${WRKSRC}/src/github.com/inconshreveable
+	@${MKDIR} ${WRKSRC}/src/github.com/jmespath
+	@${MKDIR} ${WRKSRC}/src/github.com/jtolds
+	@${MKDIR} ${WRKSRC}/src/github.com/klauspost
+	@${MKDIR} ${WRKSRC}/src/github.com/kr
+	@${MKDIR} ${WRKSRC}/src/github.com/lib
+	@${MKDIR} ${WRKSRC}/src/github.com/mattn
+	@${MKDIR} ${WRKSRC}/src/github.com/rainycape
+	@${MKDIR} ${WRKSRC}/src/github.com/smartystreets
+	@${MKDIR} ${WRKSRC}/src/github.com/streadway
+	@${MKDIR} ${WRKSRC}/src/golang.org/x
+	@${MKDIR} ${WRKSRC}/src/gopkg.in/asn1-ber.v1
+	@${MKDIR} ${WRKSRC}/src/gopkg.in/bufio.v1
+	@${MKDIR} ${WRKSRC}/src/gopkg.in/ini.v1
+	@${MKDIR} ${WRKSRC}/src/gopkg.in/macaron.v1
+	@${MKDIR} ${WRKSRC}/src/gopkg.in/redis.v2
+	@${MV} ${WRKSRC_toml} \
+		${WRKSRC}/src/github.com/BurntSushi/toml
+	@${MV} ${WRKSRC_com} \
+		${WRKSRC}/src/github.com/Unknwon/com
+	@${MV} ${WRKSRC_aws_sdk_go} \
+		${WRKSRC}/src/github.com/aws/aws-sdk-go
+	@${MV} ${WRKSRC_assert} \
+		${WRKSRC}/src/github.com/bmizerany/assert
+	@${MV} ${WRKSRC_gomemcache} \
+		${WRKSRC}/src/github.com/bradfitz/gomemcache
+	@${MV} ${WRKSRC_cli} \
+		${WRKSRC}/src/github.com/codegangsta/cli
+	@${MV} ${WRKSRC_go_spew} \
+		${WRKSRC}/src/github.com/davecgh/go-spew
+	@${MV} ${WRKSRC_color} \
+		${WRKSRC}/src/github.com/fatih/color
+	@${MV} ${WRKSRC_goreq} \
+		${WRKSRC}/src/github.com/franela/goreq
+	@${MV} ${WRKSRC_ldap} \
+		${WRKSRC}/src/github.com/go-ldap/ldap
+	@${MV} ${WRKSRC_binding} \
+		${WRKSRC}/src/github.com/go-macaron/binding
+	@${MV} ${WRKSRC_gzip} \
+		${WRKSRC}/src/github.com/go-macaron/gzip
+	@${MV} ${WRKSRC_inject} \
+		${WRKSRC}/src/github.com/go-macaron/inject
+	@${MV} ${WRKSRC_session} \
+		${WRKSRC}/src/github.com/go-macaron/session
+	@${MV} ${WRKSRC_mysql} \
+		${WRKSRC}/src/github.com/go-sql-driver/mysql
+	@${MV} ${WRKSRC_stack} \
+		${WRKSRC}/src/github.com/go-stack/stack
+	@${MV} ${WRKSRC_core} \
+		${WRKSRC}/src/github.com/go-xorm/core
+	@${MV} ${WRKSRC_xorm} \
+		${WRKSRC}/src/github.com/go-xorm/xorm
+	@${MV} ${WRKSRC_websocket} \
+		${WRKSRC}/src/github.com/gorilla/websocket
+	@${MV} ${WRKSRC_slug} \
+		${WRKSRC}/src/github.com/gosimple/slug
+	@${MV} ${WRKSRC_go_version} \
+		${WRKSRC}/src/github.com/hashicorp/go-version
+	@${MV} ${WRKSRC_log15} \
+		${WRKSRC}/src/github.com/inconshreveable/log15
+	@${MV} ${WRKSRC_go_jmespath} \
+		${WRKSRC}/src/github.com/jmespath/go-jmespath
+	@${MV} ${WRKSRC_gls} \
+		${WRKSRC}/src/github.com/jtolds/gls
+	@${MV} ${WRKSRC_compress} \
+		${WRKSRC}/src/github.com/klauspost/compress
+	@${MV} ${WRKSRC_cpuid} \
+		${WRKSRC}/src/github.com/klauspost/cpuid
+	@${MV} ${WRKSRC_crc32} \
+		${WRKSRC}/src/github.com/klauspost/crc32
+	@${MV} ${WRKSRC_pretty} \
+		${WRKSRC}/src/github.com/kr/pretty
+	@${MV} ${WRKSRC_text} \
+		${WRKSRC}/src/github.com/kr/text
+	@${MV} ${WRKSRC_pq} \
+		${WRKSRC}/src/github.com/lib/pq
+	@${MV} ${WRKSRC_go_colorable} \
+		${WRKSRC}/src/github.com/mattn/go-colorable
+	@${MV} ${WRKSRC_go_isatty} \
+		${WRKSRC}/src/github.com/mattn/go-isatty
+	@${MV} ${WRKSRC_go_sqlite3} \
+		${WRKSRC}/src/github.com/mattn/go-sqlite3
+	@${MV} ${WRKSRC_unidecode} \
+		${WRKSRC}/src/github.com/rainycape/unidecode
+	@${MV} ${WRKSRC_goconvey} \
+		${WRKSRC}/src/github.com/smartystreets/goconvey
+	@${MV} ${WRKSRC_amqp} \
+		${WRKSRC}/src/github.com/streadway/amqp
+	@${MV} ${WRKSRC_net} \
+		${WRKSRC}/src/golang.org/x/net
+	@${MV} ${WRKSRC_oauth2} \
+		${WRKSRC}/src/golang.org/x/oauth2
+	@${MV} ${WRKSRC_sys} \
+		${WRKSRC}/src/golang.org/x/sys
+	@${MV} ${WRKSRC_asn1_ber} \
+		${WRKSRC}/src/gopkg.in/asn1-ber.v1
+	@${MV} ${WRKSRC_bufio} \
+		${WRKSRC}/src/gopkg.in/bufio.v1
+	@${MV} ${WRKSRC_ini} \
+		${WRKSRC}/src/gopkg.in/ini.v1
+	@${MV} ${WRKSRC_macaron} \
+		${WRKSRC}/src/gopkg.in/macaron.v1
+	@${MV} ${WRKSRC_redis} \
+		${WRKSRC}/src/gopkg.in/redis.v2
+
+	${RM} -rf ${WRKSRC}/src/github.com/grafana/grafana/public
+	${MV} ${WRKSRC_grafana_public} ${WRKSRC}/src/github.com/grafana/grafana/public
+	${MV} ${WRKSRC}/src/github.com/grafana/grafana/public/public_gen \
+		${WRKSRC}/src/github.com/grafana/grafana/public_gen
+
+do-build:
+	cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana; \
+		${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go run build.go build
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \
+		${STAGEDIR}${PREFIX}/bin/grafana-server
+	cd ${WRKSRC}/src/github.com/grafana/grafana && \
+		${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana
+	cd ${WRKSRC}/src/github.com/grafana/grafana && \
+		${COPYTREE_SHARE} public_gen ${STAGEDIR}${PREFIX}/share/grafana
+	${MKDIR} ${STAGEDIR}${GRAFANAPIDDIR}
+	${MKDIR} ${STAGEDIR}${GRAFANALOGDIR}
+	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}
+	${MKDIR} ${STAGEDIR}${GRAFANADATADIR}
+	${MKDIR} ${STAGEDIR}${GRAFANAPLUGINDIR}
+	${MKDIR} ${STAGEDIR}${GRAFANADASHBOARDDIR}
+	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/conf
+	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data
+	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log
+	${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \
+		${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini
+	${INSTALL_DATA} ${WRKDIR}/grafana3.conf ${STAGEDIR}${PREFIX}/etc/grafana3.conf.sample
+
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == clang
+BUILD_ENV=	CC=clang
+.endif
+
+.include <bsd.port.post.mk>
--- a/www/grafana3/distinfo
+++ b/www/grafana3/distinfo
@ -0,0 +1,92 @@
+SHA256 (grafana-grafana-v3.0.4-0daadc9_GH0.tar.gz) = 25cf84e526807aa2c8dea994f630696e63c0839a3f6f7b5646abb0810f99b046
+SIZE (grafana-grafana-v3.0.4-0daadc9_GH0.tar.gz) = 7334066
+SHA256 (BurntSushi-toml-v0.2.0_GH0.tar.gz) = 4d496e400019fd050ff569952befb464f03ed586cb475640bdc206fe5c2b75cc
+SIZE (BurntSushi-toml-v0.2.0_GH0.tar.gz) = 38304
+SHA256 (Unknwon-com-v1_GH0.tar.gz) = 72e33e86ed4fa24cc1ce5f2d7c79ffd4889ef3afd1da68a0b3a23bc4b60d7b88
+SIZE (Unknwon-com-v1_GH0.tar.gz) = 19798
+SHA256 (aws-aws-sdk-go-v1.1.36_GH0.tar.gz) = b6eac028bc59cfb9d4149dd69547576f015896aa3538941e9d48e586241c3e9b
+SIZE (aws-aws-sdk-go-v1.1.36_GH0.tar.gz) = 3468992
+SHA256 (bmizerany-assert-release.r60_GH0.tar.gz) = a8219c385ddc6fc5988fba61b57a5d24838864b9710736ba51db3fa88a545111
+SIZE (bmizerany-assert-release.r60_GH0.tar.gz) = 1533
+SHA256 (bradfitz-gomemcache-release.r60_GH0.tar.gz) = 5bf98669ae74376230d43fc6acec6fd00a956df2b7fe9419f02899280c2e9123
+SIZE (bradfitz-gomemcache-release.r60_GH0.tar.gz) = 7614
+SHA256 (codegangsta-cli-v1.17.0_GH0.tar.gz) = 3a96a1a35684c9103c70e3719be28a95cb75a7dfcf330f4e6cb49496f6fa80a0
+SIZE (codegangsta-cli-v1.17.0_GH0.tar.gz) = 39424
+SHA256 (davecgh-go-spew-5215b55_GH0.tar.gz) = a73d6352d8172dfb648e6aa25a8b81ed5c1895295090c876bef01d017264cbac
+SIZE (davecgh-go-spew-5215b55_GH0.tar.gz) = 41794
+SHA256 (fatih-color-v0.1_GH0.tar.gz) = adebf2c2afd05583decd3bf3be52bedf8d06b7df6c5aa4826be4ad2629da180a
+SIZE (fatih-color-v0.1_GH0.tar.gz) = 6684
+SHA256 (franela-goreq-fc08df6_GH0.tar.gz) = 1827e98c8749952c7969e1f9afe2b21d8ecc995393c862f4d4fdcf96141562b1
+SIZE (franela-goreq-fc08df6_GH0.tar.gz) = 14281
+SHA256 (go-ini-ini-v1.12.0_GH0.tar.gz) = 79377b5bf2281d6429a58df8f1374bc80e7464f45633136f398441d807957a6c
+SIZE (go-ini-ini-v1.12.0_GH0.tar.gz) = 29987
+SHA256 (go-ldap-ldap-v2.3.0_GH0.tar.gz) = bc0f0f712f331801a0e56052ad52d87b4f24d147d93d3426c42e22106b97b696
+SIZE (go-ldap-ldap-v2.3.0_GH0.tar.gz) = 27201
+SHA256 (go-macaron-binding-bd00823_GH0.tar.gz) = cbe7d5c111583f8d710f8388fa1c4f4a88a3a345b6c1abcc0fecbc45d8948f7c
+SIZE (go-macaron-binding-bd00823_GH0.tar.gz) = 20243
+SHA256 (go-macaron-gzip-cad1c65_GH0.tar.gz) = 4bbfc799469e95a2c511c011bcaeebecffe3e388fa8734add0c2541f90188fb8
+SIZE (go-macaron-gzip-cad1c65_GH0.tar.gz) = 6445
+SHA256 (go-macaron-inject-c5ab7bf_GH0.tar.gz) = 7479d2968e6358e6176cf394e4874d3afea3972324c4667046bee5b41fb5495c
+SIZE (go-macaron-inject-c5ab7bf_GH0.tar.gz) = 7182
+SHA256 (go-macaron-session-66031fc_GH0.tar.gz) = 2278982d7120dbca8338a89679865535b2c122b7093ff55a80a1bd65fc4a8a23
+SIZE (go-macaron-session-66031fc_GH0.tar.gz) = 17064
+SHA256 (go-sql-driver-mysql-v1.2_GH0.tar.gz) = 3b59eeb0a61146877a0e48eb894d1bf3965b691ae7ee370a9ee84d24417c7dcb
+SIZE (go-sql-driver-mysql-v1.2_GH0.tar.gz) = 45364
+SHA256 (go-stack-stack-v1.5.2_GH0.tar.gz) = 0c6016f54ae51d1faa0b0a9901c3039fe22a49e1dad2816bf3b029088ef56966
+SIZE (go-stack-stack-v1.5.2_GH0.tar.gz) = 6252
+SHA256 (go-xorm-core-v0.5.3_GH0.tar.gz) = 1c6702d4af8ae2ada978025242e55f5f5be3882b4264b2eda3ab576e61666cc5
+SIZE (go-xorm-core-v0.5.3_GH0.tar.gz) = 15793
+SHA256 (go-xorm-xorm-v0.5.3_GH0.tar.gz) = aa0347b76a0b60f5e543e3c691289c73720d302f42e7d1a40ef88be806a8df1a
+SIZE (go-xorm-xorm-v0.5.3_GH0.tar.gz) = 334031
+SHA256 (gorilla-websocket-v1.0.0_GH0.tar.gz) = be1a8e61e8f9d75186ad0ea7bf4a559f9c2b4adab3204e5c86f64eaa878f5f39
+SIZE (gorilla-websocket-v1.0.0_GH0.tar.gz) = 31197
+SHA256 (gosimple-slug-v1.0_GH0.tar.gz) = 31b0a94ea1fbaf9b2736dc18b228aaede01e30d1bddbed44a72a52ac9a3e10f8
+SIZE (gosimple-slug-v1.0_GH0.tar.gz) = 5420
+SHA256 (hashicorp-go-version-0181db4_GH0.tar.gz) = cc15f2e925829e48a45e4a2991ab83fe3b8ca5c5e2d8521d431529f2069b6448
+SIZE (hashicorp-go-version-0181db4_GH0.tar.gz) = 11428
+SHA256 (inconshreveable-log15-v2.11_GH0.tar.gz) = 3ba5babba0c535ef504ff70fadcdaf675a7a53d5ebd352fb970c0853fc94c273
+SIZE (inconshreveable-log15-v2.11_GH0.tar.gz) = 24456
+SHA256 (jmespath-go-jmespath-0b12d6b_GH0.tar.gz) = 67ecbb0fbfd8706f88deb430189504315c88a5628d90a7986d0cb5cb3d3660e8
+SIZE (jmespath-go-jmespath-0b12d6b_GH0.tar.gz) = 48250
+SHA256 (jtolds-gls-v4.2.0_GH0.tar.gz) = 0bfe801887fcaed4fa63a9c63f8a395f09adc75d7706e5276efeef62d488b803
+SIZE (jtolds-gls-v4.2.0_GH0.tar.gz) = 6464
+SHA256 (klauspost-compress-v1.0_GH0.tar.gz) = cc6016f2ad55013da0ed1ea238f01ccac2f74ed2ee485af6763870e9e4267adb
+SIZE (klauspost-compress-v1.0_GH0.tar.gz) = 2668909
+SHA256 (klauspost-cpuid-v1.0_GH0.tar.gz) = 9739cdbf54eb6c26752c37ae567f59d52ceb879bba7b925b161caf920155d43d
+SIZE (klauspost-cpuid-v1.0_GH0.tar.gz) = 205089
+SHA256 (klauspost-crc32-v1.0_GH0.tar.gz) = d86e9545c783e3b972129c3e76f0a29b237fba37b790e4cf3cc0203fde56aaf1
+SIZE (klauspost-crc32-v1.0_GH0.tar.gz) = 9087
+SHA256 (kr-pretty-add1dbc_GH0.tar.gz) = a23dd95835a1a4fcdf67aaf95e87fa000cc581cdd387ef491ab981d02350eb25
+SIZE (kr-pretty-add1dbc_GH0.tar.gz) = 6998
+SHA256 (kr-text-7cafcd8_GH0.tar.gz) = 218bd56a3927283e4c9232b4ee15e0fcc989ace72a2a0be14863ce3795ad3c90
+SIZE (kr-text-7cafcd8_GH0.tar.gz) = 8584
+SHA256 (lib-pq-e2402a7_GH0.tar.gz) = 60f67c4377040b9158f22eb2bdc164d019879bc6680dd57c733a16ebff22d342
+SIZE (lib-pq-e2402a7_GH0.tar.gz) = 70779
+SHA256 (mattn-go-colorable-v0.0.5_GH0.tar.gz) = 8cd5edba9e942ee564359af89c735743046b01ca7c12d9ec45ef5e5c26bc076e
+SIZE (mattn-go-colorable-v0.0.5_GH0.tar.gz) = 5856
+SHA256 (mattn-go-isatty-v0.0.1_GH0.tar.gz) = 71e6931ff2804ef711eae1882fe95beee5b60c38d929c638d553ba143a3bc7ec
+SIZE (mattn-go-isatty-v0.0.1_GH0.tar.gz) = 1950
+SHA256 (mattn-go-sqlite3-v1.1.0_GH0.tar.gz) = ec10e01a91cff2a5102e8ee234cfaedca69207318ee828ab3e16db7004829054
+SIZE (mattn-go-sqlite3-v1.1.0_GH0.tar.gz) = 1501603
+SHA256 (rainycape-unidecode-cb7f23e_GH0.tar.gz) = 99d66dcae0c30f1b22337f313f4cb02bd05926a46d29ccc8528756cb9086acd1
+SIZE (rainycape-unidecode-cb7f23e_GH0.tar.gz) = 387818
+SHA256 (smartystreets-goconvey-c53abc9_GH0.tar.gz) = 7d9741c30876f7c021b5d3f143e19fa610ba0b88f2739b4fbb92f4e75b22c2eb
+SIZE (smartystreets-goconvey-c53abc9_GH0.tar.gz) = 1475128
+SHA256 (streadway-amqp-2e25825_GH0.tar.gz) = 89ba742ea6102a67fd850ca80d0c8f9b22b783f0e0b4b24eb445d758e3196104
+SIZE (streadway-amqp-2e25825_GH0.tar.gz) = 79659
+SHA256 (golang-net-bc3663d_GH0.tar.gz) = ae3bb77d60c3d6533e56c66d5eff3007d66207d2d5da87959168fc8766526b22
+SIZE (golang-net-bc3663d_GH0.tar.gz) = 722948
+SHA256 (golang-oauth2-65a8d08_GH0.tar.gz) = d1866a923e4f241232795edfc15f3e1107414258f22fad81c03814f1ce643808
+SIZE (golang-oauth2-65a8d08_GH0.tar.gz) = 35571
+SHA256 (golang-sys-62bee03_GH0.tar.gz) = bd1f8ba6291cd5f33ec5374261d2050bf52ff949005fe8095a5b37679140cc7a
+SIZE (golang-sys-62bee03_GH0.tar.gz) = 596511
+SHA256 (go-asn1-ber-asn1-ber-v1_GH0.tar.gz) = 46b62858cba2399f019723e0671e5bb6190e8b31e6beccc30ab245c3f2e2ddd4
+SIZE (go-asn1-ber-asn1-ber-v1_GH0.tar.gz) = 5949
+SHA256 (go-bufio-bufio-v1_GH0.tar.gz) = 6d87ae729046b24e9c91695c39cdf5262d3376af950e3d0cfbfd60b03cf15f25
+SIZE (go-bufio-bufio-v1_GH0.tar.gz) = 21833
+SHA256 (go-macaron-macaron-v1_GH0.tar.gz) = 5d37728fd53797b7b55377fad03de6d06a86f0e364b1ad84f7bfbf34e862745f
+SIZE (go-macaron-macaron-v1_GH0.tar.gz) = 127430
+SHA256 (go-redis-redis-v2_GH0.tar.gz) = b8f776107a393f04231a41e81da6c654404562555ebbea4eb9f8c677921583e7
+SIZE (go-redis-redis-v2_GH0.tar.gz) = 27427
+SHA256 (jhixson74-grafana_public-v3.0.4_GH0.tar.gz) = 9b1eb27e741c1894c996dd58dee47d4a84e45ed3abfaafc350c2f5985bf1cd34
+SIZE (jhixson74-grafana_public-v3.0.4_GH0.tar.gz) = 9878767
--- a/www/grafana3/files/grafana3.conf.in
+++ b/www/grafana3/files/grafana3.conf.in
@ -0,0 +1,270 @@
+##################### Grafana Configuration Example #####################
+#
+# Everything has defaults so you only need to uncomment things you want to
+# change
+
+# possible values : production, development
+; app_mode = production
+
+#################################### Paths ####################################
+[paths]
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+#
+data = %%GRAFANADATADIR%%
+#
+# Directory where grafana can store logs
+#
+logs = %%GRAFANALOGDIR%%
+#
+# Directory where grafana will automatically scan and look for plugins
+#
+plugins = %%GRAFANAPLUGINDIR%%
+
+#
+#################################### Server ####################################
+[server]
+# Protocol (http or https)
+;protocol = http
+
+# The ip address to bind to, empty will bind to all interfaces
+;http_addr =
+
+# The http port  to use
+;http_port = 3000
+
+# The public facing domain name used to access grafana from a browser
+;domain = localhost
+
+# Redirect to correct domain if host header does not match domain
+# Prevents DNS rebinding attacks
+;enforce_domain = false
+
+# The full public facing url
+;root_url = %(protocol)s://%(domain)s:%(http_port)s/
+
+# Log web requests
+;router_logging = false
+
+# the path relative working path
+static_root_path = public_gen
+
+# enable gzip
+;enable_gzip = false
+
+# https certs & key file
+;cert_file =
+;cert_key =
+
+#################################### Database ####################################
+[database]
+# Either "mysql", "postgres" or "sqlite3", it's your choice
+;type = sqlite3
+;host = 127.0.0.1:3306
+;name = grafana
+;user = root
+;password =
+
+# For "postgres" only, either "disable", "require" or "verify-full"
+;ssl_mode = disable
+
+# For "sqlite3" only, path relative to data_path setting
+;path = grafana.db
+
+#################################### Session ####################################
+[session]
+# Either "memory", "file", "redis", "mysql", "postgres", default is "file"
+;provider = file
+
+# Provider config options
+# memory: not have any config yet
+# file: session dir path, is relative to grafana data_path
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
+# mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
+# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable
+;provider_config = sessions
+
+# Session cookie name
+;cookie_name = grafana_sess
+
+# If you use session in https only, default is false
+;cookie_secure = false
+
+# Session life time, default is 86400
+;session_life_time = 86400
+
+#################################### Analytics ####################################
+[analytics]
+# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
+# No ip addresses are being tracked, only simple counters to track
+# running instances, dashboard and error counts. It is very helpful to us.
+# Change this option to false to disable reporting.
+;reporting_enabled = true
+
+# Set to false to disable all checks to https://grafana.net
+# for new vesions (grafana itself and plugins), check is used
+# in some UI views to notify that grafana or plugin update exists
+# This option does not cause any auto updates, nor send any information
+# only a GET request to http://grafana.net to get latest versions
+check_for_updates = true
+
+# Google Analytics universal tracking code, only enabled if you specify an id here
+;google_analytics_ua_id =
+
+#################################### Security ####################################
+[security]
+# default admin user, created on startup
+;admin_user = admin
+
+# default admin password, can be changed before first start of grafana,  or in profile settings
+;admin_password = admin
+
+# used for signing
+;secret_key = SW2YcwTIb9zpOOhoPsMm
+
+# Auto-login remember days
+;login_remember_days = 7
+;cookie_username = grafana_user
+;cookie_remember_name = grafana_remember
+
+# disable gravatar profile images
+;disable_gravatar = false
+
+# data source proxy whitelist (ip_or_domain:port seperated by spaces)
+;data_source_proxy_whitelist =
+
+[snapshots]
+# snapshot sharing options
+;external_enabled = true
+;external_snapshot_url = https://snapshots-origin.raintank.io
+;external_snapshot_name = Publish to snapshot.raintank.io
+
+#################################### Users ####################################
+[users]
+# disable user signup / registration
+;allow_sign_up = true
+
+# Allow non admin users to create organizations
+;allow_org_create = true
+
+# Set to true to automatically assign new users to the default organization (id 1)
+;auto_assign_org = true
+
+# Default role new users will be automatically assigned (if disabled above is set to true)
+;auto_assign_org_role = Viewer
+
+# Background text for the user field on the login page
+;login_hint = email or username
+
+#################################### Anonymous Auth ##########################
+[auth.anonymous]
+# enable anonymous access
+;enabled = false
+
+# specify organization name that should be used for unauthenticated users
+;org_name = Main Org.
+
+# specify role for unauthenticated users
+;org_role = Viewer
+
+#################################### Github Auth ##########################
+[auth.github]
+;enabled = false
+;allow_sign_up = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email,read:org
+;auth_url = https://github.com/login/oauth/authorize
+;token_url = https://github.com/login/oauth/access_token
+;api_url = https://api.github.com/user
+;team_ids =
+;allowed_organizations =
+
+#################################### Google Auth ##########################
+[auth.google]
+;enabled = false
+;allow_sign_up = false
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+;auth_url = https://accounts.google.com/o/oauth2/auth
+;token_url = https://accounts.google.com/o/oauth2/token
+;api_url = https://www.googleapis.com/oauth2/v1/userinfo
+;allowed_domains =
+
+#################################### Auth Proxy ##########################
+[auth.proxy]
+;enabled = false
+;header_name = X-WEBAUTH-USER
+;header_property = username
+;auto_sign_up = true
+
+#################################### Basic Auth ##########################
+[auth.basic]
+;enabled = true
+
+#################################### Auth LDAP ##########################
+[auth.ldap]
+;enabled = false
+;config_file = /etc/grafana/ldap.toml
+
+#################################### SMTP / Emailing ##########################
+[smtp]
+;enabled = false
+;host = localhost:25
+;user =
+;password =
+;cert_file =
+;key_file =
+;skip_verify = false
+;from_address = admin@grafana.localhost
+
+[emails]
+;welcome_email_on_sign_up = false
+
+#################################### Logging ##########################
+[log]
+# Either "console", "file", "syslog". Default is console and  file
+# Use comma to separate multiple modes, e.g. "console, file"
+;mode = console, file
+
+# Buffer length of channel, keep it as it is if you don't know what it is.
+;buffer_len = 10000
+
+# Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Info"
+;level = Info
+
+# For "console" mode only
+[log.console]
+;level =
+
+# For "file" mode only
+[log.file]
+;level =
+# This enables automated log rotate(switch of following options), default is true
+;log_rotate = true
+
+# Max line number of single file, default is 1000000
+;max_lines = 1000000
+
+# Max size shift of single file, default is 28 means 1 << 28, 256MB
+;max_lines_shift = 28
+
+# Segment log daily, default is true
+;daily_rotate = true
+
+# Expired days of log file(delete after max days), default is 7
+;max_days = 7
+
+#################################### AMPQ Event Publisher ##########################
+[event_publisher]
+;enabled = false
+;rabbitmq_url = amqp://localhost/
+;exchange = grafana_events
+
+;#################################### Dashboard JSON files ##########################
+[dashboards.json]
+;enabled = false
+path = %%GRAFANADASHBOARDDIR%%
+
+
+
--- a/www/grafana3/files/grafana3.in
+++ b/www/grafana3/files/grafana3.in
@ -0,0 +1,48 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: grafana3
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable grafana
+# grafana_enable="YES"
+#
+# grafana3_enable (bool): 	Set to YES to enable grafana
+#				Default: NO
+# grafana3_conf (str):		grafana configration file
+#				Default: ${PREFIX}/etc/grafana.cfg
+# grafana3_user (str):		grafana daemon user
+#				Default: %%GRAFANA_USER%%
+# grafana3_group (str):		grafana daemon group
+#				Default: %%GRAFANA_GROUP%%
+
+. /etc/rc.subr
+
+name="grafana3"
+rcvar=grafana3_enable
+
+: ${grafana3_enable:="NO"}
+: ${grafana3_user:="%%GRAFANA_USER%%"}
+: ${grafana3_group:="%%GRAFANA_GROUP%%"}
+: ${grafana3_flags:=""}
+: ${grafana3_conf:="%%PREFIX%%/etc/${name}.conf"}
+: ${grafana3_options:="-config=${grafana3_conf} -homepath=%%GRAFANAHOMEDIR%%"}
+
+pidfile="%%GRAFANAPIDDIR%%${name}.pid"
+procname="%%PREFIX%%/bin/grafana-server"
+command=/usr/sbin/daemon
+command_args="-f -c -p ${pidfile} ${procname} ${grafana3_options}"
+start_precmd="grafana_precmd"
+
+grafana_precmd()
+{
+    chown ${grafana3_user}:${grafana3_group} %%GRAFANADATADIR%%
+    chown ${grafana3_user}:${grafana3_group} %%GRAFANALOGDIR%%
+    chown ${grafana3_user}:${grafana3_group} %%GRAFANAHOMEDIR%%data/log/
+    install -o ${grafana3_user} /dev/null ${pidfile}
+}
+
+load_rc_config $name
+run_rc_command "$1"
--- a/www/grafana3/pkg-descr
+++ b/www/grafana3/pkg-descr
@ -0,0 +1,4 @@
+Grafana is an open source, feature rich metrics dashboard
+and graph editor for Graphite, InfluxDB & OpenTSDB.
+
+WWW: https://github.com/grafana/grafana
--- a/www/grafana3/pkg-plist
+++ b/www/grafana3/pkg-plist
--- a/www/p5-Data-Validate-URI/Makefile
+++ b/www/p5-Data-Validate-URI/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Data-Validate-URI
-PORTVERSION=	0.06
-PORTREVISION=	1
+PORTVERSION=	0.07
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -18,5 +17,6 @@ RUN_DEPENDS=	p5-Data-Validate-Domain>=0:dns/p5-Data-Validate-Domain \

 USES=		perl5
 USE_PERL5=	configure
+NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/Show More
+++ b/Show More