[arch-commits] CVS update of arch/build/editors/gvim (3 files)
Tobias Kieslich
tobias at archlinux.org
Tue Jul 10 00:26:30 UTC 2007
Date: Monday, July 9, 2007 @ 20:26:30
Author: tobias
Path: /home/cvs-arch/arch/build/editors/gvim
Modified: PKGBUILD (1.39 -> 1.40) fetch_patches.sh (1.2 -> 1.3)
gvim.install (1.7 -> 1.8)
innitial checkin fro new vim layout based on
vi -> the very base but comes with a complete runtime
vim -> x capabilities, but NO GUI!, supports all script languages (except mzScheme wich we don't have)
gvim -> everuthing including a gui
------------------+
PKGBUILD | 62 ++++++++++++++++++++++++-----------------------------
fetch_patches.sh | 14 ++++++++++-
gvim.install | 20 -----------------
3 files changed, 42 insertions(+), 54 deletions(-)
Index: arch/build/editors/gvim/PKGBUILD
diff -u arch/build/editors/gvim/PKGBUILD:1.39 arch/build/editors/gvim/PKGBUILD:1.40
--- arch/build/editors/gvim/PKGBUILD:1.39 Mon Jun 25 15:48:45 2007
+++ arch/build/editors/gvim/PKGBUILD Mon Jul 9 20:26:30 2007
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD,v 1.39 2007/06/25 19:48:45 tobias Exp $
-# Maintainer: judd <jvinet at zeroflux.org>
+# $Id: PKGBUILD,v 1.40 2007/07/10 00:26:30 tobias Exp $
+# Maintainer: tobias [ tobias at archlinux org ]
pkgname=gvim
_srcver=7.1
-_patchlevel=12
+_patchlevel=22
pkgver=${_srcver}.${_patchlevel}
pkgrel=1
pkgdesc="the vim text editor with advanced features enabled, such as a gui mode"
arch=(i686 x86_64)
license=('vim')
url="http://www.vim.org"
-depends=("vim>=${pkgver}" 'python' 'ruby' 'gtk2' 'libxt' 'desktop-file-utils' 'acl')
+depends=("vim>=${pkgver}" 'gtk2' 'desktop-file-utils')
makedepends=('pkgconfig')
backup=(etc/gvimrc)
conflicts=('gvim-devel')
@@ -24,25 +24,22 @@
'605cc7ae31bcc9d7864bb0bb6025f55d'
'144aa049ba70621acf4247f0459f3ee7'
'2be104c0372dd6dae19cb7968c03cd4f'
- 'd37948193ff95918089300eb2bcf865a')
+ 'fba5e33a451066494c7203d13cf0be3d')
build()
{
# patch party
# pull in patches from vim.org (or the src cache alternatively)
. ${startdir}/fetch_patches.sh
- _patchdir=${startdir}/src/patches
get_patches
cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
- for _patch in $(/bin/ls ${_patchdir}); do
- patch -Np0 -i ${_patchdir}/${_patch} || return 1
- done
- rm -rf ${_patchdir}
# define the place for the global (g)vimrc file (set to /etc/vimrc)
sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h
./configure --prefix=/usr --localstatedir=/var/lib/vim \
- --disable-gpm --with-x=yes --enable-gui=gtk2 --enable-multibyte \
- --enable-cscope --with-features=big \
+ --with-compiledby=ArchLinux --with-features=big \
+ --with-x=yes --disable-gpm --with-x=yes --enable-gui=gtk2 \
+ --with-global-runtime=/usr/share/vim --with-vim-name=gvim \
+ --enable-multibyte --enable-cscope \
--enable-perlinterp --enable-pythoninterp --enable-rubyinterp
make || return 1
# install everything first ...
@@ -50,35 +47,34 @@
# ... and clean up what vim already has for us
# move the binary and fix the (g)* related symlinks
- cd ${startdir}/pkg/usr/bin
- mv -f vim gvim
- rm -f ex rview rvim view vimdiff vimtutor xxd
- for slink in *; do
- if [ ! -e ${slink} ]; then
- ln -sf gvim ${slink}
- fi
- done
-
- # preserve the g* manpages
- # fix the manpages and symlinks - this is ripped from makepkg
- find ${startdir}/pkg/usr/man -type f 2> /dev/null | while read i ; do
- fn="${i##*/}"
- # point symlinks to gzipped file
- find ${startdir}/pkg/usr/man -lname "${fn}" 2> /dev/null | while read ln ; do
- rm -f "${ln}"
- ln -sf "${fn}.gz" "${ln}.gz"
- done
+ find ${startdir}/pkg/usr/bin -type l 2> /dev/null | while read symlink; do
+ rm ${symlink}
done
+ cd ${startdir}/pkg/usr/bin
+ rm -f gvimtutor xxd
+ ln -s gvim egvim
+ ln -s gvim egview
+ ln -s gvim gview
+ ln -s gvim gvimdiff
+ ln -s gvim rgview
+ ln -s gvim rgvim
- # delete the manpages/symlinks provided by vim package
+ # delete the manpages/symlinks provided by vi package
find ${startdir}/pkg/usr/man -type d -name 'man1' 2> /dev/null | while read mandir; do
cd ${mandir}
- rm -f evim.* ex.* rview.* rvim.* view.* vim.* vimdiff.* vimtutor.* xxd.*
+ rm -f *.1
+ ln -s vi.1.gz egvim.1.gz
+ ln -s vi.1.gz egview.1.gz
+ ln -s vi.1.gz gview.1.gz
+ ln -s vi.1.gz gvim.1.gz
+ ln -s vidiff.1.gz gvimdiff.1.gz
+ ln -s vi.1.gz rgvim.1.gz
+ ln -s vi.1.gz rgview.1.gz
done
install -Dm644 ${startdir}/pkg/usr/share/vim/gvimrc_example.vim \
${startdir}/pkg/etc/gvimrc
- # clean all settings and controls - served by vim package
+ # clean all settings and controls - served by vi package
rm -rf ${startdir}/pkg/usr/share/vim
# freedesktop links
install -D -m644 ${startdir}/src/${pkgname}.desktop \
Index: arch/build/editors/gvim/fetch_patches.sh
diff -u arch/build/editors/gvim/fetch_patches.sh:1.2 arch/build/editors/gvim/fetch_patches.sh:1.3
--- arch/build/editors/gvim/fetch_patches.sh:1.2 Mon Jun 25 15:45:44 2007
+++ arch/build/editors/gvim/fetch_patches.sh Mon Jul 9 20:26:30 2007
@@ -1,5 +1,8 @@
# the external logic for pulling in patches
+
get_patches() {
+ _patchdir=${startdir}/src/patches
+ cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
if [ -d ${_patchdir} ]; then
rm -rf ${_patchdir}
echo -e "\tremove patches from old build"
@@ -18,16 +21,17 @@
_md5=$(echo $_line | cut -d ' ' -f1)
_file=$(echo $_line | cut -d ' ' -f3)
if [ -f ${SRCDEST}/vim-${_srcver}/${_file} ]; then
+ echo -e "\thaving patch file:${_file}"
cp ${SRCDEST}/vim-${_srcver}/${_file} ./
else
- echo -e "\tfetching patch file: ${_file}"
+ echo -n -e "\t... fetching patch file: ${_file} ..."
wget ${_rpath}/${_file} >/dev/null 2>&1
if [ -w ${SRCDEST} ]; then
if [ ! -d ${SRCDEST}/vim-${_srcver} ]; then
mkdir -p ${SRCDEST}/vim-${_srcver}
fi
- echo -e "\tcopy ${_file} to ${SRCDEST}/vim-${_srcver}"
cp ${_file} ${SRCDEST}/vim-${_srcver}/
+ echo " done!"
fi
fi
@@ -39,4 +43,10 @@
done
IFS=$_OLDIFS
rm MD5SUMS
+ cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
+ for _patch in $(/bin/ls ${_patchdir}); do
+ patch -Np0 -i ${_patchdir}/${_patch} || return 1
+ done
+ rm -rf ${_patchdir}
+ return 0
}
Index: arch/build/editors/gvim/gvim.install
diff -u arch/build/editors/gvim/gvim.install:1.7 arch/build/editors/gvim/gvim.install:1.8
--- arch/build/editors/gvim/gvim.install:1.7 Thu Jun 1 22:00:10 2006
+++ arch/build/editors/gvim/gvim.install Mon Jul 9 20:26:30 2007
@@ -1,34 +1,16 @@
post_install() {
echo "updating desktop and mime database..."
update-desktop-database -q
- echo -n "moving symlinks to make vim binary more capable..."
- mv -f /usr/bin/vim /usr/bin/vi
- mv -f /usr/bin/gvim /usr/bin/vim
- ln -sf /usr/bin/vim /usr/bin/gvim
- echo "done"
echo -n "Updating vim help tags..."
/usr/bin/vim --noplugins -u NONE -U NONE \
--cmd ":helptags /usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
echo "done."
}
-pre_remove() {
- echo -n "recovering symlink names and binaries..."
- rm /usr/bin/gvim
- mv -f /usr/bin/vim /usr/bin/gvim
- mv -f /usr/bin/vi /usr/bin/vim
- ln -sf /usr/bin/vim /usr/bin/vi
- echo "done"
-}
-
post_upgrade() {
post_install $1
}
-pre_upgrade() {
- pre_remove $1
-}
-
post_remove() {
echo -n "update desktop and mime database..."
update-desktop-database
@@ -39,4 +21,4 @@
shift
$op $*
-# vim: ft=sh
+# vim: ft=sh
More information about the arch-commits
mailing list