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

[dmichelsen at users.sourceforge.net]

Revision: 13738
          http://gar.svn.sourceforge.net/gar/?rev=13738&view=rev
Author:   dmichelsen
Date:     2011-03-11 13:17:37 +0000 (Fri, 11 Mar 2011)

Log Message:
-----------
mGAR v2: Tweak obsoletions

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-11 12:50:09 UTC (rev 13737)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-03-11 13:17:37 UTC (rev 13738)
@@ -68,10 +68,12 @@
 PKGFILES_$(1) = NOFILES
 ARCHALL_$(1) = 1
 # For legacy packages we know that the dependency is correct because we deliberately set it
+# A legacy dependency from another package may not have been released
 # 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,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),
 CHECKPKG_OVERRIDES_$(1) += surplus-dependency|$P
+$(if $(filter $P,$(FOREIGN_PACKAGES)),CHECKPKG_OVERRIDES_$(1) += unidentified-dependency|$P)
 ))
 CHECKPKG_OVERRIDES_$(1) += catalogname-does-not-match-pkgname
 CHECKPKG_OVERRIDES_$(1) += archall-devel-package
@@ -710,11 +712,11 @@
 	$(_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,$(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; \
-		) \
+	$(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETES_$Q)), \
+		($(if $(SPKG_DESC_$Q), \
+			echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \
+			echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print }')"; \
+		)) > $(WORKDIR_GLOBAL)/$P.obsolete; \
 	)))
 	@$(MAKECOOKIE)
 


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