aboutsummaryrefslogtreecommitdiffstats
path: root/main/cpufrequtils
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-01-05 14:32:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-01-05 14:33:15 +0000
commit22f3b4760658fcd019306fd41d1929f07b2b5b56 (patch)
tree9084e8206dfa0a97edbf5e9495f390bf36ae43a5 /main/cpufrequtils
parent37d0a9de359ceab5272d06b9ba17e362a2b3afdf (diff)
downloadaports-22f3b4760658fcd019306fd41d1929f07b2b5b56.tar.bz2
aports-22f3b4760658fcd019306fd41d1929f07b2b5b56.tar.xz
main/cpufrequtils: upgrade to 006
Diffstat (limited to 'main/cpufrequtils')
-rw-r--r--main/cpufrequtils/APKBUILD19
-rw-r--r--main/cpufrequtils/cpufrequtils-006-nls.patch (renamed from main/cpufrequtils/cpufrequtils-005-nls.patch)38
2 files changed, 31 insertions, 26 deletions
diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
index 50cb2d1b08..cddef63fc3 100644
--- a/main/cpufrequtils/APKBUILD
+++ b/main/cpufrequtils/APKBUILD
@@ -1,21 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cpufrequtils
-pkgver=005
+pkgver=006
pkgrel=0
pkgdesc="Userspace tools for the kernel cpufreq subsystem"
url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
license="GPL"
subpackages="$pkgname-dev $pkgname-doc"
-depends="sysfsutils uclibc"
-makedepends="sysfsutils-dev uclibc libtool"
+depends="sysfsutils"
+makedepends="sysfsutils-dev libtool"
source="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/$pkgname-$pkgver.tar.bz2
cpufrequtils-005-build.patch
- cpufrequtils-005-nls.patch
+ cpufrequtils-006-nls.patch
$pkgname.initd
$pkgname.confd"
-build ()
-{
+build() {
cd "$srcdir"/$pkgname-$pkgver
for i in ../*.patch; do
msg "Applying $i..."
@@ -28,6 +27,10 @@ build ()
NLS=false \
PROC=false \
|| return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make mandir=/usr/share/man \
NLS=false \
DESTDIR="$pkgdir" \
@@ -35,8 +38,8 @@ build ()
install -D -m755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
install -D -m644 ../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-md5sums="73a41589fe74b73fc530f4179f2c6142 cpufrequtils-005.tar.bz2
+md5sums="124b0de8f3a4d672539a85ce13eed869 cpufrequtils-006.tar.bz2
0b007dbd9fcb3acf55a8570f21b2f5d4 cpufrequtils-005-build.patch
-d88bee4d20c8b72d8edd50c2af5d4600 cpufrequtils-005-nls.patch
+aa4c6f19766a741a68ae1ad352c6bad9 cpufrequtils-006-nls.patch
b9b80ef2f1b6c5e7ce0476037a8bce6b cpufrequtils.initd
d47ff635eef03248c633486eaeec191d cpufrequtils.confd"
diff --git a/main/cpufrequtils/cpufrequtils-005-nls.patch b/main/cpufrequtils/cpufrequtils-006-nls.patch
index 7a0336fff4..7d1c24dbd5 100644
--- a/main/cpufrequtils/cpufrequtils-005-nls.patch
+++ b/main/cpufrequtils/cpufrequtils-006-nls.patch
@@ -1,21 +1,19 @@
-make nls/gettext support optional
-
-patch by Jos van der Ende <seraph@xs4all.nl>
-
-http://bugs.gentoo.org/205576
-
---- cpufrequtils-005/Makefile
-+++ cpufrequtils-005/Makefile
-@@ -141,6 +141,7 @@
+diff --git a/Makefile b/Makefile
+index 19f3dd6..b7f1e56 100644
+--- a/Makefile
++++ b/Makefile
+@@ -147,6 +147,7 @@ endif
ifeq ($(strip $(NLS)),true)
INSTALL_NLS += install-gmo
COMPILE_NLS += update-gmo
+ CFLAGDEF += -DNLS
endif
-
---- cpufrequtils-005/utils/info.c
-+++ cpufrequtils-005/utils/info.c
+ ifeq ($(strip $(CPUFRQ_BENCH)),true)
+diff --git a/utils/info.c b/utils/info.c
+index 38d906a..155e604 100644
+--- a/utils/info.c
++++ b/utils/info.c
@@ -10,7 +10,6 @@
#include <errno.h>
#include <stdlib.h>
@@ -43,8 +41,10 @@ http://bugs.gentoo.org/205576
#define LINE_LEN 10
---- cpufrequtils-005/utils/set.c
-+++ cpufrequtils-005/utils/set.c
+diff --git a/utils/set.c b/utils/set.c
+index 2ece47e..312cc8c 100644
+--- a/utils/set.c
++++ b/utils/set.c
@@ -12,16 +12,24 @@
#include <limits.h>
#include <string.h>
@@ -56,13 +56,15 @@ http://bugs.gentoo.org/205576
#include "cpufreq.h"
+-#define _(String) gettext(String)
+#ifdef NLS
+#include <libintl.h>
- #define _(String) gettext (String)
- #define gettext_noop(String) String
- #define N_(String) gettext_noop (String)
-+#else
++#define _(String) gettext (String)
+#define gettext_noop(String) String
++#define N_(String) gettext_noop (String)
++#else
+ #define gettext_noop(String) String
+-#define N_(String) gettext_noop(String)
+#define _(String) gettext_noop (String)
+#define gettext(String) gettext_noop (String)
+#define N_(String) gettext_noop (String)