remove references to lextor; 0.9.3-2

3 files changed, 49 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f9cf4cd214d..e9d694b9b994 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = apertium-en-ca
 	pkgdesc = Apertium language data for the English-Catalan (including Valencian) translator.
 	pkgver = 0.9.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://apertium.org
 	arch = i686
 	arch = x86_64
@@ -10,10 +10,13 @@ pkgbase = apertium-en-ca
 	depends = lttoolbox>=3.2
 	depends = apertium>=3.2
 	source = https://downloads.sourceforge.net/sourceforge/apertium/apertium-en-ca-0.9.3.tar.gz
+	source = Makefile.am.patch
 	source = configure.ac.patch
 	md5sums = c984145a73c10c332c45b92bb676c37a
+	md5sums = 452356ce2ca88ad9c7cba79c879f8961
 	md5sums = 69cf23698c83a2d4456a0b5c0f7d8a13
 	sha256sums = c56e1f1c3fece009dc7c6b68af70f04ca9fbdee8e4b5e2ed8ea603f2f22ef0d5
+	sha256sums = fd8d3d4b91201a4c451c9ca39dd1ccae26749d1e9a319bd1c6e5e899878be2de
 	sha256sums = f8e473ed4b180976d09a772f5d5f0827a019c4ad3ca420a818e38c9402da72e3
 
 pkgname = apertium-en-ca
diff --git a/Makefile.am.patch b/Makefile.am.patch
new file mode 100644
index 000000000000..e2578d94183d
--- /dev/null
+++ b/Makefile.am.patch
@@ -0,0 +1,39 @@
+--- src/apertium-en-ca-0.9.3/Makefile.am.old	2011-10-21 11:50:27.000000000 +0200
++++ src/apertium-en-ca-0.9.3/Makefile.am	2015-08-06 15:10:49.742491212 +0200
+@@ -14,16 +14,14 @@
+ 
+ TARGETS_COMMON = $(PREFIX1).automorf.bin $(PREFIX1).autobil.bin $(PREFIX1).autogen.bin \
+      $(PREFIX1).autopgen.bin $(PREFIX2).automorf.bin $(PREFIX2).autobil.bin \
+-     $(PREFIX2).autogen.bin $(PREFIX2).autopgen.bin $(PREFIX1).lextormono.bin $(PREFIX2).lextormono.bin \
+-     $(PREFIX1).lextorbil.bin $(PREFIX2).lextorbil.bin $(PREFIX1).genitive.bin \
++     $(PREFIX2).autogen.bin $(PREFIX2).autopgen.bin  \
++     $(PREFIX1).genitive.bin \
+      $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
+      $(PREFIX1)-poly.autobil.bin $(PREFIX2)-poly.autobil.bin empty.bin \
+      $(PREFIX2).t1x.bin $(PREFIX2).t2x.bin $(PREFIX2).t3x.bin modes \
+      $(PREFIX2b).autogen.bin $(PREFVAR2)$(PREFIX1).autobil.bin
+ 
+-TARGETS = $(TARGETS_COMMON) \
+-	  $(BASENAME).$(LANG1)-lextor.dix $(BASENAME).$(LANG2)-lextor.dix \
+-	  $(BASENAME).$(PREFIX1)-lextor.dix $(BASENAME).$(PREFIX2)-lextor.dix 
++TARGETS = $(TARGETS_COMMON)
+ 
+ .deps/$(LANG1).metadix: $(BASENAME).$(LANG1).metadix
+ 	if [ ! -d .deps ]; then mkdir .deps; fi
+@@ -251,7 +249,6 @@
+ 	   $(BASENAME).$(PREFIX1)-poly.dix $(BASENAME).$(PREFIX2)-poly.dix \
+ 	   $(PREFIX1).prob $(PREFIX2).prob \
+ 	   buscaPar.xsl principal.xsl apertium-en-ca.en.metadix \
+-	   $(PREFIX1).lextor $(PREFIX2).lextor \
+ 	   $(PREFIX1)-supervised.make $(PREFIX1)-unsupervised.make \
+ 	   $(PREFIX2)-supervised.make $(PREFIX2)-unsupervised.make \
+ 	   $(LANG1)-tagger-data/README $(LANG2)-tagger-data/README \
+@@ -272,8 +269,6 @@
+ 		    $(PREFVAR2)$(PREFIX1).autogen.bin $(PREFVAR2)$(PREFIX1).autopgen.bin\
+ 		    $(PREFIX1)-poly.autobil.bin $(PREFIX2)-poly.autobil.bin \
+ 		    $(PREFIX1).prob $(PREFIX2).prob \
+-		    $(PREFIX1).lextormono.bin $(PREFIX2).lextormono.bin \
+-		    $(PREFIX1).lextorbil.bin $(PREFIX2).lextorbil.bin \
+ 	            $(BASENAME).$(PREFIX1).genitive.t1x \
+ 		    $(PREFIX1).genitive.bin  \
+ 		    $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
diff --git a/PKGBUILD b/PKGBUILD
index e8255bbb47df..70cecd785d58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kevin Brubeck Unhammer <unhammer@fsfe.org>
 pkgname=apertium-en-ca
 pkgver=0.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Apertium language data for the English-Catalan (including Valencian) translator."
 url="http://apertium.org"
 license=('GPL')
@@ -10,14 +10,18 @@ makedepends=('pkgconfig')
 depends=('lttoolbox>=3.2' 'apertium>=3.2')
 arch=('i686' 'x86_64')
 source=("https://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-  "configure.ac.patch")
+        "Makefile.am.patch"
+        "configure.ac.patch")
 md5sums=('c984145a73c10c332c45b92bb676c37a'
+         '452356ce2ca88ad9c7cba79c879f8961'
          '69cf23698c83a2d4456a0b5c0f7d8a13')
 sha256sums=('c56e1f1c3fece009dc7c6b68af70f04ca9fbdee8e4b5e2ed8ea603f2f22ef0d5'
+            'fd8d3d4b91201a4c451c9ca39dd1ccae26749d1e9a319bd1c6e5e899878be2de'
             'f8e473ed4b180976d09a772f5d5f0827a019c4ad3ca420a818e38c9402da72e3')
 
 build() {
   patch -p1 < configure.ac.patch
+  patch -p1 < Makefile.am.patch
 
   cd "$srcdir/$pkgname-$pkgver"