[arch-commits] Commit in hspell/trunk (PKGBUILD hspell-1.0.sharedlib.patch)

Sat Feb 5 13:53:56 UTC 2011

Date: Saturday, February 5, 2011 @ 08:53:55
  Author: andyrtr
Revision: 109025

upgpkg: hspell 1.1-1
upstream update 1.1; add hunspell-he subpkg

Added:
  hspell/trunk/hspell-1.0.sharedlib.patch
Modified:
  hspell/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   55 ++++++++++++++++++++++++++++-------
 hspell-1.0.sharedlib.patch |   66 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2011-02-05 12:02:00 UTC (rev 109024)
+++ PKGBUILD	2011-02-05 13:53:55 UTC (rev 109025)
@@ -1,24 +1,57 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
-pkgname=hspell
-pkgver=1.0
-pkgrel=3
-pkgdesc="Hebrew spell-checker"
+pkgbase=hspell
+pkgname=('hspell' 'hunspell-he')
+pkgver=1.1
+pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.ivrix.org.il/projects/spell-checker/"
-depends=('glibc' 'zlib' 'perl')
+makedepends=('glibc' 'zlib' 'perl' 'hunspell' 'gawk')
 options=('!libtool' '!makeflags')
-source=(ftp://ftp.archlinux.org/other/hspell/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3e12fa383c2cfd430918d115f33f9841')
+source=(http://hspell.ivrix.org.il/${pkgname}-${pkgver}.tar.gz
+	hspell-1.0.sharedlib.patch)
+md5sums=('e79e75180ce529c008ea085954a52f2c'
+         '0df6764bb37500ee936b9355fee0c7a5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
+  patch -Np1 -i ${srcdir}/hspell-1.0.sharedlib.patch
+  autoreconf -v
   sed -i -e 's|/usr/bin/awk|/bin/awk|' wzip
   ./configure --prefix=/usr --mandir=/usr/share/man \
-      --enable-linginfo || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --enable-linginfo --enable-fatverb
+  make 
+  make hunspell
 }
+
+package_hspell() {
+
+  pkgdesc="Hebrew spell-checker"
+  depends=('glibc' 'zlib' 'perl')
+
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  rm -f ${pkgdir}/usr/lib/libhspell.a
+}
+
+package_hunspell-he() {
+
+  pkgdesc="Hebrew hunspell dictionary"
+  
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -dm755 ${pkgdir}/usr/share/hunspell
+  cp -p hunspell/new_he.dic ${pkgdir}/usr/share/hunspell/he_IL.dic
+  cp -p hunspell/new_he.aff ${pkgdir}/usr/share/hunspell/he_IL.aff
+
+  # the symlinks
+  install -dm755 ${pkgdir}/usr/share/myspell/dicts
+  pushd $pkgdir/usr/share/myspell/dicts
+    for file in $pkgdir/usr/share/hunspell/*; do
+      ln -sv /usr/share/hunspell/$(basename $file) .
+    done
+  popd
+}

Added: hspell-1.0.sharedlib.patch
===================================================================
--- hspell-1.0.sharedlib.patch	                        (rev 0)
+++ hspell-1.0.sharedlib.patch	2011-02-05 13:53:55 UTC (rev 109025)
@@ -0,0 +1,66 @@
+Index: hspell-1.0/Makefile.in
+===================================================================
+--- hspell-1.0.orig/Makefile.in
++++ hspell-1.0/Makefile.in
+@@ -51,7 +51,7 @@ LDFLAGS=@LDFLAGS@
+ 
+ # Our TARGETS variable chooses what to compile. Some things are
+ # optionally compiled depending on --enable-* paramters to configure.
+-TARGETS = @TARGETS@
++TARGETS = @TARGETS@ libhspell.a
+ all: $(TARGETS)
+ 
+ # SEDCMD controls on whether objective-kinuyim - about 130,000 rare verb
+@@ -76,7 +76,8 @@ clean:
+ 	      hebrew.wgz.lingsizes.tmp dmask.c install.js \
+ 	      spell-he.xpi he.dic he.aff README-he.txt \
+ 	      README_he_IL.txt he_IL.dic he_IL.aff he_IL.zip \
+-	      specfilter.o specfilter
++	      specfilter.o specfilter \
++	      libhspell.so.0 libhspell.so *.lo
+ 	rm -f hebeng/install.js hebeng/heb-eng.aff hebeng/heb-eng.dic \
+ 	      hebeng/README-he.txt hebeng/README-en-US.txt \
+ 	      hebeng/spell-heb-eng.xpi
+@@ -113,6 +114,9 @@ install: all
+ 	test -d $(DESTDIR)$(LIBDIR) || mkdir -m 755 -p $(DESTDIR)$(LIBDIR)
+ 	cp libhspell.a $(DESTDIR)$(LIBDIR)/
+ 	chmod 644 $(DESTDIR)$(LIBDIR)/libhspell.a
++	cp libhspell.so.0 $(DESTDIR)$(LIBDIR)/
++	chmod 755 $(DESTDIR)$(LIBDIR)/libhspell.so.0
++	ln -sf libhspell.so.0 $(DESTDIR)$(LIBDIR)/libhspell.so
+ 	test -d $(DESTDIR)$(INCLUDEDIR) || mkdir -m 755 -p $(DESTDIR)$(INCLUDEDIR)
+ 	cp hspell.h linginfo.h $(DESTDIR)$(INCLUDEDIR)/
+ 	chmod 644 $(DESTDIR)$(INCLUDEDIR)/hspell.h $(DESTDIR)$(INCLUDEDIR)/linginfo.h
+@@ -166,19 +170,30 @@ libhspell.a: dict_radix.o gimatria.o cor
+ 	ar cr $@ $^
+ 	-ranlib $@
+ 
+-$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.a $(LIBS)
++EXTRAOBJECTSPIC=$(EXTRAOBJECTS:.o=.lo)
++
++%.lo: %.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -o $@ $<
++
++libhspell.so.0: dict_radix.lo gimatria.lo corlist.lo libhspell.lo $(EXTRAOBJECTSPIC)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,libhspell.so.0 $^ -lz
++	ln -sf libhspell.so.0 libhspell.so
++
++$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.so.0
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.so.0 $(LIBS)
+ 
+ # remember to update this dependency list once in a while...
+ libhspell.o dict_radix.o find_sizes.o: dict_radix.h
+ dict_radix.o linginfo.o: gzbuffered.h
+ libhspell.o mk_he_affix.o: prefixes.c
++libhspell.lo mk_he_affix.lo: prefixes.c
+ hspell.o: hash.h tclHash.h
+ tclHash.o: tclHash.h
+ corlist.o gimatria.o hspell.o libhspell.o: hspell.h
+ hspell.o libhspell.o linginfo.o: linginfo.h hspell.h
+ linginfo.o: dmask.c
+ specfilter.o: prefixes.c
++specfilter.lo: prefixes.c
+ 
+ prefixes.c: genprefixes.pl PrefixBits.pl
+ 	$(PERL) -w ./genprefixes.pl >prefixes.c


