Merge branch '3.0' into 3.1

dvtm/.md5sum

@@ -1,2 +1,2 @@
-15dd5c17d39fca0e043577985ee1c6a6  config.h
-0c7167dc898df1693c20e2a34ba3e947  dvtm-0.10.tar.gz
+492d9162182eadf4563aed842d682acd  config.h
+ce102246802bf443226c23e1e43aed3a  dvtm-0.12.tar.gz

dvtm/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  ncurses
 
 name=dvtm
-version=0.10
+version=0.12
 release=1
 source=(http://www.brain-dump.org/projects/$name/$name-$version.tar.gz config.h)
 

dvtm/config.h

@@ -76,10 +76,10 @@ static Key keys[] = {
 	{ MOD,   '7',           { focusn,         { "7" }                     } },
 	{ MOD,   '8',           { focusn,         { "8" }                     } },
 	{ MOD,   '9',           { focusn,         { "9" }                     } },
+	{ MOD,   '\t',          { focuslast,      { NULL }                    } },
 	{ MOD,   'q',           { quit,           { NULL }                    } },
 	{ MOD,   'a',           { togglerunall,   { NULL }                    } },
 	{ MOD,   'r',           { redraw,         { NULL }                    } },
-	{ MOD, 'X',       { lock,           { NULL }                    } },
 	{ MOD,   'B',           { togglebell,     { NULL }                    } },
 	{ MOD,   'v',           { copymode,       { NULL }                    } },
 	{ MOD,   '/',           { copymode,       { "/" }                     } },
@@ -89,6 +89,8 @@ static Key keys[] = {
 	{ MOD,   KEY_NPAGE,     { scrollback,     { "1"  }                    } },
 	{ MOD,   KEY_F(1),      { create,         { "man dvtm", "dvtm help" } } },
 	{ MOD,   MOD,           { send,           { (const char []){MOD, 0} } } },
+	{ NOMOD, KEY_SPREVIOUS, { scrollback,     { "-1" }                    } },
+	{ NOMOD, KEY_SNEXT,     { scrollback,     { "1"  }                    } },
 };
 
 static const ColorRule colorrules[] = {

gtkspell/.footprint

@@ -0,0 +1,13 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/gtkspell-2.0/
+drwxr-xr-x	root/root	usr/include/gtkspell-2.0/gtkspell/
+-rw-r--r--	root/root	usr/include/gtkspell-2.0/gtkspell/gtkspell.h
+drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libgtkspell.a
+-rwxr-xr-x	root/root	usr/lib/libgtkspell.la
+lrwxrwxrwx	root/root	usr/lib/libgtkspell.so -> libgtkspell.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libgtkspell.so.0 -> libgtkspell.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libgtkspell.so.0.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/gtkspell-2.0.pc

gtkspell/.md5sum

@@ -0,0 +1 @@
+f75dcc9338f182c571b321d37c606a94  gtkspell-2.0.16.tar.gz

gtkspell/Pkgfile

@@ -0,0 +1,28 @@
+# Description: Spell checking utility for GTK+ applications.
+# URL: http://gtkspell.sourceforge.net/
+# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
+# Packager: Brett Goulder, predatorfreak at dcaf-security dot org
+# Depends on: aspell-en enchant xorg-libxcomposite gtk
+
+name=gtkspell
+version=2.0.16
+release=1
+source="http://gtkspell.sourceforge.net/download/$name-$version.tar.gz"
+up2date="http://sourceforge.net/projects/gtkspell/files/"
+
+build() {
+	cd $name-$version
+
+	rm -f $SRC/po/*.{po,gmo}
+
+	sed -i \
+		-e 's/USE_NLS=yes/USE_NLS=no/' \
+		-e 's/ENABLE_NLS 1/ENABLE_NLS 0/' configure
+
+	sed -i -e 's/SUBDIRS = gtkspell examples docs po/SUBDIRS = gtkspell examples po/' Makefile.in
+
+	./configure --prefix=/usr
+	make
+	make DESTDIR=$PKG install
+}
+