- The big change on ports of freepascal, now all ports are compiled

- Adding entry for lang/fpc-utils

Approved by:	garga (mentor)

12 files changed, 295 insertions, 324 deletions

diff --git a/lang/Makefile b/lang/Makefile
index 4b373a2..3f39ec8 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -66,6 +66,7 @@
     SUBDIR += fpc-docs
     SUBDIR += fpc-tcl
     SUBDIR += fpc-units
+    SUBDIR += fpc-utils
     SUBDIR += freetxl
     SUBDIR += gambas
     SUBDIR += gauche
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index 86d81ef..e8bd7d7 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	fpc-
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Meta package to install all of the Free Pascal base
 
 RUN_DEPENDS=	${UNITSDIR}/gdbint/Package.fpc:${PORTSDIR}/devel/fpc-gdbint \
@@ -32,13 +32,10 @@ RUN_DEPENDS=	${UNITSDIR}/gdbint/Package.fpc:${PORTSDIR}/devel/fpc-gdbint \
 		${UNITSDIR}/sqlite/Package.fpc:${PORTSDIR}/databases/fpc-sqlite
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
-DOCSDIR=	${LOCALBASE}/share/doc/fpc-${PORTVERSION}
-EXAMPLESDIR=	${LOCALBASE}/share/examples/fpc-${PORTVERSION}
-BUILDNAME=	i386-freebsd
+BUILDNAME=	${ARCH}-freebsd
 
 .if !defined(NOPORTDOCS)
-RUN_DEPENDS+=	${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:${PORTSDIR}/lang/fpc-docs \
-		${LOCALBASE}/share/doc/fpc-${PORTVERSION}/demo/Makefile.fpc:${PORTSDIR}/lang/fpc-demo
+RUN_DEPENDS+=	${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:${PORTSDIR}/lang/fpc-docs
 .endif
 
 NO_BUILD=	yes
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 37915eb..3baf4f6 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -8,19 +8,17 @@
 PORTNAME=	docs
 PORTVERSION=	2.0.2
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://planetmirror.com/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://ftp.jp.freepascal.org/mirror/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://freepascal.stack.nl/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://ftp.no.freepascal.org/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://ftp.us.freepascal.org/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	freepascal
+MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/docs-${PORTVERSION}/ \
+		ftp://planetmirror.com/pub/fpc/dist/docs-${PORTVERSION}/ \
+		ftp://ftp.jp.freepascal.org/mirror/fpc/dist/docs-${PORTVERSION}/ \
+		ftp://freepascal.stack.nl/pub/fpc/dist/docs-${PORTVERSION}/ \
+		ftp://ftp.no.freepascal.org/pub/fpc/dist/docs-${PORTVERSION}/ \
+		ftp://ftp.us.freepascal.org/pub/fpc/dist/docs-${PORTVERSION}/
 PKGNAMEPREFIX=	fpc-
-DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}.${BUILDNAME}
-EXTRACT_SUFX=	.tar
+DISTNAME=	${PORTNAME:S/s//}-pdf
+DIST_SUBDIR=	freepascal
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal compiler Adobe Acrobat(tm) documentation
 
 ONLY_FOR_ARCHS=	i386
@@ -28,28 +26,12 @@ NO_BUILD=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/fpdocs-${PORTVERSION}
 PORTDOCS=	chart.pdf fcl.pdf fpdoc.pdf prog.pdf ref.pdf rtl.pdf user.pdf
-BUILDNAME=	i386-freebsd
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
-		BUILDNAME=${BUILDNAME}
 SUB_FILES=	pkg-message
 
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar \
-		--directory ${WRKSRC}
-	@${TAR} xf ${WRKSRC}/binary.${BUILDNAME}.tar \
-		--directory ${WRKSRC}
-
-# unpack binary and docs distribution
-	@${MKDIR} ${WRKSRC}/${PORTNAME}
-	@${TAR} zxf ${WRKSRC}/doc-pdf.tar.gz \
-		--directory ${WRKSRC}/${PORTNAME}
-
 do-install:
-	@cd ${WRKSRC}/${PORTNAME}/share && \
-		${FIND} * -type d -exec ${MKDIR} "{}" "${PREFIX}/share/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/{}" \;
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKDIR}/share/doc/fpdocs-${PORTVERSION} && \
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index 80f3f20..cfc723f 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (fpc-2.0.2.i386-freebsd.tar) = e1f834f445b0f2313f41ed417a28fb1c
-SHA256 (fpc-2.0.2.i386-freebsd.tar) = 906f002dfdbdfc3380f5a66b93d68debdbb68bba65b9db0590a93f548fb9f528
-SIZE (fpc-2.0.2.i386-freebsd.tar) = 22517760
+MD5 (freepascal/doc-pdf.tar.gz) = 9f035a0cc92f5e915968045b9326d0e3
+SHA256 (freepascal/doc-pdf.tar.gz) = 53ce7a4ea22e5dde67bd35ceddd06c99f9185d904ae4cf7f43f6dea0ec05a6cc
+SIZE (freepascal/doc-pdf.tar.gz) = 6347140
diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile
index f7413de..c33b3c6 100644
--- a/lang/fpc-tcl/Makefile
+++ b/lang/fpc-tcl/Makefile
@@ -8,12 +8,33 @@
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-tcl
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the tcl/tk interpreter
 
-RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		wish8.4:${PORTSDIR}/x11-toolkits/tk84
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		fpcmake:${PORTSDIR}/lang/fpc-utils \
+		${UNITSDIR}/fcl/Package.fpc:${PORTSDIR}/devel/fpc-fcl \
+		${UNITSDIR}/gdbint/Package.fpc:${PORTSDIR}/devel/fpc-gdbint \
+		${UNITSDIR}/ibase/Package.fpc:${PORTSDIR}/databases/fpc-ibase \
+		${UNITSDIR}/libasync/Package.fpc:${PORTSDIR}/net/fpc-libasync \
+		${UNITSDIR}/md5/Package.fpc:${PORTSDIR}/security/fpc-md5 \
+		${UNITSDIR}/mysql/Package.fpc:${PORTSDIR}/databases/fpc-mysql \
+		${UNITSDIR}/netdb/Package.fpc:${PORTSDIR}/net/fpc-netdb \
+		${UNITSDIR}/odbc/Package.fpc:${PORTSDIR}/databases/fpc-odbc \
+		${UNITSDIR}/oracle/Package.fpc:${PORTSDIR}/databases/fpc-oracle \
+		${UNITSDIR}/pasjpeg/Package.fpc:${PORTSDIR}/graphics/fpc-pasjpeg \
+		${UNITSDIR}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
+		${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads \
+		${UNITSDIR}/postgres/Package.fpc:${PORTSDIR}/databases/fpc-postgres \
+		${UNITSDIR}/regexpr/Package.fpc:${PORTSDIR}/devel/fpc-regexpr \
+		${UNITSDIR}/sqlite/Package.fpc:${PORTSDIR}/databases/fpc-sqlite
 
+RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+
+UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
+WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
+HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/fpc-tcl/pkg-plist b/lang/fpc-tcl/pkg-plist
new file mode 100644
index 0000000..554df91
--- /dev/null
+++ b/lang/fpc-tcl/pkg-plist
@@ -0,0 +1,12 @@
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/tcl80.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/tcl80.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/libptcl80.a
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/tcl/tcl_demo.pp
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/tcl
+%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 5b010cd..7383765 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -14,13 +14,13 @@ PKGNAMEPREFIX=	fpc-
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	A meta port to install Free Pascal units
 
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 
-BUILDNAME=	i386-freebsd
+BUILDNAME=	${ARCH}-freebsd
 
 OPTIONS=	BFD	"Interface to GNU Binary Format description"	on \
 		FCL	"Free Pascal Component Library"	on \
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 0c7b815..d648b96 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -7,31 +7,46 @@
 
 PORTNAME=	fpc
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES?=	lang
-MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://planetmirror.com/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://ftp.jp.freepascal.org/mirror/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://freepascal.stack.nl/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://ftp.no.freepascal.org/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		ftp://ftp.us.freepascal.org/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
+		ftp://planetmirror.com/pub/fpc/dist/source-${PORTVERSION}/:source \
+		ftp://ftp.jp.freepascal.org/mirror/fpc/dist/source-${PORTVERSION}/:source \
+		ftp://freepascal.stack.nl/pub/fpc/dist/source-${PORTVERSION}/:source \
+		ftp://ftp.no.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
+		ftp://ftp.us.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
+		${MASTER_SITE_SOURCEFORGE}:source \
+		${MASTER_SITE_LOCAL:S|$|acm/freepascal/:bin|}
 MASTER_SITE_SUBDIR=	freepascal
-DISTNAME=	${PORTNAME}-${PORTVERSION}.${BUILDNAME}
-EXTRACT_SUFX=	.tar
+DISTNAME=	${PORTNAME}-${PORTVERSION}
+DISTFILES=	${DISTNAME:S/$/.source/}${EXTRACT_SUFX}:source
+DIST_SUBDIR=	freepascal
 
-MAINTAINER?=	acardenas@bsd.org.pe
+MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	Free Pascal compiler with Turbo and Delphi
 
-BUILDNAME=	i386-freebsd
+USE_GMAKE=	yes
 ONLY_FOR_ARCHS=	i386
-NO_BUILD=	yes
+BUILDNAME=	${ARCH}-freebsd
+OPT?=-CX
+MAKE_ENV=	PREFIX=${PREFIX} \
+		FPCTARGET=${BUILDNAME} \
+		OPT="${OPT}" \
+		BSDHIER=1
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		BUILDNAME=${BUILDNAME}
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=	does not compile
+.endif
+
 .if !defined(PKGNAMESUFFIX)
+DISTFILES+=	${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
+MAKE_ENV+=	PP=${WRKDIR}/${PORTNAME:S/$/-bin/}/lib/${PORTNAME}/${PORTVERSION}/ppc386 \
+		FPCMAKE=${WRKDIR}/${PORTNAME:S/$/-bin/}/bin/fpcmake
 MAN1=	bin2obj.1 \
 	data2inc.1 \
 	delp.1 \
@@ -66,31 +81,29 @@ LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 .endif
 
 do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack pre-compiled binaries distribution
-	@${MKDIR} ${WRKSRC}/binary
-	@${TAR} xf ${WRKSRC}/binary.${BUILDNAME}.tar --directory ${WRKSRC}/binary
-# create a local binary ppc386
-	@${MKDIR} ${WRKSRC}/boot
-	@${TAR} zxf ${WRKSRC}/binary/base.${BUILDNAME}.tar.gz \
-		--directory ${WRKSRC}/boot
-	@${TAR} zxf ${WRKSRC}/binary/utils.${BUILDNAME}.tar.gz \
-		--directory ${WRKSRC}/boot
+# unpack binary distribution
+	@${MKDIR} ${WRKDIR}
+	@${TAR} xfz ${_DISTDIR}/${DISTNAME:S/$/.bin/}${EXTRACT_SUFX} --directory \
+		${WRKDIR}
+# unpack source distribution
+	@cd ${WRKDIR} && \
+		${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} \
+			| ${TAR} xf - ${PORTNAME}/compiler ${PORTNAME}/rtl
+
+do-build:
+# build fpc compiler
+	@cd ${WRKDIR}/${PORTNAME}/compiler && ${GMAKE} cycle ${MAKE_ENV}
+# build fpc runtime
+#	@cd ${WRKDIR}/${PORTNAME}/rtl && ${GMAKE} all ${MAKE_ENV}
 
 do-install:
-	# Installing binaries
-	${INSTALL_SCRIPT} ${WRKSRC}/boot/bin/* ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/boot/share/doc/fpc-${PORTVERSION}/* ${DOCSDIR}
-.endif
-	# Installing fpc libs
-	${CP} -r ${WRKSRC}/boot/lib/* ${PREFIX}/lib
+	# Installing fpc compiler
+	@cd ${WRKDIR}/${PORTNAME}/rtl && ${GMAKE} install ${MAKE_ENV}
+      	# Installing fpc runtime
+	@cd ${WRKDIR}/${PORTNAME}/compiler && ${GMAKE} install ${MAKE_ENV}
 	# Installing manpages
-	${INSTALL_DATA} ${WRKSRC}/boot/man/man1/* ${MAN1PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/boot/man/man5/* ${MAN1PREFIX}/man/man5
+	${INSTALL_DATA} ${WRKDIR}/fpc-bin/man/man1/* ${MAN1PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKDIR}/fpc-bin/man/man5/* ${MAN1PREFIX}/man/man5
 
 post-install:
 	if [ -e "${PREFIX}/bin/ppc386" ]; then ${RM} -f "${PREFIX}/bin/ppc386"; fi
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 2e44768..9254f4a 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -1,57 +1,31 @@
-UNITPREFIX?=    		units-
+PLIST=	${.CURDIR}/pkg-plist
+PATCHDIR=	${.CURDIR}/files
+WRKSRC=	${WRKDIR}/${PORTNAME}
+
+UNITPREFIX=    		unit-
 UNITEXTRACT_SUFX=	.tar.gz
 UNITNAME=		${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX}
-UNITDIR=		${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
+UNITDIR=		lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 
-EXAMPLESDIR=	share/examples/${PORTNAME}${PORTVERSION:S/^/-/}
-EXTRACT_CMD=	${CAT}
-EXTRACT_BEFORE_ARGS=	# none
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - binary${BUILDNAME:S/^/./}.tar && ${CAT} \
-				binary${BUILDNAME:S/^/./}.tar| ${TAR} -xf - \
-				${UNITNAME} && ${CAT} ${UNITNAME} | ${GUNZIP_CMD} \
-				-dc | ${TAR} -xf -			
-do-install:
-.for DIRE in bin lib
-	@if [ -d ${WRKDIR}/${DIRE} ]; \
-	then \
-		cd ${WRKDIR}/${DIRE} && \
-	      		${FIND} * -type d -exec ${MKDIR} "{}" "${PREFIX}/${DIRE}/{}" \; && \
-		      		${FIND} * -type f -exec ${INSTALL_SCRIPT} "{}" "${PREFIX}/${DIRE}/{}" \; ; \
-	fi
-.endfor
-.if !defined(NOPORTDOCS)
-.	for DIRE in share/examples share/doc
-		@if [ -d ${WRKDIR}/${DIRE} ]; \
-		then \
-			cd ${WRKDIR}/${DIRE} && \
-				${FIND} * -type d -exec ${MKDIR} "{}" "${PREFIX}/${DIRE}/{}" \; && \
-					${FIND} * -type f -exec ${INSTALL_SCRIPT} "{}" "${PREFIX}/${DIRE}/{}" \; ; \
-		fi
-.	endfor
-.endif
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${EXTRACTUNITDIR}
 
-add-plist-info: add-plist-fpcunits
-add-plist-fpcunits:
-.for DIRE in bin lib
-	@if [ -d ${WRKDIR}/${DIRE} ]; \
-	then \
-		cd ${WRKDIR}/${DIRE} && \
-			${FIND} * -type f | ${SORT} | ${SED} -e 's|^|${DIRE}/|' >> ${TMPPLIST}.FILES && \
-				${FIND} -d * -type d | ${SED} -e 's|^|@unexec rmdir %D/${DIRE}/|' -e 's@$$@ 2>/dev/null || true@' >> ${TMPPLIST}.DIRS; \
-	fi
-.endfor
-.if !defined(NOPORTDOCS)
-.	for DIRE in share/examples share/doc
-		@if [ -d ${WRKDIR}/${DIRE} ]; \
-		then \
-			cd ${WRKDIR}/${DIRE} && \
-				${FIND} * -type f | ${SORT} | ${SED} -e 's|^|${DIRE}/|' >> ${TMPPLIST}.FILES && \
-					${FIND} -d * -type d | ${SED} -e 's|^|@unexec rmdir %D/${DIRE}/|' -e 's@$$@ 2>/dev/null || true@' >> ${TMPPLIST}.DIRS; \
-		fi
-.	endfor
+.if !exists(${LOCALBASE}/bin/fpcmake)
+EXTRACTUNITDIR+=	fpc-bin
+DISTFILES+=	${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
+MAKE_ENV+=	FPCMAKE=${WRKDIR}/${PORTNAME:S/$/-bin/}/bin/fpcmake
 .endif
-	@${CAT} ${TMPPLIST}.FILES > ${TMPPLIST} && ${CAT} ${TMPPLIST}.DIRS >> ${TMPPLIST}
 
+do-build:
+	@cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} all ${MAKE_ENV}
+
+do-install:
+	@cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} install ${MAKE_ENV}
+.	if !defined(NOPORTSDOCS)
+.		if defined(HAVE_EXAMPLES)
+			@cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} fpc_exampleinstall
+.		endif
+.	endif
+	
 security-check: fpc-check-install
 
 fpc-check-install:
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index 80f3f20..12f100c 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,3 +1,6 @@
-MD5 (fpc-2.0.2.i386-freebsd.tar) = e1f834f445b0f2313f41ed417a28fb1c
-SHA256 (fpc-2.0.2.i386-freebsd.tar) = 906f002dfdbdfc3380f5a66b93d68debdbb68bba65b9db0590a93f548fb9f528
-SIZE (fpc-2.0.2.i386-freebsd.tar) = 22517760
+MD5 (freepascal/fpc-2.0.2.source.tar.gz) = 0a48954021273fec6b7fdba9038acdcc
+SHA256 (freepascal/fpc-2.0.2.source.tar.gz) = b49a9044392484b7fe54163ab6e5fa7cb4fb47c8851c6934edadfb0de0796cc3
+SIZE (freepascal/fpc-2.0.2.source.tar.gz) = 13404431
+MD5 (freepascal/fpc-2.0.2.bin.tar.gz) = 026cf7313d6c8e66fdbb50720f1bb7ee
+SHA256 (freepascal/fpc-2.0.2.bin.tar.gz) = 8ca1018d20da019c24cfe250a1b65dcd299c8074f57589a869af4284c21838a0
+SIZE (freepascal/fpc-2.0.2.bin.tar.gz) = 7035128
diff --git a/lang/fpc/files/pkg-message.in b/lang/fpc/files/pkg-message.in
index af58d20..8f4a64d 100644
--- a/lang/fpc/files/pkg-message.in
+++ b/lang/fpc/files/pkg-message.in
@@ -1,16 +1,20 @@
 ###############################################################################
 
-1) You can to install additional units from:
+1) Add lib paths to %%PREFIX%%/etc/fpc.cfg
 
-   * lang/fpc-units
+   # searchpath for libraries
+   -Fl/usr/local/lib
+   -Fl/usr/X11R6/lib
 
-2) If you want see all documentation about FreePascal, you can to install
+   This is necessary for correct linking of libraries.
 
-   * lang/fpc-docs
+2) You can to install additional units from:
 
-3) Also you can to install all examples that you can test with FreePascal
+   * lang/fpc-units
 
-   * lang/fpc-demo
+3) If you want see all documentation about FreePascal, you can to install
+
+   * lang/fpc-docs
 
 4) Optionally, you can to install textmode IDE with delphi support 
 
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index d730359..3b4f341 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,32 +1,15 @@
-@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.5 2006-06-21 16:52:56 garga Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.6 2006-07-24 11:21:24 acm Exp $
 
 @unexec rm -f %D/etc/fpc.cfg > /dev/null 2>&1 || true
-bin/bin2obj
-bin/data2inc
-bin/delp
 bin/fpc
-bin/fpcmake
 bin/fpcmkcfg
-bin/fpcres
 bin/fpcsubst
-bin/fpdoc
 bin/fppkg
-bin/fprcp
-bin/h2pas
-bin/h2paspp
-bin/makeskel
-bin/plex
-bin/postw32
-bin/ppdep
 bin/ppudump
 bin/ppufiles
 bin/ppumove
-bin/ptop
-bin/pyacc
-bin/rstconv
-bin/unitdiff
 bin/ppc386
-lib/fpc/%%PORTVERSION%%/msg/errorues.msg
+lib/fpc/%%PORTVERSION%%/msg/errorct.msg
 lib/fpc/%%PORTVERSION%%/msg/errord.msg
 lib/fpc/%%PORTVERSION%%/msg/errore.msg
 lib/fpc/%%PORTVERSION%%/msg/errores.msg
@@ -37,200 +20,181 @@ lib/fpc/%%PORTVERSION%%/msg/errorpl.msg
 lib/fpc/%%PORTVERSION%%/msg/errorpli.msg
 lib/fpc/%%PORTVERSION%%/msg/errorptd.msg
 lib/fpc/%%PORTVERSION%%/msg/errorptw.msg
+lib/fpc/%%PORTVERSION%%/msg/errorues.msg
 lib/fpc/%%PORTVERSION%%/msg/errorr.msg
 lib/fpc/%%PORTVERSION%%/msg/errorrw.msg
-lib/fpc/%%PORTVERSION%%/msg/errorct.msg
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfpmkunit.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/prt0.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cprt0.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/gprt0.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/system.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixtype.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ctypes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objpas.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/macpas.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strings.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/syscall.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysctl.ppu
+lib/fpc/%%PORTVERSION%%/ppc386
+lib/fpc/%%PORTVERSION%%/samplecfg
+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/unixutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unix.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/rtlconsts.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/matrix.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dl.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/termio.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/printer.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/math.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/varutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/variants.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/typinfo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/types.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.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/cprt0.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/graph.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ucomplex.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/getopts.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/heaptrc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lineinfo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sockets.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/terminfo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/video.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mouse.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/console.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/serial.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dateutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysconst.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/convutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dos.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objects.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cwstring.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpmkunit.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/system.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixtype.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ctypes.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objpas.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/macpas.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strings.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/syscall.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysctl.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/baseunix.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixutil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unix.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/rtlconsts.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/matrix.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/termio.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/printer.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/varutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/math.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/variants.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/typinfo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/types.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dl.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dos.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dos.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/graph.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ucomplex.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpmkunit.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpmkunit.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/getopts.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/getopts.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/gprt0.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/graph.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/graph.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/heaptrc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lineinfo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sockets.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/terminfo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/video.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mouse.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/console.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/serial.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dateutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysconst.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/convutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dos.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objects.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cwstring.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpmkunit.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsystem.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpunixtype.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpctypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpobjpas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmacpas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstrings.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsyscall.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsysctl.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbaseunix.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpunixutil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpunix.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libprtlconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpinitc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcmem.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmatrix.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libptermio.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpprinter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsysutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvarutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmath.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvariants.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libptypinfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libptypes.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclasses.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdynlibs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpx86.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpports.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/libpmmx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgraph.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcharset.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpucomplex.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/libpfpmkunit.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgetopts.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgraph.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpheaptrc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplineinfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libperrors.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsockets.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpinitc.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpipc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpterminfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvideo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmouse.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpkeyboard.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconsole.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplineinfo.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
+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/libpdateutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsysconst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcthreads.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsockets.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstrings.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstrutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconvutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdos.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpobjects.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcwstring.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/lexlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/yacclib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/lexlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/yacclib.o
-lib/fpc/%%PORTVERSION%%/ppc386
-lib/fpc/%%PORTVERSION%%/samplecfg
-lib/fpc/lexyacc/yyparse.cod
-lib/fpc/lexyacc/yylex.cod
-%%PORTDOCS%%%%DOCSDIR%%/copying
-%%PORTDOCS%%%%DOCSDIR%%/copying.dj
-%%PORTDOCS%%%%DOCSDIR%%/copying.emx
-%%PORTDOCS%%%%DOCSDIR%%/copying.fpc
-%%PORTDOCS%%%%DOCSDIR%%/copying.rsx
-%%PORTDOCS%%%%DOCSDIR%%/faq.htm
-%%PORTDOCS%%%%DOCSDIR%%/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry lib/fpc/lexyacc
-@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl
-@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc
+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/lineinfo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lineinfo.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
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.o
+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/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
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysctl.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysctl.ppu
+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/unix.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unix.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/x86.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.ppu
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%/msg