- Update to 2.4.2

See changelog at: http://wiki.freepascal.org/User_Changes_2.4.2

15 files changed, 28 insertions, 142 deletions

diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
index a12f541000d3..e1691c66904a 100644
--- a/Mk/bsd.fpc.mk
+++ b/Mk/bsd.fpc.mk
@@ -30,7 +30,7 @@ _FPCMKINCLUDED=	yes
 FPC_Include_MAINTAINER=	acm@FreeBSD.org
 FPC_Pre_Include=	bsd.fpc.mk
 
-DEFAULT_FPC_VER=	2.4.0
+DEFAULT_FPC_VER=	2.4.2
 FPC_VER=		${DEFAULT_FPC_VER}
 FPC_ARCH=		${ARCH:S/amd64/x86_64/}
 
diff --git a/devel/fpc-fcl-base/pkg-plist b/devel/fpc-fcl-base/pkg-plist
index 1a116242a47b..0e40a2b429fa 100644
--- a/devel/fpc-fcl-base/pkg-plist
+++ b/devel/fpc-fcl-base/pkg-plist
@@ -27,7 +27,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/daemonapp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptemplate.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.o
@@ -57,7 +57,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/daemonapp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptemplate.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpascii85.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcontnrs.a
@@ -87,8 +87,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamcoll.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpmaskutils.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfpexprpars.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpsyncobjs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpdaemonapp.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptimer.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptemplate.a
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
diff --git a/devel/fpc-fcl-net/pkg-plist b/devel/fpc-fcl-net/pkg-plist
index a4e320d6f052..1675e08c5a34 100644
--- a/devel/fpc-fcl-net/pkg-plist
+++ b/devel/fpc-fcl-net/pkg-plist
@@ -1,5 +1,6 @@
 bin/mkxmlrpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.ppu
@@ -9,6 +10,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpbase.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpclient.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpsvlt.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/xmlrpc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.o
@@ -18,6 +20,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpbase.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpclient.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpsvlt.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/xmlrpc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpcnetdb.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpnetdb.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpresolve.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpssockets.a
diff --git a/devel/fpc-fcl-res/pkg-plist b/devel/fpc-fcl-res/pkg-plist
index 40585cbf619f..31b3bc02e0ab 100644
--- a/devel/fpc-fcl-res/pkg-plist
+++ b/devel/fpc-fcl-res/pkg-plist
@@ -69,6 +69,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresreader.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpreswriter.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpstringtableresource.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpstrtable.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libptlbreader.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpversionconsts.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpversionresource.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpversiontypes.a
@@ -99,6 +100,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/stringtableresource.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/stringtableresource.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/strtable.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/strtable.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/tlbreader.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/tlbreader.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionconsts.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionconsts.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionresource.o
diff --git a/devel/fpc-fcl-web/pkg-plist b/devel/fpc-fcl-web/pkg-plist
index 1cb1ec4f1a0e..2daa2fd3750c 100644
--- a/devel/fpc-fcl-web/pkg-plist
+++ b/devel/fpc-fcl-web/pkg-plist
@@ -9,7 +9,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fptemplate.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.ppu
@@ -25,7 +24,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fptemplate.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.o
@@ -41,7 +39,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttp.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustcgi.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustfcgi.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustweb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfptemplate.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphtml.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebsession.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpweb.a
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 3d6d78734ff8..5dec3f4018f9 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	docs
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \
 		ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/docs/ \
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index 63130687bb4d..bb6cf3fc4815 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,3 +1,2 @@
-MD5 (freepascal/doc-pdf.tar.gz) = 20c1d67974c4d3f4fc5d8c7f4136840e
-SHA256 (freepascal/doc-pdf.tar.gz) = ba11897d6734da631f93764ff87cecc475e8f43be0c64e5ec8a6cfb69fe6d24e
-SIZE (freepascal/doc-pdf.tar.gz) = 7192775
+SHA256 (freepascal/doc-pdf.tar.gz) = b528d320adc5597883745bc27efecc1155e6445ca2480fb0d3b82209ef374151
+SIZE (freepascal/doc-pdf.tar.gz) = 7408440
diff --git a/lang/fpc-lua/files/patch-Makefile b/lang/fpc-lua/files/patch-Makefile
index 8cae476ab648..b3f56a58c0df 100644
--- a/lang/fpc-lua/files/patch-Makefile
+++ b/lang/fpc-lua/files/patch-Makefile
@@ -6,6 +6,6 @@
  PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 -override PACKAGE_NAME=bfd
 +override PACKAGE_NAME=lua
- override PACKAGE_VERSION=2.4.0
+ override PACKAGE_VERSION=2.4.2
  ifeq ($(FULL_TARGET),i386-linux)
  override TARGET_UNITS+=lua lualib lauxlib
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 6085a7124e70..70cc43a17d59 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	units
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.2
 CATEGORIES=	lang
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	fpc-
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 242788740367..585ad5e3d045 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fpc
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.2
 PORTREVISION?=	0
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
@@ -72,6 +72,7 @@ MAN1=	bin2obj.1 \
 	fd2pascal.1 \
 	fp.1 \
 	fpc.1 \
+	fpclasschart.1 \
 	fpcmake.1 \
 	fpcmkcfg.1 \
 	fpdoc.1 \
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index e12e08f8e140..95636d93a7cf 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,12 +1,8 @@
-MD5 (freepascal/fpc-2.4.0.source.tar.gz) = d1c14576efc007efe876b95b3427df01
-SHA256 (freepascal/fpc-2.4.0.source.tar.gz) = 11bc81df2102325645955613737f2027a8acb0f2c9e8d564ad7318ca425e4f69
-SIZE (freepascal/fpc-2.4.0.source.tar.gz) = 25981207
-MD5 (freepascal/ppc386-2.4.0-freebsd.tar.gz) = 1fd7df3740d1758d2c58c1e276073904
-SHA256 (freepascal/ppc386-2.4.0-freebsd.tar.gz) = 870290e502c342d8eb56383bf717854cae38c84e66a4445d81efd7ea1a1166cd
-SIZE (freepascal/ppc386-2.4.0-freebsd.tar.gz) = 809641
-MD5 (freepascal/ppcx64-2.4.0-freebsd.tar.gz) = 513be074ddb5db8b82442aae5143caa6
-SHA256 (freepascal/ppcx64-2.4.0-freebsd.tar.gz) = 9ce78fda4560c541a9fe9e0230e6fad1833940115ca9771443f07292ccbdad7d
-SIZE (freepascal/ppcx64-2.4.0-freebsd.tar.gz) = 812761
-MD5 (freepascal/fpc-2.4.0.man.tar.gz) = 46d17eb2cfc63901ac44eedf0ee20aee
-SHA256 (freepascal/fpc-2.4.0.man.tar.gz) = ee5dee733c4dc5bedd8117a019f19217425629ca6cc6e5d8917d61d9639f6368
-SIZE (freepascal/fpc-2.4.0.man.tar.gz) = 30300
+SHA256 (freepascal/fpc-2.4.2.source.tar.gz) = ecbc7be56633ec80338ff25682a0ac644f9c0ead769cd573d0cda9d3f4343ca1
+SIZE (freepascal/fpc-2.4.2.source.tar.gz) = 25278167
+SHA256 (ppc386-2.4.2-freebsd.tar.gz) = 2647f5967bd84f3c91bb445e1ef093ae3518c6c8dbcb2155b469e95301c0e36d
+SIZE (freepascal/ppc386-2.4.2-freebsd.tar.gz) = 847877
+SHA256 (freepascal/ppcx64-2.4.2-freebsd.tar.gz) = a2e72b1df65c337c9fc4319df53754b0c6a8f9ffd3728878c5c99e04e5577dc1
+SIZE (freepascal/ppcx64-2.4.2-freebsd.tar.gz) = 856404
+SHA256 (freepascal/fpc-2.4.2.man.tar.gz) = 5fe8a7b601586d722254b93b3aa7036e28ae522ad92b9e105063ed9814b4a55e
+SIZE (freepascal/fpc-2.4.2.man.tar.gz) = 30504
diff --git a/lang/fpc/files/patch-rtl-bsd-x86_64_syscall.inc b/lang/fpc/files/patch-rtl-bsd-x86_64_syscall.inc
deleted file mode 100644
index e024f7e44594..000000000000
--- a/lang/fpc/files/patch-rtl-bsd-x86_64_syscall.inc
+++ /dev/null
@@ -1,89 +0,0 @@
---- rtl/bsd/x86_64/syscall.inc	2008-09-13 19:17:13.000000000 +0100
-+++ rtl/bsd/x86_64/syscall.inc	2010-08-12 11:35:15.000000000 +0100
-@@ -219,7 +219,6 @@
- .LSyscOK:
- end;
- 
--
- function fpsysCall(sysnr,param1,param2,param3,param4,param5,param6 : TSysParam):TSysResult; assembler;[public,alias:'FPC_DOSYS6'];
- 
- asm
-@@ -232,7 +231,6 @@
-   movq param6,%r9
-   syscall                 { Do the system call. }
-   jnb .LSyscOK            { branch to exit if ok, errorhandler otherwise}
--
-   movq  %rax,%rdx
- {$ifdef FPC_PIC}
-   movq  fpc_threadvar_relocate_proc@GOTPCREL(%rip),%rax
-@@ -257,50 +255,11 @@
- .LSyscOK:
- 
- end;
--//                    edi   esi   edx 	 ecx    r8      r9   stack
--function fp_sysCall(sysnr,param1,param2,param3,param4,param5,param6 : TSysParam):TSysResult; assembler;[public,alias:'FPC__DOSYS'];
- 
--asm
--  movq sysnr,%rax         { Syscall number -> rax.  }
--  movq param1,%rdi        { shift arg1 - arg6. }
--  movq param2,%rsi
--  movq param3,%rdx
--  movq param4,%r10
--  movq param5,%r8
--  movq param6,%r9
--  syscall                 { Do the system call. }
--  jnb .LSyscOK            { branch to exit if ok, errorhandler otherwise}
--  movq  %rax,%rdx
--{$ifdef FPC_PIC}
--  movq  fpc_threadvar_relocate_proc@GOTPCREL(%rip),%rax
--  movq  (%rax),%rax
--  movq  Errno@GOTPCREL(%rip),%r11
--{$else FPC_PIC}
--  movq  fpc_threadvar_relocate_proc,%rax
--  leaq  Errno,%r11
--{$endif FPC_PIC}
--  testq %rax,%rax
--  jne   .LThread
--  movl  %edx,8(%r11)
--  jmp   .LNoThread
--.LThread:
--  pushq %rdx
--  movq  (%r11),%rdi
--  call  *%rax
--  popq  %rdx
--  movl  %edx,(%rax)
--.LNoThread:
--  movq  $-1,%rax
--.LSyscOK:
--  add    $0x18,%rsp
--end;
--
--
--//                    edi   esi   edx 	 ecx    r8      r9   stack  stack
--function fp_sysCall(sysnr,param1,param2,param3,param4,param5,param6,param7 : TSysParam):TSysResult; assembler;[public,alias:'FPC__DOSYS7'];
-+function fp_sysCall(sysnr,param1,param2,param3,param4,param5,param6,param7 : TSysParam):TSysResult; assembler;[public,alias:'FPC_DOSYS7'];
- 
- asm
--  sub    $0x10,%rsp
-+  subq   $0x10,%rsp
-   movq   sysnr,%rax       { Syscall number -> rax.  }
-   movq   param1,%rdi      { shift arg1 - arg6. }
-   movq   param2,%rsi
-@@ -309,7 +268,7 @@
-   movq   param5,%r8
-   movq   param6,%r9
-   movq   param7,%r11
--  movq   %r11,(%rsp)
-+  movq   %r11,8(%rsp)
-   syscall                 { Do the system call. }
-   jnb .LSyscOK            { branch to exit if ok, errorhandler otherwise}
-   movq  %rax,%rdx
-@@ -334,6 +293,6 @@
- .LNoThread:
-   movq  $-1,%rax
- .LSyscOK:
--  add    $0x10,%rsp
-+  addq   $0x10,%rsp
- end;
- 
-
diff --git a/lang/fpc/files/patch-rtl-bsd-x86_64_syscallh.inc b/lang/fpc/files/patch-rtl-bsd-x86_64_syscallh.inc
deleted file mode 100644
index 89f0fe567c90..000000000000
--- a/lang/fpc/files/patch-rtl-bsd-x86_64_syscallh.inc
+++ /dev/null
@@ -1,10 +0,0 @@
---- rtl/bsd/x86_64/syscallh.inc	2008-10-31 18:19:44.000000000 +0000
-+++ rtl/bsd/x86_64/syscallh.inc	2010-08-12 11:35:15.000000000 +0100
-@@ -41,7 +41,5 @@
- function do_sysCall(sysnr,param1,param2,param3,param4,param5,param6:TSysParam):int64; external name 'FPC_DOSYS6';
- function do_sysCall(sysnr,param1,param2,param3,param4,param5,param6,param7:TSysParam):int64; external name 'FPC_DOSYS7';
- 
--// special
--function do__sysCall(sysnr,param1,param2,param3,param4,param5,param6,param7,Param8:TSysParam):TSysResult; external name 'FPC__DOSYS';
- {$endif}
- 
diff --git a/lang/fpc/files/patch-rtl-bsd_ossysc.inc b/lang/fpc/files/patch-rtl-bsd_ossysc.inc
deleted file mode 100644
index 8dabd322eb68..000000000000
--- a/lang/fpc/files/patch-rtl-bsd_ossysc.inc
+++ /dev/null
@@ -1,17 +0,0 @@
---- rtl/bsd/ossysc.inc	2009-05-02 10:40:44.000000000 +0100
-+++ rtl/bsd/ossysc.inc	2010-08-12 11:36:07.000000000 +0100
-@@ -94,11 +94,11 @@
- 
- begin
-  {$ifdef CPU64}
--  Fpmmap:=pointer(ptruint(do__syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),TSysParam(offst),0,0)));
-+  Fpmmap:=pointer(ptruint(do_syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),0,TSysParam(offst))));
- {$else}
--  Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,
-+  Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,0,
-         {$ifdef FPC_BIG_ENDIAN}    hi(offst),lo(offst){$endif}
--        {$ifdef FPC_LITTLE_ENDIAN} lo(offst),hi(offst){$endif},0
-+        {$ifdef FPC_LITTLE_ENDIAN} lo(offst),hi(offst){$endif}
-         )));
- {$endif}
- end;
diff --git a/misc/fpc-chm/pkg-plist b/misc/fpc-chm/pkg-plist
index 45cf30f7c873..eee1e6ad35b2 100644
--- a/misc/fpc-chm/pkg-plist
+++ b/misc/fpc-chm/pkg-plist
@@ -6,6 +6,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlutil.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzx.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzxcomp.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslznonslide.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/lzxcompressthread.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmbase.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmtypes.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmspecialfiles.ppu
@@ -20,6 +21,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlutil.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzx.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzxcomp.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslznonslide.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/lzxcompressthread.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmbase.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmtypes.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmspecialfiles.o
@@ -34,6 +36,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libphtmlutil.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslzx.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslzxcomp.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslznonslide.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libplzxcompressthread.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmbase.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmtypes.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmspecialfiles.a