[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (e7c2e8ec8dbdf3b86301eafec8e9d0d2461cfd4d)

Vlad Glagolev scm at sourcemage.org
Wed May 9 21:34:25 EDT 2012


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 ChangeLog                           |   11 +++++++++++
 audio-creation/ardour2/DEPENDS      |    2 +-
 audio-creation/ardour2/HISTORY      |    4 +++-
 audio-libs/libifp/DEPENDS           |    2 +-
 audio-libs/libifp/HISTORY           |    4 +++-
 crypto/gnupg/DEPENDS                |    2 +-
 crypto/gnupg/HISTORY                |    4 +++-
 crypto/npth/DETAILS                 |   28 ++++++++++++++++++++++++++++
 crypto/npth/HISTORY                 |    2 ++
 crypto/openct/DEPENDS               |    2 +-
 crypto/openct/HISTORY               |    4 +++-
 crypto/openssl/BUILD                |    3 ++-
 crypto/openssl/HISTORY              |    3 +++
 crypto/pcsc-lite/DEPENDS            |    2 +-
 crypto/pcsc-lite/HISTORY            |    4 +++-
 devel/strace/DETAILS                |    2 +-
 devel/strace/HISTORY                |    3 +++
 disk/gphotofs/DEPENDS               |    2 +-
 disk/gphotofs/HISTORY               |    4 +++-
 gnome2-apps/gtkam/DEPENDS           |    2 +-
 gnome2-apps/gtkam/HISTORY           |    4 +++-
 gnome2-libs/devicekit-power/DEPENDS |    2 +-
 gnome2-libs/devicekit-power/HISTORY |    4 +++-
 graphics-libs/sane-backends/DEPENDS |    2 +-
 graphics-libs/sane-backends/HISTORY |    4 +++-
 graphics/libgphoto2/DEPENDS         |    7 ++++---
 graphics/libgphoto2/DETAILS         |    4 ++--
 graphics/libgphoto2/HISTORY         |    6 ++++++
 kde4-edu/kstars/DEPENDS             |    2 +-
 kde4-edu/kstars/HISTORY             |    4 +++-
 kde4/kdebase-workspace4/DEPENDS     |    2 +-
 kde4/kdebase-workspace4/HISTORY     |    4 +++-
 kde4/kdebase4/DEPENDS               |    2 +-
 kde4/kdebase4/HISTORY               |    4 +++-
 libs/libchipcard/DEPENDS            |    2 +-
 libs/libchipcard/HISTORY            |    4 +++-
 libs/libfreenect/DEPENDS            |    2 +-
 libs/libfreenect/HISTORY            |    4 +++-
 libs/libftdi/DEPENDS                |    2 +-
 libs/libftdi/HISTORY                |    3 +++
 libs/libg15/DEPENDS                 |    2 +-
 libs/libg15/HISTORY                 |    4 +++-
 libs/libnfc/DEPENDS                 |    2 +-
 libs/libnfc/HISTORY                 |    4 +++-
 libs/libnjb/DEPENDS                 |    2 +-
 libs/libnjb/HISTORY                 |    4 +++-
 libs/libusb-compat/DEPENDS          |    2 +-
 libs/libusb-compat/HISTORY          |    4 +++-
 libs/libusb/CONFLICTS               |    1 +
 libs/libusb/HISTORY                 |    4 ++++
 libs/libusb/PROVIDES                |    1 +
 libs/libusbx/CONFLICTS              |    1 +
 libs/libusbx/DEPENDS                |   14 ++++++++++++++
 libs/libusbx/DETAILS                |   25 +++++++++++++++++++++++++
 libs/libusbx/HISTORY                |    3 +++
 libs/libusbx/PRE_BUILD              |    4 ++++
 libs/libusbx/PROVIDES               |    1 +
 libs/libusbx/UP_TRIGGERS            |    1 +
 libs/openni/DEPENDS                 |    2 +-
 libs/openni/HISTORY                 |    3 +++
 libs/openobex/DEPENDS               |    2 +-
 libs/openobex/HISTORY               |    4 +++-
 mobile/barry/DEPENDS                |    2 +-
 mobile/barry/HISTORY                |    3 +++
 mobile/gnokii/DEPENDS               |    2 +-
 mobile/gnokii/HISTORY               |    4 +++-
 mobile/pilot-link/DEPENDS           |    2 +-
 mobile/pilot-link/HISTORY           |    4 +++-
 php-pear/php/DETAILS                |   18 +++++++++---------
 php-pear/php/HISTORY                |    3 +++
 printer/cups/DEPENDS                |    2 +-
 printer/cups/HISTORY                |    4 +++-
 printer/hplip/DEPENDS               |    2 +-
 printer/hplip/HISTORY               |    4 +++-
 python-pypi/calibre/DEPENDS         |    2 +-
 python-pypi/calibre/HISTORY         |    4 +++-
 science/garmindev/DEPENDS           |    2 +-
 science/garmindev/HISTORY           |    4 +++-
 science/mkgmap/BUILD                |    3 +++
 science/mkgmap/DEPENDS              |    2 ++
 science/mkgmap/DETAILS              |   35 +++++++++++++++++++++++++++++++++++
 science/mkgmap/HISTORY              |    3 +++
 science/mkgmap/INSTALL              |    3 +++
 science/mkgmap/mkgmap               |    3 +++
 security-libs/libfprint/DEPENDS     |    2 +-
 security-libs/libfprint/HISTORY     |    4 +++-
 security/fprintd/DEPENDS            |    2 +-
 security/fprintd/HISTORY            |    4 +++-
 telephony/asterisk/DEPENDS          |    2 +-
 telephony/asterisk/HISTORY          |    4 +++-
 telephony/usbb2k-api/DEPENDS        |    2 +-
 telephony/usbb2k-api/HISTORY        |    4 +++-
 telephony/zaptel/DEPENDS            |    2 +-
 telephony/zaptel/HISTORY            |    4 +++-
 utils/bluez/DEPENDS                 |    2 +-
 utils/bluez/HISTORY                 |    4 +++-
 utils/g15daemon/DEPENDS             |    2 +-
 utils/g15daemon/HISTORY             |    4 +++-
 utils/garmintools/DEPENDS           |    2 +-
 utils/garmintools/HISTORY           |    4 +++-
 utils/hal/DEPENDS                   |    2 +-
 utils/hal/HISTORY                   |    4 +++-
 utils/lcdproc/DEPENDS               |    2 +-
 utils/lcdproc/HISTORY               |    4 +++-
 utils/lmctl/DEPENDS                 |    2 +-
 utils/lmctl/HISTORY                 |    4 +++-
 utils/logitech_applet/DEPENDS       |    2 +-
 utils/logitech_applet/HISTORY       |    4 +++-
 utils/lshwd/DEPENDS                 |    2 +-
 utils/lshwd/HISTORY                 |    4 +++-
 utils/openmoko-dfu-util/DEPENDS     |    2 +-
 utils/openmoko-dfu-util/HISTORY     |    4 +++-
 utils/razercfg/DEPENDS              |    2 +-
 utils/razercfg/HISTORY              |    4 +++-
 utils/usb-modeswitch/DEPENDS        |    2 +-
 utils/usb-modeswitch/HISTORY        |    3 +++
 utils/usbutils/DEPENDS              |    2 +-
 utils/usbutils/HISTORY              |    4 +++-
 video-libs/libdc1394/DEPENDS        |    2 +-
 video-libs/libdc1394/HISTORY        |    4 +++-
 120 files changed, 362 insertions(+), 104 deletions(-)

New commits:
commit 125f32dbb62fea83723c65947157bac9fdc34d85
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    openssl: fixed #225

commit 0028024e12a6470accabe52321bf1bebdd365505
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    science/mkgmap: new spell, a tool for generating Garmin img files from OpenStreetMap data

commit e3a7db276a445ca8d7dd927716b824e2d015f35b
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    php 5.3.13, SECURITY_PATCH=17

commit d0313eaba7f3f232d4698df6f188ea4a81328ba1
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    strace 4.7

commit 9be1081aaa996ac188967395efcfead22f6c93f1
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libgphoto2 - extra depends

commit 9d66ecd4c82005926fd247104de8a10a2576f85f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    crypto/npth: new spell, new GNU Portable Threads Library

commit c3acc416b45571687e17524d2439e2a2d2a3faf5
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libgphoto2: => 2.4.14

commit 6ec8d79cc1bb56ffba09b3ba50cc94fda4b5476f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    new spell: libs/libusbx version 1.0.11
    this is a fork of the original libusb project

commit f45503125dedb60ab5cf01f6f3076a4483bc42d3
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libdc1394 - change depends libusb -> LIBUSB

commit 8038c60e2eb7e8976267fc2d30490ad6c3d51278
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    usbutils - change depends libusb -> LIBUSB

commit ab7f56d73415657e4a6d966a13e103c253442a17
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    usb-modeswitch - change depends libusb -> LIBUSB

commit 2057850d9dbeafc97cab6a77c537416e38252ecd
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    razercfg - change depends libusb -> LIBUSB

commit 96f20bfd326a95a63e857d09477eccd562b8771f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    openmoko-dfu-util - change depends libusb -> LIBUSB

commit 3de718ea122785759353446c677ec5c9dc31c029
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    lshwd - change depends libusb -> LIBUSB

commit 60736d8ac141c1d435545db947c49f0843ea0552
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    logitech_applet - change depends libusb -> LIBUSB

commit 3ec1b6db417f8186f131e7f7cb50912e81733167
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    lmctl - change depends libusb -> LIBUSB

commit 504d3fa752de1ffdd60f9fa473362b34bb766246
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    lcdproc - change depends libusb -> LIBUSB

commit b8078413258ea19c423ee11447ffd5bab81f1bca
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    hal - change depends libusb -> LIBUSB

commit a5df044945884a55e492d2c5c99304c771f6a6e1
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    garmintools - change depends libusb -> LIBUSB

commit e0a570bc649ed7f7b4ea2efa3e26b611b2b9c0b4
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    g15daemon - change depends libusb -> LIBUSB

commit 3ef3ff1131f7ec7186bfc2b0709efaa09966e6ef
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    bluez - change depends libusb -> LIBUSB

commit 50bd0f0b7df50d2a4ed9185ea092824d25f10edb
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    zaptel - change depends libusb -> LIBUSB

commit f3a8d0859f1a1576c6151604b1e350ca14428347
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    usbb2k-api - change depends libusb -> LIBUSB

commit 68adf83539f19009e2fab5d33b690636fe4b6f2b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    asterisk - change depends libusb -> LIBUSB

commit 77a0eb38cf50c7f5f0369be482dd61dabf707882
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libfprint - change depends libusb -> LIBUSB

commit 92891d9796e5402a57c75c077d65ac658c629e5f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    fprintd - change depends libusb -> LIBUSB

commit 905d77eac7dc8be38fa52b6bd6e78222c0bbe5fe
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    garmindev - change depends libusb -> LIBUSB

commit 603612ff705e4d6e01ab263b09a19a9b3f90f233
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    calibre - change depends libusb -> LIBUSB

commit 01d295ca2496a294be98ddfa2487137247f924a7
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    hplip - change depends libusb -> LIBUSB

commit 1269f69eb1a6843d6009ec7ed05e1c56599fa2a2
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    cups - change depends libusb -> LIBUSB

commit 9aa8a528a09d5a201b29d79fc7daa07d408ab4b5
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pilot-link - change depends libusb -> LIBUSB

commit 67c1d055f99e86bc8c97443623e94fa5acf77700
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gnokii - change depends libusb -> LIBUSB

commit af483b34db586f2fb8c7c287d989ca26a380ead4
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    barry - change depends libusb -> LIBUSB

commit f675c54ebe6040bbcbf3e9880ee1def882bdf6d4
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    openobex - change depends libusb -> LIBUSB

commit a618eea3125922ff25b6006b3ec04f7cbb40b55f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    openni - change depends libusb -> LIBUSB

commit 4b682b9f82f9de53c0158c4be855b810d7e00a1f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libusb-compat - change depends libusb -> LIBUSB

commit 7beb5199affde280db4192c694ecc25a043decbf
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libnjb - change depends libusb -> LIBUSB

commit 107fad2b23b100ec3862cc5e59d727e77458be41
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libnfc - change depends libusb -> LIBUSB

commit b982a1df37694bcd77fe7b8afa76ca5e0d4448e9
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libg15 - change depends libusb -> LIBUSB

commit b52d3cc5f5fba691c23a5a4f292718b259ee3766
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libftdi - change depends libusb -> LIBUSB

commit b2b3dbcb1ef39a2e6717ce55495e860ef574b95a
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libfreenect - change depends libusb -> LIBUSB

commit f8555028ddc866072b0c89fa1c20a016f65d95bd
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libchipcard - change depends libusb -> LIBUSB

commit 45333e0c7c9a8b216b228dc56fd613e121e032a0
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdebase-workspace4 - change depends libusb -> LIBUSB

commit 95554a5b21d00b0c7f48bc388fa7530a11695495
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdebase4 - change depends libusb -> LIBUSB

commit 6e93f3ed9b94c45921660ead9c9115bdb24ca033
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kstars - change depends libusb -> LIBUSB

commit 53647ec0cbe11149e986dc3b09111d9d7c8963c9
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    sane-backends - change depends libusb -> LIBUSB

commit fb94f4db68eb4ac78c8febba4a63a165ea78846d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libgphoto2 - change depends libusb -> LIBUSB

commit 6b1b5420d901fff1707147ed8ff49cc330861120
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    devicekit-power - change depends libusb -> LIBUSB

commit 68c8d129095ff02e20e7ba03639f3bada2b97261
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gtkam - change depends libusb -> LIBUSB

commit 1cf51cf3447955c02b783bafc47c8a88a4ecbc7d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gphotofs - change depends libusb -> LIBUSB

commit e93e7f8561516b80c51e42119e5f4570408160ca
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pcsc-lite - change depends libusb -> LIBUSB

commit 9d1a5e683f71a43085c76a183621c3b5a4828649
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    openct - change depends libusb -> LIBUSB

commit f84f928955cd0c04da8c75c2b205b19a57777e46
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gnupg - change depends libusb -> LIBUSB

commit 7c4eee5e174032bdc60942346c26750465b5fd1b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libifp - change depends libusb -> LIBUSB

commit 2cbc05e26a95a5d593e9e0c6241b4162059c965e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    ardour2 - change depends libusb -> LIBUSB

commit 24d6de55d8de26fb0b2877c3568b365b50fa49f0
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libusb now provides LIBUSB, conflicts libusbx

diff --git a/ChangeLog b/ChangeLog
index 46330ae..9196569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-05-09 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* science/mkgmap: new spell, a tool for generating Garmin img files from
+	  OpenStreetMap data
+
+2012-05-09 Ladislav Hagara <hgr at vabo.cz>
+	* crypto/npth: new spell, new GNU Portable Threads Library
+
+2012-05-09  Treeve Jelbert <treeve at sourcemage.org>
+	* libs/libusbx: new spell
+	  fork of original libusb project
+
 2012-05-07 Ladislav Hagara <hgr at vabo.cz>
 	* editors/scribus.gpg: removed
 
diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS
index cd942c0..0a54431 100755
--- a/audio-creation/ardour2/DEPENDS
+++ b/audio-creation/ardour2/DEPENDS
@@ -34,7 +34,7 @@ optional_depends  slv2                                \
                   "LV2=0"                             \
                   "for LV2 plugin support"            &&
 
-optional_depends  libusb                              \
+optional_depends  LIBUSB                              \
                   "TRANZPORT=1"                       \
                   "TRANZPORT=0"                       \
                   "for TranzPort controller support"  &&
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index 0a63e87..75ee166 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2010-08-12 Thomas Orgis <sobukus at sourcemage.org>
 	* DETAILS: updated spell to 2.8.12
-	* gcc46.patch: removed
 
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
diff --git a/audio-libs/libifp/DEPENDS b/audio-libs/libifp/DEPENDS
index 2fad8d7..7125080 100755
--- a/audio-libs/libifp/DEPENDS
+++ b/audio-libs/libifp/DEPENDS
@@ -1 +1 @@
-depends  libusb
+depends  LIBUSB
diff --git a/audio-libs/libifp/HISTORY b/audio-libs/libifp/HISTORY
index 3e823ca..1b9cff6 100644
--- a/audio-libs/libifp/HISTORY
+++ b/audio-libs/libifp/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2010-04-11 Ismael Luceno <ismael at sourcemage.org>
 	* CONFIGURE, INSTALL: Fix kernel path
-
 2008-08-04 Julien "_kaze_" ROZO <julien at rozo.org>
 	* BUILD, CONFIGURE, DEPENDS, DETAILS, HISTORY, INSTALL: spell created
 
diff --git a/crypto/gnupg/DEPENDS b/crypto/gnupg/DEPENDS
index 1c46278..850541c 100755
--- a/crypto/gnupg/DEPENDS
+++ b/crypto/gnupg/DEPENDS
@@ -23,7 +23,7 @@ optional_depends  nasm                     \
                   "--disable-asm"          \
                   "for assembler modules"  &&
 
-optional_depends  libusb                                                \
+optional_depends  LIBUSB                                                \
                   ""                                                    \
                   "--without-libusb"                                    \
                   "to use the integrated CCID smartcard reader driver" &&
diff --git a/crypto/gnupg/HISTORY b/crypto/gnupg/HISTORY
index 6c8d84b..0348007 100644
--- a/crypto/gnupg/HISTORY
+++ b/crypto/gnupg/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-02-15 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: added pcsc-lite suggest dependency
-
 2012-01-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.12
 
diff --git a/crypto/npth/DETAILS b/crypto/npth/DETAILS
new file mode 100755
index 0000000..0997b8d
--- /dev/null
+++ b/crypto/npth/DETAILS
@@ -0,0 +1,28 @@
+           SPELL=npth
+         VERSION=0.90
+
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/npth/$SOURCE
+      SOURCE_GPG="GnuPG.gpg:$SOURCE.sig:VERIFIED_UPSTREAM_KEY"
+
+         SOURCE2=$SOURCE.sig
+  SOURCE2_URL[0]=$SOURCE_URL.sig
+  SOURCE2_IGNORE=signature
+
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=http://www.gnupg.org/
+         ENTERED=20120509
+      LICENSE[0]=GPL
+           SHORT="new GNU Portable Threads Library"
+cat << EOF
+nPth - The New GNU Portable Threads Library
+
+This is a library to provide the GNU Pth API and thus a
+non-preemptive threads implementation.
+
+In contrast to GNU Pth is is based on the system's standard threads
+implementation.  This allows the use of libraries which are not
+compatible to GNU Pth.  Experience with a Windows Pth emulation
+showed that this is a solid way to provide a co-routine based
+framework.
+EOF
diff --git a/crypto/npth/HISTORY b/crypto/npth/HISTORY
new file mode 100644
index 0000000..8677c78
--- /dev/null
+++ b/crypto/npth/HISTORY
@@ -0,0 +1,2 @@
+2012-05-09 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: spell created, version 0.90
diff --git a/crypto/openct/DEPENDS b/crypto/openct/DEPENDS
index 3cba84e..105aa22 100755
--- a/crypto/openct/DEPENDS
+++ b/crypto/openct/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends libusb '--enable-usb' '' 'usb hot plug support'    &&
+optional_depends LIBUSB '--enable-usb' '' 'usb hot plug support'    &&
 optional_depends hal    '' '' 'determine card insert policy'        &&
 optional_depends pcsc-lite '--enable-pcsc' '' 'secure card support'
diff --git a/crypto/openct/HISTORY b/crypto/openct/HISTORY
index bc3cc44..52a2b9a 100644
--- a/crypto/openct/HISTORY
+++ b/crypto/openct/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2010-02-17 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.6.20
-
 2010-01-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.6.19
 
diff --git a/crypto/openssl/BUILD b/crypto/openssl/BUILD
index 962c5a6..a5fefde 100755
--- a/crypto/openssl/BUILD
+++ b/crypto/openssl/BUILD
@@ -36,7 +36,8 @@ make         && {
     RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
     PATH="${PATH//$RUN_COMPILER_DIR:/}"                            &&
     (
-    unset OPTS  &&
+    OPTS="--with-ssl=openssl"
+
     delve -c start BUILD wget                 && # this links against old libraries still
     local TEMPWGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget |
                         head -n 3 | tail -n 1 | awk '{ print $4 }')" &&
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index ac44056..735a355 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2012-05-10 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: fixed #225
+
 2012-04-25 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.9.8w, SECURITY_PATCH=18
 	  http://www.openssl.org/news/secadv_20120424.txt
diff --git a/crypto/pcsc-lite/DEPENDS b/crypto/pcsc-lite/DEPENDS
index f3bc5a8..a8faa4a 100755
--- a/crypto/pcsc-lite/DEPENDS
+++ b/crypto/pcsc-lite/DEPENDS
@@ -1,6 +1,6 @@
 depends -sub CXX gcc &&
 if [[ $PCSC_DEVICE_ACCESS == libusb ]]; then
-  depends libusb "--enable-libusb"
+  depends LIBUSB "--enable-libusb"
 elif [[ $PCSC_DEVICE_ACCESS == udev ]]; then
   depends udev "--enable-libudev"
 fi
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 2c1fa52..cbb3e50 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-04-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.8.3
-
 2012-01-19 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.8.2
 
diff --git a/devel/strace/DETAILS b/devel/strace/DETAILS
index fa13f95..d56b0e3 100755
--- a/devel/strace/DETAILS
+++ b/devel/strace/DETAILS
@@ -1,5 +1,5 @@
            SPELL=strace
-         VERSION=4.6
+         VERSION=4.7
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/strace/HISTORY b/devel/strace/HISTORY
index c5b16f3..04aee0a 100644
--- a/devel/strace/HISTORY
+++ b/devel/strace/HISTORY
@@ -1,3 +1,6 @@
+2012-05-09 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.7
+
 2011-09-26 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: converted to upstream signature checking
 	* F7DDBB3A.gpg: added gpg keyring
diff --git a/disk/gphotofs/DEPENDS b/disk/gphotofs/DEPENDS
index ca2763f..d9ec51c 100755
--- a/disk/gphotofs/DEPENDS
+++ b/disk/gphotofs/DEPENDS
@@ -1,6 +1,6 @@
 depends libgphoto2 &&
 depends libexif &&
-depends libusb &&
+depends LIBUSB &&
 depends glib2 &&
 depends fuse &&
 depends locale
diff --git a/disk/gphotofs/HISTORY b/disk/gphotofs/HISTORY
index 411bbd5..93fdbb7 100644
--- a/disk/gphotofs/HISTORY
+++ b/disk/gphotofs/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2008-03-06 Julien "_kaze_" ROZO <julien at rozo.org>
 	* gphotofs-0.4.0.patch: added, a work around that includes locale.h
-	  in gphotofs.c if LC_CTYPE is not defined during spell casting.
 
 2008-03-05 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DEPENDS: added fuse
diff --git a/gnome2-apps/gtkam/DEPENDS b/gnome2-apps/gtkam/DEPENDS
index 26bcf6e..d5577c8 100755
--- a/gnome2-apps/gtkam/DEPENDS
+++ b/gnome2-apps/gtkam/DEPENDS
@@ -1,7 +1,7 @@
 depends gtk+2 &&
 depends libexif-gtk &&
 depends libgphoto2 &&
-depends libusb &&
+depends LIBUSB &&
 
 optional_depends gimp "" "--without-gimp" "for GIMP plugin" &&
 optional_depends hotplug "" "" "for kernel hotplug support"
diff --git a/gnome2-apps/gtkam/HISTORY b/gnome2-apps/gtkam/HISTORY
index 5c32c5d..45be656 100644
--- a/gnome2-apps/gtkam/HISTORY
+++ b/gnome2-apps/gtkam/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2010-05-09 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.1.17
-
 2009-11-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: removed unneeded dependency -- aalib
 
diff --git a/gnome2-libs/devicekit-power/DEPENDS b/gnome2-libs/devicekit-power/DEPENDS
index 5633d55..37da95a 100755
--- a/gnome2-libs/devicekit-power/DEPENDS
+++ b/gnome2-libs/devicekit-power/DEPENDS
@@ -1,5 +1,5 @@
 depends devicekit &&
-depends libusb    &&
+depends LIBUSB    &&
 depends policykit &&
 depends -sub GUDEV udev &&
 
diff --git a/gnome2-libs/devicekit-power/HISTORY b/gnome2-libs/devicekit-power/HISTORY
index 9526ada..e5e8602 100644
--- a/gnome2-libs/devicekit-power/HISTORY
+++ b/gnome2-libs/devicekit-power/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-07-13 Arjan Bouter <abouter at sourcemage.org>
 	* DEPENDS: switched udev's sub dep from EXTRAS to GUDEV
-
 2010-10-31 Robin Cook <rcook at wyrms.net>
 	* CONFLICTS: added
 
diff --git a/graphics-libs/sane-backends/DEPENDS b/graphics-libs/sane-backends/DEPENDS
index 4c2475d..1c15ed5 100755
--- a/graphics-libs/sane-backends/DEPENDS
+++ b/graphics-libs/sane-backends/DEPENDS
@@ -1,7 +1,7 @@
 depends JPEG &&
 depends tiff &&
 
-optional_depends libusb \
+optional_depends LIBUSB \
                  "--enable-libusb" \
                  "--disable-libusb" \
                  "Enable libusb support" &&
diff --git a/graphics-libs/sane-backends/HISTORY b/graphics-libs/sane-backends/HISTORY
index eb5862a..a42d588 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-12-25 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: added missing dependency
-
 2011-10-25 Vlad Glagolev <stealth at sourcemage.org>
 	* PRE_BUILD: apply the patch
 	* libv4l.patch: added, to fix compilation with libv4l 0.8.3+
diff --git a/graphics/libgphoto2/DEPENDS b/graphics/libgphoto2/DEPENDS
index ceeb877..b8a47ff 100755
--- a/graphics/libgphoto2/DEPENDS
+++ b/graphics/libgphoto2/DEPENDS
@@ -4,14 +4,15 @@ depends  pkgconfig  &&
 # test kernel version
 local  GPH_KDEV
 GPH_KVER=`uname -r |cut -c-3`    &&
-if [ $GPH_KVER == "2.6" ];then
+if [[ $GPH_KVER != "2.4" ]];then
   optional_depends  udev  "udevscriptdir=$INSTALL_ROOT/lib/udev"  ""  \
                           "for kernel UDEV support" 
 else
   optional_depends  hotplug  ""  ""  "for kernel hotplug support"  
 fi  &&
 
-
+optional_depends  lockdev  "" "" "serial port locking" &&
+optional_depends  gettext  "--enable-nls" "--disable-nls" "NLS support" &&
 optional_depends  libexif  "--with-exif"  "--without-exif"  \
       "extracts additional image information provided by most cameras"  &&
 
@@ -21,7 +22,7 @@ optional_depends gd "" "" "for GD conversion support" &&
 optional_depends  libtool  "--with-ltdl"  "--without-ltdl"  \
       "an alternative way of opening shared libraries"  &&
 
-optional_depends libusb "" "" "enable use of cameras connected though the USB port"  &&
+optional_depends LIBUSB "" "" "enable use of cameras connected though the USB port"  &&
 
 optional_depends  dbus     ""  ""  "for dbus support"          &&
 optional_depends  hal     ""  ""  "for HAL support"          &&
diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index 904b83b..2191675 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libgphoto2
-         VERSION=2.4.13
-     SOURCE_HASH=sha512:53a70c31e2f0255e03156eec26180faee1971fe05e7107b6b7b0065d069e8f9cbc5b5e92abfefec6c708c8fff2beb708db845888be0fd127ab5c4bad156b34b7
+         VERSION=2.4.14
+     SOURCE_HASH=sha512:4abc89ee2d714deab98cdba84d0497b7262105ade3b3c43eaa8936b6e5359a8dc50c49c217fff37f013e0ce7404b82b4c7c2f90af49274a3ecb9f15e10747a73
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/gphoto/$SOURCE
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 8599cb4..2a9966f 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,9 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+	  add optional lockdev
+	  fix detection of kernel version
+	* DETAILS: version 2.4.14
+
 2012-03-31 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.4.13
 
diff --git a/kde4-edu/kstars/DEPENDS b/kde4-edu/kstars/DEPENDS
index 55afc60..5227ac9 100755
--- a/kde4-edu/kstars/DEPENDS
+++ b/kde4-edu/kstars/DEPENDS
@@ -1,6 +1,6 @@
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 depends libkdeedu &&
-optional_depends  libusb  "" "" "INDI support"        &&
+optional_depends  LIBUSB  "" "" "INDI support"        &&
 optional_depends  OPENGL  "" "" "for hardware rendering" &&
 optional_depends  xplanet "" "" "show major planets and most satellites"
 # libsbigudrv for KStars
diff --git a/kde4-edu/kstars/HISTORY b/kde4-edu/kstars/HISTORY
index 3a17209..3b124dc 100644
--- a/kde4-edu/kstars/HISTORY
+++ b/kde4-edu/kstars/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-02-01 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.8.0
-
 2011-12-10 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.7.4
 
diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS
index 293b96e..4070ea7 100755
--- a/kde4/kdebase-workspace4/DEPENDS
+++ b/kde4/kdebase-workspace4/DEPENDS
@@ -22,7 +22,7 @@ optional_depends  lm_sensors  '' ''   'hardware monitoring'        &&
 optional_depends  glib2       '' ''   'gnome support'              &&
 optional_depends  libraw1394  '' ''   'Firewire support'           &&
 optional_depends  libxklavier '' ''   'keyboard configuration'     &&
-optional_depends  libusb      '' ''   'usb support'                &&
+optional_depends  LIBUSB      '' ''   'usb support'                &&
 
 if [[ "$BLUEZ" != "none" ]]; then
         depends $BLUEZ;
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 3264931..b6f7a0d 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-05-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.8.3, bz2 -> xz
-
 2012-02-08 Bor Kraljič <pyrobor at ver.si>
 	* DEPENDS: added dependency on kactivities
 
diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index ecb19e0..3194099 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -27,7 +27,7 @@ optional_depends  libraw1394 '' ''   'Firewire support'           &&
 #optional_depends networkmanager  '' ''   '' &&
 optional_depends  fontconfig '' ''   'font management'            &&
 optional_depends  libxklavier '' ''  'keyboard configuration'     &&
-optional_depends  libusb     '' ''   'usb support'                &&
+optional_depends  LIBUSB     '' ''   'usb support'                &&
 optional_depends  pciutils     '' '' 'show pci data'              &&
 
 if [[ "$BLUEZ" != "none" ]]; then
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index a60e037..b18feae 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-05-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.8.3, bz2 -> xz
-
 2012-02-01 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.8.0
 
diff --git a/libs/libchipcard/DEPENDS b/libs/libchipcard/DEPENDS
index ad4c408..a760b7d 100755
--- a/libs/libchipcard/DEPENDS
+++ b/libs/libchipcard/DEPENDS
@@ -1,7 +1,7 @@
 depends opensc      &&
 depends gwenhywfar  &&
 
-optional_depends libusb                        \
+optional_depends LIBUSB                        \
                  "--enable-libusb"             \
                  "--disable-libusb"            \
                  "Enable libusb support?"      &&
diff --git a/libs/libchipcard/HISTORY b/libs/libchipcard/HISTORY
index e9dc137..26b0ad9 100644
--- a/libs/libchipcard/HISTORY
+++ b/libs/libchipcard/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2009-05-10 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.2.8
-	* CONFLICTS: removed
 
 2009-03-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.2.4, upstream SOURCE_URL[0] with NO_CACHE="-O ${SOURCE}"
diff --git a/libs/libfreenect/DEPENDS b/libs/libfreenect/DEPENDS
index 43c3584..10bbf0a 100755
--- a/libs/libfreenect/DEPENDS
+++ b/libs/libfreenect/DEPENDS
@@ -1,3 +1,3 @@
 depends git &&
 depends cmake &&
-depends libusb
+depends LIBUSB
diff --git a/libs/libfreenect/HISTORY b/libs/libfreenect/HISTORY
index cafecc5..ca586bf 100644
--- a/libs/libfreenect/HISTORY
+++ b/libs/libfreenect/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-12-31 Ladislav Hagara <hgr at vabo.cz>
 	* BUILD: audios.bin backup and restore added
-	* INSTALL: 51-kinect.rules installed if spell_ok udev
 
 2011-12-30 Ladislav Hagara <hgr at vabo.cz>
 	* PREPARE, BUILD: option to enable audio added
diff --git a/libs/libftdi/DEPENDS b/libs/libftdi/DEPENDS
index 3fb2769..44e7a79 100755
--- a/libs/libftdi/DEPENDS
+++ b/libs/libftdi/DEPENDS
@@ -1 +1 @@
-depends libusb-compat
+depends LIBUSB-compat
diff --git a/libs/libftdi/HISTORY b/libs/libftdi/HISTORY
index 694505b..ec93dd7 100644
--- a/libs/libftdi/HISTORY
+++ b/libs/libftdi/HISTORY
@@ -1,2 +1,5 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-03-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, DEPENDS: spell created, version 0.19
diff --git a/libs/libg15/DEPENDS b/libs/libg15/DEPENDS
index 2fad8d7..7125080 100755
--- a/libs/libg15/DEPENDS
+++ b/libs/libg15/DEPENDS
@@ -1 +1 @@
-depends  libusb
+depends  LIBUSB
diff --git a/libs/libg15/HISTORY b/libs/libg15/HISTORY
index 76c9aed..968304a 100644
--- a/libs/libg15/HISTORY
+++ b/libs/libg15/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2008-03-14 David Kowis <dkowis at shlrm.org>
 	* PI DAY!
-	* DETAILS: Updated to latest version
 
 2007-12-30 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS, DEPENDS: Created spell.
diff --git a/libs/libnfc/DEPENDS b/libs/libnfc/DEPENDS
index 7e4c67c..1946045 100755
--- a/libs/libnfc/DEPENDS
+++ b/libs/libnfc/DEPENDS
@@ -1,5 +1,5 @@
 depends ccid &&
-optional_depends libusb \
+optional_depends LIBUSB \
                  "--enable-libusb" \
                  "--disable-libusb" \
                  "for PN531USB and PN533USB support" &&
diff --git a/libs/libnfc/HISTORY b/libs/libnfc/HISTORY
index 8c323d7..a65dcb5 100644
--- a/libs/libnfc/HISTORY
+++ b/libs/libnfc/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-09-29 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
-
 2010-04-25 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD: use autoreconf instead of autogen.sh
 
diff --git a/libs/libnjb/DEPENDS b/libs/libnjb/DEPENDS
index a74c52e..a602538 100755
--- a/libs/libnjb/DEPENDS
+++ b/libs/libnjb/DEPENDS
@@ -1,4 +1,4 @@
-depends  libusb   &&
+depends  LIBUSB   &&
 
 if  [  "$CVS"  ==  "y"  ];  then
   depends  CVS
diff --git a/libs/libnjb/HISTORY b/libs/libnjb/HISTORY
index b3ffbaf..2655a9e 100644
--- a/libs/libnjb/HISTORY
+++ b/libs/libnjb/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-08-05 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 2.2.7
-
 2008-08-10 Julien "_kaze_" ROZO <julien at rozo.org>
 	* BUILD: removed path to hotplug in configure
 	* DEPENDS: added hal as an optional dependency
diff --git a/libs/libusb-compat/DEPENDS b/libs/libusb-compat/DEPENDS
index d3df555..817580f 100755
--- a/libs/libusb-compat/DEPENDS
+++ b/libs/libusb-compat/DEPENDS
@@ -1,2 +1,2 @@
-depends  libusb     &&
+depends  LIBUSB     &&
 depends  pkgconfig
diff --git a/libs/libusb-compat/HISTORY b/libs/libusb-compat/HISTORY
index ce6f523..e269556 100644
--- a/libs/libusb-compat/HISTORY
+++ b/libs/libusb-compat/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-04-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.1.4
-
 2009-07-13 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.1.3
 
diff --git a/libs/libusb/CONFLICTS b/libs/libusb/CONFLICTS
new file mode 100755
index 0000000..61916af
--- /dev/null
+++ b/libs/libusb/CONFLICTS
@@ -0,0 +1 @@
+conflicts libusbx
diff --git a/libs/libusb/HISTORY b/libs/libusb/HISTORY
index 3c22e03..52627c2 100644
--- a/libs/libusb/HISTORY
+++ b/libs/libusb/HISTORY
@@ -1,3 +1,7 @@
+12-05-09 Treeve Jelbert treeve <01 at pi.be>
+	* PROVIDES, CONFLICTS: added
+	  now provides LIBUSB, conflicts libusbx
+
 2012-04-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.0.9, libusb-compat 0.1.4
 
diff --git a/libs/libusb/PROVIDES b/libs/libusb/PROVIDES
new file mode 100755
index 0000000..42a30a8
--- /dev/null
+++ b/libs/libusb/PROVIDES
@@ -0,0 +1 @@
+LIBUSB
diff --git a/libs/libusbx/CONFLICTS b/libs/libusbx/CONFLICTS
new file mode 100755
index 0000000..c3cc187
--- /dev/null
+++ b/libs/libusbx/CONFLICTS
@@ -0,0 +1 @@
+conflicts libusb
diff --git a/libs/libusbx/DEPENDS b/libs/libusbx/DEPENDS
new file mode 100755
index 0000000..60149b4
--- /dev/null
+++ b/libs/libusbx/DEPENDS
@@ -0,0 +1,14 @@
+depends -sub CXX gcc  &&
+
+#
+# Fix Bug #8283
+#
+if  [  "$LIBUSB_DOC"  ==  '--enable-build-docs'  ];  then
+  depends  docbook-dsssl          &&
+  depends  docbook-sgml-dtd
+fi  &&
+
+optional_depends  doxygen                           \
+                  ""                                \
+                  ""                                \
+                  "to build C++ API documentation"
diff --git a/libs/libusbx/DETAILS b/libs/libusbx/DETAILS
new file mode 100755
index 0000000..779f9eb
--- /dev/null
+++ b/libs/libusbx/DETAILS
@@ -0,0 +1,25 @@
+           SPELL=libusbx
+         VERSION=1.0.11
+     SOURCE_HASH=sha512:73b1f8592e80f79f5dfd3588a84ef94bf3f76e74b3027e9c455d5bc7fb99276998514c587505b19116ed22d5c1973ba0943daef723e8360c99befe583fa688fc
+	  SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
+         SOURCE2=libusb-compat-0.1.4.tar.bz2
+  SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
+    SOURCE2_HASH=sha512:23214b362f3a3c2aa299678bf6da786ac3ff3c6a4299b392dee65b6ca7ffff68d8559f72549b16175f2fd44f45e127efdfc883895a1b39465a89f0b288b2fb7d
+
+      LICENSE[0]=LGPL
+        WEB_SITE=http://libusbx.org/
+         ENTERED=20120509
+        KEYWORDS="usb libs"
+           SHORT="Library for USB devices."
+cat << EOF
+libusbx is a library that provides generic access to USB devices. As a 
+library, it is meant to be used by developers, to facilitate the development 
+of applications that communicate with USB hardware.
+It is user-mode: No special privilege or elevation is required for the 
+application to communicate with a device.
+It is version-agnostic: All versions of the USB protocol, from 1.0 to 3.0 
+(latest), are supported.
+EOF
diff --git a/libs/libusbx/HISTORY b/libs/libusbx/HISTORY
new file mode 100644
index 0000000..6c2b21e
--- /dev/null
+++ b/libs/libusbx/HISTORY
@@ -0,0 +1,3 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: 1.0.11, libusb-compat 0.1.4
+	 spell created, cloned from libusb spell
diff --git a/libs/libusbx/PRE_BUILD b/libs/libusbx/PRE_BUILD
new file mode 100755
index 0000000..5031d10
--- /dev/null
+++ b/libs/libusbx/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+unpack_file 2
diff --git a/libs/libusbx/PROVIDES b/libs/libusbx/PROVIDES
new file mode 100755
index 0000000..42a30a8
--- /dev/null
+++ b/libs/libusbx/PROVIDES
@@ -0,0 +1 @@
+LIBUSB
diff --git a/libs/libusbx/UP_TRIGGERS b/libs/libusbx/UP_TRIGGERS
new file mode 100755
index 0000000..dfd894b
--- /dev/null
+++ b/libs/libusbx/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger libusb-compat cast_self
diff --git a/libs/openni/DEPENDS b/libs/openni/DEPENDS
index d8405d0..ec421fc 100755
--- a/libs/openni/DEPENDS
+++ b/libs/openni/DEPENDS
@@ -1,3 +1,3 @@
 depends git &&
 depends python &&
-depends libusb
+depends LIBUSB
diff --git a/libs/openni/HISTORY b/libs/openni/HISTORY
index 09af20c..4508263 100644
--- a/libs/openni/HISTORY
+++ b/libs/openni/HISTORY
@@ -1,2 +1,5 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-08-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, DEPENDS, PREPARE, BUILD, INSTALL: spell created
diff --git a/libs/openobex/DEPENDS b/libs/openobex/DEPENDS
index 223a9e3..2f86f6a 100755
--- a/libs/openobex/DEPENDS
+++ b/libs/openobex/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends  libusb "" "--disable-usb" "Usb-obex support"  &&
+optional_depends  LIBUSB "" "--disable-usb" "Usb-obex support"  &&
 optional_depends  BLUEZ "" "--disable-bluetooth" "Bluetooth support"  &&
 optional_depends  irda-utils  "" "--disable-irda" "Irda support" 
diff --git a/libs/openobex/HISTORY b/libs/openobex/HISTORY
index 4bd5769..76ba745 100644
--- a/libs/openobex/HISTORY
+++ b/libs/openobex/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2009-08-15 Arjan Bouter <abouter at sourcemage.org>
 	* DEPENDS: use BLUEZ provider
-
 2009-08-03 Julien "_kaze_" ROZO <julien at rozo.org>
 	* PRE_SUB_DEPENDS, SUB_DEPENDS: switched to bluez, bluez-libs deprecation
 	  completed
diff --git a/mobile/barry/DEPENDS b/mobile/barry/DEPENDS
index 5728bb9..2b360a5 100755
--- a/mobile/barry/DEPENDS
+++ b/mobile/barry/DEPENDS
@@ -1,5 +1,5 @@
 depends pkgconfig &&
-depends libusb &&
+depends LIBUSB &&
 depends openssl &&
 optional_depends boost "" "" "needed if you want to save downloads for later upload to your device" &&
 optional_depends libopensync "--enable-opensync-plugin" "--disable-opensync-plugin" "For an opensync plugin" &&
diff --git a/mobile/barry/HISTORY b/mobile/barry/HISTORY
index 0f9df7c..57d2a7a 100644
--- a/mobile/barry/HISTORY
+++ b/mobile/barry/HISTORY
@@ -1,2 +1,5 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2008-05-17 David Kowis <dkowis at shlrm.org>
 	* DETAILS, DEPENDS, CONFIGURE, HISTORY: added as a new spell
diff --git a/mobile/gnokii/DEPENDS b/mobile/gnokii/DEPENDS
index d716f1a..99efb3f 100755
--- a/mobile/gnokii/DEPENDS
+++ b/mobile/gnokii/DEPENDS
@@ -13,7 +13,7 @@ optional_depends libical \
                  "--disable-libical" \
                  "for libical support" &&
 
-optional_depends libusb \
+optional_depends LIBUSB \
                  "--enable-libusb" \
                  "--disable-libusb" \
                  "for libusb support" &&
diff --git a/mobile/gnokii/HISTORY b/mobile/gnokii/HISTORY
index 39b2229..f3236e6 100644
--- a/mobile/gnokii/HISTORY
+++ b/mobile/gnokii/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2010-06-27 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.6.29; quoting paths; renewed source url
-	* DEPENDS: rewritten for new version
 	* BUILD: removed deprecated/unneeded flags
 	* CONFIGURE: added, to use optional features
 
diff --git a/mobile/pilot-link/DEPENDS b/mobile/pilot-link/DEPENDS
index 0056870..6b0e9ad 100755
--- a/mobile/pilot-link/DEPENDS
+++ b/mobile/pilot-link/DEPENDS
@@ -11,7 +11,7 @@ optional_depends  readline                    \
                   "--without-readline"        \
                   "Enable readline"           &&
 
-optional_depends  libusb                      \
+optional_depends  LIBUSB                      \
                   "--enable-libusb"           \
                   "--disable-libusb"          \
                   "Enable use of libusb"      &&
diff --git a/mobile/pilot-link/HISTORY b/mobile/pilot-link/HISTORY
index 74f2e5f..0848c13 100644
--- a/mobile/pilot-link/HISTORY
+++ b/mobile/pilot-link/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
-	  sub-depends on CXX (scripted)
 
 2010-08-05 Thomas Orgis <sobukus at sourcemage.org>
 	* DETAILS: bumped to 0.12.5
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 02837d1..a161320 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,8 +1,8 @@
            SPELL=php
 if [[ $PHP5_BRANCH == stable ]]; then
-         VERSION=5.3.10
-  SECURITY_PATCH=16
-     SOURCE_HASH=sha512:667b0b0871f8edb101115783739c4bfbbf7cbe5c8c090e184a01c4efbad07df882135e23c85fc6630f3ee5d4ec22384b9859942f996708ca6f9a51875b17b527
+         VERSION=5.3.13
+  SECURITY_PATCH=17
+     SOURCE_HASH=sha512:230ae89ee8bcb7bf0aa9b05adb62641f14de7db1d9421ed84e4f6ae47ace7e93ed67f2925b2727ee447c1d9191ef9ff94980a5af9e177681f3cf0c08e1ceb405
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
    if [[ $PHP5_SUHOSIN == y ]]; then
@@ -16,11 +16,11 @@ if [[ $PHP5_BRANCH == stable ]]; then
      SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
    fi
 elif [[ $PHP5_BRANCH == alpha ]]; then
-         VERSION=5.3.10
-     SOURCE_HASH=sha512:667b0b0871f8edb101115783739c4bfbbf7cbe5c8c090e184a01c4efbad07df882135e23c85fc6630f3ee5d4ec22384b9859942f996708ca6f9a51875b17b527
+         VERSION=5.3.13
+     SOURCE_HASH=sha512:230ae89ee8bcb7bf0aa9b05adb62641f14de7db1d9421ed84e4f6ae47ace7e93ed67f2925b2727ee447c1d9191ef9ff94980a5af9e177681f3cf0c08e1ceb405
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
-  SECURITY_PATCH=1
+  SECURITY_PATCH=17
 elif [[ $PHP5_BRANCH == legacy ]]; then
          VERSION=5.2.17
   SECURITY_PATCH=16
@@ -37,9 +37,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
      SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
   fi
 else
-         VERSION=5.3.10
-  SECURITY_PATCH=16
-     SOURCE_HASH=sha512:667b0b0871f8edb101115783739c4bfbbf7cbe5c8c090e184a01c4efbad07df882135e23c85fc6630f3ee5d4ec22384b9859942f996708ca6f9a51875b17b527
+         VERSION=5.3.13
+  SECURITY_PATCH=17
+     SOURCE_HASH=sha512:230ae89ee8bcb7bf0aa9b05adb62641f14de7db1d9421ed84e4f6ae47ace7e93ed67f2925b2727ee447c1d9191ef9ff94980a5af9e177681f3cf0c08e1ceb405
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
 fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 042930f..63b5672 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2012-05-09 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 5.3.13, SECURITY_PATCH=17
+
 2012-02-03 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 5.3.10; SECURITY_PATCH++ (CVE-2012-0830);
 	  added SECURITY_PATCH for alpha branch
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index eae5bb8..e09a17b 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -42,7 +42,7 @@ elif [[ $CUPS_PDF == ghostscript ]]; then
 depends ghostscript '--enable-pdftops --with-pdftops=gs'
 fi &&
 
-optional_depends  "libusb" \
+optional_depends  "LIBUSB" \
                   '--enable-libusb' \
                   '--disable-libusb' \
                   'usb printers' &&
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index bc8aee3..c5481f7 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-04-22 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: python => PYTHON
-
 2012-02-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.5.2
 
diff --git a/printer/hplip/DEPENDS b/printer/hplip/DEPENDS
index c471890..2981bd3 100755
--- a/printer/hplip/DEPENDS
+++ b/printer/hplip/DEPENDS
@@ -1,4 +1,4 @@
-depends  libusb    &&
+depends  LIBUSB    &&
 depends  cups      &&
 depends  JPEG      &&
 depends  openssl   &&
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index 757802a..d63e644 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-04-23 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.12.4
-
 2012-02-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.12.2
 
diff --git a/python-pypi/calibre/DEPENDS b/python-pypi/calibre/DEPENDS
index 03e9690..8c42a41 100755
--- a/python-pypi/calibre/DEPENDS
+++ b/python-pypi/calibre/DEPENDS
@@ -1,7 +1,7 @@
 depends python &&
 depends SETUPTOOLS &&
 depends pil &&
-depends libusb &&
+depends LIBUSB &&
 depends qt4 &&
 depends pyqt4 &&
 depends mechanize &&
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index 1223d3e..1f745e9 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-04-22 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 0.8.48
-
 2012-03-29 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 0.8.44
 
diff --git a/science/garmindev/DEPENDS b/science/garmindev/DEPENDS
index 0b24d0d..dc25fac 100755
--- a/science/garmindev/DEPENDS
+++ b/science/garmindev/DEPENDS
@@ -1,3 +1,3 @@
 depends cmake         &&
 depends -sub CXX gcc  &&
-depends libusb-compat
+depends LIBUSB-compat
diff --git a/science/garmindev/HISTORY b/science/garmindev/HISTORY
index a7dd331..1eb1d16 100644
--- a/science/garmindev/HISTORY
+++ b/science/garmindev/HISTORY
@@ -1,3 +1,5 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-05-06 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* BUILD, DEPENDS, DETAILS: spell created
-
diff --git a/science/mkgmap/BUILD b/science/mkgmap/BUILD
new file mode 100755
index 0000000..c080dbd
--- /dev/null
+++ b/science/mkgmap/BUILD
@@ -0,0 +1,3 @@
+. $INSTALL_ROOT/etc/profile.d/ant.sh  &&
+. $INSTALL_ROOT/etc/profile.d/java.sh &&
+ant
diff --git a/science/mkgmap/DEPENDS b/science/mkgmap/DEPENDS
new file mode 100755
index 0000000..108a8e5
--- /dev/null
+++ b/science/mkgmap/DEPENDS
@@ -0,0 +1,2 @@
+depends JDK &&
+depends ant 
diff --git a/science/mkgmap/DETAILS b/science/mkgmap/DETAILS
new file mode 100755
index 0000000..ee130cc
--- /dev/null
+++ b/science/mkgmap/DETAILS
@@ -0,0 +1,35 @@
+           SPELL=mkgmap
+         VERSION=r2277
+          SOURCE="${SPELL}-${VERSION}-src.tar.gz"
+   SOURCE_URL[0]=http://www.${SPELL}.org.uk/snapshots/${SOURCE}
+     SOURCE_HASH=sha512:a66c41cb9656d4eba4ac459715c32b381d604781ddcbee85a47f9deb608db8a76ab337726d0a6f99b115deb83da492e425e404ee474b4b2dbd9c4ecd55eed191
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.mkgmap.org.uk/page/main"
+      LICENSE[0]=GPL
+         ENTERED=20120509
+           SHORT="converts OpenStreetMap data to Garmin's .img format"
+cat << EOF
+The mkgmap program takes OpenStreetMap data and generates a map in the Garmin
+.img file format so that it can be loaded onto compatible GPS units.
+
+* Generates a map directly from a file saved from JOSM or from an extract of
+  the main OSM planet file.
+* Converts several .osm files in one run of the program to create a map tile
+  set.
+* Creates a .tdb file and an overview map that can be used to view the maps in
+  MapSource or QLandkarte.
+* Creates a gmapsupp.img file that can be copied directly to an SD card.  *
+Can also combine previously produced .img files into one gmapsupp.img file.
+* Create a .tdb and overview map from previously produced .img files.  *
+The mapping between OSM features features in the Garmin map can be
+  customised.
+* Transliteration of characters to ascii where that is possible to enable
+  viewing on low end devices or for international maps.
+* Character set can be specified for display on capable GPS devices.  *
+Control over the zoom levels that any feature appears at.
+
+The program does not send the created maps to the GPS unit. This can be done
+with another program such as sendmap or qlandkarte gt. If your GPS device
+has a removable SD card, then you can just create a gmapsupp.img file and
+copy it to the cards in the Garmin directory.
+EOF
diff --git a/science/mkgmap/HISTORY b/science/mkgmap/HISTORY
new file mode 100644
index 0000000..006e1dd
--- /dev/null
+++ b/science/mkgmap/HISTORY
@@ -0,0 +1,3 @@
+2012-05-09 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/science/mkgmap/INSTALL b/science/mkgmap/INSTALL
new file mode 100755
index 0000000..242a6bd
--- /dev/null
+++ b/science/mkgmap/INSTALL
@@ -0,0 +1,3 @@
+mkdir -p ${INSTALL_ROOT}/usr/share/mkgmap                                           &&
+install -m644 ${SOURCE_DIRECTORY}/dist/mkgmap.jar ${INSTALL_ROOT}/usr/share/mkgmap/ &&
+install -m755 ${SCRIPT_DIRECTORY}/mkgmap ${INSTALL_ROOT}/usr/bin/
diff --git a/science/mkgmap/mkgmap b/science/mkgmap/mkgmap
new file mode 100644
index 0000000..56556d9
--- /dev/null
+++ b/science/mkgmap/mkgmap
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+java -jar /usr/share/mkgmap/mkgmap.jar "$@"
diff --git a/security-libs/libfprint/DEPENDS b/security-libs/libfprint/DEPENDS
index cb835e4..fa1f3bb 100755
--- a/security-libs/libfprint/DEPENDS
+++ b/security-libs/libfprint/DEPENDS
@@ -2,5 +2,5 @@ if [[ "$LIBFPRINT_DEV" == 'y' ]]; then
   depends git
 fi &&
 depends glib &&
-depends libusb &&
+depends LIBUSB &&
 depends imagemagick
diff --git a/security-libs/libfprint/HISTORY b/security-libs/libfprint/HISTORY
index 2af7dc3..c52e660 100644
--- a/security-libs/libfprint/HISTORY
+++ b/security-libs/libfprint/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2009-07-28 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: fixed source url
-
 2009-03-22 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: added latest unstable release to track when
 	  it's recent enough for fprintd
diff --git a/security/fprintd/DEPENDS b/security/fprintd/DEPENDS
index bbf42d1..ea4954b 100755
--- a/security/fprintd/DEPENDS
+++ b/security/fprintd/DEPENDS
@@ -1,5 +1,5 @@
 depends git &&
-depends libusb &&
+depends LIBUSB &&
 depends libfprint &&
 depends dbus &&
 depends gtk-doc &&
diff --git a/security/fprintd/HISTORY b/security/fprintd/HISTORY
index 624c87c..96db191 100644
--- a/security/fprintd/HISTORY
+++ b/security/fprintd/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
-
 2009-07-28 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: fixed source url
 	* DEPENDS: gtk-doc no longer optional
diff --git a/telephony/asterisk/DEPENDS b/telephony/asterisk/DEPENDS
index 13b56a2..9e5139d 100755
--- a/telephony/asterisk/DEPENDS
+++ b/telephony/asterisk/DEPENDS
@@ -17,7 +17,7 @@ optional_depends  "lua"                                             \
                   "--without-lua"                                   \
                   "enable lua support"                             &&
 
-optional_depends  "libusb"                                          \
+optional_depends  "LIBUSB"                                          \
                   "--with-usb"                                      \
                   "--without-usb"                                   \
                   "enable libusb support"                          &&
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index f908e82..8394687 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc
-	  with sub-depends on CXX
 
 2010-08-12 Martin Spitzbarth <m.spitzbarth at gmx.de>
 	* DETAILS: updated spell to 1.6.2.11
diff --git a/telephony/usbb2k-api/DEPENDS b/telephony/usbb2k-api/DEPENDS
index 60d5fe0..b380e2c 100755
--- a/telephony/usbb2k-api/DEPENDS
+++ b/telephony/usbb2k-api/DEPENDS
@@ -1,4 +1,4 @@
 depends  autoconf  &&
 depends  automake  &&
-depends  libusb    &&
+depends  LIBUSB    &&
 depends  cvs
diff --git a/telephony/usbb2k-api/HISTORY b/telephony/usbb2k-api/HISTORY
index 3aba5dd..91ab083 100644
--- a/telephony/usbb2k-api/HISTORY
+++ b/telephony/usbb2k-api/HISTORY
@@ -1,5 +1,7 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2006-11-04 Juuso Alasuutari <iuso at sourcemage.org>
 	* DEPENDS: Added depends cvs.
-
 2006-11-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS, PREPARE, DEPENDS, PRE_BUILD: Created spell.
diff --git a/telephony/zaptel/DEPENDS b/telephony/zaptel/DEPENDS
index 6b57a77..c4e99f9 100755
--- a/telephony/zaptel/DEPENDS
+++ b/telephony/zaptel/DEPENDS
@@ -1,7 +1,7 @@
 depends newt   &&
 depends libpri &&
 
-optional_depends  "libusb"                                           \
+optional_depends  "LIBUSB"                                           \
                   "--with-usb"                                       \
                   "--without-usb"                                    \
                   "if you have USB telephony hardware"              &&
diff --git a/telephony/zaptel/HISTORY b/telephony/zaptel/HISTORY
index cddcc9c..8bb2230 100644
--- a/telephony/zaptel/HISTORY
+++ b/telephony/zaptel/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2008-07-25 Martin Spitzbarth <m.spitzbarth at gmx.de>
 	* DETAILS: updated spell to 1.4.11
-
 2007-08-25 Martin Spitzbarth <m.spitzbarth at gmx.de>
 	* DETAILS: updated spell to 1.4.5.1
 	  converted to upstream signature checking
diff --git a/utils/bluez/DEPENDS b/utils/bluez/DEPENDS
index 2801cd3..d318f17 100755
--- a/utils/bluez/DEPENDS
+++ b/utils/bluez/DEPENDS
@@ -13,7 +13,7 @@ optional_depends cups \
                  "--disable-cups" \
                  "for CUPS backend support" &&
 
-optional_depends libusb \
+optional_depends LIBUSB \
                  "--enable-usb" \
                  "--disable-usb" \
                  "for USB support" &&
diff --git a/utils/bluez/HISTORY b/utils/bluez/HISTORY
index 17384ba..ae32f91 100644
--- a/utils/bluez/HISTORY
+++ b/utils/bluez/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-08-19 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.96
-	* DEPENDS, CONFIGURE: fixed unrecognized options (issue #30)
 
 2011-08-12 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 4.95
diff --git a/utils/g15daemon/DEPENDS b/utils/g15daemon/DEPENDS
index 8d143a8..a3c5d39 100755
--- a/utils/g15daemon/DEPENDS
+++ b/utils/g15daemon/DEPENDS
@@ -1,3 +1,3 @@
-depends  libusb        &&
+depends  LIBUSB        &&
 depends  libg15        &&
 depends  libg15render
diff --git a/utils/g15daemon/HISTORY b/utils/g15daemon/HISTORY
index 31f160c..b33aed2 100644
--- a/utils/g15daemon/HISTORY
+++ b/utils/g15daemon/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2008-03-14 David Kowis <dkowis at shlrm.org>
 	* PI DAY!
-	* DETAILS: to latest version
 
 2007-12-30 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS, DEPENDS, init.d/g15daemon: Created spell.
diff --git a/utils/garmintools/DEPENDS b/utils/garmintools/DEPENDS
index 3fb2769..44e7a79 100755
--- a/utils/garmintools/DEPENDS
+++ b/utils/garmintools/DEPENDS
@@ -1 +1 @@
-depends libusb-compat
+depends LIBUSB-compat
diff --git a/utils/garmintools/HISTORY b/utils/garmintools/HISTORY
index d54d807..b78fb8c 100644
--- a/utils/garmintools/HISTORY
+++ b/utils/garmintools/HISTORY
@@ -1,3 +1,5 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-05-06 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS, DEPENDS: spell created
-
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 98bd3a8..1f3b569 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -36,7 +36,7 @@ optional_depends  docbook-utils             \
                   "--disable-docbook-docs"  \
                   "Build Docbook Docs"      &&
 
-optional_depends  libusb                    \
+optional_depends  LIBUSB                    \
                   "--enable-usb"            \
                   "--disable-usb"           \
                   "for libusb support"      &&
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index e6514fc..782dcfb 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-04-21 Vlad Glagolev <stealth at sourcemage.org>
 	* PRE_BUILD: apply the patch; use is_version_less()
-	* glib232.patch: added, to fix build with glib2 >= 2.32
 
 2011-10-12 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: use ACPI provider
diff --git a/utils/lcdproc/DEPENDS b/utils/lcdproc/DEPENDS
index 4cff65c..e88bce3 100755
--- a/utils/lcdproc/DEPENDS
+++ b/utils/lcdproc/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends "libusb" "--enable-libusb" "--disable-libusb" "Use libUSB?" &&
+optional_depends "LIBUSB" "--enable-libusb" "--disable-libusb" "Use libUSB?" &&
 
 config_query LCDPROC_G15 "Use the G15 LCD?" n &&
 if [[ "$LCDPROC_G15" == "y" ]]; then
diff --git a/utils/lcdproc/HISTORY b/utils/lcdproc/HISTORY
index 59487e3..060ec41 100644
--- a/utils/lcdproc/HISTORY
+++ b/utils/lcdproc/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2008-03-14 David Kowis <dkowis at shlrm.org>
 	* PI DAY!
-	* DETAILS: updated to latest version
 	* BUILD: added LCDPROC_OPTS
 	* CONFIGURE: added various and sundry configure options
 	* DEPENDS: added correct dependencies
diff --git a/utils/lmctl/DEPENDS b/utils/lmctl/DEPENDS
index 5487d07..eb409de 100755
--- a/utils/lmctl/DEPENDS
+++ b/utils/lmctl/DEPENDS
@@ -1 +1 @@
-depends libusb
+depends LIBUSB
diff --git a/utils/lmctl/HISTORY b/utils/lmctl/HISTORY
index 2aefa12..08b5514 100644
--- a/utils/lmctl/HISTORY
+++ b/utils/lmctl/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2008-08-19 Robert Figura <template at sourcemage.org>
 	* DEPENDS: added libusb
-
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/utils/logitech_applet/DEPENDS b/utils/logitech_applet/DEPENDS
index 5487d07..eb409de 100755
--- a/utils/logitech_applet/DEPENDS
+++ b/utils/logitech_applet/DEPENDS
@@ -1 +1 @@
-depends libusb
+depends LIBUSB
diff --git a/utils/logitech_applet/HISTORY b/utils/logitech_applet/HISTORY
index 5601c8a..70a0b2b 100644
--- a/utils/logitech_applet/HISTORY
+++ b/utils/logitech_applet/HISTORY
@@ -1,4 +1,6 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2008-01-26 Lubomir Blaha <tritol at trilogic.cz>
 	* DEPENDS, DETAILS, HISTORY, PRE_BUILD, init.d: created this spell
-	* mx518.patch, verbose-report.patch: taken from http://cvs.mandriva.com/cgi-bin/viewvc.cgi/contrib-SPECS/logitech_applet/
 
diff --git a/utils/lshwd/DEPENDS b/utils/lshwd/DEPENDS
index 7d66b00..8fb48e6 100755
--- a/utils/lshwd/DEPENDS
+++ b/utils/lshwd/DEPENDS
@@ -1,2 +1,2 @@
-depends libusb
+depends LIBUSB
 
diff --git a/utils/lshwd/HISTORY b/utils/lshwd/HISTORY
index d5dce07..118876f 100644
--- a/utils/lshwd/HISTORY
+++ b/utils/lshwd/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* init.d/lshwd: made it non-sh, bug #13702
-
 2008-07-23 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* PRE_BUILD: added to fix an include path #14589
 
diff --git a/utils/openmoko-dfu-util/DEPENDS b/utils/openmoko-dfu-util/DEPENDS
index c408458..91c6213 100755
--- a/utils/openmoko-dfu-util/DEPENDS
+++ b/utils/openmoko-dfu-util/DEPENDS
@@ -1,4 +1,4 @@
-depends libusb-compat &&
+depends LIBUSB-compat &&
 depends autogen       &&
 depends pkgconfig     &&
 depends automake      &&
diff --git a/utils/openmoko-dfu-util/HISTORY b/utils/openmoko-dfu-util/HISTORY
index dc2a4c9..e49a27b 100644
--- a/utils/openmoko-dfu-util/HISTORY
+++ b/utils/openmoko-dfu-util/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-09-29 Ismael Luceno <ismael at sourcemage.org>
 	* DETAILS, PREPARE: Use prepare_select_branch
-
 2010-08-12 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS, PREPARE: corrected SOURCE_URL and WEB_SITE
 
diff --git a/utils/razercfg/DEPENDS b/utils/razercfg/DEPENDS
index 42e00ca..43def08 100755
--- a/utils/razercfg/DEPENDS
+++ b/utils/razercfg/DEPENDS
@@ -1,3 +1,3 @@
 depends cmake  &&
-depends libusb &&
+depends LIBUSB &&
 depends pyqt4 
diff --git a/utils/razercfg/HISTORY b/utils/razercfg/HISTORY
index 28c2dea..2758541 100644
--- a/utils/razercfg/HISTORY
+++ b/utils/razercfg/HISTORY
@@ -1,3 +1,5 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2012-01-04 Julien _kaze_ ROZO <julien at rozo.org>
 	* BUILD, DEPENDS, DETAILS, FINAL, HISTORY, init.d/razerd: spell created
-
diff --git a/utils/usb-modeswitch/DEPENDS b/utils/usb-modeswitch/DEPENDS
index b2b9127..9431cbb 100755
--- a/utils/usb-modeswitch/DEPENDS
+++ b/utils/usb-modeswitch/DEPENDS
@@ -1,2 +1,2 @@
 depends tcl &&
-depends libusb-compat
+depends LIBUSB-compat
diff --git a/utils/usb-modeswitch/HISTORY b/utils/usb-modeswitch/HISTORY
index 2c7062c..61ac36f 100644
--- a/utils/usb-modeswitch/HISTORY
+++ b/utils/usb-modeswitch/HISTORY
@@ -1,2 +1,5 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-10-25 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, DEPENDS, BUILD: spell created, version 1.2.0
diff --git a/utils/usbutils/DEPENDS b/utils/usbutils/DEPENDS
index 4700748..736ed12 100755
--- a/utils/usbutils/DEPENDS
+++ b/utils/usbutils/DEPENDS
@@ -1,2 +1,2 @@
-depends  libusb   #&&
+depends  LIBUSB   #&&
 #depends  hotplug
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index 8e40049..baa2f93 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-10-01 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated SOURCE_URL due to kernel.org being offline
-
 2011-08-14 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 004, upstream gpg checking
 
diff --git a/video-libs/libdc1394/DEPENDS b/video-libs/libdc1394/DEPENDS
index daa8677..63546d3 100644
--- a/video-libs/libdc1394/DEPENDS
+++ b/video-libs/libdc1394/DEPENDS
@@ -1,4 +1,4 @@
 depends libtool &&
 optional_depends libraw1394 '' '' 'Linux legacy support' &&
-optional_depends libusb     '' '' 'IIDC-over-USB support' &&
+optional_depends LIBUSB     '' '' 'IIDC-over-USB support' &&
 optional_depends doxygen    '' '' 'nuild documentation'
diff --git a/video-libs/libdc1394/HISTORY b/video-libs/libdc1394/HISTORY
index 38fb617..3e5b9bb 100644
--- a/video-libs/libdc1394/HISTORY
+++ b/video-libs/libdc1394/HISTORY
@@ -1,6 +1,8 @@
+2012-05-09 Treeve Jelbert <treeve at sourcemage.org> 
+	* DEPENDS: libusb => LIBUSB
+
 2011-12-09 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 2.1.4
-
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 


More information about the SM-Commit mailing list