CWS-TOOLING: integrate CWS ause099

2009-01-29 12:30:57 +0100 hjs  r267116 : #i98365# fix unsetting g+s bit
2009-01-23 14:21:19 +0100 hjs  r266819 : #i40246# - cleanup
2009-01-23 14:14:07 +0100 hjs  r266818 : #i40246# - fix quoting of final echo line
2009-01-23 12:42:33 +0100 hjs  r266807 : #i98365# leave higher bits alone
2009-01-23 11:23:42 +0100 rt  r266799 : Header
2009-01-22 19:14:25 +0100 hjs  r266753 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:22:18 +0100 hjs  r266737 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:20:54 +0100 hjs  r266736 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:20:24 +0100 hjs  r266735 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:08:33 +0100 hjs  r266734 : #i40246# renamed variable
2009-01-22 16:05:26 +0100 hjs  r266733 : #i40246# renamed variable
2009-01-20 17:46:54 +0100 hjs  r266610 : #i98290# cleanup
2009-01-19 19:32:19 +0100 hjs  r266522 : CWS-TOOLING: rebase CWS ause099 to trunk@266428 (milestone: DEV300:m39)
2008-12-08 21:00:09 +0100 hjs  r265049 : CWS-TOOLING: rebase CWS ause099 to trunk@264807 (milestone: DEV300:m37)
2008-11-27 18:25:18 +0100 hjs  r264513 : #i40246# - support multiple patches per archive
2008-11-17 19:00:12 +0100 hjs  r263738 : CWS-TOOLING: rebase CWS ause099 to trunk@263288 (milestone: DEV300:m35)

18 files changed, 24 insertions, 24 deletions

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index b013d9c8d8ea..b3cf36e6365d 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -62,9 +62,9 @@ ADDITIONAL_FILES=    \
 
 # not needed for win32. comment out when causing problems...
 .IF "$(GUI)$(COM)"=="WNTGCC"
-PATCH_FILE_NAME=db-4.2.52-mingw.patch
+PATCH_FILES=db-4.2.52-mingw.patch
 .ELSE
-PATCH_FILE_NAME=db-4.2.52.patch
+PATCH_FILES=db-4.2.52.patch
 .ENDIF
 
 # clean compiler flags
diff --git a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk b/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
index 4332af42b13f..5af2dc1f8c0f 100644
--- a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
+++ b/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
@@ -43,7 +43,7 @@ TARGET=ttf_dejavu
 TARFILE_NAME=dejavu-ttf-2.21
 TARFILE_ROOTDIR=dejavu-ttf-2.21
 
-PATCH_FILE_NAME=
+PATCH_FILES=
 
 
 CONFIGURE_DIR=
diff --git a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk b/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk
index aea6331923ee..112c8922f87a 100644
--- a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk
+++ b/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk
@@ -43,7 +43,7 @@ TARGET=ttf_liberation
 TARFILE_NAME=liberation-fonts-1.04
 TARFILE_ROOTDIR=liberation-fonts-1.04
 
-PATCH_FILE_NAME=
+PATCH_FILES=
 
 
 CONFIGURE_DIR=
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 74ac50bfefe8..7f5e5b4c5441 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -53,14 +53,14 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=boost-1.30.2
-PATCH_FILE_NAME=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch
 
 .IF "$(COMID)"=="gcc3"
 
 # enabled for gcc4.x
 .IF "$(CCNUMVER)">="000400000000" 
   TARFILE_NAME=boost_1_34_1
-  PATCH_FILE_NAME=$(TARFILE_NAME).patch
+  PATCH_FILES=$(TARFILE_NAME).patch
 .ENDIF
 
 .ENDIF
diff --git a/boost/spirit/makefile.mk b/boost/spirit/makefile.mk
index 6c2a27eba9d7..e34465e4cd34 100644
--- a/boost/spirit/makefile.mk
+++ b/boost/spirit/makefile.mk
@@ -62,7 +62,7 @@ all:
 .ELSE
 
 TARFILE_NAME=spirit-1.6.1
-PATCH_FILE_NAME=$(PRJ)$/$(TARFILE_NAME).patch
+PATCH_FILES=$(PRJ)$/$(TARFILE_NAME).patch
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index f97b489f8c3b..73d3a27f9493 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -54,7 +54,7 @@ all:
 CAIROVERSION=1.8.0
 
 TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
-PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch
+PATCH_FILES=..$/$(TARFILE_NAME).patch
 
 cairo_CFLAGS=$(SOLARINC)
 cairo_LDFLAGS=$(SOLARLIB)
diff --git a/curl/makefile.mk b/curl/makefile.mk
index d8c281bf7902..8bac551ecb74 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -46,7 +46,7 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=curl-7.12.2
-PATCH_FILE_NAME=curl-7.12.2.patch
+PATCH_FILES=curl-7.12.2.patch
 CONVERTFILES= \
     lib$/Makefile.vc6
 
diff --git a/expat/makefile.mk b/expat/makefile.mk
index f8c2c733eb91..1b5abd365ef3 100644
--- a/expat/makefile.mk
+++ b/expat/makefile.mk
@@ -49,7 +49,7 @@ all:
 TARFILE_NAME=expat
 ADDITIONAL_FILES=xmlparse$/makefile.mk xmltok$/makefile.mk makefile.mk
 
-PATCH_FILE_NAME=expat.patch
+PATCH_FILES=expat.patch
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 57259392cf01..0032166c83f6 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -45,7 +45,7 @@ TARFILE_ROOTDIR=hunspell-1.1.12
 
 #ADDITIONAL_FILES += src/hunspell/makefile.mk
 
-PATCH_FILE_NAME=hunspell-1.1.12.patch
+PATCH_FILES=hunspell-1.1.12.patch
 
 .IF "$(GUI)"=="UNX"
 #CONFIGURE_DIR=$(BUILD_DIR)
diff --git a/icu/makefile.mk b/icu/makefile.mk
index b042ede5a29e..5a15d4274e25 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -48,7 +48,7 @@ TARFILE_NAME=icu-$(ICU_MAJOR).$(ICU_MINOR)
 .ENDIF
 TARFILE_ROOTDIR=icu
 
-PATCH_FILE_NAME=${TARFILE_NAME}.patch
+PATCH_FILES=${TARFILE_NAME}.patch
 
 # ADDITIONAL_FILES=
 
@@ -243,10 +243,10 @@ OUT2BIN= \
 .INCLUDE :	target.mk
 .INCLUDE :	tg_ext.mk
 
-.IF "$(BINARY_PATCH_FILE_NAME)"!=""
+.IF "$(BINARY_PATCH_FILES)"!=""
 
 $(PACKAGE_DIR)$/so_add_binary :  $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
-    cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILE_NAME) | tar $(TAR_EXCLUDE_SWITCH) -xvf -
+    cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar $(TAR_EXCLUDE_SWITCH) -xvf -
     $(TOUCH) $(PACKAGE_DIR)$/so_add_binary
 
 $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
diff --git a/jpeg/makefile.mk b/jpeg/makefile.mk
index 5b43ddb3a82a..b02480b118d6 100644
--- a/jpeg/makefile.mk
+++ b/jpeg/makefile.mk
@@ -48,7 +48,7 @@ all:
 
 TARFILE_NAME=jpeg-6b
 
-PATCH_FILE_NAME=jpeg-6b.patch
+PATCH_FILES=jpeg-6b.patch
 ADDITIONAL_FILES=makefile.mk \
                  jconfig.h
 
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index a250bb10847b..7ae2265271b8 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -50,9 +50,9 @@ LIBXML2VERSION=2.6.31
 
 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
 #.IF "$(OS)$(COM)"=="WNTGCC"
-#PATCH_FILE_NAME=$(TARFILE_NAME)-mingw.patch
+#PATCH_FILES=$(TARFILE_NAME)-mingw.patch
 #.ELSE
-PATCH_FILE_NAME=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch
 #.ENDIF
 
 # This is only for UNX environment now
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 6c88eacea2d5..6115af330f7b 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -51,7 +51,7 @@ all:
 LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
-PATCH_FILE_NAME=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch
 
 # This is only for UNX environment now
 
diff --git a/moz/makefile.mk b/moz/makefile.mk
index adc4c91c7df0..703b3ab08361 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -73,7 +73,7 @@ TARFILE_NAME=mozilla-source-$(MOZILLA_VERSION)
 .ENDIF
 TARFILE_ROOTDIR=mozilla
 
-PATCH_FILE_NAME=mozilla-source-$(MOZILLA_VERSION).patch 
+PATCH_FILES=mozilla-source-$(MOZILLA_VERSION).patch 
 
 # These files are needed for the W32 build when BUILD_MOZAB is set
 LIBIDL_VC71_ZIPFILE_NAME*=vc71-libIDL-0.6.8-bin.zip
@@ -239,7 +239,7 @@ $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(MISC)$/remove_build.flag
 # Since you never know what will be in a patch (for example, it may already
 # patch at configure level), we remove the entire package directory if a patch
 # is newer.
-$(MISC)$/remove_build.flag : $(PATCH_FILE_NAME)
+$(MISC)$/remove_build.flag : $(PATCH_FILES)
     $(REMOVE_PACKAGE_COMMAND)
     $(TOUCH) $(MISC)$/remove_build.flag
 
diff --git a/neon/makefile.mk b/neon/makefile.mk
index 41f6b63c57c5..7bb11a759610 100644
--- a/neon/makefile.mk
+++ b/neon/makefile.mk
@@ -53,7 +53,7 @@ TARGET=so_neon
 NEON_NAME=neon-0.26.3
 
 TARFILE_NAME=$(NEON_NAME)
-PATCH_FILE_NAME=neon.patch
+PATCH_FILES=neon.patch
 ADDITIONAL_FILES=src$/makefile.mk src$/config.h
 
 BUILD_DIR=src
diff --git a/python/makefile.mk b/python/makefile.mk
index 66532174defc..469c9467ddc5 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -50,7 +50,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-PATCH_FILE_NAME=Python-$(PYVERSION).patch
+PATCH_FILES=Python-$(PYVERSION).patch
 
 PYPROJECTS= \
     datetime 	\
diff --git a/saxon/makefile.mk b/saxon/makefile.mk
index 8b66fb5feec2..03c873fc9e5e 100644
--- a/saxon/makefile.mk
+++ b/saxon/makefile.mk
@@ -52,7 +52,7 @@ TARFILE_NAME=source-9.0.0.7-bj
 ADDITIONAL_FILES=build.xml
 TARFILE_ROOTDIR=src
 
-PATCH_FILE_NAME=saxon-9.0.0.7-bj.patch
+PATCH_FILES=saxon-9.0.0.7-bj.patch
 
 BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolarbindir=$(SOLARBINDIR) jar-bj 
 
diff --git a/zlib/makefile.mk b/zlib/makefile.mk
index abc3de43edaf..9b0aafba4e61 100644
--- a/zlib/makefile.mk
+++ b/zlib/makefile.mk
@@ -50,7 +50,7 @@ all:
 
 TARFILE_NAME=zlib-1.1.4
 
-PATCH_FILE_NAME=zlib-1.1.4.patch
+PATCH_FILES=zlib-1.1.4.patch
 ADDITIONAL_FILES=makefile.mk
 
 #relative to CONFIGURE_DIR