diff options
author | Juergen Daubert <jue@jue.li> | 2015-11-20 15:58:14 +0100 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2015-11-20 15:58:14 +0100 |
commit | f9c311c7652d5746643aa8220ae7d3682e694851 (patch) | |
tree | 5888d046bad5d4e8739358db26412ab6ca327dd4 /flex | |
parent | 8d1e601f371a93cb466b7593a21fd5269a99832d (diff) | |
parent | 9bd4492134373dc6d8b96d69ef9ddd3b2037be33 (diff) | |
download | core-f9c311c7652d5746643aa8220ae7d3682e694851.tar.gz core-f9c311c7652d5746643aa8220ae7d3682e694851.tar.xz |
Merge branch '3.1' into 3.2
Conflicts:
btrfs-progs/.md5sum
btrfs-progs/Pkgfile
flex/Pkgfile
Diffstat (limited to 'flex')
-rw-r--r-- | flex/.md5sum | 2 | ||||
-rw-r--r-- | flex/Pkgfile | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/flex/.md5sum b/flex/.md5sum index f19d4a36..d594c983 100644 --- a/flex/.md5sum +++ b/flex/.md5sum @@ -1 +1 @@ -477679c37ff8b28248a9b05f1da29a82 flex-2.5.39.tar.xz +3cbbfa1554d0b75fad9f8100732454de flex-2.6.0.tar.xz diff --git a/flex/Pkgfile b/flex/Pkgfile index cffbd27c..6d275cc8 100644 --- a/flex/Pkgfile +++ b/flex/Pkgfile @@ -3,15 +3,14 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=flex -version=2.5.39 -release=2 +version=2.6.0 +release=1 source=(http://downloads.sourceforge.net/project/$name/$name-$version.tar.xz) build() { cd $name-$version - ./configure --prefix=/usr \ - --disable-nls + ./configure --prefix=/usr --disable-nls make make DESTDIR=$PKG install |