4 files changed, 25 insertions, 23 deletions
diff --git a/system/commons-daemon/README b/system/commons-daemon/README
index 742c932cc1f8c..e3b048090c7ca 100644
--- a/system/commons-daemon/README
+++ b/system/commons-daemon/README
@@ -4,5 +4,4 @@ used instead of the above mentioned public static void main(String[]) method.
 This specification cover the behavior and life cycle of what we define as
 Java(tm) daemons, or, in other words, non interactive Java(tm) applications.
 
-commons-daemon requires apache-ant at build-time; apache-ant is also
-available from SlackBuilds.org.
+commons-daemon requires apache-ant and jdk from /extra at build-time.
diff --git a/system/commons-daemon/commons-daemon.SlackBuild b/system/commons-daemon/commons-daemon.SlackBuild
index 9cd98298669bd..c0041bd4b6bd0 100644
--- a/system/commons-daemon/commons-daemon.SlackBuild
+++ b/system/commons-daemon/commons-daemon.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for commons-daemon
 
-# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=commons-daemon
-VERSION=1.0.1
+VERSION=1.0.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -49,9 +49,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf daemon-$VERSION
-tar xvf $CWD/daemon-$VERSION.tar.gz
-cd daemon-$VERSION
+rm -rf $PRGNAM-$VERSION-src
+tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+cd $PRGNAM-$VERSION-src
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -59,7 +59,10 @@ ant dist
 
 mkdir -p $PKG/usr/{share/java,bin}
 
-cp dist/commons-daemon.jar $PKG/usr/share/java/
+cp dist/$PRGNAM-$VERSION.jar $PKG/usr/share/java/
+cd $PKG/usr/share/java
+  ln -s $PRGNAM-$VERSION.jar $PRGNAM.jar
+cd -
 
 cd src/native/unix/
   CFLAGS="$SLKCFLAGS" \
@@ -70,15 +73,15 @@ cd src/native/unix/
     --sysconfdir=/etc \
     --localstatedir=/var \
     --mandir=/usr/man \
-    --disable-static \
     --build=$ARCH-slackware-linux
+  make clean
   make
-  install -m 755 jsvc $PKG/usr/bin/jsvc
+  install -m 0755 jsvc $PKG/usr/bin/jsvc
 cd -
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/jsvc
 cd dist
-  cp -a docs/api LICENSE NOTICE.txt RELEASE-NOTES.txt \
+  cp -a docs/api LICENSE.txt NOTICE.txt RELEASE-NOTES.txt \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cd -
 cd src/native/unix/
diff --git a/system/commons-daemon/commons-daemon.info b/system/commons-daemon/commons-daemon.info
index 45911ff0d1950..53f92fbf57852 100644
--- a/system/commons-daemon/commons-daemon.info
+++ b/system/commons-daemon/commons-daemon.info
@@ -1,10 +1,10 @@
 PRGNAM="commons-daemon"
-VERSION="1.0.1"
+VERSION="1.0.2"
 HOMEPAGE="http://commons.apache.org/daemon/index.html"
-DOWNLOAD="http://www.apache.org/dist/commons/daemon/source/daemon-1.0.1.tar.gz"
+DOWNLOAD="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.2-src.tar.gz"
+MD5SUM="a6c68eed204bc9f1ef3b77488edfcfeb"
 DOWNLOAD_x86_64=""
-MD5SUM="df3eb5aafa53ca530843a09d40b8a1c0"
 MD5SUM_x86_64=""
-MAINTAINER="pprkut"
+MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
 APPROVED="rworkman"
diff --git a/system/commons-daemon/slack-desc b/system/commons-daemon/slack-desc
index b45e54e875039..06b4b24fbf6a3 100644
--- a/system/commons-daemon/slack-desc
+++ b/system/commons-daemon/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-              |-----handy-ruler----------------------------------------------|
+              |-----handy-ruler-------------------------------------------------------|
 commons-daemon: commons-daemon (Jakarta Commons Daemon Package)
 commons-daemon:
-commons-daemon: The scope of this package is to define an API in line with
-commons-daemon: the current Java(tm) Platform APIs to support an alternative
-commons-daemon: invocation mechanism which could be used instead of the above
-commons-daemon: mentioned public static void main(String[]) method. This
-commons-daemon: specification cover the behavior and life cycle of what we
-commons-daemon: define as Java(tm) daemons, or, in other words, non
-commons-daemon: interactive Java(tm) applications.
+commons-daemon: The scope of this package is to define an API in line with the current
+commons-daemon: Java(tm) Platform APIs to support an alternative invocation
+commons-daemon: mechanism which could be used instead of the above mentioned public
+commons-daemon: static void main(String[]) method. This specification cover the
+commons-daemon: behavior and life cycle of what we define as Java(tm) daemons, or, in
+commons-daemon: other words, non interactive Java(tm) applications.
 commons-daemon:
 commons-daemon: Homepage: http://commons.apache.org/daemon/index.html
+commons-daemon: