[arch-commits] Commit in ispell/trunk (ChangeLog PKGBUILD)

[Allan McRae]

    Date: Friday, February 17, 2012 @ 19:38:09
  Author: allan
Revision: 150466

upgpkg: ispell 3.3.02-5

signing rebuild

Modified:
  ispell/trunk/PKGBUILD
Deleted:
  ispell/trunk/ChangeLog

-----------+
 ChangeLog |    6 ------
 PKGBUILD  |   33 +++++++++++++++------------------
 2 files changed, 15 insertions(+), 24 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2012-02-18 00:25:08 UTC (rev 150465)
+++ ChangeLog	2012-02-18 00:38:09 UTC (rev 150466)
@@ -1,6 +0,0 @@
-2008-03-31  Eric Belanger  <eric at archlinux.org>
-
-	* ispell 3.3.02-2
-	* FSH man pages
-	* Added ChangeLog
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-18 00:25:08 UTC (rev 150465)
+++ PKGBUILD	2012-02-18 00:38:09 UTC (rev 150466)
@@ -1,10 +1,10 @@
 # $Id$
 # Contributor: Eric Belanger <eric at archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Maintainer:
 
 pkgname=ispell
 pkgver=3.3.02
-pkgrel=4
+pkgrel=5
 pkgdesc="An interactive spell-checking program for Unix"
 arch=('i686' 'x86_64')
 url="http://ficus-www.cs.ucla.edu/geoff/ispell.html"
@@ -19,34 +19,31 @@
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
-	patch -p0 < ${srcdir}/getline.patch || return 1
+	patch -Np0 -i ${srcdir}/getline.patch
 
-	sed -i 's/#undef USG/#define USG/' local.h.linux
-	sed -i 's|/usr/local|/usr|' local.h.linux
-	sed -i 's|/lib|/lib/ispell|' local.h.linux
+	sed -i -e 's/#undef USG/#define USG/' \
+	       -e 's|/usr/local|/usr|' \
+               -e 's|/lib|/lib/ispell|' local.h.linux
 	cp local.h.linux local.h
-	make TMPDIR=/tmp all || return 1
+	make TMPDIR=/tmp all
 }
 
 package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
+        # creating directory structure
+        install -dm755 ${pkgdir}/usr/{bin,lib/ispell,share/man/man{1,5}}
+
 	# Installing binary tools
-	install -Dm755 buildhash ${pkgdir}/usr/bin/buildhash
-	install -Dm755 findaffix ${pkgdir}/usr/bin/findaffix
-	install -Dm755 icombine ${pkgdir}/usr/bin/icombine
-	install -Dm755 ijoin ${pkgdir}/usr/bin/ijoin
-	install -Dm755 ispell ${pkgdir}/usr/bin/ispell
-	install -Dm755 iwhich ${pkgdir}/usr/bin/iwhich
-	install -Dm755 munchlist ${pkgdir}/usr/bin/munchlist
-	install -Dm755 tryaffix ${pkgdir}/usr/bin/tryaffix
+	for b in buildhash findaffix icombine ijoin ispell iwhich munchlist tryaffix; do
+		install -m755 $b ${pkgdir}/usr/bin/
+	done
 
 	# Installing man pages
-	install -Dm644 ispell.1 ${pkgdir}/usr/share/man/man1/ispell.1
-	install -Dm644 ispell.5 ${pkgdir}/usr/share/man/man5/ispell.5
+	install -m644 ispell.1 ${pkgdir}/usr/share/man/man1/ispell.1
+	install -m644 ispell.5 ${pkgdir}/usr/share/man/man5/ispell.5
 
 	# Installing dictionnaries
-	install -d ${pkgdir}/usr/bin ${pkgdir}/usr/lib/ispell
 	install -m644 languages/american/americanmed.hash \
 	    ${pkgdir}/usr/lib/ispell/americanmed.hash
 	install -m644 languages/english/english.aff \