Revision: 7554
http://gar.svn.sourceforge.net/gar/?rev=7554&view=rev
Author: wahwah
Date: 2009-12-04 17:47:14 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
gar-v2-git: Merging v2 up to r7553
Modified Paths:
--------------
csw/mgar/gar/v2-git/gar.conf.mk
csw/mgar/gar/v2-git/gar.pkg.mk
Property Changed:
----------------
csw/mgar/gar/v2-git/
Property changes on: csw/mgar/gar/v2-git
___________________________________________________________________
Modified: svn:mergeinfo
- /csw/mgar/gar/v2:4936-6678,6916-7336
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-skayser:6087-6132
+ /csw/mgar/gar/v2:4936-6678,6915-7553
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-skayser:6087-6132
Modified: csw/mgar/gar/v2-git/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2-git/gar.conf.mk 2009-12-04 17:30:14 UTC (rev 7553)
+++ csw/mgar/gar/v2-git/gar.conf.mk 2009-12-04 17:47:14 UTC (rev 7554)
@@ -499,8 +499,8 @@
CC_HOME = $($(GARCOMPILER)_CC_HOME)
CC = $($(GARCOMPILER)_CC)
CXX = $($(GARCOMPILER)_CXX)
-CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS)
$(EXTRA_CFLAGS) $(INCLUDE_FLAGS))
-CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS)
$(EXTRA_CXXFLAGS) $(INCLUDE_FLAGS))
+CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS)
$(EXTRA_CFLAGS))
+CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS)
$(EXTRA_CXXFLAGS))
CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS)
$(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS))
LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS)
$(EXTRA_LDFLAGS) $(LINKER_FLAGS))
ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS)
$(EXTRA_ASFLAGS))
Modified: csw/mgar/gar/v2-git/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-git/gar.pkg.mk 2009-12-04 17:30:14 UTC (rev 7553)
+++ csw/mgar/gar/v2-git/gar.pkg.mk 2009-12-04 17:47:14 UTC (rev 7554)
@@ -185,15 +185,16 @@
SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf)
SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices)
SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup)
+SPKG_CLASSES := $(call _spkg_cond_add,CRONTABS,cswcrontab)
SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile)
SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd)
SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf)
+
# This is the default path for texinfo pages to be picked up. Extend or
replace as necessary.
TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO)
# - set class for all config files
-ifneq
($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),)
_CSWCLASS_FILTER = | perl -ane '\
$(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if(
$$F[2] =~ m(^$(FILE)$$) );)\
$(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] =
"cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\
@@ -202,10 +203,13 @@
$(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~
m(^$(FILE)$$) );)\
$(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~
m(^$(FILE)$$) );)\
$(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2]
=~ m(^$(FILE)$$) );)\
+ $(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~
m(^$(FILE)$$) );)\
$(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] =
"cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\
$(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~
m(^$(FILE)$$) );)\
print join(" ",@F),"\n";'
+# The TEXINFO dependency is handled dynamically by looking at the prototype
for matching files
+ifneq
($(MIGRATECONF)$(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),)
_EXTRA_GAR_PKGS += CSWcswclassutils
# Make sure the configuration files always have a .CSW suffix and rename the
# configuration files to this if necessary during merge.
@@ -596,16 +600,14 @@
merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or
$(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S))
@$(MAKECOOKIE)
-merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES)
-merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR)
-merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR)
merge-migrateconf-%:
@echo "[ Generating cswmigrateconf for package $* ]"
+ @echo "X: $(MIGRATE_FILES_$*) Y: $(MIGRATE_FILES)"
$(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$*
- $(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\
+ $(_DBG)(echo "MIGRATE_FILES=\"$(or
$(MIGRATE_FILES_$*),$(MIGRATE_FILES))\"";\
$(if $(MIGRATE_SOURCE_DIR_$*),echo
"SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\
$(if $(MIGRATE_DEST_DIR_$*),echo
"DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\
- $(foreach F,$(MIGRATE_FILES_$*),\
+ $(foreach F,$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES)),\
$(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst
.,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\
$(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst
.,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\
)\
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
