From 6f2c7d782d8574a7af39be7d08a71eba21e1fd4e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 8 Nov 2010 15:03:04 +0100
Subject: [PATCH] Added garcon-0.1.3 build template, required by XFCE 4.8.

---
 srcpkgs/garcon-devel                     |  1 +
 srcpkgs/garcon/depends                   |  2 ++
 srcpkgs/garcon/garcon-devel.template     | 20 ++++++++++++++++++++
 srcpkgs/garcon/template                  | 24 ++++++++++++++++++++++++
 xbps-src/common/mapping_shlib_binpkg.txt |  5 +++--
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/garcon-devel
 create mode 100644 srcpkgs/garcon/depends
 create mode 100644 srcpkgs/garcon/garcon-devel.template
 create mode 100644 srcpkgs/garcon/template

diff --git a/srcpkgs/garcon-devel b/srcpkgs/garcon-devel
new file mode 120000
index 00000000000..c52c5ebdb1c
--- /dev/null
+++ b/srcpkgs/garcon-devel
@@ -0,0 +1 @@
+garcon
\ No newline at end of file
diff --git a/srcpkgs/garcon/depends b/srcpkgs/garcon/depends
new file mode 100644
index 00000000000..6f02f456795
--- /dev/null
+++ b/srcpkgs/garcon/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.3"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/garcon/garcon-devel.template b/srcpkgs/garcon/garcon-devel.template
new file mode 100644
index 00000000000..b7ed4fa8dbf
--- /dev/null
+++ b/srcpkgs/garcon/garcon-devel.template
@@ -0,0 +1,20 @@
+# Template file for 'garcon-devel'.
+#
+short_desc="${short_desc} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run glib-devel
+Add_dependency run garcon
+
+do_install()
+{
+	install -d ${DESTDIR}/usr/{lib,share}
+
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
new file mode 100644
index 00000000000..41fd54fe2fc
--- /dev/null
+++ b/srcpkgs/garcon/template
@@ -0,0 +1,24 @@
+# Template file for 'garcon'
+pkgname=garcon
+version=0.1.3
+distfiles="http://archive.xfce.org/src/libs/$pkgname/0.1/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Glib/GIO freedesktop.org compliant menu implementation"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=1e36c4cd99fe92a1fe3e3f648de8c941fd39bbda22d4cd8c52a8ec341432d954
+long_desc="
+ This is garcon, a freedesktop.org compliant menu implementation based
+ on GLib and GIO. It was started as a complete rewrite of the former
+ Xfce menu library called libxfce4menu, which, in contrast to garcon,
+ was lacking menu merging features essential for loading menus modified
+ with menu editors."
+
+conf_files="/etc/xdg/menus/xfce-applications.menu"
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+
+Add_dependency build pkg-config
+Add_dependency build gettext
+Add_dependency build intltool
+Add_dependency build glib-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 2f7da42fd8f..854d29abb56 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -279,8 +279,7 @@ libxcb-atom.so			xcb-util		xcb-util-devel
 libxcb-event.so			xcb-util		xcb-util-devel
 libtiff.so			tiff			tiff-devel
 libnotify.so			libnotify		libnotify-devel
-libexo-0.3.so			exo			exo-devel
-libexo-hal-0.3.so		exo			exo-devel
+libexo-1.so			exo			exo-devel
 libvte.so			vte			vte-devel
 libgamin-1.so			gamin			gamin-devel
 libfam.so			gamin			gamin-devel
@@ -649,6 +648,7 @@ libclang.so			libclang
 libapr-1.so			apr			apr-devel
 libaprutil-1.so			apr-util		apr-util-devel
 libnetpgp.so			libnetpgp		libnetpgp-devel
+libmj.so			libnetpgp		libnetpgp-devel
 libmca_common_sm.so		openmpi			openmpi-devel
 libmpi_cxx.so			openmpi			openmpi-devel
 libmpi.so			openmpi			openmpi-devel
@@ -667,3 +667,4 @@ libassuan.so			libassuan		libassuan-devel
 libgpgme.so.11			gpgme			gpgme-devel
 libgpgme-pthread.so.11		gpgme			gpgme-devel
 libcryptui.so			seahorse		seahorse-devel
+libgarcon-1.so			garcon			garcon-devel