From 06b9c09220221f2e7938a2ae83a8b9eb537d2687 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 29 Jan 2010 12:43:03 +0000
Subject: main/libglade: workaround segfaulting xmlcatalog

---
 main/libglade/APKBUILD                | 23 +++++++++++++----------
 main/libglade/libglade.post-deinstall |  1 +
 main/libglade/libglade.post-install   |  1 +
 3 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'main/libglade')

diff --git a/main/libglade/APKBUILD b/main/libglade/APKBUILD
index b999bd4ae4..3a4b079e39 100644
--- a/main/libglade/APKBUILD
+++ b/main/libglade/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libglade
 pkgver=2.6.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Allows you to load glade interface files in a program at runtime"
 url="http://www.gnome.org"
 license="LGPL"
@@ -12,24 +12,27 @@ install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade
 	$pkgname.post-deinstall"
 source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.6/$pkgname-$pkgver.tar.bz2
 	$pkgname-2.0.1-nowarning.patch
-	$install
 	"
 
 depends_dev="gtk+-dev libxml2-dev"
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$pkgver
+package() {
+	cd "$_builddir"
 	patch -Np1 -i "$srcdir"/libglade-2.0.1-nowarning.patch || return 1
+}
+
+build() {
+	cd "$_builddir"
 	./configure --sysconfdir=/etc \
 		--prefix=/usr \
 		--localstatedir=/var || return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	install -m755 libglade-convert "$pkgdir"/usr/bin/ || return 1
 }
 md5sums="d1776b40f4e166b5e9c107f1c8fe4139  libglade-2.6.4.tar.bz2
-4f879c0ce550004905aa0fb24f25c353  libglade-2.0.1-nowarning.patch
-9083bddf8edd4a116bec36df3866e9bf  libglade.post-install
-964867abf7ceafdce9640b08f34ce090  libglade.pre-upgrade
-9083bddf8edd4a116bec36df3866e9bf  libglade.post-upgrade
-964867abf7ceafdce9640b08f34ce090  libglade.post-deinstall"
+4f879c0ce550004905aa0fb24f25c353  libglade-2.0.1-nowarning.patch"
diff --git a/main/libglade/libglade.post-deinstall b/main/libglade/libglade.post-deinstall
index 1b368de845..bb4b3039a0 100644
--- a/main/libglade/libglade.post-deinstall
+++ b/main/libglade/libglade.post-deinstall
@@ -3,3 +3,4 @@
 xmlcatalog --noout --del \
 	/usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog
 
+exit 0
diff --git a/main/libglade/libglade.post-install b/main/libglade/libglade.post-install
index 2188b75635..82e58a85fe 100644
--- a/main/libglade/libglade.post-install
+++ b/main/libglade/libglade.post-install
@@ -10,3 +10,4 @@ xmlcatalog --noout --add "system" \
 	"http://glade.gnome.org/glade-2.0.dtd" \
 	/usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog
 
+exit 0
-- 
cgit v1.2.3