[arch-commits] Commit in vi/repos (testing-i686 testing-i686/PKGBUILD)

[Tobias Kieslich]

    Date: Sunday, July 19, 2009 @ 21:17:06
  Author: tobias
Revision: 46735

Merged revisions 46734 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/vi/trunk

........
  r46734 | tobias | 2009-07-19 18:16:42 -0700 (Sun, 19 Jul 2009) | 1 line
  
  upgpkg: vi 050325-1
........

Modified:
  vi/repos/testing-i686/	(properties)
  vi/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)


Property changes on: vi/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /vi/trunk:1-46732
   + /vi/trunk:1-46734

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-07-20 01:16:42 UTC (rev 46734)
+++ testing-i686/PKGBUILD	2009-07-20 01:17:06 UTC (rev 46735)
@@ -1,23 +1,24 @@
-# Maintainer: Davorin Učakar <davorin.ucakar at gmail.com>
+# $Id$
+# Maintainer: tobias [ tobias at archlinux org ]
 
-pkgname=ex
+pkgname=vi
 pkgver=050325
-pkgrel=3
+pkgrel=1
 pkgdesc='The original ex/vi text editor.'
 arch=('i686' 'x86_64')
 url='http://ex-vi.sourceforge.net/'
 license=('custom:ex')
 conflicts=('vi')
 depends=('ncurses')
-options=(strip !libtool emptydirs)
+groups=('base')
+options=(force strip !libtool emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
-	du.patch
-	exrc.sample)
+        du.patch exrc.sample)
 md5sums=('e668595254233e4d96811083a3e4e2f3' '2d80fbc7d612963466d9ae45058a3778' \
-	 'd3b483c994d859232ce369b82a4b5668')
+         'd3b483c994d859232ce369b82a4b5668')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/ex-${pkgver}
   sed -i -e 's/^PREFIX.*$/PREFIX = \/usr/' Makefile
   sed -i -e 's/^LIBEXECDIR.*$/LIBEXECDIR = $(PREFIX)\/lib\/ex/' Makefile
   sed -i -e 's/^PRESERVEDIR.*$/PRESERVEDIR = \/var\/lib\/ex/' Makefile
@@ -27,9 +28,9 @@
   sed -i -e 's/^TERMLIB.*$/TERMLIB = ncurses/' Makefile
   sed -i -e 's/^\.B \/usr\/libexec/.B \/usr\/lib\/ex/' vi.1
   sed -i -e 's/^\.B \/var\/preserve$/.B \/var\/lib\/ex/' vi.1
-  patch -p1 < ../du.patch
+  patch -Np1 -i ../du.patch || return 1
   make || return 1
   make install
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/vi/LICENSE
   install -D -m644 ${srcdir}/exrc.sample ${pkgdir}/etc/exrc.sample
 }