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

[bdwalton at users.sourceforge.net]

Revision: 13868
          http://gar.svn.sourceforge.net/gar/?rev=13868&view=rev
Author:   bdwalton
Date:     2011-03-20 00:48:04 +0000 (Sun, 20 Mar 2011)

Log Message:
-----------
libxml2/trunk: add renames for new standards, use obsoletes for old names

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

Modified: csw/mgar/pkg/libxml2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxml2/trunk/Makefile	2011-03-20 00:39:43 UTC (rev 13867)
+++ csw/mgar/pkg/libxml2/trunk/Makefile	2011-03-20 00:48:04 UTC (rev 13868)
@@ -14,19 +14,24 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-PACKAGES = CSWlibxml2 CSWlibxml2devel CSWpylibxml2
+PACKAGES = CSWlibxml2-2 CSWlibxml2devel CSWpy-libxml2
 
-CATALOGNAME_CSWlibxml2 = libxml2
-CATALOGNAME_CSWlibxml2devel = libxml2_devel
-CATALOGNAME_CSWpylibxml2 = py_libxml2
+OBSOLETS_CSWlibxml2-2 = CSWlibxml2
+OBSOLETES_CSWpy-libxml2 = CSWpylibxml2
+OBSOLETES_CSWlibxml2-dev = CSWlibxml2devel
 
+CATALOGNAME_CSWlibxml2-2 = libxml2_2
+CATALOGNAME_CSWlibxml2-dev = libxml2_dev
+CATALOGNAME_CSWpy-libxml2 = py_libxml2
+
 SPKG_DESC_CSWlibxml2      = XML Parser Library
-SPKG_DESC_CSWlibxml2devel = XML Parser Library Developer Files
-SPKG_DESC_CSWpylibxml2    = XML Parser Library Python Bindings
+SPKG_DESC_CSWlibxml2-dev = XML Parser Library Developer Files
+SPKG_DESC_CSWpy-libxml2    = XML Parser Library Python Bindings
 
 RUNTIME_DEP_PKGS_CSWlibxml2 = CSWiconv CSWzlib
-RUNTIME_DEP_PKGS_CSWlibxml2devel = CSWlibxml2
-RUNTIME_DEP_PKGS_CSWpylibxml2 = CSWlibpython2-6-1-0 CSWlibxml2 CSWiconv CSWzlib
+RUNTIME_DEP_PKGS_CSWlibxml2-dev = CSWlibxml2
+RUNTIME_DEP_PKGS_CSWpy-libxml2  = CSWlibpython2-6-1-0 CSWlibxml2
+RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWiconv CSWzlib
 
 # We don't have 64 bit Python yet
 CONFIGURE_ARGS_32 = --with-python=$(prefix)
@@ -52,20 +57,20 @@
 EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(VERSION),.$(docdir)/pylibxml2,p"
 EXTRA_PAX_ARGS += -s ",^\.$(libdir)/python[^/]*,.$(libdir)/python,p"
 
-PKGFILES_CSWlibxml2devel  = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibxml2devel += $(docdir)/libxml2/.*
-PKGFILES_CSWlibxml2devel += $(sharedstatedir)/gtk-doc/.*
-PKGFILES_CSWlibxml2devel += $(libdir)/xml2Conf.sh
-PKGFILES_CSWlibxml2devel += $(call isadirs,$(libdir),xml2Conf.sh)
+PKGFILES_CSWlibxml2-dev  = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibxml2-dev += $(docdir)/libxml2/.*
+PKGFILES_CSWlibxml2-dev += $(sharedstatedir)/gtk-doc/.*
+PKGFILES_CSWlibxml2-dev += $(libdir)/xml2Conf.sh
+PKGFILES_CSWlibxml2-dev += $(call isadirs,$(libdir),xml2Conf.sh)
 
-PKGFILES_CSWpylibxml2  = $(libdir)/python/.*
-PKGFILES_CSWpylibxml2 += $(docdir)/pylibxml2/.*
+PKGFILES_CSWpy-libxml2  = $(libdir)/python/.*
+PKGFILES_CSWpy-libxml2 += $(docdir)/pylibxml2/.*
 
 sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
 
 # override checkpkg for this
-CHECKPKG_OVERRIDES_CSWlibxml2devel += surplus-dependency|CSWlibxml2
+CHECKPKG_OVERRIDES_CSWlibxml2-dev += surplus-dependency|CSWlibxml2
 
 include gar/category.mk
 


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