From 22df51df56c1f8e90ed0cf75b86fc8fdc7b6c04e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 23 Jun 2013 21:56:49 -0600
Subject: add java/beanshell and dependencies

---
 java/beanshell/PKGBUILD         | 45 +++++++++++++++++++++++++++++++
 java/java-commons-bsf/PKGBUILD  | 59 -----------------------------------------
 java/java-commons-bsf2/PKGBUILD | 59 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 59 deletions(-)
 create mode 100644 java/beanshell/PKGBUILD
 delete mode 100644 java/java-commons-bsf/PKGBUILD
 create mode 100644 java/java-commons-bsf2/PKGBUILD

diff --git a/java/beanshell/PKGBUILD b/java/beanshell/PKGBUILD
new file mode 100644
index 000000000..95b14d379
--- /dev/null
+++ b/java/beanshell/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): AndyRTR <andyrtr at archlinux.org>
+
+pkgname=beanshell
+pkgver=2.0b4
+pkgrel=2.1
+pkgdesc="Lightweight scripting for Java"
+url="http://www.beanshell.org/"
+license=('LGPL')
+
+provides=('bsh')
+
+arch=('any')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'java-servlet3.0-tomcat')
+source=("http://www.beanshell.org/bsh-${pkgver}-src.jar")
+
+prepare() {
+  cd "$srcdir"/BeanShell-$pkgver
+
+  rm lib/*.jar
+  ln -s /usr/share/java/bsf2.jar lib/
+  ln -s /usr/share/java/javacc.jar lib/
+  ln -s /usr/share/java/servlet-api.jar lib/servlet.jar
+}
+
+build() {
+  cd "$srcdir"/BeanShell-$pkgver
+  ant dist
+}
+
+check() {
+  cd "$srcdir"/BeanShell-$pkgver
+  ant test
+}
+
+package() {
+  cd "$srcdir"/BeanShell-$pkgver/dist
+  install -d "${pkgdir}"/usr/share/java/
+  for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do
+    install -m644 $artifact-$pkgver.jar "${pkgdir}"/usr/share/java/$artifact.jar
+  done
+}
+
+sha1sums=('69b36df249654a04e777ab899046c50b8cc844ac')
diff --git a/java/java-commons-bsf/PKGBUILD b/java/java-commons-bsf/PKGBUILD
deleted file mode 100644
index 57a9dfc1a..000000000
--- a/java/java-commons-bsf/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=java-commons-bsf2
-pkgver=2.4.0
-url="https://commons.apache.org/proper/commons-bsf/"
-license=('Apache')
-pkgdesc="Bean Scripting Framework"
-
-pkgrel=1
-arch=('any')
-depends=('java-commons-logging')
-makedepends=('apache-ant')
-
-_mirror=http://archive.apache.org/dist
-source=($_mirror/commons/bsf/source/bsf-src-$pkgver.tar.gz
-  build-properties.xml::"https://svn.apache.org/viewvc/commons/proper/bsf/tags/bsf-2.4.0/build-properties.xml?view=co&content-type=text%2Fplain"
-)
-
-declare -A _opts
-#_opts[jacl]="/usr/share/java/jacl.jar"
-_opts[jython]="/opt/jython/jython.jar"
-#_opts[nexrexx]="/usr/share/java/nexrexx.jar"
-_opts[java-rhino]="/usr/share/java/js.jar"
-_opts[xalan-java]="/usr/share/java/xalan.jar"
-_opts[junit]="/usr/share/java/junit.jar"
-
-for pkg in "${!_opts[@]}"; do
-  optdepends+=("$pkg")
-  makedepends+=("$pkg")
-  _jars+="${_opts[$pkg]} "
-done
-
-prepare() {
-  cd "${srcdir}/bsf-${pkgver}"
-  rm lib/*.jar
-}
-
-build() {
-  cd "${srcdir}/bsf-${pkgver}"
-
-  for jar in $_jars; do
-	  ln -s "$jar" lib/
-  done
-
-  # Adjust it to work with jython 2.5+
-  sed -i 's/PyJavaInstance/PyJavaType/g' src/org/apache/bsf/engines/jython/*
-
-  ln -sf ../build-properties.xml ./
-  ant jar
-}
-
-package() {
-  cd "${srcdir}/bsf-${pkgver}"
-  install -Dm644 build/lib/bsf.jar "$pkgdir"/usr/share/java/bsf-$pkgver.jar
-  ln -s bsf-$pkgver.jar "$pkgdir"/usr/share/java/bsf2.jar
-}
-
-md5sums=('7e58b2a009c0f70ab36bbef420b25c07'
-         'd7180c2b95f1a5424f785a2482260eaa')
diff --git a/java/java-commons-bsf2/PKGBUILD b/java/java-commons-bsf2/PKGBUILD
new file mode 100644
index 000000000..57a9dfc1a
--- /dev/null
+++ b/java/java-commons-bsf2/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-commons-bsf2
+pkgver=2.4.0
+url="https://commons.apache.org/proper/commons-bsf/"
+license=('Apache')
+pkgdesc="Bean Scripting Framework"
+
+pkgrel=1
+arch=('any')
+depends=('java-commons-logging')
+makedepends=('apache-ant')
+
+_mirror=http://archive.apache.org/dist
+source=($_mirror/commons/bsf/source/bsf-src-$pkgver.tar.gz
+  build-properties.xml::"https://svn.apache.org/viewvc/commons/proper/bsf/tags/bsf-2.4.0/build-properties.xml?view=co&content-type=text%2Fplain"
+)
+
+declare -A _opts
+#_opts[jacl]="/usr/share/java/jacl.jar"
+_opts[jython]="/opt/jython/jython.jar"
+#_opts[nexrexx]="/usr/share/java/nexrexx.jar"
+_opts[java-rhino]="/usr/share/java/js.jar"
+_opts[xalan-java]="/usr/share/java/xalan.jar"
+_opts[junit]="/usr/share/java/junit.jar"
+
+for pkg in "${!_opts[@]}"; do
+  optdepends+=("$pkg")
+  makedepends+=("$pkg")
+  _jars+="${_opts[$pkg]} "
+done
+
+prepare() {
+  cd "${srcdir}/bsf-${pkgver}"
+  rm lib/*.jar
+}
+
+build() {
+  cd "${srcdir}/bsf-${pkgver}"
+
+  for jar in $_jars; do
+	  ln -s "$jar" lib/
+  done
+
+  # Adjust it to work with jython 2.5+
+  sed -i 's/PyJavaInstance/PyJavaType/g' src/org/apache/bsf/engines/jython/*
+
+  ln -sf ../build-properties.xml ./
+  ant jar
+}
+
+package() {
+  cd "${srcdir}/bsf-${pkgver}"
+  install -Dm644 build/lib/bsf.jar "$pkgdir"/usr/share/java/bsf-$pkgver.jar
+  ln -s bsf-$pkgver.jar "$pkgdir"/usr/share/java/bsf2.jar
+}
+
+md5sums=('7e58b2a009c0f70ab36bbef420b25c07'
+         'd7180c2b95f1a5424f785a2482260eaa')
-- 
cgit v1.2.3