* fpmakes batch #4. Most work now, but toplevel does not. Dependancies also not complete

git-svn-id: trunk@11952 -

packages/amunits/fpmake.pp

@@ -22,6 +22,7 @@ begin
     P.SourcePath.Add('src/coreunits');
     P.SourcePath.Add('src/otherlibs');
     P.SourcePath.Add('src/utilunits');
+    P.SourcePath.Add('.');
     P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('msgbox.pas');
@@ -165,8 +166,9 @@ begin
     T:=P.Targets.AddExampleProgram('envprint.pas');
     T:=P.Targets.AddExampleProgram('penshare.pas');
 
-    P.Sources.AddSrc('README');
-    P.Sources.AddSrc('units.txt');
+    P.Sources.AddDoc('README');
+    P.Sources.AddDoc('units.txt');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/hermes/fpmake.pp

@@ -63,18 +63,16 @@ T:=P.Targets.AddUnit('hermes.pp');
 end.
 {$endif ALLPACKAGES}
 
-      AddInclude('headi386.inc');
-      AddInclude('headmmx.inc');
-mmx_clr.as
-mmx_main.as
-mmxp2_32.as
-mmxp_32.as
-x8616lut.as
-x86_clr.as
-x86_main.as
-x86p_16.as
-x86p_32.as
-x86p_cpy.as
-x86p_i8.as
-x86p_s32.as
-x86pscpy.as');
+// mmx_clr.as
+// mmx_main.as
+// mmxp2_32.as
+// mmxp_32.as
+// x8616lut.as
+// x86_clr.as
+// x86_main.as
+// x86p_16.as
+// x86p_32.as
+// x86p_cpy.as
+// x86p_i8.as
+// x86p_s32.as
+// x86pscpy.as');

packages/os2units/fpmake.pp

@@ -34,6 +34,8 @@ begin
     P.Targets.AddUnit('sw.pas',[OS2]);
     P.Targets.AddUnit('wpstk.pp',[OS2]);
 
+    P.Sources.AddSrc('readme.txt');
+
    // not compilable defunct for now
 
     P.ExamplePath.Add('examples');
@@ -43,6 +45,8 @@ begin
     P.Targets.AddExampleProgram('ftptest.pas');
     P.Targets.AddExampleProgram('lvmtest.pas');
 
+
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/palmunits/fpmake.pp

@@ -17,8 +17,110 @@ begin
     P.Directory:='palmunits';
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
+
     P.SourcePath.Add('src');
-//    P.Dependencies.Add('x11');
+    P.Targets.AddUnit('day.pp',[PalmOS]);
+    P.Targets.AddUnit('uicontrols.pp',[PalmOS]);
+    P.Targets.AddUnit('inetmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('window.pp',[PalmOS]);
+    P.Targets.AddUnit('textservicesmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('table.pp',[PalmOS]);
+    P.Targets.AddUnit('serialmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('hal.pp',[PalmOS]);
+    P.Targets.AddUnit('featuremgr.pp',[PalmOS]);
+    P.Targets.AddUnit('hwrmiscflags.pp',[PalmOS]);
+    P.Targets.AddUnit('crc.pp',[PalmOS]);
+    P.Targets.AddUnit('palmlocale.pp',[PalmOS]);
+    P.Targets.AddUnit('applaunchcmd.pp',[PalmOS]);
+    P.Targets.AddUnit('fatalalert.pp',[PalmOS]);
+    P.Targets.AddUnit('find_.pp',[PalmOS]);
+    P.Targets.AddUnit('soundmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('form.pp',[PalmOS]);
+    P.Targets.AddUnit('event_.pp',[PalmOS]);
+    P.Targets.AddUnit('attentionmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('overlaymgr.pp',[PalmOS]);
+    P.Targets.AddUnit('slotdrvrlib.pp',[PalmOS]);
+    P.Targets.AddUnit('modemmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('menu_.pp',[PalmOS]);
+    P.Targets.AddUnit('privaterecords.pp',[PalmOS]);
+    P.Targets.AddUnit('exgmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('fslib.pp',[PalmOS]);
+    P.Targets.AddUnit('timemgr.pp',[PalmOS]);
+    P.Targets.AddUnit('libtraps.pp',[PalmOS]);
+    P.Targets.AddUnit('control.pp',[PalmOS]);
+    P.Targets.AddUnit('m68khwr.pp',[PalmOS]);
+    P.Targets.AddUnit('rect.pp',[PalmOS]);
+    P.Targets.AddUnit('graffiti.pp',[PalmOS]);
+    P.Targets.AddUnit('telephonymgr.pp',[PalmOS]);
+    P.Targets.AddUnit('keymgr.pp',[PalmOS]);
+    P.Targets.AddUnit('consolemgr.pp',[PalmOS]);
+    P.Targets.AddUnit('selday.pp',[PalmOS]);
+    P.Targets.AddUnit('localize.pp',[PalmOS]);
+    P.Targets.AddUnit('field.pp',[PalmOS]);
+    P.Targets.AddUnit('seltimezone.pp',[PalmOS]);
+    P.Targets.AddUnit('phonelookup.pp',[PalmOS]);
+    P.Targets.AddUnit('pdiconst.pp',[PalmOS]);
+    P.Targets.AddUnit('helper.pp',[PalmOS]);
+    P.Targets.AddUnit('notifymgr.pp',[PalmOS]);
+    P.Targets.AddUnit('systemresources.pp',[PalmOS]);
+    P.Targets.AddUnit('intlmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('sysutil.pp',[PalmOS]);
+    P.Targets.AddUnit('preferences.pp',[PalmOS]);
+    P.Targets.AddUnit('netbitutils.pp',[PalmOS]);
+    P.Targets.AddUnit('datamgr.pp',[PalmOS]);
+    P.Targets.AddUnit('dlserver.pp',[PalmOS]);
+    P.Targets.AddUnit('vfsmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('irlib.pp',[PalmOS]);
+    P.Targets.AddUnit('font.pp',[PalmOS]);
+    P.Targets.AddUnit('serialmgrold.pp',[PalmOS]);
+    P.Targets.AddUnit('launcher.pp',[PalmOS]);
+    P.Targets.AddUnit('palmos.pp',[PalmOS]);
+    P.Targets.AddUnit('password.pp',[PalmOS]);
+    P.Targets.AddUnit('seriallinkmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('palmcompatibility.pp',[PalmOS]);
+    P.Targets.AddUnit('lz77mgr.pp',[PalmOS]);
+    P.Targets.AddUnit('errorbase.pp',[PalmOS]);
+    P.Targets.AddUnit('fontselect_.pp',[PalmOS]);
+    P.Targets.AddUnit('keyboard.pp',[PalmOS]);
+    P.Targets.AddUnit('telephonymgrui.pp',[PalmOS]);
+    P.Targets.AddUnit('udamgr.pp',[PalmOS]);
+    P.Targets.AddUnit('encrypt.pp',[PalmOS]);
+    P.Targets.AddUnit('bitmap.pp',[PalmOS]);
+    P.Targets.AddUnit('connectionmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('graffitireference.pp',[PalmOS]);
+    P.Targets.AddUnit('seltime.pp',[PalmOS]);
+    P.Targets.AddUnit('alarmmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('stringmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('smslib.pp',[PalmOS]);
+    P.Targets.AddUnit('textmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('imcutils.pp',[PalmOS]);
+    P.Targets.AddUnit('coretraps.pp',[PalmOS]);
+    P.Targets.AddUnit('scrollbar.pp',[PalmOS]);
+    P.Targets.AddUnit('category.pp',[PalmOS]);
+    P.Targets.AddUnit('progress.pp',[PalmOS]);
+    P.Targets.AddUnit('datetime.pp',[PalmOS]);
+    P.Targets.AddUnit('chars.pp',[PalmOS]);
+    P.Targets.AddUnit('list.pp',[PalmOS]);
+    P.Targets.AddUnit('memorymgr.pp',[PalmOS]);
+    P.Targets.AddUnit('netmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('exglib.pp',[PalmOS]);
+    P.Targets.AddUnit('sysevent.pp',[PalmOS]);
+    P.Targets.AddUnit('sysevtmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('aboutbox.pp',[PalmOS]);
+    P.Targets.AddUnit('telephonymgrtypes.pp',[PalmOS]);
+    P.Targets.AddUnit('localemgr.pp',[PalmOS]);
+    P.Targets.AddUnit('floatmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('graffitishift.pp',[PalmOS]);
+    P.Targets.AddUnit('clipboard.pp',[PalmOS]);
+    P.Targets.AddUnit('inspoint.pp',[PalmOS]);
+    P.Targets.AddUnit('expansionmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('filestream.pp',[PalmOS]);
+    P.Targets.AddUnit('systemmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('uicolor.pp',[PalmOS]);
+    P.Targets.AddUnit('uiresources.pp',[PalmOS]);
+    P.Targets.AddUnit('penmgr.pp',[PalmOS]);
+    P.Targets.AddUnit('pdilib.pp',[PalmOS]);
+    P.Targets.AddUnit('helperserviceclass.pp',[PalmOS]);
 
 {$ifndef ALLPACKAGES}
     Run;

packages/pasjpeg/fpmake.pp

@@ -127,13 +127,43 @@ begin
     T:=P.Targets.AddImplicitUnit('jquant2.pas');
     T:=P.Targets.AddImplicitUnit('jutils.pas');
 
+    P.Sources.AddSrc('readme.txt');
+ 
     P.ExamplePath.Add('examples');
 
-    T:=P.Targets.AddExampleProgram('cjpeg.pas');
-    T:=P.Targets.AddExampleProgram('demo.pas');
-    T:=P.Targets.AddExampleProgram('djpeg.pas');
-    T:=P.Targets.AddExampleProgram('jpegtran.pas');
-    T:=P.Targets.AddExampleProgram('rdjpgcom.pas');
+    P.Targets.AddExampleProgram('cjpeg.pas');
+    P.Targets.AddExampleProgram('djpeg.pas');
+    P.Targets.AddExampleProgram('rdswitch.pas');
+    P.Targets.AddExampleProgram('testproj.dpr');
+    P.Targets.AddExampleProgram('cdjpeg.pas');
+    P.Targets.AddExampleProgram('test1.pas');
+    P.Targets.AddExampleProgram('example.pas');
+    P.Targets.AddExampleProgram('wrjpgcom.pas');
+    P.Targets.AddExampleProgram('rdjpgcom.pas');
+    P.Targets.AddExampleProgram('rdtarga.pas');
+    P.Targets.AddExampleProgram('demo.pas');
+    P.Targets.AddExampleProgram('wrppm.pas');
+    P.Targets.AddExampleProgram('transupp.pas');
+    P.Targets.AddExampleProgram('rdbmp.pas');
+    P.Targets.AddExampleProgram('rdppm.pas');
+    P.Targets.AddExampleProgram('rdcolmap.pas');
+    P.Targets.AddExampleProgram('wrtarga.pas');
+    P.Targets.AddExampleProgram('wrbmp.pas');
+    P.Targets.AddExampleProgram('jpegtran.pas');
+    P.Targets.AddExampleProgram('cderror.pas');
+    P.Targets.AddExampleProgram('test.pas');
+    P.Targets.AddExampleProgram('fcache.pas');
+    // 'djpeg.res
+    // 'testproj.res
+    // 'script0.ijg
+    // 'test1.dfm
+    // 'jpegtran.res
+    // 'demo.res
+    // 'qtable1.ijg
+    // 'script1.ijg
+    // 'cjpeg.res
+    // 'jpegtran.drc
+    // 'script2.ijg
 
 {$ifndef ALLPACKAGES}
     Run;

packages/pcap/fpmake.pp

@@ -18,7 +18,6 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
-//    P.Dependencies.Add('x11');
 
     T:=P.Targets.AddUnit('pcap.pp');
 

packages/postgres/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('dllistdyn.pp');
       with T.Dependencies do
@@ -47,6 +48,12 @@ begin
           AddUnit('dllist');
         end;
 
+    P.Sources.AddSrc('README');
+
+    P.ExamplePath.Add('tests/');
+    P.Targets.AddExampleProgram('testpg2.pp');
+    P.Targets.AddExampleProgram('testpg1.pp');
+  
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/ptc/fpmake.pp

@@ -2,6 +2,8 @@
 {$mode objfpc}{$H+}
 program fpmake;
 
+// Note this package is currently not compiled and a mess.
+
 uses fpmkunit;
 
 Var
@@ -18,8 +20,24 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
+    P.IncludePath.Add('src/dos',[go32v2]);
+    P.IncludePath.Add('src/dos/base',[go32v2]);
+    P.SourcePath.Add('src/dos/cga',[go32v2]);
+    P.SourcePath.Add('src/dos/fakemode',[go32v2]);
+    P.SourcePath.Add('src/dos/textfx2',[go32v2]);
+    P.SourcePath.Add('src/dos/timeunit',[go32v2]);
+    P.SourcePath.Add('src/dos/vesa',[go32v2]);
+    P.IncludePath.Add('src/dos/cga',[go32v2]);
+    P.IncludePath.Add('src/dos/fakemode',[go32v2]);
+    P.IncludePath.Add('src/dos/textfx2',[go32v2]);
+    P.IncludePath.Add('src/dos/timeunit',[go32v2]);
+    P.IncludePath.Add('src/dos/vesa',[go32v2]);
+    P.IncludePath.Add('src/win32',[win32,win64]);
+    P.IncludePath.Add('src/wince',[wince]);
+    P.IncludePath.Add('src/x11',AllUnixOSes);
 
-T:=P.Targets.AddUnit('ptc.pp');
+  T:=P.Targets.AddUnit('ptc.pp');
   with T.Dependencies do
     begin
       AddInclude('extensions.inc');
@@ -60,32 +78,74 @@ T:=P.Targets.AddUnit('ptc.pp');
       AddInclude('surfacei.inc');
       AddInclude('timeri.inc');
       AddInclude('includes.inc');
-      AddInclude('x11modesd.inc');
-      AddInclude('x11imaged.inc');
-      AddInclude('x11displayd.inc');
-      AddInclude('x11windowdisplayd.inc');
-      AddInclude('x11dga1displayd.inc');
-      AddInclude('x11dga2displayd.inc');
-      AddInclude('x11consoled.inc');
-      AddInclude('check.inc');
-      AddInclude('x11modesi.inc');
-      AddInclude('x11imagei.inc');
-      AddInclude('x11displayi.inc');
-      AddInclude('xunikey.inc');
-      AddInclude('x11windowdisplayi.inc');
-      AddInclude('x11dga1displayi.inc');
-      AddInclude('x11dga2displayi.inc');
-      AddInclude('x11consolei.inc');
+      AddInclude('x11modesd.inc',allunixoses);
+      AddInclude('x11imaged.inc',allunixoses);
+      AddInclude('x11displayd.inc',allunixoses);
+      AddInclude('x11windowdisplayd.inc',allunixoses);
+      AddInclude('x11dga1displayd.inc',allunixoses);
+      AddInclude('x11dga2displayd.inc',allunixoses);
+      AddInclude('x11consoled.inc',allunixoses);
+      AddInclude('check.inc',allunixoses);
+      AddInclude('x11modesi.inc',allunixoses);
+      AddInclude('x11imagei.inc',allunixoses);
+      AddInclude('x11displayi.inc',allunixoses);
+      AddInclude('xunikey.inc',allunixoses);
+      AddInclude('x11windowdisplayi.inc',allunixoses);
+      AddInclude('x11dga1displayi.inc',allunixoses);
+      AddInclude('x11dga2displayi.inc',allunixoses);
+      AddInclude('x11consolei.inc',allunixoses);
       AddInclude('consolei.inc');
       AddUnit('hermes');
-      AddUnit('xlib');
-      AddUnit('xatom');
-      AddUnit('keysym');
-      AddUnit('xrandr');
-      AddUnit('xf86vmode');
-      AddUnit('xf86dga');
-      AddUnit('xshm');
-    end;
+      AddUnit('x',AllUnixOSes);
+      AddUnit('xlib',AllUnixOSes);
+      AddUnit('xutil',AllUnixOSes);
+      AddUnit('xatom',AllUnixOSes);
+      AddUnit('keysym',AllUnixOSes);
+      AddUnit('xrandr',AllUnixOSes);
+      AddUnit('xf86vmode',AllUnixOSes);
+      AddUnit('xf86dga',AllUnixOSes);
+      AddUnit('xshm',AllUnixOSes);
+      AddUnit('directdr',[Win32,win64]);
+      AddUnit('p_gx',[Wince]);
+      AddUnit('textfx2',[Go32v2]);
+      AddUnit('cga',[Go32v2]);
+      AddUnit('timeunit',[Go32v2]);
+      AddUnit('vesa',[Go32v2]);
+      AddUnit('vga',[Go32v2]);
+     end;
+
+    P.ExamplePath.Add('examples/');
+    P.Targets.AddExampleProgram('random.pp');
+    P.Targets.AddExampleProgram('palette.pp');
+    P.Targets.AddExampleProgram('pixel.pp');
+    P.Targets.AddExampleProgram('console.pp');
+    P.Targets.AddExampleProgram('image.pp');
+    P.Targets.AddExampleProgram('flower.pp');
+    P.Targets.AddExampleProgram('save.pp');
+    P.Targets.AddExampleProgram('hicolor.pp');
+    P.Targets.AddExampleProgram('stretch.pp');
+    P.Targets.AddExampleProgram('tunnel.pp');
+    P.Targets.AddExampleProgram('modes.pp');
+    P.Targets.AddExampleProgram('buffer.pp');
+    P.Targets.AddExampleProgram('texwarp.pp');
+    P.Targets.AddExampleProgram('keyboard.pp');
+    P.Targets.AddExampleProgram('timer.pp');
+    P.Targets.AddExampleProgram('clip.pp');
+    P.Targets.AddExampleProgram('lights.pp');
+    P.Targets.AddExampleProgram('fire.pp');
+    P.Targets.AddExampleProgram('mojo.pp');
+    P.Targets.AddExampleProgram('land.pp');
+    P.Targets.AddExampleProgram('keybrd2.pp');
+    P.Targets.AddExampleProgram('clear.pp');
+    P.Targets.AddExampleProgram('con_info.pp');
+    P.Targets.AddExampleProgram('area.pp');
+    P.Targets.AddExampleProgram('tunnel3d.pp');
+    // 'Makefile
+    // 'stretch.tga
+    // 'Makefile.fpc
+    // 'mojo.raw
+    // 'tunnel3d.raw
+    // 'image.tga
 
 
 {$ifndef ALLPACKAGES}

packages/pxlib/fpmake.pp

@@ -19,6 +19,7 @@ begin
     T:=P.Targets.AddUnit('src/pxlib.pp');
       T.OSes:=[Linux];
     T:=P.Targets.AddExampleunit('examples/ppxview.pp');
+      T.OSes:=[Linux];
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/regexpr/fpmake.pp

@@ -20,6 +20,10 @@ begin
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('regexpr.pp');
+    T:=P.Targets.AddUnit('regex.pp');
+
+    P.ExamplePath.Add('tests');
+    P.Targets.AddExampleProgram('testreg1.pp');
 
 {$ifndef ALLPACKAGES}
     Run;

packages/rexx/fpmake.pp

@@ -19,10 +19,18 @@ begin
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
     P.Oses:=[emx,os2];
-//    P.Dependencies.Add('x11');
+    p.Targets.AddUnit('rexxsaa.pp',[OS2]);
+
+    P.Sources.AddSrc('readme.txt');
+
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('callrexx.pas',[OS2]);
+    // 'backward.fnc
 
 {$ifndef ALLPACKAGES}
     Run;
     end;
 end.
 {$endif ALLPACKAGES}
+
+

packages/sdl/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
     P.Dependencies.Add('x11');
     P.Dependencies.Add('pthreads');
 
@@ -83,9 +84,18 @@ begin
           AddInclude('jedi-sdl.inc');
           AddUnit('sdl');
         end;
+    P.Sources.AddSrc('LGPL');
+    P.Sources.AddSrc('LGPL.addon');
+    P.Sources.AddSrc('MPL-1.1');
+    P.Sources.AddSrc('README');
 
 {$ifndef ALLPACKAGES}
     Run;
     end;
 end.
 {$endif ALLPACKAGES}
+
+
+
+
+ 

packages/sndfile/fpmake.pp

@@ -18,10 +18,14 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
-//    P.Dependencies.Add('x11');
 
     T:=P.Targets.AddUnit('sndfile.pp');
 
+    P.Sources.AddSrc('README');
+
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('sfplay.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/sqlite/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('sqlite3db.pas');
       with T.Dependencies do
@@ -41,6 +42,10 @@ begin
         end;
     T:=P.Targets.AddUnit('sqlite.pp');
 
+    P.ExamplePath.Add('tests/');
+    P.Targets.AddExampleProgram('testapiv3x.pp');
+    P.Targets.AddExampleProgram('test.pas');
+    // 'testapiv3x.README
 
 {$ifndef ALLPACKAGES}
     Run;

packages/svgalib/fpmake.pp

@@ -22,6 +22,12 @@ begin
     T:=P.Targets.AddUnit('svgalib.pp');
     T:=P.Targets.AddUnit('vgamouse.pp');
 
+    P.Sources.AddSrc('README');
+ 
+    P.ExamplePath.Add('tests/');
+    P.Targets.AddExampleProgram('testvga.pp');
+    P.Targets.AddExampleProgram('vgatest.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/symbolic/fpmake.pp

@@ -32,6 +32,10 @@ begin
           AddInclude('rearrang.inc');
         end;
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('evaltest.pas');
+    P.Targets.AddExampleProgram('rpnthing.pas');
+
 
 {$ifndef ALLPACKAGES}
     Run;

packages/syslog/fpmake.pp

@@ -21,6 +21,8 @@ begin
 
     T:=P.Targets.AddUnit('systemlog.pp');
 
+    P.ExamplePath.Add('tests/');
+    P.Targets.AddExampleProgram('testlog.pp');
 
 {$ifndef ALLPACKAGES}
     Run;

packages/tcl/fpmake.pp

@@ -21,6 +21,9 @@ begin
 
     T:=P.Targets.AddUnit('tcl80.pp');
 
+    P.ExamplePath.Add('tests/');
+    P.Targets.AddExampleProgram('tcl_demo.pp');
+    // 'test.tcl
 
 {$ifndef ALLPACKAGES}
     Run;

packages/univint/fpmake.pp

@@ -18,7 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
-
+    P.OSes:=[darwin];
   T:=P.Targets.AddUnit('ABActions.pas');
     with T.Dependencies do
       begin
@@ -851,7 +851,7 @@ begin
         AddUnit('cfdictionary');
         AddUnit('cggeometry');
       end;
-  T:=P.Targets.AddUnit('CGDisplayFade.pas');
+  T:=P.Targets.AddUnit('CGDisplayFades.pas');
     with T.Dependencies do
       begin
         AddUnit('mactypes');
@@ -1528,7 +1528,7 @@ begin
         AddUnit('quickdraw');
         AddUnit('endian');
       end;
-  T:=P.Targets.AddUnit('FPCMacOSAll.pas');
+  T:=P.Targets.AddUnit('MacOSAll.pas');
   T:=P.Targets.AddUnit('FileTypesAndCreators.pas');
     with T.Dependencies do
       begin
@@ -3181,6 +3181,9 @@ begin
         AddUnit('mactypes');
       end;
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('controldemo.pas');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/unixutil/fpmake.pp

@@ -18,8 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
-
-    T:=P.Targets.AddUnit('unixutils.pp');
+    T:=P.Targets.AddUnit('unixutils.pp',[i386],[linux]);
       with T.Dependencies do
         begin
           AddUnit('libc');

packages/users/fpmake.pp

@@ -19,17 +19,23 @@ begin
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
 
+    T:=P.Targets.AddUnit('crypth.pp',[linux]);
     T:=P.Targets.AddUnit('grp.pp');
     T:=P.Targets.AddUnit('pwd.pp');
-    T:=P.Targets.AddUnit('shadow.pp');
+    T:=P.Targets.AddUnit('shadow.pp',[linux]);
     T:=P.Targets.AddUnit('users.pp');
       with T.Dependencies do
         begin
           AddUnit('pwd');
-          AddUnit('shadow');
+          AddUnit('shadow',[linux]);
           AddUnit('grp');
         end;
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('testpass.pp');
+    P.Targets.AddExampleProgram('testpass2.pp');
+    P.Targets.AddExampleProgram('testuser.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/uuid/fpmake.pp

@@ -22,6 +22,12 @@ begin
     T:=P.Targets.AddUnit('libuuid.pp');
     T:=P.Targets.AddUnit('macuuid.pp');
 
+    P.Sources.AddSrc('README');
+
+    P.ExamplePath.Add('tests/');
+    P.Targets.AddExampleProgram('testlibuid.pp');
+    P.Targets.AddExampleProgram('testuid.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/winunits-base/fpmake.pp

@@ -30,6 +30,7 @@ begin
           AddUnit('mmsystem');
           AddUnit('comconst');
           AddUnit('commctrl');
+          AddUnit('commdlg');
           AddUnit('comobj');
           AddUnit('ole2');
           AddUnit('activex');
@@ -38,11 +39,12 @@ begin
           AddUnit('oleserver');
           AddUnit('shfolder');
           AddUnit('richedit');
-		  AddUnit('wininet');
+	  AddUnit('wininet');
         end;
     T:=P.Targets.AddImplicitUnit('activex.pp');
     T:=P.Targets.AddImplicitUnit('comconst.pp');
     T:=P.Targets.AddImplicitUnit('commctrl.pp');
+    T:=P.Targets.AddImplicitUnit('commdlg.pp');
     T:=P.Targets.AddImplicitUnit('comobj.pp');
     T:=P.Targets.AddImplicitUnit('flatsb.pp');
     T:=P.Targets.AddImplicitUnit('mmsystem.pp');
@@ -53,9 +55,17 @@ begin
     T:=P.Targets.AddImplicitUnit('shfolder.pp');
     T:=P.Targets.AddImplicitUnit('shlobj.pp');
     T:=P.Targets.AddImplicitUnit('winver.pp');
+    T:=P.Targets.AddImplicitUnit('wininet.pp');
     T:=P.Targets.AddImplicitUnit('imagehlp.pp');
     T:=P.Targets.AddImplicitUnit('commdlg.pp');
     T:=P.Targets.AddImplicitUnit('wininet.pp');
+    P.ExamplePath.Add('tests/');
+    P.Targets.AddExampleProgram('testcom1.pp');
+    P.Targets.AddExampleProgram('OOTest.pp');
+    P.Targets.AddExampleProgram('OOHelper.pp');
+    P.Targets.AddExampleProgram('testver.pp');
+    P.Targets.AddExampleProgram('testcom2.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/x11/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('cursorfont.pp');
     T:=P.Targets.AddUnit('keysym.pp');

packages/xforms/fpmake.pp

@@ -18,7 +18,8 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
-//    P.Dependencies.Add('x11');
+    P.IncludePath.Add('src');
+    P.Dependencies.Add('x11');
 
     T:=P.Targets.AddUnit('xforms.pp');
       with T.Dependencies do
@@ -28,6 +29,68 @@ begin
           AddUnit('xresource');
         end;
 
+    
+    P.Sources.AddSrc('README');
+
+    P.ExamplePath.Add('examples/');
+    P.Targets.AddExampleProgram('newbutton.pp');
+    P.Targets.AddExampleProgram('colbrowser.pp');
+    P.Targets.AddExampleProgram('chartstrip.pp');
+    P.Targets.AddExampleProgram('pup.pp');
+    P.Targets.AddExampleProgram('ll.pp');
+    P.Targets.AddExampleProgram('pushme.pp');
+    P.Targets.AddExampleProgram('lalign.pp');
+    P.Targets.AddExampleProgram('flclock.pp');
+    P.Targets.AddExampleProgram('choice.pp');
+    P.Targets.AddExampleProgram('positioner.pp');
+    P.Targets.AddExampleProgram('objpos.pp');
+    P.Targets.AddExampleProgram('canvas.pp');
+    P.Targets.AddExampleProgram('colsel1.pp');
+    P.Targets.AddExampleProgram('fbrowse.pp');
+    P.Targets.AddExampleProgram('secretinput.pp');
+    P.Targets.AddExampleProgram('group.pp');
+    P.Targets.AddExampleProgram('inputall.pp');
+    P.Targets.AddExampleProgram('pushbutton.pp');
+    P.Targets.AddExampleProgram('touchbutton.pp');
+    P.Targets.AddExampleProgram('buttonall.pp');
+    P.Targets.AddExampleProgram('fonts.pp');
+    P.Targets.AddExampleProgram('multilabel.pp');
+    P.Targets.AddExampleProgram('sliderall.pp');
+    P.Targets.AddExampleProgram('goodies.pp');
+    P.Targets.AddExampleProgram('minput.pp');
+    P.Targets.AddExampleProgram('counter.pp');
+    P.Targets.AddExampleProgram('borderwidth.pp');
+    P.Targets.AddExampleProgram('browserall.pp');
+    P.Targets.AddExampleProgram('ldial.pp');
+    P.Targets.AddExampleProgram('chartall.pp');
+    P.Targets.AddExampleProgram('arrowbutton.pp');
+    P.Targets.AddExampleProgram('longlabel.pp');
+    P.Targets.AddExampleProgram('fdial.pp');
+    P.Targets.AddExampleProgram('xyplotover.pp');
+    P.Targets.AddExampleProgram('fbrowse1.pp');
+    P.Targets.AddExampleProgram('objinactive.pp');
+    P.Targets.AddExampleProgram('menu.pp');
+    P.Targets.AddExampleProgram('free1.pp');
+    P.Targets.AddExampleProgram('browserop.pp');
+    P.Targets.AddExampleProgram('cursor.pp');
+    P.Targets.AddExampleProgram('yesno.pp');
+    P.Targets.AddExampleProgram('invslider.pp');
+    P.Targets.AddExampleProgram('objreturn.pp');
+    P.Targets.AddExampleProgram('colsel.pp');
+    P.Targets.AddExampleProgram('butttypes.pp');
+    P.Targets.AddExampleProgram('iconify.pp');
+    P.Targets.AddExampleProgram('boxtype.pp');
+    P.Targets.AddExampleProgram('ndial.pp');
+    // 'Makefile
+    // 'crab45.xpm
+    // 'nomail.xbm
+    // 'crab.xpm
+    // 'Makefile.fpc
+    // 'bm2.xbm
+    // 'srs.xbm
+    // 'bm1.xbm
+    // 'porsche.xpm
+
 {$ifndef ALLPACKAGES}
     Run;
     end;