From 321472ecc099b8cf34a66070e6120b1571fb39ff Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 20 Jan 2010 21:00:34 +0000
Subject: x11/giflib: update makedepends

---
 x11/giflib/APKBUILD    | 24 ++++++++++++------------
 x11/giflib/nocxx.patch | 15 ---------------
 2 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 x11/giflib/nocxx.patch

(limited to 'x11')

diff --git a/x11/giflib/APKBUILD b/x11/giflib/APKBUILD
index a4b464d6..4ea64b88 100644
--- a/x11/giflib/APKBUILD
+++ b/x11/giflib/APKBUILD
@@ -1,31 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=giflib
 pkgver=4.1.6
-pkgrel=0
+pkgrel=1
 pkgdesc="A library for reading and writing gif images"
 url="http://sourceforge.net/projects/giflib/"
 license="MIT"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="libx11 uclibc"
-makedepends="libx11-dev libsm-dev e2fsprogs-dev"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	nocxx.patch"
+depends=
+makedepends="libx11-dev libsm-dev util-linux-ng-dev"
+source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
 
-build () 
-{ 
+build () { 
 	cd "$srcdir"/$pkgname-$pkgver
-	patch configure < ../nocxx.patch || return 1
 	./configure --prefix=/usr || return 1
 	make || return 1
+	MAJOR=`echo $pkgver | sed 's/\([0-9]\+\)\..*/\1/'`
+	gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.$pkgver || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING \
 		|| return 1
 	
-	MAJOR=`echo $pkgver | sed 's/\([0-9]\+\)\..*/\1/'`
-	gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.$pkgver || return 1
 	install -m755 libungif.so.$pkgver "$pkgdir"/usr/lib/ || return 1
 	ln -sf libungif.so.$pkgver "$pkgdir"/usr/lib/libungif.so.4 || return 1
 	ln -sf libungif.so.4 "$pkgdir"/usr/lib/libungif.so || return 1
 }
-md5sums="7125644155ae6ad33dbc9fc15a14735f  giflib-4.1.6.tar.bz2
-28513788ba4d556ccd538867dc6205ab  nocxx.patch"
+md5sums="7125644155ae6ad33dbc9fc15a14735f  giflib-4.1.6.tar.bz2"
diff --git a/x11/giflib/nocxx.patch b/x11/giflib/nocxx.patch
deleted file mode 100644
index beb1ab90..00000000
--- a/x11/giflib/nocxx.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure	2004-12-07 21:34:23.205172545 +0000
-+++ b/configure	2004-12-07 21:37:17.726654782 +0000
-@@ -5148,10 +5148,8 @@
-   :
- else
-   { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+See \`config.log' for more details." >&5;}
-+   { echo "C++ sucks, ignoring ..." >&5; }; }
- fi
- 
- ac_ext=cc
-- 
cgit v1.2.3