svn commit: r493898 - in head/devel: geany-plugin-devhelp geany-plugin-markdown geany-plugin-webhelper geany-plugins geany-plugins/files

[Guido Falsi]

Author: madpilot
Date: Mon Feb 25 21:27:09 2019
New Revision: 493898
URL: https://svnweb.freebsd.org/changeset/ports/493898

Log:
  - Deprecate geany pplugins devhelp and webhelper. They depend on
    deprecated and forbidden webkit. Set same expiration date
  - Markdown geany plugin now available only in gtk3 flavor, the gtk2
    flavor depends on deprecated and forbidden webkit-gtk2
  - Update geany-plugins port to not depend on deprecated modules
  
  NOTE: these plugins can be added back in the future, once upstream
  converts them to work with a supported webkit version.
  
  Approved by:	portmgr (FLAVORS already approved)

Modified:
  head/devel/geany-plugin-devhelp/Makefile
  head/devel/geany-plugin-markdown/Makefile
  head/devel/geany-plugin-webhelper/Makefile
  head/devel/geany-plugins/Makefile
  head/devel/geany-plugins/files/bsd.geany-plugins.mk

Modified: head/devel/geany-plugin-devhelp/Makefile
==============================================================================
--- head/devel/geany-plugin-devhelp/Makefile	Mon Feb 25 20:35:59 2019	(r493897)
+++ head/devel/geany-plugin-devhelp/Makefile	Mon Feb 25 21:27:09 2019	(r493898)
@@ -8,6 +8,9 @@ CATEGORIES=	devel
 MAINTAINER=	madpilot at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
+DEPRECATED=	Depends on forbidden webkit port
+EXPIRATION_DATE=2019-03-24
+
 LIB_DEPENDS=	libwnck-1.so:x11-toolkits/libwnck \
 		libwebkitgtk-1.0.so:www/webkit-gtk2 \
 		libsoup-2.4.so:devel/libsoup \

Modified: head/devel/geany-plugin-markdown/Makefile
==============================================================================
--- head/devel/geany-plugin-markdown/Makefile	Mon Feb 25 20:35:59 2019	(r493897)
+++ head/devel/geany-plugin-markdown/Makefile	Mon Feb 25 21:27:09 2019	(r493898)
@@ -7,10 +7,10 @@ CATEGORIES=	devel
 MAINTAINER=	madpilot at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
-gtk2_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
-gtk3_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+FLAVORS=	gtk3
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/devel/geany-plugin-webhelper/Makefile
==============================================================================
--- head/devel/geany-plugin-webhelper/Makefile	Mon Feb 25 20:35:59 2019	(r493897)
+++ head/devel/geany-plugin-webhelper/Makefile	Mon Feb 25 21:27:09 2019	(r493898)
@@ -7,6 +7,9 @@ CATEGORIES=	devel
 MAINTAINER=	madpilot at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
+DEPRECATED=	Depends on forbidden webkit port
+EXPIRATION_DATE=2019-03-24
+
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 gtk2_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2

Modified: head/devel/geany-plugins/Makefile
==============================================================================
--- head/devel/geany-plugins/Makefile	Mon Feb 25 20:35:59 2019	(r493897)
+++ head/devel/geany-plugins/Makefile	Mon Feb 25 21:27:09 2019	(r493898)
@@ -3,6 +3,7 @@
 
 PORTNAME=	geany-plugins
 PORTVERSION=	${GEANY_VER}
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTFILES=	# none
 
@@ -20,18 +21,20 @@ gtk3_CONFLICTS_INSTALL=	geany-plugins-gtk2
 USES=		metaport
 
 OPTIONS_DEFINE=		NLS
-OPTIONS_GROUP=		GTK2 ALL
+OPTIONS_GROUP=		GTK2 GTK3 ALL
 OPTIONS_GROUP_GTK2=	${GEANY_PLUGINS_GTK2:tu}
+OPTIONS_GROUP_GTK3=	${GEANY_PLUGINS_GTK3:tu}
 OPTIONS_GROUP_ALL=	${GEANY_PLUGINS_ALL:tu}
-OPTIONS_DEFAULT=	${GEANY_PLUGINS_ALL:tu} ${GEANY_PLUGINS_GTK2:tu}
+OPTIONS_DEFAULT=	${GEANY_PLUGINS_ALL:tu} ${GEANY_PLUGINS_GTK2:tu} ${GEANY_PLUGINS_GTK3:tu}
 NO_OPTIONS_SORT=	yes
 
 GTK2_DESC=		Available only for GTK2
+GTK3_DESC=		Available only for GTK3
 ALL_DESC=		Available for both GTK2 and GTK3
 
 .include "${.CURDIR}/files/bsd.geany-plugins.mk"
 
-.for plugin in ${GEANY_PLUGINS_ALL} ${GEANY_PLUGINS_GTK2}
+.for plugin in ${GEANY_PLUGINS_ALL} ${GEANY_PLUGINS_GTK2} ${GEANY_PLUGINS_GTK3}
 ${plugin:tu}_DESC=	${${plugin}_DESC}
 .endfor
 
@@ -46,6 +49,9 @@ NLS_RUN_DEPENDS=	geany-plugins-l10n-gtk2>=0:devel/gean
 .elif ${FLAVOR} == gtk3
 .for plugin in ${GEANY_PLUGINS_ALL}
 ${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}@gtk3
+.endfor
+.for plugin in ${GEANY_PLUGINS_GTK3}
+${plugin:tu}_RUN_DEPENDS=       geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}
 .endfor
 NLS_RUN_DEPENDS=	geany-plugins-l10n>=0:devel/geany-plugins-l10n at gtk3
 .endif

Modified: head/devel/geany-plugins/files/bsd.geany-plugins.mk
==============================================================================
--- head/devel/geany-plugins/files/bsd.geany-plugins.mk	Mon Feb 25 20:35:59 2019	(r493897)
+++ head/devel/geany-plugins/files/bsd.geany-plugins.mk	Mon Feb 25 21:27:09 2019	(r493898)
@@ -2,10 +2,11 @@
 
 GEANY_VER=		1.34
 GEANY_PLUGINS_GTK2=	debugger \
-			devhelp \
 			geanypy \
 			multiterm
 
+GEANY_PLUGINS_GTK3=	markdown
+
 GEANY_PLUGINS_ALL=	addons \
 			autoclose \
 			automark \
@@ -24,7 +25,6 @@ GEANY_PLUGINS_ALL=	addons \
 			lipsum \
 			lua \
 			macro \
-			markdown \
 			miniscript \
 			numberedbookmarks \
 			overview \
@@ -43,7 +43,6 @@ GEANY_PLUGINS_ALL=	addons \
 			updatechecker \
 			vc \
 			vimode \
-			webhelper \
 			workbench \
 			xmlsnippets
 
@@ -55,7 +54,6 @@ commander_DESC=		command panel for rapid access to any
 ctags_DESC=		generate and query ctags files
 debugger_DESC=		debugging support (via GDB currently)
 defineformat_DESC=	on-the-fly \#define formatter
-devhelp_DESC=		API documentation browser
 doc_DESC=		execute command on the word at cursor position
 geanypy_DESC=		support for Python plugins
 extrasel_DESC=		additional selection tools
@@ -89,7 +87,6 @@ updatechecker_DESC=	check for new version of Geany
 utilslib_DESC=		utility library
 vc_DESC=		access to different version-control systems
 vimode_DESC=		vim-mode plugin for Geany written by a guy who does not use Vim
-webhelper_DESC=		web development facilities
 workbench_DESC=		manage multiple projects in geany
 xmlsnippets_DESC=	XML/HTML tag autocompletion