git: 58d9da58c03c - 2023Q4 - lang/fpc-*: Merge all units to lang/fpc

From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Sun, 26 Nov 2023 01:19:00 UTC
The branch 2023Q4 has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=58d9da58c03cbe30d42c2aa14ae4d188f5c0e677

commit 58d9da58c03cbe30d42c2aa14ae4d188f5c0e677
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-11-26 01:18:03 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2023-11-26 01:18:03 +0000

    lang/fpc-*: Merge all units to lang/fpc
    
    - Merge all fpc-* units to lang/fpc. It gives us a better way to maintain fpc
      and lazarus ports.
    - Update Mk/fpc.mk for reflects new changes
    - Update Mk/lazarus.mk for reflects new changes
    - Now we can defined WANT_FPC_DEVEL AND WANT_LAZARUS_DEVEL for use devel version
      of fpc or lazarus for build apps based on fpc/lazarus
    - Add entries to MOVED
    - Bump PORTREVISON of affected ports
    - Some other minor modifications
    
    (cherry picked from commit 0b92f925a3a155ce7b5f4eddfd528553915c6eb8)
---
 MOVED                                              |  104 +
 Mk/Uses/fpc.mk                                     |  179 +-
 Mk/Uses/lazarus.mk                                 |   13 +-
 Mk/bsd.default-versions.mk                         |    6 +-
 archivers/Makefile                                 |    2 -
 archivers/fpc-bzip2/Makefile                       |   13 -
 archivers/fpc-bzip2/pkg-plist                      |    8 -
 archivers/fpc-unzip/Makefile                       |   12 -
 archivers/fpc-unzip/pkg-plist                      |    5 -
 archivers/peazip/Makefile                          |    2 +-
 audio/Makefile                                     |    5 -
 audio/fpc-a52/Makefile                             |   18 -
 audio/fpc-a52/files/patch-packages_a52_fpmake.pp   |   11 -
 audio/fpc-a52/pkg-plist                            |    3 -
 audio/fpc-mad/Makefile                             |   19 -
 audio/fpc-mad/files/patch-packages_mad_fpmake.pp   |   11 -
 audio/fpc-mad/pkg-plist                            |    3 -
 audio/fpc-modplug/Makefile                         |   18 -
 .../files/patch-packages_modplug_fpmake.pp         |   11 -
 audio/fpc-modplug/pkg-plist                        |    3 -
 audio/fpc-oggvorbis/Makefile                       |   20 -
 .../files/patch-packages_oggvorbis_fpmake.pp       |   11 -
 audio/fpc-oggvorbis/pkg-plist                      |    5 -
 audio/fpc-openal/Makefile                          |   18 -
 .../files/patch-packages_openal_fpmake.pp          |   14 -
 audio/fpc-openal/pkg-plist                         |    3 -
 cad/zcad/Makefile                                  |    4 +-
 comms/cqrlog/Makefile                              |    5 +-
 converters/Makefile                                |    1 -
 converters/fpc-iconvenc/Makefile                   |   12 -
 converters/fpc-iconvenc/pkg-plist                  |    5 -
 databases/Makefile                                 |   10 -
 databases/fpc-dblib/Makefile                       |   12 -
 databases/fpc-dblib/pkg-plist                      |    3 -
 databases/fpc-fpindexer/Makefile                   |   14 -
 databases/fpc-fpindexer/pkg-plist                  |   25 -
 databases/fpc-gdbm/Makefile                        |   18 -
 databases/fpc-gdbm/pkg-plist                       |    3 -
 databases/fpc-ibase/Makefile                       |   17 -
 databases/fpc-ibase/pkg-plist                      |    8 -
 databases/fpc-mysql/Makefile                       |   17 -
 databases/fpc-mysql/pkg-plist                      |   58 -
 databases/fpc-odbc/Makefile                        |   17 -
 databases/fpc-odbc/pkg-plist                       |    5 -
 databases/fpc-oracle/Makefile                      |   12 -
 databases/fpc-oracle/pkg-plist                     |    9 -
 databases/fpc-postgres/Makefile                    |   17 -
 databases/fpc-postgres/pkg-plist                   |   12 -
 databases/fpc-pxlib/Makefile                       |   12 -
 databases/fpc-pxlib/pkg-plist                      |    3 -
 databases/fpc-sqlite/Makefile                      |   16 -
 databases/fpc-sqlite/pkg-plist                     |   14 -
 devel/Makefile                                     |   33 -
 devel/fpc-bfd/Makefile                             |   14 -
 devel/fpc-bfd/pkg-plist                            |    3 -
 devel/fpc-dbus/Makefile                            |   18 -
 devel/fpc-dbus/files/patch-packages_dbus_fpmake.pp |   11 -
 devel/fpc-dbus/pkg-plist                           |    6 -
 devel/fpc-fcl-async/Makefile                       |   12 -
 devel/fpc-fcl-async/pkg-plist                      |    5 -
 devel/fpc-fcl-base/Makefile                        |   13 -
 devel/fpc-fcl-base/pkg-plist                       |   94 -
 devel/fpc-fcl-db/Makefile                          |   14 -
 devel/fpc-fcl-db/pkg-plist                         |  236 --
 devel/fpc-fcl-extra/Makefile                       |   13 -
 devel/fpc-fcl-extra/pkg-plist                      |    7 -
 devel/fpc-fcl-fpcunit/Makefile                     |   13 -
 devel/fpc-fcl-fpcunit/pkg-plist                    |   30 -
 devel/fpc-fcl-image/Makefile                       |   13 -
 devel/fpc-fcl-image/pkg-plist                      |   97 -
 devel/fpc-fcl-js/Makefile                          |   13 -
 devel/fpc-fcl-js/pkg-plist                         |   21 -
 devel/fpc-fcl-json/Makefile                        |   13 -
 devel/fpc-fcl-json/pkg-plist                       |   26 -
 devel/fpc-fcl-net/Makefile                         |   13 -
 devel/fpc-fcl-net/pkg-plist                        |   19 -
 devel/fpc-fcl-passrc/Makefile                      |   13 -
 devel/fpc-fcl-passrc/pkg-plist                     |   24 -
 devel/fpc-fcl-pdf/Makefile                         |   13 -
 devel/fpc-fcl-pdf/pkg-plist                        |   17 -
 devel/fpc-fcl-registry/Makefile                    |   13 -
 devel/fpc-fcl-registry/pkg-plist                   |    6 -
 devel/fpc-fcl-report/Makefile                      |   16 -
 devel/fpc-fcl-report/pkg-plist                     |   55 -
 devel/fpc-fcl-res/Makefile                         |   13 -
 devel/fpc-fcl-res/pkg-plist                        |   83 -
 devel/fpc-fcl-sdo/Makefile                         |   14 -
 devel/fpc-fcl-sdo/pkg-plist                        |   77 -
 devel/fpc-fcl-sound/Makefile                       |   13 -
 devel/fpc-fcl-sound/pkg-plist                      |    7 -
 devel/fpc-fcl-stl/Makefile                         |   12 -
 devel/fpc-fcl-stl/pkg-plist                        |   15 -
 devel/fpc-fcl-web/Makefile                         |   16 -
 devel/fpc-fcl-web/pkg-plist                        |  161 --
 devel/fpc-fcl-xml/Makefile                         |   13 -
 devel/fpc-fcl-xml/pkg-plist                        |   48 -
 devel/fpc-fppkg/Makefile                           |   16 -
 devel/fpc-fppkg/pkg-plist                          |   37 -
 devel/fpc-fv/Makefile                              |   17 -
 devel/fpc-fv/pkg-plist                             |   51 -
 devel/fpc-gdbint/Makefile                          |   12 -
 devel/fpc-gdbint/pkg-plist                         |    5 -
 devel/fpc-libmagic/Makefile                        |   12 -
 devel/fpc-libmagic/pkg-plist                       |    3 -
 devel/fpc-newt/Makefile                            |   18 -
 devel/fpc-newt/files/patch-packages_newt_fpmake.pp |   11 -
 devel/fpc-newt/pkg-plist                           |    3 -
 devel/fpc-odata/Makefile                           |   16 -
 devel/fpc-odata/pkg-plist                          |   11 -
 devel/fpc-pthreads/Makefile                        |   12 -
 devel/fpc-pthreads/pkg-plist                       |    3 -
 devel/fpc-regexpr/Makefile                         |   13 -
 devel/fpc-regexpr/pkg-plist                        |   10 -
 devel/fpc-sdl/Makefile                             |   20 -
 devel/fpc-sdl/pkg-plist                            |   21 -
 devel/fpc-symbolic/Makefile                        |   14 -
 devel/fpc-symbolic/pkg-plist                       |    6 -
 devel/fpc-tplylib/Makefile                         |   12 -
 devel/fpc-tplylib/pkg-plist                        |    5 -
 devel/fpc-zlib/Makefile                            |   12 -
 devel/fpc-zlib/pkg-plist                           |    3 -
 editors/Makefile                                   |    1 -
 editors/cudatext/Makefile                          |    4 +-
 editors/fpc-ide/Makefile                           |   13 -
 editors/fpc-ide/pkg-plist                          |   14 -
 editors/lazarus-devel/Makefile                     |   10 +-
 editors/lazarus-qt5/Makefile                       |    2 +-
 editors/lazarus/Makefile                           |   10 +-
 editors/picpas/Makefile                            |    6 +-
 ftp/Makefile                                       |    1 -
 ftp/fpc-libcurl/Makefile                           |   18 -
 ftp/fpc-libcurl/pkg-plist                          |    3 -
 graphics/Makefile                                  |   13 -
 graphics/fpc-cairo/Makefile                        |   19 -
 graphics/fpc-cairo/pkg-plist                       |    8 -
 graphics/fpc-graph/Makefile                        |   13 -
 .../fpc-graph/files/patch-packages_graph_fpmake.pp |   67 -
 graphics/fpc-graph/pkg-plist                       |    7 -
 graphics/fpc-hermes/Makefile                       |   18 -
 graphics/fpc-hermes/pkg-plist                      |    3 -
 graphics/fpc-imagemagick/Makefile                  |   19 -
 graphics/fpc-imagemagick/pkg-plist                 |    5 -
 graphics/fpc-libgd/Makefile                        |   18 -
 graphics/fpc-libgd/pkg-plist                       |    3 -
 graphics/fpc-libpng/Makefile                       |   19 -
 graphics/fpc-libpng/pkg-plist                      |    3 -
 graphics/fpc-ncurses/Makefile                      |   12 -
 graphics/fpc-ncurses/pkg-plist                     |   13 -
 graphics/fpc-opengl/Makefile                       |   21 -
 .../files/patch-packages-opengl-src-glut.pp        |   11 -
 graphics/fpc-opengl/pkg-plist                      |   13 -
 graphics/fpc-pasjpeg/Makefile                      |   12 -
 graphics/fpc-pasjpeg/pkg-plist                     |  101 -
 graphics/fpc-proj4/Makefile                        |   19 -
 .../fpc-proj4/files/patch-packages_proj4_fpmake.pp |   11 -
 graphics/fpc-proj4/pkg-plist                       |    3 -
 graphics/fpc-rsvg/Makefile                         |   21 -
 graphics/fpc-rsvg/pkg-plist                        |    3 -
 graphics/fpc-svgalib/Makefile                      |   17 -
 graphics/fpc-svgalib/pkg-plist                     |    5 -
 graphics/fpc-vcl-compat/Makefile                   |   15 -
 graphics/fpc-vcl-compat/pkg-plist                  |    4 -
 graphics/lazpaint/Makefile                         |    6 +-
 lang/Makefile                                      |   11 -
 lang/fpc-base/Makefile                             |   16 -
 lang/fpc-base/pkg-descr                            |    4 -
 lang/fpc-lua/Makefile                              |   18 -
 lang/fpc-lua/files/patch-packages_lua_fpmake.pp    |   11 -
 lang/fpc-lua/pkg-plist                             |    7 -
 lang/fpc-pastojs/Makefile                          |   13 -
 lang/fpc-pastojs/pkg-plist                         |   43 -
 lang/fpc-rexx/Makefile                             |   18 -
 lang/fpc-rexx/files/patch-packages_rexx_fpmake.pp  |   11 -
 lang/fpc-rexx/pkg-plist                            |    3 -
 lang/fpc-rtl-console/Makefile                      |   13 -
 lang/fpc-rtl-console/pkg-plist                     |    9 -
 lang/fpc-rtl-extra/Makefile                        |   12 -
 lang/fpc-rtl-extra/pkg-plist                       |   19 -
 lang/fpc-rtl-generics/Makefile                     |   13 -
 lang/fpc-rtl-generics/pkg-plist                    |   14 -
 lang/fpc-rtl-objpas/Makefile                       |   12 -
 lang/fpc-rtl-objpas/pkg-plist                      |   26 -
 lang/fpc-rtl-unicode/Makefile                      |   12 -
 lang/fpc-rtl-unicode/pkg-plist                     |   29 -
 lang/fpc-units/Makefile                            |  132 -
 lang/fpc-units/pkg-descr                           |    1 -
 lang/fpc-utils/Makefile                            |   21 -
 lang/fpc-utils/pkg-plist                           |   47 -
 lang/fpc/Makefile                                  |  123 +-
 lang/fpc/Makefile.units                            |   72 -
 .../fpc}/files/patch-packages-dts-src-dts.pas      |    0
 lang/fpc/files/patch-packages-opencl-src_cl.pp     |   11 +
 lang/fpc/files/patch-packages_libvlc_fpmake.pp     |   13 +
 lang/fpc/pkg-plist                                 | 2731 +++++++++++++++++++-
 math/Makefile                                      |    3 -
 math/fpc-fftw/Makefile                             |   18 -
 math/fpc-fftw/pkg-plist                            |    3 -
 math/fpc-gmp/Makefile                              |   18 -
 math/fpc-gmp/pkg-plist                             |    3 -
 math/fpc-numlib/Makefile                           |   12 -
 math/fpc-numlib/pkg-plist                          |   37 -
 misc/Makefile                                      |    1 -
 misc/fpc-chm/Makefile                              |   13 -
 misc/fpc-chm/pkg-plist                             |   39 -
 multimedia/Makefile                                |    3 +-
 multimedia/fpc-dts/Makefile                        |   18 -
 .../fpc-dts/files/patch-packages_dts_fpmake.pp     |   11 -
 multimedia/fpc-dts/pkg-plist                       |    3 -
 multimedia/fpc-libvlc/Makefile                     |   17 -
 .../files/patch-packages_libvlc_fpmake.pp          |   21 -
 multimedia/fpc-libvlc/pkg-plist                    |    5 -
 multimedia/winff/Makefile                          |    4 +-
 net-p2p/awgg/Makefile                              |    6 +-
 net-p2p/transmission-remote-gui/Makefile           |    4 +-
 net/Makefile                                       |    3 -
 net/fpc-ldap/Makefile                              |   19 -
 net/fpc-ldap/files/patch-packages_ldap_fpmake.pp   |   11 -
 net/fpc-ldap/pkg-plist                             |    5 -
 net/fpc-libenet/Makefile                           |   13 -
 net/fpc-libenet/pkg-plist                          |    5 -
 net/fpc-pcap/Makefile                              |   13 -
 net/fpc-pcap/pkg-plist                             |    3 -
 russian/emkatic/Makefile                           |    4 +-
 security/Makefile                                  |    2 -
 security/fpc-gnutls/Makefile                       |   19 -
 security/fpc-gnutls/pkg-plist                      |    5 -
 security/fpc-openssl/Makefile                      |   20 -
 security/fpc-openssl/pkg-plist                     |   10 -
 sysutils/Makefile                                  |    4 -
 sysutils/fpc-syslog/Makefile                       |   12 -
 sysutils/fpc-syslog/pkg-plist                      |    3 -
 sysutils/fpc-users/Makefile                        |   12 -
 sysutils/fpc-users/pkg-plist                       |    8 -
 sysutils/fpc-utmp/Makefile                         |   12 -
 sysutils/fpc-utmp/pkg-plist                        |    3 -
 sysutils/fpc-uuid/Makefile                         |   13 -
 .../fpc-uuid/files/patch-packages_uuid_fpmake.pp   |   11 -
 sysutils/fpc-uuid/pkg-plist                        |    5 -
 textproc/Makefile                                  |    2 -
 textproc/fpc-aspell/Makefile                       |   15 -
 textproc/fpc-aspell/pkg-plist                      |    7 -
 textproc/fpc-libxml2/Makefile                      |   20 -
 textproc/fpc-libxml2/pkg-plist                     |    9 -
 www/Makefile                                       |    6 -
 www/fpc-fastcgi/Makefile                           |   12 -
 www/fpc-fastcgi/pkg-plist                          |    3 -
 www/fpc-googleapi/Makefile                         |   16 -
 www/fpc-googleapi/pkg-plist                        |  223 --
 www/fpc-httpd22/Makefile                           |   13 -
 www/fpc-httpd22/pkg-plist                          |    9 -
 www/fpc-httpd24/Makefile                           |   18 -
 www/fpc-httpd24/pkg-plist                          |    5 -
 www/fpc-libmicrohttpd/Makefile                     |   13 -
 www/fpc-libmicrohttpd/pkg-plist                    |    3 -
 www/fpc-webidl/Makefile                            |   13 -
 www/fpc-webidl/pkg-plist                           |   11 -
 x11-fm/doublecmd/Makefile                          |    5 +-
 x11-fonts/Makefile                                 |    1 -
 x11-fonts/fpc-libfontconfig/Makefile               |   12 -
 x11-fonts/fpc-libfontconfig/pkg-plist              |    3 -
 x11-toolkits/Makefile                              |    2 -
 x11-toolkits/fpc-gtk2/Makefile                     |   21 -
 x11-toolkits/fpc-gtk2/pkg-plist                    |   25 -
 x11-toolkits/fpc-xforms/Makefile                   |   19 -
 x11-toolkits/fpc-xforms/pkg-plist                  |    4 -
 x11/Makefile                                       |    1 -
 x11/fpc-x11/Makefile                               |   19 -
 x11/fpc-x11/pkg-plist                              |   53 -
 268 files changed, 2962 insertions(+), 4659 deletions(-)

diff --git a/MOVED b/MOVED
index 1b11c771b4a7..8a40d8a681f1 100644
--- a/MOVED
+++ b/MOVED
@@ -7929,3 +7929,107 @@ databases/percona57-client||2023-10-01|Has expired: Upstream EOL reaches on 2023
 sysutils/nfs-over-tls||2023-10-01|Has expired: All supported releases of FreeBSD include this in base
 x11/antimicro|x11/antimicrox|2023-10-01|Has expired: Replaced by x11/antimicrox upstream no longer maintained
 security/krb5-appl||2023-10-01|Has expired: Desupported by upstream, uses old ciphers
+archivers/fpc-bzip2|lang/fpc|2023-11-12|This port was merged into lang/fpc
+archivers/fpc-unzip|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-mad|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-a52|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-oggvorbis|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-modplug|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-openal|lang/fpc|2023-11-12|This port was merged into lang/fpc
+converters/fpc-iconvenc|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-odbc|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-fpindexer|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-postgres|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-dblib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-ibase|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-gdbm|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-mysql|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-pxlib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-oracle|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-sqlite|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-pthreads|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-tplylib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-pdf|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-sdo|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-image|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-xml|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-newt|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fppkg|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-sdl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-extra|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-odata|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-stl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-js|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-symbolic|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-res|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-web|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-registry|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-fpcunit|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-report|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-passrc|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-regexpr|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-sound|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-dbus|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-db|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-gdbint|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-libmagic|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-async|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-base|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-json|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-net|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fv|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-zlib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-bfd|lang/fpc|2023-11-12|This port was merged into lang/fpc
+editors/fpc-ide|lang/fpc|2023-11-12|This port was merged into lang/fpc
+ftp/fpc-libcurl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-libpng|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-ncurses|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-hermes|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-imagemagick|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-rsvg|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-libgd|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-opengl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-graph|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-vcl-compat|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-svgalib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-proj4|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-pasjpeg|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-cairo|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-pastojs|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-objpas|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-lua|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-utils|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-generics|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-extra|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-units|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rexx|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-base|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-unicode|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-console|lang/fpc|2023-11-12|This port was merged into lang/fpc
+math/fpc-gmp|lang/fpc|2023-11-12|This port was merged into lang/fpc
+math/fpc-numlib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+math/fpc-fftw|lang/fpc|2023-11-12|This port was merged into lang/fpc
+misc/fpc-chm|lang/fpc|2023-11-12|This port was merged into lang/fpc
+multimedia/fpc-dts|lang/fpc|2023-11-12|This port was merged into lang/fpc
+multimedia/fpc-libvlc|lang/fpc|2023-11-12|This port was merged into lang/fpc
+net/fpc-ldap|lang/fpc|2023-11-12|This port was merged into lang/fpc
+net/fpc-pcap|lang/fpc|2023-11-12|This port was merged into lang/fpc
+net/fpc-libenet|lang/fpc|2023-11-12|This port was merged into lang/fpc
+print/fpc-libcups|lang/fpc|2023-11-12|This port was merged into lang/fpc
+security/fpc-gnutls|lang/fpc|2023-11-12|This port was merged into lang/fpc
+security/fpc-openssl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+sysutils/fpc-utmp|lang/fpc|2023-11-12|This port was merged into lang/fpc
+sysutils/fpc-uuid|lang/fpc|2023-11-12|This port was merged into lang/fpc
+sysutils/fpc-syslog|lang/fpc|2023-11-12|This port was merged into lang/fpc
+textproc/fpc-aspell|lang/fpc|2023-11-12|This port was merged into lang/fpc
+textproc/fpc-libxml2|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-libmicrohttpd|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-httpd24|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-googleapi|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-webidl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-httpd22|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-fastcgi|lang/fpc|2023-11-12|This port was merged into lang/fpc
+x11/fpc-x11|lang/fpc|2023-11-12|This port was merged into lang/fpc
+x11-fonts/fpc-libfontconfig|lang/fpc|2023-11-12|This port was merged into lang/fpc
+x11-toolkits/fpc-xforms|lang/fpc|2023-11-12|This port was merged into lang/fpc
+x11-toolkits/fpc-gtk2|lang/fpc|2023-11-12|This port was merged into lang/fpc
diff --git a/Mk/Uses/fpc.mk b/Mk/Uses/fpc.mk
index f5f5517d3d4d..dd9a3137e3f9 100644
--- a/Mk/Uses/fpc.mk
+++ b/Mk/Uses/fpc.mk
@@ -3,22 +3,14 @@
 #
 # Feature:      fpc
 # Usage:        USES=fpc
-# Valid ARGS:   (none), run, base, all
+# Valid ARGS:   (none), run
 #
-# run			- Free pascal units will be registered also as run dependencies.
-#
-# base			- This automatically will install all base units of fpc 
-#			  (gdbint graph ibase libasync hash httpd mysql netdb odbc 
-#			  oracle pasjpeg paszlib pthreads postgres regexpr and sqlite).
-#
-# all			- This automatically will install all free pascal units.
-#
-# if you need install additional fpc units, they can be listed there (USE_FPC=gtk2 x11 opengl).
+# run			- Free pascal compiler and units will be registered also
+#			  as run dependencies.
 #
 # Example:
 #	
 #	USES+=	fpc:run
-#	USE_FPC=gtk2
 #
 
 .if !defined(_INCLUDE_USES_FPC_MK)
@@ -31,8 +23,8 @@ _INCLUDE_USES_FPC_MK=   yes
 WARNING+=	"DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
 .  endif
 
-.  if ${fpc_ARGS:Nrun:Nbase:Nall}
-IGNORE=		Unknown argument for USES=fpc: ${fpc_ARGS:Nrun:Nbase:Nall}
+.  if ${fpc_ARGS:Nrun}
+IGNORE=		Unknown argument for USES=fpc: ${fpc_ARGS:Nrun}
 .  endif
 
 DEFAULT_FPC_VER=	${FPC_DEFAULT}
@@ -58,159 +50,22 @@ ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 .  endif
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
-			${PPNAME}:lang/fpc
-
-BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
-UNITSDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
-MKINSTDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
-
-_FPC_ALL_UNITS=	a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \
-		fcl-async fcl-base fcl-db fcl-extra fcl-fpcunit fcl-image \
-		fcl-js fcl-json fcl-net fcl-passrc fcl-pdf fcl-registry \
-		fcl-report fcl-res fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml \
-		fftw fpindexer fppkg fv gdbint gdbm gnutls gmp googleapi \
-		graph gtk2 hermes httpd22 httpd24 ibase iconvenc imagemagick \
-		ldap libcups libcurl libenet libfontconfig libgd libmagic \
-		libmicrohttpd libpng libvlc libxml2 lua mad modplug \
-		mysql ncurses newt numlib odata odbc oggvorbis openal opengl openssl \
-		oracle pasjpeg pastojs pcap postgres proj4 pthreads pxlib \
-		regexpr rexx rsvg rtl-console rtl-extra rtl-generics rtl-objpas \
-		rtl-unicode sdl sqlite svgalib symbolic syslog tplylib unzip \
-		users utmp uuid vcl-compat webidl x11 xforms zlib
-
-.  if ${fpc_ARGS:Mbase}
-USE_FPC=	gdbint graph httpd22 httpd24 ibase mysql odbc oracle pasjpeg \
-		postgres pthreads regexpr sqlite
+.  if !defined(WANT_FPC_DEVEL)
+FPC_DEVELSUFFIX=	#
+.  else
+FPC_DEVELSUFFIX=	-devel
 .  endif
 
-.  if ${fpc_ARGS:Mall}
-USE_FPC=	${_FPC_ALL_UNITS}
-.  endif
+BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			${LOCALBASE}/lib/fpc/${FPC_VER}/${PPNAME}:lang/fpc${FPC_DEVELSUFFIX}
 
-.  if defined(USE_FPC) && ${USE_FPC:tl} != "yes"
-.    for UNITS in ${USE_FPC}
-.      if ${_FPC_ALL_UNITS:M${UNITS}}==""
-IGNORE= cannot install: unknown FPC unit ${UNITS}
-.      endif
-.    endfor
+.  if ${fpc_ARGS:Mrun}
+RUN_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			${LOCALBASE}/lib/fpc/${FPC_VER}/${PPNAME}:lang/fpc${FPC_DEVELSUFFIX}
 .  endif
 
-# Base units
-gdbint_UNIT=	devel/fpc-gdbint
-graph_UNIT=	graphics/fpc-graph
-httpd22_UNIT=	www/fpc-httpd22
-httpd24_UNIT=	www/fpc-httpd24
-ibase_UNIT=	databases/fpc-ibase
-mysql_UNIT=	databases/fpc-mysql
-odbc_UNIT=	databases/fpc-odbc
-oracle_UNIT=	databases/fpc-oracle
-pasjpeg_UNIT=	graphics/fpc-pasjpeg
-postgres_UNIT=	databases/fpc-postgres
-pthreads_UNIT=	devel/fpc-pthreads
-regexpr_UNIT=	devel/fpc-regexpr
-sqlite_UNIT=	databases/fpc-sqlite
-
-# Extra units
-a52_UNIT=	audio/fpc-a52
-aspell_UNIT=	textproc/fpc-aspell
-bfd_UNIT=	devel/fpc-bfd
-bzip2_UNIT=	archivers/fpc-bzip2
-cairo_UNIT=	graphics/fpc-cairo
-chm_UNIT=	misc/fpc-chm
-dblib_UNIT=	databases/fpc-dblib
-dbus_UNIT=	devel/fpc-dbus
-dts_UNIT=	multimedia/fpc-dts
-fastcgi_UNIT=	www/fpc-fastcgi
-fcl_async_UNIT=	devel/fpc-fcl-async
-fcl_base_UNIT=	devel/fpc-fcl-base
-fcl_db_UNIT=	devel/fpc-fcl-db
-fcl_extra_UNIT=	devel/fpc-fcl-extra
-fcl_fpcunit_UNIT=	devel/fpc-fcl-fpcunit
-fcl_image_UNIT=	devel/fpc-fcl-image
-fcl_js_UNIT=	devel/fpc-fcl-js
-fcl_json_UNIT=	devel/fpc-fcl-json
-fcl_net_UNIT=	devel/fpc-fcl-net
-fcl_passrc_UNIT=	devel/fpc-fcl-passrc
-fcl_pdf_UNIT=	devel/fpc-fcl-pdf
-fcl_registry_UNIT=	devel/fpc-fcl-registry
-fcl_report_UNIT=	devel/fpc-fcl-report
-fcl_res_UNIT=	devel/fpc-fcl-res
-fcl_sdo_UNIT=	devel/fpc-fcl-sdo
-fcl_sound_UNIT=	devel/fpc-fcl-sound
-fcl_stl_UNIT=	devel/fpc-fcl-stl
-fcl_web_UNIT=	devel/fpc-fcl-web
-fcl_xml_UNIT=	devel/fpc-fcl-xml
-fftw_UNIT=	math/fpc-fftw
-fpindexer_UNIT=	databases/fpc-fpindexer
-fppkg_UNIT=	devel/fpc-fppkg
-fpvectorial_UNIT=	graphics/fpc-fpvectorial
-fv_UNIT=	devel/fpc-fv
-hermes_UNIT=	graphics/fpc-hermes
-gdbm_UNIT=	databases/fpc-gdbm
-gnutls_UNIT=	security/fpc-gnutls
-gmp_UNIT=	math/fpc-gmp
-googleapi_UNIT=	www/fpc-googleapi
-gtk2_UNIT=	x11-toolkits/fpc-gtk2
-iconvenc_UNIT=	converters/fpc-iconvenc
-imagemagick_UNIT=	graphics/fpc-imagemagick
-ldap_UNIT=	net/fpc-ldap
-libcurl_UNIT=	ftp/fpc-libcurl
-libcups_UNIT=	print/fpc-libcups
-libenet_UNIT=	net/fpc-libenet
-libfontconfig_UNIT=	x11-fonts/fpc-libfontconfig
-libgd_UNIT=	graphics/fpc-libgd
-libmagic_UNIT=	devel/fpc-libmagic
-libmicrohttpd_UNIT=	www/fpc-libmicrohttpd
-libpng_UNIT=	graphics/fpc-libpng
-libvlc_UNIT=	multimedia/fpc-libvlc
-libxml2_UNIT=	textproc/fpc-libxml2
-lua_UNIT=	lang/fpc-lua
-mad_UNIT=	audio/fpc-mad
-modplug_UNIT=	audio/fpc-modplug
-newt_UNIT=	devel/fpc-newt
-ncurses_UNIT=	graphics/fpc-ncurses
-numlib_UNIT=	math/fpc-numlib
-odata_UNIT=	devel/fpc-odata
-oggvorbis_UNIT=	audio/fpc-oggvorbis
-openal_UNIT=	audio/fpc-openal
-opengl_UNIT=	graphics/fpc-opengl
-openssl_UNIT=	security/fpc-openssl
-pastojs_UNIT=	lang/fpc-pastojs
-pcap_UNIT=	net/fpc-pcap
-proj4_UNIT=	graphics/fpc-proj4
-pxlib_UNIT=	databases/fpc-pxlib
-rexx_UNIT=	lang/fpc-rexx
-rsvg_UNIT=	graphics/fpc-rsvg
-rtl_console_UNIT=	lang/fpc-rtl-console
-rtl_extra_UNIT=		lang/fpc-rtl-extra
-rtl_generics_UNIT=	lang/fpc-rtl-generics
-rtl_objpas_UNIT=	lang/fpc-rtl-objpas
-rtl_unicode_UNIT=	lang/fpc-rtl-unicode
-sdl_UNIT=	devel/fpc-sdl
-svgalib_UNIT=	graphics/fpc-svgalib
-symbolic_UNIT=	devel/fpc-symbolic
-syslog_UNIT=	sysutils/fpc-syslog
-tplylib_UNIT=	devel/fpc-tplylib
-unzip_UNIT=	archivers/fpc-unzip
-users_UNIT=	sysutils/fpc-users
-utmp_UNIT=	sysutils/fpc-utmp
-uuid_UNIT=	sysutils/fpc-uuid
-vcl_compat_UNIT=	graphics/fpc-vcl-compat
-webidl_UNIT=	www/fpc-webidl
-x11_UNIT=	x11/fpc-x11
-xforms_UNIT=	x11-toolkits/fpc-xforms
-zlib_UNIT=	devel/fpc-zlib
-
-.endif
+BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
+UNITSDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
+MKINSTDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
 
-.if defined(USE_FPC)
-.  for UNIT in ${USE_FPC}
-.    if ${_FPC_ALL_UNITS:M${UNIT}} != ""
-BUILD_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${${UNIT:S/-/_/}_UNIT}
-.      if ${fpc_ARGS:Mrun} || ${fpc_ARGS:Mbase}
-RUN_DEPENDS+=   ${MKINSTDIR}/${UNIT}.fpm:${${UNIT:S/-/_/}_UNIT}
-.      endif
-.    endif
-.  endfor
 .endif
diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk
index 0f7cc934562e..f1b3be3ed3f7 100644
--- a/Mk/Uses/lazarus.mk
+++ b/Mk/Uses/lazarus.mk
@@ -2,7 +2,7 @@
 #
 # Feature:      lazarus
 # Usage:        USES=lazarus
-# Valid ARGS:   (none), gtk2, qt5, flavors
+# Valid ARGS:   (none), gtk2, qt5, qt6, flavors
 #
 # (none)    - This automatically build lazarus-app with gtk2 interface
 #
@@ -75,13 +75,19 @@ LAZARUS_DIR?=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
-			fpcres:lang/fpc-utils
+.  if !defined(WANT_FPC_DEVEL)
+FPC_DEVELSUFFIX=	#
+.  else
+FPC_DEVELSUFFIX=	-devel
+.  endif
 
 BUILDNAME=		${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_UNITS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
 MKINSTDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
 
+BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			${MKINSTDIR}/utils-lexyacc.fpm:lang/fpc${FPC_DEVELSUFFIX}
+
 LAZARUS_FLAVORS=	gtk2 qt5
 
 .  if defined(WANT_LAZARUS_DEVEL)
@@ -111,7 +117,6 @@ LAZARUS_DEVELSUFFIX=	-devel
 .  endif
 
 .  if ${lazarus_ARGS:Mgtk2} || ${FLAVOR} == gtk2
-BUILD_DEPENDS+=	${MKINSTDIR}/gtk2.fpm:x11-toolkits/fpc-gtk2
 LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
 		libgtk-x11-2.0.so:x11-toolkits/gtk20 \
 		libatk-1.0.so:accessibility/at-spi2-core \
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 2d7ca4c54b7b..f671bed8fbf9 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -50,8 +50,12 @@ EBUR128_DEFAULT?=	legacy
 FIREBIRD_DEFAULT?=	3.0
 # Possible values: gfortran
 FORTRAN_DEFAULT?=	gfortran
-# Possible values: 3.2.2
+# Possible values: 3.2.2, 3.3.1
+.  if !defined(WANT_FPC_DEVEL)
 FPC_DEFAULT?=		3.2.2
+.  else
+FPC_DEFAULT?=		3.3.1
+.  endif
 # Possible values: 8 (last to support powerpcspe), 9, 10, 11, 12
 # (Any other version is completely unsupported and not meant for general use.)
 .  if ${ARCH} == "powerpcspe"
diff --git a/archivers/Makefile b/archivers/Makefile
index aa9aa1032174..15578e40b897 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -31,8 +31,6 @@
     SUBDIR += engrampa
     SUBDIR += fastjar
     SUBDIR += file-roller
-    SUBDIR += fpc-bzip2
-    SUBDIR += fpc-unzip
     SUBDIR += gcab
     SUBDIR += gcpio
     SUBDIR += gnome-autoar
diff --git a/archivers/fpc-bzip2/Makefile b/archivers/fpc-bzip2/Makefile
deleted file mode 100644
index 65a878bd4cbb..000000000000
--- a/archivers/fpc-bzip2/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-CATEGORIES=	archivers lang
-PKGNAMESUFFIX=	-bzip2
-
-COMMENT=	Free Pascal bzip2 unit
-
-USES=		fpc
-USE_FPC=	rtl-extra
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/archivers/fpc-bzip2/pkg-plist b/archivers/fpc-bzip2/pkg-plist
deleted file mode 100644
index 479edcec8e43..000000000000
--- a/archivers/fpc-bzip2/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/bzip2.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2comn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2comn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2stream.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2stream.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2stream.rsj
diff --git a/archivers/fpc-unzip/Makefile b/archivers/fpc-unzip/Makefile
deleted file mode 100644
index c821eb9447a4..000000000000
--- a/archivers/fpc-unzip/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-CATEGORIES=	archivers lang
-PKGNAMESUFFIX=	-unzip
-
-COMMENT=	Free Pascal routines for unzipping zip files
-
-USES=	fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/archivers/fpc-unzip/pkg-plist b/archivers/fpc-unzip/pkg-plist
deleted file mode 100644
index 640baf248ccd..000000000000
--- a/archivers/fpc-unzip/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/unzip.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.ppu
diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile
index dffc953a85fa..c57a4400a2e1 100644
--- a/archivers/peazip/Makefile
+++ b/archivers/peazip/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	peazip
 PORTVERSION=	9.4.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -12,7 +13,6 @@ WWW=		https://peazip.github.io
 LICENSE=	LGPL3
 
 USES=		cpe desktop-file-utils dos2unix fpc lazarus:flavors zip xorg
-USE_FPC=	cairo chm fcl-base fcl-image fcl-xml pasjpeg rtl-objpas x11
 USE_XORG=	x11
 
 CPE_VENDOR=	giorgio_tani
diff --git a/audio/Makefile b/audio/Makefile
index b2c44c23c1f7..242f8cbae8ca 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -196,11 +196,6 @@
     SUBDIR += fomp-lv2
     SUBDIR += foo-yc20
     SUBDIR += fossmixer
-    SUBDIR += fpc-a52
-    SUBDIR += fpc-mad
-    SUBDIR += fpc-modplug
-    SUBDIR += fpc-oggvorbis
-    SUBDIR += fpc-openal
     SUBDIR += freac
     SUBDIR += freealut
     SUBDIR += freebsd-13-mixer
diff --git a/audio/fpc-a52/Makefile b/audio/fpc-a52/Makefile
deleted file mode 100644
index 2680418cfb45..000000000000
--- a/audio/fpc-a52/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-CATEGORIES=	audio lang
-PKGNAMESUFFIX=	-a52
-
-COMMENT=	Free Pascal interface to a52 library
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	LIBA52
-LIBA52_DESC=	Install a52 library
-OPTIONS_DEFAULT=	LIBA52
-
-LIBA52_LIB_DEPENDS=	liba52.so:audio/liba52
-
-.include "${MASTERDIR}/Makefile"
diff --git a/audio/fpc-a52/files/patch-packages_a52_fpmake.pp b/audio/fpc-a52/files/patch-packages_a52_fpmake.pp
deleted file mode 100644
index de501c6d93b2..000000000000
--- a/audio/fpc-a52/files/patch-packages_a52_fpmake.pp
+++ /dev/null
@@ -1,11 +0,0 @@
---- packages/a52/fpmake.pp.orig	2015-11-13 21:15:29 UTC
-+++ packages/a52/fpmake.pp
-@@ -20,7 +20,7 @@ begin
-     P.Email := '';
-     P.Description := 'A free library for decoding ATSC A/52 streams.';
-     P.NeedLibC:= true;
--    P.OSes := [linux,win32];
-+    P.OSes := [linux,win32,dragonfly,freebsd];
- 
- {$ifdef ALLPACKAGES}
-     P.Directory:=ADirectory;
diff --git a/audio/fpc-a52/pkg-plist b/audio/fpc-a52/pkg-plist
deleted file mode 100644
index 2ba372769c0f..000000000000
--- a/audio/fpc-a52/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/a52.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/a52.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/a52.ppu
diff --git a/audio/fpc-mad/Makefile b/audio/fpc-mad/Makefile
deleted file mode 100644
index a589562378cf..000000000000
--- a/audio/fpc-mad/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-PORTREVISION=	4
-CATEGORIES=	audio lang
-PKGNAMESUFFIX=	-mad
-
-COMMENT=	Free Pascal interface to mad library
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	LIBMAD
-LIBMAD_DESC=	Install mad library
-OPTIONS_DEFAULT=	LIBMAD
-
-LIBMAD_LIB_DEPENDS=	libmad.so:audio/libmad
-
-.include "${MASTERDIR}/Makefile"
diff --git a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
deleted file mode 100644
index 74ff33a56d4c..000000000000
--- a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
+++ /dev/null
@@ -1,11 +0,0 @@
---- packages/mad/fpmake.pp	2017-09-02 11:48:24.000000000 -0500
-+++ packages/mad/fpmake.pp	2017-12-12 12:22:21.182111000 -0500
-@@ -17,7 +17,7 @@
-     P.Directory:=ADirectory;
- {$endif ALLPACKAGES}
-     P.Version:='3.2.2';
--    P.OSes := [linux,win32,win64,wii];
-+    P.OSes := [linux,win32,win64,wii,dragonfly,freebsd];
-     P.SourcePath.Add('src');
- 
-     T:=P.Targets.AddUnit('mad.pas');
diff --git a/audio/fpc-mad/pkg-plist b/audio/fpc-mad/pkg-plist
deleted file mode 100644
index ae4314206041..000000000000
--- a/audio/fpc-mad/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/mad.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/mad.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/mad.ppu
diff --git a/audio/fpc-modplug/Makefile b/audio/fpc-modplug/Makefile
deleted file mode 100644
index 33a9ce121dec..000000000000
--- a/audio/fpc-modplug/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-CATEGORIES=	audio lang
-PKGNAMESUFFIX=	-modplug
-
-COMMENT=	Free Pascal interface to modplug library
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	LIBMODPLUG
-LIBMODPLUG_DESC=	Install modplug library
-OPTIONS_DEFAULT=	LIBMODPLUG
-
-LIBMODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
-
-.include "${MASTERDIR}/Makefile"
diff --git a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
deleted file mode 100644
index 4f06a2329c56..000000000000
--- a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
+++ /dev/null
@@ -1,11 +0,0 @@
---- packages/modplug/fpmake.pp	2017-09-02 11:48:24.000000000 -0500
-+++ packages/modplug/fpmake.pp	2017-12-12 12:24:14.440128000 -0500
-@@ -17,7 +17,7 @@
-     P.Directory:=ADirectory;
- {$endif ALLPACKAGES}
-     P.Version:='3.2.2';
--    P.OSes := [linux];
-+    P.OSes := [linux,dragonfly,freebsd];
-     P.SourcePath.Add('src');
- 
-     T:=P.Targets.AddUnit('modplug.pas');
diff --git a/audio/fpc-modplug/pkg-plist b/audio/fpc-modplug/pkg-plist
deleted file mode 100644
index d28e24819193..000000000000
--- a/audio/fpc-modplug/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/modplug.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/modplug.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/modplug.ppu
diff --git a/audio/fpc-oggvorbis/Makefile b/audio/fpc-oggvorbis/Makefile
deleted file mode 100644
index f567735a5106..000000000000
--- a/audio/fpc-oggvorbis/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-CATEGORIES=	audio lang
-PKGNAMESUFFIX=	-oggvorbis
-
-COMMENT=	Free Pascal interface to ogg & vorbis libraries
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	LIBOGG LIBVORBIS
-LIBOGG_DESC=	Install ogg library
-LIBVORBIS_DESC=	Install vorbis library
-OPTIONS_DEFAULT=	LIBOGG LIBVORBIS
-
-LIBOGG_LIB_DEPENDS=	libogg.so:audio/libogg
-LIBVORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
-
-.include "${MASTERDIR}/Makefile"
diff --git a/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp b/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp
deleted file mode 100644
index 3cc105136938..000000000000
--- a/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp
+++ /dev/null
@@ -1,11 +0,0 @@
---- packages/oggvorbis/fpmake.pp.orig	2015-11-13 21:15:29 UTC
-+++ packages/oggvorbis/fpmake.pp
-@@ -19,7 +19,7 @@ begin
- {$endif ALLPACKAGES}
-     P.Version:='3.0.0';
-     P.SourcePath.Add('src');
--    P.OSes := [linux,win32,wince];
-+    P.OSes := [linux,win32,wince,dragonfly,freebsd];
- //    P.Dependencies.Add('x11');
- 
-    T:=P.Targets.AddUnit('ogg.pas');
diff --git a/audio/fpc-oggvorbis/pkg-plist b/audio/fpc-oggvorbis/pkg-plist
deleted file mode 100644
*** 9029 LINES SKIPPED ***