lang/fpc: update to 3.2.2

* Add new unit devel/fpc-tplylib
* Remove COMPAT10 dependency  [PR/254481]
PR:		254481
Reported by:	jbeich

4 files changed, 49 insertions, 21 deletions

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;