*/*: sync with upstream

Taken from: FreeBSD
2016-02-25 04:09:50 +01:00 · 2016-02-25 04:09:50 +01:00 · 46516e7ae4
commit 46516e7ae4
parent a905c7dc8a
95 changed files with 2057 additions and 1247 deletions
--- a/astro/p5-Astro-Constants/Makefile
+++ b/astro/p5-Astro-Constants/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Astro-Constants
-PORTVERSION=	0.09
-PORTREVISION=	1
+PORTVERSION=	0.1002
 CATEGORIES=	astro perl5 science
 MASTER_SITES=	CPAN/Astro
 PKGNAMEPREFIX=	p5-
@ -11,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Physical constants for use in astronomy

+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 USES=		perl5
 USE_PERL5=	configure

--- a/astro/p5-Astro-Constants/distinfo
+++ b/astro/p5-Astro-Constants/distinfo
@ -1,2 +1,2 @@
-SHA256 (Astro-Constants-0.09.tar.gz) = d9e48a98690b41c726b79bc888c6f78cf0c3d57372be33242d5191b85164330f
-SIZE (Astro-Constants-0.09.tar.gz) = 12034
+SHA256 (Astro-Constants-0.1002.tar.gz) = bc69ee93db2d7caecf3238ab02646f5f9dab836583978f12a08157b74c7d6f3a
+SIZE (Astro-Constants-0.1002.tar.gz) = 255524
--- a/astro/p5-Astro-Constants/pkg-plist
+++ b/astro/p5-Astro-Constants/pkg-plist
@ -2,3 +2,5 @@
 %%SITE_PERL%%/Astro/Constants/CGS.pm
 %%SITE_PERL%%/Astro/Constants/MKS.pm
 %%PERL5_MAN3%%/Astro::Constants.3.gz
+%%PERL5_MAN3%%/Astro::Constants::CGS.3.gz
+%%PERL5_MAN3%%/Astro::Constants::MKS.3.gz
--- a/astro/xtide/distinfo
+++ b/astro/xtide/distinfo
@ -4,3 +4,5 @@ SHA256 (libtcd-2.2.7-r2.tar.bz2) = aff1f218b84106c572d094912cd11c828e1ea212db566
 SIZE (libtcd-2.2.7-r2.tar.bz2) = 308959
 SHA256 (harmonics-dwf-20151227-free.tar.bz2) = b382acfd94cefd6f6434ff3efdbecfd929abe3639e345979da7826a37ed5a7ac
 SIZE (harmonics-dwf-20151227-free.tar.bz2) = 499871
+SHA256 (wvs.tar.bz2) = 4e996ce2e608d612ba78e35cdf50c2c73b01fce06bd5b561a7fe957ea75d6d75 
+SIZE (wvs.tar.bz2) = 37461520
--- a/benchmarks/ubench/Makefile
+++ b/benchmarks/ubench/Makefile
@ -6,7 +6,7 @@ PORTVERSION=	0.32
 CATEGORIES=	benchmarks
 MASTER_SITES=	SUNSITE/system/benchmark

-MAINTAINER=	brian@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unix Benchmark Utility for CPU(s) and memory

 HAS_CONFIGURE=	yes
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@ -2,10 +2,9 @@
 # $FreeBSD$

 PORTNAME=	xpad
-PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTVERSION=	4.6.0
 CATEGORIES=	deskutils
-MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/4.5/+download/
+MASTER_SITES=	https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/

 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Virtual note-pad system for your X11 desktop
@ -35,6 +34,8 @@ NLS_CONFIGURE_ENABLE=	nls
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/glist.h|glib.h|g' \
 		${WRKSRC}/src/xpad-undo.c
+	@${REINPLACE_CMD} -e 's|/etc/xdg/autostart|${LOCALBASE}/etc/xdg/autostart|g' \
+		${WRKSRC}/Makefile.am

 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/deskutils/xpad/distinfo
+++ b/deskutils/xpad/distinfo
@ -1,2 +1,2 @@
-SHA256 (xpad-4.5.0.tar.bz2) = f870cefc92593febf266bb0f90ceb0feeb4af7eb1033625fca50933701a7b9e8
-SIZE (xpad-4.5.0.tar.bz2) = 1907957
+SHA256 (xpad-4.6.0.tar.bz2) = 382942a423f1bb76a251b71303530e136dd212030ec28f97051878b69ab3c473
+SIZE (xpad-4.6.0.tar.bz2) = 244936
--- a/deskutils/xpad/pkg-plist
+++ b/deskutils/xpad/pkg-plist
@ -1,4 +1,5 @@
 bin/xpad
+etc/xdg/autostart/xpad.desktop
 man/man1/xpad.1.gz
 share/applications/xpad.desktop
 share/icons/hicolor/scalable/apps/xpad.svg
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	distel
-PORTVERSION=	4.1.0
+PORTVERSION=	4.1.1
 CATEGORIES=	devel elisp

 MAINTAINER=	olgeni@FreeBSD.org
@ -15,6 +15,7 @@ GH_ACCOUNT=	massemanet
 PLIST_SUB=	VERSION="${PORTVERSION}"

 USE_EMACS=	yes
+NO_ARCH=	yes

 DISTEL_DOCS=	AUTHORS ChangeLog INSTALL INSTALL.WIN32 NEWS README README.ie-session
 DISTEL_ROOT=	${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
--- a/devel/distel/distinfo
+++ b/devel/distel/distinfo
@ -1,2 +1,2 @@
-SHA256 (massemanet-distel-4.1.0_GH0.tar.gz) = 6321e25c9bd7ec9edcb5e1474f570c321dd09d710b9e0fc085f76f56eadb2dd9
-SIZE (massemanet-distel-4.1.0_GH0.tar.gz) = 213828
+SHA256 (massemanet-distel-4.1.1_GH0.tar.gz) = 80a57750a18bb5522fae3827323f91f3e4c148ee2ed36d704864cc482a775ff7
+SIZE (massemanet-distel-4.1.1_GH0.tar.gz) = 214189
--- a/devel/erlang-cuttlefish/Makefile
+++ b/devel/erlang-cuttlefish/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cuttlefish
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.6
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-

--- a/devel/erlang-cuttlefish/distinfo
+++ b/devel/erlang-cuttlefish/distinfo
@ -1,2 +1,2 @@
-SHA256 (basho-cuttlefish-2.0.5_GH0.tar.gz) = af809585d998e528a6458df33a5ede7e45ecb03382edbdf08019e1dc910f73f8
-SIZE (basho-cuttlefish-2.0.5_GH0.tar.gz) = 231033
+SHA256 (basho-cuttlefish-2.0.6_GH0.tar.gz) = ca869b6dd34ca2b9dae84ce648a2734323466c25c505836e812eb73d79a7115b
+SIZE (basho-cuttlefish-2.0.6_GH0.tar.gz) = 231470
--- a/devel/gitg/files/patch-Makefile.in
+++ b/devel/gitg/files/patch-Makefile.in
@ -0,0 +1,11 @@
+--- Makefile.in.orig	2016-02-24 20:05:48.691700000 +0100
+++ Makefile.in	2016-02-24 20:07:55.252920000 +0100
+@@ -4591,7 +4591,7 @@
+ 	@if test -f $@; then :; else \
+ 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \
+ 	fi
+-$(srcdir)/GitgExt-1.0.gir: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp
+$(srcdir)/GitgExt-1.0.gir: Gitg-1.0.gir $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp
+ 	@if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi
+ 	@if test -f $@; then :; else \
+ 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \
--- a/dns/knot1/Makefile
+++ b/dns/knot1/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	knot
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		http://dns-lab.com/downloads/knot-dns/
--- a/dns/knot1/distinfo
+++ b/dns/knot1/distinfo
@ -1,2 +1,2 @@
-SHA256 (knot-1.6.6.tar.xz) = 6ccae42b0878201e2113a048317bf518acad70fe436b04e24da32703d27edf03
-SIZE (knot-1.6.6.tar.xz) = 793380
+SHA256 (knot-1.6.7.tar.xz) = ed3cd8e281aff9b28ab9d8de8d59cae7aae48e435660193c117a43e8979b4d48
+SIZE (knot-1.6.7.tar.xz) = 793964
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	eog
-PORTVERSION=	3.18.1
+PORTVERSION=	3.18.2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@ -1,2 +1,2 @@
-SHA256 (gnome3/eog-3.18.1.tar.xz) = 7b7bb47a680518701e2e724c8632fcf12dcb3c3e45ce1f2bdd4c4ace325793a7
-SIZE (gnome3/eog-3.18.1.tar.xz) = 4327208
+SHA256 (gnome3/eog-3.18.2.tar.xz) = dc2d16e3754cad12703261fe586e7599c4df2e39282f6c28681a514f749fe636
+SIZE (gnome3/eog-3.18.2.tar.xz) = 4327676
--- a/graphics/py-pillow/Makefile
+++ b/graphics/py-pillow/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pillow
-PORTVERSION=	2.9.0
-PORTREVISION=	1
+PORTVERSION=	3.1.1
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

@ -22,84 +21,53 @@ LCMS_DESC=		Little Color Management System
 TKINTER_DESC=		Tkinter (Tcl/Tk) BitmapImage & PhotoImage support

 FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_VARS=		PYDISTUTILS_BUILDARGS+=--enable-freetype
+FREETYPE_VARS_OFF=	PYDISTUTILS_BUILDARGS+=--disable-freetype
+
 JPEG_USES=		jpeg
+JPEG_VARS=		PYDISTUTILS_BUILDARGS+=--enable-jpeg
+JPEG_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-jpeg
+
 LCMS_LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2
+LCMS_VARS=		PYDISTUTILS_BUILDARGS+=--enable-lcms
+LCMS_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-lcms
+
+PNG_VARS=		PYDISTUTILS_BUILDARGS+=--enable-zlib
+PNG_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-zlib
+
 TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_VARS=		PYDISTUTILS_BUILDARGS+=--enable-tiff
+TIFF_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-tiff
+
 TKINTER_USES=		tk:build
 TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKINTER_VARS=		PYDISTUTILS_BUILDARGS+=--enable-tcl --enable-tk --include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}
+TKINTER_VARS_OFF=	PYDISTUTILS_BUILDARGS+=--disable-tcl --disable-tk
+
 WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_VARS=		PYDISTUTILS_BUILDARGS+=--enable-webp
+WEBP_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-webp

-USES=			cpe python
-USE_GITHUB=		yes
-USES=			python
-USE_PYTHON=		autoplist concurrent distutils
-PYDISTUTILS_SETUP=		${PYSETUP}
-PYDISTUTILS_BUILD_TARGET=	build build_py build_ext
+USES=		cpe python
+USE_GITHUB=	yes
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils

-# we have to build and install everything in a single run,
-# otherwise pillow's build_ext extension tries to be clever
-# and messes up standard distutils behaviour...
-NO_BUILD=		yes
+PYDISTUTILS_BUILD_TARGET=	build build_ext

 GH_ACCOUNT=	python-${PORTNAME}
 GH_PROJECT=	${PORTNAME:C/p/P/}

 CONFLICTS_INSTALL=	py*-imaging-*

-.include <bsd.port.options.mk>
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PIL/*.so

-.if ${PORT_OPTIONS:MFREETYPE}
-PYDISTUTILS_BUILDARGS+=	--enable-freetype
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-freetype
-.endif
-
-.if ${PORT_OPTIONS:MJPEG}
-PYDISTUTILS_BUILDARGS+=	--enable-jpeg
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-jpeg
-.endif
-
-.if ${PORT_OPTIONS:MLCMS}
-PYDISTUTILS_BUILDARGS+=	--enable-lcms
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-lcms
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-PYDISTUTILS_BUILDARGS+=	--enable-zlib
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-zlib
-.endif
-
-.if ${PORT_OPTIONS:MTIFF}
-PYDISTUTILS_BUILDARGS+=	--enable-tiff
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-tiff
-.endif
-
-.if ${PORT_OPTIONS:MTKINTER}
-PYDISTUTILS_BUILDARGS+=	--enable-tcl --enable-tk \
-			--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-tcl --disable-tk
-.endif
-
-.if ${PORT_OPTIONS:MWEBP}
-PYDISTUTILS_BUILDARGS+=	--enable-webp
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-webp
-.endif
-
-do-install:
-	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-		${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS} \
-		${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
-
-do-test: extract
+do-test:
 	@cd ${WRKSRC} && \
 	${PYTHON_CMD} ${PYSETUP} build_ext -i && \
-	${PYTHON_CMD} selftest.py
+	${PYTHON_CMD} selftest.py && \
+	${PYTHON_CMD} -m nose -vx Tests/test_*.py

 .include <bsd.port.mk>
--- a/graphics/py-pillow/distinfo
+++ b/graphics/py-pillow/distinfo
@ -1,2 +1,2 @@
-SHA256 (python-pillow-Pillow-2.9.0_GH0.tar.gz) = e048d3fb43832b09077242dc46f3ed83f09fada0a2386196b7b0eea664422158
-SIZE (python-pillow-Pillow-2.9.0_GH0.tar.gz) = 9320944
+SHA256 (python-pillow-Pillow-3.1.1_GH0.tar.gz) = a2ab64b39378031effdd86a6cd303de7b5b606445ab0338359e9ff9dc3f2e634
+SIZE (python-pillow-Pillow-3.1.1_GH0.tar.gz) = 10051635
--- a/graphics/py-pillow/files/patch-CVE-2016-0740
+++ b/graphics/py-pillow/files/patch-CVE-2016-0740
@ -1,24 +0,0 @@
-From 6dcbf5bd96b717c58d7b642949da8d323099928e Mon Sep 17 00:00:00 2001
-From: Eric Soroos <eric-github@soroos.net>
-Date: Thu, 14 Jan 2016 04:59:19 -0800
-Subject: [PATCH] Fix for buffer overflow in TiffDecode.c CVE-2016-0740
-
---
- Tests/check_libtiff_segfault.py   |  23 +++++++++++++++++++++++
- Tests/images/libtiff_segfault.tif | Bin 0 -> 262 bytes
- libImaging/TiffDecode.c           |   2 +-
- 3 files changed, 24 insertions(+), 1 deletion(-)
- create mode 100644 Tests/check_libtiff_segfault.py
- create mode 100644 Tests/images/libtiff_segfault.tif
-
--- libImaging/TiffDecode.c
-+++ libImaging/TiffDecode.c
-@@ -169,7 +169,7 @@ int ImagingLibTiffDecode(Imaging im, ImagingCodecState state, UINT8* buffer, int
- 	char *filename = "tempfile.tif";
- 	char *mode = "r";
- 	TIFF *tiff;
-	int size;
-+	tsize_t size;
- 
- 
- 	/* buffer is the encoded file, bytes is the length of the encoded file */
--- a/graphics/py-pillow/files/patch-CVE-2016-0775
+++ b/graphics/py-pillow/files/patch-CVE-2016-0775
@ -1,24 +0,0 @@
-From bcaaf97f4ff25b3b5b9e8efeda364e17e80858ec Mon Sep 17 00:00:00 2001
-From: wiredfool <eric-github@soroos.net>
-Date: Wed, 20 Jan 2016 22:37:28 +0000
-Subject: [PATCH] FLI overflow error fix and testcase CVE-2016-0775
-
---
- Tests/check_fli_overflow.py   |  16 ++++++++++++++++
- Tests/images/fli_overflow.fli | Bin 0 -> 4645 bytes
- libImaging/FliDecode.c        |   2 +-
- 3 files changed, 17 insertions(+), 1 deletion(-)
- create mode 100644 Tests/check_fli_overflow.py
- create mode 100644 Tests/images/fli_overflow.fli
-
--- libImaging/FliDecode.c
-+++ libImaging/FliDecode.c
-@@ -185,7 +185,7 @@ ImagingFliDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
- 	    /* COPY chunk */
- 	    for (y = 0; y < state->ysize; y++) {
- 		UINT8* buf = (UINT8*) im->image[y];
-		memcpy(buf+x, data, state->xsize);
-+		memcpy(buf, data, state->xsize);
- 		data += state->xsize;
- 	    }
- 	    break;
--- a/graphics/py-pillow/files/patch-libImaging-PcdDecode.c
+++ b/graphics/py-pillow/files/patch-libImaging-PcdDecode.c
@ -1,33 +0,0 @@
-From ae453aa18b66af54e7ff716f4ccb33adca60afd4 Mon Sep 17 00:00:00 2001
-From: wiredfool <eric-github@soroos.net>
-Date: Tue, 2 Feb 2016 05:46:26 -0800
-Subject: [PATCH] PCD decoder overruns the shuffle buffer, Fixes #568
-
---
- Tests/images/hopper.pcd | Bin 0 -> 788480 bytes
- Tests/test_file_pcd.py  |  18 ++++++++++++++++++
- libImaging/PcdDecode.c  |   4 ++--
- 3 files changed, 20 insertions(+), 2 deletions(-)
- create mode 100644 Tests/images/hopper.pcd
- create mode 100644 Tests/test_file_pcd.py
-
--- libImaging/PcdDecode.c
-+++ libImaging/PcdDecode.c
-@@ -47,7 +47,7 @@ ImagingPcdDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
- 	    out[0] = ptr[x];
- 	    out[1] = ptr[(x+4*state->xsize)/2];
- 	    out[2] = ptr[(x+5*state->xsize)/2];
-	    out += 4;
-+	    out += 3;
- 	}
- 
- 	state->shuffle((UINT8*) im->image[state->y],
-@@ -62,7 +62,7 @@ ImagingPcdDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
- 	    out[0] = ptr[x+state->xsize];
- 	    out[1] = ptr[(x+4*state->xsize)/2];
- 	    out[2] = ptr[(x+5*state->xsize)/2];
-	    out += 4;
-+	    out += 3;
- 	}
- 
- 	state->shuffle((UINT8*) im->image[state->y],
--- a/graphics/py-pillow/files/patch-libImaging-Resample.c
+++ b/graphics/py-pillow/files/patch-libImaging-Resample.c
@ -1,35 +0,0 @@
-From 41fae6d9e2da741d2c5464775c7f1a609ea03798 Mon Sep 17 00:00:00 2001
-From: Ned Williamson <nedwilliamson@gmail.com>
-Date: Thu, 4 Feb 2016 01:54:12 -0500
-Subject: [PATCH] fix integer overflow in Resample.c
-
---
- libImaging/Resample.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
--- libImaging/Resample.c
-+++ libImaging/Resample.c
-@@ -138,11 +138,23 @@ ImagingResampleHorizontal(Imaging imIn, int xsize, int filter)
-     /* maximum number of coofs */
-     kmax = (int) ceil(support) * 2 + 1;
- 
-+    // check for overflow
-+    if (kmax > 0 && xsize > SIZE_MAX / kmax)
-+        return (Imaging) ImagingError_MemoryError();
-+
-+    // sizeof(float) should be greater than 0
-+    if (xsize * kmax > SIZE_MAX / sizeof(float))
-+        return (Imaging) ImagingError_MemoryError();
-+
-     /* coefficient buffer */
-     kk = malloc(xsize * kmax * sizeof(float));
-     if ( ! kk)
-         return (Imaging) ImagingError_MemoryError();
- 
-+    // sizeof(int) should be greater than 0 as well
-+    if (xsize > SIZE_MAX / (2 * sizeof(int)))
-+        return (Imaging) ImagingError_MemoryError();
-+
-     xbounds = malloc(xsize * 2 * sizeof(int));
-     if ( ! xbounds) {
-         free(kk);
--- a/lang/erlang-java/Makefile
+++ b/lang/erlang-java/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	erlang
-PORTVERSION=	18.2.3
+PORTVERSION=	18.2.4
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@ -14,7 +14,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3
+PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3 patch-otp-18.2.4

 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang interface for Java
--- a/lang/erlang-java/distinfo
+++ b/lang/erlang-java/distinfo
@ -6,3 +6,5 @@ SHA256 (erlang/patch-otp-18.2.2) = 2a223e838a5b018535905f813eb95830dcced30b39dce
 SIZE (erlang/patch-otp-18.2.2) = 9587
 SHA256 (erlang/patch-otp-18.2.3) = 9294879b4b3f1fc9eb005003b1e930458b184e543a898f21d7cab921e36a0862
 SIZE (erlang/patch-otp-18.2.3) = 55919
+SHA256 (erlang/patch-otp-18.2.4) = ea07166fcfd6cab6fcf21945cf7b630473d3a5828a6e101b60e845f42dbbd002
+SIZE (erlang/patch-otp-18.2.4) = 17847
--- a/lang/erlang-runtime18/Makefile
+++ b/lang/erlang-runtime18/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	erlang
-PORTVERSION=	18.2.3
+PORTVERSION=	18.2.4
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@ -16,7 +16,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3
+PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3 patch-otp-18.2.4

 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
@ -196,6 +196,10 @@ post-install:
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}

+	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.11.1/* \
+		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.11.2
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.11.1
+
 	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.1/* \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.1.1
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.1
--- a/lang/erlang-runtime18/distinfo
+++ b/lang/erlang-runtime18/distinfo
@ -8,3 +8,5 @@ SHA256 (erlang/patch-otp-18.2.2) = 2a223e838a5b018535905f813eb95830dcced30b39dce
 SIZE (erlang/patch-otp-18.2.2) = 9587
 SHA256 (erlang/patch-otp-18.2.3) = 9294879b4b3f1fc9eb005003b1e930458b184e543a898f21d7cab921e36a0862
 SIZE (erlang/patch-otp-18.2.3) = 55919
+SHA256 (erlang/patch-otp-18.2.4) = ea07166fcfd6cab6fcf21945cf7b630473d3a5828a6e101b60e845f42dbbd002
+SIZE (erlang/patch-otp-18.2.4) = 17847
--- a/lang/erlang-wx/Makefile
+++ b/lang/erlang-wx/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	erlang
-PORTVERSION=	18.2.3
+PORTVERSION=	18.2.4
 CATEGORIES=	lang parallel
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@ -14,7 +14,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3
+PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3 patch-otp-18.2.4

 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang bindings for wxWindows
--- a/lang/erlang-wx/distinfo
+++ b/lang/erlang-wx/distinfo
@ -6,3 +6,5 @@ SHA256 (erlang/patch-otp-18.2.2) = 2a223e838a5b018535905f813eb95830dcced30b39dce
 SIZE (erlang/patch-otp-18.2.2) = 9587
 SHA256 (erlang/patch-otp-18.2.3) = 9294879b4b3f1fc9eb005003b1e930458b184e543a898f21d7cab921e36a0862
 SIZE (erlang/patch-otp-18.2.3) = 55919
+SHA256 (erlang/patch-otp-18.2.4) = ea07166fcfd6cab6fcf21945cf7b630473d3a5828a6e101b60e845f42dbbd002
+SIZE (erlang/patch-otp-18.2.4) = 17847
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	erlang
-PORTVERSION=	18.2.3
+PORTVERSION=	18.2.4
 PORTEPOCH=	3
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@ -20,7 +20,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3
+PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3 patch-otp-18.2.4

 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
@ -218,6 +218,10 @@ post-install:
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}

+	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.11.1/* \
+		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.11.2
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.11.1
+
 	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.1/* \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.1.1
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.1
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@ -20,3 +20,5 @@ SHA256 (erlang/patch-otp-18.2.2) = 2a223e838a5b018535905f813eb95830dcced30b39dce
 SIZE (erlang/patch-otp-18.2.2) = 9587
 SHA256 (erlang/patch-otp-18.2.3) = 9294879b4b3f1fc9eb005003b1e930458b184e543a898f21d7cab921e36a0862
 SIZE (erlang/patch-otp-18.2.3) = 55919
+SHA256 (erlang/patch-otp-18.2.4) = ea07166fcfd6cab6fcf21945cf7b630473d3a5828a6e101b60e845f42dbbd002
+SIZE (erlang/patch-otp-18.2.4) = 17847
--- a/mail/milter-skem/Makefile
+++ b/mail/milter-skem/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	skem
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	mail
 MASTER_SITES=	http://virtual-estates.net/skem/

@ -19,19 +19,17 @@ USES=		tar:bzip2 uidfix
 PLIST_FILES=	sbin/skem \
 		man/man8/skem.8.gz

-OPTIONS_DEFINE=	SKEM_MILTER421 SKEM_NO_CLEANUP SKEM_NO_LOGWATCHER SKEM_NETINET6 SKEM_NETINET
-SKEM_MILTER421_DESC=	Sendmail was built with -D_FFR_MILTER_421
+OPTIONS_DEFINE=	SKEM_NO_CLEANUP SKEM_NO_LOGWATCHER SKEM_NETINET6 SKEM_NETINET
 SKEM_NO_CLEANUP_DESC=	Omit the auto-cleanup module
 SKEM_NO_LOGWATCHER_DESC=	Omit the log-watching module
 SKEM_NETINET6_DESC=	Support IPv6 addresses (not tested)
 SKEM_NETINET_DESC=	Support IPv4 addresses

 OPTIONS_DEFAULT=	SKEM_NETINET
+NO_WRKSUBDIR=	yes

 .include <bsd.port.options.mk>

-MAKE_ENV+=	PTHREAD_LIBS="-lpthread"
-
 .for o in ${PORT_OPTIONS:MSKEM_*}
 .	if ${PORT_OPTIONS:M$o}
 MAKE_ARGS+=	-D$o
--- a/mail/milter-skem/distinfo
+++ b/mail/milter-skem/distinfo
@ -1,2 +1,2 @@
-SHA256 (skem-1.0.1.tar.bz2) = ac5c895a46e087d70e146659cbc241bc13e1c7b2bea64cb9541fe2f7405883fc
-SIZE (skem-1.0.1.tar.bz2) = 14179
+SHA256 (skem-1.0.2.tar.bz2) = bed37274ffaef0f9136588ec5330b3056e7b00eae6057cdbdcc9482ec09a561c
+SIZE (skem-1.0.2.tar.bz2) = 13978
--- a/mail/milter-skem/files/patch-cleanup.c
+++ b/mail/milter-skem/files/patch-cleanup.c
@ -1,22 +0,0 @@
--- cleanup.c	Sun Jan  1 08:19:39 2006
-+++ newcleanup.c	Sun Jan  1 08:19:18 2006
-@@ -15,6 +15,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/types.h>
-+#include <inttypes.h>
- #include <dirent.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-@@ -50,9 +51,9 @@
- 			return NULL;
- 		}
- 	}
-	syslog(LOG_DEBUG, "periodic cleanup: period %ld seconds%s, "
-+	syslog(LOG_DEBUG, "periodic cleanup: period %jd seconds%s, "
- 	    "permanent bans removed after %u seconds since last seen",
-	    O.cleanupperiod.tv_sec,
-+	    (intmax_t)O.cleanupperiod.tv_sec,
- 	    O.cleanupperiod.tv_sec ? "" : " (one shot)",
- 	    O.permcleanup);
- 	for (result = 0, select_failures = 0;
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	notmuch
-PORTVERSION=	0.20.2
-PORTREVISION=	1
+PORTVERSION=	0.21
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/

@ -42,6 +41,6 @@ MAKE_ENV+=		PYTHONCMD=${PYTHON_CMD}

 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.2.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.3.0

 .include <bsd.port.mk>
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@ -1,2 +1,2 @@
-SHA256 (notmuch-0.20.2.tar.gz) = f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec
-SIZE (notmuch-0.20.2.tar.gz) = 652945
+SHA256 (notmuch-0.21.tar.gz) = d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3
+SIZE (notmuch-0.21.tar.gz) = 663600
--- a/mail/notmuch/files/patch-doc_Makefile.local
+++ b/mail/notmuch/files/patch-doc_Makefile.local
@ -1,11 +0,0 @@
--- doc/Makefile.local.orig	2015-07-09 20:39:00 UTC
-+++ doc/Makefile.local
-@@ -7,7 +7,7 @@ SPHINXOPTS    := -q
- SPHINXBUILD   = sphinx-build
- DOCBUILDDIR      := $(dir)/_build
- 
-mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
-+mkdocdeps := $(PYTHON) $(srcdir)/$(dir)/mkdocdeps.py
- 
- # Internal variables.
- ALLSPHINXOPTS   := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)
--- a/mail/notmuch/files/patch-lib_notmuch.h
+++ b/mail/notmuch/files/patch-lib_notmuch.h
@ -0,0 +1,11 @@
+--- lib/notmuch.h.orig	2015-10-30 10:14:41 UTC
+++ lib/notmuch.h
+@@ -60,7 +60,7 @@ NOTMUCH_BEGIN_DECLS
+ #define LIBNOTMUCH_MICRO_VERSION	0
+ 
+ #define NOTMUCH_DEPRECATED(major,minor) \
+-    __attribute__ ((deprecated ("function deprecated as of libnotmuch " #major "." #minor)))
+    __attribute__ ((deprecated))
+ #endif /* __DOXYGEN__ */
+ 
+ /**
--- a/mail/notmuch/pkg-plist
+++ b/mail/notmuch/pkg-plist
@ -2,7 +2,7 @@ bin/notmuch
 include/notmuch.h
 lib/libnotmuch.so
 lib/libnotmuch.so.4
-lib/libnotmuch.so.4.2.0
+lib/libnotmuch.so.4.3.0
 man/man1/notmuch-address.1.gz
 man/man1/notmuch-compact.1.gz
 man/man1/notmuch-config.1.gz
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	sylpheed
 PORTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/  \
 		LOCAL/ehaupt
@ -32,17 +33,18 @@ CONFIGURE_ARGS=	--enable-ipv6 \
 CONFLICTS=	sylpheed-1.[0-8]* sylpheed-2.[0-9]* sylpheed-gtk2-[0-9]*

 OPTIONS_DEFINE=	CA_BUNDLE COMPFACE CURL DOCS GPGME GTKSPELL JPILOT LDAP \
-		ONIGURUMA SSL
+		ONIGURUMA SSL HIDE_OSSIG

 CA_BUNDLE_DESC=	Include CA bundle for certificate verification
 COMPFACE_DESC=	X-Face support
 CURL_DESC=	libcurl dependency (remote update check)
 GPGME_DESC=	GnuPG support using GPGME
 GTKSPELL_DESC=	Spell checking support
+HIDE_OSSIG_DESC=Hide OS and GTK signature in mail header
 JPILOT_DESC=	JPilot support
 ONIGURUMA_DESC=	Oniguruma support

-OPTIONS_DEFAULT=CA_BUNDLE CURL GTKSPELL SSL
+OPTIONS_DEFAULT=CA_BUNDLE CURL GTKSPELL GPGME SSL

 CA_BUNDLE_RUN_DEPENDS=		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 CA_BUNDLE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-libsylph_ssl.c
@ -59,6 +61,8 @@ GPGME_CONFIGURE_ENABLE=		gpgme
 GTKSPELL_LIB_DEPENDS=		libgtkspell.so:${PORTSDIR}/textproc/gtkspell
 GTKSPELL_CONFIGURE_ENABLE=	gtkspell

+HIDE_OSSIG_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_main.c
+
 JPILOT_LIB_DEPENDS=		libpisock.so:${PORTSDIR}/palm/pilot-link
 JPILOT_RUN_DEPENDS=		jpilot:${PORTSDIR}/palm/jpilot
 JPILOT_CONFIGURE_ENABLE=	jpilot
--- a/mail/sylpheed/files/extra-patch-src_main.c
+++ b/mail/sylpheed/files/extra-patch-src_main.c
@ -0,0 +1,15 @@
+--- src/main.c.orig	2014-11-20 03:16:13 UTC
+++ src/main.c
+@@ -280,10 +280,8 @@ int main(int argc, char *argv[])
+ 	colorlabel_read_config();
+ 
+ 	prefs_common.user_agent_str = g_strdup_printf
+-		("%s (GTK+ %d.%d.%d; %s)",
+-		 prog_version,
+-		 gtk_major_version, gtk_minor_version, gtk_micro_version,
+-		 TARGET_ALIAS);
+		("%s",
+		 prog_version);
+ 
+ #if defined(G_OS_WIN32) || defined(__APPLE__)
+ 	fix_font_setting();
--- a/math/R-cran-memisc/Makefile
+++ b/math/R-cran-memisc/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	memisc
-DISTVERSION=	0.99.5
+DISTVERSION=	0.99.6
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}

--- a/math/R-cran-memisc/distinfo
+++ b/math/R-cran-memisc/distinfo
@ -1,2 +1,2 @@
-SHA256 (memisc_0.99.5.tar.gz) = 938195482e358a4690e400259f7531179a2a6dd3bb0e7bb6c72d2dfa2eeb6d4c
-SIZE (memisc_0.99.5.tar.gz) = 1184256
+SHA256 (memisc_0.99.6.tar.gz) = acdaaeeb6f3db033cd065d8bdb8313ab516935aa34f420990879864a3e784c5e
+SIZE (memisc_0.99.6.tar.gz) = 1184630
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@ -11,7 +11,8 @@ MASTER_SITES=	http://download.gna.org/gaupol/0.19/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Subtitle editor

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

 RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
 		py*-chardet>=0:${PORTSDIR}/textproc/py-chardet \
@ -21,10 +22,13 @@ USE_GNOME=	pygtk2 intltool
 USE_PYTHON=	distutils
 USES=		desktop-file-utils python
 INSTALLS_ICONS=	yes
+NO_ARCH=	yes

 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
+
 NLS_USES=	gettext
+NLS_USES_OFF=	gettext-tools

 post-patch:
 	@${REINPLACE_CMD} \
--- a/net-im/skype4/Makefile
+++ b/net-im/skype4/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	skype
 PORTVERSION=	4.3.0.37
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://download.skype.com/linux/
@ -23,7 +23,7 @@ NO_BUILD=	yes

 USES=		cpe desktop-file-utils tar:bzip2
 USE_LINUX=	yes
-USE_LINUX_APPS+=	fontconfig xorglibs qt47 qt47-x11 qt47-webkit openssl-compat
+USE_LINUX_APPS+=	fontconfig xorglibs qt47 qt47-x11 qt47-webkit openssl openssl-compat pulseaudio-libs

 RESTRICTED=	Redistribution prohibited.

--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cacti
-PORTVERSION=	0.8.8f${PATCHLEVEL}
-PORTREVISION=	2
+PORTVERSION=	0.8.8g${PATCHLEVEL}
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://www.cacti.net/downloads/ \
 		ftp://ftpmirror.uk/freebsd-ports/cacti/
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@ -1,2 +1,2 @@
-SHA256 (cacti-0.8.8f.tar.gz) = 2ea92407c11bf13302558a5bc9e1f3a57bd14a1d9ded48c505ec495762f76738
-SIZE (cacti-0.8.8f.tar.gz) = 2594409
+SHA256 (cacti-0.8.8g.tar.gz) = 3187bd5054ae4e54496bb23187f14c79a441fedcfd397a2d27cd60179f0dee33
+SIZE (cacti-0.8.8g.tar.gz) = 2584879
--- a/net-mgmt/cacti/files/patch-CVE-2015-8369
+++ b/net-mgmt/cacti/files/patch-CVE-2015-8369
@ -1,218 +0,0 @@
------------------------------------------------------------------------
-r7767 | cigamit | 2015-11-28 20:08:16 +0000 (Sat, 28 Nov 2015) | 1 line
-Changed paths:
-   M /cacti/tags/0.8.8g/docs/CHANGELOG
-   M /cacti/tags/0.8.8g/graph.php
-   M /cacti/tags/0.8.8g/include/top_graph_header.php
------------------------------------------------------------------------
-
-bug:0002646: SQL injection in graph.php
-
--- graph.php	(revision 7766)
-+++ graph.php	(revision 7767)
-@@ -32,29 +32,29 @@
- 
- api_plugin_hook_function('graph');
- 
-include_once("./lib/html_tree.php");
-include_once("./include/top_graph_header.php");
-
- /* ================= input validation ================= */
-input_validate_input_regex(get_request_var("rra_id"), "^([0-9]+|all)$");
-input_validate_input_number(get_request_var("local_graph_id"));
-input_validate_input_number(get_request_var("graph_end"));
-input_validate_input_number(get_request_var("graph_start"));
-+input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$");
-+input_validate_input_number(get_request_var_request("local_graph_id"));
-+input_validate_input_number(get_request_var_request("graph_end"));
-+input_validate_input_number(get_request_var_request("graph_start"));
- input_validate_input_regex(get_request_var_request("view_type"), "^([a-zA-Z0-9]+)$");
- /* ==================================================== */
- 
-if (!isset($_GET['rra_id'])) {
-	$_GET['rra_id'] = 'all';
-+include_once("./lib/html_tree.php");
-+include_once("./include/top_graph_header.php");
-+
-+if (!isset($_REQUEST['rra_id'])) {
-+	$_REQUEST['rra_id'] = 'all';
- }
- 
-if ($_GET["rra_id"] == "all") {
-+if ($_REQUEST["rra_id"] == "all") {
- 	$sql_where = " where id is not null";
- }else{
-	$sql_where = " where id=" . $_GET["rra_id"];
-+	$sql_where = " where id=" . $_REQUEST["rra_id"];
- }
- 
- /* make sure the graph requested exists (sanity) */
-if (!(db_fetch_cell("select local_graph_id from graph_templates_graph where local_graph_id=" . $_GET["local_graph_id"]))) {
-+if (!(db_fetch_cell("select local_graph_id from graph_templates_graph where local_graph_id=" . $_REQUEST["local_graph_id"]))) {
- 	print "<strong><font size='+1' color='FF0000'>GRAPH DOES NOT EXIST</font></strong>"; exit;
- }
- 
-@@ -61,7 +61,7 @@
- /* take graph permissions into account here, if the user does not have permission
- give an "access denied" message */
- if (read_config_option("auth_method") != 0) {
-	$access_denied = !(is_graph_allowed($_GET["local_graph_id"]));
-+	$access_denied = !(is_graph_allowed($_REQUEST["local_graph_id"]));
- 
- 	if ($access_denied == true) {
- 		print "<strong><font size='+1' color='FF0000'>ACCESS DENIED</font></strong>"; exit;
-@@ -68,7 +68,7 @@
- 	}
- }
- 
-$graph_title = get_graph_title($_GET["local_graph_id"]);
-+$graph_title = get_graph_title($_REQUEST["local_graph_id"]);
- 
- if ($_REQUEST["view_type"] == "tree") {
- 	print "<table width='100%' style='background-color: #ffffff; border: 1px solid #ffffff;' align='center' cellspacing='0' cellpadding='3'>";
-@@ -76,15 +76,15 @@
- 	print "<table width='100%' style='background-color: #f5f5f5; border: 1px solid #bbbbbb;' align='center' cellspacing='0' cellpadding='3'>";
- }
- 
-$rras = get_associated_rras($_GET["local_graph_id"]);
-+$rras = get_associated_rras($_REQUEST["local_graph_id"]);
- 
- switch ($_REQUEST["action"]) {
- case 'view':
- 	api_plugin_hook_function('page_buttons',
-		array('lgid' => $_GET["local_graph_id"],
-+		array('lgid' => $_REQUEST["local_graph_id"],
- 			'leafid' => '',//$leaf_id,
- 			'mode' => 'mrtg',
-			'rraid' => $_GET["rra_id"])
-+			'rraid' => $_REQUEST["rra_id"])
- 		);
- 	?>
- 	<tr class='tableHeader'>
-@@ -105,13 +105,13 @@
- 					<table width='1' cellpadding='0'>
- 						<tr>
- 							<td>
-								<img class='graphimage' id='graph_<?php print $_GET["local_graph_id"] ?>' src='<?php print htmlspecialchars("graph_image.php?action=view&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"]);?>' border='0' alt='<?php print htmlspecialchars($graph_title, ENT_QUOTES);?>'>
-+								<img class='graphimage' id='graph_<?php print $_REQUEST["local_graph_id"] ?>' src='<?php print htmlspecialchars("graph_image.php?action=view&local_graph_id=" . $_REQUEST["local_graph_id"] . "&rra_id=" . $rra["id"]);?>' border='0' alt='<?php print htmlspecialchars($graph_title, ENT_QUOTES);?>'>
- 							</td>
- 							<td valign='top' style='padding: 3px;' class='noprint'>
-								<a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $_GET["local_graph_id"]. "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"] . "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
-								<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"] .  "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
-								<a href='<?php print htmlspecialchars("graph.php?action=properties&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"] .  "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
-								<?php api_plugin_hook('graph_buttons', array('hook' => 'view', 'local_graph_id' => $_GET['local_graph_id'], 'rra' => $rra['id'], 'view_type' => $_REQUEST['view_type'])); ?>
-+								<a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $_REQUEST["local_graph_id"]. "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"] . "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
-+								<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_REQUEST["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"] .  "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
-+								<a href='<?php print htmlspecialchars("graph.php?action=properties&local_graph_id=" . $_REQUEST["local_graph_id"] . "&rra_id=" . $rra["id"] . "&view_type=" . $_REQUEST["view_type"] .  "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
-+								<?php api_plugin_hook('graph_buttons', array('hook' => 'view', 'local_graph_id' => $_REQUEST['local_graph_id'], 'rra' => $rra['id'], 'view_type' => $_REQUEST['view_type'])); ?>
- 								<a href='#page_top'><img src='<?php print $config['url_path']; ?>images/graph_page_top.gif' border='0' alt='Page Top' title='Page Top' style='padding: 3px;'></a><br>
- 							</td>
- 						</tr>
-@@ -143,7 +143,7 @@
- 	}
- 
- 	/* fetch information for the current RRA */
-	$rra = db_fetch_row("select id,timespan,steps,name from rra where id=" . $_GET["rra_id"]);
-+	$rra = db_fetch_row("select id,timespan,steps,name from rra where id=" . $_REQUEST["rra_id"]);
- 
- 	/* define the time span, which decides which rra to use */
- 	$timespan = -($rra["timespan"]);
-@@ -154,7 +154,7 @@
- 		FROM (data_template_data,data_template_rrd,graph_templates_item)
- 		WHERE graph_templates_item.task_item_id=data_template_rrd.id
- 		AND data_template_rrd.local_data_id=data_template_data.local_data_id
-		AND graph_templates_item.local_graph_id=" . $_GET["local_graph_id"] .
-+		AND graph_templates_item.local_graph_id=" . $_REQUEST["local_graph_id"] .
- 		" LIMIT 0,1");
- 	$ds_step = empty($ds_step) ? 300 : $ds_step;
- 	$seconds_between_graph_updates = ($ds_step * $rra["steps"]);
-@@ -161,17 +161,17 @@
- 
- 	$now = time();
- 
-	if (isset($_GET["graph_end"]) && ($_GET["graph_end"] <= $now - $seconds_between_graph_updates)) {
-		$graph_end = $_GET["graph_end"];
-+	if (isset($_REQUEST["graph_end"]) && ($_REQUEST["graph_end"] <= $now - $seconds_between_graph_updates)) {
-+		$graph_end = $_REQUEST["graph_end"];
- 	}else{
- 		$graph_end = $now - $seconds_between_graph_updates;
- 	}
- 
-	if (isset($_GET["graph_start"])) {
-		if (($graph_end - $_GET["graph_start"])>$max_timespan) {
-+	if (isset($_REQUEST["graph_start"])) {
-+		if (($graph_end - $_REQUEST["graph_start"])>$max_timespan) {
- 			$graph_start = $now - $max_timespan;
- 		}else {
-			$graph_start = $_GET["graph_start"];
-+			$graph_start = $_REQUEST["graph_start"];
- 		}
- 	}else{
- 		$graph_start = $now + $timespan;
-@@ -186,7 +186,7 @@
- 		graph_templates_graph.height,
- 		graph_templates_graph.width
- 		from graph_templates_graph
-		where graph_templates_graph.local_graph_id=" . $_GET["local_graph_id"]);
-+		where graph_templates_graph.local_graph_id=" . $_REQUEST["local_graph_id"]);
- 
- 	$graph_height = $graph["height"];
- 	$graph_width = $graph["width"];
-@@ -214,12 +214,12 @@
- 			<table width='1' cellpadding='0'>
- 				<tr>
- 					<td>
-						<img id='zoomGraphImage' class="graphimage" src='<?php print htmlspecialchars("graph_image.php?action=zoom&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"] . "&graph_start=" . $graph_start . "&graph_end=" . $graph_end . "&graph_height=" . $graph_height . "&graph_width=" . $graph_width . "&title_font_size=" . $title_font_size);?>' border='0' alt='<?php print htmlspecialchars($graph_title, ENT_QUOTES);?>'>
-+						<img id='zoomGraphImage' class="graphimage" src='<?php print htmlspecialchars("graph_image.php?action=zoom&local_graph_id=" . $_REQUEST["local_graph_id"] . "&rra_id=" . $_REQUEST["rra_id"] . "&view_type=" . $_REQUEST["view_type"] . "&graph_start=" . $graph_start . "&graph_end=" . $graph_end . "&graph_height=" . $graph_height . "&graph_width=" . $graph_width . "&title_font_size=" . $title_font_size);?>' border='0' alt='<?php print htmlspecialchars($graph_title, ENT_QUOTES);?>'>
- 					</td>
- 					<td valign='top' style='padding: 3px;' class='noprint'>
-						<a href='<?php print htmlspecialchars("graph.php?action=properties&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"] . "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
-						<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"]);?>&graph_start=<?php print $graph_start;?>&graph_end=<?php print $graph_end;?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
-						<?php api_plugin_hook('graph_buttons', array('hook' => 'zoom', 'local_graph_id' => $_GET['local_graph_id'], 'rra' =>  $_GET['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?>
-+						<a href='<?php print htmlspecialchars("graph.php?action=properties&local_graph_id=" . $_REQUEST["local_graph_id"] . "&rra_id=" . $_REQUEST["rra_id"] . "&view_type=" . $_REQUEST["view_type"] . "&graph_start=" . $graph_start . "&graph_end=" . $graph_end);?>'><img src='images/graph_properties.gif' border='0' alt='Graph Source/Properties' title='Graph Source/Properties' style='padding: 3px;'></a>
-+						<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_REQUEST["local_graph_id"] . "&rra_id=" . $_REQUEST["rra_id"] . "&view_type=" . $_REQUEST["view_type"]);?>&graph_start=<?php print $graph_start;?>&graph_end=<?php print $graph_end;?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
-+						<?php api_plugin_hook('graph_buttons', array('hook' => 'zoom', 'local_graph_id' => $_REQUEST['local_graph_id'], 'rra' =>  $_REQUEST['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?>
- 					</td>
- 				</tr>
- 				<tr>
-@@ -249,17 +249,17 @@
- 			<table width='1' cellpadding='0'>
- 				<tr>
- 					<td>
-						<img src='<?php print htmlspecialchars("graph_image.php?action=properties&local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&graph_start=" . (isset($_GET["graph_start"]) ? $_GET["graph_start"] : "0") . "&graph_end=" . (isset($_GET["graph_end"]) ? $_GET["graph_end"] : "0"));?>' border='0' alt='<?php print htmlspecialchars($graph_title);?>'>
-+						<img src='<?php print htmlspecialchars("graph_image.php?action=properties&local_graph_id=" . $_REQUEST["local_graph_id"] . "&rra_id=" . $_REQUEST["rra_id"] . "&graph_start=" . (isset($_REQUEST["graph_start"]) ? $_REQUEST["graph_start"] : "0") . "&graph_end=" . (isset($_REQUEST["graph_end"]) ? $_REQUEST["graph_end"] : "0"));?>' border='0' alt='<?php print htmlspecialchars($graph_title);?>'>
- 					</td>
- 					<td valign='top' style='padding: 3px;'>
-						<a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $_GET["local_graph_id"]. "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"] . "&graph_start=" . get_request_var("graph_start") . "&graph_end=" . get_request_var("graph_end"));?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
-						<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_GET["local_graph_id"] . "&rra_id=" . $_GET["rra_id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
-						<?php api_plugin_hook('graph_buttons', array('hook' => 'properties', 'local_graph_id' => $_GET['local_graph_id'], 'rra' =>  $_GET['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?>
-+						<a href='<?php print htmlspecialchars("graph.php?action=zoom&local_graph_id=" . $_REQUEST["local_graph_id"]. "&rra_id=" . $_REQUEST["rra_id"] . "&view_type=" . $_REQUEST["view_type"] . "&graph_start=" . get_request_var("graph_start") . "&graph_end=" . get_request_var("graph_end"));?>'><img src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
-+						<a href='<?php print htmlspecialchars("graph_xport.php?local_graph_id=" . $_REQUEST["local_graph_id"] . "&rra_id=" . $_REQUEST["rra_id"] . "&view_type=" . $_REQUEST["view_type"]);?>'><img src='images/graph_query.png' border='0' alt='CSV Export' title='CSV Export' style='padding: 3px;'></a><br>
-+						<?php api_plugin_hook('graph_buttons', array('hook' => 'properties', 'local_graph_id' => $_REQUEST['local_graph_id'], 'rra' =>  $_REQUEST['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?>
- 					</td>
- 				</tr>
- 				<tr>
- 					<td colspan='2' align='center'>
-						<strong><?php print htmlspecialchars(db_fetch_cell("select name from rra where id=" . $_GET["rra_id"]));?></strong>
-+						<strong><?php print htmlspecialchars(db_fetch_cell("select name from rra where id=" . $_REQUEST["rra_id"]));?></strong>
- 					</td>
- 				</tr>
- 			</table>
--- include/top_graph_header.php	(revision 7766)
-+++ include/top_graph_header.php	(revision 7767)
-@@ -146,12 +146,12 @@
- 			$graph_data_array["print_source"] = true;
- 
- 			/* override: graph start time (unix time) */
-			if (!empty($_GET["graph_start"])) {
-+			if (!empty($_REQUEST["graph_start"])) {
- 				$graph_data_array["graph_start"] = get_request_var_request("graph_start");
- 			}
- 
- 			/* override: graph end time (unix time) */
-			if (!empty($_GET["graph_end"])) {
-+			if (!empty($_REQUEST["graph_end"])) {
- 				$graph_data_array["graph_end"] = get_request_var_request("graph_end");
- 			}
- 
-
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@ -137,7 +137,6 @@
 %%CACTIDIR%%/docs/html/user_management.html
 %%CACTIDIR%%/docs/html/using_spine.html
 %%CACTIDIR%%/docs/html/variables.html
-%%CACTIDIR%%/docs/pdf/README
 %%CACTIDIR%%/docs/txt/manual.txt
 %%CACTIDIR%%/gprint_presets.php
 %%CACTIDIR%%/graph.php
@ -348,6 +347,7 @@
 %%CACTIDIR%%/install/0_8_8c_to_0_8_8d.php
 %%CACTIDIR%%/install/0_8_8d_to_0_8_8e.php
 %%CACTIDIR%%/install/0_8_8e_to_0_8_8f.php
+%%CACTIDIR%%/install/0_8_8f_to_0_8_8g.php
 %%CACTIDIR%%/install/0_8_to_0_8_1.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/install_finish.gif
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.1
+DISTVERSION=	2.4.3
 CATEGORIES=	net-mgmt

 MAINTAINER=	lme@FreeBSD.org
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@ -1,2 +1,2 @@
-SHA256 (icinga-icinga2-v2.4.1_GH0.tar.gz) = 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0
-SIZE (icinga-icinga2-v2.4.1_GH0.tar.gz) = 1342073
+SHA256 (icinga-icinga2-v2.4.3_GH0.tar.gz) = 63dd01134274a794d5a5b00c421214260946335d6579f4ae405be558c58bcaa6
+SIZE (icinga-icinga2-v2.4.3_GH0.tar.gz) = 1359833
--- a/net/Makefile
+++ b/net/Makefile
@ -155,6 +155,7 @@
    SUBDIR += gkrellmwireless2
    SUBDIR += glflow
    SUBDIR += glib-networking
+    SUBDIR += glusterfs
    SUBDIR += gnet2
    SUBDIR += gnetcat
    SUBDIR += gnome-nettool
--- a/net/glusterfs/Makefile
+++ b/net/glusterfs/Makefile
@ -0,0 +1,52 @@
+# $FreeBSD$
+
+PORTNAME=	glusterfs
+PORTVERSION=	3.7.6
+CATEGORIES=	net
+MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
+
+MAINTAINER=	craig001@lerwick.hopto.org
+COMMENT=	GlusterFS distributed file system
+
+LICENSE=	GPLv2 LGPL3
+LICENSE_COMB=	dual
+
+LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone liburcu-bp.so:${PORTSDIR}/sysutils/liburcu
+
+USE_GCC=	any
+
+USES=		bison gettext libtool pkgconfig python:build readline \
+		shebangfix
+SHEBANG_FILES=	extras/peer_add_secret_pub.in \
+		tools/glusterfind/S57glusterfind-delete-post.py \
+		extras/ganesha/scripts/ganesha-ha.sh
+
+USE_GNOME=	glib20 libxml2
+USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
+USE_SQLITE=	yes
+USE_RC_SUBR=	glusterd
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
+		--with-mountutildir=${PREFIX}/sbin \
+		--localstatedir=/var \
+		--disable-epoll \
+		--enable-glupy \
+		--disable-georeplication \
+		ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
+		ac_cv_func_setfsuid=no 	ac_cv_func_fdatasync=no \
+		ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
+CPPFLAGS+=	-I"${LOCALBASE}/include"
+LDFLAGS+=	-L"${LOCALBASE}/lib" -largp
+INSTALL_TARGET=	install-strip
+PLIST_SUB=	GLUSTERLIBDIR="lib/${PORTNAME}/3.7.6"
+KMODDIR?=	/boot/modules
+
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} < 1000000
+WITH_OPENSSL_PORT=	yes
+RUN_DEPENDS+=	${KMODDIR}/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+.endif
+
+.include <bsd.port.mk>
--- a/net/glusterfs/distinfo
+++ b/net/glusterfs/distinfo
@ -0,0 +1,2 @@
+SHA256 (glusterfs-3.7.6.tar.gz) = bb83f0b6bd95599d3742d1c7c12dbbe7b4ef4d4908c5056ee97b3f32c508cf05
+SIZE (glusterfs-3.7.6.tar.gz) = 7690697
--- a/net/glusterfs/files/glusterd.in
+++ b/net/glusterfs/files/glusterd.in
@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+# PROVIDE: glusterd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="glusterd"
+rcvar="${name}_enable"
+start_precmd="glusterd_prestart"
+
+glusterd_prestart()
+{
+
+	mkdir -p /var/db/glusterd /var/log/glusterfs
+}
+
+load_rc_config $name
+: ${glusterd_program:="%%PREFIX%%/sbin/$name"}
+: ${glusterd_pidfile:="/var/run/${name}.pid"}
+pidfile="$glusterd_pidfile"
+glusterd_flags="--pid-file=\"${glusterd_pidfile}\" ${glusterd_flags}"
+
+run_rc_command "$1"
--- a/net/glusterfs/files/patch-configure
+++ b/net/glusterfs/files/patch-configure
@ -0,0 +1,21 @@
+--- configure.orig	2015-11-08 21:57:53 UTC
+++ configure
+@@ -17172,6 +17172,9 @@ case $host_os in
+      linux*)
+ #do nothing
+        ;;
+     freebsd*)
+#do nothing
+       ;;
+      netbsd*)
+ #do nothing
+        ;;
+@@ -20758,7 +20761,7 @@ CPPFLAGS=$CFLAGS
+ LDFLAGS="${PYTHON_LIBS} -L`${PYTHON}-config --prefix`/lib -L`${PYTHON}-config --prefix`/$libdir `${PYTHON}-config --ldflags`"
+ 
+ 
+-for ac_header in python$PYTHON_VERSION/Python.h
+for ac_header in python$PYTHON_VERSION/Python.h Python.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--- a/net/glusterfs/files/patch-contrib-fuse-lib-mount.c
+++ b/net/glusterfs/files/patch-contrib-fuse-lib-mount.c
@ -0,0 +1,10 @@
+--- contrib/fuse-lib/mount.c.orig	2015-11-08 21:57:46 UTC
+++ contrib/fuse-lib/mount.c
+@@ -256,6 +256,7 @@ fuse_mount_sys (const char *mountpoint, 
+         build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1);
+         build_iovec (&iov, &iovlen, "volname", source, -1);
+         build_iovec (&iov, &iovlen, "fd", fdstr, -1);
+	build_iovec (&iov, &iovlen, "allow_other", NULL, -1);
+         ret = nmount (iov, iovlen, mountflags);
+ #else
+         ret = mount (source, mountpoint, fstype, mountflags,
--- a/net/glusterfs/files/patch-extras-Makefile.in
+++ b/net/glusterfs/files/patch-extras-Makefile.in
@ -0,0 +1,22 @@
+--- extras/Makefile.in.orig	2015-11-08 21:57:56 UTC
+++ extras/Makefile.in
+@@ -529,8 +529,8 @@ install-volDATA: $(vol_DATA)
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)/$${files}.sample'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)/$${files}.sample" || exit $$?; \
+ 	done
+ 
+ uninstall-volDATA:
+@@ -865,7 +865,7 @@ install-data-local:
+ 	fi
+ 	$(MKDIR_P) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups
+ 	$(INSTALL_DATA) $(top_srcdir)/extras/group-virt.example \
+-		$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt
+		$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt.sample
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/net/glusterfs/pkg-descr
+++ b/net/glusterfs/pkg-descr
@ -0,0 +1,9 @@
+GlusterFS is an open source, distributed file system capable of
+scaling to several petabytes and handling thousands of
+clients. GlusterFS clusters together storage building blocks over
+Infiniband RDMA or TCP/IP interconnect, aggregating disk and memory
+resources and managing data in a single global namespace.  GlusterFS
+is based on a stackable user space design and can deliver exceptional
+performance for diverse workloads.
+
+WWW: http://www.gluster.org
--- a/net/glusterfs/pkg-plist
+++ b/net/glusterfs/pkg-plist
@ -0,0 +1,198 @@
+bin/glusterfind
+@sample etc/ganesha/ganesha-ha.conf.sample
+%%ETCDIR%%/gluster-rsyslog-5.8.conf
+%%ETCDIR%%/gluster-rsyslog-7.2.conf
+@sample %%ETCDIR%%/glusterd.vol.sample
+%%ETCDIR%%/glusterfs-georep-logrotate
+%%ETCDIR%%/glusterfs-logrotate
+%%ETCDIR%%/group-virt.example
+%%ETCDIR%%/logger.conf.example
+include/glusterfs/api/glfs-handles.h
+include/glusterfs/api/glfs.h
+include/glusterfs/gfchangelog/changelog.h
+include/glusterfs/gfdb/gfdb_data_store.h
+include/glusterfs/gfdb/gfdb_data_store_helper.h
+include/glusterfs/gfdb/gfdb_data_store_types.h
+include/glusterfs/gfdb/gfdb_mem-types.h
+include/glusterfs/gfdb/gfdb_sqlite3.h
+include/glusterfs/gfdb/gfdb_sqlite3_helper.h
+%%GLUSTERLIBDIR%%/auth/addr.so
+%%GLUSTERLIBDIR%%/auth/login.so
+%%GLUSTERLIBDIR%%/rpc-transport/socket.so
+%%GLUSTERLIBDIR%%/xlator/cluster/afr.so
+%%GLUSTERLIBDIR%%/xlator/cluster/dht.so
+%%GLUSTERLIBDIR%%/xlator/cluster/disperse.so
+%%GLUSTERLIBDIR%%/xlator/cluster/distribute.so
+%%GLUSTERLIBDIR%%/xlator/cluster/ec.so
+%%GLUSTERLIBDIR%%/xlator/cluster/nufa.so
+%%GLUSTERLIBDIR%%/xlator/cluster/pump.so
+%%GLUSTERLIBDIR%%/xlator/cluster/replicate.so
+%%GLUSTERLIBDIR%%/xlator/cluster/stripe.so
+%%GLUSTERLIBDIR%%/xlator/cluster/switch.so
+%%GLUSTERLIBDIR%%/xlator/cluster/tier.so
+%%GLUSTERLIBDIR%%/xlator/debug/error-gen.so
+%%GLUSTERLIBDIR%%/xlator/debug/io-stats.so
+%%GLUSTERLIBDIR%%/xlator/debug/trace.so
+%%GLUSTERLIBDIR%%/xlator/encryption/crypt.so
+%%GLUSTERLIBDIR%%/xlator/encryption/rot-13.so
+%%GLUSTERLIBDIR%%/xlator/features/access-control.so
+%%GLUSTERLIBDIR%%/xlator/features/arbiter.so
+%%GLUSTERLIBDIR%%/xlator/features/barrier.so
+%%GLUSTERLIBDIR%%/xlator/features/bit-rot.so
+%%GLUSTERLIBDIR%%/xlator/features/bitrot-stub.so
+%%GLUSTERLIBDIR%%/xlator/features/cdc.so
+%%GLUSTERLIBDIR%%/xlator/features/changelog.so
+%%GLUSTERLIBDIR%%/xlator/features/changetimerecorder.so
+%%GLUSTERLIBDIR%%/xlator/features/ganesha.so
+%%GLUSTERLIBDIR%%/xlator/features/gfid-access.so
+%%GLUSTERLIBDIR%%/xlator/features/glupy.so
+%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.py
+%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.pyc
+%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.pyo
+%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.py
+%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.pyc
+%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.pyo
+%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.py
+%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.pyc
+%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.pyo
+%%GLUSTERLIBDIR%%/xlator/features/index.so
+%%GLUSTERLIBDIR%%/xlator/features/locks.so
+%%GLUSTERLIBDIR%%/xlator/features/mac-compat.so
+%%GLUSTERLIBDIR%%/xlator/features/marker.so
+%%GLUSTERLIBDIR%%/xlator/features/posix-locks.so
+%%GLUSTERLIBDIR%%/xlator/features/prot_client.so
+%%GLUSTERLIBDIR%%/xlator/features/prot_dht.so
+%%GLUSTERLIBDIR%%/xlator/features/prot_server.so
+%%GLUSTERLIBDIR%%/xlator/features/qemu-block.so
+%%GLUSTERLIBDIR%%/xlator/features/quiesce.so
+%%GLUSTERLIBDIR%%/xlator/features/quota.so
+%%GLUSTERLIBDIR%%/xlator/features/quotad.so
+%%GLUSTERLIBDIR%%/xlator/features/read-only.so
+%%GLUSTERLIBDIR%%/xlator/features/shard.so
+%%GLUSTERLIBDIR%%/xlator/features/snapview-client.so
+%%GLUSTERLIBDIR%%/xlator/features/snapview-server.so
+%%GLUSTERLIBDIR%%/xlator/features/trash.so
+%%GLUSTERLIBDIR%%/xlator/features/upcall.so
+%%GLUSTERLIBDIR%%/xlator/features/worm.so
+%%GLUSTERLIBDIR%%/xlator/meta.so
+%%GLUSTERLIBDIR%%/xlator/mgmt/glusterd.so
+%%GLUSTERLIBDIR%%/xlator/mount/api.so
+%%GLUSTERLIBDIR%%/xlator/mount/fuse.so
+%%GLUSTERLIBDIR%%/xlator/nfs/server.so
+%%GLUSTERLIBDIR%%/xlator/performance/io-cache.so
+%%GLUSTERLIBDIR%%/xlator/performance/io-threads.so
+%%GLUSTERLIBDIR%%/xlator/performance/md-cache.so
+%%GLUSTERLIBDIR%%/xlator/performance/open-behind.so
+%%GLUSTERLIBDIR%%/xlator/performance/quick-read.so
+%%GLUSTERLIBDIR%%/xlator/performance/read-ahead.so
+%%GLUSTERLIBDIR%%/xlator/performance/readdir-ahead.so
+%%GLUSTERLIBDIR%%/xlator/performance/stat-prefetch.so
+%%GLUSTERLIBDIR%%/xlator/performance/write-behind.so
+%%GLUSTERLIBDIR%%/xlator/protocol/client.so
+%%GLUSTERLIBDIR%%/xlator/protocol/server.so
+%%GLUSTERLIBDIR%%/xlator/storage/posix.so
+%%GLUSTERLIBDIR%%/xlator/system/posix-acl.so
+%%GLUSTERLIBDIR%%/xlator/testing/features/template.so
+%%GLUSTERLIBDIR%%/xlator/testing/performance/symlink-cache.so
+lib/libgfapi.so
+lib/libgfapi.so.0
+lib/libgfapi.so.0.0.0
+lib/libgfchangelog.so
+lib/libgfchangelog.so.0
+lib/libgfchangelog.so.0.0.1
+lib/libgfdb.so
+lib/libgfdb.so.0
+lib/libgfdb.so.0.0.1
+lib/libgfrpc.so
+lib/libgfrpc.so.0
+lib/libgfrpc.so.0.0.1
+lib/libgfxdr.so
+lib/libgfxdr.so.0
+lib/libgfxdr.so.0.0.1
+lib/libglusterfs.so
+lib/libglusterfs.so.0
+lib/libglusterfs.so.0.0.1
+lib/ocf/resource.d/glusterfs/glusterd
+lib/ocf/resource.d/glusterfs/volume
+lib/ocf/resource.d/heartbeat/ganesha_grace
+lib/ocf/resource.d/heartbeat/ganesha_mon
+lib/ocf/resource.d/heartbeat/ganesha_nfsd
+%%PYTHON_SITELIBDIR%%/gluster/__init__.py
+%%PYTHON_SITELIBDIR%%/gluster/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gluster/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.py
+%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyo
+libdata/pkgconfig/glusterfs-api.pc
+libdata/pkgconfig/libgfchangelog.pc
+libdata/pkgconfig/libgfdb.pc
+libexec/ganesha/create-export-ganesha.sh
+libexec/ganesha/dbus-send.sh
+libexec/ganesha/ganesha-ha.sh
+libexec/glusterfs/gfind_missing_files/gcrawler
+libexec/glusterfs/gfind_missing_files/gfid_to_path.py
+libexec/glusterfs/gfind_missing_files/gfid_to_path.sh
+libexec/glusterfs/gfind_missing_files/gfind_missing_files.sh
+libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py
+libexec/glusterfs/glusterfind/__init__.py
+libexec/glusterfs/glusterfind/__init__.pyc
+libexec/glusterfs/glusterfind/__init__.pyo
+libexec/glusterfs/glusterfind/brickfind.py
+libexec/glusterfs/glusterfind/changelog.py
+libexec/glusterfs/glusterfind/changelogdata.py
+libexec/glusterfs/glusterfind/changelogdata.pyc
+libexec/glusterfs/glusterfind/changelogdata.pyo
+libexec/glusterfs/glusterfind/conf.py
+libexec/glusterfs/glusterfind/conf.pyc
+libexec/glusterfs/glusterfind/conf.pyo
+libexec/glusterfs/glusterfind/libgfchangelog.py
+libexec/glusterfs/glusterfind/libgfchangelog.pyc
+libexec/glusterfs/glusterfind/libgfchangelog.pyo
+libexec/glusterfs/glusterfind/main.py
+libexec/glusterfs/glusterfind/main.pyc
+libexec/glusterfs/glusterfind/main.pyo
+libexec/glusterfs/glusterfind/nodeagent.py
+libexec/glusterfs/glusterfind/tool.conf
+libexec/glusterfs/glusterfind/utils.py
+libexec/glusterfs/glusterfind/utils.pyc
+libexec/glusterfs/glusterfind/utils.pyo
+libexec/glusterfs/peer_add_secret_pub
+man/man8/gluster.8.gz
+man/man8/glusterd.8.gz
+man/man8/glusterfs.8.gz
+man/man8/glusterfsd.8.gz
+man/man8/mount.glusterfs.8.gz
+sbin/gcron.py
+sbin/gfind_missing_files
+sbin/glfsheal
+sbin/gluster
+sbin/glusterd
+sbin/glusterfs
+sbin/glusterfsd
+sbin/mount_glusterfs
+sbin/snap_scheduler.py
+sbin/umountd
+%%DOCSDIR%%/benchmarking/README
+%%DOCSDIR%%/benchmarking/glfs-bm.c
+%%DOCSDIR%%/benchmarking/launch-script.sh
+%%DOCSDIR%%/benchmarking/local-script.sh
+%%DOCSDIR%%/benchmarking/rdd.c
+%%DOCSDIR%%/glusterfs-mode.el
+%%DOCSDIR%%/glusterfs.vim
+%%DATADIR%%/scripts/post-upgrade-script-for-quota.sh
+%%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh
+%%DATADIR%%/scripts/stop-all-gluster-processes.sh
+@sample /var/db/glusterd/groups/virt.sample
+/var/db/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py
+@dir /var/db/glusterd/glusterfind/.keys
+@dir /var/db/glusterd/glusterfind
+@dir /var/db/glusterd/groups
+@dir /var/db/glusterd/hooks/1/delete/post
+@dir /var/db/glusterd/hooks/1/delete
+@dir /var/db/glusterd/hooks/1/gsync-create/post
+@dir /var/db/glusterd/hooks/1/gsync-create
+@dir /var/db/glusterd/hooks/1
+@dir /var/db/glusterd/hooks
+@dir /var/db/glusterd
+@dir /var/log/glusterfs
+@dir /var/run/gluster
--- a/ports-mgmt/portal/Makefile
+++ b/ports-mgmt/portal/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	portal
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	ports-mgmt

 MAINTAINER=	culot@FreeBSD.org
--- a/ports-mgmt/portal/distinfo
+++ b/ports-mgmt/portal/distinfo
@ -1,2 +1,2 @@
-SHA256 (culot-portal-0.1_GH0.tar.gz) = 4242824317a1c7b97140e4b34b884df3ca88de8e53cc0217038b152e7f58f99e
-SIZE (culot-portal-0.1_GH0.tar.gz) = 29623
+SHA256 (culot-portal-0.2_GH0.tar.gz) = 949d41c3ee3babb2fd47aee5e044f06f2f24749919be8b78eccee031e54b9941
+SIZE (culot-portal-0.2_GH0.tar.gz) = 30309
--- a/security/Makefile
+++ b/security/Makefile
@ -94,6 +94,7 @@
    SUBDIR += cyrus-sasl2-gssapi
    SUBDIR += cyrus-sasl2-ldapdb
    SUBDIR += cyrus-sasl2-saslauthd
+    SUBDIR += cyrus-sasl2-srp
    SUBDIR += d0_blind_id
    SUBDIR += dcetest
    SUBDIR += ddos_scan
--- a/security/cyrus-sasl2-srp/Makefile
+++ b/security/cyrus-sasl2-srp/Makefile
@ -0,0 +1,73 @@
+# $FreeBSD$
+
+PORTNAME=	srp
+PORTVERSION=	2.1.26
+#PORTREVISION=	0
+CATEGORIES=	security ipv6
+MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
+		http://cyrusimap.org/releases/
+PKGNAMEPREFIX=	cyrus-sasl-
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
+
+MAINTAINER=	ume@FreeBSD.org
+COMMENT=	SASL SRP authentication plugin
+
+LICENSE=	BSD4CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+
+CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2
+DISTINFO_FILE=	${CYRUS_SASL2_DIR}/distinfo
+PATCHDIR=	${CYRUS_SASL2_DIR}/files
+INSTALL_WRKSRC=	${WRKSRC}/plugins
+
+USES=		libtool
+USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
+		--with-plugindir=${PREFIX}/lib/sasl2 \
+		--with-dbpath=${PREFIX}/etc/sasldb2 \
+		--with-lib-subdir=lib \
+		--includedir=${PREFIX}/include \
+		--enable-static \
+		--with-rc4=openssl
+CONFIGURE_ARGS+=--with-dblib=none \
+		--disable-anon \
+		--disable-cram \
+		--disable-digest \
+		--disable-gssapi \
+		--disable-krb4 \
+		--disable-ntlm \
+		--disable-otp \
+		--disable-plain \
+		--disable-scram
+CONFIGURE_ARGS+=--enable-srp
+
+MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
+
+OPTIONS_DEFINE=			SRP_SETPASS
+OPTIONS_DEFAULT=		SRP_SETPASS
+SRP_SETPASS_DESC=		setting SRP secrets with saslpasswd
+SRP_SETPASS_CONFIGURE_ENABLE=	srp-setpass
+
+PLIST_FILES=	lib/sasl2/libsrp.a \
+		lib/sasl2/libsrp.so \
+		lib/sasl2/libsrp.so.3 \
+		lib/sasl2/libsrp.so.3.0.0
+
+.include <bsd.port.pre.mk>
+
+.if ${OPENSSLBASE} == /usr
+CONFIGURE_ARGS+=--with-openssl=yes
+.else
+CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
+.endif
+
+do-build:
+	cd ${WRKSRC}/include && ${MAKE}
+	cd ${WRKSRC}/plugins && ${MAKE}
+
+.include <bsd.port.post.mk>
--- a/security/cyrus-sasl2-srp/pkg-descr
+++ b/security/cyrus-sasl2-srp/pkg-descr
@ -0,0 +1,3 @@
+SASL SRP authentication plugin
+
+WWW: http://cyrusimap.web.cmu.edu/
--- a/security/cyrus-sasl2/files/pkg-message.in
+++ b/security/cyrus-sasl2/files/pkg-message.in
@ -15,6 +15,8 @@ NOTE: This port has been compiled with a default pwcheck_method of
      pwcheck_method.
      If you want to use GSSAPI mechanism, install
      ports/security/cyrus-sasl2-gssapi.
+      If you want to use SRP mechanism, install
+      ports/security/cyrus-sasl2-srp.
      If you want to use LDAP auxprop plugin, install
      ports/security/cyrus-sasl2-ldapdb.

--- a/sysutils/pbi-manager/Makefile
+++ b/sysutils/pbi-manager/Makefile
@ -2,10 +2,8 @@
 # $FreeBSD$

 PORTNAME=	pbi-manager
-PORTVERSION=	1431457960
+PORTVERSION=	1456333648
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.pcbsd.org/~kris/software/ \
-		ftp://ftp.pcbsd.org/pub/software/

 MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	PBI management utilities
@ -14,11 +12,16 @@ LICENSE=	BSD3CLAUSE

 RUN_DEPENDS=	${LOCALBASE}/share/pcbsd/scripts/functions.sh:${PORTSDIR}/sysutils/pcbsd-libsh

-WRKSRC=		${WRKDIR}/pbi-manager
+WRKSRC_SUBDIR=	src-sh/pbi-manager
 USES=		pkgconfig tar:xz
 NO_BUILD=	yes
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}

+USE_GITHUB=	yes
+GH_ACCOUNT=	pcbsd
+GH_PROJECT=	pcbsd
+GH_TAGNAME=	b77814
+
 .include <bsd.port.pre.mk>

 .if ${OSVERSION} < 1000000
--- a/sysutils/pbi-manager/distinfo
+++ b/sysutils/pbi-manager/distinfo
@ -1,2 +1,2 @@
-SHA256 (pbi-manager-1431457960.tar.xz) = b5902ba6c159021551d4ba134f47c748d863bccad6250efea1264726e6e6befa
-SIZE (pbi-manager-1431457960.tar.xz) = 24600
+SHA256 (pcbsd-pcbsd-1456333648-b77814_GH0.tar.xz) = 1a8fae2b82b293fc12446ef3d258348f8b2e2a7c943414afc39ff1f81af50c77
+SIZE (pcbsd-pcbsd-1456333648-b77814_GH0.tar.xz) = 169583863
--- a/sysutils/vmdktool/Makefile
+++ b/sysutils/vmdktool/Makefile
@ -8,7 +8,7 @@ MASTER_SITES=	http://www.Awfulhak.org/vmdktool/ \
 		ftp://ftp.Awfulhak.org/pub/vmdktool/ \
 		http://people.FreeBSD.org/~brian/vmdktool/

-MAINTAINER=	brian@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert VMDK files to/from raw disk images

 LICENSE=	BSD2CLAUSE
--- a/textproc/R-cran-rmarkdown/Makefile
+++ b/textproc/R-cran-rmarkdown/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	rmarkdown
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.5
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}

--- a/textproc/R-cran-rmarkdown/distinfo
+++ b/textproc/R-cran-rmarkdown/distinfo
@ -1,2 +1,2 @@
-SHA256 (rmarkdown_0.9.2.tar.gz) = b1f94d0b09a05781e101eda5b32b4aaacc5aee2741b8d5e2674c8594be78e7ae
-SIZE (rmarkdown_0.9.2.tar.gz) = 1190013
+SHA256 (rmarkdown_0.9.5.tar.gz) = 0c4d382b361edf33a0f10468f94c6a984bb8de1936c8398bda9f0ebebb44e9ff
+SIZE (rmarkdown_0.9.5.tar.gz) = 1772637
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	XML-XPath
-PORTVERSION=	1.31
+PORTVERSION=	1.32
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/textproc/p5-XML-XPath/distinfo
+++ b/textproc/p5-XML-XPath/distinfo
@ -1,2 +1,2 @@
-SHA256 (XML-XPath-1.31.tar.gz) = 9f039f5f5ba2be74e2352fe94895678f93e32fde315a8c5f65e502be1bc66275
-SIZE (XML-XPath-1.31.tar.gz) = 52745
+SHA256 (XML-XPath-1.32.tar.gz) = cbe83070a4125e675e2cce8c00f75a3e006c9e8449db1f10504d981b8678374c
+SIZE (XML-XPath-1.32.tar.gz) = 53229
--- a/www/e2guardian/Makefile
+++ b/www/e2guardian/Makefile
@ -2,9 +2,9 @@
 # $FreeBSD$

 PORTNAME=	e2guardian
-PORTVERSION=	3.0.4
+PORTVERSION=	3.4.0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	www

 MAINTAINER=	marcellocoutinho@gmail.com
@ -16,7 +16,7 @@ BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre

 USE_GITHUB=	yes
-USES=		iconv pkgconfig
+USES=		autoreconf libtool iconv pkgconfig
 USE_RC_SUBR=	e2guardian
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
@ -92,6 +92,9 @@ post-extract:
 	@sleep 3
 .endif

+pre-configure:
+	@cd ${WRKSRC} && ${SH} ${WRKSRC}/autogen.sh
+
 post-install:
 	@${FIND} ${STAGEDIR}${ETCDIR} -type f \
 		\( -name '*.conf' -or -name '*list' \) -exec ${MV} {} {}.sample \;
--- a/www/e2guardian/distinfo
+++ b/www/e2guardian/distinfo
@ -1,2 +1,2 @@
-SHA256 (e2guardian-e2guardian-v3.0.4_GH0.tar.gz) = 8817a0e95f38982520b87bb7cd7b34b7ab752f37bc2307065a82d59960b52530
-SIZE (e2guardian-e2guardian-v3.0.4_GH0.tar.gz) = 793490
+SHA256 (e2guardian-e2guardian-v3.4.0.1_GH0.tar.gz) = 0eaae1d9069ca1cf9436cb3318da321ab50107e8cc96f9f3d98417307dc608d1
+SIZE (e2guardian-e2guardian-v3.4.0.1_GH0.tar.gz) = 517052
--- a/www/e2guardian/files/e2guardian.in
+++ b/www/e2guardian/files/e2guardian.in
@ -27,8 +27,21 @@ load_rc_config $name

 command=%%PREFIX%%/sbin/${name}
 pidfile=/var/run/${name}.pid
+stop_postcmd="e2guardian_stop_postcmd"
+reload_cmd="e2guardian_reload_cmd"
+extra_commands="reload"

 command_args="-p $pidfile -f $e2guardian_config $e2guardian_flags"

-run_rc_command "$1"
+e2guardian_reload_cmd() {
+	if [ -f "${pidfile}" ]; then
+		${command} -g ${command_args}
+		echo "Reloading ${name}."
+	fi
+}

+e2guardian_stop_postcmd() {
+	rm ${pidfile}
+}
+
+run_rc_command "$1"
--- a/www/e2guardian/pkg-plist
+++ b/www/e2guardian/pkg-plist
@ -14,7 +14,6 @@
@sample %%ETCDIR%%/downloadmanagers/fancy.conf.sample
@sample %%ETCDIR%%/e2guardian.conf.sample
@sample %%ETCDIR%%/e2guardianf1.conf.sample
-%%ETCDIR%%/installation_or_migration_from_dg.sh
@sample %%ETCDIR%%/lists/addheaderregexplist.sample
 %%DNS%%@sample %%ETCDIR%%/lists/authexceptionsitelist.sample
 %%DNS%%@sample %%ETCDIR%%/lists/authexceptionurllist.sample
@ -31,8 +30,6 @@
@sample %%ETCDIR%%/lists/bannedsitelist.sample
@sample %%ETCDIR%%/lists/bannedsslsitelist.sample
@sample %%ETCDIR%%/lists/bannedurllist.sample
-%%ETCDIR%%/lists/blacklists/ads/domains
-%%ETCDIR%%/lists/blacklists/ads/urls
@sample %%ETCDIR%%/lists/contentregexplist.sample
 %%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusextensionlist.sample
 %%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusmimetypelist.sample
@ -68,6 +65,7 @@
@sample %%ETCDIR%%/lists/logregexpurllist.sample
@sample %%ETCDIR%%/lists/logsitelist.sample
@sample %%ETCDIR%%/lists/logurllist.sample
+@sample %%ETCDIR%%/lists/nocheckcertsitelist.sample
 %%ETCDIR%%/lists/phraselists/badwords/weighted_dutch
 %%ETCDIR%%/lists/phraselists/badwords/weighted_french
 %%ETCDIR%%/lists/phraselists/badwords/weighted_german
@ -243,6 +241,7 @@ sbin/e2guardian
 %%DATADIR%%/languages/ukenglish/template.html
 %%DATADIR%%/scripts/bsd-init
 %%DATADIR%%/scripts/e2guardian
+%%DATADIR%%/scripts/e2guardian.service
 %%DATADIR%%/scripts/logrotation
 %%DATADIR%%/scripts/solaris-init
 %%DATADIR%%/scripts/systemv-init
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	nginx
-PORTVERSION=	1.9.11
-PORTREVISION=	2
+PORTVERSION=	1.9.12
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@ -1,5 +1,5 @@
-SHA256 (nginx-1.9.11.tar.gz) = 6a5c72f4afaf57a6db064bba0965d72335f127481c5d4e64ee8714e7b368a51f
-SIZE (nginx-1.9.11.tar.gz) = 895373
+SHA256 (nginx-1.9.12.tar.gz) = 1af2eb956910ed4b11aaf525a81bc37e135907e7127948f9179f5410337da042
+SIZE (nginx-1.9.12.tar.gz) = 899183
 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-devel/files/patch-src-core-ngx_module.h
+++ b/www/nginx-devel/files/patch-src-core-ngx_module.h
@ -1,11 +0,0 @@
--- src/core/ngx_module.h.orig	2016-02-10 19:26:57.903123000 -0500
-+++ src/core/ngx_module.h	2016-02-10 19:27:40.978113000 -0500
-@@ -253,7 +253,7 @@
-     ngx_uint_t            spare1;
- 
-     ngx_uint_t            version;
-    char                 *signature;
-+    const char           *signature;
- 
-     void                 *ctx;
-     ngx_command_t        *commands;
--- a/www/p5-Mojolicious/Makefile
+++ b/www/p5-Mojolicious/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Mojolicious
-PORTVERSION=	6.47
+PORTVERSION=	6.48
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/www/p5-Mojolicious/distinfo
+++ b/www/p5-Mojolicious/distinfo
@ -1,2 +1,2 @@
-SHA256 (Mojolicious-6.47.tar.gz) = 7adb24f0578cef4f97a450ad27dc2f0ba5d5f45a55c328a30a28b6c9004ec975
-SIZE (Mojolicious-6.47.tar.gz) = 660826
+SHA256 (Mojolicious-6.48.tar.gz) = a538fbc0609fbdefb39884d86611b0b8387fe652137cea3f9334bd08ef52e520
+SIZE (Mojolicious-6.48.tar.gz) = 646721
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	tt-rss
-PORTVERSION=	15.7.2015.11.02
+PORTVERSION=	16.1.2016.02.23
 CATEGORIES=	www
 MASTER_SITES=	https://tt-rss.org/gitlab/fox/tt-rss/repository/archive${EXTRACT_SUFX}?ref=${GL_TAGNAME}&num;/

@ -11,7 +11,7 @@ COMMENT=	Tiny Tiny RSS: web-based news feed (RSS/Atom) aggregator

 LICENSE=	GPLv2

-GL_TAGNAME=		ee4c4602
+GL_TAGNAME=	94d425fe

 NO_BUILD=	yes
 NO_ARCH=	yes
@ -20,7 +20,7 @@ USE_PHP=	ctype dom hash json mbstring pcntl posix session xmlrpc
 WANT_PHP_WEB=	yes
 WANT_PHP_CLI=	yes
 REINPLACE_ARGS=	-i ""
-USES=		shebangfix tar:bz2
+USES=		shebangfix tar:bz2 gettext
 SHEBANG_FILES=	lib/dojo-src/rebuild-dojo.sh utils/extract-i18n-js.pl
 WRKSRC=		${WRKDIR}/tt-rss.git

--- a/www/tt-rss/distinfo
+++ b/www/tt-rss/distinfo
@ -1,2 +1,2 @@
-SHA256 (tt-rss-15.7.2015.11.02.tar.bz2) = ded1e453bfe4d1b74d42d7f3f63c6eb6512a73345eb4e868e2415a04ba44b18e
-SIZE (tt-rss-15.7.2015.11.02.tar.bz2) = 2082310
+SHA256 (tt-rss-16.1.2016.02.23.tar.bz2) = 04a6614566c5e085aad911399b6d7ee249a4ede6da119dece9f4f06a83cce23b
+SIZE (tt-rss-16.1.2016.02.23.tar.bz2) = 2058073
--- a/www/tt-rss/pkg-plist
+++ b/www/tt-rss/pkg-plist
@ -2005,8 +2005,8 @@
 %%WWWDIR%%/locale/ca_CA/LC_MESSAGES/messages.po
 %%WWWDIR%%/locale/cs_CZ/LC_MESSAGES/messages.mo
 %%WWWDIR%%/locale/cs_CZ/LC_MESSAGES/messages.po
-%%WWWDIR%%/locale/da_DA/LC_MESSAGES/messages.mo
-%%WWWDIR%%/locale/da_DA/LC_MESSAGES/messages.po
+%%WWWDIR%%/locale/da_DK/LC_MESSAGES/messages.mo
+%%WWWDIR%%/locale/da_DK/LC_MESSAGES/messages.po
 %%WWWDIR%%/locale/de_DE/LC_MESSAGES/messages.mo
 %%WWWDIR%%/locale/de_DE/LC_MESSAGES/messages.po
 %%WWWDIR%%/locale/el_GR/LC_MESSAGES/messages.mo
@ -2082,19 +2082,6 @@
 %%WWWDIR%%/plugins/af_psql_trgm/init.php
 %%WWWDIR%%/plugins/af_readability/init.php
 %%WWWDIR%%/plugins/af_redditimgur/init.php
-%%WWWDIR%%/plugins/af_sort_bayes/chart_bar.png
-%%WWWDIR%%/plugins/af_sort_bayes/init.js
-%%WWWDIR%%/plugins/af_sort_bayes/init.php
-%%WWWDIR%%/plugins/af_sort_bayes/lib/COPYING
-%%WWWDIR%%/plugins/af_sort_bayes/lib/HISTORY
-%%WWWDIR%%/plugins/af_sort_bayes/lib/README.md
-%%WWWDIR%%/plugins/af_sort_bayes/lib/README.txt
-%%WWWDIR%%/plugins/af_sort_bayes/lib/VERSION
-%%WWWDIR%%/plugins/af_sort_bayes/lib/class.naivebayesian.php
-%%WWWDIR%%/plugins/af_sort_bayes/lib/class.naivebayesian_ngram.php
-%%WWWDIR%%/plugins/af_sort_bayes/lib/class.naivebayesianstorage.php
-%%WWWDIR%%/plugins/af_sort_bayes/thumb_down.png
-%%WWWDIR%%/plugins/af_sort_bayes/thumb_up.png
 %%WWWDIR%%/plugins/af_tumblr_1280/init.php
 %%WWWDIR%%/plugins/af_unburn/init.php
 %%WWWDIR%%/plugins/af_youtube_embed/init.php
@ -2112,8 +2099,6 @@
 %%WWWDIR%%/plugins/embed_original/init.css
 %%WWWDIR%%/plugins/embed_original/init.js
 %%WWWDIR%%/plugins/embed_original/init.php
-%%WWWDIR%%/plugins/googlereaderimport/init.js
-%%WWWDIR%%/plugins/googlereaderimport/init.php
 %%WWWDIR%%/plugins/googlereaderkeys/init.php
 %%WWWDIR%%/plugins/import_export/import_export.js
 %%WWWDIR%%/plugins/import_export/init.php
@ -2190,6 +2175,7 @@
 %%WWWDIR%%/schema/versions/mysql/128.sql
 %%WWWDIR%%/schema/versions/mysql/129.sql
 %%WWWDIR%%/schema/versions/mysql/13.sql
+%%WWWDIR%%/schema/versions/mysql/130.sql
 %%WWWDIR%%/schema/versions/mysql/14.sql
 %%WWWDIR%%/schema/versions/mysql/15.sql
 %%WWWDIR%%/schema/versions/mysql/16.sql
@ -2317,6 +2303,7 @@
 %%WWWDIR%%/schema/versions/pgsql/128.sql
 %%WWWDIR%%/schema/versions/pgsql/129.sql
 %%WWWDIR%%/schema/versions/pgsql/13.sql
+%%WWWDIR%%/schema/versions/pgsql/130.sql
 %%WWWDIR%%/schema/versions/pgsql/14.sql
 %%WWWDIR%%/schema/versions/pgsql/15.sql
 %%WWWDIR%%/schema/versions/pgsql/16.sql
@ -2458,7 +2445,6 @@
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/instances
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/import_export
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/googlereaderkeys
-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/googlereaderimport
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/embed_original
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/close_button
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/cache_starred_images
@ -2470,8 +2456,6 @@
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_youtube_embed
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_unburn
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_tumblr_1280
-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_sort_bayes/lib
-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_sort_bayes
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_redditimgur
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_readability
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_psql_trgm
@ -2529,8 +2513,8 @@
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/el_GR
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/de_DE/LC_MESSAGES
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/de_DE
-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/da_DA/LC_MESSAGES
-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/da_DA
+@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/da_DK/LC_MESSAGES
+@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/da_DK
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/cs_CZ/LC_MESSAGES
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/cs_CZ
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/ca_CA/LC_MESSAGES
--- a/www/youtube_dl/Makefile
+++ b/www/youtube_dl/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	youtube_dl
-PORTVERSION=	2016.02.13
+PORTVERSION=	2016.02.22
 CATEGORIES=	www
 MASTER_SITES=	https://yt-dl.org/downloads/${PORTVERSION}/
 DISTNAME=	youtube-dl-${PORTVERSION}
--- a/www/youtube_dl/distinfo
+++ b/www/youtube_dl/distinfo
@ -1,2 +1,2 @@
-SHA256 (youtube-dl-2016.02.13.tar.gz) = 8bb5cb62aad23fd3b049d9ffac76af6d76af8c18d68da3a3b9f602adaca1d534
-SIZE (youtube-dl-2016.02.13.tar.gz) = 1951048
+SHA256 (youtube-dl-2016.02.22.tar.gz) = 14cf17af94a23d451c1c8d2fcc8ee072ee99746d6bc7487c91043498599d630a
+SIZE (youtube-dl-2016.02.22.tar.gz) = 1971515
--- a/x11-toolkits/py-kivy/Makefile
+++ b/x11-toolkits/py-kivy/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	kivy
-PORTVERSION=	1.8.0
-PORTREVISION=	3
+PORTVERSION=	1.9.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	GH LOCAL/dbn/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -15,25 +14,22 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+LIB_DEPENDS=	libmtdev.so:${PORTSDIR}/devel/libmtdev
+TEST_DEPENDS=	nosetests-${PYTHON_VER}:${PORTSDIR}/devel/py-nose

-MAKE_ENV=	KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes PYTHONPATH=${WRKSRC}
-MAKE_JOBS_UNSAFE=	yes  # does not (really) use make
+MAKE_ENV=	KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes USE_OPENGL_ES2=1 \
+		PYTHONPATH=${WRKSRC}

 USE_GITHUB=	yes
-USES=		python:2.7+ shebangfix
-USE_GL=		gl
-PYDISTUTILS_BUILD_TARGET=	build_ext
-PYDISTUTILS_BUILDARGS=	--inplace
-PYDISTUTILS_EGGINFO=	Kivy-${PORTVERSION}-py${PYTHON_VER}.egg-info
-USE_PYTHON=	autoplist distutils
-SHEBANG_FILES=	kivy/lib/osc/OSC.py \
-		kivy/tools/packaging/osx/kivy.sh \
-		examples/demo/*/*.py
-SHEBANG_LANG=	kivy
-kivy_OLD_CMD=	/usr/bin/kivy
-kivy_CMD=	${LOCALBASE}/bin/kivy
+USES=		display:test python:2.7+,concurrent uniquefiles:dirs
+USE_GL=		egl gl glesv2
+USE_PYTHON=	distutils

-OPTIONS_DEFINE=	DOCS PDF TEST
+PYDISTUTILS_BUILD_TARGET=	build_ext
+PYDISTUTILS_BUILDARGS=		--inplace
+PYDISTUTILS_EGGINFO=		Kivy-${PORTVERSION}-py${PYTHON_VER}.egg-info
+
+OPTIONS_DEFINE=	DOCS
 OPTIONS_SET=	ENCHANT OPENCV PYGAME
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	VIDEO AUDIO IMAGE CAMERA SPELLING CLIPBOARD
@ -42,7 +38,7 @@ OPTIONS_MULTI_WINDOW=	PYGAME X11  SDL2
 OPTIONS_MULTI_TEXT=	PIL PYGAME SDL2
 OPTIONS_GROUP_VIDEO=	GSTREAMER FFMPEG
 OPTIONS_GROUP_AUDIO=	GSTREAMER PYGAME SDL2
-OPTIONS_GROUP_IMAGE=	PIL PYGAME
+OPTIONS_GROUP_IMAGE=	PIL PYGAME SDL2
 OPTIONS_GROUP_CAMERA=	OPENCV GSTREAMER
 OPTIONS_GROUP_SPELLING=	ENCHANT
 OPTIONS_GROUP_CLIPBOARD=	PYGAME
@ -58,23 +54,24 @@ DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 ENCHANT_DESC=		Spell checking support via Enchant
 ENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
 FFMPEG_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ffmpeg/__init__.py:${PORTSDIR}/multimedia/py-ffmpeg
+GSTREAMER_MAKE_ENV=	USE_GSTREAMER=1
+GSTREAMER_MAKE_ENV_OFF=	USE_GSTREAMER=0
+GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:${PORTSDIR}/multimedia/gstreamer1
 GSTREAMER_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygst.py:${PORTSDIR}/multimedia/py-gstreamer
+GSTREAMER_USES=		pkgconfig
 OPENCV_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cv.py:${PORTSDIR}/graphics/py-opencv
-PDF_DESC=		Build PDF documentation (required TeXLive, DOCS)
-PDF_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-PDF_USE=		TEX=texlive,pdftex:build,dvipsk:build
-PDF_USES=		gmake
 PIL_DESC=		Text and window rendering support via PIL
 PIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging
 PYGAME_DESC=		Window, text and image rendering support via PyGame
 PYGAME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
 PYGLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet>0:${PORTSDIR}/graphics/py-pyglet
 SDL2_DESC=		Simple Direct Media Layer v2.0 support
-SDL2_MAKE_ENV=		USE_SDL=1
-SDL2_USE=		SDL=sdl2,ttf2,mixer2
-TEST_BUILD_DEPENDS=	nosetests:${PORTSDIR}/devel/py-nose
-TEST_USES=		display:build
+SDL2_MAKE_ENV=		USE_SDL2=1
+SDL2_MAKE_ENV_OFF=	USE_SDL2=0
+SDL2_USE=		SDL=sdl2,mixer2,image2,ttf2
+SDL2_USES=		pkgconfig
 X11_MAKE_ENV=		USE_X11=1
+X11_MAKE_ENV_OFF=	USE_X11=0
 X11_USE=		XORG=x11

 .if !defined(ARCH)
@ -85,76 +82,30 @@ ARCH!=		uname -p
 OPTIONS_GROUP_VIDEO+=	PYGLET
 .endif

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPDF}
-.if empty(PORT_OPTIONS:MDOCS)
-IGNORE=		option PDF requires DOCS
-.endif
-.endif
-
-.if empty(PORT_OPTIONS:MPYGAME)
-NOSE_ARGS+=	--exclude=test_fbo_pixels
-.endif
-
-.if ${PORT_OPTIONS:MTEST}
-
-post-build: do-test-build
-
-do-test-build:
-	@${RM} -rf kivy/tests/build
-	@(cd ${WRKSRC}; \
-		${SETENV} ${MAKE_ENV} nosetests ${NOSE_ARGS} ${WRKSRC}/kivy/tests)
-
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-
-post-build: do-build-docs
-	find ${WKRSRC} -name '*.so' | ${XARGS} ${STRIP_CMD}
-
-do-build-docs:
-	${MKDIR} ${WRKSRC}/doc/build/doctrees ${WRKSRC}/doc/build/html \
-		${WRKSRC}/doc/build/latex-a4 ${WRKSRC}/doc/build/latex-letter
-	${REINPLACE_CMD} -i '' -e 's/\(import pygame\.joystick\)/#\1/' \
-		${WRKSRC}/kivy/input/providers/androidjoystick.py
+post-build-DOCS-on:
+	${MKDIR} ${WRKSRC}/doc/build/doctrees ${WRKSRC}/doc/build/html
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} doc/autobuild.py)
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} sphinx-build -b html \
 			-d ${WRKSRC}/doc/build/doctrees \
 			doc/sources ${WRKSRC}/doc/build/html)
-.if ${PORT_OPTIONS:MPDF}
-	(cd ${WRKSRC}; \
-		${SETENV} ${MAKE_ENV} sphinx-build -b latex \
-			-d ${WRKSRC}/doc/build/doctrees \
-			-D latex_paper=a4 doc/sources ${WRKSRC}/doc/build/latex-a4)
-	(cd ${WRKSRC}; \
-		${SETENV} ${MAKE_ENV} sphinx-build -b latex \
-			-d ${WRKSRC}/doc/build/doctrees \
-			-D latex_paper=letter doc/sources ${WRKSRC}/doc/build/latex-letter)
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/doc/build/latex-a4 \
-		all-pdf < /dev/null > /dev/null
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/doc/build/latex-letter \
-		all-pdf < /dev/null > /dev/null
-.endif
-	${REINPLACE_CMD} -i '' -e 's/#\(import pygame\.joystick\)/\1/' \
-		${WRKSRC}/kivy/input/providers/androidjoystick.py

-post-install: do-install-docs
-
-do-install-docs:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc/build/html; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.if ${PORT_OPTIONS:MPDF}
-	${INSTALL_DATA} ${WRKSRC}/doc/build/latex-a4/Kivy.pdf \
-		${STAGEDIR}${DOCSDIR}/Kivy-a4.pdf
-	${INSTALL_DATA} ${WRKSRC}/doc/build/latex-letter/Kivy.pdf \
-		${STAGEDIR}${DOCSDIR}/Kivy-letter.pdf
-.endif
-.endif
+do-test:
+	@(cd ${KIVYPATH}; \
+		${SETENV} ${MAKE_ENV} nosetests-${PYTHON_VER} ${KIVYPATH}/kivy/tests)

 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/kivy -name '*.so' | ${XARGS} ${STRIP_CMD}

+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/build/html; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+
+post-install-PDF-on: post-install-DOCS-on
+	${INSTALL_DATA} ${WRKSRC}/doc/build/latex-a4/Kivy.pdf \
+		${STAGEDIR}${DOCSDIR}/Kivy-a4.pdf
+	${INSTALL_DATA} ${WRKSRC}/doc/build/latex-letter/Kivy.pdf \
+		${STAGEDIR}${DOCSDIR}/Kivy-letter.pdf
+
 .include <bsd.port.mk>
--- a/x11-toolkits/py-kivy/distinfo
+++ b/x11-toolkits/py-kivy/distinfo
@ -1,2 +1,2 @@
-SHA256 (kivy-kivy-1.8.0_GH0.tar.gz) = 0a6e1b58aedf6e90f812e67ee91375650454fb3d99854f17852830f33e3e6975
-SIZE (kivy-kivy-1.8.0_GH0.tar.gz) = 14702799
+SHA256 (kivy-kivy-1.9.1_GH0.tar.gz) = 29bc45be34c26a8acb1dafdd329145f997a473be344cd052659f821f6478637e
+SIZE (kivy-kivy-1.9.1_GH0.tar.gz) = 16363833
--- a/x11-toolkits/py-kivy/files/patch-90ddeb
+++ b/x11-toolkits/py-kivy/files/patch-90ddeb
@ -1,30 +0,0 @@
-commit 90ddebab3f56c06175dd99b153383990434b9514
-Author: Mathieu Virbel <mat@kivy.org>
-Date:   Tue Sep 16 10:11:23 2014 +0200
-
-    Fixes for Cython 0.21
-
-diff --git a/kivy/lib/gstplayer/_gstplayer.pyx b/kivy/lib/gstplayer/_gstplayer.pyx
-index f07af0b..aa29c11 100644
--- kivy/lib/gstplayer/_gstplayer.pyx
-+++ kivy/lib/gstplayer/_gstplayer.pyx
-@@ -207,7 +207,7 @@ cdef class GstPlayer:
-             self.eos_cb()
- 
-     def load(self):
-        cdef char *c_uri
-+        cdef bytes py_uri
- 
-         # if already loaded before, clean everything.
-         if self.pipeline != NULL:
-@@ -256,8 +256,8 @@ cdef class GstPlayer:
- 
-         # configure playbin
-         g_object_set_int(self.pipeline, 'async-handling', 1)
-        c_uri = <bytes>self.uri.encode('utf-8')
-        g_object_set_void(self.playbin, 'uri', c_uri)
-+        py_uri = <bytes>self.uri.encode('utf-8')
-+        g_object_set_void(self.playbin, 'uri', <char *>py_uri)
- 
-         # attach the callback
-         # NOTE no need to create a weakref here, as we manage to grab/release
--- a/x11-toolkits/py-kivy/files/patch-except
+++ b/x11-toolkits/py-kivy/files/patch-except
@ -1,444 +0,0 @@
-diff -ur kivy/graphics/context_instructions.pxd kivy/graphics/context_instructions.pxd
--- kivy/graphics/context_instructions.pxd	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/context_instructions.pxd	2015-03-12 20:13:57.709879145 +0200
-@@ -16,39 +16,39 @@
-     pass
- 
- cdef class LineWidth(ContextInstruction):
-    cdef void apply(self)
-+    cdef void apply(self) except *
- 
- cdef class Color(ContextInstruction):
-    cdef void apply(self)
-+    cdef void apply(self) except *
- 
- cdef class BindTexture(ContextInstruction):
-     cdef int _index
-     cdef object _source
-     cdef Texture _texture
-    cdef void apply(self)
-+    cdef void apply(self) except *
- 
- 
- cdef class LoadIdentity(ContextInstruction):
-     pass
- 
- cdef class PushMatrix(ContextInstruction):
-    cdef void apply(self)
-+    cdef void apply(self) except *
- 
- cdef class PopMatrix(ContextInstruction):
-    cdef void apply(self)
-+    cdef void apply(self) except *
- 
- cdef class ApplyContextMatrix(ContextInstruction):
-     cdef object _target_stack
-     cdef object _source_stack
-    cdef void apply(self)
-+    cdef void apply(self) except *
- 
- cdef class UpdateNormalMatrix(ContextInstruction):
-    cdef void apply(self)
-+    cdef void apply(self) except *
- 
- cdef class MatrixInstruction(ContextInstruction):
-     cdef object _stack
-     cdef Matrix _matrix
-    cdef void apply(self)
-+    cdef void apply(self) except *
- 
- cdef class Transform(MatrixInstruction):
-     cpdef transform(self, Matrix trans)
-@@ -61,16 +61,16 @@
-     cdef float _angle
-     cdef tuple _axis
-     cdef tuple _origin
-    cdef void apply(self)
-+    cdef void apply(self) except *
-     cdef void compute(self)
- 
- cdef class Scale(Transform):
-     cdef float _x, _y, _z
-    cdef void apply(self)
-+    cdef void apply(self) except *
-     cdef set_scale(self, double x, double y, double z)
- 
- cdef class Translate(Transform):
-     cdef double _x, _y, _z
-    cdef void apply(self)
-+    cdef void apply(self) except *
-     cdef set_translate(self, double x, double y, double z)
- 
-diff -ur kivy/graphics/context_instructions.pyx kivy/graphics/context_instructions.pyx
--- kivy/graphics/context_instructions.pyx	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/context_instructions.pyx	2015-03-12 20:15:07.788203456 +0200
-@@ -320,7 +320,7 @@
- 
-         self.index = kwargs.get('index', 0)
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         cdef RenderContext context = self.get_context()
-         context.set_texture(self._index, self._texture)
- 
-@@ -437,7 +437,7 @@
-         self.target_stack = kwargs.get('target_stack', 'modelview_mat')
-         self.source_stack = kwargs.get('source_stack', 'modelview_mat')
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         cdef RenderContext context = self.get_context()
-         m = context.get_state(self._target_stack)
-         m = m.multiply(context.get_state(self._source_stack))
-@@ -473,7 +473,7 @@
- 
-     .. versionadded:: 1.6.0
-     '''
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         cdef RenderContext context = self.get_context()
-         mvm = context.get_state('modelview_mat')
-         context.set_state('normal_mat', mvm.normal_matrix())
-@@ -488,7 +488,7 @@
-         self.stack = kwargs.get('stack', 'modelview_mat')
-         self._matrix = None
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         '''Apply the matrix of this instance to the
-         context model view matrix.
-         '''
-diff -ur kivy/graphics/fbo.pxd kivy/graphics/fbo.pxd
--- kivy/graphics/fbo.pxd	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/fbo.pxd	2015-03-12 19:46:39.959774791 +0200
-@@ -22,7 +22,7 @@
- 
-     cdef void create_fbo(self)
-     cdef void delete_fbo(self)
-    cdef void apply(self)
-+    cdef void apply(self) except *
-     cdef void raise_exception(self, str message, int status=?)
-     cdef str resolve_status(self, int status)
-     cdef void reload(self)
-diff -ur kivy/graphics/fbo.pyx kivy/graphics/fbo.pyx
--- kivy/graphics/fbo.pyx	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/fbo.pyx	2015-03-12 19:47:46.149725464 +0200
-@@ -295,7 +295,7 @@
-         else:
-             glClear(GL_COLOR_BUFFER_BIT)
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         if self.flags & GI_NEEDS_UPDATE:
-             self.bind()
-             RenderContext.apply(self)
-diff -ur kivy/graphics/gl_instructions.pyx kivy/graphics/gl_instructions.pyx
--- kivy/graphics/gl_instructions.pyx	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/gl_instructions.pyx	2015-03-12 20:17:33.398880449 +0200
-@@ -50,7 +50,7 @@
-         self.b = b
-         self.a = a
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         glClearColor(self.r, self.g, self.b, self.a)
- 
-     property rgba:
-@@ -136,7 +136,7 @@
-         self.clear_stencil = int(kwargs.get('clear_stencil', 0))
-         self.clear_depth = int(kwargs.get('clear_depth', 0))
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         cdef GLbitfield mask = 0
-         if self.clear_color:
-             mask |= GL_COLOR_BUFFER_BIT
-diff -ur kivy/graphics/instructions.pxd kivy/graphics/instructions.pxd
--- kivy/graphics/instructions.pxd	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/instructions.pxd	2015-03-12 20:12:10.370562015 +0200
-@@ -24,7 +24,7 @@
-     cdef object __weakref__
-     cdef object __proxy_ref
- 
-    cdef void apply(self)
-+    cdef void apply(self) except *
-     cdef void flag_update(self, int do_parent=?)
-     cdef void flag_update_done(self)
-     cdef void set_parent(self, Instruction parent)
-@@ -75,7 +75,7 @@
-     cdef Shader _shader
-     cdef object func
-     cdef int _reset_context
-    cdef void apply(self)
-+    cdef void apply(self) except *
-     cdef void enter(self)
- 
- 
-@@ -94,7 +94,7 @@
-     cpdef add(self, Instruction c)
-     cpdef remove(self, Instruction c)
-     cpdef draw(self)
-    cdef void apply(self)
-+    cdef void apply(self) except *
- 
- 
- cdef class RenderContext(Canvas):
-diff -ur kivy/graphics/instructions.pyx kivy/graphics/instructions.pyx
--- kivy/graphics/instructions.pyx	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/instructions.pyx	2015-03-12 20:11:54.069524371 +0200
-@@ -57,7 +57,7 @@
-         if self.parent:
-             self.parent.add(self)
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         pass
- 
-     cdef void flag_update(self, int do_parent=1):
-@@ -123,7 +123,7 @@
-         else:
-             self.compiler = GraphicsCompiler()
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         cdef Instruction c
-         cdef list children
-         if self.compiler is not None:
-@@ -224,7 +224,7 @@
-         cdef RenderContext context = getActiveContext()
-         return context
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         cdef RenderContext context = self.get_context()
-         if self.context_push:
-             context.push_states(self.context_push)
-@@ -233,15 +233,15 @@
-         if self.context_pop:
-             context.pop_states(self.context_pop)
- 
-    cdef void set_state(self, str name, value):
-+    cdef void set_state(self, str name, value) except *:
-         self.context_state[name] = value
-         self.flag_update()
- 
-    cdef void push_state(self, str name):
-+    cdef void push_state(self, str name) except *:
-         self.context_push.append(name)
-         self.flag_update()
- 
-    cdef void pop_state(self, str name):
-+    cdef void pop_state(self, str name) except *:
-         self.context_pop.append(name)
-         self.flag_update()
- 
-@@ -378,7 +378,7 @@
-     cdef void build(self):
-         pass
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         if self.flags & GI_NEEDS_UPDATE:
-             self.build()
-             self.flag_update_done()
-@@ -444,7 +444,7 @@
-         '''
-         self.flag_update()
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         cdef RenderContext rcx
-         cdef Context ctx
-         cdef Shader shader
-@@ -575,7 +575,7 @@
-         '''
-         self.apply()
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         cdef float opacity = self._opacity
-         cdef float rc_opacity
-         cdef RenderContext rc
-@@ -764,29 +764,29 @@
-     cdef get_state(self, str name):
-         return self.state_stacks[name][-1]
- 
-    cdef void set_states(self, dict states):
-+    cdef void set_states(self, dict states) except *:
-         cdef str name
-         for name, value in states.iteritems():
-             self.set_state(name, value)
- 
-    cdef void push_state(self, str name):
-+    cdef void push_state(self, str name) except *:
-         stack = self.state_stacks[name]
-         stack.append(stack[-1])
-         self.flag_update()
- 
-    cdef void push_states(self, list names):
-+    cdef void push_states(self, list names) except *:
-         cdef str name
-         for name in names:
-             self.push_state(name)
- 
-    cdef void pop_state(self, str name):
-+    cdef void pop_state(self, str name) except *:
-         stack = self.state_stacks[name]
-         oldvalue = stack.pop()
-         if oldvalue != stack[-1]:
-             self.set_state(name, stack[-1])
-             self.flag_update()
- 
-    cdef void pop_states(self, list names):
-+    cdef void pop_states(self, list names) except *:
-         cdef str name
-         for name in names:
-             self.pop_state(name)
-@@ -806,13 +806,13 @@
-         texture.bind()
-         self.flag_update()
- 
-    cdef void enter(self):
-+    cdef void enter(self) except *:
-         self._shader.use()
- 
-    cdef void leave(self):
-+    cdef void leave(self) except *:
-         self._shader.stop()
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         cdef list keys
-         if PY2:
-             keys = self.state_stacks.keys()
-diff -ur kivy/graphics/shader.pyx kivy/graphics/shader.pyx
--- kivy/graphics/shader.pyx	2015-03-22 20:50:55.383258546 +0200
-+++ kivy/graphics/shader.pyx	2015-03-12 20:26:19.922137472 +0200
-@@ -221,13 +221,13 @@
-         '''
-         glUseProgram(0)
- 
-    cdef void set_uniform(self, str name, value):
-+    cdef void set_uniform(self, str name, value) except *:
-         if name in self.uniform_values and self.uniform_values[name] == value:
-             return
-         self.uniform_values[name] = value
-         self.upload_uniform(name, value)
- 
-    cdef void upload_uniform(self, str name, value):
-+    cdef void upload_uniform(self, str name, value) except *:
-         '''Pass a uniform variable to the shader.
-         '''
-         cdef long vec_size, index, x, y
-@@ -412,7 +412,7 @@
-             mat[x] = <GLfloat>value.mat[x]
-         glUniformMatrix4fv(loc, 1, False, mat)
- 
-    cdef int get_uniform_loc(self, str name):
-+    cdef int get_uniform_loc(self, str name) except *:
-         cdef bytes c_name = name.encode('utf-8')
-         cdef int loc = glGetUniformLocation(self.program, c_name)
-         self.uniform_locations[name] = loc
-@@ -453,11 +453,11 @@
-         # save for the next run.
-         self._current_vertex_format = vertex_format
- 
-    cdef void build(self):
-+    cdef void build(self) except *:
-         self.build_vertex()
-         self.build_fragment()
- 
-    cdef void build_vertex(self, int link=1):
-+    cdef void build_vertex(self, int link=1) except *:
-         if self.vertex_shader is not None:
-             glDetachShader(self.program, self.vertex_shader.shader)
-             self.vertex_shader = None
-@@ -467,7 +467,7 @@
-         if link:
-             self.link_program()
- 
-    cdef void build_fragment(self, int link=1):
-+    cdef void build_fragment(self, int link=1) except *:
-         if self.fragment_shader is not None:
-             glDetachShader(self.program, self.fragment_shader.shader)
-             self.fragment_shader = None
-@@ -477,7 +477,7 @@
-         if link:
-             self.link_program()
- 
-    cdef void link_program(self):
-+    cdef void link_program(self) except *:
-         if self.vertex_shader is None or self.fragment_shader is None:
-             return
- 
-diff -ur kivy/graphics/stencil_instructions.pxd kivy/graphics/stencil_instructions.pxd
--- kivy/graphics/stencil_instructions.pxd	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/stencil_instructions.pxd	2015-03-12 20:16:45.137608771 +0200
-@@ -1,11 +1,11 @@
- from kivy.graphics.instructions cimport Instruction
- 
- cdef class StencilPush(Instruction):
-    cdef void apply(self)
-+    cdef void apply(self) except *
- cdef class StencilPop(Instruction):
-    cdef void apply(self)
-+    cdef void apply(self) except *
- cdef class StencilUse(Instruction):
-     cdef unsigned int _op
-    cdef void apply(self)
-+    cdef void apply(self) except *
- cdef class StencilUnUse(Instruction):
-    cdef void apply(self)
-+    cdef void apply(self) except *
-diff -ur kivy/graphics/stencil_instructions.pyx kivy/graphics/stencil_instructions.pyx
--- kivy/graphics/stencil_instructions.pyx	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/stencil_instructions.pyx	2015-03-12 20:16:11.438228738 +0200
-@@ -127,7 +127,7 @@
-     '''Push the stencil stack. See the module documentation for more
-     information.
-     '''
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         global _stencil_level, _stencil_in_push
-         if _stencil_in_push:
-             raise Exception('Cannot use StencilPush inside another '
-@@ -151,7 +151,7 @@
- cdef class StencilPop(Instruction):
-     '''Pop the stencil stack. See the module documentation for more information.
-     '''
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         global _stencil_level, _stencil_in_push
-         if _stencil_level == 0:
-             raise Exception('Too much StencilPop (stack underflow)')
-@@ -177,7 +177,7 @@
-         else:
-             self._op = GL_EQUAL
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         global _stencil_in_push
-         _stencil_in_push = 0
-         glColorMask(1, 1, 1, 1)
-@@ -208,7 +208,7 @@
- cdef class StencilUnUse(Instruction):
-     '''Use current stencil buffer to unset the mask.
-     '''
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         glStencilFunc(GL_ALWAYS, 0, 0)
-         glStencilOp(GL_DECR, GL_DECR, GL_DECR)
-         glColorMask(0, 0, 0, 0)
-diff -ur kivy/graphics/vertex_instructions_line.pxi kivy/graphics/vertex_instructions_line.pxi
--- kivy/graphics/vertex_instructions_line.pxi	2014-01-31 17:13:23.000000000 +0200
-+++ kivy/graphics/vertex_instructions_line.pxi	2015-03-12 20:26:50.588536611 +0200
-@@ -165,7 +165,7 @@
-             self._stencil_use = StencilUse(op='lequal')
-             self._stencil_unuse = StencilUnUse()
- 
-    cdef void apply(self):
-+    cdef void apply(self) except *:
-         if self._width == 1.:
-             VertexInstruction.apply(self)
-             return
-
--- a/x11-toolkits/py-kivy/files/patch-kivycorewindow__sdl.pyx
+++ b/x11-toolkits/py-kivy/files/patch-kivycorewindow__sdl.pyx
@ -1,20 +0,0 @@
--- kivy/core/window/sdl.pyx
-+++ kivy/core/window/sdl.pyx
-@@ -35,7 +35,7 @@ cdef extern from "SDL.h":
-         unsigned int scancode
-         unsigned int sym
-         unsigned short mod
-        unsigned int unicode
-+        unsigned int unused
- 
-     ctypedef struct SDL_KeyboardEvent:
-         unsigned char state
-@@ -282,7 +282,7 @@ def poll():
-         action = 'keydown' if event.type == SDL_KEYDOWN else 'keyup'
-         mod = event.key.keysym.mod
-         scancode = event.key.keysym.scancode
-        unicode = event.key.keysym.unicode
-+        unicode = event.key.keysym.unused
-         key = event.key.keysym.sym
-         return (action, mod, key, scancode, unicode)
-     elif event.type == SDL_TEXTINPUT:
--- a/x11-toolkits/py-kivy/files/patch-kivygrahicsshader.pyx
+++ b/x11-toolkits/py-kivy/files/patch-kivygrahicsshader.pyx
@ -1,22 +0,0 @@
-diff --git a/kivy/graphics/shader.pyx b/kivy/graphics/shader.pyx
-index eab0f42..39c449a 100644
--- kivy/graphics/shader.pyx
-+++ kivy/graphics/shader.pyx
-@@ -421,6 +421,7 @@ cdef class Shader:
-     cdef void bind_vertex_format(self, VertexFormat vertex_format):
-         cdef unsigned int i
-         cdef vertex_attr_t *attr
-+        cdef bytes name
- 
-         # if the current vertex format used in the shader is the current one, do
-         # nothing.
-@@ -445,7 +446,8 @@ cdef class Shader:
-                 attr = &vertex_format.vattr[i]
-                 if attr.per_vertex == 0:
-                     continue
-                attr.index = glGetAttribLocation(self.program, <char *><bytes>attr.name)
-+                name = <bytes>attr.name
-+                attr.index = glGetAttribLocation(self.program, <char *>name)
-                 glEnableVertexAttribArray(attr.index)
- 
-         # save for the next run.
--- a/x11-toolkits/py-kivy/files/patch-setup.py
+++ b/x11-toolkits/py-kivy/files/patch-setup.py
@ -1,58 +0,0 @@
--- setup.py
-+++ setup.py
-@@ -12,6 +12,7 @@ from os import walk, environ
- from distutils.core import setup
- from distutils.extension import Extension
- from collections import OrderedDict
-+from subprocess import check_output
- 
- if sys.version > '3':
-     PY3 = True
-@@ -36,7 +37,6 @@ def pkgconfig(*packages, **kw):
-         kw.setdefault(flag, []).append(token[2:].decode('utf-8'))
-     return kw
- 
-
- # -----------------------------------------------------------------------------
- # Determine on which platform we are
- 
-@@ -178,7 +178,7 @@ elif platform == 'win32':
-     c_options['use_glew'] = True
- else:
-     # searching GLES headers
-    default_header_dirs = ['/usr/include', '/usr/local/include']
-+    default_header_dirs = ['/usr/include', join(environ.get('LOCALBASE', '/usr/local'), 'include')]
-     found = False
-     for hdir in default_header_dirs:
-         filename = join(hdir, 'GLES2', 'gl2.h')
-@@ -283,6 +283,9 @@ def determine_base_flags():
-                        'ApplicationServices.framework/Frameworks')
-         flags['extra_compile_args'] += ['-F%s' % sysroot]
-         flags['extra_link_args'] += ['-F%s' % sysroot]
-+    elif platform.startswith('freebsd'):
-+        flags['include_dirs'] += [join(environ.get('LOCALBASE', '/usr/local'), 'include')]
-+        flags['extra_link_args'] += ['-L', join(environ.get('LOCALBASE', '/usr/local'), 'lib')]
-     return flags
- 
- 
-@@ -297,8 +300,6 @@ def determine_gl_flags():
-         flags['extra_link_args'] = ['-framework', 'OpenGL', '-arch', osx_arch]
-         flags['extra_compile_args'] = ['-arch', osx_arch]
-     elif platform.startswith('freebsd'):
-        flags['include_dirs'] = ['/usr/local/include']
-        flags['extra_link_args'] = ['-L', '/usr/local/lib']
-         flags['libraries'] = ['GL']
-     elif platform.startswith('openbsd'):
-         flags['include_dirs'] = ['/usr/X11R6/include']
-@@ -367,6 +368,11 @@ def determine_sdl():
-     elif platform == 'darwin':
-         flags['extra_link_args'] += [
-             '-framework', 'ApplicationServices']
-+    elif platform.startswith('freebsd'):
-+        flags['extra_compile_args'] = check_output([environ.get('SDL2_CONFIG', 'sdl2-config'), '--cflags']).split()
-+        flags['extra_link_args'] = check_output([environ.get('SDL2_CONFIG', 'sdl2-config'), '--libs']).split()
-+        flags['include_dirs'] = []
-+        flags['libraries'] = ["SDL2_ttf", "SDL2_mixer"]
-     return flags
- 
- 
--- a/x11-toolkits/py-kivy/pkg-plist
+++ b/x11-toolkits/py-kivy/pkg-plist