summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-04-22 15:12:54 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-04-22 15:12:54 +0000
commit5c8d92d9090cac0c44bdafd549911f4dd29ac85f (patch)
treeb86dfd93a829248457575de352eae110e45f75f1
parentb16de0f48089522a29a39c4ef68d9917e8e33900 (diff)
gkrellm: updated to 2.2.10 with patch by Marek Vasut to fix install - close #2090
-rw-r--r--packages/gkrellm/gkrellm/.mtn2git_empty0
-rw-r--r--packages/gkrellm/gkrellm/destdir.patch24
-rw-r--r--packages/gkrellm/gkrellm_2.2.10.bb (renamed from packages/gkrellm/gkrellm_2.2.7.bb)3
3 files changed, 26 insertions, 1 deletions
diff --git a/packages/gkrellm/gkrellm/.mtn2git_empty b/packages/gkrellm/gkrellm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gkrellm/gkrellm/.mtn2git_empty
diff --git a/packages/gkrellm/gkrellm/destdir.patch b/packages/gkrellm/gkrellm/destdir.patch
new file mode 100644
index 0000000000..3800fb7868
--- /dev/null
+++ b/packages/gkrellm/gkrellm/destdir.patch
@@ -0,0 +1,24 @@
+diff -Naur gkrellm-2.2.7-orig/server/Makefile gkrellm-2.2.7/server/Makefile
+--- gkrellm-2.2.7-orig/server/Makefile 2004-04-12 15:30:48.000000000 +0200
++++ gkrellm-2.2.7/server/Makefile 2007-04-06 12:48:08.000000000 +0200
+@@ -129,7 +129,7 @@
+
+ install:
+ $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)
+- $(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
++ $(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)
+ $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
+ $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
+ $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
+diff -Naur gkrellm-2.2.7-orig/src/Makefile gkrellm-2.2.7/src/Makefile
+--- gkrellm-2.2.7-orig/src/Makefile 2005-05-09 18:54:03.000000000 +0200
++++ gkrellm-2.2.7/src/Makefile 2007-04-06 12:48:24.000000000 +0200
+@@ -144,7 +144,7 @@
+
+ install:
+ $(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR)
+- $(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)/$(PACKAGE)
++ $(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)
+ $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
+ $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2
+ $(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
diff --git a/packages/gkrellm/gkrellm_2.2.7.bb b/packages/gkrellm/gkrellm_2.2.10.bb
index 5fd83e6923..ca13f4732e 100644
--- a/packages/gkrellm/gkrellm_2.2.7.bb
+++ b/packages/gkrellm/gkrellm_2.2.10.bb
@@ -3,7 +3,8 @@ DESCRIPTION = "GKrellM is a GTK-based stacked monitor program."
LICENSE = "GPL"
DEPENDS = "gtk+ glib-2.0 libsm libice"
-SRC_URI = "http://members.dslextreme.com/users/billw/gkrellm/gkrellm-${PV}.tar.bz2"
+SRC_URI = "http://members.dslextreme.com/users/billw/gkrellm/gkrellm-${PV}.tar.bz2 \
+ file://destdir.patch;patch=1"
inherit pkgconfig