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

(cherry picked from commit 0b92f925a3a155ce7b5f4eddfd528553915c6eb8)

5 files changed, 0 insertions, 71 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index de2cd513b866..0126de4b9cfc 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -12,8 +12,6 @@
     SUBDIR += fltk
     SUBDIR += fox16
     SUBDIR += fox17
-    SUBDIR += fpc-gtk2
-    SUBDIR += fpc-xforms
     SUBDIR += fxscintilla
     SUBDIR += gdl
     SUBDIR += girara
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
deleted file mode 100644
index 91644400f71d..000000000000
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-CATEGORIES=	x11-toolkits lang
-PORTREVISION=	4
-PKGNAMESUFFIX=	-gtk2
-
-COMMENT=	Free Pascal interface to the GTK2 libraries
-
-USES=		fpc
-USE_FPC=	cairo fcl-base fcl-image fcl-res pasjpeg rtl-objpas x11
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	GTK2
-GTK2_DESC=	Gimp Toolkit for X11 GUI (version 2.x)
-OPTIONS_DEFAULT=	GTK2
-
-GTK2_USES=	gnome
-GTK2_USE=	GNOME=gtk20
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk2/pkg-plist b/x11-toolkits/fpc-gtk2/pkg-plist
deleted file mode 100644
index c996052dc6b3..000000000000
--- a/x11-toolkits/fpc-gtk2/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/gtk2.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.ppu
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
deleted file mode 100644
index 48ebdf54f011..000000000000
--- a/x11-toolkits/fpc-xforms/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-CATEGORIES=	x11-toolkits lang
-PKGNAMESUFFIX=	-xforms
-
-COMMENT=	X-Forms interface for Free Pascal
-
-USES=		fpc
-USE_FPC=	x11
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	EXAMPLES XFORMS
-XFORMS_DESC=	Install xforms graphical user interface toolkit
-OPTIONS_DEFAULT=	XFORMS
-
-XFORMS_LIB_DEPENDS=	libforms.so:x11-toolkits/xforms
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-xforms/pkg-plist b/x11-toolkits/fpc-xforms/pkg-plist
deleted file mode 100644
index 4798e803448e..000000000000
--- a/x11-toolkits/fpc-xforms/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/fd2pascal
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/xforms.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.ppu