[arch-commits] Commit in flex/trunk (PKGBUILD)

[Allan McRae]

    Date: Saturday, July 21, 2012 @ 06:29:53
  Author: allan
Revision: 163833

upgpkg: flex 2.5.36-1

upstream update

Modified:
  flex/trunk/PKGBUILD

----------+
 PKGBUILD |   35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-21 07:49:51 UTC (rev 163832)
+++ PKGBUILD	2012-07-21 10:29:53 UTC (rev 163833)
@@ -3,8 +3,8 @@
 # Contributor: judd <jvinet at 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 @@
 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
-  	
 }