[csw-devel] SF.net SVN: gar:[15179] csw/mgar/pkg/xz/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15179
          http://gar.svn.sourceforge.net/gar/?rev=15179&view=rev
Author:   dmichelsen
Date:     2011-07-21 12:07:55 +0000 (Thu, 21 Jul 2011)

Log Message:
-----------
xz: Update to 5.0.3 and use Sun Studio again

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

Removed Paths:
-------------
    csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch

Modified: csw/mgar/pkg/xz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xz/trunk/Makefile	2011-07-21 02:39:10 UTC (rev 15178)
+++ csw/mgar/pkg/xz/trunk/Makefile	2011-07-21 12:07:55 UTC (rev 15179)
@@ -1,5 +1,5 @@
 NAME = xz
-VERSION = 5.0.1
+VERSION = 5.0.3
 CATEGORIES = utils
 
 DESCRIPTION = XZ Utils is free data compression software with high compression ratio
@@ -11,56 +11,30 @@
 endef
 
 MASTER_SITES = http://tukaani.org/xz/
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-PATCHFILES = 0001-Do-not-force-inclusion-of-stdint.h.patch
+DISTFILES  = $(DISTNAME).tar.bz2
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
 PACKAGES += CSWxz
-CATALOGNAME_CSWxz = xz
 SPKG_DESC_CSWxz = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWxz += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWxz += CSWliblzma5
+OBSOLETED_BY_CSWxz += CSWlzma
 
-PACKAGES += CSWlzma
-CATALOGNAME_CSWlzma = lzma
-SPKG_DESC_CSWlzma = Stub to the successor xz
-RUNTIME_DEP_PKGS_CSWlzma = CSWxz
-CHECKPKG_OVERRIDES_CSWlzma += surplus-dependency|CSWxz
-PKGFILES_CSWlzma = NOFILES
-ARCHALL_CSWlzma = 1
-
 PACKAGES += CSWliblzma5
-CATALOGNAME_CSWliblzma5 = liblzma5
-SPKG_DESC_CSWliblzma5 = LZMA Compression Library providing liblzma.so.5
-PKGFILES_CSWliblzma5 = $(call baseisadirs,$(libdir),liblzma\.so\.5(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWliblzma5 += CSWgcc4corert
+SPKG_DESC_CSWliblzma5 = LZMA compression library, liblzma.so.5
+PKGFILES_CSWliblzma5 += $(call pkgfiles_lib,liblzma.so.5)
 
 PACKAGES += CSWliblzma-dev
-CATALOGNAME_CSWliblzma-dev = liblzma_dev
-SPKG_DESC_CSWliblzma-dev = Development Files for liblzma
-PKGFILES_CSWliblzma-dev = $(PKGFILES_DEVEL)
+SPKG_DESC_CSWliblzma-dev = Development Files for liblzma.so.5
+PKGFILES_CSWliblzma-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWliblzma-dev += $(docdir)/xz/examples/.*
+PKGFILES_CSWliblzma-dev += $(docdir)/xz/.*-file-format.txt
 RUNTIME_DEP_PKGS_CSWliblzma-dev += CSWliblzma5
 
-GARCOMPILER = GNU
-
 BUILD64 = 1
-NOISAEXEC = 1
 
-# Assembler integration broken in amd64
-CONFIGURE_ARGS_isa-amd64 = --disable-assembler
-
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_isa-$(ISA))
+# This test fails as SOS12 cc is not real c99 (stdbool.h is missing)
+# but nonetheless SOS12 works fine
+CONFIGURE_ARGS += ac_cv_prog_cc_c99=
 
-# Workaround for reported bug:
-#   <http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/3500014>
-CONFIGURE_ARGS += gl_cv_cc_visibility=no
-
-MERGE_DIRS_isa-extra = $(libdir)
-
-# not able to figure out which target runs the tests in "tests"
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/xz/trunk/checksums
===================================================================
--- csw/mgar/pkg/xz/trunk/checksums	2011-07-21 02:39:10 UTC (rev 15178)
+++ csw/mgar/pkg/xz/trunk/checksums	2011-07-21 12:07:55 UTC (rev 15179)
@@ -1 +1 @@
-cb6c7a58cec4d663a395c54d186ca0c6  xz-5.0.1.tar.bz2
+8d900b742b94fa9e708ca4f5a4b29003  xz-5.0.3.tar.bz2

Deleted: csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch
===================================================================
--- csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch	2011-07-21 02:39:10 UTC (rev 15178)
+++ csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch	2011-07-21 12:07:55 UTC (rev 15179)
@@ -1,25 +0,0 @@
-From 5424924f8c92878e914f5ec5c9bfd00915cf439a Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 24 Feb 2010 14:58:17 +0100
-Subject: [PATCH] Do not force inclusion of stdint.h
-
----
- src/common/sysdefs.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/common/sysdefs.h b/src/common/sysdefs.h
-index fbc9176..f413863 100644
---- a/src/common/sysdefs.h
-+++ b/src/common/sysdefs.h
-@@ -34,7 +34,7 @@
- // C99 says that inttypes.h always includes stdint.h, but some systems
- // don't do that, and require including stdint.h separately.
- #ifdef HAVE_STDINT_H
--#	include <stdint.h>
-+/* #	include <stdint.h> */
- #endif
- 
- // Some pre-C99 systems have SIZE_MAX in limits.h instead of stdint.h. The
--- 
-1.6.6
-


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