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

20 files changed, 308 insertions, 194 deletions

diff --git a/extra/brltty/.footprint.i686 b/extra/brltty/.footprint.i686
index aafef6700..11861576c 100644
--- a/extra/brltty/.footprint.i686
+++ b/extra/brltty/.footprint.i686
@@ -17,57 +17,120 @@ drwxr-xr-x	root/root	etc/brltty/
 -rw-r--r--	root/root	etc/brltty/boxes.tti
 -rw-r--r--	root/root	etc/brltty/bra.ttb
 -rw-r--r--	root/root	etc/brltty/brf.ttb
--rw-r--r--	root/root	etc/brltty/brltty-al.hlp
--rw-r--r--	root/root	etc/brltty/brltty-at.hlp
--rw-r--r--	root/root	etc/brltty/brltty-ba.hlp
--rw-r--r--	root/root	etc/brltty/brltty-bd.hlp
--rw-r--r--	root/root	etc/brltty/brltty-bl.hlp
--rw-r--r--	root/root	etc/brltty/brltty-bm.hlp
--rw-r--r--	root/root	etc/brltty/brltty-bn.hlp
--rw-r--r--	root/root	etc/brltty/brltty-cb.hlp
--rw-r--r--	root/root	etc/brltty/brltty-ec.hlp
--rw-r--r--	root/root	etc/brltty/brltty-eu.hlp
--rw-r--r--	root/root	etc/brltty/brltty-fs.hlp
--rw-r--r--	root/root	etc/brltty/brltty-hm.hlp
--rw-r--r--	root/root	etc/brltty/brltty-ht.hlp
--rw-r--r--	root/root	etc/brltty/brltty-il.hlp
--rw-r--r--	root/root	etc/brltty/brltty-lt.hlp
--rw-r--r--	root/root	etc/brltty/brltty-mb.hlp
--rw-r--r--	root/root	etc/brltty/brltty-md.hlp
--rw-r--r--	root/root	etc/brltty/brltty-mn.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pg.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-2d_l.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-2d_s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-c.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-c_486.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el2d_80s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el40s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el66s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el70s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el80_ii.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el80s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_2d_40.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_2d_66.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_2d_80.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_40_p.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_80.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-elba_20.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-elba_32.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-elba_trio_20.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-elba_trio_32.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-ib_80.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-trio.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm.conf
--rw-r--r--	root/root	etc/brltty/brltty-pm.hlp
--rw-r--r--	root/root	etc/brltty/brltty-sk.hlp
--rw-r--r--	root/root	etc/brltty/brltty-tn.hlp
--rw-r--r--	root/root	etc/brltty/brltty-ts.hlp
--rw-r--r--	root/root	etc/brltty/brltty-tt.hlp
--rw-r--r--	root/root	etc/brltty/brltty-vd.hlp
--rw-r--r--	root/root	etc/brltty/brltty-vo.hlp
--rw-r--r--	root/root	etc/brltty/brltty-vr.hlp
--rw-r--r--	root/root	etc/brltty/brltty-vs.hlp
--rw-r--r--	root/root	etc/brltty/brltty-xw.hlp
+-rw-r--r--	root/root	etc/brltty/brl-al-abt_basic.kti
+-rw-r--r--	root/root	etc/brltty/brl-al-abt_extra.kti
+-rw-r--r--	root/root	etc/brltty/brl-al-abt_large.ktb
+-rw-r--r--	root/root	etc/brltty/brl-al-abt_small.ktb
+-rw-r--r--	root/root	etc/brltty/brl-al-bc.ktb
+-rw-r--r--	root/root	etc/brltty/brl-al-sat_basic.kti
+-rw-r--r--	root/root	etc/brltty/brl-al-sat_extra.kti
+-rw-r--r--	root/root	etc/brltty/brl-al-sat_large.ktb
+-rw-r--r--	root/root	etc/brltty/brl-al-sat_small.ktb
+-rw-r--r--	root/root	etc/brltty/brl-at-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-command.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-default.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-display6.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-display7.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-dm80p.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-front10.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-front6.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-horizontal.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-inka.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-keyboard.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-pro.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-routing6.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-routing7.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-status.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-vario.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-vertical.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-wheels.kti
+-rw-r--r--	root/root	etc/brltty/brl-cb-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-bumpers.kti
+-rw-r--r--	root/root	etc/brltty/brl-fs-common.kti
+-rw-r--r--	root/root	etc/brltty/brl-fs-focus_basic.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-focus_basic.kti
+-rw-r--r--	root/root	etc/brltty/brl-fs-focus_large.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-focus_small.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-pacmate.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-rockers.kti
+-rw-r--r--	root/root	etc/brltty/brl-hm-sense.ktb
+-rw-r--r--	root/root	etc/brltty/brl-hm-sync.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-bkwm.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-bs.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-bs40.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-bs80.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-dots.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-easy.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-input.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-keypad.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-mdlr.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-me.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-me64.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-me88.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-rockers.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-wave.ktb
+-rw-r--r--	root/root	etc/brltty/brl-mt-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pg-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-2d_l.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-2d_s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-bar.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-c.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-c_486.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el2d_80s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el40s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el66s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el70s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el80_ii.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el80s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_2d_40.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_2d_66.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_2d_80.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_40_p.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_80.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-elba_20.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-elba_32.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-elba_trio_20.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-elba_trio_32.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-front13.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-front9.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-ib_80.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-keyboard.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-keys.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-routing.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status0.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status13.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status2.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status20.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status22.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status4.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-switches.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-trio.ktb
+-rw-r--r--	root/root	etc/brltty/brl-sk-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-vo-all.ktb
+-rw-r--r--	root/root	etc/brltty/brltty-ba-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bd-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bl-18.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bl-40_m20_m40.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bn-commands.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bn-keys.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ec-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ec-spanish.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-eu-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-il-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-lt-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-mb-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-md-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-mn-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-tn-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ts-nav20_nav40.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ts-nav80.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ts-pb40.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ts-pb65_pb81.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-tt-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-vd-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-vr-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-vs-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-xw-all.hlp
 -rw-r--r--	root/root	etc/brltty/common.tti
 -rw-r--r--	root/root	etc/brltty/control-latin.tti
 -rw-r--r--	root/root	etc/brltty/countries.cti
@@ -81,7 +144,6 @@ drwxr-xr-x	root/root	etc/brltty/
 -rw-r--r--	root/root	etc/brltty/de-kurzschrift.ctb
 -rw-r--r--	root/root	etc/brltty/de-vollschrift.ctb
 -rw-r--r--	root/root	etc/brltty/de.ttb
--rw-r--r--	root/root	etc/brltty/desktop.ktb
 -rw-r--r--	root/root	etc/brltty/devanagari.tti
 -rw-r--r--	root/root	etc/brltty/dra.ttb
 -rw-r--r--	root/root	etc/brltty/el.ttb
@@ -125,7 +187,10 @@ drwxr-xr-x	root/root	etc/brltty/
 -rw-r--r--	root/root	etc/brltty/it.ttb
 -rw-r--r--	root/root	etc/brltty/ja.ctb
 -rw-r--r--	root/root	etc/brltty/kannada.tti
--rw-r--r--	root/root	etc/brltty/keypad.ktb
+-rw-r--r--	root/root	etc/brltty/kbd-braille.kti
+-rw-r--r--	root/root	etc/brltty/kbd-desktop.ktb
+-rw-r--r--	root/root	etc/brltty/kbd-keypad.ktb
+-rw-r--r--	root/root	etc/brltty/kbd-laptop.ktb
 -rw-r--r--	root/root	etc/brltty/kha.ttb
 -rw-r--r--	root/root	etc/brltty/kn.ttb
 -rw-r--r--	root/root	etc/brltty/ko-g1.ctb
@@ -133,7 +198,6 @@ drwxr-xr-x	root/root	etc/brltty/
 -rw-r--r--	root/root	etc/brltty/ko.ctb
 -rw-r--r--	root/root	etc/brltty/kok.ttb
 -rw-r--r--	root/root	etc/brltty/kru.ttb
--rw-r--r--	root/root	etc/brltty/laptop.ktb
 -rw-r--r--	root/root	etc/brltty/letters-cyrillic.tti
 -rw-r--r--	root/root	etc/brltty/letters-latin-dot8.tti
 -rw-r--r--	root/root	etc/brltty/letters-latin.cti
@@ -219,13 +283,24 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/brlapi_protocol.h
 drwxr-xr-x	root/root	usr/include/brltty/
 -rw-r--r--	root/root	usr/include/brltty/api.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-al.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-at.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-bm.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-cb.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-fs.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-hm.h
 -rw-r--r--	root/root	usr/include/brltty/brldefs-ht.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-mt.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-pg.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-pm.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-sk.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-vo.h
 -rw-r--r--	root/root	usr/include/brltty/brldefs-vs.h
 -rw-r--r--	root/root	usr/include/brltty/brldefs.h
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/brlapi-0.5.4/
--rwxr-xr-x	root/root	usr/lib/brlapi-0.5.4/libbrlapi_tcl.so
--rw-r--r--	root/root	usr/lib/brlapi-0.5.4/pkgIndex.tcl
+drwxr-xr-x	root/root	usr/lib/brlapi-0.5.5/
+-rwxr-xr-x	root/root	usr/lib/brlapi-0.5.5/libbrlapi_tcl.so
+-rw-r--r--	root/root	usr/lib/brlapi-0.5.5/pkgIndex.tcl
 drwxr-xr-x	root/root	usr/lib/brltty/
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybal.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybat.so
@@ -245,6 +320,7 @@ drwxr-xr-x	root/root	usr/lib/brltty/
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybmb.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybmd.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybmn.so
+-rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybmt.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybpg.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybpm.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybsk.so
@@ -259,17 +335,16 @@ drwxr-xr-x	root/root	usr/lib/brltty/
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysal.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysbl.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyscb.so
--rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyses.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysfv.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysgs.so
--rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyxas.so
+-rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysxs.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyxlx.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyxsc.so
 drwxr-xr-x	root/root	usr/lib/brltty/rw/
 -rw-r--r--	root/root	usr/lib/libbrlapi.a
-lrwxrwxrwx	root/root	usr/lib/libbrlapi.so -> libbrlapi.so.0.5.4
-lrwxrwxrwx	root/root	usr/lib/libbrlapi.so.0.5 -> libbrlapi.so.0.5.4
--rwxr-xr-x	root/root	usr/lib/libbrlapi.so.0.5.4
+lrwxrwxrwx	root/root	usr/lib/libbrlapi.so -> libbrlapi.so.0.5.5
+lrwxrwxrwx	root/root	usr/lib/libbrlapi.so.0.5 -> libbrlapi.so.0.5.5
+-rwxr-xr-x	root/root	usr/lib/libbrlapi.so.0.5.5
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
diff --git a/extra/brltty/.footprint.x86_64 b/extra/brltty/.footprint.x86_64
index aafef6700..11861576c 100644
--- a/extra/brltty/.footprint.x86_64
+++ b/extra/brltty/.footprint.x86_64
@@ -17,57 +17,120 @@ drwxr-xr-x	root/root	etc/brltty/
 -rw-r--r--	root/root	etc/brltty/boxes.tti
 -rw-r--r--	root/root	etc/brltty/bra.ttb
 -rw-r--r--	root/root	etc/brltty/brf.ttb
--rw-r--r--	root/root	etc/brltty/brltty-al.hlp
--rw-r--r--	root/root	etc/brltty/brltty-at.hlp
--rw-r--r--	root/root	etc/brltty/brltty-ba.hlp
--rw-r--r--	root/root	etc/brltty/brltty-bd.hlp
--rw-r--r--	root/root	etc/brltty/brltty-bl.hlp
--rw-r--r--	root/root	etc/brltty/brltty-bm.hlp
--rw-r--r--	root/root	etc/brltty/brltty-bn.hlp
--rw-r--r--	root/root	etc/brltty/brltty-cb.hlp
--rw-r--r--	root/root	etc/brltty/brltty-ec.hlp
--rw-r--r--	root/root	etc/brltty/brltty-eu.hlp
--rw-r--r--	root/root	etc/brltty/brltty-fs.hlp
--rw-r--r--	root/root	etc/brltty/brltty-hm.hlp
--rw-r--r--	root/root	etc/brltty/brltty-ht.hlp
--rw-r--r--	root/root	etc/brltty/brltty-il.hlp
--rw-r--r--	root/root	etc/brltty/brltty-lt.hlp
--rw-r--r--	root/root	etc/brltty/brltty-mb.hlp
--rw-r--r--	root/root	etc/brltty/brltty-md.hlp
--rw-r--r--	root/root	etc/brltty/brltty-mn.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pg.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-2d_l.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-2d_s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-c.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-c_486.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el2d_80s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el40s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el66s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el70s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el80_ii.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el80s.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_2d_40.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_2d_66.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_2d_80.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_40_p.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-el_80.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-elba_20.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-elba_32.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-elba_trio_20.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-elba_trio_32.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-ib_80.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm-trio.hlp
--rw-r--r--	root/root	etc/brltty/brltty-pm.conf
--rw-r--r--	root/root	etc/brltty/brltty-pm.hlp
--rw-r--r--	root/root	etc/brltty/brltty-sk.hlp
--rw-r--r--	root/root	etc/brltty/brltty-tn.hlp
--rw-r--r--	root/root	etc/brltty/brltty-ts.hlp
--rw-r--r--	root/root	etc/brltty/brltty-tt.hlp
--rw-r--r--	root/root	etc/brltty/brltty-vd.hlp
--rw-r--r--	root/root	etc/brltty/brltty-vo.hlp
--rw-r--r--	root/root	etc/brltty/brltty-vr.hlp
--rw-r--r--	root/root	etc/brltty/brltty-vs.hlp
--rw-r--r--	root/root	etc/brltty/brltty-xw.hlp
+-rw-r--r--	root/root	etc/brltty/brl-al-abt_basic.kti
+-rw-r--r--	root/root	etc/brltty/brl-al-abt_extra.kti
+-rw-r--r--	root/root	etc/brltty/brl-al-abt_large.ktb
+-rw-r--r--	root/root	etc/brltty/brl-al-abt_small.ktb
+-rw-r--r--	root/root	etc/brltty/brl-al-bc.ktb
+-rw-r--r--	root/root	etc/brltty/brl-al-sat_basic.kti
+-rw-r--r--	root/root	etc/brltty/brl-al-sat_extra.kti
+-rw-r--r--	root/root	etc/brltty/brl-al-sat_large.ktb
+-rw-r--r--	root/root	etc/brltty/brl-al-sat_small.ktb
+-rw-r--r--	root/root	etc/brltty/brl-at-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-command.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-default.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-display6.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-display7.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-dm80p.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-front10.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-front6.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-horizontal.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-inka.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-keyboard.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-pro.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-routing6.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-routing7.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-status.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-vario.ktb
+-rw-r--r--	root/root	etc/brltty/brl-bm-vertical.kti
+-rw-r--r--	root/root	etc/brltty/brl-bm-wheels.kti
+-rw-r--r--	root/root	etc/brltty/brl-cb-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-bumpers.kti
+-rw-r--r--	root/root	etc/brltty/brl-fs-common.kti
+-rw-r--r--	root/root	etc/brltty/brl-fs-focus_basic.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-focus_basic.kti
+-rw-r--r--	root/root	etc/brltty/brl-fs-focus_large.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-focus_small.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-pacmate.ktb
+-rw-r--r--	root/root	etc/brltty/brl-fs-rockers.kti
+-rw-r--r--	root/root	etc/brltty/brl-hm-sense.ktb
+-rw-r--r--	root/root	etc/brltty/brl-hm-sync.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-bkwm.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-bs.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-bs40.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-bs80.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-dots.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-easy.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-input.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-keypad.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-mdlr.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-me.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-me64.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-me88.ktb
+-rw-r--r--	root/root	etc/brltty/brl-ht-rockers.kti
+-rw-r--r--	root/root	etc/brltty/brl-ht-wave.ktb
+-rw-r--r--	root/root	etc/brltty/brl-mt-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pg-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-2d_l.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-2d_s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-bar.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-c.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-c_486.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el2d_80s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el40s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el66s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el70s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el80_ii.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el80s.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_2d_40.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_2d_66.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_2d_80.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_40_p.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-el_80.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-elba_20.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-elba_32.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-elba_trio_20.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-elba_trio_32.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-front13.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-front9.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-ib_80.ktb
+-rw-r--r--	root/root	etc/brltty/brl-pm-keyboard.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-keys.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-routing.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status0.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status13.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status2.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status20.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status22.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-status4.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-switches.kti
+-rw-r--r--	root/root	etc/brltty/brl-pm-trio.ktb
+-rw-r--r--	root/root	etc/brltty/brl-sk-all.ktb
+-rw-r--r--	root/root	etc/brltty/brl-vo-all.ktb
+-rw-r--r--	root/root	etc/brltty/brltty-ba-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bd-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bl-18.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bl-40_m20_m40.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bn-commands.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-bn-keys.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ec-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ec-spanish.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-eu-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-il-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-lt-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-mb-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-md-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-mn-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-tn-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ts-nav20_nav40.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ts-nav80.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ts-pb40.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-ts-pb65_pb81.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-tt-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-vd-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-vr-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-vs-all.hlp
+-rw-r--r--	root/root	etc/brltty/brltty-xw-all.hlp
 -rw-r--r--	root/root	etc/brltty/common.tti
 -rw-r--r--	root/root	etc/brltty/control-latin.tti
 -rw-r--r--	root/root	etc/brltty/countries.cti
@@ -81,7 +144,6 @@ drwxr-xr-x	root/root	etc/brltty/
 -rw-r--r--	root/root	etc/brltty/de-kurzschrift.ctb
 -rw-r--r--	root/root	etc/brltty/de-vollschrift.ctb
 -rw-r--r--	root/root	etc/brltty/de.ttb
--rw-r--r--	root/root	etc/brltty/desktop.ktb
 -rw-r--r--	root/root	etc/brltty/devanagari.tti
 -rw-r--r--	root/root	etc/brltty/dra.ttb
 -rw-r--r--	root/root	etc/brltty/el.ttb
@@ -125,7 +187,10 @@ drwxr-xr-x	root/root	etc/brltty/
 -rw-r--r--	root/root	etc/brltty/it.ttb
 -rw-r--r--	root/root	etc/brltty/ja.ctb
 -rw-r--r--	root/root	etc/brltty/kannada.tti
--rw-r--r--	root/root	etc/brltty/keypad.ktb
+-rw-r--r--	root/root	etc/brltty/kbd-braille.kti
+-rw-r--r--	root/root	etc/brltty/kbd-desktop.ktb
+-rw-r--r--	root/root	etc/brltty/kbd-keypad.ktb
+-rw-r--r--	root/root	etc/brltty/kbd-laptop.ktb
 -rw-r--r--	root/root	etc/brltty/kha.ttb
 -rw-r--r--	root/root	etc/brltty/kn.ttb
 -rw-r--r--	root/root	etc/brltty/ko-g1.ctb
@@ -133,7 +198,6 @@ drwxr-xr-x	root/root	etc/brltty/
 -rw-r--r--	root/root	etc/brltty/ko.ctb
 -rw-r--r--	root/root	etc/brltty/kok.ttb
 -rw-r--r--	root/root	etc/brltty/kru.ttb
--rw-r--r--	root/root	etc/brltty/laptop.ktb
 -rw-r--r--	root/root	etc/brltty/letters-cyrillic.tti
 -rw-r--r--	root/root	etc/brltty/letters-latin-dot8.tti
 -rw-r--r--	root/root	etc/brltty/letters-latin.cti
@@ -219,13 +283,24 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/brlapi_protocol.h
 drwxr-xr-x	root/root	usr/include/brltty/
 -rw-r--r--	root/root	usr/include/brltty/api.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-al.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-at.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-bm.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-cb.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-fs.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-hm.h
 -rw-r--r--	root/root	usr/include/brltty/brldefs-ht.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-mt.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-pg.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-pm.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-sk.h
+-rw-r--r--	root/root	usr/include/brltty/brldefs-vo.h
 -rw-r--r--	root/root	usr/include/brltty/brldefs-vs.h
 -rw-r--r--	root/root	usr/include/brltty/brldefs.h
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/brlapi-0.5.4/
--rwxr-xr-x	root/root	usr/lib/brlapi-0.5.4/libbrlapi_tcl.so
--rw-r--r--	root/root	usr/lib/brlapi-0.5.4/pkgIndex.tcl
+drwxr-xr-x	root/root	usr/lib/brlapi-0.5.5/
+-rwxr-xr-x	root/root	usr/lib/brlapi-0.5.5/libbrlapi_tcl.so
+-rw-r--r--	root/root	usr/lib/brlapi-0.5.5/pkgIndex.tcl
 drwxr-xr-x	root/root	usr/lib/brltty/
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybal.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybat.so
@@ -245,6 +320,7 @@ drwxr-xr-x	root/root	usr/lib/brltty/
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybmb.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybmd.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybmn.so
+-rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybmt.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybpg.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybpm.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttybsk.so
@@ -259,17 +335,16 @@ drwxr-xr-x	root/root	usr/lib/brltty/
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysal.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysbl.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyscb.so
--rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyses.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysfv.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysgs.so
--rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyxas.so
+-rwxr-xr-x	root/root	usr/lib/brltty/libbrlttysxs.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyxlx.so
 -rwxr-xr-x	root/root	usr/lib/brltty/libbrlttyxsc.so
 drwxr-xr-x	root/root	usr/lib/brltty/rw/
 -rw-r--r--	root/root	usr/lib/libbrlapi.a
-lrwxrwxrwx	root/root	usr/lib/libbrlapi.so -> libbrlapi.so.0.5.4
-lrwxrwxrwx	root/root	usr/lib/libbrlapi.so.0.5 -> libbrlapi.so.0.5.4
--rwxr-xr-x	root/root	usr/lib/libbrlapi.so.0.5.4
+lrwxrwxrwx	root/root	usr/lib/libbrlapi.so -> libbrlapi.so.0.5.5
+lrwxrwxrwx	root/root	usr/lib/libbrlapi.so.0.5 -> libbrlapi.so.0.5.5
+-rwxr-xr-x	root/root	usr/lib/libbrlapi.so.0.5.5
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
diff --git a/extra/brltty/.md5sum.i686 b/extra/brltty/.md5sum.i686
index 08272f455..a5a954a9f 100644
--- a/extra/brltty/.md5sum.i686
+++ b/extra/brltty/.md5sum.i686
@@ -1,3 +1,4 @@
 fc0d288920d80e09e9a497076bbce18b  brltty
-b3b492240ba33fd3af45a181f5b89e7a  brltty-4.1.tar.gz
+5954b289efaf2ff17676d06de9a88854  brltty-4.2-S_ISCHR.patch
+192af5e634210616928496645e392097  brltty-4.2.tar.gz
 f6a8781a7ded6b69b02cef5597357d9c  brltty.conf
diff --git a/extra/brltty/.md5sum.x86_64 b/extra/brltty/.md5sum.x86_64
index 08272f455..a5a954a9f 100644
--- a/extra/brltty/.md5sum.x86_64
+++ b/extra/brltty/.md5sum.x86_64
@@ -1,3 +1,4 @@
 fc0d288920d80e09e9a497076bbce18b  brltty
-b3b492240ba33fd3af45a181f5b89e7a  brltty-4.1.tar.gz
+5954b289efaf2ff17676d06de9a88854  brltty-4.2-S_ISCHR.patch
+192af5e634210616928496645e392097  brltty-4.2.tar.gz
 f6a8781a7ded6b69b02cef5597357d9c  brltty.conf
diff --git a/extra/brltty/Pkgfile b/extra/brltty/Pkgfile
index c49e8f811..684544ece 100644
--- a/extra/brltty/Pkgfile
+++ b/extra/brltty/Pkgfile
@@ -2,15 +2,16 @@
 # URL: http://mielke.cc/brltty
 # Maintainer: NuTyX core team
 # Packager: lesibel at free dot fr
-# Depends on: xorg-libxaw, at-spi, gpm, icu, python, tcl, atk, xorg-libxtst
-# Run on: xorg-libxaw,at-spi,gpm,icu,tcl,atk,xorg-libxtst
+# Depends on: xorg-libxaw, xorg-libxtst
+# Run on: xorg-libxaw,xorg-libxtst
 
 name=brltty
-version=4.1
+version=4.2
 release=1
 
 source=( http://mielke.cc/$name/releases/$name-$version.tar.gz
-         brltty brltty.conf )
+         brltty brltty.conf 
+	brltty-4.2-S_ISCHR.patch )
 
 build() {
 	cd $name-$version
@@ -21,7 +22,10 @@ build() {
               	--localstatedir=/var \
               	--enable-gpm \
               	--disable-java-bindings \
-              	--disable-caml-bindings
+              	--disable-caml-bindings \
+    		PYTHON=/usr/bin/python2
+
+	patch -Np1 -i ../brltty-4.2-S_ISCHR.patch
         make
         make INSTALL_ROOT=$PKG install
 	mkdir -p $PKG/etc/rc.d/rcsysinit.d
diff --git a/extra/brltty/brltty-4.2-S_ISCHR.patch b/extra/brltty/brltty-4.2-S_ISCHR.patch
new file mode 100644
index 000000000..eddac9616
--- /dev/null
+++ b/extra/brltty/brltty-4.2-S_ISCHR.patch
@@ -0,0 +1,11 @@
+diff -up brltty-4.2/Programs/sys_linux.c.BAD brltty-4.2/Programs/sys_linux.c
+--- brltty-4.2/Programs/sys_linux.c.BAD	2010-05-21 09:04:10.003122084 -0400
++++ brltty-4.2/Programs/sys_linux.c	2010-05-21 09:04:19.376198268 -0400
+@@ -23,6 +23,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#include <sys/stat.h>
+ #include <linux/kd.h>
+ 
+ #ifdef HAVE_LINUX_INPUT_H
diff --git a/extra/consolekit/.md5sum.i686 b/extra/consolekit/.md5sum.i686
index 147e51978..1b94c75d5 100755
--- a/extra/consolekit/.md5sum.i686
+++ b/extra/consolekit/.md5sum.i686
@@ -1 +1 @@
-4c39c6eacc75334b890f21eead1d2945  ConsoleKit-0.4.3.tar.bz2
+b57eb18eae8c4d3631d5f4f030218a29  ConsoleKit-0.4.4.tar.bz2
diff --git a/extra/consolekit/.md5sum.x86_64 b/extra/consolekit/.md5sum.x86_64
index 147e51978..1b94c75d5 100755
--- a/extra/consolekit/.md5sum.x86_64
+++ b/extra/consolekit/.md5sum.x86_64
@@ -1 +1 @@
-4c39c6eacc75334b890f21eead1d2945  ConsoleKit-0.4.3.tar.bz2
+b57eb18eae8c4d3631d5f4f030218a29  ConsoleKit-0.4.4.tar.bz2
diff --git a/extra/consolekit/Pkgfile b/extra/consolekit/Pkgfile
index 6844170e9..39bdfd437 100755
--- a/extra/consolekit/Pkgfile
+++ b/extra/consolekit/Pkgfile
@@ -6,8 +6,8 @@
 # Run on: dbus,glib,xorg-libx11,policykit,polkit
 
 name=consolekit
-version=0.4.3
-release=2
+version=0.4.4
+release=1
 source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$version.tar.bz2)
 
 build() {
diff --git a/extra/cups/.md5sum.i686 b/extra/cups/.md5sum.i686
index 7f5e9c5d2..fe9ba96e1 100644
--- a/extra/cups/.md5sum.i686
+++ b/extra/cups/.md5sum.i686
@@ -1,2 +1,2 @@
 01820c3d0b6cbe798bab94dfc962e8ef  cups
-50729f6fc46ba54223e0eaf5009f3419  cups-1.4.5-source.tar.bz2
+de8fb5a29c36554925c0c6a6e2c0dae1  cups-1.4.6-source.tar.bz2
diff --git a/extra/cups/.md5sum.x86_64 b/extra/cups/.md5sum.x86_64
index 7f5e9c5d2..fe9ba96e1 100644
--- a/extra/cups/.md5sum.x86_64
+++ b/extra/cups/.md5sum.x86_64
@@ -1,2 +1,2 @@
 01820c3d0b6cbe798bab94dfc962e8ef  cups
-50729f6fc46ba54223e0eaf5009f3419  cups-1.4.5-source.tar.bz2
+de8fb5a29c36554925c0c6a6e2c0dae1  cups-1.4.6-source.tar.bz2
diff --git a/extra/cups/Pkgfile b/extra/cups/Pkgfile
index ab77acc85..b22c59089 100755
--- a/extra/cups/Pkgfile
+++ b/extra/cups/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: libcups,dbus-glib,libusb,hicolor-icon-theme,linux-pam,libldap
 
 name=cups
-version=1.4.5
+version=1.4.6
 release=1
 source=( http://ftp.easysw.com/pub/$name/$version/$name-$version-source.tar.bz2\
        cups)
diff --git a/extra/enblend-enfuse/.footprint.i686 b/extra/enblend-enfuse/.footprint.i686
deleted file mode 100644
index 482e437f2..000000000
--- a/extra/enblend-enfuse/.footprint.i686
+++ /dev/null
@@ -1,12 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/enblend
--rwxr-xr-x	root/root	usr/bin/enfuse
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/info/
--rw-r--r--	root/root	usr/share/info/enblend.info.gz
--rw-r--r--	root/root	usr/share/info/enfuse.info.gz
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/enblend.1.gz
--rw-r--r--	root/root	usr/share/man/man1/enfuse.1.gz
diff --git a/extra/enblend-enfuse/.footprint.x86_64 b/extra/enblend-enfuse/.footprint.x86_64
deleted file mode 100644
index 482e437f2..000000000
--- a/extra/enblend-enfuse/.footprint.x86_64
+++ /dev/null
@@ -1,12 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/enblend
--rwxr-xr-x	root/root	usr/bin/enfuse
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/info/
--rw-r--r--	root/root	usr/share/info/enblend.info.gz
--rw-r--r--	root/root	usr/share/info/enfuse.info.gz
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/enblend.1.gz
--rw-r--r--	root/root	usr/share/man/man1/enfuse.1.gz
diff --git a/extra/enblend-enfuse/.md5sum.i686 b/extra/enblend-enfuse/.md5sum.i686
deleted file mode 100644
index 23546c90f..000000000
--- a/extra/enblend-enfuse/.md5sum.i686
+++ /dev/null
@@ -1,2 +0,0 @@
-2e7c950061e0085fd75d94576130250f  enblend-enfuse-4.0.tar.gz
-a39df8dd32ccfa020dea2ea388642575  libpng-1.4.patch
diff --git a/extra/enblend-enfuse/.md5sum.x86_64 b/extra/enblend-enfuse/.md5sum.x86_64
deleted file mode 100644
index 23546c90f..000000000
--- a/extra/enblend-enfuse/.md5sum.x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-2e7c950061e0085fd75d94576130250f  enblend-enfuse-4.0.tar.gz
-a39df8dd32ccfa020dea2ea388642575  libpng-1.4.patch
diff --git a/extra/enblend-enfuse/Pkgfile b/extra/enblend-enfuse/Pkgfile
deleted file mode 100755
index 6c5c85c5c..000000000
--- a/extra/enblend-enfuse/Pkgfile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Description: intelligent blend tool for overlapping picture
-# URL: http://enblend.sourceforge.net
-# Maintainer: NuTyX packager team
-# Packager: lesibel at free dot fr
-# Depends on: boost, openexr, glew, libxmi, freeglut,  lcms, texinfo, libpng
-# Run on:
-
-name=enblend-enfuse
-version=4.0
-release=1
-source=( http://downloads.sourceforge.net/sourceforge/enblend/$name-$version.tar.gz
-	http://nutyx.meticul.eu/files/patchs/$name/libpng-1.4.patch)
-
-build() {
-	cd $name-$version*
-	patch -p1 < ../libpng-1.4.patch 
-	./configure --prefix=/usr 
-	make
-	make DESTDIR=$PKG install
-	install -D -m644 doc/enblend.info $PKG/usr/share/info/enblend.info
-	install -D -m644 doc/enfuse.info $PKG/usr/share/info/enfuse.info
-
-}
-
-  
diff --git a/xorg/dejavu-ttf/.md5sum.i686 b/xorg/dejavu-ttf/.md5sum.i686
index 17a8a4494..906f319ba 100644
--- a/xorg/dejavu-ttf/.md5sum.i686
+++ b/xorg/dejavu-ttf/.md5sum.i686
@@ -1 +1 @@
-63b1bf644cd54188a2ec43aff1846104  dejavu-fonts-ttf-2.32.tar.bz2
+8b601e91725b6d69141b0fcf527948c0  dejavu-fonts-ttf-2.33.tar.bz2
diff --git a/xorg/dejavu-ttf/.md5sum.x86_64 b/xorg/dejavu-ttf/.md5sum.x86_64
index 17a8a4494..906f319ba 100644
--- a/xorg/dejavu-ttf/.md5sum.x86_64
+++ b/xorg/dejavu-ttf/.md5sum.x86_64
@@ -1 +1 @@
-63b1bf644cd54188a2ec43aff1846104  dejavu-fonts-ttf-2.32.tar.bz2
+8b601e91725b6d69141b0fcf527948c0  dejavu-fonts-ttf-2.33.tar.bz2
diff --git a/xorg/dejavu-ttf/Pkgfile b/xorg/dejavu-ttf/Pkgfile
index c52ddd488..f9780f14b 100644
--- a/xorg/dejavu-ttf/Pkgfile
+++ b/xorg/dejavu-ttf/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: xorg-libx11
 
 name=dejavu-ttf
-version=2.32
+version=2.33
 release=1
 source=(http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-$version.tar.bz2)