java/antlr2: fix deps, but remove antrl2-sharp

1 files changed, 21 insertions, 18 deletions

diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD
index 4269d30c7..3468e25fc 100644
--- a/java/antlr2/PKGBUILD
+++ b/java/antlr2/PKGBUILD
@@ -1,17 +1,22 @@
-# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor: George Giorgidze <giorgidze (at) gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
+# FIXME: antlr2-sharp doesn't build with mono 3.
+
 pkgbase=antlr2
-pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+#MONO pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+pkgname=(antlr2 antlr2-{java,python2,cxx})
 pkgver=2.7.7
+pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
 
-pkgrel=3
+pkgrel=3.1
 arch=('i686' 'x86_64')
-makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+#MONO makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+makedepends=('java-environment' 'python2' 'sh' 'jh')
 source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
 	"http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
 	'runantlr2.sh' 'gcc4.4.patch' 'mono.patch')
@@ -25,8 +30,8 @@ build() {
   ./configure --prefix=/usr --disable-examples
   make -j1
 
-  cd lib/csharp
-  nant release
+  #MONO cd lib/csharp
+  #MONO nant release
 }
 
 _install_license() {
@@ -35,7 +40,6 @@ _install_license() {
 }
 
 package_antlr2() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
   depends=('sh' 'antlr2-java')
 
   install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
@@ -43,7 +47,7 @@ package_antlr2() {
 }
 
 package_antlr2-java() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Java version)"
+  pkgdesc+=" (Java version)"
   depends=('java-runtime')
 
   provides=("java-antlr2=$pkgver")
@@ -51,16 +55,16 @@ package_antlr2-java() {
   replaces=("java-antlr2")
 
   DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \
-	  "$srcdir"/antlr-${pkgver}.pom \
-	  "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
-	  antlr2.jar
+    "$srcdir"/antlr-${pkgver}.pom \
+    "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
+    antlr2.jar
 
   _install_license
 }
 
 package_antlr2-python2() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Python version)"
-  depends=('antlr2' 'python2')
+  pkgdesc+=" (Python version)"
+  depends=('python2')
 
   provides=("python2-antlr2=$pkgver")
   conflicts=("python2-antlr2")
@@ -73,8 +77,7 @@ package_antlr2-python2() {
 }
 
 package_antlr2-cxx() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C++ version)"
-  depends=('java-runtime')
+  pkgdesc+=" (C++ version)"
 
   cd "$srcdir"/antlr-${pkgver}/lib/cpp
   make -j1 prefix="${pkgdir}/usr" install
@@ -83,8 +86,8 @@ package_antlr2-cxx() {
 }
 
 package_antlr2-sharp() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C Sharp version)"
-  depends=('antlr2' 'mono')
+  pkgdesc+=" (C Sharp version)"
+  depends=('mono')
 
   cd "$srcdir"/antlr-${pkgver}/lib/csharp
   install -d "$pkgdir"/usr/share