diff options
35 files changed, 230 insertions, 151 deletions
@@ -7850,3 +7850,4 @@ print/ghostscript9-agpl|print/ghostscript9-agpl-base|2015-08-22|Split into print print/ghostscript9-agpl-nox11|print/ghostscript9-agpl-base|2015-08-22|Integrated into print/ghostscript9-agpl-base www/pelican|www/py-pelican|2015-08-29|Rename to match Python naming conventions devel/ninja16|devel/ninja|2015-08-29|Use devel/ninja instead +devel/geany-plugin-gproject|devel/geany-plugin-projectorganizer|2015-08-31|Renamed to match upstream naming diff --git a/devel/Makefile b/devel/Makefile index 89453775c852..b3790a223977 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -576,8 +576,10 @@ SUBDIR += geany SUBDIR += geany-plugin-addons SUBDIR += geany-plugin-autoclose + SUBDIR += geany-plugin-automark SUBDIR += geany-plugin-codenav SUBDIR += geany-plugin-commander + SUBDIR += geany-plugin-ctags SUBDIR += geany-plugin-debugger SUBDIR += geany-plugin-defineformat SUBDIR += geany-plugin-devhelp @@ -586,20 +588,23 @@ SUBDIR += geany-plugin-geanypy SUBDIR += geany-plugin-gendoc SUBDIR += geany-plugin-geniuspaste - SUBDIR += geany-plugin-gproject + SUBDIR += geany-plugin-git-changebar SUBDIR += geany-plugin-insertnum SUBDIR += geany-plugin-latex SUBDIR += geany-plugin-lipsum SUBDIR += geany-plugin-lua SUBDIR += geany-plugin-macro + SUBDIR += geany-plugin-markdown SUBDIR += geany-plugin-miniscript SUBDIR += geany-plugin-multiterm SUBDIR += geany-plugin-numberedbookmarks + SUBDIR += geany-plugin-overview SUBDIR += geany-plugin-pairtaghighlighter SUBDIR += geany-plugin-pg SUBDIR += geany-plugin-pohelper SUBDIR += geany-plugin-pretty-printer SUBDIR += geany-plugin-prj + SUBDIR += geany-plugin-projectorganizer SUBDIR += geany-plugin-scope SUBDIR += geany-plugin-sendmail SUBDIR += geany-plugin-shiftcolumn diff --git a/devel/geany-plugin-gproject/Makefile b/devel/geany-plugin-automark/Makefile index bd492569804e..7e1f9cd39319 100644 --- a/devel/geany-plugin-gproject/Makefile +++ b/devel/geany-plugin-automark/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin-gproject +PORTNAME= geany-plugin-automark PORTVERSION= ${GEANY_VER} CATEGORIES= devel diff --git a/devel/geany-plugin-automark/pkg-descr b/devel/geany-plugin-automark/pkg-descr new file mode 100644 index 000000000000..909d51eff5d4 --- /dev/null +++ b/devel/geany-plugin-automark/pkg-descr @@ -0,0 +1,3 @@ +This plugin highlights all words that match current word under cursor. + +WWW: http://plugins.geany.org/automark.html diff --git a/devel/geany-plugin-automark/pkg-plist b/devel/geany-plugin-automark/pkg-plist new file mode 100644 index 000000000000..f30e570d18b7 --- /dev/null +++ b/devel/geany-plugin-automark/pkg-plist @@ -0,0 +1,6 @@ +lib/geany/automark.so +%%DOCSDIR%%/automark/AUTHORS +%%DOCSDIR%%/automark/COPYING +%%DOCSDIR%%/automark/ChangeLog +%%DOCSDIR%%/automark/NEWS +%%DOCSDIR%%/automark/README diff --git a/devel/geany-plugin-ctags/Makefile b/devel/geany-plugin-ctags/Makefile new file mode 100644 index 000000000000..183c4ab98d38 --- /dev/null +++ b/devel/geany-plugin-ctags/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= geany-plugin-ctags +PORTVERSION= ${GEANY_VER} +CATEGORIES= devel + +MAINTAINER= makc@FreeBSD.org +COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} + +RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags + +.include "${.CURDIR}/../geany-plugins/files/Makefile.common" +.include <bsd.port.mk> diff --git a/devel/geany-plugin-ctags/files/patch-ctags b/devel/geany-plugin-ctags/files/patch-ctags new file mode 100644 index 000000000000..6294226e2ac3 --- /dev/null +++ b/devel/geany-plugin-ctags/files/patch-ctags @@ -0,0 +1,11 @@ +--- geanyctags/src/geanyctags.c.orig 2015-01-02 18:40:37 UTC ++++ geanyctags/src/geanyctags.c +@@ -223,7 +223,7 @@ on_generate_tags(GtkMenuItem *menuitem, + #ifndef G_OS_WIN32 + gchar *find_string = generate_find_string(prj); + cmd = g_strconcat(find_string, +- " | ctags --totals --fields=fKsSt --extra=-fq --c-kinds=+p --sort=foldcase --excmd=number -L - -f ", ++ " | exctags --totals --fields=fKsSt --extra=-fq --c-kinds=+p --sort=foldcase --excmd=number -L - -f ", + tag_filename, NULL); + g_free(find_string); + #else diff --git a/devel/geany-plugin-ctags/pkg-descr b/devel/geany-plugin-ctags/pkg-descr new file mode 100644 index 000000000000..0bda97ec80d5 --- /dev/null +++ b/devel/geany-plugin-ctags/pkg-descr @@ -0,0 +1,11 @@ +GeanyCtags adds a simple support for generating and querying ctags +files for a Geany project. + +Even though Geany supports symbol definition searching by itself +within the open files (and with a plugin support within the whole +project), tag regeneration can become too slow for really big +projects. This is why this plugin was created. It makes it possible +to generate the tag file only once and just query it when searching +for a particular symbol definition/declaration. + +WWW: http://plugins.geany.org/geanyctags.html diff --git a/devel/geany-plugin-ctags/pkg-plist b/devel/geany-plugin-ctags/pkg-plist new file mode 100644 index 000000000000..5dec1c7af4d2 --- /dev/null +++ b/devel/geany-plugin-ctags/pkg-plist @@ -0,0 +1,6 @@ +lib/geany/geanyctags.so +%%DOCSDIR%%/geanyctags/AUTHORS +%%DOCSDIR%%/geanyctags/COPYING +%%DOCSDIR%%/geanyctags/ChangeLog +%%DOCSDIR%%/geanyctags/NEWS +%%DOCSDIR%%/geanyctags/README diff --git a/devel/geany-plugin-debugger/files/patch-debugger__src__debug.c b/devel/geany-plugin-debugger/files/patch-debugger__src__debug.c deleted file mode 100644 index 6e59af55afa7..000000000000 --- a/devel/geany-plugin-debugger/files/patch-debugger__src__debug.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./debugger/src/debug.c.orig 2012-06-16 14:42:46.000000000 +0000 -+++ ./debugger/src/debug.c 2012-09-21 14:55:31.192392925 +0000 -@@ -37,7 +37,6 @@ - - #include <string.h> - #include <unistd.h> --#include <pty.h> - #include <gtk/gtk.h> - #include <gdk/gdkkeysyms.h> - #include <vte/vte.h> diff --git a/devel/geany-plugin-devhelp/Makefile b/devel/geany-plugin-devhelp/Makefile index ee19d3939d44..a207317ce68e 100644 --- a/devel/geany-plugin-devhelp/Makefile +++ b/devel/geany-plugin-devhelp/Makefile @@ -12,5 +12,12 @@ LIB_DEPENDS= libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \ USE_GNOME= gconf2 +# Workaround for 9.x which doesn't have zlib.pc +LIBS= -lz + +post-patch: + ${REINPLACE_CMD} -e 's,zlib,,g' \ + ${WRKSRC}/configure + .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-git-changebar/Makefile b/devel/geany-plugin-git-changebar/Makefile new file mode 100644 index 000000000000..be24ea56cc88 --- /dev/null +++ b/devel/geany-plugin-git-changebar/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= geany-plugin-git-changebar +PORTVERSION= ${GEANY_VER} +CATEGORIES= devel + +MAINTAINER= makc@FreeBSD.org +COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} + +LIB_DEPENDS= libgit2.so:${PORTSDIR}/devel/libgit2 + +.include "${.CURDIR}/../geany-plugins/files/Makefile.common" +.include <bsd.port.mk> diff --git a/devel/geany-plugin-git-changebar/pkg-descr b/devel/geany-plugin-git-changebar/pkg-descr new file mode 100644 index 000000000000..991ca3208bec --- /dev/null +++ b/devel/geany-plugin-git-changebar/pkg-descr @@ -0,0 +1,4 @@ +This plugin highlights uncommitted changes to files tracked with +Git, and allows to navigate through the hunks. + +WWW: http://plugins.geany.org/git-changebar.html diff --git a/devel/geany-plugin-git-changebar/pkg-plist b/devel/geany-plugin-git-changebar/pkg-plist new file mode 100644 index 000000000000..8bb0ee7a225c --- /dev/null +++ b/devel/geany-plugin-git-changebar/pkg-plist @@ -0,0 +1,7 @@ +lib/geany/git-changebar.so +%%PORTDOCS%%%%DOCSDIR%%/git-changebar/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/git-changebar/COPYING +%%PORTDOCS%%%%DOCSDIR%%/git-changebar/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/git-changebar/NEWS +%%PORTDOCS%%%%DOCSDIR%%/git-changebar/README +%%DATADIR%%/git-changebar/prefs.ui diff --git a/devel/geany-plugin-gproject/pkg-descr b/devel/geany-plugin-gproject/pkg-descr deleted file mode 100644 index fe1e1fcda5c8..000000000000 --- a/devel/geany-plugin-gproject/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -GProject is an extension of Geany's project management displaying -a tree of files belonging to the project in the sidebar. In addition, -it enables quick swapping between header and source files, searching -project files by name and more. The plugin was created with big -projects in mind so everything works fast enough even with projects -consisting of hundreds of thousands of files. - -WWW: http://plugins.geany.org/gproject.html diff --git a/devel/geany-plugin-gproject/pkg-plist b/devel/geany-plugin-gproject/pkg-plist deleted file mode 100644 index bb1025a29471..000000000000 --- a/devel/geany-plugin-gproject/pkg-plist +++ /dev/null @@ -1,13 +0,0 @@ -lib/geany/gproject.so -%%DOCSDIR%%/gproject/AUTHORS -%%DOCSDIR%%/gproject/COPYING -%%DOCSDIR%%/gproject/ChangeLog -%%DOCSDIR%%/gproject/NEWS -%%DOCSDIR%%/gproject/README -share/icons/hicolor/16x16/apps/gproject-collapse.png -share/icons/hicolor/16x16/apps/gproject-expand.png -share/icons/hicolor/16x16/apps/gproject-file.png -share/icons/hicolor/16x16/apps/gproject-follow.png -share/icons/hicolor/16x16/apps/gproject-header.png -share/icons/hicolor/16x16/apps/gproject-refresh.png -share/icons/hicolor/16x16/apps/gproject-source.png diff --git a/devel/geany-plugin-markdown/Makefile b/devel/geany-plugin-markdown/Makefile new file mode 100644 index 000000000000..1d6156eb8e89 --- /dev/null +++ b/devel/geany-plugin-markdown/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= geany-plugin-markdown +PORTVERSION= ${GEANY_VER} +CATEGORIES= devel + +MAINTAINER= makc@FreeBSD.org +COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} + +LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 + +.include "${.CURDIR}/../geany-plugins/files/Makefile.common" +.include <bsd.port.mk> diff --git a/devel/geany-plugin-markdown/pkg-descr b/devel/geany-plugin-markdown/pkg-descr new file mode 100644 index 000000000000..332b93aeeb5d --- /dev/null +++ b/devel/geany-plugin-markdown/pkg-descr @@ -0,0 +1,4 @@ +This plugin provides a real-time preview of rendered Markdown using +the WebKit engine. + +WWW: http://plugins.geany.org/markdown.html diff --git a/devel/geany-plugin-markdown/pkg-plist b/devel/geany-plugin-markdown/pkg-plist new file mode 100644 index 000000000000..f373ee33d47b --- /dev/null +++ b/devel/geany-plugin-markdown/pkg-plist @@ -0,0 +1,13 @@ +lib/geany/markdown.so +%%PORTDOCS%%%%DOCSDIR%%/markdown/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/markdown/COPYING +%%PORTDOCS%%%%DOCSDIR%%/markdown/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/markdown/NEWS +%%PORTDOCS%%%%DOCSDIR%%/markdown/README +%%PORTDOCS%%%%DOCSDIR%%/markdown/html/help.html +%%PORTDOCS%%%%DOCSDIR%%/markdown/html/plugin.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/html/plugin_mgr.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/html/plugin_prefs.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/html/plugin_small.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/html/set_filetype.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/html/settings.png diff --git a/devel/geany-plugin-overview/Makefile b/devel/geany-plugin-overview/Makefile new file mode 100644 index 000000000000..5868c2ed1fed --- /dev/null +++ b/devel/geany-plugin-overview/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PORTNAME= geany-plugin-overview +PORTVERSION= ${GEANY_VER} +CATEGORIES= devel + +MAINTAINER= makc@FreeBSD.org +COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} + +.include "${.CURDIR}/../geany-plugins/files/Makefile.common" +.include <bsd.port.mk> diff --git a/devel/geany-plugin-overview/pkg-descr b/devel/geany-plugin-overview/pkg-descr new file mode 100644 index 000000000000..2583b8edb61a --- /dev/null +++ b/devel/geany-plugin-overview/pkg-descr @@ -0,0 +1,5 @@ +The Overview plugin is a small zoomed-out view next to the normal +editor view that allows to see and navigate a lot of the file at +once. + +WWW: http://plugins.geany.org/overview.html diff --git a/devel/geany-plugin-overview/pkg-plist b/devel/geany-plugin-overview/pkg-plist new file mode 100644 index 000000000000..48282c21588f --- /dev/null +++ b/devel/geany-plugin-overview/pkg-plist @@ -0,0 +1,7 @@ +lib/geany/overview.so +%%DOCSDIR%%/overview/AUTHORS +%%DOCSDIR%%/overview/COPYING +%%DOCSDIR%%/overview/ChangeLog +%%DOCSDIR%%/overview/NEWS +%%DOCSDIR%%/overview/README +%%DATADIR%%/overview/prefs.ui diff --git a/devel/geany-plugin-pohelper/pkg-plist b/devel/geany-plugin-pohelper/pkg-plist index 9404886f014f..dc7720f70ede 100644 --- a/devel/geany-plugin-pohelper/pkg-plist +++ b/devel/geany-plugin-pohelper/pkg-plist @@ -5,3 +5,4 @@ lib/geany/pohelper.so %%DOCSDIR%%/pohelper/NEWS %%DOCSDIR%%/pohelper/README %%DATADIR%%/pohelper/menus.ui +%%DATADIR%%/pohelper/stats.ui diff --git a/devel/geany-plugin-projectorganizer/Makefile b/devel/geany-plugin-projectorganizer/Makefile new file mode 100644 index 000000000000..a41f0efe5659 --- /dev/null +++ b/devel/geany-plugin-projectorganizer/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PORTNAME= geany-plugin-projectorganizer +PORTVERSION= ${GEANY_VER} +CATEGORIES= devel + +MAINTAINER= makc@FreeBSD.org +COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} + +.include "${.CURDIR}/../geany-plugins/files/Makefile.common" +.include <bsd.port.mk> diff --git a/devel/geany-plugin-projectorganizer/pkg-descr b/devel/geany-plugin-projectorganizer/pkg-descr new file mode 100644 index 000000000000..c46ea2aa511e --- /dev/null +++ b/devel/geany-plugin-projectorganizer/pkg-descr @@ -0,0 +1,8 @@ +Project Organizer is an extension of Geany's project management +displaying a tree of files belonging to the project in the sidebar. +In addition, it enables quick swapping between header and source +files, searching project files by name and more. The plugin was +created with big projects in mind so everything works fast enough +even with projects consisting of hundreds of thousands of files. + +WWW: http://plugins.geany.org/projectorganizer.html diff --git a/devel/geany-plugin-projectorganizer/pkg-plist b/devel/geany-plugin-projectorganizer/pkg-plist new file mode 100644 index 000000000000..d348330a4aeb --- /dev/null +++ b/devel/geany-plugin-projectorganizer/pkg-plist @@ -0,0 +1,14 @@ +lib/geany/projectorganizer.so +%%PORTDOCS%%%%DOCSDIR%%/projectorganizer/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/projectorganizer/COPYING +%%PORTDOCS%%%%DOCSDIR%%/projectorganizer/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/projectorganizer/NEWS +%%PORTDOCS%%%%DOCSDIR%%/projectorganizer/README +share/icons/hicolor/16x16/apps/prjorg-add-external.png +share/icons/hicolor/16x16/apps/prjorg-collapse.png +share/icons/hicolor/16x16/apps/prjorg-expand.png +share/icons/hicolor/16x16/apps/prjorg-file.png +share/icons/hicolor/16x16/apps/prjorg-follow.png +share/icons/hicolor/16x16/apps/prjorg-header.png +share/icons/hicolor/16x16/apps/prjorg-refresh.png +share/icons/hicolor/16x16/apps/prjorg-source.png diff --git a/devel/geany-plugins-l10n/Makefile b/devel/geany-plugins-l10n/Makefile index aaca8d6cd092..6f7958f1304d 100644 --- a/devel/geany-plugins-l10n/Makefile +++ b/devel/geany-plugins-l10n/Makefile @@ -7,5 +7,7 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Localization messages for Geany plugins +NO_ARCH= yes + .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugins/Makefile b/devel/geany-plugins/Makefile index b08604b7b83a..5d097c05056f 100644 --- a/devel/geany-plugins/Makefile +++ b/devel/geany-plugins/Makefile @@ -9,20 +9,15 @@ DISTFILES= # none MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugins (meta port) -NO_BUILD= yes -NO_INSTALL= yes -NO_MTREE= yes +USES= metaport -.include "${.CURDIR}/files/bsd.geany-plugins.mk" - -OPTIONS_DEFINE= NLS - -# NLS option first, then plugins sorted in GEANY_PLUGINS_ALL +OPTIONS_DEFINE= NLS ${GEANY_PLUGINS_ALL:tu} +OPTIONS_DEFAULT= ${GEANY_PLUGINS_ALL:tu} NO_OPTIONS_SORT= yes +.include "${.CURDIR}/files/bsd.geany-plugins.mk" + .for plugin in ${GEANY_PLUGINS_ALL} -OPTIONS_DEFINE+= ${plugin:tu} -OPTIONS_DEFAULT+= ${plugin:tu} ${plugin:tu}_DESC= ${${plugin}_DESC} ${plugin:tu}_RUN_DEPENDS= geany-plugin-${plugin}>=0:${PORTSDIR}/devel/geany-plugin-${plugin} .endfor diff --git a/devel/geany-plugins/distinfo b/devel/geany-plugins/distinfo index 7ec3012d5775..f44bddc9d88f 100644 --- a/devel/geany-plugins/distinfo +++ b/devel/geany-plugins/distinfo @@ -1,2 +1,2 @@ -SHA256 (geany-plugins-1.24.tar.bz2) = dcc0414b29ae0160fc3a7adb0a1d6cbd5bd6bfb1900dab03e8774b3cebf6f2ec -SIZE (geany-plugins-1.24.tar.bz2) = 3039764 +SHA256 (geany-plugins-1.25.tar.bz2) = 5c13ac1e173284462248ed2faae389a72364c5aa1538de628d2aaa7d286e244b +SIZE (geany-plugins-1.25.tar.bz2) = 3230888 diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common index 70d89f007e79..c2b043d11028 100644 --- a/devel/geany-plugins/files/Makefile.common +++ b/devel/geany-plugins/files/Makefile.common @@ -9,8 +9,6 @@ DISTINFO_FILE= ${.CURDIR}/../../devel/geany-plugins/distinfo BUILD_DEPENDS+= ${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany RUN_DEPENDS+= ${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany -EXTRA_PATCHES= ${.CURDIR}/../../devel/geany-plugins/files/extrapatch-configure - GNU_CONFIGURE= yes USES+= gettext-tools gmake libtool pkgconfig tar:bzip2 USE_GNOME+= gtk20 intltool @@ -21,6 +19,8 @@ GEANY_PLUGIN= po po_SWITCH= --enable-nls CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +.else +INSTALL_TARGET= install-strip .endif GEANY_PLUGIN?= ${PORTNAME:S,geany-plugin-,,} @@ -29,26 +29,16 @@ ${GEANY_PLUGIN}_SWITCH?= --enable-${${GEANY_PLUGIN}_DIR} CONFIGURE_ARGS+= ${${GEANY_PLUGIN}_SWITCH} +.if defined(VERBOSE_BUILD) || defined(PACKAGE_BUILDING) +CONFIGURE_ARGS+= --disable-silent-rules +.endif + BUILD_WRKSRC= ${WRKSRC}/${${GEANY_PLUGIN}_DIR} INSTALL_WRKSRC= ${BUILD_WRKSRC} DATADIR= share/geany-plugins DOCSDIR= share/doc/geany-plugins -.include <bsd.port.options.mk> - -.if ${PORTNAME} != "geany-plugins-l10n" -. if ${PORT_OPTIONS:MNLS} -USES+= gettext-runtime -. else -CONFIGURE_ARGS+= --disable-nls -. endif -.endif - -pre-configure: - ${REINPLACE_CMD} -e 's,zlib,,g' \ - ${WRKSRC}/configure - post-configure: ${FIND} ${BUILD_WRKSRC} -name Makefile | ${XARGS} \ ${REINPLACE_CMD} -e '/^geanypluginsdir/s,${LOCALBASE},${PREFIX},' diff --git a/devel/geany-plugins/files/bsd.geany-plugins.mk b/devel/geany-plugins/files/bsd.geany-plugins.mk index a1d857581c70..18647a86265a 100644 --- a/devel/geany-plugins/files/bsd.geany-plugins.mk +++ b/devel/geany-plugins/files/bsd.geany-plugins.mk @@ -1,10 +1,12 @@ # $FreeBSD$ -GEANY_VER= 1.24 +GEANY_VER= 1.25 GEANY_PLUGINS_ALL= addons \ autoclose \ + automark \ codenav \ commander \ + ctags \ debugger \ defineformat \ devhelp \ @@ -13,19 +15,22 @@ GEANY_PLUGINS_ALL= addons \ geanypy \ gendoc \ geniuspaste \ - gproject \ + git-changebar \ insertnum \ latex \ lipsum \ lua \ macro \ + markdown \ miniscript \ multiterm \ numberedbookmarks \ + overview \ pairtaghighlighter \ pg \ pohelper \ pretty-printer \ + projectorganizer \ prj \ scope \ sendmail \ @@ -38,12 +43,12 @@ GEANY_PLUGINS_ALL= addons \ webhelper \ xmlsnippets -# markdown plugin is excluded, requires peg-markdown - 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 @@ -52,20 +57,22 @@ geanypy_DESC= support for Python plugins extrasel_DESC= additional selection tools gendoc_DESC= generate documentation from the sources comments geniuspaste_DESC= pastebins support -gproject_DESC= extension of Geany's project management -insertnum_DESC= replaces selection with integer numbers +git-changebar_DESC= highlight changed files tracked with Git +insertnum_DESC= replace selection with integer numbers latex_DESC= LaTeX support lipsum_DESC= Lorem Ipsum generator lua_DESC= Lua scripting macro_DESC= user defined macros -# markdown_DESC= real-time preview of rendered Markdown +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 -pairtaghighlighter_DESC= highlights matching opening/closing HTML tags +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 @@ -79,6 +86,7 @@ webhelper_DESC= web development facilities xmlsnippets_DESC= XML/HTML tag autocompletion doc_DIR= geanydoc +ctags_DIR= geanyctags extrasel_DIR= geanyextrasel gendoc_DIR= geanygendoc insertnum_DIR= geanyinsertnum @@ -93,4 +101,5 @@ prj_DIR= geanyprj sendmail_DIR= geanysendmail vc_DIR= geanyvc +git-changebar_SWITCH= --enable-gitchangebar pretty-printer_SWITCH= --enable-pretty_printer diff --git a/devel/geany-plugins/files/extrapatch-configure b/devel/geany-plugins/files/extrapatch-configure deleted file mode 100644 index 4877444b2289..000000000000 --- a/devel/geany-plugins/files/extrapatch-configure +++ /dev/null @@ -1,72 +0,0 @@ ---- configure.orig 2014-04-13 17:12:39 UTC -+++ configure -@@ -23223,69 +23223,3 @@ fi - expanded_docdir=$(eval echo $expanded_docdir) - - -- cat <<GPEOF -- --${PACKAGE}-${VERSION} -- -- Build Environment: -- Geany version: ${GEANY_VERSION} (GTK${GP_GTK_VERSION_MAJOR}) -- Install prefix: ${prefix} -- Datadir: ${expanded_datadir}/${PACKAGE_TARNAME} -- Libdir: ${expanded_libdir}/${PACKAGE_TARNAME} -- Docdir: ${expanded_docdir} -- Plugins path: ${geanypluginsdir} -- -- Build Features: --GPEOF -- -- -- while read line; do -- test -z "$line" && break; -- plugin=" ${line%:*}:" -- status=${line#*:} -- let extracols=34-${#plugin} -- echo -n "$plugin" -- for (( i=0; $i<$extracols; i++ )); do -- echo -n ' ' -- done -- echo $status -- done << GPEOF --$build_feature_statusmsg --GPEOF -- -- echo -- echo " Plugins:" -- -- while read line; do -- test -z "$line" && break; -- plugin=" ${line%:*}:" -- status=${line#*:} -- let extracols=34-${#plugin} -- echo -n "$plugin" -- for (( i=0; $i<$extracols; i++ )); do -- echo -n ' ' -- done -- echo $status -- done << GPEOF --$plugins_statusmsg --GPEOF -- -- echo -- echo " Features:" -- -- while read line; do -- test -z "$line" && break; -- plugin=" ${line%:*}:" -- status=${line#*:} -- let extracols=34-${#plugin} -- echo -n "$plugin" -- for (( i=0; $i<$extracols; i++ )); do -- echo -n ' ' -- done -- echo $status -- done << GPEOF --$feature_statusmsg --GPEOF -- -- echo -- diff --git a/devel/geany/Makefile b/devel/geany/Makefile index 44ee43f72ef3..1e42cc061400 100644 --- a/devel/geany/Makefile +++ b/devel/geany/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= geany -PORTVERSION= 1.24.1 +PORTVERSION= 1.25 CATEGORIES= devel editors MASTER_SITES= http://download.geany.org/ SF @@ -18,6 +18,8 @@ USES= desktop-file-utils gettext-tools \ gmake libtool pathfix pkgconfig tar:bzip2 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +USE_LDCONFIG= yes +INSTALL_TARGET= install-strip OPTIONS_DEFINE= VTE NLS DOCS OPTIONS_DEFAULT= VTE diff --git a/devel/geany/distinfo b/devel/geany/distinfo index 84cf1822b48c..69d89df25b09 100644 --- a/devel/geany/distinfo +++ b/devel/geany/distinfo @@ -1,2 +1,2 @@ -SHA256 (geany-1.24.1.tar.bz2) = 7fb505d9b01fe6874890525f837644a6a38c23a372bb068c65ef3673108a8c33 -SIZE (geany-1.24.1.tar.bz2) = 3990492 +SHA256 (geany-1.25.tar.bz2) = 8ee41da28cead8c94d433e616d7ababa81727c63e9196ca6758ade3af14a49ef +SIZE (geany-1.25.tar.bz2) = 4149876 diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist index 66e1e2fe5eb0..df22ff17d023 100644 --- a/devel/geany/pkg-plist +++ b/devel/geany/pkg-plist @@ -1,5 +1,7 @@ bin/geany +include/geany/app.h include/geany/build.h +include/geany/dialogs.h include/geany/document.h include/geany/editor.h include/geany/encodings.h @@ -10,25 +12,26 @@ include/geany/geanyplugin.h include/geany/gtkcompat.h include/geany/highlighting.h include/geany/keybindings.h +include/geany/main.h include/geany/msgwindow.h +include/geany/navqueue.h include/geany/plugindata.h +include/geany/pluginutils.h include/geany/prefs.h include/geany/project.h include/geany/scintilla/SciLexer.h include/geany/scintilla/Scintilla.h include/geany/scintilla/Scintilla.iface include/geany/scintilla/ScintillaWidget.h +include/geany/sciwrappers.h include/geany/search.h +include/geany/spawn.h include/geany/stash.h include/geany/support.h -include/geany/tagmanager/tm_file_entry.h -include/geany/tagmanager/tm_parser.h -include/geany/tagmanager/tm_project.h +include/geany/symbols.h include/geany/tagmanager/tm_source_file.h -include/geany/tagmanager/tm_symbol.h include/geany/tagmanager/tm_tag.h include/geany/tagmanager/tm_tagmanager.h -include/geany/tagmanager/tm_work_object.h include/geany/tagmanager/tm_workspace.h include/geany/templates.h include/geany/toolbar.h @@ -40,6 +43,9 @@ lib/geany/filebrowser.so lib/geany/htmlchars.so lib/geany/saveactions.so lib/geany/splitwindow.so +lib/libgeany.so +lib/libgeany.so.0 +lib/libgeany.so.0.0.0 libdata/pkgconfig/geany.pc %%PORTDOCS%%man/man1/geany.1.gz share/applications/geany.desktop @@ -82,8 +88,8 @@ share/applications/geany.desktop %%DATADIR%%/filetypes.Clojure.conf %%DATADIR%%/filetypes.Cython.conf %%DATADIR%%/filetypes.Genie.conf -%%DATADIR%%/filetypes.Go.conf %%DATADIR%%/filetypes.Graphviz.conf +%%DATADIR%%/filetypes.JSON.conf %%DATADIR%%/filetypes.Scala.conf %%DATADIR%%/filetypes.abaqus %%DATADIR%%/filetypes.abc @@ -96,6 +102,7 @@ share/applications/geany.desktop %%DATADIR%%/filetypes.caml %%DATADIR%%/filetypes.cmake %%DATADIR%%/filetypes.cobol +%%DATADIR%%/filetypes.coffeescript %%DATADIR%%/filetypes.common %%DATADIR%%/filetypes.conf %%DATADIR%%/filetypes.cpp @@ -111,6 +118,7 @@ share/applications/geany.desktop %%DATADIR%%/filetypes.fortran %%DATADIR%%/filetypes.freebasic %%DATADIR%%/filetypes.glsl +%%DATADIR%%/filetypes.go %%DATADIR%%/filetypes.haskell %%DATADIR%%/filetypes.haxe %%DATADIR%%/filetypes.html @@ -143,7 +151,7 @@ share/applications/geany.desktop %%DATADIR%%/filetypes.vhdl %%DATADIR%%/filetypes.xml %%DATADIR%%/filetypes.yaml -%%DATADIR%%/geany.css +%%DATADIR%%/filetypes.zephir %%DATADIR%%/geany.glade %%DATADIR%%/geany.gtkrc %%DATADIR%%/html_entities.tags @@ -158,6 +166,7 @@ share/applications/geany.desktop %%DATADIR%%/templates/files/file.php %%DATADIR%%/templates/files/file.rb %%DATADIR%%/templates/files/file.tex +%%DATADIR%%/templates/files/file_html5.html %%DATADIR%%/templates/files/main.c %%DATADIR%%/templates/files/main.cxx %%DATADIR%%/templates/files/main.d @@ -192,6 +201,7 @@ share/icons/hicolor/24x24/actions/geany-save-all.png share/icons/hicolor/32x32/actions/geany-build.png share/icons/hicolor/32x32/actions/geany-close-all.png share/icons/hicolor/32x32/actions/geany-save-all.png +share/icons/hicolor/32x32/apps/geany.png share/icons/hicolor/48x48/actions/geany-build.png share/icons/hicolor/48x48/actions/geany-close-all.png share/icons/hicolor/48x48/actions/geany-save-all.png |