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

8 files changed, 7 insertions, 51 deletions

diff --git a/editors/Makefile b/editors/Makefile
index 82391653e11b..d39280462eca 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -46,7 +46,6 @@
     SUBDIR += fileobj
     SUBDIR += flim
     SUBDIR += focuswriter
-    SUBDIR += fpc-ide
     SUBDIR += fte
     SUBDIR += fxite
     SUBDIR += gedit
diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index 9c27bf0d9baf..624a57bfe7bf 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cudatext
 PORTVERSION=	1.201.0.2
+PORTREVISION=	1
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -10,7 +11,6 @@ WWW=		https://uvviewsoft.com/
 LICENSE=	MPL20
 
 USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors python xorg
-USE_FPC=	chm fcl-base fcl-image fcl-json fcl-stl fcl-xml pasjpeg rtl-objpas x11
 USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	Alexey-T
diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile
deleted file mode 100644
index 8622b3e1c685..000000000000
--- a/editors/fpc-ide/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-CATEGORIES=	editors lang
-PKGNAMESUFFIX=	-ide
-
-COMMENT=	Free Pascal integrated IDE/compiler
-
-USES=		fpc
-USE_FPC=	chm fv gdbint regexpr rtl-console rtl-extra rtl-generics fcl-xml
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-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
deleted file mode 100644
index 9d809da086d9..000000000000
--- a/editors/fpc-ide/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/cvsco.tdf
-bin/cvsdiff.tdf
-bin/cvsup.tdf
-bin/fp
-bin/fp.ans
-bin/fp.rsj
-bin/gplprog.pt
-bin/gplunit.pt
-bin/grep.tdf
-bin/program.pt
-bin/tpgrep.tdf
-bin/unit.pt
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/ide.fpm
-share/doc/fpc-%%PORTVERSION%%/ide/readme.ide
diff --git a/editors/lazarus-devel/Makefile b/editors/lazarus-devel/Makefile
index 81f113241fdc..7e49b552a08a 100644
--- a/editors/lazarus-devel/Makefile
+++ b/editors/lazarus-devel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lazarus
 DISTVERSION=	3.0.0.20231028
 PKGNAMESUFFIX?=  -gtk2-devel
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	editors devel
 DIST_SUBDIR=	freepascal
 
@@ -11,11 +11,9 @@ WWW=		https://www.lazarus-ide.org/
 
 CONFLICTS?=	lazarus-gtk2 lazarus-qt5 lazarus-qt5-devel lazarus-qt6-devel
 
-BUILD_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils \
-		fpcres:lang/fpc-utils
+BUILD_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils \
 		gmake:devel/gmake \
-		fpcres:lang/fpc-utils \
 		${LOCALBASE}/share/fpc-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc-source
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -26,10 +24,6 @@ GL_PROJECT=	${PORTNAME}
 GL_COMMIT=	da69f50a82ed2c57fdecc26023f75431bffe3d42
 
 USES=		desktop-file-utils fpc:run gettext gmake iconv shared-mime-info xorg
-USE_FPC?=	chm cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
-		fcl-registry fcl-res fcl-web fcl-xml fppkg gtk2 ibase iconvenc mysql \
-		numlib odbc opengl openssl oracle pasjpeg postgres regexpr rtl-extra \
-		rtl-generics sqlite x11
 USE_XORG=	x11
 OPT?=		"-Sgic "
 
diff --git a/editors/lazarus-qt5/Makefile b/editors/lazarus-qt5/Makefile
index 1e0e96340327..142ba6550a24 100644
--- a/editors/lazarus-qt5/Makefile
+++ b/editors/lazarus-qt5/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	3
 
 PKGNAMESUFFIX?=  -qt5
 
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 6f80a1243386..659e0edf6062 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	lazarus
 PORTVERSION=	2.2.6
 DISTVERSIONSUFFIX=	-0
 PKGNAMESUFFIX?=  -gtk2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
 		LOCAL/acm/freepascal
@@ -14,21 +14,15 @@ WWW=		https://www.lazarus-ide.org/
 
 CONFLICTS?=	lazarus-gtk2-devel lazarus-qt5 lazarus-qt5-devel lazarusqt6-devel
 
-BUILD_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils \
-		fpcres:lang/fpc-utils
+BUILD_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils \
 		gmake:devel/gmake \
 		${PPNAME}:lang/fpc \
-		fpcres:lang/fpc-utils \
 		${LOCALBASE}/share/fpc-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc-source
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USES=		cpe desktop-file-utils fpc:run gettext gmake iconv shared-mime-info xorg
-USE_FPC?=	chm cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
-		fcl-registry fcl-res fcl-web fcl-xml fppkg gtk2 ibase iconvenc mysql \
-		numlib odbc opengl openssl oracle pasjpeg postgres regexpr rtl-extra \
-		rtl-generics sqlite x11
 USE_XORG=	x11
 OPT?=		"-Sgic "
 
diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
index e1644ac147df..2c4deac932c7 100644
--- a/editors/picpas/Makefile
+++ b/editors/picpas/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	picpas
 PORTVERSION=	0.9.0
-PORTREVISION=	10
+PORTREVISION=	11
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -15,8 +15,6 @@ gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USES=		dos2unix fpc gnome lazarus:flavors xorg
-USE_FPC=	chm fcl-base fcl-image fcl-json fcl-registry fcl-xml pasjpeg regexpr \
-		rtl-objpas x11
 USE_XORG=	x11
 DOS2UNIX_REGEX=	.*\.([txt]|pas|lpi|txt|lfm)
 USE_GITHUB=	yes
@@ -31,9 +29,7 @@ GH_TUPLE=	t-edson:MiConfig:a4a988a:miconfig/miconfig \
 		t-edson:ogEditGraf:a19b68a:ogeditgraf/ogeeditgraf \
 		t-edson:t-Xpres:6665922:txpres/txpres
 
-USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
-USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 LAZARUS_PROJECT_FILES=	Source/PicPas.lpi