summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--flex/.footprint.i68612
-rw-r--r--flex/.footprint.x86_6412
-rw-r--r--flex/.md5sum.i6864
-rw-r--r--flex/.md5sum.x86_644
-rwxr-xr-xflex/Pkgfile35
-rw-r--r--flex/lex.sh3
6 files changed, 43 insertions, 27 deletions
diff --git a/flex/.footprint.i686 b/flex/.footprint.i686
index 036e0333d..2bc05f8e3 100644
--- a/flex/.footprint.i686
+++ b/flex/.footprint.i686
@@ -1,14 +1,24 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/flex
+lrwxrwxrwx root/root usr/bin/flex++ -> flex
-rwxr-xr-x root/root usr/bin/lex
drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/FlexLexer.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libfl.a
-rw-r--r-- root/root usr/lib/libfl_pic.a
-lrwxrwxrwx root/root usr/lib/libl.a -> libfl.a
drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/doc/
+drwxr-xr-x root/root usr/share/doc/flex/
+-rw-r--r-- root/root usr/share/doc/flex/AUTHORS
+-rw-r--r-- root/root usr/share/doc/flex/COPYING
+-rw-r--r-- root/root usr/share/doc/flex/NEWS
+-rw-r--r-- root/root usr/share/doc/flex/ONEWS
+-rw-r--r-- root/root usr/share/doc/flex/README
+-rw-r--r-- root/root usr/share/doc/flex/README.cvs
+-rw-r--r-- root/root usr/share/doc/flex/TODO
+-rw-r--r-- root/root usr/share/doc/flex/flex.pdf
drwxr-xr-x root/root usr/share/info/
-rw-r--r-- root/root usr/share/info/flex.info-1.gz
-rw-r--r-- root/root usr/share/info/flex.info-2.gz
diff --git a/flex/.footprint.x86_64 b/flex/.footprint.x86_64
index 036e0333d..2bc05f8e3 100644
--- a/flex/.footprint.x86_64
+++ b/flex/.footprint.x86_64
@@ -1,14 +1,24 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/flex
+lrwxrwxrwx root/root usr/bin/flex++ -> flex
-rwxr-xr-x root/root usr/bin/lex
drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/FlexLexer.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libfl.a
-rw-r--r-- root/root usr/lib/libfl_pic.a
-lrwxrwxrwx root/root usr/lib/libl.a -> libfl.a
drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/doc/
+drwxr-xr-x root/root usr/share/doc/flex/
+-rw-r--r-- root/root usr/share/doc/flex/AUTHORS
+-rw-r--r-- root/root usr/share/doc/flex/COPYING
+-rw-r--r-- root/root usr/share/doc/flex/NEWS
+-rw-r--r-- root/root usr/share/doc/flex/ONEWS
+-rw-r--r-- root/root usr/share/doc/flex/README
+-rw-r--r-- root/root usr/share/doc/flex/README.cvs
+-rw-r--r-- root/root usr/share/doc/flex/TODO
+-rw-r--r-- root/root usr/share/doc/flex/flex.pdf
drwxr-xr-x root/root usr/share/info/
-rw-r--r-- root/root usr/share/info/flex.info-1.gz
-rw-r--r-- root/root usr/share/info/flex.info-2.gz
diff --git a/flex/.md5sum.i686 b/flex/.md5sum.i686
index 91c1aba09..4a65fa47e 100644
--- a/flex/.md5sum.i686
+++ b/flex/.md5sum.i686
@@ -1,2 +1,2 @@
-ad9109820534278c6dd0898178c0788f flex-2.5.35-gcc44-1.patch
-10714e50cea54dc7a227e3eddcd44d57 flex-2.5.35.tar.bz2
+c75940e1fc25108f2a7b3ef42abdae06 flex-2.5.37.tar.bz2
+f725259ec23a9e87ee29e2ef82eda9a5 lex.sh
diff --git a/flex/.md5sum.x86_64 b/flex/.md5sum.x86_64
index 91c1aba09..4a65fa47e 100644
--- a/flex/.md5sum.x86_64
+++ b/flex/.md5sum.x86_64
@@ -1,2 +1,2 @@
-ad9109820534278c6dd0898178c0788f flex-2.5.35-gcc44-1.patch
-10714e50cea54dc7a227e3eddcd44d57 flex-2.5.35.tar.bz2
+c75940e1fc25108f2a7b3ef42abdae06 flex-2.5.37.tar.bz2
+f725259ec23a9e87ee29e2ef82eda9a5 lex.sh
diff --git a/flex/Pkgfile b/flex/Pkgfile
index 634234f61..a87cf97a0 100755
--- a/flex/Pkgfile
+++ b/flex/Pkgfile
@@ -5,29 +5,22 @@
# Depends on:
name=flex
-version=2.5.35
+version=2.5.37
release=1
-source=( http://prdownloads.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2\
- http://www.linuxfromscratch.org/patches/lfs/development/flex-2.5.35-gcc44-1.patch)
+source=(http://prdownloads.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2
+ lex.sh)
+
build() {
-cd $name-$version
-patch -Np1 -i ../flex-2.5.35-gcc44-1.patch
-./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info
-make
-make DESTDIR=$PKG install
-ln -sv libfl.a $PKG/usr/lib/libl.a
-cat > $PKG/usr/bin/lex << "EOF"
-#!/bin/sh
-# Begin /usr/bin/lex
+ cd $name-$version
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info
+ make
+ make DESTDIR=$PKG install
-exec /usr/bin/flex -l "$@"
+ install -Dm755 ../lex.sh $PKG/usr/bin/lex
-# End /usr/bin/lex
-EOF
-chmod -v 755 $PKG/usr/bin/lex
-if [ -f $PKG/usr/share/info/dir ]; then
- rm $PKG/usr/share/info/dir
-fi
+ if [ -f $PKG/usr/share/info/dir ]; then
+ rm $PKG/usr/share/info/dir
+ fi
}
diff --git a/flex/lex.sh b/flex/lex.sh
new file mode 100644
index 000000000..13e7de692
--- /dev/null
+++ b/flex/lex.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/flex -l "$@"