diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 8819688e2d50..2c46f7f41d9d 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -1,190 +1,190 @@ # MAINTAINER: ports@FreeBSD.org # # Note: before committing to this file, contact portmgr to arrange for an # experimental ports run. Untested commits may be backed out at portmgr's # discretion. # # Provide default versions for ports with multiple versions selectable # by the user. # # Users who want to override these defaults can easily do so by defining # DEFAULT_VERSIONS in their make.conf as follows: # # DEFAULT_VERSIONS= perl5=5.20 ruby=3.1 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK) _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes LOCALBASE?= /usr/local . for lang in APACHE BDB COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \ GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \ LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \ PYCRYPTOGRAPHY PYTHON PYTHON2 RUBY RUST SAMBA SSL TCLTK VARNISH . if defined(${lang}_DEFAULT) ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" . endif #.undef ${lang}_DEFAULT . endfor . for lang in ${DEFAULT_VERSIONS} _l= ${lang:C/=.*//g} ${_l:tu}_DEFAULT= ${lang:C/.*=//g} . endfor # Possible values: 2.4 APACHE_DEFAULT?= 2.4 # Possible values: 5, 18 BDB_DEFAULT?= 5 # Possible values: 2, 3 COROSYNC_DEFAULT?= 3 # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) EBUR128_DEFAULT?= rust . else EBUR128_DEFAULT?= legacy . endif # Possible_values: full canna nox devel_full devel_nox #EMACS_DEFAULT?= let the flavor be the default if not explicitly set # Possible values: 3.0, 4.0 FIREBIRD_DEFAULT?= 3.0 # Possible values: gfortran FORTRAN_DEFAULT?= gfortran # Possible values: 3.2.2, 3.3.1 . if !defined(WANT_FPC_DEVEL) -FPC_DEFAULT?= 3.2.2 +FPC_DEFAULT?= 3.2.3 . else FPC_DEFAULT?= 3.3.1 . endif # Possible values: 9, 10, 11, 12, 13, 14, 15 # (Any other version is completely unsupported and not meant for general use.) GCC_DEFAULT?= 13 # Possible values: 10 GHOSTSCRIPT_DEFAULT?= 10 # Possible values: mesa-libs, mesa-devel GL_DEFAULT?= mesa-libs # Possible values: 1.20, 1.21, 1.22, 1.23-devel GO_DEFAULT?= 1.21 # Possible values: 1.8, 2.2, 3.0 GUILE_DEFAULT?= 2.2 # Possible versions: 6, 7 # Possible flavors: x11, nox11 # (defaults to x11 when not specified) # Format: version[-flavor] # Examples: 6-nox11, 7 IMAGEMAGICK_DEFAULT?= 7 # Possible values: 8, 11, 17, 18, 19, 20, 21 JAVA_DEFAULT?= 8 # Possible values: 3.2.0, 3.1.0 . if !defined(WANT_LAZARUS_DEVEL) LAZARUS_DEFAULT?= 3.2.0 . else LAZARUS_DEFAULT?= 3.3.1 . endif # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) LIBRSVG2_DEFAULT?= rust . else LIBRSVG2_DEFAULT?= legacy . endif # Possible values: c7 rl9 LINUX_DEFAULT?= c7 # Possible values: 11, 12, 13, 14, 15, 16, 17, -devel (to be used when non-base compiler is required) LLVM_DEFAULT?= 15 # Possible values: 5.1, 5.2, 5.3, 5.4 LUA_DEFAULT?= 5.4 # Possible values: luajit, luajit-devel, luajit-openresty . if ${ARCH:Mpowerpc64*} LUAJIT_DEFAULT?= luajit-openresty . else LUAJIT_DEFAULT?= luajit-devel . endif # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.20 # Possible values: 8.0, 8.1, 8.4, 10.5m, 10.6m, 10.11m MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja # Possible value: 18, 20, 21, 22, current, lts (Note: current = 22 and lts = 20) NODEJS_DEFAULT?= lts # Possible value: 25, 26 OPENLDAP_DEFAULT?= 26 # Possible values: 5.34, 5.36, 5.38, devel . if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) # When changing the default here, make sure the DEPRECATED/EXPIRATION lines in # the older Perl 5 ports are uncommented at the same time. PERL5_DEFAULT?= 5.36 . elif !defined(PERL5_DEFAULT) # There's no need to replace development versions, like "5.23" with "devel" # because 1) nobody is supposed to use it outside of poudriere, and 2) it must # be set manually in /etc/make.conf in the first place, and we're never getting # in here. . if !defined(_PERL5_FROM_BIN) _PERL5_FROM_BIN!= ${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;' . endif _EXPORTED_VARS+= _PERL5_FROM_BIN PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} . endif # Possible values: 12, 13, 14, 15, 16 PGSQL_DEFAULT?= 15 # Possible values: 8.1, 8.2, 8.3 PHP_DEFAULT?= 8.2 # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) PYCRYPTOGRAPHY_DEFAULT?= rust . else PYCRYPTOGRAPHY_DEFAULT?= legacy . endif # Possible values: 3.8, 3.9, 3.10, 3.11 PYTHON_DEFAULT?= 3.11 # Possible values: 2.7 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.1, 3.2, 3.3 RUBY_DEFAULT?= 3.2 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust # Possible values: 4.16, 4.19 SAMBA_DEFAULT?= 4.16 # Possible values: base, openssl, openssl111, openssl31, openssl32, libressl, libressl-devel . if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version # but give an installed port preference over it. . if !defined(SSL_DEFAULT) && \ !exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \ exists(${DESTDIR}/usr/include/openssl/opensslv.h) SSL_DEFAULT= base . else . if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) . if defined(PKG_BIN) # find installed port and use it for dependency . if !defined(OPENSSL_INSTALLED) . if defined(DESTDIR) PKGARGS= -c ${DESTDIR} . else PKGARGS= . endif OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || : . endif . if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED) SSL_DEFAULT:= ${OPENSSL_INSTALLED:T} WARNING+= "You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf" . endif . else check-makevars:: @${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable" @${ECHO_MSG} "to determine what port it comes from." @${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl= to your /etc/make.conf and try again." @${FALSE} . endif . endif . endif # Make sure we have a default in the end SSL_DEFAULT?= base . endif # Possible values: 8.5, 8.6, 8.7 TCLTK_DEFAULT?= 8.6 # Possible values: 6, 7 VARNISH_DEFAULT?= 6 .endif diff --git a/lang/fpc-source/Makefile b/lang/fpc-source/Makefile index f4d65b0d243c..92e31706ad18 100644 --- a/lang/fpc-source/Makefile +++ b/lang/fpc-source/Makefile @@ -1,106 +1,112 @@ PORTNAME= fpc -PORTVERSION= 3.2.2 -PORTREVISION= 5 +PORTVERSION= 3.2.3 DISTVERSIONSUFFIX=.source CATEGORIES= lang -MASTER_SITES= SF/freepascal/Source/${PORTVERSION} \ - https://downloads.freepascal.org/${PORTNAME}/dist/${PORTVERSION}/source/ PKGNAMESUFFIX= -source DIST_SUBDIR= freepascal MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal compiler with Turbo and Delphi compatibility (source) WWW= https://www.freepascal.org/ ONLY_FOR_ARCHS= amd64 i386 NO_BUILD= yes +USE_GITLAB= yes +GL_SITE= https://gitlab.com/freepascal.org +GL_ACCOUNT= fpc +GL_PROJECT= source +GL_TAGNAME= 3d2b1f062e1e79d64b56a496f9eecd6084fa5803 + PLIST= ${WRKDIR}/pkg-plist PATCHDIR= ${PORTSDIR}/lang/fpc/files DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/source-${GL_TAGNAME} -FPCSRCDIR= ${PORTNAME}-${PORTVERSION} +FPCSRCDIR= source-${GL_TAGNAME} .include .if ${ARCH} == "i386" FPC_ARCH= i386 .elif ${ARCH} == "amd64" FPC_ARCH= x86_64 .endif post-patch: .if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -i "" -e 's|900044|${OSVERSION}|g' \ + -e 's|1201000|${OSVERSION}|g' \ + -e 's|1200000|${OSVERSION}|g' \ + -e 's|1400097|${OSVERSION}|g' \ ${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.as \ ${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.inc .else @${REINPLACE_CMD} -i "" -e 's|400000|${DFLYVERSION}|g' \ ${WRKSRC}/rtl/dragonfly/${FPC_ARCH}/*.as .endif .if empty(ICONV_LIB) @${REINPLACE_CMD} -e "s|s<>'c'|(s<>'c') and (s<>'iconv')|" \ -e "s|%%FPC_LDPATH%%|${FPC_LDPATH}|g" \ ${WRKDIR}/${FPCSRCDIR}/compiler/systems/t_bsd.pas @${REINPLACE_CMD} -e 's|defined(bsd) and not ||' \ ${WRKDIR}/${FPCSRCDIR}/rtl/unix/cwstring.pp .endif @${REINPLACE_CMD} -e '/samplecfg/ {s/INSTALLEXE/INSTALLSCR/;}' \ ${WRKDIR}/${FPCSRCDIR}/compiler/Makefile @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ ${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit/src/fpmkunit.pp # enable units @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/a52/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/dbus/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/dts/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|freebsd,||g' \ ${WRKSRC}/packages/fpgtk/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|iphonesim|freebsd,iphonesim|g' \ ${WRKSRC}/packages/gnome1/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|iphonesim|freebsd,iphonesim|g' \ ${WRKSRC}/packages/gtk1/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|iphonesim|freebsd,iphonesim|g' \ ${WRKSRC}/packages/imlib/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/ldap/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/libsee/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/lua/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/mad/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/modplug/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|Linux|freebsd,linux|g' \ ${WRKSRC}/packages/newt/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/oggvorbis/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/openal/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/opencl/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/proj4/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/ptc/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|os2|freebsd,os2|g' \ ${WRKSRC}/packages/rexx/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/zorba/fpmake.pp pre-install: @${RM} -f ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DATADIR}) .include diff --git a/lang/fpc-source/distinfo b/lang/fpc-source/distinfo index 1f4bd2743f90..60cd565fc72e 100644 --- a/lang/fpc-source/distinfo +++ b/lang/fpc-source/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1627716934 -SHA256 (freepascal/fpc-3.2.2.source.tar.gz) = d542e349de246843d4f164829953d1f5b864126c5b62fd17c9b45b33e23d2f44 -SIZE (freepascal/fpc-3.2.2.source.tar.gz) = 52240052 +TIMESTAMP = 1718515958 +SHA256 (freepascal/fpc-source-3d2b1f062e1e79d64b56a496f9eecd6084fa5803_GL0.tar.gz) = b0ffaac6e9b0778eecbbd206b5b25668e63748152f7e96e315269b8ddc6201d4 +SIZE (freepascal/fpc-source-3d2b1f062e1e79d64b56a496f9eecd6084fa5803_GL0.tar.gz) = 52566500 diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 3b5028a0f36a..b920289fae74 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -1,186 +1,189 @@ PORTNAME= fpc -PORTVERSION= 3.2.2 -PORTREVISION= 10 +PORTVERSION= 3.2.3 CATEGORIES= lang -MASTER_SITES= SF/freepascal/Source/${PORTVERSION}:source \ - https://downloads.freepascal.org/${PORTNAME}/dist/${PORTVERSION}/source/:source \ - http://leaf.dragonflybsd.org/~marino/dports-src/:DragonFlybootstrap \ +MASTER_SITES= http://leaf.dragonflybsd.org/~marino/dports-src/:DragonFlybootstrap \ LOCAL/acm/freepascal/:bootstrap \ LOCAL/acm/freepascal/:man -DISTFILES= ${DISTNAME:S/$/.source/}${EXTRACT_SUFX}:source DIST_SUBDIR= freepascal MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal compiler with Turbo and Delphi compatibility WWW= https://www.freepascal.org/ CONFLICTS= fpc-devel RUN_DEPENDS= ${LOCALBASE}/bin/as:devel/binutils ONLY_FOR_ARCHS= amd64 i386 USES+= gmake iconv USE_BINUTILS= yes -BOOTVER= ${PORTVERSION} -MANVER= ${PORTVERSION} +BOOTVER= 3.2.2 +MANVER= 3.2.2 -FPC_LDPATH?= "${LOCALBASE}/bin/ld.bfd" +USE_GITLAB= yes +GL_SITE= https://gitlab.com/freepascal.org +GL_ACCOUNT= fpc +GL_PROJECT= source +GL_TAGNAME= 3d2b1f062e1e79d64b56a496f9eecd6084fa5803 -FPCSRCDIR= ${PORTNAME}-${PORTVERSION} +FPCSRCDIR= source-${GL_TAGNAME} .include .if ${ARCH} == "i386" PPNAME= ppc386 FPC_ARCH= i386 #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 .if ${OPSYS} == FreeBSD PLIST_SUB+= FREEBSD="" .else PLIST_SUB+= FREEBSD="@comment " .endif SUB_FILES= pkg-message BUILDNAME= ${FPC_ARCH}-${OPSYS:tl} PLIST_SUB+= PORTVERSION=${PORTVERSION} \ BUILDNAME=${BUILDNAME} DISTFILES+= ${BOOTDIR}.tar.gz:${OPSYS:MDragonFly}bootstrap \ fpc-${MANVER}.man.tar.gz:man NEWFPCMAKE= ${WRKDIR}/${FPCSRCDIR}/utils/fpcm/bin/${BUILDNAME}/fpcmake MAKE_ARGS+= FPCMAKE=${NEWFPCMAKE} \ FPCTARGET=${BUILDNAME} \ ARCH=${FPC_ARCH} \ OPT="${OPT}" \ BSDHIER=1 \ INSTALL="${INSTALL_DATA} -p" \ INSTALLEXE="${INSTALL_PROGRAM}" \ INSTALLSCR="${INSTALL_SCRIPT}" \ INSTALL_PREFIX=${STAGEDIR}${PREFIX} \ FPC_LDPATH=${FPC_LDPATH} NEWPPC= PP=${WRKSRC}/compiler/${PPNAME} NEWFPC= FPC=${WRKSRC}/compiler/${PPNAME} BOOTDIR= ${PPNAME}-${BOOTVER}-${OPSYS:tl} BOOTPPC= PP=${WRKDIR}/${BOOTDIR} do-extract: # unpack binary distribution @${MKDIR} ${WRKDIR} @${TAR} -xzf ${_DISTDIR}/${BOOTDIR}.tar.gz \ --directory ${WRKDIR} && ${CHMOD} +x ${WRKDIR}/${BOOTDIR} # unpack man files @${TAR} -xzf ${_DISTDIR}/fpc-${MANVER}.man.tar.gz --directory ${WRKDIR} # unpack source distribution @(cd ${WRKDIR} && ${GZIP_CMD} -dc \ - ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} | \ + ${_DISTDIR}/${PORTNAME}-source-${GL_TAGNAME}_GL0${EXTRACT_SUFX} | \ ${TAR} -xf -) post-patch: .if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -i "" -e 's|900044|${OSVERSION}|g' \ + -e 's|1201000|${OSVERSION}|g' \ + -e 's|1200000|${OSVERSION}|g' \ + -e 's|1400097|${OSVERSION}|g' \ ${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.as \ ${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.inc .else @${REINPLACE_CMD} -i "" -e 's|400000|${DFLYVERSION}|g' \ ${WRKSRC}/rtl/dragonfly/${FPC_ARCH}/*.as .endif .if empty(ICONV_LIB) @${REINPLACE_CMD} -e "s|s<>'c'|(s<>'c') and (s<>'iconv')|" \ -e "s|%%FPC_LDPATH%%|${FPC_LDPATH}|g" \ ${WRKDIR}/${FPCSRCDIR}/compiler/systems/t_bsd.pas @${REINPLACE_CMD} -e 's|defined(bsd) and not ||' \ ${WRKDIR}/${FPCSRCDIR}/rtl/unix/cwstring.pp .endif @${REINPLACE_CMD} -e '/samplecfg/ {s/INSTALLEXE/INSTALLSCR/;}' \ ${WRKDIR}/${FPCSRCDIR}/compiler/Makefile @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ ${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit/src/fpmkunit.pp # enable units @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/a52/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/dbus/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/dts/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|freebsd,||g' \ ${WRKSRC}/packages/fpgtk/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|iphonesim|freebsd,iphonesim|g' \ ${WRKSRC}/packages/gnome1/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|iphonesim|freebsd,iphonesim|g' \ ${WRKSRC}/packages/gtk1/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|iphonesim|freebsd,iphonesim|g' \ ${WRKSRC}/packages/imlib/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/ldap/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/libsee/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/lua/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/mad/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/modplug/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|Linux|freebsd,linux|g' \ ${WRKSRC}/packages/newt/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/oggvorbis/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/openal/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/opencl/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/proj4/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/ptc/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|os2|freebsd,os2|g' \ ${WRKSRC}/packages/rexx/fpmake.pp @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/zorba/fpmake.pp do-build: # build fpc compiler @${ECHO_MSG} "##### STARTING COMPILER #####" (cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} cycle ${MAKE_ARGS} ${BOOTPPC}) @${ECHO_MSG} "##### COMPLETE COMPILER #####" # build units @${ECHO_MSG} "##### STARTING UNITS #####" (cd ${WRKDIR}/${FPCSRCDIR} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} build ${MAKE_ARGS} ${BOOTPPC}) @${ECHO_MSG} "##### COMPLETE UNITS #####" do-install: # Installing fpc compiler (cd ${WRKDIR}/${FPCSRCDIR} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} install ${MAKE_ARGS} ${BOOTPPC}) # Installing manpages ${INSTALL_MAN} ${WRKDIR}/man/man1/* ${STAGEDIR}${PREFIX}/share/man/man1 ${INSTALL_MAN} ${WRKDIR}/man/man5/* ${STAGEDIR}${PREFIX}/share/man/man5 # symlinking compiler (cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf ../lib/fpc/${PORTVERSION}/${PPNAME}) # creating sample configuration file ${SH} "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" \ "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" \ "${STAGEDIR}${PREFIX}/etc" @${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||' \ -e 's|^#-Fl/lib;/usr/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt5;${LOCALBASE}/lib/qt6|g' \ ${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample \ ${STAGEDIR}${PREFIX}/etc/fppkg.cfg.sample \ ${STAGEDIR}${PREFIX}/etc/fppkg/default \ ${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/ide/text/fp.cfg .include diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo index e95c432f9872..c4e5c141c127 100644 --- a/lang/fpc/distinfo +++ b/lang/fpc/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1655772890 -SHA256 (freepascal/fpc-3.2.2.source.tar.gz) = d542e349de246843d4f164829953d1f5b864126c5b62fd17c9b45b33e23d2f44 -SIZE (freepascal/fpc-3.2.2.source.tar.gz) = 52240052 +TIMESTAMP = 1718511648 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 +SHA256 (freepascal/fpc-source-3d2b1f062e1e79d64b56a496f9eecd6084fa5803_GL0.tar.gz) = b0ffaac6e9b0778eecbbd206b5b25668e63748152f7e96e315269b8ddc6201d4 +SIZE (freepascal/fpc-source-3d2b1f062e1e79d64b56a496f9eecd6084fa5803_GL0.tar.gz) = 52566500 diff --git a/lang/fpc/files/patch-compiler-x86_aoptx86.pas b/lang/fpc/files/patch-compiler-x86_aoptx86.pas deleted file mode 100644 index d07688bb55ed..000000000000 --- a/lang/fpc/files/patch-compiler-x86_aoptx86.pas +++ /dev/null @@ -1,72 +0,0 @@ ---- compiler/x86/aoptx86.pas 2022-01-25 22:18:01.236523000 -0500 -+++ compiler/x86/aoptx86.pas 2022-01-25 22:34:15.492397000 -0500 -@@ -2761,6 +2761,7 @@ - if (l<=4) and (l>0) then - begin - condition:=inverse_cond(taicpu(p).condition); -+ UpdateUsedRegs(tai(p.next)); - GetNextInstruction(p,hp1); - repeat - if not Assigned(hp1) then -@@ -2768,7 +2769,7 @@ - - taicpu(hp1).opcode:=A_CMOVcc; - taicpu(hp1).condition:=condition; -- UpdateUsedRegs(hp1); -+ UpdateUsedRegs(tai(hp1.next)); - GetNextInstruction(hp1,hp1); - until not(CanBeCMOV(hp1)); - -@@ -2815,6 +2816,7 @@ - asml.Remove(p); - p.Free; - -+ UpdateUsedRegs(tai(hp2.next)); - GetNextInstruction(hp2, p); { Instruction after the label } - - { Remove the label if this is its final reference } -@@ -2878,6 +2880,7 @@ - FindLabel(tasmlabel(taicpu(hp2).oper[0]^.ref^.symbol),hp1) then - begin - condition:=inverse_cond(taicpu(p).condition); -+ UpdateUsedRegs(tai(p.next)); - GetNextInstruction(p,hp1); - repeat - taicpu(hp1).opcode:=A_CMOVcc; -@@ -2888,19 +2891,23 @@ - not(CanBeCMOV(hp1)); - - condition:=inverse_cond(condition); -+ if GetLastInstruction(hpmov2,hp1) then -+ UpdateUsedRegs(tai(hp1.next)); -+ - hp1 := hpmov2; - { hp1 is now at } - while Assigned(hp1) and CanBeCMOV(hp1) do - begin - taicpu(hp1).opcode:=A_CMOVcc; - taicpu(hp1).condition:=condition; -- UpdateUsedRegs(hp1); -+ UpdateUsedRegs(tai(hp1.next)); - GetNextInstruction(hp1,hp1); - end; - - hp1 := p; - - { Get first instruction after label } -+ UpdateUsedRegs(tai(hp3.next)); - GetNextInstruction(hp3, p); - - if assigned(p) and (hp3.typ = ait_align) then -@@ -2955,10 +2962,7 @@ - end; - - if Assigned(p) then -- begin -- UpdateUsedRegs(p); -- result:=true; -- end; -+ result:=true; - exit; - end; - end; diff --git a/lang/fpc/files/patch-compiler_systems_t__bsd.pas b/lang/fpc/files/patch-compiler_systems_t__bsd.pas index 48e32a46526b..dc8d422f5dff 100644 --- a/lang/fpc/files/patch-compiler_systems_t__bsd.pas +++ b/lang/fpc/files/patch-compiler_systems_t__bsd.pas @@ -1,24 +1,20 @@ ---- compiler/systems/t_bsd.pas 2020-10-03 17:54:31.715884000 -0500 -+++ compiler/systems/t_bsd.pas 2020-10-03 18:18:40.577288000 -0500 -@@ -155,6 +155,8 @@ - LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib',true) - else if target_info.system in systems_openbsd then +--- compiler/systems/t_bsd.pas.orig 2024-06-14 09:29:25.000000000 -0500 ++++ compiler/systems/t_bsd.pas 2024-06-15 23:36:51.623753000 -0500 +@@ -114,6 +114,8 @@ + if not Dontlinkstdlibpath Then + if target_info.system in systems_openbsd then LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib;=$OPENBSD_X11BASE/lib;=$OPENBSD_LOCALBASE/lib',true) + else if target_info.system in systems_freebsd then + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib;=$FREEBSD_LOCALBASE/lib',true) else LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true); end; -@@ -167,6 +169,12 @@ - var - LdProgram: string='ld'; - begin -+ if target_info.system in systems_freebsd then -+ begin -+ LdProgram:=GetEnvPChar('FPC_LDPATH'); -+ if not FileExists(LdProgram,True) then -+ LdProgram:='%%FPC_LDPATH%%'; -+ end; - if target_info.system in (systems_openbsd+[system_x86_64_dragonfly]) then - LdProgram:='ld.bfd'; - LibrarySuffix:=' '; +@@ -148,6 +150,8 @@ + DynamicLinker:='/usr/libexec/ld.so' + else if target_info.system in systems_netbsd then + DynamicLinker:='/usr/libexec/ld.elf_so' ++ else if target_info.system in systems_freebsd then ++ DynamicLinker:='/usr/libexec/ld-elf.so.1' + else if target_info.system=system_x86_64_dragonfly then + DynamicLinker:='/libexec/ld-elf.so.2' + else diff --git a/lang/fpc/files/patch-freebsd-i386_cprt0.as b/lang/fpc/files/patch-freebsd-i386_cprt0.as deleted file mode 100644 index 0e4b21d404c1..000000000000 --- a/lang/fpc/files/patch-freebsd-i386_cprt0.as +++ /dev/null @@ -1,26 +0,0 @@ ---- rtl/freebsd/i386/cprt0.as 2022-06-16 22:38:18.787786000 -0500 -+++ rtl/freebsd/i386/cprt0.as 2022-06-16 22:39:54.403673000 -0500 -@@ -35,16 +35,21 @@ - - .file "cprt0.as" - .ident "FreePascal 2.6.x/2.7.x series dynlinked to libc" --.section .note.ABI-tag,"a",@progbits -+.section .note.tag,"a",@note - .p2align 2 - .type abitag, @object -- .size abitag, 24 -+ .size abitag, 48 - abitag: - .long 8 - .long 4 - .long 1 - .string "FreeBSD" - .long 900044 -+ .long 8 -+ .long 4 -+ .long 1 -+ .string "FreeBSD" -+ .long 0 - .section .rodata.str1.1,"aMS",@progbits,1 - .LC0: - .string "" diff --git a/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc b/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc deleted file mode 100644 index 835a089c15ec..000000000000 --- a/lang/fpc/files/patch-rtl-bsd_bunxsysc.inc +++ /dev/null @@ -1,62 +0,0 @@ ---- rtl/bsd/bunxsysc.inc 2015-07-14 16:58:27.000000000 -0500 -+++ rtl/bsd/bunxsysc.inc 2022-05-27 11:25:13.139710000 -0500 -@@ -374,40 +374,12 @@ - FPutime:=do_syscall(syscall_nr_utimes,TSysParam(path),TSysParam(tvp)); - end; - --function __pipe_call(sysnr:TSysParam):TSysResult; {$ifdef cpui386}oldfpccall{$endif} external name 'FPC_DOSYS0'; -+function FPpipe(var fildes : tfildes; flags:cint):cint; - --{$if defined(freebsd) or defined (dragonfly)} -- {$define PIPE_RESULT_IN_EAX_AND_EDX} --{$endif} --Function FPpipe(var fildes : tfildes):cint; --{$ifndef PIPE_RESULT_IN_EAX_AND_EDX} - begin -- fppipe:=do_syscall(syscall_nr_pipe,TSysParam(@fildes)); -+ fppipe:=do_syscall(syscall_nr_pipe2,TSysParam(@fildes), TSysParam(flags)); - end; --{$else} --var -- a, b: cInt; --begin -- asm -- {$ifdef CPUi386} -- pushl syscall_nr_pipe -- call __pipe_call -- movl %eax, a -- movl %edx, b -- {$else} -- movq syscall_nr_pipe, %rdi -- call __pipe_call -- movl %eax, a -- movl %edx, b -- {$endif} -- end; - -- fpPipe := a; // eax is in a, no matter if it worked or not -- fildes[0] := a; -- fildes[1] := b; --end; --{$endif} -- - function FPfcntl(fildes:cint;Cmd:cint;Arg:cint):cint; - - begin -@@ -497,9 +469,15 @@ - { - Get all information on a link (the link itself), and return it in info. - } -- -+const -+ AT_FDCWD=-100; -+ AT_SYMLINK_NOFOLLOW=$0200; - begin -+{$ifdef freebsd} -+ fpLStat:=do_syscall(syscall_nr_fstatat,AT_FDCWD,TSysParam(path),TSysParam(Info),AT_SYMLINK_NOFOLLOW); -+{$else} - fpLStat:=do_syscall(syscall_nr_lstat,TSysParam(path),TSysParam(info)); -+{$endif} - end; - - function fpNice(N:cint):cint; diff --git a/lang/fpc/files/patch-rtl-bsd_ostypes.inc b/lang/fpc/files/patch-rtl-bsd_ostypes.inc deleted file mode 100644 index df225b39632b..000000000000 --- a/lang/fpc/files/patch-rtl-bsd_ostypes.inc +++ /dev/null @@ -1,76 +0,0 @@ ---- rtl/bsd/ostypes.inc 2019-05-04 17:02:10.000000000 -0500 -+++ rtl/bsd/ostypes.inc 2022-05-24 17:03:10.944070000 -0500 -@@ -107,6 +107,45 @@ - st_gen : cuint32; // file generation number - st_birthtime : time_t; // File creation time - st_birthtimensec : clong; // nsec of file creation time -+{$elseif defined(freebsd)} -+{$ifdef i386} -+{$define __STAT_TIME_T_EXT} -+{$endif} -+ st_dev : dev_t; // inode's device -+ st_ino : ino_t; // inode's number -+ st_nlink : nlink_t; // number of hard links -+ st_mode : mode_t; // inode protection mode -+ st_padding0 : cint16; -+ st_uid : uid_t; // user ID of the file's owner -+ st_gid : gid_t; // group ID of the file's group -+ st_padding1 : cint32; -+ st_rdev : dev_t; // device type -+{$ifdef __STAT_TIME_T_EXT} -+ st_atim_ext : cint32; -+{$endif} -+ st_atime : time_t; // time of last access -+ st_atimensec : clong; // nsec of last access -+{$ifdef __STAT_TIME_T_EXT} -+ st_mtim_ext : cint32; -+{$endif} -+ st_mtime : time_t; // time of last data modification -+ st_mtimensec : clong; // nsec of last data modification -+{$ifdef __STAT_TIME_T_EXT} -+ st_ctim_ext : cint32; -+{$endif} -+ st_ctime : time_t; // time of last file status change -+ st_ctimensec : clong; // nsec of last file status change -+{$ifdef __STAT_TIME_T_EXT} -+ st_birthtim_ext : cint32; -+{$endif} -+ st_birthtime : time_t; // File creation time -+ st_birthtimensec : clong; // nsec of file creation time -+ st_size : off_t; // file size, in bytes -+ st_blocks : cint64; // blocks allocated for file -+ st_blksize : cint32; // optimal blocksize for I/O -+ st_flags : cuint32; // user defined flags for file -+ st_gen : cuint64; // file generation number -+ st_spare : array [0..10-1] of cuint64; - {$else} - st_dev : dev_t; // inode's device - {$ifdef darwin_new_iostructs} -@@ -189,6 +228,17 @@ - d_padding : array[0..3] of cuint8; - d_name : array[0..(255 + 1)-1] of char; // name must be no longer than this - end; -+{$elseif defined(freebsd)} -+ dirent = record -+ d_fileno : ino_t; -+ d_off : off_t; -+ d_reclen : cuint16; // length of this record -+ d_type : cuint8; // file type, see below -+ d_pad0 : cuint8; -+ d_namlen : cuint16; // length of string in d_name -+ d_pad1 : cuint16; -+ d_name : array[0..(255 + 1)-1] of char; // name must be no longer than this -+ end; - {$else} - dirent = record - d_fileno : cuint32; // file number of entry -@@ -242,6 +292,9 @@ - l_pid : pid_t; { lock owner } - l_type : cshort; { lock type: read/write, etc. } - l_whence: cshort; { type of l_start } -+{$ifdef freebsd} -+ l_sysid : cint; -+{$endif} - end; - TFlock = flock; - pFlock = ^flock; diff --git a/lang/fpc/files/patch-rtl-freebsd-x86_64_cprt0.as b/lang/fpc/files/patch-rtl-freebsd-x86_64_cprt0.as deleted file mode 100644 index 66662b21416d..000000000000 --- a/lang/fpc/files/patch-rtl-freebsd-x86_64_cprt0.as +++ /dev/null @@ -1,26 +0,0 @@ ---- rtl/freebsd/x86_64/cprt0.as 2022-06-16 22:35:12.252513000 -0500 -+++ rtl/freebsd/x86_64/cprt0.as 2022-06-16 22:36:47.506865000 -0500 -@@ -32,16 +32,21 @@ - #APP - .ident "FreePascal 2.6.x/2.7.x series dynlinked to libc" - #NO_APP -- .section .note.ABI-tag,"a",@progbits -+ .section .note.tag,"a",@note - .align 4 - .type abitag, @object -- .size abitag, 24 -+ .size abitag, 48 - abitag: - .long 8 - .long 4 - .long 1 - .string "FreeBSD" - .long 900044 -+ .long 8 -+ .long 4 -+ .long 1 -+ .string "FreeBSD" -+ .long 0 - .globl __progname - .section .rodata - .LC0: diff --git a/lang/fpc/files/patch-rtl-freebsd_ptypes.inc b/lang/fpc/files/patch-rtl-freebsd_ptypes.inc deleted file mode 100644 index 5e19ec1792ae..000000000000 --- a/lang/fpc/files/patch-rtl-freebsd_ptypes.inc +++ /dev/null @@ -1,51 +0,0 @@ ---- rtl/freebsd/ptypes.inc 2013-02-10 12:51:29.000000000 -0500 -+++ rtl/freebsd/ptypes.inc 2022-05-29 19:24:36.804227000 -0500 -@@ -26,7 +26,7 @@ - SEM_SAFE=255; - type - -- dev_t = cuint32; { used for device numbers } -+ dev_t = cuint64; { used for device numbers } - TDev = dev_t; - pDev = ^dev_t; - -@@ -35,11 +35,7 @@ - pGid = ^gid_t; - TIOCtlRequest = cuLong; - -- {$ifdef CPU64} -- ino_t = cuint32; { used for file serial numbers } -- {$else} -- ino_t = clong; { used for file serial numbers } -- {$endif} -+ ino_t = cuint64; { used for file serial numbers } - TIno = ino_t; - pIno = ^ino_t; - -@@ -47,7 +43,7 @@ - TMode = mode_t; - pMode = ^mode_t; - -- nlink_t = cuint16; { used for link counts } -+ nlink_t = cuint64; { used for link counts } - TnLink = nlink_t; - pnLink = ^nlink_t; - -@@ -195,7 +191,7 @@ - - Type TStatFS = {?} Record - case boolean of -- 0 : ( // current FreeBSD -+ false : ( // current FreeBSD - version : cuint32; { structure version number } - ftype : cuint32; { type of filesystem } - fflags : cuint64; { copy of mount exported flags } -@@ -219,7 +215,7 @@ - mnfromname : array[0..MNAMELEN-1] of ansichar; { mounted filesystem } - mountpoint : array[0..MNAMELEN-1] of ansichar; { directory on which mounted } - ); -- 1:( // union for old fieldname's sake. -+ true:( // union for old fieldname's sake. - f_version : cuint32; { structure version number } - f_type : cuint32; { type of filesystem } - f_flags : cuint64; { copy of mount exported flags } diff --git a/lang/fpc/files/patch-rtl-freebsd_sysnr.inc b/lang/fpc/files/patch-rtl-freebsd_sysnr.inc deleted file mode 100644 index a4184c7bf5e7..000000000000 --- a/lang/fpc/files/patch-rtl-freebsd_sysnr.inc +++ /dev/null @@ -1,59 +0,0 @@ ---- rtl/freebsd/sysnr.inc 2019-09-03 08:30:49.000000000 -0500 -+++ rtl/freebsd/sysnr.inc 2022-05-27 11:07:33.577303000 -0500 -@@ -16,9 +16,9 @@ - {More or less checked/in use FreeBSD syscalls} - syscall_nr_readv = 120; - syscall_nr_writev = 121; -- syscall_nr_pread = 173; -- syscall_nr_pwrite = 174; -- syscall_nr_semsys = 169; -+ syscall_nr_pread = 475; -+ syscall_nr_pwrite = 476; -+ syscall_nr_semsys = 169; - syscall_nr_msgsys = 170; - syscall_nr_shmsys = 171; - syscall_nr_mkfifo = 132; -@@ -48,15 +48,17 @@ - syscall_nr_fcntl = 92; - syscall_nr_flock = 131; - syscall_nr_fork = 2; -- syscall_nr_fstat = 189; -+ syscall_nr_fstat = 551; // COMPAT11x 189 -+ syscall_nr_fstatat = 552; - syscall_nr_statfs4 = 157; // COMPAT4x - syscall_nr_fstatfs4 = 158; // COMPAT4x -- syscall_nr_getfsstat = 395; -+ syscall_nr_getfsstat = 557; // COMPAT11x 395 - syscall_nr_statfs = 396; - syscall_nr_fstatfs = 397; - syscall_nr_fsync = 95; -- syscall_nr_ftruncate = 201; -- syscall_nr_getdents = 272; -+ syscall_nr_ftruncate = 480; -+ syscall_nr_getdents = 272; -+ syscall_nr_getdirentries = 554; - syscall_nr_getegid = 43; - syscall_nr_geteuid = 25; - syscall_nr_getgid = 47; -@@ -70,15 +72,16 @@ - syscall_nr_ioctl = 54; - syscall_nr_kill = 37; - syscall_nr_link = 9; -- syscall_nr_listen = 106; -- syscall_nr_lseek = 199; -- syscall_nr_lstat = 190; -+ syscall_nr_listen = 106; -+ syscall_nr_lseek = 478; -+ syscall_nr_lstat = 190; - syscall_nr_mkdir = 136; - syscall_nr_mknod = 14; -- syscall_nr_mmap = 197; -+ syscall_nr_mmap = 477; - syscall_nr_open = 5; - syscall_nr_pipe = 42; -- syscall_nr_poll = 209; -+ syscall_nr_pipe2 = 542; -+ syscall_nr_poll = 209; - syscall_nr_read = 3; - syscall_nr_readlink = 58; - syscall_nr_recvfrom = 29; diff --git a/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc b/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc deleted file mode 100644 index 372bd61a2076..000000000000 --- a/lang/fpc/files/patch-rtl-freebsd_unxfunc.inc +++ /dev/null @@ -1,13 +0,0 @@ ---- rtl/freebsd/unxfunc.inc 2020-02-21 18:39:27.076200000 -0500 -+++ rtl/freebsd/unxfunc.inc 2020-02-21 18:39:47.649039000 -0500 -@@ -49,8 +49,9 @@ - } - var - pip : tfildes; -+ flags : cint; - begin -- assignPipe:=fppipe(pip); -+ assignPipe:=fppipe(pip, 0); - pipe_in:=pip[0]; - pipe_out:=pip[1]; - end; diff --git a/lang/fpc/files/patch-rtl-unix_bunxh.inc b/lang/fpc/files/patch-rtl-unix_bunxh.inc deleted file mode 100644 index 5fb2ec529b41..000000000000 --- a/lang/fpc/files/patch-rtl-unix_bunxh.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- rtl/unix/bunxh.inc 2019-11-05 11:17:53.000000000 -0500 -+++ rtl/unix/bunxh.inc 2022-05-27 15:51:22.481698000 -0500 -@@ -34,7 +34,7 @@ - Function FpChmod (path : pChar; Mode : TMode): cInt; - Function FpChown (path : pChar; owner : TUid; group : TGid): cInt; - Function FpUtime (path : pChar; times : putimbuf): cInt; -- Function FpPipe (var fildes : tfildes):cInt; -+ Function FpPipe (var fildes : tfildes; flags : cInt):cInt; - Function FpDup (fildes : cInt): cInt; external name 'FPC_SYSC_DUP'; - Function FpDup2 (fildes, fildes2 : cInt): cInt; external name 'FPC_SYSC_DUP2'; - Function FpTimes (var buffer : tms): TClock; 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 096bcaecd656..000000000000 --- a/lang/fpc/files/patch-rtl_bsd_ossysc.inc +++ /dev/null @@ -1,85 +0,0 @@ ---- rtl/bsd/ossysc 2019-11-05 11:17:53.000000000 -0500 -+++ rtl/bsd/ossysc.inc 2022-05-28 16:58:54.884379000 -0500 -@@ -76,9 +76,9 @@ - - begin - {$ifdef CPU64} -- Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,TSysParam(fd),0,Offset,whence); -+ Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,TSysParam(fd),Offset,whence); - {$else} -- Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,0,TSysParam(fd),0, -+ Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,0,TSysParam(fd), - {$ifdef ENDIAN_BIG}hi(offset),lo(offset){$endif} - {$ifdef ENDIAN_LITTLE}lo(Offset),hi(offset){$endif}, - Whence); -@@ -90,9 +90,9 @@ - - begin - {$ifdef CPU64} -- Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate, fd ,0 ,flength); -+ Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate, fd ,flength); - {$else} -- Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate,0,fd,0,lo(flength),hi(flength)); -+ Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate,0,fd,lo(flength),hi(flength)); - {$endif} - - end; -@@ -102,9 +102,9 @@ - - begin - {$ifdef CPU64} -- Fpmmap:=pointer(ptruint(do_syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),0,TSysParam(offst)))); -+ Fpmmap:=pointer(ptruint(do_syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),TSysParam(offst)))); - {$else} -- Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,0, -+ Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd, - {$ifdef FPC_BIG_ENDIAN} hi(offst),lo(offst){$endif} - {$ifdef FPC_LITTLE_ENDIAN} lo(offst),hi(offst){$endif} - ))); -@@ -138,10 +138,20 @@ - Fprename:=do_syscall(syscall_nr_rename,TSysParam(old),TSysParam(newpath)); - end; - --function Fpstat(const path: pchar; var buf : stat):cint; [public, alias : 'FPC_SYSC_STAT']; -+Function fpFstatat(fd: cint; path: pchar; var sb: stat; flag: cint):cint; -+begin -+ fpFStatat:=do_syscall(syscall_nr_fstatat,fd,TSysParam(path),TSysParam(@sb),flag); -+end; - -+function Fpstat(const path: pchar; var buf : stat):cint; [public, alias : 'FPC_SYSC_STAT']; -+const -+ AT_FDCWD=-100; - begin -+{$ifdef freebsd} -+ Fpstat:=FpFstatat(AT_FDCWD, path, buf, 0); -+{$else} - Fpstat:=do_syscall(syscall_nr_stat,TSysParam(path),TSysParam(@buf)); -+{$endif} - end; - - -@@ -171,6 +181,12 @@ - - const DIRBLKSIZ=1024; - -+{$ifdef freebsd} -+function FpGetdirentries(fd : cint; buf : pchar; nbytes : clong) : cint; -+begin -+ FpGetdirentries:=do_syscall(syscall_nr_getdirentries,fd,TSysParam(buf), nbytes, TSysParam(0)); -+end; -+{$endif} - - function Fpfstat(fd : cint; var sb : stat): cint; forward; - -@@ -247,7 +263,11 @@ - - var retval :longint; - begin -+{$ifdef freebsd} -+ Retval:=FpGetdirentries(dirp^.dd_fd, @dirp^.dd_buf^, DIRBLKSIZ {sizeof(getdentsbuffer)}); -+{$else} - Retval:=do_syscall(syscall_nr_getdents,TSysParam(dirp^.dd_fd),TSysParam(@dirp^.dd_buf^),DIRBLKSIZ {sizeof(getdentsbuffer)}); -+{$endif} - dirp^.dd_rewind:=TSysParam(dirp^.dd_buf); - if retval=0 then - begin diff --git a/lang/fpc/files/pkg-message.in b/lang/fpc/files/pkg-message.in index 6733c0ec4758..b458e7650d0e 100644 --- a/lang/fpc/files/pkg-message.in +++ b/lang/fpc/files/pkg-message.in @@ -1,25 +1,21 @@ [ { type: install message: <