Update to 7.2 and newstyle metadata.

vim/build.sh

@@ -1,79 +1,84 @@
-#!/usr/local/bin/bash
+#!/bin/bash
 #
 # This is a generic build.sh script
 # It can be used nearly unmodified with many packages
 # 
-# The concept of "method" registering and the logic that implements it was shamelessly
+# build.sh helper functions
-# stolen from jhlj's Compile.sh script :)
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
+###########################################################
 # Check the following 4 variables before running the script
 topdir=vim
-version=6.3.4
+version=7.2
 pkgver=1
-source[0]=$topdir-6.3.tar.bz2
+source[0]=ftp://ftp.vim.org/pub/vim/unix/$topdir-$version.tar.bz2
 # If there are no patches, simply comment this
-patch[0]=6.3.001
+# Generate rough patchlist like this:
-patch[1]=6.3.002
+# grep -v Win32 README | grep -v VMS | grep -v Mac | grep -v \.gz |grep -v \(extra|awk '{ print $2 }'|grep 7.1
-patch[2]=6.3.003
+# Unfortunately the markers are misleading and several Mac, Win32 and extra patches need also to be applied
-patch[3]=6.3.004
+# num=0; for i in `grep -v Win32 README | grep -v VMS | grep -v Mac | grep -v \.gz |grep -v \(extra|awk '{ print $2 }'|grep 7.1`; do echo "patch[$num]=$i"; let num=num+1; done
-
-# Helper var
-patchcount=${#patch[@]}
 
 # Source function library
-. ${HOME}/buildpkg/scripts/buildpkg.functions
+. ${BUILDPKG_BASE}/scripts/buildpkg.functions
 
+# Global settings
 # We need to override this
-topsrcdir=vim63
+topsrcdir=vim72
-patchdir=$srcfiles/vim-6.3-patches
+patchdir=$srcfiles/vim-${version}-patches
-
+patch_prefix="-p0"
-# Define script functions and register them
+export CPPFLAGS="-I/usr/tgcware/include"
-METHODS=""
+export LDFLAGS="-L$prefix/lib -R$prefix/lib"
-reg() {
+# What gui should we build?
-    METHODS="$METHODS $1"
+gui=motif
-}
+configure_args='--prefix=$prefix --without-local-dir --enable-gui=$gui --with-features=huge --enable-multibyte --disable-perlinterp --disable-pythoninterp --disable-tclinterp --with-compiledby="<swpkg@jupiterrise.com>" --disable-netbeans'
 
 reg prep
 prep()
 {
-    clean source
+    generic_prep
-    unpack 0
-    for ((i=0; i<patchcount; i++))
-    do
-	patch $i -p0
-    done
 }
 
 reg build
 build()
 {
-    export EXTRA_LIBS="-R/usr/local/lib"
+    # First build a gui version
-    # Build gvim
+    gui=motif
-    configure_args='--prefix=$prefix --enable-gui=motif --disable-gpm --disable-nls --with-features=huge --with-compiledby="<tgc@statsbiblioteket.dk>" --enable-multibyte'
     generic_build
+    # Save the gui binary for later
     setdir source
-    cd src
+    ${__cp} src/vim src/gvim
-    $CP vim gvim
+    setdir source
-    $MAKE_PROG clean
+    ${__make} clean
-    # Build text-based vim
+    gui="no --with-x=no"
-    configure_args='--prefix=$prefix --with-x=no --enable-gui=no --disable-gpm --disable-nls --with-features=huge --with-compiledby="<tgc@statsbiblioteket.dk>" --enable-multibyte'
     generic_build
 }
 
+reg check
+check()
+{
+    generic_check
+}
+
 reg install
 install()
 {
     generic_install DESTDIR
     setdir source
-    $CP src/gvim ${stagedir}${prefix}/${_bindir}
+    ${__cp} src/gvim ${stagedir}${prefix}/${_bindir}
     setdir ${stagedir}${prefix}/${_bindir}
-    ln -s gvim gvimdiff
+    ${__ln} -s gvim gvimdiff
-    ln -s gvim gview
+    ${__ln} -s gvim gview
     setdir ${stagedir}${prefix}/${_mandir}/man1
-    ln -s vim.1 gvim.1
+    ${__ln} -s vim.1 gvim.1
-    ln -s vim.1 gview.1
+    ${__ln} -s vim.1 gview.1
-    ln -s vimdiff.1 gvimdiff.1
+    ${__ln} -s vimdiff.1 gvimdiff.1
-    strip
+    custom_install=1
+    generic_install DESTDIR
+    doc README.txt
+    #setdir ${stagedir}${prefix}/${_sharedir}/vim/vim71/lang/
+    #${__mv} "menu_chinese(gb)_gb.936.vim" "menu_chinese_gb__gb.936.vim"
+    #${__mv} "menu_chinese(taiwan)_taiwan.950.vim" "menu_chinese_taiwan__taiwan.950.vim"
+    ${__rm} -rf ${stagedir}${prefix}/${_mandir}/{fr,it,pl,ru}*
 }
 
 reg pack
@@ -91,42 +96,4 @@ distclean()
 ###################################################
 # No need to look below here
 ###################################################
-
+build_sh $*
-reg all
-all()
-{
-    for METHOD in $METHODS 
-    do
-	case $METHOD in
-	     all*|*clean) ;;
-	     *) $METHOD
-		;;
-	esac
-    done
-
-}
-
-reg
-usage() {
-    echo Usage $0 "{"$(echo $METHODS | tr " " "|")"}"
-    exit 1
-}
-
-OK=0
-for METHOD in $*
-do
-    METHOD=" $METHOD *"
-    if [ "${METHODS%$METHOD}" == "$METHODS" ] ; then
-	usage
-    fi
-    OK=1
-done
-
-if [ $OK = 0 ] ; then
-    usage;
-fi
-
-for METHOD in $*
-do
-    ( $METHOD )
-done

vim/meta/depend.vim-gtk

@@ -1,2 +0,0 @@
-P   SBvim	Vim 6.3 + all the runtime stuff
-P   SBgtk12	GTK 1.2.10 shared libraries

vim/meta/depend.vim-motif

@@ -1,3 +0,0 @@
-P   SBvim	Vim 6.3 + all the runtime stuff
-P   SBlibxpm	X pixmap library
-P   SUNWmfrun	Motif RunTime Kit v2.1.1

vim/meta/depend.vim-x11

@@ -1,2 +0,0 @@
-P   SBvim	Vim 6.3 + all the runtime stuff
-P   SBlibxpm	X pixmap library

vim/meta/pkgdef

@@ -6,9 +6,7 @@ pkgvendor="http://www.vim.org"
 pkgdesc="An improved almost compatible version of Vi"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $_bindir
+default_docs
-dir $_mandir
-dir $_mandir/man1
 $_bindir/ex
 $_bindir/rview
 $_bindir/rvim
@@ -17,7 +15,7 @@ $_bindir/vim
 $_bindir/vimdiff
 $_bindir/vimtutor
 $_bindir/xxd
-$_sharedir
+$_sharedir/vim
 $_mandir/man1/evim*
 $_mandir/man1/ex*
 $_mandir/man1/rview*
@@ -34,9 +32,6 @@ pkgvendor="http://www.vim.org"
 pkgdesc="An improved almost compatible version of Vi"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $_bindir
-dir $_mandir
-dir $_mandir/man1
 $_bindir/gvim
 $_bindir/gvimdiff
 $_bindir/gview