5 files changed, 44 insertions, 77 deletions
diff --git a/system/tabbed/README b/system/tabbed/README
index 8c122a748b..f93f15cf9d 100644
--- a/system/tabbed/README
+++ b/system/tabbed/README
@@ -1,2 +1,11 @@
-Simple generic tabbed fronted to xembed aware applications, originally designed
-for surf but also usable with many other application, i.e. uzbl, urxvt and xterm
+tabbed (framework for embeddable apps)
+
+Simple generic tabbed frontend to xembed aware applications, originally
+designed for surf but also usable with many other applications, e.g. st,
+uzbl, urxvt, and xterm.
+
+The default width and height for the tabbed window are hard-coded in
+the application, and can be set by setting WIDTH and HEIGHT environment
+variables.  Default size is 800x600. Example:
+
+  WIDTH=1024 HEIGHT=768 ./tabbed.SlackBuild
diff --git a/system/tabbed/README.SBo b/system/tabbed/README.SBo
deleted file mode 100644
index 4f75e19d11..0000000000
--- a/system/tabbed/README.SBo
+++ /dev/null
@@ -1,21 +0,0 @@
- CUSTOMIZATION
--------------
-Place patches in patches/ .  Any files in this directory will be
-applied before the build.  If you wish to make changes to the default
-keybindings or other settings, produce a patch against config.h.
-config.h is a copy of config.def.h distributed with the source
-tarball.
-
-Place any patches in the patches/ directory before starting the
-SlackBuild script.
-
-Example:
-
-$ tar xvf tabbed-0.3.tar.gz
-$ cd tabbed-0.3
-$ cp config.def.h config.h
-$ vi config.h
-[make customizations]
-$ diff -u config.def.h config.h > ../patches/config.patch
-$ cd ..
-$ sh tabbed.SlackBuild
diff --git a/system/tabbed/slack-desc b/system/tabbed/slack-desc
index 4a8ac09ede..c1e935528f 100644
--- a/system/tabbed/slack-desc
+++ b/system/tabbed/slack-desc
@@ -1,16 +1,16 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-tabbed: tabbed (simple Xembed container manager)
+tabbed: tabbed (framework for embeddable apps)
 tabbed:
-tabbed: tabbed is a simple Xembed container manager based on Xlib.
-tabbed:
-tabbed: Homepage: http://tools.suckless.org/tabbed
+tabbed: Simple generic tabbed frontend to xembed aware applications, 
+tabbed: originally designed for surf but also usable with many other 
+tabbed: applications, e.g. st, uzbl, urxvt, and xterm.
 tabbed:
 tabbed:
 tabbed:
diff --git a/system/tabbed/tabbed.SlackBuild b/system/tabbed/tabbed.SlackBuild
index 452b0c56db..3f0a22b84e 100644
--- a/system/tabbed/tabbed.SlackBuild
+++ b/system/tabbed/tabbed.SlackBuild
@@ -1,30 +1,13 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tabbed
 
-# Copyright (c) 2012, Nikolay Korotkiy <sikmir@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#   * Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY Tom Canich ''AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Tom Canich BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=tabbed
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,27 +53,23 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-sed \
-  -e 's|/usr/local|/usr|g' \
-  -e "s|^CFLAGS.*|CFLAGS += $SLKCFLAGS -std=c99 -pedantic -Wall \${INCS} \${CPPFLAGS}|g" \
-  -e 's|^LDFLAGS.*|LDFLAGS += ${LIBS}|g' \
-  -e 's|^LIBS.*|LIBS = -lX11|g' \
-  -e 's|share/man|man|g' \
-  -e '/^CC/d' \
-  -i config.mk
-
-make install DESTDIR=$PKG
+sed -i \
+  -e 's,share/man,man,' \
+  -e 's,usr/local,usr/,' \
+  -e "s,/usr/lib,/usr/lib$LIBDIRSUFFIX," \
+  -e "s,-O0,$SLKCFLAGS," \
+  config.mk
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+sed -i -e "s,800,${WIDTH:-800}," $PRGNAM.c
+sed -i -e "s,600,${HEIGHT:-600}," $PRGNAM.c
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make
+strip $PRGNAM
+make install DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
-cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/tabbed/tabbed.info b/system/tabbed/tabbed.info
index b7bcf3ff3a..c9c54a3a35 100644
--- a/system/tabbed/tabbed.info
+++ b/system/tabbed/tabbed.info
@@ -1,10 +1,10 @@
 PRGNAM="tabbed"
-VERSION="0.4.1"
-HOMEPAGE="http://tools.suckless.org/tabbed"
-DOWNLOAD="http://dl.suckless.org/tools/tabbed-0.4.1.tar.gz"
-MD5SUM="6349b763f8a4d5e42d18245169fb136c"
+VERSION="0.5"
+HOMEPAGE="http://tools.suckless.org/tabbed/"
+DOWNLOAD="http://dl.suckless.org/tools/tabbed-0.5.tar.gz"
+MD5SUM="cd9cfd696db745637486ec3b9bbe4b75"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Nikolay Korotkiy"
-EMAIL="sikmir@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"