[csw-devel] SF.net SVN: gar:[4274] csw/mgar/pkg/bash/trunk

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Sat Apr 11 17:35:57 CEST 2009


Revision: 4274
          http://gar.svn.sourceforge.net/gar/?rev=4274&view=rev
Author:   chninkel
Date:     2009-04-11 15:35:57 +0000 (Sat, 11 Apr 2009)

Log Message:
-----------
bash: switched to gar v2

Modified Paths:
--------------
    csw/mgar/pkg/bash/trunk/Makefile
    csw/mgar/pkg/bash/trunk/checksums
    csw/mgar/pkg/bash/trunk/files/CSWbash.prototype
    csw/mgar/pkg/bash/trunk/files/changelog.CSW

Removed Paths:
-------------
    csw/mgar/pkg/bash/trunk/files/CSWbash.depend
    csw/mgar/pkg/bash/trunk/files/CSWbash.gspec

Property Changed:
----------------
    csw/mgar/pkg/bash/trunk/


Property changes on: csw/mgar/pkg/bash/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/bash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash/trunk/Makefile	2009-04-10 16:56:53 UTC (rev 4273)
+++ csw/mgar/pkg/bash/trunk/Makefile	2009-04-11 15:35:57 UTC (rev 4274)
@@ -24,7 +24,12 @@
 BASH_VERSION = $(shell echo $(GARVERSION)c | cut -d. -f1-2)
 BASH_PATCHLEVEL = $(shell echo -n $(GARVERSION) | cut -d. -f3)
 
+PACKAGES = CSWbash
 
+REQUIRED_PKGS = CSWggettextrt
+REQUIRED_PKGS += CSWiconv
+
+
 ###### Upstream and opencsw files information #######
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -34,8 +39,9 @@
 MASTER_SITES = $(GNU_MIRROR)/bash-$(BASH_VERSION)-patches/
 # Main archive location
 MASTER_SITES += $(GNU_MIRROR)
+DISTNAME = $(GARNAME)-$(BASH_VERSION)
 DISTFILES  = $(GARNAME)-$(BASH_VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWbash,prototype postinstall postremove depend)
+DISTFILES += CSWbash.prototype CSWbash.postinstall CSWbash.postremove
 DISTFILES += changelog.CSW
 
 PATCHFILE_PREFIX = bash$(subst .,,$(BASH_VERSION))
@@ -68,8 +74,9 @@
 	touch $(WORKSRC)/config.status
 
 
-post-install:
+post-merge:
 	@( for FILE in README RBASH NEWS NOTES POSIX AUTHORS doc/FAQ doc/INTRO; do \
-		 ginstall -D $(WORKSRC)/$$FILE $(DESTDIR)$(docdir)/$(GARNAME)/`basename $$FILE`; \
+		 ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)$(docdir)/$(GARNAME)/`basename $$FILE`; \
 	done )
+	ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW
 

Modified: csw/mgar/pkg/bash/trunk/checksums
===================================================================
--- csw/mgar/pkg/bash/trunk/checksums	2009-04-10 16:56:53 UTC (rev 4273)
+++ csw/mgar/pkg/bash/trunk/checksums	2009-04-11 15:35:57 UTC (rev 4274)
@@ -1,10 +1,7 @@
-a90a1b5a6db4838483f05438e05e8eb9  download/bash-4.0.tar.gz
-29e973aa9a6fca0a9e28c905b95609bf  download/CSWbash.gspec
-5ba80bd9a48fdccfb70739095fb77010  download/CSWbash.prototype
 bcc9760316385d49ff31c2ed72f4be4a  download/CSWbash.postinstall
 589297e4f9a43d0c82632e99423db7ef  download/CSWbash.postremove
-293cc64a948ea3d49010ae6e58122b52  download/CSWbash.depend
-9fbdf25b297945fee52e6f7b7a5c218f  download/changelog.CSW
+949396065ba932e8af683eae510586e9  download/CSWbash.prototype
+a90a1b5a6db4838483f05438e05e8eb9  download/bash-4.0.tar.gz
 bc7f4762443939bd7dccb42370f0d932  download/bash40-001
 c2a4a4786a83ed4ec366c6a8924369a2  download/bash40-002
 22e8a824eddba21a8fce10d7984c2aba  download/bash40-003
@@ -22,4 +19,5 @@
 bb41963d030bc61a20e8185367b337c5  download/bash40-015
 f75455048a086528971252fd979b8755  download/bash40-016
 34b2cd57271a452f4a26b39d77ff908f  download/bash40-017
+4e4a9d374ce4291b6ba4974adc086767  download/changelog.CSW
 29607316cff22f7427322d8f190cbadf  download/use_system_bashrc_and_logout.patch

Deleted: csw/mgar/pkg/bash/trunk/files/CSWbash.depend
===================================================================
--- csw/mgar/pkg/bash/trunk/files/CSWbash.depend	2009-04-10 16:56:53 UTC (rev 4273)
+++ csw/mgar/pkg/bash/trunk/files/CSWbash.depend	2009-04-11 15:35:57 UTC (rev 4274)
@@ -1,2 +0,0 @@
-P CSWggettextrt ggettextrt - GNU gettext
-P CSWiconv libiconv - GNU iconv library

Deleted: csw/mgar/pkg/bash/trunk/files/CSWbash.gspec
===================================================================
--- csw/mgar/pkg/bash/trunk/files/CSWbash.gspec	2009-04-10 16:56:53 UTC (rev 4273)
+++ csw/mgar/pkg/bash/trunk/files/CSWbash.gspec	2009-04-11 15:35:57 UTC (rev 4274)
@@ -1,4 +0,0 @@
-%var            bitname bash
-%var            pkgname CSWbash
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING

Modified: csw/mgar/pkg/bash/trunk/files/CSWbash.prototype
===================================================================
--- csw/mgar/pkg/bash/trunk/files/CSWbash.prototype	2009-04-10 16:56:53 UTC (rev 4273)
+++ csw/mgar/pkg/bash/trunk/files/CSWbash.prototype	2009-04-11 15:35:57 UTC (rev 4274)
@@ -1,7 +1,7 @@
 f none /opt/csw/bin/bash 0755 root bin
 f none /opt/csw/bin/bashbug 0555 root bin
 d none /opt/csw/share/doc/bash 0755 root bin
-f none /opt/csw/share/doc/bash/changelog.CSW=changelog.CSW 0644 root bin
+f none /opt/csw/share/doc/bash/changelog.CSW 0644 root bin
 f none /opt/csw/share/doc/bash/README 0644 root bin
 f none /opt/csw/share/doc/bash/FAQ 0644 root bin
 f none /opt/csw/share/doc/bash/RBASH 0644 root bin

Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/bash/trunk/files/changelog.CSW	2009-04-10 16:56:53 UTC (rev 4273)
+++ csw/mgar/pkg/bash/trunk/files/changelog.CSW	2009-04-11 15:35:57 UTC (rev 4274)
@@ -1,28 +1,28 @@
-bash (4.0.17,REV=2009.04.10) unstable
+bash (4.0.17,REV=2009.04.11) unstable
 
   * Added bash patches bash40-011 to bash40-017.
   * Added patch level in package version.
 
-   -- Yann Rouillard <yann at opencsw.org>  Fri, 10 Apr 2009 12:06:33 +0200
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 11 Apr 2009 12:06:33 +0200
 
 bash (4.0,REV=2009.03.21) unstable
 
   * Added bash patches bash40-001 to bash40-010.
 
-   -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Mar 2009 12:55:58 +0100
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Mar 2009 12:55:58 +0100
 
 bash (4.0,REV=2009.02.21) unstable 
 
   * New upstream release.
 
-   -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Feb 2009 16:58:45 +0100
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Feb 2009 16:58:45 +0100
 
 bash (3.2,REV=2009.02.15) unstable
 
   * Changed gettext dependancy to follow gettext package split
   (Closes: #3147).
 
-   -- Yann Rouillard <yann at opencsw.org>  Sat, 14 Feb 2009 23:53:41 +0100
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 14 Feb 2009 23:53:41 +0100
 
 bash (3.2,REV=2008.11.30) unstable
 


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



More information about the devel mailing list