--- Merging r15263 into '.':

U    packages/fpmake.pp
--- Merging r15268 into '.':
U    packages/unixutil/fpmake.pp
U    packages/sdl/fpmake.pp
U    packages/fcl-xml/fpmake.pp
U    packages/libc/fpmake.pp
U    packages/newt/fpmake.pp
   C packages/nvapi
U    packages/opencl/fpmake.pp
U    packages/proj4/fpmake.pp
U    packages/postgres/fpmake.pp
U    packages/xforms/fpmake.pp
U    packages/amunits/fpmake.pp
U    packages/svgalib/fpmake.pp
U    packages/uuid/fpmake.pp
--- Merging r15271 into '.':
A    packages/fuse/fpmake_disabled.pp
D    packages/fuse/fpmake.pp
A    packages/hermes/fpmake_disabled.pp
D    packages/hermes/fpmake.pp
   C packages/fcl-js
--- Merging r15273 into '.':
C    packages/fpmake_add.inc
C    packages/fpmake_proc.inc
Summary of conflicts:
  Text conflicts: 2
  Tree conflicts: 2

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

.gitattributes

@@ -1752,7 +1752,7 @@ packages/fpvectorial/src/pdfvrsemantico.pas svneol=native#text/plain
 packages/fpvectorial/src/pdfvrsintatico.pas svneol=native#text/plain
 packages/fuse/Makefile svneol=native#text/plain
 packages/fuse/Makefile.fpc svneol=native#text/plain
-packages/fuse/fpmake.pp svneol=native#text/plain
+packages/fuse/fpmake_disabled.pp svneol=native#text/plain
 packages/fuse/src/fuse.pas svneol=native#text/plain
 packages/fuse/tests/fusetest.pp svneol=native#text/plain
 packages/fv/Makefile svneol=native#text/plain
@@ -2614,7 +2614,7 @@ packages/hash/src/unixcrypt.pas svneol=native#text/plain
 packages/hash/src/uuid.pas svneol=native#text/plain
 packages/hermes/Makefile svneol=native#text/plain
 packages/hermes/Makefile.fpc svneol=native#text/plain
-packages/hermes/fpmake.pp svneol=native#text/plain
+packages/hermes/fpmake_disabled.pp svneol=native#text/plain
 packages/hermes/src/clear.inc svneol=native#text/plain
 packages/hermes/src/convert.inc svneol=native#text/plain
 packages/hermes/src/d_32.inc svneol=native#text/plain

packages/amunits/fpmake.pp

@@ -174,7 +174,7 @@ begin
     T:=P.Targets.AddExampleProgram('envprint.pas');
     T:=P.Targets.AddExampleProgram('penshare.pas');
 
-    P.Sources.AddDoc('README');
+    P.Sources.AddDoc('README.txt');
     P.Sources.AddDoc('units.txt');
 
 {$ifndef ALLPACKAGES}

packages/fcl-xml/fpmake.pp

@@ -131,7 +131,7 @@ begin
         end;
 
  
-    P.Sources.AddSrc('src/README');
+    P.Sources.AddSrc('src/README.txt');
 
 
     P.ExamplePath.Add('examples');

packages/fpmake.pp

@@ -33,7 +33,7 @@ begin
         begin
           P:=Packages.PackageItems[i];
           if P.Name<>'fpc-all' then
-            D:=PBuild.Dependencies.Add(P.Name);
+            D:=PBuild.Dependencies.Add(P.Name,P.CPUs,P.OSes);
         end;
 
       Run;

packages/fpmake_add.inc

@@ -8,9 +8,11 @@
   add_chm;
   add_dbus;
   add_dts;
+  add_fastcgi;
   add_fcl_async;
   add_fcl_base;
   add_fcl_db;
+  add_fcl_extra;
   add_fcl_fpcunit;
   add_fcl_image;
   add_fcl_json;
@@ -24,6 +26,7 @@
   add_fftw;
   add_fpgtk;
   add_fpmkunit;
+  add_fpvectorial;
   add_fv;
   add_gdbint;
   add_gdbm;
@@ -33,7 +36,6 @@
   add_gtk1;
   add_gtk2;
   add_hash;
-  add_hermes;
   add_httpd13;
   add_httpd20;
   add_httpd22;
@@ -48,6 +50,7 @@
   add_libgd;
   add_libndsfpc;
   add_libpng;
+  add_librsvg;
   add_libxml;
   add_lua;
   add_mad;
@@ -57,9 +60,11 @@
   add_ncurses;
   add_newt;
   add_numlib;
+  add_objcrtl;
   add_odbc;
   add_oggvorbis;
   add_openal;
+  add_opencl;
   add_opengl;
   add_openssl;
   add_oracle;
@@ -69,6 +74,7 @@
   add_paszlib;
   add_pcap;
   add_postgres;
+  add_proj4;
   add_ptc;
   add_pthreads;
   add_pxlib;
@@ -92,3 +98,4 @@
   add_x11;
   add_xforms;
   add_zlib;
+  add_zorba;

packages/fpmake_proc.inc

@@ -58,6 +58,12 @@ begin
 {$include dts/fpmake.pp}
 end;
 
+procedure add_fastcgi;
+begin
+  with Installer do
+{$include fastcgi/fpmake.pp}
+end;
+
 procedure add_fcl_async;
 begin
   with Installer do
@@ -76,6 +82,12 @@ begin
 {$include fcl-db/fpmake.pp}
 end;
 
+procedure add_fcl_extra;
+begin
+  with Installer do
+{$include fcl-extra/fpmake.pp}
+end;
+
 procedure add_fcl_fpcunit;
 begin
   with Installer do
@@ -154,6 +166,12 @@ begin
 {$include fpmkunit/fpmake.pp}
 end;
 
+procedure add_fpvectorial;
+begin
+  with Installer do
+{$include fpvectorial/fpmake.pp}
+end;
+
 procedure add_fv;
 begin
   with Installer do
@@ -208,12 +226,6 @@ begin
 {$include hash/fpmake.pp}
 end;
 
-procedure add_hermes;
-begin
-  with Installer do
-{$include hermes/fpmake.pp}
-end;
-
 procedure add_httpd13;
 begin
   with Installer do
@@ -298,6 +310,12 @@ begin
 {$include libpng/fpmake.pp}
 end;
 
+procedure add_librsvg;
+begin
+  with Installer do
+{$include librsvg/fpmake.pp}
+end;
+
 procedure add_libxml;
 begin
   with Installer do
@@ -352,6 +370,12 @@ begin
 {$include numlib/fpmake.pp}
 end;
 
+procedure add_objcrtl;
+begin
+  with Installer do
+{$include objcrtl/fpmake.pp}
+end;
+
 procedure add_odbc;
 begin
   with Installer do
@@ -370,6 +394,12 @@ begin
 {$include openal/fpmake.pp}
 end;
 
+procedure add_opencl;
+begin
+  with Installer do
+{$include opencl/fpmake.pp}
+end;
+
 procedure add_opengl;
 begin
   with Installer do
@@ -424,6 +454,12 @@ begin
 {$include postgres/fpmake.pp}
 end;
 
+procedure add_proj4;
+begin
+  with Installer do
+{$include proj4/fpmake.pp}
+end;
+
 procedure add_ptc;
 begin
   with Installer do
@@ -567,3 +603,4 @@ begin
   with Installer do
 {$include zorba/fpmake.pp}
 end;
+

packages/libc/fpmake.pp

@@ -265,7 +265,7 @@ begin
           AddUnit('kerneldefs');
           AddUnit('kernelioctl');
         end;
-     p.Sources.Adddoc('README');
+     p.Sources.Adddoc('README.txt');
 
 {$ifndef ALLPACKAGES}
     Run;

packages/newt/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.OSes:=[Linux];
 
     T:=P.Targets.AddUnit('newt.pp');
 

packages/opencl/fpmake.pp

@@ -23,6 +23,8 @@ begin
     P.Email := '';
     P.Description := 'A OpenCL header';
     P.NeedLibC:= true;
+    P.OSes:=[win64,win32,darwin];
+    P.CPUs:=[i386,x86_64];
 
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');

packages/postgres/fpmake.pp

@@ -48,7 +48,7 @@ begin
           AddUnit('dllist');
         end;
 
-    P.Sources.AddSrc('README');
+    P.Sources.AddSrc('README.txt');
 
     P.ExamplePath.Add('tests/');
     P.Targets.AddExampleProgram('testpg2.pp');

packages/proj4/fpmake.pp

@@ -12,7 +12,7 @@ begin
     begin
 {$endif ALLPACKAGES}
 
-    P:=AddPackage('proj');
+    P:=AddPackage('proj4');
 {$ifdef ALLPACKAGES}
     P.Directory:='proj4';
 {$endif ALLPACKAGES}

packages/sdl/fpmake.pp

@@ -84,7 +84,7 @@ begin
     P.Sources.AddSrc('LGPL');
     P.Sources.AddSrc('LGPL.addon');
     P.Sources.AddSrc('MPL-1.1');
-    P.Sources.AddSrc('README');
+    P.Sources.AddSrc('README.txt');
 
 {$ifndef ALLPACKAGES}
     Run;

packages/svgalib/fpmake.pp

@@ -22,7 +22,7 @@ begin
     T:=P.Targets.AddUnit('svgalib.pp');
     T:=P.Targets.AddUnit('vgamouse.pp');
 
-    P.Sources.AddSrc('README');
+    P.Sources.AddSrc('README.txt');
  
     P.ExamplePath.Add('tests/');
     P.Targets.AddExampleProgram('testvga.pp');

packages/unixutil/fpmake.pp

@@ -17,6 +17,8 @@ begin
     P.Directory:='unixutil';
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
+    P.OSes:=[Linux];
+    P.CPUs:=[i386];
     P.SourcePath.Add('src');
     T:=P.Targets.AddUnit('unixutils.pp',[i386],[linux]);
       with T.Dependencies do

packages/uuid/fpmake.pp

@@ -22,7 +22,7 @@ begin
     T:=P.Targets.AddUnit('libuuid.pp');
     T:=P.Targets.AddUnit('macuuid.pp');
 
-    P.Sources.AddSrc('README');
+    P.Sources.AddSrc('README.txt');
 
     P.ExamplePath.Add('tests/');
     P.Targets.AddExampleProgram('testlibuid.pp');

packages/xforms/fpmake.pp

@@ -28,7 +28,7 @@ begin
         end;
 
     
-    P.Sources.AddSrc('README');
+    P.Sources.AddSrc('README.txt');
 
     P.ExamplePath.Add('examples/');
     P.Targets.AddExampleProgram('newbutton.pp');