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

[dmichelsen at users.sourceforge.net]

Revision: 13694
          http://gar.svn.sourceforge.net/gar/?rev=13694&view=rev
Author:   dmichelsen
Date:     2011-03-08 21:19:14 +0000 (Tue, 08 Mar 2011)

Log Message:
-----------
mGAR v2: Add FOREIGN_PACKAGES to obsolete from external packages

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-08 18:50:21 UTC (rev 13693)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-03-08 21:19:14 UTC (rev 13694)
@@ -40,7 +40,8 @@
 CATALOGNAME    ?= $(if $(filter-out $(firstword $(PACKAGES)),$(PACKAGES)),,$(subst -,_,$(patsubst CSW%,%,$(PACKAGES))))
 SRCPACKAGE_BASE = $(firstword $(PACKAGES))
 SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
-OBSOLETED_PKGS ?= $(sort $(foreach P,$(PACKAGES),$(OBSOLETES_$P)))
+OBSOLETING_PKGS ?= $(sort $(PACKAGES) $(FOREIGN_PACKAGES))
+OBSOLETED_PKGS ?= $(sort $(foreach P,$(OBSOLETING_PKGS),$(OBSOLETES_$P)))
 SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(OBSOLETED_PKGS) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)))
 endif
 
@@ -62,21 +63,19 @@
 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/(.{0,97}\s|\S{0,97})(.+)/$$1.../')
-RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P))
+SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{0,97}\s|\S{0,97})(.+)/$$1.../')
+RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(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
-
+$(foreach P,$(OBSOLETING_PKGS),$(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
-# ^^ "THE NEWLINE IS IMPORTANT, DO NOT DELETE!", Dago M.
 
 $(foreach P,$(OBSOLETED_PKGS),$(eval $(call obsoleted_pkg,$P)))
 
@@ -710,7 +709,7 @@
 	$(_DBG)rm -f $(COOKIEDIR)/merge-README.CSW $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/README.CSW)
 
 merge-obsolete: $(WORKDIR_GLOBAL)
-	$(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(PACKAGES),$(if $(filter $P,$(OBSOLETES_$Q)), \
+	$(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PACKAGES),$(if $(filter $P,$(OBSOLETES_$Q)), \
 		$(if $(SPKG_DESC_$Q), \
 			echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)" >> $(WORKDIR_GLOBAL)/$P.obsolete;, \
 			echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print } ')" $(WORKDIR_GLOBAL)/$P.obsolete; \


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