*/*: sync with upstream

Taken from: FreeBSD
2016-06-01 06:14:50 +02:00 · 2016-06-01 06:14:50 +02:00 · 335fd7a768
commit 335fd7a768
parent 94ed32dd0d
77 changed files with 12180 additions and 1560 deletions
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@ -15,14 +15,13 @@ RUN_DEPENDS=	chromaprint>=0.4:audio/chromaprint \
 		${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:audio/py-musicbrainz2 \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.5.0:graphics/py-qt4-svg \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5.0:x11-toolkits/py-qt4-gui
+		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing

-USES=		python:2
+USES=		python:2 pyqt:4
 USE_PYTHON=	autoplist distutils
-INSTALLS_ICONS=	yes
+USE_PYQT=	gui_run svg_run
 NO_BUILD=	yes
+NO_ARCH=	yes

 post-patch:
 	@${REINPLACE_CMD} 's|share/man/man1|man/man1|' ${WRKSRC}/setup.py
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@ -15,18 +15,18 @@ MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Structured information storage program

 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE

 BUILD_DEPENDS=	aspell:textproc/aspell
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:net/py-qt4-network \
-		aspell:textproc/aspell
+RUN_DEPENDS=	aspell:textproc/aspell

-WRKSRC=		${WRKDIR}/TreeLine
-USE_QT4=	# empty
-USES=		python:2
+USES=		python:2 pyqt:4
+USE_PYQT=	gui network sip_build	
 NO_BUILD=	yes
 NO_ARCH=	yes

+WRKSRC=		${WRKDIR}/TreeLine
+
 DESKTOP_ENTRIES=	"TreeLine" "" "${DATADIR}/icons/tree/treeline.png" \
 			"${PORTNAME}" "Utility;" false

--- a/deskutils/treeline/pkg-install
+++ b/deskutils/treeline/pkg-install
@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-INSTALL" ]; then
-	mkdir -p ${PKG_PREFIX}/lib/treeline/plugins
-fi
--- a/devel/libcxxrt/Makefile
+++ b/devel/libcxxrt/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libcxxrt
 PORTVERSION=	20131225
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel

 MAINTAINER=	mokhi64@gmail.com
@ -15,6 +15,7 @@ GH_ACCOUNT=	pathscale
 GH_TAGNAME=	2f150a6

 USES=		cmake compiler:c++11-lang
+USE_LDCONFIG=	yes
 CXXFLAGS+=	-nostdlib

 do-install:
--- a/devel/libcxxrt/files/patch-src_exception.cc
+++ b/devel/libcxxrt/files/patch-src_exception.cc
@ -0,0 +1,48 @@
+--- src/exception.cc.orig	2013-12-26 03:11:27 UTC
+++ src/exception.cc
+@@ -304,13 +304,17 @@ static pthread_key_t eh_key;
+ static void exception_cleanup(_Unwind_Reason_Code reason, 
+                               struct _Unwind_Exception *ex)
+ {
+-	__cxa_free_exception(static_cast<void*>(ex));
+	// Exception layout:
+	// [__cxa_exception [_Unwind_Exception]] [exception object]
+	//
+	// __cxa_free_exception expects a pointer to the exception object
+	__cxa_free_exception(static_cast<void*>(ex + 1));
+ }
+ static void dependent_exception_cleanup(_Unwind_Reason_Code reason, 
+                               struct _Unwind_Exception *ex)
+ {
+ 
+-	__cxa_free_dependent_exception(static_cast<void*>(ex));
+	__cxa_free_dependent_exception(static_cast<void*>(ex + 1));
+ }
+ 
+ /**
+@@ -340,7 +344,8 @@ static void thread_cleanup(void* thread_
+ 		if (info->foreign_exception_state != __cxa_thread_info::none)
+ 		{
+ 			_Unwind_Exception *e = reinterpret_cast<_Unwind_Exception*>(info->globals.caughtExceptions);
+-			e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
+			if (e->exception_cleanup)
+				e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
+ 		}
+ 		else
+ 		{
+@@ -1270,12 +1275,13 @@ extern "C" void __cxa_end_catch()
+ 	
+ 	if (ti->foreign_exception_state != __cxa_thread_info::none)
+ 	{
+-		globals->caughtExceptions = 0;
+ 		if (ti->foreign_exception_state != __cxa_thread_info::rethrown)
+ 		{
+ 			_Unwind_Exception *e = reinterpret_cast<_Unwind_Exception*>(ti->globals.caughtExceptions);
+-			e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
+			if (e->exception_cleanup)
+				e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
+ 		}
+		globals->caughtExceptions = 0;
+ 		ti->foreign_exception_state = __cxa_thread_info::none;
+ 		return;
+ 	}
--- a/devel/libcxxrt/files/patch-test_CMakeLists.txt
+++ b/devel/libcxxrt/files/patch-test_CMakeLists.txt
@ -0,0 +1,24 @@
+--- test/CMakeLists.txt.orig	2013-12-26 03:11:27 UTC
+++ test/CMakeLists.txt
+@@ -23,6 +23,11 @@ add_executable(cxxrt-test-shared ${CXXTE
+ set_property(TARGET cxxrt-test-shared PROPERTY LINK_FLAGS -nodefaultlibs)
+ target_link_libraries(cxxrt-test-shared cxxrt-shared pthread dl c)
+ 
+include_directories(${CMAKE_SOURCE_DIR}/src)
+add_executable(cxxrt-test-foreign-exceptions test_foreign_exceptions.cc)
+set_property(TARGET cxxrt-test-foreign-exceptions PROPERTY LINK_FLAGS "-nodefaultlibs -Wl,--wrap,_Unwind_RaiseException")
+target_link_libraries(cxxrt-test-foreign-exceptions cxxrt-static gcc_s pthread dl c)
+
+ add_test(cxxrt-test-static-test
+          ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+          ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-static
+@@ -35,6 +40,9 @@ add_test(cxxrt-test-shared-test
+          ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log
+          ${CMAKE_CURRENT_BINARY_DIR}/test-shared-output.log)
+ 
+add_test(cxxrt-test-foreign-exceptions
+         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-foreign-exceptions)
+
+ set(valgrind "valgrind -q")
+ 
+ if(TEST_VALGRIND)
--- a/devel/libcxxrt/files/patch-test_testforeignexceptions.cc
+++ b/devel/libcxxrt/files/patch-test_testforeignexceptions.cc
@ -0,0 +1,128 @@
+--- test/test_foreign_exceptions.cc.orig	2016-05-29 13:30:15 UTC
+++ test/test_foreign_exceptions.cc
+@@ -0,0 +1,125 @@
+#include <cstdio>
+#include <cstdlib>
+#include "unwind.h"
+
+#define EXCEPTION_CLASS(a,b,c,d,e,f,g,h) \
+	((static_cast<uint64_t>(a) << 56) +\
+	 (static_cast<uint64_t>(b) << 48) +\
+	 (static_cast<uint64_t>(c) << 40) +\
+	 (static_cast<uint64_t>(d) << 32) +\
+	 (static_cast<uint64_t>(e) << 24) +\
+	 (static_cast<uint64_t>(f) << 16) +\
+	 (static_cast<uint64_t>(g) << 8) +\
+	 (static_cast<uint64_t>(h)))
+
+// using ld --wrap=_Unwind_RaiseException hook feature
+extern "C" _Unwind_Reason_Code __real__Unwind_RaiseException (_Unwind_Exception *e);
+extern "C" _Unwind_Reason_Code __wrap__Unwind_RaiseException (_Unwind_Exception *e);
+
+extern "C" _Unwind_Reason_Code __wrap__Unwind_RaiseException (_Unwind_Exception *e)
+{
+	// clobber exception class forcing libcxx own exceptions to be treated
+	// as foreign exception within libcxx itself
+	e->exception_class = EXCEPTION_CLASS('F','O','R','E','I','G','N','\0');
+	__real__Unwind_RaiseException(e);
+}
+
+_Unwind_Exception global_e;
+
+enum test_status {
+	PENDING, PASSED, FAILED
+};
+
+const char test_status_str[][8] = {
+	"PENDING", "PASSED", "FAILED"
+};
+
+test_status test1_status = PENDING;
+test_status test2_status = PENDING;
+test_status test3_status = PENDING;
+
+void test2_exception_cleanup(_Unwind_Reason_Code code, _Unwind_Exception *e)
+{
+	fputs("(2) exception_cleanup called\n", stderr);
+	if (e != &global_e) {
+		fprintf(stderr, "(2) ERROR: unexpected ptr: expecting %p, got %p\n", &global_e, e);
+		test2_status = FAILED;
+	}
+	if (test2_status == PENDING)
+		test2_status = PASSED;
+}
+
+struct test3_exception
+{
+	static int counter;
+	~test3_exception()
+	{
+		counter++;
+		fputs("(3) exception dtor\n", stderr);
+	}
+};
+int test3_exception::counter = 0;
+
+int main()
+{
+	///////////////////////////////////////////////////////////////
+	fputs("(1) foreign exception, exception_cleanup=nullptr\n", stderr);
+	try
+	{
+		global_e.exception_class = 0;
+		global_e.exception_cleanup = 0;
+		__real__Unwind_RaiseException(&global_e);
+	}
+	catch (...)
+	{
+	}
+	test1_status = PASSED;
+	fputs("(1) PASS\n", stderr);
+
+	///////////////////////////////////////////////////////////////
+	fputs("(2) foreign exception, exception_cleanup present\n", stderr);
+	try
+	{
+		global_e.exception_class = 0;
+		global_e.exception_cleanup = test2_exception_cleanup;
+		__real__Unwind_RaiseException(&global_e);
+	}
+	catch (...)
+	{
+	}
+	fprintf(stderr, "(2) %s\n", test_status_str[test2_status]);
+
+	///////////////////////////////////////////////////////////////
+	fputs("(3) C++ exception in foreign environment\n", stderr);
+	int counter_expected;
+	try
+	{
+		// throw was rigged such that the runtime treats C++ exceptions
+		// as foreign ones
+		throw test3_exception();
+	}
+	catch (test3_exception&)
+	{
+		fputs("(3) ERROR: wrong catch\n", stderr);
+		test3_status = FAILED;
+	}
+	catch (...)
+	{
+		fputs("(3) catch(...)\n", stderr);
+		counter_expected = test3_exception::counter + 1;
+		// one more dtor immediately after we leave catch
+	}
+	if (test3_status == PENDING && test3_exception::counter != counter_expected) {
+		fputs("(3) ERROR: exception dtor didn't run\n", stderr);
+		test3_status = FAILED;
+	}
+	if (test3_status == PENDING)
+		test3_status = PASSED;
+	fprintf(stderr, "(3) %s\n", test_status_str[test3_status]);
+
+	///////////////////////////////////////////////////////////////
+	if (test1_status == PASSED && test2_status == PASSED && test3_status == PASSED)
+		return EXIT_SUCCESS;
+	else
+		return EXIT_FAILURE;
+}
--- a/devel/libcxxrt/pkg-descr
+++ b/devel/libcxxrt/pkg-descr
@ -1,6 +1,6 @@
 This library implements the Code Sourcery C++ ABI, as documented here:

-http://www.codesourcery.com/public/cxx-abi/abi.html
+WWW: http://www.codesourcery.com/public/cxx-abi/abi.html

 It is intended to sit below an STL implementation, and provide features required
 by the compiler for implementation of the C++ language.
--- a/dns/Makefile
+++ b/dns/Makefile
@ -172,6 +172,7 @@
    SUBDIR += py-namebench
    SUBDIR += py-publicsuffix
    SUBDIR += py-py3dns
+    SUBDIR += py-pycares
    SUBDIR += py-pydnstable
    SUBDIR += py-pywdns
    SUBDIR += py-tldextract
--- a/dns/py-pycares/Makefile
+++ b/dns/py-pycares/Makefile
@ -0,0 +1,21 @@
+# Created by: Dmitry Sivachenko <mitya@yandex-team.ru>
+# $FreeBSD$
+
+PORTNAME=	pycares
+PORTVERSION=	2.0.1
+CATEGORIES=	dns python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	demon@FreeBSD.org
+COMMENT=	Python interface to c-ares
+
+LICENSE=	MIT
+
+USES=		python
+USE_PYTHON=	distutils autoplist
+
+PYDISTUTILS_BUILD_TARGET=	build_ext
+PYDISTUTILS_BUILDARGS=		--inplace --force
+
+.include <bsd.port.mk>
--- a/dns/py-pycares/distinfo
+++ b/dns/py-pycares/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1464695332
+SHA256 (pycares-2.0.1.tar.gz) = 3a684c09b753e143d86190b57d71bd82d24492062d11d6ab6acc21349d2da34d
+SIZE (pycares-2.0.1.tar.gz) = 225788
--- a/dns/py-pycares/pkg-descr
+++ b/dns/py-pycares/pkg-descr
@ -0,0 +1,5 @@
+pycares is a Python module which provides an interface to c-ares.
+c-ares is a C library that performs DNS requests and name
+resolutions asynchronously.
+
+WWW: https://pypi.python.org/pypi/pycares
--- a/emulators/qemu/files/patch-scripts_texi2pod.pl
+++ b/emulators/qemu/files/patch-scripts_texi2pod.pl
@ -0,0 +1,11 @@
+--- scripts/texi2pod.pl.orig	2015-11-03 20:01:35 UTC
+++ scripts/texi2pod.pl
+@@ -317,7 +317,7 @@ while(<$inf>) {
+ 	@columns = ();
+ 	for $column (split (/\s*\@tab\s*/, $1)) {
+ 	    # @strong{...} is used a @headitem work-alike
+-	    $column =~ s/^\@strong{(.*)}$/$1/;
+	    $column =~ s/^\@strong\{(.*)\}$/$1/;
+ 	    push @columns, $column;
+ 	}
+ 	$_ = "\n=item ".join (" : ", @columns)."\n";
--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -923,7 +923,6 @@
    SUBDIR += rigsofrods-pagedgeometry
    SUBDIR += ristretto
    SUBDIR += ruby-gd
-    SUBDIR += ruby-gdal
    SUBDIR += ruby-image_size
    SUBDIR += ruby-imlib2
    SUBDIR += ruby-svg
--- a/graphics/ruby-gdal/Makefile
+++ b/graphics/ruby-gdal/Makefile
@ -1,44 +0,0 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	gdal
-PORTVERSION=	2.1.0
-CATEGORIES=	graphics ruby
-MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
-		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
-		LOCAL/sunpoet
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Ruby binding for GDAL
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/../../LICENSE.TXT
-
-BUILD_DEPENDS=	swig3.0:devel/swig30
-LIB_DEPENDS=	libgdal.so:graphics/gdal
-
-EXPIRATION_DATE=2016-05-31
-
-IGNORE=		disabled by upstream (https://trac.osgeo.org/gdal/changeset/28756)
-
-MAKE_ARGS=	USER_DEFS=-fPIC
-MAKEFILE=	GNUmakefile
-USE_RUBY=	yes
-USES=		gmake tar:xz
-
-WRKSRC_SUBDIR=	swig/ruby
-
-post-patch:
-	@${REINPLACE_CMD} -e '/^SWIG = swig/ s|$$|3.0|' ${WRKSRC}/../SWIGmake.base
-	@${REINPLACE_CMD} -e 's|Config::CONFIG|Rb&|g' ${WRKSRC}/RubyMakefile.mk
-
-# include/cpl_config.h will only exist after graphics/gdal (build dependency) installed
-pre-configure:
-	@${SED} -e '/^GDAL_ROOT/d' ${DATADIR}/GDALmake.opt > ${WRKSRC}/../../GDALmake.opt
-	@${CP} ${LOCALBASE}/include/cpl_config.h ${WRKSRC}/../../port/
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${RUBY_SITELIBDIR}/${RUBY_ARCH}/gdal/*.so
-
-.include <bsd.port.mk>
--- a/graphics/ruby-gdal/distinfo
+++ b/graphics/ruby-gdal/distinfo
@ -1,2 +0,0 @@
-SHA256 (gdal-2.1.0.tar.xz) = 568b43441955b306364fcf97fb47d4c1512ac6f2f5f76b2ec39a890d2418ee03
-SIZE (gdal-2.1.0.tar.xz) = 7656496
--- a/graphics/ruby-gdal/pkg-descr
+++ b/graphics/ruby-gdal/pkg-descr
@ -1,3 +0,0 @@
-This port is the Ruby binding for GDAL (Geospatial Data Abstraction Library).
-
-WWW: http://www.gdal.org/
--- a/graphics/ruby-gdal/pkg-plist
+++ b/graphics/ruby-gdal/pkg-plist
@ -1,4 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/gdal/gdal.so
-%%RUBY_SITEARCHLIBDIR%%/gdal/gdalconst.so
-%%RUBY_SITEARCHLIBDIR%%/gdal/ogr.so
-%%RUBY_SITEARCHLIBDIR%%/gdal/osr.so
--- a/graphics/seexpr/Makefile
+++ b/graphics/seexpr/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME=	seexpr
-DISTVERSION=	1.0.1.2015.08.29
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+PORTVERSION=	2.9
 CATEGORIES=	graphics math

 MAINTAINER=	danfe@FreeBSD.org
@ -13,10 +13,9 @@ LICENSE=	APACHE20

 USE_GITHUB=	yes
 GH_ACCOUNT=	wdas
-GH_TAGNAME=	36ffb818b8

 USES=		bison cmake compiler:c++0x pyqt:4 python
-USE_PYQT=	gui_build
+USE_PYQT=	gui_build sip_build
 USE_QT4=	moc_build qmake_build rcc_build uic_build gui opengl

 MAKE_JOBS_UNSAFE=	yes
--- a/graphics/seexpr/distinfo
+++ b/graphics/seexpr/distinfo
@ -1,2 +1,2 @@
-SHA256 (wdas-seexpr-1.0.1.2015.08.29-36ffb818b8_GH0.tar.gz) = 8361adb26310060b063e37376625acb60314deac081130a397857f04884e2a7b
-SIZE (wdas-seexpr-1.0.1.2015.08.29-36ffb818b8_GH0.tar.gz) = 709489
+SHA256 (wdas-seexpr-v2.9_GH0.tar.gz) = 097642881f2c360d825f31e7c23881226386776dccbe8aa5b37c9ee0077601b2
+SIZE (wdas-seexpr-v2.9_GH0.tar.gz) = 709434
--- a/graphics/seexpr/files/patch-src_SeExprEditor_CMakeLists.txt
+++ b/graphics/seexpr/files/patch-src_SeExprEditor_CMakeLists.txt
@ -0,0 +1,11 @@
+--- src/SeExprEditor/CMakeLists.txt.orig	2015-08-28 22:32:38 UTC
+++ src/SeExprEditor/CMakeLists.txt
+@@ -103,6 +103,8 @@ ENDIF(WIN32)
+                        -t WS_X11 -g -j 1
+                        -I. -I${PYQT4_SIP} -I${SIP_INCLUDE_DIR}
+                        ${CMAKE_CURRENT_SOURCE_DIR}/SeExprEditor.sip
+# libc++ 3.8.0 hack: things break if <iostream> is included after <Python.h>
+                       COMMAND sed -i.bak -e "10s,^,#include <iostream>," sipAPIexpreditor.h
+                        VERBATIM)
+ 
+     add_library(expreditor SHARED sipexpreditorpart0.cpp)
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@ -2,10 +2,11 @@
 # $FreeBSD$

 PORTNAME=	rust
-PORTVERSION?=	1.8.0
+PORTVERSION?=	1.9.0
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
-		http://static.rust-lang.org/stage0-snapshots/:bootstrap
+		http://static.rust-lang.org/stage0-snapshots/:bootstrap \
+		https://github.com/dhuseby/rust-manual-snapshots/raw/master/:bootstrap
 DISTNAME?=	${PORTNAME}c-${PORTVERSION}
 DISTFILES?=	${DISTNAME}-src${EXTRACT_SUFX}:src
 DISTFILES+=	${RUST_BOOT}:bootstrap
@ -36,9 +37,9 @@ CONFLICTS_INSTALL?=	rust-nightly

 RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG_${ARCH}}.tar.bz2

-RUST_BOOT_SIG_x86_64?=	2016-02-17-4d3eebf-dragonfly-x86_64-765bb5820ad406e966ec0ac51c8070b656459b02
-RUST_BOOT_SIG_amd64?=	2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804
-RUST_BOOT_SIG_i386?=	2016-02-17-4d3eebf-freebsd-i386-4e2af0b34eb335e173aebff543be693724a956c2
+RUST_BOOT_SIG_x86_64?=	2016-03-18-235d774-dragonfly-x86_64-e790279a7b286ddf2e716ccd3bb1b7f0a386a5c7
+RUST_BOOT_SIG_amd64?=	2016-03-18-235d774-freebsd-x86_64-390b9a9f60f3d0d6a52c04d939a0355f572d03b3
+RUST_BOOT_SIG_i386?=	2016-03-18-235d774-freebsd-i386-b5a87e66e3e3eed5f0b68367ad22f25f0be2d4ea

 # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so.
 # The hash depends on Rust version and, if the channel is not "stable",
--- a/lang/rust/distinfo.amd64
+++ b/lang/rust/distinfo.amd64
@ -1,4 +1,5 @@
-SHA256 (rustc-1.8.0-src.tar.gz) = af4466147e8d4db4de2a46e07494d2dc2d96313c5b37da34237f511c905f7449
-SIZE (rustc-1.8.0-src.tar.gz) = 25641320
-SHA256 (rust-stage0-2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804.tar.bz2) = 6123aa870918555835623548e7edbf79480cd754c649fda844dc3c14e4e142f2
-SIZE (rust-stage0-2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804.tar.bz2) = 15922558
+TIMESTAMP = 1464541774
+SHA256 (rustc-1.9.0-src.tar.gz) = b19b21193d7d36039debeaaa1f61cbf98787e0ce94bd85c5cbe2a59462d7cfcd
+SIZE (rustc-1.9.0-src.tar.gz) = 25859714
+SHA256 (rust-stage0-2016-03-18-235d774-freebsd-x86_64-390b9a9f60f3d0d6a52c04d939a0355f572d03b3.tar.bz2) = 50e9c7fe6e88eefcb212eec4791df494e1ed82f667ebd501c226630b0d8d0a1a
+SIZE (rust-stage0-2016-03-18-235d774-freebsd-x86_64-390b9a9f60f3d0d6a52c04d939a0355f572d03b3.tar.bz2) = 16164738
--- a/lang/rust/distinfo.i386
+++ b/lang/rust/distinfo.i386
@ -1,4 +1,5 @@
-SHA256 (rustc-1.8.0-src.tar.gz) = af4466147e8d4db4de2a46e07494d2dc2d96313c5b37da34237f511c905f7449
-SIZE (rustc-1.8.0-src.tar.gz) = 25641320
-SHA256 (rust-stage0-2016-02-17-4d3eebf-freebsd-i386-4e2af0b34eb335e173aebff543be693724a956c2.tar.bz2) = 578be492263cf9512020662fa35a493ec0589870e9de2e45e0aa63d40f515a3e
-SIZE (rust-stage0-2016-02-17-4d3eebf-freebsd-i386-4e2af0b34eb335e173aebff543be693724a956c2.tar.bz2) = 17417438
+TIMESTAMP = 1464553284
+SHA256 (rustc-1.9.0-src.tar.gz) = b19b21193d7d36039debeaaa1f61cbf98787e0ce94bd85c5cbe2a59462d7cfcd
+SIZE (rustc-1.9.0-src.tar.gz) = 25859714
+SHA256 (rust-stage0-2016-03-18-235d774-freebsd-i386-b5a87e66e3e3eed5f0b68367ad22f25f0be2d4ea.tar.bz2) = 8d03f5b90b5b7b191c601967f9742ab727205c9ef45b4088744b8d4546eab7ce
+SIZE (rust-stage0-2016-03-18-235d774-freebsd-i386-b5a87e66e3e3eed5f0b68367ad22f25f0be2d4ea.tar.bz2) = 17492337
--- a/lang/rust/distinfo.x86_64
+++ b/lang/rust/distinfo.x86_64
@ -1,4 +1,5 @@
-SHA256 (rustc-1.8.0-src.tar.gz) = af4466147e8d4db4de2a46e07494d2dc2d96313c5b37da34237f511c905f7449
-SIZE (rustc-1.8.0-src.tar.gz) = 25641320
-SHA256 (rust-stage0-2016-02-17-4d3eebf-dragonfly-x86_64-765bb5820ad406e966ec0ac51c8070b656459b02.tar.bz2) = 4e4155a410042ffa149ac26e94c1c5cd9f24aae7e647deed54e694f88cf33d5c
-SIZE (rust-stage0-2016-02-17-4d3eebf-dragonfly-x86_64-765bb5820ad406e966ec0ac51c8070b656459b02.tar.bz2) = 18130945
+TIMESTAMP = 1464724184
+SHA256 (rustc-1.9.0-src.tar.gz) = b19b21193d7d36039debeaaa1f61cbf98787e0ce94bd85c5cbe2a59462d7cfcd
+SIZE (rustc-1.9.0-src.tar.gz) = 25859714
+SHA256 (rust-stage0-2016-03-18-235d774-dragonfly-x86_64-e790279a7b286ddf2e716ccd3bb1b7f0a386a5c7.tar.bz2) = da27393277ee35fc866be78ecedf37d57232d956cc457391b9680997ea64c5f2
+SIZE (rust-stage0-2016-03-18-235d774-dragonfly-x86_64-e790279a7b286ddf2e716ccd3bb1b7f0a386a5c7.tar.bz2) = 18070513
--- a/lang/rust/files/patch-src_snapshots.txt
+++ b/lang/rust/files/patch-src_snapshots.txt
@ -1,17 +1,10 @@
--- src/snapshots.txt.orig	2016-04-11 21:22:04 UTC
+--- src/snapshots.txt.orig	2016-05-23 16:29:00 UTC
 +++ src/snapshots.txt
-@@ -1,4 +1,5 @@
- S 2016-02-17 4d3eebf
-+  dragonfly-x86_64 765bb5820ad406e966ec0ac51c8070b656459b02
-   linux-i386 5f194aa7628c0703f0fd48adc4ec7f3cc64b98c7
-   linux-x86_64 d29b7607d13d64078b6324aec82926fb493f59ba
-   macos-i386 4c8e42dd649e247f3576bf9dfa273327b4907f9c
-@@ -6,6 +7,8 @@ S 2016-02-17 4d3eebf
-   winnt-i386 0c336d794a65f8e285c121866c7d59aa2dd0d1e1
-   winnt-x86_64 27e75b1bf99770b3564bcebd7f3230be01135a92
-   openbsd-x86_64 ac957c6b84de2bd67f01df085d9ea515f96e22f3
-+  freebsd-i386 4e2af0b34eb335e173aebff543be693724a956c2
-+  freebsd-x86_64 f38991fbb81c1cd8d0bbda396f98f13a55b42804
+@@ -6,6 +6,7 @@ S 2016-03-18 235d774
+   winnt-i386 7703869608cc4192b8f1943e51b19ba1a03c0110
+   winnt-x86_64 8512b5ecc0c53a2cd3552e4f5688577de95cd978
+   openbsd-x86_64 c5b6feda38138a12cd5c05574b585dadebbb5e87
+  freebsd-i386 b5a87e66e3e3eed5f0b68367ad22f25f0be2d4ea
+   freebsd-x86_64 390b9a9f60f3d0d6a52c04d939a0355f572d03b3
 
- S 2015-12-18 3391630
-   bitrig-x86_64 6476e1562df02389b55553b4c88b1f4fd121cd40
+ S 2016-02-17 4d3eebf
--- a/lang/rust/pkg-plist
+++ b/lang/rust/pkg-plist
@ -11,9 +11,11 @@ lib/librbml-%%RUST_VSN_HASH%%.so
 lib/librustc-%%RUST_VSN_HASH%%.so
 lib/librustc_back-%%RUST_VSN_HASH%%.so
 lib/librustc_borrowck-%%RUST_VSN_HASH%%.so
+lib/librustc_const_eval-%%RUST_VSN_HASH%%.so
+lib/librustc_const_math-%%RUST_VSN_HASH%%.so
 lib/librustc_data_structures-%%RUST_VSN_HASH%%.so
 lib/librustc_driver-%%RUST_VSN_HASH%%.so
-lib/librustc_front-%%RUST_VSN_HASH%%.so
+lib/librustc_incremental-%%RUST_VSN_HASH%%.so
 lib/librustc_lint-%%RUST_VSN_HASH%%.so
 lib/librustc_llvm-%%RUST_VSN_HASH%%.so
 lib/librustc_metadata-%%RUST_VSN_HASH%%.so
@ -23,6 +25,7 @@ lib/librustc_platform_intrinsics-%%RUST_VSN_HASH%%.so
 lib/librustc_plugin-%%RUST_VSN_HASH%%.so
 lib/librustc_privacy-%%RUST_VSN_HASH%%.so
 lib/librustc_resolve-%%RUST_VSN_HASH%%.so
+lib/librustc_save_analysis-%%RUST_VSN_HASH%%.so
 lib/librustc_trans-%%RUST_VSN_HASH%%.so
 lib/librustc_typeck-%%RUST_VSN_HASH%%.so
 lib/librustdoc-%%RUST_VSN_HASH%%.so
@ -43,31 +46,28 @@ lib/rustlib/uninstall.sh
 lib/rustlib/%%RUST_TARGET%%/lib/liballoc-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-%%RUST_VSN_HASH%%.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libarena-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libcollections-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libcompiler-rt.a
 lib/rustlib/%%RUST_TARGET%%/lib/libcore-%%RUST_VSN_HASH%%.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libflate-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-%%RUST_VSN_HASH%%.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/liblibc-%%RUST_VSN_HASH%%.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/liblog-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librand-%%RUST_VSN_HASH%%.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librbml-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/librbml-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-%%RUST_VSN_HASH%%.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_front-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-%%RUST_VSN_HASH%%.so
@ -77,11 +77,11 @@ lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-%%RUST_VSN_HASH%%.s
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-%%RUST_VSN_HASH%%.so
+lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/librustc_unicode-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-%%RUST_VSN_HASH%%.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libserialize-%%RUST_VSN_HASH%%.so
 lib/rustlib/%%RUST_TARGET%%/lib/libstd-%%RUST_VSN_HASH%%.rlib
 lib/rustlib/%%RUST_TARGET%%/lib/libstd-%%RUST_VSN_HASH%%.so
--- a/math/cminpack/Makefile
+++ b/math/cminpack/Makefile
@ -2,15 +2,22 @@
 # $FreeBSD$

 PORTNAME=	cminpack
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 CATEGORIES=	math
-MASTER_SITES=	http://devernay.free.fr/hacks/${PORTNAME}/
+MASTER_SITES=	GH

 MAINTAINER=	fernando.apesteguia@gmail.com
 COMMENT=	Solving nonlinear equations and nonlinear least squares problems

+LICENSE_FILE=	${WRKSRC}/CopyrightMINPACK.txt
+
 USES=		cmake:outsource

+USE_GITHUB=	yes
+GH_PROJECT=	cminpack
+GH_ACCOUNT=	devernay
+GH_TAGNAME=	e89f19c
+
 OPTIONS_DEFINE=	EXAMPLES

 post-install:
--- a/math/cminpack/distinfo
+++ b/math/cminpack/distinfo
@ -1,2 +1,2 @@
-SHA256 (cminpack-1.3.4.tar.gz) = 3b517bf7dca68cc9a882883db96dac0a0d37d72aba6dfb0c9c7e78e67af503ca
-SIZE (cminpack-1.3.4.tar.gz) = 311147
+SHA256 (devernay-cminpack-1.3.5-e89f19c_GH0.tar.gz) = c4e7e71afa1c1fa69ab4f29f65908f171e31f82d462c14277b73d11f00940ded
+SIZE (devernay-cminpack-1.3.5-e89f19c_GH0.tar.gz) = 312937
--- a/math/cminpack/pkg-plist
+++ b/math/cminpack/pkg-plist
@ -1,6 +1,6 @@
 include/cminpack-1/cminpack.h
 include/cminpack-1/minpack.h
-lib/libcminpack.a
+lib/libcminpack_s.a
 libdata/pkgconfig/cminpack.pc
 share/cmake/Modules/FindCMinpack.cmake
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkdrv.c
@ -10,30 +10,32 @@ share/cmake/Modules/FindCMinpack.cmake
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/genf77tests.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hybdrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hybdrv_.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hybipt.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyjdrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyjdrv_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ibmdpdr.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ibmdpdr_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmddrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmddrv_.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmdipt.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmfdrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmfdrv_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmsdrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmsdrv_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/machar.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/neqipt.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssq.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssqfcn.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssqipt.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssqjac.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tchkder_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tchkderc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tchkderc_box.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tenorm_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tenormc.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/chkder.data
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/hybrd.data
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/lm.data
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/neq.data
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/ssq.data
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/um.data
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tfdjac2_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tfdjac2c.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrd1_.c
--- a/misc/Makefile
+++ b/misc/Makefile
@ -393,6 +393,7 @@
    SUBDIR += qt4-l10n
    SUBDIR += qt4-qtconfig
    SUBDIR += qt4-qtdemo
+    SUBDIR += qt5-doc
    SUBDIR += qt5-examples
    SUBDIR += qt5-l10n
    SUBDIR += qt5ct
--- a/misc/qt5-doc/Makefile
+++ b/misc/qt5-doc/Makefile
@ -0,0 +1,69 @@
+# Created by: Ralf Nolden <nolden@kde.org>
+# $FreeBSD$
+
+PORTNAME=	doc
+DISTVERSION=	${QT5_VERSION}
+CATEGORIES=	misc
+MASTER_SITES=	QT/${QT5_BRANCH}/qt/${QT5_VERSION:R}/${QT5_VERSION}/${QT5_SUBDIR}
+PKGNAMEPREFIX=	qt5-
+DISTNAME=	qt-everywhere-opensource-src-${QT5_VERSION}
+DIST_SUBDIR=	KDE/Qt/${QT5_VERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Qt 5 documentation
+
+NO_ARCH=	yes
+
+USE_QT5=	help_build qdoc_build sql_build sql-sqlite3_build \
+		buildtools_build qmake_build
+
+USES=		compiler:c++11-lib python:build tar:xz
+
+HAS_CONFIGURE=	yes
+CONFIGURE_OUTSOURCE=	yes
+QT_NONSTANDARD=	yes
+CONFIGURE_ARGS=	-opensource -confirm-license -developer-build -nomake tests
+
+.include <bsd.port.pre.mk>
+# If we are on a system without gcc make qmake use the internal freebsd-clang
+# mkspec.
+.if ${COMPILER_TYPE:Mclang}
+CONFIGURE_ARGS+=	-platform unsupported/freebsd-clang
+.endif
+
+EXTRACT_AFTER_ARGS?=    ${DISTNAME:S,$,/qtwebkit,:S,^,--exclude ,} \
+                                ${DISTNAME:S,$,/qtwebkit-examples,:S,^,--exclude ,} \
+				${DISTNAME:S,$,/qtwebengine,:S,^,--exclude ,}
+
+DOCSDIR=	${PREFIX}/share/doc/qt5
+
+MAKE_JOBS_UNSAFE=	YES
+ALL_TARGET=		docs
+
+DESCR=		${.CURDIR:H:H}/devel/qt5/pkg-descr
+
+post-extract:
+	${MKDIR} ${BUILD_WRKSRC}/qtbase/bin
+	${LN} -sf ${MOC} ${BUILD_WRKSRC}/qtbase/bin/moc
+	${LN} -sf ${UIC} ${BUILD_WRKSRC}/qtbase/bin/uic
+	${LN} -sf ${RCC} ${BUILD_WRKSRC}/qtbase/bin/rcc
+	${LN} -sf ${QT_BINDIR}/qdoc ${BUILD_WRKSRC}/qtbase/bin/qdoc
+	${LN} -sf ${QT_BINDIR}/qhelpgenerator ${BUILD_WRKSRC}/qtbase/bin/qhelpgenerator
+
+post-patch:
+# qtdeclarative.pro wants to run python, replace that with PYTHON_CMD
+	${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \
+		${WRKSRC}/qtdeclarative/qtdeclarative.pro
+# Make mkspecs/freebsd-g++ use the correct gcc for the build.
+.if ${COMPILER_TYPE:Mgcc}
+	${REINPLACE_CMD} -e 's#gcc#${CC}#g' \
+			 -e 's#g++#${CXX}#g' \
+			 ${PATCH_WRKSRC}/qtbase/mkspecs/common/g++-base.conf
+.endif
+
+do-install:
+	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
+		cd ${BUILD_WRKSRC}/qtbase/doc && \
+		${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.post.mk>
--- a/misc/qt5-doc/distinfo
+++ b/misc/qt5-doc/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1464515376
+SHA256 (KDE/Qt/5.5.1/qt-everywhere-opensource-src-5.5.1.tar.xz) = 6f028e63d4992be2b4a5526f2ef3bfa2fe28c5c757554b11d9e8d86189652518
+SIZE (KDE/Qt/5.5.1/qt-everywhere-opensource-src-5.5.1.tar.xz) = 320459924
--- a/misc/qt5-doc/pkg-plist
+++ b/misc/qt5-doc/pkg-plist
--- a/net-im/uTox/Makefile
+++ b/net-im/uTox/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	uTox
-PORTVERSION=	0.8.2.20160511
+PORTVERSION=	0.9.5.20160530
 CATEGORIES=	net-im net-p2p

 MAINTAINER=	fidaj@ukr.net
@ -17,12 +17,13 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libsodium.so:security/libsodium \
 		libv4lconvert.so:multimedia/libv4l \
 		libvpx.so:multimedia/libvpx \
-		libfilteraudio.so:audio/libfilteraudio
+		libfilteraudio.so:audio/libfilteraudio\
+		libopus.so:audio/opus
 RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox

 USE_GITHUB=	yes
 GH_ACCOUNT=	GrayHatter
-GH_TAGNAME=	cc4388c
+GH_TAGNAME=	c85c747

 USES=		compiler:c11 desktop-file-utils gmake openal:al pkgconfig
 USE_XORG=	x11 xext xrender
--- a/net-im/uTox/distinfo
+++ b/net-im/uTox/distinfo
@ -1,2 +1,2 @@
-SHA256 (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 7c436cec5bd524ffcce3e1824dbebb7a93a121d0bc5d6860f8dadd1494e67067
-SIZE (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 2015584
+SHA256 (GrayHatter-uTox-0.9.5.20160530-c85c747_GH0.tar.gz) = 43aaad041c7a830bc7e422908855f314f396c4c9e30577e86c225a3b5377c93e
+SIZE (GrayHatter-uTox-0.9.5.20160530-c85c747_GH0.tar.gz) = 2020325
--- a/net-im/uTox/files/patch-Makefile
+++ b/net-im/uTox/files/patch-Makefile
@ -1,4 +1,4 @@
--- Makefile.orig	2016-05-10 07:09:15 UTC
+--- Makefile.orig	2016-05-30 04:33:35 UTC
 +++ Makefile
@@ -2,9 +2,9 @@
 # set to anything else to disable them
@ -12,7 +12,7 @@
 
 DEPS = libtoxav libtoxcore openal vpx libsodium
 
-@@ -54,6 +54,37 @@ ifeq ($(UNAME_S), Linux)
+@@ -54,6 +54,40 @@ ifeq ($(UNAME_S), Linux)
 
 	TRAY_OBJ = icons/utox-128x128.o
 	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
@ -34,13 +34,16 @@
 +
 +	ifeq ($(DBUS), 1)
 +		DEPS += dbus-1
+		CFLAGS += -DHAVE_DBUS
 +	else
 +		CFLAGS += -DNO_DBUS
 +	endif
 +
-+	CFLAGS += $(shell pkg-config --cflags $(DEPS))
+	PKG_CONFIG = pkg-config
 +
-+	LDFLAGS += $(shell pkg-config --libs $(DEPS))
+	CFLAGS += $(shell $(PKG_CONFIG) --cflags $(DEPS))
+
+	LDFLAGS += $(shell $(PKG_CONFIG) --libs $(DEPS))
 +
 +	OS_SRC = $(wildcard src/xlib/*.c)
 +	OS_OBJ = $(OS_SRC:.c=.o)
@ -49,3 +52,4 @@
 +	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
 else ifeq ($(UNAME_O), Cygwin)
 	OUT_FILE = utox.exe
+ 
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	asterisk
 PORTVERSION=	11.22.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
 MASTER_SITE_SUBDIR=	asterisk/:main \
--- a/net/asterisk11/files/patch-apps_app__queue.c
+++ b/net/asterisk11/files/patch-apps_app__queue.c
@ -0,0 +1,11 @@
+--- apps/app_queue.c.orig	2016-03-29 19:25:17 UTC
+++ apps/app_queue.c
+@@ -3641,7 +3641,7 @@ static int can_ring_entry(struct queue_e
+ 		return 0;
+ 	}
+ 
+-	if (call->member->in_call && call->lastqueue->wrapuptime) {
+	if (call->member->in_call && call->lastqueue && call->lastqueue->wrapuptime) {
+ 		ast_debug(1, "%s is in call, so not available (wrapuptime %d)\n",
+ 			call->interface, call->lastqueue->wrapuptime);
+ 		return 0;
--- a/net/spoofer/Makefile
+++ b/net/spoofer/Makefile
@ -2,22 +2,36 @@
 # $FreeBSD$

 PORTNAME=	spoofer
-PORTVERSION=	0.8e
+PORTVERSION=	1.0.1
 CATEGORIES=	net
-MASTER_SITES=	http://spoofer.caida.org/
+MASTER_SITES=	http://www.caida.org/projects/spoofer/downloads/

 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Spoofer Project testing software

-PLIST_FILES=	bin/spoofer
+LICENSE=	GPLv3
+
+BUILD_DEPENDS=	protoc:devel/protobuf
+LIB_DEPENDS=	libprotobuf-lite.so:devel/protobuf
+
 PORTDOCS=	README

-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--disable-development

-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS GUI
+OPTIONS_DEFAULT=	GUI
+OPTIONS_SUB=	yes

-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/prober/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGUI}
+USE_QT5=	buildtools_build qmake_build core network gui widgets
+USE_GL+=	gl
+USE_RC_SUBR=	${PORTNAME}
+.else
+CONFIGURE_ARGS+=	--disable-manager
+.endif

 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/net/spoofer/distinfo
+++ b/net/spoofer/distinfo
@ -1,2 +1,3 @@
-SHA256 (spoofer-0.8e.tar.gz) = 2bd653531399a24a3da60c75627a2ca6bc6fce9a5266ea3e6be7f83ff224741b
-SIZE (spoofer-0.8e.tar.gz) = 253702
+TIMESTAMP = 1464210224
+SHA256 (spoofer-1.0.1.tar.gz) = a70997223f075c1b3834a6bde8fdb7d8179b0dd49b960e915e1ffb1392711e2d
+SIZE (spoofer-1.0.1.tar.gz) = 361056
--- a/net/spoofer/files/spoofer.in
+++ b/net/spoofer/files/spoofer.in
@ -0,0 +1,31 @@
+# $FreeBSD$
+#!/bin/sh
+#
+# PROVIDE: spoofer
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable spoofer:
+#
+# spoofer_enable="YES"
+#
+
+. /etc/rc.subr
+
+name=spoofer
+rcvar=spoofer_enable
+
+command="%%PREFIX%%/bin/spoofer-scheduler"
+command_args="-D"
+
+load_rc_config $name
+
+: ${spoofer_enable="NO"}
+: ${spoofer_flags="-s 1"}
+
+spoofer_stop()
+{
+    %%PREFIX%%/bin/spoofer-cli shutdown
+}
+
+run_rc_command "$1"
--- a/net/spoofer/pkg-descr
+++ b/net/spoofer/pkg-descr
@ -1,4 +1,4 @@
-Spoofer helps ANA Spoofer Project better understand the current state of
+Spoofer helps the CAIDA Spoofer Project better understand the current state of
 filtering in the Internet. It attempts to send a series of spoofed UDP packets
 to a central server which logs and summarizes the results.

--- a/net/spoofer/pkg-plist
+++ b/net/spoofer/pkg-plist
@ -0,0 +1,4 @@
+%%GUI%%bin/spoofer-cli
+%%GUI%%bin/spoofer-gui
+bin/spoofer-prober
+%%GUI%%bin/spoofer-scheduler
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@ -1,8 +1,8 @@
 # $FreeBSD$

 PORTNAME=	poudriere
-DISTVERSION=	3.1.99.20160520
-PORTREVISION=	0
+DISTVERSION=	3.1.99.20160531
+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-1659-gfdf5930
+GH_TAGNAME=	3.0-1663-gf6c1bad
 #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 = 1463770065
-SHA256 (freebsd-poudriere-3.1.99.20160520-3.0-1659-gfdf5930_GH0.tar.gz) = 489072404c8a88004ca2c4989b2803f95864505e03a0e0dba30aa6f6b7ac60bd
-SIZE (freebsd-poudriere-3.1.99.20160520-3.0-1659-gfdf5930_GH0.tar.gz) = 2937720
+TIMESTAMP = 1464733812
+SHA256 (freebsd-poudriere-3.1.99.20160531-3.0-1663-gf6c1bad_GH0.tar.gz) = dad4ade41148c49e5ed2d36e1a4e70eff95dd0c66904274992f6615dca0d9d3f
+SIZE (freebsd-poudriere-3.1.99.20160531-3.0-1663-gf6c1bad_GH0.tar.gz) = 2937807
--- a/security/Makefile
+++ b/security/Makefile
@ -287,6 +287,7 @@
    SUBDIR += lasso
    SUBDIR += lastpass-cli
    SUBDIR += letsencrypt.sh
+    SUBDIR += letskencrypt
    SUBDIR += libadacrypt
    SUBDIR += libassuan
    SUBDIR += libbeid
--- a/security/letskencrypt/Makefile
+++ b/security/letskencrypt/Makefile
@ -0,0 +1,41 @@
+# Created by: Bernard Spil <brnrd@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	letskencrypt
+PORTVERSION=	0.1.5
+CATEGORIES=	security
+
+MAINTAINER=	brnrd@FreeBSD.org
+COMMENT=	Native C client for Let's Encrypt, designed for security
+
+LICENSE=	ISCL
+
+USES=		gmake
+USE_GITHUB=	yes
+USE_OPENSSL=	yes
+
+GH_ACCOUNT=	kristapsdz
+GH_PROJECT=	${PORTNAME}-portable
+GH_TAGNAME=	VERSION_${PORTVERSION:S/./_/g}
+
+MAKEFILE=	GNUmakefile
+MAKE_ARGS=	PREFIX=${STAGEDIR}/${PREFIX}
+
+WITH_OPENSSL_PORT=	yes
+OPENSSL_PORT=	security/libressl
+
+WWWDIR=		${PREFIX}/www/letsencrypt
+
+post-patch:
+	${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
+		-e "s|/var/www/letsencrypt|${WWWDIR}|" \
+		${WRKSRC}/main.c ${WRKSRC}/letskencrypt.1
+
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/letskencrypt
+.	for d in etc/ssl/letsencrypt etc/ssl/letsencrypt/private \
+		etc/letsencrypt www/letsencrypt 
+		${MKDIR} ${STAGEDIR}${PREFIX}/${d}
+.	endfor
+
+.include <bsd.port.mk>
--- a/security/letskencrypt/distinfo
+++ b/security/letskencrypt/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1464616584
+SHA256 (kristapsdz-letskencrypt-portable-0.1.5-VERSION_0_1_5_GH0.tar.gz) = 046b46711202beb7a012b81aabacf4407434a655857eacedd9f76d0306c4867a
+SIZE (kristapsdz-letskencrypt-portable-0.1.5-VERSION_0_1_5_GH0.tar.gz) = 39307
--- a/security/letskencrypt/pkg-descr
+++ b/security/letskencrypt/pkg-descr
@ -0,0 +1,5 @@
+letskencrypt is a client for Let's Encrypt users, but one designed for
+security. No Python. No Ruby. No Bash. A straightforward, open source
+implementation in C that isolates each step of the sequence.
+
+WWW: https://kristaps.bsd.lv/letskencrypt/
--- a/security/letskencrypt/pkg-plist
+++ b/security/letskencrypt/pkg-plist
@ -0,0 +1,7 @@
+bin/letskencrypt
+man/man1/letskencrypt.1.gz
+@dir(,,0700) etc/letsencrypt
+@dir(,,0755) etc/ssl
+@dir(,,0755) etc/ssl/letsencrypt
+@dir(,,0700) etc/ssl/letsencrypt/private
+@dir(,www,) %%WWWDIR%%
--- a/sysutils/jobd/Makefile
+++ b/sysutils/jobd/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jobd
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.1
 DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils

@ -17,4 +17,10 @@ USE_GITHUB=	YES
 USE_LDCONFIG=	YES
 GH_ACCOUNT=	mheily

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000000
+IGNORE=		requires FreeBSD 10 or later
+.endif
+
+.include <bsd.port.post.mk>
--- a/sysutils/jobd/distinfo
+++ b/sysutils/jobd/distinfo
@ -1,2 +1,2 @@
-SHA256 (mheily-jobd-v0.7.0_GH0.tar.gz) = 7c5f1bb169c70691b59105a13e9d2d3944416241e0f2ae3d509db9c74fc1cae0
-SIZE (mheily-jobd-v0.7.0_GH0.tar.gz) = 2901249
+SHA256 (mheily-jobd-v0.7.1_GH0.tar.gz) = f062a71e8686221bffa4e404825762b6049dd66114086b403181d42348a9e422
+SIZE (mheily-jobd-v0.7.1_GH0.tar.gz) = 2901721
--- a/sysutils/p5-Sysadm-Install/Makefile
+++ b/sysutils/p5-Sysadm-Install/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Sysadm-Install
-PORTVERSION=	0.46
+PORTVERSION=	0.47
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSCHILLI
--- a/sysutils/p5-Sysadm-Install/distinfo
+++ b/sysutils/p5-Sysadm-Install/distinfo
@ -1,2 +1,3 @@
-SHA256 (Sysadm-Install-0.46.tar.gz) = a5464bec7c40daa33b8b8dbcc901369bd094a83d8558ac0444752168d6ddbd23
-SIZE (Sysadm-Install-0.46.tar.gz) = 26560
+TIMESTAMP = 1464703680
+SHA256 (Sysadm-Install-0.47.tar.gz) = cf4c8542595502db2d56b8a06173f5f2dc9b8df5e423cf9d3f1b150f49c9a441
+SIZE (Sysadm-Install-0.47.tar.gz) = 29117
--- a/sysutils/password-store/Makefile
+++ b/sysutils/password-store/Makefile
@ -1,12 +1,11 @@
 # $FreeBSD$

 PORTNAME=	password-store
-PORTVERSION=	1.6.3
-PORTREVISION=	2
+PORTVERSION=	1.6.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://git.zx2c4.com/password-store/snapshot/

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	rene@FreeBSD.org
 COMMENT=	Stores, retrieves, generates, and synchronizes passwords securely

 LICENSE=	GPLv2+
@ -22,6 +21,7 @@ NO_ARCH=	yes
 NO_BUILD=	yes

 OPTIONS_DEFINE=		GIT XCLIP CONTRIB DOCS EXAMPLES
+OPTIONS_DEFAULT=	CONTRIB
 OPTIONS_SUB=		yes

 GIT_DESC=		Enable git storage
@ -34,26 +34,24 @@ XCLIP_RUN_DEPENDS=	base64>=0:converters/base64 \

 .include <bsd.port.options.mk>

-.if ! ${PORT_OPTIONS:MGIT} && ! ${PORT_OPTIONS:MXCLIP}
-EXTRA_PATCHES=	${PATCHDIR}/git+xclip.patch:-p1
-.elif ! ${PORT_OPTIONS:MGIT}
-EXTRA_PATCHES=	${PATCHDIR}/git.patch:-p1
-.elif ! ${PORT_OPTIONS:MXCLIP}
-EXTRA_PATCHES=	${PATCHDIR}/xclip.patch:-p1
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|GETOPT="getopt"|GETOPT="${LOCALBASE}/bin/getopt"|' ${WRKSRC}/src/password-store.sh
 	@${REINPLACE_CMD} -Ee 's|SHRED="shred -f -z"|SHRED="rm -P -f"|' ${WRKSRC}/src/password-store.sh

 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/pass
-	@${LN} -s ${PREFIX}/libexec/pass ${STAGEDIR}${PREFIX}/bin/pass
+	${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/pass
+	${LN} -s ${PREFIX}/libexec/pass ${STAGEDIR}${PREFIX}/bin/pass

 do-install-CONTRIB-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-	@(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.zsh-completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_pass
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.bash-completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/password-store
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.fish-completion ${STAGEDIR}${PREFIX}/share/fish/completions/password-store.fish

 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
--- a/sysutils/password-store/distinfo
+++ b/sysutils/password-store/distinfo
@ -1,2 +1,3 @@
-SHA256 (password-store-1.6.3.tar.gz) = 1a9437fe07fdce5f562f8b6bd7e8492416f5ad298f32b87a02984c3908267148
-SIZE (password-store-1.6.3.tar.gz) = 59408
+TIMESTAMP = 1464706588
+SHA256 (password-store-1.6.5.tar.gz) = 0b70e27babed42209544acafbfdaddc222933977883b1dcd9db2acb142045608
+SIZE (password-store-1.6.5.tar.gz) = 61020
--- a/sysutils/password-store/files/git+xclip.patch
+++ b/sysutils/password-store/files/git+xclip.patch
@ -1,634 +0,0 @@
-diff --git a/README b/README
-index 1cc01b9..f994aba 100644
--- a/README
-+++ b/README
-@@ -17,10 +17,6 @@ Depends on:
-   http://www.gnu.org/software/bash/
- - GnuPG2
-   http://www.gnupg.org/
-- git
-  http://www.git-scm.com/
-- xclip
-  http://sourceforge.net/projects/xclip/
- - pwgen
-   http://sourceforge.net/projects/pwgen/
- - tree >= 1.7.0
-diff --git a/contrib/emacs/password-store.el b/contrib/emacs/password-store.el
-index cdecad4..052eda7 100644
--- a/contrib/emacs/password-store.el
-+++ b/contrib/emacs/password-store.el
-@@ -112,10 +112,6 @@ outputs error message on failure."
-                        entry
-                        new-entry))
- 
-(defun password-store--run-git (&rest args)
-  (apply 'password-store--run "git"
-         args))
-
- (defun password-store--run-version ()
-   (password-store--run "version"))
- 
-diff --git a/man/pass.1 b/man/pass.1
-index 8ac8ecf..5024799 100644
--- a/man/pass.1
-+++ b/man/pass.1
-@@ -33,13 +33,6 @@ or
- depending on the type of specifier in ARGS. Otherwise COMMAND must be one of
- the valid commands listed below.
- 
-Several of the commands below rely on or provide additional functionality if
-the password store directory is also a git repository. If the password store
-directory is a git repository, all password store modification commands will
-cause a corresponding git commit. See the \fIEXTENDED GIT EXAMPLE\fP section
-for a detailed description using \fBinit\fP and
-.BR git (1).
-
- The \fBinit\fP command must be run before other commands in order to initialize
- the password store with the correct gpg key id. Passwords are encrypting using
- the gpg key set with \fBinit\fP.
-@@ -86,12 +79,8 @@ List names of passwords inside the tree that match \fIpass-names\fP by using the
- .BR tree (1)
- program. This command is alternatively named \fBsearch\fP.
- .TP
-\fBshow\fP [ \fI--clip\fP, \fI-c\fP ] \fIpass-name\fP
-Decrypt and print a password named \fIpass-name\fP. If \fI--clip\fP or \fI-c\fP
-is specified, do not print the password but instead copy the first line to the
-clipboard using
-.BR xclip (1)
-and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds.
-+\fBshow\fP \fIpass-name\fP
-+Decrypt and print a password named \fIpass-name\fP.
- .TP
- \fBinsert\fP [ \fI--echo\fP, \fI-e\fP | \fI--multiline\fP, \fI-m\fP ] [ \fI--force\fP, \fI-f\fP ] \fIpass-name\fP
- Insert a new password into the password store called \fIpass-name\fP. This will
-@@ -110,15 +99,11 @@ ensure that temporary files are created in \fI/dev/shm\fP in order to avoid writ
- difficult-to-erase disk sectors. If \fI/dev/shm\fP is not accessible, fallback to
- the ordinary \fITMPDIR\fP location, and print a warning.
- .TP
-\fBgenerate\fP [ \fI--no-symbols\fP, \fI-n\fP ] [ \fI--clip\fP, \fI-c\fP ] [ \fI--in-place\fP, \fI-i\fP | \fI--force\fP, \fI-f\fP ] \fIpass-name pass-length\fP
-+\fBgenerate\fP [ \fI--no-symbols\fP, \fI-n\fP ] [ \fI--in-place\fP, \fI-i\fP | \fI--force\fP, \fI-f\fP ] \fIpass-name pass-length\fP
- Generate a new password using
- .BR pwgen (1)
- of length \fIpass-length\fP and insert into \fIpass-name\fP. If \fI--no-symbols\fP or \fI-n\fP
- is specified, do not use any non-alphanumeric characters in the generated password.
-If \fI--clip\fP or \fI-c\fP is specified, do not print the password but instead copy
-it to the clipboard using
-.BR xclip (1)
-and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds.
- Prompt before overwriting an existing password,
- unless \fI--force\fP or \fI-f\fP is specified. If \fI--in-place\fP or \fI-i\fP is
- specified, do not interactively prompt, and only replace the first line of the password
-@@ -144,16 +129,6 @@ silently overwrite \fInew-path\fP if it exists. If \fInew-path\fP ends in a
- trailing \fI/\fP, it is always treated as a directory. Passwords are selectively
- reencrypted to the corresponding keys of their new destination.
- .TP
-\fBgit\fP \fIgit-command-args\fP...
-If the password store is a git repository, pass \fIgit-command-args\fP as arguments to
-.BR git (1)
-using the password store as the git repository. If \fIgit-command-args\fP is \fBinit\fP,
-in addition to initializing the git repository, add the current contents of the password
-store to the repository in an initial commit. If the git config key \fIpass.signcommits\fP
-is set to \fItrue\fP, then all commits will be signed using \fIuser.signingkey\fP or the
-default git signing key. This config key may be turned on using:
-.B `pass git config --bool --add pass.signcommits true`
-.TP
- \fBhelp\fP
- Show usage message.
- .TP
-@@ -223,11 +198,6 @@ Show existing password
- .br
- sup3rh4x3rizmynam3 
- .TP
-Copy existing password to clipboard
-.B zx2c4@laptop ~ $ pass -c Email/zx2c4.com 
-.br
-Copied Email/jason@zx2c4.com to clipboard. Will clear in 45 seconds.
-.TP
- Add password to store
- .B zx2c4@laptop ~ $ pass insert Business/cheese-whiz-factory 
- .br
-@@ -266,10 +236,8 @@ The generated password to Email/jasondonenfeld.com is:
- .br
- YqFsMkBeO6di
- .TP
-Generate new password and copy it to the clipboard
-.B zx2c4@laptop ~ $ pass generate -c Email/jasondonenfeld.com 19
-.br
-Copied Email/jasondonenfeld.com to clipboard. Will clear in 45 seconds.
-+Generate new password
-+.B zx2c4@laptop ~ $ pass generate Email/jasondonenfeld.com 19
- .TP
- Remove password from store
- .B zx2c4@laptop ~ $ pass remove Business/cheese-whiz-factory 
-@@ -278,99 +246,6 @@ rm: remove regular file \[u2018]/home/zx2c4/.password-store/Business/cheese-whiz
- .br
- removed \[u2018]/home/zx2c4/.password-store/Business/cheese-whiz-factory.gpg\[u2019]
- 
-.SH EXTENDED GIT EXAMPLE
-Here, we initialize new password store, create a git repository, and then manipulate and sync passwords. Make note of the arguments to the first call of \fBpass git push\fP; consult
-.BR git-push (1)
-for more information.
-
-.B zx2c4@laptop ~ $ pass init Jason@zx2c4.com 
-.br
-mkdir: created directory \[u2018]/home/zx2c4/.password-store\[u2019] 
-.br
-Password store initialized for Jason@zx2c4.com. 
-
-.B zx2c4@laptop ~ $ pass git init 
-.br
-Initialized empty Git repository in /home/zx2c4/.password-store/.git/
-.br
-[master (root-commit) 998c8fd] Added current contents of password store.
-.br
- 1 file changed, 1 insertion(+)
-.br
- create mode 100644 .gpg-id
-
-.B zx2c4@laptop ~ $ pass git remote add origin kexec.com:pass-store 
-
-.B zx2c4@laptop ~ $ pass generate Amazon/amazonemail@email.com 21 
-.br
-mkdir: created directory \[u2018]/home/zx2c4/.password-store/Amazon\[u2019] 
-.br
-[master 30fdc1e] Added generated password for Amazon/amazonemail@email.com to store.
-.br
-1 file changed, 0 insertions(+), 0 deletions(-) 
-.br
-create mode 100644 Amazon/amazonemail@email.com.gpg 
-.br
-The generated password to Amazon/amazonemail@email.com is: 
-.br
-<5m,_BrZY`antNDxKN<0A 
-
-.B zx2c4@laptop ~ $ pass git push -u --all
-.br
-Counting objects: 4, done. 
-.br
-Delta compression using up to 2 threads. 
-.br
-Compressing objects: 100% (3/3), done. 
-.br
-Writing objects: 100% (4/4), 921 bytes, done. 
-.br
-Total 4 (delta 0), reused 0 (delta 0) 
-.br
-To kexec.com:pass-store 
-.br
-* [new branch]      master -> master 
-.br
-Branch master set up to track remote branch master from origin. 
-
-.B zx2c4@laptop ~ $ pass insert Amazon/otheraccount@email.com 
-.br
-Enter password for Amazon/otheraccount@email.com: som3r3a11yb1gp4ssw0rd!!88** 
-.br
-[master b9b6746] Added given password for Amazon/otheraccount@email.com to store. 
-.br
-1 file changed, 0 insertions(+), 0 deletions(-) 
-.br
-create mode 100644 Amazon/otheraccount@email.com.gpg 
-
-.B zx2c4@laptop ~ $ pass rm Amazon/amazonemail@email.com 
-.br
-rm: remove regular file \[u2018]/home/zx2c4/.password-store/Amazon/amazonemail@email.com.gpg\[u2019]? y 
-.br
-removed \[u2018]/home/zx2c4/.password-store/Amazon/amazonemail@email.com.gpg\[u2019] 
-.br
-rm 'Amazon/amazonemail@email.com.gpg' 
-.br
-[master 288b379] Removed Amazon/amazonemail@email.com from store. 
-.br
-1 file changed, 0 insertions(+), 0 deletions(-) 
-.br
-delete mode 100644 Amazon/amazonemail@email.com.gpg 
-
-.B zx2c4@laptop ~ $ pass git push
-.br
-Counting objects: 9, done. 
-.br
-Delta compression using up to 2 threads. 
-.br
-Compressing objects: 100% (5/5), done. 
-.br
-Writing objects: 100% (7/7), 1.25 KiB, done. 
-.br
-Total 7 (delta 0), reused 0 (delta 0) 
-.br
-To kexec.com:pass-store
-
- .SH FILES
- 
- .TP
-@@ -394,19 +269,6 @@ Overrides the default gpg key identification set by \fBinit\fP. Keys must not
- contain spaces and thus use of the hexidecimal key signature is recommended.
- Multiple keys may be specified separated by spaces. 
- .TP
-.I PASSWORD_STORE_GIT
-Overrides the default root of the git repository, which is helpful if
-\fIPASSWORD_STORE_DIR\fP is temporarily set to a sub-directory of the default
-password store.
-.TP
-.I PASSWORD_STORE_X_SELECTION
-Overrides the selection passed to \fBxclip\fP, by default \fIclipboard\fP. See
-.BR xclip (1)
-for more info.
-.TP
-.I PASSWORD_STORE_CLIP_TIME
-Specifies the number of seconds to wait before restoring the clipboard, by default
-\fI45\fP seconds.
- .TP
- .I PASSWORD_STORE_UMASK
- Sets the umask of all files modified by pass, by default \fI077\fP.
-@@ -416,8 +278,6 @@ The location of the text editor used by \fBedit\fP.
- .SH SEE ALSO
- .BR gpg2 (1),
- .BR pwgen (1),
-.BR git (1),
-.BR xclip (1).
- 
- .SH AUTHOR
- .B pass
-diff --git a/src/completion/pass.bash-completion b/src/completion/pass.bash-completion
-index ea31fbf..dbf39dc 100644
--- a/src/completion/pass.bash-completion
-+++ b/src/completion/pass.bash-completion
-@@ -62,7 +62,7 @@ _pass()
- {
- 	COMPREPLY=()
- 	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local commands="init ls find grep show insert generate edit rm mv cp git help version"
-+	local commands="init ls find grep show insert generate edit rm mv cp help version"
- 	if [[ $COMP_CWORD -gt 1 ]]; then
- 		local lastarg="${COMP_WORDS[$COMP_CWORD-1]}"
- 		case "${COMP_WORDS[1]}" in
-@@ -78,7 +78,6 @@ _pass()
- 				_pass_complete_entries
- 				;;
- 			show|-*)
-				COMPREPLY+=($(compgen -W "-c --clip" -- ${cur}))
- 				_pass_complete_entries 1
- 				;;
- 			insert)
-@@ -86,7 +85,7 @@ _pass()
- 				_pass_complete_entries
- 				;;
- 			generate)
-				COMPREPLY+=($(compgen -W "-n --no-symbols -c --clip -f --force -i --in-place" -- ${cur}))
-+				COMPREPLY+=($(compgen -W "-n --no-symbols -f --force -i --in-place" -- ${cur}))
- 				_pass_complete_entries
- 				;;
- 			cp|copy|mv|rename)
-@@ -97,9 +96,6 @@ _pass()
- 				COMPREPLY+=($(compgen -W "-r --recursive -f --force" -- ${cur}))
- 				_pass_complete_entries
- 				;;
-			git)
-				COMPREPLY+=($(compgen -W "init push pull config log reflog rebase" -- ${cur}))
-				;;
- 		esac
- 	else
- 		COMPREPLY+=($(compgen -W "${commands}" -- ${cur}))
-diff --git a/src/completion/pass.fish-completion b/src/completion/pass.fish-completion
-index c32a42c..6920546 100644
--- a/src/completion/pass.fish-completion
-+++ b/src/completion/pass.fish-completion
-@@ -75,7 +75,6 @@ complete -c $PROG -f -A -n '__fish_pass_uses_command insert' -a "(__fish_pass_pr
- 
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a generate -d 'Command: generate new password'
- complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -s n -l no-symbols -d 'Do not use special symbols'
-complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -s c -l clip -d 'Put the password in clipboard'
- complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -s f -l force -d 'Do not prompt before overwritting'
- complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -s i -l in-place -d 'Replace only the first line with the generated password'
- complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -a "(__fish_pass_print_entry_dirs)"
-@@ -97,22 +96,10 @@ complete -c $PROG -f -A -n '__fish_pass_needs_command' -a edit -d 'Command: edit
- complete -c $PROG -f -A -n '__fish_pass_uses_command edit' -a "(__fish_pass_print_entries)"
- 
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a show -d 'Command: show existing password'
-complete -c $PROG -f -A -n '__fish_pass_uses_command show' -s c -l clip -d 'Put password in clipboard'
- complete -c $PROG -f -A -n '__fish_pass_uses_command show' -a "(__fish_pass_print_entries)"
- # When no command is given, `show` is defaulted.
-complete -c $PROG -f -A -n '__fish_pass_needs_command' -s c -l clip -d 'Put password in clipboard'
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a "(__fish_pass_print_entries)"
- complete -c $PROG -f -A -n '__fish_pass_uses_command -c' -a "(__fish_pass_print_entries)"
-complete -c $PROG -f -A -n '__fish_pass_uses_command --clip' -a "(__fish_pass_print_entries)"
-
-complete -c $PROG -f -A -n '__fish_pass_needs_command' -a git -d 'Command: execute a git command'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'init' -d 'Initialize git repository'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'status' -d 'Show status of the repo'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'add' -d 'Add changes to the index'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'commit' -d 'Commit changes to the repo'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'push' -d 'Push changes to remote repo'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'pull' -d 'Pull changes from remote repo'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'log' -d 'View changelog'
- 
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a find -d 'Command: find a password file or directory matching pattern'
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a grep -d 'Command: search inside of decrypted password files for matching pattern'
-diff --git a/src/completion/pass.zsh-completion b/src/completion/pass.zsh-completion
-index b658398..0f5599f 100644
--- a/src/completion/pass.zsh-completion
-+++ b/src/completion/pass.zsh-completion
-@@ -41,8 +41,6 @@ _pass () {
- 				_arguments : \
- 					"-n[don't include symbols in password]" \
- 					"--no-symbols[don't include symbols in password]" \
-					"-c[copy password to the clipboard]" \
-					"--clip[copy password to the clipboard]" \
- 					"-f[force overwrite]" \
- 					"--force[force overwrite]" \
- 					"-i[replace first line]" \
-@@ -63,18 +61,6 @@ _pass () {
- 					"--recursive[recursively delete]"
- 					_pass_complete_entries_with_subdirs
- 				;;
-			git)
-				local -a subcommands
-				subcommands=(
-					"init:Initialize git repository"
-					"push:Push to remote repository"
-					"pull:Pull from remote repository"
-					"config:Show git config"
-					"log:Show git log"
-					"reflog:Show git reflog"
-				)
-				_describe -t commands 'pass git' subcommands
-				;;
- 			show|*)
- 				_pass_cmd_show
- 				;;
-@@ -93,7 +79,6 @@ _pass () {
- 			"mv:Rename the password"
- 			"cp:Copy the password"
- 			"rm:Remove the password"
-			"git:Call git on the password store"
- 			"version:Output version information"
- 			"help:Output help message"
- 		)
-@@ -106,15 +91,12 @@ _pass () {
- }
- 
- _pass_cmd_show () {
-	_arguments : \
-		"-c[put it on the clipboard]" \
-		"--clip[put it on the clipboard]"
- 	_pass_complete_entries
- }
- _pass_complete_entries_helper () {
- 	local IFS=$'\n'
- 	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' $(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort)
-+	_values -C 'passwords' $(find -L "$prefix" -name .gpg-id -prune -o $@ -print | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort)
- }
- 
- _pass_complete_entries_with_subdirs () {
-diff --git a/src/password-store.sh b/src/password-store.sh
-index cfc25cc..01fa1bc 100755
--- a/src/password-store.sh
-+++ b/src/password-store.sh
-@@ -12,28 +12,11 @@ which gpg2 &>/dev/null && GPG="gpg2"
- [[ -n $GPG_AGENT_INFO || $GPG == "gpg2" ]] && GPG_OPTS+=( "--batch" "--use-agent" )
- 
- PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-X_SELECTION="${PASSWORD_STORE_X_SELECTION:-clipboard}"
-CLIP_TIME="${PASSWORD_STORE_CLIP_TIME:-45}"
-
-export GIT_DIR="${PASSWORD_STORE_GIT:-$PREFIX}/.git"
-export GIT_WORK_TREE="${PASSWORD_STORE_GIT:-$PREFIX}"
- 
- #
- # BEGIN helper functions
- #
- 
-git_add_file() {
-	[[ -d $GIT_DIR ]] || return
-	git add "$1" || return
-	[[ -n $(git status --porcelain "$1") ]] || return
-	git_commit "$2"
-}
-git_commit() {
-	local sign=""
-	[[ -d $GIT_DIR ]] || return
-	[[ $(git config --bool --get pass.signcommits) == "true" ]] && sign="-S"
-	git commit $sign -m "$1"
-}
- yesno() {
- 	[[ -t 0 ]] || return 0
- 	local response
-@@ -135,33 +118,6 @@ check_sneaky_paths() {
- # BEGIN platform definable
- #
- 
-clip() {
-	# This base64 business is because bash cannot store binary data in a shell
-	# variable. Specifically, it cannot store nulls nor (non-trivally) store
-	# trailing new lines.
-
-	local sleep_argv0="password store sleep on display $DISPLAY"
-	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
-	local before="$(xclip -o -selection "$X_SELECTION" | base64)"
-	echo -n "$1" | xclip -selection "$X_SELECTION"
-	(
-		( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
-		local now="$(xclip -o -selection "$X_SELECTION" | base64)"
-		[[ $now != $(echo -n "$1" | base64) ]] && before="$now"
-
-		# It might be nice to programatically check to see if klipper exists,
-		# as well as checking for other common clipboard managers. But for now,
-		# this works fine -- if qdbus isn't there or if klipper isn't running,
-		# this essentially becomes a no-op.
-		#
-		# Clipboard managers frequently write their history out in plaintext,
-		# so we axe it here:
-		qdbus org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory &>/dev/null
-
-		echo "$before" | base64 -d | xclip -selection "$X_SELECTION"
-	) 2>/dev/null & disown
-	echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds."
-}
- tmpdir() {
- 	[[ -n $SECURE_TMPDIR ]] && return
- 	local warn=1
-@@ -232,9 +188,8 @@ cmd_usage() {
- 	        List passwords.
- 	    $PROGRAM find pass-names...
- 	    	List passwords that match pass-names.
-	    $PROGRAM [show] [--clip,-c] pass-name
-	        Show existing password and optionally put it on the clipboard.
-	        If put on the clipboard, it will be cleared in $CLIP_TIME seconds.
-+	    $PROGRAM [show] pass-name
-+	        Show existing password.
- 	    $PROGRAM grep search-string
- 	        Search for password files containing search-string when decrypted.
- 	    $PROGRAM insert [--echo,-e | --multiline,-m] [--force,-f] pass-name
-@@ -243,9 +198,8 @@ cmd_usage() {
- 	        overwriting existing password unless forced.
- 	    $PROGRAM edit pass-name
- 	        Insert a new password or edit an existing password using ${EDITOR:-vi}.
-	    $PROGRAM generate [--no-symbols,-n] [--clip,-c] [--in-place,-i | --force,-f] pass-name pass-length
-+	    $PROGRAM generate [--no-symbols,-n] [--in-place,-i | --force,-f] pass-name pass-length
- 	        Generate a new password of pass-length with optionally no symbols.
-	        Optionally put it on the clipboard and clear board after 45 seconds.
- 	        Prompt before overwriting existing password unless forced.
- 	        Optionally replace only the first line of an existing file with a new password.
- 	    $PROGRAM rm [--recursive,-r] [--force,-f] pass-name
-@@ -254,9 +208,6 @@ cmd_usage() {
- 	        Renames or moves old-path to new-path, optionally forcefully, selectively reencrypting.
- 	    $PROGRAM cp [--force,-f] old-path new-path
- 	        Copies old-path to new-path, optionally forcefully, selectively reencrypting.
-	    $PROGRAM git git-command-args...
-	        If the password store is a git repository, execute a git command
-	        specified by git-command-args.
- 	    $PROGRAM help
- 	        Show this text.
- 	    $PROGRAM version
-@@ -285,47 +236,24 @@ cmd_init() {
- 	if [[ $# -eq 1 && -z $1 ]]; then
- 		[[ ! -f "$gpg_id" ]] && die "Error: $gpg_id does not exist and so cannot be removed."
- 		rm -v -f "$gpg_id" || exit 1
-		if [[ -d $GIT_DIR ]]; then
-			git rm -qr "$gpg_id"
-			git_commit "Deinitialize ${gpg_id}."
-		fi
- 		rmdir -p "${gpg_id%/*}" 2>/dev/null
- 	else
- 		mkdir -v -p "$PREFIX/$id_path"
- 		printf "%s\n" "$@" > "$gpg_id"
- 		local id_print="$(printf "%s, " "$@")"
- 		echo "Password store initialized for ${id_print%, }"
-		git_add_file "$gpg_id" "Set GPG id to ${id_print%, }."
- 	fi
- 
- 	agent_check
- 	reencrypt_path "$PREFIX/$id_path"
-	git_add_file "$PREFIX/$id_path" "Reencrypt password store using new GPG id ${id_print%, }."
- }
- 
- cmd_show() {
-	local opts clip=0
-	opts="$($GETOPT -o c -l clip -n "$PROGRAM" -- "$@")"
-	local err=$?
-	eval set -- "$opts"
-	while true; do case $1 in
-		-c|--clip) clip=1; shift ;;
-		--) shift; break ;;
-	esac done
-
-	[[ $err -ne 0 ]] && die "Usage: $PROGRAM $COMMAND [--clip,-c] [pass-name]"
-
- 	local path="$1"
- 	local passfile="$PREFIX/$path.gpg"
- 	check_sneaky_paths "$path"
- 	if [[ -f $passfile ]]; then
-		if [[ $clip -eq 0 ]]; then
- 			exec $GPG -d "${GPG_OPTS[@]}" "$passfile"
-		else
-			local pass="$($GPG -d "${GPG_OPTS[@]}" "$passfile" | head -n 1)"
-			[[ -n $pass ]] || exit 1
-			clip "$pass" "$path"
-		fi
- 	elif [[ -d $PREFIX/$path ]]; then
- 		if [[ -z $path ]]; then
- 			echo "Password Store"
-@@ -408,7 +336,6 @@ cmd_insert() {
- 		read -r -p "Enter password for $path: " -e password
- 		$GPG -e "${GPG_RECIPIENT_ARGS[@]}" -o "$passfile" "${GPG_OPTS[@]}" <<<"$password"
- 	fi
-	git_add_file "$passfile" "Add given password for $path to store."
- }
- 
- cmd_edit() {
-@@ -434,23 +361,21 @@ cmd_edit() {
- 	while ! $GPG -e "${GPG_RECIPIENT_ARGS[@]}" -o "$passfile" "${GPG_OPTS[@]}" "$tmp_file"; do
- 		yesno "GPG encryption failed. Would you like to try again?"
- 	done
-	git_add_file "$passfile" "$action password for $path using ${EDITOR:-vi}."
- }
- 
- cmd_generate() {
-	local opts clip=0 force=0 symbols="-y" inplace=0
-	opts="$($GETOPT -o ncif -l no-symbols,clip,in-place,force -n "$PROGRAM" -- "$@")"
-+	local opts force=0 symbols="-y" inplace=0
-+	opts="$($GETOPT -o nif -l no-symbols,in-place,force -n "$PROGRAM" -- "$@")"
- 	local err=$?
- 	eval set -- "$opts"
- 	while true; do case $1 in
- 		-n|--no-symbols) symbols=""; shift ;;
-		-c|--clip) clip=1; shift ;;
- 		-f|--force) force=1; shift ;;
- 		-i|--in-place) inplace=1; shift ;;
- 		--) shift; break ;;
- 	esac done
- 
-	[[ $err -ne 0 || $# -ne 2 || ( $force -eq 1 && $inplace -eq 1 ) ]] && die "Usage: $PROGRAM $COMMAND [--no-symbols,-n] [--clip,-c] [--in-place,-i | --force,-f] pass-name pass-length"
-+	[[ $err -ne 0 || $# -ne 2 || ( $force -eq 1 && $inplace -eq 1 ) ]] && die "Usage: $PROGRAM $COMMAND [--no-symbols,-n] [--in-place,-i | --force,-f] pass-name pass-length"
- 	local path="$1"
- 	local length="$2"
- 	check_sneaky_paths "$path"
-@@ -476,13 +401,8 @@ cmd_generate() {
- 	fi
- 	local verb="Add"
- 	[[ $inplace -eq 1 ]] && verb="Replace"
-	git_add_file "$passfile" "$verb generated password for ${path}."
- 
-	if [[ $clip -eq 0 ]]; then
-		printf "\e[1m\e[37mThe generated password for \e[4m%s\e[24m is:\e[0m\n\e[1m\e[93m%s\e[0m\n" "$path" "$pass"
-	else
-		clip "$pass" "$path"
-	fi
-+	printf "\e[1m\e[37mThe generated password for \e[4m%s\e[24m is:\e[0m\n\e[1m\e[93m%s\e[0m\n" "$path" "$pass"
- }
- 
- cmd_delete() {
-@@ -508,10 +428,6 @@ cmd_delete() {
- 	[[ $force -eq 1 ]] || yesno "Are you sure you would like to delete $path?"
- 
- 	rm $recursive -f -v "$passfile"
-	if [[ -d $GIT_DIR && ! -e $passfile ]]; then
-		git rm -qr "$passfile"
-		git_commit "Remove $path from store."
-	fi
- 	rmdir -p "${passfile%/*}" 2>/dev/null
- }
- 
-@@ -548,33 +464,10 @@ cmd_copy_move() {
- 		mv $interactive -v "$old_path" "$new_path" || exit 1
- 		[[ -e "$new_path" ]] && reencrypt_path "$new_path"
- 
-		if [[ -d $GIT_DIR && ! -e $old_path ]]; then
-			git rm -qr "$old_path"
-			git_add_file "$new_path" "Rename ${1} to ${2}."
-		fi
- 		rmdir -p "$old_dir" 2>/dev/null
- 	else
- 		cp $interactive -r -v "$old_path" "$new_path" || exit 1
- 		[[ -e "$new_path" ]] && reencrypt_path "$new_path"
-		git_add_file "$new_path" "Copy ${1} to ${2}."
-	fi
-}
-
-cmd_git() {
-	if [[ $1 == "init" ]]; then
-		git "$@" || exit 1
-		git_add_file "$PREFIX" "Add current contents of password store."
-
-		echo '*.gpg diff=gpg' > "$PREFIX/.gitattributes"
-		git_add_file .gitattributes "Configure git repository for gpg file diff."
-		git config --local diff.gpg.binary true
-		git config --local diff.gpg.textconv "$GPG -d ${GPG_OPTS[*]}"
-	elif [[ -d $GIT_DIR ]]; then
-		tmpdir nowarn #Defines $SECURE_TMPDIR. We don't warn, because at most, this only copies encrypted files.
-		export TMPDIR="$SECURE_TMPDIR"
-		git "$@"
-	else
-		die "Error: the password store is not a git repository. Try \"$PROGRAM git init\"."
- 	fi
- }
- 
-@@ -598,7 +491,6 @@ case "$1" in
- 	delete|rm|remove) shift;	cmd_delete "$@" ;;
- 	rename|mv) shift;		cmd_copy_move "move" "$@" ;;
- 	copy|cp) shift;			cmd_copy_move "copy" "$@" ;;
-	git) shift;			cmd_git "$@" ;;
- 	*) COMMAND="show";		cmd_show "$@" ;;
- esac
- exit 0
--- a/sysutils/password-store/files/git.patch
+++ b/sysutils/password-store/files/git.patch
@ -1,405 +0,0 @@
-diff --git a/README b/README
-index 1cc01b9..1a7555b 100644
--- a/README
-+++ b/README
-@@ -17,8 +17,6 @@ Depends on:
-   http://www.gnu.org/software/bash/
- - GnuPG2
-   http://www.gnupg.org/
-- git
-  http://www.git-scm.com/
- - xclip
-   http://sourceforge.net/projects/xclip/
- - pwgen
-diff --git a/contrib/emacs/password-store.el b/contrib/emacs/password-store.el
-index cdecad4..052eda7 100644
--- a/contrib/emacs/password-store.el
-+++ b/contrib/emacs/password-store.el
-@@ -112,10 +112,6 @@ outputs error message on failure."
-                        entry
-                        new-entry))
- 
-(defun password-store--run-git (&rest args)
-  (apply 'password-store--run "git"
-         args))
-
- (defun password-store--run-version ()
-   (password-store--run "version"))
- 
-diff --git a/man/pass.1 b/man/pass.1
-index 8ac8ecf..b340a95 100644
--- a/man/pass.1
-+++ b/man/pass.1
-@@ -33,13 +33,6 @@ or
- depending on the type of specifier in ARGS. Otherwise COMMAND must be one of
- the valid commands listed below.
- 
-Several of the commands below rely on or provide additional functionality if
-the password store directory is also a git repository. If the password store
-directory is a git repository, all password store modification commands will
-cause a corresponding git commit. See the \fIEXTENDED GIT EXAMPLE\fP section
-for a detailed description using \fBinit\fP and
-.BR git (1).
-
- The \fBinit\fP command must be run before other commands in order to initialize
- the password store with the correct gpg key id. Passwords are encrypting using
- the gpg key set with \fBinit\fP.
-@@ -144,16 +137,6 @@ silently overwrite \fInew-path\fP if it exists. If \fInew-path\fP ends in a
- trailing \fI/\fP, it is always treated as a directory. Passwords are selectively
- reencrypted to the corresponding keys of their new destination.
- .TP
-\fBgit\fP \fIgit-command-args\fP...
-If the password store is a git repository, pass \fIgit-command-args\fP as arguments to
-.BR git (1)
-using the password store as the git repository. If \fIgit-command-args\fP is \fBinit\fP,
-in addition to initializing the git repository, add the current contents of the password
-store to the repository in an initial commit. If the git config key \fIpass.signcommits\fP
-is set to \fItrue\fP, then all commits will be signed using \fIuser.signingkey\fP or the
-default git signing key. This config key may be turned on using:
-.B `pass git config --bool --add pass.signcommits true`
-.TP
- \fBhelp\fP
- Show usage message.
- .TP
-@@ -278,99 +261,6 @@ rm: remove regular file \[u2018]/home/zx2c4/.password-store/Business/cheese-whiz
- .br
- removed \[u2018]/home/zx2c4/.password-store/Business/cheese-whiz-factory.gpg\[u2019]
- 
-.SH EXTENDED GIT EXAMPLE
-Here, we initialize new password store, create a git repository, and then manipulate and sync passwords. Make note of the arguments to the first call of \fBpass git push\fP; consult
-.BR git-push (1)
-for more information.
-
-.B zx2c4@laptop ~ $ pass init Jason@zx2c4.com 
-.br
-mkdir: created directory \[u2018]/home/zx2c4/.password-store\[u2019] 
-.br
-Password store initialized for Jason@zx2c4.com. 
-
-.B zx2c4@laptop ~ $ pass git init 
-.br
-Initialized empty Git repository in /home/zx2c4/.password-store/.git/
-.br
-[master (root-commit) 998c8fd] Added current contents of password store.
-.br
- 1 file changed, 1 insertion(+)
-.br
- create mode 100644 .gpg-id
-
-.B zx2c4@laptop ~ $ pass git remote add origin kexec.com:pass-store 
-
-.B zx2c4@laptop ~ $ pass generate Amazon/amazonemail@email.com 21 
-.br
-mkdir: created directory \[u2018]/home/zx2c4/.password-store/Amazon\[u2019] 
-.br
-[master 30fdc1e] Added generated password for Amazon/amazonemail@email.com to store.
-.br
-1 file changed, 0 insertions(+), 0 deletions(-) 
-.br
-create mode 100644 Amazon/amazonemail@email.com.gpg 
-.br
-The generated password to Amazon/amazonemail@email.com is: 
-.br
-<5m,_BrZY`antNDxKN<0A 
-
-.B zx2c4@laptop ~ $ pass git push -u --all
-.br
-Counting objects: 4, done. 
-.br
-Delta compression using up to 2 threads. 
-.br
-Compressing objects: 100% (3/3), done. 
-.br
-Writing objects: 100% (4/4), 921 bytes, done. 
-.br
-Total 4 (delta 0), reused 0 (delta 0) 
-.br
-To kexec.com:pass-store 
-.br
-* [new branch]      master -> master 
-.br
-Branch master set up to track remote branch master from origin. 
-
-.B zx2c4@laptop ~ $ pass insert Amazon/otheraccount@email.com 
-.br
-Enter password for Amazon/otheraccount@email.com: som3r3a11yb1gp4ssw0rd!!88** 
-.br
-[master b9b6746] Added given password for Amazon/otheraccount@email.com to store. 
-.br
-1 file changed, 0 insertions(+), 0 deletions(-) 
-.br
-create mode 100644 Amazon/otheraccount@email.com.gpg 
-
-.B zx2c4@laptop ~ $ pass rm Amazon/amazonemail@email.com 
-.br
-rm: remove regular file \[u2018]/home/zx2c4/.password-store/Amazon/amazonemail@email.com.gpg\[u2019]? y 
-.br
-removed \[u2018]/home/zx2c4/.password-store/Amazon/amazonemail@email.com.gpg\[u2019] 
-.br
-rm 'Amazon/amazonemail@email.com.gpg' 
-.br
-[master 288b379] Removed Amazon/amazonemail@email.com from store. 
-.br
-1 file changed, 0 insertions(+), 0 deletions(-) 
-.br
-delete mode 100644 Amazon/amazonemail@email.com.gpg 
-
-.B zx2c4@laptop ~ $ pass git push
-.br
-Counting objects: 9, done. 
-.br
-Delta compression using up to 2 threads. 
-.br
-Compressing objects: 100% (5/5), done. 
-.br
-Writing objects: 100% (7/7), 1.25 KiB, done. 
-.br
-Total 7 (delta 0), reused 0 (delta 0) 
-.br
-To kexec.com:pass-store
-
- .SH FILES
- 
- .TP
-@@ -394,11 +284,6 @@ Overrides the default gpg key identification set by \fBinit\fP. Keys must not
- contain spaces and thus use of the hexidecimal key signature is recommended.
- Multiple keys may be specified separated by spaces. 
- .TP
-.I PASSWORD_STORE_GIT
-Overrides the default root of the git repository, which is helpful if
-\fIPASSWORD_STORE_DIR\fP is temporarily set to a sub-directory of the default
-password store.
-.TP
- .I PASSWORD_STORE_X_SELECTION
- Overrides the selection passed to \fBxclip\fP, by default \fIclipboard\fP. See
- .BR xclip (1)
-@@ -416,7 +301,6 @@ The location of the text editor used by \fBedit\fP.
- .SH SEE ALSO
- .BR gpg2 (1),
- .BR pwgen (1),
-.BR git (1),
- .BR xclip (1).
- 
- .SH AUTHOR
-diff --git a/src/completion/pass.bash-completion b/src/completion/pass.bash-completion
-index ea31fbf..f7e207b 100644
--- a/src/completion/pass.bash-completion
-+++ b/src/completion/pass.bash-completion
-@@ -62,7 +62,7 @@ _pass()
- {
- 	COMPREPLY=()
- 	local cur="${COMP_WORDS[COMP_CWORD]}"
-	local commands="init ls find grep show insert generate edit rm mv cp git help version"
-+	local commands="init ls find grep show insert generate edit rm mv cp help version"
- 	if [[ $COMP_CWORD -gt 1 ]]; then
- 		local lastarg="${COMP_WORDS[$COMP_CWORD-1]}"
- 		case "${COMP_WORDS[1]}" in
-@@ -97,9 +97,6 @@ _pass()
- 				COMPREPLY+=($(compgen -W "-r --recursive -f --force" -- ${cur}))
- 				_pass_complete_entries
- 				;;
-			git)
-				COMPREPLY+=($(compgen -W "init push pull config log reflog rebase" -- ${cur}))
-				;;
- 		esac
- 	else
- 		COMPREPLY+=($(compgen -W "${commands}" -- ${cur}))
-diff --git a/src/completion/pass.fish-completion b/src/completion/pass.fish-completion
-index c32a42c..598b55e 100644
--- a/src/completion/pass.fish-completion
-+++ b/src/completion/pass.fish-completion
-@@ -105,14 +105,5 @@ complete -c $PROG -f -A -n '__fish_pass_needs_command' -a "(__fish_pass_print_en
- complete -c $PROG -f -A -n '__fish_pass_uses_command -c' -a "(__fish_pass_print_entries)"
- complete -c $PROG -f -A -n '__fish_pass_uses_command --clip' -a "(__fish_pass_print_entries)"
- 
-complete -c $PROG -f -A -n '__fish_pass_needs_command' -a git -d 'Command: execute a git command'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'init' -d 'Initialize git repository'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'status' -d 'Show status of the repo'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'add' -d 'Add changes to the index'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'commit' -d 'Commit changes to the repo'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'push' -d 'Push changes to remote repo'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'pull' -d 'Pull changes from remote repo'
-complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'log' -d 'View changelog'
-
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a find -d 'Command: find a password file or directory matching pattern'
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a grep -d 'Command: search inside of decrypted password files for matching pattern'
-diff --git a/src/completion/pass.zsh-completion b/src/completion/pass.zsh-completion
-index b658398..b0695e6 100644
--- a/src/completion/pass.zsh-completion
-+++ b/src/completion/pass.zsh-completion
-@@ -63,18 +63,6 @@ _pass () {
- 					"--recursive[recursively delete]"
- 					_pass_complete_entries_with_subdirs
- 				;;
-			git)
-				local -a subcommands
-				subcommands=(
-					"init:Initialize git repository"
-					"push:Push to remote repository"
-					"pull:Pull from remote repository"
-					"config:Show git config"
-					"log:Show git log"
-					"reflog:Show git reflog"
-				)
-				_describe -t commands 'pass git' subcommands
-				;;
- 			show|*)
- 				_pass_cmd_show
- 				;;
-@@ -93,7 +81,6 @@ _pass () {
- 			"mv:Rename the password"
- 			"cp:Copy the password"
- 			"rm:Remove the password"
-			"git:Call git on the password store"
- 			"version:Output version information"
- 			"help:Output help message"
- 		)
-@@ -114,7 +101,7 @@ _pass_cmd_show () {
- _pass_complete_entries_helper () {
- 	local IFS=$'\n'
- 	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' $(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort)
-+	_values -C 'passwords' $(find -L "$prefix" -name .gpg-id -prune -o $@ -print | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort)
- }
- 
- _pass_complete_entries_with_subdirs () {
-diff --git a/src/password-store.sh b/src/password-store.sh
-index cfc25cc..72a0ed6 100755
--- a/src/password-store.sh
-+++ b/src/password-store.sh
-@@ -15,25 +15,10 @@ PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
- X_SELECTION="${PASSWORD_STORE_X_SELECTION:-clipboard}"
- CLIP_TIME="${PASSWORD_STORE_CLIP_TIME:-45}"
- 
-export GIT_DIR="${PASSWORD_STORE_GIT:-$PREFIX}/.git"
-export GIT_WORK_TREE="${PASSWORD_STORE_GIT:-$PREFIX}"
-
- #
- # BEGIN helper functions
- #
- 
-git_add_file() {
-	[[ -d $GIT_DIR ]] || return
-	git add "$1" || return
-	[[ -n $(git status --porcelain "$1") ]] || return
-	git_commit "$2"
-}
-git_commit() {
-	local sign=""
-	[[ -d $GIT_DIR ]] || return
-	[[ $(git config --bool --get pass.signcommits) == "true" ]] && sign="-S"
-	git commit $sign -m "$1"
-}
- yesno() {
- 	[[ -t 0 ]] || return 0
- 	local response
-@@ -254,9 +239,6 @@ cmd_usage() {
- 	        Renames or moves old-path to new-path, optionally forcefully, selectively reencrypting.
- 	    $PROGRAM cp [--force,-f] old-path new-path
- 	        Copies old-path to new-path, optionally forcefully, selectively reencrypting.
-	    $PROGRAM git git-command-args...
-	        If the password store is a git repository, execute a git command
-	        specified by git-command-args.
- 	    $PROGRAM help
- 	        Show this text.
- 	    $PROGRAM version
-@@ -285,22 +267,16 @@ cmd_init() {
- 	if [[ $# -eq 1 && -z $1 ]]; then
- 		[[ ! -f "$gpg_id" ]] && die "Error: $gpg_id does not exist and so cannot be removed."
- 		rm -v -f "$gpg_id" || exit 1
-		if [[ -d $GIT_DIR ]]; then
-			git rm -qr "$gpg_id"
-			git_commit "Deinitialize ${gpg_id}."
-		fi
- 		rmdir -p "${gpg_id%/*}" 2>/dev/null
- 	else
- 		mkdir -v -p "$PREFIX/$id_path"
- 		printf "%s\n" "$@" > "$gpg_id"
- 		local id_print="$(printf "%s, " "$@")"
- 		echo "Password store initialized for ${id_print%, }"
-		git_add_file "$gpg_id" "Set GPG id to ${id_print%, }."
- 	fi
- 
- 	agent_check
- 	reencrypt_path "$PREFIX/$id_path"
-	git_add_file "$PREFIX/$id_path" "Reencrypt password store using new GPG id ${id_print%, }."
- }
- 
- cmd_show() {
-@@ -408,7 +384,6 @@ cmd_insert() {
- 		read -r -p "Enter password for $path: " -e password
- 		$GPG -e "${GPG_RECIPIENT_ARGS[@]}" -o "$passfile" "${GPG_OPTS[@]}" <<<"$password"
- 	fi
-	git_add_file "$passfile" "Add given password for $path to store."
- }
- 
- cmd_edit() {
-@@ -434,7 +409,6 @@ cmd_edit() {
- 	while ! $GPG -e "${GPG_RECIPIENT_ARGS[@]}" -o "$passfile" "${GPG_OPTS[@]}" "$tmp_file"; do
- 		yesno "GPG encryption failed. Would you like to try again?"
- 	done
-	git_add_file "$passfile" "$action password for $path using ${EDITOR:-vi}."
- }
- 
- cmd_generate() {
-@@ -476,7 +450,6 @@ cmd_generate() {
- 	fi
- 	local verb="Add"
- 	[[ $inplace -eq 1 ]] && verb="Replace"
-	git_add_file "$passfile" "$verb generated password for ${path}."
- 
- 	if [[ $clip -eq 0 ]]; then
- 		printf "\e[1m\e[37mThe generated password for \e[4m%s\e[24m is:\e[0m\n\e[1m\e[93m%s\e[0m\n" "$path" "$pass"
-@@ -508,10 +481,6 @@ cmd_delete() {
- 	[[ $force -eq 1 ]] || yesno "Are you sure you would like to delete $path?"
- 
- 	rm $recursive -f -v "$passfile"
-	if [[ -d $GIT_DIR && ! -e $passfile ]]; then
-		git rm -qr "$passfile"
-		git_commit "Remove $path from store."
-	fi
- 	rmdir -p "${passfile%/*}" 2>/dev/null
- }
- 
-@@ -548,33 +517,10 @@ cmd_copy_move() {
- 		mv $interactive -v "$old_path" "$new_path" || exit 1
- 		[[ -e "$new_path" ]] && reencrypt_path "$new_path"
- 
-		if [[ -d $GIT_DIR && ! -e $old_path ]]; then
-			git rm -qr "$old_path"
-			git_add_file "$new_path" "Rename ${1} to ${2}."
-		fi
- 		rmdir -p "$old_dir" 2>/dev/null
- 	else
- 		cp $interactive -r -v "$old_path" "$new_path" || exit 1
- 		[[ -e "$new_path" ]] && reencrypt_path "$new_path"
-		git_add_file "$new_path" "Copy ${1} to ${2}."
-	fi
-}
-
-cmd_git() {
-	if [[ $1 == "init" ]]; then
-		git "$@" || exit 1
-		git_add_file "$PREFIX" "Add current contents of password store."
-
-		echo '*.gpg diff=gpg' > "$PREFIX/.gitattributes"
-		git_add_file .gitattributes "Configure git repository for gpg file diff."
-		git config --local diff.gpg.binary true
-		git config --local diff.gpg.textconv "$GPG -d ${GPG_OPTS[*]}"
-	elif [[ -d $GIT_DIR ]]; then
-		tmpdir nowarn #Defines $SECURE_TMPDIR. We don't warn, because at most, this only copies encrypted files.
-		export TMPDIR="$SECURE_TMPDIR"
-		git "$@"
-	else
-		die "Error: the password store is not a git repository. Try \"$PROGRAM git init\"."
- 	fi
- }
- 
-@@ -598,7 +544,6 @@ case "$1" in
- 	delete|rm|remove) shift;	cmd_delete "$@" ;;
- 	rename|mv) shift;		cmd_copy_move "move" "$@" ;;
- 	copy|cp) shift;			cmd_copy_move "copy" "$@" ;;
-	git) shift;			cmd_git "$@" ;;
- 	*) COMMAND="show";		cmd_show "$@" ;;
- esac
- exit 0
--- a/sysutils/password-store/files/xclip.patch
+++ b/sysutils/password-store/files/xclip.patch
@ -1,303 +0,0 @@
-diff --git a/README b/README
-index 1cc01b9..10f841d 100644
--- a/README
-+++ b/README
-@@ -19,8 +19,6 @@ Depends on:
-   http://www.gnupg.org/
- - git
-   http://www.git-scm.com/
-- xclip
-  http://sourceforge.net/projects/xclip/
- - pwgen
-   http://sourceforge.net/projects/pwgen/
- - tree >= 1.7.0
-diff --git a/man/pass.1 b/man/pass.1
-index 8ac8ecf..9301122 100644
--- a/man/pass.1
-+++ b/man/pass.1
-@@ -86,12 +86,8 @@ List names of passwords inside the tree that match \fIpass-names\fP by using the
- .BR tree (1)
- program. This command is alternatively named \fBsearch\fP.
- .TP
-\fBshow\fP [ \fI--clip\fP, \fI-c\fP ] \fIpass-name\fP
-Decrypt and print a password named \fIpass-name\fP. If \fI--clip\fP or \fI-c\fP
-is specified, do not print the password but instead copy the first line to the
-clipboard using
-.BR xclip (1)
-and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds.
-+\fBshow\fP \fIpass-name\fP
-+Decrypt and print a password named \fIpass-name\fP.
- .TP
- \fBinsert\fP [ \fI--echo\fP, \fI-e\fP | \fI--multiline\fP, \fI-m\fP ] [ \fI--force\fP, \fI-f\fP ] \fIpass-name\fP
- Insert a new password into the password store called \fIpass-name\fP. This will
-@@ -110,15 +106,11 @@ ensure that temporary files are created in \fI/dev/shm\fP in order to avoid writ
- difficult-to-erase disk sectors. If \fI/dev/shm\fP is not accessible, fallback to
- the ordinary \fITMPDIR\fP location, and print a warning.
- .TP
-\fBgenerate\fP [ \fI--no-symbols\fP, \fI-n\fP ] [ \fI--clip\fP, \fI-c\fP ] [ \fI--in-place\fP, \fI-i\fP | \fI--force\fP, \fI-f\fP ] \fIpass-name pass-length\fP
-+\fBgenerate\fP [ \fI--no-symbols\fP, \fI-n\fP ] [ \fI--in-place\fP, \fI-i\fP | \fI--force\fP, \fI-f\fP ] \fIpass-name pass-length\fP
- Generate a new password using
- .BR pwgen (1)
- of length \fIpass-length\fP and insert into \fIpass-name\fP. If \fI--no-symbols\fP or \fI-n\fP
- is specified, do not use any non-alphanumeric characters in the generated password.
-If \fI--clip\fP or \fI-c\fP is specified, do not print the password but instead copy
-it to the clipboard using
-.BR xclip (1)
-and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds.
- Prompt before overwriting an existing password,
- unless \fI--force\fP or \fI-f\fP is specified. If \fI--in-place\fP or \fI-i\fP is
- specified, do not interactively prompt, and only replace the first line of the password
-@@ -223,11 +215,6 @@ Show existing password
- .br
- sup3rh4x3rizmynam3 
- .TP
-Copy existing password to clipboard
-.B zx2c4@laptop ~ $ pass -c Email/zx2c4.com 
-.br
-Copied Email/jason@zx2c4.com to clipboard. Will clear in 45 seconds.
-.TP
- Add password to store
- .B zx2c4@laptop ~ $ pass insert Business/cheese-whiz-factory 
- .br
-@@ -266,10 +253,8 @@ The generated password to Email/jasondonenfeld.com is:
- .br
- YqFsMkBeO6di
- .TP
-Generate new password and copy it to the clipboard
-.B zx2c4@laptop ~ $ pass generate -c Email/jasondonenfeld.com 19
-.br
-Copied Email/jasondonenfeld.com to clipboard. Will clear in 45 seconds.
-+Generate new password
-+.B zx2c4@laptop ~ $ pass generate Email/jasondonenfeld.com 19
- .TP
- Remove password from store
- .B zx2c4@laptop ~ $ pass remove Business/cheese-whiz-factory 
-@@ -399,15 +384,6 @@ Overrides the default root of the git repository, which is helpful if
- \fIPASSWORD_STORE_DIR\fP is temporarily set to a sub-directory of the default
- password store.
- .TP
-.I PASSWORD_STORE_X_SELECTION
-Overrides the selection passed to \fBxclip\fP, by default \fIclipboard\fP. See
-.BR xclip (1)
-for more info.
-.TP
-.I PASSWORD_STORE_CLIP_TIME
-Specifies the number of seconds to wait before restoring the clipboard, by default
-\fI45\fP seconds.
-.TP
- .I PASSWORD_STORE_UMASK
- Sets the umask of all files modified by pass, by default \fI077\fP.
- .TP
-@@ -417,7 +393,6 @@ The location of the text editor used by \fBedit\fP.
- .BR gpg2 (1),
- .BR pwgen (1),
- .BR git (1),
-.BR xclip (1).
- 
- .SH AUTHOR
- .B pass
-diff --git a/src/completion/pass.bash-completion b/src/completion/pass.bash-completion
-index ea31fbf..86860cb 100644
--- a/src/completion/pass.bash-completion
-+++ b/src/completion/pass.bash-completion
-@@ -78,7 +78,6 @@ _pass()
- 				_pass_complete_entries
- 				;;
- 			show|-*)
-				COMPREPLY+=($(compgen -W "-c --clip" -- ${cur}))
- 				_pass_complete_entries 1
- 				;;
- 			insert)
-@@ -86,7 +85,7 @@ _pass()
- 				_pass_complete_entries
- 				;;
- 			generate)
-				COMPREPLY+=($(compgen -W "-n --no-symbols -c --clip -f --force -i --in-place" -- ${cur}))
-+				COMPREPLY+=($(compgen -W "-n --no-symbols -f --force -i --in-place" -- ${cur}))
- 				_pass_complete_entries
- 				;;
- 			cp|copy|mv|rename)
-diff --git a/src/completion/pass.fish-completion b/src/completion/pass.fish-completion
-index c32a42c..abcff4d 100644
--- a/src/completion/pass.fish-completion
-+++ b/src/completion/pass.fish-completion
-@@ -75,7 +75,6 @@ complete -c $PROG -f -A -n '__fish_pass_uses_command insert' -a "(__fish_pass_pr
- 
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a generate -d 'Command: generate new password'
- complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -s n -l no-symbols -d 'Do not use special symbols'
-complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -s c -l clip -d 'Put the password in clipboard'
- complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -s f -l force -d 'Do not prompt before overwritting'
- complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -s i -l in-place -d 'Replace only the first line with the generated password'
- complete -c $PROG -f -A -n '__fish_pass_uses_command generate' -a "(__fish_pass_print_entry_dirs)"
-@@ -97,13 +96,10 @@ complete -c $PROG -f -A -n '__fish_pass_needs_command' -a edit -d 'Command: edit
- complete -c $PROG -f -A -n '__fish_pass_uses_command edit' -a "(__fish_pass_print_entries)"
- 
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a show -d 'Command: show existing password'
-complete -c $PROG -f -A -n '__fish_pass_uses_command show' -s c -l clip -d 'Put password in clipboard'
- complete -c $PROG -f -A -n '__fish_pass_uses_command show' -a "(__fish_pass_print_entries)"
- # When no command is given, `show` is defaulted.
-complete -c $PROG -f -A -n '__fish_pass_needs_command' -s c -l clip -d 'Put password in clipboard'
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a "(__fish_pass_print_entries)"
- complete -c $PROG -f -A -n '__fish_pass_uses_command -c' -a "(__fish_pass_print_entries)"
-complete -c $PROG -f -A -n '__fish_pass_uses_command --clip' -a "(__fish_pass_print_entries)"
- 
- complete -c $PROG -f -A -n '__fish_pass_needs_command' -a git -d 'Command: execute a git command'
- complete -c $PROG -f -A -n '__fish_pass_uses_command git' -a 'init' -d 'Initialize git repository'
-diff --git a/src/completion/pass.zsh-completion b/src/completion/pass.zsh-completion
-index b658398..0ab3e43 100644
--- a/src/completion/pass.zsh-completion
-+++ b/src/completion/pass.zsh-completion
-@@ -41,8 +41,6 @@ _pass () {
- 				_arguments : \
- 					"-n[don't include symbols in password]" \
- 					"--no-symbols[don't include symbols in password]" \
-					"-c[copy password to the clipboard]" \
-					"--clip[copy password to the clipboard]" \
- 					"-f[force overwrite]" \
- 					"--force[force overwrite]" \
- 					"-i[replace first line]" \
-@@ -106,9 +104,6 @@ _pass () {
- }
- 
- _pass_cmd_show () {
-	_arguments : \
-		"-c[put it on the clipboard]" \
-		"--clip[put it on the clipboard]"
- 	_pass_complete_entries
- }
- _pass_complete_entries_helper () {
-diff --git a/src/password-store.sh b/src/password-store.sh
-index cfc25cc..06ddeb2 100755
--- a/src/password-store.sh
-+++ b/src/password-store.sh
-@@ -12,8 +12,6 @@ which gpg2 &>/dev/null && GPG="gpg2"
- [[ -n $GPG_AGENT_INFO || $GPG == "gpg2" ]] && GPG_OPTS+=( "--batch" "--use-agent" )
- 
- PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-X_SELECTION="${PASSWORD_STORE_X_SELECTION:-clipboard}"
-CLIP_TIME="${PASSWORD_STORE_CLIP_TIME:-45}"
- 
- export GIT_DIR="${PASSWORD_STORE_GIT:-$PREFIX}/.git"
- export GIT_WORK_TREE="${PASSWORD_STORE_GIT:-$PREFIX}"
-@@ -135,33 +133,6 @@ check_sneaky_paths() {
- # BEGIN platform definable
- #
- 
-clip() {
-	# This base64 business is because bash cannot store binary data in a shell
-	# variable. Specifically, it cannot store nulls nor (non-trivally) store
-	# trailing new lines.
-
-	local sleep_argv0="password store sleep on display $DISPLAY"
-	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
-	local before="$(xclip -o -selection "$X_SELECTION" | base64)"
-	echo -n "$1" | xclip -selection "$X_SELECTION"
-	(
-		( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
-		local now="$(xclip -o -selection "$X_SELECTION" | base64)"
-		[[ $now != $(echo -n "$1" | base64) ]] && before="$now"
-
-		# It might be nice to programatically check to see if klipper exists,
-		# as well as checking for other common clipboard managers. But for now,
-		# this works fine -- if qdbus isn't there or if klipper isn't running,
-		# this essentially becomes a no-op.
-		#
-		# Clipboard managers frequently write their history out in plaintext,
-		# so we axe it here:
-		qdbus org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory &>/dev/null
-
-		echo "$before" | base64 -d | xclip -selection "$X_SELECTION"
-	) 2>/dev/null & disown
-	echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds."
-}
- tmpdir() {
- 	[[ -n $SECURE_TMPDIR ]] && return
- 	local warn=1
-@@ -232,9 +203,8 @@ cmd_usage() {
- 	        List passwords.
- 	    $PROGRAM find pass-names...
- 	    	List passwords that match pass-names.
-	    $PROGRAM [show] [--clip,-c] pass-name
-	        Show existing password and optionally put it on the clipboard.
-	        If put on the clipboard, it will be cleared in $CLIP_TIME seconds.
-+	    $PROGRAM [show] pass-name
-+	        Show existing password.
- 	    $PROGRAM grep search-string
- 	        Search for password files containing search-string when decrypted.
- 	    $PROGRAM insert [--echo,-e | --multiline,-m] [--force,-f] pass-name
-@@ -243,9 +213,8 @@ cmd_usage() {
- 	        overwriting existing password unless forced.
- 	    $PROGRAM edit pass-name
- 	        Insert a new password or edit an existing password using ${EDITOR:-vi}.
-	    $PROGRAM generate [--no-symbols,-n] [--clip,-c] [--in-place,-i | --force,-f] pass-name pass-length
-+	    $PROGRAM generate [--no-symbols,-n] [--in-place,-i | --force,-f] pass-name pass-length
- 	        Generate a new password of pass-length with optionally no symbols.
-	        Optionally put it on the clipboard and clear board after 45 seconds.
- 	        Prompt before overwriting existing password unless forced.
- 	        Optionally replace only the first line of an existing file with a new password.
- 	    $PROGRAM rm [--recursive,-r] [--force,-f] pass-name
-@@ -304,28 +273,11 @@ cmd_init() {
- }
- 
- cmd_show() {
-	local opts clip=0
-	opts="$($GETOPT -o c -l clip -n "$PROGRAM" -- "$@")"
-	local err=$?
-	eval set -- "$opts"
-	while true; do case $1 in
-		-c|--clip) clip=1; shift ;;
-		--) shift; break ;;
-	esac done
-
-	[[ $err -ne 0 ]] && die "Usage: $PROGRAM $COMMAND [--clip,-c] [pass-name]"
-
- 	local path="$1"
- 	local passfile="$PREFIX/$path.gpg"
- 	check_sneaky_paths "$path"
- 	if [[ -f $passfile ]]; then
-		if [[ $clip -eq 0 ]]; then
- 			exec $GPG -d "${GPG_OPTS[@]}" "$passfile"
-		else
-			local pass="$($GPG -d "${GPG_OPTS[@]}" "$passfile" | head -n 1)"
-			[[ -n $pass ]] || exit 1
-			clip "$pass" "$path"
-		fi
- 	elif [[ -d $PREFIX/$path ]]; then
- 		if [[ -z $path ]]; then
- 			echo "Password Store"
-@@ -438,19 +390,18 @@ cmd_edit() {
- }
- 
- cmd_generate() {
-	local opts clip=0 force=0 symbols="-y" inplace=0
-	opts="$($GETOPT -o ncif -l no-symbols,clip,in-place,force -n "$PROGRAM" -- "$@")"
-+	local opts force=0 symbols="-y" inplace=0
-+	opts="$($GETOPT -o nif -l no-symbols,in-place,force -n "$PROGRAM" -- "$@")"
- 	local err=$?
- 	eval set -- "$opts"
- 	while true; do case $1 in
- 		-n|--no-symbols) symbols=""; shift ;;
-		-c|--clip) clip=1; shift ;;
- 		-f|--force) force=1; shift ;;
- 		-i|--in-place) inplace=1; shift ;;
- 		--) shift; break ;;
- 	esac done
- 
-	[[ $err -ne 0 || $# -ne 2 || ( $force -eq 1 && $inplace -eq 1 ) ]] && die "Usage: $PROGRAM $COMMAND [--no-symbols,-n] [--clip,-c] [--in-place,-i | --force,-f] pass-name pass-length"
-+	[[ $err -ne 0 || $# -ne 2 || ( $force -eq 1 && $inplace -eq 1 ) ]] && die "Usage: $PROGRAM $COMMAND [--no-symbols,-n] [--in-place,-i | --force,-f] pass-name pass-length"
- 	local path="$1"
- 	local length="$2"
- 	check_sneaky_paths "$path"
-@@ -478,11 +429,7 @@ cmd_generate() {
- 	[[ $inplace -eq 1 ]] && verb="Replace"
- 	git_add_file "$passfile" "$verb generated password for ${path}."
- 
-	if [[ $clip -eq 0 ]]; then
-		printf "\e[1m\e[37mThe generated password for \e[4m%s\e[24m is:\e[0m\n\e[1m\e[93m%s\e[0m\n" "$path" "$pass"
-	else
-		clip "$pass" "$path"
-	fi
-+	printf "\e[1m\e[37mThe generated password for \e[4m%s\e[24m is:\e[0m\n\e[1m\e[93m%s\e[0m\n" "$path" "$pass"
- }
- 
- cmd_delete() {
--- a/sysutils/password-store/pkg-plist
+++ b/sysutils/password-store/pkg-plist
@ -1,6 +1,5 @@
 %%CONTRIB%%%%DATADIR%%/dmenu/README.md
 %%CONTRIB%%%%DATADIR%%/dmenu/passmenu
-%%CONTRIB%%%%DATADIR%%/emacs/.gitignore
 %%CONTRIB%%%%DATADIR%%/emacs/Cask
 %%CONTRIB%%%%DATADIR%%/emacs/README.md
 %%CONTRIB%%%%DATADIR%%/emacs/password-store.el
@ -18,7 +17,11 @@
 %%CONTRIB%%%%DATADIR%%/pass.fish-completion
 %%CONTRIB%%%%DATADIR%%/pass.zsh-completion
 %%CONTRIB%%%%DATADIR%%/related-projects.txt
-%%PORTDOCS%%man/man1/pass.1.gz
+%%CONTRIB%%%%DATADIR%%/vim/noplaintext.vim
+%%CONTRIB%%etc/bash_completion.d/password-store
+%%CONTRIB%%share/fish/completions/password-store.fish
+%%CONTRIB%%share/zsh/site-functions/_pass
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-filter.sh
 bin/pass
 libexec/pass
+man/man1/pass.1.gz
--- a/sysutils/syslog-ng37/Makefile
+++ b/sysutils/syslog-ng37/Makefile
@ -3,14 +3,16 @@

 PORTNAME=	syslog-ng
 PORTVERSION=	3.7.3
-PORTREVISION=	3
+PORTREVISION=	4
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	37
 .endif
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
-DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
-MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
+#DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
+#MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
+DISTFILES=      syslog-ng-${DISTVERSION}_with_man.tar.gz
+MASTER_SITES=   http://peter.czanik.hu/freebsd/

 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
@ -52,17 +54,12 @@ INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking --enable-manpages \
 		--disable-linux-caps \
-		--datadir=${PREFIX}/share/syslog-ng/ \
-		--with-docbook-dir=${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
+		--datadir=${PREFIX}/share/syslog-ng/ 

 BROKEN_sparc64=	Does not compile on sparc64: gcc core dump

 .include <bsd.port.options.mk>

-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
-.endif
-
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"

--- a/sysutils/syslog-ng37/distinfo
+++ b/sysutils/syslog-ng37/distinfo
@ -1,2 +1,3 @@
-SHA256 (syslog-ng-3.7.3.tar.gz) = 49201dcfd59c8992936aa16c694f5e6593d505b44895f6c66b7d7f7895ce2c62
-SIZE (syslog-ng-3.7.3.tar.gz) = 3511155
+TIMESTAMP = 1464621619
+SHA256 (syslog-ng-3.7.3_with_man.tar.gz) = bd991765f9f57d35eaa5a909475cbba22fd7a25bc3ea8a210e4b7a8988389f8c
+SIZE (syslog-ng-3.7.3_with_man.tar.gz) = 3561113
--- a/sysutils/tmate-slave/Makefile
+++ b/sysutils/tmate-slave/Makefile
@ -25,7 +25,4 @@ PLIST_FILES=	bin/tmate-slave

 BROKEN_FreeBSD_9=	Does not build

-pre-configure:
-	@cd $(wrksrc} && ./autogen.sh
-
 .include <bsd.port.mk>
--- a/sysutils/tmate/Makefile
+++ b/sysutils/tmate/Makefile
@ -24,7 +24,4 @@ PLIST_FILES=	bin/tmate man/man1/tmate.1.gz

 BROKEN_FreeBSD_9=	Does not build

-pre-configure:
-	@cd $(wrksrc} && ./autogen.sh
-
 .include <bsd.port.mk>
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	nginx
-PORTVERSION=	1.11.0
+PORTVERSION=	1.11.1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1464123738
-SHA256 (nginx-1.11.0.tar.gz) = 6ca0e7bf540cdae387ce9470568c2c3a826bc7e7f12def1ae7d20b66f4065a99
-SIZE (nginx-1.11.0.tar.gz) = 913282
+TIMESTAMP = 1464730599
+SHA256 (nginx-1.11.1.tar.gz) = 5d8dd0197e3ffeb427729c045382182fb28db8e045c635221b2e0e6722821ad0
+SIZE (nginx-1.11.1.tar.gz) = 913417
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	nginx
-PORTVERSION=	1.10.0
-PORTREVISION=	3
+PORTVERSION=	1.10.1
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@ -1,5 +1,6 @@
-SHA256 (nginx-1.10.0.tar.gz) = 8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d
-SIZE (nginx-1.10.0.tar.gz) = 908954
+TIMESTAMP = 1464728985
+SHA256 (nginx-1.10.1.tar.gz) = 1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801
+SIZE (nginx-1.10.1.tar.gz) = 909077
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
--- a/www/p5-HTTP-BrowserDetect/Makefile
+++ b/www/p5-HTTP-BrowserDetect/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	HTTP-BrowserDetect
-PORTVERSION=	3.13
+PORTVERSION=	3.14
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/www/p5-HTTP-BrowserDetect/distinfo
+++ b/www/p5-HTTP-BrowserDetect/distinfo
@ -1,2 +1,3 @@
-SHA256 (HTTP-BrowserDetect-3.13.tar.gz) = 4aece667a0136e770912c592c3d84341f71b9875a45cc0c1bb24e8ec02d0c977
-SIZE (HTTP-BrowserDetect-3.13.tar.gz) = 92658
+TIMESTAMP = 1464703845
+SHA256 (HTTP-BrowserDetect-3.14.tar.gz) = 7d0e0153946ea8ef3c4105d2bda80ae3b88adc11967246a1cc8a56707bf4be98
+SIZE (HTTP-BrowserDetect-3.14.tar.gz) = 95445
--- a/www/py-django-registration/Makefile
+++ b/www/py-django-registration/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	django-registration
-PORTVERSION=	2.0.4
+PORTVERSION=	2.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/www/py-django-registration/distinfo
+++ b/www/py-django-registration/distinfo
@ -1,2 +1,3 @@
-SHA256 (django-registration-2.0.4.tar.gz) = 46f33a7232a8e387241157245ab14d3d8a62b5af565f32a68b11f2a243675f5b
-SIZE (django-registration-2.0.4.tar.gz) = 63942
+TIMESTAMP = 1464689413
+SHA256 (django-registration-2.1.tar.gz) = d20ad301964e986724de47d207ee27369084d0d28d3ad125106020d877c520c5
+SIZE (django-registration-2.1.tar.gz) = 69840
--- a/www/uwsgi/Makefile
+++ b/www/uwsgi/Makefile
@ -22,7 +22,7 @@ OPTIONS_DEFINE=	DEBUG JSON PCRE XML
 DEBUG_VARS=	PYDISTUTILS_BUILDARGS+=--debug
 JSON_LIB_DEPENDS=	libjansson.so:devel/jansson
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
-XML_LIB_DEPENDS=	libexpat.so:textproc/expat2
+XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2

 .include <bsd.port.options.mk>

@ -39,8 +39,7 @@ O_PCRE=		false
 .endif

 .if ${PORT_OPTIONS:MXML}
-O_XML=		expat
-CFLAGS+=	"-I${LOCALBASE}/include"
+O_XML=		libxml2
 .else
 O_XML=		false
 .endif
--- a/x11-themes/kde4-style-skulpture/Makefile
+++ b/x11-themes/kde4-style-skulpture/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	skulpture
-PORTVERSION=	0.2.3
-PORTREVISION=	10
+PORTVERSION=	0.2.4
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde4-style-
@ -16,6 +15,6 @@ LICENSE=	GPLv3

 USE_KDE4=	kdelibs automoc4 workspace
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
-USES=		cmake tar:bzip2
+USES=		cmake

 .include <bsd.port.mk>
--- a/x11-themes/kde4-style-skulpture/distinfo
+++ b/x11-themes/kde4-style-skulpture/distinfo
@ -1,2 +1,3 @@
-SHA256 (59031-skulpture-0.2.3.tar.bz2) = ab22184d0d47ae0ddbfe760a0acdc74409a46cb13eaa0beb28769aa30a44e179
-SIZE (59031-skulpture-0.2.3.tar.bz2) = 95976
+TIMESTAMP = 1464702022
+SHA256 (59031-skulpture-0.2.4.tar.gz) = 606a4399b3e8cc2af09ef78a978f3a5a82c8bbbfe14a6b434e6032311aee47e8
+SIZE (59031-skulpture-0.2.4.tar.gz) = 121290
--- a/x11-themes/kde4-style-skulpture/pkg-plist
+++ b/x11-themes/kde4-style-skulpture/pkg-plist
@ -2,6 +2,7 @@ lib/kde4/kstyle_skulpture_config.so
 lib/kde4/kwin3_skulpture.so
 lib/kde4/kwin_skulpture_config.so
 %%QT_PLUGINDIR%%/styles/libskulpture.so
+share/apps/color-schemes/SkulptureBeton.colors
 share/apps/color-schemes/SkulptureChocolate.colors
 share/apps/color-schemes/SkulptureIce.colors
 share/apps/color-schemes/SkulptureMint.colors