lang/fpc-*: Merge all units to lang/fpc

- Merge all fpc-* units to lang/fpc. It gives us a better way to maintain fpc
  and lazarus ports.
- Update Mk/fpc.mk for reflects new changes
- Update Mk/lazarus.mk for reflects new changes
- Now we can defined WANT_FPC_DEVEL AND WANT_LAZARUS_DEVEL for use devel version
  of fpc or lazarus for build apps based on fpc/lazarus
- Add entries to MOVED
- Bump PORTREVISON of affected ports
- Some other minor modifications

MOVED

@@ -7975,3 +7975,107 @@ games/libretro-fbalpha|games/libretro-fbalpha2012|2023-11-06|Follow naming of li
 games/libretro-paralleln64|games/libretro-parallel_n64|2023-11-06|Follow naming of libretro-super build script
 games/libretro-uae|games/libretro-puae|2023-11-06|Follow naming of libretro-super build script
 games/libretro-vbanext|games/libretro-vba_next|2023-11-06|Follow naming of libretro-super build script
+archivers/fpc-bzip2|lang/fpc|2023-11-12|This port was merged into lang/fpc
+archivers/fpc-unzip|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-mad|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-a52|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-oggvorbis|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-modplug|lang/fpc|2023-11-12|This port was merged into lang/fpc
+audio/fpc-openal|lang/fpc|2023-11-12|This port was merged into lang/fpc
+converters/fpc-iconvenc|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-odbc|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-fpindexer|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-postgres|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-dblib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-ibase|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-gdbm|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-mysql|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-pxlib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-oracle|lang/fpc|2023-11-12|This port was merged into lang/fpc
+databases/fpc-sqlite|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-pthreads|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-tplylib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-pdf|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-sdo|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-image|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-xml|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-newt|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fppkg|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-sdl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-extra|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-odata|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-stl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-js|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-symbolic|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-res|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-web|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-registry|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-fpcunit|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-report|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-passrc|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-regexpr|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-sound|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-dbus|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-db|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-gdbint|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-libmagic|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-async|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-base|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-json|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fcl-net|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-fv|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-zlib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+devel/fpc-bfd|lang/fpc|2023-11-12|This port was merged into lang/fpc
+editors/fpc-ide|lang/fpc|2023-11-12|This port was merged into lang/fpc
+ftp/fpc-libcurl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-libpng|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-ncurses|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-hermes|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-imagemagick|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-rsvg|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-libgd|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-opengl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-graph|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-vcl-compat|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-svgalib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-proj4|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-pasjpeg|lang/fpc|2023-11-12|This port was merged into lang/fpc
+graphics/fpc-cairo|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-pastojs|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-objpas|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-lua|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-utils|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-generics|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-extra|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-units|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rexx|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-base|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-unicode|lang/fpc|2023-11-12|This port was merged into lang/fpc
+lang/fpc-rtl-console|lang/fpc|2023-11-12|This port was merged into lang/fpc
+math/fpc-gmp|lang/fpc|2023-11-12|This port was merged into lang/fpc
+math/fpc-numlib|lang/fpc|2023-11-12|This port was merged into lang/fpc
+math/fpc-fftw|lang/fpc|2023-11-12|This port was merged into lang/fpc
+misc/fpc-chm|lang/fpc|2023-11-12|This port was merged into lang/fpc
+multimedia/fpc-dts|lang/fpc|2023-11-12|This port was merged into lang/fpc
+multimedia/fpc-libvlc|lang/fpc|2023-11-12|This port was merged into lang/fpc
+net/fpc-ldap|lang/fpc|2023-11-12|This port was merged into lang/fpc
+net/fpc-pcap|lang/fpc|2023-11-12|This port was merged into lang/fpc
+net/fpc-libenet|lang/fpc|2023-11-12|This port was merged into lang/fpc
+print/fpc-libcups|lang/fpc|2023-11-12|This port was merged into lang/fpc
+security/fpc-gnutls|lang/fpc|2023-11-12|This port was merged into lang/fpc
+security/fpc-openssl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+sysutils/fpc-utmp|lang/fpc|2023-11-12|This port was merged into lang/fpc
+sysutils/fpc-uuid|lang/fpc|2023-11-12|This port was merged into lang/fpc
+sysutils/fpc-syslog|lang/fpc|2023-11-12|This port was merged into lang/fpc
+textproc/fpc-aspell|lang/fpc|2023-11-12|This port was merged into lang/fpc
+textproc/fpc-libxml2|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-libmicrohttpd|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-httpd24|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-googleapi|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-webidl|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-httpd22|lang/fpc|2023-11-12|This port was merged into lang/fpc
+www/fpc-fastcgi|lang/fpc|2023-11-12|This port was merged into lang/fpc
+x11/fpc-x11|lang/fpc|2023-11-12|This port was merged into lang/fpc
+x11-fonts/fpc-libfontconfig|lang/fpc|2023-11-12|This port was merged into lang/fpc
+x11-toolkits/fpc-xforms|lang/fpc|2023-11-12|This port was merged into lang/fpc
+x11-toolkits/fpc-gtk2|lang/fpc|2023-11-12|This port was merged into lang/fpc

Mk/Uses/fpc.mk

@@ -3,22 +3,14 @@
 #
 # Feature:      fpc
 # Usage:        USES=fpc
-# Valid ARGS:   (none), run, base, all
+# Valid ARGS:   (none), run
 #
-# run			- Free pascal units will be registered also as run dependencies.
-#
-# base			- This automatically will install all base units of fpc 
-#			  (gdbint graph ibase libasync hash httpd mysql netdb odbc 
-#			  oracle pasjpeg paszlib pthreads postgres regexpr and sqlite).
-#
-# all			- This automatically will install all free pascal units.
-#
-# if you need install additional fpc units, they can be listed there (USE_FPC=gtk2 x11 opengl).
+# run			- Free pascal compiler and units will be registered also
+#			  as run dependencies.
 #
 # Example:
 #	
 #	USES+=	fpc:run
-#	USE_FPC=gtk2
 #
 
 .if !defined(_INCLUDE_USES_FPC_MK)
@@ -31,8 +23,8 @@ _INCLUDE_USES_FPC_MK=   yes
 WARNING+=	"DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
 .  endif
 
-.  if ${fpc_ARGS:Nrun:Nbase:Nall}
-IGNORE=		Unknown argument for USES=fpc: ${fpc_ARGS:Nrun:Nbase:Nall}
+.  if ${fpc_ARGS:Nrun}
+IGNORE=		Unknown argument for USES=fpc: ${fpc_ARGS:Nrun}
 .  endif
 
 DEFAULT_FPC_VER=	${FPC_DEFAULT}
@@ -58,159 +50,22 @@ ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 .  endif
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
-			${PPNAME}:lang/fpc
-
-BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
-UNITSDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
-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-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 tplylib 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 \
-		postgres pthreads regexpr sqlite
+.  if !defined(WANT_FPC_DEVEL)
+FPC_DEVELSUFFIX=	#
+.  else
+FPC_DEVELSUFFIX=	-devel
 .  endif
 
-.  if ${fpc_ARGS:Mall}
-USE_FPC=	${_FPC_ALL_UNITS}
-.  endif
+BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			${LOCALBASE}/lib/fpc/${FPC_VER}/${PPNAME}:lang/fpc${FPC_DEVELSUFFIX}
 
-.  if defined(USE_FPC) && ${USE_FPC:tl} != "yes"
-.    for UNITS in ${USE_FPC}
-.      if ${_FPC_ALL_UNITS:M${UNITS}}==""
-IGNORE= cannot install: unknown FPC unit ${UNITS}
-.      endif
-.    endfor
+.  if ${fpc_ARGS:Mrun}
+RUN_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			${LOCALBASE}/lib/fpc/${FPC_VER}/${PPNAME}:lang/fpc${FPC_DEVELSUFFIX}
 .  endif
 
-# Base units
-gdbint_UNIT=	devel/fpc-gdbint
-graph_UNIT=	graphics/fpc-graph
-httpd22_UNIT=	www/fpc-httpd22
-httpd24_UNIT=	www/fpc-httpd24
-ibase_UNIT=	databases/fpc-ibase
-mysql_UNIT=	databases/fpc-mysql
-odbc_UNIT=	databases/fpc-odbc
-oracle_UNIT=	databases/fpc-oracle
-pasjpeg_UNIT=	graphics/fpc-pasjpeg
-postgres_UNIT=	databases/fpc-postgres
-pthreads_UNIT=	devel/fpc-pthreads
-regexpr_UNIT=	devel/fpc-regexpr
-sqlite_UNIT=	databases/fpc-sqlite
-
-# Extra units
-a52_UNIT=	audio/fpc-a52
-aspell_UNIT=	textproc/fpc-aspell
-bfd_UNIT=	devel/fpc-bfd
-bzip2_UNIT=	archivers/fpc-bzip2
-cairo_UNIT=	graphics/fpc-cairo
-chm_UNIT=	misc/fpc-chm
-dblib_UNIT=	databases/fpc-dblib
-dbus_UNIT=	devel/fpc-dbus
-dts_UNIT=	multimedia/fpc-dts
-fastcgi_UNIT=	www/fpc-fastcgi
-fcl_async_UNIT=	devel/fpc-fcl-async
-fcl_base_UNIT=	devel/fpc-fcl-base
-fcl_db_UNIT=	devel/fpc-fcl-db
-fcl_extra_UNIT=	devel/fpc-fcl-extra
-fcl_fpcunit_UNIT=	devel/fpc-fcl-fpcunit
-fcl_image_UNIT=	devel/fpc-fcl-image
-fcl_js_UNIT=	devel/fpc-fcl-js
-fcl_json_UNIT=	devel/fpc-fcl-json
-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
-fcl_stl_UNIT=	devel/fpc-fcl-stl
-fcl_web_UNIT=	devel/fpc-fcl-web
-fcl_xml_UNIT=	devel/fpc-fcl-xml
-fftw_UNIT=	math/fpc-fftw
-fpindexer_UNIT=	databases/fpc-fpindexer
-fppkg_UNIT=	devel/fpc-fppkg
-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
-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
-libxml2_UNIT=	textproc/fpc-libxml2
-lua_UNIT=	lang/fpc-lua
-mad_UNIT=	audio/fpc-mad
-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
-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
-svgalib_UNIT=	graphics/fpc-svgalib
-symbolic_UNIT=	devel/fpc-symbolic
-syslog_UNIT=	sysutils/fpc-syslog
-tplylib_UNIT=	devel/fpc-tplylib
-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
-
-.endif
+BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
+UNITSDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
+MKINSTDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
 
-.if defined(USE_FPC)
-.  for UNIT in ${USE_FPC}
-.    if ${_FPC_ALL_UNITS:M${UNIT}} != ""
-BUILD_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${${UNIT:S/-/_/}_UNIT}
-.      if ${fpc_ARGS:Mrun} || ${fpc_ARGS:Mbase}
-RUN_DEPENDS+=   ${MKINSTDIR}/${UNIT}.fpm:${${UNIT:S/-/_/}_UNIT}
-.      endif
-.    endif
-.  endfor
 .endif

Mk/Uses/lazarus.mk

@@ -2,7 +2,7 @@
 #
 # Feature:      lazarus
 # Usage:        USES=lazarus
-# Valid ARGS:   (none), gtk2, qt5, flavors
+# Valid ARGS:   (none), gtk2, qt5, qt6, flavors
 #
 # (none)    - This automatically build lazarus-app with gtk2 interface
 #
@@ -75,13 +75,19 @@ LAZARUS_DIR?=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
-			fpcres:lang/fpc-utils
+.  if !defined(WANT_FPC_DEVEL)
+FPC_DEVELSUFFIX=	#
+.  else
+FPC_DEVELSUFFIX=	-devel
+.  endif
 
 BUILDNAME=		${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_UNITS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
 MKINSTDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
 
+BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			${MKINSTDIR}/utils-lexyacc.fpm:lang/fpc${FPC_DEVELSUFFIX}
+
 LAZARUS_FLAVORS=	gtk2 qt5
 
 .  if defined(WANT_LAZARUS_DEVEL)
@@ -111,7 +117,6 @@ LAZARUS_DEVELSUFFIX=	-devel
 .  endif
 
 .  if ${lazarus_ARGS:Mgtk2} || ${FLAVOR} == gtk2
-BUILD_DEPENDS+=	${MKINSTDIR}/gtk2.fpm:x11-toolkits/fpc-gtk2
 LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
 		libgtk-x11-2.0.so:x11-toolkits/gtk20 \
 		libatk-1.0.so:accessibility/at-spi2-core \

Mk/bsd.default-versions.mk

@@ -50,8 +50,12 @@ EBUR128_DEFAULT?=	legacy
 FIREBIRD_DEFAULT?=	3.0
 # Possible values: gfortran
 FORTRAN_DEFAULT?=	gfortran
-# Possible values: 3.2.2
+# Possible values: 3.2.2, 3.3.1
+.  if !defined(WANT_FPC_DEVEL)
 FPC_DEFAULT?=		3.2.2
+.  else
+FPC_DEFAULT?=		3.3.1
+.  endif
 # Possible values: 8 (last to support powerpcspe), 9, 10, 11, 12
 # (Any other version is completely unsupported and not meant for general use.)
 .  if ${ARCH} == "powerpcspe"

archivers/Makefile

@@ -31,8 +31,6 @@
     SUBDIR += engrampa
     SUBDIR += fastjar
     SUBDIR += file-roller
-    SUBDIR += fpc-bzip2
-    SUBDIR += fpc-unzip
     SUBDIR += gcab
     SUBDIR += gcpio
     SUBDIR += gnome-autoar