From 3f4993bbdd55ed2cf272dbcea33d314d436aac2e Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 24 Jul 2013 09:44:38 +0000
Subject: main/rrdtool: upgrade to 1.4.8

---
 main/rrdtool/APKBUILD                | 21 +++++++++++++++------
 main/rrdtool/libm-underlinking.patch | 11 +++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 main/rrdtool/libm-underlinking.patch

(limited to 'main/rrdtool')

diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index 3dfbcaf312..a51ec6ad21 100644
--- a/main/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rrdtool
-pkgver=1.4.7
-pkgrel=6
+pkgver=1.4.8
+pkgrel=0
 pkgdesc="Data logging and graphing application"
 url="http://www.rrdtool.org"
 arch="all"
@@ -9,10 +9,11 @@ license="GPL"
 depends="font-sony-misc"
 makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev
 	pango-dev lua-dev python-dev man
-	autoconf automake"
+	autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd lua-rrd:lua_rrd py-rrd:py_rrd"
 source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz
 	lua-install-cmod.patch
+	libm-underlinking.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -23,17 +24,18 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	libtoolize --force && aclocal && autoconf --force && automake --add-missing
 }
 
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
+		--disable-nls \
 		--disable-tcl \
 		--disable-ruby \
 		--enable-rrdcgi \
 		--enable-perl-site-install \
 		--enable-lua-site-install \
-		--enable-python-site-install \
 		--with-perl-options="INSTALLDIRS=vendor" \
 		|| return 1
 	make || return 1 
@@ -74,5 +76,12 @@ py_rrd() {
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
 
-md5sums="ffe369d8921b4dfdeaaf43812100c38f  rrdtool-1.4.7.tar.gz
-f94e916381af48dcf5687aa046b35aac  lua-install-cmod.patch"
+md5sums="dbe59386db97fd2f2216729facd74ca8  rrdtool-1.4.8.tar.gz
+f94e916381af48dcf5687aa046b35aac  lua-install-cmod.patch
+ab92a2b87f71d59e3830dac3b227c357  libm-underlinking.patch"
+sha256sums="de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6  rrdtool-1.4.8.tar.gz
+1e49eeca4561d29da3975f84e06b27f0f305e566bb26922397d938eede678b71  lua-install-cmod.patch
+0495bd122941bcd635ca2a2b7c3f01a6eb3ca3e00b7e40c257862b7071b7738a  libm-underlinking.patch"
+sha512sums="c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b  rrdtool-1.4.8.tar.gz
+0be4ebb864233cf32fa70c872f5421b2da50ad39d6a265c2f5869337b40647c0b88011ccf41fe17a8d35de915ca1c38d04d67696118e1e32ff774221b1816ab6  lua-install-cmod.patch
+94449972ccc7d1a057c2b827c041a16de1667c280a47ef30c1323ec9168812a96374704cc42dd832a30b8cc08d7fad94da44ff3695c66f3a0d324a87158fc23c  libm-underlinking.patch"
diff --git a/main/rrdtool/libm-underlinking.patch b/main/rrdtool/libm-underlinking.patch
new file mode 100644
index 0000000000..8fa33dab77
--- /dev/null
+++ b/main/rrdtool/libm-underlinking.patch
@@ -0,0 +1,11 @@
+--- ./src/Makefile.am.orig	2013-07-24 09:38:33.088184877 +0000
++++ ./src/Makefile.am	2013-07-24 09:38:48.788333567 +0000
+@@ -111,7 +111,7 @@
+ 
+ rrdtool_SOURCES = rrd_tool.c
+ rrdtool_DEPENDENCIES = librrd.la
+-rrdtool_LDADD	= librrd.la
++rrdtool_LDADD	= librrd.la -lm
+ 
+ rrdcached_SOURCES = rrd_daemon.c
+ rrdcached_DEPENDENCIES = librrd_th.la
-- 
cgit v1.2.3