Merged revisions 10164,10168,10170,10172,10176-10178,10180,10183-10184,10187-10188,10191-10192,10200-10201,10203-10204,10206,10218,10232,10234,10238-10239,10243,10245,10251,10253-10254,10264,10266,10271,10273,10276-10279,10282 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r10164 | peter | 2008-02-02 23:55:03 +0100 (Sat, 02 Feb 2008) | 2 lines
  
    * extensions for ctypes, cwstring
........
  r10218 | peter | 2008-02-05 00:46:33 +0100 (Tue, 05 Feb 2008) | 2 lines
  
    * version for fpc-all
........
  r10245 | peter | 2008-02-08 00:10:39 +0100 (Fri, 08 Feb 2008) | 2 lines
  
    * dependency and path updates
........
  r10282 | peter | 2008-02-10 20:20:10 +0100 (Sun, 10 Feb 2008) | 2 lines
  
    * updated
........

git-svn-id: branches/fixes_2_2@10288 -

packages/a52/fpmake.pp

@@ -16,7 +16,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='a52';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('a52.pas');

packages/amunits/fpmake.pp

@@ -14,12 +14,159 @@ begin
 
     P:=AddPackage('amunits');
 {$ifdef ALLPACKAGES}
-    P.Directory:='amunits';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
-    P.SourcePath.Add('src');
-//    P.Dependencies.Add('x11');
+    P.Version:='2.2.1';
+    P.CPUs:=[m68k];
+    P.OSes:=[Amiga];
 
+    P.SourcePath.Add('src/coreunits');
+    P.SourcePath.Add('src/otherlibs');
+    P.SourcePath.Add('src/utilunits');
+    P.IncludePath.Add('src');
+
+    T:=P.Targets.AddUnit('msgbox.pas');
+    T:=P.Targets.AddUnit('amigautils.pas');
+    T:=P.Targets.AddUnit('wbargs.pas');
+    T:=P.Targets.AddUnit('vartags.pas');
+    T:=P.Targets.AddUnit('pastoc.pas');
+    T:=P.Targets.AddUnit('tagsarray.pas');
+    T:=P.Targets.AddUnit('systemvartags.pas');
+    T:=P.Targets.AddUnit('deadkeys.pas');
+    T:=P.Targets.AddUnit('consoleio.pas');
+    T:=P.Targets.AddUnit('pcq.pas');
+    T:=P.Targets.AddUnit('longarray.pas');
+    T:=P.Targets.AddUnit('linklist.pas');
+    T:=P.Targets.AddUnit('hisoft.pas');
+    T:=P.Targets.AddUnit('timerutils.pas');
+    T:=P.Targets.AddUnit('easyasl.pas');
+    T:=P.Targets.AddUnit('doublebuffer.pas');
+    T:=P.Targets.AddUnit('intuition.pas');
+    T:=P.Targets.AddUnit('graphics.pas');
+    T:=P.Targets.AddUnit('amigalib.pas');
+    T:=P.Targets.AddUnit('nonvolatile.pas');
+    T:=P.Targets.AddUnit('iffparse.pas');
+    T:=P.Targets.AddUnit('hardware.pas');
+    T:=P.Targets.AddUnit('expansion.pas');
+    T:=P.Targets.AddUnit('diskfont.pas');
+    T:=P.Targets.AddUnit('conunit.pas');
+    T:=P.Targets.AddUnit('amigados.pas');
+    T:=P.Targets.AddUnit('configvars.pas');
+    T:=P.Targets.AddUnit('keyboard.pas');
+    T:=P.Targets.AddUnit('bootblock.pas');
+    T:=P.Targets.AddUnit('icon.pas');
+    T:=P.Targets.AddUnit('cd.pas');
+    T:=P.Targets.AddUnit('realtime.pas');
+    T:=P.Targets.AddUnit('rexx.pas');
+    T:=P.Targets.AddUnit('translator.pas');
+    T:=P.Targets.AddUnit('scsidisk.pas');
+    T:=P.Targets.AddUnit('lowlevel.pas');
+    T:=P.Targets.AddUnit('configregs.pas');
+    T:=P.Targets.AddUnit('prefs.pas');
+    T:=P.Targets.AddUnit('parallel.pas');
+    T:=P.Targets.AddUnit('gadtools.pas');
+    T:=P.Targets.AddUnit('prtgfx.pas');
+    T:=P.Targets.AddUnit('romboot_base.pas');
+    T:=P.Targets.AddUnit('trackdisk.pas');
+    T:=P.Targets.AddUnit('expansionbase.pas');
+    T:=P.Targets.AddUnit('amigaguide.pas');
+    T:=P.Targets.AddUnit('amigaprinter.pas');
+    T:=P.Targets.AddUnit('bullet.pas');
+    T:=P.Targets.AddUnit('clipboard.pas');
+    T:=P.Targets.AddUnit('keymap.pas');
+    T:=P.Targets.AddUnit('utility.pas');
+    T:=P.Targets.AddUnit('timer.pas');
+    T:=P.Targets.AddUnit('workbench.pas');
+    T:=P.Targets.AddUnit('colorwheel.pas');
+    T:=P.Targets.AddUnit('prtbase.pas');
+    T:=P.Targets.AddUnit('console.pas');
+    T:=P.Targets.AddUnit('locale.pas');
+    T:=P.Targets.AddUnit('tapedeck.pas');
+    T:=P.Targets.AddUnit('serial.pas');
+    T:=P.Targets.AddUnit('gameport.pas');
+    T:=P.Targets.AddUnit('gradientslider.pas');
+    T:=P.Targets.AddUnit('input.pas');
+    T:=P.Targets.AddUnit('audio.pas');
+    T:=P.Targets.AddUnit('datatypes.pas');
+    T:=P.Targets.AddUnit('asl.pas');
+    T:=P.Targets.AddUnit('commodities.pas');
+    T:=P.Targets.AddUnit('hardblocks.pas');
+    T:=P.Targets.AddUnit('layers.pas');
+    T:=P.Targets.AddUnit('inputevent.pas');
+    T:=P.Targets.AddUnit('identify.pas');
+    T:=P.Targets.AddUnit('gtlayout.pas');
+    T:=P.Targets.AddUnit('tritonmacros.pas');
+    T:=P.Targets.AddUnit('render.pas');
+    T:=P.Targets.AddUnit('mui.pas');
+    T:=P.Targets.AddUnit('picasso96api.pas');
+    T:=P.Targets.AddUnit('guigfx.pas');
+    T:=P.Targets.AddUnit('preferences.pas');
+    T:=P.Targets.AddUnit('xadmaster.pas');
+    T:=P.Targets.AddUnit('cybergraphics.pas');
+    T:=P.Targets.AddUnit('ptreplay.pas');
+    T:=P.Targets.AddUnit('reqtools.pas');
+    T:=P.Targets.AddUnit('amarquee.pas');
+    T:=P.Targets.AddUnit('ttengine.pas');
+    T:=P.Targets.AddUnit('triton.pas');
+    T:=P.Targets.AddUnit('zlib.pas');
+    T:=P.Targets.AddUnit('mysticview.pas');
+    T:=P.Targets.AddUnit('ahi.pas');
+    T:=P.Targets.AddUnit('lucyplay.pas');
+    T:=P.Targets.AddUnit('ahi_sub.pas');
+
+    P.ExamplePath.Add('examples');
+    P.ExamplePath.Add('examples/otherlibs');
+    T:=P.Targets.AddExampleProgram('simple_timer.pas');
+    T:=P.Targets.AddExampleProgram('getfontasl.pas');
+    T:=P.Targets.AddExampleProgram('asltest.pas');
+    T:=P.Targets.AddExampleProgram('easygadtools.pas');
+    T:=P.Targets.AddExampleProgram('bezier.pas');
+    T:=P.Targets.AddExampleProgram('listtest.pas');
+    T:=P.Targets.AddExampleProgram('dirdemo.pas');
+    T:=P.Targets.AddExampleProgram('getmultifiles.pas');
+    T:=P.Targets.AddExampleProgram('showdevs.pas');
+    T:=P.Targets.AddExampleProgram('checkmem.pas');
+    T:=P.Targets.AddExampleProgram('moire.pas');
+    T:=P.Targets.AddExampleProgram('wbtest.pas');
+    T:=P.Targets.AddExampleProgram('stars.pas');
+    T:=P.Targets.AddExampleProgram('snow.pas');
+    T:=P.Targets.AddExampleProgram('imagegadget.pas');
+    T:=P.Targets.AddExampleProgram('talk2boopsi.pas');
+    T:=P.Targets.AddExampleProgram('easter.pas');
+    T:=P.Targets.AddExampleProgram('gtmenu.pas');
+    T:=P.Targets.AddExampleProgram('getdate.pas');
+    T:=P.Targets.AddExampleProgram('deviceinfo.pas');
+    T:=P.Targets.AddExampleProgram('bezier2.pas');
+    T:=P.Targets.AddExampleProgram('sortdemo.pas');
+    T:=P.Targets.AddExampleProgram('toolmanager3.pas');
+    T:=P.Targets.AddExampleProgram('tritongadgets.pas');
+    T:=P.Targets.AddExampleProgram('slider.pas');
+    T:=P.Targets.AddExampleProgram('scroller.pas');
+    T:=P.Targets.AddExampleProgram('rtdemo.pas');
+    T:=P.Targets.AddExampleProgram('palette.pas');
+    T:=P.Targets.AddExampleProgram('toolmanager1.pas');
+    T:=P.Targets.AddExampleProgram('checkbox.pas');
+    T:=P.Targets.AddExampleProgram('toolmanager2.pas');
+    T:=P.Targets.AddExampleProgram('requestmodeid.pas');
+    T:=P.Targets.AddExampleProgram('bestmodeid.pas');
+    T:=P.Targets.AddExampleProgram('writetruecolordata.pas');
+    T:=P.Targets.AddExampleProgram('string.pas');
+    T:=P.Targets.AddExampleProgram('smallplay.pas');
+    T:=P.Targets.AddExampleProgram('progindex.pas');
+    T:=P.Targets.AddExampleProgram('openscreen.pas');
+    T:=P.Targets.AddExampleProgram('listview.pas');
+    T:=P.Targets.AddExampleProgram('p96checkboards.pas');
+    T:=P.Targets.AddExampleProgram('modelist.pas');
+    T:=P.Targets.AddExampleProgram('gttest.pas');
+    T:=P.Targets.AddExampleProgram('gadgetdemo.pas');
+    T:=P.Targets.AddExampleProgram('linklib.pas');
+    T:=P.Targets.AddExampleProgram('demo.pas');
+    T:=P.Targets.AddExampleProgram('amarqueetest.pas');
+    T:=P.Targets.AddExampleProgram('openpip.pas');
+    T:=P.Targets.AddExampleProgram('envprint.pas');
+    T:=P.Targets.AddExampleProgram('penshare.pas');
+
+    P.Sources.AddSrc('README');
+    P.Sources.AddSrc('units.txt');
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/bfd/fpmake.pp

@@ -16,7 +16,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='bfd';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('bfd.pas');

packages/bzip2/fpmake.pp

@@ -16,7 +16,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='bzip2';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 

packages/cairo/fpmake.pp

@@ -16,16 +16,13 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='cairo';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
     P.SourcePath.Add('src');
 
-T:=P.Targets.AddUnit('cairo.pp');
-  with T.Dependencies do
-    begin
-      AddUnit('xlib');
-      AddUnit('xrender');
-      AddUnit('freetypeh');
-    end;
+    P.Dependencies.Add('x11');
+    P.Dependencies.Add('fcl-image');
+    
+    T:=P.Targets.AddUnit('cairo.pp');
 
 
 {$ifndef ALLPACKAGES}

packages/cdrom/fpmake.pp

@@ -16,27 +16,45 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='cdrom';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
+    P.OSes:=[Win32,Win64,Linux];
+
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('cdrom.pp');
       with T.Dependencies do
         begin
-          AddInclude('cdromlin.inc');
-          AddUnit('lincd');
+          AddInclude('cdromlin.inc',[Linux]);
+          AddInclude('cdromw32.inc',[Win32,Win64]);
+          AddUnit('lincd',[Linux]);
+          AddUnit('wincd',[Win32,Win64]);
         end;
     T:=P.Targets.AddUnit('discid.pp');
       with T.Dependencies do
         begin
           AddUnit('cdrom');
         end;
-    T:=P.Targets.AddUnit('lincd.pp');
+
+    // Linux
+    T:=P.Targets.AddUnit('lincd.pp',[Linux]);
       with T.Dependencies do
         begin
           AddUnit('major');
         end;
-    T:=P.Targets.AddUnit('major.pp');
+    T:=P.Targets.AddUnit('major.pp',[Linux]);
 
+    // Windows
+    T:=P.Targets.AddUnit('cdromioctl.pp',[Win32,Win64]);
+    T:=P.Targets.AddUnit('scsidefs.pp',[Win32,Win64]);
+    T:=P.Targets.AddUnit('wincd.pp',[Win32,Win64]);
+      with T.Dependencies do
+        begin
+          AddUnit('cdromioctl');
+          AddUnit('wnaspi32');
+          AddUnit('scsidefs');
+        end;
+    T:=P.Targets.AddUnit('wnaspi32.pp',[Win32,Win64]);
 
 {$ifndef ALLPACKAGES}
     Run;

packages/chm/fpmake.pp

@@ -7,6 +7,7 @@ uses fpmkunit;
 Var
   P : TPackage;
   T : TTarget;
+  D : TDependency;
 begin
   With Installer do
     begin
@@ -16,7 +17,11 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='chm';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
+
+    D:=P.Dependencies.Add('fcl-xml');
+      D.Version:='2.2.1';
+    
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('chmbase.pas');
@@ -24,7 +29,6 @@ begin
       with T.Dependencies do
         begin
           AddUnit('chmwriter');
-          AddUnit('xmlcfg');
         end;
     T:=P.Targets.AddUnit('chmreader.pas');
       with T.Dependencies do

packages/dbus/fpmake.pp

@@ -16,8 +16,9 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='dbus';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('dbus.pas');
       with T.Dependencies do

packages/fcl-xml/fpmake.pp

@@ -7,6 +7,7 @@ uses fpmkunit;
 Var
   T : TTarget;
   P : TPackage;
+  D : TDependency;
 begin
   With Installer do
     begin
@@ -18,8 +19,10 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.1';
 
-    P.Dependencies.Add('paszlib');
-    P.Dependencies.Add('fcl-base');
+    D:=P.Dependencies.Add('paszlib');
+      D.Version:='2.2.1';
+    D:=P.Dependencies.Add('fcl-base');
+      D.Version:='2.2.1';
 
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');

packages/fpmake.pp

@@ -104,6 +104,7 @@ The include lines below are generated with the following command:
 
     // Create fpc-all package
     PBuild:=AddPackage('fpc-all');
+    PBuild.Version:='2.2.1-1';
     for i:=0 to Packages.Count-1 do
       begin
         P:=Packages.PackageItems[i];

packages/fpmkunit/fpmake.pp

@@ -18,10 +18,17 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.1-1';
     P.Description:='Free Pascal Make Tool';
+    
+    // All dependencies (including implicit) are listed
+    // here to be able to update all requirements to
+    // compile fpmake from a single place
+    D:=P.Dependencies.Add('hash');
+      D.Version:='2.2.1-0';
     D:=P.Dependencies.Add('paszlib');
       D.Version:='2.2.1-0';
     D:=P.Dependencies.Add('fcl-process');
       D.Version:='2.2.1-0';
+      
     P.Targets.AddUnit('src/fpmkunit.pp');
 
 {$ifndef ALLPACKAGES}

packages/gnome1/fpmake.pp

@@ -16,22 +16,24 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='gnome1';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
-    P.SourcePath.Add('src');
-//    P.Dependencies.Add('x11');
+    P.Version:='2.2.1';
+    P.OSes:=AllUnixOSes;
 
-    T:=P.Targets.AddUnit('gconfclient.pp');
+    P.Dependencies.Add('gtk1');
+    P.Dependencies.Add('imlib');
+
+    T:=P.Targets.AddUnit('src/gconfclient/gconfclient.pp');
+      T.IncludePath.Add('src/gconfclient');
       with T.Dependencies do
         begin
           AddInclude('gconflisteners.inc');
           AddInclude('gconfchangeset.inc');
           AddInclude('gconflisteners.inc');
           AddInclude('gconfchangeset.inc');
-          AddUnit('glib');
-          AddUnit('gtk');
           AddUnit('gconf');
         end;
-    T:=P.Targets.AddUnit('gconf.pp');
+    T:=P.Targets.AddUnit('src/gconf/gconf.pp');
+      T.IncludePath.Add('src/gconf');
       with T.Dependencies do
         begin
           AddInclude('gconfglibpublic.inc');
@@ -44,10 +46,10 @@ begin
           AddInclude('gconfvalue.inc');
           AddInclude('gconfschema.inc');
           AddInclude('gconfengine.inc');
-          AddUnit('glib');
         end;
-    T:=P.Targets.AddUnit('libart.pp');
-    T:=P.Targets.AddUnit('libgnome.pp');
+    T:=P.Targets.AddUnit('src/libart.pp');
+    T:=P.Targets.AddUnit('src/libgnome/libgnome.pp');
+      T.IncludePath.Add('src/libgnome');
       with T.Dependencies do
         begin
           AddInclude('gnomeutil.inc');
@@ -80,9 +82,9 @@ begin
           AddInclude('gnomesound.inc');
           AddInclude('gnometriggers.inc');
           AddInclude('gnomeurl.inc');
-          AddUnit('glib');
-        end;
-    T:=P.Targets.AddUnit('libgnomeui.pp');
+         end;
+    T:=P.Targets.AddUnit('src/libgnomeui/libgnomeui.pp');
+      T.IncludePath.Add('src/libgnomeui');
       with T.Dependencies do
         begin
           AddInclude('gnomeinit.inc');
@@ -204,14 +206,11 @@ begin
           AddInclude('gnomedruidpagestandard.inc');
           AddInclude('gnomedruidpagefinish.inc');
           AddInclude('gnomedruid.inc');
-          AddUnit('glib');
-          AddUnit('gdk');
-          AddUnit('gdk_imlib');
-          AddUnit('gtk');
           AddUnit('libgnome');
           AddUnit('libart');
         end;
-    T:=P.Targets.AddUnit('libzvt.pp');
+    T:=P.Targets.AddUnit('src/zvt/libzvt.pp');
+      T.IncludePath.Add('src/zvt');
       with T.Dependencies do
         begin
           AddInclude('lists.inc');
@@ -220,10 +219,6 @@ begin
           AddInclude('lists.inc');
           AddInclude('vt.inc');
           AddInclude('vtx.inc');
-          AddUnit('glib');
-          AddUnit('gdk');
-          AddUnit('gtk');
-          AddUnit('gdk_imlib');
         end;
 
 

packages/gtk1/fpmake.pp

@@ -16,24 +16,19 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='gtk1';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
-    P.SourcePath.Add('src/gtk');
-    P.SourcePath.Add('src/gdk');
-    P.SourcePath.Add('src/glib');
-    P.SourcePath.Add('src/gtkgl');
-    P.IncludePath.Add('src/gtk');
-    P.IncludePath.Add('src/gdk');
-    P.IncludePath.Add('src/glib');
-    P.IncludePath.Add('src/gtkgl');
+    P.Version:='2.2.1';
+    P.OSes:=AllUnixOSes+[Win32,Win64];
+    P.Dependencies.Add('opengl');
 
-    T:=P.Targets.AddUnit('gdkpixbuf.pp');
+    T:=P.Targets.AddUnit('src/gdk/gdkpixbuf.pp');
       with T.Dependencies do
         begin
           AddUnit('glib');
           AddUnit('gdk');
           AddUnit('gtk');
         end;
-    T:=P.Targets.AddUnit('gdk.pp');
+    T:=P.Targets.AddUnit('src/gdk/gdk.pp');
+      T.IncludePath.Add('src/gdk');
       with T.Dependencies do
         begin
           AddInclude('gdktypes.pp');
@@ -50,19 +45,22 @@ begin
           AddInclude('gdkmain.pp');
           AddUnit('glib');
         end;
-    T:=P.Targets.AddUnit('glib.pp');
-    T:=P.Targets.AddUnit('gmodule.pp');
+    T:=P.Targets.AddUnit('src/glib/glib.pp');
+      T.IncludePath.Add('src/glib');
+    T:=P.Targets.AddUnit('src/glib/gmodule.pp');
       with T.Dependencies do
         begin
           AddUnit('glib');
         end;
-    T:=P.Targets.AddUnit('gtkglarea.pp');
+    T:=P.Targets.AddUnit('src/gtkgl/gtkglarea.pp');
+      T.IncludePath.Add('src/gtkgl');
       with T.Dependencies do
         begin
           AddUnit('gdk');
           AddUnit('gtk');
         end;
-    T:=P.Targets.AddUnit('gtk.pp');
+    T:=P.Targets.AddUnit('src/gtk/gtk.pp');
+      T.IncludePath.Add('src/gtk');
       with T.Dependencies do
         begin
           AddInclude('gtkincludes.pp');

packages/gtk2/fpmake.pp

@@ -16,127 +16,124 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='gtk2';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
-    P.SourcePath.Add('src/glib');
-    P.SourcePath.Add('src/gtk+');
-    P.SourcePath.Add('src/atk');
-    P.SourcePath.Add('src/gtk2x11');
-    P.SourcePath.Add('src/gtkglext');
-    P.SourcePath.Add('src/gtkhtml');
-    P.SourcePath.Add('src/libglade');
-    P.SourcePath.Add('src/pango');
-    P.SourcePath.Add('src/');
+    P.Version:='2.2.1';
+    P.OSes:=AllUnixOSes+[Win32,Win64];
 
-     T:=P.Targets.AddUnit('atk.pas');
-      with T.Dependencies do
-        begin
-          AddInclude('atkincludes.inc');
-          AddInclude('atkobject.inc');
-          AddInclude('atkaction.inc');
-          AddInclude('atkcomponent.inc');
-          AddInclude('atkdocument.inc');
-          AddInclude('atkeditabletext.inc');
-          AddInclude('atkgobjectaccessible.inc');
-          AddInclude('atkhyperlink.inc');
-          AddInclude('atkhypertext.inc');
-          AddInclude('atkimage.inc');
-          AddInclude('atkobjectfactory.inc');
-          AddInclude('atkregistry.inc');
-          AddInclude('atkrelation.inc');
-          AddInclude('atkrelationset.inc');
-          AddInclude('atkselection.inc');
-          AddInclude('atkstate.inc');
-          AddInclude('atkstateset.inc');
-          AddInclude('atkstreamablecontent.inc');
-          AddInclude('atktable.inc');
-          AddInclude('atktext.inc');
-          AddInclude('atkutil.inc');
-          AddInclude('atkvalue.inc');
-          AddInclude('atkincludes.inc');
-          AddInclude('atkobject.inc');
-          AddInclude('atkaction.inc');
-          AddInclude('atkcomponent.inc');
-          AddInclude('atkdocument.inc');
-          AddInclude('atkeditabletext.inc');
-          AddInclude('atkgobjectaccessible.inc');
-          AddInclude('atkhyperlink.inc');
-          AddInclude('atkhypertext.inc');
-          AddInclude('atkimage.inc');
-          AddInclude('atkobjectfactory.inc');
-          AddInclude('atkregistry.inc');
-          AddInclude('atkrelation.inc');
-          AddInclude('atkrelationset.inc');
-          AddInclude('atkselection.inc');
-          AddInclude('atkstate.inc');
-          AddInclude('atkstateset.inc');
-          AddInclude('atkstreamablecontent.inc');
-          AddInclude('atktable.inc');
-          AddInclude('atktext.inc');
-          AddInclude('atkutil.inc');
-          AddInclude('atkvalue.inc');
-          AddInclude('atkincludes.inc');
-          AddInclude('atkobject.inc');
-          AddInclude('atkaction.inc');
-          AddInclude('atkcomponent.inc');
-          AddInclude('atkdocument.inc');
-          AddInclude('atkeditabletext.inc');
-          AddInclude('atkgobjectaccessible.inc');
-          AddInclude('atkhyperlink.inc');
-          AddInclude('atkhypertext.inc');
-          AddInclude('atkimage.inc');
-          AddInclude('atkobjectfactory.inc');
-          AddInclude('atkregistry.inc');
-          AddInclude('atkrelation.inc');
-          AddInclude('atkrelationset.inc');
-          AddInclude('atkselection.inc');
-          AddInclude('atkstate.inc');
-          AddInclude('atkstateset.inc');
-          AddInclude('atkstreamablecontent.inc');
-          AddInclude('atktable.inc');
-          AddInclude('atktext.inc');
-          AddInclude('atkutil.inc');
-          AddInclude('atkvalue.inc');
-          AddInclude('atkincludes.inc');
-          AddInclude('atkobject.inc');
-          AddInclude('atkaction.inc');
-          AddInclude('atkcomponent.inc');
-          AddInclude('atkdocument.inc');
-          AddInclude('atkeditabletext.inc');
-          AddInclude('atkgobjectaccessible.inc');
-          AddInclude('atkhyperlink.inc');
-          AddInclude('atkhypertext.inc');
-          AddInclude('atkimage.inc');
-          AddInclude('atkobjectfactory.inc');
-          AddInclude('atkregistry.inc');
-          AddInclude('atkrelation.inc');
-          AddInclude('atkrelationset.inc');
-          AddInclude('atkselection.inc');
-          AddInclude('atkstate.inc');
-          AddInclude('atkstateset.inc');
-          AddInclude('atkstreamablecontent.inc');
-          AddInclude('atktable.inc');
-          AddInclude('atktext.inc');
-          AddInclude('atkutil.inc');
-          AddInclude('atkvalue.inc');
-          AddUnit('glib2');
-        end;
-    T:=P.Targets.AddUnit('buildgtk2.pp');
+    P.Dependencies.Add('x11',AllUnixOSes);
+
+    T:=P.Targets.AddUnit('src/atk/atk.pas');
+     T.IncludePath.Add('src/atk');
+     with T.Dependencies do
+       begin
+         AddInclude('atkincludes.inc');
+         AddInclude('atkobject.inc');
+         AddInclude('atkaction.inc');
+         AddInclude('atkcomponent.inc');
+         AddInclude('atkdocument.inc');
+         AddInclude('atkeditabletext.inc');
+         AddInclude('atkgobjectaccessible.inc');
+         AddInclude('atkhyperlink.inc');
+         AddInclude('atkhypertext.inc');
+         AddInclude('atkimage.inc');
+         AddInclude('atkobjectfactory.inc');
+         AddInclude('atkregistry.inc');
+         AddInclude('atkrelation.inc');
+         AddInclude('atkrelationset.inc');
+         AddInclude('atkselection.inc');
+         AddInclude('atkstate.inc');
+         AddInclude('atkstateset.inc');
+         AddInclude('atkstreamablecontent.inc');
+         AddInclude('atktable.inc');
+         AddInclude('atktext.inc');
+         AddInclude('atkutil.inc');
+         AddInclude('atkvalue.inc');
+         AddInclude('atkincludes.inc');
+         AddInclude('atkobject.inc');
+         AddInclude('atkaction.inc');
+         AddInclude('atkcomponent.inc');
+         AddInclude('atkdocument.inc');
+         AddInclude('atkeditabletext.inc');
+         AddInclude('atkgobjectaccessible.inc');
+         AddInclude('atkhyperlink.inc');
+         AddInclude('atkhypertext.inc');
+         AddInclude('atkimage.inc');
+         AddInclude('atkobjectfactory.inc');
+         AddInclude('atkregistry.inc');
+         AddInclude('atkrelation.inc');
+         AddInclude('atkrelationset.inc');
+         AddInclude('atkselection.inc');
+         AddInclude('atkstate.inc');
+         AddInclude('atkstateset.inc');
+         AddInclude('atkstreamablecontent.inc');
+         AddInclude('atktable.inc');
+         AddInclude('atktext.inc');
+         AddInclude('atkutil.inc');
+         AddInclude('atkvalue.inc');
+         AddInclude('atkincludes.inc');
+         AddInclude('atkobject.inc');
+         AddInclude('atkaction.inc');
+         AddInclude('atkcomponent.inc');
+         AddInclude('atkdocument.inc');
+         AddInclude('atkeditabletext.inc');
+         AddInclude('atkgobjectaccessible.inc');
+         AddInclude('atkhyperlink.inc');
+         AddInclude('atkhypertext.inc');
+         AddInclude('atkimage.inc');
+         AddInclude('atkobjectfactory.inc');
+         AddInclude('atkregistry.inc');
+         AddInclude('atkrelation.inc');
+         AddInclude('atkrelationset.inc');
+         AddInclude('atkselection.inc');
+         AddInclude('atkstate.inc');
+         AddInclude('atkstateset.inc');
+         AddInclude('atkstreamablecontent.inc');
+         AddInclude('atktable.inc');
+         AddInclude('atktext.inc');
+         AddInclude('atkutil.inc');
+         AddInclude('atkvalue.inc');
+         AddInclude('atkincludes.inc');
+         AddInclude('atkobject.inc');
+         AddInclude('atkaction.inc');
+         AddInclude('atkcomponent.inc');
+         AddInclude('atkdocument.inc');
+         AddInclude('atkeditabletext.inc');
+         AddInclude('atkgobjectaccessible.inc');
+         AddInclude('atkhyperlink.inc');
+         AddInclude('atkhypertext.inc');
+         AddInclude('atkimage.inc');
+         AddInclude('atkobjectfactory.inc');
+         AddInclude('atkregistry.inc');
+         AddInclude('atkrelation.inc');
+         AddInclude('atkrelationset.inc');
+         AddInclude('atkselection.inc');
+         AddInclude('atkstate.inc');
+         AddInclude('atkstateset.inc');
+         AddInclude('atkstreamablecontent.inc');
+         AddInclude('atktable.inc');
+         AddInclude('atktext.inc');
+         AddInclude('atkutil.inc');
+         AddInclude('atkvalue.inc');
+         AddUnit('glib2');
+       end;
+    T:=P.Targets.AddUnit('src/buildgtk2.pp');
       with T.Dependencies do
         begin
           AddUnit('gtk2');
           AddUnit('libglade2');
           AddUnit('gdkglext');
           AddUnit('gtkglext');
-          AddUnit('gdk2x');
+          AddUnit('gdk2x',AllUnixOSes);
         end;
-    T:=P.Targets.AddUnit('gdk2pixbuf.pas');
+    T:=P.Targets.AddUnit('src/gtk+/gdk-pixbuf/gdk2pixbuf.pas');
+      T.IncludePath.Add('src/gtk+/gdk-pixbuf');
       with T.Dependencies do
         begin
           AddInclude('gdk-pixbuf-loader.inc');
           AddInclude('gdk-pixbuf-loader.inc');
           AddUnit('glib2');
         end;
-    T:=P.Targets.AddUnit('gdk2.pas');
+    T:=P.Targets.AddUnit('src/gtk+/gdk/gdk2.pas');
+      T.IncludePath.Add('src/gtk+/gdk');
       with T.Dependencies do
         begin
           AddInclude('gdkincludes.inc');
@@ -243,7 +240,9 @@ begin
           AddUnit('gdk2pixbuf');
           AddUnit('pango');
         end;
-    T:=P.Targets.AddUnit('gdk2x.pas');
+    T:=P.Targets.AddUnit('src/gtk2x11/gdk2x.pas',AllUnixOSes);
+      T.IncludePath.Add('src/gtk2x11');
+      T.IncludePath.Add('src/gtk2x11/include');
       with T.Dependencies do
         begin
           AddInclude('gdk2x11includes.inc');
@@ -287,10 +286,9 @@ begin
           AddInclude('mwmutil.inc');
           AddUnit('glib2');
           AddUnit('gdk2');
-          AddUnit('xlib');
-          AddUnit('xrender');
         end;
-    T:=P.Targets.AddUnit('gdkglext.pas');
+    T:=P.Targets.AddUnit('src/gtkglext/gdkglext.pas');
+      T.IncludePath.Add('src/gtkglext');
       with T.Dependencies do
         begin
           AddInclude('gdkglext_includes.inc');
@@ -341,7 +339,8 @@ begin
           AddUnit('glib2');
           AddUnit('gdk2');
         end;
-    T:=P.Targets.AddUnit('glib2.pas');
+    T:=P.Targets.AddUnit('src/glib/glib2.pas');
+      T.IncludePath.Add('src/glib');
       with T.Dependencies do
         begin
           AddInclude('gtypes.inc');
@@ -415,7 +414,8 @@ begin
           AddInclude('gmodule.inc');
           AddInclude('gmarshal.inc');
         end;
-    T:=P.Targets.AddUnit('gtk2.pas');
+    T:=P.Targets.AddUnit('src/gtk+/gtk/gtk2.pas');
+      T.IncludePath.Add('src/gtk+/gtk');
       with T.Dependencies do
         begin
           AddInclude('gtkincludes.inc');
@@ -1112,7 +1112,8 @@ begin
           AddUnit('gdk2pixbuf');
           AddUnit('gdk2');
         end;
-    T:=P.Targets.AddUnit('gtkglext.pas');
+    T:=P.Targets.AddUnit('src/gtkglext/gtkglext.pas');
+      T.IncludePath.Add('src/gtkglext');
       with T.Dependencies do
         begin
           AddInclude('gtkglext_includes.inc');
@@ -1135,7 +1136,8 @@ begin
           AddUnit('gtk2');
           AddUnit('gdkglext');
         end;
-    T:=P.Targets.AddUnit('libglade2.pas');
+    T:=P.Targets.AddUnit('src/libglade/libglade2.pas');
+      T.IncludePath.Add('src/libglade');
       with T.Dependencies do
         begin
           AddInclude('glade-init.inc');
@@ -1143,7 +1145,8 @@ begin
           AddUnit('glib2');
           AddUnit('gtk2');
         end;
-    T:=P.Targets.AddUnit('pango.pas');
+    T:=P.Targets.AddUnit('src/pango/pango.pas');
+      T.IncludePath.Add('src/pango');
       with T.Dependencies do
         begin
           AddInclude('pangoincludes.inc');
@@ -1205,6 +1208,37 @@ begin
           AddUnit('glib2');
         end;
 
+     T:=P.Targets.AddUnit('src/gtkhtml/gtkhtml.pas');
+       T.IncludePath.Add('src/gtkhtml');
+       with T.Dependencies do
+         begin
+           AddInclude('gtkhtmlincludes.inc');
+           AddInclude('htmlstream.inc');
+           AddInclude('htmlstreambuffer.inc');
+           AddInclude('htmldocument.inc');
+           AddInclude('htmlview.inc');
+           AddInclude('gtkhtmlincludes.inc');
+           AddInclude('htmlstream.inc');
+           AddInclude('htmlstreambuffer.inc');
+           AddInclude('htmldocument.inc');
+           AddInclude('htmlview.inc');
+           AddInclude('gtkhtmlincludes.inc');
+           AddInclude('htmlstream.inc');
+           AddInclude('htmlstreambuffer.inc');
+           AddInclude('htmldocument.inc');
+           AddInclude('htmlview.inc');
+           AddInclude('gtkhtmlincludes.inc');
+           AddInclude('htmlstream.inc');
+           AddInclude('htmlstreambuffer.inc');
+           AddInclude('htmldocument.inc');
+           AddInclude('htmlview.inc');
+           AddUnit('gtk2');
+           AddUnit('glib2');
+           AddUnit('atk');
+           AddUnit('pango');
+           AddUnit('gdk2pixbuf');
+           AddUnit('gdk2');
+         end;
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/imlib/fpmake.pp

@@ -16,38 +16,16 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='imlib';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
-    P.SourcePath.Add('src');
+    P.Version:='2.2.1';
+    P.OSes:=AllUnixOSes;
+    
     P.Dependencies.Add('gtk1');
     P.Dependencies.Add('x11');
 
-    T:=P.Targets.AddUnit('gdk_imlib.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('glib');
-          AddUnit('gdk');
-          AddUnit('gtk');
-        end;
-    T:=P.Targets.AddUnit('imlib.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('xlib');
-        end;
-
+    P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('gdk_imlib.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('glib');
-          AddUnit('gdk');
-          AddUnit('gtk');
-        end;
     T:=P.Targets.AddUnit('imlib.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('xlib');
-        end;
-
 
 {$ifndef ALLPACKAGES}
     Run;

packages/opengl/fpmake.pp

@@ -16,19 +16,18 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='opengl';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
+    P.OSes:=AllUnixOSes+[Win32,Win64];
+
+    P.Dependencies.Add('x11',AllUnixOSes);
+
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('glext.pp');
     T:=P.Targets.AddUnit('gl.pp');
     T:=P.Targets.AddUnit('glu.pp');
     T:=P.Targets.AddUnit('glut.pp');
-    T:=P.Targets.AddUnit('glx.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('xlib');
-        end;
-
+    T:=P.Targets.AddUnit('glx.pp',AllUnixOSes);
 
 {$ifndef ALLPACKAGES}
     Run;

packages/paszlib/fpmake.pp

@@ -7,6 +7,7 @@ uses fpmkunit;
 Var
   T : TTarget;
   P : TPackage;
+  D : TDependency;
 begin
   With Installer do
     begin
@@ -17,7 +18,8 @@ begin
     P.Directory:='paszlib';
 {$endif ALLPACKAGES}
     P.Version:='2.2.1';
-    P.Dependencies.Add('hash');
+    D:=P.Dependencies.Add('hash');
+      D.Version:='2.2.1';
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     T:=P.Targets.AddUnit('paszlib.pas');

rtl/fpmake.pp

@@ -547,7 +547,7 @@ begin
       T.Dependencies.AddUnit('cpu');
 
     // C Interfacing units
-    T:=P.Targets.AddUnit('ctypes');
+    T:=P.Targets.AddUnit('ctypes.pp');
       With T.Dependencies do
         begin
           AddUnit('system');
@@ -567,7 +567,7 @@ begin
           AddUnit('dl');
           AddInclude('pthread.inc');
         end;
-    T:=P.Targets.AddUnit('cwstring',AllUnixOSes);
+    T:=P.Targets.AddUnit('cwstring.pp',AllUnixOSes);
       With T.Dependencies do
         begin
           AddUnit('objpas');