[csw-devel] SF.net SVN: gar:[12173] csw/mgar/pkg/libarchive/trunk

[dmichelsen at users.sourceforge.net]

Revision: 12173
          http://gar.svn.sourceforge.net/gar/?rev=12173&view=rev
Author:   dmichelsen
Date:     2011-01-04 13:06:25 +0000 (Tue, 04 Jan 2011)

Log Message:
-----------
libarchive: Update to 2.8.4 and split package

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

Removed Paths:
-------------
    csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch

Modified: csw/mgar/pkg/libarchive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libarchive/trunk/Makefile	2011-01-04 13:04:54 UTC (rev 12172)
+++ csw/mgar/pkg/libarchive/trunk/Makefile	2011-01-04 13:06:25 UTC (rev 12173)
@@ -1,6 +1,6 @@
 # : Makefile 9089 2010-03-11 08:34:46Z wahwah $
 NAME = libarchive
-VERSION = 2.8.3
+VERSION = 2.8.4
 CATEGORIES = lib
 
 DESCRIPTION = C library for reading and writing various archive formats
@@ -10,22 +10,49 @@
 MASTER_SITES = $(GOOGLE_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-# This is already in trunk from r2347:
-#   <http://code.google.com/p/libarchive/source/diff?spec=svn2396&r=2347&format=side&path=/trunk/cpio/test/test_owner_parse.c>
-PATCHFILES = 0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch
-
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 VENDOR_URL = http://code.google.com/p/libarchive/
 
-DEP_PKGS = CSWxz CSWbzip2 CSWiconv CSWlibxml2 CSWzlib CSWosslrt
+PACKAGES += CSWlibarchive2
+CATALOGNAME_CSWlibarchive2 = libarchive2
+SPKG_DESC_CSWlibarchive2 = $(DESCRIPTION), libarchive.so.2
+PKGFILES_CSWlibarchive2 = $(call baseisadirs,$(libdir),libarchive\.so\.2(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWxz
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibxml2
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWbzip2
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWosslrt
 
+PACKAGES += CSWlibarchive-devel
+CATALOGNAME_CSWlibarchive-devel = libarchive_devel
+SPKG_DESC_CSWlibarchive-devel = Development files for libarchive
+RUNTIME_DEP_PKGS_CSWlibarchive-devel = CSWlibarchive2
+PKGFILES_CSWlibarchive-devel = $(PKGFILES_DEVEL)
+
+PACKAGES += CSWlibarchive
+CATALOGNAME_CSWlibarchive = libarchive
+SPKG_DESC_CSWlibarchive = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWlibarchive += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibarchive += CSWxz
+RUNTIME_DEP_PKGS_CSWlibarchive += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibarchive += CSWlibxml2
+RUNTIME_DEP_PKGS_CSWlibarchive += CSWbzip2
+RUNTIME_DEP_PKGS_CSWlibarchive += CSWosslrt
+
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWlibarchive42)
+BUILD_DEP_PKGS += CSWlibxml2devel CSWossldevel 
+
 EXTRA_INC = $(includedir)/cryptopp
 
 BUILD64 = 1
+NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check
 
+MERGE_DIRS_isa-extra = $(libdir)
+
 include gar/category.mk

Modified: csw/mgar/pkg/libarchive/trunk/checksums
===================================================================
--- csw/mgar/pkg/libarchive/trunk/checksums	2011-01-04 13:04:54 UTC (rev 12172)
+++ csw/mgar/pkg/libarchive/trunk/checksums	2011-01-04 13:06:25 UTC (rev 12173)
@@ -1,2 +1 @@
-9539f1e6273764c7d7f798876c198a83  0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch
-fe8d917e101d4b37580124030842a1d0  libarchive-2.8.3.tar.gz
+83b237a542f27969a8d68ac217dc3796  libarchive-2.8.4.tar.gz

Deleted: csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch	2011-01-04 13:04:54 UTC (rev 12172)
+++ csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch	2011-01-04 13:06:25 UTC (rev 12173)
@@ -1,31 +0,0 @@
-From 9c1bc0a961436ef420f1b379f58309db7ce43d60 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 14 May 2010 12:01:53 +0200
-Subject: [PATCH] Check against gids 0 and 1 for root on Solaris
-
----
- cpio/test/test_owner_parse.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/cpio/test/test_owner_parse.c b/cpio/test/test_owner_parse.c
-index 9875e91..a3ebccd 100644
---- a/cpio/test/test_owner_parse.c
-+++ b/cpio/test/test_owner_parse.c
-@@ -30,8 +30,14 @@ __FBSDID("$FreeBSD$");
- 
- #if !defined(_WIN32)
- #define ROOT "root"
-+#if defined(__sun)
-+static int root_uids[] = { 0 };
-+/* Solaris 9 has gid 1 (=other) */
-+static int root_gids[] = { 0, 1 };
-+#else
- static int root_uids[] = { 0 };
- static int root_gids[] = { 0 };
-+#endif
- #elif defined(__CYGWIN__)
- /* On cygwin, the Administrator user most likely exists (unless
-  * it has been renamed or is in a non-English localization), but
--- 
-1.7.0
-


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