From 4ca1f77d7a903e9d8adda25d74b44b28cb8a69f0 Mon Sep 17 00:00:00 2001 From: Jose Alonso Cardenas Marquez Date: Wed, 25 Nov 2020 02:57:50 +0000 Subject: [PATCH] - Update to 3.2.0 ChangeLog at: https://wiki.freepascal.org/FPC_New_Features_3.2.0 --- Mk/Uses/fpc.mk | 30 +++-- .../files/patch-packages_mad_fpmake.pp | 2 +- .../files/patch-packages_modplug_fpmake.pp | 2 +- databases/fpc-fpindexer/Makefile | 3 +- databases/fpc-gdbm/Makefile | 1 - databases/fpc-ibase/Makefile | 2 - databases/fpc-postgres/Makefile | 1 - devel/fpc-fcl-base/pkg-plist | 9 +- devel/fpc-fcl-db/Makefile | 1 - devel/fpc-fcl-image/pkg-plist | 11 ++ devel/fpc-fcl-js/Makefile | 3 +- devel/fpc-fcl-js/pkg-plist | 2 + devel/fpc-fcl-json/Makefile | 1 - devel/fpc-fcl-json/pkg-plist | 7 ++ devel/fpc-fcl-net/Makefile | 2 +- devel/fpc-fcl-net/pkg-plist | 2 + devel/fpc-fcl-passrc/Makefile | 1 - devel/fpc-fcl-pdf/Makefile | 1 - devel/fpc-fcl-sdo/Makefile | 1 - devel/fpc-fcl-stl/Makefile | 1 - devel/fpc-fcl-stl/pkg-plist | 12 -- devel/fpc-fcl-web/Makefile | 6 +- devel/fpc-fcl-web/pkg-plist | 43 +++++++ devel/fpc-fppkg/Makefile | 4 +- devel/fpc-fppkg/pkg-plist | 6 + devel/fpc-sdl/Makefile | 1 - editors/fpc-ide/Makefile | 2 +- editors/fpc-ide/pkg-plist | 1 + graphics/fpc-imagemagick/Makefile | 1 - .../files/patch-packages-opengl-src-glut.pp | 18 +-- graphics/fpc-rsvg/Makefile | 1 - lang/fpc-base/Makefile | 3 +- lang/fpc-docs/Makefile | 2 +- lang/fpc-docs/distinfo | 6 +- lang/fpc-rtl-objpas/Makefile | 1 - lang/fpc-source/Makefile | 3 +- lang/fpc-source/distinfo | 6 +- lang/fpc-units/Makefile | 36 ++++-- lang/fpc-utils/Makefile | 11 +- lang/fpc-utils/pkg-plist | 16 +++ lang/fpc/Makefile | 4 +- lang/fpc/Makefile.units | 14 ++- lang/fpc/distinfo | 8 +- lang/fpc/files/patch-compiler_cfileutl.pas | 12 -- lang/fpc/files/patch-compiler_globals.pas | 32 +++++ lang/fpc/files/patch-compiler_ogelf.pas | 21 ---- .../files/patch-compiler_systems_t__bsd.pas | 112 ++++-------------- lang/fpc/files/patch-rtl_bsd_ossysc.inc | 38 ++---- lang/fpc/files/patch-rtl_bsd_ostypes.inc | 27 ----- lang/fpc/pkg-plist | 65 +++++++++- misc/fpc-chm/Makefile | 2 +- multimedia/fpc-libvlc/Makefile | 3 - .../files/patch-packages_libvlc_fpmake.pp | 2 +- security/fpc-openssl/Makefile | 3 +- security/fpc-openssl/pkg-plist | 5 + www/fpc-googleapi/Makefile | 3 +- www/fpc-httpd22/Makefile | 5 - x11/fpc-x11/Makefile | 1 - 58 files changed, 327 insertions(+), 292 deletions(-) delete mode 100644 lang/fpc/files/patch-compiler_cfileutl.pas create mode 100644 lang/fpc/files/patch-compiler_globals.pas delete mode 100644 lang/fpc/files/patch-compiler_ogelf.pas delete mode 100644 lang/fpc/files/patch-rtl_bsd_ostypes.inc diff --git a/Mk/Uses/fpc.mk b/Mk/Uses/fpc.mk index 2438fca5ec15..d1bd879209fb 100644 --- a/Mk/Uses/fpc.mk +++ b/Mk/Uses/fpc.mk @@ -71,15 +71,16 @@ MKINSTDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME} _FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \ fcl-async fcl-base fcl-db fcl-extra fcl-fpcunit fcl-image \ fcl-js fcl-json fcl-net fcl-passrc fcl-pdf fcl-registry \ - fcl-res fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml fftw \ - fpindexer fppkg fv gdbint gdbm gmp googleapi graph gtk2 \ - hermes httpd22 httpd24 ibase iconvenc imagemagick \ - ldap libcurl libgd libmicrohttpd libpng libvlc libxml2 lua mad \ - modplug mysql ncurses newt numlib odbc oggvorbis openal opengl \ - openssl oracle pasjpeg pcap postgres proj4 pthreads pxlib \ - regexpr rexx rsvg rtl-console rtl-extra rtl-objpas rtl-unicode \ - sdl sqlite svgalib symbolic syslog unzip users utmp uuid x11 \ - xforms zlib + fcl-report fcl-res fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml \ + fftw fpindexer fppkg fv gdbint gdbm gnutls gmp googleapi \ + graph gtk2 hermes httpd22 httpd24 ibase iconvenc imagemagick \ + ldap libcups libcurl libenet libfontconfig libgd libmagic \ + libmicrohttpd libpng libvlc libxml2 lua mad modplug \ + mysql ncurses newt numlib odata odbc oggvorbis openal opengl openssl \ + oracle pasjpeg pastojs pcap postgres proj4 pthreads pxlib \ + regexpr rexx rsvg rtl-console rtl-extra rtl-generics rtl-objpas \ + rtl-unicode sdl sqlite svgalib symbolic syslog unzip users utmp \ + uuid vcl-compat webidl x11 xforms zlib .if ${fpc_ARGS:Mbase} USE_FPC= gdbint graph httpd22 httpd24 ibase mysql odbc oracle pasjpeg \ @@ -136,6 +137,7 @@ fcl_net_UNIT= devel/fpc-fcl-net fcl_passrc_UNIT= devel/fpc-fcl-passrc fcl_pdf_UNIT= devel/fpc-fcl-pdf fcl_registry_UNIT= devel/fpc-fcl-registry +fcl_report_UNIT= devel/fpc-fcl-report fcl_res_UNIT= devel/fpc-fcl-res fcl_sdo_UNIT= devel/fpc-fcl-sdo fcl_sound_UNIT= devel/fpc-fcl-sound @@ -149,6 +151,7 @@ fpvectorial_UNIT= graphics/fpc-fpvectorial fv_UNIT= devel/fpc-fv hermes_UNIT= graphics/fpc-hermes gdbm_UNIT= databases/fpc-gdbm +gnutls_UNIT= security/fpc-gnutls gmp_UNIT= math/fpc-gmp googleapi_UNIT= www/fpc-googleapi gtk2_UNIT= x11-toolkits/fpc-gtk2 @@ -156,7 +159,11 @@ iconvenc_UNIT= converters/fpc-iconvenc imagemagick_UNIT= graphics/fpc-imagemagick ldap_UNIT= net/fpc-ldap libcurl_UNIT= ftp/fpc-libcurl +libcups_UNIT= print/fpc-libcups +libenet_UNIT= net/fpc-libenet +libfontconfig_UNIT= x11-fonts/fpc-libfontconfig libgd_UNIT= graphics/fpc-libgd +libmagic_UNIT= devel/fpc-libmagic libmicrohttpd_UNIT= www/fpc-libmicrohttpd libpng_UNIT= graphics/fpc-libpng libvlc_UNIT= multimedia/fpc-libvlc @@ -167,10 +174,12 @@ modplug_UNIT= audio/fpc-modplug newt_UNIT= devel/fpc-newt ncurses_UNIT= graphics/fpc-ncurses numlib_UNIT= math/fpc-numlib +odata_UNIT= devel/fpc-odata oggvorbis_UNIT= audio/fpc-oggvorbis openal_UNIT= audio/fpc-openal opengl_UNIT= graphics/fpc-opengl openssl_UNIT= security/fpc-openssl +pastojs_UNIT= lang/fpc-pastojs pcap_UNIT= net/fpc-pcap proj4_UNIT= graphics/fpc-proj4 pxlib_UNIT= databases/fpc-pxlib @@ -178,6 +187,7 @@ rexx_UNIT= lang/fpc-rexx rsvg_UNIT= graphics/fpc-rsvg rtl_console_UNIT= lang/fpc-rtl-console rtl_extra_UNIT= lang/fpc-rtl-extra +rtl_generics_UNIT= lang/fpc-rtl-generics rtl_objpas_UNIT= lang/fpc-rtl-objpas rtl_unicode_UNIT= lang/fpc-rtl-unicode sdl_UNIT= devel/fpc-sdl @@ -188,6 +198,8 @@ unzip_UNIT= archivers/fpc-unzip users_UNIT= sysutils/fpc-users utmp_UNIT= sysutils/fpc-utmp uuid_UNIT= sysutils/fpc-uuid +vcl_compat_UNIT= graphics/fpc-vcl-compat +webidl_UNIT= www/fpc-webidl x11_UNIT= x11/fpc-x11 xforms_UNIT= x11-toolkits/fpc-xforms zlib_UNIT= devel/fpc-zlib diff --git a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp index faf28fef7882..e8a8b990950a 100644 --- a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp +++ b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp @@ -3,7 +3,7 @@ @@ -17,7 +17,7 @@ P.Directory:=ADirectory; {$endif ALLPACKAGES} - P.Version:='3.0.4'; + P.Version:='3.2.0'; - P.OSes := [linux,win32,win64,wii]; + P.OSes := [linux,win32,win64,wii,dragonfly,freebsd]; P.SourcePath.Add('src'); diff --git a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp index dc5a1ae8d6b8..46fdcec9c74a 100644 --- a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp +++ b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp @@ -3,7 +3,7 @@ @@ -17,7 +17,7 @@ P.Directory:=ADirectory; {$endif ALLPACKAGES} - P.Version:='3.0.4'; + P.Version:='3.2.0'; - P.OSes := [linux]; + P.OSes := [linux,dragonfly,freebsd]; P.SourcePath.Add('src'); diff --git a/databases/fpc-fpindexer/Makefile b/databases/fpc-fpindexer/Makefile index 532b2519ea19..e046efcc2951 100644 --- a/databases/fpc-fpindexer/Makefile +++ b/databases/fpc-fpindexer/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 6 CATEGORIES= databases lang PKGNAMESUFFIX= -fpindexer @@ -8,7 +7,7 @@ COMMENT= Database indexer with database/flat file backend USES= fpc USE_FPC= chm dblib fcl-base fcl-db fcl-json fcl-xml ibase mysql odbc \ - oracle postgres pxlib sqlite rtl-extra + oracle postgres pxlib sqlite rtl-extra rtl-generics MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile index 48ee06568ed0..622fbaea6118 100644 --- a/databases/fpc-gdbm/Makefile +++ b/databases/fpc-gdbm/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= databases lang PKGNAMESUFFIX= -gdbm diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile index 236af3feed52..f0c6ceec70f6 100644 --- a/databases/fpc-ibase/Makefile +++ b/databases/fpc-ibase/Makefile @@ -1,7 +1,6 @@ # Created by: John Merryweather Cooper # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= databases lang PKGNAMESUFFIX= -ibase @@ -15,7 +14,6 @@ EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= IBASE IBASE_DESC= Install Interbase/Firebird client -OPTIONS_DEFAULT= IBASE IBASE_USES= firebird diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile index 8748edb11341..ad7345e8fedd 100644 --- a/databases/fpc-postgres/Makefile +++ b/databases/fpc-postgres/Makefile @@ -1,7 +1,6 @@ # Created by: John Merryweather Cooper et al # $FreeBSD$ -PORTREVISION= 6 CATEGORIES= databases lang PKGNAMESUFFIX= -postgres diff --git a/devel/fpc-fcl-base/pkg-plist b/devel/fpc-fcl-base/pkg-plist index c27d209711ee..9056534d96f8 100644 --- a/devel/fpc-fcl-base/pkg-plist +++ b/devel/fpc-fcl-base/pkg-plist @@ -35,11 +35,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.rsj -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpmimetypes.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpmimetypes.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpobserver.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpobserver.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpobserver.rsj @@ -57,6 +56,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.o @@ -64,6 +64,9 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/nullstream.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/nullstream.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/nullstream.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pascodegen.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pascodegen.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rtfpars.o @@ -77,11 +80,13 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wformat.o diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile index 33e1306cc382..1fd982b36f18 100644 --- a/devel/fpc-fcl-db/Makefile +++ b/devel/fpc-fcl-db/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 6 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-db diff --git a/devel/fpc-fcl-image/pkg-plist b/devel/fpc-fcl-image/pkg-plist index 5cf14aaa4da1..84c44ea00622 100644 --- a/devel/fpc-fcl-image/pkg-plist +++ b/devel/fpc-fcl-image/pkg-plist @@ -7,6 +7,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ellipses.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ellipses.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpbarcode.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpbarcode.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcolhash.o @@ -15,14 +17,20 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpditherer.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpditherer.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgbarcode.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgbarcode.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimggauss.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimggauss.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgqrcode.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgqrcode.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpqrcodegen.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpqrcodegen.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadbmp.o @@ -69,6 +77,9 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypehdyn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypehdyn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypehdyn.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.o diff --git a/devel/fpc-fcl-js/Makefile b/devel/fpc-fcl-js/Makefile index ede4a86c9e86..e659b5916256 100644 --- a/devel/fpc-fcl-js/Makefile +++ b/devel/fpc-fcl-js/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-js COMMENT= Free Pascal Javascript scanner/parser/syntax tree (FCL) USES= fpc -USE_FPC= fcl-base fcl-res rtl-objpas +USE_FPC= fcl-base fcl-json fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fcl-js/pkg-plist b/devel/fpc-fcl-js/pkg-plist index 0a211c50d45c..be2a288eb0e0 100644 --- a/devel/fpc-fcl-js/pkg-plist +++ b/devel/fpc-fcl-js/pkg-plist @@ -10,6 +10,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsparser.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsscanner.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsscanner.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsscanner.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jssrcmap.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jssrcmap.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstoken.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstoken.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstree.o diff --git a/devel/fpc-fcl-json/Makefile b/devel/fpc-fcl-json/Makefile index 4e8c1b8d9d97..fe08d8248aa8 100644 --- a/devel/fpc-fcl-json/Makefile +++ b/devel/fpc-fcl-json/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-json diff --git a/devel/fpc-fcl-json/pkg-plist b/devel/fpc-fcl-json/pkg-plist index 6624e10283a3..7742772d460b 100644 --- a/devel/fpc-fcl-json/pkg-plist +++ b/devel/fpc-fcl-json/pkg-plist @@ -8,12 +8,19 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsontopas.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsontopas.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsontopas.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/json2yaml.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/json2yaml.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonini.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonini.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonreader.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonreader.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonreader.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.rsj diff --git a/devel/fpc-fcl-net/Makefile b/devel/fpc-fcl-net/Makefile index 3726aba6b0c0..54640853551c 100644 --- a/devel/fpc-fcl-net/Makefile +++ b/devel/fpc-fcl-net/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -fcl-net COMMENT= Free Pascal network interfaces (FCL) USES= fpc -USE_FPC= fcl-base openssl fcl-xml fcl-passrc fcl-async rtl-extra +USE_FPC= fcl-base fcl-xml fcl-passrc fcl-async rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fcl-net/pkg-plist b/devel/fpc-fcl-net/pkg-plist index 4462b3474610..8b31d41ee7ab 100644 --- a/devel/fpc-fcl-net/pkg-plist +++ b/devel/fpc-fcl-net/pkg-plist @@ -9,6 +9,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslbase.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslbase.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslsockets.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslsockets.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslsockets.rsj diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile index 64785d5e9192..e12a9fe4c83b 100644 --- a/devel/fpc-fcl-passrc/Makefile +++ b/devel/fpc-fcl-passrc/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-passrc diff --git a/devel/fpc-fcl-pdf/Makefile b/devel/fpc-fcl-pdf/Makefile index 763f1d343544..d403819a8a37 100644 --- a/devel/fpc-fcl-pdf/Makefile +++ b/devel/fpc-fcl-pdf/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-pdf diff --git a/devel/fpc-fcl-sdo/Makefile b/devel/fpc-fcl-sdo/Makefile index eae1c82202e0..8086b166dbaf 100644 --- a/devel/fpc-fcl-sdo/Makefile +++ b/devel/fpc-fcl-sdo/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 6 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-sdo diff --git a/devel/fpc-fcl-stl/Makefile b/devel/fpc-fcl-stl/Makefile index ad08221c50bf..01cd5b17f242 100644 --- a/devel/fpc-fcl-stl/Makefile +++ b/devel/fpc-fcl-stl/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-stl diff --git a/devel/fpc-fcl-stl/pkg-plist b/devel/fpc-fcl-stl/pkg-plist index 811b06244b2e..7f4d7e9c2873 100644 --- a/devel/fpc-fcl-stl/pkg-plist +++ b/devel/fpc-fcl-stl/pkg-plist @@ -1,27 +1,15 @@ lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-stl.fpm -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/garrayutils.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/garrayutils.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gdeque.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gdeque.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashmap.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashmap.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashset.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashset.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/glinkedlist.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/glinkedlist.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gmap.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gmap.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gpriorityqueue.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gpriorityqueue.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gqueue.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gqueue.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gset.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gset.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gstack.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gstack.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gtree.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gtree.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gutil.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gutil.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gvector.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gvector.ppu diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile index 7a4a7e39ed9e..f0d7f80424ed 100644 --- a/devel/fpc-fcl-web/Makefile +++ b/devel/fpc-fcl-web/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 7 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-web @@ -8,8 +7,9 @@ COMMENT= Free Pascal web application libary (FCL) USES= fpc USE_FPC= dblib fcl-async fcl-base fcl-db fcl-xml fcl-json fcl-net \ - fcl-fpcunit fcl-passrc fastcgi httpd22 httpd24 ibase mysql \ - odbc openssl oracle postgres pxlib rtl-extra sqlite + fcl-fpcunit fcl-passrc fastcgi httpd22 httpd24 ibase \ + libmicrohttpd mysql odbc openssl oracle postgres pxlib \ + rtl-extra sqlite MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fcl-web/pkg-plist b/devel/fpc-fcl-web/pkg-plist index f5502597aa99..5ca6076ea8e8 100644 --- a/devel/fpc-fcl-web/pkg-plist +++ b/devel/fpc-fcl-web/pkg-plist @@ -18,6 +18,9 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custhttpapp.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custhttpapp.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custmicrohttpapp.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custmicrohttpapp.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custmicrohttpapp.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.rsj @@ -64,6 +67,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpclient.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpstatus.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpstatus.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpwebclient.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpwebclient.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.o @@ -71,8 +76,11 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjwt.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjwt.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpmimetypes.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpmimetypes.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2ini.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2ini.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.o @@ -86,6 +94,9 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebproxy.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebproxy.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebproxy.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.rsj @@ -93,13 +104,45 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpprotocol.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpprotocol.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httproute.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httproute.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httproute.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/microhttpapp.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/microhttpapp.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restbase.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restbase.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restcodegen.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restcodegen.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestado.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestado.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestauth.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestauth.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestauthini.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestauthini.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestbridge.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestbridge.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestcds.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestcds.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestconst.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestconst.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestconst.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestcsv.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestcsv.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestdata.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestdata.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestini.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestini.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestio.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestio.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestjson.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestjson.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestmodule.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestmodule.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestschema.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestschema.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestxml.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbrestxml.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.rsj diff --git a/devel/fpc-fppkg/Makefile b/devel/fpc-fppkg/Makefile index b7de9711c154..c26c88150596 100644 --- a/devel/fpc-fppkg/Makefile +++ b/devel/fpc-fppkg/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 6 CATEGORIES= devel lang PKGNAMESUFFIX= -fppkg @@ -9,7 +8,8 @@ COMMENT= Free Pascal package manager unit USES= fpc USE_FPC= dblib fastcgi fcl-async fcl-base fcl-db fcl-fpcunit fcl-json \ fcl-net fcl-passrc fcl-web fcl-xml httpd22 httpd24 ibase \ - mysql odbc openssl oracle postgres pxlib rtl-extra sqlite + libmicrohttpd mysql odbc openssl oracle postgres pxlib \ + rtl-extra sqlite MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fppkg/pkg-plist b/devel/fpc-fppkg/pkg-plist index 6ba236181ab1..b21382d69d38 100644 --- a/devel/fpc-fppkg/pkg-plist +++ b/devel/fpc-fppkg/pkg-plist @@ -13,6 +13,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfphttp.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfphttp.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfpmake.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfpmake.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfppkg.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfppkg.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgglobals.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgglobals.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkghandler.o @@ -24,8 +26,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgpackagesstructure.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgpackagesstructure.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkguninstalledsrcsrepo.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkguninstalledsrcsrepo.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.ppu diff --git a/devel/fpc-sdl/Makefile b/devel/fpc-sdl/Makefile index 8ba82f1ce3af..8c33c1d0df2e 100644 --- a/devel/fpc-sdl/Makefile +++ b/devel/fpc-sdl/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= devel lang PKGNAMESUFFIX= -sdl diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile index 955044892271..febcc91a1fdc 100644 --- a/editors/fpc-ide/Makefile +++ b/editors/fpc-ide/Makefile @@ -10,7 +10,7 @@ USES= fpc USE_FPC= chm fv gdbint regexpr rtl-extra rtl-console fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc -WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//} +WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/compiler .include "${MASTERDIR}/Makefile" diff --git a/editors/fpc-ide/pkg-plist b/editors/fpc-ide/pkg-plist index 89718ea51ba4..9d809da086d9 100644 --- a/editors/fpc-ide/pkg-plist +++ b/editors/fpc-ide/pkg-plist @@ -3,6 +3,7 @@ bin/cvsdiff.tdf bin/cvsup.tdf bin/fp bin/fp.ans +bin/fp.rsj bin/gplprog.pt bin/gplunit.pt bin/grep.tdf diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index c8671d7cb316..d2fea87ad7c6 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= graphics lang PKGNAMESUFFIX= -imagemagick diff --git a/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp b/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp index 4a27d7479a78..a38bf3cdeaa1 100644 --- a/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp +++ b/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp @@ -1,11 +1,11 @@ ---- packages/opengl/src/glut.pp.orig 2015-01-05 19:27:06.000000000 +0000 -+++ packages/opengl/src/glut.pp -@@ -768,7 +768,7 @@ initialization - {$ifdef darwin} +--- packages/opengl/src/glut.pp 2020-10-04 23:20:00.147154000 -0500 ++++ packages/opengl/src/glut.pp 2020-10-04 23:20:56.679328000 -0500 +@@ -765,7 +765,7 @@ + LoadGlut('glut.dll'); + {$elseif defined(darwin)} LoadGlut('/System/Library/Frameworks/GLUT.framework/GLUT'); - {$else} -- {$IFDEF haiku} -+ {$if defined(haiku) or defined(freebsd) or defined(dragonfly)} +- {$elseif defined(haiku) or defined(OpenBSD)} ++ {$elseif defined(haiku) or defined(OpenBSD) or defined(freebsd) or defined(dragonfly)} LoadGlut('libglut.so'); - {$ELSE} - {$IFNDEF MORPHOS} + {$elseif defined(MORPHOS)} + {nothing} diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile index efa6ca253092..806b38fa7e5e 100644 --- a/graphics/fpc-rsvg/Makefile +++ b/graphics/fpc-rsvg/Makefile @@ -1,5 +1,4 @@ # Created by: Christopher Key -PORTREVISION= 1 # $FreeBSD$ CATEGORIES= graphics lang diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile index 6d03784dde1f..92e7fb4658b3 100644 --- a/lang/fpc-base/Makefile +++ b/lang/fpc-base/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= base -PORTVERSION= 3.0.4 -PORTREVISION= 5 +PORTVERSION= 3.2.0 CATEGORIES= lang PKGNAMEPREFIX= fpc- diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile index 68093d874c09..0b748a23d347 100644 --- a/lang/fpc-docs/Makefile +++ b/lang/fpc-docs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= docs -PORTVERSION= 3.0.4 +PORTVERSION= 3.2.0 CATEGORIES= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \ ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/docs/ diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo index 3fb596935218..261358488ade 100644 --- a/lang/fpc-docs/distinfo +++ b/lang/fpc-docs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1517333020 -SHA256 (freepascal/3.0.4/doc-pdf.tar.gz) = 0c70ac388a5a6a1c775308661ce4feb9cfa9d9c1084fd6939bfa101d5488817b -SIZE (freepascal/3.0.4/doc-pdf.tar.gz) = 9161471 +TIMESTAMP = 1601823528 +SHA256 (freepascal/3.2.0/doc-pdf.tar.gz) = 5c4efe4709c387182d6da214bdd159f503ae9aa65c5c3e47c299cd7a03ed8de1 +SIZE (freepascal/3.2.0/doc-pdf.tar.gz) = 9644753 diff --git a/lang/fpc-rtl-objpas/Makefile b/lang/fpc-rtl-objpas/Makefile index 520f046787c5..658bbed896f7 100644 --- a/lang/fpc-rtl-objpas/Makefile +++ b/lang/fpc-rtl-objpas/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 5 CATEGORIES= lang PKGNAMESUFFIX= -rtl-objpas diff --git a/lang/fpc-source/Makefile b/lang/fpc-source/Makefile index 626018d06267..f0a91b4b1a14 100644 --- a/lang/fpc-source/Makefile +++ b/lang/fpc-source/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= fpc -PORTVERSION= 3.0.4 -PORTREVISION= 2 +PORTVERSION= 3.2.0 DISTVERSIONSUFFIX=.source CATEGORIES= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/ \ diff --git a/lang/fpc-source/distinfo b/lang/fpc-source/distinfo index 8abef10bde36..9a9a342c65a2 100644 --- a/lang/fpc-source/distinfo +++ b/lang/fpc-source/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565829645 -SHA256 (freepascal/fpc-3.0.4.source.tar.gz) = 69b3b7667b72b6759cf27226df5eb54112ce3515ff5efb79d95ac14bac742845 -SIZE (freepascal/fpc-3.0.4.source.tar.gz) = 40347617 +TIMESTAMP = 1601823640 +SHA256 (freepascal/fpc-3.2.0.source.tar.gz) = d595b72de7ed9e53299694ee15534e5046a62efa57908314efa02d5cc3b1cf75 +SIZE (freepascal/fpc-3.2.0.source.tar.gz) = 52028183 diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile index 1d704d578f99..6d5f51074978 100644 --- a/lang/fpc-units/Makefile +++ b/lang/fpc-units/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= units -PORTVERSION= 3.0.4 +PORTVERSION= 3.2.0 CATEGORIES= lang PKGNAMEPREFIX= fpc- @@ -15,20 +15,19 @@ BUILDNAME= ${ARCH}-${OPSYS:tl} ALL_OPTIONS= A52 ASPELL BFD BZIP2 CAIRO CHM DBLIB DBUS DTS FASTCGI \ FCL_ASYNC FCL_BASE FCL_DB FCL_EXTRA FCL_FPCUNIT FCL_IMAGE \ - FCL_JS FCL_JSON FCL_NET FCL_PASSRC FCL_PDF FCL_REGISTRY FCL_RES \ - FCL_SDO FCL_SOUND FCL_STL FCL_WEB FCL_XML FFTW \ - FPINDEXER FPPKG FV GDBM GMP GOOGLEAPI GTK2 HERMES ICONVENC \ - IMAGEMAGICK LDAP LIBCURL LIBGD LIBMICROHTTPD LIBPNG LIBXML2 LIBVLC LUA MAD \ - MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL \ - OPENSSL PASJPEG PCAP PROJ4 PXLIB RSVG REXX RTL_CONSOLE \ - RTL_EXTRA RTL_OBJPAS RTL_UNICODE SDL SVGALIB SYMBOLIC \ - SYSLOG UNZIP USERS UTMP UUID X11 XFORMS ZLIB - -# per PR 212919, the inclusion of the VLC unit will cause pkg(8) to require -# the deinstallation of KDE, so it's not a default option until furter notice + FCL_JS FCL_JSON FCL_NET FCL_PASSRC FCL_PDF FCL_REGISTRY \ + FCL_REPORT FCL_RES FCL_SDO FCL_SOUND FCL_STL FCL_WEB FCL_XML \ + FFTW FPINDEXER FPPKG FV GDBM GNUTLS GMP GOOGLEAPI \ + GTK2 HERMES ICONVENC IMAGEMAGICK LDAP LIBCUPS LIBCURL LIBENET \ + LIBFONTCONFIG LIBGD LIBMAGIC LIBMICROHTTPD LIBPNG LIBXML2 \ + LIBVLC LUA MAD MODPLUG NCURSES NEWT NUMLIB ODATA OGGVORBIS \ + OPENAL OPENGL OPENSSL PASJPEG PASTOJS PCAP PROJ4 PXLIB RSVG \ + REXX RTL_CONSOLE RTL_EXTRA RTL-GENERICS RTL_OBJPAS RTL_UNICODE \ + SDL SVGALIB SYMBOLIC SYSLOG UNZIP USERS UTMP UUID VCL-COMPAT \ + WEBIDL X11 XFORMS ZLIB OPTIONS_DEFINE:= ${ALL_OPTIONS} -OPTIONS_DEFAULT:= ${ALL_OPTIONS:NLIBVLC} +OPTIONS_DEFAULT:= ${ALL_OPTIONS} A52_DESC= Interface to a52 library ASPELL_DESC= Interface to aspell spelling checker @@ -52,6 +51,7 @@ FCL_NET_DESC= Component Library (net) FCL_PASSRC_DESC= Component Library (passrc) FCL_PDF_DESC= Component Library (pdf) FCL_REGISTRY_DESC= Component Library (registry) +FCL_REPORT_DESC= Freepascal report unit FCL_RES_DESC= Component Library (res) FCL_SDO_DESC= Component Library (sdo) FCL_SOUND_DESC= Component Library (sound) @@ -65,13 +65,18 @@ FV_DESC= Unit for Delphi support GDBM_DESC= Interface to the GNU database system GOOGLEAPI_DESC= Interface to the google api GMP_DESC= Interface to gmp library +GNUTLS_DESC= Unit for GnuTLS GTK2_DESC= Interface to gtk2 libraries HERMES_DESC= Unit for hermes ICONVENC_DESC= Interface to iconv library IMAGEMAGICK_DESC= Interface to ImageMagick LDAP_DESC= Interface to OpenLDAP +LIBCUPS_DESC= Interface to cups LIBCURL_DESC= Interface to curl library +LIBENET_DESC= Interface to enet library +LIBFONTCONFIG_DESC= Interface to fontconfig library LIBGD_DESC= Interface to gd library +LIBMAGIC_DESC= Interface to magic library LIBMICROHTTPD_DESC= Interface to libmicrohttpd library LIBPNG_DESC= Interface to png library LIBVLC_DESC= Unit for VLC @@ -82,11 +87,13 @@ MODPLUG_DESC= Interface to modplug library NCURSES_DESC= Interface to ncurses library NEWT_DESC= Interface to newt library NUMLIB_DESC= Unit for numerical methods +ODATA_DESC= Unit for odata protocol OGGVORBIS_DESC= Interaface to ogg & vorbis libraries OPENAL_DESC= Interface to openal library OPENGL_DESC= Interface to opengl library OPENSSL_DESC= Interface to openssl library PASJPEG_DESC= Unit for JPEG image format handling +PASTOJS_DESC= Interface to pas2js library PCAP_DESC= Interface to pcap library PROJ4_DESC= Interface to proj library PXLIB_DESC= Unit to read various Paradox file @@ -94,6 +101,7 @@ REXX_DESC= Interface to rexx-regina library RSVG_DESC= Interface to rsvg2 library RTL_CONSOLE_DESC= Run-Time lib for console abstraction RTL_EXTRA_DESC= Run-Time lib not needed for bootstrapping +RTL-GENERICS_DESC= Run-Time lib for generic containers RTL_OBJPAS_DESC= Rtl-objpas, aux. Delphi compat unit RTL_UNICODE_DESC= Rtl-unicode, misc Unicode units SDL_DESC= Interface to SDL library @@ -104,8 +112,10 @@ UNZIP_DESC= Routines for unzipping zip files USERS_DESC= Interface to manipulate users UTMP_DESC= Gather information from the utmp file UUID_DESC= Unit for UUID +VCL-COMPAT_DESC= Interface to visual component library X11_DESC= Interface to X windows server XFORMS_DESC= Interface to X-Forms +WEBIDL_DESC= Interface to webidl ZLIB_DESC= Interface to the zlib compression library .include diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile index 1bb7b5b85cf7..44f669aa51ba 100644 --- a/lang/fpc-utils/Makefile +++ b/lang/fpc-utils/Makefile @@ -1,16 +1,17 @@ # $FreeBSD$ -PORTREVISION= 6 +PORTREVISION= 0 CATEGORIES= lang PKGNAMESUFFIX= -utils COMMENT= Free Pascal Compiler utilities USES= fpc -USE_FPC= chm fcl-base fcl-fpcunit fcl-net fcl-passrc fcl-res fcl-xml \ - fppkg libcurl fcl-json rtl-extra rtl-objpas openssl fcl-async \ - fcl-web fcl-db ibase mysql odbc oracle postgres sqlite \ - dblib pxlib fastcgi httpd22 httpd24 +USE_FPC= chm dblib fastcgi fcl-async fcl-base fcl-db fcl-fpcunit fcl-js \ + fcl-net fcl-passrc fcl-res fcl-xml fcl-web fcl-json fppkg \ + httpd22 httpd24 ibase libcurl libmicrohttpd mysql odbc openssl \ + oracle pastojs postgres pxlib rtl-extra rtl-generics rtl-objpas \ + sqlite webidl MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/utils diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist index 9e28dea310f2..36226640769a 100644 --- a/lang/fpc-utils/pkg-plist +++ b/lang/fpc-utils/pkg-plist @@ -1,22 +1,29 @@ bin/bin2obj +bin/compileserver bin/data2inc bin/delp bin/fpcjres bin/fpclasschart +bin/fpclasschart.rsj +bin/fpcmkcfg.rsj bin/fpcres bin/fpcsubst +bin/fpcsubst.rsj bin/fpdoc bin/fppkg bin/fprcp bin/h2pas bin/h2paspp bin/instantfpc +bin/json2pas bin/makeskel bin/makeskel.rsj bin/mkinsadd bin/pas2fpm bin/pas2jni +bin/pas2js bin/pas2ut +bin/pas2ut.rsj bin/plex bin/postw32 bin/ppdep @@ -25,11 +32,20 @@ bin/ptop.rsj bin/pyacc bin/rmcvsdir bin/rstconv +bin/rstconv.rsj bin/unitdiff +bin/unitdiff.rsj +bin/webidl2pas lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/utils-lexyacc.fpm +lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/utils-pas2js.fpm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/lexlib.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/lexlib.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/yacclib.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/yacclib.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-pas2js/dirwatch.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-pas2js/dirwatch.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-pas2js/httpcompiler.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-pas2js/httpcompiler.ppu lib/fpc/lexyacc/yylex.cod lib/fpc/lexyacc/yyparse.cod +lib/libpas2jslib.so diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index b8f2e3504f5a..cdf4157d7476 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= fpc -PORTVERSION= 3.0.4 -PORTREVISION?= 6 +PORTVERSION= 3.2.0 +PORTREVISION?= 0 CATEGORIES?= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \ ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \ diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index a6efd51f1753..dfc2fc0e003a 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -43,10 +43,15 @@ LATE_INSTALL_ARGS= fpc_exampleinstall post-extract: @cd ${WRKDIR}/${WRKUNITDIR} && \ ${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -r -.if ${PKGNAMESUFFIX:M-utils} || ${PKGNAMESUFFIX:M-ide} +.if ${PKGNAMESUFFIX:M-utils} ${REINPLACE_CMD} -e '/globalunit/ s|\.\./packages|${FPCDIR}|' \ ${WRKDIR}/${WRKUNITDIR}/Makefile -.else +.endif +.if ${PKGNAMESUFFIX:M-ide} + ${REINPLACE_CMD} -e '/globalunit/ s|\.\./\.\./packages|${FPCDIR}|' \ + ${WRKDIR}/${WRKUNITDIR}/Makefile +.endif +.if ${PKGNAMESUFFIX:N-ide:N-utils} ${REINPLACE_CMD} -e '/globalunit/ {s|\.\.|${FPCDIR}|;}' \ ${WRKDIR}/${WRKUNITDIR}/Makefile .endif @@ -60,3 +65,8 @@ post-patch: @${REINPLACE_CMD} -e 's|android,linux,|android,linux,freebsd,dragonfly,|g' \ ${WRKDIR}/${WRKUNITDIR}/fpmake.pp .endif +.if ${PKGNAMESUFFIX} == "-rtl-generics" + @${REINPLACE_CMD} -e 's|googleapi|rtl-generics|g' \ + ${WRKDIR}/${WRKUNITDIR}/Makefile.fpc \ + ${WRKDIR}/${WRKUNITDIR}/Makefile +.endif diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo index 200587cb4a7a..fd6bfde26402 100644 --- a/lang/fpc/distinfo +++ b/lang/fpc/distinfo @@ -1,8 +1,6 @@ -TIMESTAMP = 1582397737 -SHA256 (freepascal/fpc-3.0.4.source.tar.gz) = 69b3b7667b72b6759cf27226df5eb54112ce3515ff5efb79d95ac14bac742845 -SIZE (freepascal/fpc-3.0.4.source.tar.gz) = 40347617 -SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 3f5fa4b24abde00a1dcfe7e28938e8b7bf908c7d6633182521916e2191ae867d -SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1121653 +TIMESTAMP = 1601340339 +SHA256 (freepascal/fpc-3.2.0.source.tar.gz) = d595b72de7ed9e53299694ee15534e5046a62efa57908314efa02d5cc3b1cf75 +SIZE (freepascal/fpc-3.2.0.source.tar.gz) = 52028183 SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = fb57c418ec374ed99cd7914a4daa5fc6afccfbf41595a886c361e3fef8bbdbb3 SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1198576 SHA256 (freepascal/fpc-3.0.4.man.tar.gz) = bc5357fc6e56d77eeeb5d820023f7f721f5febcc684837f296a598c6c772b26c diff --git a/lang/fpc/files/patch-compiler_cfileutl.pas b/lang/fpc/files/patch-compiler_cfileutl.pas deleted file mode 100644 index c5e1f8e6fb5f..000000000000 --- a/lang/fpc/files/patch-compiler_cfileutl.pas +++ /dev/null @@ -1,12 +0,0 @@ ---- compiler/cfileutl.pas.orig 2015-11-13 21:15:29 UTC -+++ compiler/cfileutl.pas -@@ -23,9 +23,7 @@ unit cfileutl; - - {$i fpcdefs.inc} - --{$ifndef DragonFly} - {$define usedircache} --{$endif DragonFly} - - interface - diff --git a/lang/fpc/files/patch-compiler_globals.pas b/lang/fpc/files/patch-compiler_globals.pas new file mode 100644 index 000000000000..0658c1ff67a5 --- /dev/null +++ b/lang/fpc/files/patch-compiler_globals.pas @@ -0,0 +1,32 @@ +--- compiler/globals.pas 2020-10-03 17:51:53.151305000 -0500 ++++ compiler/globals.pas 2020-10-03 17:53:05.954948000 -0500 +@@ -897,6 +897,19 @@ + FreeEnvPChar(envvalue); + end; + {$endif openbsd} ++{$ifdef freebsd} ++ function GetFreeBSDLocalBase: ansistring; ++ var ++ envvalue: pchar; ++ begin ++ envvalue := GetEnvPChar('LOCALBASE'); ++ if assigned(envvalue) then ++ Result:=envvalue ++ else ++ Result:='/usr/local'; ++ FreeEnvPChar(envvalue); ++ end; ++{$endif freebsd} + var + envstr: string; + envvalue: pchar; +@@ -933,6 +946,9 @@ + Replace(s,'$OPENBSD_LOCALBASE',GetOpenBSDLocalBase); + Replace(s,'$OPENBSD_X11BASE',GetOpenBSDX11Base); + {$endif openbsd} ++{$ifdef freebsd} ++ Replace(s,'$FREEBSD_LOCALBASE',GetFreeBSDLocalBase); ++{$endif freebsd} + { Replace environment variables between dollar signs } + i := pos('$',s); + while i>0 do diff --git a/lang/fpc/files/patch-compiler_ogelf.pas b/lang/fpc/files/patch-compiler_ogelf.pas deleted file mode 100644 index c705c69b2874..000000000000 --- a/lang/fpc/files/patch-compiler_ogelf.pas +++ /dev/null @@ -1,21 +0,0 @@ ---- compiler/ogelf.pas 2019-03-02 14:21:26.692250000 +0000 -+++ compiler/ogelf.pas 2019-03-02 14:23:40.598706000 +0000 -@@ -1241,7 +1241,7 @@ - { section data } - layoutsections(datapos); - { section headers } -- shoffset:=datapos; -+ shoffset:=align(datapos,dword(Sizeof(AInt))); - inc(datapos,(nsections+1)*sizeof(telfsechdr)); - - { Write ELF Header } -@@ -1277,6 +1277,9 @@ - writer.writezeros($40-sizeof(header)); { align } - { Sections } - WriteSectionContent(data); -+ -+ { Align header } -+ Writer.Writezeros(Align(Writer.Size,Sizeof(AInt))-Writer.Size); - { section headers, start with an empty header for sh_undef } - writer.writezeros(sizeof(telfsechdr)); - ObjSectionList.ForEachCall(@section_write_sechdr,nil); diff --git a/lang/fpc/files/patch-compiler_systems_t__bsd.pas b/lang/fpc/files/patch-compiler_systems_t__bsd.pas index 10c84b259d53..7d770b5da9d5 100644 --- a/lang/fpc/files/patch-compiler_systems_t__bsd.pas +++ b/lang/fpc/files/patch-compiler_systems_t__bsd.pas @@ -1,92 +1,24 @@ ---- compiler/systems/t_bsd.pas 2014-12-07 15:27:02.000000000 -0500 -+++ compiler/systems/t_bsd.pas 2019-12-30 19:00:54.968908000 -0500 -@@ -60,6 +60,7 @@ - private - LdSupportsNoResponseFile : boolean; - LibrarySuffix : Char; -+ LdPath : String; - Function WriteResponseFile(isdll:boolean) : Boolean; - function GetDarwinCrt1ObjName(isdll: boolean): TCmdStr; - Function GetDarwinPrtobjName(isdll: boolean): TCmdStr; -@@ -139,6 +140,9 @@ - } +--- 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 + 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 - LibrarySuffix:=' '; -+ LdPath:=GetEnvironmentVariable('FPC_LDPATH'); -+ if not FileExists(LdPath,True) then -+ LdPath:='%%FPC_LDPATH%%'; - LdSupportsNoResponseFile := (target_info.system in ([system_m68k_netbsd]+systems_darwin)); - with Info do - begin -@@ -146,8 +150,8 @@ - begin - if not(target_info.system in systems_darwin) then - begin -- ExeCmd[1]:='ld $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $CATRES'; -- DllCmd[1]:='ld $TARGET $EMUL $OPT -shared -L. -o $EXE $CATRES' -+ ExeCmd[1]:=LdPath + ' $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $CATRES'; -+ DllCmd[1]:=LdPath + ' $TARGET $EMUL $OPT -shared -L. -o $EXE $CATRES' - end - else - begin -@@ -166,22 +170,22 @@ - programs with problems that require Valgrind will have more - than 60KB of data (first 4KB of address space is always invalid) - } -- ExeCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; -+ ExeCmd[1]:=LdPath + ' $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; - if not(cs_gdb_valgrind in current_settings.globalswitches) then - ExeCmd[1]:=ExeCmd[1]+' -pagezero_size 0x10000'; - {$else ndef cpu64bitaddr} -- ExeCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; -+ ExeCmd[1]:=LdPath + ' $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; - {$endif ndef cpu64bitaddr} - if (apptype<>app_bundle) then -- DllCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -dylib -multiply_defined suppress -L. -o $EXE $CATRES' -+ DllCmd[1]:=LdPath + ' $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -dylib -multiply_defined suppress -L. -o $EXE $CATRES' - else -- DllCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -bundle -multiply_defined suppress -L. -o $EXE $CATRES' -+ DllCmd[1]:=LdPath + ' $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -bundle -multiply_defined suppress -L. -o $EXE $CATRES' - end - end - else - begin -- ExeCmd[1]:='ld $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $RES'; -- DllCmd[1]:='ld $TARGET $EMUL $OPT $INIT $FINI $SONAME -shared -L. -o $EXE $RES'; -+ ExeCmd[1]:=LdPath + ' $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $RES'; -+ DllCmd[1]:=LdPath + ' $TARGET $EMUL $OPT $INIT $FINI $SONAME -shared -L. -o $EXE $RES'; - end; - if not(target_info.system in systems_darwin) then - DllCmd[2]:='strip --strip-unneeded $EXE' -@@ -192,6 +196,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=system_x86_64_dragonfly then -+ DynamicLinker:='/libexec/ld-elf.so.2' - else - DynamicLinker:=''; - end; -@@ -555,7 +561,7 @@ - While not SharedLibFiles.Empty do - begin - S:=SharedLibFiles.GetFirst; -- if (s<>'c') or reorder then -+ if (((((((((s<>'c') and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) or reorder then - begin - i:=Pos(target_info.sharedlibext,S); - if i>0 then -@@ -718,7 +724,12 @@ - Replace(cmdstr,'$DYNLINK',DynLinkStr); - if (target_info.system in systems_darwin) then - Replace(cmdstr,'$PRTOBJ',GetDarwinPrtobjName(false)); -- BinStr:=FindUtil(utilsprefix+BinStr); -+ if target_info.system=system_x86_64_dragonfly then -+ BinStr:='/usr/libexec/binutils225/elf/ld.bfd'; + if target_info.system in systems_freebsd then -+ BinStr:=LdPath -+ else -+ BinStr:=FindUtil(utilsprefix+BinStr); - - { create dsym file? } - extdbgbinstr:=''; ++ begin ++ LdProgram:=GetEnvPChar('FPC_LDPATH'); ++ if not FileExists(LdProgram,True) then ++ LdProgram:=GetEnvPChar('LOCALBASE')+'/bin/ld.bfd'; ++ end; + if target_info.system in (systems_openbsd+[system_x86_64_dragonfly]) then + LdProgram:='ld.bfd'; + LibrarySuffix:=' '; diff --git a/lang/fpc/files/patch-rtl_bsd_ossysc.inc b/lang/fpc/files/patch-rtl_bsd_ossysc.inc index b1bfa41edde4..9642dbf97e80 100644 --- a/lang/fpc/files/patch-rtl_bsd_ossysc.inc +++ b/lang/fpc/files/patch-rtl_bsd_ossysc.inc @@ -1,32 +1,30 @@ ---- rtl/bsd/ossysc.inc 2014-11-23 16:59:25.000000000 -0500 -+++ rtl/bsd/ossysc.inc 2020-02-21 21:01:06.087663000 -0500 -@@ -72,9 +72,9 @@ +--- rtl/bsd/ossysc.inc 2020-10-03 18:58:28.503033000 -0500 ++++ rtl/bsd/ossysc.inc 2020-10-03 19:01:01.207504000 -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,lo(Offset),{0} hi(offset),Whence); -+ Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,0,TSysParam(fd),lo(Offset),{0} hi(offset),Whence); - {$endif} - end; - -@@ -82,11 +82,10 @@ +- 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); ++ 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; - - -@@ -94,9 +93,9 @@ +@@ -102,9 +102,9 @@ begin {$ifdef CPU64} @@ -38,15 +36,3 @@ {$ifdef FPC_BIG_ENDIAN} hi(offst),lo(offst){$endif} {$ifdef FPC_LITTLE_ENDIAN} lo(offst),hi(offst){$endif} ))); -@@ -282,7 +281,11 @@ - repeat - novalid:=false; - CurEntry:=pdirent(dirp^.dd_rewind); -+{$ifdef dragonfly} -+ RecLen:=(CurEntry^.d_namlen + 24) and $FFFFFFF8; -+{$else} - RecLen:=CurEntry^.d_reclen; -+{$endif} - if RecLen<>0 Then - begin {valid direntry?} - if CurEntry^.d_fileno<>0 then 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 62fa7e7deeb8..000000000000 --- a/lang/fpc/files/patch-rtl_bsd_ostypes.inc +++ /dev/null @@ -1,27 +0,0 @@ ---- rtl/bsd/ostypes.inc.orig 2015-11-13 21:15:29 UTC -+++ rtl/bsd/ostypes.inc -@@ -145,6 +145,16 @@ TYPE - - { directory services } - {$ifndef darwinarm} -+{$ifdef dragonfly} -+ dirent = record -+ d_fileno : ino_t; // file number of entry -+ d_namlen : cuint16; // strlen (d_name) -+ d_type : cuint8; // file type, see below -+ d_unused1 : cuint8; // padding, reserved -+ d_unused2 : cuint32; // reserved -+ d_name : array[0..255] of char; // name, null terminated -+ end; -+{$else} - dirent = record - d_fileno : cuint32; // file number of entry - d_reclen : cuint16; // length of this record -@@ -152,6 +162,7 @@ TYPE - d_namlen : cuint8; // length of string in d_name - d_name : array[0..(255 + 1)-1] of char; // name must be no longer than this - end; -+{$endif} - {$else not darwinarm} - {$packrecords 4} - { available on Mac OS X 10.6 and later, and used by all iPhoneOS versions } diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist index f23f7cfd72f9..a8b743ff2a80 100644 --- a/lang/fpc/pkg-plist +++ b/lang/fpc/pkg-plist @@ -1,6 +1,7 @@ bin/fpc bin/fpcmake bin/fpcmkcfg +bin/mka64ins bin/mkarmins bin/mkx86ins %%FPC_I386%%bin/ppc386 @@ -9,6 +10,11 @@ bin/ppudump bin/ppufiles bin/ppumove @sample etc/fpc.cfg.sample +lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-process.fpm +lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fpmkunit.fpm +lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/hash.fpm +lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libtar.fpm +lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/paszlib.fpm lib/fpc/%%PORTVERSION%%/msg/errorct.msg lib/fpc/%%PORTVERSION%%/msg/errord.msg lib/fpc/%%PORTVERSION%%/msg/errorda.msg @@ -32,11 +38,6 @@ lib/fpc/%%PORTVERSION%%/msg/errorues.msg %%FPC_I386%%lib/fpc/%%PORTVERSION%%/ppc386 %%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/ppcx64 lib/fpc/%%PORTVERSION%%/samplecfg -lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-process.fpm -lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fpmkunit.fpm -lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/hash.fpm -lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libtar.fpm -lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/paszlib.fpm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.rsj @@ -145,27 +146,79 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1257.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1257.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1258.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1258.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp3021.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp3021.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp437.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp437.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp646.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp646.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp737.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp737.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp775.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp775.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp850.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp850.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp852.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp852.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp855.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp855.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp856.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp856.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp857.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp857.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp860.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp860.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp861.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp861.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp862.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp862.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp863.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp863.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp864.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp864.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp865.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp865.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp866.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp866.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp869.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp869.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp874.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp874.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_1.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_1.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_10.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_10.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_11.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_11.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_13.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_13.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_14.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_14.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_15.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_15.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_16.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_16.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_2.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_2.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_3.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_3.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_4.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_4.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_5.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_5.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_6.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_6.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_7.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_7.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_8.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_8.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_9.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_9.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpall.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpkoi8_r.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpkoi8_r.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpkoi8_u.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpkoi8_u.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cprt0.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.ppu @@ -186,6 +239,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/extpas.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/extpas.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpintres.o diff --git a/misc/fpc-chm/Makefile b/misc/fpc-chm/Makefile index 69597bd0e500..7466b1fed37c 100644 --- a/misc/fpc-chm/Makefile +++ b/misc/fpc-chm/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -chm COMMENT= Free Pascal unit to manipulate chm files USES= fpc -USE_FPC= fcl-base fcl-xml +USE_FPC= fcl-base fcl-xml rtl-generics MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/multimedia/fpc-libvlc/Makefile b/multimedia/fpc-libvlc/Makefile index ae86fffa402c..ee5d3957c5c3 100644 --- a/multimedia/fpc-libvlc/Makefile +++ b/multimedia/fpc-libvlc/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 6 CATEGORIES= multimedia lang PKGNAMESUFFIX= -libvlc @@ -15,8 +14,6 @@ EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= VLC VLC_DESC= Install vlc media player -OPTIONS_DEFAULT= VLC - VLC_RUN_DEPENDS= vlc:multimedia/vlc .include "${MASTERDIR}/Makefile" diff --git a/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp index 2d85944ec243..3ec35927568b 100644 --- a/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp +++ b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp @@ -7,7 +7,7 @@ - P.OSes := [win32, win64, linux, freebsd]; + P.OSes := [win32, win64, linux, dragonfly, freebsd]; P.Dependencies.Add('fcl-base'); - P.Version:='3.0.4'; + P.Version:='3.2.0'; P.License := 'LGPL with modification'; P.HomepageURL := 'www.freepascal.org'; P.Email := 'michael@freepascal.org'; diff --git a/security/fpc-openssl/Makefile b/security/fpc-openssl/Makefile index 1c7073c228a3..200fd023b91e 100644 --- a/security/fpc-openssl/Makefile +++ b/security/fpc-openssl/Makefile @@ -6,7 +6,8 @@ PKGNAMESUFFIX= -openssl COMMENT= Free Pascal unit for OpenSSL USES= fpc -USE_FPC= rtl-extra +USE_FPC= fcl-async fcl-base fcl-net fcl-passrc fcl-res fcl-xml rtl-extra \ + rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/security/fpc-openssl/pkg-plist b/security/fpc-openssl/pkg-plist index 3d9edb4d49ea..4ebc19071310 100644 --- a/security/fpc-openssl/pkg-plist +++ b/security/fpc-openssl/pkg-plist @@ -1,5 +1,10 @@ lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/openssl.fpm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/fpopenssl.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/fpopenssl.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/fpopenssl.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/openssl.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/openssl.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/openssl.rsj +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/opensslsockets.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/opensslsockets.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/opensslsockets.rsj diff --git a/www/fpc-googleapi/Makefile b/www/fpc-googleapi/Makefile index f42613cdc7f7..47581199f709 100644 --- a/www/fpc-googleapi/Makefile +++ b/www/fpc-googleapi/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 6 CATEGORIES= www lang PKGNAMESUFFIX= -googleapi @@ -9,7 +8,7 @@ COMMENT= Free Pascal googleapi unit USES= fpc USE_FPC= dblib fastcgi fcl-async fcl-base fcl-db fcl-json fcl-fpcunit \ fcl-net fcl-passrc fcl-res fcl-web fcl-xml httpd22 httpd24 \ - ibase mysql postgres pxlib odbc openssl oracle rtl-extra \ + ibase libmicrohttpd mysql postgres pxlib odbc openssl oracle rtl-extra \ rtl-objpas sqlite MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/www/fpc-httpd22/Makefile b/www/fpc-httpd22/Makefile index 623ded12b8c8..bde9b65e4083 100644 --- a/www/fpc-httpd22/Makefile +++ b/www/fpc-httpd22/Makefile @@ -12,9 +12,4 @@ MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR= ${WRKUNITDIR} -OPTIONS_DEFINE= APACHE22 -APACHE22_DESC= Install apache22 server - -APACHE22_USE= APACHE=22 - .include "${MASTERDIR}/Makefile" diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile index 4b04a032d88c..e5daf8de8b0f 100644 --- a/x11/fpc-x11/Makefile +++ b/x11/fpc-x11/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 6 CATEGORIES= x11 lang PKGNAMESUFFIX= -x11