[csw-devel] SF.net SVN: gar:[3097] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 3097
          http://gar.svn.sourceforge.net/gar/?rev=3097&view=rev
Author:   dmichelsen
Date:     2009-02-13 12:56:49 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
mGAR v2: Dynamic admscripts and gspec fixes

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

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2009-02-13 12:35:39 UTC (rev 3096)
+++ csw/mgar/gar/v2/gar.lib.mk	2009-02-13 12:56:49 UTC (rev 3097)
@@ -19,12 +19,6 @@
 
 #################### FETCH RULES ####################
 
-DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),\
-		$(foreach SCR,$(ADMSCRIPTS),\
-			$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR))))
-
-NOCHECKSUM += $(DYNSCRIPTS)
-
 URLS = $(subst ://,//,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES))))
 
 # if the caller has defined _postinstall, etc targets for a package, add

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-02-13 12:35:39 UTC (rev 3096)
+++ csw/mgar/gar/v2/gar.mk	2009-02-13 12:56:49 UTC (rev 3097)
@@ -34,6 +34,9 @@
 
 DISTNAME ?= $(GARNAME)-$(GARVERSION)
 
+DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR))))
+_NOCHECKSUM += $(DYNSCRIPTS)
+
 ALLFILES ?= $(DISTFILES) $(PATCHFILES) $(DYNSCRIPTS)
 
 ifeq ($(MAKE_INSTALL_DIRS),1)
@@ -250,7 +253,7 @@
 
 # checksum		- Use $(CHECKSUMFILE) to ensure that your
 # 				  distfiles are valid.
-CHECKSUM_TARGETS = $(addprefix checksum-,$(filter-out $(NOCHECKSUM),$(ALLFILES)))
+CHECKSUM_TARGETS = $(addprefix checksum-,$(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)))
 
 checksum: fetch $(COOKIEDIR) pre-checksum $(CHECKSUM_TARGETS) post-checksum
 	@$(DONADA)
@@ -269,7 +272,7 @@
 	@$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
 
 # makesum		- Generate distinfo (only do this for your own ports!).
-MAKESUM_TARGETS =  $(addprefix $(DOWNLOADDIR)/,$(filter-out $(NOCHECKSUM),$(ALLFILES))) 
+MAKESUM_TARGETS =  $(addprefix $(DOWNLOADDIR)/,$(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES))) 
 
 makesum: fetch $(MAKESUM_TARGETS)
 	@if test "x$(MAKESUM_TARGETS)" != "x "; then \

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-02-13 12:35:39 UTC (rev 3096)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-02-13 12:56:49 UTC (rev 3097)
@@ -284,11 +284,11 @@
 # This rule dynamically generates gspec-files
 .PRECIOUS: $(WORKDIR)/%.gspec
 $(WORKDIR)/%.gspec:
-	$(_DBG)$(if $(filter $*.gspec,$(DISTFILES)),,
+	$(_DBG)$(if $(filter $*.gspec,$(DISTFILES)),,\
 		(echo "%var            bitname $(call catalogname,$*)"; \
 		echo "%var            pkgname $*"; \
 		$(if $(or $(ARCHALL),$(ARCHALL_$*)),echo "%var            arch all";) \
-		echo "%include        url file://%{PKGLIB}/csw_dyngspec.gspec") >$@ 
+		echo "%include        url file://%{PKGLIB}/csw_dyngspec.gspec") >$@\
 	)
 
 


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