* updated

git-svn-id: trunk@10282 -

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/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/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');