Index: head/devel/geany/Makefile =================================================================== --- head/devel/geany/Makefile (revision 500465) +++ head/devel/geany/Makefile (revision 500466) @@ -1,61 +1,61 @@ # Created by: Remington Lang # $FreeBSD$ PORTNAME= geany -PORTVERSION= 1.34.1 +PORTVERSION= 1.35 CATEGORIES= devel editors MASTER_SITES= http://download.geany.org/ SF MAINTAINER= madpilot@FreeBSD.org COMMENT= Fast and lightweight GTK+ IDE LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING FLAVORS= gtk3 gtk2 FLAVOR?= ${FLAVORS:[1]} gtk2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 gtk2_CONFLICTS_INSTALL= geany gtk2_PKGNAMESUFFIX= -gtk2 gtk3_CONFLICTS_INSTALL= geany-gtk2 USES= compiler:c++11-lang desktop-file-utils gettext-tools gmake \ gnome libtool localbase pathfix pkgconfig tar:bzip2 USE_GNOME= cairo intltool USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip OPTIONS_DEFINE= VTE NLS DOCS OPTIONS_DEFAULT= VTE OPTIONS_SUB= yes NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls VTE_DESC= Embedded virtual terminal VTE_CONFIGURE_ENABLE= vte VTE_USE= GNOME=vte .if ${FLAVOR} == gtk2 USE_GNOME+= gtk20 CONFIGURE_ARGS+= --disable-gtk3 PLIST_SUB+= GTK2="" GTK3="@comment " .elif ${FLAVOR} == gtk3 USE_GNOME+= gtk30 CONFIGURE_ARGS+= --enable-gtk3 PLIST_SUB+= GTK2="@comment " GTK3="" .endif post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in post-patch-NLS-off: @${REINPLACE_CMD} -e '/^SUBDIRS/ s|po||' ${WRKSRC}/Makefile.in .include Index: head/devel/geany/distinfo =================================================================== --- head/devel/geany/distinfo (revision 500465) +++ head/devel/geany/distinfo (revision 500466) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548871369 -SHA256 (geany-1.34.1.tar.bz2) = e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11 -SIZE (geany-1.34.1.tar.bz2) = 4474211 +TIMESTAMP = 1556536390 +SHA256 (geany-1.35.tar.bz2) = 35ee1d3ddfadca8bf1764e174ba3a5f348b1f1f430d32a36295b7706b7753d9d +SIZE (geany-1.35.tar.bz2) = 4593705 Index: head/devel/geany-plugin-git-changebar/Makefile =================================================================== --- head/devel/geany-plugin-git-changebar/Makefile (revision 500465) +++ head/devel/geany-plugin-git-changebar/Makefile (revision 500466) @@ -1,16 +1,15 @@ # $FreeBSD$ PORTNAME= geany-plugin-git-changebar PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} LIB_DEPENDS= libgit2.so:devel/libgit2 OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Index: head/devel/geany-plugin-pg/Makefile =================================================================== --- head/devel/geany-plugin-pg/Makefile (revision 500465) +++ head/devel/geany-plugin-pg/Makefile (revision 500466) @@ -1,17 +1,16 @@ # $FreeBSD$ PORTNAME= geany-plugin-pg PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} LIB_DEPENDS= libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error RUN_DEPENDS= gpg2:security/gnupg .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Index: head/devel/geany-plugin-scope/Makefile =================================================================== --- head/devel/geany-plugin-scope/Makefile (revision 500465) +++ head/devel/geany-plugin-scope/Makefile (revision 500466) @@ -1,21 +1,25 @@ # $FreeBSD$ PORTNAME= geany-plugin-scope PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} + +gtk3_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ + libgnutls.so:security/gnutls + USES= gnome USE_XORG= x11 xext .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .if ${FLAVOR} == gtk3 USE_GNOME+= vte3 .else USE_GNOME+= vte .endif .include Index: head/devel/geany-plugin-utilslib/Makefile =================================================================== --- head/devel/geany-plugin-utilslib/Makefile (revision 500465) +++ head/devel/geany-plugin-utilslib/Makefile (revision 500466) @@ -1,13 +1,19 @@ # $FreeBSD$ PORTNAME= geany-plugin-utilslib PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../geany-plugins/files/Makefile.common" + +.if ${FLAVOR} == gtk2 +USE_GNOME+= vte +USE_XORG+= x11 xext +.endif + .include Index: head/devel/geany-plugin-vc/Makefile =================================================================== --- head/devel/geany-plugin-vc/Makefile (revision 500465) +++ head/devel/geany-plugin-vc/Makefile (revision 500466) @@ -1,20 +1,21 @@ # $FreeBSD$ PORTNAME= geany-plugin-vc PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} gtk2_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell -gtk3_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 +gtk3_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 \ + libenchant-2.so:textproc/enchant2 OPTIONS_DEFINE= GTKSPELL OPTIONS_DEFAULT= GTKSPELL GTKSPELL_DESC= Spell checking support via GtkSpell GTKSPELL_CONFIGURE_ENABLE= gtkspell .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Index: head/devel/geany-plugins/Makefile =================================================================== --- head/devel/geany-plugins/Makefile (revision 500465) +++ head/devel/geany-plugins/Makefile (revision 500466) @@ -1,59 +1,58 @@ # 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 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} ${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} ${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/distinfo =================================================================== --- head/devel/geany-plugins/distinfo (revision 500465) +++ head/devel/geany-plugins/distinfo (revision 500466) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545042887 -SHA256 (geany-plugins-1.34.tar.bz2) = 244417c681636e82a63cf6f9901b5b7f3889168f7d9b5ba9b45601767a589c3b -SIZE (geany-plugins-1.34.tar.bz2) = 3347870 +TIMESTAMP = 1556536413 +SHA256 (geany-plugins-1.35.tar.bz2) = b3718ad31c02e178aec108045109b456ef81052b0951ae294b0bf7ce3ff2cb25 +SIZE (geany-plugins-1.35.tar.bz2) = 3352178 Index: head/devel/geany-plugins/files/bsd.geany-plugins.mk =================================================================== --- head/devel/geany-plugins/files/bsd.geany-plugins.mk (revision 500465) +++ head/devel/geany-plugins/files/bsd.geany-plugins.mk (revision 500466) @@ -1,112 +1,112 @@ # $FreeBSD$ -GEANY_VER= 1.34 +GEANY_VER= 1.35 GEANY_PLUGINS_GTK2= debugger \ 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 \ miniscript \ numberedbookmarks \ overview \ pairtaghighlighter \ pg \ pohelper \ pretty-printer \ projectorganizer \ prj \ scope \ sendmail \ shiftcolumn \ spellcheck \ tableconvert \ treebrowser \ updatechecker \ vc \ vimode \ 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 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 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