summaryrefslogtreecommitdiffstats
path: root/network/ApacheDirectoryStudio
diff options
context:
space:
mode:
Diffstat (limited to 'network/ApacheDirectoryStudio')
-rw-r--r--network/ApacheDirectoryStudio/ApacheDirectoryStudio.SlackBuild20
-rw-r--r--network/ApacheDirectoryStudio/ApacheDirectoryStudio.info2
2 files changed, 16 insertions, 6 deletions
diff --git a/network/ApacheDirectoryStudio/ApacheDirectoryStudio.SlackBuild b/network/ApacheDirectoryStudio/ApacheDirectoryStudio.SlackBuild
index bd0fb4a30b..a7b19a761e 100644
--- a/network/ApacheDirectoryStudio/ApacheDirectoryStudio.SlackBuild
+++ b/network/ApacheDirectoryStudio/ApacheDirectoryStudio.SlackBuild
@@ -1,23 +1,33 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for ApacheDirectoryStudio
# Written by Vincent Batts, vbatts@hashbangbash.com
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=ApacheDirectoryStudio
VERSION=${VERSION:-2.0.0.v20130628}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
ARCH=${ARCH:-$(uname -m)}
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -90,5 +100,5 @@ 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.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/ApacheDirectoryStudio/ApacheDirectoryStudio.info b/network/ApacheDirectoryStudio/ApacheDirectoryStudio.info
index e9ca4ac34e..f9ff934955 100644
--- a/network/ApacheDirectoryStudio/ApacheDirectoryStudio.info
+++ b/network/ApacheDirectoryStudio/ApacheDirectoryStudio.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://archive.apache.org/dist/directory/studio/dist/2.0.0.v20130628/
MD5SUM="dba7618834772e30a7e93af7fb7e0b22"
DOWNLOAD_x86_64="https://archive.apache.org/dist/directory/studio/dist/2.0.0.v20130628/ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628.tar.gz"
MD5SUM_x86_64="c4a8a0b22fe352f1509f8f7fe2678f2a"
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
MAINTAINER="Vincent Batts"
EMAIL="vbatts@hashbangbash.com"