From owner-svn-ports-head@FreeBSD.ORG Thu Mar 21 14:43:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9BE98C9C; Thu, 21 Mar 2013 14:43:34 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8CCFCEBA; Thu, 21 Mar 2013 14:43:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2LEhYZt010229; Thu, 21 Mar 2013 14:43:34 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2LEhOQj010163; Thu, 21 Mar 2013 14:43:24 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201303211443.r2LEhOQj010163@svn.freebsd.org> From: Max Brazhnikov Date: Thu, 21 Mar 2013 14:43:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314846 - in head: . devel devel/geany devel/geany-plugin-addons devel/geany-plugin-codenav devel/geany-plugin-commander devel/geany-plugin-debugger devel/geany-plugin-devhelp devel/gea... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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: Thu, 21 Mar 2013 14:43:34 -0000 Author: makc Date: Thu Mar 21 14:43:24 2013 New Revision: 314846 URL: http://svnweb.freebsd.org/changeset/ports/314846 Log: - Update Geany and plugins to 1.23 - Add ports for new plugins (commander, scope) and localization forgotten after splitting (geany-plugins-l10n). geanyGDB plugin has been removed upstream. markdown plugin excluded from ports as it requires currently missing port for libmarkdown. - Patch configure script and remove build dependence on shells/bash Added: head/devel/geany-plugin-commander/ head/devel/geany-plugin-commander/Makefile (contents, props changed) head/devel/geany-plugin-commander/pkg-descr (contents, props changed) head/devel/geany-plugin-commander/pkg-plist (contents, props changed) head/devel/geany-plugin-scope/ head/devel/geany-plugin-scope/Makefile (contents, props changed) head/devel/geany-plugin-scope/pkg-descr (contents, props changed) head/devel/geany-plugin-scope/pkg-plist (contents, props changed) head/devel/geany-plugins-l10n/ head/devel/geany-plugins-l10n/Makefile (contents, props changed) head/devel/geany-plugins-l10n/pkg-descr (contents, props changed) head/devel/geany-plugins-l10n/pkg-plist (contents, props changed) head/devel/geany-plugins/files/extrapatch-configure (contents, props changed) Modified: head/MOVED head/devel/Makefile head/devel/geany-plugin-addons/Makefile head/devel/geany-plugin-codenav/Makefile head/devel/geany-plugin-debugger/Makefile head/devel/geany-plugin-devhelp/Makefile head/devel/geany-plugin-doc/Makefile head/devel/geany-plugin-extrasel/Makefile head/devel/geany-plugin-gendoc/Makefile head/devel/geany-plugin-geniuspaste/Makefile head/devel/geany-plugin-gproject/Makefile head/devel/geany-plugin-insertnum/Makefile head/devel/geany-plugin-latex/Makefile head/devel/geany-plugin-latex/pkg-plist head/devel/geany-plugin-lipsum/Makefile head/devel/geany-plugin-lua/Makefile head/devel/geany-plugin-macro/Makefile head/devel/geany-plugin-miniscript/Makefile head/devel/geany-plugin-multiterm/Makefile head/devel/geany-plugin-numberedbookmarks/Makefile head/devel/geany-plugin-pg/Makefile head/devel/geany-plugin-pretty-printer/Makefile head/devel/geany-plugin-prj/Makefile head/devel/geany-plugin-sendmail/Makefile head/devel/geany-plugin-shiftcolumn/Makefile head/devel/geany-plugin-spellcheck/Makefile head/devel/geany-plugin-tableconvert/Makefile head/devel/geany-plugin-treebrowser/Makefile head/devel/geany-plugin-updatechecker/Makefile head/devel/geany-plugin-vc/Makefile head/devel/geany-plugin-webhelper/Makefile head/devel/geany-plugin-xmlsnippets/Makefile head/devel/geany-plugins/Makefile head/devel/geany-plugins/distinfo head/devel/geany-plugins/files/Makefile.common head/devel/geany-plugins/files/bsd.geany-plugins.mk head/devel/geany/Makefile head/devel/geany/distinfo head/devel/geany/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Thu Mar 21 14:22:13 2013 (r314845) +++ head/MOVED Thu Mar 21 14:43:24 2013 (r314846) @@ -4178,3 +4178,4 @@ www/nspluginwrapper-devel||2013-03-19|Re french/eficas_doc||2013-03-19|Removed: eficas is now able to open the documentation through a web browser so the pdf files are no longer included editors/openoffice.org-vcltesttool||2013-03-21|Removed editors/openoffice-3-devel|editors/openoffice-devel|2013-03-21|Renamed to match current version number +devel/geany-plugin-gdb||2013-03-21|Removed from geany plugins distribution Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -493,11 +493,11 @@ SUBDIR += geany SUBDIR += geany-plugin-addons SUBDIR += geany-plugin-codenav + SUBDIR += geany-plugin-commander SUBDIR += geany-plugin-debugger SUBDIR += geany-plugin-devhelp SUBDIR += geany-plugin-doc SUBDIR += geany-plugin-extrasel - SUBDIR += geany-plugin-gdb SUBDIR += geany-plugin-gendoc SUBDIR += geany-plugin-geniuspaste SUBDIR += geany-plugin-gproject @@ -512,6 +512,7 @@ SUBDIR += geany-plugin-pg SUBDIR += geany-plugin-pretty-printer SUBDIR += geany-plugin-prj + SUBDIR += geany-plugin-scope SUBDIR += geany-plugin-sendmail SUBDIR += geany-plugin-shiftcolumn SUBDIR += geany-plugin-spellcheck @@ -522,6 +523,7 @@ SUBDIR += geany-plugin-webhelper SUBDIR += geany-plugin-xmlsnippets SUBDIR += geany-plugins + SUBDIR += geany-plugins-l10n SUBDIR += gearmand SUBDIR += gecode SUBDIR += generate Modified: head/devel/geany-plugin-addons/Makefile ============================================================================== --- head/devel/geany-plugin-addons/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-addons/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,13 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-addons PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= addons - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-codenav/Makefile ============================================================================== --- head/devel/geany-plugin-codenav/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-codenav/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,13 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-codenav PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= codenav - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Added: head/devel/geany-plugin-commander/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugin-commander/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PORTNAME= geany-plugin-commander +PORTVERSION= ${GEANY_VER} +CATEGORIES= devel + +MAINTAINER= makc@FreeBSD.org +COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} + +.include "${.CURDIR}/../geany-plugins/files/Makefile.common" +.include Added: head/devel/geany-plugin-commander/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugin-commander/pkg-descr Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,4 @@ +Commander is a plugin for Geany that provides a command panel for +rapid access to any action. + +WWW: http://plugins.geany.org/commander.html Added: head/devel/geany-plugin-commander/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugin-commander/pkg-plist Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,10 @@ +lib/geany/commander.a +lib/geany/commander.la +lib/geany/commander.so +%%DOCSDIR%%/commander/AUTHORS +%%DOCSDIR%%/commander/COPYING +%%DOCSDIR%%/commander/ChangeLog +%%DOCSDIR%%/commander/NEWS +%%DOCSDIR%%/commander/README +@dirrm %%DOCSDIR%%/commander +@dirrmtry %%DOCSDIR%% Modified: head/devel/geany-plugin-debugger/Makefile ============================================================================== --- head/devel/geany-plugin-debugger/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-debugger/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,13 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-debugger PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= debugger - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-devhelp/Makefile ============================================================================== --- head/devel/geany-plugin-devhelp/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-devhelp/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-devhelp PORTVERSION= ${GEANY_VER} CATEGORIES= devel @@ -12,7 +12,5 @@ LIB_DEPENDS= wnck-1:${PORTSDIR}/x11-tool USE_GNOME= gconf2 -GEANY_PLUGIN= devhelp - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-doc/Makefile ============================================================================== --- head/devel/geany-plugin-doc/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-doc/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-doc PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= doc -GEANY_PLUGIN_DIR= geanydoc - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-extrasel/Makefile ============================================================================== --- head/devel/geany-plugin-extrasel/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-extrasel/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-extrasel PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= extrasel -GEANY_PLUGIN_DIR= geanyextrasel - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-gendoc/Makefile ============================================================================== --- head/devel/geany-plugin-gendoc/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-gendoc/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-gendoc PORTVERSION= ${GEANY_VER} CATEGORIES= devel @@ -10,8 +10,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN} LIB_DEPENDS= ctpl:${PORTSDIR}/textproc/ctpl RUN_DEPENDS= ${LOCALBASE}/bin/rst2html:${PORTSDIR}/textproc/py-docutils -GEANY_PLUGIN= gendoc -GEANY_PLUGIN_DIR= geanygendoc - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-geniuspaste/Makefile ============================================================================== --- head/devel/geany-plugin-geniuspaste/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-geniuspaste/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-geniuspaste PORTVERSION= ${GEANY_VER} CATEGORIES= devel @@ -9,7 +9,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN} LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup -GEANY_PLUGIN= geniuspaste - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-gproject/Makefile ============================================================================== --- head/devel/geany-plugin-gproject/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-gproject/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,13 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-gproject PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= gproject - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-insertnum/Makefile ============================================================================== --- head/devel/geany-plugin-insertnum/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-insertnum/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-insertnum PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= insertnum -GEANY_PLUGIN_DIR= geanyinsertnum - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-latex/Makefile ============================================================================== --- head/devel/geany-plugin-latex/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-latex/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-latex PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= latex -GEANY_PLUGIN_DIR= geanylatex - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-latex/pkg-plist ============================================================================== --- head/devel/geany-plugin-latex/pkg-plist Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-latex/pkg-plist Thu Mar 21 14:43:24 2013 (r314846) @@ -1,25 +1,25 @@ lib/geany/geanylatex.a lib/geany/geanylatex.la lib/geany/geanylatex.so -%%DOCSDIR%%/bibtex_reference.png -%%DOCSDIR%%/geanylatex.css -%%DOCSDIR%%/geanylatex.html -%%DOCSDIR%%/geanylatex.pdf -%%DOCSDIR%%/geanylatex.tex %%DOCSDIR%%/geanylatex/AUTHORS %%DOCSDIR%%/geanylatex/COPYING %%DOCSDIR%%/geanylatex/ChangeLog %%DOCSDIR%%/geanylatex/NEWS %%DOCSDIR%%/geanylatex/README -%%DOCSDIR%%/geanylatex2.html -%%DOCSDIR%%/geanylatex3.html -%%DOCSDIR%%/geanylatex4.html -%%DOCSDIR%%/insert_environment.png -%%DOCSDIR%%/insert_label.png -%%DOCSDIR%%/insert_reference.png -%%DOCSDIR%%/insert_usepackage.png -%%DOCSDIR%%/latexwizard.png -%%DOCSDIR%%/plugin_manager.png -%%DOCSDIR%%/toolbar.png +%%DOCSDIR%%/geanylatex/bibtex_reference.png +%%DOCSDIR%%/geanylatex/geanylatex.css +%%DOCSDIR%%/geanylatex/geanylatex.html +%%DOCSDIR%%/geanylatex/geanylatex.pdf +%%DOCSDIR%%/geanylatex/geanylatex.tex +%%DOCSDIR%%/geanylatex/geanylatex2.html +%%DOCSDIR%%/geanylatex/geanylatex3.html +%%DOCSDIR%%/geanylatex/geanylatex4.html +%%DOCSDIR%%/geanylatex/insert_environment.png +%%DOCSDIR%%/geanylatex/insert_label.png +%%DOCSDIR%%/geanylatex/insert_reference.png +%%DOCSDIR%%/geanylatex/insert_usepackage.png +%%DOCSDIR%%/geanylatex/latexwizard.png +%%DOCSDIR%%/geanylatex/plugin_manager.png +%%DOCSDIR%%/geanylatex/toolbar.png @dirrm %%DOCSDIR%%/geanylatex @dirrmtry %%DOCSDIR%% Modified: head/devel/geany-plugin-lipsum/Makefile ============================================================================== --- head/devel/geany-plugin-lipsum/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-lipsum/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-lipsum PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= lipsum -GEANY_PLUGIN_DIR= geanylipsum - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-lua/Makefile ============================================================================== --- head/devel/geany-plugin-lua/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-lua/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-lua PORTVERSION= ${GEANY_VER} CATEGORIES= devel @@ -9,8 +9,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN} USE_LUA= 5.1 -GEANY_PLUGIN= lua -GEANY_PLUGIN_DIR= geanylua - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-macro/Makefile ============================================================================== --- head/devel/geany-plugin-macro/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-macro/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-macro PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= macro -GEANY_PLUGIN_DIR= geanymacro - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-miniscript/Makefile ============================================================================== --- head/devel/geany-plugin-miniscript/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-miniscript/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-miniscript PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= miniscript -GEANY_PLUGIN_DIR= geanyminiscript - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-multiterm/Makefile ============================================================================== --- head/devel/geany-plugin-multiterm/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-multiterm/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-multiterm PORTVERSION= ${GEANY_VER} CATEGORIES= devel @@ -10,7 +10,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN} BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala USE_GNOME= vte -GEANY_PLUGIN= multiterm - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-numberedbookmarks/Makefile ============================================================================== --- head/devel/geany-plugin-numberedbookmarks/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-numberedbookmarks/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-numberedbookmarks PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= numberedbookmarks -GEANY_PLUGIN_DIR= geanynumberedbookmarks - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-pg/Makefile ============================================================================== --- head/devel/geany-plugin-pg/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-pg/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-pg PORTVERSION= ${GEANY_VER} CATEGORIES= devel @@ -10,8 +10,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN} LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg -GEANY_PLUGIN= pg -GEANY_PLUGIN_DIR= geanypg - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-pretty-printer/Makefile ============================================================================== --- head/devel/geany-plugin-pretty-printer/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-pretty-printer/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-pretty-printer PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= pretty-printer -GEANY_PLUGIN_SWITCH= --enable-pretty_printer - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-prj/Makefile ============================================================================== --- head/devel/geany-plugin-prj/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-prj/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-prj PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= prj -GEANY_PLUGIN_DIR= geanyprj - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Added: head/devel/geany-plugin-scope/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugin-scope/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= geany-plugin-scope +PORTVERSION= ${GEANY_VER} +CATEGORIES= devel + +MAINTAINER= makc@FreeBSD.org +COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} + +USE_GNOME= vte + +.include "${.CURDIR}/../geany-plugins/files/Makefile.common" +.include Added: head/devel/geany-plugin-scope/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugin-scope/pkg-descr Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,3 @@ +Scope is a graphical GDB front-end. + +WWW: http://plugins.geany.org/scope.html Added: head/devel/geany-plugin-scope/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugin-scope/pkg-plist Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,42 @@ +lib/geany/scope.a +lib/geany/scope.la +lib/geany/scope.so +%%DOCSDIR%%/scope/AUTHORS +%%DOCSDIR%%/scope/COPYING +%%DOCSDIR%%/scope/ChangeLog +%%DOCSDIR%%/scope/NEWS +%%DOCSDIR%%/scope/README +%%DOCSDIR%%/scope/html/codes.html +%%DOCSDIR%%/scope/html/scope.html +share/geany-plugins/scope/BreakPoint.png +share/geany-plugins/scope/BreakPoint22.png +share/geany-plugins/scope/Continue.png +share/geany-plugins/scope/Continue22.png +share/geany-plugins/scope/Continue24.png +share/geany-plugins/scope/Kill.png +share/geany-plugins/scope/Kill22.png +share/geany-plugins/scope/Kill24.png +share/geany-plugins/scope/Pause.png +share/geany-plugins/scope/Pause22.png +share/geany-plugins/scope/Pause24.png +share/geany-plugins/scope/RunToCursor.png +share/geany-plugins/scope/RunToCursor22.png +share/geany-plugins/scope/RunToCursor24.png +share/geany-plugins/scope/RunToMethod.png +share/geany-plugins/scope/RunToMethod22.png +share/geany-plugins/scope/RunToMethod24.png +share/geany-plugins/scope/StepInto.png +share/geany-plugins/scope/StepInto22.png +share/geany-plugins/scope/StepInto24.png +share/geany-plugins/scope/StepOut.png +share/geany-plugins/scope/StepOut22.png +share/geany-plugins/scope/StepOut24.png +share/geany-plugins/scope/StepOver.png +share/geany-plugins/scope/StepOver22.png +share/geany-plugins/scope/StepOver24.png +share/geany-plugins/scope/scope.glade +@dirrm share/geany-plugins/scope +@dirrmtry share/geany-plugins +@dirrm %%DOCSDIR%%/scope/html +@dirrm %%DOCSDIR%%/scope +@dirrm %%DOCSDIR%% Modified: head/devel/geany-plugin-sendmail/Makefile ============================================================================== --- head/devel/geany-plugin-sendmail/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-sendmail/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,14 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-sendmail PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= sendmail -GEANY_PLUGIN_DIR= geanysendmail - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-shiftcolumn/Makefile ============================================================================== --- head/devel/geany-plugin-shiftcolumn/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-shiftcolumn/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,13 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-shiftcolumn PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= shiftcolumn - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-spellcheck/Makefile ============================================================================== --- head/devel/geany-plugin-spellcheck/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-spellcheck/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-spellcheck PORTVERSION= ${GEANY_VER} CATEGORIES= devel @@ -9,7 +9,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN} LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant -GEANY_PLUGIN= spellcheck - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-tableconvert/Makefile ============================================================================== --- head/devel/geany-plugin-tableconvert/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-tableconvert/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,13 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-tableconvert PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= tableconvert - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-treebrowser/Makefile ============================================================================== --- head/devel/geany-plugin-treebrowser/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-treebrowser/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,13 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-treebrowser PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= treebrowser - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-updatechecker/Makefile ============================================================================== --- head/devel/geany-plugin-updatechecker/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-updatechecker/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-updatechecker PORTVERSION= ${GEANY_VER} CATEGORIES= devel @@ -9,7 +9,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN} LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup -GEANY_PLUGIN= updatechecker - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-vc/Makefile ============================================================================== --- head/devel/geany-plugin-vc/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-vc/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,15 +1,12 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-vc PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= vc -GEANY_PLUGIN_DIR= geanyvc - OPTIONS_DEFINE= GTKSPELL OPTIONS_DEFAULT= GTKSPELL GTKSPELL_DESC= Spell checking support via GtkSpell Modified: head/devel/geany-plugin-webhelper/Makefile ============================================================================== --- head/devel/geany-plugin-webhelper/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-webhelper/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-webhelper PORTVERSION= ${GEANY_VER} CATEGORIES= devel @@ -9,7 +9,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN} LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 -GEANY_PLUGIN= webhelper - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugin-xmlsnippets/Makefile ============================================================================== --- head/devel/geany-plugin-xmlsnippets/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugin-xmlsnippets/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -1,13 +1,11 @@ # $FreeBSD$ -PORTNAME= geany-plugin +PORTNAME= geany-plugin-xmlsnippets PORTVERSION= ${GEANY_VER} CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -GEANY_PLUGIN= xmlsnippets - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Added: head/devel/geany-plugins-l10n/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugins-l10n/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= geany-plugins-l10n +PORTVERSION= ${GEANY_VER} +CATEGORIES= devel + +MAINTAINER= makc@FreeBSD.org +COMMENT= Localization messages for Geany plugins + +USES= pathfix + +.include "${.CURDIR}/../geany-plugins/files/Makefile.common" +.include Added: head/devel/geany-plugins-l10n/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugins-l10n/pkg-descr Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,3 @@ +Localization messages for Geany plugins. + +WWW: http://plugins.geany.org Added: head/devel/geany-plugins-l10n/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugins-l10n/pkg-plist Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,14 @@ +share/locale/be/LC_MESSAGES/geany-plugins.mo +share/locale/ca/LC_MESSAGES/geany-plugins.mo +share/locale/da/LC_MESSAGES/geany-plugins.mo +share/locale/de/LC_MESSAGES/geany-plugins.mo +share/locale/es/LC_MESSAGES/geany-plugins.mo +share/locale/fr/LC_MESSAGES/geany-plugins.mo +share/locale/gl/LC_MESSAGES/geany-plugins.mo +share/locale/ja/LC_MESSAGES/geany-plugins.mo +share/locale/nl/LC_MESSAGES/geany-plugins.mo +share/locale/pt/LC_MESSAGES/geany-plugins.mo +share/locale/pt_BR/LC_MESSAGES/geany-plugins.mo +share/locale/ru/LC_MESSAGES/geany-plugins.mo +share/locale/tr/LC_MESSAGES/geany-plugins.mo +share/locale/zh_CN/LC_MESSAGES/geany-plugins.mo Modified: head/devel/geany-plugins/Makefile ============================================================================== --- head/devel/geany-plugins/Makefile Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugins/Makefile Thu Mar 21 14:43:24 2013 (r314846) @@ -13,14 +13,20 @@ NO_BUILD= yes .include "${.CURDIR}/files/bsd.geany-plugins.mk" +OPTIONS_DEFINE= NLS OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +# NLS option first, then plugins sorted in GEANY_PLUGINS_ALL +NO_OPTIONS_SORT= yes + .for plugin in ${GEANY_PLUGINS_ALL} OPTIONS_DEFINE+= ${plugin:U} ${plugin:U}_DESC= ${${plugin}_DESC} ${plugin:U}_DEP= geany-plugin-${plugin}>=0:${PORTSDIR}/devel/geany-plugin-${plugin} .endfor +NLS_DEP= geany-plugins-l10n>=0:${PORTSDIR}/devel/geany-plugins-l10n + .include .for opt in ${OPTIONS_DEFINE} Modified: head/devel/geany-plugins/distinfo ============================================================================== --- head/devel/geany-plugins/distinfo Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugins/distinfo Thu Mar 21 14:43:24 2013 (r314846) @@ -1,2 +1,2 @@ -SHA256 (geany-plugins-1.22.tar.bz2) = a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce -SIZE (geany-plugins-1.22.tar.bz2) = 2088130 +SHA256 (geany-plugins-1.23.tar.bz2) = ff26860edd1cbaea88c73bd8c2bd02f9ba04046674f05d3696baf66582e2bf58 +SIZE (geany-plugins-1.23.tar.bz2) = 2811640 Modified: head/devel/geany-plugins/files/Makefile.common ============================================================================== --- head/devel/geany-plugins/files/Makefile.common Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugins/files/Makefile.common Thu Mar 21 14:43:24 2013 (r314846) @@ -3,30 +3,37 @@ .include "${.CURDIR}/../../devel/geany-plugins/files/bsd.geany-plugins.mk" MASTER_SITES= http://plugins.geany.org/geany-plugins/ -PKGNAMESUFFIX?= -${GEANY_PLUGIN} DISTNAME= geany-plugins-${PORTVERSION} DISTINFO_FILE= ${.CURDIR}/../../devel/geany-plugins/distinfo -BUILD_DEPENDS+= ${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany \ - ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +BUILD_DEPENDS+= ${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany RUN_DEPENDS+= ${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany CONFLICTS_INSTALL= geany-plugins-0.* +EXTRA_PATCHES= ${.CURDIR}/../../devel/geany-plugins/files/extrapatch-configure + USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_AUTOTOOLS+= libtool USE_PKGCONFIG= build -USE_GETTEXT= yes USE_GNOME+= gtk20 -GEANY_PLUGIN_DIR?= ${GEANY_PLUGIN} -GEANY_PLUGIN_SWITCH?= --enable-${GEANY_PLUGIN_DIR} +# geany-plugins-l10n is not a plugin, thus special treatment +.if ${PORTNAME} == "geany-plugins-l10n" +GEANY_PLUGIN= NLS +NLS_DIR= po +NLS_SWITCH= --enable-nls +.endif + +GEANY_PLUGIN?= ${PORTNAME:S,geany-plugin-,,} +${GEANY_PLUGIN}_DIR?= ${GEANY_PLUGIN} +${GEANY_PLUGIN}_SWITCH?= --enable-${${GEANY_PLUGIN}_DIR} -CONFIGURE_ARGS+= ${GEANY_PLUGIN_SWITCH} +CONFIGURE_ARGS+= ${${GEANY_PLUGIN}_SWITCH} -BUILD_WRKSRC= ${WRKSRC}/${GEANY_PLUGIN_DIR} +BUILD_WRKSRC= ${WRKSRC}/${${GEANY_PLUGIN}_DIR} INSTALL_WRKSRC= ${BUILD_WRKSRC} DATADIR= share/geany-plugins @@ -34,15 +41,16 @@ DOCSDIR= share/doc/geany-plugins .include -.if ${PORT_OPTIONS:MNLS} +.if ${PORTNAME} != "geany-plugins-l10n" +. if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes -.else +. else CONFIGURE_ARGS+= --disable-nls +. endif .endif pre-configure: - ${REINPLACE_CMD} -e 's,/bin/sh,${LOCALBASE}/bin/bash,g' \ - -e 's,zlib,,g' \ + ${REINPLACE_CMD} -e 's,zlib,,g' \ ${WRKSRC}/configure post-configure: Modified: head/devel/geany-plugins/files/bsd.geany-plugins.mk ============================================================================== --- head/devel/geany-plugins/files/bsd.geany-plugins.mk Thu Mar 21 14:22:13 2013 (r314845) +++ head/devel/geany-plugins/files/bsd.geany-plugins.mk Thu Mar 21 14:43:24 2013 (r314846) @@ -1,13 +1,13 @@ # $FreeBSD$ -GEANY_VER= 1.22 +GEANY_VER= 1.23 GEANY_PLUGINS_ALL= addons \ codenav \ + commander \ debugger \ devhelp \ doc \ extrasel \ - gdb \ gendoc \ geniuspaste \ gproject \ @@ -22,6 +22,7 @@ GEANY_PLUGINS_ALL= addons \ pg \ pretty-printer \ prj \ + scope \ sendmail \ shiftcolumn \ spellcheck \ @@ -32,13 +33,15 @@ GEANY_PLUGINS_ALL= addons \ webhelper \ xmlsnippets +# markdown plugin is excluded, requires peg-markdown + addons_DESC= various small addons codenav_DESC= some facilities for navigating in the code +commander_DESC= command panel for rapid access to any action debugger_DESC= debugging support (via GDB currently) devhelp_DESC= API documentation browser doc_DESC= execute command on the word at cursor position extrasel_DESC= additional selection tools -gdb_DESC= debugging support via the GNU Debugger gendoc_DESC= generate documentation from the sources comments geniuspaste_DESC= pastebins support gproject_DESC= extension of Geany's project management @@ -47,12 +50,14 @@ 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 miniscript_DESC= pipe text/documents via script (shell, perl, awk, etc.) multiterm_DESC= multi-tabbed virtual terminals emulator numberedbookmarks_DESC= additional numbered bookmarks pg_DESC= encrypt, decrypt and verify signatures with GnuPG pretty-printer_DESC= formats XML and make it human-readable 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 @@ -62,3 +67,20 @@ updatechecker_DESC= check for new versio vc_DESC= access to different version-control systems webhelper_DESC= web development facilities xmlsnippets_DESC= XML/HTML tag autocompletion + +doc_DIR= geanydoc +extrasel_DIR= geanyextrasel +gendoc_DIR= geanygendoc +insertnum_DIR= geanyinsertnum +latex_DIR= geanylatex +lipsum_DIR= geanylipsum +lua_DIR= geanylua +macro_DIR= geanymacro +miniscript_DIR= geanyminiscript +numberedbookmarks_DIR= geanynumberedbookmarks +pg_DIR= geanypg +prj_DIR= geanyprj +sendmail_DIR= geanysendmail +vc_DIR= geanyvc + +pretty-printer_SWITCH= --enable-pretty_printer Added: head/devel/geany-plugins/files/extrapatch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/geany-plugins/files/extrapatch-configure Thu Mar 21 14:43:24 2013 (r314846) @@ -0,0 +1,72 @@ +--- ./configure.orig 2013-03-10 17:01:27.000000000 +0000 ++++ ./configure 2013-03-21 00:22:04.580741068 +0000 +@@ -21101,69 +21101,3 @@ + expanded_docdir=$(eval echo $expanded_docdir) + + +- cat <