<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/be35db8e1bf03e25fcdf8ecf94bee5936f15b858">https://github.com/macports/macports-ports/commit/be35db8e1bf03e25fcdf8ecf94bee5936f15b858</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit be35db8e1bf03e25fcdf8ecf94bee5936f15b858
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Feb 7 06:04:59 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> fpc: non-functional: break some longer lines in portfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
lang/fpc/Portfile | 110 ++++++++++++++++++++++++++++++++++--------------------
1 file changed, 70 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fpc/Portfile b/lang/fpc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b7115f6b27..6a69cc242d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,12 +10,15 @@ license {GPL-2 LGPL-2}
</span> maintainers {@kamischi web.de:karl-michael.schindler} \
{@barracuda156 gmail.com:vital.had} \
openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Free Pascal, an open source Pascal and Object Pascal compiler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Free Pascal is a 32, 64 and 16 bit professional Pascal compiler. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- It can target many processor architectures: Intel x86 (including 8086), \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AMD64/x86-64, PowerPC, PowerPC64, SPARC, ARM, AArch64, MIPS and the JVM. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Supported operating systems include Linux, FreeBSD, Mac OS X/iOS/iPhoneSimulator/Darwin, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Win32, Win64, WinCE and Android.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Free Pascal, an open source Pascal and Object Pascal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Free Pascal is a 32, 64 and 16 bit professional Pascal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler. It can target many processor architectures: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Intel x86 (including 8086), AMD64/x86-64, PowerPC, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PowerPC64, SPARC, ARM, AArch64, MIPS and the JVM. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Supported operating systems include Linux, FreeBSD, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Mac OS X/iOS/iPhoneSimulator/Darwin, Win32, Win64, WinCE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and Android.
</span> homepage https://www.freepascal.org
# TODO: add support for i386
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +67,8 @@ universal_variant no
</span>
set fpcbasepath ${prefix}/libexec/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 22} { # 13, Ventura, fix obsolete linker options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS 13, Ventura, fix obsolete linker options
</span> patchfiles-append t_darwin.pas.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,8 +77,8 @@ subport "chmcmd-${name}" {
</span>
description The FPC Pascal htmlhelp (CHM) compiler
long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- chmcmd is an cross-platform utility to generate compressed HTML (.chm) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- documentation, written in Free Pascal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmcmd is a cross-platform utility to generate compressed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HTML (.chm) documentation, written in Free Pascal.
</span>
depends_build-append \
port:${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +127,8 @@ subport "${name}-cross" {
</span> use_configure no
patch.pre_args -p1
build.args OPT="-ap -v0"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target aarch64 arm avr i386 i8086 jvm m68k mips mipsel powerpc powerpc64 sparc x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target aarch64 arm avr i386 i8086 jvm m68k mips mipsel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ powerpc powerpc64 sparc x86_64
</span> switch ${build_arch} {
x86_64 {
build.target-delete x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,8 +148,10 @@ subport "${name}-cross" {
</span>
# loop over installing all cross-compilers
foreach PPCCROSS [glob -tails -directory ${worksrcpath} ppc*] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/$PPCCROSS ${destroot}${prefix}/lib/fpc/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -sf ../lib/fpc/${version}/$PPCCROSS ${destroot}${prefix}/bin/$PPCCROSS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/$PPCCROSS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/fpc/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ../lib/fpc/${version}/$PPCCROSS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/$PPCCROSS
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,7 +179,8 @@ subport "${name}-cross-arm-wince" {
</span> fpc -Parm -Twince FILENAME
build.args PP=ppcarm CPU_TARGET=arm OS_TARGET=wince OPT="-ap -v0"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args CPU_TARGET=arm OS_TARGET=wince CROSSINSTALL=1 INSTALL_PREFIX=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args CPU_TARGET=arm OS_TARGET=wince CROSSINSTALL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_PREFIX=${destroot}${prefix}
</span>
# remove duplicate doc and bin files
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,8 +212,10 @@ foreach ostarget {nativent win32 wince} {
</span> \n \
fpc -Pi386 -T$ostarget FILENAME
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args PP=ppc386 CPU_TARGET=i386 OS_TARGET=$ostarget OPT="-ap -v0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args CPU_TARGET=i386 OS_TARGET=$ostarget CROSSINSTALL=1 INSTALL_PREFIX=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args PP=ppc386 CPU_TARGET=i386 OS_TARGET=$ostarget \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT="-ap -v0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args CPU_TARGET=i386 OS_TARGET=$ostarget CROSSINSTALL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_PREFIX=${destroot}${prefix}
</span>
# remove duplicate doc and bin files
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,7 +248,8 @@ subport "${name}-cross-x86-64-win64" {
</span> fpc -Px86_64 -Twin64 FILENAME
build.args PP=ppcx64 CPU_TARGET=x86_64 OS_TARGET=win64 OPT="-ap -v0"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args CPU_TARGET=x86_64 OS_TARGET=win64 CROSSINSTALL=1 INSTALL_PREFIX=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args CPU_TARGET=x86_64 OS_TARGET=win64 CROSSINSTALL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_PREFIX=${destroot}${prefix}
</span>
# remove duplicate doc and bin files
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,23 +263,28 @@ if {${subport} eq "${name}"} {
</span>
installs_libs yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${configure.build_arch} in [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ${configure.build_arch} in [list ppc ppc64]} {
</span> post-extract {
xinstall -d ${workpath}/tmp/boot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "hdiutil attach ${distpath}/${pp} -private -nobrowse -mountpoint ${workpath}/tmp/boot"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${workpath}/tmp/boot/${name}-${boot_v}.powerpc-macosx.pkg ${workpath}/pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "hdiutil attach ${distpath}/${pp} -private -nobrowse \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -mountpoint ${workpath}/tmp/boot"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/tmp/boot/${name}-${boot_v}.powerpc-macosx.pkg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/pkg
</span> system "hdiutil detach ${workpath}/tmp/boot -force"
delete -force ${workpath}/tmp/boot
system -W ${workpath} "gunzip -d pkg/Contents/Archive.pax.gz"
system -W ${workpath}/pkg "pax -r < Contents/Archive.pax"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${workpath}/pkg/usr/local/lib/${name}/${boot_v}/${bootstrapCompiler} ${workpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/pkg/usr/local/lib/${name}/${boot_v}/${bootstrapCompiler} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}
</span> }
} else {
extract.only-append ${pp}
}
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # adjust the path "codfilepath" for plex from /usr/local to MacPort's prefix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # adjust the path "codfilepath" for plex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from /usr/local to MacPort's prefix.
</span> reinplace "s|/usr/local|${prefix}|g" \
${worksrcpath}/utils/tply/pyacc.y \
${worksrcpath}/utils/tply/pyacc.pas \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,7 +339,7 @@ if {${subport} eq "${name}"} {
</span> macosx_deployment_target 10.4
set tiger_sdkpath ${developer_dir}/SDKs/MacOSX10.4u.sdk
if {![file exists $tiger_sdkpath]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {ui_error "Building ${name} @${version} requires 10.4 SDK"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {ui_error "Building ${name} requires 10.4 SDK"}
</span> }
# We use symlinks to needed tools, but make sure those
# have not been created already:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -335,7 +351,8 @@ if {${subport} eq "${name}"} {
</span> ln -s /usr/bin/ld_classic ${workpath}/bin/ld
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set otherOptions "-WM${macosx_deployment_target} -XR${tiger_sdkpath} -Fl=/usr/lib -FD${binutils_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set otherOptions "-WM${macosx_deployment_target} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -XR${tiger_sdkpath} -Fl=/usr/lib -FD${binutils_path}"
</span> }
} else {
set otherOptions ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -345,7 +362,8 @@ if {${subport} eq "${name}"} {
</span> worksrcdir ${name}build-${version}/fpcsrc
build.env PP=${workpath}/${bootstrapCompiler} \
PREFIX=${destroot}${fpcbasepath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args OPT="-v0 -ap ${otherOptions}" CPU_TARGET=${cpuTarget} UTILS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args OPT="-v0 -ap ${otherOptions}" CPU_TARGET=${cpuTarget} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UTILS=1
</span>
destroot.args {*}${build.args}
destroot.env {*}${build.env}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -367,32 +385,39 @@ if {${subport} eq "${name}"} {
</span>
post-destroot {
# create a symlink to the architecture dependent executable
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${fpcbasepath}/lib/${name}/${version}/${compiler} ${destroot}${fpcbasepath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${fpcbasepath}/lib/${name}/${version}/${compiler} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${fpcbasepath}/bin
</span> # target arm64 needs make utils_install explicitly
if {${build_arch} == "arm64"} {
system -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "make utils_install FPC=${worksrcpath}/compiler/${compiler} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${destroot}${fpcbasepath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT=\"-Furtl/units/${cpuTarget}-darwin -ap -v0 ${otherOptions}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "make utils_install FPC=${worksrcpath}/compiler/${compiler} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${destroot}${fpcbasepath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT=\"-Furtl/units/${cpuTarget}-darwin -ap -v0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${otherOptions}\""
</span> }
# generate a configuration file
xinstall -d ${destroot}${fpcbasepath}/etc
system -W ${destroot}${fpcbasepath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "bin/fpcmkcfg -d basepath=${fpcbasepath}/lib/${name}/${version} -o etc/fpc.cfg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "bin/fpcmkcfg -d basepath=${fpcbasepath}/lib/${name}/${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -o etc/fpc.cfg"
</span> ln -s ${fpcbasepath}/etc/fpc.cfg ${destroot}${prefix}/etc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "patch ${destroot}${fpcbasepath}/etc/fpc.cfg ${filespath}/fpc.cfg.patch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "patch ${destroot}${fpcbasepath}/etc/fpc.cfg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${filespath}/fpc.cfg.patch"
</span>
# remove the -WM option for older systems or update it as needed
if {${os.platform} eq "darwin"} {
if {${configure.build_arch} in [list ppc ppc64]} { # macOS PowerPC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-WM10.9|-WM10.4|g" ${destroot}${fpcbasepath}/etc/fpc.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-WM10.9|-WM10.4|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${fpcbasepath}/etc/fpc.cfg
</span> } elseif {${os.major} < 11} { # 10.7, Lion
reinplace "s|-WM10.9||g" ${destroot}${fpcbasepath}/etc/fpc.cfg
} elseif {${os.major} >= 20} { # 11, Big Sur
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-WM10.9|-WM11.0|g" ${destroot}${fpcbasepath}/etc/fpc.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-WM10.9|-WM11.0|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${fpcbasepath}/etc/fpc.cfg
</span> }
if {${os.major} < 13} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/Applications/Xcode.app/Contents/Developer||g" ${destroot}${fpcbasepath}/etc/fpc.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/Applications/Xcode.app/Contents/Developer||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${fpcbasepath}/etc/fpc.cfg
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -402,13 +427,16 @@ if {${subport} eq "${name}"} {
</span> # install man
xinstall -d ${destroot}${fpcbasepath}/man
foreach d {1 5} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${workpath}/${name}build-${version}/install/man/man${d} ${destroot}${fpcbasepath}/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${workpath}/${name}build-${version}/install/man/man${d} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${fpcbasepath}/man
</span> foreach f [glob ${destroot}${fpcbasepath}/man/man${d}/*.${d}] {
system "/usr/bin/gzip ${f}"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${fpcbasepath}/man/man1/fpc.1.gz ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${fpcbasepath}/man/man5/fpc.cfg.5.gz ${destroot}${prefix}/share/man/man5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${fpcbasepath}/man/man1/fpc.1.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${fpcbasepath}/man/man5/fpc.cfg.5.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/man/man5
</span>
# chmcmd will be installed by the chmcmd-fpc subport
file delete -force ${destroot}${fpcbasepath}/bin/chmcmd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -418,7 +446,8 @@ if {${subport} eq "${name}"} {
</span> }
# install the compiler utilities msgdif and msg2inc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -W ${worksrcpath}/compiler/utils msgdif msg2inc ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -W ${worksrcpath}/compiler/utils msgdif msg2inc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin
</span> }
notes "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,9 +459,10 @@ if {${subport} eq "${name}"} {
</span> - If it is not yet found: in /etc.
All the files of fpc are installed in ${fpcbasepath} and\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- the executables are installed in ${fpcbasepath}/bin.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The fpc.cfg is installed in ${fpcbasepath}/etc to make fpc find fpc.cfg.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- To customize, use ~/.fpc.cfg or /etc/fpc.cfg and call ${fpcbasepath}/bin/fpc directly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the executables are installed in ${fpcbasepath}/bin. The fpc.cfg\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is installed in ${fpcbasepath}/etc to make fpc find fpc.cfg.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ To customize, use ~/.fpc.cfg or /etc/fpc.cfg and call\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${fpcbasepath}/bin/fpc directly.
</span> "
livecheck.distname ${name}
</pre><pre style='margin:0'>
</pre>