Merge blocked
--- Merging r14385 into '.':
C packages/syslog/Makefile
C packages/syslog/examples/Makefile
C packages/unixutil/Makefile
C packages/sdl/Makefile
C packages/ncurses/Makefile
C packages/ncurses/examples/Makefile
C packages/pcap/Makefile
C packages/fcl-extra/Makefile
C packages/fcl-net/Makefile
C packages/winunits-jedi/Makefile
C packages/fcl-res/Makefile
C packages/imlib/Makefile
C packages/fcl-passrc/Makefile
C packages/imagemagick/Makefile
C packages/objcrtl/Makefile
C packages/zlib/Makefile
C packages/mad/Makefile
C packages/graph/Makefile
C packages/fcl-xml/Makefile
C packages/iconvenc/Makefile
C packages/iconvenc/examples/Makefile
C packages/unzip/Makefile
C packages/gdbint/Makefile
C packages/libc/Makefile
C packages/fcl-fpcunit/Makefile
C packages/fcl-registry/Makefile
C packages/fv/Makefile
C packages/fv/examples/Makefile
C packages/Makefile
C packages/newt/Makefile
C packages/newt/examples/Makefile
C packages/fastcgi/Makefile
C packages/fcl-process/Makefile
C packages/symbolic/Makefile
C packages/tcl/Makefile
C packages/openssl/Makefile
C packages/gmp/Makefile
C packages/gmp/examples/Makefile
C packages/opengl/Makefile
C packages/opengl/examples/Makefile
C packages/fcl-image/Makefile
C packages/fcl-image/examples/Makefile
C packages/gnome1/Makefile
C packages/fcl-db/src/export/Makefile
C packages/fcl-db/src/sqlite/Makefile
C packages/fcl-db/src/codegen/Makefile
C packages/fcl-db/src/memds/Makefile
C packages/fcl-db/src/sqldb/sqlite/Makefile
C packages/fcl-db/src/sqldb/mysql/Makefile
C packages/fcl-db/src/sqldb/oracle/Makefile
C packages/fcl-db/src/sqldb/postgres/Makefile
C packages/fcl-db/src/sqldb/odbc/Makefile
C packages/fcl-db/src/sqldb/interbase/Makefile
C packages/fcl-db/src/sqldb/Makefile
C packages/fcl-db/src/base/Makefile
C packages/fcl-db/src/sdf/Makefile
C packages/fcl-db/src/datadict/Makefile
C packages/fcl-db/src/dbase/Makefile
C packages/fcl-db/src/paradox/Makefile
C packages/fcl-db/Makefile
C packages/a52/Makefile
C packages/httpd13/Makefile
C packages/libcurl/Makefile
C packages/libcurl/examples/Makefile
C packages/proj4/Makefile
C packages/sqlite/Makefile
C packages/modplug/Makefile
C packages/pxlib/Makefile
C packages/pxlib/examples/Makefile
C packages/fcl-web/Makefile
C packages/ldap/Makefile
C packages/libgd/Makefile
C packages/libgd/examples/Makefile
C packages/hash/Makefile
C packages/hash/examples/Makefile
C packages/utmp/Makefile
C packages/utmp/examples/Makefile
C packages/httpd20/Makefile
C packages/httpd20/examples/Makefile
C packages/rexx/Makefile
C packages/rexx/examples/Makefile
C packages/numlib/Makefile
C packages/httpd22/Makefile
C packages/httpd22/examples/Makefile
C packages/winceunits/Makefile
C packages/dts/Makefile
C packages/univint/Makefile
C packages/univint/examples/Makefile
C packages/fpmkunit/Makefile
C packages/dbus/Makefile
C packages/dbus/examples/Makefile
C packages/oggvorbis/Makefile
C packages/users/Makefile
C packages/users/examples/Makefile
C packages/ggi/Makefile
C packages/ggi/examples/Makefile
C packages/postgres/Makefile
C packages/postgres/examples/Makefile
C packages/librsvg/Makefile
C packages/fpgtk/Makefile
C packages/fcl-base/Makefile
C packages/opengles/Makefile
C packages/opengles/examples/Makefile
C packages/palmunits/Makefile
C packages/openal/Makefile
C packages/openal/examples/Makefile
C packages/xforms/Makefile
C packages/xforms/examples/Makefile
C packages/fcl-async/Makefile
C packages/aspell/Makefile
C packages/amunits/Makefile
C packages/lua/Makefile
C packages/ibase/Makefile
C packages/ibase/examples/Makefile
C packages/bzip2/Makefile
C packages/os2units/Makefile
C packages/os2units/examples/Makefile
C packages/libxml/Makefile
C packages/libxml/examples/Makefile
C packages/svgalib/Makefile
C packages/svgalib/examples/Makefile
C packages/winunits-base/Makefile
C packages/pasjpeg/Makefile
C packages/bfd/Makefile
C packages/cairo/Makefile
C packages/cocoaint
C packages/cdrom/Makefile
C packages/cdrom/examples/Makefile
C packages/paszlib/Makefile
C packages/paszlib/examples/Makefile
C packages/mysql/Makefile
C packages/mysql/examples/Makefile
C packages/oracle/Makefile
C packages/oracle/examples/Makefile
C packages/gtk1/Makefile
C packages/gtk1/examples/tutorial/Makefile
C packages/gtk1/examples/Makefile
C packages/fftw/Makefile
C packages/uuid/Makefile
C packages/uuid/examples/Makefile
C packages/gtk2/Makefile
C packages/gtk2/examples/plugins/Makefile
C packages/gtk2/examples/gettingstarted/Makefile
C packages/gtk2/examples/gtk_demo/Makefile
C packages/gtk2/examples/gtkglext/Makefile
C packages/gtk2/examples/helloworld/Makefile
C packages/gtk2/examples/Makefile
C packages/gtk2/examples/helloworld2/Makefile
C packages/gtk2/examples/scribble_simple/Makefile
C packages/chm/Makefile
C packages/odbc/Makefile
C packages/odbc/examples/Makefile
C packages/gdbm/Makefile
C packages/gdbm/examples/Makefile
C packages/x11/Makefile
C packages/pthreads/Makefile
C packages/libpng/Makefile
C packages/fcl-json/Makefile
C packages/regexpr/Makefile
C packages/regexpr/examples/Makefile
C packages/zorba/Makefile
Summary of conflicts:
Text conflicts: 160
Tree conflicts: 1

# revisions: 14385
------------------------------------------------------------------------
r14385 | pierre | 2009-12-10 09:36:52 +0100 (Thu, 10 Dec 2009) | 1 line
Changed paths:
M /trunk/packages/Makefile
M /trunk/packages/a52/Makefile
M /trunk/packages/amunits/Makefile
M /trunk/packages/aspell/Makefile
M /trunk/packages/bfd/Makefile
M /trunk/packages/bzip2/Makefile
M /trunk/packages/cairo/Makefile
M /trunk/packages/cdrom/Makefile
M /trunk/packages/cdrom/examples/Makefile
M /trunk/packages/chm/Makefile
M /trunk/packages/cocoaint/Makefile
M /trunk/packages/dbus/Makefile
M /trunk/packages/dbus/examples/Makefile
M /trunk/packages/dts/Makefile
M /trunk/packages/fastcgi/Makefile
M /trunk/packages/fcl-async/Makefile
M /trunk/packages/fcl-base/Makefile
M /trunk/packages/fcl-db/Makefile
M /trunk/packages/fcl-db/src/base/Makefile
M /trunk/packages/fcl-db/src/codegen/Makefile
M /trunk/packages/fcl-db/src/datadict/Makefile
M /trunk/packages/fcl-db/src/dbase/Makefile
M /trunk/packages/fcl-db/src/export/Makefile
M /trunk/packages/fcl-db/src/memds/Makefile
M /trunk/packages/fcl-db/src/paradox/Makefile
M /trunk/packages/fcl-db/src/sdf/Makefile
M /trunk/packages/fcl-db/src/sqldb/Makefile
M /trunk/packages/fcl-db/src/sqldb/interbase/Makefile
M /trunk/packages/fcl-db/src/sqldb/mysql/Makefile
M /trunk/packages/fcl-db/src/sqldb/odbc/Makefile
M /trunk/packages/fcl-db/src/sqldb/oracle/Makefile
M /trunk/packages/fcl-db/src/sqldb/postgres/Makefile
M /trunk/packages/fcl-db/src/sqldb/sqlite/Makefile
M /trunk/packages/fcl-db/src/sqlite/Makefile
M /trunk/packages/fcl-extra/Makefile
M /trunk/packages/fcl-fpcunit/Makefile
M /trunk/packages/fcl-image/Makefile
M /trunk/packages/fcl-image/examples/Makefile
M /trunk/packages/fcl-json/Makefile
M /trunk/packages/fcl-net/Makefile
M /trunk/packages/fcl-passrc/Makefile
M /trunk/packages/fcl-process/Makefile
M /trunk/packages/fcl-registry/Makefile
M /trunk/packages/fcl-res/Makefile
M /trunk/packages/fcl-web/Makefile
M /trunk/packages/fcl-xml/Makefile
M /trunk/packages/fftw/Makefile
M /trunk/packages/fpgtk/Makefile
M /trunk/packages/fpmkunit/Makefile
M /trunk/packages/fv/Makefile
M /trunk/packages/fv/examples/Makefile
M /trunk/packages/gdbint/Makefile
M /trunk/packages/gdbm/Makefile
M /trunk/packages/gdbm/examples/Makefile
M /trunk/packages/ggi/Makefile
M /trunk/packages/ggi/examples/Makefile
M /trunk/packages/gmp/Makefile
M /trunk/packages/gmp/examples/Makefile
M /trunk/packages/gnome1/Makefile
M /trunk/packages/graph/Makefile
M /trunk/packages/gtk1/Makefile
M /trunk/packages/gtk1/examples/Makefile
M /trunk/packages/gtk1/examples/tutorial/Makefile
M /trunk/packages/gtk2/Makefile
M /trunk/packages/gtk2/examples/Makefile
M /trunk/packages/gtk2/examples/gettingstarted/Makefile
M /trunk/packages/gtk2/examples/gtk_demo/Makefile
M /trunk/packages/gtk2/examples/gtkglext/Makefile
M /trunk/packages/gtk2/examples/helloworld/Makefile
M /trunk/packages/gtk2/examples/helloworld2/Makefile
M /trunk/packages/gtk2/examples/plugins/Makefile
M /trunk/packages/gtk2/examples/scribble_simple/Makefile
M /trunk/packages/hash/Makefile
M /trunk/packages/hash/examples/Makefile
M /trunk/packages/httpd13/Makefile
M /trunk/packages/httpd20/Makefile
M /trunk/packages/httpd20/examples/Makefile
M /trunk/packages/httpd22/Makefile
M /trunk/packages/httpd22/examples/Makefile
M /trunk/packages/ibase/Makefile
M /trunk/packages/ibase/examples/Makefile
M /trunk/packages/iconvenc/Makefile
M /trunk/packages/iconvenc/examples/Makefile
M /trunk/packages/imagemagick/Makefile
M /trunk/packages/imlib/Makefile
M /trunk/packages/ldap/Makefile
M /trunk/packages/libc/Makefile
M /trunk/packages/libcurl/Makefile
M /trunk/packages/libcurl/examples/Makefile
M /trunk/packages/libgd/Makefile
M /trunk/packages/libgd/examples/Makefile
M /trunk/packages/libpng/Makefile
M /trunk/packages/librsvg/Makefile
M /trunk/packages/libxml/Makefile
M /trunk/packages/libxml/examples/Makefile
M /trunk/packages/lua/Makefile
M /trunk/packages/mad/Makefile
M /trunk/packages/modplug/Makefile
M /trunk/packages/mysql/Makefile
M /trunk/packages/mysql/examples/Makefile
M /trunk/packages/ncurses/Makefile
M /trunk/packages/ncurses/examples/Makefile
M /trunk/packages/newt/Makefile
M /trunk/packages/newt/examples/Makefile
M /trunk/packages/numlib/Makefile
M /trunk/packages/objcrtl/Makefile
M /trunk/packages/odbc/Makefile
M /trunk/packages/odbc/examples/Makefile
M /trunk/packages/oggvorbis/Makefile
M /trunk/packages/openal/Makefile
M /trunk/packages/openal/examples/Makefile
M /trunk/packages/opengl/Makefile
M /trunk/packages/opengl/examples/Makefile
M /trunk/packages/opengles/Makefile
M /trunk/packages/opengles/examples/Makefile
M /trunk/packages/openssl/Makefile
M /trunk/packages/oracle/Makefile
M /trunk/packages/oracle/examples/Makefile
M /trunk/packages/os2units/Makefile
M /trunk/packages/os2units/examples/Makefile
M /trunk/packages/palmunits/Makefile
M /trunk/packages/pasjpeg/Makefile
M /trunk/packages/paszlib/Makefile
M /trunk/packages/paszlib/examples/Makefile
M /trunk/packages/pcap/Makefile
M /trunk/packages/postgres/Makefile
M /trunk/packages/postgres/examples/Makefile
M /trunk/packages/proj4/Makefile
M /trunk/packages/pthreads/Makefile
M /trunk/packages/pxlib/Makefile
M /trunk/packages/pxlib/examples/Makefile
M /trunk/packages/regexpr/Makefile
M /trunk/packages/regexpr/examples/Makefile
M /trunk/packages/rexx/Makefile
M /trunk/packages/rexx/examples/Makefile
M /trunk/packages/sdl/Makefile
M /trunk/packages/sqlite/Makefile
M /trunk/packages/svgalib/Makefile
M /trunk/packages/svgalib/examples/Makefile
M /trunk/packages/symbolic/Makefile
M /trunk/packages/syslog/Makefile
M /trunk/packages/syslog/examples/Makefile
M /trunk/packages/tcl/Makefile
M /trunk/packages/univint/Makefile
M /trunk/packages/univint/examples/Makefile
M /trunk/packages/unixutil/Makefile
M /trunk/packages/unzip/Makefile
M /trunk/packages/users/Makefile
M /trunk/packages/users/examples/Makefile
M /trunk/packages/utmp/Makefile
M /trunk/packages/utmp/examples/Makefile
M /trunk/packages/uuid/Makefile
M /trunk/packages/uuid/examples/Makefile
M /trunk/packages/winceunits/Makefile
M /trunk/packages/winunits-base/Makefile
M /trunk/packages/winunits-jedi/Makefile
M /trunk/packages/x11/Makefile
M /trunk/packages/xforms/Makefile
M /trunk/packages/xforms/examples/Makefile
M /trunk/packages/zlib/Makefile
M /trunk/packages/zorba/Makefile

* Update Makefiles
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@16427 -