[Lunar-commits] <moonbase> elvis: fix compilation, & minor tidy

[Paul Bredbury]

commit 4bfa2f1485b304ad5ea577e8e9bb0b6d292dedf9
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Tue Mar 1 13:54:54 2011 +0700

    elvis: fix compilation, & minor tidy
---
 editors/elvis/BUILD   |   14 ++++++++------
 editors/elvis/DETAILS |    3 +++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/editors/elvis/BUILD b/editors/elvis/BUILD
index adc3ff3..33e238e 100644
--- a/editors/elvis/BUILD
+++ b/editors/elvis/BUILD
@@ -1,9 +1,11 @@
 (
 
-  sedit "s/if test -n \"\$mandir\"/mandir=\/usr\/share\/man\/man1 ; \0/" instman.sh
-  sedit "s/for dir in \$mandir/mandir=\/usr\/share\/man\/man1 ; \0/" instman.sh
-  sedit  "s/-O2/$CFLAGS $LDFLAGS/"  configure     &&
-  
+  patch_it $SOURCE2 1 &&
+
+  sedit "s/if test -n \"\$mandir\"/mandir=\/usr\/share\/man\/man1 ; \0/" instman.sh &&
+  sedit "s/for dir in \$mandir/mandir=\/usr\/share\/man\/man1 ; \0/" instman.sh &&
+  sedit  "s/-O2/$CFLAGS $LDFLAGS/" configure &&
+
   if [ "$USE_X11" == "y" ]; then
     ./configure  --with-x linux            \
                  --bindir=/usr/bin         \
@@ -11,13 +13,13 @@
     make &&
     mv elvis xelvis &&
     make clean
-  fi
+  fi &&
 
   ./configure  --with-x=no linux         \
                --bindir=/usr/bin         \
                --datadir=/var/lib/elvis  &&
   default_make &&
-  
+
   if [ "$USE_X11" == "y" ]; then
     cp xelvis /usr/bin/xelvis
   fi
diff --git a/editors/elvis/DETAILS b/editors/elvis/DETAILS
index 8b6f7e1..3347226 100644
--- a/editors/elvis/DETAILS
+++ b/editors/elvis/DETAILS
@@ -1,8 +1,11 @@
           MODULE=elvis
          VERSION=2.2_0
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=elvis-2.2_0-fixes.patch.bz2
       SOURCE_URL=ftp://ftp.cs.pdx.edu/pub/$MODULE/
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:8c16574b6d36529735b8ced70972ddaf6275a477
+     SOURCE2_VFY=sha1:34861a82b39a5f65f1423bf89751f205ffaf1a89
         WEB_SITE=http://elvis.vi-editor.org
          ENTERED=20010922
          UPDATED=20031107