summaryrefslogtreecommitdiff
path: root/core/flex
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-07-27 20:23:53 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-07-27 20:23:53 -0300
commit3a3f329b736af639fdd3c9621816bad627b96903 (patch)
treea0935f38e21136a3b7eeb93d0ec5c449c12de5b0 /core/flex
parent4d788e769855cbef2539d7cf7049dc2b4d9ac2e0 (diff)
parent2c30604c9ff749660a4b8507eec99e679cf19508 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/kdenlive/PKGBUILD community-staging/openscenegraph/PKGBUILD community-staging/schroot/PKGBUILD community-staging/wt/PKGBUILD community-testing/cdfs/PKGBUILD community-testing/pingus/PKGBUILD community-testing/tagpy/PKGBUILD community-testing/vhba-module/PKGBUILD community-testing/vhba-module/vhba-module.install community/surf/PKGBUILD community/unpaper/PKGBUILD core/flex/PKGBUILD core/gcc/PKGBUILD extra/boost/PKGBUILD extra/cups/PKGBUILD extra/gnutls/PKGBUILD extra/gtk2/PKGBUILD extra/llvm/PKGBUILD extra/mesa/PKGBUILD extra/qt/PKGBUILD kde-unstable/akonadi/PKGBUILD kde-unstable/kdeplasma-addons/PKGBUILD libre/virtualbox-libre/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-libpng/PKGBUILD testing/bind/PKGBUILD testing/dnsutils/PKGBUILD testing/iptables/PKGBUILD testing/nouveau-dri/PKGBUILD
Diffstat (limited to 'core/flex')
-rw-r--r--core/flex/PKGBUILD37
1 files changed, 11 insertions, 26 deletions
diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index 62a73bbfc..967356836 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.1
+pkgver=2.5.36
+pkgrel=1
pkgdesc="A tool for generating text-scanning programs"
arch=('i686' 'x86_64' 'mips64el')
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
-
}