From 22f3b4760658fcd019306fd41d1929f07b2b5b56 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 5 Jan 2010 14:32:51 +0000 Subject: main/cpufrequtils: upgrade to 006 --- main/cpufrequtils/APKBUILD | 19 ++++--- main/cpufrequtils/cpufrequtils-005-nls.patch | 73 --------------------------- main/cpufrequtils/cpufrequtils-006-nls.patch | 75 ++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 81 deletions(-) delete mode 100644 main/cpufrequtils/cpufrequtils-005-nls.patch create mode 100644 main/cpufrequtils/cpufrequtils-006-nls.patch diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD index 50cb2d1b0..cddef63fc 100644 --- a/main/cpufrequtils/APKBUILD +++ b/main/cpufrequtils/APKBUILD @@ -1,21 +1,20 @@ # Maintainer: Natanael Copa 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-005-nls.patch deleted file mode 100644 index 7a0336fff..000000000 --- a/main/cpufrequtils/cpufrequtils-005-nls.patch +++ /dev/null @@ -1,73 +0,0 @@ -make nls/gettext support optional - -patch by Jos van der Ende - -http://bugs.gentoo.org/205576 - ---- cpufrequtils-005/Makefile -+++ cpufrequtils-005/Makefile -@@ -141,6 +141,7 @@ - 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 -@@ -10,7 +10,6 @@ - #include - #include - #include --#include - #include - - #include -@@ -18,9 +17,18 @@ - #include "cpufreq.h" - - -+#ifdef NLS -+#include - #define _(String) gettext (String) - #define gettext_noop(String) String - #define N_(String) gettext_noop (String) -+#else -+#define gettext_noop(String) String -+#define _(String) gettext_noop (String) -+#define gettext(String) gettext_noop (String) -+#define N_(String) gettext_noop (String) -+#define textdomain(String) -+#endif - - #define LINE_LEN 10 - ---- cpufrequtils-005/utils/set.c -+++ cpufrequtils-005/utils/set.c -@@ -12,16 +12,24 @@ - #include - #include - #include --#include - #include - - #include - - #include "cpufreq.h" - -+#ifdef NLS -+#include - #define _(String) gettext (String) - #define gettext_noop(String) String - #define N_(String) gettext_noop (String) -+#else -+#define gettext_noop(String) String -+#define _(String) gettext_noop (String) -+#define gettext(String) gettext_noop (String) -+#define N_(String) gettext_noop (String) -+#define textdomain(String) -+#endif - - #define NORM_FREQ_LEN 32 - diff --git a/main/cpufrequtils/cpufrequtils-006-nls.patch b/main/cpufrequtils/cpufrequtils-006-nls.patch new file mode 100644 index 000000000..7d1c24dbd --- /dev/null +++ b/main/cpufrequtils/cpufrequtils-006-nls.patch @@ -0,0 +1,75 @@ +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 + + 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 + #include + #include +-#include + #include + + #include +@@ -18,9 +17,18 @@ + #include "cpufreq.h" + + ++#ifdef NLS ++#include + #define _(String) gettext (String) + #define gettext_noop(String) String + #define N_(String) gettext_noop (String) ++#else ++#define gettext_noop(String) String ++#define _(String) gettext_noop (String) ++#define gettext(String) gettext_noop (String) ++#define N_(String) gettext_noop (String) ++#define textdomain(String) ++#endif + + #define LINE_LEN 10 + +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 + #include + #include +-#include + #include + + #include + + #include "cpufreq.h" + +-#define _(String) gettext(String) ++#ifdef NLS ++#include ++#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) ++#define textdomain(String) ++#endif + + #define NORM_FREQ_LEN 32 + -- cgit v1.2.3