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

[chninkel at users.sourceforge.net]

Revision: 4273
          http://gar.svn.sourceforge.net/gar/?rev=4273&view=rev
Author:   chninkel
Date:     2009-04-10 16:56:53 +0000 (Fri, 10 Apr 2009)

Log Message:
-----------
bash: added patch level in package version and some reorganisation

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

Modified: csw/mgar/pkg/bash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash/trunk/Makefile	2009-04-10 10:49:05 UTC (rev 4272)
+++ csw/mgar/pkg/bash/trunk/Makefile	2009-04-10 16:56:53 UTC (rev 4273)
@@ -1,6 +1,19 @@
+#####################################################################
+# OpenCSW build recipe for bash
+#
+# Copyright 2009 Yann Rouillard <yann at pleiades.fr.eu.org>
+# All rights reserved.  Use is subject to license terms.
+#
+# Redistribution and/or use, with or without modification, is
+# permitted.  This software is without warranty of any kind.  The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+#####################################################################
+
+###### Package information #######
+
 GARNAME = bash
-GARVERSION = 4.0
-PATCHLEVEL = 17
+GARVERSION = 4.0.17
 CATEGORIES = devel
 
 DESCRIPTION = A sh-compatible command language interpreter
@@ -8,23 +21,29 @@
   GNU Bash is an sh-compatible command language interpreter that executes commands read from the standard input or from a file. Bash also incorporates useful features from the Korn and C shells (ksh and csh). Bash is intended to be a conforming implementation of the IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2).
 endef
 
+BASH_VERSION = $(shell echo $(GARVERSION)c | cut -d. -f1-2)
+BASH_PATCHLEVEL = $(shell echo -n $(GARVERSION) | cut -d. -f3)
+
+
+###### Upstream and opencsw files information #######
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = bash-(\d+\.\d+).tar.gz $(PATCHFILE_PREFIX)-(\d+)
 
 # Patches download location
-MASTER_SITES = $(GNU_MIRROR)/bash-$(GARVERSION)-patches/
+MASTER_SITES = $(GNU_MIRROR)/bash-$(BASH_VERSION)-patches/
 # Main archive location
 MASTER_SITES += $(GNU_MIRROR)
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES  = $(GARNAME)-$(BASH_VERSION).tar.gz
 DISTFILES += $(call admfiles,CSWbash,prototype postinstall postremove depend)
 DISTFILES += changelog.CSW
 
-PATCHFILE_PREFIX = bash$(subst .,,$(GARVERSION))
+PATCHFILE_PREFIX = bash$(subst .,,$(BASH_VERSION))
 PATCHDIRLEVEL = 0
 # we generate the list of patches from the PATCHLEVEL
 PATCHFILES = $(shell LEVEL=1; \
 	        PREFIX_0="00"; \
-	     	while [ $$LEVEL -le $(PATCHLEVEL)  ]; do \
+	     	while [ $$LEVEL -le $(BASH_PATCHLEVEL)  ]; do \
 			echo $(PATCHFILE_PREFIX)-$$PREFIX_0$$LEVEL; \
 			LEVEL=`expr $$LEVEL + 1`; \
 			if [ $$LEVEL -ge 10 ]; then \
@@ -34,6 +53,9 @@
 
 PATCHFILES += use_system_bashrc_and_logout.patch
 
+
+##### Build and installation information #####
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/bash/trunk/files/changelog.CSW	2009-04-10 10:49:05 UTC (rev 4272)
+++ csw/mgar/pkg/bash/trunk/files/changelog.CSW	2009-04-10 16:56:53 UTC (rev 4273)
@@ -1,6 +1,7 @@
-bash (4.0,REV=2009.04.10) unstable
+bash (4.0.17,REV=2009.04.10) 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
 


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