[csw-devel] SF.net SVN: gar:[13608] csw/mgar/gar/v2/gar.pkg.mk

[dmichelsen at users.sourceforge.net]

Revision: 13608
          http://gar.svn.sourceforge.net/gar/?rev=13608&view=rev
Author:   dmichelsen
Date:     2011-03-06 20:30:24 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
mGAR v2: Allow overriding of obseleted catalog names

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2011-03-06 19:17:19 UTC (rev 13607)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-03-06 20:30:24 UTC (rev 13608)
@@ -59,15 +59,20 @@
 CATALOG_RELEASE ?= current
 
 define obsoleted_pkg
-CATALOGNAME_$(1) = $(call catalogname,$(1))
+CATALOGNAME_$(1) ?= $(call catalogname,$(1))
 # The length of the description has been limited to 100 characters,
 # the string is cut (no longer on word boundaries).
 SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/^(.{100}).+/substr($$1,0,-4) . " ..."/')
 RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P))
 PKGFILES_$(1) = NOFILES
 ARCHALL_$(1) = 1
+# For legacy packages we know that the dependency is correct because we deliberately set it
+# The catalog name may not match for legacy packages
+# The overridden package may be a devel package, as it is empty it is ok to be archall
 $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),
   CHECKPKG_OVERRIDES_$(1) += surplus-dependency|$P
+  CHECKPKG_OVERRIDES_$(1) += catalogname-does-not-match-pkgname
+  CHECKPKG_OVERRIDES_$(1) += archall-devel-package
 
 ))
 endef


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