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

[dmichelsen at users.sourceforge.net]

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

Log Message:
-----------
mGAR v2: Rename ISAEXEC_EXCLUDE_FILES to EXTRA_ISAEXEC_EXCLUDE_FILES

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk
    csw/mgar/pkg/pango/trunk/Makefile
    csw/mgar/pkg/proftpd/trunk/Makefile
    csw/mgar/pkg/unbound/trunk/Makefile

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2011-03-15 02:45:16 UTC (rev 13807)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-03-15 08:21:57 UTC (rev 13808)
@@ -866,8 +866,8 @@
 # The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper.
 # The trick is to delay the calculcation of the variable values until that time
 # when PKGROOT has already been populated.
-_ISAEXEC_EXCLUDE_FILES = $(bindir)/%-config $(bindir)/%/%-config
-_buildpackage: _ISAEXEC_FILES=$(filter-out $(foreach F,$(_ISAEXEC_EXCLUDE_FILES) $(ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \
+ISAEXEC_EXCLUDE_FILES ?= $(bindir)/%-config $(bindir)/%/%-config
+_buildpackage: _ISAEXEC_FILES=$(filter-out $(foreach F,$(ISAEXEC_EXCLUDE_FILES) $(EXTRA_ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \
 			$(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/* )) \
 		)
 _buildpackage: ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%,               \

Modified: csw/mgar/pkg/pango/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pango/trunk/Makefile	2011-03-15 02:45:16 UTC (rev 13807)
+++ csw/mgar/pkg/pango/trunk/Makefile	2011-03-15 08:21:57 UTC (rev 13808)
@@ -43,7 +43,7 @@
 
 BUILD64 = 1
 NOISALIST = 1
-ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules
+EXTRA_ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-x --enable-gtk-doc
 CONFIGURE_ARGS += --x-include=$(prefix)/X11/include

Modified: csw/mgar/pkg/proftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/proftpd/trunk/Makefile	2011-03-15 02:45:16 UTC (rev 13807)
+++ csw/mgar/pkg/proftpd/trunk/Makefile	2011-03-15 08:21:57 UTC (rev 13808)
@@ -26,8 +26,8 @@
 EXTRA_BUILD_ISAS_i386  = amd64
 EXTRA_BUILD_ISAS_sparc = sparcv9
 
-ISAEXEC_DIRS           = $(bindir) $(sbindir)
-ISAEXEC_EXCLUDE_FILES  = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs
+ISAEXEC_DIRS                 = $(bindir) $(sbindir)
+EXTRA_ISAEXEC_EXCLUDE_FILES  = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs
 
 EXTRA_MERGE_EXCLUDE_FILES_isa-amd64   = $(prefix)/bin/amd64/ftpasswd $(prefix)/bin/amd64/ftpmail $(prefix)/bin/amd64/ftpquota $(prefix)/bin/amd64/prxs
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/bin/sparcv9/ftpasswd $(prefix)/bin/sparcv9/ftpmail $(prefix)/bin/sparcv9/ftpquota $(prefix)/bin/sparcv9/prxs

Modified: csw/mgar/pkg/unbound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unbound/trunk/Makefile	2011-03-15 02:45:16 UTC (rev 13807)
+++ csw/mgar/pkg/unbound/trunk/Makefile	2011-03-15 08:21:57 UTC (rev 13808)
@@ -51,12 +51,12 @@
 MERGE_DIRS_isa-pentium_pro  = $(libdir)
 MERGE_DIRS_isa-pentium_pro += $(sbindir)
 
-ISAXEC_DIRS            = $(sbindir)
-ISAEXEC_EXCLUDE_FILES  = $(sbindir)/unbound-anchor
-ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf
-ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control
-ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup
-ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host
+ISAXEC_DIRS                  = $(sbindir)
+EXTRA_ISAEXEC_EXCLUDE_FILES  = $(sbindir)/unbound-anchor
+EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf
+EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control
+EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup
+EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host
 
 EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro  = $(prefix)/sbin/unbound-anchor
 EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-checkconf


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