[ooo-build-commit] 13 commits - AUTHORS autogen.sh berkeleydb/prj bitstream_vera_fonts/prj boost/prj buildenv.in build/prj build/src build/stamp cairo/cairo cairo/cairo-1.8.0.patch cairo/pixman ChangeLog configure.in COPYING curl/curl-7.12.2.patch curl/prj .gitignore hunspell/hunspell-consts-1.2.8.patch hunspell/makefile.mk hunspell/prj icu/icuversion.mk icu/makefile.mk icu/prj INSTALL libxslt/libxslt-1.1.24_win_manifest.patch libxslt/makefile.mk Makefile.am moz/prj neon/neon.patch neon/prj NEWS python/prj README saxon/prj stax/prj

Jan Holesovsky kendy at kemper.freedesktop.org
Tue Jul 7 08:38:47 PDT 2009


 .gitignore                                     |   21 
 AUTHORS                                        |    1 
 COPYING                                        |  165 +
 ChangeLog                                      |    1 
 INSTALL                                        |  237 ++
 Makefile.am                                    |   34 
 README                                         |   12 
 autogen.sh                                     |   11 
 berkeleydb/prj/build.lst                       |    2 
 bitstream_vera_fonts/prj/build.lst             |    2 
 boost/prj/build.lst                            |    2 
 build/prj/build.lst                            |    1 
 build/src/.gitignore                           |    1 
 build/src/OpenOffice.org-libs-extern-sys.pc.in |    7 
 build/stamp/.gitignore                         |    3 
 build/stamp/README.txt                         |    1 
 buildenv.in                                    |   10 
 cairo/cairo-1.8.0.patch                        |    4 
 cairo/cairo/makefile.mk                        |    4 
 cairo/pixman/makefile.mk                       |   17 
 configure.in                                   |   19 
 curl/curl-7.12.2.patch                         | 2170 ++++++++++++-------------
 curl/prj/build.lst                             |    2 
 hunspell/hunspell-consts-1.2.8.patch           |   22 
 hunspell/makefile.mk                           |    4 
 hunspell/prj/build.lst                         |    2 
 icu/icuversion.mk                              |   37 
 icu/makefile.mk                                |    2 
 icu/prj/build.lst                              |    2 
 libxslt/libxslt-1.1.24_win_manifest.patch      |   11 
 libxslt/makefile.mk                            |    4 
 moz/prj/build.lst                              |    2 
 neon/neon.patch                                | 1570 +++++++++---------
 neon/prj/build.lst                             |    2 
 python/prj/build.lst                           |    2 
 saxon/prj/build.lst                            |    2 
 stax/prj/build.lst                             |    2 
 37 files changed, 2466 insertions(+), 1925 deletions(-)

New commits:
commit eedcc3eb43937f4a3bb8cc9a97af95c034f478f9
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jul 7 17:30:19 2009 +0200

    Split build: build.lst updates so that everything builds.
    
    * berkeleydb/prj/build.lst:
    * bitstream_vera_fonts/prj/build.lst:
    * boost/prj/build.lst:
    * curl/prj/build.lst:
    * hunspell/prj/build.lst:
    * icu/icuversion.mk: Moved to solenv/bin/.
    * icu/prj/build.lst:
    * moz/prj/build.lst:
    * neon/prj/build.lst:
    * python/prj/build.lst:
    * saxon/prj/build.lst:
    * stax/prj/build.lst:

diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst
index 4631e56..4019bbe 100644
--- a/berkeleydb/prj/build.lst
+++ b/berkeleydb/prj/build.lst
@@ -1,3 +1,3 @@
-db	berkeleydb	:	external xml2cmp sal NULL
+db	berkeleydb	:	xml2cmp NULL
 db	berkeleydb						nmake	-	u	as_mkout NULL
 db	berkeleydb						nmake	-	w,vc7	as_mkout NULL
diff --git a/bitstream_vera_fonts/prj/build.lst b/bitstream_vera_fonts/prj/build.lst
index 93449f0..72bb590 100644
--- a/bitstream_vera_fonts/prj/build.lst
+++ b/bitstream_vera_fonts/prj/build.lst
@@ -1,4 +1,4 @@
-bs	bitstream_vera_fonts	:	solenv NULL
+bs	bitstream_vera_fonts	:	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
 
diff --git a/boost/prj/build.lst b/boost/prj/build.lst
index 5076257..d5692a1 100644
--- a/boost/prj/build.lst
+++ b/boost/prj/build.lst
@@ -1,4 +1,4 @@
-bo      boost : SO:so_prereq solenv NULL
+bo      boost : SO:so_prereq NULL
 bo      boost           usr1    -       all     bo_mkout NULL
 bo      boost           nmake   -       all     bo_boost NULL
 bo      boost\spirit    nmake   -       all     bo_spirit NULL
diff --git a/curl/prj/build.lst b/curl/prj/build.lst
index 0c9a917..af4e35f 100644
--- a/curl/prj/build.lst
+++ b/curl/prj/build.lst
@@ -1,3 +1,3 @@
-xc	curl	:	external NULL
+xc	curl	:	NULL
 xc	curl	usr1	-	all	xc_mkout NULL
 xc	curl	nmake	-	all	xc_curl NULL
diff --git a/hunspell/prj/build.lst b/hunspell/prj/build.lst
index ac3a882..83a2c8e 100644
--- a/hunspell/prj/build.lst
+++ b/hunspell/prj/build.lst
@@ -1,3 +1,3 @@
-hun	hunspell	:	solenv ICU:icu sal NULL
+hun	hunspell	:	ICU:icu NULL
 hun     hunspell              usr1    -       all hun_mkout NULL
 hun     hunspell              nmake   -       all hun_hunspell NULL
diff --git a/icu/icuversion.mk b/icu/icuversion.mk
deleted file mode 100755
index 7c03890..0000000
--- a/icu/icuversion.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: icuversion.mk,v $
-#
-# $Revision: 1.5 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-# major 
-ICU_MAJOR=4
-# minor 
-ICU_MINOR=0
-# micro 
-ICU_MICRO=0
-
diff --git a/icu/prj/build.lst b/icu/prj/build.lst
index c633589..81ea915 100644
--- a/icu/prj/build.lst
+++ b/icu/prj/build.lst
@@ -1,4 +1,4 @@
-ic  icu :	solenv external NULL
+ic  icu :	NULL
 ic	icu		usr1	-	all	ic_mkout NULL
 ic	icu		nmake	-	u	ic_icu	NULL
 ic	icu		nmake	-	w,vc7	ic_icu	NULL
diff --git a/moz/prj/build.lst b/moz/prj/build.lst
index f5593fa..30fccd3 100644
--- a/moz/prj/build.lst
+++ b/moz/prj/build.lst
@@ -1,4 +1,4 @@
-moz	moz : solenv SO:so_prereq NULL
+moz	moz : SO:so_prereq NULL
 moz	moz				usr1	-	all	moz_mkout NULL
 moz	moz				nmake	-	all	moz_mozilla     NULL
 moz	moz\zipped			nmake	-	all	moz_zipped	moz_mozilla NULL
diff --git a/neon/prj/build.lst b/neon/prj/build.lst
index 2a13360..2a9078a 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 soltools EXPAT:expat LIBXML2:libxml2 NULL
 xh      neon     usr1           -       all     xh_mkout NULL
 xh      neon     nmake          -       all     xh_neon NULL
diff --git a/python/prj/build.lst b/python/prj/build.lst
index e742133..deff517 100644
--- a/python/prj/build.lst
+++ b/python/prj/build.lst
@@ -1,3 +1,3 @@
-py	python	:	SO:so_prereq solenv NULL
+py	python	:	SO:so_prereq NULL
 py	python			nmake	-	w,vc7	py_mkout NULL
 py	python			nmake	-	u	py_mkout NULL
diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst
index 813097c..493828c 100644
--- a/saxon/prj/build.lst
+++ b/saxon/prj/build.lst
@@ -1,2 +1,2 @@
-xx	saxon	:	solenv stax NULL
+xx	saxon	:	stax NULL
 xx	saxon	nmake	-	all	xx_saxon NULL
diff --git a/stax/prj/build.lst b/stax/prj/build.lst
index cbfc6ea..c76a30c 100644
--- a/stax/prj/build.lst
+++ b/stax/prj/build.lst
@@ -1,2 +1,2 @@
-tx stax : solenv NULL
+tx stax : NULL
 tx stax nmake - all tx_stax NULL
commit 54e565926ad01cfd4bc4ca26ad84ab471df08c92
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jul 7 17:29:53 2009 +0200

    Split build: Automake/autoconf stuff.
    
    * .gitignore:
    * AUTHORS:
    * COPYING:
    * ChangeLog:
    * INSTALL:
    * Makefile.am:
    * NEWS:
    * README:
    * autogen.sh:
    * build/prj/build.lst:
    * build/src/.gitignore:
    * build/src/OpenOffice.org-libs-extern-sys.pc.in:
    * build/stamp/.gitignore:
    * build/stamp/README.txt:
    * buildenv.in:
    * configure.in:

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7a7ce93
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,21 @@
+/Makefile
+/Makefile.in
+/aclocal.m4
+/autom4te.cache
+/buildenv
+/config.log
+/config.parms
+/config.status
+/configure
+/install-sh
+/logfile.log
+/missing
+/OpenOffice
+/solver
+
+/*/unxlng??.pro
+
+localize.sdf
+
+# temp files
+.*.swp
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..120da2f
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+http://www.openoffice.org/welcome/credits.html
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..cca7fc2
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..73c8beb
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1 @@
+Please see the output of git log.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..d3c5b40
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,237 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..da90ca2
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,34 @@
+# few needed variables
+
+stampdir = $(top_builddir)/build/stamp
+pkgconfigdir = $(libdir)/pkgconfig
+ooo_prefix = @OOO_PREFIX@
+solenvdir = $(ooo_prefix)/solenv
+solverdir = $(ooo_prefix)/solver
+buildsolverdir = "@abs_builddir@/solver"
+
+# the predefined rules
+
+include $(solverdir)/Makefile.common
+
+# what to add to the package
+
+# TODO
+EXTRA_DIST = 
+
+dist-hook: dist-hook-common
+
+# rules to execute
+
+all-local: $(stampdir)/all
+
+# TODO
+clean-local:
+
+# TODO
+distclean-local:
+
+install-data-local: $(stampdir)/all install-data-common
+	$(INSTALL_DATA) $(top_builddir)/build/src/OpenOffice.org-libs-extern-sys.pc $(DESTDIR)$(pkgconfigdir)/
+
+$(stampdir)/all: buildenv all-common
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
diff --git a/README b/README
new file mode 100644
index 0000000..138a828
--- /dev/null
+++ b/README
@@ -0,0 +1,12 @@
+OpenOffice.org - split build
+============================
+
+This package provides the possibility to build OpenOffice.org by pieces.  This
+one contains the 3rd party libraries that are usually available in the Linux
+systems.
+
+To build, do the usual
+
+./autogen.sh or ./configure
+make
+make install
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..8183a7f
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+aclocal $ACLOCAL_FLAGS || exit 1
+automake --gnu --add-missing --copy || exit 1
+autoconf || exit 1
+
+if test "x$NOCONFIGURE" = "x"; then
+    ./configure "$@"
+else
+    echo "Skipping configure process."
+fi
diff --git a/build/prj/build.lst b/build/prj/build.lst
new file mode 100644
index 0000000..0e8a413
--- /dev/null
+++ b/build/prj/build.lst
@@ -0,0 +1 @@
+bs build : BERKELEYDB:berkeleydb BITSTREAM_VERA_FONTS:bitstream_vera_fonts BOOST:boost CAIRO:cairo CURL:curl DICTIONARIES:dictionaries EXPAT:expat HUNSPELL:hunspell ICU:icu JPEG:jpeg LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NEON:neon PYTHON:python SAXON:saxon stax ZLIB:zlib NULL
diff --git a/build/src/.gitignore b/build/src/.gitignore
new file mode 100644
index 0000000..840ea15
--- /dev/null
+++ b/build/src/.gitignore
@@ -0,0 +1 @@
+/OpenOffice.org-*.pc
diff --git a/build/src/OpenOffice.org-libs-extern-sys.pc.in b/build/src/OpenOffice.org-libs-extern-sys.pc.in
new file mode 100644
index 0000000..e7aeeca
--- /dev/null
+++ b/build/src/OpenOffice.org-libs-extern-sys.pc.in
@@ -0,0 +1,7 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+
+Name: OpenOffice.org 3rd party system libraries
+Description: OpenOffice.org 3rd party system libraries package
+Version: @PACKAGE_VERSION@
diff --git a/build/stamp/.gitignore b/build/stamp/.gitignore
new file mode 100644
index 0000000..a9a95e9
--- /dev/null
+++ b/build/stamp/.gitignore
@@ -0,0 +1,3 @@
+/*
+!/README.txt
+!/.gitignore
diff --git a/build/stamp/README.txt b/build/stamp/README.txt
new file mode 100644
index 0000000..a28c9d7
--- /dev/null
+++ b/build/stamp/README.txt
@@ -0,0 +1 @@
+This directory is for storing the stamps generated by the toplevel Makefile.
diff --git a/buildenv.in b/buildenv.in
new file mode 100644
index 0000000..6c6c26e
--- /dev/null
+++ b/buildenv.in
@@ -0,0 +1,10 @@
+# Source this if you want to use build.pl directly, like:
+# . buildenv
+# or
+# source buildenv
+
+ooo_prefix="@OOO_PREFIX@"
+solverdir="$ooo_prefix/solver"
+buildsolverdir="@abs_builddir@/solver"
+
+. "$solverdir"/buildenv-common
diff --git a/configure.in b/configure.in
new file mode 100644
index 0000000..12b7358
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,19 @@
+dnl Version X.Y.A.M
+dnl   X.Y - version
+dnl   A   - minor, or 97 for devel, 98 for alpha, 99 for beta
+dnl   M   - milestone, or micro version
+AC_INIT(OpenOffice.org-libs-extern-sys,3.1.97.50)
+
+AM_INIT_AUTOMAKE([1.8b tar-ustar])
+PKG_PROG_PKG_CONFIG
+
+dnl Where should be the OOo installed
+PKG_CHECK_MODULES(OOO_BOOTSTRAP,OpenOffice.org-bootstrap)
+OOO_PREFIX=$($PKG_CONFIG --variable=ooo_prefix OpenOffice.org-bootstrap)
+AC_SUBST(OOO_PREFIX)
+
+dnl OpenOffice.org build dependencies
+PKG_CHECK_MODULES(OOO_URE,OpenOffice.org-ure)
+
+dnl Create what is necessary
+AC_OUTPUT([Makefile buildenv build/src/OpenOffice.org-libs-extern-sys.pc])
commit f64943c638e95eca5f877afaf43b6e5a7dd888de
Merge: 9dfd3cf... 0200bf8...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 2 15:48:07 2009 +0200

    Merge commit 'ooo/DEV300_m51'

commit 0200bf86aa3404fcf3a5c0630adb808ef4800219
Author: Release Engineers <releng at openoffice.org>
Date:   Mon Jun 29 10:25:28 2009 +0000

    Create DEV300_m51 milestone tag from trunk at 273467
commit df8ba285ddb09ddb7d9ddfae98559cebe8c9a738
Author: Rüdiger Timm <rt at openoffice.org>
Date:   Wed Jun 24 08:53:08 2009 +0000

    #i92629# remove DOS line ends from neon patch file

diff --git a/neon/neon.patch b/neon/neon.patch
index 268a733..bdc2964 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,785 +1,785 @@
---- misc/neon-0.28.2/src/config.h	2008-08-25 14:36:05.062500000 +0200
-+++ misc/build/neon-0.28.2/src/config.h	2008-08-25 14:32:17.656250000 +0200
-@@ -1 +1,479 @@
--dummy
-+
-+/* Define to specific EGD socket path */
-+/* #undef EGD_PATH */
-+
-+/* Define if EGD should be supported */
-+/* #undef ENABLE_EGD */
-+
-+/* Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise */
-+/* #undef GSS_C_NT_HOSTBASED_SERVICE */
-+
-+/* Define to 1 if you have the <arpa/inet.h> header file. */
-+#ifdef UNX
-+#define HAVE_ARPA_INET_H 1
-+#endif
-+
-+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET 1 */
-+
-+/* Define to 1 if you have the declaration of `h_errno', and to 0 if you
-+   don't. */
-+#ifdef WIN32 
-+#define HAVE_DECL_H_ERRNO 1
-+#endif
-+
-+/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
-+   */
-+#ifdef LINUX
-+#define HAVE_DECL_STPCPY 1
-+#endif
-+
-+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
-+   don't. */
-+#ifdef LINUX
-+#define HAVE_DECL_STRERROR_R 1
-+#endif
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#ifdef UNX
-+#define HAVE_DLFCN_H 1
-+#endif
-+
-+/* Define to 1 if you have the <errno.h> header file. */
-+#define HAVE_ERRNO_H 1
-+
-+/* Define if you have expat */
-+/* #undef HAVE_EXPAT */
-+
-+/* Define to 1 if you have the `fstat64' function. */
-+#define HAVE_FSTAT64
-+
-+/* Define to 1 if you have the `gai_strerror' function. */
-+#define HAVE_GAI_STRERROR 1
-+
-+/* Define if GnuTLS support is enabled */
-+/* #undef HAVE_GNUTLS */
-+
-+/* Define to 1 if you have the `gnutls_session_get_data2' function. */
-+/* #undef HAVE_GNUTLS_SESSION_GET_DATA2 */
-+
-+/* Define if GSSAPI support is enabled */
-+/* #undef HAVE_GSSAPI */
-+
-+/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
-+/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
-+
-+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
-+/* #undef HAVE_GSSAPI_GSSAPI_H */
-+
-+/* Define to 1 if you have the <gssapi.h> header file. */
-+/* #undef HAVE_GSSAPI_H */
-+
-+/* Define to 1 if you have the `gss_init_sec_context' function. */
-+/* #undef HAVE_GSS_INIT_SEC_CONTEXT */
-+
-+/* Define to 1 if you have the `hstrerror' function. */
-+/* #undef HAVE_HSTRERROR */
-+
-+/* Define to 1 if you have the `inet_ntop' function. */
-+#ifdef UNX
-+#define HAVE_INET_NTOP 1
-+#endif
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#ifdef UNX
-+#define HAVE_INTTYPES_H 1
-+#endif
-+
-+/* Define to 1 if you have the `isatty' function. */
-+#define HAVE_ISATTY 1
-+
-+/* Define to 1 if you have the <libintl.h> header file. */
-+/* #undef HAVE_LIBINTL_H */
-+
-+/* Define if you have libxml */
-+#define HAVE_LIBXML 1
-+
-+/* Define to 1 if you have the <libxml/parser.h> header file. */
-+#define HAVE_LIBXML_PARSER_H 1
-+
-+/* Define to 1 if you have the <libxml/xmlversion.h> header file. */
-+#define HAVE_LIBXML_XMLVERSION_H 1
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#define HAVE_LIMITS_H 1
-+
-+/* Define to 1 if you have the <locale.h> header file. */
-+#define HAVE_LOCALE_H 1
-+
-+/* Define to 1 if you have the `lseek64' function. */
-+#define HAVE_LSEEK64 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the <netdb.h> header file. */
-+#ifdef UNX
-+#define HAVE_NETDB_H 1
-+#endif
-+
-+/* Define to 1 if you have the <netinet/in.h> header file. */
-+#ifdef UNX
-+#define HAVE_NETINET_IN_H 1
-+#endif
-+
-+/* Define to 1 if you have the <netinet/tcp.h> header file. */
-+#ifdef UNX
-+#define HAVE_NETINET_TCP_H 1
-+#endif
-+
-+/* Define if OpenSSL support is enabled */
-+/* #undef HAVE_OPENSSL */
-+#define HAVE_OPENSSL
-+/* Define to 1 if you have the <openssl/opensslv.h> header file. */
-+/* #undef HAVE_OPENSSL_OPENSSLV_H */
-+#define HAVE_OPENSSL_OPENSSLV_H 1
-+/* Define to 1 if you have the <openssl/ssl.h> header file. */
-+/* #undef HAVE_OPENSSL_SSL_H */
-+#define HAVE_OPENSSL_SSL_H 1
-+/* Define to 1 if you have the `pipe' function. */
-+#define HAVE_PIPE 1
-+
-+/* Define to 1 if you have the `poll' function. */
-+#define HAVE_POLL 1
-+
-+/* Define to 1 if you have the `pthread_mutex_init' function. */
-+/* #undef HAVE_PTHREAD_MUTEX_INIT */
-+
-+/* Define to 1 if you have the `pthread_mutex_lock' function. */
-+/* #undef HAVE_PTHREAD_MUTEX_LOCK */
-+
-+/* Define to 1 if you have the `setlocale' function. */
-+#define HAVE_SETLOCALE 1
-+
-+/* Define to 1 if you have the `setsockopt' function. */
-+#if defined (LINUX) || defined (WIN32)
-+#define HAVE_SETSOCKOPT 1
-+#endif
-+
-+/* Define to 1 if you have the `setvbuf' function. */
-+#define HAVE_SETVBUF 1
-+
-+/* Define to 1 if you have the `shutdown' function. */
-+#ifdef LINUX
-+#define HAVE_SHUTDOWN 1
-+#endif
-+
-+/* Define to 1 if you have the `signal' function. */
-+#define HAVE_SIGNAL 1
-+
-+/* Define to 1 if you have the <signal.h> header file. */
-+#define HAVE_SIGNAL_H 1
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+#ifdef UNX
-+#define HAVE_SNPRINTF 1
-+#endif
-+
-+#ifdef WIN32
-+#define snprintf _snprintf
-+#endif
-+
-+/* Define to 1 if you have the <socks.h> header file. */
-+/* #undef HAVE_SOCKS_H */
-+
-+/* Define to 1 if you have the <stdarg.h> header file. */
-+#define HAVE_STDARG_H 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the `stpcpy' function. */
-+#ifdef LINUX
-+#define HAVE_STPCPY 1
-+#endif
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+#ifdef UNX
-+#define HAVE_STRCASECMP 1
-+#endif
-+
-+#ifdef WIN32
-+#define strcasecmp strcmpi
-+#endif
-+
-+/* Define to 1 if you have the `strerror_r' function. */
-+#ifdef LINUX
-+#define HAVE_STRERROR_R 1
-+#endif
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#ifdef UNX
-+#define HAVE_STRINGS_H 1
-+#endif
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strtoll' function. */
-+#define HAVE_STRTOLL 1
-+
-+/* Define to 1 if you have the `strtoq' function. */
-+/* #undef HAVE_STRTOQ */
-+
-+/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */
-+#ifdef LINUX
-+#define HAVE_STRUCT_TM_TM_GMTOFF 1
-+#endif
-+
-+/* Define to 1 if `__tm_gmtoff' is member of `struct tm'. */
-+/* #undef HAVE_STRUCT_TM___TM_GMTOFF */
-+
-+/* Define to 1 if you have the <sys/limits.h> header file. */
-+/* #undef HAVE_SYS_LIMITS_H */
-+
-+/* Define to 1 if you have the <sys/poll.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_POLL_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/select.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_SELECT_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_SOCKET_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_TIME_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define if the timezone global is available */
-+#ifndef MACOSX
-+#define HAVE_TIMEZONE 1
-+#endif
-+
-+/* Use trio printf replacement library */
-+/* #undef HAVE_TRIO */
-+
-+/* Define to 1 if you have the <trio.h> header file. */
-+/* #undef HAVE_TRIO_H */
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#ifdef UNX
-+#define HAVE_UNISTD_H 1
-+#endif
-+
-+/* Define to 1 if you have the `usleep' function. */
-+#ifdef UNX
-+#define HAVE_USLEEP 1
-+#endif
-+
-+/* Define to 1 if you have the `vsnprintf' function. */
-+#if defined( UNX ) || (defined(_MSC_VER) && (_MSC_VER > 1400))
-+#define HAVE_VSNPRINTF 1
-+#endif
-+
-+#ifdef WIN32
-+#if (defined(_MSC_VER) && (_MSC_VER < 1500)) || defined(__MINGW32__)
-+#define vsnprintf _vsnprintf
-+#endif
-+#endif
-+
-+/* Define to be location of localedir */
-+/* #undef LOCALEDIR */
-+
-+/* Defined when neon is built as a library */
-+#define NEON_IS_LIBRARY 1
-+
-+/* Define to be the neon version string */
-+#define NEON_VERSION "0.26.3"
-+
-+/* Define to enable debugging */
-+/* #undef NE_DEBUGGING */
-+
-+/* Define to be printf format string for off64_t */
-+#define NE_FMT_OFF64_T "lld"
-+
-+/* Define to be printf format string for off_t */
-+#define NE_FMT_OFF_T "ld"
-+
-+/* Define to be printf format string for size_t */
-+#define NE_FMT_SIZE_T "u"
-+
-+/* Define to be printf format string for ssize_t */
-+#define NE_FMT_SSIZE_T "d"
-+
-+/* Define to be printf format string for time_t */
-+#define NE_FMT_TIME_T "ld"
-+
-+/* Defined if DAV is supported */
-+#define NE_HAVE_DAV 1
-+
-+/* Defined if I18N is supported */
-+/* #undef NE_HAVE_I18N 1 */
-+
-+/* Defined if IPV6 is supported */
-+#define NE_HAVE_IPV6 1
-+
-+/* Defined if LFS is supported */
-+#define NE_HAVE_LFS 1
-+
-+/* Defined if SOCKS is supported */
-+/* #undef NE_HAVE_SOCKS */
-+
-+/* Defined if SSL is supported */
-+/* #undef NE_HAVE_SSL */
-+#define NE_HAVE_SSL
-+/* Defined if TS_SSL is supported */
-+/* #undef NE_HAVE_TS_SSL */
-+
-+/* Defined if ZLIB is supported */
-+/* #undef NE_HAVE_ZLIB */
-+
-+/* Define to be filename of an SSL CA root bundle */
-+/* #undef NE_SSL_CA_BUNDLE */
-+
-+/* Define if poll() should be used */
-+#ifdef UNX
-+#define NE_USE_POLL 1
-+#endif
-+
-+/* Define to be neon library major version */
-+#define NE_VERSION_MAJOR (0)
-+
-+/* Define to be neon library minor version */
-+#define NE_VERSION_MINOR (26)
-+
-+/* Define to be neon library patch version */
-+#define NE_VERSION_PATCH (3)
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT "neon at webdav.org"
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "neon"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "neon 0.26.3"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "neon"
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.26.3"
-+
-+/* The size of a `int', as computed by sizeof. */
-+#define SIZEOF_INT 4
-+
-+/* The size of a `long', as computed by sizeof. */
-+#define SIZEOF_LONG 4
-+
-+/* The size of a `long long', as computed by sizeof. */
-+#define SIZEOF_LONG_LONG 8
-+
-+/* The size of a `off64_t', as computed by sizeof. */
-+#define SIZEOF_OFF64_T 8
-+
-+/* The size of a `off_t', as computed by sizeof. */
-+#define SIZEOF_OFF_T 4
-+
-+/* The size of a `size_t', as computed by sizeof. */
-+#define SIZEOF_SIZE_T 4
-+
-+/* The size of a `ssize_t', as computed by sizeof. */
-+#define SIZEOF_SSIZE_T 4
-+
-+/* The size of a `time_t', as computed by sizeof. */
-+#define SIZEOF_TIME_T 4
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#ifdef SOLARIS
-+#define STDC_HEADERS 1
-+#endif
-+
-+/* Define to 1 if strerror_r returns char *. */
-+#ifdef LINUX
-+#define STRERROR_R_CHAR_P 1
-+#endif
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#define TIME_WITH_SYS_TIME 1
-+
-+/* Define if getaddrinfo supports AI_ADDRCONFIG */
-+/* #undef USE_GAI_ADDRCONFIG */
-+
-+/* Define if getaddrinfo() should be used */
-+#define USE_GETADDRINFO 1
-+
-+/* Define to 1 if your processor stores words with the most significant byte
-+   first (like Motorola and SPARC, unlike Intel and VAX). */
-+#if defined (SOLARIS) && defined (SPARC)
-+#define WORDS_BIGENDIAN 1
-+#endif
-+
-+/* Always defined to enable GNU extensions */
-+#define _GNU_SOURCE 1
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+/* #undef const */
-+
-+/* Define if in_addr_t is not available */
-+/* #undef in_addr_t */
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#if defined (SOLARIS) && defined (__SUNPRO_C)
-+#define inline
-+#endif
-+#endif
-+
-+/* Define to `long' if <sys/types.h> does not define. */
-+/* #undef off_t */
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+/* #undef pid_t */
-+
-+/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* #undef size_t */
-+
-+
-+/* Enable leak-tracking versions of ne_*alloc when NEON_MEMLEAK is enabled */
-+#ifdef NEON_MEMLEAK
-+# include "memleak.h"
-+#endif
-+
-+#if defined(HAVE_STPCPY) && defined(HAVE_DECL_STPCPY) && !HAVE_DECL_STPCPY && !defined(stpcpy)
-+char *stpcpy(char *, const char *);
-+#endif
-+
-+#ifdef WIN32
-+
-+#include <io.h>
-+
-+#define HAVE_SSPI 1
-+
-+#define HAVE_MEMCPY 1
-+
-+#define strncasecmp	strnicmp
-+#define inline      __inline
-+#define WIN32_LEAN_AND_MEAN
-+#define NOUSER
-+#define NOGDI
-+#define NONLS
-+#define NOCRYPT 
-+#endif
---- misc/neon-0.28.2/src/makefile.mk	2008-08-25 14:36:04.640625000 +0200
-+++ misc/build/neon-0.28.2/src/makefile.mk	2008-08-25 14:32:17.671875000 +0200
-@@ -1 +1,54 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=neon
-+TARGET=neon
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+CDEFS+=-DHAVE_CONFIG_H
-+
-+.IF "$(SYSTEM_LIBXML)" == "YES"
-+CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-+.ENDIF
-+
-+
-+SLOFILES= \
-+        $(SLO)$/ne_207.obj \
-+        $(SLO)$/ne_acl.obj \
-+        $(SLO)$/ne_alloc.obj \
-+        $(SLO)$/ne_auth.obj \
-+        $(SLO)$/ne_basic.obj \
-+        $(SLO)$/ne_compress.obj \
-+        $(SLO)$/ne_dates.obj \
-+        $(SLO)$/ne_i18n.obj \
-+        $(SLO)$/ne_locks.obj \
-+        $(SLO)$/ne_md5.obj \
-+        $(SLO)$/ne_props.obj \
-+        $(SLO)$/ne_redirect.obj \
-+        $(SLO)$/ne_request.obj \
-+        $(SLO)$/ne_session.obj \
-+        $(SLO)$/ne_socket.obj \
-+        $(SLO)$/ne_sspi.obj \
-+        $(SLO)$/ne_string.obj \
-+        $(SLO)$/ne_uri.obj \
-+        $(SLO)$/ne_utils.obj \
-+        $(SLO)$/ne_xml.obj \
-+        $(SLO)$/ne_xmlreq.obj \
-+        $(SLO)$/ne_openssl.obj
-+        
-+#       $(SLO)$/ne_gnutls.obj \
-+#       $(SLO)$/ne_stubssl.obj 
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
---- misc/neon-0.28.2/src/ne_207.c	2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_207.c	2009-01-09 10:12:39.563530700 +0100
-@@ -177,7 +177,6 @@
- 	/* Now we have the href, begin the response */
- 	if (p->start_response && HAVE_CDATA(p)) {
-             ne_uri ref, resolved;
--
-             if (ne_uri_parse(cdata, &ref) == 0) {
-                 ne_uri_resolve(&p->base, &ref, &resolved);
- 
-@@ -367,5 +366,4 @@
-     ne_request_destroy(req);
- 
-     return ret;
--}
--    
-+}    
---- misc/neon-0.28.2/src/ne_auth.c	2008-02-29 17:30:12.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_auth.c	2008-08-25 14:35:18.453125000 +0200
-@@ -598,9 +598,10 @@
-     int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
-     int status;
-     char *response = NULL;
--    
-+	char password[NE_ABUFSIZ];
-+
-     NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
--    
-+
-     if (!sess->sspi_context) {
-         ne_uri uri = {0};
- 
-@@ -614,8 +615,17 @@
-             return status;
-         }
-     }
-+
-+	/* Authentification needs more than one http request. 
-+	 * As long as authentification in progress use the existing credentials.
-+	 * Otherwise get new credentials.*/
-+	if (!parms->opaque)
-+		if (get_credentials(sess, errmsg, attempt, parms, password)) {
-+		        /* Failed to get credentials */
-+			    return -1;
-+		}
-     
--    status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response);
-+    status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response, sess->username, password);
-     if (status) {
-         return status;
-     }
-@@ -1413,6 +1423,7 @@
-         /* note above: allow a 401 in response to a CONNECT request
-          * from a proxy since some buggy proxies send that. */
- 	NE_DEBUG(NE_DBG_HTTPAUTH, "auth: Got challenge (code %d).\n", status->code);
-+
- 	if (!auth_challenge(sess, areq->attempt++, auth_hdr)) {
- 	    ret = NE_RETRY;
- 	} else {
---- misc/neon-0.28.2/src/ne_defs.h	2006-10-24 21:40:09.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_defs.h	2008-08-25 14:32:17.875000000 +0200
-@@ -41,7 +41,7 @@
- #endif
- 
- /* define ssize_t for Win32 */
--#if defined(WIN32) && !defined(ssize_t)
-+#if defined(WIN32) && !defined(ssize_t) && !defined(__MINGW32__)
- #define ssize_t int
- #endif
- 
---- misc/neon-0.28.2/src/ne_locks.h	2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_locks.h	2008-08-25 14:32:17.937500000 +0200
-@@ -22,6 +22,10 @@
- #ifndef NE_LOCKS_H
- #define NE_LOCKS_H
- 
-+# if defined __GNUC__
-+# pragma GCC system_header
-+# endif
-+
- #include "ne_request.h" /* for ne_session + ne_request */
- #include "ne_uri.h" /* for ne_uri */
- 
---- misc/neon-0.28.2/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_sspi.c	2009-01-09 10:31:05.752056400 +0100
-@@ -202,9 +202,48 @@
-         return -1;
-     }
- 
-+    return 0; 
-+}
-+
-+/*
-+ * Simplification wrapper arround AcquireCredentialsHandle as most of
-+ * the parameters do not change. 
-+ */
-+static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password)
-+{
-+    SECURITY_STATUS status;
-+    TimeStamp timestamp;
-+
-+	const char *domain = "";
-+
-+	int rc, rcISC;
-+	SecPkgInfo *secPackInfo;
-+	SEC_WINNT_AUTH_IDENTITY *nameAndPwd = NULL;
-+	int bytesReceived = 0, bytesSent = 0;
-+
-+	nameAndPwd = (SEC_WINNT_AUTH_IDENTITY *) malloc( sizeof(SEC_WINNT_AUTH_IDENTITY) );
-+	memset( nameAndPwd, '\0', sizeof (*nameAndPwd) );
-+	nameAndPwd->Domain = (unsigned char *) _strdup( domain? domain: "" );
-+	nameAndPwd->DomainLength = domain? strlen( domain ): 0;
-+	nameAndPwd->User = (unsigned char *) _strdup( username? username: "" );
-+	nameAndPwd->UserLength = username? strlen( username ): 0;
-+	nameAndPwd->Password = (unsigned char *) _strdup( password? password: "" );
-+	nameAndPwd->PasswordLength = password? strlen( password ): 0;
-+	nameAndPwd->Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;
-+
-+	status = pSFT->AcquireCredentialsHandle( NULL, package, SECPKG_CRED_OUTBOUND,
-+		NULL, nameAndPwd, NULL, NULL, credentials, &timestamp );
-+
-+    if (status != SEC_E_OK) {
-+        NE_DEBUG(NE_DBG_HTTPAUTH,
-+                 "sspi: AcquireCredentialsHandle [fail] [%x].\n", status);
-+        return -1;
-+    }
-+
-     return 0;
- }
- 
-+
- /*
-  * Wrapper arround initializeSecurityContext.  Supplies several
-  * default parameters as well as logging in case of errors.
-@@ -483,7 +522,7 @@
-  * Processes received authentication tokens as well as supplies the
-  * response token.
-  */
--int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken)
-+int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken, const char* username, const char* password)
- {
-     SecBufferDesc outBufferDesc;
-     SecBuffer outBuffer;
-@@ -552,7 +591,7 @@
-             {
-                 freeBuffer(&outBufferDesc);
-                 sspiContext->authfinished = 0;
--                NE_DEBUG(NE_DBG_HTTPAUTH,"sspi: failing because starting over from failed try.\n");
-+                NE_DEBUG(NE_DBG_HTTPAUTH,"sspi: fai6 over from failed try.\n");
-                 return -1;
-             }
-             sspiContext->authfinished = 0;
-@@ -560,14 +599,26 @@
- 
-         /* Reset any existing context since we are starting over */
-         resetContext(sspiContext);
-+		
-+		if (strlen(username) != 0) {
-+			if (acquireCredentialsHandleForUsername
-+				(&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) {
-+					freeBuffer(&outBufferDesc);
-+					NE_DEBUG(NE_DBG_HTTPAUTH,
-+						"sspi: acquireCredentialsHandleForUsername failed.\n");
-+					return -1;
-+			}
-+		} else {
-+			if (acquireCredentialsHandle
-+				(&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
-+					freeBuffer(&outBufferDesc);
-+					NE_DEBUG(NE_DBG_HTTPAUTH,
-+						"sspi: acquireCredentialsHandle failed.\n");
-+					return -1;
-+			}
-+		}
- 
--        if (acquireCredentialsHandle
--            (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
--                freeBuffer(&outBufferDesc);
--                NE_DEBUG(NE_DBG_HTTPAUTH,
--                    "sspi: acquireCredentialsHandle failed.\n");
--                return -1;
--        }
-+        
- 
-         securityStatus =
-             initializeSecurityContext(&sspiContext->credentials, NULL,
---- misc/neon-0.28.2/src/ne_sspi.h	2006-02-12 13:05:14.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_sspi.h	2008-08-25 14:32:18.000000000 +0200
-@@ -41,7 +41,7 @@
- int ne_sspi_clear_context(void *context);
- 
- int ne_sspi_authenticate(void *context, const char *base64Token,
--                         char **responseToken);
-+                         char **responseToken, const char* username, const char* password);
- 
- #endif /* HAVE_SSPI */
- 
---- misc/neon-0.28.2/src/ne_uri.c	2007-12-05 12:04:47.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_uri.c	2009-01-09 10:21:45.201720200 +0100
-@@ -42,7 +42,7 @@
- #include "ne_alloc.h"
- #include "ne_uri.h"
- 
--/* URI ABNF from RFC 3986: */
-+/* URI ABNF from RFC 3986: (TKR: SharePoint is contradictory to this RFC. So I fix it here. )*/
- 
- #define PS (0x0001) /* "+" */
- #define PC (0x0002) /* "%" */
-@@ -67,6 +67,9 @@
- 
- #define OT (0x4000) /* others */
- 
-+/* TKR new symbol */
-+#define WS (0x8000) /* Whitespaces ( Space, Tab ) */
-+
- #define URI_ALPHA (AL)
- #define URI_DIGIT (DG)
- 
-@@ -83,20 +86,21 @@
- /* pchar = unreserved / pct-encoded / sub-delims / ":" / "@" */
- #define URI_PCHAR (URI_UNRESERVED | PC | URI_SUBDELIM | CL | AT)
- /* invented: segchar = pchar / "/" */
--#define URI_SEGCHAR (URI_PCHAR | FS)
-+/* (TKR) WS added */
-+#define URI_SEGCHAR (URI_PCHAR | FS | WS)
- /* query = *( pchar / "/" / "?" ) */
- #define URI_QUERY (URI_PCHAR | FS | QU)
- /* fragment == query */
- #define URI_FRAGMENT URI_QUERY
- 
- /* any characters which should be path-escaped: */
--#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | PC)
-+#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | WS | PC)
- 
- static const unsigned int uri_chars[256] = {
- /* 0xXX    x0      x2      x4      x6      x8      xA      xC      xE     */
--/*   0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
-+/*   0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, WS, OT, OT, OT, OT, OT, OT,
- /*   1x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
--/*   2x */ OT, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
-+/*   2x */ WS, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
- /*   3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU,
- /*   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.28.2/src/config.h	2008-08-25 14:36:05.062500000 +0200
++++ misc/build/neon-0.28.2/src/config.h	2008-08-25 14:32:17.656250000 +0200
+@@ -1 +1,479 @@
+-dummy
++
++/* Define to specific EGD socket path */
++/* #undef EGD_PATH */
++
++/* Define if EGD should be supported */
++/* #undef ENABLE_EGD */
++
++/* Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise */
++/* #undef GSS_C_NT_HOSTBASED_SERVICE */
++
++/* Define to 1 if you have the <arpa/inet.h> header file. */
++#ifdef UNX
++#define HAVE_ARPA_INET_H 1
++#endif
++
++/* Define to 1 if you have the `bind_textdomain_codeset' function. */
++/* #undef HAVE_BIND_TEXTDOMAIN_CODESET 1 */
++
++/* Define to 1 if you have the declaration of `h_errno', and to 0 if you
++   don't. */
++#ifdef WIN32 
++#define HAVE_DECL_H_ERRNO 1
++#endif
++
++/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
++   */
++#ifdef LINUX
++#define HAVE_DECL_STPCPY 1
++#endif
++
++/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
++   don't. */
++#ifdef LINUX
++#define HAVE_DECL_STRERROR_R 1
++#endif
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#ifdef UNX
++#define HAVE_DLFCN_H 1
++#endif
++
++/* Define to 1 if you have the <errno.h> header file. */
++#define HAVE_ERRNO_H 1
++
++/* Define if you have expat */
++/* #undef HAVE_EXPAT */
++
++/* Define to 1 if you have the `fstat64' function. */
++#define HAVE_FSTAT64
++
++/* Define to 1 if you have the `gai_strerror' function. */
++#define HAVE_GAI_STRERROR 1
++
++/* Define if GnuTLS support is enabled */
++/* #undef HAVE_GNUTLS */
++
++/* Define to 1 if you have the `gnutls_session_get_data2' function. */
++/* #undef HAVE_GNUTLS_SESSION_GET_DATA2 */
++
++/* Define if GSSAPI support is enabled */
++/* #undef HAVE_GSSAPI */
++
++/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
++/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
++
++/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
++/* #undef HAVE_GSSAPI_GSSAPI_H */
++
++/* Define to 1 if you have the <gssapi.h> header file. */
++/* #undef HAVE_GSSAPI_H */
++
++/* Define to 1 if you have the `gss_init_sec_context' function. */
++/* #undef HAVE_GSS_INIT_SEC_CONTEXT */
++
++/* Define to 1 if you have the `hstrerror' function. */
++/* #undef HAVE_HSTRERROR */
++
++/* Define to 1 if you have the `inet_ntop' function. */
++#ifdef UNX
++#define HAVE_INET_NTOP 1
++#endif
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#ifdef UNX
++#define HAVE_INTTYPES_H 1
++#endif
++
++/* Define to 1 if you have the `isatty' function. */
++#define HAVE_ISATTY 1
++
++/* Define to 1 if you have the <libintl.h> header file. */
++/* #undef HAVE_LIBINTL_H */
++
++/* Define if you have libxml */
++#define HAVE_LIBXML 1
++
++/* Define to 1 if you have the <libxml/parser.h> header file. */
++#define HAVE_LIBXML_PARSER_H 1
++
++/* Define to 1 if you have the <libxml/xmlversion.h> header file. */
++#define HAVE_LIBXML_XMLVERSION_H 1
++
++/* Define to 1 if you have the <limits.h> header file. */
++#define HAVE_LIMITS_H 1
++
++/* Define to 1 if you have the <locale.h> header file. */
++#define HAVE_LOCALE_H 1
++
++/* Define to 1 if you have the `lseek64' function. */
++#define HAVE_LSEEK64 1
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the <netdb.h> header file. */
++#ifdef UNX
++#define HAVE_NETDB_H 1
++#endif
++
++/* Define to 1 if you have the <netinet/in.h> header file. */
++#ifdef UNX
++#define HAVE_NETINET_IN_H 1
++#endif
++
++/* Define to 1 if you have the <netinet/tcp.h> header file. */
++#ifdef UNX
++#define HAVE_NETINET_TCP_H 1
++#endif
++
++/* Define if OpenSSL support is enabled */
++/* #undef HAVE_OPENSSL */
++#define HAVE_OPENSSL
++/* Define to 1 if you have the <openssl/opensslv.h> header file. */
++/* #undef HAVE_OPENSSL_OPENSSLV_H */
++#define HAVE_OPENSSL_OPENSSLV_H 1
++/* Define to 1 if you have the <openssl/ssl.h> header file. */
++/* #undef HAVE_OPENSSL_SSL_H */
++#define HAVE_OPENSSL_SSL_H 1
++/* Define to 1 if you have the `pipe' function. */
++#define HAVE_PIPE 1
++
++/* Define to 1 if you have the `poll' function. */
++#define HAVE_POLL 1
++
++/* Define to 1 if you have the `pthread_mutex_init' function. */
++/* #undef HAVE_PTHREAD_MUTEX_INIT */
++
++/* Define to 1 if you have the `pthread_mutex_lock' function. */
++/* #undef HAVE_PTHREAD_MUTEX_LOCK */
++
++/* Define to 1 if you have the `setlocale' function. */
++#define HAVE_SETLOCALE 1
++
++/* Define to 1 if you have the `setsockopt' function. */
++#if defined (LINUX) || defined (WIN32)
++#define HAVE_SETSOCKOPT 1
++#endif
++
++/* Define to 1 if you have the `setvbuf' function. */
++#define HAVE_SETVBUF 1
++
++/* Define to 1 if you have the `shutdown' function. */
++#ifdef LINUX
++#define HAVE_SHUTDOWN 1
++#endif
++
++/* Define to 1 if you have the `signal' function. */
++#define HAVE_SIGNAL 1
++
++/* Define to 1 if you have the <signal.h> header file. */
++#define HAVE_SIGNAL_H 1
++
++/* Define to 1 if you have the `snprintf' function. */
++#ifdef UNX
++#define HAVE_SNPRINTF 1
++#endif
++
++#ifdef WIN32
++#define snprintf _snprintf
++#endif
++
++/* Define to 1 if you have the <socks.h> header file. */
++/* #undef HAVE_SOCKS_H */
++
++/* Define to 1 if you have the <stdarg.h> header file. */
++#define HAVE_STDARG_H 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the `stpcpy' function. */
++#ifdef LINUX
++#define HAVE_STPCPY 1
++#endif
++
++/* Define to 1 if you have the `strcasecmp' function. */
++#ifdef UNX
++#define HAVE_STRCASECMP 1
++#endif
++
++#ifdef WIN32
++#define strcasecmp strcmpi
++#endif
++
++/* Define to 1 if you have the `strerror_r' function. */
++#ifdef LINUX
++#define HAVE_STRERROR_R 1
++#endif
++
++/* Define to 1 if you have the <strings.h> header file. */
++#ifdef UNX
++#define HAVE_STRINGS_H 1
++#endif
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the `strtoll' function. */
++#define HAVE_STRTOLL 1
++
++/* Define to 1 if you have the `strtoq' function. */
++/* #undef HAVE_STRTOQ */
++
++/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */
++#ifdef LINUX
++#define HAVE_STRUCT_TM_TM_GMTOFF 1
++#endif
++
++/* Define to 1 if `__tm_gmtoff' is member of `struct tm'. */
++/* #undef HAVE_STRUCT_TM___TM_GMTOFF */
++
++/* Define to 1 if you have the <sys/limits.h> header file. */
++/* #undef HAVE_SYS_LIMITS_H */
++
++/* Define to 1 if you have the <sys/poll.h> header file. */
++#ifdef UNX
++#define HAVE_SYS_POLL_H 1
++#endif
++
++/* Define to 1 if you have the <sys/select.h> header file. */
++#ifdef UNX
++#define HAVE_SYS_SELECT_H 1
++#endif
++
++/* Define to 1 if you have the <sys/socket.h> header file. */
++#ifdef UNX
++#define HAVE_SYS_SOCKET_H 1
++#endif
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#ifdef UNX
++#define HAVE_SYS_TIME_H 1
++#endif
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define if the timezone global is available */
++#ifndef MACOSX
++#define HAVE_TIMEZONE 1
++#endif
++
++/* Use trio printf replacement library */
++/* #undef HAVE_TRIO */
++
++/* Define to 1 if you have the <trio.h> header file. */
++/* #undef HAVE_TRIO_H */
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#ifdef UNX
++#define HAVE_UNISTD_H 1
++#endif
++
++/* Define to 1 if you have the `usleep' function. */
++#ifdef UNX
++#define HAVE_USLEEP 1
++#endif
++
++/* Define to 1 if you have the `vsnprintf' function. */
++#if defined( UNX ) || (defined(_MSC_VER) && (_MSC_VER > 1400))
++#define HAVE_VSNPRINTF 1
++#endif
++
++#ifdef WIN32
++#if (defined(_MSC_VER) && (_MSC_VER < 1500)) || defined(__MINGW32__)
++#define vsnprintf _vsnprintf
++#endif
++#endif
++
++/* Define to be location of localedir */
++/* #undef LOCALEDIR */
++
++/* Defined when neon is built as a library */
++#define NEON_IS_LIBRARY 1
++
++/* Define to be the neon version string */
++#define NEON_VERSION "0.26.3"
++
++/* Define to enable debugging */
++/* #undef NE_DEBUGGING */
++
++/* Define to be printf format string for off64_t */
++#define NE_FMT_OFF64_T "lld"
++
++/* Define to be printf format string for off_t */
++#define NE_FMT_OFF_T "ld"
++
++/* Define to be printf format string for size_t */
++#define NE_FMT_SIZE_T "u"
++
++/* Define to be printf format string for ssize_t */
++#define NE_FMT_SSIZE_T "d"
++
++/* Define to be printf format string for time_t */
++#define NE_FMT_TIME_T "ld"
++
++/* Defined if DAV is supported */
++#define NE_HAVE_DAV 1
++
++/* Defined if I18N is supported */
++/* #undef NE_HAVE_I18N 1 */
++
++/* Defined if IPV6 is supported */
++#define NE_HAVE_IPV6 1
++
++/* Defined if LFS is supported */
++#define NE_HAVE_LFS 1
++
++/* Defined if SOCKS is supported */
++/* #undef NE_HAVE_SOCKS */
++
++/* Defined if SSL is supported */
++/* #undef NE_HAVE_SSL */
++#define NE_HAVE_SSL
++/* Defined if TS_SSL is supported */
++/* #undef NE_HAVE_TS_SSL */
++
++/* Defined if ZLIB is supported */
++/* #undef NE_HAVE_ZLIB */
++
++/* Define to be filename of an SSL CA root bundle */
++/* #undef NE_SSL_CA_BUNDLE */
++
++/* Define if poll() should be used */
++#ifdef UNX
++#define NE_USE_POLL 1
++#endif
++
++/* Define to be neon library major version */
++#define NE_VERSION_MAJOR (0)
++
++/* Define to be neon library minor version */
++#define NE_VERSION_MINOR (26)
++
++/* Define to be neon library patch version */
++#define NE_VERSION_PATCH (3)
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "neon at webdav.org"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "neon"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "neon 0.26.3"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "neon"
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "0.26.3"
++
++/* The size of a `int', as computed by sizeof. */
++#define SIZEOF_INT 4
++
++/* The size of a `long', as computed by sizeof. */
++#define SIZEOF_LONG 4
++
++/* The size of a `long long', as computed by sizeof. */
++#define SIZEOF_LONG_LONG 8
++
++/* The size of a `off64_t', as computed by sizeof. */
++#define SIZEOF_OFF64_T 8
++
++/* The size of a `off_t', as computed by sizeof. */
++#define SIZEOF_OFF_T 4
++
++/* The size of a `size_t', as computed by sizeof. */
++#define SIZEOF_SIZE_T 4
++
++/* The size of a `ssize_t', as computed by sizeof. */
++#define SIZEOF_SSIZE_T 4
++
++/* The size of a `time_t', as computed by sizeof. */
++#define SIZEOF_TIME_T 4
++
++/* Define to 1 if you have the ANSI C header files. */
++#ifdef SOLARIS
++#define STDC_HEADERS 1
++#endif
++
++/* Define to 1 if strerror_r returns char *. */
++#ifdef LINUX
++#define STRERROR_R_CHAR_P 1
++#endif
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#define TIME_WITH_SYS_TIME 1
++
++/* Define if getaddrinfo supports AI_ADDRCONFIG */
++/* #undef USE_GAI_ADDRCONFIG */
++
++/* Define if getaddrinfo() should be used */
++#define USE_GETADDRINFO 1
++
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#if defined (SOLARIS) && defined (SPARC)
++#define WORDS_BIGENDIAN 1
++#endif
++
++/* Always defined to enable GNU extensions */
++#define _GNU_SOURCE 1
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
++
++/* Define if in_addr_t is not available */
++/* #undef in_addr_t */
++
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++   calls it, or to nothing if 'inline' is not supported under any name.  */
++#ifndef __cplusplus
++#if defined (SOLARIS) && defined (__SUNPRO_C)
++#define inline
++#endif
++#endif
++
++/* Define to `long' if <sys/types.h> does not define. */
++/* #undef off_t */
++
++/* Define to `int' if <sys/types.h> does not define. */
++/* #undef pid_t */
++
++/* Define to `unsigned' if <sys/types.h> does not define. */
++/* #undef size_t */
++
++
++/* Enable leak-tracking versions of ne_*alloc when NEON_MEMLEAK is enabled */
++#ifdef NEON_MEMLEAK
++# include "memleak.h"
++#endif
++
++#if defined(HAVE_STPCPY) && defined(HAVE_DECL_STPCPY) && !HAVE_DECL_STPCPY && !defined(stpcpy)
++char *stpcpy(char *, const char *);
++#endif
++
++#ifdef WIN32
++
++#include <io.h>
++
++#define HAVE_SSPI 1
++
++#define HAVE_MEMCPY 1
++
++#define strncasecmp	strnicmp
++#define inline      __inline
++#define WIN32_LEAN_AND_MEAN
++#define NOUSER
++#define NOGDI
++#define NONLS
++#define NOCRYPT 
++#endif
+--- misc/neon-0.28.2/src/makefile.mk	2008-08-25 14:36:04.640625000 +0200
++++ misc/build/neon-0.28.2/src/makefile.mk	2008-08-25 14:32:17.671875000 +0200
+@@ -1 +1,54 @@
+-dummy
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=neon
++TARGET=neon
++LIBTARGET=NO
++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++# --- Files --------------------------------------------------------
++
++CDEFS+=-DHAVE_CONFIG_H
++
++.IF "$(SYSTEM_LIBXML)" == "YES"
++CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++.ENDIF
++
++
++SLOFILES= \
++        $(SLO)$/ne_207.obj \
++        $(SLO)$/ne_acl.obj \
++        $(SLO)$/ne_alloc.obj \
++        $(SLO)$/ne_auth.obj \
++        $(SLO)$/ne_basic.obj \
++        $(SLO)$/ne_compress.obj \
++        $(SLO)$/ne_dates.obj \
++        $(SLO)$/ne_i18n.obj \
++        $(SLO)$/ne_locks.obj \
++        $(SLO)$/ne_md5.obj \
++        $(SLO)$/ne_props.obj \
++        $(SLO)$/ne_redirect.obj \
++        $(SLO)$/ne_request.obj \
++        $(SLO)$/ne_session.obj \
++        $(SLO)$/ne_socket.obj \
++        $(SLO)$/ne_sspi.obj \
++        $(SLO)$/ne_string.obj \
++        $(SLO)$/ne_uri.obj \
++        $(SLO)$/ne_utils.obj \
++        $(SLO)$/ne_xml.obj \
++        $(SLO)$/ne_xmlreq.obj \
++        $(SLO)$/ne_openssl.obj
++        
++#       $(SLO)$/ne_gnutls.obj \
++#       $(SLO)$/ne_stubssl.obj 
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
+--- misc/neon-0.28.2/src/ne_207.c	2006-01-02 12:43:19.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_207.c	2009-01-09 10:12:39.563530700 +0100
+@@ -177,7 +177,6 @@
+ 	/* Now we have the href, begin the response */
+ 	if (p->start_response && HAVE_CDATA(p)) {
+             ne_uri ref, resolved;
+-
+             if (ne_uri_parse(cdata, &ref) == 0) {
+                 ne_uri_resolve(&p->base, &ref, &resolved);
+ 
+@@ -367,5 +366,4 @@
+     ne_request_destroy(req);
+ 
+     return ret;
+-}
+-    
++}    
+--- misc/neon-0.28.2/src/ne_auth.c	2008-02-29 17:30:12.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_auth.c	2008-08-25 14:35:18.453125000 +0200
+@@ -598,9 +598,10 @@
+     int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
+     int status;
+     char *response = NULL;
+-    
++	char password[NE_ABUFSIZ];
++
+     NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
+-    
++
+     if (!sess->sspi_context) {
+         ne_uri uri = {0};
+ 
+@@ -614,8 +615,17 @@
+             return status;
+         }
+     }
++
++	/* Authentification needs more than one http request. 
++	 * As long as authentification in progress use the existing credentials.
++	 * Otherwise get new credentials.*/
++	if (!parms->opaque)
++		if (get_credentials(sess, errmsg, attempt, parms, password)) {
++		        /* Failed to get credentials */
++			    return -1;
++		}
+     
+-    status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response);
++    status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response, sess->username, password);
+     if (status) {
+         return status;
+     }
+@@ -1413,6 +1423,7 @@
+         /* note above: allow a 401 in response to a CONNECT request
+          * from a proxy since some buggy proxies send that. */
+ 	NE_DEBUG(NE_DBG_HTTPAUTH, "auth: Got challenge (code %d).\n", status->code);
++
+ 	if (!auth_challenge(sess, areq->attempt++, auth_hdr)) {
+ 	    ret = NE_RETRY;
+ 	} else {
+--- misc/neon-0.28.2/src/ne_defs.h	2006-10-24 21:40:09.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_defs.h	2008-08-25 14:32:17.875000000 +0200
+@@ -41,7 +41,7 @@
+ #endif
+ 
+ /* define ssize_t for Win32 */
+-#if defined(WIN32) && !defined(ssize_t)
++#if defined(WIN32) && !defined(ssize_t) && !defined(__MINGW32__)
+ #define ssize_t int
+ #endif
+ 
+--- misc/neon-0.28.2/src/ne_locks.h	2006-01-02 12:43:19.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_locks.h	2008-08-25 14:32:17.937500000 +0200
+@@ -22,6 +22,10 @@
+ #ifndef NE_LOCKS_H
+ #define NE_LOCKS_H
+ 
++# if defined __GNUC__
++# pragma GCC system_header
++# endif
++
+ #include "ne_request.h" /* for ne_session + ne_request */
+ #include "ne_uri.h" /* for ne_uri */
+ 
+--- misc/neon-0.28.2/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_sspi.c	2009-01-09 10:31:05.752056400 +0100
+@@ -202,9 +202,48 @@
+         return -1;
+     }
+ 
++    return 0; 
++}
++
++/*
++ * Simplification wrapper arround AcquireCredentialsHandle as most of
++ * the parameters do not change. 
++ */
++static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password)
++{
++    SECURITY_STATUS status;
++    TimeStamp timestamp;
++
++	const char *domain = "";
++
++	int rc, rcISC;
++	SecPkgInfo *secPackInfo;
++	SEC_WINNT_AUTH_IDENTITY *nameAndPwd = NULL;
++	int bytesReceived = 0, bytesSent = 0;
++
++	nameAndPwd = (SEC_WINNT_AUTH_IDENTITY *) malloc( sizeof(SEC_WINNT_AUTH_IDENTITY) );
++	memset( nameAndPwd, '\0', sizeof (*nameAndPwd) );
++	nameAndPwd->Domain = (unsigned char *) _strdup( domain? domain: "" );
++	nameAndPwd->DomainLength = domain? strlen( domain ): 0;
++	nameAndPwd->User = (unsigned char *) _strdup( username? username: "" );
++	nameAndPwd->UserLength = username? strlen( username ): 0;
++	nameAndPwd->Password = (unsigned char *) _strdup( password? password: "" );
++	nameAndPwd->PasswordLength = password? strlen( password ): 0;
++	nameAndPwd->Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;
++
++	status = pSFT->AcquireCredentialsHandle( NULL, package, SECPKG_CRED_OUTBOUND,
++		NULL, nameAndPwd, NULL, NULL, credentials, &timestamp );
++
++    if (status != SEC_E_OK) {
++        NE_DEBUG(NE_DBG_HTTPAUTH,
++                 "sspi: AcquireCredentialsHandle [fail] [%x].\n", status);
++        return -1;
++    }
++
+     return 0;
+ }
+ 
++
+ /*
+  * Wrapper arround initializeSecurityContext.  Supplies several
+  * default parameters as well as logging in case of errors.
+@@ -483,7 +522,7 @@
+  * Processes received authentication tokens as well as supplies the
+  * response token.
+  */
+-int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken)
++int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken, const char* username, const char* password)
+ {
+     SecBufferDesc outBufferDesc;
+     SecBuffer outBuffer;
+@@ -552,7 +591,7 @@
+             {
+                 freeBuffer(&outBufferDesc);
+                 sspiContext->authfinished = 0;
+-                NE_DEBUG(NE_DBG_HTTPAUTH,"sspi: failing because starting over from failed try.\n");
++                NE_DEBUG(NE_DBG_HTTPAUTH,"sspi: fai6 over from failed try.\n");
+                 return -1;
+             }
+             sspiContext->authfinished = 0;
+@@ -560,14 +599,26 @@
+ 
+         /* Reset any existing context since we are starting over */
+         resetContext(sspiContext);
++		
++		if (strlen(username) != 0) {
++			if (acquireCredentialsHandleForUsername
++				(&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) {
++					freeBuffer(&outBufferDesc);
++					NE_DEBUG(NE_DBG_HTTPAUTH,
++						"sspi: acquireCredentialsHandleForUsername failed.\n");
++					return -1;
++			}
++		} else {
++			if (acquireCredentialsHandle
++				(&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
++					freeBuffer(&outBufferDesc);
++					NE_DEBUG(NE_DBG_HTTPAUTH,
++						"sspi: acquireCredentialsHandle failed.\n");
++					return -1;
++			}
++		}
+ 
+-        if (acquireCredentialsHandle
+-            (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
+-                freeBuffer(&outBufferDesc);
+-                NE_DEBUG(NE_DBG_HTTPAUTH,
+-                    "sspi: acquireCredentialsHandle failed.\n");
+-                return -1;
+-        }
++        
+ 
+         securityStatus =
+             initializeSecurityContext(&sspiContext->credentials, NULL,
+--- misc/neon-0.28.2/src/ne_sspi.h	2006-02-12 13:05:14.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_sspi.h	2008-08-25 14:32:18.000000000 +0200
+@@ -41,7 +41,7 @@
+ int ne_sspi_clear_context(void *context);
+ 
+ int ne_sspi_authenticate(void *context, const char *base64Token,
+-                         char **responseToken);
++                         char **responseToken, const char* username, const char* password);
+ 
+ #endif /* HAVE_SSPI */
+ 
+--- misc/neon-0.28.2/src/ne_uri.c	2007-12-05 12:04:47.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_uri.c	2009-01-09 10:21:45.201720200 +0100
+@@ -42,7 +42,7 @@
+ #include "ne_alloc.h"
+ #include "ne_uri.h"
+ 
+-/* URI ABNF from RFC 3986: */
++/* URI ABNF from RFC 3986: (TKR: SharePoint is contradictory to this RFC. So I fix it here. )*/
+ 
+ #define PS (0x0001) /* "+" */
+ #define PC (0x0002) /* "%" */
+@@ -67,6 +67,9 @@
+ 
+ #define OT (0x4000) /* others */
+ 
++/* TKR new symbol */
++#define WS (0x8000) /* Whitespaces ( Space, Tab ) */
++
+ #define URI_ALPHA (AL)
+ #define URI_DIGIT (DG)
+ 
+@@ -83,20 +86,21 @@
+ /* pchar = unreserved / pct-encoded / sub-delims / ":" / "@" */
+ #define URI_PCHAR (URI_UNRESERVED | PC | URI_SUBDELIM | CL | AT)
+ /* invented: segchar = pchar / "/" */
+-#define URI_SEGCHAR (URI_PCHAR | FS)
++/* (TKR) WS added */
++#define URI_SEGCHAR (URI_PCHAR | FS | WS)
+ /* query = *( pchar / "/" / "?" ) */
+ #define URI_QUERY (URI_PCHAR | FS | QU)
+ /* fragment == query */
+ #define URI_FRAGMENT URI_QUERY
+ 
+ /* any characters which should be path-escaped: */
+-#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | PC)
++#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | WS | PC)
+ 
+ static const unsigned int uri_chars[256] = {
+ /* 0xXX    x0      x2      x4      x6      x8      xA      xC      xE     */
+-/*   0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
++/*   0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, WS, OT, OT, OT, OT, OT, OT,
+ /*   1x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
+-/*   2x */ OT, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
++/*   2x */ WS, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
+ /*   3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU,
+ /*   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,
commit 1eaac327c1f93c4be58ea7af617d669caf4f7f21
Author: Rüdiger Timm <rt at openoffice.org>
Date:   Wed Jun 24 08:52:46 2009 +0000

    #i92629# remove DOS line ends from curl patch file

diff --git a/curl/curl-7.12.2.patch b/curl/curl-7.12.2.patch
index f176d1b..f65e4cd 100644
--- a/curl/curl-7.12.2.patch
+++ b/curl/curl-7.12.2.patch
@@ -1,1085 +1,1085 @@
---- misc/curl-7.12.2/configure	2004-10-18 00:22:10.000000000 +0200
-+++ misc/build/curl-7.12.2/configure	2008-07-08 16:11:12.796875000 +0200
-@@ -1538,8 +1538,8 @@
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
-@@ -2314,8 +2314,8 @@
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-@@ -2967,15 +2967,15 @@
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+    CFLAGS="$ADDCFLAGS -g -O2"
-   else
--    CFLAGS="-g"
-+    CFLAGS="$ADDCFLAGS -g"
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+    CFLAGS="$ADDCFLAGS -O2"
-   else
--    CFLAGS=
-+    CFLAGS="$ADDCFLAGS"
-   fi
- fi
- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-@@ -9456,7 +9456,7 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -13154,7 +13154,7 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -16303,7 +16303,7 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -18650,7 +18650,7 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
---- misc/curl-7.12.2/lib/Makefile.os2	2008-07-09 07:45:49.093750000 +0200
-+++ misc/build/curl-7.12.2/lib/Makefile.os2	2008-07-08 16:11:13.109375000 +0200
-@@ -1 +1,79 @@
--dummy
-+#############################################################
-+# $Id$
-+#
-+## Makefile for building libcurl.a with MingW32 (GCC-3.2) and
-+## optionally OpenSSL (0.9.7)
-+##
-+## Use: make -f Makefile.m32
-+##
-+## Comments to: Troy Engel <tengel at sonic.net> or
-+##              Joern Hartroth <hartroth at acm.org>
-+
-+ifndef OPENSSL_PATH
-+OPENSSL_PATH = ../../openssl-0.9.7d
-+endif
-+ifndef ZLIB_PATH
-+ZLIB_PATH = ../../zlib-1.2.1
-+endif
-+
-+CC = gcc
-+AR = emxomfar
-+RM = rm -f 
-+RANLIB = echo
-+STRIP = echo
-+
-+########################################################
-+## Nothing more to do below this line!
-+
-+INCLUDES = -I. -I.. -I../include -I../src
-+CFLAGS = -s -Zomf -O2 -DOS2
-+ifdef SSL
-+ INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
-+ CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
-+ DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32
-+endif
-+ifdef ZLIB
-+ INCLUDES += -I"$(ZLIB_PATH)"
-+ CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
-+ DLL_LIBS += -L$(ZLIB_PATH) -lz
-+endif
-+COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
-+
-+# Makefile.inc provides the CSOURCES and HHEADERS defines
-+include Makefile.inc
-+
-+libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES)))
-+
-+libcurl_a_LIBRARIES = libcurl.a
-+libcurl_a_DEPENDENCIES = $(strip $(CSOURCES) $(HHEADERS))
-+
-+all: libcurl.a libcurl.dll
-+
-+libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
-+	$(RM) libcurl.a
-+	$(AR) cru libcurl.a $(libcurl_a_OBJECTS)
-+	$(STRIP) $@
-+
-+# remove the last line above to keep debug info
-+
-+libcurl.dll: libcurl.a 
-+	$(RM) $@
-+	dllar -omf -libflags "INITINSTANCE TERMINSTANCE" -libdata "MULTIPLE" libcurl.a -lz -lgcc_eh -Zmap -Zno-fork -Zhigh-mem -Zbin-files
-+
-+# remove the last line above to keep debug info
-+
-+.c.o:
-+	$(COMPILE) -c $<
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+clean:
-+	$(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
-+
-+distrib: clean
-+	$(RM) $(libcurl_a_LIBRARIES)
-+
---- misc/curl-7.12.2/lib/Makefile.vc6	2004-09-16 13:13:37.000000000 +0200
-+++ misc/build/curl-7.12.2/lib/Makefile.vc6	2008-07-08 16:11:16.765625000 +0200
-@@ -23,7 +23,7 @@
- ##############################################################
- 
- LIB_NAME       = libcurl
--LIB_NAME_DEBUG = libcurld
-+LIB_NAME_DEBUG = libcurl
- !IFNDEF OPENSSL_PATH
- OPENSSL_PATH   = ../../openssl-0.9.7d
- !ENDIF
-@@ -34,7 +34,7 @@
- 
- # Use the high resolution time by default.  Comment this out to use low
- # resolution time and not require winmm.lib
--USEMM_LIBS = YES
-+#USEMM_LIBS = YES
- 
- #############################################################
- ## Nothing more to do below this line!
-@@ -43,7 +43,7 @@
- CCDEBUG    = cl.exe /MDd /Od /Gm /Zi  /D "_DEBUG" /GZ
- CFLAGSSSL  = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
- CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"
--CFLAGS     = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS" 
-+CFLAGS     = /I "." /I "../include" /nologo /W3 $(EXCFLAGS) /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /FD /c /D "MSDOS" 
- LNKDLL     = link.exe /DLL  /def:libcurl.def
- LNKLIB     = link.exe /lib
- LFLAGS     = /nologo
-@@ -51,7 +51,11 @@
- !IFDEF USEMM_LIBS
- WINLIBS    = wsock32.lib winmm.lib
- !ELSE
-+!IFDEF WINDOWS_VISTA_PSDK
-+WINLIBS    = wsock32.lib ws2_32.lib
-+!ELSE
- WINLIBS    = wsock32.lib 
-+!ENDIF
- CFLAGS     = $(CFLAGS) /D "WITHOUT_MM_LIB"
- !ENDIF
- #  RSAglue.lib was formerly needed in the SSLLIBS
---- misc/curl-7.12.2/lib/config-os2.h	2008-07-09 07:45:48.484375000 +0200
-+++ misc/build/curl-7.12.2/lib/config-os2.h	2008-07-08 16:11:12.859375000 +0200
-@@ -1 +1,531 @@
--dummy
-+/* lib/config.h.  Generated by configure.  */
-+/* lib/config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* to disable DICT */
-+#define CURL_DISABLE_DICT 1
-+
-+/* to disable FILE */
-+#define CURL_DISABLE_FILE 1
-+
-+/* to disable FTP */
-+/* #undef CURL_DISABLE_FTP */
-+
-+/* to disable GOPHER */
-+#define CURL_DISABLE_GOPHER 1
-+
-+/* to disable HTTP */
-+#define CURL_DISABLE_HTTP 1
-+
-+/* to disable LDAP */
-+#define CURL_DISABLE_LDAP 1
-+
-+/* to disable TELNET */
-+#define CURL_DISABLE_TELNET 1
-+
-+/* Set to explicitly specify we don't want to use thread-safe functions */
-+/* #undef DISABLED_THREADSAFE */
-+
-+/* your Entropy Gathering Daemon socket pathname */
-+/* #undef EGD_SOCKET */
-+
-+/* Define if you want to enable IPv6 support */
-+/* #undef ENABLE_IPV6 */
-+
-+/* Define to 1 if you have the <alloca.h> header file. */
-+#define HAVE_ALLOCA_H 1
-+
-+/* Define to 1 if you have the <arpa/inet.h> header file. */
-+#define HAVE_ARPA_INET_H 1
-+
-+/* Define to 1 if you have the <assert.h> header file. */
-+#define HAVE_ASSERT_H 1
-+
-+/* Define to 1 if you have the `basename' function. */
-+#define HAVE_BASENAME 1
-+
-+/* Define to 1 if you have the `closesocket' function. */
-+/* #undef HAVE_CLOSESOCKET */
-+
-+/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
-+/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */
-+
-+/* Define to 1 if you have the <crypto.h> header file. */
-+/* #undef HAVE_CRYPTO_H */
-+
-+/* Define to 1 if you have the <des.h> header file. */
-+/* #undef HAVE_DES_H */
-+
-+/* disabled non-blocking sockets */
-+/* #undef HAVE_DISABLED_NONBLOCKING */
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#define HAVE_DLFCN_H 1
-+
-+/* Define to 1 if you have the `dlopen' function. */
-+#define HAVE_DLOPEN 1
-+
-+/* Define to 1 if you have the <err.h> header file. */
-+/* #undef HAVE_ERR_H */
-+
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#define HAVE_FCNTL_H 1
-+
-+/* use FIONBIO for non-blocking sockets */
-+/* #undef HAVE_FIONBIO */
-+
-+/* Define if getaddrinfo exists and works */
-+/* #undef HAVE_GETADDRINFO */
-+
-+/* Define to 1 if you have the `geteuid' function. */
-+#define HAVE_GETEUID 1
-+
-+/* Define to 1 if you have the `gethostbyaddr' function. */
-+#define HAVE_GETHOSTBYADDR 1
-+
-+/* If you have gethostbyname */
-+#define HAVE_GETHOSTBYNAME 1
-+
-+/* Define to 1 if you have the `gethostbyname_r' function. */
-+/* #undef HAVE_GETHOSTBYNAME_R */
-+
-+/* gethostbyname_r() takes 3 args */
-+/* #undef HAVE_GETHOSTBYNAME_R_3 */
-+
-+/* gethostbyname_r() takes 5 args */
-+/* #undef HAVE_GETHOSTBYNAME_R_5 */
-+
-+/* gethostbyname_r() takes 6 args */
-+/* #undef HAVE_GETHOSTBYNAME_R_6 */
-+
-+/* Define to 1 if you have the `getpass_r' function. */
-+/* #undef HAVE_GETPASS_R */
-+
-+/* Define to 1 if you have the `getpwuid' function. */
-+#define HAVE_GETPWUID 1
-+
-+/* Define to 1 if you have the `gettimeofday' function. */
-+#define HAVE_GETTIMEOFDAY 1
-+
-+/* we have a glibc-style strerror_r() */
-+/* #undef HAVE_GLIBC_STRERROR_R */
-+
-+/* Define to 1 if you have the `gmtime_r' function. */
-+#define HAVE_GMTIME_R 1
-+
-+/* if you have the gssapi libraries */
-+/* #undef HAVE_GSSAPI */
-+
-+/* if you have the Heimdal gssapi libraries */
-+/* #undef HAVE_GSSHEIMDAL */
-+
-+/* if you have the MIT gssapi libraries */
-+/* #undef HAVE_GSSMIT */
-+
-+/* Define to 1 if you have the `idna_strerror' function. */
-+/* #undef HAVE_IDNA_STRERROR */
-+
-+/* Define to 1 if you have the `idn_free' function. */
-+/* #undef HAVE_IDN_FREE */
-+
-+/* Define to 1 if you have the <idn-free.h> header file. */
-+/* #undef HAVE_IDN_FREE_H */
-+
-+/* Define to 1 if you have the `inet_addr' function. */
-+#define HAVE_INET_ADDR 1
-+
-+/* Define to 1 if you have the `inet_ntoa' function. */
-+#define HAVE_INET_NTOA 1
-+
-+/* Define to 1 if you have the `inet_ntoa_r' function. */
-+/* #undef HAVE_INET_NTOA_R */
-+
-+/* inet_ntoa_r() is declared */
-+/* #undef HAVE_INET_NTOA_R_DECL */
-+
-+/* Define to 1 if you have the `inet_pton' function. */
-+#define HAVE_INET_PTON 1
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#define HAVE_INTTYPES_H 1
-+
-+/* use ioctlsocket() for non-blocking sockets */
-+/* #undef HAVE_IOCTLSOCKET */
-+
-+/* use Ioctlsocket() for non-blocking sockets */
-+/* #undef HAVE_IOCTLSOCKET_CASE */
-+
-+/* Define to 1 if you have the <io.h> header file. */
-+#define HAVE_IO_H 1
-+
-+/* if you have the Kerberos4 libraries (including -ldes) */
-+/* #undef HAVE_KRB4 */
-+
-+/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */
-+/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */
-+
-+/* Define to 1 if you have the <krb.h> header file. */
-+/* #undef HAVE_KRB_H */
-+
-+/* Define to 1 if you have the `crypto' library (-lcrypto). */
-+/* #undef HAVE_LIBCRYPTO */
-+
-+/* Define to 1 if you have the `dl' library (-ldl). */
-+/* #undef HAVE_LIBDL */
-+
-+/* Define to 1 if you have the <libgen.h> header file. */
-+#define HAVE_LIBGEN_H 1
-+
-+/* Define to 1 if you have the `idn' library (-lidn). */
-+/* #undef HAVE_LIBIDN */
-+
-+/* Define to 1 if you have the `resolv' library (-lresolv). */
-+/* #undef HAVE_LIBRESOLV */
-+
-+/* Define to 1 if you have the `resolve' library (-lresolve). */
-+/* #undef HAVE_LIBRESOLVE */
-+
-+/* Define to 1 if you have the `socket' library (-lsocket). */
-+/* #undef HAVE_LIBSOCKET */
-+
-+/* Define to 1 if you have the `ssl' library (-lssl). */
-+/* #undef HAVE_LIBSSL */
-+
-+/* if zlib is available */
-+#define HAVE_LIBZ 1
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#define HAVE_LIMITS_H 1
-+
-+/* if your compiler supports LL */
-+#define HAVE_LL 1
-+
-+/* Define to 1 if you have the `localtime_r' function. */
-+#define HAVE_LOCALTIME_R 1
-+
-+/* if your compiler supports long long */
-+#define HAVE_LONGLONG 1
-+
-+/* Define to 1 if you have the <malloc.h> header file. */
-+#define HAVE_MALLOC_H 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the <netdb.h> header file. */
-+#define HAVE_NETDB_H 1
-+
-+/* Define to 1 if you have the <netinet/in.h> header file. */
-+#define HAVE_NETINET_IN_H 1
-+
-+/* Define to 1 if you have the <netinet/tcp.h> header file. */
-+#define HAVE_NETINET_TCP_H 1
-+
-+/* Define to 1 if you have the <net/if.h> header file. */
-+#define HAVE_NET_IF_H 1
-+
-+/* Define if NI_WITHSCOPEID exists and works */
-+/* #undef HAVE_NI_WITHSCOPEID */
-+
-+/* we have no strerror_r() proto */
-+/* #undef HAVE_NO_STRERROR_R_DECL */
-+
-+/* Define to 1 if you have the <openssl/crypto.h> header file. */
-+/* #undef HAVE_OPENSSL_CRYPTO_H */
-+
-+/* Define to 1 if you have the <openssl/engine.h> header file. */
-+/* #undef HAVE_OPENSSL_ENGINE_H */
-+
-+/* Define to 1 if you have the <openssl/err.h> header file. */
-+/* #undef HAVE_OPENSSL_ERR_H */
-+
-+/* Define to 1 if you have the <openssl/pem.h> header file. */
-+/* #undef HAVE_OPENSSL_PEM_H */
-+
-+/* Define to 1 if you have the <openssl/rsa.h> header file. */
-+/* #undef HAVE_OPENSSL_RSA_H */
-+
-+/* Define to 1 if you have the <openssl/ssl.h> header file. */
-+/* #undef HAVE_OPENSSL_SSL_H */
-+
-+/* Define to 1 if you have the <openssl/x509.h> header file. */
-+/* #undef HAVE_OPENSSL_X509_H */
-+
-+/* use O_NONBLOCK for non-blocking sockets */
-+#define HAVE_O_NONBLOCK 1
-+
-+/* Define to 1 if you have the <pem.h> header file. */
-+/* #undef HAVE_PEM_H */
-+
-+/* Define to 1 if you have the `perror' function. */
-+#define HAVE_PERROR 1
-+
-+/* Define to 1 if you have the `poll' function. */
-+/* #undef HAVE_POLL */
-+
-+/* If you have a fine poll */
-+/* #undef HAVE_POLL_FINE */
-+
-+/* we have a POSIX-style strerror_r() */
-+#define HAVE_POSIX_STRERROR_R 1
-+
-+/* Define to 1 if you have the <pwd.h> header file. */
-+#define HAVE_PWD_H 1
-+
-+/* Define to 1 if you have the `RAND_egd' function. */
-+/* #undef HAVE_RAND_EGD */
-+
-+/* Define to 1 if you have the `RAND_screen' function. */
-+/* #undef HAVE_RAND_SCREEN */
-+
-+/* Define to 1 if you have the `RAND_status' function. */
-+/* #undef HAVE_RAND_STATUS */
-+
-+/* Define to 1 if you have the <rsa.h> header file. */
-+/* #undef HAVE_RSA_H */
-+
-+/* Define to 1 if you have the `select' function. */
-+#define HAVE_SELECT 1
-+
-+/* Define to 1 if you have the <setjmp.h> header file. */
-+#define HAVE_SETJMP_H 1
-+
-+/* Define to 1 if you have the <sgtty.h> header file. */
-+#define HAVE_SGTTY_H 1
-+
-+/* Define to 1 if you have the `sigaction' function. */
-+#define HAVE_SIGACTION 1
-+
-+/* Define to 1 if you have the `siginterrupt' function. */
-+#define HAVE_SIGINTERRUPT 1
-+
-+/* Define to 1 if you have the `signal' function. */
-+#define HAVE_SIGNAL 1
-+
-+/* If you have sigsetjmp */
-+#define HAVE_SIGSETJMP 1
-+
-+/* Define to 1 if you have the `socket' function. */
-+#define HAVE_SOCKET 1
-+
-+/* use SO_NONBLOCK for non-blocking sockets */
-+/* #undef HAVE_SO_NONBLOCK */
-+
-+/* Define this if you have the SPNEGO library fbopenssl */
-+/* #undef HAVE_SPNEGO */
-+
-+/* Define to 1 if you have the <ssl.h> header file. */
-+/* #undef HAVE_SSL_H */
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+#define HAVE_STRCASECMP 1
-+
-+/* Define to 1 if you have the `strcmpi' function. */
-+/* #undef HAVE_STRCMPI */
-+
-+/* Define to 1 if you have the `strdup' function. */
-+#define HAVE_STRDUP 1
-+
-+/* Define to 1 if you have the `strerror_r' function. */
-+#define HAVE_STRERROR_R 1
-+
-+/* Define to 1 if you have the `strftime' function. */
-+#define HAVE_STRFTIME 1
-+
-+/* Define to 1 if you have the `stricmp' function. */
-+#define HAVE_STRICMP 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#define HAVE_STRINGS_H 1
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strlcat' function. */
-+#define HAVE_STRLCAT 1
-+
-+/* Define to 1 if you have the `strlcpy' function. */
-+/* #undef HAVE_STRLCPY */
-+
-+/* Define to 1 if you have the `strstr' function. */
-+#define HAVE_STRSTR 1
-+
-+/* Define to 1 if you have the `strtok_r' function. */
-+#define HAVE_STRTOK_R 1
-+
-+/* Define to 1 if you have the `strtoll' function. */
-+#define HAVE_STRTOLL 1
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#define HAVE_SYS_IOCTL_H 1
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#define HAVE_SYS_PARAM_H 1
-+
-+/* Define to 1 if you have the <sys/poll.h> header file. */
-+/* #undef HAVE_SYS_POLL_H */
-+
-+/* Define to 1 if you have the <sys/select.h> header file. */
-+#define HAVE_SYS_SELECT_H 1
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#define HAVE_SYS_SOCKET_H 1
-+
-+/* Define to 1 if you have the <sys/sockio.h> header file. */
-+#define HAVE_SYS_SOCKIO_H 1
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#define HAVE_SYS_TIME_H 1
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define to 1 if you have the <sys/utime.h> header file. */
-+#define HAVE_SYS_UTIME_H 1
-+
-+/* Define to 1 if you have the `tcgetattr' function. */
-+#define HAVE_TCGETATTR 1
-+
-+/* Define to 1 if you have the `tcsetattr' function. */
-+#define HAVE_TCSETATTR 1
-+
-+/* Define to 1 if you have the <termios.h> header file. */
-+#define HAVE_TERMIOS_H 1
-+
-+/* Define to 1 if you have the <termio.h> header file. */
-+#define HAVE_TERMIO_H 1
-+
-+/* Define to 1 if you have the <time.h> header file. */
-+#define HAVE_TIME_H 1
-+
-+/* Define to 1 if you have the `tld_strerror' function. */
-+/* #undef HAVE_TLD_STRERROR */
-+
-+/* Define to 1 if you have the `uname' function. */
-+#define HAVE_UNAME 1
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define HAVE_UNISTD_H 1
-+
-+/* Define to 1 if you have the `utime' function. */
-+#define HAVE_UTIME 1
-+
-+/* Define to 1 if you have the <utime.h> header file. */
-+#define HAVE_UTIME_H 1
-+
-+/* Define to 1 if you have the <winsock.h> header file. */
-+/* #undef HAVE_WINSOCK_H */
-+
-+/* Define this symbol if your OS supports changing the contents of argv */
-+#define HAVE_WRITABLE_ARGV 1
-+
-+/* Define to 1 if you have the <x509.h> header file. */
-+/* #undef HAVE_X509_H */
-+
-+/* if you have the zlib.h header file */
-+#define HAVE_ZLIB_H 1
-+
-+/* If you lack a fine basename() prototype */
-+/* #undef NEED_BASENAME_PROTO */
-+
-+/* need REENTRANT defined */
-+/* #undef NEED_REENTRANT */
-+
-+/* cpu-machine-OS */
-+#define OS "i386-pc-os2-emx"
-+
-+/* Name of package */
-+#define PACKAGE "curl"
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "curl"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "curl -"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "curl"
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "-"
-+
-+/* a suitable file to read random data from */
-+/* #undef RANDOM_FILE */
-+
-+/* Define as the return type of signal handlers (`int' or `void'). */
-+#define RETSIGTYPE void
-+
-+/* Define to the type of arg 1 for `select'. */
-+#define SELECT_TYPE_ARG1 int
-+
-+/* Define to the type of args 2, 3 and 4 for `select'. */
-+#define SELECT_TYPE_ARG234 (fd_set *)
-+
-+/* Define to the type of arg 5 for `select'. */
-+#define SELECT_TYPE_ARG5 (struct timeval *)
-+
-+/* The size of a `curl_off_t', as computed by sizeof. */
-+#define SIZEOF_CURL_OFF_T 8
-+
-+/* The size of a `long', as computed by sizeof. */
-+#define SIZEOF_LONG 4
-+
-+/* The size of a `size_t', as computed by sizeof. */
-+#define SIZEOF_SIZE_T 4
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#define TIME_WITH_SYS_TIME 1
-+
-+/* Define if you want to enable ares support */
-+/* #undef USE_ARES */
-+
-+/* If you want to build curl with the built-in manual */
-+/* #undef USE_MANUAL */
-+
-+/* Version number of package */
-+#define VERSION "7.12.2"
-+
-+/* Define to 1 if on AIX 3.
-+  System headers sometimes define this.
-+  We just want to avoid a redefinition error message.  */
-+#ifndef _ALL_SOURCE
-+/* # undef _ALL_SOURCE */
-+#endif
-+
-+/* Number of bits in a file offset, on hosts where this is settable. */
-+/* #undef _FILE_OFFSET_BITS */
-+
-+/* Define for large files, on AIX-style hosts. */
-+/* #undef _LARGE_FILES */
-+
-+/* define this if you need it to compile thread-safe code */
-+/* #undef _THREAD_SAFE */
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+/* #undef const */
-+
-+/* type to use in place of in_addr_t if not defined */
-+/* #undef in_addr_t */
-+
-+/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* #undef size_t */
-+
-+/* type to use in place of socklen_t if not defined */
-+#define socklen_t int
-+
-+/* the signed version of size_t */
-+/* #undef ssize_t */
---- misc/curl-7.12.2/lib/config-win32.h	2004-07-29 15:09:58.000000000 +0200
-+++ misc/build/curl-7.12.2/lib/config-win32.h	2008-07-08 16:11:12.984375000 +0200
-@@ -29,6 +29,24 @@
- /* Define this to 'int' if ssize_t is not an available typedefed type */
- #define ssize_t int
- 
-+/* Define to disable DICT */
-+#define CURL_DISABLE_DICT 1
-+ 
-+/* Define to disable FILE */
-+#define CURL_DISABLE_FILE 1
-+ 
-+/* Define to disable GOPHER */
-+#define CURL_DISABLE_GOPHER 1
-+ 
-+/* Define to disable LDAP */
-+#define CURL_DISABLE_LDAP 1
-+ 
-+/* Define to disable TELNET */
-+#define CURL_DISABLE_TELNET 1
-+ 
-+/* Define if you want to enable IPv6 support */
-+#define ENABLE_IPV6 1
-+
- /* Define this to 'int' if socklen_t is not an available typedefed type */
- #if !defined(ENABLE_IPV6) && ((_MSC_VER < 1300) || !defined(USE_SSLEAY))
- #define socklen_t int
---- misc/curl-7.12.2/lib/http_ntlm.c	2004-07-29 15:09:58.000000000 +0200
-+++ misc/build/curl-7.12.2/lib/http_ntlm.c	2008-07-08 16:11:13.062500000 +0200
-@@ -528,6 +528,13 @@
-     size=64;
-     ntlmbuf[62]=ntlmbuf[63]=0;
- 
-+    /* Make sure that the user and domain strings fit in the target buffer
-+       before we copy them there. */
-+    if(size + userlen + domlen >= sizeof(ntlmbuf)) {
-+      failf(conn->data, "user + domain name too big");
-+      return CURLE_OUT_OF_MEMORY;
-+    }
-+
-     memcpy(&ntlmbuf[size], domain, domlen);
-     size += domlen;
- 
---- misc/curl-7.12.2/lib/setup.h	2004-10-08 10:06:16.000000000 +0200
-+++ misc/build/curl-7.12.2/lib/setup.h	2008-07-08 16:23:32.328125000 +0200
-@@ -44,6 +44,10 @@
- /* hand-modified win32 config.h! */
- #include "config-win32.h"
- #endif
-+#ifdef OS2
-+/* hand-modified os2 config.h! */
-+#include "config-os2.h"
-+#endif
- #endif
- 
- #ifdef macintosh
-@@ -161,21 +165,11 @@
- #define WIN32_LEAN_AND_MEAN  /* Prevent including <winsock*.h> in <windows.h> */
- #endif
- 
--#if (defined(ENABLE_IPV6) || defined(CURLDEBUG)) && defined(_MSC_VER) && \
--    (!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0500)
--/*
-- * Needed to pull in the real getaddrinfo() and not the inline version
-- * in <wspiAPI.H> which doesn't support IPv6 (IPv4 only). <wspiAPI.H> is
-- * included from <ws2tcpip.h> for <= 0x0500 SDKs.
-- */
--#undef  _WIN32_WINNT
--#define _WIN32_WINNT 0x0501
--#endif
--
- #include <winsock2.h>        /* required by telnet.c */
- 
- #if defined(ENABLE_IPV6) || defined(USE_SSLEAY)
- #include <ws2tcpip.h>
-+#include <wspiapi.h>
- #endif
- 
- #if !defined(__GNUC__) || defined(__MINGW32__)
---- misc/curl-7.12.2/lib/url.c	2004-10-18 00:21:02.000000000 +0200
-+++ misc/build/curl-7.12.2/lib/url.c	2008-07-08 16:11:13.375000000 +0200
-@@ -814,27 +814,6 @@
-        and this just changes the actual request keyword */
-     break;
- 
--  case CURLOPT_PROXY:
--    /*
--     * Set proxy server:port to use as HTTP proxy.
--     *
--     * If the proxy is set to "" we explicitly say that we don't want to use a
--     * proxy (even though there might be environment variables saying so).
--     *
--     * Setting it to NULL, means no proxy but allows the environment variables
--     * to decide for us.
--     */
--    if(data->change.proxy_alloc) {
--      /*
--       * The already set string is allocated, free that first
--       */
--      data->change.proxy_alloc=FALSE;;
--      free(data->change.proxy);
--    }
--    data->set.set_proxy = va_arg(param, char *);
--    data->change.proxy = data->set.set_proxy;
--    break;
--
-   case CURLOPT_PROXYPORT:
-     /*
-      * Explicitly set HTTP proxy port number.
-@@ -883,6 +862,27 @@
-   break;
- #endif   /* CURL_DISABLE_HTTP */
- 
-+  case CURLOPT_PROXY:
-+    /*
-+     * Set proxy server:port to use as HTTP proxy.
-+     *
-+     * If the proxy is set to "" we explicitly say that we don't want to use a
-+     * proxy (even though there might be environment variables saying so).
-+     *
-+     * Setting it to NULL, means no proxy but allows the environment variables
-+     * to decide for us.
-+     */
-+    if(data->change.proxy_alloc) {
-+      /*
-+       * The already set string is allocated, free that first
-+       */
-+      data->change.proxy_alloc=FALSE;;
-+      free(data->change.proxy);
-+    }
-+    data->set.set_proxy = va_arg(param, char *);
-+    data->change.proxy = data->set.set_proxy;
-+    break;
-+
-   case CURLOPT_WRITEHEADER:
-     /*
-      * Custom pointer to pass the header write callback function
-@@ -1428,7 +1428,7 @@
-     result = CURLE_FAILED_INIT; /* correct this */
-     break;
-   }
--  
-+
-   return result;
- }
- 
-@@ -2278,12 +2278,18 @@
-   if(urllen < LEAST_PATH_ALLOC)
-     urllen=LEAST_PATH_ALLOC;
- 
--  conn->pathbuffer=(char *)malloc(urllen);
-+  /*
-+   * We malloc() the buffers below urllen+2 to make room for to possibilities:
-+   * 1 - an extra terminating zero
-+   * 2 - an extra slash (in case a syntax like "www.host.com?moo" is used)
-+   */
-+
-+  conn->pathbuffer=(char *)malloc(urllen+2);
-   if(NULL == conn->pathbuffer)
-     return CURLE_OUT_OF_MEMORY; /* really bad error */
-   conn->path = conn->pathbuffer;
- 
--  conn->host.rawalloc=(char *)malloc(urllen);
-+  conn->host.rawalloc=(char *)malloc(urllen+2);
-   if(NULL == conn->host.rawalloc)
-     return CURLE_OUT_OF_MEMORY;
-   conn->host.name = conn->host.rawalloc;
-@@ -2461,6 +2467,7 @@
-       return CURLE_OUT_OF_MEMORY;
-   }
- 
-+#ifndef CURL_DISABLE_HTTP
-   /*************************************************************
-    * Detect what (if any) proxy to use
-    *************************************************************/
-@@ -2625,6 +2632,7 @@
-     if(no_proxy)
-       free(no_proxy);
-   } /* if not using proxy */
-+#endif /* CURL_DISABLE_HTTP */
- 
-   /*************************************************************
-    * No protocol part in URL was used, add it!
-@@ -2880,54 +2888,6 @@
-     return CURLE_UNSUPPORTED_PROTOCOL;
-   }
- 
--  /*************************************************************
--   * Figure out the remote port number
--   *
--   * No matter if we use a proxy or not, we have to figure out the remote
--   * port number of various reasons.
--   *
--   * To be able to detect port number flawlessly, we must not confuse them
--   * IPv6-specified addresses in the [0::1] style. (RFC2732)
--   *
--   * The conn->host.name is currently [user:passwd@]host[:port] where host
--   * could be a hostname, IPv4 address or IPv6 address.
--   *************************************************************/
--  if((1 == sscanf(conn->host.name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) &&
--     (']' == endbracket)) {
--    /* this is a RFC2732-style specified IP-address */
--    conn->bits.ipv6_ip = TRUE;
--
--    conn->host.name++; /* pass the starting bracket */
--    tmp = strchr(conn->host.name, ']');
--    *tmp = 0; /* zero terminate */
--    tmp++; /* pass the ending bracket */
--    if(':' != *tmp)
--      tmp = NULL; /* no port number available */
--  }
--  else
--    tmp = strrchr(conn->host.name, ':');
--
--  if (tmp) {
--    char *rest;
--    unsigned long port;
--
--    port=strtoul(tmp+1, &rest, 10);  /* Port number must be decimal */
--
--    if (rest != (tmp+1) && *rest == '\0') {
--      /* The colon really did have only digits after it,
--       * so it is either a port number or a mistake */
--
--      if (port > 0xffff) {   /* Single unix standard says port numbers are
--                              * 16 bits long */
--        failf(data, "Port number too large: %lu", port);
--        return CURLE_URL_MALFORMAT;
--      }
--
--      *tmp = '\0'; /* cut off the name there */
--      conn->remote_port = (unsigned short)port;
--    }
--  }
--
-   if(data->change.proxy && *data->change.proxy) {
-     /* If this is supposed to use a proxy, we need to figure out the proxy
-        host name name, so that we can re-use an existing connection
-@@ -3119,6 +3079,54 @@
-     return CURLE_OUT_OF_MEMORY;
- 
-   /*************************************************************
-+   * Figure out the remote port number
-+   *
-+   * No matter if we use a proxy or not, we have to figure out the remote
-+   * port number of various reasons.
-+   *
-+   * To be able to detect port number flawlessly, we must not confuse them
-+   * IPv6-specified addresses in the [0::1] style. (RFC2732)
-+   *
-+   * The conn->host.name is currently host[:port] where host could be a
-+   * hostname, IPv4 address or IPv6 address.
-+   *************************************************************/
-+  if((1 == sscanf(conn->host.name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) &&
-+     (']' == endbracket)) {
-+    /* this is a RFC2732-style specified IP-address */
-+    conn->bits.ipv6_ip = TRUE;
-+
-+    conn->host.name++; /* pass the starting bracket */
-+    tmp = strchr(conn->host.name, ']');
-+    *tmp = 0; /* zero terminate */
-+    tmp++; /* pass the ending bracket */
-+    if(':' != *tmp)
-+      tmp = NULL; /* no port number available */
-+  }
-+  else
-+    tmp = strrchr(conn->host.name, ':');
-+
-+  if (tmp) {
-+    char *rest;
-+    unsigned long port;
-+
-+    port=strtoul(tmp+1, &rest, 10);  /* Port number must be decimal */
-+
-+    if (rest != (tmp+1) && *rest == '\0') {
-+      /* The colon really did have only digits after it,
-+       * so it is either a port number or a mistake */
-+
-+      if (port > 0xffff) {   /* Single unix standard says port numbers are
-+                              * 16 bits long */
-+        failf(data, "Port number too large: %lu", port);
-+        return CURLE_URL_MALFORMAT;
-+      }
-+
-+      *tmp = '\0'; /* cut off the name there */
-+      conn->remote_port = (unsigned short)port;
-+    }
-+  }
-+
-+  /*************************************************************
-    * Check the current list of connections to see if we can
-    * re-use an already existing one or if we have to create a
-    * new one.
-@@ -3471,9 +3479,7 @@
-    * characters (you get mangled text files, and corrupted binary files when
-    * you download to stdout and redirect it to a file). */
- 
--  if ((data->set.out)->_handle == NULL) {
-     _fsetmode(stdout, "b");
--  }
- #endif
- 
-   return CURLE_OK;
---- misc/curl-7.12.2/ltmain.sh	2004-08-09 13:12:17.000000000 +0200
-+++ misc/build/curl-7.12.2/ltmain.sh	2008-07-08 16:11:13.484375000 +0200
-@@ -2915,12 +2915,12 @@
- 	  # which has an extra 1 added just for fun
- 	  #
- 	  case $version_type in
--	  darwin|linux|osf|windows)
-+	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
- 	    current=`expr $number_major + $number_minor`
- 	    age="$number_minor"
- 	    revision="$number_revision"
- 	    ;;
--	  freebsd-aout|freebsd-elf|sunos)
-+	  sunos)
- 	    current="$number_major"
- 	    revision="$number_minor"
- 	    age="0"
-@@ -2990,16 +2990,6 @@
- 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- 	  ;;
- 
--	freebsd-aout)
--	  major=".$current"
--	  versuffix=".$current.$revision";
--	  ;;
--
--	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
--	  ;;
--
- 	irix | nonstopux)
- 	  major=`expr $current - $age + 1`
- 
-@@ -3022,7 +3012,7 @@
- 	  versuffix="$major.$revision"
- 	  ;;
- 
--	linux)
-+	linux|freebsd-aout|freebsd-elf)
- 	  major=.`expr $current - $age`
- 	  versuffix="$major.$age.$revision"
- 	  ;;
+--- misc/curl-7.12.2/configure	2004-10-18 00:22:10.000000000 +0200
++++ misc/build/curl-7.12.2/configure	2008-07-08 16:11:12.796875000 +0200
+@@ -1538,8 +1538,8 @@
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+@@ -2314,8 +2314,8 @@
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+@@ -2967,15 +2967,15 @@
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+   if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
++    CFLAGS="$ADDCFLAGS -g -O2"
+   else
+-    CFLAGS="-g"
++    CFLAGS="$ADDCFLAGS -g"
+   fi
+ else
+   if test "$GCC" = yes; then
+-    CFLAGS="-O2"
++    CFLAGS="$ADDCFLAGS -O2"
+   else
+-    CFLAGS=
++    CFLAGS="$ADDCFLAGS"
+   fi
+ fi
+ echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+@@ -9456,7 +9456,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -13154,7 +13154,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -16303,7 +16303,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -18650,7 +18650,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+--- misc/curl-7.12.2/lib/Makefile.os2	2008-07-09 07:45:49.093750000 +0200
++++ misc/build/curl-7.12.2/lib/Makefile.os2	2008-07-08 16:11:13.109375000 +0200
+@@ -1 +1,79 @@
+-dummy
++#############################################################
++# $Id$
++#
++## Makefile for building libcurl.a with MingW32 (GCC-3.2) and
++## optionally OpenSSL (0.9.7)
++##
++## Use: make -f Makefile.m32
++##
++## Comments to: Troy Engel <tengel at sonic.net> or
++##              Joern Hartroth <hartroth at acm.org>
++
++ifndef OPENSSL_PATH
++OPENSSL_PATH = ../../openssl-0.9.7d
++endif
++ifndef ZLIB_PATH
++ZLIB_PATH = ../../zlib-1.2.1
++endif
++
++CC = gcc
++AR = emxomfar
++RM = rm -f 
++RANLIB = echo
++STRIP = echo
++
++########################################################
++## Nothing more to do below this line!
++
++INCLUDES = -I. -I.. -I../include -I../src
++CFLAGS = -s -Zomf -O2 -DOS2
++ifdef SSL
++ INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
++ CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
++ DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32
++endif
++ifdef ZLIB
++ INCLUDES += -I"$(ZLIB_PATH)"
++ CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
++ DLL_LIBS += -L$(ZLIB_PATH) -lz
++endif
++COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
++
++# Makefile.inc provides the CSOURCES and HHEADERS defines
++include Makefile.inc
++
++libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES)))
++
++libcurl_a_LIBRARIES = libcurl.a
++libcurl_a_DEPENDENCIES = $(strip $(CSOURCES) $(HHEADERS))
++
++all: libcurl.a libcurl.dll
++
++libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
++	$(RM) libcurl.a
++	$(AR) cru libcurl.a $(libcurl_a_OBJECTS)
++	$(STRIP) $@
++
++# remove the last line above to keep debug info
++
++libcurl.dll: libcurl.a 
++	$(RM) $@
++	dllar -omf -libflags "INITINSTANCE TERMINSTANCE" -libdata "MULTIPLE" libcurl.a -lz -lgcc_eh -Zmap -Zno-fork -Zhigh-mem -Zbin-files
++
++# remove the last line above to keep debug info
++
++.c.o:
++	$(COMPILE) -c $<
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++clean:
++	$(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
++
++distrib: clean
++	$(RM) $(libcurl_a_LIBRARIES)
++
+--- misc/curl-7.12.2/lib/Makefile.vc6	2004-09-16 13:13:37.000000000 +0200
++++ misc/build/curl-7.12.2/lib/Makefile.vc6	2008-07-08 16:11:16.765625000 +0200
+@@ -23,7 +23,7 @@
+ ##############################################################
+ 
+ LIB_NAME       = libcurl
+-LIB_NAME_DEBUG = libcurld
++LIB_NAME_DEBUG = libcurl
+ !IFNDEF OPENSSL_PATH
+ OPENSSL_PATH   = ../../openssl-0.9.7d
+ !ENDIF
+@@ -34,7 +34,7 @@
+ 
+ # Use the high resolution time by default.  Comment this out to use low
+ # resolution time and not require winmm.lib
+-USEMM_LIBS = YES
++#USEMM_LIBS = YES
+ 
+ #############################################################
+ ## Nothing more to do below this line!
+@@ -43,7 +43,7 @@
+ CCDEBUG    = cl.exe /MDd /Od /Gm /Zi  /D "_DEBUG" /GZ
+ CFLAGSSSL  = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
+ CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"
+-CFLAGS     = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS" 
++CFLAGS     = /I "." /I "../include" /nologo /W3 $(EXCFLAGS) /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /FD /c /D "MSDOS" 
+ LNKDLL     = link.exe /DLL  /def:libcurl.def
+ LNKLIB     = link.exe /lib
+ LFLAGS     = /nologo
+@@ -51,7 +51,11 @@
+ !IFDEF USEMM_LIBS
+ WINLIBS    = wsock32.lib winmm.lib
+ !ELSE
++!IFDEF WINDOWS_VISTA_PSDK
++WINLIBS    = wsock32.lib ws2_32.lib
++!ELSE
+ WINLIBS    = wsock32.lib 
++!ENDIF
+ CFLAGS     = $(CFLAGS) /D "WITHOUT_MM_LIB"
+ !ENDIF
+ #  RSAglue.lib was formerly needed in the SSLLIBS
+--- misc/curl-7.12.2/lib/config-os2.h	2008-07-09 07:45:48.484375000 +0200
++++ misc/build/curl-7.12.2/lib/config-os2.h	2008-07-08 16:11:12.859375000 +0200
+@@ -1 +1,531 @@
+-dummy
++/* lib/config.h.  Generated by configure.  */
++/* lib/config.h.in.  Generated from configure.ac by autoheader.  */
++
++/* to disable DICT */
++#define CURL_DISABLE_DICT 1
++
++/* to disable FILE */
++#define CURL_DISABLE_FILE 1
++
++/* to disable FTP */
++/* #undef CURL_DISABLE_FTP */
++
++/* to disable GOPHER */
++#define CURL_DISABLE_GOPHER 1
++
++/* to disable HTTP */
++#define CURL_DISABLE_HTTP 1
++
++/* to disable LDAP */
++#define CURL_DISABLE_LDAP 1
++
++/* to disable TELNET */
++#define CURL_DISABLE_TELNET 1
++
++/* Set to explicitly specify we don't want to use thread-safe functions */
++/* #undef DISABLED_THREADSAFE */
++
++/* your Entropy Gathering Daemon socket pathname */
++/* #undef EGD_SOCKET */
++
++/* Define if you want to enable IPv6 support */
++/* #undef ENABLE_IPV6 */
++
++/* Define to 1 if you have the <alloca.h> header file. */
++#define HAVE_ALLOCA_H 1
++
++/* Define to 1 if you have the <arpa/inet.h> header file. */
++#define HAVE_ARPA_INET_H 1
++
++/* Define to 1 if you have the <assert.h> header file. */
++#define HAVE_ASSERT_H 1
++
++/* Define to 1 if you have the `basename' function. */
++#define HAVE_BASENAME 1
++
++/* Define to 1 if you have the `closesocket' function. */
++/* #undef HAVE_CLOSESOCKET */
++
++/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
++/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */
++
++/* Define to 1 if you have the <crypto.h> header file. */
++/* #undef HAVE_CRYPTO_H */
++
++/* Define to 1 if you have the <des.h> header file. */
++/* #undef HAVE_DES_H */
++
++/* disabled non-blocking sockets */
++/* #undef HAVE_DISABLED_NONBLOCKING */
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define HAVE_DLFCN_H 1
++
++/* Define to 1 if you have the `dlopen' function. */
++#define HAVE_DLOPEN 1
++
++/* Define to 1 if you have the <err.h> header file. */
++/* #undef HAVE_ERR_H */
++
++/* Define to 1 if you have the <fcntl.h> header file. */
++#define HAVE_FCNTL_H 1
++
++/* use FIONBIO for non-blocking sockets */
++/* #undef HAVE_FIONBIO */
++
++/* Define if getaddrinfo exists and works */
++/* #undef HAVE_GETADDRINFO */
++
++/* Define to 1 if you have the `geteuid' function. */
++#define HAVE_GETEUID 1
++
++/* Define to 1 if you have the `gethostbyaddr' function. */
++#define HAVE_GETHOSTBYADDR 1
++
++/* If you have gethostbyname */
++#define HAVE_GETHOSTBYNAME 1
++
++/* Define to 1 if you have the `gethostbyname_r' function. */
++/* #undef HAVE_GETHOSTBYNAME_R */
++
++/* gethostbyname_r() takes 3 args */
++/* #undef HAVE_GETHOSTBYNAME_R_3 */
++
++/* gethostbyname_r() takes 5 args */
++/* #undef HAVE_GETHOSTBYNAME_R_5 */
++
++/* gethostbyname_r() takes 6 args */
++/* #undef HAVE_GETHOSTBYNAME_R_6 */
++
++/* Define to 1 if you have the `getpass_r' function. */
++/* #undef HAVE_GETPASS_R */
++
++/* Define to 1 if you have the `getpwuid' function. */
++#define HAVE_GETPWUID 1
++
++/* Define to 1 if you have the `gettimeofday' function. */
++#define HAVE_GETTIMEOFDAY 1
++
++/* we have a glibc-style strerror_r() */
++/* #undef HAVE_GLIBC_STRERROR_R */
++
++/* Define to 1 if you have the `gmtime_r' function. */
++#define HAVE_GMTIME_R 1
++
++/* if you have the gssapi libraries */
++/* #undef HAVE_GSSAPI */
++
++/* if you have the Heimdal gssapi libraries */
++/* #undef HAVE_GSSHEIMDAL */
++
++/* if you have the MIT gssapi libraries */
++/* #undef HAVE_GSSMIT */
++
++/* Define to 1 if you have the `idna_strerror' function. */
++/* #undef HAVE_IDNA_STRERROR */
++
++/* Define to 1 if you have the `idn_free' function. */
++/* #undef HAVE_IDN_FREE */
++
++/* Define to 1 if you have the <idn-free.h> header file. */
++/* #undef HAVE_IDN_FREE_H */
++
++/* Define to 1 if you have the `inet_addr' function. */
++#define HAVE_INET_ADDR 1
++
++/* Define to 1 if you have the `inet_ntoa' function. */
++#define HAVE_INET_NTOA 1
++
++/* Define to 1 if you have the `inet_ntoa_r' function. */
++/* #undef HAVE_INET_NTOA_R */
++
++/* inet_ntoa_r() is declared */
++/* #undef HAVE_INET_NTOA_R_DECL */
++
++/* Define to 1 if you have the `inet_pton' function. */
++#define HAVE_INET_PTON 1
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* use ioctlsocket() for non-blocking sockets */
++/* #undef HAVE_IOCTLSOCKET */
++
++/* use Ioctlsocket() for non-blocking sockets */
++/* #undef HAVE_IOCTLSOCKET_CASE */
++
++/* Define to 1 if you have the <io.h> header file. */
++#define HAVE_IO_H 1
++
++/* if you have the Kerberos4 libraries (including -ldes) */
++/* #undef HAVE_KRB4 */
++
++/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */
++/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */
++
++/* Define to 1 if you have the <krb.h> header file. */
++/* #undef HAVE_KRB_H */
++
++/* Define to 1 if you have the `crypto' library (-lcrypto). */
++/* #undef HAVE_LIBCRYPTO */
++
++/* Define to 1 if you have the `dl' library (-ldl). */
++/* #undef HAVE_LIBDL */
++
++/* Define to 1 if you have the <libgen.h> header file. */
++#define HAVE_LIBGEN_H 1
++
++/* Define to 1 if you have the `idn' library (-lidn). */
++/* #undef HAVE_LIBIDN */
++
++/* Define to 1 if you have the `resolv' library (-lresolv). */
++/* #undef HAVE_LIBRESOLV */
++
++/* Define to 1 if you have the `resolve' library (-lresolve). */
++/* #undef HAVE_LIBRESOLVE */
++
++/* Define to 1 if you have the `socket' library (-lsocket). */
++/* #undef HAVE_LIBSOCKET */
++
++/* Define to 1 if you have the `ssl' library (-lssl). */
++/* #undef HAVE_LIBSSL */
++
++/* if zlib is available */
++#define HAVE_LIBZ 1
++
++/* Define to 1 if you have the <limits.h> header file. */
++#define HAVE_LIMITS_H 1
++
++/* if your compiler supports LL */
++#define HAVE_LL 1
++
++/* Define to 1 if you have the `localtime_r' function. */
++#define HAVE_LOCALTIME_R 1
++
++/* if your compiler supports long long */
++#define HAVE_LONGLONG 1
++
++/* Define to 1 if you have the <malloc.h> header file. */
++#define HAVE_MALLOC_H 1
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the <netdb.h> header file. */
++#define HAVE_NETDB_H 1
++
++/* Define to 1 if you have the <netinet/in.h> header file. */
++#define HAVE_NETINET_IN_H 1
++
++/* Define to 1 if you have the <netinet/tcp.h> header file. */
++#define HAVE_NETINET_TCP_H 1
++
++/* Define to 1 if you have the <net/if.h> header file. */
++#define HAVE_NET_IF_H 1
++
++/* Define if NI_WITHSCOPEID exists and works */
++/* #undef HAVE_NI_WITHSCOPEID */
++
++/* we have no strerror_r() proto */
++/* #undef HAVE_NO_STRERROR_R_DECL */
++
++/* Define to 1 if you have the <openssl/crypto.h> header file. */
++/* #undef HAVE_OPENSSL_CRYPTO_H */
++
++/* Define to 1 if you have the <openssl/engine.h> header file. */
++/* #undef HAVE_OPENSSL_ENGINE_H */
++
++/* Define to 1 if you have the <openssl/err.h> header file. */
++/* #undef HAVE_OPENSSL_ERR_H */
++
++/* Define to 1 if you have the <openssl/pem.h> header file. */
++/* #undef HAVE_OPENSSL_PEM_H */
++
++/* Define to 1 if you have the <openssl/rsa.h> header file. */
++/* #undef HAVE_OPENSSL_RSA_H */
++
++/* Define to 1 if you have the <openssl/ssl.h> header file. */
++/* #undef HAVE_OPENSSL_SSL_H */
++
++/* Define to 1 if you have the <openssl/x509.h> header file. */
++/* #undef HAVE_OPENSSL_X509_H */
++
++/* use O_NONBLOCK for non-blocking sockets */
++#define HAVE_O_NONBLOCK 1
++
++/* Define to 1 if you have the <pem.h> header file. */
++/* #undef HAVE_PEM_H */
++
++/* Define to 1 if you have the `perror' function. */
++#define HAVE_PERROR 1
++
++/* Define to 1 if you have the `poll' function. */
++/* #undef HAVE_POLL */
++
++/* If you have a fine poll */
++/* #undef HAVE_POLL_FINE */
++
++/* we have a POSIX-style strerror_r() */
++#define HAVE_POSIX_STRERROR_R 1
++
++/* Define to 1 if you have the <pwd.h> header file. */
++#define HAVE_PWD_H 1
++
++/* Define to 1 if you have the `RAND_egd' function. */
++/* #undef HAVE_RAND_EGD */
++
++/* Define to 1 if you have the `RAND_screen' function. */
++/* #undef HAVE_RAND_SCREEN */
++
++/* Define to 1 if you have the `RAND_status' function. */
++/* #undef HAVE_RAND_STATUS */
++
++/* Define to 1 if you have the <rsa.h> header file. */
++/* #undef HAVE_RSA_H */
++
++/* Define to 1 if you have the `select' function. */
++#define HAVE_SELECT 1
++
++/* Define to 1 if you have the <setjmp.h> header file. */
++#define HAVE_SETJMP_H 1
++
++/* Define to 1 if you have the <sgtty.h> header file. */
++#define HAVE_SGTTY_H 1
++
++/* Define to 1 if you have the `sigaction' function. */
++#define HAVE_SIGACTION 1
++
++/* Define to 1 if you have the `siginterrupt' function. */
++#define HAVE_SIGINTERRUPT 1
++
++/* Define to 1 if you have the `signal' function. */
++#define HAVE_SIGNAL 1
++
++/* If you have sigsetjmp */
++#define HAVE_SIGSETJMP 1
++
++/* Define to 1 if you have the `socket' function. */
++#define HAVE_SOCKET 1
++
++/* use SO_NONBLOCK for non-blocking sockets */
++/* #undef HAVE_SO_NONBLOCK */
++
++/* Define this if you have the SPNEGO library fbopenssl */
++/* #undef HAVE_SPNEGO */
++
++/* Define to 1 if you have the <ssl.h> header file. */
++/* #undef HAVE_SSL_H */
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the `strcasecmp' function. */
++#define HAVE_STRCASECMP 1
++
++/* Define to 1 if you have the `strcmpi' function. */
++/* #undef HAVE_STRCMPI */
++
++/* Define to 1 if you have the `strdup' function. */
++#define HAVE_STRDUP 1
++
++/* Define to 1 if you have the `strerror_r' function. */
++#define HAVE_STRERROR_R 1
++
++/* Define to 1 if you have the `strftime' function. */
++#define HAVE_STRFTIME 1
++
++/* Define to 1 if you have the `stricmp' function. */
++#define HAVE_STRICMP 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the `strlcat' function. */
++#define HAVE_STRLCAT 1
++
++/* Define to 1 if you have the `strlcpy' function. */
++/* #undef HAVE_STRLCPY */
++
++/* Define to 1 if you have the `strstr' function. */
++#define HAVE_STRSTR 1
++
++/* Define to 1 if you have the `strtok_r' function. */
++#define HAVE_STRTOK_R 1
++
++/* Define to 1 if you have the `strtoll' function. */
++#define HAVE_STRTOLL 1
++
++/* Define to 1 if you have the <sys/ioctl.h> header file. */
++#define HAVE_SYS_IOCTL_H 1
++
++/* Define to 1 if you have the <sys/param.h> header file. */
++#define HAVE_SYS_PARAM_H 1
++
++/* Define to 1 if you have the <sys/poll.h> header file. */
++/* #undef HAVE_SYS_POLL_H */
++
++/* Define to 1 if you have the <sys/select.h> header file. */
++#define HAVE_SYS_SELECT_H 1
++
++/* Define to 1 if you have the <sys/socket.h> header file. */
++#define HAVE_SYS_SOCKET_H 1
++
++/* Define to 1 if you have the <sys/sockio.h> header file. */
++#define HAVE_SYS_SOCKIO_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define to 1 if you have the <sys/utime.h> header file. */
++#define HAVE_SYS_UTIME_H 1
++
++/* Define to 1 if you have the `tcgetattr' function. */
++#define HAVE_TCGETATTR 1
++
++/* Define to 1 if you have the `tcsetattr' function. */
++#define HAVE_TCSETATTR 1
++
++/* Define to 1 if you have the <termios.h> header file. */
++#define HAVE_TERMIOS_H 1
++
++/* Define to 1 if you have the <termio.h> header file. */
++#define HAVE_TERMIO_H 1
++
++/* Define to 1 if you have the <time.h> header file. */
++#define HAVE_TIME_H 1
++
++/* Define to 1 if you have the `tld_strerror' function. */
++/* #undef HAVE_TLD_STRERROR */
++
++/* Define to 1 if you have the `uname' function. */
++#define HAVE_UNAME 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define to 1 if you have the `utime' function. */
++#define HAVE_UTIME 1
++
++/* Define to 1 if you have the <utime.h> header file. */
++#define HAVE_UTIME_H 1
++
++/* Define to 1 if you have the <winsock.h> header file. */
++/* #undef HAVE_WINSOCK_H */
++
++/* Define this symbol if your OS supports changing the contents of argv */
++#define HAVE_WRITABLE_ARGV 1
++
++/* Define to 1 if you have the <x509.h> header file. */
++/* #undef HAVE_X509_H */
++
++/* if you have the zlib.h header file */
++#define HAVE_ZLIB_H 1
++
++/* If you lack a fine basename() prototype */
++/* #undef NEED_BASENAME_PROTO */
++
++/* need REENTRANT defined */
++/* #undef NEED_REENTRANT */
++
++/* cpu-machine-OS */
++#define OS "i386-pc-os2-emx"
++
++/* Name of package */
++#define PACKAGE "curl"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "curl"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "curl -"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "curl"
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "-"
++
++/* a suitable file to read random data from */
++/* #undef RANDOM_FILE */
++
++/* Define as the return type of signal handlers (`int' or `void'). */
++#define RETSIGTYPE void
++
++/* Define to the type of arg 1 for `select'. */
++#define SELECT_TYPE_ARG1 int
++
++/* Define to the type of args 2, 3 and 4 for `select'. */
++#define SELECT_TYPE_ARG234 (fd_set *)
++
++/* Define to the type of arg 5 for `select'. */
++#define SELECT_TYPE_ARG5 (struct timeval *)
++
++/* The size of a `curl_off_t', as computed by sizeof. */
++#define SIZEOF_CURL_OFF_T 8
++
++/* The size of a `long', as computed by sizeof. */
++#define SIZEOF_LONG 4
++
++/* The size of a `size_t', as computed by sizeof. */
++#define SIZEOF_SIZE_T 4
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#define TIME_WITH_SYS_TIME 1
++
++/* Define if you want to enable ares support */
++/* #undef USE_ARES */
++
++/* If you want to build curl with the built-in manual */
++/* #undef USE_MANUAL */
++
++/* Version number of package */
++#define VERSION "7.12.2"
++
++/* Define to 1 if on AIX 3.
++  System headers sometimes define this.
++  We just want to avoid a redefinition error message.  */
++#ifndef _ALL_SOURCE
++/* # undef _ALL_SOURCE */
++#endif
++
++/* Number of bits in a file offset, on hosts where this is settable. */
++/* #undef _FILE_OFFSET_BITS */
++
++/* Define for large files, on AIX-style hosts. */
++/* #undef _LARGE_FILES */
++
++/* define this if you need it to compile thread-safe code */
++/* #undef _THREAD_SAFE */
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
++
++/* type to use in place of in_addr_t if not defined */
++/* #undef in_addr_t */
++
++/* Define to `unsigned' if <sys/types.h> does not define. */
++/* #undef size_t */
++
++/* type to use in place of socklen_t if not defined */
++#define socklen_t int
++
++/* the signed version of size_t */
++/* #undef ssize_t */
+--- misc/curl-7.12.2/lib/config-win32.h	2004-07-29 15:09:58.000000000 +0200
++++ misc/build/curl-7.12.2/lib/config-win32.h	2008-07-08 16:11:12.984375000 +0200
+@@ -29,6 +29,24 @@
+ /* Define this to 'int' if ssize_t is not an available typedefed type */
+ #define ssize_t int
+ 
++/* Define to disable DICT */
++#define CURL_DISABLE_DICT 1
++ 
++/* Define to disable FILE */
++#define CURL_DISABLE_FILE 1
++ 
++/* Define to disable GOPHER */
++#define CURL_DISABLE_GOPHER 1
++ 
++/* Define to disable LDAP */
++#define CURL_DISABLE_LDAP 1
++ 
++/* Define to disable TELNET */
++#define CURL_DISABLE_TELNET 1
++ 
++/* Define if you want to enable IPv6 support */
++#define ENABLE_IPV6 1
++
+ /* Define this to 'int' if socklen_t is not an available typedefed type */
+ #if !defined(ENABLE_IPV6) && ((_MSC_VER < 1300) || !defined(USE_SSLEAY))
+ #define socklen_t int
+--- misc/curl-7.12.2/lib/http_ntlm.c	2004-07-29 15:09:58.000000000 +0200
++++ misc/build/curl-7.12.2/lib/http_ntlm.c	2008-07-08 16:11:13.062500000 +0200
+@@ -528,6 +528,13 @@
+     size=64;
+     ntlmbuf[62]=ntlmbuf[63]=0;
+ 
++    /* Make sure that the user and domain strings fit in the target buffer
++       before we copy them there. */
++    if(size + userlen + domlen >= sizeof(ntlmbuf)) {
++      failf(conn->data, "user + domain name too big");
++      return CURLE_OUT_OF_MEMORY;
++    }
++
+     memcpy(&ntlmbuf[size], domain, domlen);
+     size += domlen;
+ 
+--- misc/curl-7.12.2/lib/setup.h	2004-10-08 10:06:16.000000000 +0200
++++ misc/build/curl-7.12.2/lib/setup.h	2008-07-08 16:23:32.328125000 +0200
+@@ -44,6 +44,10 @@
+ /* hand-modified win32 config.h! */
+ #include "config-win32.h"
+ #endif
++#ifdef OS2
++/* hand-modified os2 config.h! */
++#include "config-os2.h"
++#endif
+ #endif
+ 
+ #ifdef macintosh
+@@ -161,21 +165,11 @@
+ #define WIN32_LEAN_AND_MEAN  /* Prevent including <winsock*.h> in <windows.h> */
+ #endif
+ 
+-#if (defined(ENABLE_IPV6) || defined(CURLDEBUG)) && defined(_MSC_VER) && \
+-    (!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0500)
+-/*
+- * Needed to pull in the real getaddrinfo() and not the inline version
+- * in <wspiAPI.H> which doesn't support IPv6 (IPv4 only). <wspiAPI.H> is
+- * included from <ws2tcpip.h> for <= 0x0500 SDKs.
+- */
+-#undef  _WIN32_WINNT
+-#define _WIN32_WINNT 0x0501
+-#endif
+-
+ #include <winsock2.h>        /* required by telnet.c */
+ 
+ #if defined(ENABLE_IPV6) || defined(USE_SSLEAY)
+ #include <ws2tcpip.h>
++#include <wspiapi.h>
+ #endif
+ 
+ #if !defined(__GNUC__) || defined(__MINGW32__)
+--- misc/curl-7.12.2/lib/url.c	2004-10-18 00:21:02.000000000 +0200
++++ misc/build/curl-7.12.2/lib/url.c	2008-07-08 16:11:13.375000000 +0200
+@@ -814,27 +814,6 @@
+        and this just changes the actual request keyword */
+     break;
+ 
+-  case CURLOPT_PROXY:
+-    /*
+-     * Set proxy server:port to use as HTTP proxy.
+-     *
+-     * If the proxy is set to "" we explicitly say that we don't want to use a
+-     * proxy (even though there might be environment variables saying so).
+-     *
+-     * Setting it to NULL, means no proxy but allows the environment variables
+-     * to decide for us.
+-     */
+-    if(data->change.proxy_alloc) {
+-      /*
+-       * The already set string is allocated, free that first
+-       */
+-      data->change.proxy_alloc=FALSE;;
+-      free(data->change.proxy);
+-    }
+-    data->set.set_proxy = va_arg(param, char *);
+-    data->change.proxy = data->set.set_proxy;
+-    break;
+-
+   case CURLOPT_PROXYPORT:
+     /*
+      * Explicitly set HTTP proxy port number.
+@@ -883,6 +862,27 @@
+   break;
+ #endif   /* CURL_DISABLE_HTTP */
+ 
++  case CURLOPT_PROXY:
++    /*
++     * Set proxy server:port to use as HTTP proxy.
++     *
++     * If the proxy is set to "" we explicitly say that we don't want to use a
++     * proxy (even though there might be environment variables saying so).
++     *
++     * Setting it to NULL, means no proxy but allows the environment variables
++     * to decide for us.
++     */
++    if(data->change.proxy_alloc) {
++      /*
++       * The already set string is allocated, free that first
++       */
++      data->change.proxy_alloc=FALSE;;
++      free(data->change.proxy);
++    }
++    data->set.set_proxy = va_arg(param, char *);
++    data->change.proxy = data->set.set_proxy;
++    break;
++
+   case CURLOPT_WRITEHEADER:
+     /*
+      * Custom pointer to pass the header write callback function
+@@ -1428,7 +1428,7 @@
+     result = CURLE_FAILED_INIT; /* correct this */
+     break;
+   }
+-  
++
+   return result;
+ }
+ 
+@@ -2278,12 +2278,18 @@
+   if(urllen < LEAST_PATH_ALLOC)
+     urllen=LEAST_PATH_ALLOC;
+ 
+-  conn->pathbuffer=(char *)malloc(urllen);
++  /*
++   * We malloc() the buffers below urllen+2 to make room for to possibilities:
++   * 1 - an extra terminating zero
++   * 2 - an extra slash (in case a syntax like "www.host.com?moo" is used)
++   */
++
++  conn->pathbuffer=(char *)malloc(urllen+2);
+   if(NULL == conn->pathbuffer)
+     return CURLE_OUT_OF_MEMORY; /* really bad error */
+   conn->path = conn->pathbuffer;
+ 
+-  conn->host.rawalloc=(char *)malloc(urllen);
++  conn->host.rawalloc=(char *)malloc(urllen+2);
+   if(NULL == conn->host.rawalloc)
+     return CURLE_OUT_OF_MEMORY;
+   conn->host.name = conn->host.rawalloc;
+@@ -2461,6 +2467,7 @@
+       return CURLE_OUT_OF_MEMORY;
+   }
+ 
++#ifndef CURL_DISABLE_HTTP
+   /*************************************************************
+    * Detect what (if any) proxy to use
+    *************************************************************/
+@@ -2625,6 +2632,7 @@
+     if(no_proxy)
+       free(no_proxy);
+   } /* if not using proxy */
++#endif /* CURL_DISABLE_HTTP */
+ 
+   /*************************************************************
+    * No protocol part in URL was used, add it!
+@@ -2880,54 +2888,6 @@
+     return CURLE_UNSUPPORTED_PROTOCOL;
+   }
+ 
+-  /*************************************************************
+-   * Figure out the remote port number
+-   *
+-   * No matter if we use a proxy or not, we have to figure out the remote
+-   * port number of various reasons.
+-   *
+-   * To be able to detect port number flawlessly, we must not confuse them
+-   * IPv6-specified addresses in the [0::1] style. (RFC2732)
+-   *
+-   * The conn->host.name is currently [user:passwd@]host[:port] where host
+-   * could be a hostname, IPv4 address or IPv6 address.
+-   *************************************************************/
+-  if((1 == sscanf(conn->host.name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) &&
+-     (']' == endbracket)) {
+-    /* this is a RFC2732-style specified IP-address */
+-    conn->bits.ipv6_ip = TRUE;
+-
+-    conn->host.name++; /* pass the starting bracket */
+-    tmp = strchr(conn->host.name, ']');
+-    *tmp = 0; /* zero terminate */
+-    tmp++; /* pass the ending bracket */
+-    if(':' != *tmp)
+-      tmp = NULL; /* no port number available */
+-  }
+-  else
+-    tmp = strrchr(conn->host.name, ':');
+-
+-  if (tmp) {
+-    char *rest;
+-    unsigned long port;
+-
+-    port=strtoul(tmp+1, &rest, 10);  /* Port number must be decimal */
+-
+-    if (rest != (tmp+1) && *rest == '\0') {
+-      /* The colon really did have only digits after it,
+-       * so it is either a port number or a mistake */
+-
+-      if (port > 0xffff) {   /* Single unix standard says port numbers are
+-                              * 16 bits long */
+-        failf(data, "Port number too large: %lu", port);
+-        return CURLE_URL_MALFORMAT;
+-      }
+-
+-      *tmp = '\0'; /* cut off the name there */
+-      conn->remote_port = (unsigned short)port;
+-    }
+-  }
+-
+   if(data->change.proxy && *data->change.proxy) {
+     /* If this is supposed to use a proxy, we need to figure out the proxy
+        host name name, so that we can re-use an existing connection
+@@ -3119,6 +3079,54 @@
+     return CURLE_OUT_OF_MEMORY;
+ 
+   /*************************************************************
++   * Figure out the remote port number
++   *
++   * No matter if we use a proxy or not, we have to figure out the remote
++   * port number of various reasons.
++   *
++   * To be able to detect port number flawlessly, we must not confuse them
++   * IPv6-specified addresses in the [0::1] style. (RFC2732)
++   *
++   * The conn->host.name is currently host[:port] where host could be a
++   * hostname, IPv4 address or IPv6 address.
++   *************************************************************/
++  if((1 == sscanf(conn->host.name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) &&
++     (']' == endbracket)) {
++    /* this is a RFC2732-style specified IP-address */
++    conn->bits.ipv6_ip = TRUE;
++
++    conn->host.name++; /* pass the starting bracket */
++    tmp = strchr(conn->host.name, ']');
++    *tmp = 0; /* zero terminate */
++    tmp++; /* pass the ending bracket */
++    if(':' != *tmp)
++      tmp = NULL; /* no port number available */
++  }
++  else
++    tmp = strrchr(conn->host.name, ':');
++
++  if (tmp) {
++    char *rest;
++    unsigned long port;
++
++    port=strtoul(tmp+1, &rest, 10);  /* Port number must be decimal */
++
++    if (rest != (tmp+1) && *rest == '\0') {
++      /* The colon really did have only digits after it,
++       * so it is either a port number or a mistake */
++
++      if (port > 0xffff) {   /* Single unix standard says port numbers are
++                              * 16 bits long */
++        failf(data, "Port number too large: %lu", port);
++        return CURLE_URL_MALFORMAT;
++      }
++
++      *tmp = '\0'; /* cut off the name there */
++      conn->remote_port = (unsigned short)port;
++    }
++  }
++
++  /*************************************************************
+    * Check the current list of connections to see if we can
+    * re-use an already existing one or if we have to create a
+    * new one.
+@@ -3471,9 +3479,7 @@
+    * characters (you get mangled text files, and corrupted binary files when
+    * you download to stdout and redirect it to a file). */
+ 
+-  if ((data->set.out)->_handle == NULL) {
+     _fsetmode(stdout, "b");
+-  }
+ #endif
+ 
+   return CURLE_OK;
+--- misc/curl-7.12.2/ltmain.sh	2004-08-09 13:12:17.000000000 +0200
++++ misc/build/curl-7.12.2/ltmain.sh	2008-07-08 16:11:13.484375000 +0200
+@@ -2915,12 +2915,12 @@
+ 	  # which has an extra 1 added just for fun
+ 	  #
+ 	  case $version_type in
+-	  darwin|linux|osf|windows)
++	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
+ 	    current=`expr $number_major + $number_minor`
+ 	    age="$number_minor"
+ 	    revision="$number_revision"
+ 	    ;;
+-	  freebsd-aout|freebsd-elf|sunos)
++	  sunos)
+ 	    current="$number_major"
+ 	    revision="$number_minor"
+ 	    age="0"
+@@ -2990,16 +2990,6 @@
+ 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ 	  ;;
+ 
+-	freebsd-aout)
+-	  major=".$current"
+-	  versuffix=".$current.$revision";
+-	  ;;
+-
+-	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current";
+-	  ;;
+-
+ 	irix | nonstopux)
+ 	  major=`expr $current - $age + 1`
+ 
+@@ -3022,7 +3012,7 @@
+ 	  versuffix="$major.$revision"
+ 	  ;;
+ 
+-	linux)
++	linux|freebsd-aout|freebsd-elf)
+ 	  major=.`expr $current - $age`
+ 	  versuffix="$major.$age.$revision"
+ 	  ;;
commit 9dfd3cfa0d9c422078a34936d4bc9fbc8b473368
Merge: 9e7537c... 79f93df...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jun 23 16:54:10 2009 +0200

    Merge commit 'ooo/DEV300_m50'

commit 4e1ac5cd6f67545a79f2313021fbf0285bbf3bee
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Jun 22 09:41:34 2009 +0000

    #i10000# #i99046# svn property removed
commit 72f7bd123d2b45abe20cf097a6e3367c82279b00
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Jun 16 17:10:38 2009 +0000

    #i10000# #i100103# icu patch

diff --git a/icu/makefile.mk b/icu/makefile.mk
index cdaec3e..6b3c15a 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -68,7 +68,7 @@ icu_CFLAGS+=$(C_RESTRICTIONFLAGS)
 # add SYSBASE libraries and make certain that they are found *after* the
 # icu build internal libraries - in case that icu is available in SYSBASE
 # as well
-icu_LDFLAGS+= -L../../lib -L../../stubdata  -L$(SYSBASE)$/usr$/lib
+icu_LDFLAGS+= -L../lib  -L../../lib -L../stubdata -L../../stubdata  -L$(SYSBASE)$/usr$/lib
 .ENDIF			# "$(SYSBASE)"!=""
 
 .IF "$(OS)"=="MACOSX"
commit 79f93dff771bdf9d6328ddf97802f754521d4bc0
Author: Release Engineers <releng at openoffice.org>
Date:   Wed Jun 10 13:24:56 2009 +0000

    Create DEV300_m50 milestone tag from trunk at 272824
commit 77e1375915058021ad903915e3a2172139dc6b45
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Jun 4 15:47:31 2009 +0000

    CWS-TOOLING: integrate CWS cmcfixes59
    2009-05-18 10:10:11 +0200 cmc  r272001 : #i102012# remove extensions warnings, and set as warnings-free
    2009-05-16 17:29:59 +0200 cmc  r271981 : #i101990# silence warning, logic is unchanged
    2009-05-16 17:13:59 +0200 cmc  r271980 : #i100412 remove warning, logic is unchanged
    2009-05-16 17:08:57 +0200 cmc  r271979 : #i100412 remove warning, logic is unchanged, matches comments for intent
    2009-05-16 17:01:08 +0200 cmc  r271978 : #i86576# remove uncallable code
    2009-05-16 15:41:46 +0200 cmc  r271977 : #i101988# fix up consts for warning-free

diff --git a/hunspell/hunspell-consts-1.2.8.patch b/hunspell/hunspell-consts-1.2.8.patch
new file mode 100644
index 0000000..8f8c727
--- /dev/null
+++ b/hunspell/hunspell-consts-1.2.8.patch
@@ -0,0 +1,22 @@
+--- 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/makefile.mk b/hunspell/makefile.mk
index c8d8d5c..db667cc 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -45,7 +45,9 @@ TARFILE_ROOTDIR=hunspell-1.2.8
 
 #ADDITIONAL_FILES += src/hunspell/makefile.mk
 
-PATCH_FILES=hunspell-1.2.8.patch
+PATCH_FILES=\
+    hunspell-1.2.8.patch \
+    hunspell-consts-1.2.8.patch # hunspell#2064983
 
 .IF "$(GUI)"=="UNX"
 #CONFIGURE_DIR=$(BUILD_DIR)
commit 747787410a988cf6dfa8a80c766a62e138af9e7e
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu May 28 16:03:55 2009 +0000

    CWS-TOOLING: integrate CWS ause101
    2009-05-11 14:39:16 +0200 hjs  r271770 : #i101204# more selective copy
    2009-05-07 19:16:08 +0200 hjs  r271693 : #i101651# embed windows manifest
    2009-05-07 18:43:17 +0200 hjs  r271692 : #i101650# fix CHECKZIPRESULT for bash
    2009-05-07 18:25:43 +0200 hjs  r271690 : #i101649# workaround warnings in generated code

diff --git a/libxslt/libxslt-1.1.24_win_manifest.patch b/libxslt/libxslt-1.1.24_win_manifest.patch
new file mode 100644
index 0000000..40f0732
--- /dev/null
+++ b/libxslt/libxslt-1.1.24_win_manifest.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ var dirSep = "\\";
+ var compiler = "msvc";
+ var cruntime = "/MD";
+-var vcmanifest = false;
++var vcmanifest = true;
+ var buildDebug = 0;
+ var buildStatic = 0;
+ var buildPrefix = ".";
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 291a161..76cbcd3 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -51,7 +51,7 @@ all:
 LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch
 
 # This is only for UNX environment now
 
@@ -126,7 +126,7 @@ OUT2BIN+=xslt-config
 .ELSE
 OUT2LIB+=win32$/bin.msvc$/*.lib
 OUT2BIN+=win32$/bin.msvc$/*.dll
-OUT2BIN+=win32$/bin.msvc$/*.exe*
+OUT2BIN+=win32$/bin.msvc$/*.exe
 .ENDIF
 .ELSE
 OUT2LIB+=libxslt$/.libs$/libxslt.so*
commit 238ac40111884ba91964e25eeefa1adafe2bcd84
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Mon May 18 12:01:49 2009 +0000

    CWS-TOOLING: integrate CWS cairocanvastext01
    2009-05-12 07:10:00 +0200 mox  r271795 : Rename ::GetLayoutData() to ::GetSysTextLayoutData() to avoid build
    breakage in sc module.
    2009-05-11 23:40:57 +0200 mox  r271794 : merge fixes (again). These files should have been removed by the rebase.
    2009-05-11 20:17:44 +0200 mox  r271791 : fix build breakage on UNX
    2009-05-11 16:53:15 +0200 mox  r271779 : Documentation fix
    2009-05-11 16:49:16 +0200 mox  r271778 : merge fixes
    2009-05-11 14:10:36 +0200 mox  r271769 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 271427 (milestone: DEV300:m47)
    2009-05-11 10:55:11 +0200 mox  r271760 : merge fixes
    2009-05-11 10:49:44 +0200 mox  r271759 : manual merge to DEV300_m47
    2009-05-11 10:42:11 +0200 mox  r271758 : merge fixes
    2009-05-11 10:29:16 +0200 mox  r271757 : Manual merge to DEV300_m47
    2009-05-11 10:21:13 +0200 mox  r271756 : manual merge to DEV300_m47
    2009-05-11 10:10:29 +0200 mox  r271755 : manual merge to DEV300_m47
    2009-05-11 10:01:33 +0200 mox  r271754 : Manual merge to DEV300_m47
    2009-05-11 09:59:30 +0200 mox  r271753 : manual merge to DEV300_m47
    2009-05-11 09:57:33 +0200 mox  r271752 : merge fixes
    2009-05-11 09:56:05 +0200 mox  r271751 : merge fixes
    2009-05-11 09:53:26 +0200 mox  r271749 : Manual merge to DEV300_m47
    2009-05-11 09:49:34 +0200 mox  r271748 : manual merge to DEV300_m47
    2009-05-11 09:43:20 +0200 mox  r271747 : manual merge to DEV300_m47
    2009-05-11 09:30:10 +0200 mox  r271745 : Manual merge to DEV300_m47
    2009-05-11 09:28:59 +0200 mox  r271744 : manual merge to DEV300_m47
    2009-05-11 09:24:49 +0200 mox  r271743 : Fix to merge
    2009-05-11 09:21:55 +0200 mox  r271742 : Manual merge to DEV300_m47
    2009-05-11 09:18:13 +0200 mox  r271741 : merge fixes
    2009-05-11 09:00:50 +0200 mox  r271739 : Manual merge to DEV300_m47
    2009-05-09 13:26:10 +0200 mox  r271734 : cleanup
    2009-05-09 13:17:22 +0200 mox  r271733 : WNT build fixes
    2009-05-09 09:23:59 +0200 mox  r271732 : Implement proper cross-platform font width calculation
    Implement faux bold support
    2009-02-21 19:47:08 +0100 mox  r268339 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 267171 (milestone: DEV300:m41)
    2009-01-19 21:51:21 +0100 mox  r266530 : Fix compilation on win32
    2009-01-19 21:37:20 +0100 mox  r266529 : Fix typo
    2009-01-19 21:35:28 +0100 mox  r266528 : Better debug
    2009-01-19 21:13:30 +0100 mox  r266527 : Win32 fixes for proper text rendering
    2009-01-19 21:12:56 +0100 mox  r266526 : Win32 fixes for proper text rendering
    2008-12-27 13:04:05 +0100 mox  r265814 : configure fixes
    2008-12-27 11:37:00 +0100 mox  r265813 : x86_64 works only with system-cairo
    2008-12-26 20:02:32 +0100 mox  r265809 : Use the fix for 64bit builds
    2008-12-25 16:58:11 +0100 mox  r265802 : Fix build breaker on WNT
    2008-12-24 23:04:58 +0100 mox  r265801 : Unbreak build after rebase.
    2008-12-23 18:52:32 +0100 mox  r265790 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 265758 (milestone: DEV300:m38)
    2008-12-23 18:23:09 +0100 mox  r265789 : Fix the fix
    2008-12-23 18:21:27 +0100 mox  r265788 : Fix OS2 stuff
    2008-12-11 19:50:40 +0100 mox  r265354 : Fix build breaker on Mac
    2008-12-09 22:00:53 +0100 mox  r265139 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 264807 (milestone: DEV300:m37)
    2008-12-08 23:02:32 +0100 thb  r265052 : Removed outdated parts from readme
    2008-12-08 22:26:54 +0100 mox  r265051 : cleanup
    2008-12-07 19:55:31 +0100 mox  r264967 : Fix for non-intel processors.
    2008-12-07 19:47:11 +0100 mox  r264963 : sysdata fixes
    2008-12-07 19:23:27 +0100 mox  r264959 : Sysdata fixes
    2008-12-07 19:01:48 +0100 mox  r264958 : Fix sysdata usage
    2008-12-07 11:41:33 +0100 mox  r264951 : sysdata fixes
    2008-12-07 11:38:32 +0100 mox  r264950 : sysdata fixes
    2008-12-06 23:15:06 +0100 mox  r264947 : Try to fix error: __sync_val_compare_and_swap_4
    2008-12-06 23:09:30 +0100 mox  r264945 : Revert unnecessary change.
    2008-12-06 23:04:40 +0100 mox  r264944 : Use pre/postx from tools module.
    2008-12-06 22:49:08 +0100 mox  r264943 : Use proper pre/post includes.
    2008-12-06 22:48:03 +0100 mox  r264942 : Use pre/postx from tools module.
    2008-12-06 22:24:10 +0100 mox  r264941 : Fix build breaker.
    2008-12-06 21:55:46 +0100 mox  r264940 : Make pre/postx.h properly available
    2008-12-06 21:54:23 +0100 mox  r264939 : Make pre/postx.h properly available.
    2008-12-06 21:43:09 +0100 mox  r264938 : Try to fix error: __sync_val_compare_and_swap_4
    2008-12-06 21:12:18 +0100 mox  r264937 : Remove obsolete pre-built binaries
    2008-12-06 21:07:40 +0100 mox  r264936 : WNT: do not hardcode pixman version in cairo build
    2008-12-06 19:26:44 +0100 mox  r264934 : Revert pixman upgrade.
    2008-12-06 18:35:14 +0100 mox  r264933 : Fix build breaker
    2008-12-06 18:31:11 +0100 mox  r264932 : Use static pixman lib on unx/32bit to avoid linking problems
    2008-12-06 17:22:52 +0100 mox  r264930 : Update pixman to 0.13.2
    2008-12-06 13:30:41 +0100 mox  r264928 : Fix accidentally changed property
    2008-12-06 13:09:00 +0100 mox  r264927 : Fix accidental prop changes
    2008-12-06 12:40:08 +0100 mox  r264926 : Fix build breaker on Win32
    2008-12-06 12:39:22 +0100 mox  r264925 : Fix build breaker on Win32
    2008-12-06 12:30:23 +0100 mox  r264924 : Fix build breakers on win32
    2008-12-06 11:45:33 +0100 mox  r264923 : revert.
    2008-12-06 11:43:05 +0100 mox  r264922 : Try to fix header include problems on WNT
    2008-12-06 09:57:35 +0100 mox  r264921 : Cleanup accidental props
    2008-11-29 14:43:51 +0100 mox  r264580 : Move headers around to make all platforms compile
    2008-11-29 14:41:59 +0100 mox  r264579 : WaE fixes for X11
    2008-11-29 13:13:49 +0100 mox  r264578 : Fix build breaker on linux
    2008-11-29 12:21:03 +0100 mox  r264577 : Fix build breaker
    2008-11-29 12:13:50 +0100 mox  r264576 : Try to fix build breaker
    2008-11-28 22:51:27 +0100 mox  r264573 : Revert header includes to common style
    2008-11-18 18:59:15 +0100 mox  r263794 : Fix build breaker.
    2008-11-17 20:28:19 +0100 mox  r263740 : Revert most configure hacks
    2008-11-17 20:12:51 +0100 mox  r263739 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 263288 (milestone: DEV300:m35)
    2008-11-14 21:22:22 +0100 mox  r263698 : ZLIB_FIX define set
    2008-11-14 18:48:22 +0100 mox  r263694 : hardcode zlib paths
    2008-11-14 16:23:07 +0100 mox  r263683 : Fix typo
    2008-11-13 20:16:13 +0100 mox  r263662 : WaE fix
    2008-11-13 19:44:29 +0100 mox  r263661 : Properly include zlib headers for win32
    2008-11-12 20:05:51 +0100 mox  r263610 : Add debugging code.
    2008-11-10 19:44:35 +0100 mox  r263537 : Try to fix build breaker
    2008-11-09 22:34:35 +0100 mox  r263504 : Remove accidentally added svn:ignore properties.
    2008-11-09 22:33:21 +0100 mox  r263503 : prop should be actually deleted.
    2008-11-09 22:30:06 +0100 mox  r263502 : props should be empty.
    2008-11-09 22:23:22 +0100 mox  r263501 : Try fix props again...
    2008-11-09 22:11:26 +0100 mox  r263500 : try to fix svn:ignore
    2008-11-09 21:30:01 +0100 mox  r263499 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 262620 (milestone: DEV300:m34)
    2008-11-09 20:30:55 +0100 mox  r263498 : add missing cairo patch
    2008-11-09 10:56:33 +0100 mox  r263494 : Resync cairo module with cws cairosource01
    2008-11-01 09:32:19 +0100 mox  r262870 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 262620 (milestone: DEV300:m34)
    2008-10-26 20:55:48 +0100 mox  r262663 : Fix build breaker
    2008-10-25 13:10:00 +0200 mox  r262662 : CWS rebase to m33
    2008-10-12 19:47:56 +0200 mox  r262170 : Migrate CWS cairocanvastext01 to SVN.

diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index b8533c8..454f234 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -7,8 +7,8 @@ diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo
  
 -PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
 -PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
-+PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman-0.12.0/pixman
-+PIXMAN_LIBS := $(top_builddir)/../pixman-0.12.0/pixman/$(CFG)/pixman-1.lib
++PIXMAN_CFLAGS := -I$(SRC_ROOT)/cairo/$(INPATH)/inc
++PIXMAN_LIBS := $(SRC_ROOT)/cairo/$(INPATH)/lib/pixman-1.lib
  
  CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib
  ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 73d3a27..59a3a35 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -125,6 +125,10 @@ LDFLAGS:=$(cairo_LDFLAGS)
 cairo_CFLAGS+=-xc99=none
 .ENDIF
 
+.IF "$(CPU)"=="I"
+cairo_CFLAGS+=-march=i486
+.ENDIF
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
 CONFIGURE_FLAGS=--enable-xlib --enable-ft --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index b33d02f..93ce366 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -109,11 +109,22 @@ LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ld
 pixman_CFLAGS+=-xc99=none
 .ENDIF
 
+.IF "$(CPU)"=="I"
+pixman_CFLAGS+=-march=i486
+.ENDIF
+
 pixman_CFLAGS+=-fPIC
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes CFLAGS="$(pixman_CFLAGS)"
+.IF "$(CPUNAME)"=="X86_64"
+# static builds tend to fail on 64bit
+CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes
+.ELSE
+# use static lib to avoid linking problems with older system pixman libs
+CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no
+.ENDIF
+CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -135,7 +146,11 @@ OUT2LIB+=pixman$/.libs$/*.a
 OUT2LIB+=pixman$/release$/*.lib
 .ENDIF
 .ELSE
+.IF "$(CPUNAME)"=="X86_64"
 OUT2LIB+=pixman$/.libs$/libpixman-1.so
+.ELSE
+OUT2LIB+=pixman$/.libs$/libpixman-1.a
+.ENDIF
 .ENDIF
 
 # --- Targets ------------------------------------------------------


More information about the ooo-build-commit mailing list