Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=c528b7621999c28453b583ee6cabbb8feb5d7c59
commit c528b7621999c28453b583ee6cabbb8feb5d7c59
Author: James Buren
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
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: mitchellcaladbolgnet
+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, _,
