[SM-Commit] GIT changes to master grimoire by Andraž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af6177)

Andraž Levstik scm at sourcemage.org
Fri Apr 20 16:07:37 EDT 2007


GIT changes to master grimoire by Andraž Levstik <ruskie at mages.ath.cx>:

 ChangeLog                                   |    5 ++
 ftp/curlftpfs/DEPENDS                       |    3 +
 ftp/curlftpfs/DETAILS                       |   15 +++++++
 ftp/curlftpfs/HISTORY                       |    2 
 gnustep-apps/FUNCTIONS                      |   58 +++++++++-------------------
 gnustep-apps/gnustep-addressbook/CONFIGURE  |    2 
 gnustep-apps/gnustep-addressbook/DEPENDS    |    3 -
 gnustep-apps/gnustep-addressbook/HISTORY    |    6 ++
 gnustep-apps/gnustep-addressbook/INSTALL    |   23 -----------
 gnustep-apps/gnustep-addressbook/PRE_BUILD  |   12 +++++
 gnustep-apps/gnustep-affiche/DEPENDS        |    3 -
 gnustep-apps/gnustep-affiche/DETAILS        |    6 --
 gnustep-apps/gnustep-affiche/HISTORY        |    4 +
 gnustep-apps/gnustep-cenon/DEPENDS          |    3 -
 gnustep-apps/gnustep-cenon/DETAILS          |    5 --
 gnustep-apps/gnustep-cenon/HISTORY          |    5 ++
 gnustep-apps/gnustep-cenon/PRE_BUILD        |    4 +
 gnustep-apps/gnustep-expense/DEPENDS        |    3 -
 gnustep-apps/gnustep-expense/DETAILS        |    6 --
 gnustep-apps/gnustep-expense/HISTORY        |    4 +
 gnustep-apps/gnustep-gnumail/BUILD          |   45 ++++++++-------------
 gnustep-apps/gnustep-gnumail/DEPENDS        |   12 +++--
 gnustep-apps/gnustep-gnumail/DETAILS        |    4 -
 gnustep-apps/gnustep-gnumail/HISTORY        |    7 +++
 gnustep-apps/gnustep-gnumail/INSTALL        |   41 ++++++++-----------
 gnustep-apps/gnustep-gnumail/PRE_BUILD      |   26 ++++++++++++
 gnustep-apps/gnustep-gorm/CONFIGURE         |    1 
 gnustep-apps/gnustep-gorm/DEPENDS           |    9 ----
 gnustep-apps/gnustep-gorm/DETAILS           |    5 --
 gnustep-apps/gnustep-gorm/HISTORY           |    4 +
 gnustep-apps/gnustep-gworkspace/BUILD       |   29 --------------
 gnustep-apps/gnustep-gworkspace/CONFIGURE   |    2 
 gnustep-apps/gnustep-gworkspace/DEPENDS     |    4 -
 gnustep-apps/gnustep-gworkspace/DETAILS     |    5 --
 gnustep-apps/gnustep-gworkspace/HISTORY     |    7 +++
 gnustep-apps/gnustep-gworkspace/INSTALL     |   20 ---------
 gnustep-apps/gnustep-mylibrary/DEPENDS      |    4 -
 gnustep-apps/gnustep-mylibrary/DETAILS      |    2 
 gnustep-apps/gnustep-mylibrary/HISTORY      |    4 +
 gnustep-apps/gnustep-notebook/DEPENDS       |    3 -
 gnustep-apps/gnustep-notebook/DETAILS       |    4 -
 gnustep-apps/gnustep-notebook/HISTORY       |    4 +
 gnustep-apps/gnustep-oolite/BUILD           |    1 
 gnustep-apps/gnustep-oolite/DETAILS         |   14 +++---
 gnustep-apps/gnustep-oolite/HISTORY         |    7 +++
 gnustep-apps/gnustep-oolite/INSTALL         |    7 ---
 gnustep-apps/gnustep-oolite/PRE_BUILD       |   10 +---
 gnustep-apps/gnustep-photoclip/DEPENDS      |    4 +
 gnustep-apps/gnustep-photoclip/DETAILS      |    7 +--
 gnustep-apps/gnustep-photoclip/HISTORY      |    4 +
 gnustep-apps/gnustep-preferences/BUILD      |   17 +-------
 gnustep-apps/gnustep-preferences/DEPENDS    |    4 +
 gnustep-apps/gnustep-preferences/DETAILS    |    3 -
 gnustep-apps/gnustep-preferences/HISTORY    |    7 +++
 gnustep-apps/gnustep-preferences/INSTALL    |    9 +---
 gnustep-apps/gnustep-preferences/PRE_BUILD  |   27 +++++++++++--
 gnustep-apps/gnustep-projectcenter/DEPENDS  |    3 -
 gnustep-apps/gnustep-projectcenter/DETAILS  |    2 
 gnustep-apps/gnustep-projectcenter/HISTORY  |    4 +
 gnustep-apps/gnustep-stepulator/DEPENDS     |    3 -
 gnustep-apps/gnustep-stepulator/DETAILS     |    2 
 gnustep-apps/gnustep-stepulator/HISTORY     |    4 +
 gnustep-apps/gnustep-talksoup/DEPENDS       |    4 +
 gnustep-apps/gnustep-talksoup/DETAILS       |    2 
 gnustep-apps/gnustep-talksoup/HISTORY       |    5 ++
 gnustep-apps/gnustep-talksoup/PRE_BUILD     |   26 ++++++++++++
 gnustep-apps/gnustep-terminal/BUILD         |   14 ------
 gnustep-apps/gnustep-terminal/DEPENDS       |    3 -
 gnustep-apps/gnustep-terminal/DETAILS       |    2 
 gnustep-apps/gnustep-terminal/HISTORY       |    5 ++
 gnustep-apps/gnustep-terminal/INSTALL       |    5 --
 gnustep-apps/gnustep-textedit/BUILD         |   14 ------
 gnustep-apps/gnustep-textedit/DEPENDS       |    3 -
 gnustep-apps/gnustep-textedit/DETAILS       |    2 
 gnustep-apps/gnustep-textedit/HISTORY       |    6 ++
 gnustep-apps/gnustep-textedit/INSTALL       |    5 --
 gnustep-apps/gnustep-ticker/DEPENDS         |    3 -
 gnustep-apps/gnustep-ticker/DETAILS         |    4 -
 gnustep-apps/gnustep-ticker/HISTORY         |    3 +
 gnustep-apps/gnustep-zipper/DEPENDS         |    3 -
 gnustep-apps/gnustep-zipper/DETAILS         |    2 
 gnustep-apps/gnustep-zipper/HISTORY         |    4 +
 gnustep-libs/FUNCTIONS                      |   58 +++++++++-------------------
 gnustep-libs/gnustep-artresources/BUILD     |    8 ---
 gnustep-libs/gnustep-artresources/DEPENDS   |    2 
 gnustep-libs/gnustep-artresources/DETAILS   |   15 -------
 gnustep-libs/gnustep-artresources/HISTORY   |   21 ----------
 gnustep-libs/gnustep-artresources/INSTALL   |    6 --
 gnustep-libs/gnustep-artresources/PRE_BUILD |    3 -
 gnustep-libs/gnustep-back-art/BUILD         |   22 ----------
 gnustep-libs/gnustep-back-art/CONFIGURE     |    1 
 gnustep-libs/gnustep-back-art/DEPENDS       |   12 -----
 gnustep-libs/gnustep-back-art/DETAILS       |    4 -
 gnustep-libs/gnustep-back-art/HISTORY       |   10 ++++
 gnustep-libs/gnustep-back-art/INSTALL       |    1 
 gnustep-libs/gnustep-back-art/PRE_BUILD     |    1 
 gnustep-libs/gnustep-back-art/PROVIDES      |    1 
 gnustep-libs/gnustep-back-art/TRIGGERS      |    1 
 gnustep-libs/gnustep-back-xlib/BUILD        |   22 ----------
 gnustep-libs/gnustep-back-xlib/CONFIGURE    |    1 
 gnustep-libs/gnustep-back-xlib/DEPENDS      |   11 -----
 gnustep-libs/gnustep-back-xlib/DETAILS      |    4 -
 gnustep-libs/gnustep-back-xlib/HISTORY      |   10 ++++
 gnustep-libs/gnustep-back-xlib/INSTALL      |    1 
 gnustep-libs/gnustep-back-xlib/PRE_BUILD    |    1 
 gnustep-libs/gnustep-back-xlib/PROVIDES     |    1 
 gnustep-libs/gnustep-back-xlib/TRIGGERS     |    1 
 gnustep-libs/gnustep-back/BUILD             |   18 ++++++++
 gnustep-libs/gnustep-back/CONFIGURE         |    3 +
 gnustep-libs/gnustep-back/CONFLICTS         |    3 +
 gnustep-libs/gnustep-back/DEPENDS           |   28 +++++++++++++
 gnustep-libs/gnustep-back/DETAILS           |   37 +++++++++++++++++
 gnustep-libs/gnustep-back/FINAL             |    4 +
 gnustep-libs/gnustep-back/HISTORY           |    7 +++
 gnustep-libs/gnustep-back/INSTALL           |    6 ++
 gnustep-libs/gnustep-back/PRE_BUILD         |    7 +++
 gnustep-libs/gnustep-base/BUILD             |    2 
 gnustep-libs/gnustep-base/CONFIGURE         |    1 
 gnustep-libs/gnustep-base/DEPENDS           |   23 +++++------
 gnustep-libs/gnustep-base/DETAILS           |   11 +----
 gnustep-libs/gnustep-base/HISTORY           |    8 +++
 gnustep-libs/gnustep-base/PRE_BUILD         |    3 +
 gnustep-libs/gnustep-base/init.d/gdomap     |    4 -
 gnustep-libs/gnustep-baseinit.d/gdomap      |    9 ----
 gnustep-libs/gnustep-cenonlib/BUILD         |    2 
 gnustep-libs/gnustep-cenonlib/DEPENDS       |    4 +
 gnustep-libs/gnustep-cenonlib/DETAILS       |    3 -
 gnustep-libs/gnustep-cenonlib/HISTORY       |    6 ++
 gnustep-libs/gnustep-cenonlib/INSTALL       |    8 ---
 gnustep-libs/gnustep-gui/BUILD              |    7 +++
 gnustep-libs/gnustep-gui/CONFIGURE          |    1 
 gnustep-libs/gnustep-gui/DEPENDS            |   47 +++++++++++++++-------
 gnustep-libs/gnustep-gui/DETAILS            |    7 ++-
 gnustep-libs/gnustep-gui/HISTORY            |    3 +
 gnustep-libs/gnustep-gui/UP_TRIGGERS        |    4 -
 gnustep-libs/gnustep-make/BUILD             |   14 ------
 gnustep-libs/gnustep-make/CONFIGURE         |    1 
 gnustep-libs/gnustep-make/DEPENDS           |   10 ----
 gnustep-libs/gnustep-make/DETAILS           |   11 ++---
 gnustep-libs/gnustep-make/FINAL             |   29 --------------
 gnustep-libs/gnustep-make/INSTALL           |   22 ----------
 gnustep-libs/gnustep-make/POST_REMOVE       |    4 -
 gnustep-libs/gnustep-mknfonts/DEPENDS       |    3 -
 gnustep-libs/gnustep-mknfonts/HISTORY       |    3 +
 gnustep-libs/gnustep-netclasses/CONFIGURE   |    1 
 gnustep-libs/gnustep-netclasses/DEPENDS     |    9 ----
 gnustep-libs/gnustep-netclasses/DETAILS     |    9 +---
 gnustep-libs/gnustep-netclasses/HISTORY     |    4 +
 gnustep-libs/gnustep-pantomime/DEPENDS      |    3 -
 gnustep-libs/gnustep-pantomime/DETAILS      |    6 --
 gnustep-libs/gnustep-pantomime/HISTORY      |    4 +
 gnustep-libs/gnustep-performance/DEPENDS    |    3 -
 gnustep-libs/gnustep-performance/DETAILS    |    6 --
 gnustep-libs/gnustep-performance/HISTORY    |    4 +
 gnustep-libs/gnustep-prefsmodule/BUILD      |   14 ------
 gnustep-libs/gnustep-prefsmodule/DEPENDS    |    4 +
 gnustep-libs/gnustep-prefsmodule/DETAILS    |    3 -
 gnustep-libs/gnustep-prefsmodule/HISTORY    |    7 +++
 gnustep-libs/gnustep-prefsmodule/INSTALL    |    5 --
 gnustep-libs/gnustep-prefsmodule/PRE_BUILD  |    3 -
 gnustep-libs/gnustep-renaissance/CONFIGURE  |    1 
 gnustep-libs/gnustep-renaissance/DEPENDS    |    7 ---
 gnustep-libs/gnustep-renaissance/DETAILS    |    1 
 gnustep-libs/gnustep-renaissance/HISTORY    |    4 +
 gnustep-libs/gnustep-sqlclient/DEPENDS      |   20 +++++++--
 gnustep-libs/gnustep-sqlclient/DETAILS      |    6 --
 gnustep-libs/gnustep-sqlclient/HISTORY      |    5 ++
 gnustep-libs/gnustep-sqlclient/PRE_BUILD    |    3 +
 gnustep-libs/gnustep-steptalk/BUILD         |   22 ++--------
 gnustep-libs/gnustep-steptalk/DEPENDS       |    8 ++-
 gnustep-libs/gnustep-steptalk/DETAILS       |    2 
 gnustep-libs/gnustep-steptalk/HISTORY       |    6 ++
 gnustep-libs/gnustep-steptalk/PRE_BUILD     |   18 ++++++++
 gnustep-libs/gnustep-webserver/DEPENDS      |    3 -
 gnustep-libs/gnustep-webserver/DETAILS      |    6 --
 gnustep-libs/gnustep-webserver/HISTORY      |    4 +
 gnustep-libs/gnustep.gpg                    |binary
 utils/util-vserver/BUILD                    |   12 +++++
 utils/util-vserver/CONFIGURE                |   17 ++++++++
 utils/util-vserver/DEPENDS                  |   15 +++++--
 utils/util-vserver/DETAILS                  |   23 ++++++-----
 utils/util-vserver/HISTORY                  |   10 ++++
 utils/util-vserver/INSTALL                  |    4 +
 utils/util-vserver/vserver.gpg              |binary
 184 files changed, 795 insertions(+), 736 deletions(-)

New commits:
commit 8f45882dc4e2f0fe6e71e2fa6b5926daf6af6177
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    ftp/curlftpfs: added, curl fuse ftp fs

commit 36312d591d0b4ab244efad90281fd0713bc9650b
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-libs/FUNCTIONS: minor fixups

commit c73b01d6eb546ceae406feb44fff108c78fba7e0
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    ChangeLog: forgot it

commit c4f9160d6c8a6e0f0e280fe17e3f38309426fcbd
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-apps/FUNCTIONS: some fixes

commit 75da8ddb8a012773303642aeb8146a99caff0997
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-oolite: version update

commit 278ee5ec7458ca740eb112a82c8f2d44bfa70c54
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-steptalk: minor fixup

commit 912ba207c76536050f87685cb14f86af313d5496
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-sqlclient: minor fixup

commit 24b43da09ef53c90ee7a3465f49194fe82f2e839
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-mylibrary: minor cleanups

commit a310d5629253163d8809bc2d414d858456ff9e5a
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-zipper: minor cleanups

commit 233102873eff11cac03ede40773d34d812cba07e
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-ticker: minor updates and a hash update

commit fdf566ec4cd755c061a86199e642d708c51fe431
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-textedit: minor fixups

commit 012a010dcfee4f44cf6db944e9513db9c6561d79
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-terminal: minor update

commit b7d28bb70946b097083d8b859e22519d51adadda
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-talksoup: minor fixups

commit f9fe7ef5b2909c0237422491e565b8a49fc73108
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-stepulator: minor tweaks

commit 9fa22a3d89195bae047f84428a58e556836a8ae1
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-projectcenter: minor tweaks

commit e47ddce6f1b4d96609e759183ec4a2d9b3578203
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-preferences: minor fixups

commit 78bd4d15e4a106419e2d59a83bca7565d73b36c8
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-photoclip: version update

commit fc9cdc55ba932e5e4cf91ebf6a916af031644cd2
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-notebook: minor cleanup

commit ac7e4f7620910e46a349e987e8607d501c1b23b2
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-gorm: version update

commit a4e289ec2158d08bca592101bec2c09101028e93
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-gworkspace: version update

commit db3931496fa65dc82c44bd1394684c1fa536818a
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-gnumail: forogt PRE_BUILD

commit 0a8aeaa0dd75b995247a2814e75ca19cd55f6c97
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-gnumail: version update and some cleanup

commit 2d792439cac00f53e6d4a424c18679b80becd201
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-expense: minor cleanup

commit af6d5e8f77d5ce8c3d861c76a88df3925762ac63
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-cenon: minor updates

commit 427daeed8d0f7e00946a52794bad69d316c866e5
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-affiche: miner cleanup

commit 741bcba2dad5551e4de00e6058b6daf4e7b3d803
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-addressbook: minor fixes

commit f0f15a7ced73de714503ef86e0cf7aa25254fbeb
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-webserver: version update

commit fae27b210526ff5a215815047450c0adf8d9742c
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-netclasses: removing CONFIGURE

commit f42db7589b26c8ab210b316a14d799bf47315788
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-performance: fixups and stuff

commit c436eb68799d04702f43a424ca7d3ac4a57d4a77
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-steptalk: minor fixups

commit ea3bece7236a7f46b83ee9e2f4e6d3996b5878da
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-sqlclient: fixup install path

commit 55bb86e33174bad9a7c71c828e46c3258679f152
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-sqlclient: version update

commit e74ba8384a3a82e26328d3d6683feaa6268cc8bd
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-renaissance: minor tweaks

commit 93a423431ab44dc527aadcac723012aea1481630
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-prefsmodule: update and revamp

commit 46db053c9f8fec20698d2eae4c9f3ca93c57b083
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-pantomime: updated version

commit 1de84d386b2951bfbe93cf241504ab216586f87c
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-netclasses: minor fixups

commit 0d0a1482633cb8ee7b8c0abf79529576a228612a
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-mknfonts: minor fixup in depends

commit 0450afa4dfe1b1c889adefce974b3c2c1b2c91b2
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-cenonlib: update and revamp

commit 54a9315946857ae60b0a54bbc6d63a7a85fc337d
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-gui: added a dependency

commit 71e0724b351c2e8cdb9578bf695e8b255478dccd
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-back: added a dependency

commit a365c31d519f4f5872b09eb069b13a9307d53b8d
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    added gnustep.gpg

commit 2d5039df7087d5106cc59a5b728f586f6bacdb94
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    removed non-spell

commit 0cc6ee02d207322b2f98b9c5f72e249385d76155
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-libs/gnustep-back-art/HISTORY: forgot HISTORY file

commit e9efe090636ec7d8254a7445b86985e2b26d1f96
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-libs/gnustep-back-xlib/HISTORY: forgot HISTORY file

commit 3f2a6fd15943a638face0cc2a1c291265fecf1bf
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-libs/gnustep-base/HISTORY: forgot HISTORY file

commit bb5dc5dc8ae1b2ed86eb53cec5732f84392d8fcb
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-libs/gnustep-gui/HISTORY: forgot HISTORY file

commit 5746b2109a3f9f42fd15347c4ea82cb172faad11
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-gui: update and revamp, forgot a file

commit 29dbd4de2f1c48b7c5c0123909c855645756c764
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-base: update and revamp, forgot a few files

commit f5be8da6ba75ad227d220b6b9e1d9e61d29b97c1
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-libs/gnustep-artresources: seems to be no longer available
    or needed

commit 7b4faf3af4342b5b16e621368c248a8668b931f8
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-back-klib: update and revamp of the backend spells

commit f5e051a303c69be1ff822cdf9f8d1796d9f3bc6a
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-back-art: update and revamp of the backend spells

commit 1e2012f3fb60852bf8eda1d50b7ab60aa2e13bdd
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-back: update and revamp of the backend spells

commit 9ce9684219ac05e64cf366683588b04b274bdd47
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-base: update and revamp

commit 65634f2d5a17733f980aae22e7b0f2742295c6e4
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-gui: update and revamp

commit 5833eeb040fb908026abd19cf0afb327a036ebe9
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnustep-make: update to 2.0.0 and other modifications

commit a0e38ffc6bbd2d4532dc83a5a51b0aec91eab4f2
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    util-vserver: forgot the HISTORY file

commit 9963ceba67c1af32f2fad869f74e103f6a70f1d0
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    util-vserver: updated with my existing spell which was waiting for a
    patch to be included

diff --git a/ChangeLog b/ChangeLog
index 12937ef..a371c90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-20 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* gnustep-apps/FUNCTIONS: fixups
+	* gnustep-libs/FUNCTIONS: fixups
+	* ftp/curlftpfs: new spell, fuse mountable ftp fs
+
 2007-04-18 Juuso Alasuutari <iuso at sourcemage.org>
 	* utils/rtirq: New spell, script that raises audio devices' IRQ
 	  thread priorities.
diff --git a/ftp/curlftpfs/DEPENDS b/ftp/curlftpfs/DEPENDS
new file mode 100755
index 0000000..88cb666
--- /dev/null
+++ b/ftp/curlftpfs/DEPENDS
@@ -0,0 +1,3 @@
+depends curl       &&
+depends pkgconfig  &&
+depends fuse 
diff --git a/ftp/curlftpfs/DETAILS b/ftp/curlftpfs/DETAILS
new file mode 100755
index 0000000..ce0ba12
--- /dev/null
+++ b/ftp/curlftpfs/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=curlftpfs
+         VERSION=0.9
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+     SOURCE_HASH=sha512:7bd2a9e8a965600979464d667be58de65278bc5672919255e073d3d3b1bd562abe250e18bc17e89ac48b66cc9b9c4137e887199766db90bb54ed048daedad5b5
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://curlftpfs.sourceforge.net/ "
+      LICENSE[0]=GPL
+         ENTERED=20070316
+           SHORT="An FTP filesystem based on cURL and FUSE."
+cat << EOF
+CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE and
+libcurl. It features SSL support, connecting through tunneling HTTP proxies,
+and automatically reconnecting if the server times out.
+EOF
diff --git a/ftp/curlftpfs/HISTORY b/ftp/curlftpfs/HISTORY
new file mode 100644
index 0000000..6cac78e
--- /dev/null
+++ b/ftp/curlftpfs/HISTORY
@@ -0,0 +1,2 @@
+2007-03-16 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/gnustep-apps/FUNCTIONS b/gnustep-apps/FUNCTIONS
index 49fbfd1..05eecd0 100755
--- a/gnustep-apps/FUNCTIONS
+++ b/gnustep-apps/FUNCTIONS
@@ -1,45 +1,25 @@
-# ------------------------------------------------------------------------------
+#---
 ## Replace sorcerys default_build with a custom one
-# ------------------------------------------------------------------------------
-function default_build ()
+#---
+function default_build()
 {
-    if [ -f /etc/profile.d/GNUstep.sh ]
-    then
-	. /etc/profile.d/GNUstep.sh
-    else
-	message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
-	message "Rebuild gnustep-make${DEFAULT_COLOR}"                   &&
-	return 1
-    fi                                                                   &&
-
-    if [ -f ./configure ]
-    then
-	./configure                                                      \
-	$OPTS                                                            
-    fi                                                                   &&
-
-    make                                                                 &&
-
-    if [ "$GNUSTEP_BUILD_DOC" == "y" ]
-    then
-	cd Documentation                                                 &&
-	make                                                             &&
-	cd ../                                        
-    fi
+  if [[ -f ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh ]]
+  then
+    . ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh
+  fi
+  if [[ -x ./configure ]]
+  then
+    real_default_build
+  else
+    make $@
+  fi
 }
 
-# ------------------------------------------------------------------------------
-## Replace sorcerys default_install with a custom one
-# ------------------------------------------------------------------------------
-function default_install ()
+function default_post_install()
 {
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           &&
-
-    if [ "$GNUSTEP_BUILD_DOC" == "y" ]
-    then
-	cd Documentation                                                  &&
-	make                                                              &&
-	make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-	cd ../
-    fi
+  real_default_post_install
+  if [[ -x /usr/bin/make_services ]]; then
+    message "Running make_services"
+    /usr/bin/make_services
+  fi
 }
diff --git a/gnustep-apps/gnustep-addressbook/CONFIGURE b/gnustep-apps/gnustep-addressbook/CONFIGURE
deleted file mode 100755
index a7ddedc..0000000
--- a/gnustep-apps/gnustep-addressbook/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query ADSRV "Build adserver?"  y
-config_query ADTOL "Build adtool?"    y
diff --git a/gnustep-apps/gnustep-addressbook/DEPENDS b/gnustep-apps/gnustep-addressbook/DEPENDS
index e9ad78b..cd6da98 100755
--- a/gnustep-apps/gnustep-addressbook/DEPENDS
+++ b/gnustep-apps/gnustep-addressbook/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-addressbook/HISTORY b/gnustep-apps/gnustep-addressbook/HISTORY
index 3a7a086..b1d8bf5 100644
--- a/gnustep-apps/gnustep-addressbook/HISTORY
+++ b/gnustep-apps/gnustep-addressbook/HISTORY
@@ -1,3 +1,9 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: missing depends
+	* CONFIGURE: dropped gonna separate goodies into own spell
+	* INSTALL: dropped
+	* PRE_BUILD: added to fix install paths
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-addressbook/INSTALL b/gnustep-apps/gnustep-addressbook/INSTALL
deleted file mode 100755
index c178813..0000000
--- a/gnustep-apps/gnustep-addressbook/INSTALL
+++ /dev/null
@@ -1,23 +0,0 @@
-export TAR_OPTIONS="--no-same-owner"
-
-make_single                                                           &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
-
-if [ "$ADSRV" == "y" ];
-then
-    cd Goodies/adserver                                               &&
-    make                                                              &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-    cd ../../
-fi                                                                    &&
-
-
-if [ "$ADTOL" == "y" ];
-then
-    cd Goodies/adtool                                                 &&
-    make                                                              &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-    cd ../../
-fi                                                                    &&
-
-make_normal
diff --git a/gnustep-apps/gnustep-addressbook/PRE_BUILD b/gnustep-apps/gnustep-addressbook/PRE_BUILD
new file mode 100755
index 0000000..867802e
--- /dev/null
+++ b/gnustep-apps/gnustep-addressbook/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library\/Headers/GNUSTEP_SYSTEM_HEADERS)/g' Frameworks/Addresses/GNUmakefile  &&
+sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' Goodies/VCFViewer/GNUmakefile  &&
+local gnumakefile
+for gnumakefile in AddressManager/GNUmakefile \
+                   Goodies/adtool/GNUmakefile \
+                   Goodies/adserver/GNUmakefile \
+                   Test/GNUmakefile
+do
+sedit 's/Versions\/A/Versions\/Current/g' $gnumakefile
+done
diff --git a/gnustep-apps/gnustep-affiche/DEPENDS b/gnustep-apps/gnustep-affiche/DEPENDS
index e9ad78b..cd6da98 100755
--- a/gnustep-apps/gnustep-affiche/DEPENDS
+++ b/gnustep-apps/gnustep-affiche/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-affiche/DETAILS b/gnustep-apps/gnustep-affiche/DETAILS
index d417976..56c6b7b 100755
--- a/gnustep-apps/gnustep-affiche/DETAILS
+++ b/gnustep-apps/gnustep-affiche/DETAILS
@@ -9,9 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Affiche
          ENTERED=20050908
         KEYWORDS="gnustep"
            SHORT="GNUstep stick little notes."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
-Affiche is a little application that allows people to 'stick little notes'
-on your desktop.
+Affiche is a little application that allows people
+to 'stick little notes' on your desktop.
 EOF
diff --git a/gnustep-apps/gnustep-affiche/HISTORY b/gnustep-apps/gnustep-affiche/HISTORY
index 621e7f1..8ab05b2 100644
--- a/gnustep-apps/gnustep-affiche/HISTORY
+++ b/gnustep-apps/gnustep-affiche/HISTORY
@@ -1,3 +1,7 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: missing depend
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-cenon/DEPENDS b/gnustep-apps/gnustep-cenon/DEPENDS
index ae6a8c8..0eccc72 100755
--- a/gnustep-apps/gnustep-cenon/DEPENDS
+++ b/gnustep-apps/gnustep-cenon/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-cenonlib
\ No newline at end of file
+depends gnustep-cenonlib  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-cenon/DETAILS b/gnustep-apps/gnustep-cenon/DETAILS
index a2f02c9..f63a6d3 100755
--- a/gnustep-apps/gnustep-cenon/DETAILS
+++ b/gnustep-apps/gnustep-cenon/DETAILS
@@ -1,13 +1,12 @@
            SPELL=gnustep-cenon
-         VERSION=3.80
+         VERSION=3.82
           SOURCE=Cenon-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Cenon
    SOURCE_URL[0]=http://www.vhf-group.com/vhfInterservice/download/source/$SOURCE
         WEB_SITE=http://www.cenon.info
-     SOURCE_HASH=sha512:8ea084b92e4d0504782d5acd382ace1f4f44fdcc706a26d09eb9fc4a10bc650c7d5fd958a7dab14cf8f0ab63b717ba9576846eb003010a7bfb6eee35ba1f77c2
+     SOURCE_HASH=sha512:f37484fb64ea971e0d94afd87896e927db962d4add86d23bdbd093637455ad8b83cd98f25ea44c789747ec9be15e5e1a845ce5ecfb506975c293668e56a9db22
       LICENSE[0]=http://www.vhf-group.com/vhfInterservice/download/LICENSE
          ENTERED=20060421
-         UPDATED=20050421
         KEYWORDS="gnustep graphics"
            SHORT="Cenon graphical tool."
 
diff --git a/gnustep-apps/gnustep-cenon/HISTORY b/gnustep-apps/gnustep-cenon/HISTORY
index a938fc0..948f3e2 100644
--- a/gnustep-apps/gnustep-cenon/HISTORY
+++ b/gnustep-apps/gnustep-cenon/HISTORY
@@ -1,3 +1,8 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: added a depends
+	* PRE_BUILD: added for install locations
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/gnustep-apps/gnustep-cenon/PRE_BUILD b/gnustep-apps/gnustep-cenon/PRE_BUILD
new file mode 100755
index 0000000..3ba474e
--- /dev/null
+++ b/gnustep-apps/gnustep-cenon/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+sedit 's/GNUSTEP_LOCAL_ROOT/GNUSTEP_LOCAL_LIBRARY/g' GNUmakefile  &&
+sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' GNUmakefile.postamble
diff --git a/gnustep-apps/gnustep-expense/DEPENDS b/gnustep-apps/gnustep-expense/DEPENDS
index e9ad78b..cd6da98 100755
--- a/gnustep-apps/gnustep-expense/DEPENDS
+++ b/gnustep-apps/gnustep-expense/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-expense/DETAILS b/gnustep-apps/gnustep-expense/DETAILS
index 880ac3f..a5b0a66 100755
--- a/gnustep-apps/gnustep-expense/DETAILS
+++ b/gnustep-apps/gnustep-expense/DETAILS
@@ -2,15 +2,13 @@
          VERSION=0.1
           SOURCE=Expense-${VERSION}.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Expense
-   SOURCE_URL[0]=http://www.eskimo.com/~pburns/Expence/files/${SOURCE}
-        WEB_SITE=http://www.eskimo.com/~pburns/Expence
+   SOURCE_URL[0]=http://www.eskimo.com/~pburns/Expense/files/${SOURCE}
+        WEB_SITE=http://www.eskimo.com/~pburns/Expense
      SOURCE_HASH=sha512:4f904bf7ec72b4fa3b13a6cc4998030e8789be012f9c1c630d0ea540d3355c63a6c6c87ff3383f4bb47229df682c3d80656c1720229d00c50304198095f19a07
       LICENSE[0]=GPL
          ENTERED=20060313
         KEYWORDS="financial expense gnustep"
            SHORT="A simple money traker."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 A simple money traker.
 EOF
diff --git a/gnustep-apps/gnustep-expense/HISTORY b/gnustep-apps/gnustep-expense/HISTORY
index 17b5c75..37dad6c 100644
--- a/gnustep-apps/gnustep-expense/HISTORY
+++ b/gnustep-apps/gnustep-expense/HISTORY
@@ -1,3 +1,7 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: missing depends
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-gnumail/BUILD b/gnustep-apps/gnustep-gnumail/BUILD
index 6947f2b..f59001b 100755
--- a/gnustep-apps/gnustep-gnumail/BUILD
+++ b/gnustep-apps/gnustep-gnumail/BUILD
@@ -1,35 +1,24 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
+make_single                  &&
+default_build                &&
+if [[ "$GMEMO" == "y" ]];
 then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
-    return 1
-fi                                                                    &&
+    pushd Bundles/Emoticon   &&
+    default_build            &&
+    popd
+fi                           &&
 
-make_single
-make                                                                  
-
-if [ "$GMEMO" == "y" ];
-then
-    cd Bundles/Emoticon                                               &&
-    make                                                              &&
-    cd ../../
-fi                                                                    &&
-
-if [ "$GMFAC" == "y" ];
+if [[ "$GMFAC" == "y" ]];
 then
-    cd Bundles/Face                                                   &&
-    make                                                              &&
-    cd ../../
-fi                                                                    &&
+    pushd Bundles/Face       &&
+    default_build            &&
+    popd
+fi                           &&
 
 
-if [ "$GMPGP" == "y" ];
+if [[ "$GMPGP" == "y" ]];
 then
-    cd Bundles/PGP                                                    &&
-    make                                                              &&
-    cd ../../
-fi                                                                    &&
-
+    pushd Bundles/PGP        &&
+    default_build            &&
+    popd
+fi                           &&
 make_normal
diff --git a/gnustep-apps/gnustep-gnumail/DEPENDS b/gnustep-apps/gnustep-gnumail/DEPENDS
index a3de05a..f85e04b 100755
--- a/gnustep-apps/gnustep-gnumail/DEPENDS
+++ b/gnustep-apps/gnustep-gnumail/DEPENDS
@@ -1,4 +1,8 @@
-depends          gnustep-gui                                    &&
-depends	         gnustep-pantomime                              &&
-depends          gnustep-addressbook                            &&
-optional_depends gnustep-steptalk "" "" "Add scripting support" 
+depends gnustep-gui                &&
+depends gnustep-make               &&
+depends gnustep-pantomime          &&
+depends gnustep-addressbook        &&
+optional_depends gnustep-steptalk  \
+                 ""                \
+                 ""                \
+                 "Add scripting support" 
diff --git a/gnustep-apps/gnustep-gnumail/DETAILS b/gnustep-apps/gnustep-gnumail/DETAILS
index 5b4c87c..ffd7a49 100755
--- a/gnustep-apps/gnustep-gnumail/DETAILS
+++ b/gnustep-apps/gnustep-gnumail/DETAILS
@@ -1,10 +1,10 @@
            SPELL=gnustep-gnumail
-         VERSION=1.2.0pre1
+         VERSION=1.2.0pre3
           SOURCE=GNUMail-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/GNUMail
    SOURCE_URL[0]=http://www.collaboration-world.com/gnumail.data/releases/Stable/$SOURCE
         WEB_SITE=http://www.collaboration-world.com
-     SOURCE_HASH=sha512:0baee1e83dbcc030f942e0ae7eba21c1999ca76ba7afd8bb5645780f75f720411e01a8a104f43160cdb8014b57d57bc81c9ff4f412fcdaba6fd039ea8db64f6e
+     SOURCE_HASH=sha512:22745bec547622106d033900ffbb16638d397ddc5286013b67d2413d9df3cc6dc71944ab1b9836ac453464db13e261dc8bd605d823aefcc8c1169004c04d0a95
       LICENSE[0]=GPL
          ENTERED=20050908
         KEYWORDS="reader gnustep mail"
diff --git a/gnustep-apps/gnustep-gnumail/HISTORY b/gnustep-apps/gnustep-gnumail/HISTORY
index 187b3cf..4c2e33b 100644
--- a/gnustep-apps/gnustep-gnumail/HISTORY
+++ b/gnustep-apps/gnustep-gnumail/HISTORY
@@ -1,3 +1,10 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: missing a dependency
+	* PRE_BUILD: added to fix some paths
+	* BUILD: cleanup
+	* INSTALL: cleanup
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-gnumail/INSTALL b/gnustep-apps/gnustep-gnumail/INSTALL
index 88670bd..39c1279 100755
--- a/gnustep-apps/gnustep-gnumail/INSTALL
+++ b/gnustep-apps/gnustep-gnumail/INSTALL
@@ -1,28 +1,21 @@
-export TAR_OPTIONS="--no-same-owner"
-
-make_single                                                           &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
-
-if [ "$GMEMO" == "y" ];
+make_single                  &&
+default_install              &&
+if [[ "$GMEMO" == "y" ]];
 then
-    cd Bundles/Emoticon                                               &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        && 
-    cd ../../
-fi                                                                    &&
-
-if [ "$GMFAC" == "y" ];
+    pushd Bundles/Emoticon   &&
+    default_install          &&
+    popd
+fi                           &&
+if [[ "$GMFAC" == "y" ]];
 then
-    cd Bundles/Face                                                   &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        && 
-    cd ../../
-fi                                                                    &&
-
-
-if [ "$GMPGP" == "y" ];
+    pushd Bundles/Face       &&
+    default_install          &&
+    popd
+fi                           &&
+if [[ "$GMPGP" == "y" ]];
 then
-    cd Bundles/PGP                                                    &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-    cd ../../
-fi                                                                    &&
-
+    pushd Bundles/PGP        &&
+    default_install          &&
+    popd
+fi                           &&
 make_normal
diff --git a/gnustep-apps/gnustep-gnumail/PRE_BUILD b/gnustep-apps/gnustep-gnumail/PRE_BUILD
new file mode 100755
index 0000000..bb67029
--- /dev/null
+++ b/gnustep-apps/gnustep-gnumail/PRE_BUILD
@@ -0,0 +1,26 @@
+default_pre_build                         &&
+cd $SOURCE_DIRECTORY                      &&
+sedit '853s:/Library/GNUMail:/GNUMail:'   \
+      Framework/GNUMail/GNUMail.m         &&
+sedit '54s:/Library/GNUMail:/GNUMail:'   \
+ Framework/GNUMail/NSBundle+Extensions.m  &&
+cd $SOURCE_DIRECTORY/Bundles              &&
+local gnumakefile                         &&
+for gnumakefile in Account/GNUmakefile    \
+                   Advanced/GNUmakefile   \
+                   Clock/GNUmakefile      \
+                   Colors/GNUmakefile     \
+                   Compose/GNUmakefile    \
+                   Emoticon/GNUmakefile   \
+                   Face/GNUmakefile       \
+                   Filtering/GNUmakefile  \
+                   Fonts/GNUmakefile      \
+                   Import/GNUmakefile     \
+                   MIME/GNUmakefile       \
+                   PGP/GNUmakefile        \
+                   Receiving/GNUmakefile  \
+                   Sending/GNUmakefile    \
+                   Viewing/GNUmakefile
+do
+sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' $gnumakefile
+done
diff --git a/gnustep-apps/gnustep-gorm/CONFIGURE b/gnustep-apps/gnustep-gorm/CONFIGURE
deleted file mode 100755
index d2f9bce..0000000
--- a/gnustep-apps/gnustep-gorm/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n
diff --git a/gnustep-apps/gnustep-gorm/DEPENDS b/gnustep-apps/gnustep-gorm/DEPENDS
index f4a2a06..605517b 100755
--- a/gnustep-apps/gnustep-gorm/DEPENDS
+++ b/gnustep-apps/gnustep-gorm/DEPENDS
@@ -1,7 +1,2 @@
-depends gnustep-gui                 &&
-
-if [ "$GNUSTEP_BUILD_DOC" == "y" ]; 
-then
-	depends tetex               &&
-	depends texinfo
-fi
+depends gnustep-gui   &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-gorm/DETAILS b/gnustep-apps/gnustep-gorm/DETAILS
index 2c60eca..d717899 100755
--- a/gnustep-apps/gnustep-gorm/DETAILS
+++ b/gnustep-apps/gnustep-gorm/DETAILS
@@ -1,15 +1,14 @@
            SPELL=gnustep-gorm
-         VERSION=1.1.0
+         VERSION=1.2.0
           SOURCE=gorm-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gorm-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/$SOURCE
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:1ec4174175df896e873a1c43c0c6dbd392e8d199b0e173ee6a8bd42025faab455f0914ac6725b5603cd1909bcd60beb9768cdd966854a2c96edf271c2e7f85c5
+     SOURCE_HASH=sha512:f105e84bb8535d9c8ad38dc99147a47b6077af64976464e35ce5d8e60fb586175484f8eb5273a96ed1f3f3f24c60cdb2745c41fe5cfa05b75c69b97d44a9e853
       LICENSE[0]=GPL
          ENTERED=20050908
         KEYWORDS="gnustep"
            SHORT="Gorm is an acronym for Graphic Object Relationship modeler."
-
 cat << EOF
 Gorm is an acronym for Graphic Object Relationship modeler (or perhaps 
 GNUstep Object Relationship Modeler).
diff --git a/gnustep-apps/gnustep-gorm/HISTORY b/gnustep-apps/gnustep-gorm/HISTORY
index 9f4a687..baa7ebd 100644
--- a/gnustep-apps/gnustep-gorm/HISTORY
+++ b/gnustep-apps/gnustep-gorm/HISTORY
@@ -1,3 +1,7 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* DEPENDS: updated depends
+
 2006-10-09 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Bump up to release 1.1.0.
 	Removed build_api and updated.
diff --git a/gnustep-apps/gnustep-gworkspace/BUILD b/gnustep-apps/gnustep-gworkspace/BUILD
deleted file mode 100755
index ff6cfd3..0000000
--- a/gnustep-apps/gnustep-gworkspace/BUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
-    return 1
-fi                                                                    &&
-
-./configure $OPTS                                                     &&
-
-make_single                                                           &&
-make                                                                  &&
-
-if [ "$GWREM" == "y" ];
-then
-    cd GWRemote                                                       &&
-    make                                                              &&
-    cd ../
-fi                                                                    &&
-
-if [ "$GWCLP" == "y" ];
-then
-    cd ClipBook                                                       &&
-    make                                                              &&
-    cd ../
-fi                                                                    &&
-
-make_normal                                                           
diff --git a/gnustep-apps/gnustep-gworkspace/CONFIGURE b/gnustep-apps/gnustep-gworkspace/CONFIGURE
deleted file mode 100755
index b8693bd..0000000
--- a/gnustep-apps/gnustep-gworkspace/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query GWREM "Build GWRemote client and server app?" y
-config_query GWCLP "Build ClipBook app?"                   y
diff --git a/gnustep-apps/gnustep-gworkspace/DEPENDS b/gnustep-apps/gnustep-gworkspace/DEPENDS
index b51563a..3e35b48 100755
--- a/gnustep-apps/gnustep-gworkspace/DEPENDS
+++ b/gnustep-apps/gnustep-gworkspace/DEPENDS
@@ -1,2 +1,2 @@
-depends          gnustep-gui                                     &&
-optional_depends gnustep-pdfkit "" "" "Add pdf viewing support."
+depends gnustep-gui    &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-gworkspace/DETAILS b/gnustep-apps/gnustep-gworkspace/DETAILS
index 4e694ca..63d1f89 100755
--- a/gnustep-apps/gnustep-gworkspace/DETAILS
+++ b/gnustep-apps/gnustep-gworkspace/DETAILS
@@ -1,15 +1,14 @@
            SPELL=gnustep-gworkspace
-         VERSION=0.8.2
+         VERSION=0.8.5
           SOURCE=gworkspace-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/GWorkspace-$VERSION
    SOURCE_URL[0]=http://www.gnustep.it/enrico/gworkspace/$SOURCE
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:ec66d19287fd000081463a37e117132e60ea812fbffebd8083047420c4026dcf8d5753db2935eae65386dede00569dc629366f85e75f3a301e4bf7d709cc662a
+     SOURCE_HASH=sha512:9417889dc02364b95665060df7db0304e6264068fee91e26548c69cd08544510a0e0a99b8e4267caed3195bd0c99d3c20e3737ed002a1ea37e785d4b4ca8e4f6
       LICENSE[0]=GPL
          ENTERED=20050908
         KEYWORDS="gnustep"
            SHORT="GNUstep workspace manager."
-
 cat << EOF
 "GNUstep workspace manager."
 EOF
diff --git a/gnustep-apps/gnustep-gworkspace/HISTORY b/gnustep-apps/gnustep-gworkspace/HISTORY
index 3694171..fc5a43c 100644
--- a/gnustep-apps/gnustep-gworkspace/HISTORY
+++ b/gnustep-apps/gnustep-gworkspace/HISTORY
@@ -1,3 +1,10 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* DEPENDS: fixup dependencies
+	* BUILD: removed no longer needed
+	* INSTALL: removed no longer needed
+	* CONFIGURE: removed no longer needed
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-gworkspace/INSTALL b/gnustep-apps/gnustep-gworkspace/INSTALL
deleted file mode 100755
index 0cb1bcc..0000000
--- a/gnustep-apps/gnustep-gworkspace/INSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-export TAR_OPTIONS="--no-same-owner"
-
-make_single                                                           &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
-
-if [ "$GWREM" == "y" ];
-then
-    cd GWRemote                                                       &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-    cd ../
-fi                                                                    &&
-
-if [ "$GWCLP" == "y" ];
-then
-    cd ClipBook                                                       &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-    cd ../
-fi                                                                    &&
-
-make_normal
diff --git a/gnustep-apps/gnustep-mylibrary/DEPENDS b/gnustep-apps/gnustep-mylibrary/DEPENDS
index 32ec96e..cd6da98 100755
--- a/gnustep-apps/gnustep-mylibrary/DEPENDS
+++ b/gnustep-apps/gnustep-mylibrary/DEPENDS
@@ -1,2 +1,2 @@
-depends          gnustep-gui &&
-depends          namazu 
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-mylibrary/DETAILS b/gnustep-apps/gnustep-mylibrary/DETAILS
index c71d81c..a2726d0 100755
--- a/gnustep-apps/gnustep-mylibrary/DETAILS
+++ b/gnustep-apps/gnustep-mylibrary/DETAILS
@@ -9,8 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/ML
          ENTERED=20050908
         KEYWORDS="gnustep"
            SHORT="GNUstep server less wiki note."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 GNUstep server less wiki note.
 EOF
diff --git a/gnustep-apps/gnustep-mylibrary/HISTORY b/gnustep-apps/gnustep-mylibrary/HISTORY
index c69004c..6d35bfb 100644
--- a/gnustep-apps/gnustep-mylibrary/HISTORY
+++ b/gnustep-apps/gnustep-mylibrary/HISTORY
@@ -1,3 +1,7 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: minor cleanup
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-notebook/DEPENDS b/gnustep-apps/gnustep-notebook/DEPENDS
index a84e787..766d60b 100755
--- a/gnustep-apps/gnustep-notebook/DEPENDS
+++ b/gnustep-apps/gnustep-notebook/DEPENDS
@@ -1,2 +1,3 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
 
diff --git a/gnustep-apps/gnustep-notebook/DETAILS b/gnustep-apps/gnustep-notebook/DETAILS
index 09d7258..9db2cab 100755
--- a/gnustep-apps/gnustep-notebook/DETAILS
+++ b/gnustep-apps/gnustep-notebook/DETAILS
@@ -7,11 +7,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NoteBook-${VERSION}
      SOURCE_HASH=sha512:1ce6f2daf98ec48e12b9c9d982c46618acd270fb56aeac201c8ff24e6a07b93d89ba27769d963e096ed745165dbc33fe571a0328609782055c0d0c660a4264be
       LICENSE[0]=GPL
          ENTERED=20060312
-         UPDATED=20060313
+      PATCHLEVEL=1
         KEYWORDS="gnustep notebook"
            SHORT="A place to store notes in an organized manner."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 A place to store notes in an organized manner.
 EOF
diff --git a/gnustep-apps/gnustep-notebook/HISTORY b/gnustep-apps/gnustep-notebook/HISTORY
index 7776121..f28d922 100644
--- a/gnustep-apps/gnustep-notebook/HISTORY
+++ b/gnustep-apps/gnustep-notebook/HISTORY
@@ -1,3 +1,7 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: missing depends
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/gnustep-apps/gnustep-oolite/BUILD b/gnustep-apps/gnustep-oolite/BUILD
new file mode 100755
index 0000000..51d9513
--- /dev/null
+++ b/gnustep-apps/gnustep-oolite/BUILD
@@ -0,0 +1 @@
+default_build debug=no
diff --git a/gnustep-apps/gnustep-oolite/DETAILS b/gnustep-apps/gnustep-oolite/DETAILS
index c8d089a..90f57d6 100755
--- a/gnustep-apps/gnustep-oolite/DETAILS
+++ b/gnustep-apps/gnustep-oolite/DETAILS
@@ -1,13 +1,15 @@
            SPELL=gnustep-oolite
-         VERSION=1.62-2
-          SOURCE=oolite-src-$VERSION.tar.gz
-         SOURCE2=oolite-data-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/oolite-src
+         VERSION=1.65
+          SOURCE=oolite-$VERSION-src.tar.gz
+         SOURCE2=oolite-$VERSION-data.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/oolite-$VERSION-src
    SOURCE_URL[0]=http://download.berlios.de/oolite-linux/${SOURCE}
+   SOURCE_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE}
   SOURCE2_URL[0]=http://download.berlios.de/oolite-linux/${SOURCE2}
+  SOURCE2_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE2}
         WEB_SITE=http://oolite.aegidian.org/
-     SOURCE_HASH=sha512:574ddcd98f335fecb33f0ba6e3fe78269910c2a81c5b95667d0c79a88fcfea466d32ec6b4d6bcb2c70bb511f9dc5d4c9c9eda27aec30a2201bfe4ed7a091df50
-    SOURCE2_HASH=sha512:a8a141d21a1a3ff395bc974c971313da65d6c376c652c1d255279d3beff0db0c62fd217d8d2cded36c26617f212c7faa9a3c239d53f295a1d9c28b62284ea528
+     SOURCE_HASH=sha512:d660e36d3679fadd7bcdb862db62c6d8eebd0bf10f68f17a16d2d83bf3570bee0c678fb9c5446158189f66d358e475c5ef1234b3b875a75091b497979c6d0135
+    SOURCE2_HASH=sha512:5d3ac8a42b4c0e46cf9a16da1bd8f32ceb730023d3b38fb3830d7031e44dfec92b465e8ae9e5a5815cd86c93540a17fedda324c42a9ebcae402ee412110b072e
       LICENSE[0]="Creative Commons"
       LICENSE[1]="Creative Commons"
          ENTERED=20060118
diff --git a/gnustep-apps/gnustep-oolite/HISTORY b/gnustep-apps/gnustep-oolite/HISTORY
index 6040ec1..366235b 100644
--- a/gnustep-apps/gnustep-oolite/HISTORY
+++ b/gnustep-apps/gnustep-oolite/HISTORY
@@ -1,3 +1,10 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* BUILD: added
+	* INSTALL: updated to install properly
+	* DEPENDS: missing a dep
+	* PRE_BUILD: added to fix a build issue
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-oolite/INSTALL b/gnustep-apps/gnustep-oolite/INSTALL
index 3181967..fb49093 100755
--- a/gnustep-apps/gnustep-oolite/INSTALL
+++ b/gnustep-apps/gnustep-oolite/INSTALL
@@ -1,5 +1,2 @@
-export TAR_OPTIONS="--no-same-owner"
-
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install && 
-cp -vrf oolite.app/Contents \
-	$GNUSTEP_SYSTEM_ROOT/Applications/oolite.app
+make debug=no install  &&
+cp -r oolite.app $INSTALL_ROOT/usr/lib/GNUstep/Applications
diff --git a/gnustep-apps/gnustep-oolite/PRE_BUILD b/gnustep-apps/gnustep-oolite/PRE_BUILD
index 4790f9f..0c43d68 100755
--- a/gnustep-apps/gnustep-oolite/PRE_BUILD
+++ b/gnustep-apps/gnustep-oolite/PRE_BUILD
@@ -1,6 +1,4 @@
-efault_pre_build                                 &&
-cd $SOURCE_DIRECTORY                             &&
-unpack_file 2                                    &&
-cp -vr oolite-data/* .                           &&
-mkdir -vp $SOURCE_DIRECTORY/oolite.app           &&
-mkdir -vp $SOURCE_DIRECTORY/oolite.app/Resources
+default_pre_build      &&
+unpack_file 2          &&
+cd $SOURCE_DIRECTORY   &&
+sedit 's/shared_obj/obj/g' GNUmakefile.postamble
diff --git a/gnustep-apps/gnustep-photoclip/DEPENDS b/gnustep-apps/gnustep-photoclip/DEPENDS
index e9ad78b..49661f8 100755
--- a/gnustep-apps/gnustep-photoclip/DEPENDS
+++ b/gnustep-apps/gnustep-photoclip/DEPENDS
@@ -1 +1,3 @@
-depends gnustep-gui
+depends gnustep-gui   &&
+depends gnustep-make  &&
+depends jpeg
diff --git a/gnustep-apps/gnustep-photoclip/DETAILS b/gnustep-apps/gnustep-photoclip/DETAILS
index 994e962..dd4b692 100755
--- a/gnustep-apps/gnustep-photoclip/DETAILS
+++ b/gnustep-apps/gnustep-photoclip/DETAILS
@@ -1,15 +1,14 @@
            SPELL=gnustep-photoclip
-         VERSION=0.2.4
+         VERSION=0.2.5
           SOURCE=PhotoClip-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/PhotoClip-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/PhotoClip
    SOURCE_URL[0]=http://www.vaisburd.net/PhotoClip/$SOURCE
         WEB_SITE=http://www.vaisburd.net/PhotoClip
-     SOURCE_HASH=sha512:1bb5d0c331531c37382cad9371fe91030d280e1e8623f9d9bad6f9243c95ac8b7ca3c3f46d48c3582c29c1cf3dd5fc027f32b1318e8a1f871e44dc236c654f46
+     SOURCE_HASH=sha512:627ef05a583633d2cde74ac726961a565e8020d8d993b5091260034a8e6fbfd0b72df2da2ad11a51597214f08b02bfb5b1232c5e16b910ff1a38ecb6525f1268
       LICENSE[0]=LGPL
          ENTERED=20060302
         KEYWORDS="gnustep"
            SHORT="The PhotoClip is a simple image viewer."
-     TAR_OPTIONS="--no-same-owner"
 
 cat << EOF
 The PhotoClip is a simple image viewer and editor mostly designed
diff --git a/gnustep-apps/gnustep-photoclip/HISTORY b/gnustep-apps/gnustep-photoclip/HISTORY
index 67936a0..c64b25f 100644
--- a/gnustep-apps/gnustep-photoclip/HISTORY
+++ b/gnustep-apps/gnustep-photoclip/HISTORY
@@ -1,3 +1,7 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* DEPENDS: missing depends
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-preferences/BUILD b/gnustep-apps/gnustep-preferences/BUILD
index 9e81f09..fe17e01 100755
--- a/gnustep-apps/gnustep-preferences/BUILD
+++ b/gnustep-apps/gnustep-preferences/BUILD
@@ -1,14 +1,3 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
-    return 1
-fi                                                                    &&
-
-cd Applications/Preferences                                           &&
-
-make                                                                  &&
-
-cd ../../
+pushd Applications/Preferences   &&
+default_build                    &&
+popd
diff --git a/gnustep-apps/gnustep-preferences/DEPENDS b/gnustep-apps/gnustep-preferences/DEPENDS
index c403875..1947e89 100755
--- a/gnustep-apps/gnustep-preferences/DEPENDS
+++ b/gnustep-apps/gnustep-preferences/DEPENDS
@@ -1 +1,3 @@
-depends gnustep-prefsmodule
+depends gnustep-prefsmodule  &&
+depends gnustep-make         &&
+depends gnustep-gui
diff --git a/gnustep-apps/gnustep-preferences/DETAILS b/gnustep-apps/gnustep-preferences/DETAILS
index 4fe86b2..d4f84f4 100755
--- a/gnustep-apps/gnustep-preferences/DETAILS
+++ b/gnustep-apps/gnustep-preferences/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnustep-preferences
-if [ "$PREFAPP_CVS_AUTOUPDATE" == "y" ];
+if [[ "$PREFAPP_CVS_AUTOUPDATE" == "y" ]];
 then
          VERSION=$(date +%Y%m%d)
 else
@@ -15,7 +15,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Preferences-cvs
          ENTERED=20050908
         KEYWORDS="gnustep"
            SHORT="GNUstep preference settings interface."
-
 cat << EOF
 GNUstep preference settings interface.
 EOF
diff --git a/gnustep-apps/gnustep-preferences/HISTORY b/gnustep-apps/gnustep-preferences/HISTORY
index a9ceeca..3fc12c8 100644
--- a/gnustep-apps/gnustep-preferences/HISTORY
+++ b/gnustep-apps/gnustep-preferences/HISTORY
@@ -1,3 +1,10 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor fixups
+	* DEPENDS: deps cleanup
+	* BUILD: updated
+	* INSTALL: updated
+	* PRE_BUILD: added to fixup some paths
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-preferences/INSTALL b/gnustep-apps/gnustep-preferences/INSTALL
index da55fe5..9d553b8 100755
--- a/gnustep-apps/gnustep-preferences/INSTALL
+++ b/gnustep-apps/gnustep-preferences/INSTALL
@@ -1,5 +1,4 @@
-export TAR_OPTIONS="--no-same-owner"
-
-cd Applications/Preferences                                &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&         
-cd ../../
+mkdir -vp ${INSTALL_ROOT}/usr/lib/GNUstep/Colors  &&
+pushd Applications/Preferences                    &&
+default_install                                   &&
+popd
diff --git a/gnustep-apps/gnustep-preferences/PRE_BUILD b/gnustep-apps/gnustep-preferences/PRE_BUILD
index f80b063..6519cfb 100755
--- a/gnustep-apps/gnustep-preferences/PRE_BUILD
+++ b/gnustep-apps/gnustep-preferences/PRE_BUILD
@@ -1,3 +1,24 @@
-default_pre_build                   &&
-cd $SOURCE_DIRECTORY                &&
-rm -rf Applications/Preferences/CVS
+default_pre_build                                         &&
+cd $SOURCE_DIRECTORY/Applications/Preferences      &&
+local gnumakefile                                         &&
+for gnumakefile in GNUmakefile.preamble                   \
+                   Modules/Time/GNUmakefile               \
+                   Modules/Time/GNUmakefile.preamble      \
+                   Modules/Colors/GNUmakefile             \
+                   Modules/Colors/GNUmakefile.preamble    \
+                   Modules/Keyboard/GNUmakefile           \
+                   Modules/Keyboard/GNUmakefile.preamble  \
+                   Modules/Font/GNUmakefile               \
+                   Modules/Font/GNUmakefile.preamble      \
+                   Modules/Defaults/GNUmakefile           \
+                   Modules/Defaults/GNUmakefile.preamble
+
+do
+sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' $gnumakefile  &&
+sedit 's/GNUSTEP_SYSTEM_ROOT/GNUSTEP_SYSTEM_LIBRARY/g' $gnumakefile
+done  &&
+sedit 's/GNUSTEP_SYSTEM_LIBRARY)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' GNUmakefile.preamble &&
+sedit 's/GNUSTEP_LOCAL_ROOT)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' GNUmakefile.preamble &&
+sedit 's/GNUSTEP_NETWORK_ROOT)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' GNUmakefile.preamble &&
+sedit 's/GNUSTEP_USER_ROOT)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' GNUmakefile.preamble
+
diff --git a/gnustep-apps/gnustep-projectcenter/DEPENDS b/gnustep-apps/gnustep-projectcenter/DEPENDS
index 2a472cc..cd6da98 100755
--- a/gnustep-apps/gnustep-projectcenter/DEPENDS
+++ b/gnustep-apps/gnustep-projectcenter/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui   
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-projectcenter/DETAILS b/gnustep-apps/gnustep-projectcenter/DETAILS
index b5e8744..d528713 100755
--- a/gnustep-apps/gnustep-projectcenter/DETAILS
+++ b/gnustep-apps/gnustep-projectcenter/DETAILS
@@ -9,8 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/ProjectCenter-$VERSION
          ENTERED=20050908
         KEYWORDS="ide gnustep"
            SHORT="The GNUstep IDE which is part of the GNUstep."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 This is ProjectCenter, the GNUstep IDE which is part of the GNUstep 
 project and is copyrighted by the Free Softare Foundation. ProjectCenter 
diff --git a/gnustep-apps/gnustep-projectcenter/HISTORY b/gnustep-apps/gnustep-projectcenter/HISTORY
index 5ed8ce2..c094057 100644
--- a/gnustep-apps/gnustep-projectcenter/HISTORY
+++ b/gnustep-apps/gnustep-projectcenter/HISTORY
@@ -1,3 +1,7 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: missing a dep
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-stepulator/DEPENDS b/gnustep-apps/gnustep-stepulator/DEPENDS
index e9ad78b..cd6da98 100755
--- a/gnustep-apps/gnustep-stepulator/DEPENDS
+++ b/gnustep-apps/gnustep-stepulator/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-stepulator/DETAILS b/gnustep-apps/gnustep-stepulator/DETAILS
index 18da6ec..43afcbd 100755
--- a/gnustep-apps/gnustep-stepulator/DETAILS
+++ b/gnustep-apps/gnustep-stepulator/DETAILS
@@ -9,8 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Stepulator-gs
          ENTERED=20050908
         KEYWORDS="calculator gnustep"
            SHORT="An GNUstep RPN Calculator."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 An GNUstep RPN Calculator.
 EOF
diff --git a/gnustep-apps/gnustep-stepulator/HISTORY b/gnustep-apps/gnustep-stepulator/HISTORY
index 3a0959c..617cdbc 100644
--- a/gnustep-apps/gnustep-stepulator/HISTORY
+++ b/gnustep-apps/gnustep-stepulator/HISTORY
@@ -1,3 +1,7 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: missing a dep
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-talksoup/DEPENDS b/gnustep-apps/gnustep-talksoup/DEPENDS
index 094ed49..bf51b2e 100755
--- a/gnustep-apps/gnustep-talksoup/DEPENDS
+++ b/gnustep-apps/gnustep-talksoup/DEPENDS
@@ -1 +1,3 @@
-depends gnustep-netclasses
+depends gnustep-netclasses  &&
+depends gnustep-gui         &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-talksoup/DETAILS b/gnustep-apps/gnustep-talksoup/DETAILS
index fa468f2..c54eaed 100755
--- a/gnustep-apps/gnustep-talksoup/DETAILS
+++ b/gnustep-apps/gnustep-talksoup/DETAILS
@@ -9,8 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/TalkSoup-$VERSION
          ENTERED=20051018
         KEYWORDS="irc gnustep"
            SHORT="A fully-featured IRC client."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 TalkSoup.app is a fully-featured IRC client which uses GNUstep base.  While
 TalkSoup.app itself is just a very basic core which can simply pass messages
diff --git a/gnustep-apps/gnustep-talksoup/HISTORY b/gnustep-apps/gnustep-talksoup/HISTORY
index 823f9d2..f1c088a 100644
--- a/gnustep-apps/gnustep-talksoup/HISTORY
+++ b/gnustep-apps/gnustep-talksoup/HISTORY
@@ -1,3 +1,8 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: minor cleanup
+	* PRE_BUILD: fixup install paths
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-talksoup/PRE_BUILD b/gnustep-apps/gnustep-talksoup/PRE_BUILD
new file mode 100755
index 0000000..ce18fc2
--- /dev/null
+++ b/gnustep-apps/gnustep-talksoup/PRE_BUILD
@@ -0,0 +1,26 @@
+default_pre_build                                       &&
+cd $SOURCE_DIRECTORY                                    &&
+local gnumakefile                                       &&
+for gnumakefile in InFilters/KeepAlive/GNUmakefile      \
+                   InFilters/DCCSupport/GNUmakefile     \
+                   InFilters/MessageOutTab/GNUmakefile  \
+                   InFilters/Debold/GNUmakefile         \
+                   InFilters/Deunderline/GNUmakefile    \
+                   InFilters/Highlighting/GNUmakefile   \
+                   InFilters/Dereverse/GNUmakefile      \
+                   InFilters/Decolorizer/GNUmakefile    \
+                   InFilters/Skeleton/GNUmakefile       \
+                   InFilters/Emoticon/GNUmakefile       \
+                   InFilters/PrivateBeep/GNUmakefile    \
+                   InFilters/Logging/GNUmakefile        \
+                   InFilters/MessageInTab/GNUmakefile   \
+                   Input/NetclassesInput/GNUmakefile    \
+                   OutFilters/Colorizer/GNUmakefile     \
+                   OutFilters/Piper/GNUmakefile         \
+                   OutFilters/Skeleton/GNUmakefile      \
+                   Output/GNUstepOutput/GNUmakefile
+
+
+do
+sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' $gnumakefile
+done
diff --git a/gnustep-apps/gnustep-terminal/BUILD b/gnustep-apps/gnustep-terminal/BUILD
deleted file mode 100755
index 38fbd31..0000000
--- a/gnustep-apps/gnustep-terminal/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
-    return 1
-fi                                                                    &&
-
-cd Applications/Terminal                                              &&
-
-make                                                                  &&
-
-cd ../../                                                             
diff --git a/gnustep-apps/gnustep-terminal/DEPENDS b/gnustep-apps/gnustep-terminal/DEPENDS
index e9ad78b..cd6da98 100755
--- a/gnustep-apps/gnustep-terminal/DEPENDS
+++ b/gnustep-apps/gnustep-terminal/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-terminal/DETAILS b/gnustep-apps/gnustep-terminal/DETAILS
index c2aae7b..89f4578 100755
--- a/gnustep-apps/gnustep-terminal/DETAILS
+++ b/gnustep-apps/gnustep-terminal/DETAILS
@@ -7,7 +7,7 @@ else
 fi
           SOURCE=Terminal-cvs.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Terminal-cvs
-   SOURCE_URL[0]=cvs://:pserver:anoncvs@cvs.savannah.gnu.org:/cvsroot/backbone:System
+   SOURCE_URL[0]=cvs://:pserver:anoncvs@cvs.savannah.gnu.org:/cvsroot/backbone:System/Applications/Terminal
         WEB_SITE=http://www.nongnu.org/backbone
    SOURCE_IGNORE=volatile
       LICENSE[0]=GPL
diff --git a/gnustep-apps/gnustep-terminal/HISTORY b/gnustep-apps/gnustep-terminal/HISTORY
index 2e4ef4b..c0b0632 100644
--- a/gnustep-apps/gnustep-terminal/HISTORY
+++ b/gnustep-apps/gnustep-terminal/HISTORY
@@ -1,3 +1,8 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* BUILD: removed
+	* INSTALL: removed
+
 2006-10-09 Maurizio Boriani <baux at sourcemage.org>
 	* BUILD: Fix dummy concatenate error.
 
diff --git a/gnustep-apps/gnustep-terminal/INSTALL b/gnustep-apps/gnustep-terminal/INSTALL
deleted file mode 100755
index 5bb4428..0000000
--- a/gnustep-apps/gnustep-terminal/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-export TAR_OPTIONS="--no-same-owner"
-
-cd Applications/Terminal                                   &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&        
-cd ../../
diff --git a/gnustep-apps/gnustep-textedit/BUILD b/gnustep-apps/gnustep-textedit/BUILD
deleted file mode 100755
index 4c4494e..0000000
--- a/gnustep-apps/gnustep-textedit/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
-    return 1
-fi                                                                    &&
-
-cd Applications/TextEdit                                              &&
-
-make                                                                  &&
-
-cd ../../
diff --git a/gnustep-apps/gnustep-textedit/DEPENDS b/gnustep-apps/gnustep-textedit/DEPENDS
index e9ad78b..cd6da98 100755
--- a/gnustep-apps/gnustep-textedit/DEPENDS
+++ b/gnustep-apps/gnustep-textedit/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-textedit/DETAILS b/gnustep-apps/gnustep-textedit/DETAILS
index 413f2af..0b391ec 100755
--- a/gnustep-apps/gnustep-textedit/DETAILS
+++ b/gnustep-apps/gnustep-textedit/DETAILS
@@ -7,7 +7,7 @@ else
 fi
           SOURCE=TextEdit-cvs.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/TextEdit-cvs
-   SOURCE_URL[0]=cvs://:pserver:anoncvs@cvs.savannah.gnu.org:/cvsroot/backbone:System
+   SOURCE_URL[0]=cvs://:pserver:anoncvs@cvs.savannah.gnu.org:/cvsroot/backbone:System/Applications/TextEdit
         WEB_SITE=http://www.nongnu.org/backbone
    SOURCE_IGNORE=volatile
       LICENSE[0]=GPL
diff --git a/gnustep-apps/gnustep-textedit/HISTORY b/gnustep-apps/gnustep-textedit/HISTORY
index 4128ed8..4f33f19 100644
--- a/gnustep-apps/gnustep-textedit/HISTORY
+++ b/gnustep-apps/gnustep-textedit/HISTORY
@@ -1,3 +1,9 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor revamp
+	* DEPENDS: missing a dep
+	* BUILD: not needed
+	* INSTALL: not needed
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-textedit/INSTALL b/gnustep-apps/gnustep-textedit/INSTALL
deleted file mode 100755
index fd411ad..0000000
--- a/gnustep-apps/gnustep-textedit/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-export TAR_OPTIONS="--no-same-owner"
-
-cd Applications/TextEdit                                   &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&         
-cd ../../
diff --git a/gnustep-apps/gnustep-ticker/DEPENDS b/gnustep-apps/gnustep-ticker/DEPENDS
index e9ad78b..cd6da98 100755
--- a/gnustep-apps/gnustep-ticker/DEPENDS
+++ b/gnustep-apps/gnustep-ticker/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-ticker/DETAILS b/gnustep-apps/gnustep-ticker/DETAILS
index c0683d4..0f6f158 100755
--- a/gnustep-apps/gnustep-ticker/DETAILS
+++ b/gnustep-apps/gnustep-ticker/DETAILS
@@ -4,13 +4,11 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Ticker
    SOURCE_URL[0]=http://www.gnustep.it/marko/Ticker/$SOURCE
         WEB_SITE=http://www.gnustep.it/marko/Ticker
-     SOURCE_HASH=sha512:54577eb9c242b2b580c16f1276daeb9649ff94179eb8e89281089de5b39ecd5dbd5fc46d005ada6342f793f787b0882779ef494d098646e58582efd28785090d
+     SOURCE_HASH=sha512:cc6a351d9ef207bb91f0ce730819583f24ed3bfbd276aa0271aca89840e64ecc781a1a08f4deeefdb5eb89fb5b394d7f7a7b33455a8819493efba9603c07ac25
       LICENSE[0]=GPL
          ENTERED=20060304
         KEYWORDS="rss gnustep"
            SHORT="A gnustep RSS monitor."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 An RSS monitor that lets you monitor many feeds at once.
 EOF
diff --git a/gnustep-apps/gnustep-ticker/HISTORY b/gnustep-apps/gnustep-ticker/HISTORY
index 3f8c515..0c2b7b3 100644
--- a/gnustep-apps/gnustep-ticker/HISTORY
+++ b/gnustep-apps/gnustep-ticker/HISTORY
@@ -1,3 +1,6 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-zipper/DEPENDS b/gnustep-apps/gnustep-zipper/DEPENDS
index 8be7cf0..f02725b 100755
--- a/gnustep-apps/gnustep-zipper/DEPENDS
+++ b/gnustep-apps/gnustep-zipper/DEPENDS
@@ -1,2 +1,3 @@
-depends gnustep-gui         &&
+depends gnustep-gui   &&
+depends gnustep-make  &&
 depends gnustep-renaissance
diff --git a/gnustep-apps/gnustep-zipper/DETAILS b/gnustep-apps/gnustep-zipper/DETAILS
index 933a472..992bbe4 100755
--- a/gnustep-apps/gnustep-zipper/DETAILS
+++ b/gnustep-apps/gnustep-zipper/DETAILS
@@ -9,8 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Zipper
          ENTERED=20050908
         KEYWORDS="gnustep"
            SHORT="A multiformat GNUstep/Cocoa archiver."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 A multiformat GNUstep/Cocoa archiver.
 EOF
diff --git a/gnustep-apps/gnustep-zipper/HISTORY b/gnustep-apps/gnustep-zipper/HISTORY
index 0e00d1f..b009cf1 100644
--- a/gnustep-apps/gnustep-zipper/HISTORY
+++ b/gnustep-apps/gnustep-zipper/HISTORY
@@ -1,3 +1,7 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: missing a dep
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-libs/FUNCTIONS b/gnustep-libs/FUNCTIONS
index 018209b..05eecd0 100755
--- a/gnustep-libs/FUNCTIONS
+++ b/gnustep-libs/FUNCTIONS
@@ -1,45 +1,25 @@
-# ------------------------------------------------------------------------------
+#---
 ## Replace sorcerys default_build with a custom one
-# ------------------------------------------------------------------------------
-function default_build ()
+#---
+function default_build()
 {
-    if [ -f /etc/profile.d/GNUstep.sh ]
-    then
-	. /etc/profile.d/GNUstep.sh
-    else
-	message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
-	message "Rebuild gnustep-make${DEFAULT_COLOR}"                   &&
-	return 1
-    fi                                                                   &&
-
-    if [ -f ./configure ]
-    then
-	./configure                                                      \
-	$OPTS                                                            
-    fi                                                                   &&
-
-    make                                                                 &&
-
-    if [ "$GNUSTEP_BUILD_DOC" == "y" ]
-    then
-	cd Documentation                                                 &&
-	make                                                             &&
-	cd ../                                        
-    fi
+  if [[ -f ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh ]]
+  then
+    . ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh
+  fi
+  if [[ -x ./configure ]]
+  then
+    real_default_build
+  else
+    make $@
+  fi
 }
 
-# ------------------------------------------------------------------------------
-## Replace sorcerys default_install with a custom one
-# ------------------------------------------------------------------------------
-function default_install ()
+function default_post_install()
 {
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
-
-    if [ "$GNUSTEP_BUILD_DOC" == "y" ]
-    then
-	cd Documentation                                                  &&
-	make                                                              &&
-	make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-	cd ../
-    fi
+  real_default_post_install
+  if [[ -x /usr/bin/make_services ]]; then
+    message "Running make_services"
+    /usr/bin/make_services
+  fi
 }
diff --git a/gnustep-libs/gnustep-artresources/BUILD b/gnustep-libs/gnustep-artresources/BUILD
deleted file mode 100755
index 1dd04bc..0000000
--- a/gnustep-libs/gnustep-artresources/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                   &&
-    return 1
-fi                                                                    
diff --git a/gnustep-libs/gnustep-artresources/DEPENDS b/gnustep-libs/gnustep-artresources/DEPENDS
deleted file mode 100755
index 389acce..0000000
--- a/gnustep-libs/gnustep-artresources/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends gnustep-gui      &&
-depends gnustep-mknfonts 
diff --git a/gnustep-libs/gnustep-artresources/DETAILS b/gnustep-libs/gnustep-artresources/DETAILS
deleted file mode 100755
index 9bee868..0000000
--- a/gnustep-libs/gnustep-artresources/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-           SPELL=gnustep-artresources
-         VERSION=0.1.2
-          SOURCE=ArtResources-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://w1.423.telia.com/~u42308495/alex/backart/$SOURCE
-        WEB_SITE=http://w1.423.telia.com/~u42308495/alex/backart/
-     SOURCE_HASH=sha512:2595da57ce33aa6ee3972c630e4df132740c57fa48d884d4d76096fbb3757e6d027c7793e1f635bb0956f601ed9b51493ca0cc860213f30634b0462169dc8054
-      LICENSE[0]=GPL
-         ENTERED=20050908
-        KEYWORDS="gnustep fonts libs"
-           SHORT="GNUstep fonts."
-
-cat << EOF
-This package contains fonts used by art gnustep backend.
-EOF
diff --git a/gnustep-libs/gnustep-artresources/HISTORY b/gnustep-libs/gnustep-artresources/HISTORY
deleted file mode 100644
index 62616fd..0000000
--- a/gnustep-libs/gnustep-artresources/HISTORY
+++ /dev/null
@@ -1,21 +0,0 @@
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-04-14 Maurizio Boriani <baux at sourcemage.org>
-	* Fix dummy concatenations bugs and others.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-11-23 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Fix source directory path.
-
-2005-09-08 Maurizio Boriani <baux at sourcemage.org>
-	* BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: created the 
-	  spell.
diff --git a/gnustep-libs/gnustep-artresources/INSTALL b/gnustep-libs/gnustep-artresources/INSTALL
deleted file mode 100755
index 5067850..0000000
--- a/gnustep-libs/gnustep-artresources/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-if ! [ -d $GNUSTEP_SYSTEM_ROOT/Library/Fonts ]; 
-then
-    mkdir $GNUSTEP_SYSTEM_ROOT/Library/Fonts
-fi                                                  &&
-
-cp -arf *.nfont $GNUSTEP_SYSTEM_ROOT/Library/Fonts/
diff --git a/gnustep-libs/gnustep-artresources/PRE_BUILD b/gnustep-libs/gnustep-artresources/PRE_BUILD
deleted file mode 100755
index 9605dfd..0000000
--- a/gnustep-libs/gnustep-artresources/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-mk_source_dir ${SOURCE_DIRECTORY} &&
-cd ${SOURCE_DIRECTORY}            &&
-unpack_file ''
diff --git a/gnustep-libs/gnustep-back-art/BUILD b/gnustep-libs/gnustep-back-art/BUILD
index 6b8701d..27ba77d 100755
--- a/gnustep-libs/gnustep-back-art/BUILD
+++ b/gnustep-libs/gnustep-back-art/BUILD
@@ -1,21 +1 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
-    return 1
-fi                                                                    &&
-
-./configure --enable-graphics=art --with-name=art                     \
-$OPTS                                                                 &&
-make                                                                  &&
-
-if [ "$GNUSTEP_BUILD_DOC" == "y" ]; 
-then
-    cd Documentation                                                  &&
-    make_single                                                       &&
-    make                                                              &&
-    make_normal                                                       &&
-    cd ../
-fi                                                                    
+true
diff --git a/gnustep-libs/gnustep-back-art/CONFIGURE b/gnustep-libs/gnustep-back-art/CONFIGURE
deleted file mode 100755
index f87a872..0000000
--- a/gnustep-libs/gnustep-back-art/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query  GNUSTEP_BUILD_DOC     "Build and install documentation?" n
diff --git a/gnustep-libs/gnustep-back-art/DEPENDS b/gnustep-libs/gnustep-back-art/DEPENDS
index 2c7630e..70563f5 100755
--- a/gnustep-libs/gnustep-back-art/DEPENDS
+++ b/gnustep-libs/gnustep-back-art/DEPENDS
@@ -1,11 +1 @@
-depends          gnustep-gui                                     &&
-depends          X11-LIBS                                        &&
-depends          libart_lgpl                                     &&
-depends          gnustep-artresources                            && 
-optional_depends glitz                "" "" "Add glitz support." &&
-
-if [ "$DOCU" == "y" ]; 
-then
-	depends tetex                                            &&
-	depends texinfo
-fi
+depends gnustep-back
diff --git a/gnustep-libs/gnustep-back-art/DETAILS b/gnustep-libs/gnustep-back-art/DETAILS
index 472838e..cec017a 100755
--- a/gnustep-libs/gnustep-back-art/DETAILS
+++ b/gnustep-libs/gnustep-back-art/DETAILS
@@ -1,10 +1,6 @@
            SPELL=gnustep-back-art
          VERSION=0.11.0
-          SOURCE=gnustep-back-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnustep-back-$VERSION
-   SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:9f0580c4b7685659b93310d37000959871bf3884c106f370de4345fc0fa90e106a1e138c64bcfa0aa9cee276f094ecabdfa83b9b2c8231440c9a5e6df7128547
       LICENSE[0]=LGPL
          ENTERED=20050908
         KEYWORDS="gnustep libs"
diff --git a/gnustep-libs/gnustep-back-art/HISTORY b/gnustep-libs/gnustep-back-art/HISTORY
index 500bf3d..2a45c6c 100644
--- a/gnustep-libs/gnustep-back-art/HISTORY
+++ b/gnustep-libs/gnustep-back-art/HISTORY
@@ -1,3 +1,13 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: Deprecation protocol in favour of gnustep-back
+	* DEPENDS: Deprecation protocol in favour of gnustep-back
+	* PRE_BUILD: Deprecation protocol in favour of gnustep-back
+	* BUILD: Deprecation protocol in favour of gnustep-back
+	* INSTALL: Deprecation protocol in favour of gnustep-back
+	* CONFIGURE: Deprecation protocol in favour of gnustep-back
+	* PROVIDES: Deprecation protocol in favour of gnustep-back
+	* TRIGGERS: Deprecation protocol in favour of gnustep-back
+
 2006-10-09 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Bump up to release 0.11.0
 	Remove build_api and updated.
diff --git a/gnustep-libs/gnustep-back-art/INSTALL b/gnustep-libs/gnustep-back-art/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnustep-libs/gnustep-back-art/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnustep-libs/gnustep-back-art/PRE_BUILD b/gnustep-libs/gnustep-back-art/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnustep-libs/gnustep-back-art/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnustep-libs/gnustep-back-art/PROVIDES b/gnustep-libs/gnustep-back-art/PROVIDES
deleted file mode 100755
index 52f8d8e..0000000
--- a/gnustep-libs/gnustep-back-art/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-GNUSTEP-GUI-BACKEND
diff --git a/gnustep-libs/gnustep-back-art/TRIGGERS b/gnustep-libs/gnustep-back-art/TRIGGERS
new file mode 100755
index 0000000..2898626
--- /dev/null
+++ b/gnustep-libs/gnustep-back-art/TRIGGERS
@@ -0,0 +1 @@
+on_cast gnustep-back-art dispel_self
diff --git a/gnustep-libs/gnustep-back-xlib/BUILD b/gnustep-libs/gnustep-back-xlib/BUILD
index 1795a74..27ba77d 100755
--- a/gnustep-libs/gnustep-back-xlib/BUILD
+++ b/gnustep-libs/gnustep-back-xlib/BUILD
@@ -1,21 +1 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
-    return 1
-fi                                                                    &&
-
-./configure --enable-graphics=xlib --with-name=xlib                   \
-$OPTS                                                                 &&
-make                                                              
-
-if [ "$GNUSTEP_BUILD_DOC" == "y" ]; 
-then
-    cd Documentation                                                  &&
-    make_single                                                       &&
-    make                                                              &&
-    make_normal                                                       &&
-    cd ../
-fi                                                                    
+true
diff --git a/gnustep-libs/gnustep-back-xlib/CONFIGURE b/gnustep-libs/gnustep-back-xlib/CONFIGURE
deleted file mode 100755
index f87a872..0000000
--- a/gnustep-libs/gnustep-back-xlib/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query  GNUSTEP_BUILD_DOC     "Build and install documentation?" n
diff --git a/gnustep-libs/gnustep-back-xlib/DEPENDS b/gnustep-libs/gnustep-back-xlib/DEPENDS
index 86ec464..70563f5 100755
--- a/gnustep-libs/gnustep-back-xlib/DEPENDS
+++ b/gnustep-libs/gnustep-back-xlib/DEPENDS
@@ -1,10 +1 @@
-depends          gnustep-gui                               &&
-depends          X11-LIBS                                  &&
-optional_depends glitz       "" "" "Add glitz support."    &&
-
-if [ "$DOCU" == "y" ]; 
-then
-	depends tetex                                      &&
-	depends texinfo
-fi
-
+depends gnustep-back
diff --git a/gnustep-libs/gnustep-back-xlib/DETAILS b/gnustep-libs/gnustep-back-xlib/DETAILS
index 5629307..f0475b8 100755
--- a/gnustep-libs/gnustep-back-xlib/DETAILS
+++ b/gnustep-libs/gnustep-back-xlib/DETAILS
@@ -1,10 +1,6 @@
            SPELL=gnustep-back-xlib
          VERSION=0.11.0
-          SOURCE=gnustep-back-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnustep-back-$VERSION
-   SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:9f0580c4b7685659b93310d37000959871bf3884c106f370de4345fc0fa90e106a1e138c64bcfa0aa9cee276f094ecabdfa83b9b2c8231440c9a5e6df7128547
       LICENSE[0]=LGPL
          ENTERED=20050908
         KEYWORDS="gnustep libs"
diff --git a/gnustep-libs/gnustep-back-xlib/HISTORY b/gnustep-libs/gnustep-back-xlib/HISTORY
index 78c024e..f578be0 100644
--- a/gnustep-libs/gnustep-back-xlib/HISTORY
+++ b/gnustep-libs/gnustep-back-xlib/HISTORY
@@ -1,3 +1,13 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: Deprecation protocol in favour of gnustep-back
+	* DEPENDS: Deprecation protocol in favour of gnustep-back
+	* PRE_BUILD: Deprecation protocol in favour of gnustep-back
+	* BUILD: Deprecation protocol in favour of gnustep-back
+	* INSTALL: Deprecation protocol in favour of gnustep-back
+	* CONFIGURE: Deprecation protocol in favour of gnustep-back
+	* PROVIDES: Deprecation protocol in favour of gnustep-back
+	* TRIGGERS: Deprecation protocol in favour of gnustep-back
+
 2007-02-22 David Kowis <dkowis at shlrm.org>
 	* DETAILS: wtf? there was a hash at the end of the file
 
diff --git a/gnustep-libs/gnustep-back-xlib/INSTALL b/gnustep-libs/gnustep-back-xlib/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnustep-libs/gnustep-back-xlib/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnustep-libs/gnustep-back-xlib/PRE_BUILD b/gnustep-libs/gnustep-back-xlib/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnustep-libs/gnustep-back-xlib/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnustep-libs/gnustep-back-xlib/PROVIDES b/gnustep-libs/gnustep-back-xlib/PROVIDES
deleted file mode 100755
index 52f8d8e..0000000
--- a/gnustep-libs/gnustep-back-xlib/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-GNUSTEP-GUI-BACKEND
diff --git a/gnustep-libs/gnustep-back-xlib/TRIGGERS b/gnustep-libs/gnustep-back-xlib/TRIGGERS
new file mode 100755
index 0000000..7bc2339
--- /dev/null
+++ b/gnustep-libs/gnustep-back-xlib/TRIGGERS
@@ -0,0 +1 @@
+on_cast gnustep-back-xlib dispel_self
diff --git a/gnustep-libs/gnustep-back/BUILD b/gnustep-libs/gnustep-back/BUILD
new file mode 100755
index 0000000..63b2b95
--- /dev/null
+++ b/gnustep-libs/gnustep-back/BUILD
@@ -0,0 +1,18 @@
+. ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh
+local backend opts
+for backend in $GNUSTEP_BACKEND ; do
+opts="--enable-server=x11 --enable-graphics=$backend --with-name=$backend"
+pushd $SOURCE_DIRECTORY.$backend
+OPTS="$OPTS --build=${BUILD}";
+[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}";
+./configure                                    \
+     --prefix=${INSTALL_ROOT}/usr              \
+     --sysconfdir=${INSTALL_ROOT}/etc          \
+     --localstatedir=${INSTALL_ROOT}/var       \
+     --mandir=${INSTALL_ROOT}/usr/share/man    \
+     --infodir=${INSTALL_ROOT}/usr/share/info  \
+     $opts                                     \
+     $OPTS                                     &&
+make
+popd
+done
diff --git a/gnustep-libs/gnustep-back/CONFIGURE b/gnustep-libs/gnustep-back/CONFIGURE
new file mode 100755
index 0000000..4c00df7
--- /dev/null
+++ b/gnustep-libs/gnustep-back/CONFIGURE
@@ -0,0 +1,3 @@
+. $GRIMOIRE/config_query_multi.function
+config_query_multi GNUSTEP_BACKEND "Which backends do you want to use?" \
+                   art xlib cairo
diff --git a/gnustep-libs/gnustep-back/CONFLICTS b/gnustep-libs/gnustep-back/CONFLICTS
new file mode 100755
index 0000000..4920994
--- /dev/null
+++ b/gnustep-libs/gnustep-back/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts gnustep-back-art y
+conflicts gnustep-back-xlib y
+
diff --git a/gnustep-libs/gnustep-back/DEPENDS b/gnustep-libs/gnustep-back/DEPENDS
new file mode 100755
index 0000000..08484e4
--- /dev/null
+++ b/gnustep-libs/gnustep-back/DEPENDS
@@ -0,0 +1,28 @@
+depends gnustep-make                        &&
+depends gnustep-gui                         &&
+depends X11-LIBS                            &&
+depends freetype2                           &&
+depends tiff                                &&
+if list_find art $GNUSTEP_BACKEND ; then
+depends libart_lgpl
+fi                                          &&
+if list_find cairo $GNUSTEP_BACKEND ; then
+depends cairo
+fi                                          &&
+optional_depends glitz                      \
+                 "--enable-glitz"           \
+                 "--disable-glitz"          \
+                 "Enable glitz support"     &&
+optional_depends OPENGL                     \
+                 "--enable-glx"             \
+                 "--disable-glx"            \
+                 "Enable GLX support"
+. $GRIMOIRE/FUNCTIONS
+if check_if_xorg_modular_libs ; then
+depends libice                              &&
+depends libxi                               &&
+depends libxft                              &&
+depends libxrender
+fi                                          &&
+depends expat                               &&
+depends fontconfig
diff --git a/gnustep-libs/gnustep-back/DETAILS b/gnustep-libs/gnustep-back/DETAILS
new file mode 100755
index 0000000..dbe18a9
--- /dev/null
+++ b/gnustep-libs/gnustep-back/DETAILS
@@ -0,0 +1,37 @@
+           SPELL=gnustep-back
+         VERSION=0.12.0
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE
+   SOURCE_URL[1]=http://ftp.easynet.nl/mirror/GNUstep/pub/gnustep/core/$SOURCE
+  SOURCE2_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE2
+  SOURCE2_URL[1]=http://ftp.easynet.nl/mirror/GNUstep/pub/gnustep/core/$SOURCE2
+        WEB_SITE=http://www.gnustep.org
+      SOURCE_GPG=gnustep.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+      LICENSE[0]=LGPL
+         ENTERED=20050908
+        KEYWORDS="gnustep libs"
+           SHORT="It is a back-end component for the GNUstep GUI Library."
+
+cat << EOF
+It is a back-end component for the GNUstep GUI Library.  The
+implementation of the GNUstep GUI Library is designed in two parts.  The
+first part is the front-end component which is independent of platform
+and display system.  This front-end is combined with a back-end
+component which handles all of the display system dependent such as
+specific calls to the X Window System.  This design allows the GNUstep
+applications to have the "look and feel" of the underlying display
+system without any changes to the application, and the library can be
+easily ported to other display systems.
+
+   The GNUstep GUI Backend is for platforms using the X-Window System or
+Window's Systems. It works via a DPS emulation engine to emulate the
+DPS functions required by the front-end system.
+
+This is the art graphic enabled version.
+EOF
+
+
+
diff --git a/gnustep-libs/gnustep-back/FINAL b/gnustep-libs/gnustep-back/FINAL
new file mode 100755
index 0000000..33b98ae
--- /dev/null
+++ b/gnustep-libs/gnustep-back/FINAL
@@ -0,0 +1,4 @@
+local backend
+for backend in $GNUSTEP_BACKEND ; do
+rm -rf $SOURCE_DIRECTORY.$backend
+done
diff --git a/gnustep-libs/gnustep-back/HISTORY b/gnustep-libs/gnustep-back/HISTORY
new file mode 100644
index 0000000..174d95a
--- /dev/null
+++ b/gnustep-libs/gnustep-back/HISTORY
@@ -0,0 +1,7 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: added gnustep-make
+
+2007-04-16 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* BUILD,CONFIGURE,DEPENDS,DETAILS: created spell
+	* FINAL,HISTORY,INSTALL,PRE_BUILD: created spell
+	* CONFILCTS,TRIGGERS: created spell
diff --git a/gnustep-libs/gnustep-back/INSTALL b/gnustep-libs/gnustep-back/INSTALL
new file mode 100755
index 0000000..34563e6
--- /dev/null
+++ b/gnustep-libs/gnustep-back/INSTALL
@@ -0,0 +1,6 @@
+. ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh
+local backend
+for backend in $GNUSTEP_BACKEND ; do
+  cd $SOURCE_DIRECTORY.$backend &&
+  default_install
+done
diff --git a/gnustep-libs/gnustep-back/PRE_BUILD b/gnustep-libs/gnustep-back/PRE_BUILD
new file mode 100755
index 0000000..f5d7b11
--- /dev/null
+++ b/gnustep-libs/gnustep-back/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build  &&
+local backend      &&
+for backend in $GNUSTEP_BACKEND ; do
+  rm -rf $SOURCE_DIRECTORY.$backend  &&
+  cp -ar $SOURCE_DIRECTORY $SOURCE_DIRECTORY.$backend
+done
+
diff --git a/gnustep-libs/gnustep-base/BUILD b/gnustep-libs/gnustep-base/BUILD
new file mode 100755
index 0000000..487b878
--- /dev/null
+++ b/gnustep-libs/gnustep-base/BUILD
@@ -0,0 +1,2 @@
+OPTS="--enable-procfs --enable-procfs-psinfo $OPTS"  &&
+default_build
diff --git a/gnustep-libs/gnustep-base/CONFIGURE b/gnustep-libs/gnustep-base/CONFIGURE
deleted file mode 100755
index d2f9bce..0000000
--- a/gnustep-libs/gnustep-base/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n
diff --git a/gnustep-libs/gnustep-base/DEPENDS b/gnustep-libs/gnustep-base/DEPENDS
index a60f10e..901d742 100755
--- a/gnustep-libs/gnustep-base/DEPENDS
+++ b/gnustep-libs/gnustep-base/DEPENDS
@@ -1,12 +1,13 @@
-depends                gnustep-make                         &&
-depends                ffcall                               &&
-depends                libxml2                              &&
-optional_depends libxslt "" "" "Enable xml support."        &&
-optional_depends openssl "" "" "Enable ssl crypto support." &&
-optional_depends gmp     "" "" "Enable gmp support."        &&
+depends gnustep-make                           &&
+depends libxml2                                &&
+depends libxslt                                &&
+depends ffcall                                 &&
+optional_depends openssl                       \
+                 "--enable-openssl"            \
+                 "--disable-openssl"           \
+                 "Enable ssl crypto support."  &&
+optional_depends gmp                           \
+                 ""                            \
+                 ""                            \
+                 "Enable gmp support."
 
-if [ "$GNUSTEP_BUILD_DOC" == "y" ] 
-then
-    depends tetex                                           &&
-    depends texinfo
-fi
diff --git a/gnustep-libs/gnustep-base/DETAILS b/gnustep-libs/gnustep-base/DETAILS
index a9eb14d..110e63e 100755
--- a/gnustep-libs/gnustep-base/DETAILS
+++ b/gnustep-libs/gnustep-base/DETAILS
@@ -1,19 +1,16 @@
            SPELL=gnustep-base
-         VERSION=1.13.0
-      PATCHLEVEL=1
+         VERSION=1.15.0
           SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE
+  SOURCE2_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE2
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:ee33e014d92db2eebe9c36011003d50b9bf2933d52aa592ed496f4ca70f78cc79189fbc0e8438d27e33f25e07a36601e244110e8595fc4f9045ee34a8a3a6813
+      SOURCE_GPG=gnustep.gpg:$SOURCE2:UPSTREAM_KEY
       LICENSE[0]=LGPL
          ENTERED=20050908
         KEYWORDS="gnustep libs"
            SHORT="GNUstep implementation of OPENSTEP base libs."
-#GS FIX
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SOURCE_DIRECTORY/Source/obj
-#END GS FIX
-
 cat << EOF
 The GNUstep Base Library is a library of general-purpose, non-graphical
 Objective C objects.  For example, it includes classes for strings,
diff --git a/gnustep-libs/gnustep-base/HISTORY b/gnustep-libs/gnustep-base/HISTORY
index 02c48ab..9e9a0b3 100644
--- a/gnustep-libs/gnustep-base/HISTORY
+++ b/gnustep-libs/gnustep-base/HISTORY
@@ -1,3 +1,11 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* DEPENDS: updated
+	* CONFIGURE: updated
+	* init.d/gdomap: updated
+	* BUILD: added
+	* PRE_BUILD: added
+
 2006-10-09 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Bump up to release 1.13.0
 	Remove build_api and updated.
diff --git a/gnustep-libs/gnustep-base/PRE_BUILD b/gnustep-libs/gnustep-base/PRE_BUILD
new file mode 100755
index 0000000..de676e1
--- /dev/null
+++ b/gnustep-libs/gnustep-base/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build                &&
+cd $SOURCE_DIRECTORY/NSTimeZones  &&
+sedit '65s/tar -xf/tar --no-same-owner -xf/' Makefile.postamble
diff --git a/gnustep-libs/gnustep-base/init.d/gdomap b/gnustep-libs/gnustep-base/init.d/gdomap
index 7a83d41..eeb4213 100755
--- a/gnustep-libs/gnustep-base/init.d/gdomap
+++ b/gnustep-libs/gnustep-base/init.d/gdomap
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-. /etc/profile.d/GNUstep.sh
-
-PROGRAM="$GNUSTEP_SYSTEM_ROOT/Tools/gdomap"
+PROGRAM="/usr/bin/gdomap"
 RUNLEVEL=3
 NEEDS="+network"
 
diff --git a/gnustep-libs/gnustep-baseinit.d/gdomap b/gnustep-libs/gnustep-baseinit.d/gdomap
deleted file mode 100755
index 7a83d41..0000000
--- a/gnustep-libs/gnustep-baseinit.d/gdomap
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-. /etc/profile.d/GNUstep.sh
-
-PROGRAM="$GNUSTEP_SYSTEM_ROOT/Tools/gdomap"
-RUNLEVEL=3
-NEEDS="+network"
-
-. /etc/init.d/smgl_init
diff --git a/gnustep-libs/gnustep-cenonlib/BUILD b/gnustep-libs/gnustep-cenonlib/BUILD
index 61c7ebf..27ba77d 100755
--- a/gnustep-libs/gnustep-cenonlib/BUILD
+++ b/gnustep-libs/gnustep-cenonlib/BUILD
@@ -1 +1 @@
-return 0
+true
diff --git a/gnustep-libs/gnustep-cenonlib/DEPENDS b/gnustep-libs/gnustep-cenonlib/DEPENDS
index bf5f653..4ee8331 100755
--- a/gnustep-libs/gnustep-cenonlib/DEPENDS
+++ b/gnustep-libs/gnustep-cenonlib/DEPENDS
@@ -1 +1,3 @@
-depends gnustep-gui
\ No newline at end of file
+depends gnustep-make  &&
+depends gnustep-gui
+
diff --git a/gnustep-libs/gnustep-cenonlib/DETAILS b/gnustep-libs/gnustep-cenonlib/DETAILS
index 55633b3..37c7380 100755
--- a/gnustep-libs/gnustep-cenonlib/DETAILS
+++ b/gnustep-libs/gnustep-cenonlib/DETAILS
@@ -1,12 +1,11 @@
            SPELL=gnustep-cenonlib
-         VERSION=3.80-1
+         VERSION=3.82-1
           SOURCE=CenonLibrary-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Cenon
    SOURCE_URL[0]=http://www.vhf-group.com/vhfInterservice/download/source/$SOURCE
         WEB_SITE=http://www.cenon.info
      SOURCE_HASH=sha512:8c54c84c25d78b1daa0f58670a76bf187d485fdd52de677cda4c80dfda7605517ae84dd40e67ff004372eb0b85be21577e848f7fedaa2c0213eedf5f282fdf69
       LICENSE[0]=http://www.vhf-group.com/vhfInterservice/download/LICENSE
-         ENTERED=20060421
          UPDATED=20050421
         KEYWORDS="gnustep libs graphics"
            SHORT="Cenon model library."
diff --git a/gnustep-libs/gnustep-cenonlib/HISTORY b/gnustep-libs/gnustep-cenonlib/HISTORY
index d03e955..8010214 100644
--- a/gnustep-libs/gnustep-cenonlib/HISTORY
+++ b/gnustep-libs/gnustep-cenonlib/HISTORY
@@ -1,3 +1,9 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* BUILD: use true
+	* INSTALL: we install now to FHS only so no need to
+	  beat around the bush to get it installed
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/gnustep-libs/gnustep-cenonlib/INSTALL b/gnustep-libs/gnustep-cenonlib/INSTALL
index 6f2c7ac..fb50e24 100755
--- a/gnustep-libs/gnustep-cenonlib/INSTALL
+++ b/gnustep-libs/gnustep-cenonlib/INSTALL
@@ -1,7 +1 @@
-if ! [ -d $GNUSTEP_SYSTEM_ROOT/Library ]
-then
-	    message "${ERROR}GNUstep system library dir does not exists."    &&
-	    message "Recasting gnustep-gui lib may help you.${DEFAULT_COLOR}"
-fi                                                                           &&
-
-cp -rfv $BUILD_DIRECTORY/Cenon $GNUSTEP_SYSTEM_ROOT/Library
+cp -rfv $BUILD_DIRECTORY/Cenon ${INSTALL_ROOT}/usr/lib/GNUstep/
diff --git a/gnustep-libs/gnustep-gui/BUILD b/gnustep-libs/gnustep-gui/BUILD
new file mode 100755
index 0000000..60a5da7
--- /dev/null
+++ b/gnustep-libs/gnustep-gui/BUILD
@@ -0,0 +1,7 @@
+if test "$(get_spell_provider $SPELL LIBGIF)" = giflib; then
+  OPTS="--disable-ungif --enable-libgif $OPTS"
+fi &&
+if test "$(get_spell_provider $SPELL LIBGIF)" = libungif; then
+  OPTS="--enable-ungif --disable-libgif $OPTS"
+fi &&
+default_build
diff --git a/gnustep-libs/gnustep-gui/CONFIGURE b/gnustep-libs/gnustep-gui/CONFIGURE
deleted file mode 100755
index d2f9bce..0000000
--- a/gnustep-libs/gnustep-gui/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n
diff --git a/gnustep-libs/gnustep-gui/DEPENDS b/gnustep-libs/gnustep-gui/DEPENDS
index a42e859..f684d7a 100755
--- a/gnustep-libs/gnustep-gui/DEPENDS
+++ b/gnustep-libs/gnustep-gui/DEPENDS
@@ -1,15 +1,32 @@
-depends          GNUSTEP-GUI-BACKEND                              &&
-depends          gnustep-base                                     &&
-depends          tiff                                             &&
-depends          libpng                                           &&
-optional_depends libungif     "" "" "Add gif support."            &&
-optional_depends aspell       "" "" "Add spell checking support." &&
-optional_depends CUPS         "" "" "Add printing support. "      &&
-optional_depends audiofile    "" "" "Add sound support."          &&
-optional_depends portaudio    "" "" "Add portable audio support." &&
-
-if [ "$GNUSTEP_BUILD_DOC" == "y" ]; 
-then
-	depends tetex                                             &&
-	depends texinfo
-fi
+depends gnustep-make                         &&
+depends gnustep-base                         &&
+depends tiff                                 &&
+depends X11-LIBS                             &&
+optional_depends libpng                      \
+                 "--enable-png"              \
+                 "--disable-png"             \
+                 "Enable PNG support"        &&
+optional_depends LIBGIF                      \
+                 ""                          \
+                 ""                          \
+                 "Add gif support."          &&
+optional_depends jpeg                        \
+                 "--enable-jpeg"             \
+                 "--disable-jpeg"            \
+                 "Enable JPEG support."      &&
+optional_depends aspell                      \
+                 "--enable-aspell"           \
+                 "--disable-aspell"          \
+                 "Enable aspell support."    &&
+optional_depends CUPS                        \
+                 "--enable-cups"             \
+                 "--disable-cups"            \
+                 "Enable printing support."  &&
+optional_depends audiofile                   \
+                 ""                          \
+                 ""                          \
+                 "Add sound support."        &&
+optional_depends portaudio                   \
+                 ""                          \
+                 ""                          \
+                 "Add portable audio support."
diff --git a/gnustep-libs/gnustep-gui/DETAILS b/gnustep-libs/gnustep-gui/DETAILS
index 361ca4a..06607c5 100755
--- a/gnustep-libs/gnustep-gui/DETAILS
+++ b/gnustep-libs/gnustep-gui/DETAILS
@@ -1,10 +1,13 @@
            SPELL=gnustep-gui
-         VERSION=0.11.0
+         VERSION=0.12.0
           SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE
+  SOURCE2_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE2
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:58693f4b99f351d842e54c4e05d43e14eb98e1032addbdcced4d2aa172b203fbff47c4fc7a353a563c6582b9dcdcd88d854bdc984485182e29726f546eac841d
+      SOURCE_GPG=gnustep.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
       LICENSE[0]=LGPL
          ENTERED=20050908
         KEYWORDS="gnustep libs"
diff --git a/gnustep-libs/gnustep-gui/HISTORY b/gnustep-libs/gnustep-gui/HISTORY
index 8621202..414e8c8 100644
--- a/gnustep-libs/gnustep-gui/HISTORY
+++ b/gnustep-libs/gnustep-gui/HISTORY
@@ -1,3 +1,6 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: added gnustep-make
+
 2006-10-09 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Bump up to release 0.11.0.
 	Remove build_api and updated.
diff --git a/gnustep-libs/gnustep-gui/UP_TRIGGERS b/gnustep-libs/gnustep-gui/UP_TRIGGERS
index 2a8e55c..90a0c37 100755
--- a/gnustep-libs/gnustep-gui/UP_TRIGGERS
+++ b/gnustep-libs/gnustep-gui/UP_TRIGGERS
@@ -1,9 +1,9 @@
-if [ -z $(installed_version gnustep-base) ]
+if [[ -z $(installed_version gnustep-base) ]]
 then
     return 0
 fi                                                  &&
 
-if [ $(installed_version gnustep-gui) != $VERSION ]
+if [[ $(installed_version gnustep-gui) != $VERSION ]]
 then
     RECAST_UP="gnustep-gui"
 fi
diff --git a/gnustep-libs/gnustep-make/BUILD b/gnustep-libs/gnustep-make/BUILD
index 522f94a..321cd8f 100755
--- a/gnustep-libs/gnustep-make/BUILD
+++ b/gnustep-libs/gnustep-make/BUILD
@@ -1,14 +1,2 @@
-unset GNUSTEP_LOCAL_ROOT
-unset GNUSTEP_HOST
-unset GNUSTEP_MAKEFILES
-unset GNUSTEP_NETWORK_ROOT
-unset GNUSTEP_FLATTENED
-unset GNUSTEP_HOST_OS
-unset GNUSTEP_HOST_VENDOR
-unset GNUSTEP_HOST_CPU
-unset GNUSTEP_USER_ROOT
-unset GNUSTEP_SYSTEM_ROOT
-unset GNUSTEP_PATHLIST
-
-OPTS="--prefix=/opt/GNUstep $OPTS"  &&
+OPTS="--with-layout=fhs --enable-native-objc-exceptions $OPTS"  &&
 default_build
diff --git a/gnustep-libs/gnustep-make/CONFIGURE b/gnustep-libs/gnustep-make/CONFIGURE
deleted file mode 100755
index b5ba266..0000000
--- a/gnustep-libs/gnustep-make/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query DOCU "Build and install documentation?" n
diff --git a/gnustep-libs/gnustep-make/DEPENDS b/gnustep-libs/gnustep-make/DEPENDS
index cb6dc24..ee0ea90 100755
--- a/gnustep-libs/gnustep-make/DEPENDS
+++ b/gnustep-libs/gnustep-make/DEPENDS
@@ -1,9 +1 @@
-depends objc           &&
-
-if [ "$DOCU" == "y" ]; 
-then
-    depends tetex      &&
-    depends texinfo    &&
-    depends latex2html &&
-    depends netpbm
-fi
+depends objc
diff --git a/gnustep-libs/gnustep-make/DETAILS b/gnustep-libs/gnustep-make/DETAILS
index d3fd700..cfd8a79 100755
--- a/gnustep-libs/gnustep-make/DETAILS
+++ b/gnustep-libs/gnustep-make/DETAILS
@@ -1,16 +1,17 @@
            SPELL=gnustep-make
-         VERSION=1.13.0
-      PATCHLEVEL=1
+         VERSION=2.0.0
           SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE
+  SOURCE2_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE2
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:31f491b75dbbc3366ad9a5b37ac07ab0670453bfbbe4f9e8ad858ad7c7d43408af017b64958b2c5d8d533468782be86fb65da791ce967525e24139affb5ba8e1
+      SOURCE_GPG=gnustep.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
       LICENSE[0]=LGPL
          ENTERED=20050908
         KEYWORDS="gnustep libs"
-           SHORT="Pwerful and extensible way to write GNUstep-based makefiles"
-
+           SHORT="Powerful and extensible way to write GNUstep-based makefiles"
 cat << EOF
 The makefile package is a simple, powerful and extensible way to write
 makefiles for a GNUstep-based project.  It allows the user to write a
diff --git a/gnustep-libs/gnustep-make/FINAL b/gnustep-libs/gnustep-make/FINAL
deleted file mode 100755
index dd879e4..0000000
--- a/gnustep-libs/gnustep-make/FINAL
+++ /dev/null
@@ -1,29 +0,0 @@
-echo  "Installing GNUstep man path in /etc/man.conf"                 &&
-
-if  !  grep  -q "GNUstep" /etc/man.conf;  
-then
-    echo "MANPATH /opt/GNUstep/System/Library/Documentaition/man"    \
-	>> /etc/man.conf                                             &&
-    echo "GNUstep MANPATH added to /etc/man.conf."
-fi                                                                   &&
-
-if  !  grep  -q "GNUstep" /etc/ld.so.conf;  
-then
-    echo "/opt/GNUstep/System/Library/Libraries"                     \
-	>> /etc/ld.so.conf                                           &&
-    echo "GNUstep library path added to /etc/ld.so.conf."
-fi                                                                   &&
-
-unset GNUSTEP_LOCAL_ROOT
-unset GNUSTEP_HOST
-unset GNUSTEP_MAKEFILES
-unset GNUSTEP_NETWORK_ROOT
-unset GNUSTEP_FLATTENED
-unset GNUSTEP_HOST_OS
-unset GNUSTEP_HOST_VENDOR
-unset GNUSTEP_HOST_CPU
-unset GNUSTEP_USER_ROOT
-unset GNUSTEP_SYSTEM_ROOT
-unset GNUSTEP_PATHLIST
-
-. /etc/profile.d/GNUstep.sh
diff --git a/gnustep-libs/gnustep-make/INSTALL b/gnustep-libs/gnustep-make/INSTALL
deleted file mode 100755
index a1fa59f..0000000
--- a/gnustep-libs/gnustep-make/INSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-make install                                                         &&
-
-if [ "$DOCU" == "y" ]; 
-then
-    . GNUstep.sh
-    cd Documentation                                                 &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install       &&
-    cd ../
-fi                                                                   &&
-
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-	rm -f /etc/profile.d/GNUstep.sh
-fi                                                                   &&
-
-if [ -a /etc/profile.d/GNUstep.sh ];
-then
-    rm -f /etc/profile.d/GNUstep.sh
-fi                                                                   &&
-
-ln -s $TRACK_ROOT/opt/GNUstep/System/Library/Makefiles/GNUstep.sh \
-    /etc/profile.d/GNUstep.sh
diff --git a/gnustep-libs/gnustep-make/POST_REMOVE b/gnustep-libs/gnustep-make/POST_REMOVE
deleted file mode 100755
index 6ab1066..0000000
--- a/gnustep-libs/gnustep-make/POST_REMOVE
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    rm /etc/profile.d/GNUstep.sh
-fi
diff --git a/gnustep-libs/gnustep-mknfonts/DEPENDS b/gnustep-libs/gnustep-mknfonts/DEPENDS
index e9ad78b..cd6da98 100755
--- a/gnustep-libs/gnustep-mknfonts/DEPENDS
+++ b/gnustep-libs/gnustep-mknfonts/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-libs/gnustep-mknfonts/HISTORY b/gnustep-libs/gnustep-mknfonts/HISTORY
index bcf1053..0090550 100644
--- a/gnustep-libs/gnustep-mknfonts/HISTORY
+++ b/gnustep-libs/gnustep-mknfonts/HISTORY
@@ -1,3 +1,6 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: added gnustep-make
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-libs/gnustep-netclasses/CONFIGURE b/gnustep-libs/gnustep-netclasses/CONFIGURE
deleted file mode 100755
index d2f9bce..0000000
--- a/gnustep-libs/gnustep-netclasses/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n
diff --git a/gnustep-libs/gnustep-netclasses/DEPENDS b/gnustep-libs/gnustep-netclasses/DEPENDS
index 6aa7aec..b75e18c 100755
--- a/gnustep-libs/gnustep-netclasses/DEPENDS
+++ b/gnustep-libs/gnustep-netclasses/DEPENDS
@@ -1,7 +1,2 @@
-depends          gnustep-base      &&
-
-if [ "$GNUSTEP_BUILD_DOC" == "y" ]
-then
-    depends tetex                  &&
-    depends texinfo
-fi
+depends gnustep-base  &&
+depends gnustep-make
diff --git a/gnustep-libs/gnustep-netclasses/DETAILS b/gnustep-libs/gnustep-netclasses/DETAILS
index d364974..cf90d22 100755
--- a/gnustep-libs/gnustep-netclasses/DETAILS
+++ b/gnustep-libs/gnustep-netclasses/DETAILS
@@ -9,10 +9,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/netclasses-$VERSION
          ENTERED=20051018
         KEYWORDS="gnustep libs"
            SHORT="An asyncronous net library."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
-netclasses is an asynchronous networking library that works on OS X natively,
-and any of the multitude of platforms supported by GNUstep. You've never 
-seen an easier way to put together network applications!
+netclasses is an asynchronous networking library that works
+on OS X natively, and any of the multitude of platforms
+supported by GNUstep. You've never seen an easier way to
+put together network applications!
 EOF
diff --git a/gnustep-libs/gnustep-netclasses/HISTORY b/gnustep-libs/gnustep-netclasses/HISTORY
index b6fae65..752818d 100644
--- a/gnustep-libs/gnustep-netclasses/HISTORY
+++ b/gnustep-libs/gnustep-netclasses/HISTORY
@@ -1,3 +1,7 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: minor update
+	* DETAILS: line up to 80 chars or less
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-libs/gnustep-pantomime/DEPENDS b/gnustep-libs/gnustep-pantomime/DEPENDS
index fe95b25..b75e18c 100755
--- a/gnustep-libs/gnustep-pantomime/DEPENDS
+++ b/gnustep-libs/gnustep-pantomime/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-base  
+depends gnustep-base  &&
+depends gnustep-make
diff --git a/gnustep-libs/gnustep-pantomime/DETAILS b/gnustep-libs/gnustep-pantomime/DETAILS
index 6bd9501..8530413 100755
--- a/gnustep-libs/gnustep-pantomime/DETAILS
+++ b/gnustep-libs/gnustep-pantomime/DETAILS
@@ -1,16 +1,14 @@
            SPELL=gnustep-pantomime
-         VERSION=1.2.0pre1
+         VERSION=1.2.0pre3
           SOURCE=Pantomime-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Pantomime
    SOURCE_URL[0]=http://www.collaboration-world.com/pantomime.data/releases/Stable/$SOURCE
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:5e3813e7b81f1f5cbc705495d8be6fd7753024897f35b0e3cc950db2ee7a646c166e8b60191a232e58c31107e44bc4d8b445f7a39362ff86f7fb2b2d818395b5
+     SOURCE_HASH=sha512:
       LICENSE[0]=LGPL
          ENTERED=20050908
         KEYWORDS="gnustep libs"
            SHORT="A mime implementation for GNUstep."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 A GNUstep mime implementation.
 EOF
diff --git a/gnustep-libs/gnustep-pantomime/HISTORY b/gnustep-libs/gnustep-pantomime/HISTORY
index 7940b4f..ad45a75 100644
--- a/gnustep-libs/gnustep-pantomime/HISTORY
+++ b/gnustep-libs/gnustep-pantomime/HISTORY
@@ -1,3 +1,7 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* DEPENDS: added gnustep-make
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-libs/gnustep-performance/DEPENDS b/gnustep-libs/gnustep-performance/DEPENDS
index f625fa2..b75e18c 100755
--- a/gnustep-libs/gnustep-performance/DEPENDS
+++ b/gnustep-libs/gnustep-performance/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-base 
+depends gnustep-base  &&
+depends gnustep-make
diff --git a/gnustep-libs/gnustep-performance/DETAILS b/gnustep-libs/gnustep-performance/DETAILS
index 99a6e35..67a6ce3 100755
--- a/gnustep-libs/gnustep-performance/DETAILS
+++ b/gnustep-libs/gnustep-performance/DETAILS
@@ -1,16 +1,14 @@
            SPELL=gnustep-performance
-         VERSION=0.1.0
+         VERSION=0.2.4
           SOURCE=Performance-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Performance-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/libs/$SOURCE
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:62ae32cca16863123a2f44c175db368a8fc270fb2378d37b1b3d9bba7a65e8aee10336e6a51be6d0e9b90cb8014f813ee1c95dbef87b27cd8ed7d079eabe3e40
+     SOURCE_HASH=sha512:ff22d24b4f9d53df73d1915781626c47955ee3b1ac0c0f24f2a9225df06f45342e414c058296795a263b246408ca959dfd11a8c262e11a5eb573affe1a2eea00
       LICENSE[0]=LGPL
          ENTERED=20060227
         KEYWORDS="gnustep libs"
            SHORT="GNUStep performance monitor boundle."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 This library is a collection of classes intended to be used to help
 improve the performance of GNUstep and Cocoa applications.  The scope
diff --git a/gnustep-libs/gnustep-performance/HISTORY b/gnustep-libs/gnustep-performance/HISTORY
index c4c3e96..486104a 100644
--- a/gnustep-libs/gnustep-performance/HISTORY
+++ b/gnustep-libs/gnustep-performance/HISTORY
@@ -1,3 +1,7 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* DEPENDS: added gnustep-make
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-libs/gnustep-prefsmodule/BUILD b/gnustep-libs/gnustep-prefsmodule/BUILD
deleted file mode 100755
index 6def23c..0000000
--- a/gnustep-libs/gnustep-prefsmodule/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
-    return 1
-fi                                                                    &&
-
-cd Frameworks/PrefsModule
-
-make                                                                  &&
-
-cd ../../                                                             
diff --git a/gnustep-libs/gnustep-prefsmodule/DEPENDS b/gnustep-libs/gnustep-prefsmodule/DEPENDS
index e9ad78b..4f00980 100755
--- a/gnustep-libs/gnustep-prefsmodule/DEPENDS
+++ b/gnustep-libs/gnustep-prefsmodule/DEPENDS
@@ -1 +1,3 @@
-depends gnustep-gui
+depends gnustep-gui   &&
+depends gnustep-make  &&
+depends cvs
diff --git a/gnustep-libs/gnustep-prefsmodule/DETAILS b/gnustep-libs/gnustep-prefsmodule/DETAILS
index 8c81172..cd58172 100755
--- a/gnustep-libs/gnustep-prefsmodule/DETAILS
+++ b/gnustep-libs/gnustep-prefsmodule/DETAILS
@@ -7,7 +7,7 @@ else
 fi
           SOURCE=PrefsModule-cvs.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/PrefsModule-cvs
-   SOURCE_URL[0]=cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/backbone:System
+   SOURCE_URL[0]=cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/backbone:System/Frameworks/PrefsModule
         WEB_SITE=http://www.nongnu.org/backbone
    SOURCE_IGNORE=volatile
       LICENSE[0]=LGPL
@@ -15,7 +15,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/PrefsModule-cvs
          ENTERED=20050908
         KEYWORDS="gnustep libs"
            SHORT="GNUstep preference settings library."
-
 cat << EOF
 GNUstep preference settings library.
 EOF
diff --git a/gnustep-libs/gnustep-prefsmodule/HISTORY b/gnustep-libs/gnustep-prefsmodule/HISTORY
index deb161b..9bdab26 100644
--- a/gnustep-libs/gnustep-prefsmodule/HISTORY
+++ b/gnustep-libs/gnustep-prefsmodule/HISTORY
@@ -1,3 +1,10 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: update
+	* DEPENDS: missing depends
+	* INSTALL: not needed
+	* PRE_BUILD: not needed
+	* BUILD: not needed
+
 2006-10-09 Maurizio Boriani <baux at sourcemage.org>
 	* BUILD: Fix dummy error.
 	Remove build_api and updated.
diff --git a/gnustep-libs/gnustep-prefsmodule/INSTALL b/gnustep-libs/gnustep-prefsmodule/INSTALL
deleted file mode 100755
index c87b973..0000000
--- a/gnustep-libs/gnustep-prefsmodule/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-export TAR_OPTIONS="--no-same-owner"
-
-cd Frameworks/PrefsModule                                  &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&          
-cd ../../
diff --git a/gnustep-libs/gnustep-prefsmodule/PRE_BUILD b/gnustep-libs/gnustep-prefsmodule/PRE_BUILD
deleted file mode 100755
index ceacfcc..0000000
--- a/gnustep-libs/gnustep-prefsmodule/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build                 &&
-cd $SOURCE_DIRECTORY              &&
-rm -rf Frameworks/PrefsModule/CVS
diff --git a/gnustep-libs/gnustep-renaissance/CONFIGURE b/gnustep-libs/gnustep-renaissance/CONFIGURE
deleted file mode 100755
index 20efdc0..0000000
--- a/gnustep-libs/gnustep-renaissance/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query DOCU "Build and install documentation?" y
diff --git a/gnustep-libs/gnustep-renaissance/DEPENDS b/gnustep-libs/gnustep-renaissance/DEPENDS
index d415a7b..0903695 100755
--- a/gnustep-libs/gnustep-renaissance/DEPENDS
+++ b/gnustep-libs/gnustep-renaissance/DEPENDS
@@ -1,7 +1,2 @@
 depends gnustep-gui     &&
-
-if [ "$DOCU" == "y" ]; 
-then
-	depends tetex   &&
-	depends texinfo
-fi
+depends gnustep-make
diff --git a/gnustep-libs/gnustep-renaissance/DETAILS b/gnustep-libs/gnustep-renaissance/DETAILS
index 52c3391..2267852 100755
--- a/gnustep-libs/gnustep-renaissance/DETAILS
+++ b/gnustep-libs/gnustep-renaissance/DETAILS
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Renaissance-$VERSION
          ENTERED=20050908
         KEYWORDS="gnustep xml libs"
            SHORT="GNUstep Renaissance gui in simple and intuitive XML."
-
 cat << EOF
 In short, GNUstep Renaissance allows you to describe your user
 interfaces (that is, the windows in your application, and the buttons,
diff --git a/gnustep-libs/gnustep-renaissance/HISTORY b/gnustep-libs/gnustep-renaissance/HISTORY
index 6651544..5014b86 100644
--- a/gnustep-libs/gnustep-renaissance/HISTORY
+++ b/gnustep-libs/gnustep-renaissance/HISTORY
@@ -1,3 +1,7 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: minor fixup
+	* DEPENDS: missing depends
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-libs/gnustep-sqlclient/DEPENDS b/gnustep-libs/gnustep-sqlclient/DEPENDS
index fc27d10..df0f208 100755
--- a/gnustep-libs/gnustep-sqlclient/DEPENDS
+++ b/gnustep-libs/gnustep-sqlclient/DEPENDS
@@ -1,6 +1,16 @@
-depends          gnustep-base                                        &&
-depends          gnustep-performance                                 &&
-optional_depends mysql               "" "" "Add mysql support."      &&
-optional_depends postgresql          "" "" "Add postgresql support." &&
-optional_depends sqlite              "" "" "Add sqlite support." 
+depends gnustep-base                          &&
+depends gnustep-performance                   &&
+depends gnustep-make                          &&
+optional_depends mysql                        \
+                 ""                           \
+                 "--disable-mysql-bundle"     \
+                 "Add mysql support."         &&
+optional_depends postgresql                   \
+                 ""                           \
+                 "--disable-postgres-bundle"  \
+                 "Add postgresql support."    &&
+optional_depends sqlite                       \
+                 ""                           \
+                 "--disable-sqllite-bundle"   \
+                 "Add sqlite support." 
 
diff --git a/gnustep-libs/gnustep-sqlclient/DETAILS b/gnustep-libs/gnustep-sqlclient/DETAILS
index 8afe7ba..c1dfd57 100755
--- a/gnustep-libs/gnustep-sqlclient/DETAILS
+++ b/gnustep-libs/gnustep-sqlclient/DETAILS
@@ -1,16 +1,14 @@
            SPELL=gnustep-sqlclient
-         VERSION=1.2.0
+         VERSION=1.3.0
           SOURCE=SQLClient-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/SQLClient-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/libs/$SOURCE
         WEB_SITE=http://www.gnustep.org
-     SOURCE_HASH=sha512:e146eb995d6723f5bac65ff90bf6ee25ad98577c1a4d3cd768847ba5a45c34bfd3e395af3ae61197777d571e07279bef2cb7eaa03ab671d97e5264e5100cc11b
+     SOURCE_HASH=sha512:1239046006700905813b19adb0da5f95c0f865ce62b3f3cd531c1be0570b27654a73946e7b7e5fdc1029c1f4fa20fed5649c1e3cee17a5e2b10048c01a0b3b08
       LICENSE[0]=LGPL
          ENTERED=20060210
         KEYWORDS="sql gnustep libs"
            SHORT="GNUStep simple sql abstraction layer."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 The SQLClient library is designed to provide a simple interface to SQL
 databases for GNUstep applications. It does not attempt the sort of
diff --git a/gnustep-libs/gnustep-sqlclient/HISTORY b/gnustep-libs/gnustep-sqlclient/HISTORY
index 25c13a1..84d1c46 100644
--- a/gnustep-libs/gnustep-sqlclient/HISTORY
+++ b/gnustep-libs/gnustep-sqlclient/HISTORY
@@ -1,3 +1,8 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* DEPENDS: missing depends
+	* PRE_BUILD: needed to correct bad install path
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-libs/gnustep-sqlclient/PRE_BUILD b/gnustep-libs/gnustep-sqlclient/PRE_BUILD
new file mode 100755
index 0000000..f117f3a
--- /dev/null
+++ b/gnustep-libs/gnustep-sqlclient/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+sedit '31s/GNUSTEP_INSTALLATION_DIR)\/Library/GNUSTEP_SYSTEM_LIBRARY)/' GNUmakefile
diff --git a/gnustep-libs/gnustep-steptalk/BUILD b/gnustep-libs/gnustep-steptalk/BUILD
index f0e03d6..0ba4b3f 100755
--- a/gnustep-libs/gnustep-steptalk/BUILD
+++ b/gnustep-libs/gnustep-steptalk/BUILD
@@ -1,20 +1,10 @@
-local myopts=""
-
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"      &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                        &&
-    return 1
-fi                                                                        &&
-
 make_single
-if [ "$APPK" == "n" ];
+if [[ "$APPK" == "n" ]];
 then
-    message "Building StepTalk without AppKit extensions${DEFAULT_COLOR}" &&
-    make appkit=no
+  OPTS="appkit=no"
+  message "Building StepTalk without AppKit extensions"  &&
+  default_build $OPTS
 else
-    make
-fi                                                                        &&
+  default_build
+fi                                                       &&
 make_normal
diff --git a/gnustep-libs/gnustep-steptalk/DEPENDS b/gnustep-libs/gnustep-steptalk/DEPENDS
index a7327db..bdc5d43 100755
--- a/gnustep-libs/gnustep-steptalk/DEPENDS
+++ b/gnustep-libs/gnustep-steptalk/DEPENDS
@@ -1,3 +1,7 @@
-depends          gnustep-gui                               &&
-optional_depends gnustep-gdl2 "" "" "Add EObject support."
+depends gnustep-gui             &&
+depends gnustep-make            &&
+optional_depends gnustep-gdl2   \
+                 ""             \
+                 ""             \
+                 "Add EObject support."
 
diff --git a/gnustep-libs/gnustep-steptalk/DETAILS b/gnustep-libs/gnustep-steptalk/DETAILS
index e7647a4..8b32fb7 100755
--- a/gnustep-libs/gnustep-steptalk/DETAILS
+++ b/gnustep-libs/gnustep-steptalk/DETAILS
@@ -9,8 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/StepTalk
          ENTERED=20050908
         KEYWORDS="gnustep libs"
            SHORT="StepTalk is a scripting framework for gnustep."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 StepTalk is a scripting framework for creating scriptable servers or
 applications. StepTalk, when combined with the dynamism that the Objective-C
diff --git a/gnustep-libs/gnustep-steptalk/HISTORY b/gnustep-libs/gnustep-steptalk/HISTORY
index 758bd16..a26e7d6 100644
--- a/gnustep-libs/gnustep-steptalk/HISTORY
+++ b/gnustep-libs/gnustep-steptalk/HISTORY
@@ -1,3 +1,9 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: fixups
+	* DEPENDS: missing deps
+	* PRE_BUILD: added to fix install path
+	* BUILD: fixup
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-libs/gnustep-steptalk/PRE_BUILD b/gnustep-libs/gnustep-steptalk/PRE_BUILD
new file mode 100755
index 0000000..4444166
--- /dev/null
+++ b/gnustep-libs/gnustep-steptalk/PRE_BUILD
@@ -0,0 +1,18 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+local gnumakefile     &&
+for gnumakefile in  Finders/ApplicationFinder/GNUmakefile \
+                    Finders/DistributedFinder/GNUmakefile \
+                    Languages/Smalltalk/GNUmakefile \
+                    Languages/MyLanguage/GNUmakefile \
+                    Languages/Guile/GNUmakefile \
+                    Modules/GDL2/GNUmakefile.postamble \
+                    Modules/GDL2/GNUmakefile \
+                    Modules/AppKit/GNUmakefile \
+                    Modules/ObjectiveC/GNUmakefile \
+                    Modules/Foundation/GNUmakefile \
+                    Modules/ReadlineTranscript/GNUmakefile \
+                    Modules/SimpleTranscript/GNUmakefile
+do
+  sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' $gnumakefile
+done
diff --git a/gnustep-libs/gnustep-webserver/DEPENDS b/gnustep-libs/gnustep-webserver/DEPENDS
index 5b8e232..b75e18c 100755
--- a/gnustep-libs/gnustep-webserver/DEPENDS
+++ b/gnustep-libs/gnustep-webserver/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-base        
+depends gnustep-base  &&
+depends gnustep-make
diff --git a/gnustep-libs/gnustep-webserver/DETAILS b/gnustep-libs/gnustep-webserver/DETAILS
index d2a8851..c8056ac 100755
--- a/gnustep-libs/gnustep-webserver/DETAILS
+++ b/gnustep-libs/gnustep-webserver/DETAILS
@@ -1,16 +1,14 @@
            SPELL=gnustep-webserver
-         VERSION=1.1.0
+         VERSION=1.1.1
           SOURCE=WebServer-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/WebServer-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/libs/$SOURCE
-     SOURCE_HASH=sha512:e20342e773dce21373e43fad1428d283a81cd16a7ae5965160e179eaed464e8b40532a8fd6a8df7596195ea434041f8897496a2fb0bbe7b94f9741a017b344f5
+     SOURCE_HASH=sha512:12eecf1c311d3d2acab064c7f6bed7338a3304ee4e54004868f34676010d63503849efc72cc5e1991b3fe23eb8603a79987e493a5cd74c3be12ed59022b7e3ca
         WEB_SITE=http://www.gnustep.org
       LICENSE[0]=LGPL
          ENTERED=20060227
         KEYWORDS="gnustep libs"
            SHORT="This library provides a single main WebServer class."
-     TAR_OPTIONS="--no-same-owner"
-
 cat << EOF
 This library provides a single main WebServer class which works with a
 framework to support the use of loadable bundles to handle requests
diff --git a/gnustep-libs/gnustep-webserver/HISTORY b/gnustep-libs/gnustep-webserver/HISTORY
index fa0ae52..4ab5346 100644
--- a/gnustep-libs/gnustep-webserver/HISTORY
+++ b/gnustep-libs/gnustep-webserver/HISTORY
@@ -1,3 +1,7 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* DEPENDS: added a missing dep
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-libs/gnustep.gpg b/gnustep-libs/gnustep.gpg
new file mode 100644
index 0000000..cf39508
Binary files /dev/null and b/gnustep-libs/gnustep.gpg differ
diff --git a/utils/util-vserver/BUILD b/utils/util-vserver/BUILD
new file mode 100755
index 0000000..fe7dd16
--- /dev/null
+++ b/utils/util-vserver/BUILD
@@ -0,0 +1,12 @@
+local VSERV_API apis
+for apis in $VSERV_API ; do
+  if [[ "$apis" == "DEFAULT" ]]; then
+    VSERV_APIS="$VSERV_APIS,v13,net,v21"
+  fi
+  VSERV_APIS="$VSERV_APIS,$apis"
+done
+OPTS="--with-initrddir=$INSTALL_ROOT/usr/share/doc/util-vserver/init   \
+      --with-vrootdir=${INSTALL_ROOT}${VSERV_INSTALL}                  \
+      --enable-apis=$VSERV_APIS                                        \
+      $OPTS"                                                           &&
+default_build
diff --git a/utils/util-vserver/CONFIGURE b/utils/util-vserver/CONFIGURE
new file mode 100755
index 0000000..dc9ae27
--- /dev/null
+++ b/utils/util-vserver/CONFIGURE
@@ -0,0 +1,17 @@
+. $GRIMOIRE/config_query_multi.function
+message "The path is the base where the vserver directories will be created"message "and is relative to \$INSTALL_ROOT so don't need to include it."
+config_query_string VSERV_INSTALL                                        \
+    "Enter the path to where you want to have virtual machines run from" \
+    '/var/lib/vserver'                                                   &&
+config_query_multi VESRV_API "What APIs do you want?" \
+                    "DEFAULT"                         \
+                    "ALL"                             \
+                    "NOLEGACY"                        \
+                    "legacy"                          \
+                    "compat"                          \
+                    "v11"                             \
+                    "fscompat"                        \
+                    "v13obs"                          \
+                    "v13"                             \
+                    "net"
+
diff --git a/utils/util-vserver/DEPENDS b/utils/util-vserver/DEPENDS
index d8489d3..023c260 100755
--- a/utils/util-vserver/DEPENDS
+++ b/utils/util-vserver/DEPENDS
@@ -1,4 +1,11 @@
-depends vlan &&
-optional_depends beecrypt '' '' 'to build vhashify' &&
-optional_depends libxslt '' '' 'for extra documentation' &&
-optional_depends dietlibc --enable-dietlibc --disable-dietlibc 'use dietlibc instead of glibc'
+optional_depends dietlibc                          \
+                 "--enable-dietlibc"               \
+                 "--disable-dietlibc"              \
+                 "To build with dietlibc support"  &&
+optional_depends beecrypt                          \
+                 ""                                \
+                 ""                                \
+                 "To build vhashify"               &&
+depends iproute2  &&
+depends iptables  &&
+depends vlan
diff --git a/utils/util-vserver/DETAILS b/utils/util-vserver/DETAILS
index a6db868..ddfac97 100755
--- a/utils/util-vserver/DETAILS
+++ b/utils/util-vserver/DETAILS
@@ -1,18 +1,21 @@
            SPELL=util-vserver
          VERSION=0.30.212
-          SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+          SOURCE=$SPELL-$VERSION.tar.bz2
+         SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://ftp.linux-vserver.org/pub/utils/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:75c951ce18419b108677193f7e7def26374b39e6740c4c1f935a1bf42ea36313ba9cec52ef6fc310a510348135b3785de4dda3d72c6592b0fdad0cf85b32aadb
-      LICENSE[0]=GPL
+  SOURCE2_URL[0]=http://ftp.linux-vserver.org/pub/utils/$SPELL/$SOURCE2
+      SOURCE_GPG=vserver.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
         WEB_SITE=http://linux-vserver.org/
-         ENTERED=20070411
+      LICENSE[0]=GPL
         KEYWORDS="virtualization"
+         ENTERED=20070411
            SHORT="userspace utils for virtual private servers."
 cat << EOF
-Linux-VServer provides virtualization for GNU/Linux systems. This is 
-accomplished by kernel level isolation. It allows to run multiple virtual units
-at once. Those units are sufficiently isolated to guarantee the required 
-security, but utilize available resources efficiently, as they run on the same
-kernel.
+util-vserver is a Linux virtual server utility framework, allowing an
+administrator to set up multiple, isolated virtual servers. It can be used
+to run various services securely separated, without requiring special
+configuration. Virtual servers are unable to interact with each other,
+or the main server.
 EOF
diff --git a/utils/util-vserver/HISTORY b/utils/util-vserver/HISTORY
index b3cd75e..f712598 100644
--- a/utils/util-vserver/HISTORY
+++ b/utils/util-vserver/HISTORY
@@ -1,2 +1,12 @@
+2007-04-13 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* BUILD: added since we're picking APIS and base dir for
+	  vservers
+	* INSTALL: added to create the dir
+	* DEPENDS: missing dependencies atleast it didn't build without
+	  them for me
+	* vserver.gpg: upstream gpg key as required by our policy
+	* DETAILS: use upstream key, better long description
+	* CONFIGURE: ask for base root and APIs to support
+
 2007-04-11 David Brown <dmlb2000 at gmail.com>
 	* ALL: created spell
diff --git a/utils/util-vserver/INSTALL b/utils/util-vserver/INSTALL
new file mode 100755
index 0000000..f869bf8
--- /dev/null
+++ b/utils/util-vserver/INSTALL
@@ -0,0 +1,4 @@
+mkdir -vp ${INSTALL_ROOT}${VSERV_INSTALL}                  &&
+mkdir -vp ${INSTALL_ROOT}/usr/share/doc/util-vserver/init  &&
+default_install
+
diff --git a/utils/util-vserver/vserver.gpg b/utils/util-vserver/vserver.gpg
new file mode 100644
index 0000000..2bd2d49
Binary files /dev/null and b/utils/util-vserver/vserver.gpg differ



More information about the SM-Commit mailing list