[csw-devel] SF.net SVN: gar:[6056] csw/mgar/pkg/libxml2/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Aug 19 15:05:37 CEST 2009 

Revision: 6056
          http://gar.svn.sourceforge.net/gar/?rev=6056&view=rev
Author:   dmichelsen
Date:     2009-08-19 13:05:37 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
libxml2: Update to 2.7.3, move to dynamic gspec and refactor renaming

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

Removed Paths:
-------------
    csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.depend
    csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec
    csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.depend
    csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec
    csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.depend
    csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec

Modified: csw/mgar/pkg/libxml2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxml2/trunk/Makefile	2009-08-19 12:45:48 UTC (rev 6055)
+++ csw/mgar/pkg/libxml2/trunk/Makefile	2009-08-19 13:05:37 UTC (rev 6056)
@@ -1,5 +1,5 @@
 GARNAME = libxml2
-GARVERSION = 2.7.2
+GARVERSION = 2.7.3
 CATEGORIES = lib
 
 DESCRIPTION = XML Parser Library
@@ -8,14 +8,21 @@
 endef
 
 MASTER_SITES = ftp://xmlsoft.org/libxml2/
-DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES   += $(call admfiles,CSWpylibxml2,depend)
-DISTFILES   += $(call admfiles,CSWlibxml2,depend)
-DISTFILES   += $(call admfiles,CSWlibxml2devel,depend)
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+PACKAGES = CSWlibxml2 CSWlibxml2devel CSWpylibxml2
+
+CATALOGNAME_CSWlibxml2 = libxml2
+CATALOGNAME_CSWlibxml2devel = libxml2_devel
+CATALOGNAME_CSWpylibxml2 = pylibxml2
+
+REQUIRED_PKGS_CSWlibxml2 = CSWiconv CSWzlib
+REQUIRED_PKGS_CSWlibxml2devel = CSWlibxml2
+REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWlibxml2
+
 # We don't have 64 bit Python yet
 CONFIGURE_ARGS_32 = --with-python=$(prefix)
 CONFIGURE_ARGS_64 = --without-python
@@ -26,18 +33,24 @@
 CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
 BUILD64 = 1
-
 NO_ISAEXEC = 1
-MERGE_EXCLUDE_FILES = .*\.la
 
+# Skip 64 bit binaries - they are just big and gain nothing
+MERGE_DIRS_isa-sparcv9 = $(libdir)
+MERGE_DIRS_isa-amd64 = $(libdir)
+
+EXTRA_PAX_ARGS  = -s ",^\.$(docdir)/libxml2-$(GARVERSION),.$(docdir)/libxml2,p"
+EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(GARVERSION),.$(docdir)/pylibxml2,p"
+EXTRA_PAX_ARGS += -s ",^\.$(libdir)/python[^/]*,.$(libdir)/python,p"
+
 PKGFILES_CSWlibxml2devel  = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibxml2devel += $(docdir)/libxml2-$(GARVERSION)/.*
+PKGFILES_CSWlibxml2devel += $(docdir)/libxml2/.*
 PKGFILES_CSWlibxml2devel += $(sharedstatedir)/gtk-doc/.*
 PKGFILES_CSWlibxml2devel += $(libdir)/xml2Conf.sh
 PKGFILES_CSWlibxml2devel += $(call isadirs,$(libdir),xml2Conf.sh)
 
 PKGFILES_CSWpylibxml2  = $(libdir)/python/.*
-PKGFILES_CSWpylibxml2 += $(docdir)/libxml2-python-$(GARVERSION)/.*
+PKGFILES_CSWpylibxml2 += $(docdir)/pylibxml2/.*
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libxml2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libxml2/trunk/checksums	2009-08-19 12:45:48 UTC (rev 6055)
+++ csw/mgar/pkg/libxml2/trunk/checksums	2009-08-19 13:05:37 UTC (rev 6056)
@@ -1,7 +1 @@
-dc43ff7ae6aded45f578c87b7b0c8766  download/libxml2-2.7.2.tar.gz
-590a7d5677be4f5c67a52b08eba6fb2b  download/CSWpylibxml2.gspec
-dd8c26f51eb9a53545b4cd914b40675b  download/CSWpylibxml2.depend
-f07ada794bee08b0d3ec7dcd68d1e0ac  download/CSWlibxml2.gspec
-115241717779eb81926e5ff971d7fbd7  download/CSWlibxml2.depend
-0633f70c4570a204284c219c02a3c00e  download/CSWlibxml2devel.gspec
-915b1265ec08b5efcfedb03ade19040f  download/CSWlibxml2devel.depend
+8f4fda3969237c2a33bdb1583b5d06b2  download/libxml2-2.7.3.tar.gz

Deleted: csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.depend
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.depend	2009-08-19 12:45:48 UTC (rev 6055)
+++ csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.depend	2009-08-19 13:05:37 UTC (rev 6056)
@@ -1,2 +0,0 @@
-P CSWiconv libiconv - GNU iconv library
-P CSWzlib  zlib - Zlib Data Compression Library

Deleted: csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec	2009-08-19 12:45:48 UTC (rev 6055)
+++ csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec	2009-08-19 13:05:37 UTC (rev 6056)
@@ -1,4 +0,0 @@
-%var            bitname libxml2
-%var            pkgname CSWlibxml2
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Deleted: csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.depend
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.depend	2009-08-19 12:45:48 UTC (rev 6055)
+++ csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.depend	2009-08-19 13:05:37 UTC (rev 6056)
@@ -1 +0,0 @@
-P CSWlibxml2     libxml2 - XML Parser Library

Deleted: csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec	2009-08-19 12:45:48 UTC (rev 6055)
+++ csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec	2009-08-19 13:05:37 UTC (rev 6056)
@@ -1,4 +0,0 @@
-%var            bitname libxml2_devel
-%var            pkgname CSWlibxml2devel
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Deleted: csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.depend
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.depend	2009-08-19 12:45:48 UTC (rev 6055)
+++ csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.depend	2009-08-19 13:05:37 UTC (rev 6056)
@@ -1,2 +0,0 @@
-P CSWlibxml2     libxml2 - XML Parser Library
-P CSWpython      python - A high-level scripting language.

Deleted: csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec	2009-08-19 12:45:48 UTC (rev 6055)
+++ csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec	2009-08-19 13:05:37 UTC (rev 6056)
@@ -1,4 +0,0 @@
-%var            bitname pylibxml2
-%var            pkgname CSWpylibxml2
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING


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

More information about the devel mailing list