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

[wahwah at users.sourceforge.net]

Revision: 7884
          http://gar.svn.sourceforge.net/gar/?rev=7884&view=rev
Author:   wahwah
Date:     2010-01-05 22:29:07 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
keychain: A better patch

Modified Paths:
--------------
    csw/mgar/pkg/keychain/trunk/Makefile
    csw/mgar/pkg/keychain/trunk/checksums
    csw/mgar/pkg/keychain/trunk/files/gsed.patch

Modified: csw/mgar/pkg/keychain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/keychain/trunk/Makefile	2010-01-05 21:38:12 UTC (rev 7883)
+++ csw/mgar/pkg/keychain/trunk/Makefile	2010-01-05 22:29:07 UTC (rev 7884)
@@ -35,8 +35,8 @@
 include gar/category.mk
 
 build-keychain:
-	(cd $(WORKSRC); gmake keychain)
-	(cd $(WORKSRC); gmake keychain.1)
+	(cd $(WORKSRC); gmake SED=gsed keychain)
+	(cd $(WORKSRC); gmake SED=gsed keychain.1)
 	@$(MAKECOOKIE)
 
 install-keychain:

Modified: csw/mgar/pkg/keychain/trunk/checksums
===================================================================
--- csw/mgar/pkg/keychain/trunk/checksums	2010-01-05 21:38:12 UTC (rev 7883)
+++ csw/mgar/pkg/keychain/trunk/checksums	2010-01-05 22:29:07 UTC (rev 7884)
@@ -1,2 +1,2 @@
-8efbaa227e87387db062f22d371b4157  gsed.patch
+ad52a3ab14a63ccff22cac5076286bcb  gsed.patch
 c5eecd36130d9e8617a77f96b746982d  keychain-2.7.0.tar.bz2

Modified: csw/mgar/pkg/keychain/trunk/files/gsed.patch
===================================================================
--- csw/mgar/pkg/keychain/trunk/files/gsed.patch	2010-01-05 21:38:12 UTC (rev 7883)
+++ csw/mgar/pkg/keychain/trunk/files/gsed.patch	2010-01-05 22:29:07 UTC (rev 7884)
@@ -1,11 +1,27 @@
---- keychain-2.7.0/Makefile.orig	2010-01-05 22:14:32.175890134 +0100
-+++ keychain-2.7.0/Makefile	2010-01-05 22:14:48.137272015 +0100
-@@ -1,7 +1,7 @@
+--- a/Makefile	2010-01-05 22:40:37.832643496 +0100
++++ b/Makefile	2010-01-05 23:01:25.428084486 +0100
+@@ -1,19 +1,22 @@
  V:=$(shell /bin/sh keychain.sh --version 2>&1 | \
  	awk -F'[ ;]' '/^K/{print $$2; exit}')
  D:=$(shell date +'%d %b %Y')
--SED = $(shell sed --version > /dev/null && echo sed || (gsed --version && echo gsed || false))
-+SED = $(shell sed --version > /dev/null && echo sed || gsed --version && echo gsed || false)
++ifndef SED
++SED = sed
++endif
  TARBALL_CONTENTS=keychain README.rst ChangeLog COPYING keychain.pod keychain.1 \
  				 keychain.spec
  
+ all: keychain.1.gz keychain keychain.spec
+ 
+ keychain.spec: keychain.spec.in keychain.sh
+-	sed 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec
++	$(SED) 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec
+ 
+ keychain.1: keychain.pod keychain.sh
+ 	pod2man --name=keychain --release=$V \
+ 		--center='http://gentoo.org/proj/en/keychain.xml' \
+ 		keychain.pod keychain.1
+-	sed -i.orig -e "s/^'br/.br/" keychain.1
++	$(SED) -i.orig -e "s/^'br/.br/" keychain.1
+ 
+ keychain.1.gz: keychain.1
+ 	gzip -9 keychain.1


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