[csw-devel] SF.net SVN: gar:[7971] csw/mgar/pkg/keychain/trunk

[wahwah at users.sourceforge.net]

Revision: 7971
          http://gar.svn.sourceforge.net/gar/?rev=7971&view=rev
Author:   wahwah
Date:     2010-01-11 17:03:34 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
keychain: patching to use CSWbash

Modified Paths:
--------------
    csw/mgar/pkg/keychain/trunk/Makefile
    csw/mgar/pkg/keychain/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/keychain/trunk/files/bash.patch

Modified: csw/mgar/pkg/keychain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/keychain/trunk/Makefile	2010-01-11 15:53:57 UTC (rev 7970)
+++ csw/mgar/pkg/keychain/trunk/Makefile	2010-01-11 17:03:34 UTC (rev 7971)
@@ -20,7 +20,8 @@
 
 MASTER_SITES = http://www.funtoo.org/archive/keychain/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
-PATCHFILES = gsed.patch
+PATCHFILES += bash.patch
+PATCHFILES += gsed.patch
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
@@ -30,7 +31,8 @@
 INSTALL_SCRIPTS = keychain
 TEST_SCRIPTS =
 
-PREREQUISITE_PKGS = CSWperl
+REQUIRED_PKGS = CSWbash
+PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWperl
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/keychain/trunk/checksums
===================================================================
--- csw/mgar/pkg/keychain/trunk/checksums	2010-01-11 15:53:57 UTC (rev 7970)
+++ csw/mgar/pkg/keychain/trunk/checksums	2010-01-11 17:03:34 UTC (rev 7971)
@@ -1,2 +1,3 @@
+6485201fc090ad73b72971357e018d52  bash.patch
 ad52a3ab14a63ccff22cac5076286bcb  gsed.patch
 c5eecd36130d9e8617a77f96b746982d  keychain-2.7.0.tar.bz2

Added: csw/mgar/pkg/keychain/trunk/files/bash.patch
===================================================================
--- csw/mgar/pkg/keychain/trunk/files/bash.patch	                        (rev 0)
+++ csw/mgar/pkg/keychain/trunk/files/bash.patch	2010-01-11 17:03:34 UTC (rev 7971)
@@ -0,0 +1,11 @@
+Looks like keychain is written in bash, but declares /bin/sh as the shell.
+Let's fix it.
+
+--- keychain-2.7.0/keychain.sh.orig	2010-01-11 18:18:26.606373414 +0100
++++ keychain-2.7.0/keychain.sh	2010-01-11 18:18:42.710377114 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ 
+ # Copyright 1999-2005 Gentoo Foundation
+ # Copyright 2007 Aron Griffis <agriffis at n01se.net>


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