Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

15 files changed, 36 insertions, 22 deletions

diff --git a/base/freetype/.footprint.i686 b/base/freetype/.footprint.i686
index 31a0e22d1..c53d8ebf3 100644
--- a/base/freetype/.footprint.i686
+++ b/base/freetype/.footprint.i686
@@ -15,6 +15,7 @@ drwxr-xr-x	root/root	usr/include/freetype2/freetype/config/
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbbox.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbdf.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbitmap.h
+-rw-r--r--	root/root	usr/include/freetype2/freetype/ftbzip2.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftcache.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftchapters.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftcid.h
@@ -55,9 +56,9 @@ drwxr-xr-x	root/root	usr/include/freetype2/freetype/config/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libfreetype.a
 -rwxr-xr-x	root/root	usr/lib/libfreetype.la
-lrwxrwxrwx	root/root	usr/lib/libfreetype.so -> libfreetype.so.6.6.2
-lrwxrwxrwx	root/root	usr/lib/libfreetype.so.6 -> libfreetype.so.6.6.2
--rwxr-xr-x	root/root	usr/lib/libfreetype.so.6.6.2
+lrwxrwxrwx	root/root	usr/lib/libfreetype.so -> libfreetype.so.6.7.1
+lrwxrwxrwx	root/root	usr/lib/libfreetype.so.6 -> libfreetype.so.6.7.1
+-rwxr-xr-x	root/root	usr/lib/libfreetype.so.6.7.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/freetype2.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/base/freetype/.footprint.x86_64 b/base/freetype/.footprint.x86_64
index 31a0e22d1..c53d8ebf3 100644
--- a/base/freetype/.footprint.x86_64
+++ b/base/freetype/.footprint.x86_64
@@ -15,6 +15,7 @@ drwxr-xr-x	root/root	usr/include/freetype2/freetype/config/
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbbox.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbdf.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbitmap.h
+-rw-r--r--	root/root	usr/include/freetype2/freetype/ftbzip2.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftcache.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftchapters.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftcid.h
@@ -55,9 +56,9 @@ drwxr-xr-x	root/root	usr/include/freetype2/freetype/config/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libfreetype.a
 -rwxr-xr-x	root/root	usr/lib/libfreetype.la
-lrwxrwxrwx	root/root	usr/lib/libfreetype.so -> libfreetype.so.6.6.2
-lrwxrwxrwx	root/root	usr/lib/libfreetype.so.6 -> libfreetype.so.6.6.2
--rwxr-xr-x	root/root	usr/lib/libfreetype.so.6.6.2
+lrwxrwxrwx	root/root	usr/lib/libfreetype.so -> libfreetype.so.6.7.1
+lrwxrwxrwx	root/root	usr/lib/libfreetype.so.6 -> libfreetype.so.6.7.1
+-rwxr-xr-x	root/root	usr/lib/libfreetype.so.6.7.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/freetype2.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/base/freetype/.md5sum.i686 b/base/freetype/.md5sum.i686
index 30548c630..25ec6d4d5 100644
--- a/base/freetype/.md5sum.i686
+++ b/base/freetype/.md5sum.i686
@@ -1 +1 @@
-b3e2b6e2f1c3e0dffa1fd2a0f848b671  freetype-2.4.4.tar.bz2
+5e6510613f612809d2d7862592b92ab7  freetype-2.4.6.tar.bz2
diff --git a/base/freetype/.md5sum.x86_64 b/base/freetype/.md5sum.x86_64
index 30548c630..25ec6d4d5 100644
--- a/base/freetype/.md5sum.x86_64
+++ b/base/freetype/.md5sum.x86_64
@@ -1 +1 @@
-b3e2b6e2f1c3e0dffa1fd2a0f848b671  freetype-2.4.4.tar.bz2
+5e6510613f612809d2d7862592b92ab7  freetype-2.4.6.tar.bz2
diff --git a/base/freetype/Pkgfile b/base/freetype/Pkgfile
index cb1dbc9cb..267420c68 100755
--- a/base/freetype/Pkgfile
+++ b/base/freetype/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=freetype
-version=2.4.4
+version=2.4.6
 release=1
 source=( http://switch.dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
 
diff --git a/base/xorg-resourceproto/.footprint.i686 b/base/xorg-resourceproto/.footprint.i686
index 41f9aad57..ae421fd04 100644
--- a/base/xorg-resourceproto/.footprint.i686
+++ b/base/xorg-resourceproto/.footprint.i686
@@ -6,3 +6,7 @@ drwxr-xr-x	root/root	usr/include/X11/extensions/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/resourceproto.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/resourceproto/
+-rw-r--r--	root/root	usr/share/doc/resourceproto/resproto.txt
diff --git a/base/xorg-resourceproto/.footprint.x86_64 b/base/xorg-resourceproto/.footprint.x86_64
index 41f9aad57..ae421fd04 100644
--- a/base/xorg-resourceproto/.footprint.x86_64
+++ b/base/xorg-resourceproto/.footprint.x86_64
@@ -6,3 +6,7 @@ drwxr-xr-x	root/root	usr/include/X11/extensions/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/resourceproto.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/resourceproto/
+-rw-r--r--	root/root	usr/share/doc/resourceproto/resproto.txt
diff --git a/base/xorg-resourceproto/.md5sum.i686 b/base/xorg-resourceproto/.md5sum.i686
index 0fe1aef73..36f1c9c53 100644
--- a/base/xorg-resourceproto/.md5sum.i686
+++ b/base/xorg-resourceproto/.md5sum.i686
@@ -1 +1 @@
-8ff0525ae7502b48597b78d00bc22284  resourceproto-1.1.1.tar.bz2
+cfdb57dae221b71b2703f8e2980eaaf4  resourceproto-1.2.0.tar.bz2
diff --git a/base/xorg-resourceproto/.md5sum.x86_64 b/base/xorg-resourceproto/.md5sum.x86_64
index 0fe1aef73..36f1c9c53 100644
--- a/base/xorg-resourceproto/.md5sum.x86_64
+++ b/base/xorg-resourceproto/.md5sum.x86_64
@@ -1 +1 @@
-8ff0525ae7502b48597b78d00bc22284  resourceproto-1.1.1.tar.bz2
+cfdb57dae221b71b2703f8e2980eaaf4  resourceproto-1.2.0.tar.bz2
diff --git a/base/xorg-resourceproto/Pkgfile b/base/xorg-resourceproto/Pkgfile
index 01ccdba7d..0b5d8ecb2 100644
--- a/base/xorg-resourceproto/Pkgfile
+++ b/base/xorg-resourceproto/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=xorg-resourceproto
-version=1.1.1
+version=1.2.0
 release=1
 source=(http://xorg.freedesktop.org/releases/individual/proto/resourceproto-$version.tar.bz2)
 
diff --git a/base/xorg-xbitmaps/.footprint.i686 b/base/xorg-xbitmaps/.footprint.i686
index 4a4d706f0..4e7092962 100644
--- a/base/xorg-xbitmaps/.footprint.i686
+++ b/base/xorg-xbitmaps/.footprint.i686
@@ -5,6 +5,8 @@ drwxr-xr-x	root/root	usr/include/X11/bitmaps/
 -rw-r--r--	root/root	usr/include/X11/bitmaps/1x1
 -rw-r--r--	root/root	usr/include/X11/bitmaps/2x2
 -rw-r--r--	root/root	usr/include/X11/bitmaps/black
+-rw-r--r--	root/root	usr/include/X11/bitmaps/black6
+-rw-r--r--	root/root	usr/include/X11/bitmaps/box6
 -rw-r--r--	root/root	usr/include/X11/bitmaps/boxes
 -rw-r--r--	root/root	usr/include/X11/bitmaps/calculator
 -rw-r--r--	root/root	usr/include/X11/bitmaps/cntr_ptr
@@ -71,6 +73,6 @@ drwxr-xr-x	root/root	usr/include/X11/bitmaps/
 -rw-r--r--	root/root	usr/include/X11/bitmaps/xlogo32
 -rw-r--r--	root/root	usr/include/X11/bitmaps/xlogo64
 -rw-r--r--	root/root	usr/include/X11/bitmaps/xsnow
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/xbitmaps.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/pkgconfig/
+-rw-r--r--	root/root	usr/share/pkgconfig/xbitmaps.pc
diff --git a/base/xorg-xbitmaps/.footprint.x86_64 b/base/xorg-xbitmaps/.footprint.x86_64
index 4a4d706f0..4e7092962 100644
--- a/base/xorg-xbitmaps/.footprint.x86_64
+++ b/base/xorg-xbitmaps/.footprint.x86_64
@@ -5,6 +5,8 @@ drwxr-xr-x	root/root	usr/include/X11/bitmaps/
 -rw-r--r--	root/root	usr/include/X11/bitmaps/1x1
 -rw-r--r--	root/root	usr/include/X11/bitmaps/2x2
 -rw-r--r--	root/root	usr/include/X11/bitmaps/black
+-rw-r--r--	root/root	usr/include/X11/bitmaps/black6
+-rw-r--r--	root/root	usr/include/X11/bitmaps/box6
 -rw-r--r--	root/root	usr/include/X11/bitmaps/boxes
 -rw-r--r--	root/root	usr/include/X11/bitmaps/calculator
 -rw-r--r--	root/root	usr/include/X11/bitmaps/cntr_ptr
@@ -71,6 +73,6 @@ drwxr-xr-x	root/root	usr/include/X11/bitmaps/
 -rw-r--r--	root/root	usr/include/X11/bitmaps/xlogo32
 -rw-r--r--	root/root	usr/include/X11/bitmaps/xlogo64
 -rw-r--r--	root/root	usr/include/X11/bitmaps/xsnow
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/xbitmaps.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/pkgconfig/
+-rw-r--r--	root/root	usr/share/pkgconfig/xbitmaps.pc
diff --git a/base/xorg-xbitmaps/.md5sum.i686 b/base/xorg-xbitmaps/.md5sum.i686
index f477a3d9b..6c6de8fae 100644
--- a/base/xorg-xbitmaps/.md5sum.i686
+++ b/base/xorg-xbitmaps/.md5sum.i686
@@ -1 +1 @@
-b28a9840cde3c38d7c09716372fea257  xbitmaps-1.0.1.tar.bz2
+7444bbbd999b53bec6a60608a5301f4c  xbitmaps-1.1.1.tar.bz2
diff --git a/base/xorg-xbitmaps/.md5sum.x86_64 b/base/xorg-xbitmaps/.md5sum.x86_64
index f477a3d9b..6c6de8fae 100644
--- a/base/xorg-xbitmaps/.md5sum.x86_64
+++ b/base/xorg-xbitmaps/.md5sum.x86_64
@@ -1 +1 @@
-b28a9840cde3c38d7c09716372fea257  xbitmaps-1.0.1.tar.bz2
+7444bbbd999b53bec6a60608a5301f4c  xbitmaps-1.1.1.tar.bz2
diff --git a/base/xorg-xbitmaps/Pkgfile b/base/xorg-xbitmaps/Pkgfile
index d9a6902fd..1815f3c83 100644
--- a/base/xorg-xbitmaps/Pkgfile
+++ b/base/xorg-xbitmaps/Pkgfile
@@ -1,9 +1,9 @@
 # Description: Bitmaps for X
 # URL: http://xorg.freedesktop.org
-# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
+# Maintainer: NuTyX Core Team
 
 name=xorg-xbitmaps
-version=1.0.1
+version=1.1.1
 release=1
 source=(http://xorg.freedesktop.org/releases/individual/data/xbitmaps-$version.tar.bz2)