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

[wahwah at users.sourceforge.net]

Revision: 21284
          http://gar.svn.sourceforge.net/gar/?rev=21284&view=rev
Author:   wahwah
Date:     2013-06-05 19:26:12 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
keychain/trunk: version update, a new sed patch

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

Added Paths:
-----------
    csw/mgar/pkg/keychain/trunk/files/0002-Allow-to-use-own-sed.patch

Removed Paths:
-------------
    csw/mgar/pkg/keychain/trunk/files/gsed.patch

Modified: csw/mgar/pkg/keychain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/keychain/trunk/Makefile	2013-06-05 16:54:43 UTC (rev 21283)
+++ csw/mgar/pkg/keychain/trunk/Makefile	2013-06-05 19:26:12 UTC (rev 21284)
@@ -3,7 +3,7 @@
 # $Header$
 
 NAME = keychain
-VERSION = 2.7.0
+VERSION = 2.7.1
 GARTYPE = v2
 
 DESCRIPTION = Convenient ssh-agent and gpg-agent manager
@@ -19,12 +19,13 @@
 endef
 
 MASTER_SITES = http://www.funtoo.org/archive/keychain/
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES  = $(DISTNAME).tar.bz2
+
+PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc
+
 PATCHFILES += bash.patch
-PATCHFILES += gsed.patch
+PATCHFILES += 0002-Allow-to-use-own-sed.patch
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
 ARCHALL = 1
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = keychain
@@ -34,6 +35,8 @@
 RUNTIME_DEP_PKGS = CSWbash
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWperl
 
+CHECKPKG_OVERRIDES_CSWkeychain += surplus-dependency|CSWbash
+
 include gar/category.mk
 
 build-keychain:

Modified: csw/mgar/pkg/keychain/trunk/checksums
===================================================================
--- csw/mgar/pkg/keychain/trunk/checksums	2013-06-05 16:54:43 UTC (rev 21283)
+++ csw/mgar/pkg/keychain/trunk/checksums	2013-06-05 19:26:12 UTC (rev 21284)
@@ -1,3 +1 @@
-6485201fc090ad73b72971357e018d52  bash.patch
-ad52a3ab14a63ccff22cac5076286bcb  gsed.patch
-c5eecd36130d9e8617a77f96b746982d  keychain-2.7.0.tar.bz2
+07c622833192189f483cbaec287f9704  keychain-2.7.1.tar.bz2

Added: csw/mgar/pkg/keychain/trunk/files/0002-Allow-to-use-own-sed.patch
===================================================================
--- csw/mgar/pkg/keychain/trunk/files/0002-Allow-to-use-own-sed.patch	                        (rev 0)
+++ csw/mgar/pkg/keychain/trunk/files/0002-Allow-to-use-own-sed.patch	2013-06-05 19:26:12 UTC (rev 21284)
@@ -0,0 +1,41 @@
+From 28bbb7e4d2f64efd28f186c3a7ca7b52b54380f9 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 5 Jun 2013 21:20:37 +0200
+Subject: [PATCH] Allow to use own sed
+
+---
+ Makefile |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 805ae63..00725b9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,8 @@
+ V:=$(shell cat VERSION)
+ D:=$(shell date +'%d %b %Y')
++ifndef SED
++SED = sed
++endif
+ TARBALL_CONTENTS=keychain README.rst ChangeLog COPYING keychain.pod keychain.1 \
+ 				 keychain.spec
+ 
+@@ -14,13 +17,13 @@ clean: tmpclean
+ 	rm -rf keychain.1 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://www.funtoo.org' \
+ 		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
+-- 
+1.7.10.3
+

Deleted: csw/mgar/pkg/keychain/trunk/files/gsed.patch
===================================================================
--- csw/mgar/pkg/keychain/trunk/files/gsed.patch	2013-06-05 16:54:43 UTC (rev 21283)
+++ csw/mgar/pkg/keychain/trunk/files/gsed.patch	2013-06-05 19:26:12 UTC (rev 21284)
@@ -1,27 +0,0 @@
---- 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')
-+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.