Merge branch '3.1' into 3.2

Conflicts: btrfs-progs/.md5sum btrfs-progs/Pkgfile flex/Pkgfile
2015-11-20 15:58:14 +01:00 · 2015-11-20 15:58:14 +01:00 · f9c311c765
commit f9c311c765
parent 8d1e601f37 9bd4492134
2 changed files with 4 additions and 5 deletions
--- a/flex/.md5sum
+++ b/flex/.md5sum
@ -1 +1 @@
-477679c37ff8b28248a9b05f1da29a82  flex-2.5.39.tar.xz
+3cbbfa1554d0b75fad9f8100732454de  flex-2.6.0.tar.xz
--- 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