tabbed: fix *FLAGS (and remove meh-git)

srcpkgs/meh-git/template

@@ -1,23 +0,0 @@
-# Template file for 'meh-git'
-pkgname=meh-git
-version=20140803
-revision=2
-hostmakedepends="git"
-makedepends="libX11-devel libXext-devel libjpeg-turbo-devel giflib-devel libpng-devel"
-build_style=gnu-makefile
-short_desc="Small, simple and super fast image viewer"
-maintainer="Ypnose <linuxienATlegtuxDOTorg>"
-license="MIT"
-homepage="http://www.johnhawthorn.com/meh/"
-provides="meh-${version}_${revision}"
-replaces="meh>=0"
-
-do_fetch() {
-	local url="git://github.com/jhawthorn/meh"
-	msg_normal "Fetching source from $url ...\n"
-	git clone ${url} ${pkgname}-${version}
-}
-
-post_install() {
-	vinstall COPYING 644 usr/share/licenses/meh
-}

srcpkgs/tabbed/files/config.h

@@ -1,58 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* appearance */
-static const char font[]        = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
-static const char* normbgcolor  = "#222222";
-static const char* normfgcolor  = "#cccccc";
-static const char* selbgcolor   = "#555555";
-static const char* selfgcolor   = "#ffffff";
-static const char before[]      = "<";
-static const char after[]       = ">";
-static const int  tabwidth      = 200;
-static const Bool foreground    = True;
-
-/*
- * Where to place a new tab when it is opened. When npisrelative is True,
- * then the current position is changed + newposition. If npisrelative
- * is False, then newposition is an absolute position.
- */
-static int  newposition   = 0;
-static Bool npisrelative  = False;
-
-#define SETPROP(p) { \
-	.v = (char *[]){ "/bin/sh", "-c", \
-		"prop=\"`xwininfo -children -id $1 | grep '^     0x' | sed -e's@^ *\\(0x[0-9a-f]*\\) \"\\([^\"]*\\)\".*@\\1 \\2@' | xargs -0 printf %b | dmenu -l 10`\" &&" \
-		"xprop -id $1 -f $0 8s -set $0 \"$prop\"", \
-		p, winid, NULL \
-	} \
-}
-
-#define MODKEY ControlMask
-static Key keys[] = { \
-	/* modifier                     key        function        argument */
-	{ MODKEY|ShiftMask,             XK_Return, focusonce,      { 0 } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          { 0 } },
-	{ MODKEY,                       XK_t,      spawn,          SETPROP("_TABBED_SELECT_TAB") },
-
-	{ MODKEY|ShiftMask,             XK_l,      rotate,         { .i = +1 } },
-	{ MODKEY|ShiftMask,             XK_h,      rotate,         { .i = -1 } },
-	{ MODKEY|ShiftMask,             XK_j,      movetab,        { .i = -1 } },
-	{ MODKEY|ShiftMask,             XK_k,      movetab,        { .i = +1 } },
-	{ MODKEY,                       XK_Tab,    rotate,         { .i = 0 } },
-
-	{ MODKEY,                       XK_1,      move,           { .i = 0 } },
-	{ MODKEY,                       XK_2,      move,           { .i = 1 } },
-	{ MODKEY,                       XK_3,      move,           { .i = 2 } },
-	{ MODKEY,                       XK_4,      move,           { .i = 3 } },
-	{ MODKEY,                       XK_5,      move,           { .i = 4 } },
-	{ MODKEY,                       XK_6,      move,           { .i = 5 } },
-	{ MODKEY,                       XK_7,      move,           { .i = 6 } },
-	{ MODKEY,                       XK_8,      move,           { .i = 7 } },
-	{ MODKEY,                       XK_9,      move,           { .i = 8 } },
-	{ MODKEY,                       XK_0,      move,           { .i = 9 } },
-
-	{ MODKEY,                       XK_q,      killclient,     { 0 } },
-
-	{ 0,                            XK_F11,    fullscreen,     { 0 } },
-};
-

srcpkgs/tabbed/template

@@ -1,26 +1,26 @@
 # Template file for 'tabbed'
 pkgname=tabbed
 version=0.6
-revision=2
-homepage="http://tools.suckless.org/tabbed/"
-distfiles="http://dl.suckless.org/tools/$pkgname-$version.tar.gz"
+revision=3
+homepage="http://tools.suckless.org/${pkgname}/"
+distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
 build_style=gnu-makefile
 make_build_args="INCS=-I. LIBS=-lX11"
 makedepends="libX11-devel"
 short_desc="Tab interface for application supporting Xembed"
-maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+maintainer="Ypnose <ypnoseATvoidlinuxDOTeu>"
 license="MIT"
-checksum=7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42
+checksum="7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42"
 
 pre_build() {
-	cp ${FILESDIR}/config.h config.h
-	sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
-	sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
-	sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
+	sed -i 's|-O0 ||g' config.mk
+	sed -i 's|^CPPFLAGS =|override CPPFLAGS +=|g' config.mk
+	sed -i 's|^CFLAGS =|override CFLAGS +=|g' config.mk
+	sed -i 's|^LDFLAGS =|override LDFLAGS +=|g' config.mk
 	# Remove BSD_SOURCE warning
 	sed -i 's/-D_BSD_SOURCE/-D_DEFAULT_SOURCE/g' config.mk
 }
 
 post_install() {
-	vinstall LICENSE 644 usr/share/licenses/$pkgname
+	vlicense LICENSE
 }