Merge commit 48814:

------------------------------------------------------------------------
r48814 | pierre | 2021-02-26 17:15:30 +0000 (Fri, 26 Feb 2021) | 1 line

 Do not add libgcc directory to library directories with -Fl option if -Xd option is used
------------------------------------------------------------------------

------------------------------------------------------------------------
r42843 | pierre | 2019-08-26 21:41:41 +0000 (Mon, 26 Aug 2019) | 1 line

 Partial update for go32v2 and sources
------------------------------------------------------------------------
--- Merging r44112 into '.':
G    installer/install.dat
--- Recording mergeinfo for merge of r44112 into '.':
 G   .
------------------------------------------------------------------------
r48836 | hajny | 2021-02-28 02:08:17 +0000 (Sun, 28 Feb 2021) | 1 line

  * package tplylib added, corrections for more than 31 items on a tab
------------------------------------------------------------------------
--- Merging r48836 into '.':
G    installer/install.dat
--- Recording mergeinfo for merge of r48836 into '.':
 G   .
------------------------------------------------------------------------
r49035 | pierre | 2021-03-22 23:26:26 +0000 (Mon, 22 Mar 2021) | 1 line

 Try to fix short package name issues in install.dat and add missing go32v2 packages
------------------------------------------------------------------------
--- Merging r49035 into '.':
G    installer/install.dat
--- Recording mergeinfo for merge of r49035 into '.':
 G   .


git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@49041 3ad0048d-3df7-0310-abae-a5850022a9f2

63 files changed, 68 insertions, 15 deletions

diff --git a/packages/ami-extra/fpmake.pp b/packages/ami-extra/fpmake.pp
index ee3dc005a3..fef297b310 100644
--- a/packages/ami-extra/fpmake.pp
+++ b/packages/ami-extra/fpmake.pp
@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('ami-extra');
-
+    P.ShortName := 'ami';
     P.Author := 'FPC core team';
     P.License := 'LGPL with modification';
     P.HomepageURL := 'www.freepascal.org';
diff --git a/packages/amunits/fpmake.pp b/packages/amunits/fpmake.pp
index 3c92f15bad..b0f11b5fb8 100644
--- a/packages/amunits/fpmake.pp
+++ b/packages/amunits/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('amunits');
+    P.ShortName := 'amu';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/arosunits/fpmake.pp b/packages/arosunits/fpmake.pp
index a0fbd3c2a7..371103bea9 100644
--- a/packages/arosunits/fpmake.pp
+++ b/packages/arosunits/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('arosunits');
+    P.ShortName := 'aru';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/aspell/fpmake.pp b/packages/aspell/fpmake.pp
index f1d30839b9..49ecd1d87c 100644
--- a/packages/aspell/fpmake.pp
+++ b/packages/aspell/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('aspell');
+    P.ShortName := 'asp';
 
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
@@ -44,7 +45,7 @@ begin
 
     P.ExamplePath.Add('examples');
     T:=P.Targets.AddExampleProgram('example.pas');
-    
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
diff --git a/packages/cairo/fpmake.pp b/packages/cairo/fpmake.pp
index fa720387af..9714e2080d 100644
--- a/packages/cairo/fpmake.pp
+++ b/packages/cairo/fpmake.pp
@@ -12,6 +12,7 @@ begin
     begin
 {$endif ALLPACKAGES}
     P:=AddPackage('cairo');
+    P.ShortName := 'cai';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/cocoaint/fpmake.pp b/packages/cocoaint/fpmake.pp
index a0f3c5de79..c2936496b2 100644
--- a/packages/cocoaint/fpmake.pp
+++ b/packages/cocoaint/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('cocoaint');
+    P.ShortName := 'coc';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/dblib/fpmake.pp b/packages/dblib/fpmake.pp
index 5c58bbd71a..c2c2cae583 100644
--- a/packages/dblib/fpmake.pp
+++ b/packages/dblib/fpmake.pp
@@ -18,6 +18,7 @@ begin
   With Installer do
     begin
       P:=AddPackage('dblib');
+      P.ShortName := 'dblb';
       P.Directory:=ADirectory;
       P.Version:='3.2.1';
       P.Author := 'Library: (FreeTDS/Microsoft), header: Ladislav Karrach';
diff --git a/packages/fastcgi/fpmake.pp b/packages/fastcgi/fpmake.pp
index 186d85c2bb..34061f5ce3 100644
--- a/packages/fastcgi/fpmake.pp
+++ b/packages/fastcgi/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fastcgi');
+    P.ShortName := 'fcgi';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-extra/fpmake.pp b/packages/fcl-extra/fpmake.pp
index ae09db9b7f..9853e59b95 100644
--- a/packages/fcl-extra/fpmake.pp
+++ b/packages/fcl-extra/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-extra');
+    P.ShortName := 'fcex';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-report/fpmake.pp b/packages/fcl-report/fpmake.pp
index cd932d3491..6d2600a025 100644
--- a/packages/fcl-report/fpmake.pp
+++ b/packages/fcl-report/fpmake.pp
@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-report');
-    P.ShortName:='fpreport';
+    P.ShortName:='fpre';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fpindexer/fpmake.pp b/packages/fpindexer/fpmake.pp
index 4a9bee16cb..f8f6b4897f 100644
--- a/packages/fpindexer/fpmake.pp
+++ b/packages/fpindexer/fpmake.pp
@@ -17,6 +17,7 @@ begin
   With Installer do
     begin
       P:=AddPackage('fpindexer');
+      P.ShortName := 'fpi';
       P.Directory:=ADirectory;
       P.Version:='3.2.1';
       P.OSes := [beos,haiku,freebsd,darwin,solaris,netbsd,openbsd,linux,win32,win64,wince,aix,dragonfly];
diff --git a/packages/fpmake.pp b/packages/fpmake.pp
index a67b13d086..8549103e58 100644
--- a/packages/fpmake.pp
+++ b/packages/fpmake.pp
@@ -41,7 +41,12 @@ begin
     begin
       // Create fpc-all package
       PBuild:=AddPackage('fpc-all');
+      PBuild.ShortName := 'fpca';
       PBuild.Version:='3.2.1';
+      { The source files fpmake_proc.inc and fpmake_add.inc
+        need to be added explicitly to be integrated in source zip }
+      PBuild.Sources.AddSrc('fpmake_proc.inc');
+      PBuild.Sources.AddSrc('fpmake_add.inc');
     end;
 end;
 
diff --git a/packages/fpmkunit/src/fpmkunit.pp b/packages/fpmkunit/src/fpmkunit.pp
index 979371f889..165f7c964c 100644
--- a/packages/fpmkunit/src/fpmkunit.pp
+++ b/packages/fpmkunit/src/fpmkunit.pp
@@ -820,7 +820,7 @@ Type
     FOptions: TStrings;
     FTransmitOptions: TStrings;
     FFileName: String;
-    FShortName: String;
+    FShortName: String; { Used to generate the short 8.3 zip file name, must be 4 characters at most }
     FAuthor: String;
     FLicense: String;
     FHomepageURL: String;
diff --git a/packages/gnome1/fpmake.pp b/packages/gnome1/fpmake.pp
index ba21f571fb..ae1e52e10c 100644
--- a/packages/gnome1/fpmake.pp
+++ b/packages/gnome1/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('gnome1');
+    P.ShortName := 'gno1';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/gnutls/fpmake.pp b/packages/gnutls/fpmake.pp
index 310b47b20a..b2a2d90c73 100644
--- a/packages/gnutls/fpmake.pp
+++ b/packages/gnutls/fpmake.pp
@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('gnutls');
     P.Dependencies.Add('fcl-net');
-    P.ShortName:='gnutls';
+    P.ShortName:='gtls';
     P.Description := 'Interface units for GNU TLS libraries supporting SSL-encrypted network communication.';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
diff --git a/packages/googleapi/fpmake.pp b/packages/googleapi/fpmake.pp
index fb5cd01225..56c0c1b3df 100644
--- a/packages/googleapi/fpmake.pp
+++ b/packages/googleapi/fpmake.pp
@@ -23,7 +23,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('googleapi');
-    P.ShortName:='googleap';
+    P.ShortName:='gapi';
     P.Author := 'Michael Van Canneyt';
     P.License := 'LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';
diff --git a/packages/iconvenc/fpmake.pp b/packages/iconvenc/fpmake.pp
index 27d62cb034..c99218a66b 100644
--- a/packages/iconvenc/fpmake.pp
+++ b/packages/iconvenc/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('iconvenc');
+    P.ShortName := 'icve';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/imagemagick/fpmake.pp b/packages/imagemagick/fpmake.pp
index 1ec5d65b4d..39f0e2d3d4 100644
--- a/packages/imagemagick/fpmake.pp
+++ b/packages/imagemagick/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('imagemagick');
+    P.ShortName := 'imgm';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/iosxlocale/fpmake.pp b/packages/iosxlocale/fpmake.pp
index 7544cfc957..cef11b3f85 100644
--- a/packages/iosxlocale/fpmake.pp
+++ b/packages/iosxlocale/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('iosxlocale');
+    P.ShortName := 'iosl';
     P.Dependencies.Add('univint');
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
diff --git a/packages/libcups/fpmake.pp b/packages/libcups/fpmake.pp
index a1ac480d6e..7c20b67386 100644
--- a/packages/libcups/fpmake.pp
+++ b/packages/libcups/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libcups');
+    P.ShortName := 'lcup';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libcurl/fpmake.pp b/packages/libcurl/fpmake.pp
index 734f21d140..28ab46c175 100644
--- a/packages/libcurl/fpmake.pp
+++ b/packages/libcurl/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libcurl');
+    P.ShortName := 'lcur';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libenet/fpmake.pp b/packages/libenet/fpmake.pp
index cb475f1335..09628f9ace 100644
--- a/packages/libenet/fpmake.pp
+++ b/packages/libenet/fpmake.pp
@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libenet');
-    P.ShortName:='libenet';
+    P.ShortName:='lnet';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libffi/fpmake.pp b/packages/libffi/fpmake.pp
index 79e1ba054b..1ba3f01c35 100644
--- a/packages/libffi/fpmake.pp
+++ b/packages/libffi/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libffi');
+    P.ShortName := 'lffi';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libfontconfig/fpmake.pp b/packages/libfontconfig/fpmake.pp
index bba0e0fd92..07df2d8881 100644
--- a/packages/libfontconfig/fpmake.pp
+++ b/packages/libfontconfig/fpmake.pp
@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libfontconfig');
-    P.ShortName:='libfc';
+    P.ShortName:='lfcg';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libgbafpc/fpmake.pp b/packages/libgbafpc/fpmake.pp
index 50a5a08122..7eaec4721e 100644
--- a/packages/libgbafpc/fpmake.pp
+++ b/packages/libgbafpc/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libgbafpc');
+    P.ShortName := 'lgba';
     P.OSes:=[gba];
     P.CPUs:=[arm];
 {$ifdef ALLPACKAGES}
diff --git a/packages/libgc/fpmake.pp b/packages/libgc/fpmake.pp
index c0a6acd148..daf681d82a 100644
--- a/packages/libgc/fpmake.pp
+++ b/packages/libgc/fpmake.pp
@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libgc');
-    P.ShortName:='libgc';
+    P.ShortName:='lgc';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libmagic/fpmake.pp b/packages/libmagic/fpmake.pp
index 51d6f53dce..007e25de18 100644
--- a/packages/libmagic/fpmake.pp
+++ b/packages/libmagic/fpmake.pp
@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libmagic');
-    P.ShortName:='magic';
+    P.ShortName:='lmag';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libmicrohttpd/fpmake.pp b/packages/libmicrohttpd/fpmake.pp
index a2487b2384..a98915eb2a 100644
--- a/packages/libmicrohttpd/fpmake.pp
+++ b/packages/libmicrohttpd/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libmicrohttpd');
+    P.ShortName := 'lmic';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libndsfpc/fpmake.pp b/packages/libndsfpc/fpmake.pp
index 192825e0e0..2736d8f5f1 100644
--- a/packages/libndsfpc/fpmake.pp
+++ b/packages/libndsfpc/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libndsfpc');
+    P.ShortName := 'lnds';
     P.OSes:=[nds];
     P.CPUs:=[arm];
 {$ifdef ALLPACKAGES}
diff --git a/packages/libogcfpc/fpmake.pp b/packages/libogcfpc/fpmake.pp
index a74a7c6df0..c8b41324be 100644
--- a/packages/libogcfpc/fpmake.pp
+++ b/packages/libogcfpc/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libogcfpc');
+    P.ShortName := 'logc';
     P.OSes:=[wii];
     P.CPUs:=[powerpc];
 {$ifdef ALLPACKAGES}
diff --git a/packages/libsee/fpmake.pp b/packages/libsee/fpmake.pp
index 7a77f966b7..efb01e7bdf 100644
--- a/packages/libsee/fpmake.pp
+++ b/packages/libsee/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libsee');
+    P.ShortName := 'lsee';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libusb/fpmake.pp b/packages/libusb/fpmake.pp
index 6d83ee419d..4d70261cc7 100644
--- a/packages/libusb/fpmake.pp
+++ b/packages/libusb/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libusb');
+    P.ShortName := 'lusb';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libvlc/fpmake.pp b/packages/libvlc/fpmake.pp
index 757306ca0c..83263d92cd 100644
--- a/packages/libvlc/fpmake.pp
+++ b/packages/libvlc/fpmake.pp
@@ -12,6 +12,7 @@ begin
     begin
 {$endif ALLPACKAGES}
     P:=AddPackage('libvlc');
+    P.ShortName := 'lvlc';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libxml/fpmake.pp b/packages/libxml/fpmake.pp
index 4f4d46d49f..36f05cb93c 100644
--- a/packages/libxml/fpmake.pp
+++ b/packages/libxml/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libxml2');
+    P.ShortName := 'lxml';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/modplug/fpmake.pp b/packages/modplug/fpmake.pp
index d56c21e8bc..4bad909fcb 100644
--- a/packages/modplug/fpmake.pp
+++ b/packages/modplug/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('modplug');
+    P.ShortName := 'mplg';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/morphunits/fpmake.pp b/packages/morphunits/fpmake.pp
index 921ce4494d..e6f15d9286 100644
--- a/packages/morphunits/fpmake.pp
+++ b/packages/morphunits/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('morphunits');
+    P.ShortName := 'mrph';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/ncurses/fpmake.pp b/packages/ncurses/fpmake.pp
index 952d3e7d8c..3db01e48b5 100644
--- a/packages/ncurses/fpmake.pp
+++ b/packages/ncurses/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('ncurses');
+    P.ShortName := 'ncrs';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/numlib/fpmake.pp b/packages/numlib/fpmake.pp
index 00b04dbced..32cd4bd943 100644
--- a/packages/numlib/fpmake.pp
+++ b/packages/numlib/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('numlib');
+    P.ShortName := 'nlib';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/nvapi/fpmake.pp b/packages/nvapi/fpmake.pp
index 51e73776af..0f88991a7c 100644
--- a/packages/nvapi/fpmake.pp
+++ b/packages/nvapi/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('nvapi');
+    P.ShortName := 'nva';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/objcrtl/fpmake.pp b/packages/objcrtl/fpmake.pp
index 44cfa6a870..af979feb4e 100644
--- a/packages/objcrtl/fpmake.pp
+++ b/packages/objcrtl/fpmake.pp
@@ -11,6 +11,7 @@ begin
     begin
 {$endif ALLPACKAGES}
     P:=AddPackage('objcrtl');
+    P.ShortName := 'objc';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/odata/fpmake.pp b/packages/odata/fpmake.pp
index a5e5410395..86e3790f43 100644
--- a/packages/odata/fpmake.pp
+++ b/packages/odata/fpmake.pp
@@ -23,7 +23,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('odata');
-    P.ShortName:='odata';
+    P.ShortName:='odat';
     P.Author := 'Michael Van Canneyt';
     P.License := 'LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';
diff --git a/packages/opencl/fpmake.pp b/packages/opencl/fpmake.pp
index fe3e2630e8..7474350d95 100644
--- a/packages/opencl/fpmake.pp
+++ b/packages/opencl/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('opencl');
+    P.ShortName := 'ocl';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/opengles/fpmake.pp b/packages/opengles/fpmake.pp
index e07b9f5dcd..397aef67f5 100644
--- a/packages/opengles/fpmake.pp
+++ b/packages/opengles/fpmake.pp
@@ -14,6 +14,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('opengles');
+    P.ShortName := 'ogls';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/os4units/fpmake.pp b/packages/os4units/fpmake.pp
index 969a713ba7..4b909efd6a 100644
--- a/packages/os4units/fpmake.pp
+++ b/packages/os4units/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('os4units');
+    P.ShortName := 'os4';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/palmunits/fpmake.pp b/packages/palmunits/fpmake.pp
index f5c8f9d7e7..dcce98b6d2 100644
--- a/packages/palmunits/fpmake.pp
+++ b/packages/palmunits/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('palmunits');
+    P.ShortName := 'palm';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/pastojs/fpmake.pp b/packages/pastojs/fpmake.pp
index 2552c8e502..d152bb053c 100644
--- a/packages/pastojs/fpmake.pp
+++ b/packages/pastojs/fpmake.pp
@@ -14,6 +14,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('pastojs');
+    P.ShortName := 'p2js';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/proj4/fpmake.pp b/packages/proj4/fpmake.pp
index 114fcb1c68..105a989e2c 100644
--- a/packages/proj4/fpmake.pp
+++ b/packages/proj4/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('proj4');
+    P.ShortName := 'prj4';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/pthreads/fpmake.pp b/packages/pthreads/fpmake.pp
index 9871a9daa8..7d55e695c2 100644
--- a/packages/pthreads/fpmake.pp
+++ b/packages/pthreads/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('pthreads');
+    P.ShortName := 'pthr';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/pxlib/fpmake.pp b/packages/pxlib/fpmake.pp
index 37ab676aec..c94307fedb 100644
--- a/packages/pxlib/fpmake.pp
+++ b/packages/pxlib/fpmake.pp
@@ -12,6 +12,7 @@ begin
     begin
 {$endif ALLPACKAGES}
     P:=AddPackage('pxlib');
+    P.ShortName := 'pxl';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/svgalib/fpmake.pp b/packages/svgalib/fpmake.pp
index f8c04c3818..11b3462a60 100644
--- a/packages/svgalib/fpmake.pp
+++ b/packages/svgalib/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('svgalib');
+    P.ShortName := 'svga';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/syslog/fpmake.pp b/packages/syslog/fpmake.pp
index 925c40cf21..3fe31f5694 100644
--- a/packages/syslog/fpmake.pp
+++ b/packages/syslog/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('syslog');
+    P.ShortName := 'sysl';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/tosunits/fpmake.pp b/packages/tosunits/fpmake.pp
index 1d2315af58..4f94a90b35 100644
--- a/packages/tosunits/fpmake.pp
+++ b/packages/tosunits/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('tosunits');
+    P.ShortName := 'tos';
 
     P.Author := 'FPC core team';
     P.License := 'LGPL with modification';
diff --git a/packages/tplylib/Makefile b/packages/tplylib/Makefile
index a55b9fb381..a8b4e4255f 100644
--- a/packages/tplylib/Makefile
+++ b/packages/tplylib/Makefile
@@ -330,7 +330,7 @@ FPCFPMAKE=$(FPC)
 endif
 endif
 override PACKAGE_NAME=tplylib
-override PACKAGE_VERSION=3.3.1
+override PACKAGE_VERSION=3.2.1
 FPMAKE_BIN_CLEAN=$(wildcard ./fpmake$(SRCEXEEXT))
 ifdef OS_TARGET
 FPC_TARGETOPT+=--os=$(OS_TARGET)
diff --git a/packages/tplylib/Makefile.fpc b/packages/tplylib/Makefile.fpc
index 62133821ce..4f5fc10665 100644
--- a/packages/tplylib/Makefile.fpc
+++ b/packages/tplylib/Makefile.fpc
@@ -4,7 +4,7 @@
 
 [package]
 name=tplylib
-version=3.3.1
+version=3.2.1
 
 [require]
 packages=rtl fpmkunit
diff --git a/packages/tplylib/fpmake.pp b/packages/tplylib/fpmake.pp
index 1756b0e391..3a2d2af94a 100644
--- a/packages/tplylib/fpmake.pp
+++ b/packages/tplylib/fpmake.pp
@@ -17,7 +17,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
-    P.Version:='3.3.1';
+    P.Version:='3.2.1';
 
     { java and jvm-android do not support
       fpc_get_output used in these sources }
diff --git a/packages/univint/fpmake.pp b/packages/univint/fpmake.pp
index e40613c868..5a15fa2c3a 100644
--- a/packages/univint/fpmake.pp
+++ b/packages/univint/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('univint');
+    P.ShortName := 'univ';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/unixutil/fpmake.pp b/packages/unixutil/fpmake.pp
index 065f7cac98..7a3e0fbc8f 100644
--- a/packages/unixutil/fpmake.pp
+++ b/packages/unixutil/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('unixutil');
+    P.ShortName := 'unix';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/users/fpmake.pp b/packages/users/fpmake.pp
index 9f92d7ff8b..7d47fc9fa6 100644
--- a/packages/users/fpmake.pp
+++ b/packages/users/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('users');
+    P.ShortName := 'user';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/webidl/fpmake.pp b/packages/webidl/fpmake.pp
index 18c1161fec..a955b383b3 100644
--- a/packages/webidl/fpmake.pp
+++ b/packages/webidl/fpmake.pp
@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('webidl');
-    P.ShortName:='webidl';
+    P.ShortName:='widl';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/winceunits/fpmake.pp b/packages/winceunits/fpmake.pp
index 64c2e546a5..c27a4002ee 100644
--- a/packages/winceunits/fpmake.pp
+++ b/packages/winceunits/fpmake.pp
@@ -14,6 +14,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('winceunits');
+    P.ShortName := 'wice';
 
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
diff --git a/packages/winunits-jedi/fpmake.pp b/packages/winunits-jedi/fpmake.pp
index f132233c8c..c1f37b1fd7 100644
--- a/packages/winunits-jedi/fpmake.pp
+++ b/packages/winunits-jedi/fpmake.pp
@@ -14,6 +14,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('winunits-jedi');
+    P.ShortName := 'wij';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/xforms/fpmake.pp b/packages/xforms/fpmake.pp
index 6803df3ce7..b926f6c4ee 100644
--- a/packages/xforms/fpmake.pp
+++ b/packages/xforms/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('xforms');
+    P.ShortName := 'xfrm';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/zorba/fpmake.pp b/packages/zorba/fpmake.pp
index c512dfb521..8205f680e0 100644
--- a/packages/zorba/fpmake.pp
+++ b/packages/zorba/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('zorba');
+    P.ShortName := 'zorb';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}