--- Merging r15148 into '.':

U    packages/sdl/fpmake.pp
U    packages/fcl-extra/fpmake.pp
U    packages/unzip/fpmake.pp
U    packages/fcl-registry/fpmake.pp
U    packages/fcl-db/fpmake.pp
U    packages/hash/fpmake.pp
U    packages/ptc/fpmake.pp
U    packages/fpgtk/fpmake.pp
U    packages/fcl-base/fpmake.pp
U    packages/fpvectorial/fpmake.pp
U    packages/xforms/fpmake.pp
U    packages/cairo/fpmake.pp
U    packages/libpng/fpmake.pp
U    packages/zorba/fpmake.pp
--- Merging r15149 into '.':
U    packages/gtk2/fpmake.pp
--- Merging r15183 into '.':
G    packages/fcl-db/fpmake.pp
U    packages/librsvg/fpmake.pp
U    packages/libxml/fpmake.pp
U    packages/chm/fpmake.pp
--- Merging r15233 into '.':
G    packages/fcl-db/fpmake.pp
--- Merging r15253 into '.':
U    packages/fcl-web/fpmake.pp

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

packages/cairo/fpmake.pp

@@ -33,21 +33,15 @@ begin
     with T.Dependencies do
       begin
         AddUnit('cairo');
-        AddUnit('freetypeh');
       end;
    T:=P.Targets.AddUnit('cairoxlib.pp',AllUnixOSes);
     with T.Dependencies do
       begin
         AddUnit('cairo');
-        AddUnit('xlib');
-        AddUnit('xrender');
       end;
    T:=P.Targets.AddUnit('cairowin32.pp',AllWindowsOses);
     with T.Dependencies do
-      begin
         AddUnit('cairo');
-        AddUnit('windows');
-      end;
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/chm/fpmake.pp

@@ -74,7 +74,7 @@ begin
           AddUnit('paslzxcomp');
           AddUnit('chmfiftimain');
         end;
-    T:=P.Targets.AddUnit('lzxcompressthread');
+    T:=P.Targets.AddUnit('lzxcompressthread.pas');
       with T.Dependencies do
         begin
           AddUnit('paslzxcomp');

packages/fcl-base/fpmake.pp

@@ -21,7 +21,6 @@ begin
 
     P.Author := '<various>';
     P.License := 'LGPL with modification, ';
-    P.ExternalURL := 'www.freepascal.org';
     P.Email := '';
     P.Description := 'Base library of Free Component Libraries(FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
@@ -46,13 +45,6 @@ begin
     T:=P.Targets.AddUnit('contnrs.pp');
     T:=P.Targets.AddUnit('custapp.pp');
       T.ResourceStrings:=true;
-    T:=P.Targets.AddUnit('daemonapp.pp',AllWindowsOSes+AllUnixOSes);
-      with T.Dependencies do
-        begin
-          AddInclude('daemonapp.inc');
-          AddUnit('custapp');
-          AddUnit('eventlog');
-        end;
     T:=P.Targets.AddUnit('eventlog.pp');
       T.ResourceStrings:=true;
       with T.Dependencies do

packages/fcl-db/fpmake.pp

@@ -52,7 +52,19 @@ begin
     P.IncludePath.Add('src/sqlite');
     P.IncludePath.Add('src/dbase');
 
+    P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('fcl-xml');
+    P.Dependencies.Add('ibase');
+    P.Dependencies.Add('mysql');
+    P.Dependencies.Add('odbc');
+    P.Dependencies.Add('oracle');
+    P.Dependencies.Add('postgres');
+    P.Dependencies.Add('sqlite');
+    P.Dependencies.Add('pxlib');
 
+    P.Options.Add('-S2h');
+
+    // base
     T:=P.Targets.AddUnit('bufdataset.pas');
       with T.Dependencies do
         begin
@@ -60,6 +72,7 @@ begin
           AddUnit('bufdataset_parser');
           AddUnit('dbconst');
         end;
+
     T:=P.Targets.AddUnit('bufdataset_parser.pp');
       with T.Dependencies do
         begin
@@ -68,12 +81,7 @@ begin
           AddUnit('dbf_prsdef');
           AddUnit('dbconst');
         end;
-    T:=P.Targets.AddUnit('customsqliteds.pas');
-      with T.Dependencies do
-        begin
-          AddUnit('db');
-          AddUnit('dbconst');
-        end;
+
     T:=P.Targets.AddUnit('db.pas');
       with T.Dependencies do
         begin
@@ -84,12 +92,37 @@ begin
           AddInclude('dsparams.inc');
           AddUnit('dbconst');
         end;
+
     T:=P.Targets.AddUnit('dbcoll.pp');
       with T.Dependencies do
         begin
           AddUnit('db');
         end;
+    T.ResourceStrings:=true;
+
+
     T:=P.Targets.AddUnit('dbconst.pas');
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('sqlscript.pp');
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('dbwhtml.pp');
+    with T.Dependencies do
+      begin
+        AddUnit('db');
+        AddUnit('dbconst');
+      end;
+
+    T:=P.Targets.AddUnit('xmldatapacketreader.pp');
+    T.ResourceStrings:=true;
+    with T.Dependencies do
+      begin
+        AddUnit('bufdataset');
+        AddUnit('db');
+      end;
+
+    // dbase
     T:=P.Targets.AddUnit('dbf.pas');
       with T.Dependencies do
         begin
@@ -255,13 +288,6 @@ begin
         begin
           AddInclude('dbf_common.inc');
         end;
-    T:=P.Targets.AddUnit('dbwhtml.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('db');
-          AddUnit('whtml');
-          AddUnit('dbconst');
-        end;
     T:=P.Targets.AddUnit('fpcgcreatedbf.pp');
       with T.Dependencies do
         begin
@@ -279,6 +305,7 @@ begin
         begin
           AddUnit('fpddcodegen');
         end;
+    T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('fpcgtiopf.pp');
       with T.Dependencies do
         begin
@@ -286,33 +313,43 @@ begin
           AddUnit('fpddcodegen');
         end;
     T:=P.Targets.AddUnit('fpcsvexport.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
           AddUnit('fpdbexport');
         end;
     T:=P.Targets.AddUnit('fpdatadict.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
-          AddUnit('inicol');
-          AddUnit('inifiles');
-          AddUnit('contnrs');
           AddUnit('db');
         end;
     T:=P.Targets.AddUnit('fpdbexport.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
-          AddUnit('streamio');
         end;
     T:=P.Targets.AddUnit('fpdbfexport.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
           AddUnit('dbf');
           AddUnit('fpdbexport');
         end;
+
+    T:=P.Targets.AddUnit('fpddpopcode.pp');
+    T.ResourceStrings:=true;
+    T.Dependencies.AddUnit('fpdatadict');
+
+    T:=P.Targets.AddUnit('fpdddiff.pp');
+    T.ResourceStrings:=true;
+    T.Dependencies.AddUnit('fpdatadict');
+
     T:=P.Targets.AddUnit('fpddcodegen.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
@@ -396,7 +433,14 @@ begin
           AddUnit('fpddmysql50');
           AddUnit('fpddodbc');
         end;
+    T:=P.Targets.AddUnit('customsqliteds.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('db');
+          AddUnit('dbconst');
+        end;
     T:=P.Targets.AddUnit('fpddsqldb.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
@@ -412,30 +456,35 @@ begin
           AddUnit('sqlite3conn');
         end;
     T:=P.Targets.AddUnit('fpfixedexport.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
           AddUnit('fpdbexport');
         end;
     T:=P.Targets.AddUnit('fprtfexport.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
           AddUnit('fpdbexport');
         end;
     T:=P.Targets.AddUnit('fpsimplejsonexport.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
           AddUnit('fpdbexport');
         end;
     T:=P.Targets.AddUnit('fpsimplexmlexport.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
           AddUnit('fpdbexport');
         end;
     T:=P.Targets.AddUnit('fpsqlexport.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
@@ -455,6 +504,7 @@ begin
           AddUnit('fpdbfexport');
         end;
     T:=P.Targets.AddUnit('fptexexport.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
@@ -467,51 +517,51 @@ begin
           AddUnit('db');
           AddUnit('dbconst');
           AddUnit('bufdataset');
-          AddUnit('ibase60dyn');
         end;
     T:=P.Targets.AddUnit('memds.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
         end;
     T:=P.Targets.AddUnit('mysql40conn.pas');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddInclude('mysqlconn.inc');
           AddUnit('bufdataset');
           AddUnit('sqldb');
           AddUnit('db');
-          AddUnit('mysql40dyn');
           AddUnit('dbconst');
         end;
     T:=P.Targets.AddUnit('mysql41conn.pas');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddInclude('mysqlconn.inc');
           AddUnit('bufdataset');
           AddUnit('sqldb');
           AddUnit('db');
-          AddUnit('mysql41dyn');
           AddUnit('dbconst');
         end;
     T:=P.Targets.AddUnit('mysql4conn.pas');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddInclude('mysqlconn.inc');
           AddUnit('bufdataset');
           AddUnit('sqldb');
           AddUnit('db');
-          AddUnit('mysql40dyn');
           AddUnit('dbconst');
         end;
     T:=P.Targets.AddUnit('mysql50conn.pas');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddInclude('mysqlconn.inc');
           AddUnit('bufdataset');
           AddUnit('sqldb');
           AddUnit('db');
-          AddUnit('mysql50dyn');
           AddUnit('dbconst');
         end;
     T:=P.Targets.AddUnit('odbcconn.pas');
@@ -519,34 +569,32 @@ begin
         begin
           AddUnit('sqldb');
           AddUnit('db');
-          AddUnit('odbcsqldyn');
           AddUnit('bufdataset');
           AddUnit('dbconst');
         end;
     T:=P.Targets.AddUnit('oracleconnection.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('sqldb');
           AddUnit('db');
           AddUnit('dbconst');
-          AddUnit('ocidyn');
-          AddUnit('oratypes');
         end;
     T:=P.Targets.AddUnit('paradox.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('db');
-          AddUnit('pxlib');
           AddUnit('bufdataset_parser');
         end;
     T:=P.Targets.AddUnit('pqconnection.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('sqldb');
           AddUnit('db');
           AddUnit('dbconst');
           AddUnit('bufdataset');
-          AddUnit('postgres3dyn');
         end;
     T:=P.Targets.AddUnit('sdfdata.pp');
       with T.Dependencies do
@@ -566,21 +614,18 @@ begin
           AddUnit('db');
           AddUnit('bufdataset');
           AddUnit('sqldb');
-          AddUnit('sqlite3dyn');
           AddUnit('dbconst');
         end;
     T:=P.Targets.AddUnit('sqlite3ds.pas');
       with T.Dependencies do
         begin
           AddUnit('customsqliteds');
-          AddUnit('sqlite3');
           AddUnit('db');
         end;
     T:=P.Targets.AddUnit('sqliteds.pas');
       with T.Dependencies do
         begin
           AddUnit('customsqliteds');
-          AddUnit('sqlite');
           AddUnit('db');
         end;
 

packages/fcl-extra/fpmake.pp

@@ -12,182 +12,38 @@ begin
     begin
 {$endif ALLPACKAGES}
 
-    P:=AddPackage('fcl-base');
+    P:=AddPackage('fcl-extra');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-base';
+    P.Directory:='fcl-extra';
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
+    P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('winunits-jedi',[Win32,Win64]);
+    P.Dependencies.Add('winunits-base',[Win32,Win64]);
+    P.Dependencies.Add('univint',[darwin]);
 
     P.Author := '<various>';
     P.License := 'LGPL with modification, ';
-    P.ExternalURL := 'www.freepascal.org';
     P.Email := '';
-    P.Description := 'Base library of Free Component Libraries(FCL), FPC''s OOP library.';
+    P.Description := 'Extra libraries of Free Component Libraries(FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
 
     P.SourcePath.Add('src');
-    P.SourcePath.Add('src/unix',AllUnixOSes);
-    P.SourcePath.Add('src/win',AllWindowsOSes);
-    P.SourcePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
-    P.IncludePath.Add('src');
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/win',AllWindowsOSes);
     P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
     P.IncludePath.Add('src/dummy',AllOSes);
 
-    T:=P.Targets.AddUnit('ascii85.pp');
-    T:=P.Targets.AddUnit('avl_tree.pp');
-    T:=P.Targets.AddUnit('base64.pp');
-    T:=P.Targets.AddUnit('blowfish.pp');
-    T:=P.Targets.AddUnit('bufstream.pp');
-    T:=P.Targets.AddUnit('cachecls.pp');
-      T.ResourceStrings:=true;
-    T:=P.Targets.AddUnit('contnrs.pp');
-    T:=P.Targets.AddUnit('custapp.pp');
-      T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('daemonapp.pp',AllWindowsOSes+AllUnixOSes);
       with T.Dependencies do
         begin
           AddInclude('daemonapp.inc');
-          AddUnit('custapp');
-          AddUnit('eventlog');
-        end;
-    T:=P.Targets.AddUnit('eventlog.pp');
-      T.ResourceStrings:=true;
-      with T.Dependencies do
-        begin
-          AddInclude('eventlog.inc');
-        end;
-    T:=P.Targets.AddUnit('fptimer.pp',AllWindowsOSes+AllUnixOSes);
-    T:=P.Targets.AddUnit('gettext.pp');
-    T:=P.Targets.AddUnit('idea.pp');
-    T:=P.Targets.AddUnit('inicol.pp');
-      T.ResourceStrings:=true;
-      with T.Dependencies do
-        begin
-          AddUnit('inifiles');
-        end;
-    T:=P.Targets.AddUnit('inifiles.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('contnrs');
         end;
-    T:=P.Targets.AddUnit('iostream.pp');
-    T:=P.Targets.AddUnit('libtar.pp');
-    T:=P.Targets.AddUnit('maskutils.pp');
-    T:=P.Targets.AddUnit('pooledmm.pp');
-    T:=P.Targets.AddUnit('rtfpars.pp');
-      with T.Dependencies do
-        begin
-          AddInclude('rtfdata.inc');
-        end;
-    T:=P.Targets.AddUnit('rttiutils.pp');
-    T:=P.Targets.AddUnit('streamcoll.pp');
       T.ResourceStrings:=true;
-    T:=P.Targets.AddUnit('streamex.pp');
-    T:=P.Targets.AddUnit('streamio.pp');
-    T:=P.Targets.AddUnit('syncobjs.pp',AllOSes-[GO32v2,OS2,EMX]);
-    T:=P.Targets.AddUnit('uriparser.pp');
-    T:=P.Targets.AddUnit('wformat.pp');
-    T:=P.Targets.AddUnit('whtml.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('wformat');
-        end;
-    T:=P.Targets.AddUnit('wtex.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('wformat');
-        end;
-    T:=P.Targets.AddUnit('fpexprpars.pp');
 
     // Windows units
     T:=P.Targets.AddUnit('ServiceManager.pas',[Win32,Win64]);
-    T:=P.Targets.AddUnit('fileinfo.pp',AllWindowsOSes);
-
-    // Additional sources
-    P.Sources.AddSrcFiles('src/win/fclel.*');
-
-    // Examples
-    P.ExamplePath.Add('examples');
-      T:=P.Targets.AddExampleProgram('asiotest.pp');
-      T:=P.Targets.AddExampleProgram('b64dec.pp');
-      T:=P.Targets.AddExampleProgram('b64enc.pp');
-      T:=P.Targets.AddExampleProgram('b64.pp');
-      T:=P.Targets.AddExampleProgram('b64test2.pp');
-      T:=P.Targets.AddExampleProgram('b64test.pp');
-      T:=P.Targets.AddExampleProgram('base64decodingtestcase.pas');
-      T:=P.Targets.AddExampleProgram('cachetest.pp');
-      T:=P.Targets.AddExampleProgram('cfgtest.pp');
-      T:=P.Targets.AddExampleProgram('daemon.pp');
-      T:=P.Targets.AddExampleProgram('daemon.txt');
-      T:=P.Targets.AddExampleProgram('dbugsrv.pp');
-      T:=P.Targets.AddExampleProgram('debugtest.pp');
-      T:=P.Targets.AddExampleProgram('doecho.pp');
-      T:=P.Targets.AddExampleProgram('dparser.pp');
-      T:=P.Targets.AddExampleProgram('dsockcli.pp');
-      T:=P.Targets.AddExampleProgram('dsocksvr.pp');
-      T:=P.Targets.AddExampleProgram('fpdoc.dtd');
-      T:=P.Targets.AddExampleProgram('fstream.pp');
-      T:=P.Targets.AddExampleProgram('htdump.pp');
-      T:=P.Targets.AddExampleProgram('ipcclient.pp');
-      T:=P.Targets.AddExampleProgram('ipcserver.pp');
-      T:=P.Targets.AddExampleProgram('isockcli.pp');
-      T:=P.Targets.AddExampleProgram('isocksvr.pp');
-      T:=P.Targets.AddExampleProgram('istream.pp');
-      T:=P.Targets.AddExampleProgram('list.pp');
-      T:=P.Targets.AddExampleProgram('mstream.pp');
-      T:=P.Targets.AddExampleProgram('poolmm1.pp');
-      T:=P.Targets.AddExampleProgram('poolmm2.pp');
-      T:=P.Targets.AddExampleProgram('restest.pp');
-      T:=P.Targets.AddExampleProgram('showver.pp');
-      T:=P.Targets.AddExampleProgram('sockcli.pp');
-      T:=P.Targets.AddExampleProgram('socksvr.pp');
-      T:=P.Targets.AddExampleProgram('sstream.pp');
-      T:=P.Targets.AddExampleProgram('stringl.pp');
-      T:=P.Targets.AddExampleProgram('tarmakerconsgzip.pas');
-      T:=P.Targets.AddExampleProgram('tarmakercons.pas');
-      T:=P.Targets.AddExampleProgram('testapp.pp');
-      T:=P.Targets.AddExampleProgram('testbf.pp');
-      T:=P.Targets.AddExampleProgram('testbs.pp');
-      T:=P.Targets.AddExampleProgram('testcgi.pp');
-      T:=P.Targets.AddExampleProgram('testcont.pp');
-      T:=P.Targets.AddExampleProgram('testez.pp');
-      T:=P.Targets.AddExampleProgram('testhres.pp');
-      T:=P.Targets.AddExampleProgram('testnres.pp');
-      T:=P.Targets.AddExampleProgram('testol.pp');
-      T:=P.Targets.AddExampleProgram('testproc.pp');
-      T:=P.Targets.AddExampleProgram('testreg.pp');
-      T:=P.Targets.AddExampleProgram('testrhre.pp');
-      T:=P.Targets.AddExampleProgram('testrnre.pp');
-      T:=P.Targets.AddExampleProgram('testrsre.pp');
-      T:=P.Targets.AddExampleProgram('testrtf.pp');
-      T:=P.Targets.AddExampleProgram('testser.pp');
-      T:=P.Targets.AddExampleProgram('testsres.pp');
-      T:=P.Targets.AddExampleProgram('testtimer.pp');
-      T:=P.Targets.AddExampleProgram('testunzip.pp');
-      T:=P.Targets.AddExampleProgram('testur.pp');
-      T:=P.Targets.AddExampleProgram('testweb.pp');
-      T:=P.Targets.AddExampleProgram('testz2.pp');
-      T:=P.Targets.AddExampleProgram('testzip.pp');
-      T:=P.Targets.AddExampleProgram('testz.pp');
-      T:=P.Targets.AddExampleProgram('threads.pp');
-      T:=P.Targets.AddExampleProgram('tidea.pp');
-      T:=P.Targets.AddExampleProgram('tstelcmd.pp');
-      T:=P.Targets.AddExampleProgram('tstelgtk.pp');
-      T:=P.Targets.AddExampleProgram('txmlreg.pp');
-      T:=P.Targets.AddExampleProgram('xmldump.pp');
-
-      // example data files.
-      // README
-      // kword.xml
-      // overview.rtf
-      // showver.rc
-      // showver.res
-      // simple.xml
-      // parser.dat
-      // testcgi.html
+      T.ResourceStrings:=true;
 
 {$ifndef ALLPACKAGES}
     Run;

packages/fcl-registry/fpmake.pp

@@ -17,6 +17,8 @@ begin
     P.Directory:='fcl-registry';
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
+    P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('fcl-xml');
 
     P.Author := 'FPC development team';
     P.License := 'LGPL with modification, ';
@@ -33,16 +35,9 @@ begin
           AddInclude('regdef.inc');
           AddInclude('xregreg.inc');
           AddInclude('regini.inc');
-          AddUnit('inifiles');
           AddUnit('xmlreg');
         end;
     T:=P.Targets.AddUnit('xmlreg.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('dom');
-          AddUnit('xmlread');
-          AddUnit('xmlwrite');
-        end;
 
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('tests/testbasics.pp');

packages/fcl-web/fpmake.pp

@@ -22,6 +22,7 @@ begin
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-process');
     P.Dependencies.Add('fastcgi');
+    P.Dependencies.Add('httpd22');
 
     P.Author := 'FreePascal development team';
     P.License := 'LGPL with modification, ';
@@ -33,7 +34,9 @@ begin
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('cgiapp.pp');
+    T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('custcgi.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('httpdefs');
@@ -51,27 +54,30 @@ begin
           AddUnit('fphtml');
         end;
     T:=P.Targets.AddUnit('fphtml.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('httpdefs');
           AddUnit('fphttp');
         end;
     T:=P.Targets.AddUnit('fphttp.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('httpdefs');
         end;
-    T:=P.Targets.AddUnit('fptemplate.pp');
     T:=P.Targets.AddUnit('fpweb.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('httpdefs');
           AddUnit('fphttp');
-          AddUnit('fptemplate');
           AddUnit('websession');
         end;
     T:=P.Targets.AddUnit('httpdefs.pp');
+    T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('websession.pp');
+    T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('fphttp');
@@ -82,6 +88,34 @@ begin
         begin
           AddUnit('httpdefs');
         end;
+    with P.Targets.AddUnit('custweb.pp') do
+      begin
+        ResourceStrings:=true;
+        Dependencies.AddUnit('httpdefs');
+        Dependencies.AddUnit('fphttp');
+      end;
+    with P.Targets.AddUnit('webpage.pp') do
+      begin
+        Dependencies.AddUnit('httpdefs');
+        Dependencies.AddUnit('fphtml');
+        Dependencies.AddUnit('fpweb');
+      end;
+    with P.Targets.AddUnit('fpfcgi.pp') do
+      begin
+        Dependencies.AddUnit('custfcgi');
+      end;
+    with P.Targets.AddUnit('custfcgi.pp') do
+      begin
+        Dependencies.AddUnit('httpdefs');
+        Dependencies.AddUnit('custweb');
+        ResourceStrings:=true;
+      end;
+    with P.Targets.AddUnit('fpapache.pp') do
+      begin
+        Dependencies.AddUnit('fphttp');
+        Dependencies.AddUnit('custweb');
+        ResourceStrings:=true;
+      end;
 
 {$ifndef ALLPACKAGES}
     Run;

packages/fpgtk/fpmake.pp

@@ -24,27 +24,18 @@ begin
     P.Description := 'Lightweight OOP wrapper over GTK1.';
     P.NeedLibC:= True;
 
+    P.Dependencies.Add('gtk1');
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('fpglib.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('glib');
-        end;
     T:=P.Targets.AddUnit('fpgtkext.pp');
       with T.Dependencies do
         begin
           AddUnit('fpgtk');
-          AddUnit('gtk');
-          AddUnit('gdk');
-          AddUnit('glib');
         end;
     T:=P.Targets.AddUnit('fpgtk.pp');
       with T.Dependencies do
         begin
-          AddUnit('gtk');
-          AddUnit('gdk');
-          AddUnit('glib');
           AddUnit('fpglib');
         end;
 

packages/fpvectorial/fpmake.pp

@@ -41,7 +41,7 @@ begin
     T:=P.Targets.AddImplicitUnit('pdfvrsintaticoa');
 
     // Build unit depending on all implicit units
-    TBuild:=P.Targets.AddUnit('fpvectorialbuildunit.pp');
+    TBuild:=P.Targets.AddUnit('fpvectbuildunit.pas');
     TBuild.Install:=False;
     For I:=0 to P.Targets.Count-1 do
       begin

packages/gtk2/fpmake.pp

@@ -28,7 +28,39 @@ begin
     P.Dependencies.Add('x11',AllUnixOSes);
     P.Dependencies.Add('cairo');
 
-    T:=P.Targets.AddUnit('src/atk/atk.pas');
+    P.SourcePath.Add('src');
+    P.SourcePath.Add('src/glib');
+    P.SourcePath.Add('src/atk');
+    P.SourcePath.Add('src/pango');
+    P.SourcePath.Add('src/pangocairo');
+    P.SourcePath.Add('src/gtk+');
+    P.SourcePath.Add('src/gtk+/gdk-pixbuf');
+    P.SourcePath.Add('src/gtk+/gdk');
+    P.SourcePath.Add('src/gtk+/gtk');
+    P.SourcePath.Add('src/libglade');
+    P.SourcePath.Add('src/gtkglext');
+    P.SourcePath.Add('src/gtkext');
+
+    // This is all so complex... Use the build-unit just like the Makefile.fpc does
+    // and be happy with it. ;)
+    T:=P.Targets.AddUnit('buildgtk2.pp');
+      with t.UnitPath do
+        begin
+          Add('src/glib');
+          Add('src/atk');
+          Add('src/pango');
+          Add('src/pangocairo');
+          Add('src/gtk+');
+          Add('src/gtk+/gdk-pixbuf');
+          Add('src/gtk+/gdk');
+          Add('src/gtk+/gtk');
+          Add('src/libglade');
+          Add('src/gtkglext');
+          Add('src/gtkext');
+          Add('src/gtk2x11');
+        end;
+
+    T:=P.Targets.AddImplicitUnit('src/atk/atk.pas');
      T.IncludePath.Add('src/atk');
      with T.Dependencies do
        begin
@@ -120,27 +152,15 @@ begin
          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',AllUnixOSes);
-          AddUnit('pangocairo');
-        end;
-    T:=P.Targets.AddUnit('src/gtk+/gdk-pixbuf/gdk2pixbuf.pas');
+    T:=P.Targets.AddImplicitUnit('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('src/gtk+/gdk/gdk2.pas');
+    T:=P.Targets.AddImplicitUnit('src/gtk+/gdk/gdk2.pas');
       T.IncludePath.Add('src/gtk+/gdk');
       with T.Dependencies do
         begin
@@ -244,11 +264,8 @@ begin
           AddInclude('gdktypes.inc');
           AddInclude('gdkvisual.inc');
           AddInclude('gdkwindow.inc');
-          AddUnit('glib2');
-          AddUnit('gdk2pixbuf');
-          AddUnit('pango');
         end;
-    T:=P.Targets.AddUnit('src/gtk2x11/gdk2x.pas',AllUnixOSes);
+    T:=P.Targets.AddImplicitUnit('src/gtk2x11/gdk2x.pas',AllUnixOSes);
       T.IncludePath.Add('src/gtk2x11');
       T.IncludePath.Add('src/gtk2x11/include');
       with T.Dependencies do
@@ -292,10 +309,8 @@ begin
           AddInclude('gdkx.inc');
           AddInclude('gxid_proto.inc');
           AddInclude('mwmutil.inc');
-          AddUnit('glib2');
-          AddUnit('gdk2');
         end;
-    T:=P.Targets.AddUnit('src/gtkglext/gdkglext.pas');
+    T:=P.Targets.AddImplicitUnit('src/gtkglext/gdkglext.pas');
       T.IncludePath.Add('src/gtkglext');
       with T.Dependencies do
         begin
@@ -344,10 +359,8 @@ begin
           AddInclude('gdkglwindow.inc');
           AddInclude('gdkglfont.inc');
           AddInclude('gdkglshapes.inc');
-          AddUnit('glib2');
-          AddUnit('gdk2');
         end;
-    T:=P.Targets.AddUnit('src/glib/glib2.pas');
+    T:=P.Targets.AddImplicitUnit('src/glib/glib2.pas');
       T.IncludePath.Add('src/glib');
       with T.Dependencies do
         begin
@@ -422,7 +435,7 @@ begin
           AddInclude('gmodule.inc');
           AddInclude('gmarshal.inc');
         end;
-    T:=P.Targets.AddUnit('src/gtk+/gtk/gtk2.pas');
+    T:=P.Targets.AddImplicitUnit('src/gtk+/gtk/gtk2.pas');
       T.IncludePath.Add('src/gtk+/gtk');
       with T.Dependencies do
         begin
@@ -1114,13 +1127,8 @@ begin
           AddInclude('gtkentrycompletion.inc');
           AddInclude('gtkuimanager.inc');
           AddInclude('gtktreemodelfilter.inc');
-          AddUnit('glib2');
-          AddUnit('atk');
-          AddUnit('pango');
-          AddUnit('gdk2pixbuf');
-          AddUnit('gdk2');
         end;
-    T:=P.Targets.AddUnit('src/gtkglext/gtkglext.pas');
+    T:=P.Targets.AddImplicitUnit('src/gtkglext/gtkglext.pas');
       T.IncludePath.Add('src/gtkglext');
       with T.Dependencies do
         begin
@@ -1139,21 +1147,15 @@ begin
           AddInclude('gtkglversion.inc');
           AddInclude('gtkglinit.inc');
           AddInclude('gtkglwidget.inc');
-          AddUnit('glib2');
-          AddUnit('gdk2');
-          AddUnit('gtk2');
-          AddUnit('gdkglext');
         end;
-    T:=P.Targets.AddUnit('src/libglade/libglade2.pas');
+    T:=P.Targets.AddImplicitUnit('src/libglade/libglade2.pas');
       T.IncludePath.Add('src/libglade');
       with T.Dependencies do
         begin
           AddInclude('glade-init.inc');
           AddInclude('glade-xml.inc');
-          AddUnit('glib2');
-          AddUnit('gtk2');
         end;
-    T:=P.Targets.AddUnit('src/pango/pango.pas');
+    T:=P.Targets.AddImplicitUnit('src/pango/pango.pas');
       T.IncludePath.Add('src/pango');
       with T.Dependencies do
         begin
@@ -1213,18 +1215,12 @@ begin
           AddInclude('pango-item.inc');
           AddInclude('pango-layout.inc');
           AddInclude('pango-tabs.inc');
-          AddUnit('glib2');
         end;
     
-    T:=P.Targets.AddUnit('src/pangocairo/pangocairo.pas');
+    T:=P.Targets.AddImplicitUnit('src/pangocairo/pangocairo.pas');
       T.IncludePath.Add('src/pangocairo');
-      with T.Dependencies do
-        begin
-          AddUnit('glib2');
-          AddUnit('pango');
-        end;
 
-    T:=P.Targets.AddUnit('src/gtkext/gtk2ext.pp');
+    T:=P.Targets.AddImplicitUnit('src/gtkext/gtk2ext.pp');
       T.IncludePath.Add('src/gtkext');
       with T.Dependencies do
         begin
@@ -1239,8 +1235,8 @@ begin
 	  AddInclude('gtktextiterh.inc');
 	  AddInclude('gtktextiter.inc');
         end;
-
-     T:=P.Targets.AddUnit('src/gtkhtml/gtkhtml.pas');
+// For some reson this isn't build in the buildunit nor the Makefile.fpc
+{     T:=P.Targets.AddUnit('src/gtkhtml/gtkhtml.pas');
        T.IncludePath.Add('src/gtkhtml');
        with T.Dependencies do
          begin
@@ -1264,13 +1260,7 @@ begin
            AddInclude('htmlstreambuffer.inc');
            AddInclude('htmldocument.inc');
            AddInclude('htmlview.inc');
-           AddUnit('gtk2');
-           AddUnit('glib2');
-           AddUnit('atk');
-           AddUnit('pango');
-           AddUnit('gdk2pixbuf');
-           AddUnit('gdk2');
-         end;
+         end;}
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/hash/fpmake.pp

@@ -29,13 +29,12 @@ begin
     T:=P.Targets.AddUnit('src/sha1.pp');
     T:=P.Targets.AddUnit('src/crc.pas');
     T:=P.Targets.AddUnit('src/ntlm.pas');
-    T:=P.Targets.AddUnit('src/sha1.pas');
     T:=P.Targets.AddUnit('src/uuid.pas');
     T:=P.Targets.AddUnit('src/unixcrypt.pas');
       T.OSes:=[Linux];
     T:=P.Targets.AddExampleunit('examples/mdtest.pas');
     T:=P.Targets.AddExampleunit('examples/crctest.pas');
-    T:=P.Targets.AddExampleunit('examples/sha1test.pas');
+    T:=P.Targets.AddExampleunit('examples/sha1test.pp');
     // md5.ref
 {$ifndef ALLPACKAGES}
     Run;

packages/libpng/fpmake.pp

@@ -17,15 +17,10 @@ begin
     P.Directory:='libpng';
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
+    P.Dependencies.Add('zlib');
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('png.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('zlib');
-        end;
-
-
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/librsvg/fpmake.pp

@@ -19,16 +19,9 @@ begin
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
+    P.Dependencies.Add('gtk2');
 
   T:=P.Targets.AddUnit('rsvg.pas');
-  with T.Dependencies do
-    begin
-    end;
-
-    // 'Makefile
-    // 'Makefile.fpc
-    // 'test1.xml
-    // 'test2.xml
 
 {$ifndef ALLPACKAGES}
     Run;

packages/libxml/fpmake.pp

@@ -30,7 +30,6 @@ begin
       AddInclude('SAX2.inc');
       AddInclude('xmlversion.inc');
       AddInclude('globals.inc');
-      AddInclude('xmlexports.inc');
       AddInclude('nanoftp.inc');
       AddInclude('SAX.inc');
       AddInclude('uri.inc');
@@ -72,6 +71,9 @@ begin
       AddInclude('schematron.inc');
     end;
 
+  T:=P.Targets.AddUnit('xmlxsd.pas');
+  T.ResourceStrings := True;
+
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('reader1.pas');
     P.Targets.AddExampleProgram('io2.pas');

packages/ptc/fpmake.pp

@@ -37,6 +37,9 @@ begin
     P.IncludePath.Add('src/wince',[wince]);
     P.IncludePath.Add('src/x11',AllUnixOSes);
 
+  P.Dependencies.Add('hermes');
+  P.Dependencies.Add('x');
+
   T:=P.Targets.AddUnit('ptc.pp');
   with T.Dependencies do
     begin
@@ -95,16 +98,6 @@ begin
       AddInclude('x11dga2displayi.inc',allunixoses);
       AddInclude('x11consolei.inc',allunixoses);
       AddInclude('consolei.inc');
-      AddUnit('hermes');
-      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]);

packages/sdl/fpmake.pp

@@ -62,8 +62,6 @@ begin
       with T.Dependencies do
         begin
           AddInclude('jedi-sdl.inc');
-          AddUnit('pthreads');
-          AddUnit('xlib');
         end;
     T:=P.Targets.AddUnit('sdl_ttf.pas');
       with T.Dependencies do
@@ -71,11 +69,10 @@ begin
           AddInclude('jedi-sdl.inc');
           AddUnit('sdl');
         end;
-    T:=P.Targets.AddUnit('sdlutils.pas');
+    T:=P.Targets.AddUnit('sdlutils.pas',[i386,powerpc],[linux,freebsd,win32,darwin]);
       with T.Dependencies do
         begin
           AddInclude('jedi-sdl.inc');
-          AddUnit('xlib');
           AddUnit('sdl');
         end;
     T:=P.Targets.AddUnit('smpeg.pas');
@@ -98,4 +95,4 @@ end.
 
 
 
- 
+ 

packages/unzip/fpmake.pp

@@ -19,7 +19,7 @@ begin
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
 
-    T:=P.Targets.AddUnit('unzip.pp');
+    T:=P.Targets.AddUnit('unzip51g.pp');
       with T.Dependencies do
         begin
           AddUnit('ziptypes');

packages/xforms/fpmake.pp

@@ -25,8 +25,6 @@ begin
       with T.Dependencies do
         begin
           AddInclude('cursorfont.inc');
-          AddUnit('xlib');
-          AddUnit('xresource');
         end;
 
     

packages/zorba/fpmake.pp

@@ -29,14 +29,14 @@ begin
     T:=P.Targets.AddUnit('zorbadyn.pas');
       with T.Dependencies do
         begin
-          AddUnit('xqc.pas');
+          AddUnit('xqc');
           AddInclude('zorba.inc');
           AddInclude('zorba_options.inc');
         end;
     T:=P.Targets.AddUnit('zorba.pas');
       with T.Dependencies do
         begin
-          AddUnit('xqc.pas');
+          AddUnit('xqc');
           AddInclude('zorba.inc');
           AddInclude('zorba_options.inc');
         end;