4 files changed, 47 insertions, 14 deletions

diff --git a/lang/fpc-devel/Makefile b/lang/fpc-devel/Makefile
index 630cb9b4ba03..265d9c147981 100644
--- a/lang/fpc-devel/Makefile
+++ b/lang/fpc-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fpc
-PORTVERSION=	3.3.1.20231027
-PORTREVISION=	2
+PORTVERSION=	3.3.1.20240103
+PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/acm/freepascal/:bootstrap \
 		LOCAL/acm/freepascal/:man
@@ -29,9 +29,9 @@ USE_GITLAB=	yes
 GL_SITE=	https://gitlab.com/freepascal.org
 GL_ACCOUNT=	fpc
 GL_PROJECT=	source
-GL_COMMIT=	55e72fc0f1505c75f60af706736d32ceca9815a4
+GL_TAGNAME=	f86a9bd5c026c7a10a165a8225bcf83e17c47b25
 
-FPCSRCDIR=	source-${GL_COMMIT}
+FPCSRCDIR=	source-${GL_TAGNAME}
 
 .include <bsd.port.pre.mk>
 
@@ -85,7 +85,7 @@ do-extract:
 	@${TAR} -xzf ${_DISTDIR}/fpc-${MANVER}.man.tar.gz --directory ${WRKDIR}
 # unpack source distribution
 	@(cd ${WRKDIR} && ${GZIP_CMD} -dc \
-		${_DISTDIR}/${PORTNAME}-source-${GL_COMMIT}_GL0${EXTRACT_SUFX} | \
+		${_DISTDIR}/${PORTNAME}-source-${GL_TAGNAME}_GL0${EXTRACT_SUFX} | \
 		${TAR} -xf -)
 
 post-patch:
@@ -178,6 +178,9 @@ do-install:
 		"${STAGEDIR}${PREFIX}/etc"
 	@${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||' \
 		-e 's|^#-Fl/lib;/usr/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt5;${LOCALBASE}/lib/qt6|g' \
-		${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample
+			${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample \
+			${STAGEDIR}${PREFIX}/etc/fppkg.cfg.sample \
+			${STAGEDIR}${PREFIX}/etc/fppkg/default \
+			${STAGEDIR}${PREFIX}/lib/fpc/${FPCBASEVER}/ide/text/fp.cfg
 
 .include <bsd.port.post.mk>
diff --git a/lang/fpc-devel/distinfo b/lang/fpc-devel/distinfo
index 57b9a7abdf7c..8341946e9dc9 100644
--- a/lang/fpc-devel/distinfo
+++ b/lang/fpc-devel/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1698457114
+TIMESTAMP = 1704317940
 SHA256 (freepascal/ppc386-3.2.2-freebsd.tar.gz) = 2e175954442e28799edfe08c01635d209298b992f1062d03872571d58aa9f43a
 SIZE (freepascal/ppc386-3.2.2-freebsd.tar.gz) = 1364288
 SHA256 (freepascal/ppcx64-3.2.2-freebsd.tar.gz) = 8cf6258688c3457f27bcec18e6993443ed2fcfe7d7c8697d54a13f32965e8fb0
 SIZE (freepascal/ppcx64-3.2.2-freebsd.tar.gz) = 2052903
 SHA256 (freepascal/fpc-3.0.4.man.tar.gz) = bc5357fc6e56d77eeeb5d820023f7f721f5febcc684837f296a598c6c772b26c
 SIZE (freepascal/fpc-3.0.4.man.tar.gz) = 47294
-SHA256 (freepascal/fpc-source-55e72fc0f1505c75f60af706736d32ceca9815a4_GL0.tar.gz) = 6e8cf9b2c0b76462645239c2cd555f854536c857a01b5afb46bb2f3b6ac33061
-SIZE (freepascal/fpc-source-55e72fc0f1505c75f60af706736d32ceca9815a4_GL0.tar.gz) = 55866150
+SHA256 (freepascal/fpc-source-f86a9bd5c026c7a10a165a8225bcf83e17c47b25_GL0.tar.gz) = 77434e9bfa92c41a1d9fa41cdd125c953392399276dc42d78db5463ea75b2c35
+SIZE (freepascal/fpc-source-f86a9bd5c026c7a10a165a8225bcf83e17c47b25_GL0.tar.gz) = 55906223
diff --git a/lang/fpc-devel/files/patch-packages-rtl-extra_fpmake.pp b/lang/fpc-devel/files/patch-packages-rtl-extra_fpmake.pp
index 7c9b7d82cc64..c817ce63ffa2 100644
--- a/lang/fpc-devel/files/patch-packages-rtl-extra_fpmake.pp
+++ b/lang/fpc-devel/files/patch-packages-rtl-extra_fpmake.pp
@@ -1,11 +1,11 @@
---- packages/rtl-extra/fpmake.pp	2023-10-27 17:59:48.000000000 -0500
-+++ packages/rtl-extra/fpmake.pp	2023-12-22 18:28:44.664770000 -0500
+--- packages/rtl-extra/fpmake.pp	2024-01-03 08:10:39.000000000 -0500
++++ packages/rtl-extra/fpmake.pp	2024-01-03 16:21:18.846789000 -0500
 @@ -20,7 +20,7 @@
  //  IPCcdeclOSes  = [Darwin,iphonesim,ios];
  
    PrinterOSes   = [go32v2,msdos,os2,win32,win64,atari]+unixlikes-[beos,haiku,morphos];
 -  SerialOSes    = [android,linux,netbsd,openbsd,win32,win64];
 +  SerialOSes    = [android,linux,freebsd,netbsd,openbsd,win32,win64];
-   UComplexOSes  = [atari,embedded,emx,gba,go32v2,msdos,nativent,nds,netware,netwlibc,os2,sinclairql,symbian,watcom,wii,wince,win32,win64,freertos,wasi]+UnixLikes+AllAmigaLikeOSes;
-   MatrixOSes    = [atari,embedded,emx,gba,go32v2,msdos,nativent,nds,netware,netwlibc,os2,sinclairql,symbian,watcom,wii,win32,win64,wince,freertos,wasi]+UnixLikes+AllAmigaLikeOSes;
-   ObjectsOSes   = [atari,embedded,emx,gba,go32v2,macosclassic,msdos,nds,netware,netwlibc,os2,sinclairql,symbian,watcom,wii,win16,win32,win64,wince,freertos,wasi]+UnixLikes+AllAmigaLikeOSes;
+   UComplexOSes  = [atari,embedded,emx,gba,go32v2,msdos,nativent,nds,netware,netwlibc,os2,sinclairql,human68k,symbian,watcom,wii,wince,win32,win64,freertos,wasi]+UnixLikes+AllAmigaLikeOSes;
+   MatrixOSes    = [atari,embedded,emx,gba,go32v2,msdos,nativent,nds,netware,netwlibc,os2,sinclairql,human68k,symbian,watcom,wii,win32,win64,wince,freertos,wasi]+UnixLikes+AllAmigaLikeOSes;
+   ObjectsOSes   = [atari,embedded,emx,gba,go32v2,macosclassic,msdos,nds,netware,netwlibc,os2,sinclairql,human68k,symbian,watcom,wii,win16,win32,win64,wince,freertos,wasi]+UnixLikes+AllAmigaLikeOSes;
diff --git a/lang/fpc-devel/pkg-plist b/lang/fpc-devel/pkg-plist
index 61527dd62167..27e2feaf983b 100644
--- a/lang/fpc-devel/pkg-plist
+++ b/lang/fpc-devel/pkg-plist
@@ -183,6 +183,7 @@ lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/svgalib.fpm
 lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/symbolic.fpm
 lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/syslog.fpm
 lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/tcl.fpm
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/testinsight.fpm
 lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/tplylib.fpm
 lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/unzip.fpm
 lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/users.fpm
@@ -1883,6 +1884,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/crc.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/crc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/fnvhash.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/fnvhash.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/hmac.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/hmac.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/md5.o
@@ -2712,6 +2715,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/tcl80.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/tcl80.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/testinsight/fpcunittestinsight.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/testinsight/fpcunittestinsight.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/testinsight/testinsightclient.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/testinsight/testinsightclient.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/testinsight/testinsightprotocol.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/testinsight/testinsightprotocol.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tplylib/lexlib.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tplylib/lexlib.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tplylib/yacclib.o
@@ -2733,16 +2742,37 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-pas2js/httpcompiler.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-pas2js/httpcompiler.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.analytics.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.analytics.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.ansistrings.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.ansistrings.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.devices.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.devices.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.diagnostics.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.diagnostics.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.hash.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.hash.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.hash.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.imagelist.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.imagelist.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.ioutils.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.ioutils.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.ioutils.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.json.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.json.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.json.rsj
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.messaging.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.messaging.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.netencoding.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.netencoding.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.netencoding.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.notification.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.notification.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.permissions.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.permissions.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.pushnotifications.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.pushnotifications.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/vcl-compat/system.pushnotifications.rsj
 %%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/wasmedge/libwasmedge.o
 %%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/wasmedge/libwasmedge.ppu
 %%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/wasmtime/wasmtime.o