FPC ecosystem: Upgrade version 2.6.4 => 3.0.0

This is the first major release of FreePascal in nearly four years.
There are a ton of new features, way more to list here. see:
http://wiki.freepascal.org/FPC_New_Features_3.0

Several new unit ports were added, some were contracted.  Most of
those were absorbed into the main FPC packages, but two units are
no longer supported: sndfile and matroshka.

All 99 remaining ports (including Lazarus ports) were build tested
on FreeBSD i386 and amd64 Release 10.2

6 files changed, 272 insertions, 255 deletions

diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 2edffbfe9e46..de6640f54b66 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -2,32 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	fpc
-PORTVERSION=	2.6.4
+PORTVERSION=	3.0.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 \
-		ftp://ftp.jp.freepascal.org/mirror/fpc/dist/${PORTVERSION}/source/:source \
-		ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/source/:source \
-		ftp://ftp.no.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
-		ftp://ftp.us.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
-		http://leaf.dragonflybsd.org/~marino/dports-src/:DragonFlybootstrap \
-		SF/freepascal/Source/${PORTVERSION}:source \
+MASTER_SITES=	http://leaf.dragonflybsd.org/~marino/dports-src/:DragonFlybootstrap \
 		LOCAL/acm/freepascal/:bootstrap \
-		LOCAL/acm/freepascal/:man
-DISTFILES=	${DISTNAME}.source.tar.gz:source
+		LOCAL/marino:man
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	freebsd-fpc@FreeBSD.org
 COMMENT?=	Free Pascal compiler with Turbo and Delphi
 
-PROJECTHOST=	bsdistfiles
 USES=		gmake iconv
 ONLY_FOR_ARCHS=	i386 amd64
 BOOTVER=	2.6.4
+MANVER=		3.0.0
 
-OPT?=-CX
-FPCSRCDIR=	${PORTNAME}-${PORTVERSION}
+USE_GITHUB=	yes
+GH_ACCOUNT=	fpc-svn
+GH_PROJECT=	fpc
+GH_TAGNAME=	release_${DISTVERSION:S/./_/g}
+FPCSRCDIR=	${GH_PROJECT}-${GH_TAGNAME}
 
 .include <bsd.port.pre.mk>
 
@@ -56,12 +52,16 @@ BUILDNAME=	${FPC_ARCH}-${OPSYS:tl}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		BUILDNAME=${BUILDNAME}
 DISTFILES+=	${BOOTDIR}.tar.gz:${OPSYS:MDragonFly}bootstrap \
-		${DISTNAME}.man.tar.gz:man
-MAKE_ARGS+=	FPCMAKE=${WRKDIR}/${FPCSRCDIR}/utils/fpcm/fpcmake \
+		fpc-${MANVER}.man.tar.gz:man
+NEWFPCMAKE=	${WRKDIR}/${FPCSRCDIR}/utils/fpcm/bin/${BUILDNAME}/fpcmake
+MAKE_ARGS+=	FPCMAKE=${NEWFPCMAKE} \
 		FPCTARGET=${BUILDNAME} \
 		ARCH=${FPC_ARCH} \
 		OPT="${OPT}" \
 		BSDHIER=1 \
+		INSTALL="${INSTALL_DATA}" \
+		INSTALLEXE="${INSTALL_PROGRAM}" \
+		INSTALLSCR="${INSTALL_SCRIPT}" \
 		INSTALL_PREFIX=${STAGEDIR}${PREFIX}
 NEWPPC=		PP=${WRKSRC}/compiler/${PPNAME}
 NEWFPC=		FPC=${WRKSRC}/compiler/${PPNAME}
@@ -74,83 +74,105 @@ do-extract:
 	@${TAR} -xzf ${_DISTDIR}/${BOOTDIR}.tar.gz \
 		--directory ${WRKDIR} && ${CHMOD} +x ${WRKDIR}/${BOOTDIR}
 # unpack man files
-	@${TAR} -xzf ${_DISTDIR}/${DISTNAME}.man.tar.gz --directory ${WRKDIR}
+	@${TAR} -xzf ${_DISTDIR}/fpc-${MANVER}.man.tar.gz --directory ${WRKDIR}
 # unpack source distribution
-	@(cd ${WRKDIR} && \
-		${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME}.source.tar.gz | \
+	@(cd ${WRKDIR} && ${GZIP_CMD} -dc \
+		${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} -xf - \
 		${FPCSRCDIR}/compiler \
 		${FPCSRCDIR}/rtl \
 		${FPCSRCDIR}/utils/fpcmkcfg \
 		${FPCSRCDIR}/packages/fcl-base \
 		${FPCSRCDIR}/packages/fcl-process \
+		${FPCSRCDIR}/packages/fcl-res \
+		${FPCSRCDIR}/packages/fpmkunit \
+		${FPCSRCDIR}/packages/hash \
+		${FPCSRCDIR}/packages/libtar \
+		${FPCSRCDIR}/packages/paszlib \
+		${FPCSRCDIR}/packages/rtl-objpas \
 		${FPCSRCDIR}/utils/fpcm)
 
 post-patch:
-.if ${ARCH} == "i386"
-	@${REINPLACE_CMD} -i "" -e 's|504000|${OSVERSION}|g' \
-		${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/cprt0.as
-.elif ${ARCH} == "amd64"
-.  if ${OPSYS} == FreeBSD
-	@${REINPLACE_CMD} -i "" -e 's|700055|${OSVERSION}|g' \
-		${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/cprt0.as
-	@${REINPLACE_CMD} -i "" -e 's|502110|${OSVERSION}|g' \
-		${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/gprt0.as
-	@${REINPLACE_CMD} -i "" -e 's|700055|${OSVERSION}|g' \
-		${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/prt0.as
-.  else
+.if ${OPSYS} == FreeBSD
+	@${REINPLACE_CMD} -i "" -e 's|900044|${OSVERSION}|g' \
+		${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.as
+.else
 	@${REINPLACE_CMD} -i "" -e 's|400000|${DFLYVERSION}|g' \
-		${WRKSRC}/${FPCSRCDIR}/rtl/dragonfly/${FPC_ARCH}/*.as
-.  endif
+		${WRKSRC}/rtl/dragonfly/${FPC_ARCH}/*.as
 .endif
 .if empty(ICONV_LIB)
-	@${REINPLACE_CMD} -e "s|if (s<>'c') or reorder then|if ((s<>'c') and (s<>'iconv')) or reorder then|" \
+	@${REINPLACE_CMD} -e "s|s<>'c'|(s<>'c') and (s<>'iconv')|" \
 		${WRKDIR}/${FPCSRCDIR}/compiler/systems/t_bsd.pas
 	@${REINPLACE_CMD} -e 's|defined(bsd) and not ||' \
 		${WRKDIR}/${FPCSRCDIR}/rtl/unix/cwstring.pp
 .endif
+	@${REINPLACE_CMD} -e '/samplecfg/ {s/INSTALLEXE/INSTALLSCR/;}' \
+		${WRKDIR}/${FPCSRCDIR}/compiler/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
+		${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit/src/fpmkunit.pp
 
 do-build:
 # build fpc compiler
+	@${ECHO_MSG} "##### STARTING COMPILER #####"
 	(cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} cycle ${MAKE_ARGS} ${BOOTPPC})
+	@${ECHO_MSG} "##### COMPLETE COMPILER #####"
+
 # build fpcmkcfg
-	(cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
-	(cd ${WRKDIR}/${FPCSRCDIR}/packages/fcl-base && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
-	(cd ${WRKDIR}/${FPCSRCDIR}/packages/fcl-process && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
-	(cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && \
+	@${ECHO_MSG} "##### STARTING BOOTSTRAP FPMKUNIT #####"
+	(cd ${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit && ${SETENV} \
+		${MAKE_ENV} ${MAKE_CMD} bootstrap ${MAKE_ARGS} ${NEWPPC})
+	@${ECHO_MSG} "##### COMPLETE BOOTSTRAP FPMKUNIT #####"
+.for component in fcl-res rtl-objpas fcl-base
+	@${ECHO_MSG} "##### STARTING ${component:tu} #####"
+	(cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
+	@${ECHO_MSG} "##### COMPLETE ${component:tu} #####"
+.endfor
+	@${ECHO_MSG} "##### STARTING FPMAKE #####"
+	(cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${SETENV} \
+		${MAKE_ENV} ${MAKE_CMD} release ${MAKE_ARGS} ${NEWPPC})
+	@${ECHO_MSG} "##### COMPLETE FPMAKE #####"
+.for component in hash paszlib libtar fcl-process fpmkunit
+	@${ECHO_MSG} "##### STARTING ${component:tu} #####"
+	(cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && ${SETENV} \
+		${MAKE_ENV} ${MAKE_CMD} release ${MAKE_ARGS} ${NEWPPC})
+	@${ECHO_MSG} "##### COMPLETE ${component:tu} #####"
+.endfor
+	@${ECHO_MSG} "##### STARTING FPCMKCFG #####"
+	(cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && ${SETENV} \
+		${MAKE_ENV} ${MAKE_CMD} release ${MAKE_ARGS} ${NEWPPC})
+	@${ECHO_MSG} "##### COMPLETE FPCMKCFG #####"
 
 do-install:
-# 	Installing fpc compiler
+	# Installing fpc compiler
 	(cd ${WRKDIR}/${FPCSRCDIR}/rtl && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} install ${MAKE_ARGS} ${NEWFPC})
-# 	Installing fpc runtime
+	# Installing fpc runtime
 	(cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} install ${MAKE_ARGS} ${NEWFPC})
-# 	Installng fpcmkcfg
-	(cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} install ${MAKE_ARGS} ${NEWFPC})
-# 	Installng fpcmake
-	${INSTALL_PROGRAM} ${WRKDIR}/${FPCSRCDIR}/utils/fpcm/fpcmake \
+	# Installing fpmkunit and its dependencies
+.for component in hash paszlib libtar fcl-process fpmkunit
+	(cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && ${SETENV} \
+		${MAKE_ENV} ${MAKE_CMD} install ${MAKE_ARGS} ${NEWPPC})
+.endfor
+	# Installing fpcmkcfg
+	${INSTALL_PROGRAM} ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg/bin/${BUILDNAME}/fpcmkcfg \
 		${STAGEDIR}${PREFIX}/bin
-# 	Installing manpages
+	# Installing fpcmake
+	${INSTALL_PROGRAM} ${NEWFPCMAKE} ${STAGEDIR}${PREFIX}/bin
+	# Installing manpages
 	${INSTALL_MAN} ${WRKDIR}/man/man1/* ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKDIR}/man/man5/* ${STAGEDIR}${MAN1PREFIX}/man/man5
-
-post-install:
-	if [ -e "${STAGEDIR}${PREFIX}/bin/${PPNAME}" ]; then ${RM} -f "${STAGEDIR}${PREFIX}/bin/${PPNAME}"; fi
-	${LN} -sf "${PREFIX}/lib/fpc/${PORTVERSION}/${PPNAME}" "${STAGEDIR}${PREFIX}/bin"
-	${SH} "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" "${STAGEDIR}${PREFIX}/etc"
+	# symlinking compiler
+	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ../lib/fpc/${PORTVERSION}/${PPNAME})
+	# creating sample configuration file
+	${SH} "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" \
+		"${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" \
+		"${STAGEDIR}${PREFIX}/etc"
 	@${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||' \
-		-e 's|^-Fl/usr/local/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt4|g' ${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fpc*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mk*ins
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ppu*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/ppc*
+		-e 's|^-Fl/usr/local/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt4|g' \
+		${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample
 
 .else
 .include "${MASTERDIR}/Makefile.units"
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 458384a360d5..4ac795babe48 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -1,35 +1,39 @@
-BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
-
-PLIST_SUB+=		PORTVERSION=${PORTVERSION} \
-			BUILDNAME=${BUILDNAME}
-
-PLIST=			${.CURDIR}/pkg-plist
-PATCHDIR=		${.CURDIR}/files
-FILESDIR=		${.CURDIR}/files
-DFLY_PATCHDIR=		${.CURDIR}/dragonfly
-DFLY_FILESDIR=		${.CURDIR}/dragonfly
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-BUILD_WRKSRC=		${WRKDIR}/${WRKUNITDIR}
-INSTALL_WRKSRC=		${WRKDIR}/${WRKUNITDIR}
-
-FPCDIR?=		${LOCALBASE}/lib/${PORTNAME}/${PORTVERSION}
-UNITPREFIX=    		unit-
-UNITEXTRACT_SUFX=	.tar.gz
-UNITNAME=		${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX}
-UNITDIR=		lib/fpc/${PORTVERSION}/units/${BUILDNAME}
+BUILDNAME=	${FPC_ARCH}-${OPSYS:tl}
+
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		BUILDNAME=${BUILDNAME}
+
+PLIST=		${.CURDIR}/pkg-plist
+PATCHDIR=	${.CURDIR}/files
+FILESDIR=	${.CURDIR}/files
+DFLY_PATCHDIR=	${.CURDIR}/dragonfly
+DFLY_FILESDIR=	${.CURDIR}/dragonfly
+WRKSRC=		${WRKDIR}/${FPCSRCDIR}
+BUILD_WRKSRC=	${WRKDIR}/${WRKUNITDIR}
+INSTALL_WRKSRC=	${WRKDIR}/${WRKUNITDIR}
+
+OPT+=		-Ur
+FPCDIR?=	${LOCALBASE}/lib/fpc/${PORTVERSION}
+UNITPREFIX=    	unit-
+UNITNAME=	${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX}
+UNITDIR=	lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 
+UNITEXTRACT_SUFX=	.tar.gz
 EXTRACT_AFTER_ARGS=	${EXTRACTUNITDIR}
-OPT+=			-Ur -CX
-
-MAKE_ARGS=		PP=${LOCALBASE}/bin/${PPNAME} \
-			FPCDIR=${FPCDIR} \
-			FPCMAKE=${LOCALBASE}/bin/fpcmake \
-			FPCTARGET=${BUILDNAME} \
-			ARCH=${FPC_ARCH} \
-			OPT="${OPT}" \
-			BSDHIER=1 \
-			INSTALL_PREFIX=${STAGEDIR}${PREFIX}
-MAKE_ENV+=		FPCDIR=${UNITDIR}
+
+MAKE_ARGS+=	PP="${LOCALBASE}/bin/fpc" \
+		FPCFPMAKE="${LOCALBASE}/bin/fpc" \
+		FPCMAKE="${LOCALBASE}/bin/fpcmake" \
+		CPU_TARGET=${FPC_ARCH} \
+		OS_TARGET=${OPSYS:tl} \
+		COMPILER_OPTIONS="${OPT}" \
+		BSDHIER=1 \
+		VERBOSE=1 \
+		INSTALL="${INSTALL_DATA}" \
+		INSTALLEXE="${INSTALL_PROGRAM}" \
+		INSTALLSCR="${INSTALL_SCRIPT}" \
+		INSTALL_PREFIX="${STAGEDIR}${PREFIX}"
+ALL_TARGET=	fpc_baseinfo release
 
 .if ${PORT_OPTIONS:MEXAMPLES} && defined(HAVE_EXAMPLES)
 LATE_INSTALL_ARGS=	fpc_exampleinstall
@@ -38,19 +42,16 @@ LATE_INSTALL_ARGS=	fpc_exampleinstall
 post-extract:
 	@cd ${WRKDIR}/${WRKUNITDIR} && \
 		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
+.if ${PKGNAMESUFFIX:M-utils} || ${PKGNAMESUFFIX:M-ide}
+	${REINPLACE_CMD} -e '/globalunit/ s|\.\./packages|${FPCDIR}|' \
+		${WRKDIR}/${WRKUNITDIR}/Makefile
+.else
+	${REINPLACE_CMD} -e '/globalunit/ {s|\.\.|${FPCDIR}|;}' \
+		${WRKDIR}/${WRKUNITDIR}/Makefile
+.endif
 
 post-patch:
-.if ${PKGNAMESUFFIX} == "-fpmkunit"
-	@${REINPLACE_CMD} -e 's|\[Linux\]|\[Linux,FreeBSD,NetBSD,OpenBSD\]|g' \
-		${WRKDIR}/${WRKUNITDIR}/src/${PKGNAMESUFFIX:S/-//}.pp
-.endif
 .if ${PKGNAMESUFFIX} == "-fppkg"
 	@${REINPLACE_CMD} -e 's|packages_${OPSYS:tl}=fcl-net fcl-web|packages_${OPSYS:tl}=fcl-net|g' \
 		${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
 .endif
-.if ${PKGNAMESUFFIX} == "-utils"
-	@${REINPLACE_CMD} -e 's| fpcmkcfg||g' -e 's| fpcm||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \
-		${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
-	@${REINPLACE_CMD} -e 's|$$(INSTALL) Package.fpc $$(INSTALL_UNITDIR)||g' \
-		${WRKDIR}/${WRKUNITDIR}/fppkg/Makefile
-.endif
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index d3a8decb6755..f8d3dce5a85c 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,10 +1,10 @@
-SHA256 (freepascal/fpc-2.6.4.source.tar.gz) = c16f2e6e0274c7afc0f1d2dded22d0fec98fe329b1d5b2f011af1655f3a1cc29
-SIZE (freepascal/fpc-2.6.4.source.tar.gz) = 29904088
+SHA256 (freepascal/fpc-svn-fpc-3.0.0-release_3_0_0_GH0.tar.gz) = 61d5fc9f1f26362f4033eb00599c0f33f96217b57c4d0c8c3474226bd70b0b25
+SIZE (freepascal/fpc-svn-fpc-3.0.0-release_3_0_0_GH0.tar.gz) = 37531012
 SHA256 (freepascal/ppc386-2.6.4-freebsd.tar.gz) = 85da7cfae4e9dfe1b426da12f9584ef22af5e0d965f34d6c6f80853cc1b6147e
 SIZE (freepascal/ppc386-2.6.4-freebsd.tar.gz) = 967476
 SHA256 (freepascal/ppcx64-2.6.4-freebsd.tar.gz) = f74a268a206fbd52d3c92f4e0722cd135ca91c1988a83826401cabdd78b3222b
 SIZE (freepascal/ppcx64-2.6.4-freebsd.tar.gz) = 1035650
-SHA256 (freepascal/fpc-2.6.4.man.tar.gz) = c1d5bc37f96d60b37dd0ea85b6c7244306ae61c01df6053226309a75145ab804
-SIZE (freepascal/fpc-2.6.4.man.tar.gz) = 43335
+SHA256 (freepascal/fpc-3.0.0.man.tar.gz) = 49f5934fe2782ce47e5d9a6becc0ba36c3c8621b78e8587165dfebf79ea14525
+SIZE (freepascal/fpc-3.0.0.man.tar.gz) = 47342
 SHA256 (freepascal/ppcx64-2.6.4-dragonfly.tar.gz) = d537d84302c0e0cb56d45851ab8da664145b9e2619346d35f1e3797a6f924ef9
 SIZE (freepascal/ppcx64-2.6.4-dragonfly.tar.gz) = 4033024
diff --git a/lang/fpc/files/patch-compiler-systems-t_bsd.pas b/lang/fpc/files/patch-compiler-systems-t_bsd.pas
deleted file mode 100644
index 527acf812024..000000000000
--- a/lang/fpc/files/patch-compiler-systems-t_bsd.pas
+++ /dev/null
@@ -1,36 +0,0 @@
---- compiler/systems/t_bsd.pas	2012-04-22 14:47:06.000000000 -0500
-+++ compiler/systems/t_bsd.pas	2013-10-01 21:07:10.000000000 -0500
-@@ -484,10 +484,19 @@
-   if linklibc and
-      not IsDarwin Then
-    begin
--     if librarysearchpath.FindFile('crtbegin.o',false,s) then
--      LinkRes.AddFileName(s);
-      if librarysearchpath.FindFile('crti.o',false,s) then
-       LinkRes.AddFileName(s);
-+     if cs_create_pic in current_settings.moduleswitches then
-+       begin
-+         if librarysearchpath.FindFile('crtbeginS.o',false,s) then
-+           LinkRes.AddFileName(s);
-+       end
-+       else
-+         if (cs_link_staticflag in current_settings.globalswitches) and
-+           librarysearchpath.FindFile('crtbeginT.o',false,s) then
-+             LinkRes.AddFileName(s)
-+         else if librarysearchpath.FindFile('crtbegin.o',false,s) then
-+             LinkRes.AddFileName(s);
-    end;
-   { main objectfiles }
-   while not ObjectFiles.Empty do
-@@ -572,7 +581,10 @@
-   if linklibc and
-      not IsDarwin Then
-    begin
--     Fl1:=librarysearchpath.FindFile('crtend.o',false,s1);
-+     if cs_create_pic in current_settings.moduleswitches then
-+       Fl1:=librarysearchpath.FindFile('crtendS.o',false,s1)
-+     else
-+       Fl1:=librarysearchpath.FindFile('crtend.o',false,s1);
-      Fl2:=librarysearchpath.FindFile('crtn.o',false,s2);
-      if Fl1 or Fl2 then
-       begin
diff --git a/lang/fpc/files/patch-compiler-utils_samplecfg b/lang/fpc/files/patch-compiler-utils_samplecfg
index 68a4b2f1ae24..901f71d8cf35 100644
--- a/lang/fpc/files/patch-compiler-utils_samplecfg
+++ b/lang/fpc/files/patch-compiler-utils_samplecfg
@@ -1,6 +1,6 @@
---- compiler/utils/samplecfg	2011-12-10 07:59:24.000000000 -0500
-+++ compiler/utils/samplecfg	2012-02-23 15:47:13.000000000 -0500
-@@ -37,8 +37,8 @@
+--- compiler/utils/samplecfg.orig	2015-08-06 19:47:53 UTC
++++ compiler/utils/samplecfg
+@@ -38,8 +38,8 @@ sysfpdir=$sysfpdirbase2/text
  # Detect if we have write permission in sysdir.
  if [ -w "$sysdir" ] ; then
    echo Write permission in $sysdir.
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index fb9b838f08fa..f23f7cfd72f9 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,14 +1,13 @@
 bin/fpc
-bin/fpcsubst
 bin/fpcmake
 bin/fpcmkcfg
 bin/mkarmins
 bin/mkx86ins
+%%FPC_I386%%bin/ppc386
+%%FPC_AMD64%%bin/ppcx64
 bin/ppudump
 bin/ppufiles
 bin/ppumove
-%%FPC_I386%%bin/ppc386
-%%FPC_AMD64%%bin/ppcx64
 @sample etc/fpc.cfg.sample
 lib/fpc/%%PORTVERSION%%/msg/errorct.msg
 lib/fpc/%%PORTVERSION%%/msg/errord.msg
@@ -22,47 +21,160 @@ lib/fpc/%%PORTVERSION%%/msg/errorhe.msg
 lib/fpc/%%PORTVERSION%%/msg/errorheu.msg
 lib/fpc/%%PORTVERSION%%/msg/errorid.msg
 lib/fpc/%%PORTVERSION%%/msg/erroriu.msg
-lib/fpc/%%PORTVERSION%%/msg/errorru.msg
 lib/fpc/%%PORTVERSION%%/msg/errorn.msg
 lib/fpc/%%PORTVERSION%%/msg/errorpl.msg
 lib/fpc/%%PORTVERSION%%/msg/errorpli.msg
 lib/fpc/%%PORTVERSION%%/msg/errorpt.msg
 lib/fpc/%%PORTVERSION%%/msg/errorptu.msg
-lib/fpc/%%PORTVERSION%%/msg/errorues.msg
 lib/fpc/%%PORTVERSION%%/msg/errorr.msg
+lib/fpc/%%PORTVERSION%%/msg/errorru.msg
+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
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/crc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/crc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/hmac.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/hmac.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/md5.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/md5.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/ntlm.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/ntlm.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/sha1.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/sha1.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libtar/libtar.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libtar/libtar.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/unzip.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/unzip.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zip.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zip.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/ziputils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/ziputils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/baseunix.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/baseunix.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/bsd.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/bsd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/character.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/character.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/clocale.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/clocale.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/console.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/console.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/convutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/convutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1250.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1250.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1251.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1251.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1252.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1252.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1253.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1253.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1254.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1254.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1255.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1255.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1256.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1256.ppu
+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/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/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/cp856.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp856.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp866.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp866.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_2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_2.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/cpall.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
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ctypes.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ctypes.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cwstring.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cwstring.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dateutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dateutils.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dl.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dl.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dllprt0.o
@@ -76,11 +188,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpintres.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpintres.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfpintres.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpwidestring.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpwidestring.ppu
 %%FREEBSD%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.o
 %%FREEBSD%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/getopts.o
@@ -90,110 +201,27 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/heaptrc.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/heaptrc.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/iso7185.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/iso7185.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbaseunix.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbsd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclasses.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclocale.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcmem.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconsole.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconvutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcpu.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcrt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcthreads.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpctypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcwstring.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcharset.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdateutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdos.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdynlibs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libperrors.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpexeinfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfgl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfmtbcd.a
-%%FREEBSD%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfreebsd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgetopts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpheaptrc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpinitc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpipc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpiso7185.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpkeyboard.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplineinfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplnfodwrf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmacpas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmath.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmatrix.a
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmmx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmouse.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpobjects.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpobjpas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpports.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpprinter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libprtlconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpserial.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsockets.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstdconvs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstrings.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstrutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsyscall.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsysconst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsysctl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsystem.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsysutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpterminfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libptermio.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libptypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libptypinfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpucomplex.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpunix.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpunixtype.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpunixutil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvariants.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvarutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvideo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpx86.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lnfodwrf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lnfodwrf.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lineinfo.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lineinfo.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lnfodwrf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lnfodwrf.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/macpas.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/macpas.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/math.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/math.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/matrix.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/matrix.ppu
 %%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.o
 %%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mouse.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mouse.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objects.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objects.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objpas.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objpas.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/printer.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/printer.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/prt0.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/rtlconsts.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/rtlconsts.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/serial.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/serial.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sockets.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sockets.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/stdconvs.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/stdconvs.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strings.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strings.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/syscall.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/syscall.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysconst.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysconst.ppu
@@ -203,28 +231,26 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/system.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/system.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysutils.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/terminfo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/terminfo.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/termio.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/termio.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/types.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/types.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/typinfo.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/typinfo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ucomplex.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ucomplex.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unicodedata.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unicodedata.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unicodenumtable.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unicodenumtable.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unix.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unix.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixcp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixcp.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixtype.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixtype.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixutil.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/variants.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/variants.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/varutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/varutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/video.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/video.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/uuchar.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/uuchar.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.ppu
 man/man1/bin2obj.1.gz
@@ -235,6 +261,7 @@ man/man1/delp.1.gz
 man/man1/fd2pascal.1.gz
 man/man1/fp.1.gz
 man/man1/fpc.1.gz
+man/man1/fpcjres.1.gz
 man/man1/fpclasschart.1.gz
 man/man1/fpcmake.1.gz
 man/man1/fpcmkcfg.1.gz
@@ -247,6 +274,9 @@ man/man1/grab_vcsa.1.gz
 man/man1/h2pas.1.gz
 man/man1/h2paspp.1.gz
 man/man1/makeskel.1.gz
+man/man1/pas2fpm.1.gz
+man/man1/pas2jni.1.gz
+man/man1/pas2ut.1.gz
 man/man1/plex.1.gz
 man/man1/postw32.1.gz
 man/man1/ppc386.1.gz