cws tl74: merge with DEV300_m81

author: Thomas Lange [tl] <tl@openoffice.org> 2010-06-09 14:50:43 +0200
committer: Thomas Lange [tl] <tl@openoffice.org> 2010-06-09 14:50:43 +0200
commit: 29f7268d43499993510698cc3ee14acf9a8e35b6 (patch)
tree: ca1a9640c2ce5e8829004f81acc99a1e71809917
parent: abbcaab344a5f36f5c84cc94f3d1f89d3f30eede (diff)
parent: 2e3cd7c625afed09e03a5d100ad6b89ec78c4dc6 (diff)
52 files changed, 974 insertions, 1719 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
index c97522f62612..8cf412d23e25 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -646,7 +646,7 @@
 +
 --- misc/db-4.7.25.NC/makefile.mk	2009-07-21 11:42:40.000000000 +0200
 +++ misc/build/db-4.7.25.NC/makefile.mk	2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,81 @@
+@@ -1 +1,76 @@
 -dummy
 +PRJ=..$/..$/..$/..
 +PRJNAME=libdb47
@@ -658,11 +658,6 @@
 +CFLAGS+=-GS -EHsc -Gy
 +
 +#LINKFLAGS!:=$(LINKFLAGS:s/NODEFAULTLIB/NOLOGO/)
-+.IF "$(USE_SHELL)"!="4nt"
-+BUILD_ACTION_SEP=;
-+.ELSE # "$(USE_SHELL)"!="4nt"
-+BUILD_ACTION_SEP=^
-+.ENDIF # "$(USE_SHELL)"!="4nt"
 +
 +CHILDREN= \
 +    btree clib common cxx \
@@ -720,7 +715,7 @@
 +ALLTAR : $(CHILDREN)
 +
 +$(CHILDREN) .PHONY :
-+	cd $@ $(BUILD_ACTION_SEP) $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
++	cd $@ ; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
 +
 +.INCLUDE :  target.mk
 +
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index fe1208e554ab..963c61a3bbde 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -43,6 +43,7 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=db-4.7.25.NC-custom
+TARFILE_MD5=d70951c80dabecc2892c919ff5d07172
 TARFILE_ROOTDIR=db-4.7.25.NC
 
 ADDITIONAL_FILES= \
@@ -160,11 +161,6 @@ OUT2INC= \
 # make use of stlport headerfiles
 EXT_USE_STLPORT=TRUE
 
-.IF "$(USE_SHELL)"!="4nt"
-BUILD_ACTION_SEP=;
-.ELSE # "$(USE_SHELL)"!="4nt"
-BUILD_ACTION_SEP=^
-.ENDIF # "$(USE_SHELL)"!="4nt"
 BUILD_DIR=
 BUILD_ACTION=dmake
 
diff --git a/bitstream_vera_fonts/prj/build.lst b/bitstream_vera_fonts/prj/build.lst
deleted file mode 100644
index 27b9f8f5f81d..000000000000
--- a/bitstream_vera_fonts/prj/build.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-bs	bitstream_vera_fonts	:	solenv NULL
-bs	bitstream_vera_fonts\fonts\ttf_dejavu		nmake	-	all	deja_fonts NULL
-bs	bitstream_vera_fonts\fonts\ttf_liberation	nmake	-	all	libe_fonts NULL
-bs	bitstream_vera_fonts\fonts\ttf_gentium		nmake	-	all	gent_fonts NULL
-
diff --git a/bitstream_vera_fonts/prj/d.lst b/bitstream_vera_fonts/prj/d.lst
deleted file mode 100644
index 831798dba3fb..000000000000
--- a/bitstream_vera_fonts/prj/d.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-mkdir: %COMMON_DEST%\pck%_EXT%
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\ttf\*.ttf             %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\dejavu-ttf-2.30\LICENSE           %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
-..\%__SRC%\misc\build\liberation-fonts-1.05\*.ttf            %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-1.05\License          %COMMON_DEST%\pck%_EXT%\LICENSE_liberation
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf          %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt        %COMMON_DEST%\pck%_EXT%\LICENSE_gentium
-
diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch
index 9ab3099fc444..d837246a83bf 100644
--- a/boost/boost_1_39_0.patch
+++ b/boost/boost_1_39_0.patch
@@ -1,6 +1,35 @@
---- misc/boost_1_39_0/boost/function/function_template.hpp	2008-10-16 15:21:50.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/function/function_template.hpp	2009-07-09 12:58:51.141224220 +0200
-@@ -950,10 +950,10 @@
+diff --git boost_1_39_0/boost/config/compiler/visualc.hpp boost_1_39_0/boost/config/compiler/visualc.hpp
+index 552e5bb..d9f90b2 100644
+--- misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp
++++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp
+@@ -138,6 +138,9 @@
+ #  define BOOST_NO_RTTI
+ #endif
+ 
++// disable WORKAROUND macro - gives warning for undefined macros
++#define BOOST_STRICT_CONFIG 1
++
+ //
+ // all versions support __declspec:
+ //
+diff --git boost_1_39_0/boost/function/function_base.hpp boost_1_39_0/boost/function/function_base.hpp
+index 6612fb8..35afa16 100644
+--- misc/build/boost_1_39_0/boost/function/function_base.hpp
++++ misc/build/boost_1_39_0/boost/function/function_base.hpp
+@@ -42,7 +42,7 @@
+ #endif       
+ 
+ // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
+-#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
++#ifdef BOOST_NO_STD_TYPEINFO
+ // Embedded VC++ does not have type_info in namespace std
+ #  define BOOST_FUNCTION_STD_NS
+ #else
+diff --git boost_1_39_0/boost/function/function_template.hpp boost_1_39_0/boost/function/function_template.hpp
+index 584abe9..36b619b 100644
+--- misc/build/boost_1_39_0/boost/function/function_template.hpp
++++ misc/build/boost_1_39_0/boost/function/function_template.hpp
+@@ -950,10 +950,10 @@ namespace boost {
            f.vtable->manager(f.functor, this->functor,
                              boost::detail::function::move_functor_tag);
  		  f.vtable = 0;
@@ -12,32 +41,11 @@
        } catch (...) {
          vtable = 0;
          throw;
---- misc/boost_1_39_0/boost/function/function_base.hpp	2008-10-16 15:21:50.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/function/function_base.hpp	2009-07-12 21:42:22.779873909 +0200
-@@ -42,7 +42,7 @@
- #endif       
- 
- // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
--#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
-+#ifdef BOOST_NO_STD_TYPEINFO
- // Embedded VC++ does not have type_info in namespace std
- #  define BOOST_FUNCTION_STD_NS
- #else
---- misc/boost_1_39_0/boost/config/compiler/visualc.hpp	2009-03-26 20:00:00.000000000 +0100
-+++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp	2009-06-10 21:53:42.484375000 +0200
-@@ -138,6 +138,9 @@
- #  define BOOST_NO_RTTI
- #endif
- 
-+// disable WORKAROUND macro - gives warning for undefined macros
-+#define BOOST_STRICT_CONFIG 1
-+
- //
- // all versions support __declspec:
- //
---- misc/boost_1_39_0/boost/mpl/apply_wrap.hpp	2008-10-11 08:50:46.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp	2009-06-10 21:53:42.500000000 +0200
-@@ -173,8 +173,8 @@
+diff --git boost_1_39_0/boost/mpl/apply_wrap.hpp boost_1_39_0/boost/mpl/apply_wrap.hpp
+index b3cb12b..0bf8e73 100644
+--- misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp
++++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp
+@@ -173,8 +173,8 @@ struct BOOST_PP_CAT(apply_wrap,i_)<AUX778076_APPLY_WRAP_SPEC_PARAMS(i_, int)>
  #   undef i_
  
  ///// iteration, depth == 2
@@ -48,15 +56,17 @@
  
  #   define j_ BOOST_PP_FRAME_ITERATION(2)
  
-@@ -230,4 +231,5 @@
+@@ -231,4 +231,5 @@ struct BOOST_PP_CAT(apply_wrap_impl,i_)<
  #   undef j_
  
  #endif // BOOST_PP_ITERATION_DEPTH()
 +#endif
  #endif // BOOST_PP_IS_ITERATING
---- misc/boost_1_39_0/boost/mpl/bind.hpp	2008-10-11 08:19:02.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/mpl/bind.hpp	2009-06-10 21:53:42.515625000 +0200
-@@ -531,7 +531,8 @@
+diff --git boost_1_39_0/boost/mpl/bind.hpp boost_1_39_0/boost/mpl/bind.hpp
+index 5d851ef..780e260 100644
+--- misc/build/boost_1_39_0/boost/mpl/bind.hpp
++++ misc/build/boost_1_39_0/boost/mpl/bind.hpp
+@@ -531,7 +531,8 @@ struct bind_chooser<i_>
  
  ///// iteration, depth == 2
  
@@ -66,15 +76,81 @@
  
  #   define j_ BOOST_PP_FRAME_ITERATION(2)
  #   if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
-@@ -548,4 +549,5 @@
+@@ -548,4 +549,5 @@ struct bind_chooser<i_>
  #   undef j_
  
  #endif // BOOST_PP_ITERATION_DEPTH()
 +#endif
  #endif // BOOST_PP_IS_ITERATING
---- misc/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp	2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp	2009-06-10 21:53:42.531250000 +0200
-@@ -19,12 +19,12 @@
+diff --git boost_1_39_0/boost/ptr_container/detail/move.hpp boost_1_39_0/boost/ptr_container/detail/move.hpp
+index bf07d5f..6b082a7 100644
+--- misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp
+@@ -20,7 +20,7 @@ namespace move_ptrs {
+ template<typename Ptr>
+ class move_source {
+ public:
+-    move_source(Ptr& ptr) : ptr_(ptr) {}
++    move_source(Ptr& _ptr) : ptr_(_ptr) {}
+     Ptr& ptr() const { return ptr_; }
+ private:
+     Ptr& ptr_;
+diff --git boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
+index 47c3903..3ad2c5c 100644
+--- misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
+@@ -278,9 +278,9 @@ namespace ptr_container_detail
+ 
+     private:
+         template< class ForwardIterator >
+-        ForwardIterator advance( ForwardIterator begin, size_type n ) 
++        ForwardIterator advance( ForwardIterator _begin, size_type n ) 
+         {
+-            ForwardIterator iter = begin;
++            ForwardIterator iter = _begin;
+             std::advance( iter, n );
+             return iter;
+         }        
+diff --git boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
+index ba2b9af..9e0d682 100644
+--- misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
+@@ -151,7 +151,7 @@ public:
+     deleter_const_reference get_deleter() const { return impl_.second(); }
+ private:
+     template<typename TT, typename DD>
+-    void check(const static_move_ptr<TT, DD>& ptr)
++    void check(const static_move_ptr<TT, DD>& _ptr)
+         {
+             typedef move_ptrs::is_smart_ptr_convertible<TT, T> convertible;
+             BOOST_STATIC_ASSERT(convertible::value);
+diff --git boost_1_39_0/boost/ptr_container/exception.hpp boost_1_39_0/boost/ptr_container/exception.hpp
+index d9a5ffe..7837fbb 100644
+--- misc/build/boost_1_39_0/boost/ptr_container/exception.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/exception.hpp
+@@ -24,7 +24,7 @@ namespace boost
+     {
+         const char* what_;
+     public:
+-        bad_ptr_container_operation( const char* what ) : what_( what )
++        bad_ptr_container_operation( const char* text ) : what_( text )
+         { }
+         
+         virtual const char* what() const throw()
+@@ -38,7 +38,7 @@ namespace boost
+     class bad_index : public bad_ptr_container_operation
+     {
+     public:
+-        bad_index( const char* what ) : bad_ptr_container_operation( what )
++        bad_index( const char* text ) : bad_ptr_container_operation( text )
+         { }
+     };
+ 
+diff --git boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
+index 492bf4b..565fdec 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
+@@ -19,12 +19,12 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
      : len(-1), val() {}
  
      template <typename T>
@@ -91,7 +167,7 @@
  
      template <typename T>
      inline bool
-@@ -66,11 +66,11 @@
+@@ -66,11 +66,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
      inline match<nil_t>::match()
      : len(-1) {}
  
@@ -107,9 +183,11 @@
  
      inline bool
      match<nil_t>::operator!() const
---- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp	2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp	2009-06-10 21:53:42.546875000 +0200
-@@ -226,7 +226,7 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
+index ca51bd2..b2282fa 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
+@@ -226,7 +226,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
          template <typename ParserT, typename ScannerT, typename AttrT>
          struct concrete_parser : abstract_parser<ScannerT, AttrT>
          {
@@ -118,9 +196,11 @@
              virtual ~concrete_parser() {}
  
              virtual typename match_result<ScannerT, AttrT>::type
---- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp	2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp	2009-06-10 21:53:42.562500000 +0200
-@@ -106,7 +106,7 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
+index 2f4b986..b3809da 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
+@@ -106,7 +106,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
                  : parser_id(reinterpret_cast<std::size_t>(this)); 
          }
  
@@ -129,9 +209,11 @@
          
      private:
      
---- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp	2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp	2009-07-08 22:23:45.899895415 +0200
-@@ -159,11 +159,11 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
+index 73389b4..18d26cc 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
+@@ -159,11 +159,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
              return ptr.get();
          }
  
@@ -147,9 +229,11 @@
  
          scoped_ptr<abstract_parser_t> ptr;
      };
---- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp	2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp	2009-06-10 21:53:42.593750000 +0200
-@@ -210,7 +210,7 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
+index 5d6761f..b93118a 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
+@@ -210,7 +210,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
              subrule_list<
                  subrule_parser<ID2, DefT2, ContextT2>,
                  nil_t> >
@@ -158,7 +242,7 @@
          {
              return subrule_list<
                  self_t,
-@@ -220,7 +220,7 @@
+@@ -220,7 +220,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
                          *this,
                          subrule_list<
                              subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
@@ -167,7 +251,7 @@
          }
  
          typename DefT::embed_t rhs;
-@@ -258,10 +258,10 @@
+@@ -258,10 +258,10 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
          parse_main(ScannerT const& scan) const
          {
              typedef typename parser_result<self_t, ScannerT>::type result_t;
@@ -181,9 +265,11 @@
          }
  
          template <typename ScannerT>
---- misc/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp	2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp	2009-10-11 22:34:54.867381817 +0200
-@@ -395,13 +395,13 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
+index 5d75be2..730cf0c 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
+@@ -395,13 +395,13 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
              }
  
              bool register_node(void const *r, char const *name_to_register,
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 8601c4d12801..fdc1dfd2a44c 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -49,6 +49,7 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=boost_1_39_0
+TARFILE_MD5=fcc6df1160753d0b8c835d17fdeeb0a7
 PATCH_FILES=$(TARFILE_NAME).patch
 
 CONFIGURE_DIR=
@@ -90,6 +91,8 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/preprocessor $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/ptr_container $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/range $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME)
diff --git a/boost/prj/d.lst b/boost/prj/d.lst
index 07d5a72a4384..6b9ebcaf6d66 100644
--- a/boost/prj/d.lst
+++ b/boost/prj/d.lst
@@ -81,6 +81,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
+mkdir: %_DEST%\inc%_EXT%\boost\ptr_container
+mkdir: %_DEST%\inc%_EXT%\boost\ptr_container\detail
+mkdir: %_DEST%\inc%_EXT%\boost\range
+mkdir: %_DEST%\inc%_EXT%\boost\range\detail
 mkdir: %_DEST%\inc%_EXT%\boost\spirit
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute
@@ -147,6 +151,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail
 mkdir: %_DEST%\inc%_EXT%\boost\type_traits
 mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail
 mkdir: %_DEST%\inc%_EXT%\boost\utility
+mkdir: %_DEST%\inc%_EXT%\boost\utility\detail
 mkdir: %_DEST%\inc%_EXT%\boost\variant
 mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
 
@@ -232,6 +237,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
 ..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot
 ..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
 ..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple
+..\%__SRC%\inc\boost\ptr_container\* %_DEST%\inc%_EXT%\boost\ptr_container
+..\%__SRC%\inc\boost\ptr_container\detail\* %_DEST%\inc%_EXT%\boost\ptr_container\detail
+..\%__SRC%\inc\boost\range\* %_DEST%\inc%_EXT%\boost\range
+..\%__SRC%\inc\boost\range\detail\* %_DEST%\inc%_EXT%\boost\range\detail
 ..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit
 ..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor
 ..\%__SRC%\inc\boost\spirit\attribute\* %_DEST%\inc%_EXT%\boost\spirit\attribute
@@ -298,5 +307,6 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
 ..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits
 ..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail
 ..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility
+..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail
 ..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
 ..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 2cf9de19ec0a..e0b12cc9f551 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -50,6 +50,8 @@ all:
 CAIROVERSION=1.8.0
 
 TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
+TARFILE_MD5=4ea70ea87b47e92d318d4e7f5b940f47
+
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
 cairo_CFLAGS=$(SOLARINC)
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index c32cf906a1dd..20773c7597f8 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -50,7 +50,9 @@ all:
 PIXMANVERSION=0.12.0
 
 TARFILE_NAME=pixman-$(PIXMANVERSION)
-PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch
+TARFILE_MD5=09357cc74975b01714e00c5899ea1881
+
+PATCH_FILES=..$/$(TARFILE_NAME).patch
 
 # Note: we are building static pixman library to avoid linking problems.
 # However, for Unix dynamic library must be used (especially due to 64bit issues)
diff --git a/curl/makefile.mk b/curl/makefile.mk
index f54d72ce8a44..1fab0c301bff 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -42,6 +42,7 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=curl-7.19.7
+TARFILE_MD5=ecb2e37e45c9933e2a963cabe03670ab
 PATCH_FILES=curl-7.19.7.patch
 
 .IF "$(GUI)"=="WNT"
diff --git a/expat/makefile.mk b/expat/makefile.mk
index 1c2ca1a9e0f7..867e2b371558 100644
--- a/expat/makefile.mk
+++ b/expat/makefile.mk
@@ -43,6 +43,7 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=expat-2.0.1
+TARFILE_MD5=ee8b492592568805593f81f8cdf2a04c
 ADDITIONAL_FILES=lib$/makefile.mk
 PATCH_FILES=expat-2.0.1.patch \
             expat-winapi.patch
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 1f3d71748a4b..2f4ff2535442 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -46,6 +46,7 @@ all:
 # --- Files --------------------------------------------------------
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
 TARFILE_NAME=silgraphite-2.3.1
+TARFILE_MD5=d35724900f6a4105550293686688bbb3
 PATCH_FILES=graphite-2.3.1.patch
 
 # convert line-endings to avoid problems when patching
@@ -92,7 +93,8 @@ GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared
 EXTRA_GR_CXX_FLAGS=-fPIC
 
 .IF "$(USE_SYSTEM_STL)"!="YES"
-EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm
+# #i112124# STLPort seems to require libstdc++
+EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm -lstdc++
 GR_LIB_PATH=LD_LIBRARY_PATH=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)
 .ELSE
 GR_LIB_PATH=
diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch
deleted file mode 100644
index e5198f23b706..000000000000
--- a/hunspell/hunspell-1.2.8.patch
+++ /dev/null
@@ -1,632 +0,0 @@
---- misc/hunspell-1.2.8/intl/localename.c	2007-04-06 10:05:34.000000000 +0200
-+++ misc/build/hunspell-1.2.8/intl/localename.c	2008-11-01 16:30:49.000000000 +0100
-@@ -140,6 +140,9 @@
- # ifndef LANG_SINDHI
- # define LANG_SINDHI 0x59
- # endif
-+# ifndef LANG_SORBIAN
-+# define LANG_SORBIAN 0x2e
-+# endif
- # ifndef LANG_SLOVAK
- # define LANG_SLOVAK 0x1b
- # endif
---- misc/hunspell-1.2.8/src/hunspell/affixmgr.cxx	2008-11-01 08:00:41.000000000 +0100
-+++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.cxx	2008-11-01 16:30:49.000000000 +0100
-@@ -25,6 +25,10 @@
- #endif
- #endif
- 
-+#ifdef OS2
-+#undef DEBUG
-+#endif
-+
- AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * key) 
- {
-   // register hash manager and load affix data from aff file
-@@ -2133,7 +2137,7 @@
-         while ((rv) && ((needaffix && TESTAFF(rv->astr, needaffix, rv->alen)) ||
-                         !((compoundflag && !words && TESTAFF(rv->astr, compoundflag, rv->alen)) ||
-                           (compoundend && !words && TESTAFF(rv->astr, compoundend, rv->alen)) ||
--                           (numdefcpd && defcpd_check(&words, wnum + 1, rv, NULL,1))))) {
-+                           (numdefcpd && words && defcpd_check(&words, wnum + 1, rv, NULL,1))))) {
-             rv = rv->next_homonym;
-         }
- 
---- misc/hunspell-1.2.8/src/hunspell/affixmgr.hxx	2008-10-30 21:28:59.000000000 +0100
-+++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.hxx	2008-11-01 16:30:49.000000000 +0100
-@@ -2,9 +2,6 @@
- #define _AFFIXMGR_HXX_
- 
- #ifdef MOZILLA_CLIENT
--#ifdef __SUNPRO_CC // for SunONE Studio compiler
--using namespace std;
--#endif
- #include <stdio.h>
- #else
- #include <cstdio>
---- misc/hunspell-1.2.8/src/hunspell/atypes.hxx	2008-10-29 15:30:51.000000000 +0100
-+++ misc/build/hunspell-1.2.8/src/hunspell/atypes.hxx	2008-11-01 16:30:49.000000000 +0100
-@@ -1,6 +1,8 @@
- #ifndef _ATYPES_HXX_
- #define _ATYPES_HXX_
- 
-+#include <stdio.h>
-+
- #ifndef HUNSPELL_WARNING
- #ifdef HUNSPELL_WARNING_ON
- #define HUNSPELL_WARNING fprintf
---- misc/hunspell-1.2.8/src/hunspell/csutil.cxx	Wed Oct 22 12:15:28 2008
-+++ misc/build/hunspell-1.2.8/src/hunspell/csutil.cxx	Thu Feb 19 18:13:34 2009
-@@ -18,13 +18,13 @@
- #include "langnum.hxx"
- 
- #ifdef OPENOFFICEORG
--#  include <unicode/uchar.h>
-+#include <unicode/uchar.h>
- #else
--#  ifndef MOZILLA_CLIENT
--#    include "utf_info.cxx"
--#    define UTF_LST_LEN (sizeof(utf_lst) / (sizeof(unicode_info)))
--#  endif
-+#ifndef MOZILLA_CLIENT
-+#include "utf_info.cxx"
-+#define UTF_LST_LEN (sizeof(utf_lst) / (sizeof(unicode_info)))
- #endif
-+#endif
- 
- #ifdef MOZILLA_CLIENT
- #include "nsCOMPtr.h"
---- misc/hunspell-1.2.8/src/hunspell/filemgr.cxx	Sat Nov  1 15:09:41 2008
-+++ misc/build/hunspell-1.2.8/src/hunspell/filemgr.cxx	Thu Feb 19 17:28:35 2009
-@@ -11,6 +11,7 @@
- #include <stdio.h>
- #endif
- 
-+using namespace std;
- #include "filemgr.hxx"
- 
- int FileMgr::fail(const char * err, const char * par) {
---- misc/hunspell-1.2.8/src/hunspell/filemgr.hxx	Mon Aug 11 11:32:02 2008
-+++ misc/build/hunspell-1.2.8/src/hunspell/filemgr.hxx	Thu Feb 19 13:58:01 2009
-@@ -6,7 +6,7 @@
- class FileMgr
- {
- protected:
--    FILE * fin;
-+    std::FILE * fin;
-     Hunzip * hin;
-     char in[BUFSIZE + 50]; // input buffer
-     int fail(const char * err, const char * par);
---- misc/hunspell-1.2.8/src/hunspell/hashmgr.cxx	Thu Aug 14 16:49:33 2008
-+++ misc/build/hunspell-1.2.8/src/hunspell/hashmgr.cxx	Thu Feb 19 17:25:33 2009
-@@ -6,6 +6,9 @@
- #include <cstring>
- #include <cstdio>
- #include <cctype>
-+//#ifdef __SUNPRO_CC // for SunONE Studio compiler
-+//using namespace std;
-+//#endif
- #else
- #include <stdlib.h> 
- #include <string.h>
-@@ -13,10 +16,6 @@
- #include <ctype.h>
- #endif
- 
--#include "hashmgr.hxx"
--#include "csutil.hxx"
--#include "atypes.hxx"
--
- #ifdef MOZILLA_CLIENT
- #ifdef __SUNPRO_CC // for SunONE Studio compiler
- using namespace std;
-@@ -27,6 +26,10 @@
- #endif
- #endif
- 
-+#include "hashmgr.hxx"
-+#include "csutil.hxx"
-+#include "atypes.hxx"
-+
- // build a hash table from a munched word list
- 
- HashMgr::HashMgr(const char * tpath, const char * apath, const char * key)
-@@ -459,6 +462,10 @@
-         }
-       } else {
-         al = decode_flags(&flags, ap + 1, dict);
-+        if (al == -1) {
-+            HUNSPELL_WARNING(stderr, "Can't allocate memory.\n");
-+            return 6;
-+        }
-         flag_qsort(flags, 0, al);
-       }
-     } else {
-@@ -499,6 +506,11 @@
- 
- int HashMgr::decode_flags(unsigned short ** result, char * flags, FileMgr * af) {
-     int len;
-+    if (*flags == '\0') {
-+        HUNSPELL_WARNING(stderr, "error: line %d: bad flagvector\n", af->getlinenum());
-+        *result = NULL;
-+        return 0;
-+    }
-     switch (flag_mode) {
-       case FLAG_LONG: { // two-character flags (1x2yZz -> 1x 2y Zz)
-         len = strlen(flags);
---- misc/hunspell-1.2.8/src/hunspell/hashmgr.hxx	2008-08-12 12:22:54.000000000 +0200
-+++ misc/build/hunspell-1.2.8/src/hunspell/hashmgr.hxx	2009-02-19 12:57:11.780108100 +0100
-@@ -3,6 +3,7 @@
- 
- #ifndef MOZILLA_CLIENT
- #include <cstdio>
-+/* using namespace std; */
- #else
- #include <stdio.h>
- #endif
---- misc/hunspell-1.2.8/src/hunspell/hunspell.cxx	Thu Oct 30 20:15:53 2008
-+++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.cxx	Thu Feb 19 18:13:35 2009
-@@ -1,3 +1,7 @@
-+#ifdef _MSC_VER
-+#pragma setlocale("C")
-+#endif
-+
- #include "license.hunspell"
- #include "license.myspell"
- 
-@@ -11,11 +15,6 @@
- #include <stdio.h>
- #endif
- 
--#include "hunspell.hxx"
--#include "hunspell.h"
--#include "config.h"
--#include "csutil.hxx"
--
- #ifndef MOZILLA_CLIENT
- #ifndef WIN32
- using namespace std;
-@@ -22,6 +21,9 @@
- #endif
- #endif
- 
-+#include "hunspell.hxx"
-+#include "csutil.hxx"
-+
- Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key)
- {
-     encoding = NULL;
-@@ -338,7 +340,11 @@
-   char wspace[MAXWORDUTF8LEN];
-   w_char unicw[MAXWORDLEN];
-   // Hunspell supports XML input of the simplified API (see manual)
--  if (strcmp(word, SPELL_XML) == 0) return 1;
-+  if (strncmp(word, SPELL_XML, sizeof(SPELL_XML) - 3) == 0) {
-+    if (strcmp(word, SPELL_XML) == 0) return 1; // query XML interface support
-+    return 0;
-+  }
-+
-   int nc = strlen(word);
-   int wl2 = 0;
-   if (utf8) {
-@@ -1854,89 +1860,3 @@
- }
- 
- #endif // END OF HUNSPELL_EXPERIMENTAL CODE
--
--Hunhandle *Hunspell_create(const char * affpath, const char * dpath)
--{
--        return (Hunhandle*)(new Hunspell(affpath, dpath));
--}
--
--Hunhandle *Hunspell_create_key(const char * affpath, const char * dpath,
--    const char * key)
--{
--        return (Hunhandle*)(new Hunspell(affpath, dpath, key));
--}
--
--void Hunspell_destroy(Hunhandle *pHunspell)
--{
--        delete (Hunspell*)(pHunspell);
--}
--
--int Hunspell_spell(Hunhandle *pHunspell, const char *word)
--{
--        return ((Hunspell*)pHunspell)->spell(word);
--}
--
--char *Hunspell_get_dic_encoding(Hunhandle *pHunspell)
--{
--        return ((Hunspell*)pHunspell)->get_dic_encoding();
--}
--
--int Hunspell_suggest(Hunhandle *pHunspell, char*** slst, const char * word)
--{
--        return ((Hunspell*)pHunspell)->suggest(slst, word);
--}
--
--int Hunspell_analyze(Hunhandle *pHunspell, char*** slst, const char * word)
--{
--        return ((Hunspell*)pHunspell)->analyze(slst, word);
--}
--
--int Hunspell_stem(Hunhandle *pHunspell, char*** slst, const char * word)
--{
--        return ((Hunspell*)pHunspell)->stem(slst, word);
--}
--
--int Hunspell_stem(Hunhandle *pHunspell, char*** slst, char** desc, int n)
--{
--        return ((Hunspell*)pHunspell)->stem(slst, desc, n);
--}
--
--int Hunspell_generate(Hunhandle *pHunspell, char*** slst, const char * word,
--    const char * word2)
--{
--        return ((Hunspell*)pHunspell)->generate(slst, word, word2);
--}
--
--int Hunspell_generate(Hunhandle *pHunspell, char*** slst, const char * word,
--    char** desc, int n)
--{
--        return ((Hunspell*)pHunspell)->generate(slst, word, desc, n);
--}
--
--  /* functions for run-time modification of the dictionary */
--
--  /* add word to the run-time dictionary */
--
--int Hunspell_add(Hunhandle *pHunspell, const char * word) {
--        return ((Hunspell*)pHunspell)->add(word);
--}
--
--  /* add word to the run-time dictionary with affix flags of
--   * the example (a dictionary word): Hunspell will recognize
--   * affixed forms of the new word, too.
--   */
--
--int Hunspell_add_with_affix(Hunhandle *pHunspell, const char * word,
--        const char * example) {
--        return ((Hunspell*)pHunspell)->add_with_affix(word, example);
--}
--
--  /* remove word from the run-time dictionary */
--
--int Hunspell_remove(Hunhandle *pHunspell, const char * word) {
--        return ((Hunspell*)pHunspell)->remove(word);
--}
--
--void Hunspell_free_list(Hunhandle *pHunspell, char *** slst, int n) {
--        freelist(slst, n);
--}
---- misc/hunspell-1.2.8/src/hunspell/hunspell.hxx	2008-07-09 16:14:39.000000000 +0200
-+++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.hxx	2008-11-26 18:32:58.765625000 +0100
-@@ -28,11 +28,7 @@
- 	#endif
- #endif
- 
--#ifdef WIN32
--class DLLEXPORT Hunspell
--#else
- class Hunspell
--#endif
- {
-   AffixMgr*       pAMgr;
-   HashMgr*        pHMgr[MAXDIC];
---- misc/hunspell-1.2.8/src/hunspell/hunzip.cxx	Tue Jun 17 10:57:55 2008
-+++ misc/build/hunspell-1.2.8/src/hunspell/hunzip.cxx	Thu Feb 19 17:29:19 2009
-@@ -8,6 +8,7 @@
- #include <stdio.h> 
- #endif
- 
-+using namespace std;
- #include "hunzip.hxx"
- 
- #define CODELEN  65536
---- misc/hunspell-1.2.8/src/hunspell/hunzip.hxx	Thu Feb 19 15:59:42 2009
-+++ misc/build/hunspell-1.2.8/src/hunspell/hunzip.hxx	Thu Feb 19 18:13:35 2009
-@@ -18,6 +18,8 @@
- #define MSG_MEMORY "error: %s: missing memory\n"
- #define MSG_KEY    "error: %s: missing or bad password\n"
- 
-+#include <stdlib.h>
-+
- struct bit {
-     unsigned char c[2];
-     int v[2];
---- misc/hunspell-1.2.8/src/hunspell/license.hunspell	2008-06-17 10:57:55.000000000 +0200
-+++ misc/build/hunspell-1.2.8/src/hunspell/license.hunspell	2008-11-01 16:30:49.000000000 +0100
-@@ -56,4 +56,3 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
--#include "config.h"
---- misc/hunspell-1.2.8/src/hunspell/makefile.mk	Tue Jun 17 10:57:55 2008
-+++ misc/build/hunspell-1.2.8/src/hunspell/makefile.mk	Thu Feb 19 18:13:52 2009
-@@ -60,11 +60,13 @@
- #
- #*************************************************************************
- 
--PRJ = ..
-+PRJ = ../../../../../..
- 
- PRJNAME	= hunspell
- TARGET	= hunspell
--LIBTARGET=NO
-+LIBTARGET=YES
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+UWINAPILIB= 
- 
- #----- Settings ---------------------------------------------------------
- 
-@@ -73,7 +74,7 @@
- # --- Files --------------------------------------------------------
- 
- # all_target: ALLTAR DICTIONARY
--all_target: ALLTAR
-+#all_target: ALLTAR
- 
- ##CXXFLAGS += -I..$/..$/lingutil
- ##CFLAGSCXX += -I..$/..$/lingutil
-@@ -89,6 +90,10 @@
- 		$(SLO)$/utf_info.obj \
- 		$(SLO)$/hashmgr.obj \
- 		$(SLO)$/suggestmgr.obj \
-+		$(SLO)$/phonet.obj \
-+		$(SLO)$/hunzip.obj \
-+		$(SLO)$/filemgr.obj \
-+		$(SLO)$/replist.obj \
- 		$(SLO)$/hunspell.obj
- 
- LIB1TARGET= $(SLB)$/lib$(TARGET).lib
---- misc/hunspell-1.2.8/src/hunspell/phonet.cxx	2008-08-13 15:29:08.000000000 +0200
-+++ misc/build/hunspell-1.2.8/src/hunspell/phonet.cxx	2008-11-01 16:30:49.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <cstring>
- #include <cstdio>
- #include <cctype>
-+using namespace std;
- #else
- #include <stdlib.h> 
- #include <string.h>
---- misc/hunspell-1.2.8/src/hunspell/replist.cxx	Sat Nov  1 15:09:51 2008
-+++ misc/build/hunspell-1.2.8/src/hunspell/replist.cxx	Thu Feb 19 14:02:51 2009
-@@ -13,6 +13,7 @@
- 
- #include "replist.hxx"
- #include "csutil.hxx"
-+using namespace std;
- 
- RepList::RepList(int n) {
-     dat = (replentry **) malloc(sizeof(replentry *) * n);
---- misc/hunspell-1.2.8/src/tools/analyze.cxx	Tue Jun 17 13:44:50 2008
-+++ misc/build/hunspell-1.2.8/src/tools/analyze.cxx	Thu Feb 19 18:13:35 2009
-@@ -3,13 +3,13 @@
- #include <cstdlib>
- #include <cstdio>
- 
--#include "hunspell.hxx"
--
- #ifndef WIN32
- using namespace std;
- #endif
- 
-+#include "hunspell.hxx"
- 
-+
- 
- int main(int argc, char **argv)
- {
---- misc/hunspell-1.2.8/src/tools/chmorph.cxx	Tue Jun 17 12:15:34 2008
-+++ misc/build/hunspell-1.2.8/src/tools/chmorph.cxx	Thu Feb 19 17:36:46 2009
-@@ -2,13 +2,13 @@
- #include <cstdlib>
- #include <cstdio>
- 
--#include "hunspell.hxx"
--#include "textparser.hxx"
--
- #ifndef W32
- using namespace std;
- #endif
- 
-+#include "hunspell.hxx"
-+#include "textparser.hxx"
-+
- int 
- main(int argc, char** argv)
- {
---- misc/hunspell-1.2.8/src/tools/example.cxx	Tue Jun 17 13:07:24 2008
-+++ misc/build/hunspell-1.2.8/src/tools/example.cxx	Thu Feb 19 17:38:12 2009
-@@ -2,12 +2,12 @@
- #include <cstdlib>
- #include <cstdio>
- 
-+using namespace std;
-+
- #include "hunspell.hxx"
- 
- extern char * mystrdup(const char * s);
- 
--using namespace std;
--
- int 
- main(int argc, char** argv)
- {
---- misc/hunspell-1.2.8/src/tools/hunspell.cxx	2008-09-04 15:44:19.000000000 +0200
-+++ misc/build/hunspell-1.2.8/src/tools/hunspell.cxx	2008-11-01 16:31:24.000000000 +0100
-@@ -7,10 +7,20 @@
- 
- #include <cstdlib>
- #include <cstdio>
-+
-+#ifdef __SUNPRO_CC
-+using namespace std;
-+#include <string.h>
-+#include <malloc.h>
-+#endif
-+
- #include "config.h"
- #include "hunspell.hxx"
- #include "csutil.hxx"
- 
-+// switch off iconv support for tests (fixing Solaris problems)
-+#undef HAVE_ICONV
-+
- #ifndef HUNSPELL_EXTRA
- #define suggest_auto suggest
- #endif
-@@ -28,7 +38,9 @@
- 
- #ifdef WIN32
- 
-+#ifndef __MINGW32__
- #define gettext
-+#endif
- #define LIBDIR "C:\\Hunspell\\"
- #define USEROOODIR "Application Data\\OpenOffice.org 2\\user\\wordbook"
- #define OOODIR \
-@@ -98,8 +110,10 @@
- #if ENABLE_NLS
- #ifdef HAVE_LOCALE_H
- #include <locale.h>
-+#ifdef HAVE_LANGINFO_CODESET
- #include <langinfo.h>
- #endif
-+#endif
- 
- #ifdef HAVE_LIBINTL_H
- #include <libintl.h>
-@@ -1385,9 +1399,11 @@
- #ifdef HAVE_LOCALE_H
- 	ui_lang = setlocale(LC_ALL, "");
- 	textdomain("hunspell");
-+#ifdef HAVE_LANGINFO_CODESET
-         ui_enc = nl_langinfo(CODESET);
- #endif
- #endif
-+#endif
- 
- #ifdef HAVE_READLINE
- 	rl_set_key("", rl_escape, rl_get_keymap());
---- misc/hunspell-1.2.8/src/tools/hunzip.cxx	Tue Jan 15 11:10:04 2008
-+++ misc/build/hunspell-1.2.8/src/tools/hunzip.cxx	Thu Feb 19 17:38:12 2009
-@@ -2,6 +2,8 @@
- #include <stdlib.h>
- #include <string.h>
- 
-+using namespace std;
-+
- #include "hunzip.hxx"
- 
- #define DESC "hunzip - decompress a hzip file to the standard output\n" \
---- misc/hunspell-1.2.8/src/tools/hzip.c	Fri Apr  4 15:20:10 2008
-+++ misc/build/hunspell-1.2.8/src/tools/hzip.c	Thu Feb 19 18:13:35 2009
-@@ -44,7 +44,7 @@
-     if (tree->type != code_NODE) {
-         int i = tree->word;
-         code[deep] = '\0';
--        if (tree->type == code_TERM) i = CODELEN; // terminal code
-+        if (tree->type == code_TERM) i = CODELEN; 
-         table[i] = malloc((deep + 1) * sizeof(char));
- 	strcpy(table[i], code);
-     }        
-@@ -63,7 +63,7 @@
-     return ni;
- }
- 
--// return length of the freq array
-+
- int get_freqdata(struct item *** dest, FILE * f, unsigned short * termword) {
-     int freq[CODELEN];
-     int i, j, k, n;
-@@ -88,7 +88,7 @@
-        (*dest)[n]->word = i;
-        n++;
-     }
--    // terminal sequence (also contains the last odd byte of the file)
-+    
-     (*dest)[n] = newitem(1, NULL, NULL, code_TERM);
-     *termword = *((unsigned short *) c);
-     return n + 1;
-@@ -134,20 +134,20 @@
-     char c[2];
-     char * enc = key;
- 
--    // header and codes
--    fprintf(f2, "%s", (key ? MAGIC_ENCRYPTED : MAGIC)); // 3-byte HEADER
-+    
-+    fprintf(f2, "%s", (key ? MAGIC_ENCRYPTED : MAGIC)); 
-     cl = (unsigned char) (n & 0x00ff);
-     ch = (unsigned char) (n >> 8);
-     if (key) {
-         unsigned char cs;
-         for (cs = 0; *enc; enc++) cs ^= *enc;
--        fprintf(f2, "%c", cs);  // 1-byte check sum
-+        fprintf(f2, "%c", cs);  
-         enc = key;        
-         ch ^= *enc;
-         if ((*(++enc)) == '\0') enc = key;
-         cl ^= *enc;
-     }
--    fprintf(f2, "%c%c", ch, cl);   // upper and lower byte of record count
-+    fprintf(f2, "%c%c", ch, cl);   
-     for (i = 0; i < BUFSIZE; i++) bitbuf[i] = '\0';
-     for (i = 0; i < CODELEN + 1; i++) if (table[i]) {
-         unsigned short * d = (unsigned short *) &c;
-@@ -159,7 +159,7 @@
-             if (*(++enc) == '\0') enc = key;
-             c[1] ^= *enc;
-         }        
--        fprintf(f2, "%c%c", c[0], c[1]); // 2-character code id
-+        fprintf(f2, "%c%c", c[0], c[1]); 
-         bits = 0;
-         write_bits(f2, bitbuf, &bits, table[i]);
-         if (key) {
-@@ -169,11 +169,11 @@
-                 if (*(++enc) == '\0') enc = key;
-                 bitbuf[cl] ^= *enc;
-             }
--        } else fprintf(f2, "%c", (unsigned char) bits); // 1-byte code length
--        fwrite(bitbuf, sizeof(char), bits/8 + 1, f2);   // x-byte code
-+        } else fprintf(f2, "%c", (unsigned char) bits); 
-+        fwrite(bitbuf, sizeof(char), bits/8 + 1, f2);   
-     }
- 
--    // file encoding 
-+    
-     bits = 0;
-     while((cx[0] = getc(f)) != -1 && (cx[1] = getc(f)) != -1) {
-         c[0] = cx[0];
-@@ -180,7 +180,7 @@
-         c[1] = cx[1];
-         write_bits(f2, bitbuf, &bits, table[*((unsigned short *) c)]);
-     }
--    // terminal suffixes
-+    
-     write_bits(f2, bitbuf, &bits, table[CODELEN]);
-     if (bits > 0) fwrite(bitbuf, sizeof(char), bits/8 + 1, f2);
- }
-@@ -201,11 +201,11 @@
-             } else pfx = 0;
-         }
-         if (i > 0 && buf[i - 1] == '\n') {
--            if (j == i) j--; // line duplicate
-+            if (j == i) j--; 
-             if (j > 29) j = 29;
-             c = j;
-             if (c == '\t') c = 30;
--            // common suffix
-+            
-             for (; buf[i - m - 2] == prev[prevlen - m - 2] && 
-                 m < i - j - 1 && m < 15; m++);
-             if (m == 1) m = 0;
-@@ -221,7 +221,7 @@
-             *p = buf[k];
-         }
-         if (m > 0) {
--            *p = m + 31; // 33-46
-+            *p = m + 31; 
-             p++;
-         }
-         if (i > 0 && buf[i - 1] == '\n') {
diff --git a/hunspell/hunspell-consts-1.2.8.patch b/hunspell/hunspell-consts-1.2.8.patch
deleted file mode 100644
index 8f8c72796cb4..000000000000
--- a/hunspell/hunspell-consts-1.2.8.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- misc/hunspell-1.2.8/src/hunspell/affixmgr.cxx       2009-05-16 14:33:27.000000000 +0100
-+++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.cxx    2009-05-16 14:35:52.000000000 +0100
-@@ -3238,7 +3238,7 @@
- }
- 
- // return the value of suffix
--const int AffixMgr::have_contclass()
-+int AffixMgr::have_contclass() const
- {
-   return havecontclass;
- }
---- misc/hunspell-1.2.8.orig/src/hunspell/affixmgr.hxx	2009-05-16 14:33:27.000000000 +0100
-+++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.hxx	2009-05-16 14:35:38.000000000 +0100
-@@ -189,7 +189,7 @@
-   const char *        get_suffix();
-   const char *        get_derived();
-   const char *        get_version();
--  const int           have_contclass();
-+  int                 have_contclass() const;
-   int                 get_utf8();
-   int                 get_complexprefixes();
-   char *              get_suffixed(char );
diff --git a/hunspell/hunspell-solaris.patch b/hunspell/hunspell-solaris.patch
new file mode 100644
index 000000000000..37c5101364b4
--- /dev/null
+++ b/hunspell/hunspell-solaris.patch
@@ -0,0 +1,12 @@
+--- misc/hunspell-1.2.9.orig/src/tools/hunspell.cxx	2010-02-27 23:42:05.000000000 +0000
++++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx	2010-02-27 23:43:02.000000000 +0000
+@@ -10,6 +10,9 @@
+ #include "hunspell.hxx"
+ #include "csutil.hxx"
+ 
++// switch off iconv support for tests (fixing Solaris problems)
++#undef HAVE_ICONV
++
+ #ifndef HUNSPELL_EXTRA
+ #define suggest_auto suggest
+ #endif
diff --git a/hunspell/hunspell-stacksmash.patch b/hunspell/hunspell-stacksmash.patch
new file mode 100644
index 000000000000..8765b6d784d3
--- /dev/null
+++ b/hunspell/hunspell-stacksmash.patch
@@ -0,0 +1,28 @@
+--- misc/hunspell-1.2.9/src/hunspell/hunspell.cxx	2010-03-04 10:25:06.000000000 +0000
++++ misc/build/hunspell-1.2.9/src/hunspell/hunspell.cxx	2010-03-04 10:25:38.000000000 +0000
+@@ -1665,7 +1665,7 @@
+   if (!q2) return 0; // bad XML input
+   if (check_xml_par(q, "type=", "analyze")) {
+       int n = 0, s = 0;
+-      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw);
++      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw);
+       if (n == 0) return 0;
+       // convert the result to <code><a>ana1</a><a>ana2</a></code> format
+       for (int i = 0; i < n; i++) s+= strlen((*slst)[i]);
+@@ -1686,13 +1686,13 @@
+       (*slst)[0] = r;
+       return 1;
+   } else if (check_xml_par(q, "type=", "stem")) {
+-      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw);
++      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw);
+   } else if (check_xml_par(q, "type=", "generate")) {
+-      int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN);
++      int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1);
+       if (n == 0) return 0;
+       char * q3 = strstr(q2 + 1, "<word");
+       if (q3) {
+-        if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN)) {
++        if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) {
+             return generate(slst, cw, cw2);
+         }
+       } else {
diff --git a/hunspell/hunspell-wntconfig.patch b/hunspell/hunspell-wntconfig.patch
new file mode 100644
index 000000000000..9b6bc9c3fbb2
--- /dev/null
+++ b/hunspell/hunspell-wntconfig.patch
@@ -0,0 +1,4 @@
+--- misc/hunspell-1.2.9/config.h	2010-02-25 14:38:38.000000000 +0000
++++ misc/build/hunspell-1.2.9/config.h	2010-02-25 14:38:42.000000000 +0000
+@@ -1 +0,0 @@
+-dummy
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index db6eb1029d98..ac74d7c5051b 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -1,4 +1,4 @@
-#*************************************************************************
+jedit#*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
@@ -36,18 +36,16 @@ TARGET=hunspell
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=hunspell-1.2.8
-TARFILE_ROOTDIR=hunspell-1.2.8
-
-#ADDITIONAL_FILES += src/hunspell/makefile.mk
+TARFILE_NAME=hunspell-1.2.9
+TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0
+ADDITIONAL_FILES+=config.h
 
 PATCH_FILES=\
-    hunspell-1.2.8.patch \
-    hunspell-consts-1.2.8.patch 	# hunspell#2064983 \
-    hunspell-1.2.8-thesfix.patch	# hunspell #i107768
+    hunspell-wntconfig.patch \
+    hunspell-solaris.patch \
+    hunspell-stacksmash.patch
 
 .IF "$(GUI)"=="UNX"
-#CONFIGURE_DIR=$(BUILD_DIR)
 
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) configure
diff --git a/icu/createmak.cfg b/icu/createmak.cfg
index f2c7c050bdd3..19ef708cca40 100644
--- a/icu/createmak.cfg
+++ b/icu/createmak.cfg
@@ -1,455 +1,452 @@
-[Copy]
-SOURCE=<HEADER>
-InputPath=<INPUTPATH>
-"<TARGET>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat
-	@echo off
-    <TARGETPATH>
-<<
-
-[Deps]
-SOURCE=.\<SOURCEFILE>.<EXT>
-"$(INTDIR)\<SOURCEFILE>.obj": $(SOURCE) "$(INTDIR)" <HEADER_LIST>
-
-[Cpp]
-CPP=cl.exe
-[Link]
-LINK32=link.exe
-[CDefs_Common]
-
-[RSC_Template]
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\<FILEOUT>.res" /i "..\common" /d "NDEBUG"
-SOURCE=<FILE>
-"$(INTDIR)\<FILEOUT>.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) $(RSC_PROJ) $(SOURCE)
-
-[General_CFlags]
-CPP_PROJ_INCLUDES=<AddIncDirs>
-CDEFS=<PreProcDefs>
-COPT=-nologo -O2 -Ob2
-CPDBOBJ=-FD -Fo"$(INTDIR)\\" -Fd"$(INTDIR)\\"
-CTOOLSFLAGS=-nologo -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-CDEF1FLAGS= -D "_WINDOWS" -D "_MBCS"
-
-[CFlags_common]
-CPP_PROJ=-nologo -MD -Za -Zi -W3 -GF -O2 -Ob2 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_i18n]
-CPP_PROJ=-MD -W3 -Oi -Op -GF -FD -GS -Gy -Za -Zi $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/i18n.pch" $(CPDBOBJ) -c
-
-[CFlags_extra_uconv]
-CPP_PROJ=-MD -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/uconv.pch" $(CPDBOBJ) -c
-
-[CFlags_layout]
-CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c
-
-[CFlags_io]
-CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c
-
-[CFlags_layoutex]
-CPP_PROJ=-MT -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/layoutex.pch" $(CPDBOBJ) -c
-
-[CFlags_stubdata]
-CPP_PROJ=-MD -W3 -Op -GF -Gy -Za $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/stubdata.pch" $(CPDBOBJ) -c
-
-[CFlags_test_cintltst]
-CPP_PROJ=-MT -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_test_intltest]
-CPP_PROJ=-nologo -MT -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_test_iotest]
-CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_test_letest]
-CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_tools_ctestfw]
-CPP_PROJ=-nologo -MD -O2 -Op -FD -Za -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/icutest.pch" $(CPDBOBJ) -c
-
-[CFlags_tools_genbrk]
-CPP_PROJ=-nologo -MD -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_tools_gencase]
-CPP_PROJ=-nologo -MD -GF -Za -Zi -W3 $(EXCEPTIONSWITCH) $(COPT) $(CPDBOBJ) -c
-
-[CFlags_tools_genccode]
-CPP_PROJ=-MD -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_gencmn]
-CPP_PROJ=-O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genctd]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_gencnval]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_gennames]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_gennorm]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genpname]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genprops]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genrb]
-CPP_PROJ=-Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genrb.derb]
-CPP_PROJ=-Za -GX $(CTOOLSFLAGS)
-
-[CFlags_tools_gensprep]
-CPP_PROJ=-Za $(CTOOLSFLAGS)
-
-[CFlags_tools_gentest]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_genuca]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_gencase]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_genbidi]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_icupkg]
-CPP_PROJ=-O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_icuswap]
-CPP_PROJ=-O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_makeconv]
-CPP_PROJ=-Za $(CTOOLSFLAGS)
-
-[CFlags_tools_pkgdata]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_toolutil]
-CPP_PROJ=-MD -O2 $(CTOOLSFLAGS)
-
-[CommonLinkFlags]
-PDBOUT=/pdb:"<PDBFILE>" /out:"<OUTFILE>"
-COMMONLINKFLAGS=/incremental:no /machine:I386 /nologo $(PDBOUT)
-COMMONLINKFLAGS_CONSOLE=$(COMMONLINKFLAGS) /subsystem:console
-COMMONLINKFLAGS_DLL=$(COMMONLINKFLAGS) /dll
-
-[LinkFlags_common]
-LINK32_FLAGS=icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib $(COMMONLINKFLAGS_DLL) /base:"0x4a800000" /implib:"$(OUTDIR)\icuuc.lib" /libpath:"..\..\lib"
-
-[LinkFlags_i18n]
-LINK32_FLAGS=icuuc.lib  $(COMMONLINKFLAGS_DLL) /base:"0x4a900000" /implib:"$(OUTDIR)\icuin.lib" /libpath:"..\..\lib"
-
-[LinkFlags_extra_uconv]
-LINK32_FLAGS=icuuc.lib icuin.lib uconvmsg.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib" /libpath:"Release"
-
-[LinkFlags_layout]
-LINK32_FLAGS=..\..\lib\icuuc.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icule.lib"
-
-[LinkFlags_io]
-LINK32_FLAGS=icuuc.lib icuin.lib $(COMMONLINKFLAGS_DLL) /libpath:"..\..\lib" /implib:"$(OUTDIR)\icuio.lib"
-
-[LinkFlags_layoutex]
-LINK32_FLAGS=..\..\lib\icuuc.lib ..\..\lib\icule.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\iculx.lib"
-
-[LinkFlags_stubdata]
-LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes /machine:I386 $(PDBOUT) /implib:"..\..\lib\icudata.lib"
-
-[LinkFlags_test_cintltst]
-LINK32_FLAGS=icuuc.lib icuin.lib icutest.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib\\"
-
-[LinkFlags_test_intltest]
-LINK32_FLAGS=$(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
-
-[LinkFlags_test_iotest]
-LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icuio.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
-
-[LinkFlags_test_letest]
-LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icule.lib iculx.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_ctestfw]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icutest.lib" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genbrk]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gencmn]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genctd]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gencnval]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genccode]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gennames]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gennorm]
-LINK32_FLAGS=icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genpname]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genprops]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genrb]
-LINK32_FLAGS=icuin.lib icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genrb.derb]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gensprep]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gentest]
-LINK32_FLAGS=icuuc.lib icutu.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genuca]
-LINK32_FLAGS=icuin.lib icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gencase]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genbidi]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_icupkg]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_icuswap]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_makeconv]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_pkgdata]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"../toolutil/release" /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_toolutil]
-LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAULTLIB:libcmt /implib:"$(OUTDIR)\icutu.lib" /libpath:"..\..\..\lib"
-
-[LinkTemplate]
-<OUTFILE> : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-    if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;<MANIFEST>
-
-[AdditionalLinkObjects_common]
-	$(OUTDIR)\icudata.lib
-
-[AdditionalLinkObjects_i18n]
-	"$(OUTDIR)\icuuc.lib"
-
-[AdditionalLinkObjects_extra_uconv]
-	"$(INTDIR)\uconvmsg.lib" \
-	"..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icuin.lib"
-
-[AdditionalLinkObjects_layout]
-	"$(OUTDIR)\icuuc.lib"
-
-[AdditionalLinkObjects_io]
-	"$(OUTDIR)\icuuc.lib"
-
-[AdditionalLinkObjects_layoutex]
-	"$(OUTDIR)\icuuc.lib" \
-	"$(OUTDIR)\icuin.lib" \
-	"$(OUTDIR)\icule.lib"
-
-[AdditionalLinkObjects_test_cintltst]
-	"..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutest.lib" \
-	"..\..\..\lib\icuin.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_test_intltest]
-	"..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutest.lib" \
-	"..\..\..\lib\icuin.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_test_letest]
-	"..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutest.lib" \
-	"..\..\..\lib\icuin.lib" \
-    "..\..\..\lib\icule.lib" \
-    "..\..\..\lib\iculx.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genbrk]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genccode]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gencmn]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genctd]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gencnval]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gennames]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gennorm]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genpname]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genprops]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genrb]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icuin.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genrb.derb]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icudata.lib"
-
-[AdditionalLinkObjects_tools_gensprep]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gentest]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genuca]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icuin.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gencase]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genbidi]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_icupkg]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_icuswap]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_makeconv]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_pkgdata]
-    "..\..\..\lib\icuuc.lib" \
-	"..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_toolutil]
-    "$(OUTDIR)\icuuc.lib"
-
-
-[Rules]
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-[AllTargetTools]
-ALL : "$(OUTDIR)\<MAKFILE>.exe" ".\<RELPATH>\bin\<MAKFILE>.exe"
-
-[AllInOnePrj]
-<PRJ> :
-    cd "$(MAKEDIR)\<PRJDIR>"
-    $(MAKE) /$(MAKEFLAGS) /F <PRJMAK> EXCEPTIONSWITCH="$(EXFLAGS)"
-    cd "<ALLINONEDIR>"
-
-[HeadSectionCommon]
-NULL=
-!IF  "$(CFG)" == "<MAKFILE> - Win32 Release"
-
-OUTDIR=<OUTDIR>
-INTDIR=<INTDIR>
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/\$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/\$(NULL)" mkdir "$(INTDIR)"
-
-!IF  "$(CFG)" == "<MAKFILE> - Win32 Release"
-
-ALL : <ALLTARGETS>
-
-[Special_stubdata]
-<OUTFILE> : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-   @if not exist "..\..\bin" mkdir "..\..\bin"
-   @if not exist "..\..\lib" mkdir "..\..\lib"
-   @if not exist "..\..\include" mkdir "..\..\include"
-   @if not exist "..\..\include\unicode" mkdir "..\..\include\unicode"
-   @if not exist "..\..\include\layout" mkdir "..\..\include\layout"
-   echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > .\stubdatabuilt.txt
-	 $(LINK32) $(LINK32_FLAGS) $(LINK32_OBJS)
-
-[Special_extra_uconv]
-SOURCE=.\makedata.mak
-InputPath=.\makedata.mak
-
-"$(INTDIR)\uconvmsg.lib" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat
-	@echo off
-	nmake /nologo /f makedata.mak icup=.\..\..\.. CFG=Release
-<<
-
-
-
-[End]
+[Copy]
+SOURCE=<HEADER>
+InputPath=<INPUTPATH>
+"<TARGET>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+    <TARGETPATH>
+
+[Deps]
+SOURCE=.\<SOURCEFILE>.<EXT>
+"$(INTDIR)\<SOURCEFILE>.obj": $(SOURCE) "$(INTDIR)" <HEADER_LIST>
+
+[Cpp]
+CPP=cl.exe
+[Link]
+LINK32=link.exe
+[CDefs_Common]
+
+[RSC_Template]
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\<FILEOUT>.res" /i "..\common" /d "NDEBUG"
+SOURCE=<FILE>
+"$(INTDIR)\<FILEOUT>.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+[General_CFlags]
+CPP_PROJ_INCLUDES=<AddIncDirs>
+CDEFS=<PreProcDefs>
+COPT=-nologo -O2 -Ob2
+CPDBOBJ=-FD -Fo"$(INTDIR)\\" -Fd"$(INTDIR)\\"
+CTOOLSFLAGS=-nologo -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+CDEF1FLAGS= -D "_WINDOWS" -D "_MBCS"
+
+[CFlags_common]
+CPP_PROJ=-nologo -MD -Za -Zi -W3 -GF -O2 -Ob2 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+
+[CFlags_i18n]
+CPP_PROJ=-MD -W3 -Oi -Op -GF -FD -GS -Gy -Za -Zi $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/i18n.pch" $(CPDBOBJ) -c
+
+[CFlags_extra_uconv]
+CPP_PROJ=-MD -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/uconv.pch" $(CPDBOBJ) -c
+
+[CFlags_layout]
+CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c
+
+[CFlags_io]
+CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c
+
+[CFlags_layoutex]
+CPP_PROJ=-MT -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/layoutex.pch" $(CPDBOBJ) -c
+
+[CFlags_stubdata]
+CPP_PROJ=-MD -W3 -Op -GF -Gy -Za $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/stubdata.pch" $(CPDBOBJ) -c
+
+[CFlags_test_cintltst]
+CPP_PROJ=-MT -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+
+[CFlags_test_intltest]
+CPP_PROJ=-nologo -MT -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+
+[CFlags_test_iotest]
+CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+
+[CFlags_test_letest]
+CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+
+[CFlags_tools_ctestfw]
+CPP_PROJ=-nologo -MD -O2 -Op -FD -Za -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/icutest.pch" $(CPDBOBJ) -c
+
+[CFlags_tools_genbrk]
+CPP_PROJ=-nologo -MD -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+
+[CFlags_tools_gencase]
+CPP_PROJ=-nologo -MD -GF -Za -Zi -W3 $(EXCEPTIONSWITCH) $(COPT) $(CPDBOBJ) -c
+
+[CFlags_tools_genccode]
+CPP_PROJ=-MD -O2 $(CTOOLSFLAGS)
+
+[CFlags_tools_gencmn]
+CPP_PROJ=-O2 -Za $(CTOOLSFLAGS)
+
+[CFlags_tools_genctd]
+CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
+
+[CFlags_tools_gencnval]
+CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
+
+[CFlags_tools_gennames]
+CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
+
+[CFlags_tools_gennorm]
+CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
+
+[CFlags_tools_genpname]
+CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
+
+[CFlags_tools_genprops]
+CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
+
+[CFlags_tools_genrb]
+CPP_PROJ=-Za $(CTOOLSFLAGS)
+
+[CFlags_tools_genrb.derb]
+CPP_PROJ=-Za -GX $(CTOOLSFLAGS)
+
+[CFlags_tools_gensprep]
+CPP_PROJ=-Za $(CTOOLSFLAGS)
+
+[CFlags_tools_gentest]
+CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
+
+[CFlags_tools_genuca]
+CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
+
+[CFlags_tools_gencase]
+CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
+
+[CFlags_tools_genbidi]
+CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
+
+[CFlags_tools_icupkg]
+CPP_PROJ=-O2 $(CTOOLSFLAGS)
+
+[CFlags_tools_icuswap]
+CPP_PROJ=-O2 $(CTOOLSFLAGS)
+
+[CFlags_tools_makeconv]
+CPP_PROJ=-Za $(CTOOLSFLAGS)
+
+[CFlags_tools_pkgdata]
+CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
+
+[CFlags_tools_toolutil]
+CPP_PROJ=-MD -O2 $(CTOOLSFLAGS)
+
+[CommonLinkFlags]
+PDBOUT=/pdb:"<PDBFILE>" /out:"<OUTFILE>"
+COMMONLINKFLAGS=/incremental:no /machine:I386 /nologo $(PDBOUT)
+COMMONLINKFLAGS_CONSOLE=$(COMMONLINKFLAGS) /subsystem:console
+COMMONLINKFLAGS_DLL=$(COMMONLINKFLAGS) /dll
+
+[LinkFlags_common]
+LINK32_FLAGS=icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib $(COMMONLINKFLAGS_DLL) /base:"0x4a800000" /implib:"$(OUTDIR)\icuuc.lib" /libpath:"..\..\lib"
+
+[LinkFlags_i18n]
+LINK32_FLAGS=icuuc.lib  $(COMMONLINKFLAGS_DLL) /base:"0x4a900000" /implib:"$(OUTDIR)\icuin.lib" /libpath:"..\..\lib"
+
+[LinkFlags_extra_uconv]
+LINK32_FLAGS=icuuc.lib icuin.lib uconvmsg.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib" /libpath:"Release"
+
+[LinkFlags_layout]
+LINK32_FLAGS=..\..\lib\icuuc.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icule.lib"
+
+[LinkFlags_io]
+LINK32_FLAGS=icuuc.lib icuin.lib $(COMMONLINKFLAGS_DLL) /libpath:"..\..\lib" /implib:"$(OUTDIR)\icuio.lib"
+
+[LinkFlags_layoutex]
+LINK32_FLAGS=..\..\lib\icuuc.lib ..\..\lib\icule.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\iculx.lib"
+
+[LinkFlags_stubdata]
+LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes /machine:I386 $(PDBOUT) /implib:"..\..\lib\icudata.lib"
+
+[LinkFlags_test_cintltst]
+LINK32_FLAGS=icuuc.lib icuin.lib icutest.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib\\"
+
+[LinkFlags_test_intltest]
+LINK32_FLAGS=$(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
+
+[LinkFlags_test_iotest]
+LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icuio.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
+
+[LinkFlags_test_letest]
+LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icule.lib iculx.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_ctestfw]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icutest.lib" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_genbrk]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_gencmn]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_genctd]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_gencnval]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_genccode]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_gennames]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_gennorm]
+LINK32_FLAGS=icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_genpname]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_genprops]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_genrb]
+LINK32_FLAGS=icuin.lib icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_genrb.derb]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_gensprep]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_gentest]
+LINK32_FLAGS=icuuc.lib icutu.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_genuca]
+LINK32_FLAGS=icuin.lib icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_gencase]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_genbidi]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_icupkg]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_icuswap]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_makeconv]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_pkgdata]
+LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"../toolutil/release" /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+[LinkFlags_tools_toolutil]
+LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAULTLIB:libcmt /implib:"$(OUTDIR)\icutu.lib" /libpath:"..\..\..\lib"
+
+[LinkTemplate]
+<OUTFILE> : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;<MANIFEST>
+
+[AdditionalLinkObjects_common]
+	$(OUTDIR)\icudata.lib
+
+[AdditionalLinkObjects_i18n]
+	"$(OUTDIR)\icuuc.lib"
+
+[AdditionalLinkObjects_extra_uconv]
+	"$(INTDIR)\uconvmsg.lib" \
+	"..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icuin.lib"
+
+[AdditionalLinkObjects_layout]
+	"$(OUTDIR)\icuuc.lib"
+
+[AdditionalLinkObjects_io]
+	"$(OUTDIR)\icuuc.lib"
+
+[AdditionalLinkObjects_layoutex]
+	"$(OUTDIR)\icuuc.lib" \
+	"$(OUTDIR)\icuin.lib" \
+	"$(OUTDIR)\icule.lib"
+
+[AdditionalLinkObjects_test_cintltst]
+	"..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutest.lib" \
+	"..\..\..\lib\icuin.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_test_intltest]
+	"..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutest.lib" \
+	"..\..\..\lib\icuin.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_test_letest]
+	"..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutest.lib" \
+	"..\..\..\lib\icuin.lib" \
+    "..\..\..\lib\icule.lib" \
+    "..\..\..\lib\iculx.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_genbrk]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_genccode]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_gencmn]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_genctd]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_gencnval]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_gennames]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_gennorm]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_genpname]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_genprops]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_genrb]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icuin.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_genrb.derb]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icudata.lib"
+
+[AdditionalLinkObjects_tools_gensprep]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_gentest]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_genuca]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icuin.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_gencase]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_genbidi]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_icupkg]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_icuswap]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_makeconv]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_pkgdata]
+    "..\..\..\lib\icuuc.lib" \
+	"..\..\..\lib\icutu.lib"
+
+[AdditionalLinkObjects_tools_toolutil]
+    "$(OUTDIR)\icuuc.lib"
+
+
+[Rules]
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+[AllTargetTools]
+ALL : "$(OUTDIR)\<MAKFILE>.exe" ".\<RELPATH>\bin\<MAKFILE>.exe"
+
+[AllInOnePrj]
+<PRJ> :
+    cd "$(MAKEDIR)\<PRJDIR>"
+    $(MAKE) /$(MAKEFLAGS) /F <PRJMAK> EXCEPTIONSWITCH="$(EXFLAGS)"
+    cd "<ALLINONEDIR>"
+
+[HeadSectionCommon]
+NULL=
+!IF  "$(CFG)" == "<MAKFILE> - Win32 Release"
+
+OUTDIR=<OUTDIR>
+INTDIR=<INTDIR>
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/\$(NULL)" mkdir "$(OUTDIR)"
+
+"$(INTDIR)" :
+    if not exist "$(INTDIR)/\$(NULL)" mkdir "$(INTDIR)"
+
+!IF  "$(CFG)" == "<MAKFILE> - Win32 Release"
+
+ALL : <ALLTARGETS>
+
+[Special_stubdata]
+<OUTFILE> : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+   @if not exist "..\..\bin" mkdir "..\..\bin"
+   @if not exist "..\..\lib" mkdir "..\..\lib"
+   @if not exist "..\..\include" mkdir "..\..\include"
+   @if not exist "..\..\include\unicode" mkdir "..\..\include\unicode"
+   @if not exist "..\..\include\layout" mkdir "..\..\include\layout"
+   echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > .\stubdatabuilt.txt
+	 $(LINK32) $(LINK32_FLAGS) $(LINK32_OBJS)
+
+[Special_extra_uconv]
+SOURCE=.\makedata.mak
+InputPath=.\makedata.mak
+
+"$(INTDIR)\uconvmsg.lib" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat
+	@echo off
+	nmake /nologo /f makedata.mak icup=.\..\..\.. CFG=Release
+<<
+
+
+
+[End]
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 8776ada87979..70ff42c1a443 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -39,8 +39,10 @@ TARGET=so_icu
 
 .IF "$(ICU_MICRO)"!="0"
 TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)_$(ICU_MICRO)-src
+TARFILE_MD5=2f6ecca935948f7db92d925d88d0d078
 .ELSE
 TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)-src
+TARFILE_MD5=
 .ENDIF
 TARFILE_ROOTDIR=icu
 
@@ -85,9 +87,8 @@ icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
 icu_LDFLAGS+=$(EXTRA_LINKFLAGS)
 icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
 
-BUILD_ACTION_SEP=;
 # remove conversion and transliteration data to reduce binary size.
-CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk $(BUILD_ACTION_SEP)
+CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ;
 
 # until someone introduces SOLARIS 64-bit builds
 .IF "$(OS)"=="SOLARIS"
@@ -184,11 +185,6 @@ OUT2BIN= \
     $(BUILD_DIR)$/bin$/gencmn.exe
 
 .ELSE
-.IF "$(USE_SHELL)"=="4nt"
-BUILD_ACTION_SEP=^
-.ELSE
-BUILD_ACTION_SEP=;
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 BUILD_DIR=source
 .IF "full_debug" == ""
 
@@ -254,7 +250,7 @@ OUT2BIN= \
 .IF "$(BINARY_PATCH_FILES)"!=""
 
 $(PACKAGE_DIR)$/so_add_binary :  $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
-    cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar $(TAR_EXCLUDE_SWITCH) -xvf -
+    cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar -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 0f5f5e0aba64..b2553dd1b4f2 100644
--- a/jpeg/makefile.mk
+++ b/jpeg/makefile.mk
@@ -43,6 +43,7 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=jpeg-6b
+TARFILE_MD5=dbd5f3b47ed13132f04c685d608a7547
 
 PATCH_FILES=jpeg-6b.patch
 ADDITIONAL_FILES=makefile.mk \
diff --git a/libxml2/libxml2-2.6.31-mingw.patch b/libxml2/libxml2-2.6.31-mingw.patch
deleted file mode 100755
index 412db5bc244a..000000000000
--- a/libxml2/libxml2-2.6.31-mingw.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- misc/libxml2-2.6.31/configure	2008-01-11 17:01:56.000000000 +0900
-+++ misc/build/libxml2-2.6.31/configure	2009-09-07 20:48:47.656250000 +0900
-@@ -27331,6 +27331,8 @@
- 
- if test "$with_modules" != "no" ; then
-  case "$host" in
-+  *-*-mingw*)
-+  ;;
-   *-*-cygwin*)
-   MODULE_EXTENSION=".dll"
-   { echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5
---- misc/libxml2-2.6.31/libxml.h	2007-11-23 19:47:23.000000000 +0900
-+++ misc/build/libxml2-2.6.31/libxml.h	2009-07-10 14:37:34.988250000 +0900
-@@ -30,6 +30,10 @@
- #include <libxml/xmlversion.h>
- #else
- #include "config.h"
-+#ifdef __MINGW32__
-+#undef HAVE_LIBPTHREAD 
-+#undef HAVE_PTHREAD_H 
-+#endif
- #include <libxml/xmlversion.h>
- #endif
- 
diff --git a/libxml2/libxml2-2.6.31.patch b/libxml2/libxml2-2.6.31.patch
deleted file mode 100644
index 31fcf72e8479..000000000000
--- a/libxml2/libxml2-2.6.31.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-*** misc/libxml2-2.6.31/configure	Fri Jan 11 09:01:56 2008
---- misc/build/libxml2-2.6.31/configure	Thu Mar 27 14:09:56 2008
-***************
-*** 3463,3477 ****
-    CFLAGS=$ac_save_CFLAGS
-  elif test $ac_cv_prog_cc_g = yes; then
-    if test "$GCC" = yes; then
-!     CFLAGS="-g -O2"
-    else
-!     CFLAGS="-g"
-    fi
-  else
-    if test "$GCC" = yes; then
-!     CFLAGS="-O2"
-    else
-!     CFLAGS=
-    fi
-  fi
-  { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
---- 3463,3477 ----
-    CFLAGS=$ac_save_CFLAGS
-  elif test $ac_cv_prog_cc_g = yes; then
-    if test "$GCC" = yes; then
-!     CFLAGS="$ADDCFLAGS -g -O2"
-    else
-!     CFLAGS="$ADDCFLAGS -g"
-    fi
-  else
-    if test "$GCC" = yes; then
-!     CFLAGS="$ADDCFLAGS -O2"
-    else
-!     CFLAGS="$ADDCFLAGS"
-    fi
-  fi
-  { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-***************
-*** 26207,26215 ****
-  
-  { echo "$as_me:$LINENO: checking for library containing setsockopt" >&5
-  echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; }
-! if test "${ac_cv_search_setsockopt+set}" = set; then
-!   echo $ECHO_N "(cached) $ECHO_C" >&6
-! else
-    ac_func_search_save_LIBS=$LIBS
-  cat >conftest.$ac_ext <<_ACEOF
-  /* confdefs.h.  */
---- 26207,26215 ----
-  
-  { echo "$as_me:$LINENO: checking for library containing setsockopt" >&5
-  echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; }
-! #if test "${ac_cv_search_setsockopt+set}" = set; then
-! #  echo $ECHO_N "(cached) $ECHO_C" >&6
-! #else
-    ac_func_search_save_LIBS=$LIBS
-  cat >conftest.$ac_ext <<_ACEOF
-  /* confdefs.h.  */
-***************
-*** 26279,26285 ****
-  fi
-  rm conftest.$ac_ext
-  LIBS=$ac_func_search_save_LIBS
-! fi
-  { echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5
-  echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; }
-  ac_res=$ac_cv_search_setsockopt
---- 26279,26285 ----
-  fi
-  rm conftest.$ac_ext
-  LIBS=$ac_func_search_save_LIBS
-! #fi
-  { echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5
-  echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; }
-  ac_res=$ac_cv_search_setsockopt
-*** misc/libxml2-2.6.31/ltmain.sh	Wed Aug 29 14:28:46 2007
---- misc/build/libxml2-2.6.31/ltmain.sh	Thu Mar 27 13:54:03 2008
-***************
-*** 3311,3318 ****
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=".$current"
-! 	  versuffix=".$current";
-  	  ;;
-  
-  	irix | nonstopux)
---- 3311,3318 ----
-  	  ;;
-  
-  	freebsd-elf)
-! 	  major=.`expr $current - $age`
-! 	  versuffix=".$major.$age.$revision";
-  	  ;;
-  
-  	irix | nonstopux)
-*** misc/libxml2-2.6.31/xml2-config.in	Fri Jan 11 08:22:32 2008
---- misc/build/libxml2-2.6.31/xml2-config.in	Wed Apr  2 11:56:17 2008
-***************
-*** 1,10 ****
-  #! /bin/sh
-  
-! prefix=@prefix@
-! exec_prefix=@exec_prefix@
-! includedir=@includedir@
-! libdir=@libdir@
-  
-  usage()
-  {
-      cat <<EOF
---- 1,15 ----
-  #! /bin/sh
-  
-! #prefix=@prefix@
-! #exec_prefix=@exec_prefix@
-! #includedir=@includedir@
-! #libdir=@libdir@
-  
-+ prefix=${SOLARVERSION}/${INPATH}
-+ exec_prefix=${SOLARVERSION}/${INPATH}
-+ includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
-+ libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
-+ 
-  usage()
-  {
-      cat <<EOF
-***************
-*** 67,73 ****
-  	;;
-  
-      --cflags)
-!        	echo @XML_INCLUDEDIR@ @XML_CFLAGS@
-         	;;
-  
-      --libtool-libs)
---- 72,79 ----
-  	;;
-  
-      --cflags)
-!         echo -I${includedir}
-! #       	echo @XML_INCLUDEDIR@ @XML_CFLAGS@
-         	;;
-  
-      --libtool-libs)
-***************
-*** 82,100 ****
-         	;;
-  
-      --libs)
-!         if [ "`uname`" = "Linux" ]
-! 	then
-! 	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
-! 	    then
-! 		echo @XML_LIBS@ 
-! 	    else
-! 		echo @XML_LIBDIR@ @XML_LIBS@ 
-! 	    fi
-! 	else
-! 	    echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
-! 	fi
-         	;;
-  
-      *)
-  	usage
-  	exit 1
---- 88,111 ----
-         	;;
-  
-      --libs)
-!         echo -L${libdir} ${LIBXML2LIB} -lm
-! #        if [ "`uname`" = "Linux" ]
-! #	then
-! #	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
-! #	    then
-! #		echo @XML_LIBS@ 
-! #	    else
-! #		echo @XML_LIBDIR@ @XML_LIBS@ 
-! #	    fi
-! #	else
-! #	    echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
-! #	fi
-         	;;
-  
-+     print) # ugly configure hack
-+         exit 0
-+         ;;
-+  
-      *)
-  	usage
-  	exit 1
-*** misc/libxml2-2.6.31/include/win32config.h	Wed Apr 18 09:51:54 2007
---- misc/build/libxml2-2.6.31/include/win32config.h	Mon Mar 31 19:09:09 2008
-***************
-*** 92,98 ****
---- 92,100 ----
-  #if defined(_MSC_VER)
-  #define mkdir(p,m) _mkdir(p)
-  #define snprintf _snprintf
-+ #if _MSC_VER < 1500
-  #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
-+ #endif
-  #elif defined(__MINGW32__)
-  #define mkdir(p,m) _mkdir(p)
-  #endif
-*** misc/libxml2-2.6.31/include/wsockcompat.h	Wed Jan  3 14:07:30 2007
---- misc/build/libxml2-2.6.31/include/wsockcompat.h	Thu Apr  3 10:15:50 2008
-***************
-*** 21,26 ****
---- 21,27 ----
-  
-  /* Check if ws2tcpip.h is a recent version which provides getaddrinfo() */
-  #if defined(GetAddrInfo)
-+ #include <wspiapi.h>
-  #define HAVE_GETADDRINFO
-  #endif
-  #endif
-*** misc/libxml2-2.6.31/include/libxml/xmlversion.h	Fri Jan 11 10:11:19 2008
---- misc/build/libxml2-2.6.31/include/libxml/xmlversion.h	Thu Mar 27 13:54:03 2008
-***************
-*** 264,270 ****
-   *
-   * Whether iconv support is available
-   */
-! #if 1
-  #define LIBXML_ICONV_ENABLED
-  #endif
-  
---- 264,270 ----
-   *
-   * Whether iconv support is available
-   */
-! #if 0
-  #define LIBXML_ICONV_ENABLED
-  #endif
-  
-***************
-*** 282,288 ****
-   *
-   * Whether Debugging module is configured in
-   */
-! #if 1
-  #define LIBXML_DEBUG_ENABLED
-  #endif
-  
---- 282,288 ----
-   *
-   * Whether Debugging module is configured in
-   */
-! #if 0
-  #define LIBXML_DEBUG_ENABLED
-  #endif
-  
-***************
-*** 291,297 ****
-   *
-   * Whether the memory debugging is configured in
-   */
-! #if 1
-  #define DEBUG_MEMORY_LOCATION
-  #endif
-  
---- 291,297 ----
-   *
-   * Whether the memory debugging is configured in
-   */
-! #if 0
-  #define DEBUG_MEMORY_LOCATION
-  #endif
-  
-***************
-*** 300,306 ****
-   *
-   * Whether the runtime debugging is configured in
-   */
-! #if 1
-  #define LIBXML_DEBUG_RUNTIME
-  #endif
-  
---- 300,306 ----
-   *
-   * Whether the runtime debugging is configured in
-   */
-! #if 0
-  #define LIBXML_DEBUG_RUNTIME
-  #endif
-  
-diff -r -cN misc/libxml2-2.6.31/changelog misc/build/libxml2-2.6.31/changelog
-*** misc/libxml2-2.6.31/changelog
---- misc/build/libxml2-2.6.31/changelog
-***************
-*** 0 ****
---- 1,10 ----
-+ libxml2 (2.6.32.dfsg-5+lenny1) stable-security; urgency=high
-+ 
-+   * Non-maintainer upload by the Security Team.
-+   * Fix multiple use-after-free flaws when parsing notation and
-+     enumeration attribute types (CVE-2009-2416).
-+   * Fix stack overflow when parsing root XML document element DTD
-+     definition (CVE-2009-2414).
-+ 
-+  -- Nico Golde <nion@debian.org>  Thu, 06 Aug 2009 13:04:00 +0000
-+ 
-diff -r -cN misc/libxml2-2.6.31/parser.c misc/build/libxml2-2.6.31/parser.c
-*** misc/libxml2-2.6.31/parser.c
---- misc/build/libxml2-2.6.31/parser.c
-***************
-*** 4752,4761 ****
-  	if (name == NULL) {
-  	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
-  			   "Name expected in NOTATION declaration\n");
-! 	    return(ret);
-  	}
-  	cur = xmlCreateEnumeration(name);
-! 	if (cur == NULL) return(ret);
-  	if (last == NULL) ret = last = cur;
-  	else {
-  	    last->next = cur;
---- 4752,4766 ----
-  	if (name == NULL) {
-  	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
-  			   "Name expected in NOTATION declaration\n");
-! 	    xmlFreeEnumeration(ret);
-! 	    return(NULL);
-  	}
-  	cur = xmlCreateEnumeration(name);
-!         if (cur == NULL) {
-!              xmlFreeEnumeration(ret);
-!              return(NULL);
-!          }
-! 
-  	if (last == NULL) ret = last = cur;
-  	else {
-  	    last->next = cur;
-***************
-*** 4765,4773 ****
-      } while (RAW == '|');
-      if (RAW != ')') {
-  	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-! 	if ((last != NULL) && (last != ret))
-! 	    xmlFreeEnumeration(last);
-! 	return(ret);
-      }
-      NEXT;
-      return(ret);
---- 4770,4777 ----
-      } while (RAW == '|');
-      if (RAW != ')') {
-  	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-!         xmlFreeEnumeration(ret);
-!         return(NULL);
-      }
-      NEXT;
-      return(ret);
-***************
-*** 4808,4814 ****
-  	}
-  	cur = xmlCreateEnumeration(name);
-  	xmlFree(name);
-! 	if (cur == NULL) return(ret);
-  	if (last == NULL) ret = last = cur;
-  	else {
-  	    last->next = cur;
---- 4812,4822 ----
-  	}
-  	cur = xmlCreateEnumeration(name);
-  	xmlFree(name);
-!         if (cur == NULL) {
-!              xmlFreeEnumeration(ret);
-!              return(NULL);
-!          }
-! 
-  	if (last == NULL) ret = last = cur;
-  	else {
-  	    last->next = cur;
-***************
-*** 5206,5211 ****
---- 5214,5226 ----
-      const xmlChar *elem;
-      xmlChar type = 0;
-  
-+     if (ctxt->depth > 128) {
-+         xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
-+                 "xmlParseElementChildrenContentDecl : depth %d too deep\n",
-+                           ctxt->depth);
-+        return(NULL);
-+     }
-+ 
-      SKIP_BLANKS;
-      GROW;
-      if (RAW == '(') {
-***************
-*** 5214,5220 ****
---- 5229,5237 ----
-          /* Recurse on first child */
-  	NEXT;
-  	SKIP_BLANKS;
-+ 	ctxt->depth++;
-          cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+ 	ctxt->depth--;
-  	SKIP_BLANKS;
-  	GROW;
-      } else {
-***************
-*** 5344,5350 ****
---- 5361,5369 ----
-  	    /* Recurse on second child */
-  	    NEXT;
-  	    SKIP_BLANKS;
-+ 	    ctxt->depth++;
-  	    last = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+ 	    ctxt->depth--;
-  	    SKIP_BLANKS;
-  	} else {
-  	    elem = xmlParseName(ctxt);
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
new file mode 100644
index 000000000000..4158c38ef47f
--- /dev/null
+++ b/libxml2/libxml2-configure.patch
@@ -0,0 +1,118 @@
+--- misc/libxml2-2.7.6/ltmain.sh	2009-10-06 17:39:54.000000000 +0100
++++ misc/build/libxml2-2.7.6/ltmain.sh	2009-12-17 11:43:56.000000000 +0000
+@@ -6271,8 +6271,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current"
++	  major=.`expr $current - $age`
++	  versuffix=".$major.$age.$revision";
+ 	  ;;
+ 
+ 	irix | nonstopux)
+--- misc/libxml2-2.7.6/include/libxml/xmlversion.h	2009-12-17 11:45:19.000000000 +0000
++++ misc/build/libxml2-2.7.6/include/libxml/xmlversion.h	2009-12-17 11:45:36.000000000 +0000
+@@ -264,7 +264,7 @@
+  *
+  * Whether iconv support is available
+  */
+-#if 1
++#if 0
+ #define LIBXML_ICONV_ENABLED
+ #endif
+ 
+@@ -282,7 +282,7 @@
+  *
+  * Whether Debugging module is configured in
+  */
+-#if 1
++#if 0
+ #define LIBXML_DEBUG_ENABLED
+ #endif
+ 
+@@ -291,7 +291,7 @@
+  *
+  * Whether the memory debugging is configured in
+  */
+-#if 1
++#if 0
+ #define DEBUG_MEMORY_LOCATION
+ #endif
+ 
+@@ -300,7 +300,7 @@
+  *
+  * Whether the runtime debugging is configured in
+  */
+-#if 1
++#if 0
+ #define LIBXML_DEBUG_RUNTIME
+ #endif
+ 
+--- misc/libxml2-2.7.6/xml2-config.in	2009-12-17 11:45:20.000000000 +0000
++++ misc/build/libxml2-2.7.6/xml2-config.in	2009-12-17 11:45:36.000000000 +0000
+@@ -1,9 +1,14 @@
+ #! /bin/sh
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-includedir=@includedir@
+-libdir=@libdir@
++#prefix=@prefix@
++#exec_prefix=@exec_prefix@
++#includedir=@includedir@
++#libdir=@libdir@
++
++prefix=${SOLARVERSION}/${INPATH}
++exec_prefix=${SOLARVERSION}/${INPATH}
++includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
++libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
+ 
+ usage()
+ {
+@@ -67,7 +72,8 @@
+ 	;;
+ 
+     --cflags)
+-       	echo @XML_INCLUDEDIR@ @XML_CFLAGS@
++        echo -I${includedir}
++#       	echo @XML_INCLUDEDIR@ @XML_CFLAGS@
+        	;;
+ 
+     --libtool-libs)
+@@ -82,19 +88,24 @@
+        	;;
+ 
+     --libs)
+-        if [ "`uname`" = "Linux" ]
+-	then
+-	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
+-	    then
+-		echo @XML_LIBS@ 
+-	    else
+-		echo @XML_LIBDIR@ @XML_LIBS@ 
+-	    fi
+-	else
+-	    echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
+-	fi
++        echo -L${libdir} ${LIBXML2LIB} -lm
++#        if [ "`uname`" = "Linux" ]
++#	then
++#	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
++#	    then
++#		echo @XML_LIBS@ 
++#	    else
++#		echo @XML_LIBDIR@ @XML_LIBS@ 
++#	    fi
++#	else
++#	    echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
++#	fi
+        	;;
+ 
++    print) # ugly configure hack
++        exit 0
++        ;;
++ 
+     *)
+ 	usage
+ 	exit 1
diff --git a/libxml2/libxml2-gnome599717.patch b/libxml2/libxml2-gnome599717.patch
new file mode 100644
index 000000000000..cc6617d0e699
--- /dev/null
+++ b/libxml2/libxml2-gnome599717.patch
@@ -0,0 +1,20 @@
+--- misc/libxml2-2.7.6/relaxng.c	2009-12-17 11:53:12.000000000 +0000
++++ misc/build/libxml2-2.7.6/relaxng.c	2009-12-17 16:30:43.000000000 +0000
+@@ -5369,7 +5369,7 @@
+     } else {
+         xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
+                    "expecting name, anyName, nsName or choice : got %s\n",
+-                   (node == NULL ? "nothing" : node->name), NULL);
++                   (node == NULL ? BAD_CAST "nothing" : node->name), NULL);
+         return (NULL);
+     }
+     if (ret != def) {
+@@ -9459,7 +9459,7 @@
+             ctxt->states = NULL;
+             if (found == 0) {
+                 if (cur == NULL) {
+-                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
++                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, BAD_CAST "noname");
+                 } else {
+                     VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
+                 }
diff --git a/libxml2/libxml2-gnome602728.patch b/libxml2/libxml2-gnome602728.patch
new file mode 100644
index 000000000000..b284d457a751
--- /dev/null
+++ b/libxml2/libxml2-gnome602728.patch
@@ -0,0 +1,12 @@
+--- misc/libxml2-2.7.6/configure	2009-12-18 12:12:08.000000000 +0000
++++ misc/build/libxml2-2.7.6/configure	2009-12-18 12:20:40.000000000 +0000
+@@ -12150,7 +12150,7 @@
+ $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
+     VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+ test "`uname`" == "SunOS" && \
+-    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
++    VERSION_SCRIPT_FLAGS=""
+ 
+  if test -n "$VERSION_SCRIPT_FLAGS"; then
+   USE_VERSION_SCRIPT_TRUE=
+
diff --git a/libxml2/libxml2-mingw.patch b/libxml2/libxml2-mingw.patch
new file mode 100755
index 000000000000..d160dcb70138
--- /dev/null
+++ b/libxml2/libxml2-mingw.patch
@@ -0,0 +1,24 @@
+--- misc/libxml2-2.7.6/configure	2008-01-11 17:01:56.000000000 +0900
++++ misc/build/libxml2-2.7.6/configure	2009-09-07 20:48:47.656250000 +0900
+@@ -19914,6 +19914,8 @@
+ 
+ if test "$with_modules" != "no" ; then
+  case "$host" in
++  *-*-mingw*)
++  ;;
+   *-*-cygwin*)
+   MODULE_EXTENSION=".dll"
+   { $as_echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5
+--- misc/libxml2-2.7.6/libxml.h	2007-11-23 19:47:23.000000000 +0900
++++ misc/build/libxml2-2.7.6/libxml.h	2009-07-10 14:37:34.988250000 +0900
+@@ -30,6 +30,10 @@
+ #include <libxml/xmlversion.h>
+ #else
+ #include "config.h"
++#ifdef __MINGW32__
++#undef HAVE_LIBPTHREAD 
++#undef HAVE_PTHREAD_H 
++#endif
+ #include <libxml/xmlversion.h>
+ #endif
+ 
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 0025df25dddc..93275b65b2d8 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -42,20 +42,19 @@ all:
 
 # --- Files --------------------------------------------------------
 
-LIBXML2VERSION=2.6.31
+LIBXML2VERSION=2.7.6
 
 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
-#.IF "$(OS)$(COM)"=="WNTGCC"
-#PATCH_FILES=$(TARFILE_NAME)-mingw.patch
-#.ELSE
-PATCH_FILES=$(TARFILE_NAME).patch
-#.ENDIF
+TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2
+PATCH_FILES=libxml2-configure.patch \
+            libxml2-mingw.patch \
+            libxml2-gnome599717.patch \
+            libxml2-gnome602728.patch
 
 # This is only for UNX environment now
 
 .IF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
-PATCH_FILES+=$(TARFILE_NAME)-mingw.patch
 xml2_CC=$(CC)
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 xml2_CC+=-shared-libgcc
diff --git a/libxslt/libxslt-1.1.24.patch b/libxslt/libxslt-configure.patch
index f30773fe7cef..bfa0b512824e 100644
--- a/libxslt/libxslt-1.1.24.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,6 +1,6 @@
---- misc/libxslt-1.1.24/ltmain.sh	Wed Aug 29 14:28:46 2007
-+++ misc/build/libxslt-1.1.24/ltmain.sh	Wed Jun 25 13:06:05 2008
-@@ -3234,9 +3234,9 @@
+--- misc/libxslt-1.1.26/ltmain.sh	Wed Aug 29 14:28:46 2007
++++ misc/build/libxslt-1.1.26/ltmain.sh	Wed Jun 25 13:06:05 2008
+@@ -6195,9 +6195,9 @@
  	    revision="$number_revision"
  	    ;;
  	  freebsd-aout|freebsd-elf|sunos)
@@ -12,20 +12,20 @@
 +	    revision="$number_revision"
  	    ;;
  	  irix|nonstopux)
- 	    current=`expr $number_major + $number_minor`
-@@ -3311,8 +3311,8 @@
+ 	    func_arith $number_major + $number_minor
+@@ -6271,8 +6271,8 @@
  	  ;;
  
  	freebsd-elf)
 -	  major=".$current"
--	  versuffix=".$current";
+-	  versuffix=".$current"
 +	  major=.`expr $current - $age`
 +	  versuffix="$major.$age.$revision"
  	  ;;
  
  	irix | nonstopux)
---- misc/libxslt-1.1.24/xslt-config.in	Wed Jan 17 14:18:26 2007
-+++ misc/build/libxslt-1.1.24/xslt-config.in	Wed Jun 25 13:06:05 2008
+--- misc/libxslt-1.1.26/xslt-config.in	Wed Jan 17 14:18:26 2007
++++ misc/build/libxslt-1.1.26/xslt-config.in	Wed Jun 25 13:06:05 2008
 @@ -1,10 +1,16 @@
  #! /bin/sh
  
@@ -57,9 +57,9 @@
  if test "$includedir" != "/usr/include"; then
      the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
  else
---- misc/libxslt-1.1.24/configure	2008-05-14 00:40:54.000000000 +0900
-+++ misc/build/libxslt-1.1.24/configure	2008-07-17 22:12:38.097000000 +0900
-@@ -5730,7 +5730,7 @@
+--- misc/libxslt-1.1.26/configure	2008-05-14 00:40:54.000000000 +0900
++++ misc/build/libxslt-1.1.26/configure	2008-07-17 22:12:38.097000000 +0900
+@@ -7437,7 +7437,7 @@
  
  cygwin*)
    # func_win32_libid is a shell function defined in ltmain.sh
@@ -68,7 +68,7 @@
    lt_cv_file_magic_cmd='func_win32_libid'
    ;;
  
-@@ -5739,7 +5739,7 @@
+@@ -7446,7 +7446,7 @@
    # func_win32_libid shell function, so use a weaker test based on 'objdump',
    # unless we find 'file', for example because we are cross-compiling.
    if ( file / ) >/dev/null 2>&1; then
diff --git a/libxslt/libxslt-gnome602728.patch b/libxslt/libxslt-gnome602728.patch
new file mode 100644
index 000000000000..182855bf9486
--- /dev/null
+++ b/libxslt/libxslt-gnome602728.patch
@@ -0,0 +1,11 @@
+--- misc/libxslt-1.1.26.orig/configure	2009-12-21 10:07:14.000000000 +0000
++++ misc/build/libxslt-1.1.26/configure	2009-12-21 10:07:42.000000000 +0000
+@@ -13402,7 +13402,7 @@
+ $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
+     VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+ test "`uname`" == "SunOS" && \
+-    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
++    VERSION_SCRIPT_FLAGS=""
+ 
+  if test -n "$VERSION_SCRIPT_FLAGS"; then
+   USE_VERSION_SCRIPT_TRUE=
diff --git a/libxslt/libxslt-1.1.24_win_manifest.patch b/libxslt/libxslt-win_manifest.patch
index 40f07324ccff..43c14eb70b8b 100644
--- a/libxslt/libxslt-1.1.24_win_manifest.patch
+++ b/libxslt/libxslt-win_manifest.patch
@@ -1,6 +1,6 @@
---- misc/libxslt-1.1.24/win32/configure.js	2007-08-03 15:41:02.000000000 +0200
-+++ misc/build/libxslt-1.1.24/win32/configure.js	2009-05-07 13:09:42.294993200 +0200
-@@ -51,7 +51,7 @@
+--- misc/libxslt-1.1.26/win32/configure.js	2007-08-03 15:41:02.000000000 +0200
++++ misc/build/libxslt-1.1.26/win32/configure.js	2009-05-07 13:09:42.294993200 +0200
+@@ -52,7 +52,7 @@
  var dirSep = "\\";
  var compiler = "msvc";
  var cruntime = "/MD";
diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk
index 94c8220336fe..c80c0e9535b0 100644
--- a/libxslt/libxsltversion.mk
+++ b/libxslt/libxsltversion.mk
@@ -29,5 +29,5 @@ LIBXSLT_MAJOR=1
 # minor 
 LIBXSLT_MINOR=1
 # micro 
-LIBXSLT_MICRO=24
+LIBXSLT_MICRO=26
 
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index a0ec45f48be0..b3f9ed203653 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -49,7 +49,10 @@ all:
 LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
-PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch
+TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
+PATCH_FILES=libxslt-configure.patch \
+            libxslt-win_manifest.patch \
+            libxslt-gnome602728.patch
 
 # This is only for UNX environment now
 .IF "$(OS)"=="WNT"
diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf
new file mode 100644
index 000000000000..973c7b57f2b9
--- /dev/null
+++ b/more_fonts/fonts/fc_local.conf
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "/etc/fonts/conf.d/fonts.dtd">
+<fontconfig>
+
+	<!-- Alias similar/metric-compatible families from various sources: -->
+
+	<alias binding="same">
+	  <family>Liberation Sans Narrow</family>
+	  <family>Arial Narrow</family>
+	  <default>
+	  <family>Arial Narrow</family>
+	  </default>
+	</alias>
+
+<!-- -->
+	<alias binding="same">
+	  <family>Arial Narrow</family>
+	  <accept>
+	  <family>Liberation Sans Narrow</family>
+	  </accept>
+	</alias>
+<!-- -->
+
+</fontconfig>
diff --git a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk
index 87fd5a859306..f9fa78a7664b 100644
--- a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
+++ b/more_fonts/fonts/ttf_dejavu/makefile.mk
@@ -27,7 +27,7 @@
 
 PRJ=..$/..
 
-PRJNAME=bitstream_vera_fonts
+PRJNAME=more_fonts
 TARGET=ttf_dejavu
 
 # --- Settings -----------------------------------------------------
@@ -37,6 +37,7 @@ TARGET=ttf_dejavu
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=dejavu-fonts-ttf-2.30
+TARFILE_MD5=fe5b3e2b7c4577f30dc001054365653e
 TARFILE_ROOTDIR=dejavu-fonts-ttf-2.30
 
 PATCH_FILES=
diff --git a/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk b/more_fonts/fonts/ttf_gentium/makefile.mk
index 2105e2f01cb5..53177e8c9f59 100644
--- a/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk
+++ b/more_fonts/fonts/ttf_gentium/makefile.mk
@@ -27,7 +27,7 @@
 
 PRJ=..$/..
 
-PRJNAME=bitstream_vera_fonts
+PRJNAME=more_fonts
 TARGET=ttf_gentium
 
 # --- Settings -----------------------------------------------------
@@ -37,6 +37,7 @@ TARGET=ttf_gentium
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=gentiumbasic-fonts-1.10
+TARFILE_MD5=35efabc239af896dfb79be7ebdd6e6b9
 TARFILE_ROOTDIR=gentiumbasic-fonts-1.10
 
 PATCH_FILES=
diff --git a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk b/more_fonts/fonts/ttf_liberation/makefile.mk
index 4d0093ec9a71..de711a644690 100644
--- a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk
+++ b/more_fonts/fonts/ttf_liberation/makefile.mk
@@ -27,7 +27,7 @@
 
 PRJ=..$/..
 
-PRJNAME=bitstream_vera_fonts
+PRJNAME=more_fonts
 TARGET=ttf_liberation
 
 # --- Settings -----------------------------------------------------
@@ -36,12 +36,12 @@ TARGET=ttf_liberation
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=liberation-fonts-1.05
-TARFILE_ROOTDIR=liberation-fonts-1.05
+TARFILE_NAME=liberation-fonts-ttf-1.05.3.20100427
+TARFILE_MD5=ef9ab6c1740682fbd730606d5f6922e6 
+TARFILE_ROOTDIR=.
 
 PATCH_FILES=
 
-
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
 
@@ -55,8 +55,6 @@ BUILD_FLAGS=
 .INCLUDE : target.mk
 
 .IF "$(WITH_FONTS)"!="NO"
-.IF "$(GUI)" != "WNT"
 .INCLUDE : tg_ext.mk
 .ENDIF
-.ENDIF
 
diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst
new file mode 100644
index 000000000000..eb567e7527f5
--- /dev/null
+++ b/more_fonts/prj/build.lst
@@ -0,0 +1,5 @@
+bs	more_fonts	:	solenv NULL
+bs	more_fonts\fonts\ttf_dejavu		nmake	-	all	deja_fonts NULL
+bs	more_fonts\fonts\ttf_liberation	nmake	-	all	libe_fonts NULL
+bs	more_fonts\fonts\ttf_gentium	nmake	-	all	gent_fonts NULL
+
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
new file mode 100644
index 000000000000..0bc15242b086
--- /dev/null
+++ b/more_fonts/prj/d.lst
@@ -0,0 +1,9 @@
+mkdir: %COMMON_DEST%\pck%_EXT%
+..\fonts\fc_local.conf	%COMMON_DEST%\pck%_EXT%\fc_local.conf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\ttf\*.ttf	%COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\LICENSE		%COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
+..\%__SRC%\misc\build\Liberation*.ttf					%COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\License.txt						%COMMON_DEST%\pck%_EXT%\LICENSE_liberation
+..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf		%COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt	%COMMON_DEST%\pck%_EXT%\LICENSE_gentium
+
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index c8d88c015411..dedfade257db 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -386,10 +386,6 @@ $(INCCOM)$/nsBuildID.h: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
 
 
 $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR)
-    $(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR)
-.ELSE
 .IF "$(OS)"!="SOLARIS"
     $(GNUCOPY) -pRL $(INCLUDE_PATH)* $(INCLUDE_DIR)
     $(GNUCOPY) -pRL $(PUBLIC_PATH)* $(INCLUDE_DIR)
@@ -397,7 +393,6 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
     $(COPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
     $(COPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
 .ENDIF			# "$(OS)"!="SOLARIS"
-.ENDIF
 
 .IF "$(GUI)"=="UNX"
     chmod -R 775 $(INCCOM)
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 2eeda8c08928..9629f7138b74 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -78,13 +78,15 @@ XLDOPTS:= -B$(SYSBASE)/usr/lib -B$(SYSBASE)/usr/lib/system -lmathCommon
 
 MOZILLA_VERSION=1.1.14
 TARFILE_NAME=seamonkey-$(MOZILLA_VERSION).source
+TARFILE_MD5=a169ab152209200a7bad29a275cb0333
 
 TARFILE_ROOTDIR=mozilla
 PATCH_FILES = \
     seamonkey-source-$(MOZILLA_VERSION).patch \
     patches/dtoa.patch \
     patches/respect_disable_pango.patch \
-    patches/arm_build_fix.patch
+    patches/arm_build_fix.patch \
+    patches/link_fontconfig.patch
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
@@ -168,13 +170,7 @@ MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch
 
 CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)
 
-.IF "$(USE_SHELL)"!="4nt"
 BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS)
-.ELSE
-# This construct is needed because unitools.mk defines GNUMAKE using $ENV_TOOLS.
-# $ENV_TOOLS doesn't exist for OOo builds and the cygwin make is needed.
-BUILD_ACTION:=make
-.ENDIF
 
 .IF "$(GUI)"=="UNX"
 .IF "$(COMNAME)"=="sunpro5"
@@ -244,7 +240,6 @@ MOZTOOLSINST:=$(MISC)$/build$/moztoolsinst
 .ELSE
 MOZTOOLS_EXTRACT:=$(MISC)$/build$/moztools
 .ENDIF
-.IF "$(USE_SHELL)"!="4nt"
 .IF "$(COM)"=="GCC"
 MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztoolsinst
 PATH!:=$(PATH):$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(shell @cygpath $(MOZ_TOOLS_DOS))/vc71/bin
@@ -253,11 +248,6 @@ SET_MOZ_TOOLS_INSTALL_BAT:=export "MOZ_TOOLS=$(MOZ_TOOLS_DOS)"
 MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztools\vc8-moztools
 PATH!:=$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(PATH)
 .ENDIF
-.ELSE # "$(USE_SHELL)"!="4nt"
-# MOZ_TOOLS must contain an absolute path
-MOZ_TOOLS_DOS:=$(shell @echo %@SFN[$(MISC)])\build\moztools\vc8-moztools
-PATH!:=$(MOZ_TOOLS_DOS)\bin;$(PATH)
-.ENDIF # "$(USE_SHELL)"!="4nt"
 
 MOZ_TOOLS:=$(subst,\,/ $(MOZ_TOOLS_DOS))
 .IF "$(COM)"=="GCC"
diff --git a/moz/patches/link_fontconfig.patch b/moz/patches/link_fontconfig.patch
new file mode 100644
index 000000000000..66e82fa63e52
--- /dev/null
+++ b/moz/patches/link_fontconfig.patch
@@ -0,0 +1,11 @@
+--- misc/mozilla/gfx/src/gtk/Makefile.in	2010-03-16 14:44:44.000000000 +0000
++++ misc/build/mozilla/gfx/src/gtk/Makefile.in	2010-03-16 14:45:08.000000000 +0000
+@@ -183,7 +183,7 @@
+ endif
+ 
+ ifdef MOZ_ENABLE_XFT
+-EXTRA_DSO_LDOPTS += $(FT2_LIBS)
++EXTRA_DSO_LDOPTS += $(FT2_LIBS) -lfontconfig
+ 
+ libs:: fontEncoding.properties pangoFontEncoding.properties
+ 	$(INSTALL) $^ $(DIST)/bin/res/fonts
diff --git a/neon/makefile.mk b/neon/makefile.mk
index e545a534d50a..d296db7a3f98 100644
--- a/neon/makefile.mk
+++ b/neon/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -49,6 +49,7 @@ TARGET=so_neon
 NEON_NAME=neon-0.29.3
 
 TARFILE_NAME=$(NEON_NAME)
+TARFILE_MD5=ba1015b59c112d44d7797b62fe7bee51
 PATCH_FILES=neon.patch
 
 .IF "$(GUI)"=="WNT"
diff --git a/neon/neon.patch b/neon/neon.patch
index b990411fd729..3d4e5019e0b7 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.29.3/src/config.h	2010-01-27 12:46:23.000000000 +0100
-+++ misc/build/neon-0.29.3/src/config.h	2010-01-27 12:44:10.000000000 +0100
+--- misc/neon-0.29.3/src/config.h	2010-03-23 14:47:43.000000000 +0100
++++ misc/build/neon-0.29.3/src/config.h	2010-03-23 12:19:50.000000000 +0100
 @@ -1 +1,488 @@
 -dummy
 +
@@ -490,9 +490,9 @@
 +#else
 +#define HAVE_NTLM 1
 +#endif
---- misc/neon-0.29.3/src/makefile.mk	2010-01-27 12:46:23.000000000 +0100
-+++ misc/build/neon-0.29.3/src/makefile.mk	2010-01-27 12:44:10.000000000 +0100
-@@ -1 +1,101 @@
+--- misc/neon-0.29.3/src/makefile.mk	2010-03-23 14:47:43.000000000 +0100
++++ misc/build/neon-0.29.3/src/makefile.mk	2010-03-23 14:45:21.000000000 +0100
+@@ -1 +1,102 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
 +
@@ -500,6 +500,7 @@
 +TARGET=neon
 +LIBTARGET=NO
 +USE_DEFFILE=TRUE
++NO_DEFAULT_STL=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 +UWINAPILIB=
 +
@@ -596,7 +597,7 @@
 +DEF1NAME=$(SHL1TARGET)
 +.INCLUDE :  target.mk
 --- misc/neon-0.29.3/src/ne_auth.c	2009-12-30 22:29:30.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_auth.c	2010-01-27 12:45:34.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_auth.c	2010-03-23 12:19:50.000000000 +0100
 @@ -367,7 +367,7 @@
  static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt,
                             struct auth_challenge *chall, char *pwbuf) 
@@ -634,7 +635,7 @@
          return status;
      }
 --- misc/neon-0.29.3/src/ne_auth.h	2009-09-01 22:13:12.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_auth.h	2010-01-27 12:44:10.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_auth.h	2010-03-23 12:19:50.000000000 +0100
 @@ -47,8 +47,8 @@
   * Hint: if you just wish to attempt authentication just once (even if
   * the user gets the username/password wrong), have the callback
@@ -647,7 +648,7 @@
  /* Set callbacks to provide credentials for server and proxy
   * authentication, using the default set of authentication protocols.
 --- misc/neon-0.29.3/src/ne_defs.h	2009-09-02 16:04:43.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_defs.h	2010-01-27 12:44:10.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_defs.h	2010-03-23 12:19:50.000000000 +0100
 @@ -41,7 +41,7 @@
  #endif
  
@@ -658,7 +659,7 @@
  #endif
  
 --- misc/neon-0.29.3/src/ne_locks.c	2007-02-05 11:09:27.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_locks.c	2010-01-27 12:44:10.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_locks.c	2010-03-23 12:19:50.000000000 +0100
 @@ -579,6 +579,23 @@
          const char *token = ne_get_response_header(ctx->req, "Lock-Token");
          /* at the root element; retrieve the Lock-Token header,
@@ -726,7 +727,7 @@
  	}
      }
 --- misc/neon-0.29.3/src/ne_locks.h	2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_locks.h	2010-01-27 12:44:10.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_locks.h	2010-03-23 12:19:50.000000000 +0100
 @@ -22,6 +22,10 @@
  #ifndef NE_LOCKS_H
  #define NE_LOCKS_H
@@ -739,7 +740,7 @@
  #include "ne_uri.h" /* for ne_uri */
  
 --- misc/neon-0.29.3/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_sspi.c	2010-01-27 12:44:10.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_sspi.c	2010-03-23 12:19:50.000000000 +0100
 @@ -206,6 +206,45 @@
  }
  
@@ -826,7 +827,7 @@
          securityStatus =
              initializeSecurityContext(&sspiContext->credentials, NULL,
 --- misc/neon-0.29.3/src/ne_sspi.h	2006-02-12 13:05:14.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_sspi.h	2010-01-27 12:44:10.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_sspi.h	2010-03-23 12:19:50.000000000 +0100
 @@ -41,7 +41,7 @@
  int ne_sspi_clear_context(void *context);
  
@@ -837,7 +838,7 @@
  #endif /* HAVE_SSPI */
  
 --- misc/neon-0.29.3/src/ne_uri.c	2007-12-05 12:04:47.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_uri.c	2010-01-27 12:44:10.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_uri.c	2010-03-23 12:19:50.000000000 +0100
 @@ -42,7 +42,7 @@
  #include "ne_alloc.h"
  #include "ne_uri.h"
@@ -884,7 +885,7 @@
  /*   4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL,
  /*   5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US,
 --- misc/neon-0.29.3/src/ne_utils.c	2006-03-07 10:36:43.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_utils.c	2010-01-27 12:44:10.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_utils.c	2010-03-23 12:19:50.000000000 +0100
 @@ -118,6 +118,9 @@
  #ifdef HAVE_GNUTLS
      ", GNU TLS " LIBGNUTLS_VERSION
@@ -915,7 +916,7 @@
  #endif /* NE_HAVE_* */
      default:
 --- misc/neon-0.29.3/src/ne_utils.h	2007-07-16 08:54:57.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_utils.h	2010-01-27 12:44:10.000000000 +0100
++++ misc/build/neon-0.29.3/src/ne_utils.h	2010-03-23 12:19:50.000000000 +0100
 @@ -54,6 +54,7 @@
  #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */
  #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */
diff --git a/neon/neon_exports_unix.patch b/neon/neon_exports_unix.patch
index 55bdaac7adc4..f5c2ce8afea3 100644
--- a/neon/neon_exports_unix.patch
+++ b/neon/neon_exports_unix.patch
@@ -1,7 +1,7 @@
 --- misc/neon-0.29.3/src/exports.map	2009-09-29 10:28:13.531250000 +0200
 +++ misc/build/neon-0.29.3/src/exports.map	2009-09-21 12:16:53.453125000 +0200
 @@ -0,0 +1,288 @@
-+NEON_0_29_3 {
++UDK_3_0_0 {
 +	global:
 +		ne__negotiate_ssl;
 +		ne__ssl_exit;
diff --git a/neon/neon_exports_win.patch b/neon/neon_exports_win.patch
index 09bc86eebce4..85d73da2b41d 100644
--- a/neon/neon_exports_win.patch
+++ b/neon/neon_exports_win.patch
@@ -1,7 +1,7 @@
 --- misc/neon-0.29.3/src/exports.map	2009-09-29 10:28:13.531250000 +0200
 +++ misc/build/neon-0.29.3/src/exports.map	2009-09-21 12:16:53.453125000 +0200
 @@ -0,0 +1,294 @@
-+NEON_0_29_3 {
++UDK_3_0_0 {
 +	global:
 +		ne_sspi_authenticate;
 +		ne_sspi_clear_context;
diff --git a/neon/prj/build.lst b/neon/prj/build.lst
index 2a133605b11e..a9786c796bd2 100755
--- a/neon/prj/build.lst
+++ b/neon/prj/build.lst
@@ -1,3 +1,3 @@
-xh      neon  :  OPENSSL:openssl soltools external EXPAT:expat LIBXML2:libxml2 NULL
+xh      neon  :  OPENSSL:openssl ZLIB:zlib stlport soltools external EXPAT:expat LIBXML2:libxml2 NULL
 xh      neon     usr1           -       all     xh_mkout NULL
 xh      neon     nmake          -       all     xh_neon NULL
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 55b3e7d118f2..78de2a9afbf3 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -42,6 +42,7 @@ all:
 .ENDIF	
 
 TARFILE_NAME=nss_3_12_5
+TARFILE_MD5=6244eb0b6e2647ee50470951fa6efb47
 TARFILE_ROOTDIR=mozilla
 PATCH_FILES=nss.patch
 
@@ -134,12 +135,8 @@ OUT2LIB= \
 .ELSE			# "$(COM)"=="GCC"
 MOZ_MSVCVERSION= 9
 .EXPORT : MOZ_MSVCVERSION
-.IF "$(USE_SHELL)"=="4nt"
-PATH!:=$(MOZILLABUILD)/msys/bin;$(MOZILLABUILD)/moztools/bin;$(PATH)
-.ELSE			# $(USE_SHELL)"=="4nt"
 moz_build:=$(shell cygpath -p $(MOZILLABUILD))
 PATH!:=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)
-.ENDIF			# $(USE_SHELL)"=="4nt"
 .EXPORT : PATH
 
 #Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll 
diff --git a/python/makefile.mk b/python/makefile.mk
index 93fdaa448a75..86d9835e8604 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -46,6 +46,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
+TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0
 PATCH_FILES=\
     Python-$(PYVERSION).patch \
     Python-ssl.patch
@@ -78,7 +79,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-in
 .IF "$(OS)$(CPU)" == "SOLARISI"
 CONFIGURE_ACTION += --disable-ipv6
 .ENDIF
-BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; chmod -R ug+w $(MYCWD)/python-inst
+BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install && chmod -R ug+w $(MYCWD)/python-inst && chmod g+w Include
 .ELSE
 # ----------------------------------
 # WINDOWS
@@ -93,7 +94,7 @@ python_LDFLAGS=-mno-cygwin -mthreads
 python_LDFLAGS+=-shared-libgcc
 .ENDIF
 CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CC="$(CC:s/guw.exe //)" CXX="$(CXX:s/guw.exe //)" MACHDEP=MINGW32 LN="cp -p" CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)"
-BUILD_ACTION=$(ENV_BUILD) make ; make install
+BUILD_ACTION=$(ENV_BUILD) make && make install
 .ELSE
 #PYTHONPATH:=..$/Lib
 #.EXPORT : PYTHONPATH
diff --git a/saxon/makefile.mk b/saxon/makefile.mk
index e1f887f1263a..e73eced80288 100644
--- a/saxon/makefile.mk
+++ b/saxon/makefile.mk
@@ -45,6 +45,7 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=source-9.0.0.7-bj
+TARFILE_MD5=ada24d37d8d638b3d8a9985e80bc2978
 ADDITIONAL_FILES=build.xml
 TARFILE_ROOTDIR=src
 
diff --git a/stax/makefile.mk b/stax/makefile.mk
index 76f2456d3b96..6dbe81ee7ca5 100644
--- a/stax/makefile.mk
+++ b/stax/makefile.mk
@@ -49,6 +49,7 @@ all:
 
 # --- Files --------------------------------------------------------
 TARFILE_NAME=stax-api-1.0-2-sources
+TARFILE_MD5=8294d6c42e3553229af9934c5c0ed997
 TARFILE_ROOTDIR=src
 
 BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf jsr173_1.0_api.jar javax$/xml$/stream$/*.class javax$/xml$/stream$/events$/*.class javax$/xml$/stream$/util$/*.class
diff --git a/zlib/makefile.mk b/zlib/makefile.mk
index e9c9a8c5c83e..389a68eb9c52 100644
--- a/zlib/makefile.mk
+++ b/zlib/makefile.mk
@@ -45,6 +45,7 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=zlib-1.1.4
+TARFILE_MD5=abc405d0bdd3ee22782d7aa20e440f08
 
 PATCH_FILES=zlib-1.1.4.patch
 ADDITIONAL_FILES=makefile.mk
author	Thomas Lange [tl] <tl@openoffice.org>	2010-06-09 14:50:43 +0200
committer	Thomas Lange [tl] <tl@openoffice.org>	2010-06-09 14:50:43 +0200
commit	29f7268d43499993510698cc3ee14acf9a8e35b6 (patch)
tree	ca1a9640c2ce5e8829004f81acc99a1e71809917
parent	abbcaab344a5f36f5c84cc94f3d1f89d3f30eede (diff)
parent	2e3cd7c625afed09e03a5d100ad6b89ec78c4dc6 (diff)