12 files changed, 76 insertions, 76 deletions
diff --git a/packages/libxml/Makefile b/packages/libxml/Makefile
index f4869e9b7a..a3135866e9 100644
--- a/packages/libxml/Makefile
+++ b/packages/libxml/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/22]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/01/18]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -265,178 +265,178 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
 override PACKAGE_NAME=libxml2
 override PACKAGE_VERSION=2.2.2
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=libxml2 xmlxsd
+override TARGET_UNITS+=xml2 xmlxsd
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_EXAMPLEDIRS+=examples
diff --git a/packages/libxml/Makefile.fpc b/packages/libxml/Makefile.fpc
index 2f882cbc68..5600a1e82a 100644
--- a/packages/libxml/Makefile.fpc
+++ b/packages/libxml/Makefile.fpc
@@ -7,7 +7,7 @@ name=libxml2
 version=2.2.2
 
 [target]
-units=libxml2 xmlxsd
+units=xml2 xmlxsd
 exampledirs=examples
 
 [require]
diff --git a/packages/libxml/examples/exutils.pas b/packages/libxml/examples/exutils.pas
index 9bd32bbd3e..347d373dda 100644
--- a/packages/libxml/examples/exutils.pas
+++ b/packages/libxml/examples/exutils.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   ctypes,
-  libxml2,
+  xml2,
   SysUtils;
 
 procedure docdump(doc: xmlDocPtr);
@@ -24,7 +24,7 @@ var
 begin
   mem := nil;
   xmlDocDumpMemory(doc, mem, size);
-  writeln(mem);
+  writeln(pchar(mem));
   xmlFree(mem);
 end;
 
@@ -48,4 +48,4 @@ begin
   writeln(msg);
 end;
 
-end.
-\ No newline at end of file
+end.
diff --git a/packages/libxml/examples/io1.pas b/packages/libxml/examples/io1.pas
index 920c9a8a63..f453dacf77 100644
--- a/packages/libxml/examples/io1.pas
+++ b/packages/libxml/examples/io1.pas
@@ -17,7 +17,7 @@ program io1;
 
 uses
   ctypes,
-  libxml2,
+  xml2,
   exutils,
   SysUtils;
 
@@ -172,4 +172,4 @@ begin
    * Cleanup function for the XML library.
    *)
   xmlCleanupParser();
-end.
-\ No newline at end of file
+end.
diff --git a/packages/libxml/examples/io2.pas b/packages/libxml/examples/io2.pas
index 50a6c62c69..9b63bcdb91 100644
--- a/packages/libxml/examples/io2.pas
+++ b/packages/libxml/examples/io2.pas
@@ -15,7 +15,7 @@ program io2;
 
 uses
   ctypes,
-  libxml2,
+  xml2,
   exutils,
   SysUtils;
 
@@ -46,4 +46,4 @@ begin
    *)
   xmlFree(xmlbuff);
   xmlFreeDoc(doc);
-end.
-\ No newline at end of file
+end.
diff --git a/packages/libxml/examples/reader1.pas b/packages/libxml/examples/reader1.pas
index 877960385f..8ca1516568 100644
--- a/packages/libxml/examples/reader1.pas
+++ b/packages/libxml/examples/reader1.pas
@@ -17,7 +17,7 @@ program reader1;
 
 uses
   ctypes,
-  libxml2,
+  xml2,
   exutils;
 
 (**
diff --git a/packages/libxml/examples/reader2.pas b/packages/libxml/examples/reader2.pas
index 414b193841..87e7af781c 100644
--- a/packages/libxml/examples/reader2.pas
+++ b/packages/libxml/examples/reader2.pas
@@ -18,7 +18,7 @@ program reader2;
 
 uses
   ctypes,
-  libxml2,
+  xml2,
   exutils;
 
 (**
diff --git a/packages/libxml/examples/tree1.pas b/packages/libxml/examples/tree1.pas
index b648daa7fd..eb27157269 100644
--- a/packages/libxml/examples/tree1.pas
+++ b/packages/libxml/examples/tree1.pas
@@ -16,7 +16,7 @@ program tree1;
 
 uses
   ctypes,
-  libxml2,
+  xml2,
   exutils,
   SysUtils;
 
diff --git a/packages/libxml/examples/tree2.pas b/packages/libxml/examples/tree2.pas
index 20870a7081..8bd8a4518b 100644
--- a/packages/libxml/examples/tree2.pas
+++ b/packages/libxml/examples/tree2.pas
@@ -14,7 +14,7 @@ program tree2;
 
 uses
   ctypes,
-  libxml2,
+  xml2,
   exutils,
   SysUtils;
 
@@ -107,4 +107,4 @@ begin
    * this is to debug memory for regression tests
    *)
   xmlMemoryDump();
-end.
-\ No newline at end of file
+end.
diff --git a/packages/libxml/fpmake.pp b/packages/libxml/fpmake.pp
index fbfa2a1aae..900d1bf179 100644
--- a/packages/libxml/fpmake.pp
+++ b/packages/libxml/fpmake.pp
@@ -12,7 +12,7 @@ begin
     begin
 {$endif ALLPACKAGES}
 
-    P:=AddPackage('libxml2');
+    P:=AddPackage('xml2');
 {$ifdef ALLPACKAGES}
     P.Directory:='libxml';
 {$endif ALLPACKAGES}
@@ -20,7 +20,7 @@ begin
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 
-  T:=P.Targets.AddUnit('libxml2.pas');
+  T:=P.Targets.AddUnit('xml2.pas');
   with T.Dependencies do
     begin
       AddInclude('xinclude.inc');
diff --git a/packages/libxml/src/libxml2.pas b/packages/libxml/src/xml2.pas
index 12938d5ba6..3f2ad54548 100644
--- a/packages/libxml/src/libxml2.pas
+++ b/packages/libxml/src/xml2.pas
@@ -3,7 +3,7 @@
   Copyright (C) 2008 by Ivo Steinmann
 }
 
-unit libxml2;
+unit xml2;
 
 {$mode objfpc}
 {$H+}
diff --git a/packages/libxml/src/xmlxsd.pas b/packages/libxml/src/xmlxsd.pas
index 5a6cf258c3..b44affe1a5 100644
--- a/packages/libxml/src/xmlxsd.pas
+++ b/packages/libxml/src/xmlxsd.pas
@@ -11,7 +11,7 @@ unit xmlxsd;
 interface
 
 uses
-  libxml2,
+  xml2,
   DateUtils,
   SysUtils;