office/devtodo: Updated for version 0.1.20

5 files changed, 60 insertions, 26 deletions

diff --git a/office/devtodo/README b/office/devtodo/README
index 455adc105c..808b92b43a 100644
--- a/office/devtodo/README
+++ b/office/devtodo/README
@@ -4,12 +4,13 @@ given one of five priority levels and a matchin colour level.
 
 Data is stored as XML, so various XSLT templates can be executed 
 on the XML to convert it into different formats (eg. HTML).
-
 Data is stored in a file named .todo in the current directory. 
 Depending on the setting of backup in your configuration file, there 
 may also be files named .todo.1, .todo.2, etc. 
 
-Additionally, it can automatically list outstanding items when you change 
-into a directory.
-
+Devtodo can display todo items as soon as you change a directory and on
+login using these scripts: /usr/doc/devtodo-0.1.20/profile.d/devtodo.{sh,csh}
 
+If you want to enable this feature, the above scripts should be added to 
+either the system wide shell initialization files (/etc/profile.d/*) or to
+a user specific initialization file.
diff --git a/office/devtodo/devtodo.SlackBuild b/office/devtodo/devtodo.SlackBuild
index 30fb7d4c9e..02631e2d1b 100644
--- a/office/devtodo/devtodo.SlackBuild
+++ b/office/devtodo/devtodo.SlackBuild
@@ -1,21 +1,40 @@
 #!/bin/sh
 
 # Slackware build script for: devtodo
-# Written by: Michiel van Wessem (BP{k}) <michiel@slackbuilds.org>
-
-set -e 
+# Copyright (c) 2007, Written by: Michiel van Wessem <michiel@slackbuilds.org>
+#
+# 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "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 THE COPYRIGHT
+# OWNER OR CONTRIBUTORS 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.
 
 PRGNAM=devtodo 
-VERSION=0.1.19
-CWD=`pwd`
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+VERSION=0.1.20
+ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-ARCH=${ARCH:-i486}
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="AUTHORS COPYING ChangeLog INSTALL NEWS README QuickStart"
+DOCFILES="AUTHORS COPYING ChangeLog INSTALL NEWS README QuickStart contrib"
 
 if [ "$ARCH" = "i486" ]; then
     SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -23,42 +42,47 @@ elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e 
+
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP 
 rm -rf $TMP/$PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz 
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
+./configure \
+  --prefix=/usr \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --disable-debug
 
-make 
+make
 make install-strip DESTDIR=$PKG
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{contrib,profile.d}
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat doc/scripts.sh > $PKG/usr/doc/$PRGNAM-$VERSION/profile.d/$PRGNAM.sh
+cat doc/scripts.tcsh > $PKG/usr/doc/$PRGNAM-$VERSION/profile.d/$PRGNAM.csh
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
+# Let's not clobber the config file
 mv $PKG/etc/todorc $PKG/etc/todorc.new
+
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
diff --git a/office/devtodo/devtodo.info b/office/devtodo/devtodo.info
index 9013a35fe5..73da4f2c29 100644
--- a/office/devtodo/devtodo.info
+++ b/office/devtodo/devtodo.info
@@ -1,8 +1,8 @@
 PRGNAM="devtodo"
-VERSION="0.1.19"
+VERSION="0.1.20"
 HOMEPAGE="http://swapoff.org/DevTodo"
-DOWNLOAD="http://swapoff.org/files/devtodo/devtodo-0.1.19.tar.gz"
-MD5SUM="723c86eae76c425ab9f271760bb951a3"
+DOWNLOAD="http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz"
+MD5SUM="4a6241437cb56f237f850bcd2233c3c4"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="Alan_Hicks"
+APPROVED="rworkman"
diff --git a/office/devtodo/doinst.sh b/office/devtodo/doinst.sh
index 5c6378d493..ee441332cc 100644
--- a/office/devtodo/doinst.sh
+++ b/office/devtodo/doinst.sh
@@ -12,6 +12,6 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-config etc/todorc.new
 
+config etc/todorc.new
 
diff --git a/office/devtodo/slack-desc b/office/devtodo/slack-desc
index 24bb592b92..75280cbe38 100644
--- a/office/devtodo/slack-desc
+++ b/office/devtodo/slack-desc
@@ -1,3 +1,11 @@
+# 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 ':'.
+
+       |-----handy-ruler------------------------------------------------------|
 devtodo: Developer Todo (console based todo list)
 devtodo: 
 devtodo: Developer Todo is a program to assist developers in maintaining a 
@@ -8,3 +16,4 @@ devtodo:
 devtodo: homepage: http://swapoff.org/DevTodo
 devtodo: 
 devtodo: 
+devtodo: