Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c528b7621999c28453b583ee6cabbb8feb5d7c59
commit c528b7621999c28453b583ee6cabbb8feb5d7c59
Author: James Buren <r...@frugalware.org>
Date: Tue Aug 24 06:10:41 2010 -0500
textadept-3.1-1-i686
* version bump
* drop ctags
* rewrite syntax support
diff --git a/source/xapps-extra/textadept/FrugalBuild
b/source/xapps-extra/textadept/FrugalBuild
index 8be15a1..3f90ca7 100644
--- a/source/xapps-extra/textadept/FrugalBuild
+++ b/source/xapps-extra/textadept/FrugalBuild
@@ -2,71 +2,57 @@
# Maintainer: James Buren <r...@frugalware.org>
pkgname=textadept
-pkgver=2.1
-pkgrel=2
+pkgver=3.1
+pkgrel=1
pkgdesc='An extremely extensible Text Editor, uses a modified version of
Scintilla.'
_F_googlecode_sep='_'
_F_googlecode_ext='.src.zip'
Finclude googlecode
source=(${sour...@]} $pkgname-frugalbuild.patch frugalbuild.lua)
depends=('gtk+2>=2.20.0-2' 'libxau' 'libxdmcp' 'libstdc++' 'libxext'
'libxdamage' 'libxml2')
-rodepends=('ctags')
options=('nodocs' 'scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
_F_desktop_name="Textadept"
_F_desktop_icon="$pkgname"
_F_desktop_categories="GTK;Development;Utility;TextEditor;"
-sha1sums=('1719a8a99d0935969f9715fef7fb15df06a9ed8c' \
- '9140fd8366f6cf877301c885877531c4e12f7537' \
- '38b85c9588f62bd9933797ed6d0fd2d2bb93544f')
+sha1sums=('9800e1528ec78a1f6e256cfb02e18292ecadc4c9' \
+ 'be7942bb5fcb625c155a91986a24ec27911cdddb' \
+ '2a02ef43aaa014448a37045f6b0a2cae4975a1ba')
build() {
- # Enforce our CFLAGS
+
+ Fpatchall
+
Fsed "-Os\?" "$CFLAGS" src/Makefile
- # Compile main binary
make -C src || Fdie
- # Modify to use exuberant-ctags
- Fsed "ctags -f" "exuberant-ctags -f" core/ext/pm/ctags_browser.lua
+ Fmkdir /usr/share/$pkgname
- # Patch for frugalbuild syntax hightlighting
- Fpatchall
+ Fdocrel LICENSE doc/*
- # Create necessary directories
- Fmkdir /usr/lib/$pkgname /usr/share/doc/$pkgname-$pkgver
+ Fcprel . /usr/share/$pkgname
- # Setup the main directory
- Fcprel . /usr/lib/$pkgname
- Fdirschmod /usr/lib/$pkgname 0755
- Ffileschmod /usr/lib/$pkgname 0644
+ Frm /usr/share/{src,doc,xcode,LICENSE}
- # Relocate documentation
- Fmv /usr/lib/$pkgname/LICENSE /usr/share/doc/$pkgname-$pkgver
- Fmv /usr/lib/$pkgname/doc/* /usr/share/doc/$pkgname-$pkgver
+ Fdirschmod /usr/share/$pkgname 0755
- # Set permissions for main binary
- Ffileschmod /usr/lib/$pkgname/$pkgname 0755
+ Ffileschmod /usr/share/$pkgname 0644
- # Strip symbols from main binary
- strip -s $Fdestdir/usr/lib/$pkgname/$pkgname || Fdie
+ strip $Fdestdir/usr/share/$pkgname/$pkgname || Fdie
- # Install desktop file
- Fdesktop2
+ Ffileschmod /usr/share/$pkgname/$pkgname 0755
+
+ Ffile /usr/share/$pkgname/lexers/frugalbuild.lua
- # Install frugalbuild lexer
- Ffile /usr/lib/$pkgname/lexers/frugalbuild.lua
+ Fln /usr/share/doc/$pkgname-$pkgver /usr/share/$pkgname/doc
- # Remove leftover clutter
- Frm /usr/lib/$pkgname/{src,doc}
+ Fln /usr/share/$pkgname/core/images/ta_128x128.png
/usr/share/pixmaps/$pkgname.png
- # Setup compatibility symlinks
- Fln /usr/share/doc/$pkgname-$pkgver /usr/lib/$pkgname/doc
- Fln /usr/lib/$pkgname/core/images/ta_128x128.png
/usr/share/pixmaps/$pkgname.png
+ Fdesktop2
- # Setup binary wrapper
- Fwrapper "cd /usr/lib/$pkgname;exec ./$pkgname \"\...@\"" $pkgname
+ Fwrapper "cd /usr/share/$pkgname;exec ./$pkgname \"\...@\"" $pkgname
}
# optimization OK
diff --git a/source/xapps-extra/textadept/frugalbuild.lua
b/source/xapps-extra/textadept/frugalbuild.lua
index 41550d7..b39240b 100644
--- a/source/xapps-extra/textadept/frugalbuild.lua
+++ b/source/xapps-extra/textadept/frugalbuild.lua
@@ -1,30 +1,23 @@
---[[
- Mitchell's lexers/shellscript.lua
- Copyright (c) 2006-2009 Mitchell Foral. All rights reserved.
+-- Frugalware Linux FrugalBuild LPeg Lexer
- SciTE-tools homepage: http://caladbolg.net/scite.php
- Send email to: mitchell<att>caladbolg<dott>net
+local l = lexer
+local token, style, color, word_match = l.token, l.style, l.color, l.word_match
+local P, R, S = l.lpeg.P, l.lpeg.R, l.lpeg.S
- Permission to use, copy, modify, and distribute this file
- is granted, provided credit is given to Mitchell.
+module(...)
- Shell LPeg lexer
-]]--
-
-module(..., package.seeall)
-local P, R, S = lpeg.P, lpeg.R, lpeg.S
-
-local ws = token('whitespace', space^1)
+local ws = token('whitespace', l.space^1)
-- comments
-local comment = token('comment', '#' * nonnewline^0)
+local comment = token('comment', '#' * l.nonnewline^0)
-- strings
-local sq_str = delimited_range("'", nil, true)
-local dq_str = delimited_range('"', '\\', true)
-local ex_str = delimited_range('`', '\\', true)
+local sq_str = l.delimited_range("'", nil, true)
+local dq_str = l.delimited_range('"', '\\', true)
+local ex_str = l.delimited_range('`', '\\', true)
local heredoc = '<<' * P(function(input, index)
- local s, e, _, delimiter = input:find('(["\']?)([%a_][%w_]*)%1[\n\r\f;]+',
index)
+ local s, e, _, delimiter =
+ input:find('(["\']?)([%a_][%w_]*)%1[\n\r\f;]+', index)
if s == index and delimiter then
local _, e = input:find('[\n\r\f]+'..delimiter, e)
return e and e + 1 or #input + 1
@@ -33,127 +26,112 @@ end)
local string = token('string', sq_str + dq_str + ex_str + heredoc)
-- numbers
-local number = token('number', float + integer)
+local number = token('number', l.float + l.integer)
-- keywords
-local keyword = token('keyword', word_match(word_list{
+local keyword = token('keyword', word_match({
+ 'patch', 'cd', 'make', 'patch', 'mkdir', 'cp', 'sed', 'install', 'rm',
'if', 'then', 'elif', 'else', 'fi', 'case', 'in', 'esac', 'while', 'for',
- 'do', 'done', 'continue', 'local', 'return',
+ 'do', 'done', 'continue', 'local', 'return', 'git', 'svn', 'co', 'clone',
+ 'gconf-merge-schema', 'msg', 'echo', 'ln',
-- operators
'-a', '-b', '-c', '-d', '-e', '-f', '-g', '-h', '-k', '-p', '-r', '-s', '-t',
'-u', '-w', '-x', '-O', '-G', '-L', '-S', '-N', '-nt', '-ot', '-ef', '-o',
- '-z', '-n', '-eq', '-ne', '-lt', '-le', '-gt', '-ge'
+ '-z', '-n', '-eq', '-ne', '-lt', '-le', '-gt', '-ge', '-Np', '-i'
}, '-'))
--- identifiers
-local identifier = token('identifier', word)
+-- functions
+local func = token('function', word_match {
+ 'Finclude', 'build', 'check_option', 'CMake_build', 'CMake_conf',
'CMake_install', 'CMake_make',
+ 'CMake_prepare_build', 'CMake_setup', 'Facu', 'Famsn_clean_files', 'Fant',
'Fautoconfize',
+ 'Fautoreconf', 'Fbuild', 'Fbuild_amsn', 'Fbuild_drupal', 'Fbuild_fonts',
'Fbuild_gnome_scriptlet',
+ 'Fbuild_haskell', 'Fbuild_haskell_regscripts', 'Fbuildkernel',
'Fbuild_kernelmod_scriptlet',
+ 'Fbuild_mono', 'Fbuildnetsurf', 'Fbuild_nvidia', 'Fbuild_nvidia_scriptlet',
'Fbuild_octave',
+ 'Fbuild_opensync', 'Fbuildpear', 'Fbuildpecl', 'Fbuild_perl',
'Fbuildsawfish',
+ 'Fbuild_slice_scrollkeeper', 'Fcd', 'Fcheckkernel', 'Fcleandestdir',
'_F_clutter_getver',
+ 'Fconf', 'Fconfoptstryset', 'Fcp', 'Fcpr', 'Fcprel', 'Fcprrel', 'Fdesktop',
'Fdesktop2',
+ 'Fdeststrip', 'Fdie', 'Fdirschmod', 'Fdirschown', 'Fdoc', 'Fdocrel', 'Fexe',
'Fexec', 'Fexerel',
+ 'Fextract', 'Ffile', 'Ffilerel', 'Ffileschmod', 'Ffileschown', 'Fgcj',
'Fgcjshared', 'Fgenscriptlet',
+ '_F_gnome_getver', 'Fgnustep_build', 'Fgnustep_init', 'Ficon', 'Ficonrel',
'Finstall', 'Finstallgem',
+ 'Finstallrel', 'Fjar', 'Fjavacleanup', 'Fkernel_genscriptlet_hook',
'Fkernelmod_genscriptlet_hook',
+ 'Fkernelver_genscriptlet_hook', 'Flastarchive', 'Flasttar', 'Flasttarbz2',
'Flasttgz', 'Fln', 'Fmake',
+ 'Fmakeinstall', 'Fman', 'Fmanrel', 'Fmessage', 'Fmkdir', 'Fmonocleanup',
'Fmonocompileaot', 'Fmonoexport',
+ 'Fmsgfmt', 'Fmv', 'Fnant', 'Fpatch', 'Fpatchall', 'Frcd', 'Frcd2',
'Freplace', 'Frm', 'Fsanitizeversion',
+ 'Fseamonkeyinstall', 'Fsed', 'Fsort', 'Fsplit', 'Fsubdestdir',
'Fsubdestdirinfo', 'Fsubmv', 'Ftreecmp',
+ 'Funpack_makeself', 'Funpack_scm', 'Fup2gnubz2', 'Fup2gnugz', 'Fuse',
'Fwcat', 'Fwrapper', 'Fxpiinstall',
+ 'i18n_language_from_locale', 'i18n_language_from_subtag',
'i18n_region_from_subtag', 'i18n_script_from_subtag',
+ 'KDE_build', 'KDE_cleanup', 'KDE_export_flags', 'KDE_install', 'KDE_make',
'KDE_make_split', 'KDE_project_install',
+ 'KDE_project_split', 'KDE_split', 'mozilla_i18n_foreach_lang',
'mozilla_i18n_lang_add', 'mozilla_i18n_lang_describe',
+ 'mozilla_i18n_lang_fini', 'mozilla_i18n_lang_install'
+})
--- variables
-local variable = token('variable', '$' * (S('!...@$') +
- delimited_range('()', nil, true, false, '\n') +
- delimited_range('[]', nil, true, false, '\n') +
- delimited_range('{}', nil, true, false, '\n') +
- delimited_range('`', nil, true, false, '\n') +
- digit^1 +
- word))
+local constant = token('constant', word_match {
+ 'pkgname', 'pkgver', 'pkgrel', 'pkgdesc', 'pkgdesc_localized', 'url',
'license', 'install', 'up2date', 'source',
+ 'sha1sums', 'signatures', 'groups', 'archs', 'backup', 'depends',
'makedepends', 'rodepends', 'conflicts',
+ 'provides', 'removes', 'replaces', 'options', 'subpkgs', 'subdescs',
'subdescs_localized', 'sublicense',
+ 'subreplaces', 'subgroups', 'subdepends', 'subrodepends', 'subremoves',
'subconflicts', 'subprovides',
+ 'subbackup', 'subinstall', 'suboptions', 'subarchs', '_F_amsn_clean_files',
'_F_amsn_name', '_F_archive_grep',
+ '_F_archive_grepv', '_F_archive_name', '_F_archive_nolinksonly',
'_F_archive_nosort', '_F_archive_prefix',
+ 'Farchs', '_F_aspell_lang', '_F_aspell_noverstrip', '_F_aspell_ver',
'_F_berlios_dirname', '_F_berlios_ext',
+ '_F_berlios_name', 'Fbuildchost', '_F_cd_path', '_F_clutter_devel',
'_F_clutter_name', '_F_clutter_pkgurl',
+ '_F_cmake_color', '_F_cmake_confopts', '_F_cmake_in_source_build',
'_F_cmake_rpath', '_F_cmake_src',
+ '_F_cmake_type', '_F_cmake_verbose', '_F_compiz_name', '_F_compiz_version',
'_F_conf_configure',
+ 'Fconfopts', '_F_conf_outsource', '_F_conf_perl_pipefrom',
'_F_desktop_categories', '_F_desktop_desc',
+ '_F_desktop_exec', '_F_desktop_filename', '_F_desktop_icon',
'_F_desktop_mime', '_F_desktop_mimetypes'
+ '_F_desktop_name', '_F_desktop_show_in', 'Fdestdir', 'Fdestir',
'_F_drupal_dev', '_F_drupal_module',
+ '_F_drupal_ver', '_F_e17_name', '_F_emul_arch', '_F_emul_name',
'_F_emul_ver', '_F_extract_taropts',
+ '_F_firefox_ext', '_F_firefox_id', '_F_firefox_name', '_F_firefox_nocurly',
'_F_fonts_dir',
+ '_F_fonts_subdir', '_F_gem_name', '_F_gensciptlet_hooks',
'_F_genscriptlet_hooks', '_F_genscriptlet_install',
+ '_F_gnome_desktop', '_F_gnome_devel', '_F_gnome_entries',
'_F_gnome_iconcache', '_F_gnome_mime', '_F_gnome_name',
+ '_F_gnome_pkgurl', '_F_gnome_pygtkdefsdir', '_F_gnome_schemas',
'_F_gnome_scriptlet', '_F_gnome_scrollkeeper',
+ '_F_gnustep_category', '_F_gnustep_name', '_F_googlecode_dirname',
'_F_googlecode_ext', '_F_googlecode_name',
+ '_F_googlecode_sep', '_F_haskell_confopts', '_F_haskell_ext',
'_F_haskell_install', '_F_haskell_name',
+ '_F_haskell_prefix', '_F_haskell_register_dir', '_F_haskell_sep',
'_F_haskell_setup', 'Fincdir', '_F_java_cflags',
+ '_F_javacleanup_opts', '_F_java_compiler', '_F_java_ldflags',
'_F_java_no_gcj', '_F_kde_defaults', '_F_kde_dirname',
+ '_F_kde_final', '_F_kde_folder', '_F_kde_id', '_F_kde_id2', '_F_kde_mirror',
'_F_kde_name', '_F_kde_pkgver',
+ '_F_kde_qtver', '_F_kde_subpkgs_custom_path', '_F_kde_unstable',
'_F_kde_ver', '_F_kernel_dontfakeversion',
+ '_F_kernelmod_dir', '_F_kernelmod_name', '_F_kernelmod_pkgver',
'_F_kernelmod_rel', '_F_kernelmod_scriptlet',
+ '_F_kernelmod_uname', '_F_kernelmod_ver', '_F_kernel_name',
'_F_kernel_patches', '_F_kernel_path', '_F_kernel_rel',
+ '_F_kernel_stable', '_F_kernel_uname', '_F_kernel_ver', '_F_kernel_verbose',
'_F_kernelver_rel', '_F_kernelver_stable',
+ '_F_kernelver_ver', '_F_kernel_vmlinuz', 'Flocalstatedir', 'Fmandir',
'Fmenudir', '_F_mono_aot', '_F_mozilla_i18n_dirname',
+ '_F_mozilla_i18n_mirror', '_F_mozilla_i18n_name',
'_F_mozilla_i18n_xpidirname', '_F_netsurf_name', '_F_netsurf_project',
+ '_F_nvidia_arch', '_F_nvidia_install', '_F_nvidia_legacyver',
'_F_nvidia_linkver', '_F_nvidia_name',
+ '_F_nvidia_opencl_linkver', '_F_nvidia_pkgnum', 'F_nvidia_pkgnum',
'_F_nvidia_up2date', '_F_pear_name',
+ '_F_pecl_name', '_F_perl_author', '_F_perl_ext', '_F_perl_name',
'_F_perl_no_source', '_F_perl_no_up2date',
+ '_F_perl_no_url', '_F_perl_sourcename', '_F_perl_url', 'Fpkgversep',
'Fprefix', '_F_python_libdir', '_F_python_ver',
+ '_F_rcd_name', '_F_sawfish_file', '_F_sawfish_name', '_F_scm_git_cloneopts',
'_F_scm_module', '_F_scm_password',
+ '_F_scm_tag', '_F_scm_tag2', '_F_scm_type', '_F_scm_url',
'_F_seamonkey_ext', '_F_seamonkey_name',
+ '_F_seamonkey_up2date_url', '_F_sourceforge_dirname', '_F_sourceforge_ext',
'_F_sourceforge_mirror',
+ '_F_sourceforge_name', '_F_sourceforge_pkgver', '_F_sourceforge_prefix',
'_F_sourceforge_realname',
+ '_F_sourceforge_sep', '_F_sourceforge_url', 'Fsrcdir', 'Fsysconfdir',
'_F_treecmp_findopts', '_F_vim_desc',
+ '_F_vim_encodings', '_F_vim_lang', '_F_xfce_goodies_dir',
'_F_xfce_goodies_ext', '_F_xfce_name', '_F_xfce_ver',
+ '_F_xorg_dir', '_F_xorg_ind', '_F_xorg_name', '_F_xorg_release_dir',
'_F_xorg_url', '_F_xorg_version'
+})
--- functions
-local functions = token('function', word_match(word_list{
- 'CMake_build', 'CMake_conf', 'CMake_make', 'CMake_prepare_build', 'Facu',
- 'Famsn_clean_files', 'Fant', 'Fautoconfize', 'Fautoreconf', 'Fbuild',
- 'Fbuild_amsn', 'Fbuild_drupal', 'Fbuild_fonts', 'Fbuild_gnome_scriptlet',
- 'Fbuild_haskell', 'Fbuild_haskell_regscripts', 'Fbuild_kde',
- 'Fbuild_kde_reconf', 'Fbuild_kde_split_docs', 'Fbuild_kernelmod_scriptlet',
- 'Fbuild_mono', 'Fbuild_nvidia', 'Fbuild_nvidia_scriptlet', 'Fbuild_octave',
- 'Fbuild_opensync', 'Fbuild_perl', 'Fbuild_rox', 'Fbuild_slice_scrollkeeper',
- 'Fbuild_thunderbird_i18n_scriptlet', 'Fbuildkernel', 'Fbuildpear',
- 'Fbuildpecl', 'Fbuildsawfish', 'Fcd', 'Fcheckkernel', 'Fconf',
- 'Fconfoptstryset', 'Fcp', 'Fcpr', 'Fcprel', 'Fcprrel', 'Fdesktop',
- 'Fdesktop2', 'Fdeststrip', 'Fdie', 'Fdirschmod', 'Fdirschown', 'Fdoc',
- 'Fdocrel', 'Fexe', 'Fexec', 'Fexerel', 'Fextract', 'Ffile', 'Ffilerel',
- 'Ffileschmod', 'Ffileschown', 'Fgcj', 'Fgcjshared', 'Fgnustep_build',
- 'Fgnustep_init', 'Ficon', 'Ficonrel', 'Finstall', 'Finstallgem',
- 'Finstallrel', 'Fjar', 'Fjavacleanup', 'Flastarchive', 'Flasttar',
- 'Flasttarbz2', 'Flasttgz', 'Fln', 'Fmake', 'Fmakeinstall', 'Fman',
- 'Fmanrel', 'Fmessage', 'Fmkdir', 'Fmonocleanup', 'Fmonocompileaot',
- 'Fmonoexport', 'Fmsgfmt', 'Fmv', 'Fnant', 'Fpatch', 'Fpatchall', 'Frcd',
- 'Frcd2', 'Frm', 'Frox_cleanup', 'Frox_compile', 'Frox_install',
- 'Frox_mkdir', 'Frox_setup', 'Fsanitizeversion', 'Fseamonkeyinstall',
- 'Fsed', 'Fsort', 'Fsplit', 'Funpack_makeself', 'Funpack_scm', 'Fup2gnubz2',
- 'Fup2gnugz', 'Fuse', 'Fwrapper', 'Fxpiinstall', 'build', 'check_option',
- 'Finclude'
-}))
+-- identifiers
+local identifier = token('identifier', l.word)
--- constants (variable names)
-local constants = token('constant', word_match(word_list{
- '_F_amsn_clean_files', '_F_amsn_name', '_F_archive_grep', '_F_archive_grepv',
- '_F_archive_name', '_F_archive_nolinksonly', '_F_archive_nosort',
- '_F_archive_prefix', '_F_aspell_lang', '_F_aspell_noverstrip',
- '_F_aspell_ver', '_F_berlios_dirname', '_F_berlios_ext', '_F_berlios_name',
- '_F_cd_path', '_F_clutter_devel', '_F_clutter_name', '_F_clutter_pkgurl',
- '_F_cmake_color', '_F_cmake_confopts', '_F_cmake_type', '_F_cmake_verbose',
- '_F_compiz_name', '_F_compiz_version', '_F_conf_configure',
- '_F_conf_perl_pipefrom', '_F_desktop_categories', '_F_desktop_desc',
- '_F_desktop_exec', '_F_desktop_filename', '_F_desktop_icon',
- '_F_desktop_mime', '_F_desktop_name', '_F_desktop_show_in',
- '_F_drupal_dev', '_F_drupal_module', '_F_drupal_ver', '_F_e17_name',
- '_F_emul_arch', '_F_firefox_ext', '_F_firefox_id', '_F_firefox_name',
- '_F_firefox_nocurly', '_F_fonts_subdir', '_F_gem_name', '_F_gnome_desktop',
- '_F_gnome_devel', '_F_gnome_entries', '_F_gnome_iconcache',
- '_F_gnome_mime', '_F_gnome_name', '_F_gnome_pkgurl', '_F_gnome_pygtkdefsdir',
- '_F_gnome_schemas', '_F_gnome_scriptlet', '_F_gnome_scrollkeeper',
- '_F_gnustep_name', '_F_googlecode_dirname', '_F_googlecode_ext',
- '_F_googlecode_name', '_F_googlecode_sep', '_F_haskell_confopts',
- '_F_haskell_ext', '_F_haskell_install', '_F_haskell_name',
- '_F_haskell_prefix', '_F_haskell_register_dir', '_F_haskell_sep',
- '_F_java_cflags', '_F_java_compiler', '_F_java_jars', '_F_java_ldflags',
- '_F_javacleanup_opts', '_F_kde_build_debug', '_F_kde_defaults',
- '_F_kde_do_not_compile', '_F_kde_id', '_F_kde_id2', '_F_kde_name',
- '_F_kde_reconf', '_F_kde_split_docs', '_F_kde_ver',
- '_F_kernel_dontfakeversion', '_F_kernel_name', '_F_kernel_path',
- '_F_kernel_rel', '_F_kernel_stable', '_F_kernel_uname', '_F_kernel_ver',
- '_F_kernel_vmlinuz', '_F_kernelmod_dir', '_F_kernelmod_name',
- '_F_kernelmod_pkgver', '_F_kernelmod_rel', '_F_kernelmod_scriptlet',
- '_F_kernelmod_uname', '_F_kernelmod_ver', '_F_kernelver_rel',
- '_F_kernelver_stable', '_F_kernelver_ver', '_F_nvidia_arch',
- '_F_nvidia_install', '_F_nvidia_legacyver', '_F_nvidia_linkver',
- '_F_nvidia_name', '_F_nvidia_pkgnum', '_F_nvidia_up2date', '_F_pear_name',
- '_F_pecl_name', '_F_perl_author', '_F_perl_ext', '_F_perl_name',
- '_F_perl_no_source', '_F_perl_no_up2date', '_F_perl_no_url',
- '_F_perl_sourcename', '_F_perl_url', '_F_python_libdir', '_F_python_ver',
- '_F_rcd_name', '_F_rox_name', '_F_rox_sep', '_F_rox_subdir',
- '_F_rox_use_hayber', '_F_rox_use_kerofin', '_F_rox_use_rox4debian',
- '_F_rox_use_sourceforge', '_F_sawfish_file', '_F_sawfish_name',
- '_F_scm_module', '_F_scm_password', '_F_scm_tag', '_F_scm_type',
- '_F_scm_url', '_F_seamonkey_ext', '_F_seamonkey_name',
- '_F_seamonkey_up2date_url', '_F_sourceforge_broken_up2date',
- '_F_sourceforge_dirname', '_F_sourceforge_ext', '_F_sourceforge_mirror',
- '_F_sourceforge_name', '_F_sourceforge_pkgver', '_F_sourceforge_prefix',
- '_F_sourceforge_sep', '_F_vim_desc', '_F_vim_encodings', '_F_vim_lang',
- '_F_vim_sug_encodings', '_F_xfce_goodies_dir', '_F_xfce_goodies_ext',
- '_F_xfce_name', '_F_xorg_ind', '_F_xorg_name', 'pkgname', 'pkgver',
- 'pkgrel', 'pkgdesc', 'pkgdesc_localized', 'url', 'license', 'install',
- 'up2date', 'source', 'sha1sums', 'signatures', 'groups', 'archs', 'backup',
- 'depends', 'makedepends', 'rodepends', 'conflicts', 'provides', 'removes',
- 'replaces', 'options', 'subpkgs', 'subdescs', 'subdescs_localized',
- 'sublicense', 'subreplaces', 'subgroups', 'subdepends', 'subrodepends',
- 'subremoves', 'subconflicts', 'subprovides', 'subbackup', 'subinstall',
- 'suboptions', 'subarchs'
-}))
+-- variables
+local variable =
+ token('variable', '$' * (S('!...@$') +
+ l.delimited_range('()', nil, true, false, '\n') +
+ l.delimited_range('[]', nil, true, false, '\n') +
+ l.delimited_range('{}', nil, true, false, '\n') +
+ l.delimited_range('`', nil, true, false, '\n') + l.digit^1 + l.word))
-- operators
local operator = token('operator', S('=!<>+-/*^~.,:;?()[]{}'))
-function LoadTokens()
- add_token(frugalbuild, 'whitespace', ws)
- add_token(frugalbuild, 'comment', comment)
- add_token(frugalbuild, 'string', string)
- add_token(frugalbuild, 'number', number)
- add_token(frugalbuild, 'keyword', keyword)
- add_token(frugalbuild, 'function', functions)
- add_token(frugalbuild, 'constant', constants)
- add_token(frugalbuild, 'identifier', identifier)
- add_token(frugalbuild, 'variable', variable)
- add_token(frugalbuild, 'operator', operator)
- add_token(frugalbuild, 'any_char', any_char)
-end
+_rules = {
+ { 'whitespace', ws },
+ { 'comment', comment },
+ { 'string', string },
+ { 'number', number },
+ { 'keyword', keyword },
+ { 'function', func },
+ { 'constant', constant },
+ { 'identifier', identifier },
+ { 'variable', variable },
+ { 'operator', operator },
+ { 'any_char', l.any_char },
+}
diff --git a/source/xapps-extra/textadept/textadept-frugalbuild.patch
b/source/xapps-extra/textadept/textadept-frugalbuild.patch
index 38db9de..07b241c 100644
--- a/source/xapps-extra/textadept/textadept-frugalbuild.patch
+++ b/source/xapps-extra/textadept/textadept-frugalbuild.patch
@@ -1,15 +1,13 @@
-Only in ../../../src/textadept_2.0: LICENSE
-diff -aur ../../../src/textadept_2.0/core/ext/mime_types.conf
textadept/core/ext/mime_types.conf
---- ../../../src/textadept_2.0/core/ext/mime_types.conf 2009-09-27
09:26:17.000000000 -0500
-+++ textadept/core/ext/mime_types.conf 2009-11-07 01:55:57.000000000 -0600
-@@ -12,6 +12,7 @@
- % #shbang_word lexer_name
- % /lua_pattern lexer_name
+diff -aur textadept_3.1/modules/textadept/mime_types.conf
textadept_3.1-2/modules/textadept/mime_types.conf
+--- textadept_3.1/modules/textadept/mime_types.conf 2010-08-21
00:29:14.000000000 -0500
++++ textadept_3.1-2/modules/textadept/mime_types.conf 2010-08-24
05:10:35.000000000 -0500
+@@ -94,6 +94,9 @@
+ f90 fortran
+ f95 fortran
++% FrugalBuild
+FrugalBuild frugalbuild
-
- % Actionscript
- as actionscript
-Only in textadept/doc: LICENSE
-Only in textadept/lexers: frugalbuild.lua
-Only in ../../../src/textadept_2.0: src
++
+ % Gap
+ g gap
+ gd gap
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
