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

[dmichelsen at users.sourceforge.net]

Revision: 15401
          http://gar.svn.sourceforge.net/gar/?rev=15401&view=rev
Author:   dmichelsen
Date:     2011-08-22 11:58:26 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
libarchive: Update to latest standards and new library package names

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

Modified: csw/mgar/pkg/libarchive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libarchive/trunk/Makefile	2011-08-22 11:58:19 UTC (rev 15400)
+++ csw/mgar/pkg/libarchive/trunk/Makefile	2011-08-22 11:58:26 UTC (rev 15401)
@@ -10,50 +10,47 @@
 MASTER_SITES = $(GOOGLE_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-# 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/
 
 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
+SPKG_DESC_CSWlibarchive2 = C library for reading and writing various archive formats, libarchive.so.2
+PKGFILES_CSWlibarchive2 = $(call pkgfiles_lib,libarchive.so.2)
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWliblzma5
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibbz2-1-0
 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)
-PKGFILES_CSWlibarchive-devel += $(mandir)/man5/.*
+PACKAGES += CSWlibarchive-dev
+SPKG_DESC_CSWlibarchive-dev = Development files for libarchive.so.2
+RUNTIME_DEP_PKGS_CSWlibarchive-dev = CSWlibarchive2
+PKGFILES_CSWlibarchive-dev = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibarchive-dev += $(mandir)/man5/.*
+OBSOLETED_BY_CSWlibarchive-dev += CSWlibarchive-devel
 
 PACKAGES += CSWlibarchive-utils
-CATALOGNAME_CSWlibarchive-utils = libarchive_utils
 SPKG_DESC_CSWlibarchive-utils = Tools for reading and writing various archive formats
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWxz
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWbzip2
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWliblzma5
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibbz2-1-0
 RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWosslrt
 
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWlibarchive42)
-BUILD_DEP_PKGS += CSWlibxml2devel CSWossldevel 
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWlibarchive2)
+BUILD_DEP_PKGS += CSWliblzma-dev
+BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS += CSWlibbz2-dev
+BUILD_DEP_PKGS += CSWlibxml2devel
+BUILD_DEP_PKGS += CSWossldevel 
 
 EXTRA_INC = $(includedir)/cryptopp
 
 BUILD64 = 1
-NOISAEXEC = 1
-CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
+# There is currently one test failing. Skip until this is fixed:
+#   http://code.google.com/p/libarchive/issues/detail?id=171
+SKIPTEST ?= 1
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk


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