From d7c709bc5e78f35d129a05b9ff1c91d9da70b521 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 23 May 2012 22:24:06 +0000
Subject: main/ruby: upgrade to 1.8.7-p358

---
 main/ruby/APKBUILD | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'main/ruby/APKBUILD')

diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index b722d325d..c86605d7e 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -1,18 +1,20 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=ruby
-pkgver=1.8.7_p352
+pkgver=1.8.7_p358
 _pkgver=${pkgver/_/-}
 pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
 url="http://www.ruby-lang.org/en/"
 arch="all"
 license="Ruby"
-depends=
-makedepends="zlib-dev openssl-dev libiconv-dev gdbm-dev db-dev readline-dev"
+depends=""
+makedepends="zlib-dev openssl-dev libiconv-dev gdbm-dev db-dev readline-dev
+		valgrind-dev"
 subpackages="$pkgname-doc $pkgname-dev"
-source="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${pkgname}-${_pkgver}.tar.bz2"
+source="ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/${pkgname}-${_pkgver}.tar.bz2"
 options="!fhs"
+
 #
 # maybe its a good idea to split dep libs to seperate pkg's.
 #
@@ -37,21 +39,27 @@ build() {
 	# ruby saves path to install. we want use $PATH
 	export INSTALL=install
 
-	./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
+	./configure \
+		--build=${CHOST:-i486-alpine-linux-uclibc} \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-pthread \
 		--with-sitedir='/usr/local/lib/site_ruby' \
-		--with-extra-site-search-path='/usr/lib/site_ruby/$(ruby_ver)/i686-linux' \
-		--enable-shared
+		--with-search-path='/usr/lib/site_ruby/$(ruby_ver)/i686-linux' \
+		--enable-pthread \
+        --disable-rpath \
+        --disable-versioned-paths \
+		--enable-shared \
+		--with-mantype=man \
+		|| return 1
 	make || return 1
+	make test || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 	if [ -d "$pkgdir"/usr/local ]; then
 		local f=$(cd "$pkgdir" ; find usr/local -type f)
 		if [ -n "$f" ]; then
@@ -60,8 +68,8 @@ package() {
 			return 1
 		fi
 	fi
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}"/COPYING || return 1
-
+	install -Dm644 COPYING \
+		"${pkgdir}/usr/share/licenses/${pkgname}"/COPYING || return 1
 }
 
-md5sums="0c61ea41d1b1183b219b9afe97f18f52  ruby-1.8.7-p352.tar.bz2"
+md5sums="de35f00997f4ccee3e22dff0f2d01b8a  ruby-1.8.7-p358.tar.bz2"
-- 
cgit v1.2.3