antlr2-2.7.7-7.parabola1: Rebuild for c++ ABI change

2 files changed, 16 insertions, 60 deletions

diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD
index a8d9c55b5..600f18159 100644
--- a/libre/antlr2/PKGBUILD
+++ b/libre/antlr2/PKGBUILD
@@ -4,40 +4,36 @@
 # Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgbase=antlr2
-pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+pkgname=('antlr2' antlr2-{java,python2,cxx})
 pkgver=2.7.7
-pkgdesc="Another Tool for Language Recognition"
+pkgrel=7.parabola1
+pkgdesc="Language recognition tool providing a framework to build grammatical parsers"
+arch=('i686' 'x86_64' 'armv7h')
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
-
-pkgrel=6.1.parabola1
-arch=('i686' 'x86_64' 'mips64el')
+makedepends=('java-environment' 'python2' 'bash' 'jh')
 options=('staticlibs')
-makedepends=('java-environment' 'python2' 'bash' 'nant' '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')
+        "https://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
+        'runantlr2.sh'
+        'gcc4.4.patch')
 md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
          '78af3de823003f6d8dded39c70bc30ae'
          '05cb34ec96d85fca430dda91c3200ba4'
-         '158677e4c0f357afbb56656231a54815'
-         '0d1960d27ff81f2fea0dd35a8290216f')
+         '158677e4c0f357afbb56656231a54815')
 
 prepare() {
   cd "${srcdir}/antlr-${pkgver}"
   patch -Np1 -i "${srcdir}"/gcc4.4.patch
-  patch -Np1 -i "${srcdir}"/mono.patch
 }
 
 build() {
   cd "${srcdir}/antlr-${pkgver}"
 
-  ./configure --prefix=/usr --disable-examples
-  make -j1
-
-  cd lib/csharp
-  nant release
+  ./configure --prefix=/usr \
+    --disable-examples \
+    --disable-csharp
+  make
 }
 
 _install_license() {
@@ -65,6 +61,8 @@ package_antlr2-java() {
     "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
     antlr2.jar
 
+  ln -s "/usr/share/java/antlr2.jar" \
+    "${pkgdir}/usr/share/java/antlr2-${pkgver}.jar"
   _install_license
 }
 
@@ -86,18 +84,7 @@ package_antlr2-cxx() {
   pkgdesc+=" (C++ version)"
 
   cd "$srcdir"/antlr-${pkgver}/lib/cpp
-  make -j1 prefix="${pkgdir}/usr" install
-
-  _install_license
-}
-
-package_antlr2-sharp() {
-  pkgdesc+=" (C Sharp version)"
-  depends=('mono')
-
-  cd "$srcdir"/antlr-${pkgver}/lib/csharp
-  install -d "$pkgdir"/usr/share
-  make -j1 prefix="${pkgdir}/usr" install
+  make prefix="${pkgdir}/usr" install
 
   _install_license
 }
diff --git a/libre/antlr2/mono.patch b/libre/antlr2/mono.patch
deleted file mode 100644
index 59c78d811..000000000
--- a/libre/antlr2/mono.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ruN antlr-2.7.7.orig/lib/csharp/antlr.runtime.build antlr-2.7.7/lib/csharp/antlr.runtime.build
---- antlr-2.7.7.orig/lib/csharp/antlr.runtime.build	2006-11-01 16:37:17.000000000 -0500
-+++ antlr-2.7.7/lib/csharp/antlr.runtime.build	2013-05-14 20:07:32.000000000 -0400
-@@ -25,6 +25,9 @@
-     	
- 		<!-- Use script task to get this from AssemblyInfo.cs using a regular expression -->
- 		<script language="C#">
-+			<imports>
-+				<import namespace="System.Text.RegularExpressions" />
-+			</imports>
- 			<code><![CDATA[
- 				public static void ScriptMain(Project project) {
- 					string assemblyInfoFileName = Path.Combine(project.BaseDirectory, "antlr.runtime/AssemblyInfo.cs");
-@@ -122,7 +125,7 @@
-         </csc>
- 
-         <!-- copy the antlr.runtime assembly to the astframe build folder -->
--        <copy file="${compile.dir}\${project.FileName}.dll" tofile="${astframe.compile.dir}\${project.FileName}.dll" />
-+        <copy file="${compile.dir}/${project.FileName}.dll" tofile="${astframe.compile.dir}/${project.FileName}.dll" />
- 
-         <!-- compile antlr.astframe.dll -->
-         <csc target="library" output="${astframe.compile.dir}/${astframe.FileName}.dll" debug="${debug}" doc="${astframe.build.dir}/${astframe.FileName}.xml">
-@@ -134,7 +137,7 @@
- 	            	<include name="System.dll" />
- 					<include name="System.Drawing.dll" />
- 					<include name="System.Windows.Forms.dll" />
--					<include name="${astframe.compile.dir}\${project.FileName}.dll" />
-+					<include name="${astframe.compile.dir}/${project.FileName}.dll" />
- 				</references>              					
- 				<arg value="/nowarn:1591"/>
-         </csc>