Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/geany-plugins/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 29 Oct 2011 21:57:15 -0000 1.6 +++ Makefile 26 Feb 2012 21:35:28 -0000 @@ -6,7 +6,7 @@ # PORTNAME= geany-plugins -PORTVERSION= 0.19 +PORTVERSION= 0.21 CATEGORIES= devel MASTER_SITES= http://plugins.geany.org/geany-plugins/ @@ -14,200 +14,335 @@ COMMENT= Plugins for lightweight editor - geany BUILD_DEPENDS= geany:${PORTSDIR}/devel/geany +BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash RUN_DEPENDS= geany:${PORTSDIR}/devel/geany -BROKEN= does not compile - +GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gtk20 USE_BZIP2= yes -USE_PYTHON_BUILD= 2.6+ -OPTIONS= GEANY_ADDONS "ADDONS" on \ - GEANY_GEANYDOC "GEANYDOC" on \ - GEANY_GEANYGDB "GDB support (broken)" off \ - GEANY_GEANYLATEX "Improve work with LaTeX" on \ - GEANY_GEANYLIPSUM "GEANYLIPSUM" on \ - GEANY_GEANYLUA "LUA support (broken)" off \ - GEANY_GEANYPRJ "Alternative project management" on \ - GEANY_GEANYSENDMAIL "Sending mail from geany" on \ - GEANY_GEANYVC "Version-control systems support" on \ - GEANY_SHIFTCOLUMN "SHIFTCOLUMN" on \ - GEANY_SPELLCHECK "Spellchecker support" on \ - GEANY_CODENAV "Siwtch between header and source" on \ - GEANY_INSERTNUM "geanyinsertnum" on \ - GEANY_GEANYEXTRASEL "geanyextrasel" on \ - GEANY_TREEBROWSER "Tree Browser" on \ - GEANY_PRETTYPRINTER "Pretty-printer" on +OPTIONS= ADDONS "Various small addons" on \ + CODENAV "Switch between header and source" on \ + DEBUGGER "Various debuggers integration" on \ + DEVHELP "Support for devhelp and other tools" on \ + GEANYDOC "Documentation viewer" on \ + GEANYEXTRASEL "Column mode and other extra selection" on \ + GEANYGDB "GDB support" on \ + GEANYGENDOC "Generate doc from source (broken)" on \ + GEANYINSERTNUM "Insert columns with numbers" on \ + GEANYLATEX "Improve work with LaTeX" on \ + GEANYLIPSUM "Insert Lorem Ipsum" on \ + GEANYLUA "LUA support" on \ + GEANYMACRO "Record and use your own macros" on \ + GEANYNUMBEREDBOOKMARKS "Numbered bookmarks" on \ + GEANYPG "Gpg encryption" on \ + GEANYPRJ "Alternative project management" on \ + GEANYSENDMAIL "Sending mail from geany" on \ + GEANYVC "Version-control systems support" on \ + GPROJECT "Project management extensions" on \ + PRETTYPRINTXML "Make XML human-readable" on \ + SHIFTCOLUMN "Move block of text horizontally" on \ + SPELLCHECK "Spellchecker support" on \ + TREEBROWSER "Browse files in a tree view" on \ + TABLECONVERT "Convert list in an table" on \ + UPDATECHECKER "Checking updates for Geany" on \ + WEBHELPER "Web development facilities " on \ + XMLSNIPPETS "XML/HTML tag autocompletion" on .include -PLUGINS= -.if !defined(WITHOUT_GEANY_TREEBROWSER) -BUILD_PLUGINS+= ,treebrowser -PLUGINS+= treebrowser.so -.endif - -.if !defined(WITHOUT_GEANY_CODENAV) -BUILD_PLUGINS+= ,codenav -PLUGINS+= codenav.so -.endif - -.if !defined(WITHOUT_GEANY_INSERTNUM) -BUILD_PLUGINS+= ,geanyinsertnum -PLUGINS+= geanyinsertnum.so -.endif - -.if !defined(WITHOUT_GEANY_GEANYEXTRASEL) -BUILD_PLUGINS+= ,geanyextrasel -PLUGINS+= geanyextrasel.so -.endif - -.if !defined(WITHOUT_GEANY_PRETTYPRINTER) -BUILD_PLUGINS+= ,pretty-printer -PLUGINS+= pretty-printer.so -.endif - -.if !defined(WITHOUT_GEANY_GEANYDOC) -BUILD_PLUGINS+= ,geanydoc -PLUGINS+= geanydoc.so -.endif - -.if !defined(WITHOUT_GEANY_ADDONS) -BUILD_PLUGINS+= ,addons -PLUGINS+= addons.so -.endif - -.if !defined(WITHOUT_GEANY_GEANYGDB) -# handle geanygdb manually -BROKEN= geanygdb plugins doesn't work -BUILD_PLUGINS+= ,geanygdb -PLIST_FILES+= lib/geany/geanygdb.so \ - libexec/geany-plugins/geanygdb/ttyhelper -.endif - -.if !defined(WITHOUT_GEANY_GEANYLATEX) -BUILD_PLUGINS+= ,geanylatex -PLUGINS+= geanylatex.so -.endif - -.if !defined(WITHOUT_GEANY_GEANYLIPSUM) -BUILD_PLUGINS+= ,geanylipsum -PLUGINS+= geanylipsum.so -.endif - -.if !defined(WITHOUT_GEANY_GEANYLUA) -# I will handle geanulua manually -BUILD_PLUGINS+= ,geanylua -USE_LUA= 5.1 -PLIST_FILES+= lib/geany/geanylua.so \ - lib/geany-plugins/geanylua/libgeanylua.so \ - share/doc/geany-plugins/geanylua/geanylua-input.html \ - share/doc/geany-plugins/geanylua/geanylua-ref.html \ - share/doc/geany-plugins/geanylua/geanylua-index.html \ - share/doc/geany-plugins/geanylua/geanylua-intro.html \ - share/doc/geany-plugins/geanylua/geanylua-keys.html \ - share/doc/geany-plugins/geanylua/geanylua-keyfile.html \ - share/doc/geany-plugins/geanylua/luarefv51.html \ - share/geany-plugins/geanylua/dialogs/complex-dialog.lua \ - share/geany-plugins/geanylua/dialogs/basic-dialogs.lua \ - share/geany-plugins/geanylua/edit/select-block.lua \ - share/geany-plugins/geanylua/edit/proper-case.lua \ - share/geany-plugins/geanylua/edit/right-trim.lua \ - share/geany-plugins/geanylua/edit/calculator.lua \ - share/geany-plugins/geanylua/edit/lua-replace.lua \ - share/geany-plugins/geanylua/edit/reverse.lua \ - share/geany-plugins/geanylua/info/show-filename.lua \ - share/geany-plugins/geanylua/info/about.lua \ - share/geany-plugins/geanylua/info/list-open-files.lua \ - share/geany-plugins/geanylua/info/file-informa\tion.lua \ - share/geany-plugins/geanylua/info/app-information.lua \ - share/geany-plugins/geanylua/scripting/show-examples.lua \ - share/geany-plugins/geanylua/scripting/open-script.lua \ - share/geany-plugins/geanylua/scripting/help.lua \ - share/geany-plugins/geanylua/scripting/rebuild-menu.lua \ - share/geany-plugins/geanylua/work/03.install-test-script.lua \ - share/geany-plugins/geanylua/work/02.run-test-script.lua \ - share/geany-plugins/geanylua/work/01.edit-test-script.lua -PLIST_DIRS+= lib/geany-plugins/geanylua \ - lib/geany-plugins \ - share/doc/geany-plugins/geanylua \ - share/doc/geany-plugins \ - share/geany-plugins/geanylua/dialogs \ - share/geany-plugins/geanylua/edit \ - share/geany-plugins/geanylua/info \ - share/geany-plugins/geanylua/scripting \ - share/geany-plugins/geanylua/work \ - share/geany-plugins/geanylua \ - share/geany-plugins -.endif - -.if !defined(WITHOUT_GEANY_GEANYPRJ) -BUILD_PLUGINS+= ,geanyprj -PLUGINS+= geanyprj.so -.endif - -.if !defined(WITHOUT_GEANY_GEANYVC) -BUILD_PLUGINS+= ,geanyvc -LIB_DEPENDS+= gtkspell:${PORTSDIR}/textproc/gtkspell -PLUGINS+= geanyvc.so -.endif - -.if !defined(WITHOUT_GEANY_GEANYSENDMAIL) -BUILD_PLUGINS+= ,geanysendmail -PLUGINS+= geanysendmail.so -.endif - -.if !defined(WITHOUT_GEANY_SHIFTCOLUMN) -BUILD_PLUGINS+= ,shiftcolumn -PLUGINS+= shiftcolumn.so +.if !defined(WITHOUT_ADDONS) +CONFIGURE_ARGS+=--enable-addons +PLUGINS+= addons +.else +CONFIGURE_ARGS+=--disable-addons +.endif + +.if !defined(WITHOUT_CODENAV) +CONFIGURE_ARGS+=--enable-codenav +PLUGINS+= codenav +.else +CONFIGURE_ARGS+=--disable-codenav +.endif + +.if !defined(WITHOUT_DEBUGGER) +CONFIGURE_ARGS+=--enable-debugger +PLUGINS+= debugger +DEBUGGER_DIR= share/geany-plugins/debugger +PLIST_DIRS+= ${DEBUGGER_DIR} +PLIST_FILES+= ${DEBUGGER_DIR}/continue.png \ + ${DEBUGGER_DIR}/restart.gif \ + ${DEBUGGER_DIR}/run.gif \ + ${DEBUGGER_DIR}/run_to_cursor.gif \ + ${DEBUGGER_DIR}/step_in.png \ + ${DEBUGGER_DIR}/step_out.gif \ + ${DEBUGGER_DIR}/step_over.gif \ + ${DEBUGGER_DIR}/stop.gif \ + ${DEBUGGER_DIR}/tabs.gif +.else +CONFIGURE_ARGS+=--disable-debugger +.endif + +.if !defined(WITHOUT_DEVHELP) +CONFIGURE_ARGS+=--enable-devhelp +PLUGINS+= devhelp +RUN_DEPENDS+= ${LOCALBASE}/include/webkit-1.0:${PORTSDIR}/www/webkit-gtk2 +RUN_DEPENDS+= devhelp:${PORTSDIR}/devel/devhelp +.else +CONFIGURE_ARGS+=--disable-devhelp +.endif + +.if !defined(WITHOUT_GEANYDOC) +CONFIGURE_ARGS+=--enable-geanydoc +PLUGINS+= geanydoc +.else +CONFIGURE_ARGS+=--disable-geanydoc +.endif + +.if !defined(WITHOUT_GEANYEXTRASEL) +CONFIGURE_ARGS+=--enable-geanyextrasel +PLUGINS+= geanyextrasel +.else +CONFIGURE_ARGS+=--disable-geanyextrasel +.endif + +.if !defined(WITHOUT_GEANYGDB) +CONFIGURE_ARGS+=--enable-geanygdb +PLUGINS+= geanygdb +GDB_DIR= libexec/geany-plugins/geanygdb +PLIST_DIRS+= ${GDB_DIR} +PLIST_FILES+= ${GDB_DIR}/ttyhelper +.else +CONFIGURE_ARGS+=--disable-geanygdb +.endif + +.if !defined(WITHOUT_GEANYGENDOC) +BROKEN= sorry, geanygendoc plugins doesn't compile +# TODO: import new ctpl port and fix gio lib_depends +CONFIGURE_ARGS+=--enable-geanygendoc +PLUGINS+= geanygendoc +LIB_DEPENDS+= glib:${PORTSDIR}/devel/glib20 +RUN_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils +.else +CONFIGURE_ARGS+=--disable-geanygendoc +.endif + +.if !defined(WITHOUT_GEANYINSERTNUM) +CONFIGURE_ARGS+=--enable-geanyinsertnum +PLUGINS+= geanyinsertnum +.else +CONFIGURE_ARGS+=--disable-geanyinsertnum +.endif + +.if !defined(WITHOUT_GEANYLATEX) +CONFIGURE_ARGS+=--enable-geanylatex +PLUGINS+= geanylatex +.else +CONFIGURE_ARGS+=--disable-geanylatex +.endif + +.if !defined(WITHOUT_GEANYLIPSUM) +CONFIGURE_ARGS+=--enable-geanylipsum +PLUGINS+= geanylipsum +.else +CONFIGURE_ARGS+=--disable-geanylipsum +.endif + +.if !defined(WITHOUT_GEANYLUA) +CONFIGURE_ARGS+=--enable-geanylua +RUN_DEPENDS= lua-5.1:${PORTSDIR}/lang/lua +PLUGINS+= geanylua +LUA_DIR= share/geany-plugins/geanylua +LUADOC_DIR= share/doc/geany-plugins/geanylua +PLIST_FILES+= ${LUADOC_DIR}/geanylua-index.html +PLIST_FILES+= ${LUADOC_DIR}/geanylua-input.html +PLIST_FILES+= ${LUADOC_DIR}/geanylua-intro.html +PLIST_FILES+= ${LUADOC_DIR}/geanylua-keyfile.html +PLIST_FILES+= ${LUADOC_DIR}/geanylua-keys.html +PLIST_FILES+= ${LUADOC_DIR}/geanylua-ref.html +PLIST_FILES+= ${LUADOC_DIR}/luarefv51.html +PLIST_DIRS+= ${LUA_DIR}/dialogs +PLIST_FILES+= ${LUA_DIR}/dialogs/basic-dialogs.lua +PLIST_FILES+= ${LUA_DIR}/dialogs/complex-dialog.lua +PLIST_DIRS+= ${LUA_DIR}/edit +PLIST_FILES+= ${LUA_DIR}/edit/calculator.lua +PLIST_FILES+= ${LUA_DIR}/edit/lua-replace.lua +PLIST_FILES+= ${LUA_DIR}/edit/proper-case.lua +PLIST_FILES+= ${LUA_DIR}/edit/reverse.lua +PLIST_FILES+= ${LUA_DIR}/edit/right-trim.lua +PLIST_FILES+= ${LUA_DIR}/edit/select-block.lua +PLIST_DIRS+= ${LUA_DIR}/info +PLIST_FILES+= ${LUA_DIR}/info/about.lua +PLIST_FILES+= ${LUA_DIR}/info/app-information.lua +PLIST_FILES+= ${LUA_DIR}/info/file-information.lua +PLIST_FILES+= ${LUA_DIR}/info/list-open-files.lua +PLIST_FILES+= ${LUA_DIR}/info/show-filename.lua +PLIST_DIRS+= ${LUA_DIR}/scripting +PLIST_FILES+= ${LUA_DIR}/scripting/help.lua +PLIST_FILES+= ${LUA_DIR}/scripting/open-script.lua +PLIST_FILES+= ${LUA_DIR}/scripting/rebuild-menu.lua +PLIST_FILES+= ${LUA_DIR}/scripting/show-examples.lua +PLIST_DIRS+= ${LUA_DIR}/work +PLIST_FILES+= ${LUA_DIR}/work/01.edit-test-script.lua +PLIST_FILES+= ${LUA_DIR}/work/02.run-test-script.lua +PLIST_FILES+= ${LUA_DIR}/work/03.install-test-script.lua + +.else +CONFIGURE_ARGS+=--disable-geanylua +.endif + +.if !defined(WITHOUT_GEANYMACRO) +CONFIGURE_ARGS+=--enable-geanymacro +PLUGINS+= geanymacro +.else +CONFIGURE_ARGS+=--disable-geanymacro +.endif + +.if !defined(WITHOUT_GEANYNUMBEREDBOOKMARKS) +CONFIGURE_ARGS+=--enable-geanynumberedbookmarks +PLUGINS+= geanynumberedbookmarks +.else +CONFIGURE_ARGS+=--disable-geanynumberedbookmarks +.endif + +.if !defined(WITHOUT_GEANYPG) +LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme +RUN_DEPENDS+= gpg2:${PORTSDIR}/security/gnupg +CONFIGURE_ARGS+=--enable-geanypg +PLUGINS+= geanypg +.else +CONFIGURE_ARGS+=--disable-geanypg +.endif + +.if !defined(WITHOUT_GEANYPRJ) +CONFIGURE_ARGS+=--enable-geanyprj +PLUGINS+= geanyprj +.else +CONFIGURE_ARGS+=--disable-geanyprj +.endif + +.if !defined(WITHOUT_GEANYSENDMAIL) +CONFIGURE_ARGS+=--enable-geanysendmail +PLUGINS+= geanysendmail +.else +CONFIGURE_ARGS+=--disable-geanysendmail +.endif + +.if !defined(WITHOUT_GEANYVC) +CONFIGURE_ARGS+=--enable-geanyvc +PLUGINS+= geanyvc +.else +CONFIGURE_ARGS+=--disable-geanyvc +.endif + +.if !defined(WITHOUT_GPROJECT) +CONFIGURE_ARGS+=--enable-gproject +PLUGINS+= gproject +GPROJECT_DIR= share/icons/hicolor/16x16/apps +PLIST_FILES+= ${GPROJECT_DIR}/gproject-collapse.png +PLIST_FILES+= ${GPROJECT_DIR}/gproject-expand.png +PLIST_FILES+= ${GPROJECT_DIR}/gproject-file.png +PLIST_FILES+= ${GPROJECT_DIR}/gproject-follow.png +PLIST_FILES+= ${GPROJECT_DIR}/gproject-header.png +PLIST_FILES+= ${GPROJECT_DIR}/gproject-refresh.png +PLIST_FILES+= ${GPROJECT_DIR}/gproject-source.png +.else +CONFIGURE_ARGS+=--disable-gproject +.endif + +.if !defined(WITHOUT_PRETTYPRINTXML) +CONFIGURE_ARGS+=--enable-pretty_printer +PLUGINS+= pretty-print +.else +CONFIGURE_ARGS+=--disable-pretty_printer +.endif + +.if !defined(WITHOUT_SHIFTCOLUMN) +CONFIGURE_ARGS+=--enable-shiftcolumn +PLUGINS+= shiftcolumn +.else +CONFIGURE_ARGS+=--disable-shiftcolumn .endif -.if !defined(WITHOUT_GEANY_SPELLCHECK) -BUILD_PLUGINS+= ,spellcheck +.if !defined(WITHOUT_SPELLCHECK) +CONFIGURE_ARGS+=--enable-spellcheck LIBDEPENS+= enchant:${PORTSDIR}/textproc/enchant -PLUGINS+= spellcheck.so +PLUGINS+= spellcheck +.else +CONFIGURE_ARGS+=--disable-spellcheck .endif -.if !defined(BUILD_PLUGINS) -IGNORE= no plugins selected +.if !defined(WITHOUT_TREEBROWSER) +CONFIGURE_ARGS+=--enable-treebrowser +PLUGINS+= treebrowser +.else +CONFIGURE_ARGS+=--disable-treebrowser .endif -.if !defined(WITHOUT_NLS) -PO_FILES= be ca da de es fr gl ja pt pt_BR ru tr zh_CN -.for i in ${PO_FILES} -PLIST_FILES+= share/locale/${i}/LC_MESSAGES/geany-plugins.mo -.endfor +.if !defined(WITHOUT_TABLECONVERT) +CONFIGURE_ARGS+=--enable-tableconvert +PLUGINS+= tableconvert +.else +CONFIGURE_ARGS+=--disable-tableconvert .endif -.for i in ${PLUGINS} -PLIST_FILES+= lib/geany/${i} -.endfor +.if !defined(WITHOUT_UPDATECHECKER) +CONFIGURE_ARGS+=--enable-updatechecker +.else +CONFIGURE_ARGS+=--disable-updatechecker +.endif -do-configure: - BUILD_PLUGINS=$(${ECHO} ${BUILD_PLUGINS} | ${SED} -e 's/^,//') - @${WRKSRC}/waf configure --enable-plugins="${BUILD_PLUGINS}" -b ${WRKSRC}/_build_ +.if !defined(WITHOUT_WEBHELPER) +CONFIGURE_ARGS+=--enable-webhelper +PLUGINS+= webhelper +LIB_DEPENDS+= glib:${PORTSDIR}/devel/glib20 +LIB_DEPENDS+= gdk_pixbuf:${PORTSDIR}/graphics/gdk-pixbuf2 +RUN_DEPENDS+= ${LOCALBASE}/include/webkit-1.0:${PORTSDIR}/www/webkit-gtk2 +.else +CONFIGURE_ARGS+=--disable-webhelper +.endif -do-install: -.for i in ${PLUGINS} - @${INSTALL_PROGRAM} ${WRKSRC}/_build_/default/${i} ${PREFIX}/lib/geany/ -.endfor -.if !defined(WITHOUT_GEANY_GEANYGDB) - @${MKDIR} ${PREFIX}/libexec/geany-plugins/geanygdb - @${INSTALL_PROGRAM} ${WRKSRC}/_build_/default/geanygdb.so ${PREFIX}/lib/geany/ - @${INSTALL_PROGRAM} ${WRKSRC}/_build_/default/ttyhelper ${PREFIX}/libexec/geany-plugins/geanygdb/ -.endif -.if !defined(WITHOUT_GEANY_GEANYLUA) - @${MKDIR} ${PREFIX}/lib/geany-plugins/geanylua - @${INSTALL_PROGRAM} ${WRKSRC}/_build_/default/libgeanylua.so ${PREFIX}/lib/geany-plugins/geanylua/ - @${INSTALL_PROGRAM} ${WRKSRC}/_build_/default/geanylua.so ${PREFIX}/lib/geany/ - @(cd ${WRKSRC}/geanylua/examples/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/geany-plugins/geanylua/ "! -name Makefile.in -and ! -name Makefile.am") - @(cd ${WRKSRC}/geanylua/docs/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/doc/geany-plugins/geanylua/ "! -name Makefile.in -and ! -name Makefile.am") +.if !defined(WITHOUT_XMLSNIPPETS) +CONFIGURE_ARGS+=--enable-xmlsnippets +PLUGINS+= xmlsnippets +.else +CONFIGURE_ARGS+=--disable-xmlsnippets .endif + +.if !defined(PLUGINS) +IGNORE= no plugins selected +.endif + .if !defined(WITHOUT_NLS) +PO_FILES= be ca da de es fr gl ja nl pt pt_BR ru tr zh_CN .for i in ${PO_FILES} - @${INSTALL_DATA} ${WRKSRC}/_build_/default/po/${i}.mo ${PREFIX}/share/locale/${i}/LC_MESSAGES/geany-plugins.mo +PLIST_FILES+= lib/locale/${i}/LC_MESSAGES/geany-plugins.mo .endfor .endif +pretty_print= pretty-print +.for i in ${PLUGINS} +PLIST_FILES+= lib/geany/${i}.so +PLIST_FILES+= lib/geany/${i}.la +.if ${pretty_print} != ${i} +PLIST_FILES+= share/doc/geany-plugins/${i}/AUTHORS +PLIST_FILES+= share/doc/geany-plugins/${i}/COPYING +PLIST_FILES+= share/doc/geany-plugins/${i}/ChangeLog +PLIST_FILES+= share/doc/geany-plugins/${i}/NEWS +PLIST_FILES+= share/doc/geany-plugins/${i}/README +.endif +.endfor + +post-install: + @${ECHO_MSG} "" + @${ECHO_MSG} "#######################################################" + @${ECHO_MSG} "Please see http://plugins.geany.org/ for more details." + @${ECHO_MSG} "#######################################################" + @${ECHO_MSG} "" + +# without this, autoconf re-create configure script +# using sh shell and this breaks build stage (bashims) +SH=${PREFIX}/bin/bash + .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/geany-plugins/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 15 Feb 2011 17:32:11 -0000 1.3 +++ distinfo 26 Feb 2012 21:35:28 -0000 @@ -1,2 +1,2 @@ -SHA256 (geany-plugins-0.19.tar.bz2) = 41a6ab69ede801d660761c799b64c8d0027d76a1dda584777f4d40e1ba064324 -SIZE (geany-plugins-0.19.tar.bz2) = 842017 +SHA256 (geany-plugins-0.21.tar.bz2) = 4d4ef30fe77087a8c4325041120ef4f74f07ce9ca6f3e99a8feb92bb587db657 +SIZE (geany-plugins-0.21.tar.bz2) = 1271337 Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-message 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,3 @@ +####################################################### +Please see http://plugins.geany.org/ for more details. +####################################################### Index: files/patch-config.guess =================================================================== RCS file: files/patch-config.guess diff -N files/patch-config.guess --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-config.guess 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,17 @@ +--- config.guess.orig 2012-02-21 23:04:39.000000000 +0100 ++++ config.guess 2012-02-21 23:04:52.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/local/bin/bash + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +@@ -871,7 +871,7 @@ + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac +- objdump --private-headers /bin/sh | grep -q ld.so.1 ++ objdump --private-headers /usr/local/bin/bash | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; Index: files/patch-config.sub =================================================================== RCS file: files/patch-config.sub diff -N files/patch-config.sub --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-config.sub 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,8 @@ +--- config.sub.orig 2012-02-21 23:05:52.000000000 +0100 ++++ config.sub 2012-02-21 23:06:19.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/local/bin/bash + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,53 @@ +--- configure.orig 2012-02-21 23:06:53.000000000 +0100 ++++ configure 2012-02-21 23:07:06.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/local/bin/bash + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.68 for geany-plugins 0.21. + # +@@ -253,7 +253,7 @@ + fi + fi + fi +-SHELL=${CONFIG_SHELL-/bin/sh} ++SHELL=${CONFIG_SHELL-/usr/local/bin/bash} + export SHELL + # Unset more variables known to interfere with behavior of common tools. + CLICOLOR_FORCE= GREP_OPTIONS= +@@ -541,7 +541,7 @@ + # Sed expression to map a string onto a valid variable name. + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + +-SHELL=${CONFIG_SHELL-/bin/sh} ++SHELL=${CONFIG_SHELL-/usr/local/bin/bash} + + + test -n "$DJDIR" || exec 7<&0 &6 + else + cat >conftest.make <<\_ACEOF +-SHELL = /bin/sh ++SHELL = /usr/local/bin/bash + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +@@ -3967,7 +3967,7 @@ + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. ++ # Solaris 8's {/usr,}/usr/local/bin/bash. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +@@ -4967,7 +4967,7 @@ + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ SHELL=${SHELL-${CONFIG_SHELL-/usr/local/bin/bash}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. Index: files/patch-debugger_dconfig.c =================================================================== RCS file: files/patch-debugger_dconfig.c diff -N files/patch-debugger_dconfig.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-debugger_dconfig.c 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,29 @@ +--- debugger/src/dconfig.c.orig 2012-02-22 22:00:04.000000000 +0100 ++++ debugger/src/dconfig.c 2012-02-22 22:08:49.000000000 +0100 +@@ -273,8 +273,9 @@ + */ + static gpointer saving_thread_func(gpointer data) + { +- GTimeVal interval; ++ //GTimeVal interval; + GMutex *m = g_mutex_new(); ++ guint timeout = 0; + do + { + g_mutex_lock(change_config_mutex); +@@ -312,10 +313,12 @@ + + g_mutex_unlock(change_config_mutex); + +- g_get_current_time(&interval); +- g_time_val_add(&interval, SAVING_INTERVAL); ++ //g_get_current_time(&interval); ++ //g_time_val_add(&interval, SAVING_INTERVAL); ++ usleep(1000); + } +- while (!g_cond_timed_wait(cond, m, &interval)); ++ //while (!g_cond_timed_wait(cond, m, &interval)); ++ while (timeout++ == 10000); + g_mutex_free(m); + + return NULL; Index: files/patch-debugger_debug.c =================================================================== RCS file: files/patch-debugger_debug.c diff -N files/patch-debugger_debug.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-debugger_debug.c 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,10 @@ +--- debugger/src/debug.c.orig 2012-02-22 21:20:27.000000000 +0100 ++++ debugger/src/debug.c 2012-02-22 21:20:36.000000000 +0100 +@@ -37,7 +37,6 @@ + + #include + #include +-#include + #include + #include + #include Index: files/patch-depcomp =================================================================== RCS file: files/patch-depcomp diff -N files/patch-depcomp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-depcomp 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,8 @@ +--- depcomp.orig 2012-02-21 23:07:34.000000000 +0100 ++++ depcomp 2012-02-21 23:07:53.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/local/bin/bash + # depcomp - compile a program generating dependencies as side-effects + + scriptversion=2009-04-28.21; # UTC Index: files/patch-geanylua-install.sh =================================================================== RCS file: files/patch-geanylua-install.sh diff -N files/patch-geanylua-install.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-geanylua-install.sh 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,8 @@ +--- geanylua/util/install.sh.orig 2012-02-21 23:13:48.000000000 +0100 ++++ geanylua/util/install.sh 2012-02-21 23:14:01.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/local/bin/bash + + # Script to install GeanyLua in the user's local Geany config directory + Index: files/patch-install-sh =================================================================== RCS file: files/patch-install-sh diff -N files/patch-install-sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-install-sh 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,8 @@ +--- install-sh.orig 2012-02-21 23:09:33.000000000 +0100 ++++ install-sh 2012-02-21 23:09:45.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/local/bin/bash + # install - install a program, script, or datafile + + scriptversion=2009-04-28.21; # UTC Index: files/patch-libtool.m4 =================================================================== RCS file: files/patch-libtool.m4 diff -N files/patch-libtool.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libtool.m4 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,20 @@ +--- build/cache/libtool.m4.orig 2012-02-21 23:01:08.000000000 +0100 ++++ build/cache/libtool.m4 2012-02-21 23:03:04.000000000 +0100 +@@ -85,7 +85,7 @@ + AC_REQUIRE([LTOBSOLETE_VERSION])dnl + m4_require([_LT_PROG_LTMAIN])dnl + +-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) ++_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/usr/local/bin/bash}]) + + dnl Parse OPTIONS + _LT_SET_OPTIONS([$0], [$1]) +@@ -1635,7 +1635,7 @@ + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ SHELL=${SHELL-${CONFIG_SHELL-/usr/local/bin/bash}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. Index: files/patch-ltmain.sh =================================================================== RCS file: files/patch-ltmain.sh diff -N files/patch-ltmain.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ltmain.sh 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,20 @@ +--- ltmain.sh.orig 2012-02-21 23:10:19.000000000 +0100 ++++ ltmain.sh 2012-02-21 23:10:43.000000000 +0100 +@@ -145,7 +145,7 @@ + : ${MV="mv -f"} + : ${RM="rm -f"} + : ${SED="/bin/sed"} +-: ${SHELL="${CONFIG_SHELL-/bin/sh}"} ++: ${SHELL="${CONFIG_SHELL-/usr/local/bin/bash}"} + : ${Xsed="$SED -e 1s/^X//"} + + # Global variables: +@@ -2770,7 +2770,7 @@ + $opt_debug + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). +- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || ++ if test "$nonopt" = "$SHELL" || test "$nonopt" = /usr/local/bin/bash || + # Allow the use of GNU shtool's install command. + case $nonopt in *shtool*) :;; *) false;; esac; then + # Aesthetically quote it. Index: files/patch-missing =================================================================== RCS file: files/patch-missing diff -N files/patch-missing --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-missing 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,17 @@ +--- missing.orig 2012-02-21 23:10:25.000000000 +0100 ++++ missing 2012-02-21 23:11:25.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/local/bin/bash + # Common stub for a few missing GNU programs while installing. + + scriptversion=2009-04-28.21; # UTC +@@ -209,7 +209,7 @@ + touch $file + else + test -z "$file" || exec >$file +- echo "#! /bin/sh" ++ echo "#! /usr/local/bin/bash" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" Index: files/patch-mk-dialog-so.sh =================================================================== RCS file: files/patch-mk-dialog-so.sh diff -N files/patch-mk-dialog-so.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-mk-dialog-so.sh 26 Feb 2012 21:35:28 -0000 @@ -0,0 +1,8 @@ +--- geanylua/util/mk-dialog-so.sh.orig 2012-02-21 23:08:36.000000000 +0100 ++++ geanylua/util/mk-dialog-so.sh 2012-02-21 23:08:50.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/local/bin/bash + + # This will create a separate dynamic shared library from the dialogs module + # that can be used with the Lua standalone interptreter. Index: files/patch-wscript =================================================================== RCS file: files/patch-wscript diff -N files/patch-wscript --- files/patch-wscript 9 Oct 2010 20:44:25 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- ./wscript.orig 2010-06-10 19:46:27.000000000 +0300 -+++ ./wscript 2010-09-21 08:36:25.926749379 +0300 -@@ -99,7 +99,7 @@ - [ 'geanylua/geanylua.c' ], # the other source files are listed in build_lua() - [ 'geanylua' ], - # maybe you need to modify the package name of Lua, try one of these: lua5.1 lua51 lua-5.1 -- [ [ 'lua', '5.1', True ] ]), -+ [ [ 'lua-5.1', '5.1', True ] ]), - Plugin('GeanyPrj', None, [ 'geanyprj/src' ]), - Plugin('Pretty-Printer', None, [ 'pretty-printer/src' ], [ [ 'libxml-2.0', '2.6.27', True ] ]), - Plugin('TreeBrowser', None, [ 'treebrowser/src' ], [ [ 'gio-2.0', '2.16', False ] ])