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

[bdwalton at users.sourceforge.net]

Revision: 7196
          http://gar.svn.sourceforge.net/gar/?rev=7196&view=rev
Author:   bdwalton
Date:     2009-11-10 02:42:35 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
gar: change the way CSWcommon is handled, making it optional with a COMMON_PKG_DEPENDS

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk
    csw/mgar/gar/v2/gar.mk
    csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec

Removed Paths:
-------------
    csw/mgar/gar/v2/pkglib/csw/depend

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2009-11-10 02:22:01 UTC (rev 7195)
+++ csw/mgar/gar/v2/gar.conf.mk	2009-11-10 02:42:35 UTC (rev 7196)
@@ -164,6 +164,8 @@
 
 DESTIMG ?= $(LOGNAME)-$(shell hostname)
 
+# A default list of packages that everyone will depend on
+COMMON_PKG_DEPENDS ?= CSWcommon
 
 # These are the core packages which must be installed for GAR to function correctly
 DEF_BASE_PKGS = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-11-10 02:22:01 UTC (rev 7195)
+++ csw/mgar/gar/v2/gar.mk	2009-11-10 02:42:35 UTC (rev 7196)
@@ -619,6 +619,10 @@
 		if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi;	\
 	done)),)
 
+ifneq ($(COMMON_PKG_DEPENDS),)
+_EXTRA_GAR_PKGS += $(COMMON_PKG_DEPENDS)
+endif
+
 ifneq ($(ISAEXEC_FILES),)
 _EXTRA_GAR_PKGS += CSWisaexec
 endif

Deleted: csw/mgar/gar/v2/pkglib/csw/depend
===================================================================
--- csw/mgar/gar/v2/pkglib/csw/depend	2009-11-10 02:22:01 UTC (rev 7195)
+++ csw/mgar/gar/v2/pkglib/csw/depend	2009-11-10 02:42:35 UTC (rev 7196)
@@ -1 +0,0 @@
-P CSWcommon common - common files and dirs for CSW packages

Modified: csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec
===================================================================
--- csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec	2009-11-10 02:22:01 UTC (rev 7195)
+++ csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec	2009-11-10 02:42:35 UTC (rev 7196)
@@ -1,5 +1,4 @@
 %include        url file://%{PKGLIB}/csw_vars.gspec
 %include        url file://%{PKGLIB}/csw_prototype.gspec
 %pkginfo        url file://%{WORKSRC}/csw/pkginfo
-%depend:merge   url file://%{PKGLIB}/csw/depend
 %include        url file://%{PKGLIB}/std_depend.gspec


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