forgot to update some time

2 files changed, 49 insertions, 65 deletions

diff --git a/vi/PKGBUILD b/vi/PKGBUILD
index 23bbe4a..4aa7877 100644
--- a/vi/PKGBUILD
+++ b/vi/PKGBUILD
@@ -1,73 +1,30 @@
 # $Id$
-# Maintainer: tobias [ tobias at archlinux org ]
+# Maintainer: tobias [ tobias funnychar archlinux org ]
+# Contributor: flx <effelleks@googlemail.com>
 
 pkgname=vi
-_srcver=7.2
-_patchlevel=132
-pkgver=${_srcver}.${_patchlevel}
+_pkgname=nvi
+pkgver=1.81.6
 pkgrel=1
-pkgdesc="a highly configurable, improved version of the vi text editor (basic version)"
-arch=(i686 x86_64)
-license=('custom:vim')
-url="http://www.vim.org"
+pkgdesc='A reimplementation of the ex/vi text editors with unicode support.'
+arch=('i686' 'x86_64')
+url='http://www.kotnet.org/~skimo/nvi/'
+license=('custom:nvi')
 groups=('base')
-depends=('glibc' 'ncurses' 'coreutils')
-makedepends=('wget' 'sed' 'grep' 'gettext')
-backup=(etc/virc)
-install=${pkgname}.install
-# we need the extra-stuff to get all patches applied smoothly
-source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
-        fetch_patches.sh fetch_runtime.sh)
+conflicts=('nvi-unicode')
+depends=('bash' 'db')
+options=(!libtool force)
+source=(http://www.kotnet.org/~skimo/nvi/devel/${_pkgname}-${pkgver}.tar.bz2 \
+        db47-hack.patch)
+md5sums=('88d1e23115ee9f2961186b62e55f5704' 'f9dd0ee3b00e1a9915c49acc5a241a6d')
 
-build()
-{
-  # pull in patches from vim.org (or the src cache alternatively)
-  . ${startdir}/src/fetch_patches.sh
-  . ${startdir}/src/fetch_runtime.sh
-  get_patches || return 1
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
-  # set the virc different from vimrc
-  sed -i 's|^.*\(#define SYS_VIMRC_FILE.*"\) .*$|\1|' src/feature.h
-  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' src/feature.h
-  sed -i 's|^.*\(#define USR_VIMRC_FILE\t"\).*$|\1$HOME/.virc"|' src/feature.h
-  sed -i 's|/etc/vimrc|/etc/virc|' src/feature.h
-  sed -i 's|\.vimrc|.virc|' src/feature.h
-  # build party
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \
-    --with-compiledby=ArchLinux --with-features=normal \
-    --with-global-runtime=/usr/share/vim --with-vim-name=vi \
-    --disable-gpm --disable-acl --with-x=no --disable-gui --enable-multibyte
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}/
+  patch -p1 <../db47-hack.patch
+  cd ./build.unix
+  ../dist/configure --prefix=/usr --program-prefix= --enable-widechar
   make || return 1
-  make  VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install
-  cd ${startdir}/pkg/usr/bin
-  rm -f vim rvim view rview vidiff
-  ln -s vi evi
-
-  # delete the manpages for vidiff, we don't bother with that symlink since vidiff doesn't work
-  find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \
-   while read mandir; do
-    cd ${mandir}
-    rm -f vidiff.1
-  done
-
-  _runtimedir="${startdir}/pkg/usr/share/vim/"
-  update_runtime
-  install -Dm644 ${startdir}/pkg/usr/share/vim/vimrc_example.vim \
-    ${startdir}/pkg/etc/virc
-  rm -f ${startdir}/pkg/usr/share/vim/gvimrc_example.vim
-  install -dm755 ${startdir}/pkg/usr/share/licenses/vim
-  cd ${startdir}/pkg/usr/share/licenses/vim
-  ln -s ../../vim/doc/uganda.txt license.txt
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
-md5sums=('f0901284b338e448bfd79ccca0041254'
-         '35e04482f07c57221c9a751aaa3b8dac'
-         'd8884786979e0e520c112faf2e176f05'
-         'e19a99604b96080b0dc6e17c643b411f'
-         '92e3dc8844d446c1ecd28e7257a47cb7')
-sha256sums=('914db0f2205ebd6f02878295ec2506036ea7500399db112c61a01491cd9a1d86'
-            '20894ac79672160bfc4f1d2f9f9775b34d944762d655307a91ca96d358faa04d'
-            '11607f539a4518b550bf1606b7d3a6f36c1ffdf566c058e7d94bced78034cd5b'
-            'f7f113c0469f452081987b62b7af795462bf6aaf879693e8118f8f178727351c'
-            '43660a058e62b88777971abace58d1a9ffddd895123cd204fd503eb496cd11af')
+## vim:set ts=2 sw=2 et:
diff --git a/vi/db47-hack.patch b/vi/db47-hack.patch
new file mode 100644
index 0000000..f2f206b
--- /dev/null
+++ b/vi/db47-hack.patch
@@ -0,0 +1,27 @@
+diff --git a/cl/cl_main.c b/cl/cl_main.c
+index 0ecbe44..87feb28 100644
+--- a/cl/cl_main.c
++++ b/cl/cl_main.c
+@@ -57,6 +57,9 @@ main(int argc, char **argv)
+ 	int rval;
+ 	char **p_av, **t_av, *ttype;
+ 
++	/* Hack for db-4.7. */
++	unsetenv("LANG");
++	unsetenv("LC_ALL");
+ 	/* If loaded at 0 and jumping through a NULL pointer, stop. */
+ 	if (reenter++)
+ 		abort();
+diff --git a/common/db.h b/common/db.h
+index fd1dc64..00a7ce7 100644
+--- a/common/db.h
++++ b/common/db.h
+@@ -18,7 +18,7 @@
+ 
+ #if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+ #define db_open(db,file,type,flags,mode)				\
+-    (db)->open(db, NULL, file, NULL, type, flags, mode)
++    (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode)
+ #else
+ #define db_open(db,file,type,flags,mode)				\
+     (db)->open(db, file, NULL, type, flags, mode)
\ No newline at end of file