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

76 files changed, 286 insertions, 244 deletions

diff --git a/installer/install.dat b/installer/install.dat
index 3a59e0a00a..7f995b9664 100644
--- a/installer/install.dat
+++ b/installer/install.dat
@@ -29,67 +29,66 @@ ideinifile=fp.ini
 
 filecheck=*dos.zip
 # Dos 1
-package=basedos.zip,~B~asic system for Go32v2 (required)
+package=basedos.zip[basedos.zip],~B~asic system for Go32v2 (required)
 # Dos 2
-package=aslddos.zip,GNU ~L~inker and GNU Assembler for Go32v2 (required)
+package=aslddos.zip[aslddos.zip],GNU ~L~inker and GNU Assembler for Go32v2 (required)
 # Dos 3
-package=idedos.zip,~I~DE with integrated debugger/compiler (BETA)
+package=units-idedos.zip[uidedos.zip],~I~DE with integrated debugger/compiler (BETA)
 # Dos 4
-package=utilsdos.zip[utildos.zip],~E~xtra Utilities
+package=utilsdos.zip[utilsdos.zip],~E~xtra Utilities
 # Dos 5
-package=makedos.zip,GNU ~U~tilities (needed for Makefile usage)
+package=makedos.zip[makedos.zip],GNU ~U~tilities (needed for Makefile usage)
 # Dos 6
-package=gdbdos.zip,GNU ~D~ebugger for Go32v2
+package=gdbdos.zip[gdbdos.zip],GNU ~D~ebugger for Go32v2
 # Dos 7
-package=ugdbintdos.zip[ugdbdos.zip],GDB Interfacing units
+package=units-gdbintdos.zip[ugdbdos.zip],GDB Interfacing units
 # Dos 8
-package=upaszlibdos.zip[upzldos.zip],PasZLib units
+package=units-paszlibdos.zip[upzldos.zip],PasZLib units
 # Dos 9
-package=uregexprdos.zip[uregdos.zip],Regular expression units
+package=units-regexprdos.zip[uregdos.zip],Regular expression units
 # Dos 10
-package=uunzipdos.zip[uzipdos.zip],Unzip units
+package=units-unzipdos.zip[uzipdos.zip],Unzip units
 # Dos 11
-package=upasjpegdos.zip[upjpdos.zip],Pas~J~PEG units
+package=units-pasjpegdos.zip[upjpdos.zip],Pas~J~PEG units
 # Dos 12
-package=uhashdos.zip,Hash calculation units
+package=units-hashdos.zip[uhashdos.zip],Hash calculation units
 # Dos 13
-package=ufvdos.zip,Free ~V~ision (FV)
+package=units-fvdos.zip[ufvdos.zip],Free ~V~ision (FV)
 # Dos 14
-package=ugraphdos.zip[ugrphdos.zip],Unit Graph
+package=units-graphdos.zip[ugrphdos.zip],Unit Graph
 # Dos 15
-package=ufcl-basedos.zip[ufclbdos.zip],Free Component Library (FCL)-base part
+package=units-fcl-basedos.zip[ufclbdos.zip],Free Component Library (FCL)-base part
 # Dos 16
-package=ufcl-dbdos.zip[ufclddos.zip],Free Component Library (FCL)-datasets
+package=units-fcl-dbdos.zip[ufclddos.zip],Free Component Library (FCL)-datasets
 # Dos 17
-package=ufcl-fpcunitdos.zip[ufcludos.zip],Free Component Library (FCL)-FPCUnit
+package=units-fcl-fpcunitdos.zip[ufcludos.zip],Free Component Library (FCL)-FPCUnit
 # Dos 18
-package=ufcl-imagedos.zip[ufclidos.zip],Free Component Library (FCL)-images
+package=units-fcl-imagedos.zip[ufclidos.zip],Free Component Library (FCL)-images
 # Dos 19
-package=ufcl-netdos.zip[ufclndos.zip],Free Component Library (FCL)-network
+package=units-fcl-netdos.zip[ufclndos.zip],Free Component Library (FCL)-network
 # Dos 20
-package=ufcl-passrcdos.zip[ufclsdos.zip],Free Component Library (FCL)-Pascal source processing
+package=units-fcl-passrcdos.zip[ufclsdos.zip],Free Component Library (FCL)-Pascal source processing
 # Dos 21
-package=ufcl-registrydos.zip[ufclrdos.zip],Free Component Library (FCL)-registry
+package=units-fcl-registrydos.zip[ufclrdos.zip],Free Component Library (FCL)-registry
 # Dos 22
-package=ufcl-xmldos.zip[ufclxdos.zip],Free Component Library (FCL)-XML
+package=units-fcl-xmldos.zip[ufclxdos.zip],Free Component Library (FCL)-XML
 # Dos 23
-package=ufpmkunitdos.zip[ufpmkdos.zip],Units required for building fpmake.exe
+package=units-fpmkunitdos.zip[ufpmkdos.zip],Units required for building fpmake.exe
 # Dos 24
-package=ufcl-jsondos.zip[ufcljdos.zip],Free Component Library (FCL)-JSON interface
+package=units-fcl-jsondos.zip[ufcljdos.zip],Free Component Library (FCL)-JSON interface
 # Dos 25
-package=ufcl-processdos.zip[ufclpdos.zip],Free Component Library (FCL)-process management
 # Dos 26
-package=uchmdos.zip,Support for .chm files handling
+package=units-chmdos.zip[uchmdos.zip],Support for .chm files handling
 # Dos 27
-package=ulibgddos.zip[ulgddos.zip],GD library interface unit
+package=units-libgddos.zip[ulgddos.zip],GD library interface unit
 # Dos 28
-package=usymbolicdos.zip[usymbdos.zip],Symbolic (unit for parsing and evaluating expressions)
+package=units-symbolicdos.zip[usymbdos.zip],Symbolic (unit for parsing and evaluating expressions)
 # Dos 29
-package=ufcl-resdos.zip[ufcledos.zip],Free Component Library (FCL)-resources
+package=units-fcl-resdos.zip[ufcledos.zip],Free Component Library (FCL)-resources
 # Dos 30
-package=ubzip2dos.zip[ubz2dos.zip],Units for bzip2 decompression
+package=units-bzip2dos.zip[ubz2dos.zip],Units for bzip2 decompression
 # Dos 31
-package=ufcl-jsdos.zip[ufcjsdos.zip],Free Component Library (FCL)-Javascript support
+package=units-fcl-jsdos.zip[ufcjsdos.zip],Free Component Library (FCL)-Javascript support
 
 #
 # Go32v2 packages 2nd part
@@ -97,57 +96,62 @@ package=ufcl-jsdos.zip[ufcjsdos.zip],Free Component Library (FCL)-Javascript sup
 pack=Dos/~G~o32v2-2
 filecheck=*dos.zip
 # Dos-2 1
-package=uhermesdos.zip[uhermdos.zip],Port of Hermes graphics library
+package=units-hermesdos.zip[uhermdos.zip],Port of Hermes graphics library
 # Dos-2 2
-package=ufppkgdos.zip[ufppkdos.zip],Units for FPPkg packaging support
+package=units-fppkgdos.zip[ufppkdos.zip],Units for FPPkg packaging support
 # Dos-2 3
-package=ufcl-sounddos.zip[ufsnddos.zip],Free Component Library (FCL)-sound files
+package=units-fcl-sounddos.zip[ufsnddos.zip],Free Component Library (FCL)-sound files
 # Dos-2 4
-package=ufcl-sdodos.zip[ufcsddos.zip],Free Component Library (FCL)-Service Data Objects
+package=units-fcl-sdodos.zip[ufcsddos.zip],Free Component Library (FCL)-Service Data Objects
 # Dos-2 5
-package=ufcl-stldos.zip[ufcstdos.zip],Free Component Library (FCL)-generic container library
+package=units-fcl-stldos.zip[ufcstdos.zip],Free Component Library (FCL)-generic container library
 # Dos-2 6
-package=ulibtardos.zip[ultardos.zip],Unit for .tar file handling
+package=units-libtardos.zip[ultardos.zip],Unit for .tar file handling
 # Dos-2 7
-package=urtl-consoledos.zip[urtlcdos.zip],RTL-console abstraction (keyboard, video & mouse)
+package=units-rtl-consoledos.zip[urtlcdos.zip],RTL-console abstraction (keyboard, video & mouse)
 # Dos-2 8
-package=urtl-extrados.zip[urtledos.zip],RTL-additional units not needed for bootstrapping
+package=units-rtl-extrados.zip[urtledos.zip],RTL-additional units not needed for bootstrapping
 # Dos-2 9
-package=urtl-objpasdos.zip[urtlodos.zip],RTL-Object Pascal units (e.g. Delphi compatibility)
+package=units-rtl-objpasdos.zip[urtlodos.zip],RTL-Object Pascal units (e.g. Delphi compatibility)
 # Dos-2 10
-package=urtl-unicodedos.zip[urtludos.zip],RTL-miscellaneous Unicode support units
+package=units-rtl-unicodedos.zip[urtludos.zip],RTL-miscellaneous Unicode support units
 # Dos-2 11
-package=utils-fpcmkcfgdos.zip[fcmkdos.zip],Creation of Free Pascal configuration files
+package=utils-fpcmkcfgdos.zip[fpckdos.zip],Creation of Free Pascal configuration files
 # Dos-2 12
 package=utils-fpcmdos.zip[fpcmdos.zip],Generate Makefiles out of Makefile.fpc files
 # Dos-2 13
-package=utils-fpdocdos.zip[fpdocdos.zip],Free Pascal documentation generation utility
+package=utils-fprcpdos.zip[fprcdos.zip],Free Pascal Resource Compiler Preprocessor
 # Dos-2 14
-package=utils-fppkgdos.zip[fppkgdos.zip],Free Pascal package repository utility
+package=utils-h2pasdos.zip[h2pados.zip],Create Pascal interface units from C headers
 # Dos-2 15
-package=utils-fprcpdos.zip[fprcpdos.zip],Free Pascal Resource Compiler Preprocessor
+package=utils-pas2fpmdos.zip[p2fpdos.zip],Generate fpmake.pp for Pascal source
 # Dos-2 16
-package=utils-h2pasdos.zip[h2pasdos.zip],Create Pascal interface units from C headers
+package=utils-pas2utdos.zip[p2utdos.zip],Pascal source to FPC Unit test generator
 # Dos-2 17
-package=utils-pas2fpmdos.zip[p2fmdos.zip],Generate fpmake.pp for Pascal source
+package=utils-rmwaitdos.zip[rmwdos.zip],Remove (delete) file(s) with optional retries
 # Dos-2 18
-package=utils-pas2jnidos.zip[p2jndos.zip],Generate JNI bridge for Pascal code
+package=utils-lexyaccdos.zip[lexydos.zip],Compiler generator for TP and compatibles
 # Dos-2 19
-package=utils-pas2utdos.zip[p2utdos.zip],Pascal source to FPC Unit test generator
+package=units-ptcdos.zip[uptcdos.zip],Free portable framebuffer library
 # Dos-2 20
-package=utils-rmwaitdos.zip[rmwdos.zip],Remove (delete) file(s) with optional retries
+package=utils-dxegendos.zip[dxegdos.zip],Generation of D~X~E modules loadable at runtime
 # Dos-2 21
-package=utils-lexyaccdos.zip[tplydos.zip],Compiler generator for TP and compatibles
+package=units-fcl-pdfdos.zip[ufcpddos.zip],PDF generating and TTF file info library
 # Dos-2 22
-package=units-ptcdos.zip[uptcdos.zip],Free portable framebuffer library
+package=units-rtl-genericsdos.zip[urtlgdos.zip],RTL-generic collection library
 # Dos-2 23
-package=utils-dxegendos.zip[dxegdos.zip],Generation of D~X~E modules loadable at runtime
+package=units-webidldos.zip[uwidldos.zip],WEB IDL parser and converter to Object Pascal classes
 # Dos-2 24
-package=ufcl-pdfdos.zip[ufcpddos.zip],PDF generating and TTF file info library
+package=utils-fpcresdos.zip[fprsdos.zip],Free Pascal Resource Converter
 # Dos-2 25
-package=urtl-genericsdos.zip[urtlgdos.zip],RTL-generic collection library
+package=utils-fpcreslipodos.zip[fprldos.zip],Free Pascal External Resource Thinner
 # Dos-2 26
-package=units-webidldos.zip[uwidldos.zip],Web IDL parser and converter to Object Pascal classes
+package=utils-json2pasdos.zip[jsnpdos.zip],A utility to create Object Pascal classes files from sample JSON files
+# Dos-2 27
+package=units-tplylibdos.zip[utplldos.zip],Units for sources created with the compiler generator
+# Dos-2 28
+package=utils-unicodedos.zip[ucddos.zip],Transformation of Unicode consortium data for FPC
+# Dos-2 29
 
 #
 # Win32 packages
@@ -166,7 +170,7 @@ package=base.i386-win32.zip,~B~asic system for Win32 (required)
 # Win32 2
 package=asld.i386-win32.zip,GNU ~L~inker and GNU Assembler for Win32 (required)
 # Win32 3
-package=ide.i386-win32.zip,~I~DE with integrated debugger/compiler (BETA)
+package=units-ide.i386-win32.zip,~I~DE with integrated debugger/compiler (BETA)
 # Win32 4
 package=utils.i386-win32.zip,~E~xtra Utilities
 # Win32 5
@@ -184,7 +188,7 @@ package=units-cdrom.i386-win32.zip,CD-ROM interface units
 # Win32 11
 package=units-odbc.i386-win32.zip,ODBC interface units
 # Win32 12
-package=units-winunits.i386-win32.zip,Extended Windows API interface units
+package=units-winunits-base.i386-win32.zip,Extended Windows API interface units
 # Win32 13
 package=units-tcl.i386-win32.zip,TCL interface units
 # Win32 14
@@ -194,11 +198,10 @@ package=units-fftw.i386-win32.zip,FFTW interface unit
 # Win32 16
 package=units-postgres.i386-win32.zip,PostGreSQL interface units
 # Win32 17
-package=units-httpd-1.3.i386-win32.zip,HTTPD 1.3 interface units
+package=units-httpd22.i386-win32.zip,HTTPD 1.3 interface units
 # Win32 18
-package=units-httpd-2.0.i386-win32.zip,HTTPD 2.0 interface units
+package=units-httpd24.i386-win32.zip,HTTPD 2.0 interface units
 # Win32 19
-package=units-httpd-2.2.i386-win32.zip,HTTPD 2.2 interface units
 # Win32 20
 package=units-oggvorbis.i386-win32.zip,OGG Vorbis interface units
 # Win32 21
@@ -274,7 +277,7 @@ package=units-fcl-xml.i386-win32.zip,Free Component Library (FCL)-XML
 # Win32-2 22
 package=units-fcl-json.i386-win32.zip,Free Component Library (FCL)-JSON interface
 # Win32-2
-#package=units-fcl-async.i386-win32.zip,Free Component Library (FCL)-asynchronous events
+package=units-fcl-extra.i386-win32.zip,Free Component Library (FCL)-extras
 # Win32-2 23
 package=units-fcl-process.i386-win32.zip,Free Component Library (FCL)-process management
 # Win32-2 24
@@ -310,7 +313,7 @@ package=baseos2.zip,~B~asic system for OS/2 (required)
 # OS/2 2
 package=asldos2.zip,GNU ~L~inker and GNU assembler for OS/2 (required)
 # OS/2 3
-package=ideos2.zip,~I~DE with integrated compiler (BETA - no debugger)
+package=uideos2.zip,~I~DE with integrated compiler (BETA - no debugger)
 # OS/2 4
 package=utilsos2.zip[utilos2.zip],~E~xtra Utilities
 # OS/2 5
@@ -321,10 +324,8 @@ package=gdbos2.zip,GNU ~D~ebugger for EMX and PMGDB front-end
 package=ufvos2.zip,Free ~V~ision (FV)
 # OS/2 8
 package=uos2unitsos2.zip[uos2os2.zip],Units interfacing libraries delivered with OS/2/eCS
-#package=uclkdllos2.zip[uclkos2.zip],CLKDLL interface unit (eCS 1.1+)
 # OS/2 9
-#package=ulvmos2.zip,LVM interface unit (OS/2 v4.5 / eCS)
-package=utils-h2pasos2.zip[h2pasos2.zip],Create Pascal interface units from C headers
+package=utils-h2pasos2.zip[h2paos2.zip],Create Pascal interface units from C headers
 # OS/2 10
 package=upasjpegos2.zip[upjpos2.zip],Pas~J~PEG units
 # OS/2 11
@@ -345,8 +346,6 @@ package=ufcl-passrcos2.zip[ufclsos2.zip],Free Component Library (FCL)-Pascal sou
 package=ufcl-registryos2.zip[ufclros2.zip],Free Component Library (FCL)-registry
 # OS/2 19
 package=ufcl-xmlos2.zip[ufclxos2.zip],Free Component Library (FCL)-XML
-# OS/2
-#package=ufcl-webos2.zip[ufclwos2.zip],Free Component Library (FCL)-Web
 # OS/2 20
 package=uhermesos2.zip[uhermos2.zip],Port of Hermes graphics library
 # OS/2 21
@@ -362,11 +361,11 @@ package=utils-fpmcos2.zip[fpmcos2.zip],Free Pascal Message Compiler
 # OS/2 26
 package=utils-fppkgos2.zip[fppkgos2.zip],Free Pascal package repository utility
 # OS/2 27
-package=utils-fprcpos2.zip[fprcpos2.zip],Free Pascal Resource Compiler Preprocessor
+package=utils-fprcpos2.zip[fprcos2.zip],Free Pascal Resource Compiler Preprocessor
 # OS/2 28
 package=utils-fpcresos2.zip[fpresos2.zip],Free Pascal Resource Converter
 # OS/2 29
-package=utils-pas2fpmos2.zip[p2fmos2.zip],Generate fpmake.pp for Pascal source
+package=utils-pas2fpmos2.zip[p2fpos2.zip],Generate fpmake.pp for Pascal source
 # OS/2 30
 package=utils-pas2jnios2.zip[p2jnos2.zip],Generate JNI bridge for Pascal code
 # OS/2 31
@@ -377,8 +376,6 @@ package=utils-pas2utos2.zip[p2utos2.zip],Pascal source to FPC Unit test generato
 #
 pack=OS/~2~-2
 filecheck=*os2.zip
-# OS/2-2
-#package=ugdbintos2.zip[ugdbos2.zip],GDB interfacing units
 # OS/2-2 1
 package=upaszlibos2.zip[upzlos2.zip],PasZLib units
 # OS/2-2 2
@@ -387,12 +384,6 @@ package=uregexpros2.zip[uregos2.zip],Regular expression units
 package=urexxos2.zip,REXX SAA interface units
 # OS/2-2 4
 package=uunzipos2.zip[uzipos2.zip],Unzip units
-# OS/2-2
-#package=uftpapios2.zip[uftpos2.zip],FTP API interface units
-# OS/2-2
-#package=uhwvideoos2.zip[uhwvos2.zip],HW Video interface units
-# OS/2-2
-#package=ummtkos2.zip,MMOS/2 interface units
 # OS/2-2 5
 package=ux11os2.zip,X Window (X11) interface units
 # OS/2-2 6
@@ -411,8 +402,6 @@ package=uzlibos2.zip,ZLib interface units
 package=ufpmkunitos2.zip[ufpmkos2.zip],Units required for building fpmake.exe
 # OS/2-2 13
 package=ufcl-jsonos2.zip[ufcljos2.zip],Free Component Library (FCL)-JSON interface
-# OS/2-2
-#package=ufcl-asyncos2.zip[ufclaos2.zip],Free Component Library (FCL)-asynchronous events
 # OS/2-2 14
 package=ufcl-processos2.zip[ufclpos2.zip],Free Component Library (FCL)-process management
 # OS/2-2 15
@@ -446,7 +435,7 @@ package=urtl-unicodeos2.zip[urtluos2.zip],RTL-miscellaneous Unicode support unit
 # OS/2-2 29
 package=utils-rmwaitos2.zip[rmwos2.zip],Remove (delete) file(s) with optional retries
 # OS/2-2 30
-package=utils-lexyaccos2.zip[tplyos2.zip],Compiler generator for TP and compatibles
+package=utils-lexyaccos2.zip[lexyos2.zip],Compiler generator for TP and compatibles
 # OS/2-2 31
 package=utils-fpcmos2.zip[fpcmos2.zip],Generate Makefiles out of Makefile.fpc files
 
@@ -458,13 +447,15 @@ pack=OS/2-3
 filecheck=*os2.zip
 # OS/2-3 1
 package=urtl-genericsos2.zip[urtlgos2.zip],RTL-generic collection library
+# OS/2-3 2
+package=utils-pas2jsos2.zip[p2jsos2.zip],Convert Pascal sources to Javascript
 # OS/2-3 3
-package=units-webidlos2.zip[uwidlos2.zip],Web IDL parser and converter to Object Pascal classes
+package=utils-webidlos2.zip[widlos2.zip],Web IDL parser and converter to Object Pascal classes
 # OS/2-3 4
-package=utils-json2pasos2.zip[jsnpos2.zip],Create Object Pascal classes from JSON files
+package=utils-json2pasos2.zip[js2pos2.zip],Create Object Pascal classes from JSON files
 # OS/2-3 5
 package=ufcl-pdfos2.zip[ufcpdos2.zip],PDF generating and TTF file info library
-# OS/2-3 6
+# OS/2-2 6
 package=utils-unicodeos2.zip[ucodeos2.zip],Transformation of Unicode consortium data for FPC
 # OS/2-3 7
 package=utplylibos2.zip[utpllos2.zip],Units for sources created with the compiler generator
@@ -486,7 +477,7 @@ package=baseemx.zip,~B~asic system for EMX (required)
 # EMX 2
 package=asldemx.zip,GNU ~L~inker and GNU assembler for EMX (required)
 # EMX 3
-package=ideemx.zip,~I~DE with integrated compiler (BETA - no debugger)
+package=uideemx.zip,~I~DE with integrated compiler (BETA - no debugger)
 # EMX 4
 package=utilsemx.zip[utilemx.zip],~E~xtra Utilities
 # EMX 5
@@ -497,9 +488,6 @@ package=gdbemx.zip,GNU ~D~ebugger for EMX and PMGDB front-end
 package=ufvemx.zip,Free ~V~ision (FV)
 # EMX 8
 package=uos2unitsemx.zip[uos2emx.zip],Units interfacing libraries delivered with OS/2/eCS
-#package=uclkdllemx.zip[uclkemx.zip],CLKDLL interface unit (eCS 1.1+)
-# EMX
-#package=ulvmemx.zip,LVM interface unit (OS/2 v4.5 / eCS)
 # EMX 9
 package=upasjpegemx.zip[upjpemx.zip],Pas~J~PEG units
 # EMX 10
@@ -520,8 +508,6 @@ package=ufcl-passrcemx.zip[ufclsemx.zip],Free Component Library (FCL)-Pascal sou
 package=ufcl-registryemx.zip[ufclremx.zip],Free Component Library (FCL)-registry
 # EMX 18
 package=ufcl-xmlemx.zip[ufclxemx.zip],Free Component Library (FCL)-XML
-# EMX
-#package=ufcl-webemx.zip[ufclwemx.zip],Free Component Library (FCL)-Web
 # EMX 19
 package=uhermesemx.zip[uhermemx.zip],Port of Hermes graphics library
 # EMX 20
@@ -537,13 +523,13 @@ package=utils-fpmcemx.zip[fpmcemx.zip],Free Pascal Message Compiler.
 # EMX 25
 package=utils-fppkgemx.zip[fppkgemx.zip],Free Pascal package repository utility.
 # EMX 26
-package=utils-fprcpemx.zip[fprcpemx.zip],Free Pascal Resource Compiler Preprocessor
+package=utils-fprcpemx.zip[ufprcemx.zip],Free Pascal Resource Compiler Preprocessor
 # EMX 27
 package=utils-fpcresemx.zip[fpresemx.zip],Free Pascal Resource Converter
 # EMX 28
-package=utils-h2pasemx.zip[h2pasemx.zip],Create Pascal interface units from C headers
+package=utils-h2pasemx.zip[uh2paemx.zip],Create Pascal interface units from C headers
 # EMX 29
-package=utils-pas2fpmemx.zip[p2fmemx.zip],Generate fpmake.pp for Pascal source
+package=utils-pas2fpmemx.zip[up2fpemx.zip],Generate fpmake.pp for Pascal source
 # EMX 30
 package=utils-pas2jniemx.zip[p2jnemx.zip],Generate JNI bridge for Pascal code
 # EMX 31
@@ -554,8 +540,6 @@ package=utils-pas2utemx.zip[p2utemx.zip],Pascal source to FPC Unit test generato
 #
 pack=E~M~X-2
 filecheck=*emx.zip
-# EMX-2
-#package=ugdbintemx.zip[ugdbemx.zip],GDB interfacing units
 # EMX-2 1
 package=upaszlibemx.zip[upzlemx.zip],PasZLib units
 # EMX-2 2
@@ -564,12 +548,6 @@ package=uregexpremx.zip[uregemx.zip],Regular expression units
 package=urexxemx.zip,REXX SAA interface units
 # EMX-2 4
 package=uunzipemx.zip[uzipemx.zip],Unzip units
-# EMX-2
-#package=uftpapiemx.zip[uftpemx.zip],FTP API interface units
-# EMX-2
-#package=uhwvideoemx.zip[uhwvemx.zip],HW Video interface units
-# EMX-2
-#package=ummtkemx.zip,MMOS/2 interface units
 # EMX-2 5
 package=ux11emx.zip,X Window (X11) interface units
 # EMX-2 6
@@ -588,8 +566,6 @@ package=uzlibemx.zip,ZLib interface units
 package=ufpmkunitemx.zip[ufpmkemx.zip],Units required for building fpmake.exe
 # EMX-2 13
 package=ufcl-jsonemx.zip[ufcljemx.zip],Free Component Library (FCL)-JSON interface
-# EMX-2
-#package=ufcl-asyncemx.zip[ufclaemx.zip],Free Component Library (FCL)-asynchronous events
 # EMX-2 14
 package=ufcl-processemx.zip[ufclpemx.zip],Free Component Library (FCL)-process management
 # EMX-2 15
@@ -623,7 +599,7 @@ package=urtl-unicodeemx.zip[urtluemx.zip],RTL-miscellaneous Unicode support unit
 # EMX-2 29
 package=utils-rmwaitemx.zip[rmwemx.zip],Remove (delete) file(s) with optional retries
 # EMX-2 30
-package=utils-lexyaccemx.zip[tplyemx.zip],Compiler generator for TP and compatibles
+package=utils-lexyaccemx.zip[ulexyemx.zip],Compiler generator for TP and compatibles
 # EMX-2 31
 package=utils-fpcmemx.zip[fpcmemx.zip],Generate Makefiles out of Makefile.fpc files
 
@@ -635,13 +611,15 @@ pack=EMX-3
 filecheck=*emx.zip
 # EMX-3 1
 package=urtl-genericsemx.zip[urtlgemx.zip],RTL-generic collection library
+# EMX-3 2
+package=utils-pas2jsemx.zip[p2jsemx.zip],Convert Pascal sources to Javascript
 # EMX-3 3
-package=units-webidlemx.zip[uwidlemx.zip],Web IDL parser and converter to Object Pascal classes
+package=utils-webidlemx.zip[widlemx.zip],Web IDL parser and converter to Object Pascal classes
 # EMX-3 4
-package=utils-json2pasemx.zip[jsnemx2.zip],Create Object Pascal classes from JSON files
+package=utils-json2pasemx.zip[js2pemx.zip],Create Object Pascal classes from JSON files
 # EMX-3 5
 package=ufcl-pdfemx.zip[ufcpdemx.zip],PDF generating and TTF file info library
-# EMX-3 6
+# EMX-2 6
 package=utils-unicodeemx.zip[ucodeemx.zip],Transformation of Unicode consortium data for FPC
 # EMX-3 7
 package=utplylibemx.zip[utpllemx.zip],Units for sources created with the compiler generator
@@ -652,15 +630,15 @@ package=utplylibemx.zip[utpllemx.zip],Units for sources created with the compile
 #
 pack=Commo~n~
 # Common 1
-package=doc-pdf.zip,Documentation (~P~DF)
+package=doc-pdf.zip[doc-pdf.zip],Documentation (~P~DF)
 # Common 2
-package=doc-chm.zip,Documentation (CH~M~)
+package=doc-chm.zip[doc-chm.zip],Documentation (CH~M~)
 # Common 3
 package=doc-html.zip[doc-htm.zip],Documentation (~H~TML)
 # Common 4
-package=doc-txt.zip,Documentation (~T~XT)
+package=doc-txt.zip[doc-txt.zip],Documentation (~T~XT)
 # Common 5
-package=demo.zip,D~e~mos
+package=demo.zip[demo.zip],D~e~mos
 
 
 #
@@ -675,61 +653,36 @@ package=compiler.source.zip[compsrc.zip],~C~ompiler sources
 # Source 3
 package=rtl.source.zip[rtlsrc.zip],Run time library sources
 # Source 4
-package=ide.source.zip[idesrc.zip],IDE sources
+package=units-ide-3.2.1.source.zip[uidesrc.zip],IDE sources
 # Source 5
-package=utils.source.zip[utilssrc.zip],~U~tils sources
+package=utils-3.2.1.source.zip[utilssrc.zip],~U~tils sources
 # Source 6
 package=installer.source.zip[instsrc.zip],~I~nstaller sources
 # Source 7
-package=doc.source.zip[docsrc.zip],~D~ocumentation sources (LaTeX)
+package=doc-3.2.1.source.zip[docsrc.zip],~D~ocumentation sources (LaTeX)
 # Source 8
-package=units-cdrom.source.zip[ucdrsrc.zip],CD-ROM interface sources
+package=units-cdrom-3.2.1.source.zip[ucdrsrc.zip],CD-ROM interface sources
 # Source 9
-package=units-unzip.source.zip[uzipsrc.zip],Unzip units sources
+package=units-unzip-3.2.1.source.zip[uzipsrc.zip],Unzip units sources
 # Source 10
-package=units-regexpr.source.zip[uregsrc.zip],Regular expression units sources
+package=units-regexpr-3.2.1.source.zip[uregsrc.zip],Regular expression units sources
 # Source 11
-package=units-paszlib.source.zip[upzlsrc.zip],PasZLib units sources
+package=units-paszlib-3.2.1.source.zip[upzlsrc.zip],PasZLib units sources
 # Source 12
-package=units-rexx.source.zip[urexxsrc.zip],REXX SAA interface units sources
+package=units-rexx-3.2.1.source.zip[urexxsrc.zip],REXX SAA interface units sources
 # Source 13
-package=units-zlib.source.zip[uzlibsrc.zip],ZLib interface units sources
+package=units-zlib-3.2.1.source.zip[uzlibsrc.zip],ZLib interface units sources
 # Source 14
-package=units-gdbint.source.zip[ugdbsrc.zip],GDB interface units sources
+package=units-gdbint-3.2.1.source.zip[ugdbsrc.zip],GDB interface units sources
 # Source 15
-package=units-postgres.source.zip[upgrsrc.zip],PostGreSQL interface sources
+package=units-postgres-3.2.1.source.zip[upgrsrc.zip],PostGreSQL interface sources
 # Source 16
-package=units-graph.source.zip[ugrphsrc.zip],Unit Graph sources
+package=units-graph-3.2.1.source.zip[ugrphsrc.zip],Unit Graph sources
 # Source 17
-package=units-hermes.source.zip[uhermsrc.zip],Port of Hermes graphics library
+package=units-hermes-3.2.1.source.zip[uhermsrc.zip],Port of Hermes graphics library
 # Source 18
-package=units-fppkg.source.zip[ufppksrc.zip],Units for FPPkg packaging support
-# Source 19
-package=utils-dxegen.source.zip[dxegsrc.zip],Generation of D~X~E modules loadable at runtime
-# Source 20
-package=utils-fpcmkcfg.source.zip[fcmksrc.zip],Creation of Free Pascal configuration files
-# Source 21
-package=utils-fpcm.source.zip[fpcmsrc.zip],Generate Makefiles out of Makefile.fpc files
-# Source 22
-package=utils-fpdoc.source.zip[fpdocsrc.zip],Free Pascal documentation generation utility
-# Source 23
-package=utils-fpmc.source.zip[fpmcsrc.zip],Free Pascal Message Compiler
-# Source 24
-package=utils-fppkg.source.zip[fppkgsrc.zip],Free Pascal package repository utility
-# Source 25
-package=utils-fprcp.source.zip[fprcpsrc.zip],Free Pascal Resource Compiler Preprocessor
-# Source 26
-package=utils-fpcres.source.zip[fpressrc.zip],Free Pascal Resource Converter
-# Source 27
-package=utils-h2pas.source.zip[h2passrc.zip],Create Pascal interface units from C headers
-# Source 28
-package=utils-pas2fpm.source.zip[p2fmsrc.zip],Generate fpmake.pp for Pascal source
-# Source 29
-package=utils-pas2jni.source.zip[p2jnsrc.zip],Generate JNI bridge for Pascal code
-# Source 30
-package=utils-pas2ut.source.zip[p2utsrc.zip],Pascal source to FPC Unit test generator
-# Source 31
-package=utils-rmwait.source.zip[rmwsrc.zip],Remove (delete) file(s) with optional retries
+package=units-fppkg-3.2.1.source.zip[ufppksrc.zip],Units for FPPkg packaging support
+
 
 #
 # Source packages 2nd part
@@ -737,72 +690,64 @@ package=utils-rmwait.source.zip[rmwsrc.zip],Remove (delete) file(s) with optiona
 pack=So~u~rces 2
 filecheck=*.source.zip[*src.zip]
 # Source-2 1
-package=units-opengl.source.zip[uoglsrc.zip],OpenGL interface units sources
+package=units-opengl-3.2.1.source.zip[uoglsrc.zip],OpenGL interface units sources
 # Source-2 2
-package=units-gtk1.source.zip[ugtk1src.zip],GTK1 interface units sources
+package=units-gtk1-3.2.1.source.zip[ugtk1src.zip],GTK1 interface units sources
 # Source-2 3
-package=units-odbc.source.zip[uodbcsrc.zip],ODBC interface units sources
+package=units-odbc-3.2.1.source.zip[uodbcsrc.zip],ODBC interface units sources
 # Source-2 4
-package=units-ibase.source.zip[uibassrc.zip],Interbase interface units sources
+package=units-ibase-3.2.1.source.zip[uibassrc.zip],Interbase interface units sources
 # Source-2 5
-package=units-mysql.source.zip[umysqsrc.zip],MySQL interface units sources
+package=units-mysql-3.2.1.source.zip[umysqsrc.zip],MySQL interface units sources
 # Source-2 6
-package=utils-lexyacc.source.zip[tplysrc.zip],Compiler generator for TP and compatibles
+package=utils-lexyacc-3.2.1.source.zip[ulexysrc.zip],Compiler generator for TP and compatibles
 # Source-2 7
-package=utils-unicode.source.zip[ucodesrc.zip],Transformation of Unicode consortium data for FPC
-# Source-2
-#package=units-ftpapi.source.zip[uftpsrc.zip],OS/2 FTP API interface units
-# Source-2
-#package=units-hwvideo.source.zip[uhwvsrc.zip],OS/2 HWVideo interface units
-# Source-2
-#package=units-mmtk.source.zip[ummtksrc.zip],MMOS/2 interface units sources
+package=utils-unicode-3.2.1.source.zip[ucdsrc.zip],Transformation of Unicode consortium data for FPC
 # Source-2 8
-package=units-os2units.source.zip[uos2src.zip],Units interfacing libraries delivered with OS/2/eCS
-#package=units-clkdll.source.zip[uclksrc.zip],CLKDLL interface unit (eCS 1.1+)
+package=units-os2units-3.2.1.source.zip[uos2src.zip],Units interfacing libraries delivered with OS/2/eCS
 # Source-2 9
-#package=units-lvm.source.zip[ulvmsrc.zip],OS/2 LVM interface unit sources
-package=units-sdl.source.zip[usdlsrc.zip],SDL (Simple DirectMedia Layer) interface units sources
+package=units-sdl-3.2.1.source.zip[usdlsrc.zip],SDL (Simple DirectMedia Layer) interface units sources
 # Source-2 10
-package=units-pasjpeg.source.zip[upjpsrc.zip],PasJPEG units sources
+package=units-pasjpeg-3.2.1.source.zip[upjpsrc.zip],PasJPEG units sources
 # Source-2 11
-package=units-fv.source.zip[ufvsrc.zip],Free ~V~ision (FV) sources
+package=units-fv-3.2.1.source.zip[ufvsrc.zip],Free ~V~ision (FV) sources
 # Source-2 12
-package=units-libpng.source.zip[ulpngsrc.zip],LibPNG interface units sources
+package=units-libpng-3.2.1.source.zip[ulpngsrc.zip],LibPNG interface units sources
 # Source-2 13
-package=units-imlib.source.zip[uimlbsrc.zip],ImLib interface units sources
+package=units-imlib-3.2.1.source.zip[uimlbsrc.zip],ImLib interface units sources
 # Source-2 14
-package=units-fpgtk.source.zip[ufpgtsrc.zip],Lightweight OOP wrapper over GTK1 sources
+package=units-fpgtk-3.2.1.source.zip[ufpgtsrc.zip],Lightweight OOP wrapper over GTK1 sources
 # Source-2 15
-package=units-sqlite.source.zip[usqltsrc.zip],SQLite interface units sources
+package=units-sqlite-3.2.1.source.zip[usqltsrc.zip],SQLite interface units sources
 # Source-2 16
-package=units-fpmkunit.source.zip[ufpmksrc.zip],Units required for building fpmake.exe
+package=units-fpmkunit-3.2.1.source.zip[ufpmksrc.zip],Units required for building fpmake.exe
 # Source-2 17
-package=units-fcl-json.source.zip[ufcljsrc.zip],Free Component Library (FCL)-JSON interface
+package=units-fcl-json-3.2.1.source.zip[ufcljsrc.zip],Free Component Library (FCL)-JSON interface
 # Source-2 18
-package=units-fcl-async.source.zip[ufclasrc.zip],Free Component Library (FCL)-asynchronous events
+package=units-fcl-async-3.2.1.source.zip[ufclasrc.zip],Free Component Library (FCL)-asynchronous events
 # Source-2 19
-package=units-fcl-process.source.zip[ufclpsrc.zip],Free Component Library (FCL)-process management
+package=units-fcl-process-3.2.1.source.zip[ufclpsrc.zip],Free Component Library (FCL)-process management
 # Source-2 20
-package=units-chm.source.zip[uchmsrc.zip],Support for .chm files handling
+package=units-chm-3.2.1.source.zip[uchmsrc.zip],Support for .chm files handling
 # Source-2 21
-package=units-libgd.source.zip[ulgdsrc.zip],GD library interface unit
+package=units-libgd-3.2.1.source.zip[ulgdsrc.zip],GD library interface unit
 # Source-2 22
-package=units-symbolic.source.zip[usymbsrc.zip],Symbolic (unit for parsing and evaluating expressions)
+package=units-symbolic-3.2.1.source.zip[usymbsrc.zip],Symbolic (unit for parsing and evaluating expressions)
 # Source-2 23
-package=units-fcl-res.source.zip[ufclesrc.zip],Free Component Library (FCL)-resources
+package=units-fcl-res-3.2.1.source.zip[ufclesrc.zip],Free Component Library (FCL)-resources
 # Source-2 24
-package=units-bzip2.source.zip[ubz2src.zip],Units for bzip2 decompression
+package=units-bzip2-3.2.1.source.zip[ubz2src.zip],Units for bzip2 decompression
 # Source-2 25
-package=units-fcl-js.source.zip[ufcjssrc.zip],Free Component Library (FCL)-Javascript support
+package=units-fcl-js-3.2.1.source.zip[ufcjssrc.zip],Free Component Library (FCL)-Javascript support
 # Source-2 26
-package=units-ptc.source.zip[uptcsrc.zip],Free portable framebuffer library
+package=units-ptc-3.2.1.source.zip[uptcsrc.zip],Free portable framebuffer library
 # Source-2 27
-package=units-x11.source.zip[ux11src.zip],X Window (X11) interface units
+package=units-x11-3.2.1.source.zip[ux11src.zip],X Window (X11) interface units
 # Source-2 28
 # Source-2 29
-package=units-fcl-pdf.source.zip[ufcpdsrc.zip],PDF generating and TTF file info library
+package=units-fcl-pdf-3.2.1.source.zip[ufcpdsrc.zip],PDF generating and TTF file info library
 # Source-2 30
-package=units-dblib.source.zip,Headers for the MS SQL Server RDBMS
+package=units-dblib-3.2.1.source.zip,Headers for the MS SQL Server RDBMS
 # Source-2 31
 package=units-tplylib.source.zip[utpllsrc.zip],Units for sources created with the compiler generator
 
@@ -813,68 +758,109 @@ package=units-tplylib.source.zip[utpllsrc.zip],Units for sources created with th
 pack=Sou~r~ces 3
 filecheck=*.source.zip[*src.zip]
 # Source-3 1
-package=units-winunits.source.zip[uwinsrc.zip],Extended Windows API interface units
+package=units-winunits-base-3.2.1.source.zip[uwibsrc.zip],Extended Windows API interface units
 # Source-3 2
-package=units-tcl.source.zip[utclsrc.zip],TCL interface units sources
+package=units-tcl-3.2.1.source.zip[utclsrc.zip],TCL interface units sources
 # Source-3 3
-package=units-oracle.source.zip[uorasrc.zip],Oracle interface units sources
+package=units-oracle-3.2.1.source.zip[uorasrc.zip],Oracle interface units sources
 # Source-3 4
-package=units-hash.source.zip[uhashsrc.zip],Hash calculation units sources
+package=units-hash-3.2.1.source.zip[uhashsrc.zip],Hash calculation units sources
 # Source-3 5
-package=units-fftw.source.zip[ufftwsrc.zip],FFTW interface unit sources
+package=units-fftw-3.2.1.source.zip[ufftwsrc.zip],FFTW interface unit sources
 # Source-3 6
-package=units-fcl-base.source.zip[ufclbsrc.zip],Free component library (FCL)-base part
+package=units-fcl-base-3.2.1.source.zip[ufclbsrc.zip],Free component library (FCL)-base part
 # Source-3 7
-package=units-fcl-db.source.zip[ufcldsrc.zip],Free component library (FCL)-datasets
+package=units-fcl-db-3.2.1.source.zip[ufcldsrc.zip],Free component library (FCL)-datasets
 # Source-3 8
-package=units-fcl-fpcunit.source.zip[ufclusrc.zip],Free component library (FCL)-FPCUnit
+package=units-fcl-fpcunit-3.2.1.source.zip[ufclusrc.zip],Free component library (FCL)-FPCUnit
 # Source-3 9
-package=units-fcl-image.source.zip[ufclisrc.zip],Free component library (FCL)-images
+package=units-fcl-image-3.2.1.source.zip[ufclisrc.zip],Free component library (FCL)-images
 # Source-3 10
-package=units-fcl-net.source.zip[ufclnsrc.zip],Free component library (FCL)-network
+package=units-fcl-net-3.2.1.source.zip[ufclnsrc.zip],Free component library (FCL)-network
 # Source-3 11
-package=units-fcl-passrc.source.zip[ufclssrc.zip],Free component library (FCL)-Pascal source processing
+package=units-fcl-passrc-3.2.1.source.zip[ufclssrc.zip],Free component library (FCL)-Pascal source processing
 # Source-3 12
-package=units-fcl-registry.source.zip[ufclrsrc.zip],Free component library (FCL)-registry
+package=units-fcl-registry-3.2.1.source.zip[ufclrsrc.zip],Free component library (FCL)-registry
 # Source-3 13
-package=units-fcl-xml.source.zip[ufclxsrc.zip],Free component library (FCL)-XML files
+package=units-fcl-xml-3.2.1.source.zip[ufclxsrc.zip],Free component library (FCL)-XML files
 # Source-3 14
-package=units-fcl-web.source.zip[ufclwsrc.zip],Free component library (FCL)-Web
+package=units-fcl-web-3.2.1.source.zip[ufclwsrc.zip],Free component library (FCL)-Web
 # Source-3 15
-package=units-httpd-1.3.source.zip[uhd13src.zip],HTTPD 1.3 interface units sources
+package=units-httpd13-3.2.1.source.zip[uhd13src.zip],HTTPD 1.3 interface units sources
 # Source-3 16
-package=units-httpd-2.0.source.zip[uhd20src.zip],HTTPD 2.0 interface units sources
+package=units-httpd20-3.2.1.source.zip[uhd20src.zip],HTTPD 2.0 interface units sources
 # Source-3 17
-package=units-httpd-2.2.source.zip[uhd22src.zip],HTTPD 2.2 interface units sources
+package=units-httpd22-3.2.1.source.zip[uhd22src.zip],HTTPD 2.2 interface units sources
 # Source-3 18
-package=units-httpd-2.4.source.zip[uhd24src.zip],HTTPD 2.4 interface units sources
+package=units-httpd24-3.2.1.source.zip[uhd24src.zip],HTTPD 2.4 interface units sources
 # Source-3 19
-package=units-oggvorbis.source.zip[uoggvsrc.zip],OGG Vorbis interface units sources
+package=units-oggvorbis-3.2.1.source.zip[uoggvsrc.zip],OGG Vorbis interface units sources
 # Source-3 20
-package=units-openal.source.zip[uoalsrc.zip],OpenAL interface units sources
+package=units-openal-3.2.1.source.zip[uoalsrc.zip],OpenAL interface units sources
 # Source-3 21
-package=units-openssl.source.zip[uosslsrc.zip],OpenSSL interface units sources
+package=units-openssl-3.2.1.source.zip[uosslsrc.zip],OpenSSL interface units sources
 # Source-3 22
-package=units-fcl-sound.source.zip[ufsndsrc.zip],Free Component Library (FCL)-sound files sources
+package=units-fcl-sound-3.2.1.source.zip[ufsndsrc.zip],Free Component Library (FCL)-sound files sources
 # Source-3 23
-package=units-fcl-sdo.source.zip[ufcsdsrc.zip],Free Component Library (FCL)-Service Data Objects
+package=units-fcl-sdo-3.2.1.source.zip[ufcsdsrc.zip],Free Component Library (FCL)-Service Data Objects
 # Source-3 24
-package=units-fcl-stl.source.zip[ufcstsrc.zip],Free Component Library (FCL)-generic container library
+package=units-fcl-stl-3.2.1.source.zip[ufcstsrc.zip],Free Component Library (FCL)-generic container library
 # Source-3 25
-package=units-libtar.source.zip[ultarsrc.zip],Unit for .tar file handling
+package=units-libtar-3.2.1.source.zip[ultarsrc.zip],Unit for .tar file handling
 # Source-3 26
-package=units-rtl-console.source.zip[urtlcsrc.zip],RTL-console abstraction (keyboard, video & mouse)
+package=units-rtl-console-3.2.1.source.zip[urtlcsrc.zip],RTL-console abstraction (keyboard, video & mouse)
 # Source-3 27
-package=units-rtl-extra.source.zip[urtlesrc.zip],RTL-additional units not needed for bootstrapping
+package=units-rtl-extra-3.2.1.source.zip[urtlesrc.zip],RTL-additional units not needed for bootstrapping
 # Source-3 28
-package=units-rtl-objpas.source.zip[urtlosrc.zip],RTL-Object Pascal units (e.g. Delphi compatibility)
+package=units-rtl-objpas-3.2.1.source.zip[urtlosrc.zip],RTL-Object Pascal units (e.g. Delphi compatibility)
 # Source-3 29
-package=units-rtl-unicode.source.zip[urtlusrc.zip],RTL-miscellaneous Unicode support units
+package=units-rtl-unicode-3.2.1.source.zip[urtlusrc.zip],RTL-miscellaneous Unicode support units
 # Source-3 30
-package=units-rtl-generics.source.zip[urtlgsrc.zip],RTL-generic collection library
+package=units-rtl-generics-3.2.1.source.zip[urtlgsrc.zip],RTL-generic collection library
 # Source-3 31
 package=utils-json2pas.source.zip[jsnpsrc.zip],Create Object Pascal classes from JSON files
 
+#
+# Utils source packages
+#
+pack=~U~tils sources
+filecheck=*.source.zip[*src.zip]
+# Source 1
+package=utils-dxegen-3.2.1.source.zip[dxegsrc.zip],Generation of D~X~E modules loadable at runtime
+# Source 2
+package=utils-fpcmkcfg-3.2.1.source.zip[fpcksrc.zip],Creation of Free Pascal configuration files
+# Source 3
+package=utils-fpcm-3.2.1.source.zip[fpcmsrc.zip],Generate Makefiles out of Makefile.fpc files
+# Source 4
+package=utils-fpdoc-3.2.1.source.zip[fpdcsrc.zip],Free Pascal documentation generation utility
+# Source 5
+package=utils-fpmc-3.2.1.source.zip[fpmcsrc.zip],Free Pascal Message Compiler
+# Source 6
+package=utils-fppkg-3.2.1.source.zip[fpkgsrc.zip],Free Pascal package repository utility
+# Source 7
+package=utils-fprcp-3.2.1.source.zip[fprcsrc.zip],Free Pascal Resource Compiler Preprocessor
+# Source 8
+package=utils-fpcres-3.2.1.source.zip[fprssrc.zip],Free Pascal Resource Converter
+# Source 9
+package=utils-fpcreslipo-3.2.1.source.zip[fprlsrc.zip],Free Pascal External Resource Thinner
+# Source 10
+package=utils-h2pas-3.2.1.source.zip[h2pasrc.zip],Create Pascal interface units from C headers
+# Source 11
+package=utils-json2pas-3.2.1.source.zip[jsnpsrc.zip],A utility to create Object Pascal classes files from sample JSON files
+# Source 12
+package=utils-importtl-3.2.1.source.zip[imptsrc.zip],
+# Source 13
+package=utils-instantfpc-3.2.1.source.zip[ifpcsrc.zip],Instantaneous Free Pascal source executer
+# Source 14
+package=utils-pas2js-3.2.1.source.zip[p2jssrc.zip],Pascal to JavaScript converter
+# Source 15
+package=utils-pas2fpm-3.2.1.source.zip[p2fpsrc.zip],Generate fpmake.pp for Pascal source
+# Source 16
+package=utils-pas2jni-3.2.1.source.zip[p2jnsrc.zip],Generate JNI bridge for Pascal code
+# Source 17
+package=utils-pas2ut-3.2.1.source.zip[p2utsrc.zip],Pascal source to FPC Unit test generator
+# Source 18
+package=utils-rmwait-3.2.1.source.zip[rmwsrc.zip],Remove (delete) file(s) with optional retries
 
 defaultcfg=
 #
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}
diff --git a/utils/fpcres/fpmake.pp b/utils/fpcres/fpmake.pp
index 3afc7bf67a..5c9e0c902e 100644
--- a/utils/fpcres/fpmake.pp
+++ b/utils/fpcres/fpmake.pp
@@ -15,7 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fpcres');
-    P.ShortName:='fpres';
+    P.ShortName:='fprs';
     P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
diff --git a/utils/fpcreslipo/fpmake.pp b/utils/fpcreslipo/fpmake.pp
index bdc5ae57db..f994b70267 100644
--- a/utils/fpcreslipo/fpmake.pp
+++ b/utils/fpcreslipo/fpmake.pp
@@ -15,7 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fpcreslipo');
-    P.ShortName:='fpcreslipo';
+    P.ShortName:='fprl';
     P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
diff --git a/utils/fpdoc/fpmake.pp b/utils/fpdoc/fpmake.pp
index bac0378ee7..3197cca6eb 100644
--- a/utils/fpdoc/fpmake.pp
+++ b/utils/fpdoc/fpmake.pp
@@ -17,7 +17,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fpdoc');
-    P.ShortName:='fpdoc';
+    P.ShortName:='fpdc';
     P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
diff --git a/utils/fpmake.pp b/utils/fpmake.pp
index e3748922cc..28f3bbcd66 100644
--- a/utils/fpmake.pp
+++ b/utils/fpmake.pp
@@ -50,7 +50,9 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils');
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos];
+    P.ShortName := 'tils';
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
 
diff --git a/utils/fppkg/fpmake.pp b/utils/fppkg/fpmake.pp
index 8773b92241..0a54c29bc7 100644
--- a/utils/fppkg/fpmake.pp
+++ b/utils/fppkg/fpmake.pp
@@ -19,7 +19,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fppkg');
-    P.ShortName:='fppkg';
+    P.ShortName:='fpkg';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/fprcp/fpmake.pp b/utils/fprcp/fpmake.pp
index ef5828f4be..1d86e74dcd 100644
--- a/utils/fprcp/fpmake.pp
+++ b/utils/fprcp/fpmake.pp
@@ -15,7 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fprcp');
-    P.ShortName:='fprcp';
+    P.ShortName:='fprc';
     { java and jvm-android do not support 
       getmem/freemem and new/dispose used in
       these sources }
diff --git a/utils/h2pas/fpmake.pp b/utils/h2pas/fpmake.pp
index 235157c59f..cde3389290 100644
--- a/utils/h2pas/fpmake.pp
+++ b/utils/h2pas/fpmake.pp
@@ -15,7 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-h2pas');
-    P.ShortName:='h2pas';
+    P.ShortName:='h2pa';
     { java and jvm-android do not support 
       fpc_get_output used in these sources }
     if Defaults.CPU=jvm then
diff --git a/utils/importtl/fpmake.pp b/utils/importtl/fpmake.pp
index 2d7253947e..497c42c80e 100644
--- a/utils/importtl/fpmake.pp
+++ b/utils/importtl/fpmake.pp
@@ -15,7 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-importtl');
-    P.ShortName:='importttl';
+    P.ShortName:='impt';
     P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
diff --git a/utils/instantfpc/fpmake.pp b/utils/instantfpc/fpmake.pp
index abfbe73062..a8611dec56 100644
--- a/utils/instantfpc/fpmake.pp
+++ b/utils/instantfpc/fpmake.pp
@@ -15,7 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-instantfpc');
-    P.ShortName:='instantfpc';
+    P.ShortName:='ifpc';
     P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
diff --git a/utils/json2pas/fpmake.pp b/utils/json2pas/fpmake.pp
index f9026b1627..78148c9275 100644
--- a/utils/json2pas/fpmake.pp
+++ b/utils/json2pas/fpmake.pp
@@ -17,7 +17,7 @@ begin
     P:=AddPackage('utils-json2pas');
     P.Dependencies.Add('fcl-json');
 
-    P.ShortName:='json2pas';
+    P.ShortName:='js2p';
     P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
diff --git a/utils/pas2js/fpmake.pp b/utils/pas2js/fpmake.pp
index 037e606048..7b7b59842a 100644
--- a/utils/pas2js/fpmake.pp
+++ b/utils/pas2js/fpmake.pp
@@ -15,6 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-pas2js');
+    P.ShortName := 'upjs';
 
     P.Author := 'Free Pascal Team';
     P.License := 'LGPL with modification';
diff --git a/utils/unicode/fpmake.pp b/utils/unicode/fpmake.pp
index 4c605d1f0c..12eb4821cb 100644
--- a/utils/unicode/fpmake.pp
+++ b/utils/unicode/fpmake.pp
@@ -15,7 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-unicode');
-    P.ShortName:='ucode';
+    P.ShortName:='ucd';
     P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];