From 48ba76afdf360261f91eccf0deee5a0767adf8b5 Mon Sep 17 00:00:00 2001
From: Zhai Edwin <edwin.zhai@intel.com>
Date: Tue, 30 Nov 2010 16:34:52 +0800
Subject: puzzles: Update to svn r9023

Removed makedist_hack.patch, as makedist.sh is no longer exist in upstream and
mkfiles.pl is called directly now.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../recipes-sato/puzzles/files/makedist_hack.patch | 17 -------
 meta/recipes-sato/puzzles/puzzles_r7593.bb         | 55 ---------------------
 meta/recipes-sato/puzzles/puzzles_r9023.bb         | 57 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 72 deletions(-)
 delete mode 100644 meta/recipes-sato/puzzles/files/makedist_hack.patch
 delete mode 100644 meta/recipes-sato/puzzles/puzzles_r7593.bb
 create mode 100644 meta/recipes-sato/puzzles/puzzles_r9023.bb

(limited to 'meta/recipes-sato/puzzles')

diff --git a/meta/recipes-sato/puzzles/files/makedist_hack.patch b/meta/recipes-sato/puzzles/files/makedist_hack.patch
deleted file mode 100644
index d07e066026..0000000000
--- a/meta/recipes-sato/puzzles/files/makedist_hack.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- makedist.sh |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: puzzles/makedist.sh
-===================================================================
---- puzzles.orig/makedist.sh	2007-05-17 11:49:59.000000000 +0100
-+++ puzzles/makedist.sh	2007-05-17 12:07:39.000000000 +0100
-@@ -30,6 +30,8 @@ fi
- 
- perl mkfiles.pl
- 
-+exit 0
-+
- mkdir tmp.$$
- mkdir tmp.$$/puzzles$arcsuffix
- 
diff --git a/meta/recipes-sato/puzzles/puzzles_r7593.bb b/meta/recipes-sato/puzzles/puzzles_r7593.bb
deleted file mode 100644
index 7471352b2d..0000000000
--- a/meta/recipes-sato/puzzles/puzzles_r7593.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-
-DEPENDS = "gtk+ libxt"
-PR = "r8"
-MOD_PV = "${@bb.data.getVar('PV',d,1)[1:]}"
-
-LICENSE = "MIT"
-
-#SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
-SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV} \
-           file://makedist_hack.patch;patch=1"
-
-S = "${WORKDIR}/${PN}"
-
-do_configure () {
-	./makedist.sh ${MOD_PV}
-}
-
-do_compile_prepend = " \
-        export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \
-	export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; "
-
-FILES_${PN} = "${prefix}/games/* ${datadir}/applications/*"
-FILES_${PN}-dbg += "${prefix}/games/.debug"
-
-do_install () {
-    rm -rf ${D}/*
-    export prefix=${D}
-    export DESTDIR=${D}
-    install -d ${D}/${prefix}/
-    install -d ${D}/${prefix}/games/
-    oe_runmake install
-    
-    install -d ${D}/${datadir}/
-    install -d ${D}/${datadir}/applications/
-
-    cd ${D}/${prefix}/games 
-    for prog in *; do
-	if [ -x $prog ]; then
-            # Convert prog to Title Case
-            title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
-	    echo "making ${D}/${datadir}/applications/$prog.desktop"
-	    cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
-[Desktop Entry]
-Name=$title
-Exec=${prefix}/games/$prog
-Icon=applications-games
-Terminal=false
-Type=Application
-Categories=Game;
-StartupNotify=true
-X-MB-SingleInstance=true
-STOP
-        fi
-    done
-}
diff --git a/meta/recipes-sato/puzzles/puzzles_r9023.bb b/meta/recipes-sato/puzzles/puzzles_r9023.bb
new file mode 100644
index 0000000000..e51bd7a560
--- /dev/null
+++ b/meta/recipes-sato/puzzles/puzzles_r9023.bb
@@ -0,0 +1,57 @@
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+
+DEPENDS = "gtk+ libxt"
+PR = "r0"
+MOD_PV = "${@bb.data.getVar('PV',d,1)[1:]}"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=9928b60f3b78be315b7ab699c1b03ff5"
+
+SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
+#SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+do_configure () {
+	./mkfiles.pl
+}
+
+do_compile_prepend = " \
+        export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \
+	export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; "
+
+FILES_${PN} = "${prefix}/games/* ${datadir}/applications/*"
+FILES_${PN}-dbg += "${prefix}/games/.debug"
+
+do_install () {
+    rm -rf ${D}/*
+    export prefix=${D}
+    export DESTDIR=${D}
+    install -d ${D}/${prefix}/
+    install -d ${D}/${prefix}/games/
+    oe_runmake install
+    
+    install -d ${D}/${datadir}/
+    install -d ${D}/${datadir}/applications/
+
+    cd ${D}/${prefix}/games 
+    for prog in *; do
+	if [ -x $prog ]; then
+            # Convert prog to Title Case
+            title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
+	    echo "making ${D}/${datadir}/applications/$prog.desktop"
+	    cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
+[Desktop Entry]
+Name=$title
+Exec=${prefix}/games/$prog
+Icon=applications-games
+Terminal=false
+Type=Application
+Categories=Game;
+StartupNotify=true
+X-MB-SingleInstance=true
+STOP
+        fi
+    done
+}
-- 
cgit v1.2.3-54-g00ecf