svn commit: r556562 - in head/x11-fm/doublecmd: . files

[Mikael Urankar]

Author: mikael
Date: Sun Nov 29 10:42:29 2020
New Revision: 556562
URL: https://svnweb.freebsd.org/changeset/ports/556562

Log:
  x11-fm/doublecmd: Fix build with FreePascal 3.2.0
  
  PR:		251426
  Submitted by:	Beñat Gonzalez Etxepare (maintainer)

Added:
  head/x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas   (contents, props changed)
Modified:
  head/x11-fm/doublecmd/Makefile

Modified: head/x11-fm/doublecmd/Makefile
==============================================================================
--- head/x11-fm/doublecmd/Makefile	Sun Nov 29 10:39:05 2020	(r556561)
+++ head/x11-fm/doublecmd/Makefile	Sun Nov 29 10:42:29 2020	(r556562)
@@ -25,7 +25,7 @@ USE_FPC=	cairo chm fcl-base fcl-db fcl-image fcl-json 
 		fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr
 USE_GNOME=	cairo glib20
 USE_XORG=	x11
-DOS2UNIX_FILES=	src/dmhelpmanager.pas
+DOS2UNIX_FILES=	src/dmhelpmanager.pas components/multithreadprocs/mtpcpu.pas
 
 PLIST=		${WRKDIR}/pkg-plist
 

Added: head/x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas	Sun Nov 29 10:42:29 2020	(r556562)
@@ -0,0 +1,22 @@
+--- components/multithreadprocs/mtpcpu.pas.orig	2015-09-06 12:19:32 UTC
++++ components/multithreadprocs/mtpcpu.pas
+@@ -69,15 +69,17 @@ end;
+     t = sysconf(_SC_NPROC_ONLN);
+   end;
+ {$ELSEIF defined(freebsd) or defined(darwin)}
++type
++  PSysCtl = {$IF FPC_FULLVERSION>=30200}pcint{$ELSE}pchar{$ENDIF};
+ var
+   mib: array[0..1] of cint;
+-  len: cint;
++  len: csize_t;
+   t: cint;
+ begin
+   mib[0] := CTL_HW;
+   mib[1] := HW_NCPU;
+   len := sizeof(t);
+-  fpsysctl(pchar(@mib), 2, @t, @len, Nil, 0);
++  fpsysctl(PSysCtl(@mib), 2, @t, @len, Nil, 0);
+   Result:=t;
+ end;
+ {$ELSEIF defined(linux)}