From f0ad471cd6a555674742f6cd137e1320929ad5e7 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Mon, 25 Apr 2005 07:19:52 +0000
Subject: [PATCH] Update to latest upstream version Convert build.sh to
 newstyle build.sh

---
 cvs/build.sh | 61 ++++++++--------------------------------------------
 1 file changed, 9 insertions(+), 52 deletions(-)

diff --git a/cvs/build.sh b/cvs/build.sh
index c629170..3f024a0 100755
--- a/cvs/build.sh
+++ b/cvs/build.sh
@@ -3,13 +3,14 @@
 # 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
-# stolen from jhlj's Compile.sh script :)
+# build.sh helper functions
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
+###########################################################
 # Check the following 4 variables before running the script
 topdir=cvs
-version=1.11.17
-pkgver=1
+version=1.11.20
+pkgver=2
 source[0]=$topdir-$version.tar.bz2
 # If there are no patches, simply comment this
 #patch[0]=
@@ -17,11 +18,9 @@ source[0]=$topdir-$version.tar.bz2
 # Source function library
 . ${HOME}/buildpkg/scripts/buildpkg.functions
 
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
+# Global settings
+export LDFLAGS="-R/usr/local/lib"
+shortroot=1
 
 reg prep
 prep()
@@ -32,23 +31,19 @@ prep()
 reg build
 build()
 {
-    export LDFLAGS="-R/usr/local/lib"
     generic_build
 }
 
 reg install
 install()
 {
-    shortroot=1
     generic_install prefix
     doc FAQ README NEWS doc/*.ps
-    $RM -f $stagedir/info/dir
 }
 
 reg pack
 pack()
 {
-    shortroot=1
     generic_pack
 }
 
@@ -61,42 +56,4 @@ distclean()
 ###################################################
 # No need to look below here
 ###################################################
-
-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
+build_sh $*