Index: head/devel/geany-plugin-devhelp/Makefile =================================================================== --- head/devel/geany-plugin-devhelp/Makefile (revision 493897) +++ head/devel/geany-plugin-devhelp/Makefile (revision 493898) @@ -1,21 +1,24 @@ # $FreeBSD$ PORTNAME= geany-plugin-devhelp PORTVERSION= ${GEANY_VER} PKGNAMESUFFIX= -gtk2 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 \ libgeany.so:devel/geany@gtk2 FLAVORS= # intentionally left empty USE_GNOME= gconf2 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Index: head/devel/geany-plugin-markdown/Makefile =================================================================== --- head/devel/geany-plugin-markdown/Makefile (revision 493897) +++ head/devel/geany-plugin-markdown/Makefile (revision 493898) @@ -1,18 +1,18 @@ # $FreeBSD$ PORTNAME= geany-plugin-markdown PORTVERSION= ${GEANY_VER} 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 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Index: head/devel/geany-plugin-webhelper/Makefile =================================================================== --- head/devel/geany-plugin-webhelper/Makefile (revision 493897) +++ head/devel/geany-plugin-webhelper/Makefile (revision 493898) @@ -1,16 +1,19 @@ # $FreeBSD$ PORTNAME= geany-plugin-webhelper PORTVERSION= ${GEANY_VER} 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 gtk3_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Index: head/devel/geany-plugins/Makefile =================================================================== --- head/devel/geany-plugins/Makefile (revision 493897) +++ head/devel/geany-plugins/Makefile (revision 493898) @@ -1,53 +1,59 @@ # Created by: Aldis Berjoza # $FreeBSD$ PORTNAME= geany-plugins PORTVERSION= ${GEANY_VER} +PORTREVISION= 1 CATEGORIES= devel DISTFILES= # none MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugins (meta port) FLAVORS= gtk3 gtk2 FLAVOR?= ${FLAVORS:[1]} gtk2_CONFLICTS_INSTALL= geany-plugins gtk2_PKGNAMESUFFIX= -gtk2 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 .if ${FLAVOR} == gtk2 .for plugin in ${GEANY_PLUGINS_ALL} ${plugin:tu}_RUN_DEPENDS= geany-plugin-${plugin}-gtk2>=0:devel/geany-plugin-${plugin}@gtk2 .endfor .for plugin in ${GEANY_PLUGINS_GTK2} ${plugin:tu}_RUN_DEPENDS= geany-plugin-${plugin}-gtk2>=0:devel/geany-plugin-${plugin} .endfor NLS_RUN_DEPENDS= geany-plugins-l10n-gtk2>=0:devel/geany-plugins-l10n@gtk2 .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 .include Index: head/devel/geany-plugins/files/bsd.geany-plugins.mk =================================================================== --- head/devel/geany-plugins/files/bsd.geany-plugins.mk (revision 493897) +++ head/devel/geany-plugins/files/bsd.geany-plugins.mk (revision 493898) @@ -1,115 +1,112 @@ # $FreeBSD$ GEANY_VER= 1.34 GEANY_PLUGINS_GTK2= debugger \ - devhelp \ geanypy \ multiterm +GEANY_PLUGINS_GTK3= markdown + GEANY_PLUGINS_ALL= addons \ autoclose \ automark \ codenav \ commander \ ctags \ defineformat \ doc \ extrasel \ gendoc \ geniuspaste \ git-changebar \ insertnum \ latex \ lineoperations \ lipsum \ lua \ macro \ - markdown \ miniscript \ numberedbookmarks \ overview \ pairtaghighlighter \ pg \ pohelper \ pretty-printer \ projectorganizer \ prj \ scope \ sendmail \ shiftcolumn \ spellcheck \ tableconvert \ treebrowser \ updatechecker \ vc \ vimode \ - webhelper \ workbench \ xmlsnippets addons_DESC= various small addons autoclose_DESC= brackets autocompletion automark_DESC= highlights all words that match selected word codenav_DESC= some facilities for navigating in the code commander_DESC= command panel for rapid access to any action 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 gendoc_DESC= generate documentation from the sources comments geniuspaste_DESC= pastebins support git-changebar_DESC= highlight changed files tracked with Git insertnum_DESC= replace selection with integer numbers latex_DESC= LaTeX support lineoperations_DESC= Simple line functions that can be applied to an open file lipsum_DESC= Lorem Ipsum generator lua_DESC= Lua scripting macro_DESC= user defined macros markdown_DESC= real-time preview of rendered Markdown miniscript_DESC= pipe text/documents via script (shell, perl, awk, etc.) multiterm_DESC= multi-tabbed virtual terminals emulator numberedbookmarks_DESC= additional numbered bookmarks overview_DESC= zoomed-out view of open files pairtaghighlighter_DESC= highlight matching opening/closing HTML tags pg_DESC= encrypt, decrypt and verify signatures with GnuPG pohelper_DESC= support for gettext translation files pretty-printer_DESC= formats XML and make it human-readable projectorganizer_DESC= extension of Geany's project management prj_DESC= alternative project manager scope_DESC= graphical GDB front-end sendmail_DESC= send a document as attachment shiftcolumn_DESC= move blocks of text horizontally spellcheck_DESC= spell check via Enchant tableconvert_DESC= convert tabulator separated selection into a table treebrowser_DESC= alternate file browser 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 doc_DIR= geanydoc ctags_DIR= geanyctags extrasel_DIR= geanyextrasel gendoc_DIR= geanygendoc insertnum_DIR= geanyinsertnum latex_DIR= latex lipsum_DIR= lipsum lua_DIR= geanylua macro_DIR= geanymacro miniscript_DIR= geanyminiscript numberedbookmarks_DIR= geanynumberedbookmarks pg_DIR= geanypg prj_DIR= geanyprj utilslib_DIR= utils vc_DIR= geanyvc git-changebar_SWITCH= --enable-gitchangebar pretty-printer_SWITCH= --enable-pretty_printer GEANY_UTIL= scope workbench