Merge branch 'master' of ssh://vlad@scm.sourcemage.org/smgl/grimoire

12 files changed, 28 insertions, 60 deletions

diff --git a/libs/sdl_sound/DETAILS b/libs/sdl_sound/DETAILS
index f438454645..6eff2bd4f3 100755
--- a/libs/sdl_sound/DETAILS
+++ b/libs/sdl_sound/DETAILS
@@ -4,7 +4,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_sound-$VERSION
    SOURCE_URL[0]=http://icculus.org/SDL_sound/downloads/$SOURCE
      SOURCE_HASH=sha512:da70bd5b3fa298c15b9ea01b8f7b32513786684fc964921a04a514a2a74dd3afc7dae91518e424834b682b7b16b67476ee0e2f0be1f62aa0743577eb78695f2c
-        WEB_SITE=http://icculus.org/$SPELL
+        WEB_SITE=http://icculus.org/SDL_sound/
          ENTERED=20020209
          UPDATED=20020213
       LICENSE[0]=LGPL
diff --git a/libs/sdl_sound/HISTORY b/libs/sdl_sound/HISTORY
index 88933c9a39..b866ec7284 100644
--- a/libs/sdl_sound/HISTORY
+++ b/libs/sdl_sound/HISTORY
@@ -1,3 +1,6 @@
+2008-01-04 Julien "_kaze_" ROZO <julien@rozo.org>
+	* DETAILS: fixed WEB_SITE
+
 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/libs/sdl_ttf/DETAILS b/libs/sdl_ttf/DETAILS
index 8e2afa9c54..5fc7988759 100755
--- a/libs/sdl_ttf/DETAILS
+++ b/libs/sdl_ttf/DETAILS
@@ -1,12 +1,11 @@
            SPELL=sdl_ttf
-         VERSION=2.0.8
+         VERSION=2.0.9
           SOURCE=SDL_ttf-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_ttf-$VERSION
    SOURCE_URL[0]=http://www.libsdl.org/projects/SDL_ttf/release/$SOURCE
 
-     SOURCE_HASH=sha512:33a913354acb728aa73d5908e7b385d0fe7a544fa1fe71431aa2abfa5d30e98385f1ffc69b245b1bf2c0918133b88029cf41ebd8614f73fa7de9898389e42a5a
+     SOURCE_HASH=sha512:990a8946456f5d6c25ac6ee4dc33202f031b53b06caf09a7d5e0d03a1476ba30d26e2c348117eb6bd2147a2a6f0feca78f4dd7a68cde6f09f025b2ab0e53191a
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-
         WEB_SITE=http://www.libsdl.org/projects/SDL_ttf/
          ENTERED=20020412
          UPDATED=20020511
diff --git a/libs/sdl_ttf/HISTORY b/libs/sdl_ttf/HISTORY
index ca24cdc7f7..7456c734b4 100644
--- a/libs/sdl_ttf/HISTORY
+++ b/libs/sdl_ttf/HISTORY
@@ -1,3 +1,7 @@
+2008-01-04 Julien "_kaze_" ROZO <julien@rozo.org>
+	* DETAILS: updated version to 2.0.9
+	* PRE_BUILD, sdl-ttf-2.0.8-noftinternals.patch: removed, no longer needed
+
 2007-03-18 George Sherwood <george@beernabeer.com>
 	* PRE_BUILD: Removed check for freetype 2.2.x.  freetype2 > 
 	  2.2.x is now in stable.  This patch is needed for all grimoires.
diff --git a/libs/sdl_ttf/PRE_BUILD b/libs/sdl_ttf/PRE_BUILD
deleted file mode 100755
index 786d6ebb14..0000000000
--- a/libs/sdl_ttf/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build       &&
-cd ${SOURCE_DIRECTORY}  &&
-patch -p0 < ${SCRIPT_DIRECTORY}/sdl-ttf-2.0.8-noftinternals.patch
-
diff --git a/libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch b/libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch
deleted file mode 100644
index 106f3ffd10..0000000000
--- a/libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- SDL_ttf.c.orig	2006-10-02 18:49:02.000000000 -0500
-+++ SDL_ttf.c	2006-10-02 18:51:21.000000000 -0500
-@@ -43,16 +43,6 @@
- #include FT_FREETYPE_H
- #include FT_OUTLINE_H
- #include FT_TRUETYPE_IDS_H
--/*
--#include <freetype/freetype.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
--*/
--#include <freetype/internal/ftobjs.h>
--
--#ifndef FT_OPEN_STREAM
--#define FT_OPEN_STREAM ft_open_stream
--#endif
- 
- #include "SDL.h"
- #include "SDL_endian.h"
-@@ -278,7 +268,7 @@
- 	}
- 	memset(stream, 0, sizeof(*stream));
- 
--	stream->memory = library->memory;
-+	stream->memory = NULL;
- 	stream->read = RWread;
- 	stream->descriptor.pointer = src;
- 	stream->pos = (unsigned long)position;
diff --git a/python-devel/django/DETAILS b/python-devel/django/DETAILS
index 4ab98fd2ed..c235c19e8b 100755
--- a/python-devel/django/DETAILS
+++ b/python-devel/django/DETAILS
@@ -1,8 +1,8 @@
            SPELL=django
-         VERSION=0.96
+         VERSION=0.96.1
           SOURCE=Django-${VERSION}.tar.gz
-   SOURCE_URL[0]=http://media.djangoproject.com/releases/${VERSION}/${SOURCE}
-     SOURCE_HASH=sha512:34457f3827c223c9ce4a938dcd87b49f7f68ad6440428004983e85316688681344c37ad016c41d80fbd47d3b0da84327716ae43f1fec18a518b411c90ef67387
+   SOURCE_URL[0]=http://www.djangoproject.com/download/${VERSION}/tarball/
+     SOURCE_HASH=sha512:53c5e03a4c2cabe07acdaf4767ef9babbd18d9e775691280105736f237080ca3cf6809575db0dcdb315d3e532ab2f04843fb985513fcaef4170a482b64ccfaec
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Django-${VERSION}
         WEB_SITE="http://www.djangoproject.com/"
       LICENSE[0]=BSD
diff --git a/python-devel/django/HISTORY b/python-devel/django/HISTORY
index a42071034a..a209bae085 100644
--- a/python-devel/django/HISTORY
+++ b/python-devel/django/HISTORY
@@ -1,3 +1,6 @@
+2008-01-05 Alexander Tsamutali <astsmtl@gmail.com>
+	* DETAILS: Updated to 0.96.1
+
 2007-09-03 Alexander Tsamutali <astsmtl@gmail.com>
 	* CONFIGURE: Removed
 	* DEPENDS: Added optional dependency on bash-completion
diff --git a/utils/virtualbox/BUILD b/utils/virtualbox/BUILD
index 76be21324f..78ab2bc015 100755
--- a/utils/virtualbox/BUILD
+++ b/utils/virtualbox/BUILD
@@ -1,11 +1,3 @@
-./configure      &&
-
-# patch to make this spell compiling with libxcursor from xorg-modular
-# this patch must be applied after configure is run
-if  check_if_xorg_modular_libs ;  then
-    cd $SOURCE_DIRECTORY  && 
-    patch -p0 < $SCRIPT_DIRECTORY/Xcursor.patch 
-fi  && 
-
+./configure $OPTS  &&
 source ./env.sh  &&
 kmk all
diff --git a/utils/virtualbox/DEPENDS b/utils/virtualbox/DEPENDS
index fb6b72155b..ea1bf33534 100755
--- a/utils/virtualbox/DEPENDS
+++ b/utils/virtualbox/DEPENDS
@@ -4,5 +4,9 @@ depends  dev86    &&
 depends  iasl     &&
 depends  xalan-c  &&
 depends  sdl      &&
-depends  pulseaudio  &&
-depends  X11-LIBS
+depends  X11-LIBS &&
+
+optional_depends  pulseaudio                       \
+                  ""                               \
+                  "--disable-pulse"                \
+                  "for PulseAudio output support" 
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index a170d02475..ccd726ab65 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,8 @@
+2008-01-04 Julien "_kaze_" ROZO <julien@rozo.org>
+	* DEPENDS: pulseaudio is now an optional dependency
+	* BUILD: added $OPTS to configure, removed patch for Xcursor from xorg-modular
+	* Xcursor.patch: removed, no longer needed
+
 2008-01-01 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 1.5.4
 	* DEPENDS: added pulseaudio
diff --git a/utils/virtualbox/Xcursor.patch b/utils/virtualbox/Xcursor.patch
deleted file mode 100644
index 8e2ec05f99..0000000000
--- a/utils/virtualbox/Xcursor.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Config.kmk.orig	2007-09-11 01:11:29.000000000 +0200
-+++ Config.kmk	2007-09-11 01:12:23.000000000 +0200
-@@ -2048,6 +2048,7 @@ else # the gcc guys:
-   TEMPLATE_VBOXQTGUIEXE_LIBS += \
- 	Xext \
- 	X11 \
-+	Xcursor \
- 	m \
- 	$(LIB_PTHREAD)
-   TEMPLATE_VBOXQTGUIEXE_LIBPATH += \