Merge branch '3.0' into 3.1

Conflicts:
	libarchive/Pkgfile

flex/.md5sum

@@ -1 +1 @@
-b230c88e65996ff74994d08a2a2e0f27  flex-2.5.38.tar.bz2
+477679c37ff8b28248a9b05f1da29a82  flex-2.5.39.tar.xz

flex/Pkgfile

@@ -3,9 +3,9 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=flex
-version=2.5.38
+version=2.5.39
 release=1
-source=(http://downloads.sourceforge.net/project/$name/$name-$version.tar.bz2)
+source=(http://downloads.sourceforge.net/project/$name/$name-$version.tar.xz)
 
 build() {
     cd $name-$version

libpcre/.footprint

@@ -1,6 +1,6 @@
 drwxr-xr-x	root/root	lib/
-lrwxrwxrwx	root/root	lib/libpcre.so.1 -> libpcre.so.1.2.2
--rwxr-xr-x	root/root	lib/libpcre.so.1.2.2
+lrwxrwxrwx	root/root	lib/libpcre.so.1 -> libpcre.so.1.2.3
+-rwxr-xr-x	root/root	lib/libpcre.so.1.2.3
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/pcre-config
@@ -16,7 +16,7 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libpcre.a
 -rwxr-xr-x	root/root	usr/lib/libpcre.la
-lrwxrwxrwx	root/root	usr/lib/libpcre.so -> ../../lib/libpcre.so.1.2.2
+lrwxrwxrwx	root/root	usr/lib/libpcre.so -> ../../lib/libpcre.so.1.2.3
 -rw-r--r--	root/root	usr/lib/libpcrecpp.a
 -rwxr-xr-x	root/root	usr/lib/libpcrecpp.la
 lrwxrwxrwx	root/root	usr/lib/libpcrecpp.so -> libpcrecpp.so.0.0.0

libpcre/.md5sum

@@ -1 +1 @@
-5439e321351bddd5533551bbce128d07  pcre-8.34.tar.bz2
+6aacb23986adccd9b3bc626c00979958  pcre-8.35.tar.bz2

libpcre/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=libpcre
-version=8.34
+version=8.35
 release=1
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)
 

tzdata/.footprint

@@ -249,6 +249,7 @@ drwxr-xr-x	root/root	usr/share/zoneinfo/Antarctica/
 -rw-r--r--	root/root	usr/share/zoneinfo/Antarctica/Rothera
 -rw-r--r--	root/root	usr/share/zoneinfo/Antarctica/South_Pole
 -rw-r--r--	root/root	usr/share/zoneinfo/Antarctica/Syowa
+-rw-r--r--	root/root	usr/share/zoneinfo/Antarctica/Troll
 -rw-r--r--	root/root	usr/share/zoneinfo/Antarctica/Vostok
 drwxr-xr-x	root/root	usr/share/zoneinfo/Arctic/
 -rw-r--r--	root/root	usr/share/zoneinfo/Arctic/Longyearbyen
@@ -851,6 +852,7 @@ drwxr-xr-x	root/root	usr/share/zoneinfo/posix/Antarctica/
 -rw-r--r--	root/root	usr/share/zoneinfo/posix/Antarctica/Rothera
 -rw-r--r--	root/root	usr/share/zoneinfo/posix/Antarctica/South_Pole
 -rw-r--r--	root/root	usr/share/zoneinfo/posix/Antarctica/Syowa
+-rw-r--r--	root/root	usr/share/zoneinfo/posix/Antarctica/Troll
 -rw-r--r--	root/root	usr/share/zoneinfo/posix/Antarctica/Vostok
 drwxr-xr-x	root/root	usr/share/zoneinfo/posix/Arctic/
 -rw-r--r--	root/root	usr/share/zoneinfo/posix/Arctic/Longyearbyen
@@ -1452,6 +1454,7 @@ drwxr-xr-x	root/root	usr/share/zoneinfo/right/Antarctica/
 -rw-r--r--	root/root	usr/share/zoneinfo/right/Antarctica/Rothera
 -rw-r--r--	root/root	usr/share/zoneinfo/right/Antarctica/South_Pole
 -rw-r--r--	root/root	usr/share/zoneinfo/right/Antarctica/Syowa
+-rw-r--r--	root/root	usr/share/zoneinfo/right/Antarctica/Troll
 -rw-r--r--	root/root	usr/share/zoneinfo/right/Antarctica/Vostok
 drwxr-xr-x	root/root	usr/share/zoneinfo/right/Arctic/
 -rw-r--r--	root/root	usr/share/zoneinfo/right/Arctic/Longyearbyen

tzdata/.md5sum

@@ -1,3 +1,3 @@
 cd1eb9bce381be0d6a35337f593aca18  tzcode-makefile.patch
-77ccbb720f0f2076f12dff6ded70eb98  tzcode2014a.tar.gz
-423a11bcffc10dda578058cf1587d048  tzdata2014a.tar.gz
+7629513a4dbd107b7da946123d498c6b  tzcode2014b.tar.gz
+c58d556612396d4ca5a17807a79924e5  tzdata2014b.tar.gz

tzdata/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu 
 
 name=tzdata
-version=2014a
+version=2014b
 release=1
 source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz
         http://www.iana.org/time-zones/repository/releases/tzcode$version.tar.gz