4 files changed, 37 insertions, 18 deletions
diff --git a/development/javacc/LICENSE b/development/javacc/LICENSE
new file mode 100644
index 0000000000000..35581220559d4
--- /dev/null
+++ b/development/javacc/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2006, Sun Microsystems, Inc.
+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.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Sun Microsystems, Inc. nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+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.
+
diff --git a/development/javacc/README b/development/javacc/README
index 0d285777466a0..8cb39b7c09c52 100644
--- a/development/javacc/README
+++ b/development/javacc/README
@@ -8,3 +8,6 @@ JJTree included with JavaCC), actions, debugging, etc.
 
 This is just a binary repackaging script. All you need to run the
 application, once installed, is a Java Runtime Environment (JRE).
+
+For documentation and examples refer to the github repository:
+https://github.com/javacc/javacc
diff --git a/development/javacc/javacc.SlackBuild b/development/javacc/javacc.SlackBuild
index aff4b37fae0c6..76d208a32d961 100644
--- a/development/javacc/javacc.SlackBuild
+++ b/development/javacc/javacc.SlackBuild
@@ -31,7 +31,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=javacc
-VERSION=${VERSION:-6.0}
+VERSION=${VERSION:-7.0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -50,35 +50,24 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENSE doc/* examples"
+DOCS="LICENSE"
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-unzip "$CWD/${PRGNAM}-${VERSION}.zip"
-cd $PRGNAM-$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
 
 # Create destination directories
 mkdir -p "$PKG/opt/$PRGNAM/" "$PKG/usr/bin" "$PKG/usr/doc/$PRGNAM-$VERSION"
 
 # Copy the main program
-cp bin/lib/javacc.jar "$PKG/opt/$PRGNAM"
+install -m 0755 $CWD/$PRGNAM-$VERSION.jar "$PKG/opt/$PRGNAM"
 
 # Copy the wrapper scripts to /usr/bin
 install -m0755 -t "$PKG/usr/bin" "$CWD/javacc" "$CWD/jjtree" "$CWD/jjdoc"
 
-cp -a \
-  $DOCS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a  $CWD/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/javacc/javacc.info b/development/javacc/javacc.info
index 0afdf255ac4a1..37073d70bed45 100644
--- a/development/javacc/javacc.info
+++ b/development/javacc/javacc.info
@@ -1,8 +1,8 @@
 PRGNAM="javacc"
-VERSION="6.0"
+VERSION="7.0.10"
 HOMEPAGE="https://javacc.org/"
-DOWNLOAD="https://javacc.org/downloads/javacc-6.0.zip"
-MD5SUM="74e524f71eea2b2b70d6a2d30b1904a9"
+DOWNLOAD="https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.10/javacc-7.0.10.jar"
+MD5SUM="87d9c6fdc5a4e197eb6d52b2e3cd406b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"