* More fpmake.pp-files fixes

git-svn-id: trunk@18049 -

.gitattributes

@@ -2873,6 +2873,7 @@ packages/gmp/examples/printf_example.pas svneol=native#text/plain
 packages/gmp/examples/printf_example2.pas svneol=native#text/plain
 packages/gmp/examples/scanf_example.pas svneol=native#text/plain
 packages/gmp/examples/scanf_example2.pas svneol=native#text/plain
+packages/gmp/fpmake.pp svneol=native#text/plain
 packages/gmp/readme svneol=native#text/plain
 packages/gmp/src/gmp.pas svneol=native#text/plain
 packages/gnome1/Makefile svneol=native#text/plain

packages/fcl-net/fpmake.pp

@@ -20,6 +20,7 @@ begin
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-xml');
     P.Dependencies.Add('fcl-passrc');
+    P.Dependencies.Add('fcl-async');
 
     P.Author := 'Sebastian Guenther and Free Pascal development team';
     P.License := 'LGPL with modification, ';

packages/fcl-xml/fpmake.pp

@@ -19,10 +19,9 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.Options.Add('-S2h');
-    D:=P.Dependencies.Add('paszlib');
-      D.Version:='2.2.2-0';
     D:=P.Dependencies.Add('fcl-base');
       D.Version:='2.2.2-0';
+    D:=P.Dependencies.Add('iconvenc',[linux,darwin,iphonesim,freebsd,haiku,beos]);
 
     P.Author := 'Sebastian Guenther, Sergei Gorelkin and FPC development team';
     P.License := 'LGPL with modification, ';

packages/fpmake_add.inc

@@ -32,6 +32,7 @@
   add_gdbint;
   add_gdbm;
   add_ggi;
+  add_gmp;
   add_gnome1;
   add_graph;
   add_gtk1;

packages/fpmake_proc.inc

@@ -202,6 +202,12 @@ begin
 {$include ggi/fpmake.pp}
 end;
 
+procedure add_gmp;
+begin
+  with Installer do
+{$include gmp/fpmake.pp}
+end;
+
 procedure add_gnome1;
 begin
   with Installer do

packages/gmp/fpmake.pp

@@ -0,0 +1,35 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  T : TTarget;
+  P : TPackage;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('gmp');
+{$ifdef ALLPACKAGES}
+    P.Directory:='gmp';
+{$endif ALLPACKAGES}
+    P.Version:='2.2.2-0';
+
+    P.Author := 'FreePascal development team';
+    P.License := 'LGPL with modification, ';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'GMP';
+    P.NeedLibC:= false;
+
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddUnit('gmp.pas');
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}

packages/opencl/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.OSes:=[linux,win64,win32,darwin];
     P.CPUs:=[i386,x86_64];
 
+    P.Dependencies.Add('opengl');
+
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 

packages/opengl/fpmake.pp

@@ -24,10 +24,12 @@ begin
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 
+    T:=P.Targets.AddImplicitUnit('freeglut.pp',AllOSes-[morphos]);
     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.Dependencies.Add('freeglut',AllOSes-[morphos]);
     T:=P.Targets.AddUnit('glx.pp',AllUnixOSes);
 
     P.ExamplePath.Add('examples');

packages/pasjpeg/fpmake.pp

@@ -21,6 +21,23 @@ begin
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 
+    T:=P.Targets.AddUnit('jctrans.pp');
+    with T.Dependencies do
+      begin
+      AddUnit('jmorecfg');
+      AddUnit('jinclude');
+      AddUnit('jdeferr');
+      AddUnit('jerror');
+      AddUnit('jutils');
+      AddUnit('jpeglib');
+      AddUnit('jcapimin');
+      AddUnit('jcparam');
+      AddUnit('jcomapi');
+      AddUnit('jcmaster');
+      AddUnit('jchuff');
+      AddUnit('jcphuff');
+      AddUnit('jcmarker');
+      end;
     T:=P.Targets.AddUnit('buildpasjpeg.pp');
       T.Install:=False;
       with T.Dependencies do