[csw-devel] SF.net SVN: gar:[9106] csw/mgar/pkg/awesome/trunk

[wahwah at users.sourceforge.net]

Revision: 9106
          http://gar.svn.sourceforge.net/gar/?rev=9106&view=rev
Author:   wahwah
Date:     2010-03-12 14:11:19 +0000 (Fri, 12 Mar 2010)

Log Message:
-----------
awesome: shorter patch for gperf.sh

Modified Paths:
--------------
    csw/mgar/pkg/awesome/trunk/checksums
    csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch

Modified: csw/mgar/pkg/awesome/trunk/checksums
===================================================================
--- csw/mgar/pkg/awesome/trunk/checksums	2010-03-12 10:16:24 UTC (rev 9105)
+++ csw/mgar/pkg/awesome/trunk/checksums	2010-03-12 14:11:19 UTC (rev 9106)
@@ -1,6 +1,6 @@
 8c2537ad898d7f58a0f3ba92e6a561a1  awesome-3.4.4.tar.bz2
 1d5c67eb4555b367032c1294fb72bf0b  backtrace.c.patch
-346c2299f6f5be4d667ff3769a1251f0  gperf.sh-solarify.patch
+15a863e32d3cd4fda402385cf0e03b46  gperf.sh-solarify.patch
 3186b1d530e691611c9da0443689b5e4  iconv-try-1.patch
 9201583f764cb4859e6a49c883dd6672  remove-export-dynamic.patch
 346d88270c8702b7f4d7ab519d7ccc07  test-dash-e-unavailable.patch

Modified: csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch
===================================================================
--- csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch	2010-03-12 10:16:24 UTC (rev 9105)
+++ csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch	2010-03-12 14:11:19 UTC (rev 9106)
@@ -1,43 +1,20 @@
---- awesome-3.4.4/build-utils/gperf.sh.orig	2010-03-07 10:35:38.518346274 +0100
-+++ awesome-3.4.4/build-utils/gperf.sh	2010-03-07 10:37:23.977357986 +0100
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/opt/csw/bin/bash
- #
- # Copyright © 2008 Pierre Habouzit <madcoder at debian.org>
- #
+--- awesome-3.4.4/build-utils/gperf.sh.orig	2010-03-12 14:08:00.910378535 +0000
++++ awesome-3.4.4/build-utils/gperf.sh	2010-03-12 14:08:26.207943113 +0000
 @@ -50,7 +50,7 @@
  
  typedef enum awesome_token_t {
      A_TK_UNKNOWN,
 -`tr '[:lower:]' '[:upper:]' | sed -e "s/^[^/].*/    A_TK_&,/"`
-+`tr '[:lower:]' '[:upper:]' | gsed -e "s/^[^/].*/    A_TK_&,/"`
++`LC_ALL=C tr a-z A-Z | sed -e "s/^[^/].*/    A_TK_&,/"`
  } awesome_token_t;
  
  __attribute__((pure)) enum awesome_token_t a_tokenize(const char *s, int len);
-@@ -109,14 +109,14 @@
- }
- 
- extract_tokens() {
--    grep '^### ' "$1" | cut -d ' ' -f 2
-+    ggrep '^### ' "$1" | cut -d ' ' -f 2
- }
- 
- 
- TOKENS_FILE="$1"
- TARGET="$2"
- 
--trap "rm -f ${TARGET}" 0
-+trap "grm -f ${TARGET}" 0
- 
- rm -f "${TARGET}"
- case "${TARGET}" in
-@@ -124,7 +124,7 @@
-     *.c) do_c > "${TARGET}" < "${TOKENS_FILE}" ;;
-     *)  die "you must ask for the 'h' or 'c' generation";;
- esac
--chmod -w "${TARGET}"
-+gchmod -w "${TARGET}"
- 
- trap - 0
- exit 0
+@@ -63,7 +63,7 @@
+         case "$tok" in
+             "") continue;;
+             *)
+-                echo "$tok, A_TK_`echo $tok | tr '[:lower:]' '[:upper:]'`"
++                echo "$tok, A_TK_`echo $tok | LC_ALL=C tr a-z A-Z`"
+                 ;;
+         esac
+     done


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.