[csw-devel] SF.net SVN: gar:[19017] csw/mgar/pkg/fio/trunk

[j_arndt at users.sourceforge.net]

Revision: 19017
          http://gar.svn.sourceforge.net/gar/?rev=19017&view=rev
Author:   j_arndt
Date:     2012-08-18 14:30:37 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
fio/trunk: update to 2.0.8

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

Added Paths:
-----------
    csw/mgar/pkg/fio/trunk/files/0001-shell-commands.patch

Modified: csw/mgar/pkg/fio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fio/trunk/Makefile	2012-08-18 11:53:01 UTC (rev 19016)
+++ csw/mgar/pkg/fio/trunk/Makefile	2012-08-18 14:30:37 UTC (rev 19017)
@@ -1,7 +1,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 
 NAME = fio
-VERSION = 1.44.2
+VERSION = 2.0.8
 CATEGORIES = apps
 GARTYPE = v2
 
@@ -23,34 +23,19 @@
 DISTFILES    = $(NAME)-$(VERSION).tar.gz
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-# On Solaris 9 getopt_long isn't part of the OS, thus we pull in CSWlibgnugetopt
-PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
-RUNTIME_DEP_PKGS = $(RUNTIME_DEP_PKGS_$(GAROSREL))
-RUNTIME_DEP_PKGS_5.9 = CSWlibgnugetopt
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-EXTRA_BUILD_EXPORTS = EXTLIBS
-EXTLIBS = $(EXTLIBS_$(GAROSREL))
-EXTLIBS_5.9 = -lgnugetopt
-# / On Solaris 9 getopt_long isn't part of the OS
+PATCHFILES	+= 0001-shell-commands.patch
 
-PATCHFILES += 0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch
-PATCHFILES += 0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch
-
-# These ones went upstream, should be integrated in post 1.44.2 releases
-# cf. http://www.spinics.net/lists/fio/msg00580.html
-#     http://www.spinics.net/lists/fio/msg00582.html
-PATCHFILES += 0003-Install-man-pages.patch
-PATCHFILES += 0005-Warn-on-missing-direct-IO-support.patch
-
 # fio compiler/compiler.h #errors out non gcc compilers
-GARCOMPILER  = GCC3
+GARCOMPILER  = GCC4
 # Required for PTHREAD_STACK_MIN
 EXTRA_CFLAGS  = -D__EXTENSIONS__
 
 CONFIGURE_SCRIPTS = 
-BUILD_ARGS = -f Makefile.solaris
+#BUILD_ARGS = -f Makefile.solaris
 TEST_SCRIPTS =
-INSTALL_ARGS = -f Makefile.solaris
+#INSTALL_ARGS = -f Makefile.solaris
 
 INSTALL_OVERRIDE_VARS = INSTALL prefix mandir
 INSTALL_OVERRIDE_VAR_INSTALL = $(bindir)/ginstall

Modified: csw/mgar/pkg/fio/trunk/checksums
===================================================================
--- csw/mgar/pkg/fio/trunk/checksums	2012-08-18 11:53:01 UTC (rev 19016)
+++ csw/mgar/pkg/fio/trunk/checksums	2012-08-18 14:30:37 UTC (rev 19017)
@@ -1 +1 @@
-ea2765f6cbc5922b0b500dd7ae0f5d92  fio-1.44.2.tar.gz
+b745a65ed56ef629e6d1a10b20d84c75  fio-2.0.8.tar.gz

Added: csw/mgar/pkg/fio/trunk/files/0001-shell-commands.patch
===================================================================
--- csw/mgar/pkg/fio/trunk/files/0001-shell-commands.patch	                        (rev 0)
+++ csw/mgar/pkg/fio/trunk/files/0001-shell-commands.patch	2012-08-18 14:30:37 UTC (rev 19017)
@@ -0,0 +1,48 @@
+From aa7db00a98f42799725dc638a75952a6172c9038 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sat, 4 Aug 2012 14:23:38 +0200
+Subject: [PATCH] shell commands
+
+---
+ FIO-VERSION-GEN |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/FIO-VERSION-GEN b/FIO-VERSION-GEN
+index 0d20126..ba99272 100755
+--- a/FIO-VERSION-GEN
++++ b/FIO-VERSION-GEN
+@@ -10,14 +10,14 @@ LF='
+ # then try git-describe, then default.
+ if test -f version
+ then
+-	VN=$(cat version) || VN="$DEF_VER"
++	VN=`cat version` || VN="$DEF_VER"
+ elif test -d .git -o -f .git &&
+-	VN=$(git describe --match "fio-[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
++	VN=`git describe --match "fio-[0-9]*" --abbrev=4 HEAD 2>/dev/null` &&
+ 	case "$VN" in
+ 	*$LF*) (exit 1) ;;
+ 	v[0-9]*)
+ 		git update-index -q --refresh
+-		test -z "$(git diff-index --name-only HEAD --)" ||
++		test -z "`git diff-index --name-only HEAD --`" ||
+ 		VN="$VN-dirty" ;;
+ 	esac
+ then
+@@ -26,11 +26,11 @@ else
+ 	VN="$DEF_VER"
+ fi
+ 
+-VN=$(expr "$VN" : v*'\(.*\)')
++VN=`expr "$VN" : v*'\(.*\)'`
+ 
+ if test -r $GVF
+ then
+-	VC=$(sed -e 's/^FIO_VERSION = //' <$GVF)
++	VC=`sed -e 's/^FIO_VERSION = //' <$GVF`
+ else
+ 	VC=unset
+ fi
+-- 
+1.7.10.3
+

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