[arch-commits] CVS update of core/devel/flex (PKGBUILD flex-yytext.patch lex.sh)

[Paul Mattal]

    Date: Monday, February 4, 2008 @ 15:24:16
  Author: paul
    Path: /home/cvs-core/core/devel/flex

   Added: lex.sh (1.1)
Modified: PKGBUILD (1.21 -> 1.22)
 Removed: flex-yytext.patch (1.1)

upgpkg: flex 2.5.34-1
upgrade to 2.5.34, removal of old patch, cleanup


-------------------+
 PKGBUILD          |   32 +++++++++++++++-----------------
 flex-yytext.patch |   22 ----------------------
 lex.sh            |    3 +++
 3 files changed, 18 insertions(+), 39 deletions(-)


Index: core/devel/flex/PKGBUILD
diff -u core/devel/flex/PKGBUILD:1.21 core/devel/flex/PKGBUILD:1.22
--- core/devel/flex/PKGBUILD:1.21	Sun Dec  2 22:13:10 2007
+++ core/devel/flex/PKGBUILD	Mon Feb  4 15:24:16 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.21 2007/12/03 03:13:10 dan Exp $
+# $Id: PKGBUILD,v 1.22 2008/02/04 20:24:16 paul Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=flex
-pkgver=2.5.33
-pkgrel=3
+pkgver=2.5.34
+pkgrel=1
 pkgdesc="A tool for generating text-scanning programs"
 arch=(i686 x86_64)
 url="http://flex.sourceforge.net"
@@ -10,23 +10,21 @@
 groups=('base-devel')
 depends=('glibc' 'sh')
 source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 
-        flex-yytext.patch)
-md5sums=('343374a00b38d9e39d1158b71af37150' '3aeab6871ea9fed8ed45db5692e390ca')
+	lex.sh)
+md5sums=('fbdabda79de417b863970eb03c0f53a3' 'f725259ec23a9e87ee29e2ef82eda9a5')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ../flex-yytext.patch
-  ./configure --prefix=/usr
+  cd $startdir/src/$pkgname-$pkgver || return 1
+  
+  # configure
+  ./configure --prefix=/usr || return 1
+
+  # build and install
   make || return 1
-  make prefix=$startdir/pkg/usr install
-  cat > $startdir/pkg/usr/bin/lex << "EOF"
-#!/bin/sh
-# Begin /usr/bin/lex
+  make prefix=$startdir/pkg/usr install || return 1
+  install -D -m755 $startdir/src/lex.sh $startdir/pkg/usr/bin/lex || return 1
 
-exec /usr/bin/flex -l "$@"
-# End /usr/bin/lex
-EOF
-  chmod 755 $startdir/pkg/usr/bin/lex
   # install license
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/license.txt
+  install -D -m644 COPYING \
+  	$startdir/pkg/usr/share/licenses/$pkgname/license.txt || return 1
 }
Index: core/devel/flex/flex-yytext.patch
diff -u core/devel/flex/flex-yytext.patch:1.1 core/devel/flex/flex-yytext.patch:removed
--- core/devel/flex/flex-yytext.patch:1.1	Sun Apr 11 15:17:21 2004
+++ core/devel/flex/flex-yytext.patch	Mon Feb  4 15:24:16 2008
@@ -1,22 +0,0 @@
-diff -Naur flex-2.5.31-orig/flex.skl flex-2.5.31/flex.skl
---- flex-2.5.31-orig/flex.skl	2003-03-31 17:51:38.000000000 -0800
-+++ flex-2.5.31/flex.skl	2004-04-11 12:19:10.000000000 -0700
-@@ -3280,7 +3280,6 @@
- #undef yy_set_bol
- #undef yy_new_buffer
- #undef yy_set_interactive
--#undef yytext_ptr
- #undef YY_DO_BEFORE_ACTION
- 
- #ifdef YY_DECL_IS_OURS
-diff -Naur flex-2.5.31-orig/gen.c flex-2.5.31/gen.c
---- flex-2.5.31-orig/gen.c	2003-03-30 11:58:44.000000000 -0800
-+++ flex-2.5.31/gen.c	2004-04-11 12:19:38.000000000 -0700
-@@ -1812,7 +1812,6 @@
- 			if (yytext_is_array) {
- 				if (!reentrant){
-     				indent_puts ("static int yy_more_offset = 0;");
--                }else{
-                     indent_puts ("static int yy_prev_more_offset = 0;");
-                 }
- 			}
Index: core/devel/flex/lex.sh
diff -u /dev/null core/devel/flex/lex.sh:1.1
--- /dev/null	Mon Feb  4 15:24:16 2008
+++ core/devel/flex/lex.sh	Mon Feb  4 15:24:16 2008
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/flex -l "$@"