Merge commit 'lesibel/master'NuTyX2010-beta-3

13 files changed, 62 insertions, 91 deletions

diff --git a/extra/graphicsmagick/.footprint b/extra/graphicsmagick/.footprint
index f168b53c9..aa4e03093 100644
--- a/extra/graphicsmagick/.footprint
+++ b/extra/graphicsmagick/.footprint
@@ -21,6 +21,7 @@ drwxr-xr-x	root/root	usr/include/GraphicsMagick/Magick++/
 -rw-r--r--	root/root	usr/include/GraphicsMagick/Magick++/STL.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/Magick++/TypeMetric.h
 drwxr-xr-x	root/root	usr/include/GraphicsMagick/magick/
+-rw-r--r--	root/root	usr/include/GraphicsMagick/magick/analyze.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/api.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/attribute.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/average.h
@@ -28,9 +29,11 @@ drwxr-xr-x	root/root	usr/include/GraphicsMagick/magick/
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/cdl.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/channel.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/color.h
+-rw-r--r--	root/root	usr/include/GraphicsMagick/magick/color_lookup.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/colormap.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/colorspace.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/command.h
+-rw-r--r--	root/root	usr/include/GraphicsMagick/magick/common.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/compare.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/composite.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/compress.h
@@ -79,6 +82,7 @@ drwxr-xr-x	root/root	usr/include/GraphicsMagick/magick/
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/texture.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/timer.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/transform.h
+-rw-r--r--	root/root	usr/include/GraphicsMagick/magick/type.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/utility.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/magick/version.h
 drwxr-xr-x	root/root	usr/include/GraphicsMagick/wand/
@@ -87,42 +91,41 @@ drwxr-xr-x	root/root	usr/include/GraphicsMagick/wand/
 -rw-r--r--	root/root	usr/include/GraphicsMagick/wand/pixel_wand.h
 -rw-r--r--	root/root	usr/include/GraphicsMagick/wand/wand_api.h
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.7/
-drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.7/config/
--rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.7/config/delegates.mgk
--rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.7/config/type-ghostscript.mgk
--rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.7/config/type-solaris.mgk
--rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.7/config/type-windows.mgk
--rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.7/config/type.mgk
-drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.7/modules-Q8/
-drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.7/modules-Q8/coders/
-drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.7/modules-Q8/filters/
+drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.12/
+drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.12/config/
+-rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.12/config/delegates.mgk
+-rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.12/config/type-ghostscript.mgk
+-rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.12/config/type-solaris.mgk
+-rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.12/config/type-windows.mgk
+-rw-r--r--	root/root	usr/lib/GraphicsMagick-1.3.12/config/type.mgk
+drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.12/modules-Q8/
+drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.12/modules-Q8/coders/
+drwxr-xr-x	root/root	usr/lib/GraphicsMagick-1.3.12/modules-Q8/filters/
 -rw-r--r--	root/root	usr/lib/libGraphicsMagick++.a
 -rwxr-xr-x	root/root	usr/lib/libGraphicsMagick++.la
-lrwxrwxrwx	root/root	usr/lib/libGraphicsMagick++.so -> libGraphicsMagick++.so.3.2.0
-lrwxrwxrwx	root/root	usr/lib/libGraphicsMagick++.so.3 -> libGraphicsMagick++.so.3.2.0
--rwxr-xr-x	root/root	usr/lib/libGraphicsMagick++.so.3.2.0
+lrwxrwxrwx	root/root	usr/lib/libGraphicsMagick++.so -> libGraphicsMagick++.so.3.3.0
+lrwxrwxrwx	root/root	usr/lib/libGraphicsMagick++.so.3 -> libGraphicsMagick++.so.3.3.0
+-rwxr-xr-x	root/root	usr/lib/libGraphicsMagick++.so.3.3.0
 -rw-r--r--	root/root	usr/lib/libGraphicsMagick.a
 -rwxr-xr-x	root/root	usr/lib/libGraphicsMagick.la
-lrwxrwxrwx	root/root	usr/lib/libGraphicsMagick.so -> libGraphicsMagick.so.3.2.0
-lrwxrwxrwx	root/root	usr/lib/libGraphicsMagick.so.3 -> libGraphicsMagick.so.3.2.0
--rwxr-xr-x	root/root	usr/lib/libGraphicsMagick.so.3.2.0
+lrwxrwxrwx	root/root	usr/lib/libGraphicsMagick.so -> libGraphicsMagick.so.3.6.0
+lrwxrwxrwx	root/root	usr/lib/libGraphicsMagick.so.3 -> libGraphicsMagick.so.3.6.0
+-rwxr-xr-x	root/root	usr/lib/libGraphicsMagick.so.3.6.0
 -rw-r--r--	root/root	usr/lib/libGraphicsMagickWand.a
 -rwxr-xr-x	root/root	usr/lib/libGraphicsMagickWand.la
-lrwxrwxrwx	root/root	usr/lib/libGraphicsMagickWand.so -> libGraphicsMagickWand.so.2.1.0
-lrwxrwxrwx	root/root	usr/lib/libGraphicsMagickWand.so.2 -> libGraphicsMagickWand.so.2.1.0
--rwxr-xr-x	root/root	usr/lib/libGraphicsMagickWand.so.2.1.0
+lrwxrwxrwx	root/root	usr/lib/libGraphicsMagickWand.so -> libGraphicsMagickWand.so.2.2.0
+lrwxrwxrwx	root/root	usr/lib/libGraphicsMagickWand.so.2 -> libGraphicsMagickWand.so.2.2.0
+-rwxr-xr-x	root/root	usr/lib/libGraphicsMagickWand.so.2.2.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/GraphicsMagick++.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/GraphicsMagick.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/GraphicsMagickWand.pc
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/GraphicsMagick-1.3.7/
-drwxr-xr-x	root/root	usr/share/GraphicsMagick-1.3.7/config/
--rw-r--r--	root/root	usr/share/GraphicsMagick-1.3.7/config/colors.mgk
--rw-r--r--	root/root	usr/share/GraphicsMagick-1.3.7/config/log.mgk
--rw-r--r--	root/root	usr/share/GraphicsMagick-1.3.7/config/magic.mgk
--rw-r--r--	root/root	usr/share/GraphicsMagick-1.3.7/config/modules.mgk
+drwxr-xr-x	root/root	usr/share/GraphicsMagick-1.3.12/
+drwxr-xr-x	root/root	usr/share/GraphicsMagick-1.3.12/config/
+-rw-r--r--	root/root	usr/share/GraphicsMagick-1.3.12/config/colors.mgk
+-rw-r--r--	root/root	usr/share/GraphicsMagick-1.3.12/config/log.mgk
+-rw-r--r--	root/root	usr/share/GraphicsMagick-1.3.12/config/modules.mgk
 drwxr-xr-x	root/root	usr/share/doc/
 drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/ChangeLog
@@ -134,30 +137,34 @@ drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/ChangeLog.2006
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/ChangeLog.2007
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/ChangeLog.2008
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/ChangeLog.2009
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/Copyright.txt
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/NEWS.txt
 drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/www/
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/CVS.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/CVS.rst
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ChangeLog-2001.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ChangeLog-2002.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ChangeLog-2003.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ChangeLog-2004.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ChangeLog-2005.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ChangeLog-2006.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ChangeLog-2007.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ChangeLog-2008.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ChangeLog-2009.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Changelog.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Copyright.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/FAQ.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/FAQ.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/GraphicsMagick.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/INSTALL-unix.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/INSTALL-windows.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ImageMagickObject.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/ImageMagickObject.rst
 drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/www/Magick++/
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Blob.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Cache.fig
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Cache.png
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Cache.svg
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/ChangeLog.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/CoderInfo.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Color.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Documentation.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Documentation.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Drawable.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Drawable_example_1.png
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Enumerations.html
@@ -165,45 +172,31 @@ drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/www/Magick++/
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/FormatCharacters.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Future.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Geometry.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Image.fig
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Image.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Image.png
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Image.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/ImageDesign.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/ImageMagick.png
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Install.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Magick++.png
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Montage.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/NEWS.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/PixelPacket.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/Pixels.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/README.txt
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/STL.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/TypeMetric.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/gm-188x120t.png
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/index.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/index.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/montage-sample-framed.jpg
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/right_triangle.png
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-framed.fig
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-framed.jpg
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-plain.fig
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-plain.jpg
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/thumbnail-sample-framed.jpg
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Magick++/thumbnail-sample-plain.jpg
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/Makefile.am
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/NEWS.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/OpenMP.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/OpenMP.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/README.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/animate.html
 drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/www/api/
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/Makefile.am
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/animate.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/annotate.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/api.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/api.rst
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/api_hyperlinks.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/attribute.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/average.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/blob.html
@@ -249,31 +242,22 @@ drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/www/api/
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/texture.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/transform.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/types.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/types.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/api/widget.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/authors.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/authors.rst
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/benchmarks-1.2.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/benchmarks-1.2.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/benchmarks.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/benchmarks.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/bugs.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/bugs.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/color.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/compare.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/composite.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/conjure.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/contribute.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/contribute.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/convert.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/display.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/docutils-api.css
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/docutils-articles.css
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/download.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/download.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/favicon.ico
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/formats.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/formats.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/gm.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/identify.html
 drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/www/images/
@@ -286,33 +270,26 @@ drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/www/images/
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/images/right_triangle_option.png
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/import.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/index.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/index.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/links.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/links.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/magick.css
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/miff.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/miff.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/mission.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/mission.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/mogrify.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/montage.html
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/motion-picture.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/motion-picture.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/perl.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/perl.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/platforms.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/platforms.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/process.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/process.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/programming.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/programming.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/quantize.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/quantize.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/smile.c
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/tools.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/tools.rst
 -rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/utilities.html
--rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/utilities.rst
+drwxr-xr-x	root/root	usr/share/doc/GraphicsMagick/www/wand/
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/wand/drawing_wand.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/wand/magick_wand.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/wand/pixel_wand.html
+-rw-r--r--	root/root	usr/share/doc/GraphicsMagick/www/wand/wand.html
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/GraphicsMagick++-config.1.gz
diff --git a/extra/graphicsmagick/.md5sum b/extra/graphicsmagick/.md5sum
index e66e13da6..75e545af0 100644
--- a/extra/graphicsmagick/.md5sum
+++ b/extra/graphicsmagick/.md5sum
@@ -1 +1 @@
-42bfd382ddcda399880721170bcbf61b  GraphicsMagick-1.3.7.tar.bz2
+55182f371f82d5f9367bce04e59bbf25  GraphicsMagick-1.3.12.tar.bz2
diff --git a/extra/graphicsmagick/Pkgfile b/extra/graphicsmagick/Pkgfile
index b2018fe96..231c8e6de 100644
--- a/extra/graphicsmagick/Pkgfile
+++ b/extra/graphicsmagick/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on : freetype2, ghostscript, jasper, lcms, libxml2, libtiff
 
 name=graphicsmagick
-version=1.3.7
+version=1.3.12
 release=1
 source=(http://downloads.sourceforge.net/sourceforge/$name/GraphicsMagick-$version.tar.bz2)
 
diff --git a/extra/kompozer/.footprint b/extra/kompozer/.footprint
index 8e34db2f5..dcf21922c 100644
--- a/extra/kompozer/.footprint
+++ b/extra/kompozer/.footprint
@@ -1481,6 +1481,10 @@ drwxr-xr-x	root/root	usr/include/kompozer/plugin/
 -rw-r--r--	root/root	usr/include/kompozer/plugin/nsplugin.h
 -rw-r--r--	root/root	usr/include/kompozer/plugin/nsplugindefs.h
 -rw-r--r--	root/root	usr/include/kompozer/plugin/nspluginroot.h
+drwxr-xr-x	root/root	usr/include/kompozer/png/
+-rw-r--r--	root/root	usr/include/kompozer/png/mozpngconf.h
+-rw-r--r--	root/root	usr/include/kompozer/png/png.h
+-rw-r--r--	root/root	usr/include/kompozer/png/pngconf.h
 drwxr-xr-x	root/root	usr/include/kompozer/pref/
 -rw-r--r--	root/root	usr/include/kompozer/pref/nsIPref.h
 -rw-r--r--	root/root	usr/include/kompozer/pref/nsIPrefBranchInternal.h
diff --git a/extra/kompozer/.md5sum b/extra/kompozer/.md5sum
index d202dd59d..d15bb42c2 100644
--- a/extra/kompozer/.md5sum
+++ b/extra/kompozer/.md5sum
@@ -1,3 +1,3 @@
-96845a730b78755d9e4c9f8e4f7e525b  kompozer-0.8b1-src.tar.bz2
+cd4664ecda908666b19ef0607010c627  kompozer-0.8b3-src.tar.bz2
 bf30cca3150f822ca80bf229b0298095  kompozer.desktop
-e09245a53d35603e70237d035d91eb61  mozconfig
+12367c9ea590287f41b0213ceed0d50e  mozconfig
diff --git a/extra/kompozer/Pkgfile b/extra/kompozer/Pkgfile
index c8a1c818a..dde3614c8 100644
--- a/extra/kompozer/Pkgfile
+++ b/extra/kompozer/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on: gtk,glib,pango,nss,xorg-libxt,libidl,libgnome
 
 name=kompozer
-version=0.8b1
-release=2
-source=(http://freefr.dl.sourceforge.net/project/kompozer/current/0.8b1/$name-$version-src.tar.bz2\
+version=0.8b3
+release=1
+source=(http://freefr.dl.sourceforge.net/project/kompozer/current/$version/$name-$version-src.tar.bz2\
 	mozconfig $name.desktop)
 
 build() {
diff --git a/extra/kompozer/mozconfig b/extra/kompozer/mozconfig
index 28065007a..c1bd196cb 100644
--- a/extra/kompozer/mozconfig
+++ b/extra/kompozer/mozconfig
@@ -44,7 +44,6 @@ ac_add_options --enable-svg-renderer=cairo
 ac_add_options --enable-system-cairo
 ac_add_options --enable-canvas
 
-ac_add_options --with-system-png=/usr
 ac_add_options --with-system-jpeg=/usr
 ac_add_options --with-system-zlib=/usr
 
diff --git a/extra/live/.md5sum b/extra/live/.md5sum
index b53e9d1bf..e1f93df36 100644
--- a/extra/live/.md5sum
+++ b/extra/live/.md5sum
@@ -1 +1 @@
-2964edc82256170ffc874c7d3b0e5b06  live.2010.01.22.tar.gz
+7f56f54c1c4697764c6e88282e353e81  live.2010.04.09.tar.gz
diff --git a/extra/live/Pkgfile b/extra/live/Pkgfile
index 6b2c10ea1..5e83f560d 100644
--- a/extra/live/Pkgfile
+++ b/extra/live/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: 
 
 name=live
-version=2010.01.22
+version=2010.04.09
 release=1
 source=(http://www.live555.com/liveMedia/public/${name}.$version.tar.gz)
 
diff --git a/extra/mono/.md5sum b/extra/mono/.md5sum
index 990a5d806..a715b195a 100644
--- a/extra/mono/.md5sum
+++ b/extra/mono/.md5sum
@@ -1 +1 @@
-32d76ff066a5c69f40ee0e5c6229be01  mono-2.4.3.tar.bz2
+342a7ca3bea3cbec0c8ac48b9322fcb4  mono-2.6.4.tar.bz2
diff --git a/extra/mono/Pkgfile b/extra/mono/Pkgfile
index b7498baf3..9902caa29 100644
--- a/extra/mono/Pkgfile
+++ b/extra/mono/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: glib
 
 name=mono
-version=2.4.3
+version=2.6.4
 release=1
 source=(http://www.go-mono.com/sources/$name/$name-$version.tar.bz2)
 
diff --git a/kde/ktorrent/Pkgfile b/kde/ktorrent/Pkgfile
index cdb2cff3a..d371dce05 100755
--- a/kde/ktorrent/Pkgfile
+++ b/kde/ktorrent/Pkgfile
@@ -6,9 +6,11 @@
 
 name=ktorrent
 version=3.3.4
+
 release=1
 source=(http://ktorrent.org/downloads/$version/$name-$version.tar.bz2 \
 	$name.png  $name.desktop httpserver.patch)
+
 build() {
 	cd $name-$version
 	patch -Np0 -i $SRC/httpserver.patch	
@@ -20,9 +22,9 @@ build() {
         make
         make DESTDIR=$PKG install
 	mkdir -p $PKG/usr/share/applications
-	install -m 644 ../$name.desktop $PKG/usr/share/applications/
+	install -m 644 $SRC/$name.desktop $PKG/usr/share/applications/
 	mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps/
-	install -m 644 ../$name.png $PKG/usr/share/icons/hicolor/48x48/apps/
+	install -m 644 $SRC/$name.png $PKG/usr/share/icons/hicolor/48x48/apps/
 }
 
 
diff --git a/kde/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch b/kde/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch
deleted file mode 100644
index 01193d734..000000000
--- a/kde/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
---- generator.orig/parser/rpp/pp.h	2008-12-05 11:01:44.000000000 +0100
-+++ generator/parser/rpp/pp.h	2008-12-13 10:42:22.000000000 +0100
-@@ -30,6 +30,7 @@
- #include <cctype>
- 
- #include <fcntl.h>
-+#include <cstdio>
- 
- #ifdef HAVE_MMAP
- #  include <sys/mman.h>
\ No newline at end of file