Updated packages

29 files changed, 63 insertions, 983 deletions

diff --git a/packages/atk.py b/packages/atk.py
index 432112e..9edad41 100644
--- a/packages/atk.py
+++ b/packages/atk.py
@@ -1 +1 @@
-GnomePackage ('atk', version_major = '1.30', version_minor = '0')
+GnomePackage ('atk', version_major = '1.32', version_minor = '0')
diff --git a/packages/banshee.py b/packages/banshee.py
index e4997db..e67db8f 100644
--- a/packages/banshee.py
+++ b/packages/banshee.py
@@ -1,13 +1,12 @@
 class BansheePackage (Package):
 	def __init__ (self):
-		Package.__init__ (self, 'banshee-1', '1.7.4')
+		Package.__init__ (self, 'banshee-1', '1.8.0')
 
 		self.sources = [
-			'http://download.banshee.fm/banshee/unstable/%{version}/%{name}-%{version}.tar.bz2',
-			'patches/banshee-gnome-doc-utils-fix.patch'
+			'http://download.banshee.fm/banshee/stable/%{version}/%{name}-%{version}.tar.bz2'
 		]
 
-		self.configure = './autogen.sh --prefix=%{prefix}'
+#		self.configure = './autogen.sh --prefix=%{prefix}'
 
 		self.configure_flags = [
 			'--disable-docs',
@@ -19,7 +18,8 @@ class BansheePackage (Package):
 		self.configure_flags.extend ([
 			'--disable-mtp',
 			'--disable-daap',
-			'--disable-ipod'
+			'--disable-ipod',
+			'--disable-appledevice'
 		])
 
 		if Package.profile.name == 'darwin':
@@ -29,15 +29,11 @@ class BansheePackage (Package):
 				'--disable-mtp',
 				'--disable-daap',
 				'--disable-ipod',
-				'--with-vendor-build-id="banshee-project.org OSX 10.5+ i386/Intel"'
+				'--with-vendor-build-id="banshee.fm OSX 10.5+ i386/Intel"'
 			])
 #		elif Package.profile.name == 'linux':
 #			self.configure_flags.extend ([
 #				'--with-vendor-build-id="banshee.fm Linux i386"'
 #			])
 
-	def prep (self):
-		Package.prep (self)
-		self.sh ('patch -p1 < "%{sources[1]}"')
-
 BansheePackage ()
diff --git a/packages/cairo.py b/packages/cairo.py
index 6953ee7..604bd00 100644
--- a/packages/cairo.py
+++ b/packages/cairo.py
@@ -1,6 +1,6 @@
 class CairoPackage (CairoGraphicsPackage):
 	def __init__ (self):
-		Package.__init__ (self, 'cairo', '1.8.10')
+		Package.__init__ (self, 'cairo', '1.10.0')
 	
 	def build (self):
 		self.configure_flags = [
diff --git a/packages/freetype.py b/packages/freetype.py
index d43cdb6..2ac002a 100644
--- a/packages/freetype.py
+++ b/packages/freetype.py
@@ -1,3 +1,3 @@
-SourceForgePackage ('%{name}', 'freetype', '2.4.2', override_properties = {
+SourceForgePackage ('%{name}', 'freetype', '2.4.3', override_properties = {
 	'configure': './configure --prefix "%{prefix}"'
 })
diff --git a/packages/gdk-pixbuf.py b/packages/gdk-pixbuf.py
new file mode 100644
index 0000000..50067cc
--- /dev/null
+++ b/packages/gdk-pixbuf.py
@@ -0,0 +1,2 @@
+GnomePackage ('gdk-pixbuf', version_major = '2.22', version_minor = '1',
+	configure_flags = [ '--without-libtiff' ])
diff --git a/packages/glib.py b/packages/glib.py
index f93bd86..ea982c8 100644
--- a/packages/glib.py
+++ b/packages/glib.py
@@ -2,8 +2,8 @@ class GlibPackage (GnomePackage):
 	def __init__ (self):
 		GnomePackage.__init__ (self,
 			'glib',
-			version_major = '2.24',
-			version_minor = '1')
+			version_major = '2.26',
+			version_minor = '0')
 
 		self.darwin = Package.profile.name == 'darwin'
 		self.macports_svn = 'http://svn.macports.org/repository/macports/trunk/dports/devel/glib2/files'
diff --git a/packages/gnutls.py b/packages/gnutls.py
index a8480d2..84583ef 100644
--- a/packages/gnutls.py
+++ b/packages/gnutls.py
@@ -1 +1 @@
-GnuBz2Package ('gnutls', '2.8.6')
+GnuBz2Package ('gnutls', '2.8.6', configure_flags = [ '--disable-guile' ])
diff --git a/packages/gst-plugins-good.py b/packages/gst-plugins-good.py
index 8541059..de354e2 100644
--- a/packages/gst-plugins-good.py
+++ b/packages/gst-plugins-good.py
@@ -1,7 +1,7 @@
 class GstPluginsGoodPackage (GstreamerPackage):
 	def __init__ (self):
 		GstreamerPackage.__init__ (self, 'gstreamer', 'gst-plugins-good',
-			'0.10.24', configure_flags = [
+			'0.10.25', configure_flags = [
 				'--disable-gtk-doc',
 				'--disable-gdk_pixbuf',
 				'--disable-cairo',
diff --git a/packages/gtk+.py b/packages/gtk+.py
index 9d50c08..5193913 100644
--- a/packages/gtk+.py
+++ b/packages/gtk+.py
@@ -1,24 +1,22 @@
 class GtkPackage (GnomePackage):
 	def __init__ (self):
 		GnomePackage.__init__ (self, 'gtk+',
-			version_major = '2.20',
-			version_minor = '1',
+			version_major = '2.22',
+			version_minor = '0',
 			configure_flags = [
 				'--with-gdktarget=%{gdk_target}',
 				'--disable-cups',
-				'--without-libjasper',
-				'--without-libtiff'
+				'--without-libjasper'
 			]
 		)
 
+		self.gdk_target = 'x11'
 		if Package.profile.name == 'darwin':
 			self.gdk_target = 'quartz'
 			self.sources.extend ([
 				'http://github.com/jralls/gtk-osx-build/raw/master/patches/gdk-quartz-input-window.patch',
 				'http://git.dronelabs.com/gtk+/patch/?id=729cbea7a2b27c4b8f2062316c0f406ab4c01dac'
 			])
-		elif Package.profile.name == 'linux':
-			self.gdk_target = 'x11'
 
 	def prep (self):
 		Package.prep (self)
diff --git a/packages/libicu.py b/packages/libicu.py
index 8cc0119..2058d0f 100644
--- a/packages/libicu.py
+++ b/packages/libicu.py
@@ -1,6 +1,6 @@
-Package ('libicu', '4.4.1',
+Package ('libicu', '4.5.2',
 	source_dir_name = 'icu/source',
 	sources = [
-		'http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz'
+		'http://download.icu-project.org/files/icu4c/%{version}/icu4c-4_5_2-src.tgz'
 	]
 )
diff --git a/packages/libjpeg.py b/packages/libjpeg.py
index 42e6918..056c268 100644
--- a/packages/libjpeg.py
+++ b/packages/libjpeg.py
@@ -1,4 +1,4 @@
-Package ('libjpeg', '7',
+Package ('libjpeg', '8',
 	source_dir_name = 'jpeg-%{version}',
 	sources = [
 		'http://www.ijg.org/files/jpegsrc.v%{version}.tar.gz'
diff --git a/packages/libogg.py b/packages/libogg.py
index af3dcf0..5b5bbbd 100644
--- a/packages/libogg.py
+++ b/packages/libogg.py
@@ -1 +1 @@
-XiphPackage ('ogg', 'libogg', '1.2.0')
+XiphPackage ('ogg', 'libogg', '1.2.1')
diff --git a/packages/libpng.py b/packages/libpng.py
index cc98018..9574c5f 100644
--- a/packages/libpng.py
+++ b/packages/libpng.py
@@ -1,3 +1,3 @@
-SourceForgePackage ('%{name}', 'libpng', '1.4.3', configure_flags = [
+SourceForgePackage ('%{name}', 'libpng', '1.4.4', configure_flags = [
 	'--enable-shared'
 ])
diff --git a/packages/libproxy.py b/packages/libproxy.py
index 706bb84..f3f6279 100644
--- a/packages/libproxy.py
+++ b/packages/libproxy.py
@@ -1,3 +1,17 @@
-Package ('libproxy', '0.3.1', sources = [
-	'http://libproxy.googlecode.com/files/%{name}-%{version}.tar.bz2'
-])
+Package ('libproxy', '0.4.6',
+	sources = [
+		'http://libproxy.googlecode.com/files/%{name}-%{version}.tar.gz'
+	],
+
+	override_properties = {
+		'configure': 'cmake '
+			'-DCMAKE_INSTALL_PREFIX=%{prefix} '
+			'-DBIN_INSTALL_DIR=%{prefix}/bin '
+			'-DLIB_INSTALL_DIR=%{prefix}/lib '
+			'-DMODULE_INSTALL_DIR=%{prefix}/lib/libproxy-%{version}/modules '
+			'-DLIBEXEC_INSTALL_DIR=%{prefix}/lib/libproxy-%{version} '
+			'.',
+
+		'makeinstall': 'make install DESTDIR=%{prefix}'
+	}
+)
diff --git a/packages/librsvg.py b/packages/librsvg.py
index f5d2b6a..20a52c6 100644
--- a/packages/librsvg.py
+++ b/packages/librsvg.py
@@ -1 +1 @@
-GnomePackage ('librsvg', version_major = '2.26', version_minor = '3')
+GnomePackage ('librsvg', version_major = '2.32', version_minor = '0')
diff --git a/packages/libsoup.py b/packages/libsoup.py
index 99971d5..9575f9d 100644
--- a/packages/libsoup.py
+++ b/packages/libsoup.py
@@ -1,9 +1,9 @@
 class LibsoupPackage (GnomePackage):
 	def __init__ (self):
-		GnomePackage.__init__ (self, 'libsoup', '2.30', '2')
+		GnomePackage.__init__ (self, 'libsoup', '2.32', '0')
 		self.configure_flags = [
 			'--disable-gtk-doc',
-			' --without-gnome'
+			'--without-gnome'
 		]
 
 LibsoupPackage ()
diff --git a/packages/libvorbis.py b/packages/libvorbis.py
index 9b0578e..f2380ac 100644
--- a/packages/libvorbis.py
+++ b/packages/libvorbis.py
@@ -1 +1 @@
-XiphPackage ('vorbis', 'libvorbis', '1.3.1')
+XiphPackage ('vorbis', 'libvorbis', '1.3.2')
diff --git a/packages/libxml2.py b/packages/libxml2.py
index 3c291ea..d276efd 100644
--- a/packages/libxml2.py
+++ b/packages/libxml2.py
@@ -1,4 +1,4 @@
-Package ('libxml2', '2.7.7',
+Package ('libxml2', '2.7.8',
 	configure_flags = [ '--with-python=no' ],
 	sources = [
 		'ftp://xmlsoft.org/%{name}/%{name}-%{version}.tar.gz'			
diff --git a/packages/mono.py b/packages/mono.py
index 17cb8cb..a1443dc 100644
--- a/packages/mono.py
+++ b/packages/mono.py
@@ -1,6 +1,6 @@
 class MonoPackage (Package):
 	def __init__ (self):
-		Package.__init__ (self, 'mono', '2.6.7',
+		Package.__init__ (self, 'mono', '2.8',
 			sources = [
 				'http://ftp.novell.com/pub/%{name}/sources/%{name}/%{name}-%{version}.tar.bz2',
 				'patches/mono-runtime-relocation.patch'
@@ -13,12 +13,13 @@ class MonoPackage (Package):
 				'--enable-quiet-build'
 			]
 		)
+
 		# Mono (in libgc) likes to fail to build randomly
 		self.make = 'for((i=0;i<20;i++)); do make && break; done'
 
-	def prep (self):
-		Package.prep (self)
-		self.sh ('patch -p1 < "%{sources[1]}"')
+#	def prep (self):
+#		Package.prep (self)
+#		self.sh ('patch -p1 < "%{sources[1]}"')
 
 	def install (self):
 		Package.install (self)
diff --git a/packages/murrine.py b/packages/murrine.py
index 07239f0..18cc357 100644
--- a/packages/murrine.py
+++ b/packages/murrine.py
@@ -2,13 +2,14 @@ class MurrinePackage (GnomePackage):
 	def __init__ (self):
 		GnomePackage.__init__ (self,
 			'murrine',
-			version_major = '0.90',
-			version_minor = '3')
+			version_major = '0.98',
+			version_minor = '1')
 
-		self.sources.append ('patches/murrine-osx.patch')
-
-	def prep (self):
-		Package.prep (self)
-		self.sh ('patch -p1 < "%{sources[1]}"')
+# FIXME: this may need porting
+#		self.sources.append ('patches/murrine-osx.patch')
+#
+#	def prep (self):
+#		Package.prep (self)
+#		self.sh ('patch -p1 < "%{sources[1]}"')
 
 MurrinePackage ()
diff --git a/packages/pango.py b/packages/pango.py
index 5041bdf..4f4fdb9 100644
--- a/packages/pango.py
+++ b/packages/pango.py
@@ -3,7 +3,7 @@ class PangoPackage (GnomePackage):
 		GnomePackage.__init__ (self,
 			'pango',
 			version_major = '1.28',
-			version_minor = '1',
+			version_minor = '3',
 			configure_flags = [
 				'--without-x'
 			]
diff --git a/packages/patches/banshee-gnome-doc-utils-fix.patch b/packages/patches/banshee-gnome-doc-utils-fix.patch
deleted file mode 100644
index 43277b3..0000000
--- a/packages/patches/banshee-gnome-doc-utils-fix.patch
+++ /dev/null
@@ -1,773 +0,0 @@
-From 372849d19bbfe36179120f95020f8cddcb8e4a90 Mon Sep 17 00:00:00 2001
-From: Aaron Bockover <abockover@novell.com>
-Date: Mon, 30 Aug 2010 14:35:25 -0400
-Subject: [PATCH] Bring gnome-doc-utils autofoo crap into the tree
-
-gnome-doc-utils' build is a nightmare. I try to make this a little saner
-and safer by not running gnome-doc-prepare in autogen. Doing this the
-way we were doing it means it's possible for a tarball to be released
-without the necessary m4 and .make includes.
-
-It's very tricky and gross to /optionally/ support gnome-doc-utils in
-the build. Because of this, both the required .m4 and .make files are
-included explicitly in the tree now, which means they must be updated as
-well, when fixes are introduced upstream. Tough luck.
-
-Also, I reintroduce the fact that ENABLE_SK is only defined when
-GNOME_DOC_INIT is called. When this is called, there's a mandatory
-pkg-config requirement for gnome-doc-utils. Therefore, we only call
-GNOME_DOC_INIT if we actually want to enable gnome-doc-utils support. If
-the support is disabled, we still need to ensure ENABLE_SK is defined,
-so this is now defined to false before any possible call to
-GNOME_DOC_INIT, which can override ENABLE_SK to whatever it pleases.
-
-Gross.
----
- autogen.sh                          |   10 -
- build/gnome-doc-utils.make          |  655 +++++++++++++++++++++++++++++++++++
- build/m4/banshee/gnome-doc-utils.m4 |   56 +++
- build/m4/shamrock/gnome-doc.m4      |    3 +
- 4 files changed, 714 insertions(+), 10 deletions(-)
- create mode 100644 build/gnome-doc-utils.make
- create mode 100644 build/m4/banshee/gnome-doc-utils.m4
-
-diff --git a/build/gnome-doc-utils.make b/build/gnome-doc-utils.make
-new file mode 100644
-index 0000000..97fd549
---- /dev/null
-+++ b/build/gnome-doc-utils.make
-@@ -0,0 +1,655 @@
-+# gnome-doc-utils.make - make magic for building documentation
-+# Copyright (C) 2004-2005 Shaun McCance <shaunm@gnome.org>
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software Foundation,
-+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+################################################################################
-+## @@ Generating Header Files
-+
-+## @ DOC_H_FILE
-+## The name of the header file to generate
-+DOC_H_FILE ?=
-+
-+## @ DOC_H_DOCS
-+## The input DocBook files for generating the header file
-+DOC_H_DOCS ?=
-+
-+$(DOC_H_FILE): $(DOC_H_DOCS);
-+	@rm -f $@.tmp; touch $@.tmp;
-+	echo 'const gchar* documentation_credits[] = {' >> $@.tmp
-+	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-+	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-+	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-+	  xsltproc --path "$$xmlpath" $(_credits) $$doc; \
-+	done | sort | uniq \
-+	  | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
-+	  | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
-+	echo '	NULL' >> $@.tmp
-+	echo '};' >> $@.tmp
-+	echo >> $@.tmp
-+	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-+	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-+	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-+	  docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
-+	    | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
-+	  echo $$xmlpath; \
-+	  ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
-+	  for id in $$ids; do \
-+	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
-+	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
-+	  done; \
-+	  echo >> $@.tmp; \
-+	done;
-+	cp $@.tmp $@ && rm -f $@.tmp
-+
-+dist-check-gdu:
-+if !HAVE_GNOME_DOC_UTILS
-+	@echo "*** GNOME Doc Utils must be installed in order to make dist"
-+	@false
-+endif
-+
-+.PHONY: dist-doc-header
-+dist-doc-header: $(DOC_H_FILE)
-+	@if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
-+	echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
-+	$(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
-+
-+doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
-+
-+.PHONY: clean-doc-header
-+_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-+clean-local: $(_clean_doc_header)
-+distclean-local: $(_clean_doc_header)
-+mostlyclean-local: $(_clean_doc_header)
-+maintainer-clean-local: $(_clean_doc_header)
-+clean-doc-header:
-+	rm -f $(DOC_H_FILE)
-+
-+all: $(DOC_H_FILE)
-+
-+
-+################################################################################
-+## @@ Generating Documentation Files
-+
-+## @ DOC_MODULE
-+## The name of the document being built
-+DOC_MODULE ?=
-+
-+## @ DOC_ID
-+## The unique identifier for a Mallard document
-+DOC_ID ?=
-+
-+## @ DOC_PAGES
-+## Page files in a Mallard document
-+DOC_PAGES ?=
-+
-+## @ DOC_ENTITIES
-+## Files included with a SYSTEM entity
-+DOC_ENTITIES ?=
-+
-+## @ DOC_INCLUDES
-+## Files included with XInclude
-+DOC_INCLUDES ?=
-+
-+## @ DOC_FIGURES
-+## Figures and other external data
-+DOC_FIGURES ?=
-+
-+## @ DOC_FORMATS
-+## The default formats to be built and installed
-+DOC_FORMATS ?= docbook
-+_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
-+
-+## @ DOC_LINGUAS
-+## The languages this document is translated into
-+DOC_LINGUAS ?=
-+_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),		\
-+	$(filter $(LINGUAS),$(DOC_LINGUAS)),					\
-+	$(DOC_LINGUAS))
-+
-+_DOC_ABS_SRCDIR = @abs_srcdir@
-+
-+
-+################################################################################
-+## Variables for Bootstrapping
-+
-+_xml2po ?= `which xml2po`
-+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
-+
-+_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
-+_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-+_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
-+_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
-+_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-+_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-+
-+if ENABLE_SK
-+_ENABLE_SK = true
-+_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
-+_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
-+_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
-+endif
-+
-+
-+################################################################################
-+## @@ Rules for OMF Files
-+
-+db2omf_args =									\
-+	--stringparam db2omf.basename $(DOC_MODULE)				\
-+	--stringparam db2omf.format $(3)					\
-+	--stringparam db2omf.dtd						\
-+	$(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 		\
-+		| sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/')			\
-+	--stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2)))	\
-+	--stringparam db2omf.omf_dir "$(OMF_DIR)"				\
-+	--stringparam db2omf.help_dir "$(HELP_DIR)"				\
-+	--stringparam db2omf.omf_in "$(_DOC_OMF_IN)"				\
-+	$(if $(_ENABLE_SK),							\
-+	  --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)")		\
-+	$(_db2omf) $(2)
-+
-+## @ _DOC_OMF_IN
-+## The OMF input file
-+_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
-+
-+## @ _DOC_OMF_DB
-+## The OMF files for DocBook output
-+_DOC_OMF_DB = $(if $(_DOC_OMF_IN),						\
-+	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
-+
-+$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
-+$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
-+	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-+	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
-+	  echo "Please check your ScrollKeeper installation." >&2;		\
-+	  exit 1; }
-+	xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
-+
-+## @ _DOC_OMF_HTML
-+## The OMF files for HTML output
-+_DOC_OMF_HTML = $(if $(_DOC_OMF_IN),						\
-+	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf))
-+
-+$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
-+$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
-+if ENABLE_SK
-+	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-+	  echo "The file '$(_skcontentslist)' does not exist" >&2;		\
-+	  echo "Please check your ScrollKeeper installation." >&2;		\
-+	  exit 1; }
-+endif
-+	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
-+
-+## @ _DOC_OMF_ALL
-+## All OMF output files to be built
-+# FIXME
-+_DOC_OMF_ALL =									\
-+	$(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB))		\
-+	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
-+
-+.PHONY: omf
-+omf: $(_DOC_OMF_ALL)
-+
-+
-+################################################################################
-+## @@ C Locale Documents
-+
-+## @ _DOC_C_MODULE
-+## The top-level documentation file in the C locale
-+_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-+
-+## @ _DOC_C_PAGES
-+## Page files in a Mallard document in the C locale
-+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
-+
-+## @ _DOC_C_ENTITIES
-+## Files included with a SYSTEM entity in the C locale
-+_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
-+
-+## @ _DOC_C_XINCLUDES
-+## Files included with XInclude in the C locale
-+_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
-+
-+## @ _DOC_C_DOCS
-+## All documentation files in the C locale
-+_DOC_C_DOCS =								\
-+	$(_DOC_C_ENTITIES)	$(_DOC_C_INCLUDES)			\
-+	$(_DOC_C_PAGES)		$(_DOC_C_MODULE)
-+
-+## @ _DOC_C_DOCS_NOENT
-+## All documentation files in the C locale,
-+## except files included with a SYSTEM entity
-+_DOC_C_DOCS_NOENT =							\
-+	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)			\
-+	$(_DOC_C_PAGES)
-+
-+## @ _DOC_C_FIGURES
-+## All figures and other external data in the C locale
-+_DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
-+	$(foreach fig,$(DOC_FIGURES),C/$(fig)),				\
-+	$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png)))
-+
-+## @ _DOC_C_HTML
-+## All HTML documentation in the C locale
-+# FIXME: probably have to shell escape to determine the file names
-+_DOC_C_HTML = $(foreach f,						\
-+	$(shell xsltproc --xinclude 					\
-+	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
-+	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
-+	C/$(f).xhtml)
-+
-+###############################################################################
-+## @@ Other Locale Documentation
-+
-+## @ _DOC_POFILES
-+## The .po files used for translating the document
-+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
-+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-+
-+.PHONY: po
-+po: $(_DOC_POFILES)
-+
-+## @ _DOC_MOFILES
-+## The .mo files used for translating the document
-+_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
-+
-+.PHONY: mo
-+mo: $(_DOC_MOFILES)
-+
-+## @ _DOC_LC_MODULES
-+## The top-level documentation files in all other locales
-+_DOC_LC_MODULES = $(if $(DOC_MODULE),						\
-+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-+
-+## @ _DOC_LC_PAGES
-+## Page files in a Mallard document in all other locales
-+_DOC_LC_PAGES =									\
-+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),	\
-+		$(lc)/$(notdir $(page)) ))
-+
-+## @ _DOC_LC_XINCLUDES
-+## Files included with XInclude in all other locales
-+_DOC_LC_INCLUDES =								\
-+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES),	\
-+		$(lc)/$(notdir $(inc)) ))
-+
-+## @ _DOC_LC_HTML
-+## All HTML documentation in all other locales
-+# FIXME: probably have to shell escape to determine the file names
-+_DOC_LC_HTML =									\
-+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML),		\
-+		$(lc)/$(notdir $(doc)) ))
-+
-+## @ _DOC_LC_DOCS
-+## All documentation files in all other locales
-+_DOC_LC_DOCS =									\
-+	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)	$(_DOC_LC_PAGES)	\
-+	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-+
-+## @ _DOC_LC_FIGURES
-+## All figures and other external data in all other locales
-+_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS),				\
-+	$(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) )
-+
-+_DOC_SRC_FIGURES =								\
-+	$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS),	\
-+		$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
-+
-+$(_DOC_POFILES):
-+	@if ! test -d $(dir $@); then \
-+	  echo "mkdir $(dir $@)"; \
-+	  mkdir "$(dir $@)"; \
-+	fi
-+	@if test ! -f $@ -a -f $(srcdir)/$@; then \
-+	  echo "cp $(srcdir)/$@ $@"; \
-+	  cp "$(srcdir)/$@" "$@"; \
-+	fi;
-+	@docs=; \
-+	list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
-+	  docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
-+	done; \
-+	if ! test -f $@; then \
-+	  echo "(cd $(dir $@) && \
-+	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-+	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
-+	  (cd $(dir $@) && \
-+	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-+	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
-+	else \
-+	  echo "(cd $(dir $@) && \
-+	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
-+	  (cd $(dir $@) && \
-+	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
-+	fi
-+
-+$(_DOC_MOFILES): %.mo: %.po
-+	@if ! test -d $(dir $@); then \
-+	  echo "mkdir $(dir $@)"; \
-+	  mkdir "$(dir $@)"; \
-+	fi
-+	msgfmt -o $@ $<
-+
-+# FIXME: fix the dependancy
-+# FIXME: hook xml2po up
-+$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
-+$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
-+	if ! test -d $(dir $@); then mkdir $(dir $@); fi
-+	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
-+	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
-+	if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
-+	(cd $(dir $@) && \
-+	  $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
-+	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
-+	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
-+
-+## @ _DOC_POT
-+## A pot file
-+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
-+.PHONY: pot
-+pot: $(_DOC_POT)
-+$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-+	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-+
-+
-+################################################################################
-+## @@ All Documentation
-+
-+## @ _DOC_HTML_ALL
-+## All HTML documentation, only if it's built
-+_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
-+	$(_DOC_C_HTML) $(_DOC_LC_HTML))
-+
-+_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
-+
-+$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-+	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-+
-+
-+################################################################################
-+## All
-+
-+all:							\
-+	$(_DOC_C_DOCS)		$(_DOC_LC_DOCS)		\
-+	$(_DOC_OMF_ALL)		$(_DOC_DSK_ALL)		\
-+	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
-+
-+
-+################################################################################
-+## Clean
-+
-+.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-+
-+clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-+clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
-+clean-doc-lc:
-+	rm -f $(_DOC_LC_DOCS)
-+	rm -f $(_DOC_MOFILES)
-+	@list='$(_DOC_POFILES)'; for po in $$list; do \
-+	  if ! test "$$po" -ef "$(srcdir)/$$po"; then \
-+	    echo "rm -f $$po"; \
-+	    rm -f "$$po"; \
-+	  fi; \
-+	done
-+#	.xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
-+	@for lc in C $(_DOC_REAL_LINGUAS); do \
-+	  if test -f "$$lc/.xml2po.mo"; then \
-+	    echo "rm -f $$lc/.xml2po.mo"; \
-+	    rm -f "$$lc/.xml2po.mo"; \
-+	  fi; \
-+	done
-+clean-doc-dir: clean-doc-lc
-+	@for lc in C $(_DOC_REAL_LINGUAS); do \
-+	  for dir in `find $$lc -depth -type d`; do \
-+	    if ! test $$dir -ef $(srcdir)/$$dir; then \
-+	      echo "rmdir $$dir"; \
-+	      rmdir "$$dir"; \
-+	   fi; \
-+	  done; \
-+	done
-+
-+_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
-+_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
-+_clean_lc  = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-+
-+clean-local:						\
-+	$(_clean_omf)		$(_clean_dsk)		\
-+	$(_clean_lc)		$(_clean_dir)
-+distclean-local:					\
-+	$(_clean_omf)		$(_clean_dsk)		\
-+	$(_clean_lc)		$(_clean_dir)
-+mostlyclean-local:					\
-+	$(_clean_omf)		$(_clean_dsk)		\
-+	$(_clean_lc)		$(_clean_dir)
-+maintainer-clean-local:					\
-+	$(_clean_omf)		$(_clean_dsk)		\
-+	$(_clean_lc)		$(_clean_dir)
-+
-+
-+
-+################################################################################
-+## Dist
-+
-+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-+doc-dist-hook: 						\
-+	$(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)	\
-+	$(if $(_DOC_C_FIGURES),dist-doc-figs)		\
-+	$(if $(_DOC_OMF_IN),dist-doc-omf)
-+#	$(if $(_DOC_DSK_IN),dist-doc-dsk)
-+
-+dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
-+	@for lc in C $(_DOC_REAL_LINGUAS); do \
-+	  echo " $(mkinstalldirs) $(distdir)/$$lc"; \
-+	  $(mkinstalldirs) "$(distdir)/$$lc"; \
-+	done
-+	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
-+	for doc in $$list; do \
-+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+	    if ! test -d "$(distdir)/$$docdir"; then \
-+	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+	    fi; \
-+	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
-+	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
-+	done
-+
-+dist-doc-figs: $(_DOC_SRC_FIGURES)
-+	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \
-+	for fig in $$list; do \
-+	  if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
-+	  if test -f "$$d$$fig"; then \
-+	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+	    if ! test -d "$(distdir)/$$figdir"; then \
-+	      echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
-+	      $(mkinstalldirs) "$(distdir)/$$figdir"; \
-+	    fi; \
-+	    echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \
-+	    $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \
-+	  fi; \
-+	done;
-+
-+dist-doc-omf:
-+	@if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \
-+	echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \
-+	$(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))"
-+
-+dist-doc-dsk:
-+	@if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \
-+	echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
-+	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-+
-+
-+
-+################################################################################
-+## Check
-+
-+.PHONY: check-doc-docs check-doc-omf
-+check:							\
-+	$(if $(DOC_MODULE),check-doc-docs)		\
-+	$(if $(DOC_ID),check-doc-pages)			\
-+	$(if $(_DOC_OMF_IN),check-doc-omf)
-+
-+check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-+	@for lc in C $(_DOC_REAL_LINGUAS); do \
-+	  if test -f "$$lc"; \
-+	    then d=; \
-+	    xmlpath="$$lc"; \
-+	  else \
-+	    d="$(srcdir)/"; \
-+	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-+	  fi; \
-+	  echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \
-+	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
-+	done
-+
-+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
-+	for lc in C $(_DOC_REAL_LINGUAS); do \
-+	  if test -f "$$lc"; \
-+	    then d=; \
-+	    xmlpath="$$lc"; \
-+	  else \
-+	    d="$(srcdir)/"; \
-+	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-+	  fi; \
-+	  for page in $(DOC_PAGES); do \
-+	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-+	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
-+	  done; \
-+	done
-+
-+check-doc-omf: $(_DOC_OMF_ALL)
-+	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-+	  echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+	  xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+	done
-+
-+
-+
-+################################################################################
-+## Install
-+
-+.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-+
-+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-+
-+install-data-local:					\
-+	$(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)	\
-+	$(if $(_DOC_HTML_ALL),install-doc-html)		\
-+	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
-+	$(if $(_DOC_OMF_IN),install-doc-omf)
-+#	$(if $(_DOC_DSK_IN),install-doc-dsk)
-+
-+install-doc-docs:
-+	@for lc in C $(_DOC_REAL_LINGUAS); do \
-+	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
-+	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
-+	done
-+	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
-+	  if ! test -d "$$docdir"; then \
-+	    echo "$(mkinstalldirs) $$docdir"; \
-+	    $(mkinstalldirs) "$$docdir"; \
-+	  fi; \
-+	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
-+	done
-+
-+install-doc-figs:
-+	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
-+	  for lc in C $(_DOC_REAL_LINGUAS); do \
-+	    figsymlink=false; \
-+	    if test -f "$$lc/$$fig"; then \
-+	      figfile="$$lc/$$fig"; \
-+	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
-+	      figfile="$(srcdir)/$$lc/$$fig"; \
-+	    else \
-+	      figsymlink=true; \
-+	    fi; \
-+	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+	    figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
-+	    if ! test -d "$$figdir"; then \
-+	      echo "$(mkinstalldirs) $$figdir"; \
-+	      $(mkinstalldirs) "$$figdir"; \
-+	    fi; \
-+	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-+	    if $$figsymlink; then \
-+	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
-+	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
-+	    else \
-+	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-+	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-+	    fi; \
-+	  done; \
-+	done
-+
-+install-doc-html:
-+	echo install-html
-+
-+install-doc-omf:
-+	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
-+	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-+	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
-+	done
-+	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
-+	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-+	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-+	fi;
-+
-+install-doc-dsk:
-+	echo install-dsk
-+
-+
-+
-+################################################################################
-+## Uninstall
-+
-+.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
-+uninstall-local:					\
-+	$(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs)	\
-+	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
-+	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
-+	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-+#	$(if $(_DOC_DSK_IN),uninstall-doc-dsk)
-+
-+uninstall-doc-docs:
-+	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-+	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+	done
-+
-+uninstall-doc-figs:
-+	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-+	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-+	done;
-+
-+uninstall-doc-omf:
-+	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-+	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
-+	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+	  fi; \
-+	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+	done
-diff --git a/build/m4/banshee/gnome-doc-utils.m4 b/build/m4/banshee/gnome-doc-utils.m4
-new file mode 100644
-index 0000000..402bb3e
---- /dev/null
-+++ b/build/m4/banshee/gnome-doc-utils.m4
-@@ -0,0 +1,56 @@
-+dnl Do not call GNOME_DOC_DEFINES directly.  It is split out from
-+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
-+AC_DEFUN([GNOME_DOC_DEFINES],
-+[
-+AC_ARG_WITH([help-dir],
-+  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-+  [with_help_dir='${datadir}/gnome/help'])
-+HELP_DIR="$with_help_dir"
-+AC_SUBST(HELP_DIR)
-+
-+AC_ARG_WITH([omf-dir],
-+  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-+  [with_omf_dir='${datadir}/omf'])
-+OMF_DIR="$with_omf_dir"
-+AC_SUBST(OMF_DIR)
-+
-+AC_ARG_WITH([help-formats],
-+  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-+  [with_help_formats=''])
-+DOC_USER_FORMATS="$with_help_formats"
-+AC_SUBST(DOC_USER_FORMATS)
-+
-+AC_ARG_ENABLE([scrollkeeper],
-+	[AC_HELP_STRING([--disable-scrollkeeper],
-+			[do not make updates to the scrollkeeper database])],,
-+	enable_scrollkeeper=yes)
-+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
-+
-+dnl disable scrollkeeper automatically for distcheck
-+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-+
-+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
-+])
-+
-+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-+#
-+AC_DEFUN([GNOME_DOC_INIT],
-+[AC_REQUIRE([AC_PROG_LN_S])dnl
-+
-+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-+
-+AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
-+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-+	[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-+
-+if test "$gdu_cv_have_gdu" = "yes"; then
-+	AC_MSG_RESULT([yes])
-+	ifelse([$2],,[:],[$2])
-+else
-+	AC_MSG_RESULT([no])
-+	ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
-+fi
-+
-+GNOME_DOC_DEFINES
-+])
-diff --git a/build/m4/shamrock/gnome-doc.m4 b/build/m4/shamrock/gnome-doc.m4
-index a7a05b5..e7340e9 100644
---- a/build/m4/shamrock/gnome-doc.m4
-+++ b/build/m4/shamrock/gnome-doc.m4
-@@ -12,6 +12,9 @@ AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS],
- 		PKG_CHECK_MODULES(GNOME_DOC_UTILS, gnome-doc-utils)
- 	fi
- 
-+	# GNOME_DOC_INIT sets ENABLE_SK, but if we have disabled
-+	# user docs, then this needs to be defined manually.
-+	AM_CONDITIONAL(ENABLE_SK, false)
- 	if test "x$enable_user_help" = "xyes"; then
- 		GNOME_DOC_INIT([$1], enable_user_help=yes, enable_user_help=no)
- 	fi
--- 
-1.7.1
-
diff --git a/packages/patches/monobjc/Makefile b/packages/patches/monobjc/Makefile
deleted file mode 100644
index 1230028..0000000
--- a/packages/patches/monobjc/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-SOURCES = $(wildcard *.mm)
-OBJECTS = $(SOURCES:.mm=.o)
-DYLIB =   libmonobjc.2.dylib
-
-CURRENT_VERSION = 2.0.0
-COMPATIBILITY_VERSION = 2.0.0
-
-CFLAGS := $(CFLAGS) \
-	-mstackrealign \
-	-x objective-c++ \
-
-LDFLAGS := $(LDFLAGS) \
-	-lobjc \
-	-lstdc++ \
-	-framework Foundation \
-	-shared \
-	-install_name $(DYLIB) \
-	-compatibility_version $(COMPATIBILITY_VERSION) \
-	-current_version $(CURRENT_VERSION)
-
-all: $(SOURCES) $(DYLIB)
-
-$(DYLIB): $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
-
-%.o: %.mm
-	$(CC) $(CFLAGS) -c $< -o $@
-
-clean:
-	rm -f $(OBJECTS) $(DYLIB)
diff --git a/packages/patches/monobjc/PkgConfigGenerator.cs b/packages/patches/monobjc/PkgConfigGenerator.cs
deleted file mode 100644
index ed814cb..0000000
--- a/packages/patches/monobjc/PkgConfigGenerator.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-
-public static class PkgConfigGenerator
-{
-    private static List<Assembly> assemblies = new List<Assembly> ();
-
-    public static void Main (string [] args)
-    {
-        var asm = Assembly.LoadFrom (args[0]);
-        var asm_name = asm.GetName ();
-        WalkAssembly (asm);
-
-        Console.WriteLine ("Name: {0}", asm_name.Name);
-        Console.WriteLine ("Description:");
-        Console.WriteLine ("Version: {0}", asm_name.Version);
-        Console.Write ("Libs: ");
-        foreach (var dep in assemblies) {
-            if (dep.GetName ().Name != "mscorlib") {
-                Console.Write ("-r:{0} ", dep.Location);
-            }
-        }
-        Console.WriteLine ();
-    }
-
-    private static void WalkAssembly (Assembly asm)
-    {
-        if (assemblies.Contains (asm)) {
-            return;
-        }
-
-        assemblies.Add (asm);
-
-        foreach (var rname in asm.GetReferencedAssemblies ()) {
-            WalkAssembly (Assembly.Load (rname.FullName));
-        }
-    }
-}
diff --git a/packages/patches/monobjc/nant-disable-native-enable-debug.patch b/packages/patches/monobjc/nant-disable-native-enable-debug.patch
deleted file mode 100644
index 082c23a..0000000
--- a/packages/patches/monobjc/nant-disable-native-enable-debug.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Monobjc.build b/Monobjc.build
-index 03546ab..83c350b 100644
---- a/Monobjc.build
-+++ b/Monobjc.build
-@@ -60,12 +60,16 @@
-   ================================================================================ -->

-   <target name="build-libraries" description="Build the two set of libraries" depends="banner, prepare">

-     <!-- Native libraries -->

-+    <!--

-     <call target="build-libraries-native"/>

-+    -->

-     

-     <!-- Version : 1.0 -->

-+    <!--

-     <property name="version" value="1.0"/>

-     <property name="define" value="ENABLE_SHORT_KEY;ENABLE_FAST_PATH"/>

-     <call target="build-libraries-intern"/>

-+    -->

-     

-     <!-- Version : 2.0 -->

-     <property name="version" value="2.0"/>

-@@ -513,6 +517,7 @@ public static String FormatVersion(String version) {
-     		output="${output.dir}/${lib.name}.dll"

-     		doc="${output.dir}/${lib.name}.xml"

-     		define="${define}"

-+    		debug="true"

-     		keyfile="${keyfile}">

-       <sources>

-         <include name="${build.dir}/GeneratedAssemblyInfo.${version}.${hg.revision}.0.cs"/>

diff --git a/packages/patches/monobjc/remove-executable-path-dllimport.patch b/packages/patches/monobjc/remove-executable-path-dllimport.patch
deleted file mode 100644
index 82d9922..0000000
--- a/packages/patches/monobjc/remove-executable-path-dllimport.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/src/libraries/Monobjc/Runtime/ObjectiveC20/NativeMethods.cs b/src/libraries/Monobjc/Runtime/ObjectiveC20/NativeMethods.cs
-index 74ce891..c44aa30 100644
---- a/src/libraries/Monobjc/Runtime/ObjectiveC20/NativeMethods.cs
-+++ b/src/libraries/Monobjc/Runtime/ObjectiveC20/NativeMethods.cs
-@@ -197,7 +197,7 @@ namespace Monobjc.Runtime.ObjectiveC20
-         /// <summary>

-         /// <para></para>

-         /// </summary>

--        [DllImport("@executable_path/libmonobjc.2.dylib", EntryPoint = "hook_thread_lifecycle")]

-+        [DllImport("libmonobjc.2.dylib", EntryPoint = "hook_thread_lifecycle")]

-         public static extern int hook_thread_lifecycle();

- 

-         /// <summary>

-@@ -205,7 +205,7 @@ namespace Monobjc.Runtime.ObjectiveC20
-         /// </summary>

-         /// <param name="callback"></param>

-         /// <returns></returns>

--        [DllImport("@executable_path/libmonobjc.2.dylib", EntryPoint = "set_dealloc_callback")]

-+        [DllImport("libmonobjc.2.dylib", EntryPoint = "set_dealloc_callback")]

-         public static extern bool set_dealloc_callback(RuntimeBridge.DeallocCallback callback);

- 

-         /// <summary>

-@@ -213,7 +213,7 @@ namespace Monobjc.Runtime.ObjectiveC20
-         /// </summary>

-         /// <param name="cls"></param>

-         /// <returns></returns>

--        [DllImport("@executable_path/libmonobjc.2.dylib", EntryPoint = "intercept_dealloc_for")]

-+        [DllImport("libmonobjc.2.dylib", EntryPoint = "intercept_dealloc_for")]

-         public static extern bool intercept_dealloc_for(IntPtr cls);

- 

-         /// <summary>

-@@ -221,7 +221,7 @@ namespace Monobjc.Runtime.ObjectiveC20
-         /// </summary>

-         /// <param name="target"></param>

-         /// <returns></returns>

--        [DllImport("@executable_path/libmonobjc.2.dylib", EntryPoint = "add_object")]

-+        [DllImport("libmonobjc.2.dylib", EntryPoint = "add_object")]

-         public static extern bool add_object(IntPtr target);

- 

-         /// <summary>

-@@ -229,7 +229,7 @@ namespace Monobjc.Runtime.ObjectiveC20
-         /// </summary>

-         /// <param name="target"></param>

-         /// <returns></returns>

--        [DllImport("@executable_path/libmonobjc.2.dylib", EntryPoint = "contains_object")]

-+        [DllImport("libmonobjc.2.dylib", EntryPoint = "contains_object")]

-         public static extern int contains_object(IntPtr target);

- 

-         /// <summary>

-@@ -237,8 +237,8 @@ namespace Monobjc.Runtime.ObjectiveC20
-         /// </summary>

-         /// <param name="target"></param>

-         /// <returns></returns>

--        [DllImport("@executable_path/libmonobjc.2.dylib", EntryPoint = "remove_object")]

-+        [DllImport("libmonobjc.2.dylib", EntryPoint = "remove_object")]

-         public static extern bool remove_object(IntPtr target);

- #endif

-     }

--}
-\ No newline at end of file
-+}

diff --git a/packages/pixman.py b/packages/pixman.py
index 81a7ddf..84236b1 100644
--- a/packages/pixman.py
+++ b/packages/pixman.py
@@ -1 +1 @@
-CairoGraphicsPackage ('pixman', '0.18.2')
+CairoGraphicsPackage ('pixman', '0.20.0')
diff --git a/packages/sqlite.py b/packages/sqlite.py
index 4c8efb8..e85e73c 100644
--- a/packages/sqlite.py
+++ b/packages/sqlite.py
@@ -1,3 +1,3 @@
-Package ('sqlite', '3.6.23.1', sources = [
+Package ('sqlite', '3.7.3', sources = [
 	'http://www.sqlite.org/sqlite-amalgamation-%{version}.tar.gz'
 ])
diff --git a/packages/webkit.py b/packages/webkit.py
index 4616948..5211119 100644
--- a/packages/webkit.py
+++ b/packages/webkit.py
@@ -1,4 +1,4 @@
-Package ('webkit', '1.2.3',
+Package ('webkit', '1.2.5',
 	sources = [ 'http://webkitgtk.org/%{name}-%{version}.tar.gz' ],
 	configure_flags = [
 		'--disable-video',