From 5c8d92d9090cac0c44bdafd549911f4dd29ac85f Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 22 Apr 2007 15:12:54 +0000
Subject: gkrellm: updated to 2.2.10 with patch by Marek Vasut to fix install -
 close #2090

---
 packages/gkrellm/gkrellm/.mtn2git_empty |  0
 packages/gkrellm/gkrellm/destdir.patch  | 24 ++++++++++++++++++++++++
 packages/gkrellm/gkrellm_2.2.10.bb      | 24 ++++++++++++++++++++++++
 packages/gkrellm/gkrellm_2.2.7.bb       | 23 -----------------------
 4 files changed, 48 insertions(+), 23 deletions(-)
 create mode 100644 packages/gkrellm/gkrellm/.mtn2git_empty
 create mode 100644 packages/gkrellm/gkrellm/destdir.patch
 create mode 100644 packages/gkrellm/gkrellm_2.2.10.bb
 delete mode 100644 packages/gkrellm/gkrellm_2.2.7.bb

(limited to 'packages/gkrellm')

diff --git a/packages/gkrellm/gkrellm/.mtn2git_empty b/packages/gkrellm/gkrellm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
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.10.bb b/packages/gkrellm/gkrellm_2.2.10.bb
new file mode 100644
index 0000000000..ca13f4732e
--- /dev/null
+++ b/packages/gkrellm/gkrellm_2.2.10.bb
@@ -0,0 +1,24 @@
+SECTION = "x11/utils"
+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 \
+           file://destdir.patch;patch=1"
+
+inherit pkgconfig
+
+EXTRA_OEMAKE = "'glib12=0' 'STRIP=/bin/true'"
+export LINK_FLAGS = "${LDFLAGS}"
+export SMC_LIBS = "-lSM -lICE"
+
+do_install () {
+	oe_runmake 'INSTALLDIR=${D}${bindir}' \
+		   'SINSTALLDIR=${D}${bindir}' \
+		   'MANDIR=${D}${mandir}/man1' \
+		   'SMANDIR=${D}${mandir}/man1' \
+		   'INCLUDEDIR=${D}${includedir}' \
+		   'PKGCONFIGDIR=${D}${libdir}/pkgconfig' \
+		   'LOCALEDIR=${D}${datadir}/locale' \
+		   install
+}
diff --git a/packages/gkrellm/gkrellm_2.2.7.bb b/packages/gkrellm/gkrellm_2.2.7.bb
deleted file mode 100644
index 5fd83e6923..0000000000
--- a/packages/gkrellm/gkrellm_2.2.7.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SECTION = "x11/utils"
-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"
-
-inherit pkgconfig
-
-EXTRA_OEMAKE = "'glib12=0' 'STRIP=/bin/true'"
-export LINK_FLAGS = "${LDFLAGS}"
-export SMC_LIBS = "-lSM -lICE"
-
-do_install () {
-	oe_runmake 'INSTALLDIR=${D}${bindir}' \
-		   'SINSTALLDIR=${D}${bindir}' \
-		   'MANDIR=${D}${mandir}/man1' \
-		   'SMANDIR=${D}${mandir}/man1' \
-		   'INCLUDEDIR=${D}${includedir}' \
-		   'PKGCONFIGDIR=${D}${libdir}/pkgconfig' \
-		   'LOCALEDIR=${D}${datadir}/locale' \
-		   install
-}
-- 
cgit 1.2.3-korg