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

[Tobias Kieslich]

    Date: Sunday, July 19, 2009 @ 21:07:56
  Author: tobias
Revision: 46733

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

........
  r46732 | tobias | 2009-07-19 18:07:31 -0700 (Sun, 19 Jul 2009) | 1 line
  
  upgpkg: ex 050325-3
........

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

----------+
 PKGBUILD |   56 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)


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

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-07-20 01:07:31 UTC (rev 46732)
+++ testing-i686/PKGBUILD	2009-07-20 01:07:56 UTC (rev 46733)
@@ -1,33 +1,35 @@
-# $Id$
-# Maintainer: tobias [ tobias funnychar archlinux org ]
-# Contributor: flx <effelleks at googlemail.com>
+# Maintainer: Davorin Učakar <davorin.ucakar at gmail.com>
 
-pkgname=vi
-_pkgname=nvi
-pkgver=1.81.6
-pkgrel=2
-pkgdesc='A reimplementation of the ex/vi text editors with unicode support.'
+pkgname=ex
+pkgver=050325
+pkgrel=3
+pkgdesc='The original ex/vi text editor.'
 arch=('i686' 'x86_64')
-url='http://www.kotnet.org/~skimo/nvi/'
-license=('custom:nvi')
-groups=('base')
-conflicts=('nvi-unicode')
-depends=('bash' 'db')
-options=(!libtool force)
-source=(http://www.kotnet.org/~skimo/nvi/devel/${_pkgname}-${pkgver}.tar.bz2 \
-        db47-hack.patch widechar.patch c_locale.patch)
-md5sums=('88d1e23115ee9f2961186b62e55f5704' 'f9dd0ee3b00e1a9915c49acc5a241a6d' \
-         '36855b815a7bf701632bc7c2b0777570' 'c2fba3fde17835bb9c90ed661231c807')
+url='http://ex-vi.sourceforge.net/'
+license=('custom:ex')
+conflicts=('vi')
+depends=('ncurses')
+options=(strip !libtool emptydirs)
+source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
+	du.patch
+	exrc.sample)
+md5sums=('e668595254233e4d96811083a3e4e2f3' '2d80fbc7d612963466d9ae45058a3778' \
+	 'd3b483c994d859232ce369b82a4b5668')
 
 build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}/
-  patch -p1 -i../db47-hack.patch || return 1
-  patch -Np1 -i ../widechar.patch || return 1
-  patch -Np1 -i ../c_locale.patch || return 1
-  cd ./build.unix
-  ../dist/configure --prefix=/usr --program-prefix= --enable-widechar
+  cd ${srcdir}/${pkgname}-${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
+  sed -i -e 's/^DESTDIR.*$/DESTDIR = ..\/..\/pkg/' Makefile
+  sed -i -e 's/^INSTALL.*$/INSTALL = \/bin\/install/' Makefile
+  sed -i -e 's/^FEATURES.*$/FEATURES = -DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8/' Makefile
+  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
   make || return 1
-  make DESTDIR=${pkgdir} install
-  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  make install
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 ${srcdir}/exrc.sample ${pkgdir}/etc/exrc.sample
 }
-## vim:set ts=2 sw=2 et: