CVS commit: pkgsrc/lang/fpc

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Wed Apr 22 23:17:35 UTC 2026

Modified Files:
        pkgsrc/lang/fpc: Makefile bootstrap.mk distinfo

Log Message:
lang/fpc: Add infrastructure to bootstrap on macOS

Does compile all the way, but still fails linking and I couldn't figure
out yet why. Rather than throwing it all away, I guess it's better to
commit it with BROKEN_ON_PLATFORM.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/fpc/Makefile \
    pkgsrc/lang/fpc/bootstrap.mk pkgsrc/lang/fpc/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/fpc/Makefile
diff -u pkgsrc/lang/fpc/Makefile:1.1 pkgsrc/lang/fpc/Makefile:1.2
--- pkgsrc/lang/fpc/Makefile:1.1        Mon Sep 29 14:13:00 2025
+++ pkgsrc/lang/fpc/Makefile    Wed Apr 22 23:17:35 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/09/29 14:13:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2026/04/22 23:17:35 js Exp $
 
 DISTNAME=      fpc-3.2.2.source
 PKGNAME=       ${DISTNAME:S/.source//}
@@ -36,6 +36,20 @@ PRINT_PLIST_AWK+=    { gsub(/${COMPILER}/, 
 PLIST_SUBST+=          COMPILER=${COMPILER}
 
 post-extract:
+.if ${OPSYS} == "Darwin"
+       mkdir ${WRKDIR}/bootstrap
+       hdiutil attach ${WRKDIR}/*.dmg -mountpoint ${WRKDIR}/bootstrap
+.  if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc*)
+       cd ${WRKDIR} && tar xf fpc-${PKGVERSION_NOREV}.powerpc-macosx.pkg/Contents/Archive.pax.gz
+.  else
+       cd ${WRKDIR} && xar -xf bootstrap/fpc-${PKGVERSION_NOREV}-intelarm64-macosx.mpkg/Contents/Packages/fpc-${PKGVERSION_NOREV}-intelarm64-macosx.pkg Payload
+       cd ${WRKDIR} && tar -xzf Payload
+.  endif
+       diskutil eject force ${WRKDIR}/bootstrap
+       mkdir ${WRKDIR}/${PKGNAME_NOREV}.${MACHINE_ARCH}-${LOWER_OPSYS}
+       mv ${WRKDIR}/usr/local/* \
+               ${WRKDIR}/${PKGNAME_NOREV}.${MACHINE_ARCH}-${LOWER_OPSYS}
+.else
        cd ${WRKDIR}/${PKGNAME_NOREV}.${MACHINE_ARCH}-${LOWER_OPSYS} && \
                ${_EXTRACT_TAR} xf binary.${MACHINE_ARCH}-${LOWER_OPSYS}.tar
        cd ${WRKDIR}/${PKGNAME_NOREV}.${MACHINE_ARCH}-${LOWER_OPSYS} && \
@@ -48,6 +62,7 @@ post-extract:
                for f in `${FIND} . -type f -name "utils-*.tar.gz" -print`; do \
                        ${_EXTRACT_TAR} zxf $$f; \
                done;
+.endif
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
Index: pkgsrc/lang/fpc/bootstrap.mk
diff -u pkgsrc/lang/fpc/bootstrap.mk:1.1 pkgsrc/lang/fpc/bootstrap.mk:1.2
--- pkgsrc/lang/fpc/bootstrap.mk:1.1    Mon Sep 29 14:13:00 2025
+++ pkgsrc/lang/fpc/bootstrap.mk        Wed Apr 22 23:17:35 2026
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.1 2025/09/29 14:13:00 ryoon Exp $
+# $NetBSD: bootstrap.mk,v 1.2 2026/04/22 23:17:35 js Exp $
 
 ONLY_FOR_PLATFORM+=            NetBSD-*-i386
 BOOT.nb-i386=                  fpc-3.2.2.i386-netbsd.tar
@@ -17,3 +17,48 @@ EXTRACT_ONLY+=                       ${BOOT.nb-amd64}
 COMPILER=                      ppcx64
 MAKE_ENV+=                     -Damd64=1 -Di386=0
 .endif
+
+ONLY_FOR_PLATFORM+=            Darwin-*-aarch64
+BOOT.darwin-arm64=             fpc-3.2.2.intelarm64-macosx.dmg
+.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo)
+DISTFILES+=                    ${BOOT.darwin-arm64}
+EXTRACT_ONLY+=                 ${BOOT.darwin-arm64}
+COMPILER=                      ppca64
+.endif
+
+ONLY_FOR_PLATFORM+=            Darwin-*-i386
+BOOT.darwin-i386=              fpc-3.2.2.intelarm64-macosx.dmg
+.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo)
+DISTFILES+=                    ${BOOT.darwin-i386}
+EXTRACT_ONLY+=                 ${BOOT.darwin-i386}
+COMPILER=                      ppc386
+.endif
+
+ONLY_FOR_PLATFORM+=            Darwin-*-powerpc
+BOOT.darwin-ppc=               fpc-3.2.2.powerpc-macosx.dmg
+.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || make(distinfo)
+DISTFILES+=                    ${BOOT.darwin-ppc}
+EXTRACT_ONLY+=                 ${BOOT.darwin-ppc}
+COMPILER=                      ppcppc
+.endif
+
+ONLY_FOR_PLATFORM+=            Darwin-*-powerpc64
+BOOT.darwin-ppc64=             fpc-3.2.2.powerpc-macosx.dmg
+.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc64) || make(distinfo)
+DISTFILES+=                    ${BOOT.darwin-ppc64}
+EXTRACT_ONLY+=                 ${BOOT.darwin-ppc64}
+COMPILER=                      ppcppc64
+.endif
+
+ONLY_FOR_PLATFORM+=            Darwin-*-x86_64
+BOOT.darwin-amd64=             fpc-3.2.2.intelarm64-macosx.dmg
+.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo)
+DISTFILES+=                    ${BOOT.darwin-amd64}
+EXTRACT_ONLY+=                 ${BOOT.darwin-amd64}
+COMPILER=                      ppcx64
+.endif
+
+# I added the infrastructure to bootstrap on macOS and it does compile, but
+# linking fails with it not finding -lc and I could not figure out yet why.
+#   -- js@
+BROKEN_ON_PLATFORM+=           Darwin-*-*
Index: pkgsrc/lang/fpc/distinfo
diff -u pkgsrc/lang/fpc/distinfo:1.1 pkgsrc/lang/fpc/distinfo:1.2
--- pkgsrc/lang/fpc/distinfo:1.1        Mon Sep 29 14:13:00 2025
+++ pkgsrc/lang/fpc/distinfo    Wed Apr 22 23:17:35 2026
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.1 2025/09/29 14:13:00 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2026/04/22 23:17:35 js Exp $
 
 BLAKE2s (fpc-3.2.2.i386-netbsd.tar) = ff050a0a727621299ce8558719354cef0b76907fbd1f80a3e2bae0f973d3aa8f
 SHA512 (fpc-3.2.2.i386-netbsd.tar) = 8aae6450150b86f4c309bc8a821af5762f06ae5df69bda1f53985312de29c56d60f0b62c28eed323f8dd43008a53bf1d27a5ad5ee23ab549a50bba44b2f32389
 Size (fpc-3.2.2.i386-netbsd.tar) = 161630720 bytes
+BLAKE2s (fpc-3.2.2.intelarm64-macosx.dmg) = a59fb35ff3b60b1c56aeb524d7ab11688b2278e42a2b905fdd97aa0594ee0ee8
+SHA512 (fpc-3.2.2.intelarm64-macosx.dmg) = 4094e7080ae4fad46cdfdec6ced8726f169659dfd3b11eb1e51dd9ea138665c4fac196cb73e54e10e29767523436b1cbb7d90b843da84f6ee9db1f38eb1597ca
+Size (fpc-3.2.2.intelarm64-macosx.dmg) = 274206896 bytes
+BLAKE2s (fpc-3.2.2.powerpc-macosx.dmg) = c8c39eb2131057069faabd62bc833c34bec5634bdb6ea821ef3a90b69832152a
+SHA512 (fpc-3.2.2.powerpc-macosx.dmg) = 44c7717ff0b57e2458c9728250eb7682f55be822ccc6f3a5970d8a1af478aa4e661998c9782971203ad1a5a759d1aaed9b549635b971175a32bfeb0fa9d02fb8
+Size (fpc-3.2.2.powerpc-macosx.dmg) = 158746504 bytes
 BLAKE2s (fpc-3.2.2.source.tar.gz) = 5a7590a4525910a137fe8bd4ae0f21212f5305e25f7bdd65c7f365878b521f83
 SHA512 (fpc-3.2.2.source.tar.gz) = 6d320b4e0805d63c40d3037f9d2078068c2c9fcdeb6ac073a6fcc19249bd6325dc542fcc7fc6dbb7e69507dcd84cf9e720e7d73925afe955e2a24e8c7d92606a
 Size (fpc-3.2.2.source.tar.gz) = 52240052 bytes