7 files changed, 144 insertions, 12 deletions

diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index ab1ea01df455..9addab0b69a0 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fpc
 PORTVERSION=	3.0.4
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
 		ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
@@ -107,8 +107,6 @@ post-patch:
 .if ${OPSYS} == FreeBSD
 	@${REINPLACE_CMD} -i "" -e 's|900044|${OSVERSION}|g' \
 		${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.as
-	@${REINPLACE_CMD} -i "" -e 's|197|477|g' \
-		${WRKSRC}/rtl/freebsd/sysnr.inc
 .else
 	@${REINPLACE_CMD} -i "" -e 's|400000|${DFLYVERSION}|g' \
 		${WRKSRC}/rtl/dragonfly/${FPC_ARCH}/*.as
@@ -185,7 +183,7 @@ do-install:
 		"${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" \
 		"${STAGEDIR}${PREFIX}/etc"
 	@${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||' \
-		-e 's|^-Fl/usr/local/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt4;${LOCALBASE}/lib/qt5|g' \
+		-e 's|^#-Fl/lib;/usr/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt5|g' \
 		${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample
 
 .else
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index 94bb968a9b8a..200587cb4a7a 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1577757794
+TIMESTAMP = 1582397737
 SHA256 (freepascal/fpc-3.0.4.source.tar.gz) = 69b3b7667b72b6759cf27226df5eb54112ce3515ff5efb79d95ac14bac742845
 SIZE (freepascal/fpc-3.0.4.source.tar.gz) = 40347617
-SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = e8ee85613149a40f887fe7f0ad46604fb93b52989d7212dfe7bb909bdab63859
-SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1121658
-SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = ba021dd49afedf554f9c3dddeb5b81c2728836ca95848625f80dbe5dd3c7b2d8
-SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1198609
+SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 3f5fa4b24abde00a1dcfe7e28938e8b7bf908c7d6633182521916e2191ae867d
+SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1121653
+SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = fb57c418ec374ed99cd7914a4daa5fc6afccfbf41595a886c361e3fef8bbdbb3
+SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1198576
 SHA256 (freepascal/fpc-3.0.4.man.tar.gz) = bc5357fc6e56d77eeeb5d820023f7f721f5febcc684837f296a598c6c772b26c
 SIZE (freepascal/fpc-3.0.4.man.tar.gz) = 47294
diff --git a/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc b/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc
new file mode 100644
index 000000000000..da74fedc93ad
--- /dev/null
+++ b/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc
@@ -0,0 +1,15 @@
+--- 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}
+-Function FPpipe(var fildes : tfildes):cint;
++Function FPpipe(var fildes : tfildes; flags:cint):cint;
+ {$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
diff --git a/lang/fpc/files/patch-rtl-freebsd_sysnr.inc b/lang/fpc/files/patch-rtl-freebsd_sysnr.inc
new file mode 100644
index 000000000000..e8a14fb76f48
--- /dev/null
+++ b/lang/fpc/files/patch-rtl-freebsd_sysnr.inc
@@ -0,0 +1,57 @@
+--- rtl/freebsd/sysnr.inc	2020-02-21 13:23:53.181811000 -0500
++++ rtl/freebsd/sysnr.inc	2020-02-21 17:55:07.026920000 -0500
+@@ -16,9 +16,9 @@
+ {More or less checked/in use FreeBSD syscalls}
+  syscall_nr_readv                       = 120;
+  syscall_nr_writev                      = 121;
+- syscall_nr_pread                       = 173;
+- syscall_nr_pwrite                      = 174;
+- syscall_nr_semsys                      = 169;
++ syscall_nr_pread                       = 475;
++ syscall_nr_pwrite                      = 476;
++ syscall_nr_semsys                      = 169; 
+  syscall_nr_msgsys                      = 170;
+  syscall_nr_shmsys                      = 171;
+  syscall_nr_mkfifo                      = 132;
+@@ -48,15 +48,15 @@
+  syscall_nr_fcntl                       =  92;
+  syscall_nr_flock                       = 131;
+  syscall_nr_fork                        =   2;
+- syscall_nr_fstat                       = 189;
++ syscall_nr_fstat                       = 189;  // COMPAT11x
+  syscall_nr_statfs4                     = 157;  // COMPAT4x
+  syscall_nr_fstatfs4                    = 158;  // COMPAT4x
+- syscall_nr_getfsstat                   = 395;  
++ syscall_nr_getfsstat                   = 395;  // COMPAT11x
+  syscall_nr_statfs                      = 396;  
+  syscall_nr_fstatfs                     = 397;  
+  syscall_nr_fsync                       =  95;
+- syscall_nr_ftruncate                   = 201;
+- syscall_nr_getdents                    = 272;
++ syscall_nr_ftruncate                   = 480;
++ syscall_nr_getdents                    = 272; 
+  syscall_nr_getegid                     =  43;
+  syscall_nr_geteuid                     =  25;
+  syscall_nr_getgid                      =  47;
+@@ -70,15 +70,16 @@
+  syscall_nr_ioctl                       =  54;
+  syscall_nr_kill                        =  37;
+  syscall_nr_link                        =   9;
+- syscall_nr_listen                      = 106;
+- syscall_nr_lseek                       = 199;
+- syscall_nr_lstat                       = 190;
++ syscall_nr_listen                      = 106; 
++ syscall_nr_lseek                       = 478;
++ syscall_nr_lstat                       = 190; 
+  syscall_nr_mkdir                       = 136;
+  syscall_nr_mknod                       =  14;
+- syscall_nr_mmap                        = 197;
++ syscall_nr_mmap                        = 477;
+  syscall_nr_open                        =   5;
+  syscall_nr_pipe                        =  42;
+- syscall_nr_poll                        = 209;
++ syscall_nr_pipe2                       = 542;
++ syscall_nr_poll                        = 209; 
+  syscall_nr_read                        =   3;
+  syscall_nr_readlink                    =  58;
+  syscall_nr_recvfrom                    =  29;
diff --git a/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc b/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc
new file mode 100644
index 000000000000..d9856a2342a4
--- /dev/null
+++ b/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc
@@ -0,0 +1,13 @@
+--- rtl/freebsd/unxfunc.inc	2020-02-21 18:39:27.076200000 -0500
++++ rtl/freebsd/unxfunc.inc	2020-02-21 18:39:47.649039000 -0500
+@@ -49,8 +49,9 @@
+ }
+ var
+   pip  : tfildes;
++  flags : cint;
+ begin
+-  assignPipe:=fppipe(pip);
++  assignPipe:=fppipe(pip, flags);
+   pipe_in:=pip[0];
+   pipe_out:=pip[1];
+ end;
diff --git a/lang/fpc/files/patch-rtl-unix_bunxh.inc b/lang/fpc/files/patch-rtl-unix_bunxh.inc
new file mode 100644
index 000000000000..bc8ae3f5a68a
--- /dev/null
+++ b/lang/fpc/files/patch-rtl-unix_bunxh.inc
@@ -0,0 +1,11 @@
+--- rtl/unix/bunxh.inc	2020-02-21 18:37:42.890255000 -0500
++++ rtl/unix/bunxh.inc	2020-02-21 18:38:00.256721000 -0500
+@@ -34,7 +34,7 @@
+     Function  FpChmod      (path : pChar; Mode : TMode): cInt;
+     Function  FpChown      (path : pChar; owner : TUid; group : TGid): cInt;
+     Function  FpUtime      (path : pChar; times : putimbuf): cInt;
+-    Function  FpPipe       (var fildes : tfildes):cInt;
++    Function  FpPipe       (var fildes : tfildes; flags : cInt):cInt;
+     Function  FpDup        (fildes : cInt): cInt;  external name 'FPC_SYSC_DUP';
+     Function  FpDup2       (fildes, fildes2 : cInt): cInt; external name 'FPC_SYSC_DUP2';
+     Function  FpTimes      (var buffer : tms): TClock;
diff --git a/lang/fpc/files/patch-rtl_bsd_ossysc.inc b/lang/fpc/files/patch-rtl_bsd_ossysc.inc
index 8523477458a8..b1bfa41edde4 100644
--- a/lang/fpc/files/patch-rtl_bsd_ossysc.inc
+++ b/lang/fpc/files/patch-rtl_bsd_ossysc.inc
@@ -1,6 +1,44 @@
---- rtl/bsd/ossysc.inc.orig	2015-11-13 21:15:29 UTC
-+++ rtl/bsd/ossysc.inc
-@@ -282,7 +282,11 @@ begin
+--- rtl/bsd/ossysc.inc	2014-11-23 16:59:25.000000000 -0500
++++ rtl/bsd/ossysc.inc	2020-02-21 21:01:06.087663000 -0500
+@@ -72,9 +72,9 @@
+ 
+ begin
+   {$ifdef CPU64}
+-    Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,TSysParam(fd),0,Offset,whence);
++    Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,TSysParam(fd),Offset,whence);
+   {$else}
+-    Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,0,TSysParam(fd),0,lo(Offset),{0} hi(offset),Whence);
++    Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,0,TSysParam(fd),lo(Offset),{0} hi(offset),Whence);
+   {$endif}
+ end;
+ 
+@@ -82,11 +82,10 @@
+ 
+ begin
+  {$ifdef CPU64}
+-   Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate, fd  ,0   ,flength);
++   Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate, fd ,flength);
+  {$else}
+-   Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate,0,fd,0,lo(flength),hi(flength));
++   Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate,0,fd,lo(flength),hi(flength));
+  {$endif}
+-
+ end;
+ 
+ 
+@@ -94,9 +93,9 @@
+ 
+ begin
+  {$ifdef CPU64}
+-  Fpmmap:=pointer(ptruint(do_syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),0,TSysParam(offst))));
++  Fpmmap:=pointer(ptruint(do_syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),TSysParam(offst))));
+ {$else}
+- Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,0,
++ Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,
+          {$ifdef FPC_BIG_ENDIAN}    hi(offst),lo(offst){$endif}
+          {$ifdef FPC_LITTLE_ENDIAN} lo(offst),hi(offst){$endif}
+          )));
+@@ -282,7 +281,11 @@
   repeat
    novalid:=false;
    CurEntry:=pdirent(dirp^.dd_rewind);