Skip to content

Commit

Permalink
lang/fpc: Fix build issues building some fpc based apps
Browse files Browse the repository at this point in the history
- Add missing parameter to getdirentries syscall function
- Re-build i386 and amd64 bootstrap
- Revert fpc-i386 (FPC_USE_LIBC) build to syscall build
- Bump PORTREVISION in all ports dependant of freepascal compiler
  • Loading branch information
alonsobsd committed Jun 21, 2022
1 parent b790bae commit c77c319
Show file tree
Hide file tree
Showing 22 changed files with 28 additions and 26 deletions.
1 change: 1 addition & 0 deletions archivers/peazip/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= peazip
PORTVERSION= 8.6.0
PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
Expand Down
2 changes: 1 addition & 1 deletion cad/zcad/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= zcad
PORTVERSION= 0.9.8.5
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= cad
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}

Expand Down
2 changes: 1 addition & 1 deletion comms/cqrlog/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
PORTNAME= cqrlog
PORTVERSION= 2.5.0
DISTVERSIONPREFIX= v
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= comms hamradio
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}

Expand Down
2 changes: 1 addition & 1 deletion editors/cudatext/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PORTNAME= cudatext
PORTVERSION= 1.166.0
PORTVERSION= 1.166.2
CATEGORIES= editors
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}

Expand Down
2 changes: 1 addition & 1 deletion editors/lazarus/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PORTNAME= lazarus
PORTVERSION= 2.2.2
DISTVERSIONSUFFIX= -0
PKGNAMESUFFIX?= -gtk2
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= editors devel
MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
LOCAL/acm/freepascal
Expand Down
2 changes: 1 addition & 1 deletion editors/picpas/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= picpas
PORTVERSION= 0.9.0
PORTREVISION= 5
PORTREVISION= 6
DISTVERSIONPREFIX= v
CATEGORIES= editors
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
Expand Down
2 changes: 1 addition & 1 deletion games/hedgewars/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= hedgewars
PORTVERSION= 1.0.0
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://www.hedgewars.org/download/releases/ \
http://mirror.amdmi3.ru/distfiles/
Expand Down
2 changes: 1 addition & 1 deletion graphics/fpc-rsvg/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>

PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics lang
PKGNAMESUFFIX= -rsvg

Expand Down
2 changes: 1 addition & 1 deletion graphics/lazpaint/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= lazpaint
PORTVERSION= 7.1.6
PORTREVISION= 3
PORTREVISION= 4
DISTVERSIONPREFIX= v
CATEGORIES= graphics
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
Expand Down
2 changes: 1 addition & 1 deletion lang/fpc-source/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= fpc
PORTVERSION= 3.2.2
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONSUFFIX=.source
CATEGORIES= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/ \
Expand Down
5 changes: 3 additions & 2 deletions lang/fpc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= fpc
PORTVERSION= 3.2.2
PORTREVISION?= 2
PORTREVISION?= 3
CATEGORIES?= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
Expand Down Expand Up @@ -38,12 +38,13 @@ FPCSRCDIR= ${PORTNAME}-${PORTVERSION}
.if ${ARCH} == "i386"
PPNAME= ppc386
FPC_ARCH= i386
OPT= "-dFPC_USE_LIBC"
#OPT= "-dFPC_USE_LIBC"
PLIST_SUB+= FPC_I386="" \
FPC_AMD64="@comment "
.elif ${ARCH} == "amd64"
PPNAME= ppcx64
FPC_ARCH= x86_64
#OPT= "-dFPC_USE_LIBC"
PLIST_SUB+= FPC_I386="@comment " \
FPC_AMD64=""
.endif
Expand Down
10 changes: 5 additions & 5 deletions lang/fpc/distinfo
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
TIMESTAMP = 1655522950
TIMESTAMP = 1655772890
SHA256 (freepascal/fpc-3.2.2.source.tar.gz) = d542e349de246843d4f164829953d1f5b864126c5b62fd17c9b45b33e23d2f44
SIZE (freepascal/fpc-3.2.2.source.tar.gz) = 52240052
SHA256 (freepascal/ppc386-3.2.2-freebsd.tar.gz) = 146ed6ce89d3e566a89608021efe79774ca2ce6d996abf9f00bb5ac070cd060e
SIZE (freepascal/ppc386-3.2.2-freebsd.tar.gz) = 1361735
SHA256 (freepascal/ppcx64-3.2.2-freebsd.tar.gz) = ea29622ec89148d6d24360ca093e33b4d067fd1596c654c5371d7e870fb03342
SIZE (freepascal/ppcx64-3.2.2-freebsd.tar.gz) = 2052926
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.2.2.man.tar.gz) = 4b7d7d50922531fa01e00d0bc913abb40426ba3001579240bf3db3f4ad640584
SIZE (freepascal/fpc-3.2.2.man.tar.gz) = 47334
2 changes: 1 addition & 1 deletion lang/fpc/files/patch-rtl_bsd_ossysc.inc
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
+{$ifdef freebsd}
+function FpGetdirentries(fd : cint; buf : pchar; nbytes : clong) : cint;
+begin
+ FpGetdirentries:=do_syscall(syscall_nr_getdirentries,fd,TSysParam(buf), nbytes);
+ FpGetdirentries:=do_syscall(syscall_nr_getdirentries,fd,TSysParam(buf), nbytes, TSysParam(0));
+end;
+{$endif}

Expand Down
2 changes: 1 addition & 1 deletion multimedia/winff/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= WinFF
PORTVERSION= 1.5.5
PORTREVISION= 23
PORTREVISION= 24
CATEGORIES= multimedia
MASTER_SITES= LOCAL/thierry
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
Expand Down
2 changes: 1 addition & 1 deletion net-p2p/awgg/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= awgg
PORTVERSION= 0.6.0
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= net-p2p
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}

Expand Down
2 changes: 1 addition & 1 deletion net-p2p/transmission-remote-gui/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= transmission-remote-gui
PORTVERSION= 5.18.0
PORTREVISION= 9
PORTREVISION= 10
DISTVERSIONPREFIX= v
CATEGORIES= net-p2p
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
Expand Down
2 changes: 1 addition & 1 deletion net/fpc-ldap/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>

PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= net lang
PKGNAMESUFFIX= -ldap

Expand Down
2 changes: 1 addition & 1 deletion russian/emkatic/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= emkatic
PORTVERSION= 0.41
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= russian emulators
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
MASTER_SITES= SF/${PORTNAME}/eMKatic%20Source
Expand Down
2 changes: 1 addition & 1 deletion science/checkmol/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= checkmol
PORTVERSION= 0.5
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= science
MASTER_SITES= https://homepage.univie.ac.at/norbert.haider/download/chemistry/checkmol/
DISTFILES= ${PORTNAME}
Expand Down
2 changes: 1 addition & 1 deletion science/mol2ps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= mol2ps
PORTVERSION= 0.4b
PORTREVISION= 11
PORTREVISION= 12
CATEGORIES= science
MASTER_SITES= https://homepage.univie.ac.at/norbert.haider/download/chemistry/mol2ps/
DISTNAME= ${PORTNAME}
Expand Down
2 changes: 1 addition & 1 deletion textproc/fpc-libxml2/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Created by: Christoper Key <cjk32@cam.ac.uk>

PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= textproc lang
PKGNAMESUFFIX= -libxml2

Expand Down
2 changes: 1 addition & 1 deletion x11-fm/doublecmd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= doublecmd
PORTVERSION= 1.0.4
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= x11-fm
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
Expand Down

0 comments on commit c77c319

Please sign in to comment.