From owner-svn-ports-head@freebsd.org Mon Feb 25 21:27:11 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B80FF15166C9; Mon, 25 Feb 2019 21:27:11 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 59FFB82674; Mon, 25 Feb 2019 21:27:11 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 443C822C43; Mon, 25 Feb 2019 21:27:11 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1PLRB5J015866; Mon, 25 Feb 2019 21:27:11 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1PLRAUE015861; Mon, 25 Feb 2019 21:27:10 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201902252127.x1PLRAUE015861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 25 Feb 2019 21:27:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493898 - in head/devel: geany-plugin-devhelp geany-plugin-markdown geany-plugin-webhelper geany-plugins geany-plugins/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/devel: geany-plugin-devhelp geany-plugin-markdown geany-plugin-webhelper geany-plugins geany-plugins/files X-SVN-Commit-Revision: 493898 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 59FFB82674 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2019 21:27:12 -0000 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@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@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@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@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