Mark webkit-gtk[23] ports as depricated with the same date as webkit-gtk[23].

Disable webkit-gtk[23] support if the port/plugin supports it.

Remove options for webkit-gtk[23] using ports or if they don't have a
option, mark them deprecated with the same date as webkit-gtk[23].

Haskell and geany where skipped and will be handled by the maintainers.

22 files changed, 67 insertions, 15 deletions

diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index de4246320fd7..7ade54fda1fa 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -19,6 +19,10 @@ LIB_DEPENDS=	libmpd.so:audio/libmpd \
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
 RUN_DEPENDS=	gmpc:audio/gmpc
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
+
 GNU_CONFIGURE=	yes
 USE_GNOME=	intltool glib20 gtk20
 USES=		gettext gmake libtool pkgconfig
diff --git a/cad/xtrkcad/Makefile b/cad/xtrkcad/Makefile
index 7a74e965f1a3..4b4dccf6a7cd 100644
--- a/cad/xtrkcad/Makefile
+++ b/cad/xtrkcad/Makefile
@@ -17,6 +17,9 @@ LIB_DEPENDS=	libcmocka.so:sysutils/cmocka \
 		libsoup-2.4.so:devel/libsoup \
 		libwebkitgtk-1.0.so:www/webkit-gtk2
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USES=		cmake gnome pkgconfig
 USE_GNOME=	gdkpixbuf2 gtk20 cairo
 
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 8fa9ec1bce75..3a2edede84e1 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cairo-dock-plugins
 PORTVERSION=	3.4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils
 
 MAINTAINER=	ports@FreeBSD.org
@@ -29,18 +29,19 @@ USE_XORG=	xrender
 USES=		cmake gettext pkgconfig python
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	PYVER="${PYTHON_VERSION:S/thon//}"
-CMAKE_ARGS=	-DROOT_PREFIX:PATH=${STAGEDIR}
+CMAKE_ARGS=	-DROOT_PREFIX:PATH=${STAGEDIR} \
+		-Denable-weblets:BOOL=FALSE
 
 OPTIONS_GROUP=		INTEGR PLUGINS ADDON TPI
 OPTIONS_GROUP_INTEGR=	GNOME_INTEGRATION XFCE_INTEGRATION
 OPTIONS_GROUP_PLUGINS=	ALSA_MIXER GMENU IMPULSE KEYBOARD_INDICATOR \
-			MAIL SOUND_EFFECTS WEBLETS XGAMMA ZEITGEIST
+			MAIL SOUND_EFFECTS XGAMMA ZEITGEIST
 OPTIONS_GROUP_ADDON=	EXIF ICAL UPOWER
 #OPTIONS_GROUP_TPI=	PYTHON RUBY MONO VALA
 
 OPTIONS_SUB=		yes
 
-OPTIONS_DEFAULT=	GMENU WEBLETS
+OPTIONS_DEFAULT=	GMENU
 
 ALSA_MIXER_DESC=	Alsa-Mixer applet
 EXIF_DESC=		Read file meta-data
@@ -121,9 +122,6 @@ UPOWER_CMAKE_BOOL=	enable-upower-support
 #VALA_CMAKE_BOOL=	enable-vala-interface
 CMAKE_ARGS+=		-Denable-vala-interface:BOOL=FALSE
 
-WEBLETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
-WEBLETS_CMAKE_BOOL=	enable-weblets
-
 XGAMMA_RUN_DEPENDS=	xgamma:x11/xgamma
 XGAMMA_CMAKE_BOOL=	enable-xgamma
 
diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile
index 0edc352f9d1b..fd06cf41c142 100644
--- a/graphics/apvlv/Makefile
+++ b/graphics/apvlv/Makefile
@@ -25,12 +25,13 @@ CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc \
 		-DMANDIR=${MANPREFIX}/man \
 		-DDOCDIR=${DOCSDIR} \
 		-DAPVLV_WITH_UMD=OFF \
+		-DAPVLV_WITH_HTML=OFF \
 		-DAPVLV_WITH_TXT=ON
 CFLAGS+=	-pthread
 LDFLAGS+=	-pthread
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-OPTIONS_DEFINE=	DJVU WEBKIT
+OPTIONS_DEFINE=	DJVU
 
 DJVU_DESC=	DjVu document support
 
@@ -38,8 +39,4 @@ DJVU_CMAKE_ON=	-DAPVLV_WITH_DJVU=ON
 DJVU_CMAKE_OFF=	-DAPVLV_WITH_DJVU=OFF
 DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 
-WEBKIT_CMAKE_ON=	-DAPVLV_WITH_HTML=ON
-WEBKIT_CMAKE_OFF=	-DAPVLV_WITH_HTML=OFF
-WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
-
 .include <bsd.port.mk>
diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile
index afe55d56ced0..63f16add4e05 100644
--- a/graphics/variety/Makefile
+++ b/graphics/variety/Makefile
@@ -36,6 +36,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${
 		webkit-gtk3>=2.4.8:www/webkit-gtk3 \
 		yelp>=3.14.1:x11/yelp
 
+DEPRECATED=	Uses webkit-gtk3 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 SHEBANG_FILES=	bin/variety data/scripts/*
 
 USES=	desktop-file-utils gettext python:2.7 shebangfix gnome
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 0e4a5c4bec1c..8f31e13f9b63 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -19,6 +19,9 @@ BUILD_DEPENDS=	${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libwebkitgtk-1.0.so:www/webkit-gtk2
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 ONLY_FOR_ARCHS=	i386 amd64
 CONFLICTS_INSTALL=	eclipse
 
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index fa8ebc0aea90..c764ae79a2d0 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -9,6 +9,9 @@ COMMENT=	Webkit based HTML renderer plugin for Claws Mail
 LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome \
 		libwebkitgtk-1.0.so:www/webkit-gtk2
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 CLAWS_PLUGINS_BUILD=	fancy
 
 .include "../claws-mail/Makefile.claws"
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index d3fcacd80ae1..3fc5c716d9ab 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -24,6 +24,9 @@ LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3 \
 		libenchant.so:textproc/enchant
 RUN_DEPENDS=	yelp:x11/yelp
 
+DEPRECATED=	Uses webkit-gtk3 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USES=		gettext gnome pkgconfig waf
 USE_GNOME=	cairo gtkhtml4 intlhack gtk30 gconf2 libgsf \
 		gtk-update-icon-cache
diff --git a/net/libproxy-webkit/Makefile b/net/libproxy-webkit/Makefile
index 605c77d4ec96..d2e08d490433 100644
--- a/net/libproxy-webkit/Makefile
+++ b/net/libproxy-webkit/Makefile
@@ -10,6 +10,9 @@ COMMENT=	WebKit JavaScript plug-in for libproxy
 
 LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 LIBPROXY_SLAVE=	webkit
 MASTERDIR=	${.CURDIR}/../libproxy
 
diff --git a/www/deforaos-surfer/Makefile b/www/deforaos-surfer/Makefile
index 5704f4e7d1ac..aa337db06fe0 100644
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@@ -21,6 +21,9 @@ LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
 		libwebkitgtk-1.0.so:www/webkit-gtk2
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USE_GNOME=	gtk20
 USES=		desktop-file-utils pkgconfig
 INSTALLS_ICONS=	yes
diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index aa170021e4f7..6b28dc2c91c4 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -16,6 +16,9 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USE_GNOME=	gconf2 gnomeprefix intltool
 USES=		gettext gmake pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/www/p5-Gtk2-WebKit/Makefile b/www/p5-Gtk2-WebKit/Makefile
index bcb2ff1b27bf..3b3a3fa7511d 100644
--- a/www/p5-Gtk2-WebKit/Makefile
+++ b/www/p5-Gtk2-WebKit/Makefile
@@ -20,6 +20,9 @@ BUILD_DEPENDS=	p5-Cairo>=0:graphics/p5-Cairo \
 		${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:www/webkit-gtk2
 RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 MAKE_JOBS_UNSAFE=	yes
 
 # blocked since 2010.  Remove to see if it works on all systems again
diff --git a/www/py-jswebkit/Makefile b/www/py-jswebkit/Makefile
index 791edf70279d..ef5374b1404e 100644
--- a/www/py-jswebkit/Makefile
+++ b/www/py-jswebkit/Makefile
@@ -14,6 +14,9 @@ COMMENT=	WebKit/JavaScriptCore Python bindings
 
 LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USES=		pkgconfig python:2.7
 USE_PYTHON=	distutils autoplist cython cython_run
 WRKSRC=		${WRKDIR}/python-${PORTNAME}-${PORTVERSION}
diff --git a/www/py-webkitgtk/Makefile b/www/py-webkitgtk/Makefile
index ffe5d65c376b..e068ba571a22 100644
--- a/www/py-webkitgtk/Makefile
+++ b/www/py-webkitgtk/Makefile
@@ -17,6 +17,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
diff --git a/www/rubygem-webkit-gtk/Makefile b/www/rubygem-webkit-gtk/Makefile
index cefac3c0fa09..02a78b660f50 100644
--- a/www/rubygem-webkit-gtk/Makefile
+++ b/www/rubygem-webkit-gtk/Makefile
@@ -14,6 +14,9 @@ BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 RUN_DEPENDS=	rubygem-gtk3>=${PORTVERSION}:x11-toolkits/rubygem-gtk3
 
+DEPRECATED=	Uses webkit-gtk3 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USES=		gem
 USE_RUBY=	yes
 
diff --git a/www/rubygem-webkit-gtk2/Makefile b/www/rubygem-webkit-gtk2/Makefile
index 97e9a8868b79..07de031046f9 100644
--- a/www/rubygem-webkit-gtk2/Makefile
+++ b/www/rubygem-webkit-gtk2/Makefile
@@ -14,6 +14,9 @@ LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
 		rubygem-gtk2>=${PORTVERSION}:x11-toolkits/rubygem-gtk2
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USES=		gem
 USE_RUBY=	yes
 
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index 9985ea51bb13..6dd87430f0fa 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -22,6 +22,9 @@ RUN_DEPENDS=	socat:net/socat \
 		dmenu:x11/dmenu \
 		${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR}
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USES=		gmake pkgconfig python:2.7 desktop-file-utils gettext-runtime shebangfix
 USE_XORG=	x11
 USE_GNOME=	gtk20 pygtk2 cairo
diff --git a/www/vimb-gtk2/Makefile b/www/vimb-gtk2/Makefile
index eded5fa0464d..8503f5a1dc03 100644
--- a/www/vimb-gtk2/Makefile
+++ b/www/vimb-gtk2/Makefile
@@ -15,6 +15,9 @@ LIB_DEPENDS?=	libwebkitgtk-1.0.so:www/webkit-gtk2 \
 		libfreetype.so:print/freetype2 \
 		libsoup-2.4.so:devel/libsoup
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USES=		gmake pkgconfig
 USE_GNOME?=	gtk20 cairo gdkpixbuf2
 
diff --git a/www/vimb-gtk3/Makefile b/www/vimb-gtk3/Makefile
index 73b6ea8a18bf..a1856dcb8125 100644
--- a/www/vimb-gtk3/Makefile
+++ b/www/vimb-gtk3/Makefile
@@ -4,6 +4,9 @@ PORTNAME=	vimb-gtk3
 
 LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 
+DEPRECATED=	Uses webkit-gtk3 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 MAKE_ENV=	GTK="3"
 USE_GNOME=	gtk30
 
diff --git a/www/webkit-sharp/Makefile b/www/webkit-sharp/Makefile
index be72555b063f..696776fd3c89 100644
--- a/www/webkit-sharp/Makefile
+++ b/www/webkit-sharp/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Mono bindings for Webkit
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:www/webkit-gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+DEPRECATED=	Uses webkit-gtk2 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	mono
 
diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile
index dfb29e6dd93a..dc289245458a 100644
--- a/www/xombrero/Makefile
+++ b/www/xombrero/Makefile
@@ -14,6 +14,9 @@ LICENSE=	ISCL
 LIB_DEPENDS=	libgnutls.so:security/gnutls \
 		libsoup-2.4.so:devel/libsoup
 
+DEPRECATED=	Uses either webkit-gtk2 or webkit-gtk3 which has security issues
+EXPIRATION_DATE=2019-03-24
+
 USES=		desktop-file-utils groff pkgconfig perl5 tar:tgz
 USE_PERL5=	build
 INSTALLS_ICONS=	yes
diff --git a/x11/rubygem-gnome2/Makefile b/x11/rubygem-gnome2/Makefile
index db09e4b24e89..849406f73454 100644
--- a/x11/rubygem-gnome2/Makefile
+++ b/x11/rubygem-gnome2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gnome2
 PORTVERSION=	3.3.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome rubygems
 PKGNAMEPREFIX=	rubygem-
 
@@ -31,9 +32,7 @@ RUN_DEPENDS=	rubygem-atk>=${PORTVERSION}:accessibility/rubygem-atk \
 		rubygem-poppler>=${PORTVERSION}:x11-toolkits/rubygem-poppler \
 		rubygem-rsvg2>=${PORTVERSION}:graphics/rubygem-rsvg2 \
 		rubygem-vte>=${PORTVERSION}:x11-toolkits/rubygem-vte \
-		rubygem-vte3>=${PORTVERSION}:x11-toolkits/rubygem-vte3 \
-		rubygem-webkit-gtk>=${PORTVERSION}:www/rubygem-webkit-gtk \
-		rubygem-webkit-gtk2>=${PORTVERSION}:www/rubygem-webkit-gtk2
+		rubygem-vte3>=${PORTVERSION}:x11-toolkits/rubygem-vte3
 
 USES=		metaport