From 56913dc8679143308408596f2872f3894b3ab9d0 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 24 Jul 2012 00:01:46 +0000
Subject: Tue Jul 24 00:01:46 UTC 2012

---
 core/flex/PKGBUILD | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

(limited to 'core/flex')

diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index b6d795076..64781e231 100644
--- a/core/flex/PKGBUILD
+++ b/core/flex/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142183 2011-11-05 22:42:53Z allan $
+# $Id: PKGBUILD 163938 2012-07-22 12:56:35Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=flex
-pkgver=2.5.35
-pkgrel=5
+pkgver=2.5.36
+pkgrel=1
 pkgdesc="A tool for generating text-scanning programs"
 arch=('i686' 'x86_64')
 url="http://flex.sourceforge.net"
@@ -12,48 +12,33 @@ license=('custom')
 groups=('base-devel')
 depends=('glibc' 'm4' 'sh')
 install=flex.install
-source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 
-        flex-2.5.35-gcc44.patch
-        flex-2.5.35-hardening.patch
-        flex-2.5.35-missing-prototypes.patch
-        flex-2.5.35-sign.patch
+source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
         lex.sh)
-md5sums=('10714e50cea54dc7a227e3eddcd44d57'
-         'e4444ef5c07db71a43280be74139bdea'
-         'de952b3ed7cc074bc8c3e6ab73634048'
-         '6b83f56b1b654c6a321cdc530a3ec68d'
-         'd87fd9e9762ba7e230d516bdcf1c8c6f'
+md5sums=('5e637290609fd3c2f1f2e75ac2bce1c5'
          'f725259ec23a9e87ee29e2ef82eda9a5')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
-  patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch
-  patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch
-  patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch
-  patch -Np1 -i $srcdir/flex-2.5.35-sign.patch
-
-  ./configure --prefix=/usr \
-    --mandir=/usr/share/man --infodir=/usr/share/info
+  ./configure --prefix=/usr
   make
 }
 
 check() {
   cd $srcdir/$pkgname-$pkgver
+  
+  # these tests used features removed in bison-2.6
+  sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in
+
   make check
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
 
-  make prefix=$pkgdir/usr \
-    mandir=$pkgdir/usr/share/man \
-    infodir=$pkgdir/usr/share/info \
-    install
+  make DESTDIR=$pkgdir install
   install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
 
   install -Dm644 COPYING \
   	$pkgdir/usr/share/licenses/$pkgname/license.txt
-  	
 }
 
-- 
cgit v1.2.3-54-g00ecf