git: e40d870fc3cb - main - lang/fpc: update to 3.2.2
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Sun Aug 1 01:56:49 UTC 2021
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e40d870fc3cb88063b59d0f8449b9ccbdf5378ea
commit e40d870fc3cb88063b59d0f8449b9ccbdf5378ea
Author: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
AuthorDate: 2021-08-01 01:52:39 +0000
Commit: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
CommitDate: 2021-08-01 01:56:08 +0000
lang/fpc: update to 3.2.2
* Add new unit devel/fpc-tplylib
* Remove COMPAT10 dependency [PR/254481]
PR: 254481
Reported by: jbeich
---
Mk/Uses/fpc.mk | 5 ++-
Mk/bsd.default-versions.mk | 4 +-
audio/fpc-mad/files/patch-packages_mad_fpmake.pp | 2 +-
.../files/patch-packages_modplug_fpmake.pp | 2 +-
databases/fpc-fpindexer/pkg-plist | 2 +
databases/fpc-mysql/Makefile | 1 -
databases/fpc-mysql/pkg-plist | 3 ++
databases/fpc-sqlite/Makefile | 1 -
devel/Makefile | 1 +
devel/fpc-dbus/pkg-plist | 3 ++
devel/fpc-fcl-base/Makefile | 2 +-
devel/fpc-fcl-base/pkg-plist | 3 --
devel/fpc-fcl-db/Makefile | 1 -
devel/fpc-fcl-db/pkg-plist | 6 +++
devel/fpc-fcl-extra/Makefile | 2 +-
devel/fpc-fcl-extra/pkg-plist | 3 ++
devel/fpc-fcl-fpcunit/Makefile | 1 -
devel/fpc-fcl-passrc/Makefile | 1 -
devel/fpc-fcl-pdf/pkg-plist | 4 ++
devel/fpc-fcl-res/Makefile | 1 +
devel/fpc-fcl-res/pkg-plist | 4 ++
devel/fpc-regexpr/Makefile | 1 -
devel/fpc-tplylib/Makefile | 12 ++++++
devel/fpc-tplylib/pkg-plist | 5 +++
lang/fpc-base/Makefile | 3 +-
lang/fpc-docs/Makefile | 2 +-
lang/fpc-docs/distinfo | 6 +--
.../files/patch-packages-pastojs_fpmake.pp | 14 -------
lang/fpc-rtl-extra/Makefile | 1 -
lang/fpc-rtl-objpas/Makefile | 1 -
lang/fpc-rtl-objpas/pkg-plist | 1 +
lang/fpc-source/Makefile | 2 +-
lang/fpc-source/distinfo | 6 +--
lang/fpc-units/Makefile | 8 ++--
lang/fpc-utils/Makefile | 1 -
lang/fpc-utils/pkg-plist | 4 --
lang/fpc/Makefile | 7 ++--
lang/fpc/distinfo | 12 +++---
lang/fpc/files/patch-rtl-bsd_bunxsysc.inc | 49 +++++++++++++++++-----
lang/fpc/files/patch-rtl-freebsd_unxfunc.inc | 2 +-
.../files/patch-packages_libvlc_fpmake.pp | 2 +-
41 files changed, 117 insertions(+), 74 deletions(-)
diff --git a/Mk/Uses/fpc.mk b/Mk/Uses/fpc.mk
index e0ac6f18462c..5371544865fa 100644
--- a/Mk/Uses/fpc.mk
+++ b/Mk/Uses/fpc.mk
@@ -76,8 +76,8 @@ _FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \
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 unzip users utmp \
- uuid vcl-compat webidl x11 xforms zlib
+ 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 \
@@ -191,6 +191,7 @@ 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
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index d68d453170c4..c7b35b125c6a 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -43,8 +43,8 @@ COROSYNC_DEFAULT?= 2
FIREBIRD_DEFAULT?= 2.5
# Possible values: flang (experimental), gfortran
FORTRAN_DEFAULT?= gfortran
-# Possible values: 3.2.0
-FPC_DEFAULT?= 3.2.0
+# Possible values: 3.2.2
+FPC_DEFAULT?= 3.2.2
# Possible values: 8 (last to support powerpcspe), 9, 10, 11
# (Any other version is completely unsupported and not meant for general use.)
.if ${ARCH} == "powerpcspe"
diff --git a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
index e8a8b990950a..74ff33a56d4c 100644
--- a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
+++ b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
@@ -3,7 +3,7 @@
@@ -17,7 +17,7 @@
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
- P.Version:='3.2.0';
+ P.Version:='3.2.2';
- P.OSes := [linux,win32,win64,wii];
+ P.OSes := [linux,win32,win64,wii,dragonfly,freebsd];
P.SourcePath.Add('src');
diff --git a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
index 46fdcec9c74a..4f06a2329c56 100644
--- a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
+++ b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
@@ -3,7 +3,7 @@
@@ -17,7 +17,7 @@
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
- P.Version:='3.2.0';
+ P.Version:='3.2.2';
- P.OSes := [linux];
+ P.OSes := [linux,dragonfly,freebsd];
P.SourcePath.Add('src');
diff --git a/databases/fpc-fpindexer/pkg-plist b/databases/fpc-fpindexer/pkg-plist
index e2aca4d3d286..5e9b863444a0 100644
--- a/databases/fpc-fpindexer/pkg-plist
+++ b/databases/fpc-fpindexer/pkg-plist
@@ -17,6 +17,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireadertxt.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/pgindexdb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/pgindexdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqldbindexdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqldbindexdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqliteindexdb.o
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
index 8dd0c39271e1..0d7289cf2d56 100644
--- a/databases/fpc-mysql/Makefile
+++ b/databases/fpc-mysql/Makefile
@@ -1,6 +1,5 @@
# Created by: John Merryweather Cooper
-PORTREVISION= 2
CATEGORIES= databases lang
PKGNAMESUFFIX= -mysql
diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist
index 849c1ab2c381..39259282b312 100644
--- a/databases/fpc-mysql/pkg-plist
+++ b/databases/fpc-mysql/pkg-plist
@@ -53,3 +53,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql80dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql80dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql80dyn.rsj
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
index 0f6d6314c200..a5aba95c0beb 100644
--- a/databases/fpc-sqlite/Makefile
+++ b/databases/fpc-sqlite/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION= 2
CATEGORIES= databases lang
PKGNAMESUFFIX= -sqlite
diff --git a/devel/Makefile b/devel/Makefile
index a09205a1a105..92f2d83c7e96 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -708,6 +708,7 @@
SUBDIR += fpc-regexpr
SUBDIR += fpc-sdl
SUBDIR += fpc-symbolic
+ SUBDIR += fpc-tplylib
SUBDIR += fpc-zlib
SUBDIR += fpp
SUBDIR += frama-c
diff --git a/devel/fpc-dbus/pkg-plist b/devel/fpc-dbus/pkg-plist
index 9f9889f00856..432eec0e5a9f 100644
--- a/devel/fpc-dbus/pkg-plist
+++ b/devel/fpc-dbus/pkg-plist
@@ -1,3 +1,6 @@
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/dbus.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbus.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbus.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbuscomp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbuscomp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbuscomp.rsj
diff --git a/devel/fpc-fcl-base/Makefile b/devel/fpc-fcl-base/Makefile
index 09c8fd4bdf30..29cb3821008e 100644
--- a/devel/fpc-fcl-base/Makefile
+++ b/devel/fpc-fcl-base/Makefile
@@ -4,7 +4,7 @@ PKGNAMESUFFIX= -fcl-base
COMMENT= Free Pascal Component Library base
USES= fpc
-USE_FPC= fcl-res rtl-objpas
+USE_FPC= rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-base/pkg-plist b/devel/fpc-fcl-base/pkg-plist
index 9056534d96f8..18679b29ce09 100644
--- a/devel/fpc-fcl-base/pkg-plist
+++ b/devel/fpc-fcl-base/pkg-plist
@@ -33,9 +33,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.rsj
diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile
index 9fb68445e167..d44663fd57b9 100644
--- a/devel/fpc-fcl-db/Makefile
+++ b/devel/fpc-fcl-db/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION= 2
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-db
diff --git a/devel/fpc-fcl-db/pkg-plist b/devel/fpc-fcl-db/pkg-plist
index dea7f81448e6..f3adbb934d18 100644
--- a/devel/fpc-fcl-db/pkg-plist
+++ b/devel/fpc-fcl-db/pkg-plist
@@ -1,3 +1,4 @@
+/you/have/to/check/what/makeplist/gives/you
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-db.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.ppu
@@ -112,6 +113,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql56.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql56.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql57.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql57.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql80.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql80.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.o
@@ -189,6 +192,9 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql56conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql57conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql57conn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql57conn.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql80conn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql80conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql80conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.o
diff --git a/devel/fpc-fcl-extra/Makefile b/devel/fpc-fcl-extra/Makefile
index 8fe3b299567c..3cbce1e32c11 100644
--- a/devel/fpc-fcl-extra/Makefile
+++ b/devel/fpc-fcl-extra/Makefile
@@ -4,7 +4,7 @@ PKGNAMESUFFIX= -fcl-extra
COMMENT= Free Pascal extra libraries (FCL)
USES= fpc
-USE_FPC= fcl-base fcl-res rtl-objpas
+USE_FPC= fcl-base fcl-res rtl-objpas tplylib
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-extra/pkg-plist b/devel/fpc-fcl-extra/pkg-plist
index ec0446695008..1ffb99964474 100644
--- a/devel/fpc-fcl-extra/pkg-plist
+++ b/devel/fpc-fcl-extra/pkg-plist
@@ -2,3 +2,6 @@ lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-extra.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/daemonapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/daemonapp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/daemonapp.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/fileinfo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/fileinfo.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/fileinfo.rsj
diff --git a/devel/fpc-fcl-fpcunit/Makefile b/devel/fpc-fcl-fpcunit/Makefile
index ebd0139ec009..3c942498f880 100644
--- a/devel/fpc-fcl-fpcunit/Makefile
+++ b/devel/fpc-fcl-fpcunit/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION= 2
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-fpcunit
diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile
index 394e70e926cf..92c662ca8bda 100644
--- a/devel/fpc-fcl-passrc/Makefile
+++ b/devel/fpc-fcl-passrc/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION= 2
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-passrc
diff --git a/devel/fpc-fcl-pdf/pkg-plist b/devel/fpc-fcl-pdf/pkg-plist
index 56b642c20d09..2ea0a235a5e0 100644
--- a/devel/fpc-fcl-pdf/pkg-plist
+++ b/devel/fpc-fcl-pdf/pkg-plist
@@ -3,11 +3,15 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpfonttextmapping.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpfonttextmapping.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpparsettf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpparsettf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpparsettf.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fppdf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fppdf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fppdf.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpttf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpttf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpttf.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpttfencodings.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpttfencodings.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpttfsubsetter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpttfsubsetter.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-pdf/fpttfsubsetter.rsj
diff --git a/devel/fpc-fcl-res/Makefile b/devel/fpc-fcl-res/Makefile
index dd5926b23aa5..743f93e089dc 100644
--- a/devel/fpc-fcl-res/Makefile
+++ b/devel/fpc-fcl-res/Makefile
@@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fcl-res
COMMENT= Free Pascal resource handlers (FCL)
USES= fpc
+USE_FPC= rtl-objpas fcl-base tplylib
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-res/pkg-plist b/devel/fpc-fcl-res/pkg-plist
index 7712dd0959cd..14363cf9ac93 100644
--- a/devel/fpc-fcl-res/pkg-plist
+++ b/devel/fpc-fcl-res/pkg-plist
@@ -44,6 +44,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machotypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machotypes.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machowriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machowriter.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/rcparser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/rcparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/rcreader.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/rcreader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resdatastream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resdatastream.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resfactory.o
diff --git a/devel/fpc-regexpr/Makefile b/devel/fpc-regexpr/Makefile
index b109a326a339..92919c142f25 100644
--- a/devel/fpc-regexpr/Makefile
+++ b/devel/fpc-regexpr/Makefile
@@ -1,6 +1,5 @@
# Created by: John Merryweather Cooper et al
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -regexpr
diff --git a/devel/fpc-tplylib/Makefile b/devel/fpc-tplylib/Makefile
new file mode 100644
index 000000000000..a26f6f63f72f
--- /dev/null
+++ b/devel/fpc-tplylib/Makefile
@@ -0,0 +1,12 @@
+CATEGORIES= devel lang
+PKGNAMESUFFIX= -tplylib
+
+COMMENT= Unit for a compiler generator for Turbo Pascal and compatibles
+
+USES= fpc
+
+MASTERDIR= ${.CURDIR}/../../lang/fpc
+WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR= ${WRKUNITDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-tplylib/pkg-plist b/devel/fpc-tplylib/pkg-plist
new file mode 100644
index 000000000000..38becd1bd90f
--- /dev/null
+++ b/devel/fpc-tplylib/pkg-plist
@@ -0,0 +1,5 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/tplylib.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tplylib/lexlib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tplylib/lexlib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tplylib/yacclib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tplylib/yacclib.ppu
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index 3568a813ac37..74d222be0094 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -1,8 +1,7 @@
# Created by: John Merryweather Cooper <coop9211 at uidaho.edu>
PORTNAME= base
-PORTVERSION= 3.2.0
-PORTREVISION= 1
+PORTVERSION= 3.2.2
CATEGORIES= lang
PKGNAMEPREFIX= fpc-
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index c938837df753..92be88cafa04 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -1,7 +1,7 @@
# Created by: John Merryweather Cooper
PORTNAME= docs
-PORTVERSION= 3.2.0
+PORTVERSION= 3.2.2
CATEGORIES= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \
ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/docs/
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index 261358488ade..2b022acdb244 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601823528
-SHA256 (freepascal/3.2.0/doc-pdf.tar.gz) = 5c4efe4709c387182d6da214bdd159f503ae9aa65c5c3e47c299cd7a03ed8de1
-SIZE (freepascal/3.2.0/doc-pdf.tar.gz) = 9644753
+TIMESTAMP = 1627716992
+SHA256 (freepascal/3.2.2/doc-pdf.tar.gz) = 4dccbd4210995a94b76d1624a796c0abcf5118c0b92c487ab35a9d5a8bc68138
+SIZE (freepascal/3.2.2/doc-pdf.tar.gz) = 9762841
diff --git a/lang/fpc-pastojs/files/patch-packages-pastojs_fpmake.pp b/lang/fpc-pastojs/files/patch-packages-pastojs_fpmake.pp
deleted file mode 100644
index 49c23cb45955..000000000000
--- a/lang/fpc-pastojs/files/patch-packages-pastojs_fpmake.pp
+++ /dev/null
@@ -1,14 +0,0 @@
---- packages/pastojs/fpmake.pp 2020-10-04 00:18:21.474418000 -0500
-+++ packages/pastojs/fpmake.pp 2020-10-04 00:18:32.337561000 -0500
-@@ -57,6 +57,11 @@
- T:=P.Targets.AddUnit('pas2jspparser.pp');
- T:=P.Targets.AddUnit('pas2jsuseanalyzer.pp');
- T:=P.Targets.AddUnit('pas2jscompiler.pp');
-+ T:=P.Targets.AddUnit('pas2jsresstrfile.pp');
-+ T.ResourceStrings := True;
-+ T:=P.Targets.AddUnit('pas2jsresources.pp');
-+ T:=P.Targets.AddUnit('pas2jshtmlresources.pp');
-+ T:=P.Targets.AddUnit('pas2jsjsresources.pp');
- T:=P.Targets.AddUnit('pas2jsfscompiler.pp');
- T.Dependencies.AddUnit('pas2jscompiler');
- T:=P.Targets.AddUnit('pas2jspcucompiler.pp');
diff --git a/lang/fpc-rtl-extra/Makefile b/lang/fpc-rtl-extra/Makefile
index edc6f224e0a9..0dab5bc1f6e3 100644
--- a/lang/fpc-rtl-extra/Makefile
+++ b/lang/fpc-rtl-extra/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION= 2
CATEGORIES= lang
PKGNAMESUFFIX= -rtl-extra
diff --git a/lang/fpc-rtl-objpas/Makefile b/lang/fpc-rtl-objpas/Makefile
index ddcffa94b11e..041204a76700 100644
--- a/lang/fpc-rtl-objpas/Makefile
+++ b/lang/fpc-rtl-objpas/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION= 2
CATEGORIES= lang
PKGNAMESUFFIX= -rtl-objpas
diff --git a/lang/fpc-rtl-objpas/pkg-plist b/lang/fpc-rtl-objpas/pkg-plist
index 43205cc44c48..01d390e3e3b0 100644
--- a/lang/fpc-rtl-objpas/pkg-plist
+++ b/lang/fpc-rtl-objpas/pkg-plist
@@ -5,6 +5,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/dateutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/dateutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/fmtbcd.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/fmtbcd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/nullable.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/rtti.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/rtti.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/rtti.rsj
diff --git a/lang/fpc-source/Makefile b/lang/fpc-source/Makefile
index 77ad80ede63e..96867b2004ce 100644
--- a/lang/fpc-source/Makefile
+++ b/lang/fpc-source/Makefile
@@ -1,5 +1,5 @@
PORTNAME= fpc
-PORTVERSION= 3.2.0
+PORTVERSION= 3.2.2
DISTVERSIONSUFFIX=.source
CATEGORIES= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/ \
diff --git a/lang/fpc-source/distinfo b/lang/fpc-source/distinfo
index 9a9a342c65a2..1f4bd2743f90 100644
--- a/lang/fpc-source/distinfo
+++ b/lang/fpc-source/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601823640
-SHA256 (freepascal/fpc-3.2.0.source.tar.gz) = d595b72de7ed9e53299694ee15534e5046a62efa57908314efa02d5cc3b1cf75
-SIZE (freepascal/fpc-3.2.0.source.tar.gz) = 52028183
+TIMESTAMP = 1627716934
+SHA256 (freepascal/fpc-3.2.2.source.tar.gz) = d542e349de246843d4f164829953d1f5b864126c5b62fd17c9b45b33e23d2f44
+SIZE (freepascal/fpc-3.2.2.source.tar.gz) = 52240052
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 1668bf6d4fbb..72c888d22d53 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -1,6 +1,5 @@
PORTNAME= units
-PORTVERSION= 3.2.0
-PORTREVISION= 1
+PORTVERSION= 3.2.2
CATEGORIES= lang
PKGNAMEPREFIX= fpc-
@@ -22,8 +21,8 @@ ALL_OPTIONS= A52 ASPELL BFD BZIP2 CAIRO CHM DBLIB DBUS DTS FASTCGI \
LIBVLC LUA MAD MODPLUG NCURSES NEWT NUMLIB ODATA OGGVORBIS \
OPENAL OPENGL OPENSSL PASJPEG PASTOJS PCAP PROJ4 PXLIB RSVG \
REXX RTL_CONSOLE RTL_EXTRA RTL-GENERICS RTL_OBJPAS RTL_UNICODE \
- SDL SVGALIB SYMBOLIC SYSLOG UNZIP USERS UTMP UUID VCL-COMPAT \
- WEBIDL X11 XFORMS ZLIB
+ SDL SVGALIB SYMBOLIC SYSLOG TPLYLIB UNZIP USERS UTMP UUID \
+ VCL-COMPAT WEBIDL X11 XFORMS ZLIB
OPTIONS_DEFINE:= ${ALL_OPTIONS}
OPTIONS_DEFAULT:= ${ALL_OPTIONS}
@@ -107,6 +106,7 @@ SDL_DESC= Interface to SDL library
SVGALIB_DESC= Interface to svgalib library
SYMBOLIC_DESC= Simple expression parsing and evaluating
SYSLOG_DESC= Interface to system logger
+TPLYLIB_DESC= Compiler generator unit for Turbo Pascal and compatibles
UNZIP_DESC= Routines for unzipping zip files
USERS_DESC= Interface to manipulate users
UTMP_DESC= Gather information from the utmp file
diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile
index 7b8d0fe691c7..c3e41095e8fc 100644
--- a/lang/fpc-utils/Makefile
+++ b/lang/fpc-utils/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION= 1
CATEGORIES= lang
PKGNAMESUFFIX= -utils
diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist
index 36226640769a..f1928f4f82b5 100644
--- a/lang/fpc-utils/pkg-plist
+++ b/lang/fpc-utils/pkg-plist
@@ -38,10 +38,6 @@ bin/unitdiff.rsj
bin/webidl2pas
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/utils-lexyacc.fpm
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/utils-pas2js.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/lexlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/lexlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/yacclib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/yacclib.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-pas2js/dirwatch.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-pas2js/dirwatch.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-pas2js/httpcompiler.o
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index c42b8c58ae99..ca156b85ee75 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -1,8 +1,8 @@
# Created by: John Merryweather Cooper et al
PORTNAME= fpc
-PORTVERSION= 3.2.0
-PORTREVISION?= 1
+PORTVERSION= 3.2.2
+PORTREVISION?= 0
CATEGORIES?= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
@@ -102,6 +102,7 @@ do-extract:
${FPCSRCDIR}/packages/libtar \
${FPCSRCDIR}/packages/paszlib \
${FPCSRCDIR}/packages/rtl-objpas \
+ ${FPCSRCDIR}/packages/tplylib \
${FPCSRCDIR}/utils/fpcm)
post-patch:
@@ -136,7 +137,7 @@ do-build:
(cd ${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit && ${SETENV} \
${MAKE_ENV} ${MAKE_CMD} bootstrap ${MAKE_ARGS} ${NEWPPC})
@${ECHO_MSG} "##### COMPLETE BOOTSTRAP FPMKUNIT #####"
-.for component in fcl-res rtl-objpas fcl-base
+.for component in rtl-objpas fcl-base tplylib fcl-res
@${ECHO_MSG} "##### STARTING ${component:tu} #####"
(cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index 3a8a4f678a5a..7a9d4265902c 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1606173579
-SHA256 (freepascal/fpc-3.2.0.source.tar.gz) = d595b72de7ed9e53299694ee15534e5046a62efa57908314efa02d5cc3b1cf75
-SIZE (freepascal/fpc-3.2.0.source.tar.gz) = 52028183
-SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 3f5fa4b24abde00a1dcfe7e28938e8b7bf908c7d6633182521916e2191ae867d
-SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1121653
+TIMESTAMP = 1627713160
+SHA256 (freepascal/fpc-3.2.2.source.tar.gz) = d542e349de246843d4f164829953d1f5b864126c5b62fd17c9b45b33e23d2f44
+SIZE (freepascal/fpc-3.2.2.source.tar.gz) = 52240052
SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = fb57c418ec374ed99cd7914a4daa5fc6afccfbf41595a886c361e3fef8bbdbb3
SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1198576
-SHA256 (freepascal/fpc-3.2.0.man.tar.gz) = d510a75642cfb87ed18c3e4d533ffcc3b9c5e7219ca914ebe7cdab47eefb3398
-SIZE (freepascal/fpc-3.2.0.man.tar.gz) = 47338
+SHA256 (freepascal/fpc-3.2.2.man.tar.gz) = 4b7d7d50922531fa01e00d0bc913abb40426ba3001579240bf3db3f4ad640584
+SIZE (freepascal/fpc-3.2.2.man.tar.gz) = 47334
diff --git a/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc b/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc
index da74fedc93ad..58cb0c24d934 100644
--- a/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc
+++ b/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc
@@ -1,15 +1,44 @@
---- rtl/bsd/bunxsysc.inc 2015-08-04 04:31:09.000000000 -0500
-+++ rtl/bsd/bunxsysc.inc 2020-02-21 18:30:23.409088000 -0500
-@@ -379,10 +379,10 @@
- {$if defined(freebsd) or defined (dragonfly)}
- {$define PIPE_RESULT_IN_EAX_AND_EDX}
- {$endif}
+--- rtl/bsd/bunxsysc.inc.orig 2015-07-14 16:58:27.000000000 -0500
++++ rtl/bsd/bunxsysc.inc 2021-07-31 02:57:36.924782000 -0500
+@@ -374,39 +374,11 @@
+ FPutime:=do_syscall(syscall_nr_utimes,TSysParam(path),TSysParam(tvp));
+ end;
+
+-function __pipe_call(sysnr:TSysParam):TSysResult; {$ifdef cpui386}oldfpccall{$endif} external name 'FPC_DOSYS0';
++function FPpipe(var fildes : tfildes; flags:cint):cint;
+
+-{$if defined(freebsd) or defined (dragonfly)}
+- {$define PIPE_RESULT_IN_EAX_AND_EDX}
+-{$endif}
-Function FPpipe(var fildes : tfildes):cint;
-+Function FPpipe(var fildes : tfildes; flags:cint):cint;
- {$ifndef PIPE_RESULT_IN_EAX_AND_EDX}
+-{$ifndef PIPE_RESULT_IN_EAX_AND_EDX}
begin
- fppipe:=do_syscall(syscall_nr_pipe,TSysParam(@fildes));
+ fppipe:=do_syscall(syscall_nr_pipe2,TSysParam(@fildes), TSysParam(flags));
end;
- {$else}
- var
+-{$else}
+-var
+- a, b: cInt;
+-begin
+- asm
+- {$ifdef CPUi386}
+- pushl syscall_nr_pipe
+- call __pipe_call
+- movl %eax, a
+- movl %edx, b
+- {$else}
+- movq syscall_nr_pipe, %rdi
+- call __pipe_call
+- movl %eax, a
+- movl %edx, b
+- {$endif}
+- end;
+-
+- fpPipe := a; // eax is in a, no matter if it worked or not
+- fildes[0] := a;
+- fildes[1] := b;
+-end;
+-{$endif}
+
+ function FPfcntl(fildes:cint;Cmd:cint;Arg:cint):cint;
+
diff --git a/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc b/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc
index d9856a2342a4..372bd61a2076 100644
--- a/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc
+++ b/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc
@@ -7,7 +7,7 @@
+ flags : cint;
begin
- assignPipe:=fppipe(pip);
-+ assignPipe:=fppipe(pip, flags);
++ assignPipe:=fppipe(pip, 0);
pipe_in:=pip[0];
pipe_out:=pip[1];
end;
diff --git a/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp
index 3ec35927568b..24f9137c0999 100644
--- a/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp
+++ b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp
@@ -7,7 +7,7 @@
- P.OSes := [win32, win64, linux, freebsd];
+ P.OSes := [win32, win64, linux, dragonfly, freebsd];
P.Dependencies.Add('fcl-base');
- P.Version:='3.2.0';
+ P.Version:='3.2.2';
P.License := 'LGPL with modification';
P.HomepageURL := 'www.freepascal.org';
P.Email := 'michael at freepascal.org';
More information about the dev-commits-ports-main
mailing list