3 files changed, 61 insertions, 44 deletions

diff --git a/network/jetty/README b/network/jetty/README
index 4a9b44dc52..31368bff74 100644
--- a/network/jetty/README
+++ b/network/jetty/README
@@ -1,19 +1,17 @@
-Jetty provides a Web server and javax.servlet container, plus support
-for SPDY, WebSocket, OSGi, JMX, JNDI, JAAS and many other integrations.
-These components are open source and available for commercial use
-and distribution.
+Jetty provides a Web server and javax.servlet container, plus support for SPDY,
+WebSocket, OSGi, JMX, JNDI, JAAS and many other integrations.
+These components are open source and available for commercial use and distribution.
 
-Jetty is used in a wide variety of projects and products, both in
-development and production.  Jetty can be easily embedded in devices,
-tools, frameworks, application servers, and clusters.
+Jetty is used in a wide variety of projects and products, both in development and production.
+Jetty can be easily embedded in devices, tools, frameworks, application servers, and clusters.
 
-This script repacks the tar.gz into a slackware package.  It also
-links the startup script to /etc/rc.d/rc.jetty.
+This script repacks the tar.gz into a slackware package.
+It also links the startup script to /etc/rc.d/rc.jetty.
 
-## Startup To have this start upon each boot, add the following lines
-to /etc/rc.d/rc.local
+## Startup
+To have this start upon each boot, add the following lines to /etc/rc.d/rc.local
 
-	# Start jetty
-	if [ -x /etc/rc.d/rc.jetty ]; then
-	   /etc/rc.d/rc.jetty start
-	fi
+# Start jetty
+if [ -x /etc/rc.d/rc.jetty ]; then
+    /etc/rc.d/rc.jetty start
+fi
diff --git a/network/jetty/jetty.SlackBuild b/network/jetty/jetty.SlackBuild
index b20f98445b..9433633980 100644
--- a/network/jetty/jetty.SlackBuild
+++ b/network/jetty/jetty.SlackBuild
@@ -1,20 +1,24 @@
 #!/bin/sh
 #
 # Slackware build script for openfire
-# Written by Mário Antunes (mariolpantunes@gmail.com)
+# Written by Mário Antunes (mariolpantunes@gmail.com)
 
-PRGNAM="jetty"
-VERSION=${VERSION:-9.0.7.v20131107}
+PRGNAM=jetty
+VERSION=${VERSION:-9.2.3.v20140905}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
 ARCH=noarch
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$( uname -m )" = "x86_64" ]; then
+    LIBDIRSUFFIX="64"
+else
+    LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
@@ -22,37 +26,52 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-distribution-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-distribution-$VERSION.tar.*z
 cd $PRGNAM-distribution-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/opt/$PRGNAM/
-cp -a bin/ $PKG/opt/$PRGNAM/
-cp -a etc/ $PKG/opt/$PRGNAM/
-cp -a lib/ $PKG/opt/$PRGNAM/
-cp -a logs/ $PKG/opt/$PRGNAM/
-cp -a resources/ $PKG/opt/$PRGNAM/
-cp -a start.d/ $PKG/opt/$PRGNAM/
-cp -a start.ini $PKG/opt/$PRGNAM/
-cp -a start.jar $PKG/opt/$PRGNAM/
-cp -a webapps/ $PKG/opt/$PRGNAM/
-cp -a webapps.demo/ $PKG/opt/$PRGNAM/
-
-mkdir -p $PKG/etc/rc.d/
-ln -sv ../../opt/$PRGNAM/bin/jetty.sh $PKG/etc/rc.d/rc.jetty
-
-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
-
+mkdir -p $PKG/var/log/$PRGNAM
+mkdir -p $PKG/etc/{profile.d,rc.d}
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.html *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+
+cp -a bin demo-base etc lib modules resources start.d \
+    start.ini start.jar webapps $PKG/opt/$PRGNAM/
+
+cat << EOF > $PKG/etc/rc.d/rc.jetty
+#!/bin/sh
+export JAVA="/usr/lib$LIBDIRSUFFIX/java/bin/java"
+export JETTY_HOME="/opt/$PRGNAM"
+export JETTY_CONF="\$JETTY_HOME/etc/jetty.conf"
+export JETTY_LOGS="/var/log/$PRGNAM"
+/opt/jetty/bin/jetty.sh "\$@"
+EOF
+
+chmod 0755 $PKG/etc/rc.d/*
+
+cp -a *.html *.txt *.TXT $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
+
+cat << EOF > $PKG/etc/profile.d/$PRGNAM.csh
+#!/bin/csh
+setenv JETTY_HOME="/opt/$PRGNAM"
+setenv JETTY_CONF="\$JETTY_HOME/etc/jetty.conf"
+setenv JETTY_LOGS="/var/log/$PRGNAM"
+EOF
+
+cat << EOF > $PKG/etc/profile.d/$PRGNAM.sh
+#!/bin/sh
+export JETTY_HOME="/opt/$PRGNAM"
+export JETTY_CONF="\$JETTY_HOME/etc/jetty.conf"
+export JETTY_LOGS="/var/log/$PRGNAM"
+EOF
+
+chmod 0755 $PKG/etc/profile.d/*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/jetty/jetty.info b/network/jetty/jetty.info
index 09d9802d69..1e3eae70ea 100644
--- a/network/jetty/jetty.info
+++ b/network/jetty/jetty.info
@@ -1,8 +1,8 @@
 PRGNAM="jetty"
-VERSION="9.0.7.v20131107"
+VERSION="9.2.3.v20140905"
 HOMEPAGE="http://www.eclipse.org/jetty/"
-DOWNLOAD="http://harrier.slackbuilds.org/misc/jetty-distribution-9.0.7.v20131107.tar.gz"
-MD5SUM="ae49869b0f8d4542b9ef3b6829919657"
+DOWNLOAD="http://ftp.osuosl.org/pub/eclipse/jetty/stable-9/dist/jetty-distribution-9.2.3.v20140905.tar.gz"
+MD5SUM="ab0822beb826a5db91de46d1d281afb7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"