From a626ee54a05b93f1754b837aaa5a769c0c140f58 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 12 Aug 2015 22:27:31 +0000
Subject: [PATCH] sync WANTLIB

---
 astro/celestia/Makefile          |  6 +++---
 comms/dfu-util/Makefile          |  7 ++++---
 devel/arm-none-eabi/gdb/Makefile |  6 +++---
 education/drgeo/Makefile         | 10 +++++-----
 graphics/amide/Makefile          |  6 +++---
 graphics/dmtx-utils/Makefile     |  8 ++++----
 mail/bmf/Makefile                |  6 +++---
 mail/dspam/Makefile              |  6 +++---
 math/cgal/Makefile               |  8 +++++---
 misc/brltty/Makefile             |  6 +++---
 misc/dtcltiny/Makefile           |  6 +++---
 net/avahi/Makefile               | 14 +++++++-------
 security/cyrus-sasl2/Makefile    |  6 +++---
 sysutils/cfengine/Makefile       |  7 ++++---
 sysutils/collectd/Makefile       | 11 +++++++----
 www/c-icap/modules/Makefile      |  7 ++++---
 www/canto/Makefile               |  6 +++---
 www/cherokee/Makefile            |  9 +++++----
 x11/kde/arts3/Makefile           |  5 +++--
 19 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 8c9b8c0a051..fd888bd0734 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2013/06/04 18:41:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.36 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT=	free space simulator and planetarium
 
 DISTNAME=	celestia-1.6.1
-REVISION=	8
+REVISION=	9
 
 CATEGORIES=	astro x11
 
@@ -24,7 +24,7 @@ WANTLIB += jpeg m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pangox-1.0
 WANTLIB += pcre pixman-1 png pthread pthread-stubs stdc++ xcb z
 WANTLIB += gdkglext-x11-1.0 gtkglext-x11-1.0 ${MODLUA_WANTLIB} theora
 WANTLIB += Xxf86vm drm gthread-2.0 xcb-render xcb-shm ffi
-WANTLIB += harfbuzz
+WANTLIB += harfbuzz X11-xcb Xau Xdmcp glapi graphite2 xcb-dri2 xcb-glx
 
 MODULES=	devel/gettext \
 		lang/lua
diff --git a/comms/dfu-util/Makefile b/comms/dfu-util/Makefile
index ca4b78a86c0..b0cbd0997c0 100644
--- a/comms/dfu-util/Makefile
+++ b/comms/dfu-util/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2014/10/21 15:08:51 abieber Exp $
+# $OpenBSD: Makefile,v 1.13 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT =		device firmware update (DFU) USB programmer
 
 DISTNAME =		dfu-util-0.8
+REVISION =		0
 
 CATEGORIES =		comms
 
@@ -15,8 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 MASTER_SITES =		${HOMEPAGE}/releases/
 
-LIB_DEPENDS =		devel/libusb-compat
-WANTLIB =		c usb pthread
+LIB_DEPENDS =		devel/libusb1
+WANTLIB =		c usb-1.0 pthread
 
 CONFIGURE_STYLE =	gnu
 
diff --git a/devel/arm-none-eabi/gdb/Makefile b/devel/arm-none-eabi/gdb/Makefile
index 6056d18fe52..635db0f1ad1 100644
--- a/devel/arm-none-eabi/gdb/Makefile
+++ b/devel/arm-none-eabi/gdb/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.2 2015/06/10 10:55:10 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT=	gdb for arm-none-eabi cross-development
 
 DISTNAME=	gdb-7.9.1
 EXTRACT_SUFX=	.tar.xz
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	https://www.gnu.org/software/gdb/
 
-WANTLIB=	c expat m ncurses z
+WANTLIB=	c expat m ncurses pthread z
 
 MASTER_SITES=	${MASTER_SITE_GNU:=gdb/}
 DIST_SUBDIR=	gdb
diff --git a/education/drgeo/Makefile b/education/drgeo/Makefile
index b6f90e08f86..07874c5938c 100644
--- a/education/drgeo/Makefile
+++ b/education/drgeo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2013/05/31 15:34:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2015/08/12 22:27:32 sthen Exp $
 
 COMMENT=	interactive geometry program
 
 DISTNAME=	drgeo-1.1.0
-REVISION=	18
+REVISION=	19
 CATEGORIES=	education math
 
 HOMEPAGE=	http://www.ofset.org/drgeo/
@@ -13,14 +13,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ofset/}
 
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
 WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gmp gobject-2.0 gtk-x11-2.0 ltdl guile
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
 WANTLIB += png pthread pthread-stubs stdc++ xcb xml2 z glade-2.0
-WANTLIB += GL Xxf86vm drm ffi gthread-2.0 xcb-render xcb-shm
-WANTLIB += harfbuzz
+WANTLIB += ffi gthread-2.0 xcb-render xcb-shm
+WANTLIB += harfbuzz graphite2 lzma
 
 MODULES=	devel/gettext \
 		textproc/intltool
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index 22e11e1f74e..27b4dbe65b1 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.44 2015/05/19 16:31:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT =	Amide a Medical Imaging Data Examiner
 
 DISTNAME =	amide-1.0.5
 CATEGORIES =	graphics
-REVISION =	3
+REVISION =	4
 
 HOMEPAGE =	http://amide.sourceforge.net/
 
@@ -21,7 +21,7 @@ WANTLIB += ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
 WANTLIB += pixman-1 png pthread pthread-stubs speex stdc++ vorbis
 WANTLIB += vorbisenc vpx x264 xcb xcb-render xcb-shm xml2 z
 WANTLIB += dbus-1 dbus-glib-1 ffi graphite2 opus
-WANTLIB += harfbuzz xvidcore
+WANTLIB += harfbuzz xvidcore lzma swresample x265
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=amide/}
 
diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile
index bbcc20b52c0..52449469c8b 100644
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2013/05/16 09:16:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2015/08/12 22:27:32 sthen Exp $
 
 COMMENT =		tools for handling data matrix barcodes
 
 DISTNAME =		dmtx-utils-0.7.4
-REVISION =		3
+REVISION =		4
 CATEGORIES =		graphics
 
 HOMEPAGE =		http://www.libdmtx.org/
@@ -15,8 +15,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 WANTLIB += ICE MagickCore MagickWand SM X11 Xext Xt bz2 c djvulibre
 WANTLIB += dmtx expat fftw3 fontconfig freetype jasper jbig jpeg
-WANTLIB += lcms2 ltdl lzma png pthread tiff wmf wmflite xcb xml2
-WANTLIB += m z
+WANTLIB += lcms2 ltdl lzma png pthread tiff xcb xml2
+WANTLIB += m z pthread-stubs webp wmf-0.2 wmflite-0.2
 
 MODULES =		converters/libiconv
 LIB_DEPENDS +=		graphics/ImageMagick>=6.6.6.10p7 \
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index f9be1b74fb6..e552d61c282 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.24 2014/10/28 08:23:06 jasper Exp $
+# $OpenBSD: Makefile,v 1.25 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT=		easy to use Bayesian spam filter
 DISTNAME=		bmf-0.9.4
-REVISION=		7
+REVISION=		8
 CATEGORIES=		mail
 HOMEPAGE=		http://sourceforge.net/projects/bmf/
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=		--without-mysql \
 
 .if ${FLAVOR:Mmysql}
 LIB_DEPENDS+=		databases/mariadb
-WANTLIB +=		mysqlclient
+WANTLIB +=		mysqlclient stdc++
 CONFIGURE_ARGS+=	--without-libdb --with-mysql="${LOCALBASE}"
 CFLAGS+=		"-I${LOCALBASE}/include/mysql"
 .endif
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 9bf000cdd54..facb24cc14a 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2015/05/22 11:31:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2015/08/12 22:27:32 sthen Exp $
 
 COMMENT-main =	anti-spam filter
 COMMENT-pgsql =	PostgreSQL driver for dspam
@@ -15,7 +15,7 @@ FULLPKGPATH-$p = ${PKGPATH},-$p
 .endfor
 REVISION =		1
 REVISION-main =		2
-REVISION-mysql =	2
+REVISION-mysql =	3
 
 SHARED_LIBS =	dspam	9.0
 CATEGORIES =	mail
@@ -66,7 +66,7 @@ ERRORS += "Fatal: choose either domainscale or largescale, not both"
 
 LIB_DEPENDS-mysql=	${LIB_DEPENDS} ${PKGNAME-main}:mail/dspam,-main \
 			databases/mariadb
-WANTLIB-mysql=		${WANTLIB} dspam z ssl lib/mysql/mysqlclient
+WANTLIB-mysql=		${WANTLIB} dspam z ssl stdc++ lib/mysql/mysqlclient
 
 LIB_DEPENDS-pgsql=	${LIB_DEPENDS} ${PKGNAME-main}:mail/dspam,-main \
 			databases/postgresql
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index b6cbd51ed95..d5cd7eed1e4 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2015/05/09 20:03:49 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2015/08/12 22:27:31 sthen Exp $
 
 # vax:	no fenv.h support
 NOT_FOR_ARCHS =		vax
@@ -14,6 +14,7 @@ DISTNAME =		CGAL-3.8
 MASTER_SITES =		https://gforge.inria.fr/frs/download.php/28500/
 PKGNAME =		${DISTNAME:L}
 EPOCH =			0
+REVISION =		0
 
 SHARED_ONLY =		Yes
 SHARED_LIBS =		CGAL		0.0 \
@@ -29,8 +30,9 @@ HOMEPAGE =		http://www.cgal.org/
 PERMIT_PACKAGE_CDROM =	Yes
 
 # m>=5.3 for fenv.h support
-WANTLIB =		GL GLU ICE SM X11 Xext boost_thread-mt gmp gmpxx \
-			lib/qt4/QtGui lib/qt4/QtOpenGL m>=5.3 mpfr stdc++ z
+WANTLIB += GL GLU boost_thread-mt gmp gmpxx
+WANTLIB += lib/qt4/QtGui lib/qt4/QtOpenGL m>=5.3 mpfr 
+WANTLIB += pthread stdc++ z
 
 MODULES =		devel/cmake \
 			x11/qt4
diff --git a/misc/brltty/Makefile b/misc/brltty/Makefile
index f08d90381e9..6a78c157177 100644
--- a/misc/brltty/Makefile
+++ b/misc/brltty/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2015/06/29 22:17:46 ratchov Exp $
+# $OpenBSD: Makefile,v 1.14 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT=	access software for a blind person using a braille terminal
 
 SHARED_ONLY=	Yes
 DISTNAME=	brltty-3.6
-REVISION=	0
+REVISION=	1
 CATEGORIES=	misc
 HOMEPAGE=	http://mielke.cc/brltty
 MASTER_SITES=	${HOMEPAGE}/releases/
@@ -13,7 +13,7 @@ MAINTAINER=	Mario Lang <mlang@delysid.org>
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c curses pthread
+WANTLIB=		c curses pthread sndio
 
 RUN_DEPENDS=	screen-*-shm:misc/screen,shm
 USE_GMAKE=	Yes
diff --git a/misc/dtcltiny/Makefile b/misc/dtcltiny/Makefile
index c2bb09d3dca..a440347b8c1 100644
--- a/misc/dtcltiny/Makefile
+++ b/misc/dtcltiny/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/11 11:23:57 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2015/08/12 22:27:32 sthen Exp $
 
 COMMENT =		small SRCP client to control digital model trains
 
 DISTNAME =		dtcltiny-0.8.4
-REVISION=		0
+REVISION=		1
 CATEGORIES =		misc x11
 
 HOMEPAGE =		http://dtcltiny.sourceforge.net/
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM =		Yes
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=dtcltiny/}
 
 MODULES =		x11/qt3
-WANTLIB += 		ICE SM X11 Xext c jpeg m pthread stdc++ z
+WANTLIB += 		ICE SM X11 Xext c m png pthread stdc++ z
 
 SEPARATE_BUILD =	Yes
 USE_GMAKE =		Yes
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 233184b042d..8da128baecc 100755
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.106 2015/07/28 14:46:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.107 2015/08/12 22:27:31 sthen Exp $
 
 ONLY_FOR_ARCHS-mono=	${MONO_ARCHS}
 
@@ -28,11 +28,11 @@ PKGNAME-ui=		avahi-ui-${V}
 
 REVISION-main=		19
 REVISION-gtk=		6
-REVISION-gtk3=		6
-REVISION-gui=		9
+REVISION-gtk3=		7
+REVISION-gui=		10
 REVISION-mono=		3
 REVISION-qt3=		4
-REVISION-qt4=		4
+REVISION-qt4=		5
 REVISION-ui=		4
 REVISION-python=	1
 
@@ -140,7 +140,7 @@ WANTLIB-gtk3 += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB-gtk3 += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
 WANTLIB-gtk3 += xcb-shm z ffi ${MODGETTEXT_WANTLIB}
 WANTLIB-gtk3 += ICE SM atk-bridge-2.0 atspi harfbuzz
-WANTLIB-gtk3 += graphite2
+WANTLIB-gtk3 += graphite2 epoxy
 
 ### -gui
 LIB_DEPENDS-gui=	${MODGETTEXT_LIB_DEPENDS} \
@@ -162,7 +162,7 @@ WANTLIB-gui += gobject-2.0 gthread-2.0 gtk-3 m pango-1.0
 WANTLIB-gui += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
 WANTLIB-gui += pthread-stubs xcb xcb-render xcb-shm z ffi
 WANTLIB-gui += ICE SM atk-bridge-2.0 atspi harfbuzz
-WANTLIB-gui += graphite2
+WANTLIB-gui += graphite2 epoxy
 WANTLIB-gui += ${MODGETTEXT_WANTLIB}
 
 ### -python
@@ -207,7 +207,7 @@ MODULES+=		x11/qt4
 LIB_DEPENDS-qt4=	${MODGETTEXT_LIB_DEPENDS} \
 			x11/qt4 \
 			${BUILD_PKGPATH}
-WANTLIB-qt4 += QtCore avahi-common m stdc++ ${MODGETTEXT_WANTLIB} pthread
+WANTLIB-qt4 += QtCore avahi-common m stdc++ ${MODGETTEXT_WANTLIB} pthread glib-2.0 gthread-2.0 pcre z
 .else
 CONFIGURE_ARGS+=	--disable-qt4
 .endif
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 42ab331228e..17f3bedb644 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.85 2015/05/22 11:31:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.86 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
 DISTNAME=	cyrus-sasl-2.1.26
-REVISION=	13
+REVISION=	14
 
 SHARED_LIBS += sasl2           3.0 # 3.0
 
@@ -69,7 +69,7 @@ ERRORS+=	${BRKFLAVORMSG}
 .endif
 PKG_ARGS=	-Dsql=1
 LIB_DEPENDS+=	databases/mariadb
-WANTLIB+=	m ssl z lib/mysql/mysqlclient
+WANTLIB+=	m pthread ssl stdc++ z lib/mysql/mysqlclient
 CONFIGURE_ARGS+=--enable-sql \
 		--with-mysql \
 		--without-pgsql \
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index 391c0fb1031..82c3133e8f2 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.51 2015/02/17 22:08:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.52 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT =	GNU system administration tool for networks
 
 DISTNAME =	cfengine-3.4.5
-REVISION =	5
+REVISION =	6
 
 SHARED_LIBS +=  promises	0.0 # 1.0
 CATEGORIES =	sysutils
@@ -23,9 +23,10 @@ SUBST_VARS +=		CFENGINE_BASE CFENGINE_EXAMPLES
 FLAVORS =		pgsql
 FLAVOR ?=
 
-WANTLIB =		c crypto m pcre pthread qdbm
+WANTLIB =		c crypto m pcre pthread qdbm z
 CONFIGURE_STYLE =	gnu
 USE_GMAKE =		Yes
+MODULES =		converters/libiconv
 LIB_DEPENDS =		databases/qdbm \
 			devel/pcre
 CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile
index 6d3d4c715e3..dd49cfdb2e1 100644
--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2015/07/31 12:06:18 landry Exp $
+# $OpenBSD: Makefile,v 1.33 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT-main =		system metrics collection engine
 COMMENT-mysql =		collectd mysql plugin
@@ -12,6 +12,9 @@ COMMENT-nut =		collectd nut plugin
 
 V =			5.5.0
 REVISION-main =		1
+REVISION-nut =		0
+REVISION-rrdtool =		0
+REVISION-virt =		0
 DISTNAME =		collectd-$V
 PKGNAME-main =		collectd-$V
 PKGNAME-mysql =		collectd-mysql-$V
@@ -46,7 +49,7 @@ WANTLIB-pgsql =		pq pthread crypto ssl
 LIB_DEPENDS-pgsql =	databases/postgresql
 RUN_DEPENDS-pgsql =	collectd-$V:${BASE_PKGPATH},-main
 
-WANTLIB-rrdtool =	X11 Xext Xrender cairo expat ffi fontconfig \
+WANTLIB-rrdtool =	X11 Xext Xrender c cairo expat ffi fontconfig \
 			freetype glib-2.0 gmodule-2.0 gobject-2.0 \
 			graphite2 gthread-2.0 harfbuzz iconv intl lzma m \
 			pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
@@ -60,7 +63,7 @@ LIB_DEPENDS-snmp =	net/net-snmp
 RUN_DEPENDS-snmp =	collectd-$V:${BASE_PKGPATH},-main
 
 LIB_DEPENDS-virt =	sysutils/libvirt
-WANTLIB-virt =		avahi-client avahi-common dbus-1 ffi gmp gnutls hogweed \
+WANTLIB-virt =		avahi-client avahi-common c dbus-1 ffi gmp gnutls hogweed \
 			nettle p11-kit ssh2 tasn1 util virt crypto curl iconv \
 			idn intl lzma m pthread ssl xml2 z
 RUN_DEPENDS-virt =	collectd-$V:${BASE_PKGPATH},-main
@@ -76,7 +79,7 @@ RUN_DEPENDS-memcachec =	collectd-$V:${BASE_PKGPATH},-main
 
 LIB_DEPENDS-nut =	nut->=2.7.3p0:sysutils/nut
 RUN_DEPENDS-nut =	collectd-$V:${BASE_PKGPATH},-main
-WANTLIB-nut =		upsclient
+WANTLIB-nut =		crypto pthread ssl upsclient
 
 LIB_DEPENDS +=	net/curl \
 		net/liboping \
diff --git a/www/c-icap/modules/Makefile b/www/c-icap/modules/Makefile
index a9889488b83..fbfc8808384 100644
--- a/www/c-icap/modules/Makefile
+++ b/www/c-icap/modules/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2014/11/05 12:16:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2015/08/12 22:27:31 sthen Exp $
 
 MULTI_PACKAGES=	-main -urlcheck
 COMMENT-main=	libclamav-based virus scanner for c-icap
@@ -9,7 +9,7 @@ DISTNAME=	c_icap_modules-$V
 PKGNAME-main=	c-icap-clamav-$V
 PKGNAME-urlcheck= c-icap-urlcheck-$V
 
-REVISION-main=	1
+REVISION-main=	2
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db4 -I${LOCALBASE}/include" \
@@ -27,7 +27,8 @@ MODULES=	converters/libiconv
 cWANTLIB=	bz2 pthread z
 
 LIB_DEPENDS-main=	security/clamav
-WANTLIB-main=		clamav crypto ltdl lzma m pthread ssl xml2 z ${cWANTLIB} ${WANTLIB}
+WANTLIB-main=		${cWANTLIB} ${WANTLIB}
+WANTLIB-main+=		clamav crypto ltdl lzma m pthread ssl stdc++ xml2 z
 
 LIB_DEPENDS-urlcheck=	archivers/bzip2 \
 			databases/db/v4 \
diff --git a/www/canto/Makefile b/www/canto/Makefile
index 35d08c81a96..97144c27a0d 100644
--- a/www/canto/Makefile
+++ b/www/canto/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2015/01/29 14:49:35 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.7 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT =	ncurses Atom/RSS newsreader for the console
 DISTNAME =	canto-0.7.10
-REVISION =	3
+REVISION =	4
 CATEGORIES =	www
 
 MASTER_SITES =	http://codezen.org/static/
@@ -11,7 +11,7 @@ HOMEPAGE =	http://codezen.org/canto/
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB +=	ncursesw
+WANTLIB +=	ncursesw pthread ${MODPY_WANTLIB}
 
 MODULES =	lang/python
 
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 52b92df3445..608ec78126c 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2015/07/15 23:29:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.56 2015/08/12 22:27:31 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -21,8 +21,8 @@ PKGNAME-streaming = cherokee-streaming-${VERSION}
 REVISION-main =		6
 REVISION-geoip =	2
 REVISION-ldap =		6
-REVISION-mysql =	5
-REVISION-streaming =	4
+REVISION-mysql =	6
+REVISION-streaming =	5
 
 SHARED_LIBS =	cherokee-base		0.0 \
 		cherokee-client		0.0 \
@@ -65,7 +65,7 @@ WANTLIB-ldap =		crypto lber-2.4 ldap-2.4 sasl2 ssl
 RUN_DEPENDS-ldap =	${BASE_PKGPATH}
 
 LIB_DEPENDS-mysql =	databases/mariadb
-WANTLIB-mysql =		crypto m mysqlclient ssl z
+WANTLIB-mysql =		crypto m mysqlclient pthread ssl stdc++ z
 RUN_DEPENDS-mysql =	${BASE_PKGPATH}
 
 LIB_DEPENDS-streaming =	graphics/ffmpeg>=20121026 \
@@ -73,6 +73,7 @@ LIB_DEPENDS-streaming =	graphics/ffmpeg>=20121026 \
 WANTLIB-streaming += avcodec avformat avutil bz2 crypto m gsm
 WANTLIB-streaming += mp3lame ogg pthread speex vorbis vorbisenc
 WANTLIB-streaming += vpx x264 xvidcore z opus ssl
+WANTLIB-streaming += stdc++ swresample x265
 RUN_DEPENDS-streaming = ${BASE_PKGPATH}
 
 USE_GMAKE =	Yes
diff --git a/x11/kde/arts3/Makefile b/x11/kde/arts3/Makefile
index ac60d192810..398a8eff11d 100644
--- a/x11/kde/arts3/Makefile
+++ b/x11/kde/arts3/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.78 2015/05/05 17:00:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.79 2015/08/12 22:27:31 sthen Exp $
 
 COMMENT =		K Desktop Environment, aRTs
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
+REVISION =		0
 DISTNAME =		arts-1.5.10
 MODKDE_VERSION =	3.5.8
 
@@ -44,7 +45,7 @@ WANTLIB += GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama Xmu
 WANTLIB += Xrandr Xrender Xt Xxf86vm audiofile c drm expat fontconfig
 WANTLIB += freetype glib-2.0 gmodule-2.0 gthread-2.0 jpeg lcms m mad mng
 WANTLIB += ogg pcre png pthread sndio stdc++ vorbis vorbisenc vorbisfile
-WANTLIB += xcb xcb-glx z
+WANTLIB += xcb xcb-glx z FLAC X11-xcb Xau Xdmcp glapi pthread-stubs xcb-dri2
 
 post-patch:
 	cp ${FILESDIR}/audioiosndio.cc ${WRKSRC}/flow