From e9e815aa9246a934b37206a5a354a48f03c7e1c3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 22 Dec 2009 22:25:53 +0100
Subject: [PATCH 01/43] MesaLib: update to 7.7.

--HG--
extra : convert_revision : fc7d22508fa7fe77e460874d32d802671bb25329
---
 srcpkgs/MesaLib/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 08b3003a22f..d52b129feaf 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,14 +1,13 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
-version=7.6
-revision=1
+version=7.7
 wrksrc="Mesa-$version"
 distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-glx-tls --enable-xcb"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830
+checksum=6252d7d4190b47f70d0e4ec0edbd5a70f2261c5f6e66859e5fd2572c1df6357a
 long_desc="
  MesaLib is a 3-D graphics library with an API which is very similar to
  that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax

From 01f4f5f491d49476cbe49882067995aab3454d54 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 22 Dec 2009 23:35:56 +0100
Subject: [PATCH 02/43] Added compiz-0.8.4 build template.

--HG--
extra : convert_revision : a05c29236a9eb9607d3c5b3bb3844a4261e729d6
---
 srcpkgs/compiz-devel                 |  1 +
 srcpkgs/compiz/compiz-devel.template | 26 +++++++++++++++++++++
 srcpkgs/compiz/depends               |  2 ++
 srcpkgs/compiz/template              | 35 ++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/compiz-devel
 create mode 100644 srcpkgs/compiz/compiz-devel.template
 create mode 100644 srcpkgs/compiz/depends
 create mode 100644 srcpkgs/compiz/template

diff --git a/srcpkgs/compiz-devel b/srcpkgs/compiz-devel
new file mode 120000
index 00000000000..abc11f71699
--- /dev/null
+++ b/srcpkgs/compiz-devel
@@ -0,0 +1 @@
+compiz
\ No newline at end of file
diff --git a/srcpkgs/compiz/compiz-devel.template b/srcpkgs/compiz/compiz-devel.template
new file mode 100644
index 00000000000..42f359aecb7
--- /dev/null
+++ b/srcpkgs/compiz/compiz-devel.template
@@ -0,0 +1,26 @@
+# Template file for 'compiz-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glibc-devel
+Add_dependency run gtk+-devel
+Add_dependency run libwnck-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run libxslt-devel
+Add_dependency run librsvg-devel
+Add_dependency run MesaLib-devel
+Add_dependency run startup-notification-devel
+Add_dependency run fuse-devel
+Add_dependency run compiz
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/compiz
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/compiz/*.a ${DESTDIR}/usr/lib/compiz
+}
diff --git a/srcpkgs/compiz/depends b/srcpkgs/compiz/depends
new file mode 100644
index 00000000000..67f3e101502
--- /dev/null
+++ b/srcpkgs/compiz/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.8.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/compiz/template b/srcpkgs/compiz/template
new file mode 100644
index 00000000000..180415893d9
--- /dev/null
+++ b/srcpkgs/compiz/template
@@ -0,0 +1,35 @@
+# Template file for 'compiz'
+pkgname=compiz
+version=0.8.4
+distfiles="http://releases.compiz.org/$version/compiz-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-gconf --disable-schemas-install
+--disable-metacity --disable-gnome --disable-gnome-keybindings
+--disable-kde --disable-kde4 --disable-kconfig"
+short_desc="Composite window manager"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=22b1f06a458f8eefc9ef511f78a55887fcd456e0fe5bb7574eefcf624146ecf6
+long_desc="
+ Compiz is a compositing window manager that uses 3D graphics acceleration
+ via OpenGL. It provides various new graphical effects and features on
+ any desktop environment, including Gnome and KDE."
+
+subpackages="$pkgname-devel"  
+Add_dependency run glibc
+Add_dependency run gtk+
+Add_dependency run libwnck
+Add_dependency run dbus-glib
+Add_dependency run libxslt
+Add_dependency run librsvg
+Add_dependency run MesaLib
+Add_dependency run startup-notification
+Add_dependency run fuse
+Add_dependency build intltool
+Add_dependency build gtk+-devel
+Add_dependency build libwnck-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build libxslt-devel
+Add_dependency build librsvg-devel
+Add_dependency build MesaLib-devel
+Add_dependency build startup-notification-devel
+Add_dependency build fuse-devel

From a8fd30890f324a160c1145f9284129e0b672f15e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 22 Dec 2009 23:49:46 +0100
Subject: [PATCH 03/43] Added libcompizconfig-0.8.4 build template.

--HG--
extra : convert_revision : 0cbeb01e3afbadc501f2637c78d7fb06012979d6
---
 srcpkgs/libcompizconfig-devel                 |  1 +
 srcpkgs/libcompizconfig/depends               |  2 ++
 .../libcompizconfig-devel.template            | 22 +++++++++++++++++
 srcpkgs/libcompizconfig/template              | 24 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/libcompizconfig-devel
 create mode 100644 srcpkgs/libcompizconfig/depends
 create mode 100644 srcpkgs/libcompizconfig/libcompizconfig-devel.template
 create mode 100644 srcpkgs/libcompizconfig/template

diff --git a/srcpkgs/libcompizconfig-devel b/srcpkgs/libcompizconfig-devel
new file mode 120000
index 00000000000..06dd437bfcd
--- /dev/null
+++ b/srcpkgs/libcompizconfig-devel
@@ -0,0 +1 @@
+libcompizconfig
\ No newline at end of file
diff --git a/srcpkgs/libcompizconfig/depends b/srcpkgs/libcompizconfig/depends
new file mode 100644
index 00000000000..67f3e101502
--- /dev/null
+++ b/srcpkgs/libcompizconfig/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.8.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libcompizconfig/libcompizconfig-devel.template b/srcpkgs/libcompizconfig/libcompizconfig-devel.template
new file mode 100644
index 00000000000..fb1bbd245aa
--- /dev/null
+++ b/srcpkgs/libcompizconfig/libcompizconfig-devel.template
@@ -0,0 +1,22 @@
+# Template file for 'libcompizconfig-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run compiz-devel
+Add_dependency run libxml2-devel
+Add_dependency run libcompizconfig
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/compiz
+	mkdir -p ${DESTDIR}/usr/lib/compizconfig/backends
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/compiz/*.a ${DESTDIR}/usr/lib/compiz
+	mv ${SRCPKGDESTDIR}/usr/lib/compizconfig/backends/*.a \
+		${DESTDIR}/usr/lib/compizconfig/backends
+}
diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template
new file mode 100644
index 00000000000..e46b79e371f
--- /dev/null
+++ b/srcpkgs/libcompizconfig/template
@@ -0,0 +1,24 @@
+# Template file for 'libcompizconfig'
+pkgname=libcompizconfig
+version=0.8.4
+distfiles="http://releases.compiz-fusion.org/$version/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Compiz configuration system library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=41313e935f1beb3375367bded72d97de60e7aabf1129620be53a7fc1aca0b029
+long_desc="
+ Compiz is a compositing window manager that uses 3D graphics acceleration
+ via OpenGL. It provides various new graphical effects and features on
+ any desktop environment, including Gnome and KDE.
+
+ This package contains a library for the compiz configuration backend."
+
+conf_files="/etc/compizconfig/config"
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run compiz
+Add_dependency run libxml2
+Add_dependency build intltool
+Add_dependency build compiz-devel
+Add_dependency build libxml2-devel

From a5f6e1ec5cc041c3d89f76e352ed8916090271dc Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 00:12:35 +0100
Subject: [PATCH 04/43] Added compizconfig-python-0.8.4 build template.

--HG--
extra : convert_revision : a400e0458ab618ca8ffceb69f62dd42c93a73e5c
---
 srcpkgs/compizconfig-python/depends  |  2 ++
 srcpkgs/compizconfig-python/template | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/compizconfig-python/depends
 create mode 100644 srcpkgs/compizconfig-python/template

diff --git a/srcpkgs/compizconfig-python/depends b/srcpkgs/compizconfig-python/depends
new file mode 100644
index 00000000000..67f3e101502
--- /dev/null
+++ b/srcpkgs/compizconfig-python/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.8.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template
new file mode 100644
index 00000000000..01648fe2e6b
--- /dev/null
+++ b/srcpkgs/compizconfig-python/template
@@ -0,0 +1,25 @@
+# Template file for 'compizconfig-python'
+pkgname=compizconfig-python
+version=0.8.4
+distfiles="http://releases.compiz-fusion.org/$version/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Compizconfig bindings for python"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=6734ae35ee69d081f35f98a89cd3bccb411a4db7c5b35fbd226270d95ac76f5a
+long_desc="
+ Compiz is a compositing window manager that uses 3D graphics acceleration
+ via OpenGL. It provides various new graphical effects and features on
+ any desktop environment, including Gnome and KDE.
+
+ This package contains python bindings for libcompizconfig."
+
+Add_dependency run compiz
+Add_dependency run libcompizconfig
+Add_dependency run glib
+Add_dependency run python
+Add_dependency full Pyrex
+Add_dependency build intltool
+Add_dependency build compiz-devel
+Add_dependency build libcompizconfig-devel
+Add_dependency build glib-devel
+Add_dependency build python-devel

From 7d5610ad5e9253319b1ff723702d81e725bcf4c6 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 00:12:50 +0100
Subject: [PATCH 05/43] Added ccsm-0.8.4 build template.

--HG--
extra : convert_revision : 0705e45a42be3c95af07b11a4a25bcf531d7bac4
---
 srcpkgs/ccsm/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/ccsm/template

diff --git a/srcpkgs/ccsm/template b/srcpkgs/ccsm/template
new file mode 100644
index 00000000000..c3d866c0f8a
--- /dev/null
+++ b/srcpkgs/ccsm/template
@@ -0,0 +1,25 @@
+# Template file for 'ccsm'
+pkgname=ccsm
+version=0.8.4
+distfiles="http://releases.compiz-fusion.org/$version/$pkgname-$version.tar.bz2"
+build_style=python-module
+short_desc="Compiz Config Settings Manager"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=46b9da032cf29e71aec0823799861d926937ad41f4edea3be718ac6a8532c16d
+long_desc="
+ Compiz is a compositing window manager that uses 3D graphics acceleration
+ via OpenGL. It provides various new graphical effects and features on
+ any desktop environment, including Gnome and KDE.
+
+ This package contains the CompizConfig Settings Manager UI for configuring
+ compiz plugins."
+
+noarch=yes
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+
+Add_dependency run compiz
+Add_dependency full compizconfig-python
+Add_dependency full pygtk
+Add_dependency full hicolor-icon-theme
+Add_dependency build intltool
+Add_dependency build compiz-devel

From a267c68cbb7d03b570714474c74c437f6d7648da Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 02:06:45 +0100
Subject: [PATCH 06/43] helpers/python-module: set prefix to /usr.

--HG--
extra : convert_revision : 2d0ddde369fa4f4e69a183e9ee7a41beb7cb50be
---
 xbps-src/helpers/python-module.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xbps-src/helpers/python-module.sh b/xbps-src/helpers/python-module.sh
index e080545c08a..5e023d179bc 100644
--- a/xbps-src/helpers/python-module.sh
+++ b/xbps-src/helpers/python-module.sh
@@ -5,7 +5,7 @@
 do_install()
 {
 	if [ -z "$make_install_args" ]; then
-		make_install_args="--prefix=usr --root=$DESTDIR"
+		make_install_args="--prefix=/usr --root=$DESTDIR"
 	fi
 
 	cd ${wrksrc} || return 1

From 465f9229c824211eb4d9435b941d212051e59902 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 02:07:11 +0100
Subject: [PATCH 07/43] python-module: enable configure and build stages.

--HG--
extra : convert_revision : 0f12cbd184a51cae91f580be3e51c285e4de5c7a
---
 xbps-src/shutils/build_funcs.sh     | 17 ++++++++++-------
 xbps-src/shutils/configure_funcs.sh | 12 +++++++++---
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/xbps-src/shutils/build_funcs.sh b/xbps-src/shutils/build_funcs.sh
index 08b47d156f4..5d7d94c32a8 100644
--- a/xbps-src/shutils/build_funcs.sh
+++ b/xbps-src/shutils/build_funcs.sh
@@ -35,26 +35,29 @@ build_src_phase()
 
         #
 	# Skip this phase for: meta-template, only-install, custom-install
-	# and python-module style builds.
+	# style builds.
 	#
 	[ "$build_style" = "meta-template" -o	\
 	  "$build_style" = "only-install" -o	\
-	  "$build_style" = "custom-install" -o	\
-	  "$build_style" = "python-module" ] && return 0
+	  "$build_style" = "custom-install" ] && return 0
 
 	[ ! -d $wrksrc ] && msg_error "unexistent build directory [$wrksrc]"
 
 	cd $wrksrc || exit 1
 
 	[ -n "$revision" ] && pkg="${pkg}_${revision}"
-	[ -z "$make_cmd" ] && make_cmd=/usr/bin/make
 
+	if [ "$build_style" = "python-module" ]; then
+		make_cmd="python"
+		make_build_args="setup.py build"
+	else
+		[ -z "$make_cmd" ] && make_cmd=/usr/bin/make
+		[ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ] && \
+			makejobs="-j$XBPS_MAKEJOBS"
+	fi
 	# Run pre_build func.
 	run_func pre_build || msg_error "pre_build stage failed!"
 
-	[ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ] && \
-		makejobs="-j$XBPS_MAKEJOBS"
-
 	. $XBPS_SHUTILSDIR/buildvars_funcs.sh
 	set_build_vars
 
diff --git a/xbps-src/shutils/configure_funcs.sh b/xbps-src/shutils/configure_funcs.sh
index 1949389636b..1d74c3e0a1a 100644
--- a/xbps-src/shutils/configure_funcs.sh
+++ b/xbps-src/shutils/configure_funcs.sh
@@ -41,13 +41,12 @@ configure_src_phase()
 
 	#
 	# Skip this phase for: meta-template, only-install, custom-install,
-	# gnu_makefile and python-module style builds.
+	# gnu_makefile style builds.
 	#
 	[ "$build_style" = "meta-template" -o	\
 	  "$build_style" = "only-install" -o	\
 	  "$build_style" = "custom-install" -o	\
-	  "$build_style" = "gnu_makefile" -o	\
-	  "$build_style" = "python-module" ] && return 0
+	  "$build_style" = "gnu_makefile" ] && return 0
 
 	if [ -n "$revision" ]; then
 		lver="${version}_${revision}"
@@ -97,6 +96,13 @@ configure_src_phase()
 		. $XBPS_HELPERSDIR/perl-module.sh
 		perl_module_build $pkgname
 		;;
+	python-module)
+		#
+		# Packages that are python modules and use setup.py files.
+		# They are all handled by the helper python-module.sh.
+		#
+		python setup.py configure ${configure_args}
+		;;
 	*)
 		#
 		# Unknown build_style type won't work :-)

From 582c12bcd8edfc2cca26e44621130a7a547b6fda Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 02:53:27 +0100
Subject: [PATCH 08/43] Added compiz-bcop-0.8.4 build template.

--HG--
extra : convert_revision : 463777048ee49e2f54e0d19902f4a184224da48b
---
 srcpkgs/compiz-bcop/depends  |  2 ++
 srcpkgs/compiz-bcop/template | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/compiz-bcop/depends
 create mode 100644 srcpkgs/compiz-bcop/template

diff --git a/srcpkgs/compiz-bcop/depends b/srcpkgs/compiz-bcop/depends
new file mode 100644
index 00000000000..67f3e101502
--- /dev/null
+++ b/srcpkgs/compiz-bcop/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.8.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/compiz-bcop/template b/srcpkgs/compiz-bcop/template
new file mode 100644
index 00000000000..77361ba1f37
--- /dev/null
+++ b/srcpkgs/compiz-bcop/template
@@ -0,0 +1,26 @@
+# Template file for 'compiz-bcop'
+pkgname=compiz-bcop
+version=0.8.4
+distfiles="http://releases.compiz-fusion.org/$version/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Compiz option code generator"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=d359ca1a9e98e0a4b9abe807f84a9e230a102aee409f3ee4594a895ea9da8c4f
+long_desc="
+ Compiz is a compositing window manager that uses 3D graphics acceleration
+ via OpenGL. It provides various new graphical effects and features on
+ any desktop environment, including Gnome and KDE.
+
+ This package contains the compiz option code generator."
+
+noarch=yes
+Add_dependency run libxslt
+Add_dependency run bash
+Add_dependency build intltool
+Add_dependency build libxslt-devel
+
+post_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib || return 1
+	mv ${DESTDIR}/usr/share/pkgconfig ${DESTDIR}/usr/lib || return 1
+}

From 29310743fa8ff7108fd630a42d8f1e0b7732121d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 02:54:45 +0100
Subject: [PATCH 09/43] Added compiz-plugins-main-0.8.4 build template.

--HG--
extra : convert_revision : b7a1d272977f3ef839f34d9ebfbc228ad0dd3440
---
 srcpkgs/compiz-plugins-main-devel             |  1 +
 .../compiz-plugins-main-devel.template        | 16 +++++++++++++++
 srcpkgs/compiz-plugins-main/depends           |  2 ++
 srcpkgs/compiz-plugins-main/template          | 20 +++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/compiz-plugins-main-devel
 create mode 100644 srcpkgs/compiz-plugins-main/compiz-plugins-main-devel.template
 create mode 100644 srcpkgs/compiz-plugins-main/depends
 create mode 100644 srcpkgs/compiz-plugins-main/template

diff --git a/srcpkgs/compiz-plugins-main-devel b/srcpkgs/compiz-plugins-main-devel
new file mode 120000
index 00000000000..2dbce140868
--- /dev/null
+++ b/srcpkgs/compiz-plugins-main-devel
@@ -0,0 +1 @@
+compiz-plugins-main
\ No newline at end of file
diff --git a/srcpkgs/compiz-plugins-main/compiz-plugins-main-devel.template b/srcpkgs/compiz-plugins-main/compiz-plugins-main-devel.template
new file mode 100644
index 00000000000..579380a25cb
--- /dev/null
+++ b/srcpkgs/compiz-plugins-main/compiz-plugins-main-devel.template
@@ -0,0 +1,16 @@
+# Template file for 'compiz-plugins-main-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run compiz-devel
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/compiz
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/compiz/*.a ${DESTDIR}/usr/lib/compiz
+}
diff --git a/srcpkgs/compiz-plugins-main/depends b/srcpkgs/compiz-plugins-main/depends
new file mode 100644
index 00000000000..67f3e101502
--- /dev/null
+++ b/srcpkgs/compiz-plugins-main/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.8.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/compiz-plugins-main/template b/srcpkgs/compiz-plugins-main/template
new file mode 100644
index 00000000000..b253e3827b2
--- /dev/null
+++ b/srcpkgs/compiz-plugins-main/template
@@ -0,0 +1,20 @@
+# Template file for 'compiz-plugins-main'
+pkgname=compiz-plugins-main
+version=0.8.4
+distfiles="http://releases.compiz-fusion.org/$version/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Compiz Main plugins"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=1ea757880a3793e9a01603839b4a2efe5fab4efee0a96101d772dc25422f8aee
+long_desc="
+ Compiz is a compositing window manager that uses 3D graphics acceleration
+ via OpenGL. It provides various new graphical effects and features on
+ any desktop environment, including Gnome and KDE.
+
+ This package contains the Compiz main plugins."
+
+subpackages="$pkgname-devel"
+Add_dependency run compiz
+Add_dependency full compiz-bcop
+Add_dependency build intltool
+Add_dependency build compiz-devel

From 5b3adfbed4db190a019c28f987adecdb1a53ae25 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 02:55:02 +0100
Subject: [PATCH 10/43] Added compiz-plugins-extra-0.8.4 build template.

--HG--
extra : convert_revision : ec226cc63eee37b61bbadb4c4312eae70ef1d940
---
 srcpkgs/compiz-plugins-extra-devel            |  1 +
 .../compiz-plugins-extra-devel.template       | 19 +++++++++++++++
 srcpkgs/compiz-plugins-extra/depends          |  2 ++
 srcpkgs/compiz-plugins-extra/template         | 24 +++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 120000 srcpkgs/compiz-plugins-extra-devel
 create mode 100644 srcpkgs/compiz-plugins-extra/compiz-plugins-extra-devel.template
 create mode 100644 srcpkgs/compiz-plugins-extra/depends
 create mode 100644 srcpkgs/compiz-plugins-extra/template

diff --git a/srcpkgs/compiz-plugins-extra-devel b/srcpkgs/compiz-plugins-extra-devel
new file mode 120000
index 00000000000..1003c1fe0d3
--- /dev/null
+++ b/srcpkgs/compiz-plugins-extra-devel
@@ -0,0 +1 @@
+compiz-plugins-extra
\ No newline at end of file
diff --git a/srcpkgs/compiz-plugins-extra/compiz-plugins-extra-devel.template b/srcpkgs/compiz-plugins-extra/compiz-plugins-extra-devel.template
new file mode 100644
index 00000000000..5e2b98230b5
--- /dev/null
+++ b/srcpkgs/compiz-plugins-extra/compiz-plugins-extra-devel.template
@@ -0,0 +1,19 @@
+# Template file for 'compiz-plugins-extra-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libnotify-devel
+Add_dependency run compiz-devel
+Add_dependency run compiz-plugins-main-devel
+Add_dependency run compiz-plugins-extra
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/compiz
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/compiz/*.a ${DESTDIR}/usr/lib/compiz
+}
diff --git a/srcpkgs/compiz-plugins-extra/depends b/srcpkgs/compiz-plugins-extra/depends
new file mode 100644
index 00000000000..67f3e101502
--- /dev/null
+++ b/srcpkgs/compiz-plugins-extra/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.8.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/compiz-plugins-extra/template b/srcpkgs/compiz-plugins-extra/template
new file mode 100644
index 00000000000..9c32ec4e73a
--- /dev/null
+++ b/srcpkgs/compiz-plugins-extra/template
@@ -0,0 +1,24 @@
+# Template file for 'compiz-plugins-extra'
+pkgname=compiz-plugins-extra
+version=0.8.4
+distfiles="http://releases.compiz-fusion.org/$version/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Compiz Extra plugins"
+extratainer="Juan RP <xtraeme@gmail.com>"
+checksum=a874903d07eb54c3bf210a322275a972cef7f47ccf4c2d2e307c31d73c57d952
+long_desc="
+ Compiz is a compositing window manager that uses 3D graphics acceleration
+ via OpenGL. It provides various new graphical effects and features on
+ any desktop environment, including Gnome and KDE.
+
+ This package contains the Compiz extra plugins."
+
+subpackages="$pkgname-devel"
+Add_dependency run compiz
+Add_dependency run compiz-plugins-main
+Add_dependency run libnotify
+Add_dependency full compiz-bcop
+Add_dependency build intltool
+Add_dependency build compiz-devel
+Add_dependency build compiz-plugins-main-devel
+Add_dependency build libnotify-devel

From ef3412a7d719ca60ea40c1a7783c88747741ae83 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 03:56:03 +0100
Subject: [PATCH 11/43] xf86-video-intel: update to 2.9.99.902.

--HG--
extra : convert_revision : 15eb453fdcc5e2657e84c0c2619b53c375b56086
---
 srcpkgs/xf86-video-intel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template
index f348f6d96d9..a6d5716a26b 100644
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@@ -1,11 +1,11 @@
 # Template build file for 'xf86-video-intel'.
 pkgname=xf86-video-intel
-version=2.9.1
+version=2.9.99.902
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Intel video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76
+checksum=3ac36692f2ff2b87ae8521e4b9e6d38a384a592cbfc573914913d1481d1b17f4
 long_desc="
  This is the video driver for Intel video chips for the
  Xorg X11 server."

From 26c9441b87cd82696030390eb746ccdf72ddc11a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 15:41:58 +0100
Subject: [PATCH 12/43] extract_funcs: always extract all distfiles into
 builddir.

--HG--
extra : convert_revision : 0ba3269604f8d0059fda5a36c30eac2d7e17d6c3
---
 xbps-src/shutils/extract_funcs.sh | 53 +++++++++++--------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/xbps-src/shutils/extract_funcs.sh b/xbps-src/shutils/extract_funcs.sh
index f83e9a68d7a..f6cb8ca4067 100644
--- a/xbps-src/shutils/extract_funcs.sh
+++ b/xbps-src/shutils/extract_funcs.sh
@@ -29,8 +29,7 @@
 #
 extract_distfiles()
 {
-	local count=0 pkg="$1"
-	local curfile cursufx lwrksrc ltar_cmd f lver
+	local pkg="$1" curfile cursufx ltar_cmd f lver
 
 	[ -f $XBPS_EXTRACT_DONE ] && return 0
 	[ -z "$in_chroot" -a ! -w $XBPS_BUILDDIR ] && \
@@ -60,18 +59,6 @@ extract_distfiles()
 		return 0
 	fi
 
-	for f in ${distfiles}; do
-		count=$(($count + 1))
-	done
-
-	if [ "$count" -gt 1 ]; then
-		if [ -z "$wrksrc" ]; then
-			msg_error "\$wrksrc must be defined with multiple distfiles."
-			exit 1
-		fi
-		mkdir $wrksrc
-	fi
-
 	msg_normal "Extracting $pkgname-$lver distfile(s)."
 
 	if [ -n "$tar_override_cmd" ]; then
@@ -109,55 +96,53 @@ extract_distfiles()
 			msg_error "unknown distfile suffix for $curfile."
 		fi
 
-
-		if [ $count -gt 1 ]; then
-			lwrksrc="$wrksrc"
-		else
-			lwrksrc="$XBPS_BUILDDIR"
-		fi
-
 		case ${cursufx} in
 		txz)
 			if [ ! -x $XBPS_MASTERDIR/usr/bin/xz ]; then
 				msg_error "cannot find xz for extraction."
 			fi
-			$ltar_cmd xfJ $XBPS_SRCDISTDIR/$curfile -C $lwrksrc
+			$ltar_cmd xfJ $XBPS_SRCDISTDIR/$curfile \
+				-C $XBPS_BUILDDIR
 			if [ $? -ne 0 ]; then
-				msg_error "extracting $curfile into $lwrksrc."
+				msg_error "extracting $curfile into $XBPS_BUILDDIR."
 			fi
 			;;
 		tbz)
-			$ltar_cmd xfj $XBPS_SRCDISTDIR/$curfile -C $lwrksrc
+			$ltar_cmd xfj $XBPS_SRCDISTDIR/$curfile \
+				-C $XBPS_BUILDDIR
 			if [ $? -ne 0 ]; then
-				msg_error "extracting $curfile into $lwrksrc."
+				msg_error "extracting $curfile into $XBPS_BUILDDIR."
 			fi
 			;;
 		tgz)
-			$ltar_cmd xfz $XBPS_SRCDISTDIR/$curfile -C $lwrksrc
+			$ltar_cmd xfz $XBPS_SRCDISTDIR/$curfile \
+				-C $XBPS_BUILDDIR
 			if [ $? -ne 0 ]; then
-				msg_error "extracting $curfile into $lwrksrc."
+				msg_error "extracting $curfile into $XBPS_BUILDDIR."
 			fi
 			;;
 		gz|bz2)
-			cp -f $XBPS_SRCDISTDIR/$curfile $lwrksrc
+			cp -f $XBPS_SRCDISTDIR/$curfile $XBPS_BUILDDIR
 			if [ "$cursufx" = ".gz" ]; then
-				cd $lwrksrc && gunzip $curfile
+				cd $XBPS_BUILDDIR && gunzip $curfile
 			else
-				cd $lwrksrc && bunzip2 $curfile
+				cd $XBPS_BUILDDIR && bunzip2 $curfile
 			fi
 			;;
 		tar)
-			$ltar_cmd xf $XBPS_SRCDISTDIR/$curfile -C $lwrksrc
+			$ltar_cmd xf $XBPS_SRCDISTDIR/$curfile \
+				-C $XBPS_BUILDDIR
 			if [ $? -ne 0 ]; then
-				msg_error "extracting $curfile into $lwrksrc."
+				msg_error "extracting $curfile into $XBPS_BUILDDIR."
 			fi
 			;;
 		zip)
 			if [ -x $XBPS_MASTERDIR/usr/bin/unzip ]; then
 				$XBPS_MASTERDIR/usr/bin/unzip \
-					-q -x $XBPS_SRCDISTDIR/$curfile -d $lwrksrc
+					-q -x $XBPS_SRCDISTDIR/$curfile \
+					-d $XBPS_BUILDDIR
 				if [ $? -ne 0 ]; then
-					msg_error "extracting $curfile into $lwrksrc."
+					msg_error "extracting $curfile into $XBPS_BUILDDIR."
 				fi
 			else
 				msg_error "cannot find unzip bin for extraction"

From 33bda6f67535137a2aea1d88ffffe23ada7e7a6b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 16:18:13 +0100
Subject: [PATCH 13/43] MesaLib: add glx-utils subpkgs containing
 glx{gears,info}.

--HG--
extra : convert_revision : 91d8136c94c44e61a6767e2baee1f18ae32c66e2
---
 srcpkgs/MesaLib/glx-utils.template | 16 ++++++++++++++++
 srcpkgs/MesaLib/template           | 24 +++++++++++++++++++-----
 srcpkgs/glx-utils                  |  1 +
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/MesaLib/glx-utils.template
 create mode 120000 srcpkgs/glx-utils

diff --git a/srcpkgs/MesaLib/glx-utils.template b/srcpkgs/MesaLib/glx-utils.template
new file mode 100644
index 00000000000..d776c347468
--- /dev/null
+++ b/srcpkgs/MesaLib/glx-utils.template
@@ -0,0 +1,16 @@
+# Template file for 'glx-utils'.
+#
+short_desc="GLX utilities from Mesa"
+long_desc="${long_desc}
+
+ This package contains some GLX utilities such as glxgears and glxinfo."
+
+Add_dependency run glibc
+Add_dependency run libX11
+Add_dependency run MesaLib
+
+do_install()
+{
+	install -d ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+}
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index d52b129feaf..65434a07d4d 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,13 +1,18 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=7.7
-wrksrc="Mesa-$version"
-distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
+revision=1
+wrksrc="Mesa-${version}"
+distfiles="
+ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2
+ftp://ftp.freedesktop.org/pub/mesa/$version/MesaDemos-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--enable-glx-tls --enable-xcb"
+configure_args="--enable-glx-tls --enable-xcb --with-demos"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6252d7d4190b47f70d0e4ec0edbd5a70f2261c5f6e66859e5fd2572c1df6357a
+checksum="
+6252d7d4190b47f70d0e4ec0edbd5a70f2261c5f6e66859e5fd2572c1df6357a
+38dbcce59fcc457b53ff6d4e2d5a400d41c02f093bb1fae141e99e032729ab14"
 long_desc="
  MesaLib is a 3-D graphics library with an API which is very similar to
  that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax
@@ -15,7 +20,7 @@ long_desc="
  Inc. However, the author makes no claim that Mesa is in any way a
  compatible replacement for OpenGL or associated with Silicon Graphics, Inc."
 
-subpackages="$pkgname-devel"
+subpackages="$pkgname-devel glx-utils"
 Add_dependency build pkg-config
 Add_dependency build glproto
 Add_dependency build dri2proto	">=2.1"
@@ -32,3 +37,12 @@ Add_dependency full libXfixes
 Add_dependency full libXdamage
 Add_dependency full libXxf86vm
 Add_dependency run  libstdc++
+
+post_install()
+{
+	install -d ${DESTDIR}/usr/bin || return 1
+	for f in glxgears glxinfo; do
+		install -m755 ${wrksrc}/progs/xdemos/${f} \
+			${DESTDIR}/usr/bin || return 1
+	done
+}
diff --git a/srcpkgs/glx-utils b/srcpkgs/glx-utils
new file mode 120000
index 00000000000..8bf5fbea217
--- /dev/null
+++ b/srcpkgs/glx-utils
@@ -0,0 +1 @@
+MesaLib
\ No newline at end of file

From fd1e4b48c1f2dd4ad332ebc6df5fdadee1a6ac41 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 16:38:08 +0100
Subject: [PATCH 14/43] Added compiz-manager-0.6.0 build template.

--HG--
extra : convert_revision : f5a8d15ac3461ff8ae3e5b410ce3900b53f44ab8
---
 srcpkgs/compiz-manager/patches/fix_paths.diff | 17 ++++++++++++++
 srcpkgs/compiz-manager/template               | 23 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 srcpkgs/compiz-manager/patches/fix_paths.diff
 create mode 100644 srcpkgs/compiz-manager/template

diff --git a/srcpkgs/compiz-manager/patches/fix_paths.diff b/srcpkgs/compiz-manager/patches/fix_paths.diff
new file mode 100644
index 00000000000..971b42ce85f
--- /dev/null
+++ b/srcpkgs/compiz-manager/patches/fix_paths.diff
@@ -0,0 +1,17 @@
+--- compiz-manager.orig	2007-10-15 21:10:06.000000000 +0200
++++ compiz-manager	2007-10-18 22:17:18.000000000 +0200
+@@ -27,10 +27,10 @@
+ # 
+ 
+ 
+-COMPIZ_BIN_PATH="/usr/local/bin/" # For window decorators and compiz
+-PLUGIN_PATH="/usr/local/lib/compiz/" 
++COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
++PLUGIN_PATH="/usr/lib/compiz/" 
+ GLXINFO="/usr/bin/glxinfo"
+-KWIN="/usr/bin/kwin"
++KWIN="/usr/bin/kwin"
+ METACITY="/usr/bin/metacity"
+ COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
+ 
+
diff --git a/srcpkgs/compiz-manager/template b/srcpkgs/compiz-manager/template
new file mode 100644
index 00000000000..9a736869d6a
--- /dev/null
+++ b/srcpkgs/compiz-manager/template
@@ -0,0 +1,23 @@
+# Template file for 'compiz-manager'
+pkgname=compiz-manager
+version=0.6.0
+distfiles="http://releases.compiz-fusion.org/components/$pkgname/$pkgname-$version.tar.bz2"
+build_style=custom-install
+short_desc="Compiz Starter Program"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=7be0744801c0c55050b5c9da997f61a8be190b2e1fb528b84dac12faf904542e
+long_desc="
+ Compiz is a compositing window manager that uses 3D graphics acceleration
+ via OpenGL. It provides various new graphical effects and features on
+ any desktop environment, including Gnome and KDE.
+
+ This package contains the Compiz Starter program."
+
+noarch=yes
+Add_dependency run compiz
+
+do_install()
+{
+	install -D -m755 ${wrksrc}/compiz-manager \
+		${DESTDIR}/usr/bin/compiz-manager || return 1
+}

From 79c9e862ba2a8e26c427f2039674b3fc5d88f7be Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 16:39:33 +0100
Subject: [PATCH 15/43] compiz-manager: needs glx-utils.

--HG--
extra : convert_revision : 91fe6de9acc0ebf2ee2b5398d7ed17c63c96cc90
---
 srcpkgs/compiz-manager/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/compiz-manager/template b/srcpkgs/compiz-manager/template
index 9a736869d6a..6b77442349e 100644
--- a/srcpkgs/compiz-manager/template
+++ b/srcpkgs/compiz-manager/template
@@ -14,7 +14,8 @@ long_desc="
  This package contains the Compiz Starter program."
 
 noarch=yes
-Add_dependency run compiz
+Add_dependency full glx-utils
+Add_dependency full compiz
 
 do_install()
 {

From 08f9e340680449965dd27f5fec6715425a90f60f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 17:32:42 +0100
Subject: [PATCH 16/43] docbook-xml: fix zip files extraction.

--HG--
extra : convert_revision : 8c6f754461930946f72d0e369b94d64e3c7f60ef
---
 srcpkgs/docbook-xml/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/docbook-xml/template b/srcpkgs/docbook-xml/template
index a51134d93f9..dccc2acfaa2 100644
--- a/srcpkgs/docbook-xml/template
+++ b/srcpkgs/docbook-xml/template
@@ -40,9 +40,9 @@ do_install()
 	for ver in ${versions}; do
 		dir=${DESTDIR}/usr/share/xml/docbook/${ver}
 		install -d -m755 ${dir}
-		cd ${dir} && \
-			unzip ${XBPS_SRCDISTDIR}/docbook-xml-${ver}.zip && \
-			mv catalog.xml catalog
+		unzip -q -x ${XBPS_SRCDISTDIR}/docbook-xml-${ver}.zip \
+			-d ${dir} && mv ${dir}/catalog.xml ${dir}/catalog \
+			|| return 1
 	done
 	dir=${DESTDIR}/usr/share/xml/docbook/4.2
 	sed -e 's|V4.2|V4.1.2|g' < ${dir}/catalog > ${dir}/catalog-4.1.2

From 11fcfb2f4a4976fa1e4048e161e46e14573e778b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 18:01:53 +0100
Subject: [PATCH 17/43] dhcpcd: update to 5.1.4.

--HG--
extra : convert_revision : f99ee80fbd4f7755d39e16846758e45efe136de6
---
 srcpkgs/dhcpcd/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 9fd90490e6b..54150344c3c 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,12 +1,12 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=5.1.3
+version=5.1.4
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2"
 build_style=configure
 configure_args="--libexecdir=/lib/dhcpcd"
 short_desc="RFC2131 compliant DHCP client"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=fa67ea8da9c1bb44d47075d44ae3266c2e22d32b9a0b86e36d0a978436df3077
+checksum=affcac3f56ebddd8ba5e2837eab7fe9b798d728aed59ed4a788a723c36cc0c28
 long_desc="
  dhcpcd is a RFC 2131 compliant DHCP client. It's also a RFC 3927 compliant
  IPv4LL (aka ZeroConf) client.
@@ -16,6 +16,7 @@ long_desc="
  configuration."
 
 Add_dependency run glibc
+Add_dependency build ntp
 
 conf_files="/etc/dhcpcd.conf"
 openrc_services="dhcpcd default"

From ddab11262d437e1cbea1ada35e5be6fc38553d9b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 20:45:51 +0100
Subject: [PATCH 18/43] Added clutter-1.0.8 build template.

--HG--
extra : convert_revision : 6cb2dfd96e434ec9fcb39a71d945bdcfd2fecdac
---
 srcpkgs/clutter-devel                  |  1 +
 srcpkgs/clutter/clutter-devel.template | 26 +++++++++++++++++++++
 srcpkgs/clutter/depends                |  2 ++
 srcpkgs/clutter/template               | 32 ++++++++++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/clutter-devel
 create mode 100644 srcpkgs/clutter/clutter-devel.template
 create mode 100644 srcpkgs/clutter/depends
 create mode 100644 srcpkgs/clutter/template

diff --git a/srcpkgs/clutter-devel b/srcpkgs/clutter-devel
new file mode 120000
index 00000000000..5a89e25ad77
--- /dev/null
+++ b/srcpkgs/clutter-devel
@@ -0,0 +1 @@
+clutter
\ No newline at end of file
diff --git a/srcpkgs/clutter/clutter-devel.template b/srcpkgs/clutter/clutter-devel.template
new file mode 100644
index 00000000000..695cbedb051
--- /dev/null
+++ b/srcpkgs/clutter/clutter-devel.template
@@ -0,0 +1,26 @@
+# Template file for 'clutter-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run gtk+-devel
+Add_dependency run gobject-introspection-devel
+Add_dependency run MesaLib-devel
+Add_dependency run libX11-devel
+Add_dependency run libXdamage-devel
+Add_dependency run libXfixes-devel
+Add_dependency run libXcomposite-devel
+Add_dependency run libXi-devel
+Add_dependency run clutter
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/gir* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+}
diff --git a/srcpkgs/clutter/depends b/srcpkgs/clutter/depends
new file mode 100644
index 00000000000..9ee6dd9885e
--- /dev/null
+++ b/srcpkgs/clutter/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.0.8"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template
new file mode 100644
index 00000000000..4306f1014f3
--- /dev/null
+++ b/srcpkgs/clutter/template
@@ -0,0 +1,32 @@
+# Template file for 'clutter'
+pkgname=clutter
+version=1.0.8
+distfiles="http://www.clutter-project.org/sources/clutter/1.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--with-x --with-flavour=glx --with-imagebackend=gdk-pixbuf
+ --enable-xinput"
+short_desc="OpenGL based interactive canvas library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=54fa3b64b7e0539d07a09eb751c5d945a4cedc8d2beb355a51ea7f04ae637501
+long_desc="
+ Clutter is an open source software library for creating fast, visually
+ rich and animated graphical user interfaces."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run gtk+
+Add_dependency run MesaLib
+Add_dependency run libX11
+Add_dependency run libXdamage
+Add_dependency run libXfixes
+Add_dependency run libXcomposite
+Add_dependency run libXi
+Add_dependency build pkg-config
+Add_dependency build gtk+-devel
+Add_dependency build gobject-introspection-devel
+Add_dependency build MesaLib-devel
+Add_dependency build libX11-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libXcomposite-devel
+Add_dependency build libXi-devel

From c99995aa8a42d732c5fea7dc22eb099f34e6ebbf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 22:48:35 +0100
Subject: [PATCH 19/43] sylpheed: update to 3.0.0beta4.

--HG--
extra : convert_revision : 92baa5fb4176908880f4f8cccae7309b9ee07f65
---
 srcpkgs/sylpheed/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 9babfa8996f..f90b8e92b93 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,13 +1,13 @@
 # Template build file for 'sylpheed'.
 pkgname=sylpheed
-version=2.7.1
-distfiles="http://sylpheed.sraoss.jp/sylpheed/v2.7/$pkgname-$version.tar.bz2"
+version=3.0.0beta4
+distfiles="http://sylpheed.sraoss.jp/sylpheed/v3.0beta/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-compface --disable-gtkspell
  --disable-gpgme"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4af84e23
+checksum=1cea406741cf464fe00374144b59ce97cbd861aca6a4c23f795662c10ab5f4b0
 long_desc="
  Sylpheed is a simple, lightweight but featureful, and easy-to-use
  e-mail client (mailer, MUA).
@@ -27,8 +27,15 @@ long_desc="
     * Junk mail control
     * Flexible cooperation with external commands"
 
+Add_dependency run glibc
+Add_dependency run gtk+
+Add_dependency run openssl
 Add_dependency build pkg-config
 Add_dependency build flex
-Add_dependency full glibc
-Add_dependency full gtk+
-Add_dependency full openssl
+Add_dependency build gtk+-devel
+Add_dependency build openssl-devel
+
+post_install()
+{
+	rm -rf ${DESTDIR}/usr/include
+}

From bdac6823fbec4caf5a245a1001853a2292af20af Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Dec 2009 23:48:32 +0100
Subject: [PATCH 20/43] poppler: update to 0.12.2.

--HG--
extra : convert_revision : 734d222e8f40b3824689689d95d2d049a1606121
---
 srcpkgs/poppler/poppler-devel.template      |  6 +++++
 srcpkgs/poppler/poppler-glib-devel.template |  1 +
 srcpkgs/poppler/poppler-utils.template      |  1 -
 srcpkgs/poppler/template                    | 30 ++++++++++++---------
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/poppler/poppler-devel.template b/srcpkgs/poppler/poppler-devel.template
index da927e4726b..ba25478ea9a 100644
--- a/srcpkgs/poppler/poppler-devel.template
+++ b/srcpkgs/poppler/poppler-devel.template
@@ -5,6 +5,12 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run pkg-config
+Add_dependency run gtk+-devel
+Add_dependency run jpeg-devel
+Add_dependency run lcms-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
 Add_dependency run poppler
 
 do_install()
diff --git a/srcpkgs/poppler/poppler-glib-devel.template b/srcpkgs/poppler/poppler-glib-devel.template
index 08ac905e86e..b83c151d744 100644
--- a/srcpkgs/poppler/poppler-glib-devel.template
+++ b/srcpkgs/poppler/poppler-glib-devel.template
@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains development files for GTK+/Glib bindings."
 
+Add_dependency run glib-devel
 Add_dependency run poppler
 Add_dependency run poppler-glib
 
diff --git a/srcpkgs/poppler/poppler-utils.template b/srcpkgs/poppler/poppler-utils.template
index 7e88f939d68..497d31327e6 100644
--- a/srcpkgs/poppler/poppler-utils.template
+++ b/srcpkgs/poppler/poppler-utils.template
@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains the ${sourcepkg} binary utilities."
 
 Add_dependency run poppler
-Add_dependency run poppler-glib
 
 do_install()
 {
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 391ae9f9aef..af7fa28b9ff 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -1,14 +1,13 @@
 # Template build file for 'poppler'.
 pkgname=poppler
-version=0.12.0
-revision=1
+version=0.12.2
 distfiles="http://poppler.freedesktop.org/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-zlib --disable-poppler-qt --disable-poppler-qt4
  --enable-libjpeg --disable-libopenjpeg --disable-abiword-output"
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a95d4a61b1220f60bc40a921766f02d6d18e8276b70291723d6cf77a9c7369ae
+checksum=bebfb8c0b091f44026a0c0d61790a0490b04b3c0132f82bd0b39e861bdaf2719
 long_desc="
  This is poppler, a PDF rendering library. It is a fork of the xpdf
  3.0 PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC.
@@ -21,13 +20,18 @@ long_desc="
 
 subpackages="$pkgname-devel $pkgname-glib $pkgname-glib-devel $pkgname-utils"
 Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full expat
-Add_dependency full jpeg
-Add_dependency full lcms
-Add_dependency full freetype
-Add_dependency full fontconfig
-Add_dependency build glib
-Add_dependency build cairo
-Add_dependency build gtk+
-Add_dependency run  libstdc++
+Add_dependency build gtk+-devel
+Add_dependency build jpeg-devel
+Add_dependency build lcms-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libpng-devel
+Add_dependency build zlib-devel
+Add_dependency run glibc
+Add_dependency run zlib
+Add_dependency run jpeg
+Add_dependency run libpng
+Add_dependency run lcms
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libstdc++

From 5229f1ed2d970c98e7a4a79b9555a77f3f594260 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 00:27:37 +0100
Subject: [PATCH 21/43] libpciaccess: update to 0.11.0.

--HG--
extra : convert_revision : 6e6b8af66feacbebcb695e9ea27f36a7f021583b
---
 srcpkgs/libpciaccess/libpciaccess-devel.template | 1 +
 srcpkgs/libpciaccess/template                    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libpciaccess/libpciaccess-devel.template b/srcpkgs/libpciaccess/libpciaccess-devel.template
index d47bd3d0350..c83f850e3d1 100644
--- a/srcpkgs/libpciaccess/libpciaccess-devel.template
+++ b/srcpkgs/libpciaccess/libpciaccess-devel.template
@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run glibc-devel
 Add_dependency run libpciaccess
 
 do_install()
diff --git a/srcpkgs/libpciaccess/template b/srcpkgs/libpciaccess/template
index c30be433eba..feedfc99795 100644
--- a/srcpkgs/libpciaccess/template
+++ b/srcpkgs/libpciaccess/template
@@ -1,11 +1,11 @@
 # Template build file for 'libpciaccess'.
 pkgname=libpciaccess
-version=0.10.9
+version=0.11.0
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="PCI Access from Modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=5ccb9683b8be76edfceab4bf006e1cce9018e0d3dea5e54aa72e82798213fead
+checksum=6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab
 long_desc="
  libpciaccess is a library for portable PCI access routines across multiple
  operating systems."

From 4386a981e12ae614f91a40cd4255977a11f7d4df Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 00:38:25 +0100
Subject: [PATCH 22/43] pm-utils: update to 1.2.6.1.

--HG--
extra : convert_revision : aa36a721fead06dc523294eb81986ce6fffdf806
---
 srcpkgs/pm-utils/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pm-utils/template b/srcpkgs/pm-utils/template
index 07d0da16179..bd988b88867 100644
--- a/srcpkgs/pm-utils/template
+++ b/srcpkgs/pm-utils/template
@@ -1,12 +1,11 @@
 # Template file for 'pm-utils'
 pkgname=pm-utils
-version=1.2.5
-revision=1
+version=1.2.6.1
 distfiles="http://$pkgname.freedesktop.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 short_desc="Power Management Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=84cf07c7771ffe91c1b6f3a60c43fc76a44ae8d6c90e47bfdd6b1a7482a0e4ce
+checksum=e5ad45930b20931bed9a44678f72fd53ff85f2a0fc694d9ea2c02180431c5e35
 long_desc="
  $pkgname is a small collection of scripts that handle suspend and
  resume on behalf of HAL (Hardware Abstraction Layer)."

From 527845ef89bc78d49cbe927aeab3012f546c0a79 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 01:01:40 +0100
Subject: [PATCH 23/43] Added fusion-icon build template.

--HG--
extra : convert_revision : bfd48951c6b2196178f149b5806a3967b8dcf831
---
 srcpkgs/fusion-icon/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/fusion-icon/template

diff --git a/srcpkgs/fusion-icon/template b/srcpkgs/fusion-icon/template
new file mode 100644
index 00000000000..b85c40924ee
--- /dev/null
+++ b/srcpkgs/fusion-icon/template
@@ -0,0 +1,27 @@
+# Template file for 'fusion-icon'
+pkgname=fusion-icon
+version="$(date +%Y%m%d)"
+build_style=gnu_makefile
+short_desc="Simple tray icon for compiz"
+maintainer="Juan RP <xtraeme@gmail.com>"
+long_desc="
+ This package provides a simple tray icon with PyGTK for starting
+ and managing compiz."
+
+noarch=yes
+nofetch=yes
+noextract=yes
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+
+Add_dependency full compiz
+Add_dependency full compizconfig-python
+Add_dependency full pygtk
+Add_dependency full hicolor-icon-theme
+Add_dependency build git
+
+do_fetch()
+{
+	msg_normal "Fetching source from master GIT repository..."
+	git clone git://anongit.opencompositing.org/users/crdlb/fusion-icon \
+		${pkgname}-${version} || return 1
+}

From 1e8ba0a3eff36fb430c30ddaf977e95a564795f5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 01:10:08 +0100
Subject: [PATCH 24/43] shutils/chroot: copy host /etc/localtime if found.

--HG--
extra : convert_revision : d3961bbaa2b8fd51d59d5ccd4e2023b2cf31a60a
---
 xbps-src/shutils/chroot.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xbps-src/shutils/chroot.sh b/xbps-src/shutils/chroot.sh
index eadd1644eac..ba49877219f 100644
--- a/xbps-src/shutils/chroot.sh
+++ b/xbps-src/shutils/chroot.sh
@@ -87,6 +87,7 @@ ff02::3 ip6-allhosts
 _EOF
 
 	cp -f /etc/resolv.conf $XBPS_MASTERDIR/etc
+	[ -f /etc/localtime ] && cp -f /etc/localtime $XBPS_MASTERDIR/etc
 	# Create /bin/sh symlink to bash
 	cd $XBPS_MASTERDIR/bin && ln -sf bash sh
 

From 84f87ae068e358c14198569f197eace23be13e52 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 01:18:27 +0100
Subject: [PATCH 25/43] fusion-icon: needs ccsm.

--HG--
extra : convert_revision : be2333ad31582d3a765639ae662faaec70f1aee0
---
 srcpkgs/fusion-icon/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/fusion-icon/template b/srcpkgs/fusion-icon/template
index b85c40924ee..c876b183b6f 100644
--- a/srcpkgs/fusion-icon/template
+++ b/srcpkgs/fusion-icon/template
@@ -13,10 +13,7 @@ nofetch=yes
 noextract=yes
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency full compiz
-Add_dependency full compizconfig-python
-Add_dependency full pygtk
-Add_dependency full hicolor-icon-theme
+Add_dependency full ccsm
 Add_dependency build git
 
 do_fetch()

From e2169c9782d4578b0b230f5048c6f281c062be7c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 01:38:32 +0100
Subject: [PATCH 26/43] xbps{,-devel}: simplify.

--HG--
extra : convert_revision : b3ef6fe9a2c6e765a639a3910351ac23c5fcaa2f
---
 srcpkgs/xbps-devel/template                   | 4 ++--
 srcpkgs/xbps-devel/xbps-devel-static.template | 2 ++
 srcpkgs/xbps/template                         | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template
index e141c015f3c..df2d1a29081 100644
--- a/srcpkgs/xbps-devel/template
+++ b/srcpkgs/xbps-devel/template
@@ -2,8 +2,8 @@
 pkgname=xbps-devel
 version="$(date +%Y%m%d)"
 build_style=gnu_makefile
-make_build_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX="
-make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX="
+make_build_args="PREFIX="
+make_install_args="PREFIX="
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-devel/xbps-devel-static.template
index 37139711eeb..b2e21a5d45f 100644
--- a/srcpkgs/xbps-devel/xbps-devel-static.template
+++ b/srcpkgs/xbps-devel/xbps-devel-static.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains the static binaries and library, that can be
  used on any GNU/Linux distribution matching the architecture."
 
+replaces="xbps-static"
+
 do_install()
 {
 	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/usr/lib
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 3879a3b1cf8..3f2eeae8a0f 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -3,8 +3,8 @@ pkgname=xbps
 version=0.3
 distfiles="http://launchpad.net/xbps/head/$version/+download/xbps-$version.tar.gz"
 build_style=gnu_makefile
-make_build_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX="
-make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX="
+make_build_args="PREFIX="
+make_install_args="PREFIX="
 short_desc="The XBPS package system utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ba9b1964779c78351241a71dc11f5c5a7323c53dd9387adce261cf1d0eb241cf

From 2f058880f66fdc3b34ffc435e19c78cc4263d3af Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 01:52:49 +0100
Subject: [PATCH 27/43] fusion-icon: also needs glx-utils.

--HG--
extra : convert_revision : 152fb10d7ef3f17f0e22114626f8d7fe212960b4
---
 srcpkgs/fusion-icon/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fusion-icon/template b/srcpkgs/fusion-icon/template
index c876b183b6f..59cf057e344 100644
--- a/srcpkgs/fusion-icon/template
+++ b/srcpkgs/fusion-icon/template
@@ -13,8 +13,10 @@ nofetch=yes
 noextract=yes
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency full ccsm
 Add_dependency build git
+Add_dependency build MesaLib
+Add_dependency run glx-utils
+Add_dependency full ccsm
 
 do_fetch()
 {

From 75d2a685656866e9522c21cb7fe617ade3fa9c24 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 02:59:50 +0100
Subject: [PATCH 28/43] Added sexy-python-0.1.9 build template.

--HG--
extra : convert_revision : 58368003216d4cbf693f882352ddc94c8b960c76
---
 srcpkgs/sexy-python/depends  |  2 ++
 srcpkgs/sexy-python/template | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/sexy-python/depends
 create mode 100644 srcpkgs/sexy-python/template

diff --git a/srcpkgs/sexy-python/depends b/srcpkgs/sexy-python/depends
new file mode 100644
index 00000000000..f848c13276e
--- /dev/null
+++ b/srcpkgs/sexy-python/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.9"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/sexy-python/template b/srcpkgs/sexy-python/template
new file mode 100644
index 00000000000..f8783fd634b
--- /dev/null
+++ b/srcpkgs/sexy-python/template
@@ -0,0 +1,14 @@
+# Template file for 'sexy-python'
+pkgname=sexy-python
+version=0.1.9
+distfiles="http://releases.chipx86.com/libsexy/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="Python bindings for libsexy"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=2d8d257bbfa498a89792e0405ed8cf70396648b3df3c8e32cdc3dcc9bb666f15
+long_desc="
+ This packages provides the Python bindings."
+
+Add_dependency run libsexy
+Add_dependency full pygtk
+Add_dependency build libsexy-devel

From 8bde4a55b5a1881004c4963480f6e31d86db2eee Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 03:32:26 +0100
Subject: [PATCH 29/43] Added SDL-1.2.14 build template.

--HG--
extra : convert_revision : 4d17f84e9333ed6ea9899a36064bebb36d41a247
---
 srcpkgs/SDL-devel              |  1 +
 srcpkgs/SDL/SDL-devel.template | 24 ++++++++++++++++++++++++
 srcpkgs/SDL/depends            |  2 ++
 srcpkgs/SDL/template           | 31 +++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 120000 srcpkgs/SDL-devel
 create mode 100644 srcpkgs/SDL/SDL-devel.template
 create mode 100644 srcpkgs/SDL/depends
 create mode 100644 srcpkgs/SDL/template

diff --git a/srcpkgs/SDL-devel b/srcpkgs/SDL-devel
new file mode 120000
index 00000000000..bf798a56736
--- /dev/null
+++ b/srcpkgs/SDL-devel
@@ -0,0 +1 @@
+SDL
\ No newline at end of file
diff --git a/srcpkgs/SDL/SDL-devel.template b/srcpkgs/SDL/SDL-devel.template
new file mode 100644
index 00000000000..044ca16b8e2
--- /dev/null
+++ b/srcpkgs/SDL/SDL-devel.template
@@ -0,0 +1,24 @@
+# Template file for 'SDL-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
+Add_dependency run libXrender-devel
+Add_dependency run MesaLib-devel
+Add_dependency run alsa-lib-devel
+Add_dependency run SDL
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+}
diff --git a/srcpkgs/SDL/depends b/srcpkgs/SDL/depends
new file mode 100644
index 00000000000..7ca2acd28bb
--- /dev/null
+++ b/srcpkgs/SDL/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.2.14"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template
new file mode 100644
index 00000000000..1a5389f73d3
--- /dev/null
+++ b/srcpkgs/SDL/template
@@ -0,0 +1,31 @@
+# Template file for 'SDL'
+pkgname=SDL
+version=1.2.14
+distfiles="http://www.libsdl.org/release/SDL-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--enable-alsa --disable-esd --disable-rpath
+ --enable-clock_gettime --disable-nas --disable-arts --disable-pulseaudio"
+short_desc="Simple Directmedia Layer"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6
+long_desc="
+ Simple DirectMedia Layer is a cross-platform multimedia library designed
+ to provide low level access to audio, keyboard, mouse, joystick, 3D hardware
+ via OpenGL, and 2D video framebuffer. It is used by MPEG playback software,
+ emulators, and many popular games, including the award winning Linux port
+ of Civilization: Call To Power."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libXext
+Add_dependency run libXrender
+Add_dependency run libX11
+Add_dependency run MesaLib
+Add_dependency run alsa-lib
+Add_dependency build pkg-config
+Add_dependency build nasm
+Add_dependency build libXext-devel
+Add_dependency build libXrender-devel
+Add_dependency build libX11-devel
+Add_dependency build MesaLib-devel
+Add_dependency build alsa-lib-devel

From 900bbd81f614a935d8482ac05f646fe07369e872 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 03:51:45 +0100
Subject: [PATCH 30/43] Added SDL_ttf-2.0.9 build template.

--HG--
extra : convert_revision : 878a4bc945911880209ce52bacb4f90e109f8ccf
---
 srcpkgs/SDL_ttf-devel                  |  1 +
 srcpkgs/SDL_ttf/SDL_ttf-devel.template | 18 ++++++++++++++++++
 srcpkgs/SDL_ttf/depends                |  2 ++
 srcpkgs/SDL_ttf/template               | 23 +++++++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 120000 srcpkgs/SDL_ttf-devel
 create mode 100644 srcpkgs/SDL_ttf/SDL_ttf-devel.template
 create mode 100644 srcpkgs/SDL_ttf/depends
 create mode 100644 srcpkgs/SDL_ttf/template

diff --git a/srcpkgs/SDL_ttf-devel b/srcpkgs/SDL_ttf-devel
new file mode 120000
index 00000000000..2e94bde2929
--- /dev/null
+++ b/srcpkgs/SDL_ttf-devel
@@ -0,0 +1 @@
+SDL_ttf
\ No newline at end of file
diff --git a/srcpkgs/SDL_ttf/SDL_ttf-devel.template b/srcpkgs/SDL_ttf/SDL_ttf-devel.template
new file mode 100644
index 00000000000..5e269e6ea2b
--- /dev/null
+++ b/srcpkgs/SDL_ttf/SDL_ttf-devel.template
@@ -0,0 +1,18 @@
+# Template file for 'SDL_ttf-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run freetype-devel
+Add_dependency run SDL-devel
+Add_dependency run SDL_ttf
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/SDL_ttf/depends b/srcpkgs/SDL_ttf/depends
new file mode 100644
index 00000000000..d3b3c31d051
--- /dev/null
+++ b/srcpkgs/SDL_ttf/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.0.9"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
new file mode 100644
index 00000000000..7d4596ea4a9
--- /dev/null
+++ b/srcpkgs/SDL_ttf/template
@@ -0,0 +1,23 @@
+# Template file for 'SDL_ttf'
+pkgname=SDL_ttf
+version=2.0.9
+distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="Use TrueType fonts in your SDL applications"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=b4248876798b43d0fae1931cf8ae249f4f67a87736f97183f035f34aab554653
+long_desc="
+ SDL_ttf is a TrueType font rendering library that is used with the SDL
+ library, and almost as portable. It depends on freetype2 to handle the
+ TrueType font data. It allows a programmer to use multiple TrueType fonts
+ without having to code a font rendering routine themselves. With the power
+ of outline fonts and antialiasing, high quality text output can be obtained
+ without much effort."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run freetype
+Add_dependency run SDL
+Add_dependency build pkg-config
+Add_dependency build freetype-devel
+Add_dependency build SDL-devel

From 17b6b3535b6148364b1dccb9d4297325390eea2c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 04:01:14 +0100
Subject: [PATCH 31/43] cmake: new deps style.

--HG--
extra : convert_revision : d2f025151dcee0d2e2b1a3ccb4ea87b9b9e4350e
---
 srcpkgs/cmake/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 1fc7dfe4bf0..0239a645dc1 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -20,9 +20,13 @@ long_desc="
  makefiles and workspaces that can be used in the compiler environment
  of your choice."
 
-Add_dependency full glibc
-Add_dependency full zlib
-Add_dependency full expat
-Add_dependency full curl-libs
-Add_dependency full ncurses
-Add_dependency run  libstdc++
+Add_dependency run glibc
+Add_dependency run zlib
+Add_dependency run expat
+Add_dependency run curl-libs
+Add_dependency run ncurses
+Add_dependency run libstdc++
+Add_dependency build zlib-devel
+Add_dependency build expat-devel
+Add_dependency build curl-devel
+Add_dependency build ncurses-devel

From b90a9c5c1e0ac1ac37f0a9a1789cff6a977dcb9c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 04:07:22 +0100
Subject: [PATCH 32/43] Added physfs-2.0.0 build template.

--HG--
extra : convert_revision : e6f14581645fe635dc8aa5b7b476d3b51cb9902a
---
 srcpkgs/physfs-devel                 |  1 +
 srcpkgs/physfs/depends               |  2 ++
 srcpkgs/physfs/physfs-devel.template | 18 ++++++++++++++++++
 srcpkgs/physfs/template              | 22 ++++++++++++++++++++++
 4 files changed, 43 insertions(+)
 create mode 120000 srcpkgs/physfs-devel
 create mode 100644 srcpkgs/physfs/depends
 create mode 100644 srcpkgs/physfs/physfs-devel.template
 create mode 100644 srcpkgs/physfs/template

diff --git a/srcpkgs/physfs-devel b/srcpkgs/physfs-devel
new file mode 120000
index 00000000000..92d050218e9
--- /dev/null
+++ b/srcpkgs/physfs-devel
@@ -0,0 +1 @@
+physfs
\ No newline at end of file
diff --git a/srcpkgs/physfs/depends b/srcpkgs/physfs/depends
new file mode 100644
index 00000000000..fb63eee7d05
--- /dev/null
+++ b/srcpkgs/physfs/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.0.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/physfs/physfs-devel.template b/srcpkgs/physfs/physfs-devel.template
new file mode 100644
index 00000000000..e60eb9a1487
--- /dev/null
+++ b/srcpkgs/physfs/physfs-devel.template
@@ -0,0 +1,18 @@
+# Template file for 'physfs-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run zlib-devel
+Add_dependency run physfs
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+}
diff --git a/srcpkgs/physfs/template b/srcpkgs/physfs/template
new file mode 100644
index 00000000000..dad0d10ebf7
--- /dev/null
+++ b/srcpkgs/physfs/template
@@ -0,0 +1,22 @@
+# Template file for 'physfs'
+pkgname=physfs
+version=2.0.0
+distfiles="http://icculus.org/physfs/downloads/physfs-$version.tar.gz"
+build_style=configure
+CFLAGS="-fno-strict-aliasing"
+configure_script="cmake"
+configure_args=". -DCMAKE_INSTALL_PREFIX=/usr"
+short_desc="Library to provide abstract access to various archives"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=cbdfaf484d26c2c5d5673aabf8a3f1e0afdcbbd0a99865ba226e9368f3c5501c
+long_desc="
+ It is intended for use in video games, and the design was somewhat inspired
+ by Quake 3's file subsystem. The programmer defines a write directory on
+ the physical filesystem. No file writing done through the PhysicsFS API can
+ leave that write directory, for security."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run zlib
+Add_dependency build cmake
+Add_dependency build zlib-devel

From 8749b90745f5d30fec2d1496aba188610792c38c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 04:40:29 +0100
Subject: [PATCH 33/43] strace: fixed build with kernel>=2.6.32.

--HG--
extra : convert_revision : ed317215b26441afeb189f33a51fe9f6842e6678
---
 srcpkgs/strace/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 4496d395354..44cf475f6ca 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -13,3 +13,9 @@ long_desc="
 Add_dependency full glibc
 # Required by strace-graph
 Add_dependency full perl
+
+pre_configure()
+{
+	# Fix for kernel>=2.6.32
+	sed -i -e "s|linux/socket.h|sys/socket.h|g" ${wrksrc}/configure
+}

From ae65abeb152261a2e458e8161887324a4f662134 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 05:09:17 +0100
Subject: [PATCH 34/43] Added neverball-1.5.4 build template!

--HG--
extra : convert_revision : 241fc995f2b3c52ae03e945ed4bab1ba1eaebdac
---
 srcpkgs/neverball/template | 67 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 srcpkgs/neverball/template

diff --git a/srcpkgs/neverball/template b/srcpkgs/neverball/template
new file mode 100644
index 00000000000..3852b04ee3d
--- /dev/null
+++ b/srcpkgs/neverball/template
@@ -0,0 +1,67 @@
+# Template file for 'neverball'
+pkgname=neverball
+version=1.5.4
+distfiles="http://www.neverball.org/$pkgname-$version.tar.gz"
+build_style=custom-install
+short_desc="Puzzle/action game similar to Super Monkey Ball"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6
+long_desc="
+ Tilt the floor to roll a ball through an obstacle course before time runs
+ out. Neverball is part puzzle game, part action game, and entirely a
+ test of skill.
+
+ Also found here is Neverputt, a hot-seat multiplayer miniature golf game
+ using the physics and graphics of Neverball."
+
+Add_dependency run glibc
+Add_dependency run libpng
+Add_dependency run jpeg
+Add_dependency run libvorbis
+Add_dependency run SDL
+Add_dependency run SDL_ttf
+Add_dependency run physfs
+Add_dependency build libpng-devel
+Add_dependency build jpeg-devel
+Add_dependency build libvorbis-devel
+Add_dependency build SDL-devel
+Add_dependency build SDL_ttf-devel
+Add_dependency build physfs-devel
+
+do_install()
+{
+	local mjobs
+	[ -n "$XBPS_MAKE_JOBS" ] && mjobs="-j$XBPS_MAKE_JOBS"
+
+	cd ${wrksrc} || return 1
+	HOME=/ make ${mjobs} ENABLE_NLS=1 DATADIR=/usr/share/neverball \
+		LOCALEDIR=/usr/share/locale || return 1
+
+	for dir in usr/bin usr/share/neverball usr/share/locale \
+		usr/share/applications usr/share/pixmaps \
+		usr/share/doc/neverball; do
+		install -d ${DESTDIR}/${dir} || return 1
+	done
+
+	for f in neverball neverputt mapc; do
+		install -m755 ${f} ${DESTDIR}/usr/bin || return 1
+	done
+
+	cp -a data/* ${DESTDIR}/usr/share/neverball || return 1
+	find ${DESTDIR}/usr/share/neverball -type f -exec chmod 0644 {} \;
+	cp -a locale/* ${DESTDIR}/usr/share/locale || return 1
+
+	install -m644 dist/*.desktop ${DESTDIR}/usr/share/applications \
+		 || return 1
+	install -m644 dist/*.png ${DESTDIR}/usr/share/pixmaps || return 1
+	ln -s neverball_48.png ${DESTDIR}/usr/share/pixmaps/neverball.png \
+		 || return 1
+	ln -s neverputt_48.png ${DESTDIR}/usr/share/pixmaps/neverputt.png \
+		 || return 1
+
+	install -m644 doc/* ${DESTDIR}/usr/share/doc/neverball || return 1
+	install -D -m644 dist/mapc.1 ${DESTDIR}/usr/share/man/man1/mapc.1 \
+		 || return 1
+	install -d ${DESTDIR}/usr/share/man/man6 || return 1
+	install -m644 dist/*.6 ${DESTDIR}/usr/share/man/man6 || return 1
+}

From f8ec6b1187e4116e69c45a2f065606c54ed8f54d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 Dec 2009 16:04:45 +0100
Subject: [PATCH 35/43] Clean up required rundeps for some pkgs.

--HG--
extra : convert_revision : e95cfb60ec6e462b01ca8ec4dd9f04dd0419ecf8
---
 srcpkgs/MesaLib/MesaLib-devel.template        | 17 +++++
 srcpkgs/MesaLib/template                      | 36 ++++++----
 srcpkgs/atk/atk-devel.template                |  3 +
 srcpkgs/atk/template                          |  5 +-
 srcpkgs/cairo/cairo-devel.template            | 11 +++
 srcpkgs/cairo/template                        | 29 +++++---
 srcpkgs/glib/glib-devel.template              |  3 +
 srcpkgs/glib/template                         |  5 +-
 srcpkgs/gtk+/gtk+-devel.template              | 21 ++++++
 srcpkgs/gtk+/template                         | 68 ++++++++++++-------
 srcpkgs/libX11/libX11-devel.template          | 14 ++++
 srcpkgs/libX11/template                       | 11 +--
 srcpkgs/libXau/libXau-devel.template          |  3 +
 srcpkgs/libXau/template                       |  2 +-
 .../libXcomposite-devel.template              |  9 +++
 srcpkgs/libXcomposite/template                | 11 +--
 srcpkgs/libXdamage/libXdamage-devel.template  |  7 ++
 srcpkgs/libXdamage/template                   |  8 ++-
 srcpkgs/libXdmcp/libXdmcp-devel.template      |  3 +
 srcpkgs/libXdmcp/template                     |  2 +-
 srcpkgs/libXfixes/libXfixes-devel.template    |  6 ++
 srcpkgs/libXfixes/template                    |  5 +-
 srcpkgs/libXrender/libXrender-devel.template  |  4 ++
 srcpkgs/libXrender/template                   |  5 +-
 srcpkgs/libXxf86vm/libXxf86vm-devel.template  |  8 +++
 srcpkgs/libXxf86vm/template                   |  8 ++-
 srcpkgs/libxcb/libxcb-devel.template          |  5 ++
 srcpkgs/libxcb/template                       | 10 +--
 srcpkgs/pango/pango-devel.template            | 10 +++
 srcpkgs/pango/template                        | 26 ++++---
 srcpkgs/xcb-util/template                     |  5 +-
 srcpkgs/xcb-util/xcb-util-devel.template      |  3 +
 32 files changed, 276 insertions(+), 87 deletions(-)

diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template
index 55722ef0121..ed968b7cc5a 100644
--- a/srcpkgs/MesaLib/MesaLib-devel.template
+++ b/srcpkgs/MesaLib/MesaLib-devel.template
@@ -5,6 +5,23 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run glproto
+Add_dependency run dri2proto	">=2.1"
+Add_dependency run makedepend
+Add_dependency run libdrm-devel	">=2.4.15"
+Add_dependency run expat-devel
+Add_dependency run libICE-devel
+Add_dependency run libSM-devel
+Add_dependency run libX11-devel
+Add_dependency run libxcb-devel
+Add_dependency run libXdamage-devel
+Add_dependency run libXext-devel
+Add_dependency run libXfixes-devel
+Add_dependency run libXt-devel
+Add_dependency run libXxf86vm-devel
 Add_dependency run MesaLib
 
 do_install()
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 65434a07d4d..d02c98ddeda 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -21,22 +21,34 @@ long_desc="
  compatible replacement for OpenGL or associated with Silicon Graphics, Inc."
 
 subpackages="$pkgname-devel glx-utils"
+Add_dependency run glibc
+Add_dependency run libdrm	">=2.4.15"
+Add_dependency run expat
+Add_dependency run libICE
+Add_dependency run libSM
+Add_dependency run libstdc++
+Add_dependency run libX11
+Add_dependency run libxcb
+Add_dependency run libXdamage
+Add_dependency run libXext
+Add_dependency run libXfixes
+Add_dependency run libXt
+Add_dependency run libXxf86vm
 Add_dependency build pkg-config
 Add_dependency build glproto
 Add_dependency build dri2proto	">=2.1"
 Add_dependency build makedepend
-Add_dependency full glibc
-Add_dependency full expat
-Add_dependency full libdrm	">=2.4.15"
-Add_dependency full libX11
-Add_dependency full libXext
-Add_dependency full libXt
-Add_dependency full libXmu
-Add_dependency full libXi
-Add_dependency full libXfixes
-Add_dependency full libXdamage
-Add_dependency full libXxf86vm
-Add_dependency run  libstdc++
+Add_dependency build libdrm-devel	">=2.4.15"
+Add_dependency build expat-devel
+Add_dependency build libICE-devel
+Add_dependency build libSM-devel
+Add_dependency build libX11-devel
+Add_dependency build libxcb-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXext-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libXt-devel
+Add_dependency build libXxf86vm-devel
 
 post_install()
 {
diff --git a/srcpkgs/atk/atk-devel.template b/srcpkgs/atk/atk-devel.template
index c49147e02e8..99408b22661 100644
--- a/srcpkgs/atk/atk-devel.template
+++ b/srcpkgs/atk/atk-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run glib-devel
 Add_dependency run atk
 
 do_install()
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index 90ef826627a..9695e9f8f85 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -20,5 +20,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full glib
+Add_dependency build glib-devel
+Add_dependency run glibc
+Add_dependency run glib
diff --git a/srcpkgs/cairo/cairo-devel.template b/srcpkgs/cairo/cairo-devel.template
index 16d9f4e46d5..38b3f33a6c1 100644
--- a/srcpkgs/cairo/cairo-devel.template
+++ b/srcpkgs/cairo/cairo-devel.template
@@ -5,6 +5,17 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run fontconfig-devel
+Add_dependency run freetype-devel
+Add_dependency run glitz-devel
+Add_dependency run pixman-devel
+Add_dependency run libpng-devel
+Add_dependency run libX11-devel
+Add_dependency run xcb-util-devel
+Add_dependency run libXrender-devel
+Add_dependency run zlib-devel
 Add_dependency run cairo
 
 do_install()
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 25bb20656cc..11a5e1a7b1e 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -23,14 +23,23 @@ long_desc="
  antialiased text rendering."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run fontconfig
+Add_dependency run freetype
+Add_dependency run glitz
+Add_dependency run pixman
+Add_dependency run libpng
+Add_dependency run libX11
+Add_dependency run xcb-util
+Add_dependency run libXrender
+Add_dependency run zlib
 Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full zlib
-Add_dependency full libpng
-Add_dependency full fontconfig
-Add_dependency full freetype
-Add_dependency full pixman
-Add_dependency full glitz
-Add_dependency full xcb-util
-Add_dependency full libX11
-Add_dependency full libXrender
+Add_dependency build fontconfig-devel
+Add_dependency build freetype-devel
+Add_dependency build glitz-devel
+Add_dependency build pixman-devel
+Add_dependency build libpng-devel
+Add_dependency build libX11-devel
+Add_dependency build xcb-util-devel
+Add_dependency build libXrender-devel
+Add_dependency build zlib-devel
diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template
index eeda9732482..e06c43a5c46 100644
--- a/srcpkgs/glib/glib-devel.template
+++ b/srcpkgs/glib/glib-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pcre-devel
 Add_dependency run glib
 
 do_install()
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 75620a97bae..40f435a35c8 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -13,7 +13,8 @@ long_desc="
  C library used by projects such as GTK+, GIMP and GNOME."
 
 subpackages="glib-devel"
-Add_dependency full glibc
-Add_dependency full pcre
+Add_dependency run glibc
+Add_dependency run pcre
 Add_dependency build gettext
 Add_dependency build pkg-config
+Add_dependency build pcre-devel
diff --git a/srcpkgs/gtk+/gtk+-devel.template b/srcpkgs/gtk+/gtk+-devel.template
index 8d2e409ad1a..76b2028a513 100644
--- a/srcpkgs/gtk+/gtk+-devel.template
+++ b/srcpkgs/gtk+/gtk+-devel.template
@@ -5,6 +5,27 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run atk-devel
+Add_dependency run cairo-devel
+Add_dependency run fontconfig-devel
+Add_dependency run freetype-devel
+Add_dependency run glib-devel
+Add_dependency run jpeg-devel
+Add_dependency run pango-devel
+Add_dependency run libpng-devel
+Add_dependency run tiff-devel
+Add_dependency run libX11-devel
+Add_dependency run libXcomposite-devel
+Add_dependency run libXcursor-devel
+Add_dependency run libXdamage-devel
+Add_dependency run libXext-devel
+Add_dependency run libXfixes-devel
+Add_dependency run libXinerama-devel
+Add_dependency run libXi-devel
+Add_dependency run libXrandr-devel
+Add_dependency run libXrender-devel
 Add_dependency run gtk+
 Add_dependency run python
 
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 1f777a28730..e9c90577e80 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,6 +1,7 @@
 # Template build file for 'gtk+'.
 pkgname=gtk+
 version=2.18.3
+revision=1
 distfiles="${GNOME_SITE}/gtk+/2.18/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-cups --with-xinput"
@@ -20,31 +21,48 @@ long_desc="
 
 conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-pixbuf-loaders gtk-immodules"
-
 subpackages="$pkgname-devel"
+
+Add_dependency run atk
+Add_dependency run cairo
+Add_dependency run glibc
+Add_dependency run fontconfig
+Add_dependency run freetype
+Add_dependency run glib
+Add_dependency run jpeg
+Add_dependency run pango
+Add_dependency run libpng
+Add_dependency run tiff
+Add_dependency run shared-mime-info
+Add_dependency run libX11
+Add_dependency run libXcomposite
+Add_dependency run libXcursor
+Add_dependency run libXdamage
+Add_dependency run libXext
+Add_dependency run libXfixes
+Add_dependency run libXinerama
+Add_dependency run libXi
+Add_dependency run libXrandr
+Add_dependency run libXrender
+
 Add_dependency build pkg-config
 Add_dependency build perl
-Add_dependency full glibc
-Add_dependency full expat
-Add_dependency full glib
-Add_dependency full atk
-Add_dependency full pango
-Add_dependency full fontconfig
-Add_dependency full freetype
-Add_dependency full jpeg
-Add_dependency full libpng
-Add_dependency full tiff
-Add_dependency full jasper
-Add_dependency full shared-mime-info
-Add_dependency full pixman
-Add_dependency full libX11
-Add_dependency full libXcursor
-Add_dependency full libXft
-Add_dependency full libXfixes
-Add_dependency full libXinerama
-Add_dependency full libXi
-Add_dependency full libXrandr
-Add_dependency full libXrender
-Add_dependency full libXt
-Add_dependency full libXext
-Add_dependency full libXcomposite
+Add_dependency build atk-devel
+Add_dependency build cairo-devel
+Add_dependency build fontconfig-devel
+Add_dependency build freetype-devel
+Add_dependency build glib-devel
+Add_dependency build jpeg-devel
+Add_dependency build pango-devel
+Add_dependency build libpng-devel
+Add_dependency build tiff-devel
+Add_dependency build libX11-devel
+Add_dependency build libXcomposite-devel
+Add_dependency build libXcursor-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXext-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libXinerama-devel
+Add_dependency build libXi-devel
+Add_dependency build libXrandr-devel
+Add_dependency build libXrender-devel
diff --git a/srcpkgs/libX11/libX11-devel.template b/srcpkgs/libX11/libX11-devel.template
index a7e4fb32244..615fb36aa72 100644
--- a/srcpkgs/libX11/libX11-devel.template
+++ b/srcpkgs/libX11/libX11-devel.template
@@ -5,6 +5,20 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run xextproto
+Add_dependency run xtrans
+Add_dependency run xcmiscproto
+Add_dependency run kbproto
+Add_dependency run bigreqsproto
+Add_dependency run inputproto
+Add_dependency run xf86bigfontproto
+Add_dependency run libXdmcp-devel
+Add_dependency run libXau-devel
+Add_dependency run libxcb-devel
 Add_dependency run libX11
 
 do_install()
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 75cb1297c73..1fad79d8388 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -14,6 +14,10 @@ long_desc="
  This is from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libXdmcp
+Add_dependency run libXau
+Add_dependency run libxcb
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
@@ -23,7 +27,6 @@ Add_dependency build kbproto
 Add_dependency build bigreqsproto
 Add_dependency build inputproto
 Add_dependency build xf86bigfontproto
-Add_dependency full glibc
-Add_dependency full libXdmcp
-Add_dependency full libXau
-Add_dependency full libxcb
+Add_dependency build libXdmcp-devel
+Add_dependency build libXau-devel
+Add_dependency build libxcb-devel
diff --git a/srcpkgs/libXau/libXau-devel.template b/srcpkgs/libXau/libXau-devel.template
index 0504b5e7226..e950fac8ca8 100644
--- a/srcpkgs/libXau/libXau-devel.template
+++ b/srcpkgs/libXau/libXau-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run xproto
 Add_dependency run libXau
 
 do_install()
diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template
index 5b2b4b0f893..438248520a0 100644
--- a/srcpkgs/libXau/template
+++ b/srcpkgs/libXau/template
@@ -11,6 +11,6 @@ long_desc="
  X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency full glibc
+Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXcomposite/libXcomposite-devel.template b/srcpkgs/libXcomposite/libXcomposite-devel.template
index b7e5a3d5a9d..8ff8330da43 100644
--- a/srcpkgs/libXcomposite/libXcomposite-devel.template
+++ b/srcpkgs/libXcomposite/libXcomposite-devel.template
@@ -5,6 +5,15 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run fixesproto
+Add_dependency run compositeproto
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
+Add_dependency run libXfixes-devel
 Add_dependency run libXcomposite
 
 do_install()
diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template
index 5f8e73657dc..bc9bd3ea76e 100644
--- a/srcpkgs/libXcomposite/template
+++ b/srcpkgs/libXcomposite/template
@@ -11,11 +11,14 @@ long_desc="
  Library. This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run libXfixes
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build fixesproto
 Add_dependency build compositeproto
-Add_dependency full glibc
-Add_dependency full libX11
-Add_dependency full libXext
-Add_dependency full libXfixes
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
+Add_dependency build libXfixes-devel
diff --git a/srcpkgs/libXdamage/libXdamage-devel.template b/srcpkgs/libXdamage/libXdamage-devel.template
index 4bab5564b1f..79a74e93f87 100644
--- a/srcpkgs/libXdamage/libXdamage-devel.template
+++ b/srcpkgs/libXdamage/libXdamage-devel.template
@@ -5,6 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run damageproto
+Add_dependency run libX11-devel
+Add_dependency run libXfixes-devel
 Add_dependency run libXdamage
 
 do_install()
diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template
index 0bed4ea2ea2..a0de1a88abe 100644
--- a/srcpkgs/libXdamage/template
+++ b/srcpkgs/libXdamage/template
@@ -10,9 +10,11 @@ long_desc="
  This package contains the Xdamage extension."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
+Add_dependency run libXfixes
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build damageproto
-Add_dependency full glibc
-Add_dependency full libX11
-Add_dependency full libXfixes
+Add_dependency build libX11-devel
+Add_dependency build libXfixes-devel
diff --git a/srcpkgs/libXdmcp/libXdmcp-devel.template b/srcpkgs/libXdmcp/libXdmcp-devel.template
index 583fe3e8a1a..cb347ea3001 100644
--- a/srcpkgs/libXdmcp/libXdmcp-devel.template
+++ b/srcpkgs/libXdmcp/libXdmcp-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run xproto
 Add_dependency run libXdmcp
 
 do_install()
diff --git a/srcpkgs/libXdmcp/template b/srcpkgs/libXdmcp/template
index 8bfbe6c97d9..7bc99a7350b 100644
--- a/srcpkgs/libXdmcp/template
+++ b/srcpkgs/libXdmcp/template
@@ -11,6 +11,6 @@ long_desc="
  from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency full glibc
+Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXfixes/libXfixes-devel.template b/srcpkgs/libXfixes/libXfixes-devel.template
index 94682b26157..057507c4ad6 100644
--- a/srcpkgs/libXfixes/libXfixes-devel.template
+++ b/srcpkgs/libXfixes/libXfixes-devel.template
@@ -5,6 +5,12 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run fixesproto
+Add_dependency run libX11-devel
 Add_dependency run libXfixes
 
 do_install()
diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template
index ad12220e786..0ff2cb989c8 100644
--- a/srcpkgs/libXfixes/template
+++ b/srcpkgs/libXfixes/template
@@ -16,8 +16,9 @@ long_desc="
  X11 project."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build fixesproto
-Add_dependency full glibc
-Add_dependency full libX11
+Add_dependency build libX11-devel
diff --git a/srcpkgs/libXrender/libXrender-devel.template b/srcpkgs/libXrender/libXrender-devel.template
index e15c9ac31a0..540169499b1 100644
--- a/srcpkgs/libXrender/libXrender-devel.template
+++ b/srcpkgs/libXrender/libXrender-devel.template
@@ -5,6 +5,10 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run renderproto
+Add_dependency run libX11-devel
 Add_dependency run libXrender
 
 do_install()
diff --git a/srcpkgs/libXrender/template b/srcpkgs/libXrender/template
index 8ca3577dbbe..28b472f423a 100644
--- a/srcpkgs/libXrender/template
+++ b/srcpkgs/libXrender/template
@@ -19,7 +19,8 @@ long_desc="
  This is the modular X.org X11 project version."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
 Add_dependency build pkg-config
 Add_dependency build renderproto
-Add_dependency full glibc
-Add_dependency full libX11
+Add_dependency build libX11-devel
diff --git a/srcpkgs/libXxf86vm/libXxf86vm-devel.template b/srcpkgs/libXxf86vm/libXxf86vm-devel.template
index 826e9ef5bc5..e94aee596e3 100644
--- a/srcpkgs/libXxf86vm/libXxf86vm-devel.template
+++ b/srcpkgs/libXxf86vm/libXxf86vm-devel.template
@@ -5,6 +5,14 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run xextproto
+Add_dependency run xf86vidmodeproto
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
 Add_dependency run libXxf86vm
 
 do_install()
diff --git a/srcpkgs/libXxf86vm/template b/srcpkgs/libXxf86vm/template
index aecc4fcff46..fd930fb037b 100644
--- a/srcpkgs/libXxf86vm/template
+++ b/srcpkgs/libXxf86vm/template
@@ -14,10 +14,12 @@ long_desc="
  This library is from the modular X.org project."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
+Add_dependency run libXext
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
 Add_dependency build xf86vidmodeproto
-Add_dependency full glibc
-Add_dependency full libX11
-Add_dependency full libXext
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
diff --git a/srcpkgs/libxcb/libxcb-devel.template b/srcpkgs/libxcb/libxcb-devel.template
index ce11cd2d7aa..b3982c749c4 100644
--- a/srcpkgs/libxcb/libxcb-devel.template
+++ b/srcpkgs/libxcb/libxcb-devel.template
@@ -5,6 +5,11 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run python
+Add_dependency run libXdmcp-devel
+Add_dependency run libXau-devel
 Add_dependency run libxcb
 
 do_install()
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index e2ce62d4e5c..53a2ab33c52 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -20,10 +20,12 @@ long_desc="
  requests and receive responses with both, which eases porting to XCB."
  
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libXdmcp
+Add_dependency run libXau
 Add_dependency build pkg-config
 Add_dependency build python
-Add_dependency build libxslt
+Add_dependency build libxslt-devel
 Add_dependency build xcb-proto ">=1.6"
-Add_dependency full glibc
-Add_dependency full libXdmcp
-Add_dependency full libXau
+Add_dependency build libXdmcp-devel
+Add_dependency build libXau-devel
diff --git a/srcpkgs/pango/pango-devel.template b/srcpkgs/pango/pango-devel.template
index 7123c70a907..561ec47dd38 100644
--- a/srcpkgs/pango/pango-devel.template
+++ b/srcpkgs/pango/pango-devel.template
@@ -5,6 +5,16 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run gobject-introspection
+Add_dependency run glib-devel
+Add_dependency run cairo-devel
+Add_dependency run fontconfig-devel
+Add_dependency run freetype-devel
+Add_dependency run libXft-devel
+Add_dependency run libXrender-devel
 Add_dependency run pango
 
 do_install()
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 29d5f30221f..c801fa43e06 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,7 @@
 # Template build file for 'pango'.
 pkgname=pango
 version=1.26.1
+revision=1
 distfiles="${GNOME_SITE}/pango/1.26/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var"
@@ -32,16 +33,21 @@ long_desc="
 subpackages="$pkgname-devel"
 triggers="pango-modules"
 
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run cairo
+Add_dependency run fontconfig
+Add_dependency run freetype
+Add_dependency run libX11
+Add_dependency run libXft
+Add_dependency run libXrender
 Add_dependency build pkg-config
 Add_dependency build gobject-introspection
-Add_dependency full glibc
-Add_dependency full glib
-Add_dependency full zlib
-Add_dependency full fontconfig
-Add_dependency full freetype
-Add_dependency full cairo
-Add_dependency full libX11
-Add_dependency full libXt
-Add_dependency full libXft
-Add_dependency full libXrender
+Add_dependency build glib-devel
+Add_dependency build cairo-devel
+Add_dependency build fontconfig-devel
+Add_dependency build freetype-devel
+Add_dependency build libX11-devel
+Add_dependency build libXft-devel
+Add_dependency build libXrender-devel
 # XXX Add missing dependency libthai.
diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template
index f6e61ca3f02..703f0535512 100644
--- a/srcpkgs/xcb-util/template
+++ b/srcpkgs/xcb-util/template
@@ -27,7 +27,8 @@ long_desc="
  wm: Framework for window manager implementation."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libxcb
 Add_dependency build pkg-config
 Add_dependency build gperf
-Add_dependency full glibc
-Add_dependency full libxcb
+Add_dependency build libxcb
diff --git a/srcpkgs/xcb-util/xcb-util-devel.template b/srcpkgs/xcb-util/xcb-util-devel.template
index e5db5a8e63b..52e8b413e58 100644
--- a/srcpkgs/xcb-util/xcb-util-devel.template
+++ b/srcpkgs/xcb-util/xcb-util-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run libxcb-devel
 Add_dependency run xcb-util
 
 do_install()

From 61cb3dadb2ec9479923d8a415e1eb677c522ea6e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 25 Dec 2009 22:39:22 +0100
Subject: [PATCH 36/43] Added smpeg-0.4.4 build template.

--HG--
extra : convert_revision : 7b7012b3070ed4e46fe6123cf3a2f3a219675a43
---
 srcpkgs/smpeg-devel                           |  1 +
 srcpkgs/smpeg/depends                         |  2 +
 srcpkgs/smpeg/patches/smpeg-0.4.4-gcc41.patch | 41 +++++++++++++++++++
 srcpkgs/smpeg/smpeg-devel.template            | 19 +++++++++
 srcpkgs/smpeg/template                        | 26 ++++++++++++
 5 files changed, 89 insertions(+)
 create mode 120000 srcpkgs/smpeg-devel
 create mode 100644 srcpkgs/smpeg/depends
 create mode 100644 srcpkgs/smpeg/patches/smpeg-0.4.4-gcc41.patch
 create mode 100644 srcpkgs/smpeg/smpeg-devel.template
 create mode 100644 srcpkgs/smpeg/template

diff --git a/srcpkgs/smpeg-devel b/srcpkgs/smpeg-devel
new file mode 120000
index 00000000000..bfaa184565e
--- /dev/null
+++ b/srcpkgs/smpeg-devel
@@ -0,0 +1 @@
+smpeg
\ No newline at end of file
diff --git a/srcpkgs/smpeg/depends b/srcpkgs/smpeg/depends
new file mode 100644
index 00000000000..6ea24dd5457
--- /dev/null
+++ b/srcpkgs/smpeg/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.4.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/smpeg/patches/smpeg-0.4.4-gcc41.patch b/srcpkgs/smpeg/patches/smpeg-0.4.4-gcc41.patch
new file mode 100644
index 00000000000..a8bb2f6e6fb
--- /dev/null
+++ b/srcpkgs/smpeg/patches/smpeg-0.4.4-gcc41.patch
@@ -0,0 +1,41 @@
+Index: MPEGaudio.h
+===================================================================
+RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
+retrieving revision 1.23
+diff -u -p -r1.23 MPEGaudio.h
+--- MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
++++ MPEGaudio.h	6 Dec 2005 06:10:43 -0000
+@@ -151,12 +151,6 @@ private:
+ /* The actual MPEG audio class */
+ class MPEGaudio : public MPEGerror, public MPEGaudioaction {
+ 
+-    friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
+-    friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
+-#ifdef THREADED_AUDIO
+-    friend int Decode_MPEGaudio(void *udata);
+-#endif
+-
+ public:
+     MPEGaudio(MPEGstream *stream, bool initSDL = true);
+     virtual ~MPEGaudio();
+@@ -367,6 +361,20 @@ public:
+ #define N_TIMESTAMPS 5
+ 
+   double timestamp[N_TIMESTAMPS];
++
++  /* Functions which access MPEGaudio internals */
++  friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
++  friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
++#ifdef THREADED_AUDIO
++  friend int Decode_MPEGaudio(void *udata);
++#endif
+ };
+ 
++/* Need to duplicate the prototypes, this is not a typo :) */
++void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
++int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
++#ifdef THREADED_AUDIO
++int Decode_MPEGaudio(void *udata);
++#endif
++
+ #endif /* _MPEGAUDIO_H_ */
diff --git a/srcpkgs/smpeg/smpeg-devel.template b/srcpkgs/smpeg/smpeg-devel.template
new file mode 100644
index 00000000000..976937ef606
--- /dev/null
+++ b/srcpkgs/smpeg/smpeg-devel.template
@@ -0,0 +1,19 @@
+# Template file for 'smpeg-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run SDL-devel
+Add_dependency run smpeg
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+}
diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template
new file mode 100644
index 00000000000..07e25915801
--- /dev/null
+++ b/srcpkgs/smpeg/template
@@ -0,0 +1,26 @@
+# Template file for 'smpeg'
+pkgname=smpeg
+version=0.4.4
+distfiles="http://mirrors.dotsrc.org/lokigames/open-source/smpeg/smpeg-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-gtk-player --disable-opengl-player"
+make_build_args="LDFLAGS+=-lstdc++"
+short_desc="SDL MPEG Player Library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=1efa7984d0aada0c2954cd0aaef357e9d7871dadd3368dbe742ab5f260523e57
+long_desc="
+ SMPEG is based on UC Berkeley's mpeg_play software MPEG decoder
+ and SPLAY, an MPEG audio decoder created by Woo-jae Jung."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run SDL
+Add_dependency run libstdc++
+Add_dependency build SDL-devel
+
+post_install()
+{
+	# Remove unused stuff
+	rm -rf ${DESTDIR}/usr/share/man
+	rm -f ${DESTDIR}/usr/bin/plaympeg
+}

From 33965b51bc72a902992e62a1bad73f31241fd97f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 25 Dec 2009 22:39:34 +0100
Subject: [PATCH 37/43] Added libmikmod-3.1.12 build template.

--HG--
extra : convert_revision : c0cdc89d245897ebfcc77d7a56f76bc1214b19e6
---
 srcpkgs/libmikmod-devel                       |   1 +
 srcpkgs/libmikmod/depends                     |   2 +
 srcpkgs/libmikmod/libmikmod-devel.template    |  18 +++
 .../patches/libmikmod-3.1.12-64bit-fix.diff   |  45 +++++++
 .../libmikmod-3.1.12-exitcrash-fix.diff       |  20 ++++
 .../libmikmod-3.1.12-loopingvolume-fix.diff   |  14 +++
 .../libmikmod-3.1.12-md_sngchn-fix.diff       | 111 ++++++++++++++++++
 .../patches/libmikmod-CVE-2009-0179.patch     |  31 +++++
 srcpkgs/libmikmod/template                    |  28 +++++
 9 files changed, 270 insertions(+)
 create mode 120000 srcpkgs/libmikmod-devel
 create mode 100644 srcpkgs/libmikmod/depends
 create mode 100644 srcpkgs/libmikmod/libmikmod-devel.template
 create mode 100644 srcpkgs/libmikmod/patches/libmikmod-3.1.12-64bit-fix.diff
 create mode 100644 srcpkgs/libmikmod/patches/libmikmod-3.1.12-exitcrash-fix.diff
 create mode 100644 srcpkgs/libmikmod/patches/libmikmod-3.1.12-loopingvolume-fix.diff
 create mode 100644 srcpkgs/libmikmod/patches/libmikmod-3.1.12-md_sngchn-fix.diff
 create mode 100644 srcpkgs/libmikmod/patches/libmikmod-CVE-2009-0179.patch
 create mode 100644 srcpkgs/libmikmod/template

diff --git a/srcpkgs/libmikmod-devel b/srcpkgs/libmikmod-devel
new file mode 120000
index 00000000000..a595774b214
--- /dev/null
+++ b/srcpkgs/libmikmod-devel
@@ -0,0 +1 @@
+libmikmod
\ No newline at end of file
diff --git a/srcpkgs/libmikmod/depends b/srcpkgs/libmikmod/depends
new file mode 100644
index 00000000000..b7c1818cdae
--- /dev/null
+++ b/srcpkgs/libmikmod/depends
@@ -0,0 +1,2 @@
+abi_depends=">=3.1.12"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libmikmod/libmikmod-devel.template b/srcpkgs/libmikmod/libmikmod-devel.template
new file mode 100644
index 00000000000..d90189e211c
--- /dev/null
+++ b/srcpkgs/libmikmod/libmikmod-devel.template
@@ -0,0 +1,18 @@
+# Template file for 'libmikmod-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glibc-devel
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+}
diff --git a/srcpkgs/libmikmod/patches/libmikmod-3.1.12-64bit-fix.diff b/srcpkgs/libmikmod/patches/libmikmod-3.1.12-64bit-fix.diff
new file mode 100644
index 00000000000..d0087823223
--- /dev/null
+++ b/srcpkgs/libmikmod/patches/libmikmod-3.1.12-64bit-fix.diff
@@ -0,0 +1,45 @@
+Date: Sun, 04 Jul 2004 11:53:23 +0200
+From: Josselin Mouette
+Subject: Re: sdl 64bit problem [PATCH]
+
+Le sam, 03/07/2004 � 18:20 +0200, Hans-Frieder Vogt a �crit :
+> Hi list,
+>
+> I found the problem that lead to the distorted sound in tuxracer on AMD64. It
+> may have also been the cause for the other reported sound problems with SDL.
+> The problem is not in SDL, but in SDL-mixer.
+> There, music files (*.it, and probably others as well) are incorrectly read on
+> all 64 bit architectures but Alpha, due to an incorrect data type definition.
+> The attached patch should solve the problem for all 64 bit architectures on
+> Linux, since at least cpp defines _LP64 and __LP64__ for them.
+> _LP64 indicates that long ints and pointers are 64 bits, but integers are 32
+> bits.
+> I am not sure whether the usage of _LP64 is also standard for the commercial
+> compilers, and for other Unixes, but at least Solaris 9 defines _LP64 in the
+> 64 bit environment as well.
+>
+> Josselin,
+> could you include this patch into your next debian packages?
+
+--- include/mikmod.h.in	2007-12-15 01:24:19.000000000 -0800
++++ include/mikmod.h.in	2009-10-05 00:18:56.000000000 -0700
+@@ -85,7 +85,7 @@
+ 
+ @DOES_NOT_HAVE_SIGNED@
+ 
+-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
++#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64)
+ /* 64 bit architectures */
+ 
+ typedef signed char     SBYTE;      /* 1 byte, signed */
+--- include/mikmod_internals.h	2007-12-15 04:24:51.000000000 -0800
++++ include/mikmod_internals.h	2009-10-05 00:19:15.000000000 -0700
+@@ -50,7 +50,7 @@
+ /*========== More type definitions */
+ 
+ /* SLONGLONG: 64bit, signed */
+-#if defined (__arch64__) || defined(__alpha)
++#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64)
+ typedef long		SLONGLONG;
+ #define NATIVE_64BIT_INT
+ #elif defined(__WATCOMC__)
diff --git a/srcpkgs/libmikmod/patches/libmikmod-3.1.12-exitcrash-fix.diff b/srcpkgs/libmikmod/patches/libmikmod-3.1.12-exitcrash-fix.diff
new file mode 100644
index 00000000000..7b83053612a
--- /dev/null
+++ b/srcpkgs/libmikmod/patches/libmikmod-3.1.12-exitcrash-fix.diff
@@ -0,0 +1,20 @@
+Date: 15 Apr 2002 11:01:19 +0200
+From: Guillaume Cottenceau <gc@mandrakesoft.com>
+
+Unfortunately, I should have double checked that the following
+fix (authored by Dave Goehrig <dave@cthulhu-burger.org>, not me),
+was really in the CVS... it's not, as of stable 1.2.3 at least.
+Please include it, it fixes a segfault on exiting a program which
+disabled MOD music during its execution.
+
+--- playercode/virtch_common.c	2007-12-15 01:26:53.000000000 -0800
++++ playercode/virtch_common.c	2009-10-05 00:37:12.000000000 -0700
+@@ -347,7 +347,7 @@
+ 
+ void VC1_SampleUnload(SWORD handle)
+ {
+-	if (handle<MAXSAMPLEHANDLES) {
++	if (Samples && handle<MAXSAMPLEHANDLES) {
+ 		if (Samples[handle])
+ 			free(Samples[handle]);
+ 		Samples[handle]=NULL;
diff --git a/srcpkgs/libmikmod/patches/libmikmod-3.1.12-loopingvolume-fix.diff b/srcpkgs/libmikmod/patches/libmikmod-3.1.12-loopingvolume-fix.diff
new file mode 100644
index 00000000000..cbb0fd1fec6
--- /dev/null
+++ b/srcpkgs/libmikmod/patches/libmikmod-3.1.12-loopingvolume-fix.diff
@@ -0,0 +1,14 @@
+Yi-Huang Han - Wed Oct 24 21:55:47 PDT 2001
+ * Fixed MOD music volume when looping
+
+--- playercode/mplayer.c	2009-10-05 00:19:59.000000000 -0700
++++ playercode/mplayer.c	2009-10-05 00:44:35.000000000 -0700
+@@ -3019,7 +3019,7 @@
+ {
+ 	MUTEX_LOCK(vars);
+ 	if (pf)
+-		pf->volume=(volume<0)?0:(volume>128)?128:volume;
++		pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume;
+ 	MUTEX_UNLOCK(vars);
+ }
+ 
diff --git a/srcpkgs/libmikmod/patches/libmikmod-3.1.12-md_sngchn-fix.diff b/srcpkgs/libmikmod/patches/libmikmod-3.1.12-md_sngchn-fix.diff
new file mode 100644
index 00000000000..0372935f5b8
--- /dev/null
+++ b/srcpkgs/libmikmod/patches/libmikmod-3.1.12-md_sngchn-fix.diff
@@ -0,0 +1,111 @@
+This patch fixes "buffer overflow due to md_numchn - ID: 1630158"
+
+--- playercode/mplayer.c	2007-12-15 01:26:28.000000000 -0800
++++ playercode/mplayer.c	2009-10-04 23:48:36.000000000 -0700
+@@ -52,6 +52,8 @@
+    will wait */
+ /*static*/ MODULE *pf = NULL;
+ 
++#define NUMVOICES(mod)	(md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices)
++
+ #define	HIGH_OCTAVE		2	/* number of above-range octaves */
+ 
+ static	UWORD oldperiods[OCTAVE*2]={
+@@ -248,14 +250,14 @@
+ 	MP_VOICE *a;
+ 	ULONG t,k,tvol,pp;
+ 
+-	for (t=0;t<md_sngchn;t++)
++	for (t=0;t<NUMVOICES(mod);t++)
+ 		if (((mod->voice[t].main.kick==KICK_ABSENT)||
+ 			 (mod->voice[t].main.kick==KICK_ENV))&&
+ 		   Voice_Stopped_internal(t))
+ 			return t;
+ 
+ 	tvol=0xffffffUL;t=-1;a=mod->voice;
+-	for (k=0;k<md_sngchn;k++,a++) {
++	for (k=0;k<NUMVOICES(mod);k++,a++) {
+ 		/* allow us to take over a nonexisting sample */
+ 		if (!a->main.s)
+ 			return k;
+@@ -2249,12 +2251,12 @@
+ 
+ 	switch (dat) {
+ 	case 0x0: /* past note cut */
+-		for (t=0;t<md_sngchn;t++)
++		for (t=0;t<NUMVOICES(mod);t++)
+ 			if (mod->voice[t].master==a)
+ 				mod->voice[t].main.fadevol=0;
+ 		break;
+ 	case 0x1: /* past note off */
+-		for (t=0;t<md_sngchn;t++)
++		for (t=0;t<NUMVOICES(mod);t++)
+ 			if (mod->voice[t].master==a) {
+ 				mod->voice[t].main.keyoff|=KEY_OFF;
+ 				if ((!(mod->voice[t].venv.flg & EF_ON))||
+@@ -2263,7 +2265,7 @@
+ 			}
+ 		break;
+ 	case 0x2: /* past note fade */
+-		for (t=0;t<md_sngchn;t++)
++		for (t=0;t<NUMVOICES(mod);t++)
+ 			if (mod->voice[t].master==a)
+ 				mod->voice[t].main.keyoff|=KEY_FADE;
+ 		break;
+@@ -2318,7 +2320,7 @@
+ 	SAMPLE *s;
+ 
+ 	mod->totalchn=mod->realchn=0;
+-	for (channel=0;channel<md_sngchn;channel++) {
++	for (channel=0;channel<NUMVOICES(mod);channel++) {
+ 		aout=&mod->voice[channel];
+ 		i=aout->main.i;
+ 		s=aout->main.s;
+@@ -2736,7 +2738,7 @@
+ 			if (a->dct!=DCT_OFF) {
+ 				int t;
+ 
+-				for (t=0;t<md_sngchn;t++)
++				for (t=0;t<NUMVOICES(mod);t++)
+ 					if ((!Voice_Stopped_internal(t))&&
+ 					   (mod->voice[t].masterchn==channel)&&
+ 					   (a->main.sample==mod->voice[t].main.sample)) {
+@@ -2978,6 +2980,11 @@
+ 	if (!(mod->voice=(MP_VOICE*)_mm_calloc(md_sngchn,sizeof(MP_VOICE))))
+ 		return 1;
+ 
++	/* mod->numvoices was used during loading to clamp md_sngchn.
++	   After loading it's used to remember how big mod->voice is.
++	*/
++	mod->numvoices = md_sngchn;
++
+ 	Player_Init_internal(mod);
+ 	return 0;
+ }
+@@ -3086,7 +3093,7 @@
+ 		pf->patbrk=0;
+ 		pf->vbtick=pf->sngspd;
+ 
+-		for (t=0;t<md_sngchn;t++) {
++		for (t=0;t<NUMVOICES(pf);t++) {
+ 			Voice_Stop_internal(t);
+ 			pf->voice[t].main.i=NULL;
+ 			pf->voice[t].main.s=NULL;
+@@ -3111,7 +3118,7 @@
+ 		pf->patbrk=0;
+ 		pf->vbtick=pf->sngspd;
+ 
+-		for (t=0;t<md_sngchn;t++) {
++		for (t=0;t<NUMVOICES(pf);t++) {
+ 			Voice_Stop_internal(t);
+ 			pf->voice[t].main.i=NULL;
+ 			pf->voice[t].main.s=NULL;
+@@ -3138,7 +3145,7 @@
+ 		pf->sngpos=pos;
+ 		pf->vbtick=pf->sngspd;
+ 
+-		for (t=0;t<md_sngchn;t++) {
++		for (t=0;t<NUMVOICES(pf);t++) {
+ 			Voice_Stop_internal(t);
+ 			pf->voice[t].main.i=NULL;
+ 			pf->voice[t].main.s=NULL;
diff --git a/srcpkgs/libmikmod/patches/libmikmod-CVE-2009-0179.patch b/srcpkgs/libmikmod/patches/libmikmod-CVE-2009-0179.patch
new file mode 100644
index 00000000000..c428c2e7364
--- /dev/null
+++ b/srcpkgs/libmikmod/patches/libmikmod-CVE-2009-0179.patch
@@ -0,0 +1,31 @@
+--- loaders/load_xm.c	2004-01-21 18:43:53.000000000 +0100
++++ loaders/load_xm.c	2008-04-16 04:30:45.000000000 +0200
+@@ -622,7 +622,8 @@
+ 				/* read the remainder of the header */
+ 				for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader);
+ 
+-				if(_mm_eof(modreader)) {
++				/* last instrument is at the end of file in version 0x0104 */
++				if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
+ 					free(nextwav);free(wh);
+ 					nextwav=NULL;wh=NULL;
+ 					_mm_errno = MMERR_LOADING_SAMPLEINFO;
+--- playercode/mloader.c	2004-01-21 18:43:53.000000000 +0100
++++ playercode/mloader.c	2008-04-16 04:30:45.000000000 +0200
+@@ -450,10 +450,12 @@
+ 	if (!l->Init || l->Init()) {
+ 		_mm_rewind(modreader);
+ 		ok = l->Load(curious);
+-		/* propagate inflags=flags for in-module samples */
+-		for (t = 0; t < of.numsmp; t++)
+-			if (of.samples[t].inflags == 0)
+-				of.samples[t].inflags = of.samples[t].flags;
++		if (ok) {
++			/* propagate inflags=flags for in-module samples */
++			for (t = 0; t < of.numsmp; t++)
++				if (of.samples[t].inflags == 0)
++					of.samples[t].inflags = of.samples[t].flags;
++		}
+ 	} else
+ 		ok = 0;
+ 
diff --git a/srcpkgs/libmikmod/template b/srcpkgs/libmikmod/template
new file mode 100644
index 00000000000..18ba98674c1
--- /dev/null
+++ b/srcpkgs/libmikmod/template
@@ -0,0 +1,28 @@
+# Template file for 'libmikmod'
+pkgname=libmikmod
+version=3.1.12
+distfiles="${SOURCEFORGE_SITE}/mikmod/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-esd"
+short_desc="MikMod Sound Library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32
+long_desc="
+ The MikMod sound library is an excellent way for a programmer to
+ add music and sound effects to an application. It is a powerful
+ and flexible library, with a simple and easy-to-learn API.
+
+ Besides, the library is very portable and runs under a lot of
+ Unices, as well as under OS/2, MacOS and Windows. Third party
+ individuals also maintain ports on other systems, including MS-DOS,
+ and BeOS.
+
+ MikMod is able to play a wide range of module formats, as well as
+ digital sound files. It can take advantage of particular features
+ of your system, such as sound redirection over the network. And
+ due to its modular nature, the library can be extended to support
+ more sound or module formats, as well as new hardware or other
+ sound output capabilities, as they appear."
+ 
+subpackages="$pkgname-devel"
+Add_dependency run glibc

From 9e86bdbd0eaf462f8bac019366e3d18b14d5dc10 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 25 Dec 2009 22:39:48 +0100
Subject: [PATCH 38/43] Added SDL_mixer-1.2.11 build template.

--HG--
extra : convert_revision : 5f219bac633752dedc86ad821cda33fd8621d746
---
 srcpkgs/SDL_mixer-devel                    |  1 +
 srcpkgs/SDL_mixer/SDL_mixer-devel.template | 21 +++++++++++++
 srcpkgs/SDL_mixer/depends                  |  2 ++
 srcpkgs/SDL_mixer/template                 | 34 ++++++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 120000 srcpkgs/SDL_mixer-devel
 create mode 100644 srcpkgs/SDL_mixer/SDL_mixer-devel.template
 create mode 100644 srcpkgs/SDL_mixer/depends
 create mode 100644 srcpkgs/SDL_mixer/template

diff --git a/srcpkgs/SDL_mixer-devel b/srcpkgs/SDL_mixer-devel
new file mode 120000
index 00000000000..6e93192bfca
--- /dev/null
+++ b/srcpkgs/SDL_mixer-devel
@@ -0,0 +1 @@
+SDL_mixer
\ No newline at end of file
diff --git a/srcpkgs/SDL_mixer/SDL_mixer-devel.template b/srcpkgs/SDL_mixer/SDL_mixer-devel.template
new file mode 100644
index 00000000000..a57072cf955
--- /dev/null
+++ b/srcpkgs/SDL_mixer/SDL_mixer-devel.template
@@ -0,0 +1,21 @@
+# Template file for 'SDL_mixer-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run SDL-devel
+Add_dependency run libvorbis-devel
+Add_dependency run libmikmod-devel
+Add_dependency run libflac-devel
+Add_dependency run smpeg-devel
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/SDL_mixer/depends b/srcpkgs/SDL_mixer/depends
new file mode 100644
index 00000000000..bd2919ddf10
--- /dev/null
+++ b/srcpkgs/SDL_mixer/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.2.11"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
new file mode 100644
index 00000000000..b82dfd5eacd
--- /dev/null
+++ b/srcpkgs/SDL_mixer/template
@@ -0,0 +1,34 @@
+# Template file for 'SDL_mixer'
+pkgname=SDL_mixer
+version=1.2.11
+distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="Multi-channel audio mixer library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9
+long_desc="
+ SDL_mixer is a sample multi-channel audio mixer library. It supports any
+ number of simultaneously playing channels of 16 bit stereo audio, plus
+ a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI,
+ Ogg Vorbis, and SMPEG MP3 libraries."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run SDL
+Add_dependency run libvorbis
+Add_dependency run libmikmod
+Add_dependency run smpeg
+Add_dependency run libflac
+Add_dependency build SDL-devel
+Add_dependency build libvorbis-devel
+Add_dependency build libmikmod-devel
+Add_dependency build libflac-devel
+Add_dependency build smpeg-devel
+
+pre_configure()
+{
+	sed -i 's|/usr/local/lib/timidity|/usr/lib/timidity|' \
+		${wrksrc}/timidity/config.h || return 1
+	sed -i 's|/etc/timidity/timidity.cfg|/etc/timidity++/timidity.cfg|' \
+		${wrksrc}/timidity/config.h || return 1
+}

From 51ee7b62fc0916ed6c1b1faa1761f5a540bfa4c5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 25 Dec 2009 22:40:00 +0100
Subject: [PATCH 39/43] Added ltris-1.0.14 build template.

--HG--
extra : convert_revision : 3ff584589141abec97a812ad82f94ee074284c74
---
 srcpkgs/ltris/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/ltris/template

diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
new file mode 100644
index 00000000000..b762c9dc4cb
--- /dev/null
+++ b/srcpkgs/ltris/template
@@ -0,0 +1,21 @@
+# Template file for 'ltris'
+pkgname=ltris
+version=1.0.14
+distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--localstatedir=/var/games/ltris"
+short_desc="An SDL tetris clone"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=d6816aa70f55c73e0de2ccb81281a92aa063d3a90b362810002db010f4e3b3b2
+long_desc="
+ LTris as a tetris clone: differently shaped blocks are falling down the
+ rectangular playing field and can be moved sideways or rotated by 90 degree
+ units with the aim of building lines without gaps which then disappear
+ (causing any block above the deleted line to fall down)."
+
+Add_dependency run glibc
+Add_dependency run SDL
+Add_dependency run SDL_mixer
+Add_dependency build bison
+Add_dependency build SDL-devel
+Add_dependency build SDL_mixer-devel

From ef3c00b26db09686558614c043426ccff875cf1b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 25 Dec 2009 23:04:35 +0100
Subject: [PATCH 40/43] Added SDL_net-1.2.7 build template.

--HG--
extra : convert_revision : 779c7ca797763d00116e4194f160995ba19b976c
---
 srcpkgs/SDL_net-devel                  |  1 +
 srcpkgs/SDL_net/SDL_net-devel.template | 16 ++++++++++++++++
 srcpkgs/SDL_net/depends                |  2 ++
 srcpkgs/SDL_net/template               | 16 ++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/SDL_net-devel
 create mode 100644 srcpkgs/SDL_net/SDL_net-devel.template
 create mode 100644 srcpkgs/SDL_net/depends
 create mode 100644 srcpkgs/SDL_net/template

diff --git a/srcpkgs/SDL_net-devel b/srcpkgs/SDL_net-devel
new file mode 120000
index 00000000000..95ea9d09a6f
--- /dev/null
+++ b/srcpkgs/SDL_net-devel
@@ -0,0 +1 @@
+SDL_net
\ No newline at end of file
diff --git a/srcpkgs/SDL_net/SDL_net-devel.template b/srcpkgs/SDL_net/SDL_net-devel.template
new file mode 100644
index 00000000000..d6df9fb34fd
--- /dev/null
+++ b/srcpkgs/SDL_net/SDL_net-devel.template
@@ -0,0 +1,16 @@
+# Template file for 'SDL_net-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run SDL-devel
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/SDL_net/depends b/srcpkgs/SDL_net/depends
new file mode 100644
index 00000000000..7af62f136f9
--- /dev/null
+++ b/srcpkgs/SDL_net/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.2.7"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template
new file mode 100644
index 00000000000..9e2d42193c5
--- /dev/null
+++ b/srcpkgs/SDL_net/template
@@ -0,0 +1,16 @@
+# Template file for 'SDL_net'
+pkgname=SDL_net
+version=1.2.7
+distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="Small sample cross-platform networking library for SDL"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53
+long_desc="
+ This is a small sample cross-platform networking library which is
+ supplementary to the SDL (Simple DirectMedia Layer) library."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run SDL
+Add_dependency build SDL-devel

From fc92bd77ce67e6d50d27390920caedf07785618e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 25 Dec 2009 23:04:46 +0100
Subject: [PATCH 41/43] Added lbreakout2-2.6.1 build template.

--HG--
extra : convert_revision : 150c8e9b7cf92d56dc8cb4b9a5ce183bd5104cc9
---
 srcpkgs/lbreakout2/files/lbreakout2.desktop |  10 +++++
 srcpkgs/lbreakout2/files/lbreakout2.png     | Bin 0 -> 1930 bytes
 srcpkgs/lbreakout2/template                 |  40 ++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 srcpkgs/lbreakout2/files/lbreakout2.desktop
 create mode 100644 srcpkgs/lbreakout2/files/lbreakout2.png
 create mode 100644 srcpkgs/lbreakout2/template

diff --git a/srcpkgs/lbreakout2/files/lbreakout2.desktop b/srcpkgs/lbreakout2/files/lbreakout2.desktop
new file mode 100644
index 00000000000..c8ef945da1f
--- /dev/null
+++ b/srcpkgs/lbreakout2/files/lbreakout2.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Linux Breakout 2
+Comment=Breakout and Arkanoid style arcade game
+Icon=/usr/share/pixmaps/lbreakout2.png
+TryExec=lbreakout2
+Exec=lbreakout2
+Terminal=false
+Categories=Application;Game;
diff --git a/srcpkgs/lbreakout2/files/lbreakout2.png b/srcpkgs/lbreakout2/files/lbreakout2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9541e1842bad41cf496141a3412eaf75fb45a28
GIT binary patch
literal 1930
zcmd5+{a4a=82$Pw8=_KuOHf**RAi;h2rbdbP*K51k*v_($S|2wLSaE#GD9UY^QC5{
z8_clbq@uJ&4a*AC)Ep~!qS98&-puvluuy6APwaHhd7k^+bDkgWFZUKFuwp!sSR@2N
zo^i2JY$peO9>fIa-t@q&34$g-3Gtk0ryL(2bBqm+eRw!FI^cNOI{MONv(~=rEV2}M
zDVRV+1-ofLoeF+Q16{cue;&jcvjB$(c)`GCskGl$+xv8XpH7od!Qhn~1_1w#j}JHo
z?mF&X8@*<<8?`p=z8Cw#>ce0OjLJsAA{dd0m?57rTR9soMbl2x$S24k1<)?iD&JQ6
zm-+)HFnll!*~h>Z0G5G;p>Z4Kf;AF80AQnBSY|%nY;QH%%zT9)Xn8P^%9iVtM!UJ&
zZZ*6!vPE1h9=l4oK~yWX*sOvwQ3#8ILc_@tZdvnjwlJB_V-Tq%6pW&<s8lwUL=V9e
z@kkWXFUTLp!e|^Ci9!i*@QD!rip6sk1n<mbrbNWalW_B-T#=BqQ^?LrXYyDP5<EI@
z0WNJCQclF1_{rTRa!YNgUdYpy37hr#-R3e&$M^RwC;EDS(4CNU<cZ8#>$Op2DGrvW
z#Pu3<)>~$yUS~Fyyc}q@+b%im9YaILE_035+}dk2bSriWSj&h+d|lBt%TYx~tHxn7
zzIl1ZsMGf9YC9x+BPUA9W9Sw9Ud_>FWu8$dH|Z74CGz!L+A&e8iOXo+oTTTnj0U+*
zD?P5@Y1woGgTf{eNC9|$bg(LLW?gtd9-pNu*i>DSsjkjGrIF<FlGab2L`0)dC{HS3
zMkW@uhDJ<gQ+ONb>AW}wWzkXqVC1AA0O*rINDzTUB2YpWP@Etw2nitsEbu2_r_FQz
z0DuPohlX)DG!Bc#VqqAb3Zp!b0DSr)ab|c!J_NZyJK3zHFVf)uX9`Lh`D(7S4_tW6
zm?)^ob!Mznxb28tCwB7ZI~Jn1e@k^X2PQ6R1t+%cb;ZXpPNH|)?ch5P!mg>p=t=a>
znzNn3`rpsTj%srIy$p4<w1v|X=P=were;j@ISH5J{k}WZ68BHl+w1QyJ}d4Y?R&cC
z_OsgCp|?Xvs2Fu<q3B40zM{Gzt#9xAm5CJxtD|Uq-=L+Ws(51hgROd8XMYiC%5-vL
zf`3NQo$|^c<Vm*Lckz^MsgTBty~^uG51EsuNKfe59Wd4t`Lx47ySy_Z;W2Xd$vfZe
zDi4#vKIm<!kLLgOV4X6NwzAv@A=tkC1^C&@)JZn4UBcBR%Np7}CRWk)M>4z*DOaBz
zq~#o9pf1Iv`9d5Qg?Q>MDJkI9wsLO-mAjF_4D1z*kL~*U^6JLZr;m0<^t|#^?2q_5
zw{*pf%ph-1DQQCflTczoTh973ao;}LUF+_*IN*`e-E~eu)!yN5!jaI4;Si=H8>rA%
z!YHs0BH^t%yz}O@Vbi2jGi%&D+*!*f(%ngyCO(=MUX|}#Q0PvnY4JrcRs7|wHzSiV
zH$4g>p4nWv@q}~h($B92^Kv*9`A`qQgmVQUg+43!{_UAVEf9H8+ZaZ>`LUyT%lXWY
zN(5Qv(x^&pl6G;)DK3pEEt{WcyAn0xB12%xg=k^_Suv_r|4?Qdy1!iJ_xQ@y$ikmW
zI=SCR#2k)}nRWQXh^F537oz9`X4!A~tn1g!HL6vy@$viT5X|#x7}VT>%v2<dNf20n
z9ag=sT6eF!y}iB5Sem`)n--|p?K#`}w6#^U@W$LV^`ge}rv{~a9G>K)2(QW|w~)7#
zLa$>>lU&p9zP5xN$oXgWpPV17XqNHI!`9)iCZ7|F#5+Xdw;!KpXYJwcT3J(6`lilk
zQva2)^+~0<J&n(&${ZTCW9wi8VXFG^E^$1QIar<C(DXX6uCYtd)NEpAm1GI`eR3%d
zuy2vYtcYo=?<Q6U-s^QOY;4fK7t0t7*$C!HbmYgTOZD~jKaZsJkMublroMbr{?)6q
zA|F1Cl>DA`z)B^Dhm$CFu?O+u;X|s!pX^x|?z?>>wAZh2+#7f4D~o;oM}c3vGb>PB
LG%HF^+a&)Fhg>wM

literal 0
HcmV?d00001

diff --git a/srcpkgs/lbreakout2/template b/srcpkgs/lbreakout2/template
new file mode 100644
index 00000000000..f87534e9fb5
--- /dev/null
+++ b/srcpkgs/lbreakout2/template
@@ -0,0 +1,40 @@
+# Template file for 'lbreakout2'
+pkgname=lbreakout2
+version=2.6.1
+distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-rpath --enable-sdl-net
+ --localstatedir=/var/games/$pkgname"
+make_install_args="doc_dir=/usr/share/doc"
+short_desc="Breakout-style arcade game"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=0d86f9da3da5fe3eaa5bb4c9d15ba9666e0c35e739b93c220eecd16f729500cb
+long_desc="
+ The polished successor to LBreakout offers you a new challenge in more
+ than 50 levels with loads of new bonuses (goldshower, joker, explosive
+ balls, bonus magnet ...), maluses (chaos, darkness, weak balls, malus
+ magnet ...) and special bricks (growing bricks, explosive bricks,
+ regenerative bricks, indestructible bricks, chaotic bricks).
+
+ And if you're through with all the levels you can create complete new
+ levelsets with the integrated easy-to-use level editor!"
+
+Add_dependency run glibc
+Add_dependency run zlib
+Add_dependency run libpng
+Add_dependency run SDL
+Add_dependency run SDL_mixer
+Add_dependency run SDL_net
+Add_dependency build zlib-devel
+Add_dependency build libpng-devel
+Add_dependency build SDL-devel
+Add_dependency build SDL_mixer-devel
+Add_dependency build SDL_net-devel
+
+post_install()
+{
+	install -Dm755 ${FILESDIR}/lbreakout2.desktop \
+		${DESTDIR}/usr/share/applications/lbreakout2.desktop || return 1
+	install -Dm755 ${FILESDIR}/lbreakout2.png \
+		${DESTDIR}/usr/share/pixmaps/lbreakout2.png || return 1
+}

From e45db90a42050450f85470a03bd8baa1a9f05d84 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 26 Dec 2009 07:02:27 +0100
Subject: [PATCH 42/43] pixman: update to 0.16.4.

--HG--
extra : convert_revision : 999f5011ddb1f40a70e9d9f2567ab9c9185eb80a
---
 srcpkgs/pixman/pixman-devel.template | 3 ++-
 srcpkgs/pixman/template              | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pixman/pixman-devel.template b/srcpkgs/pixman/pixman-devel.template
index 9904077ebd9..2d04ae4e501 100644
--- a/srcpkgs/pixman/pixman-devel.template
+++ b/srcpkgs/pixman/pixman-devel.template
@@ -1,10 +1,11 @@
 # Template file for 'pixman-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run glibc-devel
 Add_dependency run pixman
 
 do_install()
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 4346cd58988..6b1462a02d2 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -1,15 +1,15 @@
 # Template build file for 'pixman'.
 pkgname=pixman
-version=0.16.2
+version=0.16.4
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Library of low-level pixel manipulation routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=80b2fa3392e97c257ea251f99f827cc0f3dda06b876c27a0fcb54b971c296760
+checksum=296e9358f125536624362c4b1502a92c81227d95cda278bbff84e5593bdfcd1e
 long_desc="
  Pixel manipulation library for modular X.org."
 
 subpackages="$pkgname-devel"
 Add_dependency build pkg-config
 Add_dependency build perl
-Add_dependency full glibc
+Add_dependency run glibc

From 6a0588cad9baf687e527f1cd53b49e5a7c101d6d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 26 Dec 2009 07:16:33 +0100
Subject: [PATCH 43/43] xf86-video-intel: downgrade to 2.9.1, it was too
 unstable.

--HG--
extra : convert_revision : 423766d9a239f7850f5cc93f71b77271afa587ca
---
 srcpkgs/xf86-video-intel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template
index a6d5716a26b..f348f6d96d9 100644
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@@ -1,11 +1,11 @@
 # Template build file for 'xf86-video-intel'.
 pkgname=xf86-video-intel
-version=2.9.99.902
+version=2.9.1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Intel video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=3ac36692f2ff2b87ae8521e4b9e6d38a384a592cbfc573914913d1481d1b17f4
+checksum=95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76
 long_desc="
  This is the video driver for Intel video chips for the
  Xorg X11 server."