- Update fpc to 2.0.2

PR: 98628, 98629, 98630, 98632, 98641, 98646, 98650, 98652, 98654, 98656, 98657, 98658, 98720, 98724 Submitted by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
author: Renato Botelho <garga@FreeBSD.org> 2006-06-21 16:52:57 +0000
committer: Renato Botelho <garga@FreeBSD.org> 2006-06-21 16:52:57 +0000
commit: b06153abd6cff3313971e58ae665e96b0bf447bf (patch)
tree: d671f1e410fe2766e67c77bc1573fd986720b550
parent: acca2dab6cf8bdfcdf61189c830d87fae34e8118 (diff)
download: ports-b06153abd6cff3313971e58ae665e96b0bf447bf.tar.gz
ports-b06153abd6cff3313971e58ae665e96b0bf447bf.zip
69 files changed, 1047 insertions, 1501 deletions
diff --git a/archivers/fpc-paszlib/Makefile b/archivers/fpc-paszlib/Makefile
index 37ad62571e77..569c5cf1d299 100644
--- a/archivers/fpc-paszlib/Makefile
+++ b/archivers/fpc-paszlib/Makefile
@@ -5,42 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	paszlib
-PORTVERSION=	1.0.10
 CATEGORIES=	archivers devel
-MASTER_SITES=	http://www.borgsdemons.com/distfiles/
-PKGNAMEPREFIX=	fpc-
+PKGNAMESUFFIX=	-paszlib
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal unit for native compression IO
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-.include <bsd.port.pre.mk>
-
-PLIST_SUB+=	INSTDIR=lib/fpc/${PORTVERSION}/units/freebsd/paszlib \
-		PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKDIR}/paszlib -name "Makefile*" | ${XARGS} \
-		${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/paszlib all
-
-do-install:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/paszlib install
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/archivers/fpc-paszlib/distinfo b/archivers/fpc-paszlib/distinfo
deleted file mode 100644
index 3c287199b583..000000000000
--- a/archivers/fpc-paszlib/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (paszlib-1.0.10.tar.gz) = 4d52f1d084a424a5deabc4f47eb4d370
-SHA256 (paszlib-1.0.10.tar.gz) = 4f72bd0f6e65c8da26202a81b1695b7da6d0951a690351183209bbf3f7d1c191
-SIZE (paszlib-1.0.10.tar.gz) = 96724
diff --git a/archivers/fpc-paszlib/pkg-descr b/archivers/fpc-paszlib/pkg-descr
deleted file mode 100644
index 4188f4bd9233..000000000000
--- a/archivers/fpc-paszlib/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The paszlib unit is one of the base packages developed for
-Free Pascal, a 32-bit Turbo Pascal/Delphi compatible compiler.
-This unit provides some of the interfaces in Delphi Vision.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/archivers/fpc-paszlib/pkg-plist b/archivers/fpc-paszlib/pkg-plist
deleted file mode 100644
index ad979ce0e501..000000000000
--- a/archivers/fpc-paszlib/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-%%INSTDIR%%/Package.fpc
-%%INSTDIR%%/adler.o
-%%INSTDIR%%/adler.ppu
-%%INSTDIR%%/gzcrc.o
-%%INSTDIR%%/gzcrc.ppu
-%%INSTDIR%%/gzio.o
-%%INSTDIR%%/gzio.ppu
-%%INSTDIR%%/infblock.o
-%%INSTDIR%%/infblock.ppu
-%%INSTDIR%%/infcodes.o
-%%INSTDIR%%/infcodes.ppu
-%%INSTDIR%%/inffast.o
-%%INSTDIR%%/inffast.ppu
-%%INSTDIR%%/inftrees.o
-%%INSTDIR%%/inftrees.ppu
-%%INSTDIR%%/infutil.o
-%%INSTDIR%%/infutil.ppu
-%%INSTDIR%%/paszlib.o
-%%INSTDIR%%/paszlib.ppu
-%%INSTDIR%%/trees.o
-%%INSTDIR%%/trees.ppu
-%%INSTDIR%%/zbase.o
-%%INSTDIR%%/zbase.ppu
-%%INSTDIR%%/zcompres.o
-%%INSTDIR%%/zcompres.ppu
-%%INSTDIR%%/zdeflate.o
-%%INSTDIR%%/zdeflate.ppu
-%%INSTDIR%%/zinflate.o
-%%INSTDIR%%/zinflate.ppu
-%%INSTDIR%%/zuncompr.o
-%%INSTDIR%%/zuncompr.ppu
-%%INSTDIR%%/zutil.o
-%%INSTDIR%%/zutil.ppu
-@dirrm %%INSTDIR%%
-@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd
-@dirrmtry lib/fpc/%%PORTVERSION%%/units
-@dirrmtry lib/fpc/%%PORTVERSION%%
-@dirrmtry lib/fpc
diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
index b03ee891922c..01d0704a2302 100644
--- a/databases/fpc-ibase/Makefile
+++ b/databases/fpc-ibase/Makefile
@@ -5,66 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ibase
-PORTVERSION=	1.0.10
 CATEGORIES=	databases lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	freepascal
-PKGNAMEPREFIX=	fpc-
-DISTNAME=	fpc-${PORTVERSION}.ELF
-EXTRACT_SUFX=	.tar
+PKGNAMESUFFIX=	-ibase
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal interface to interbase
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+LIB_DEPENDS=	fbembed.1:${PORTSDIR}/databases/firebird-client
 
-.include <bsd.port.pre.mk>
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
-
-PLIST_SUB+=	INSTDIR=lib/fpc/${PORTVERSION}/units/freebsd/ibase \
-		PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
-# further extract base sources
-#
-# interbase sources
-	@${TAR} zxf ${WRKSRC}/sources/unitsibasesrc.tar.gz \
-		--directory ${WRKSRC}
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src/fpc-${PORTVERSION} -name \
-		"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/ibase \
-		all
-
-do-install:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/ibase \
-		install
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-ibase/distinfo b/databases/fpc-ibase/distinfo
deleted file mode 100644
index fb00975ada0c..000000000000
--- a/databases/fpc-ibase/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
diff --git a/databases/fpc-ibase/pkg-descr b/databases/fpc-ibase/pkg-descr
deleted file mode 100644
index b905fb33d2b7..000000000000
--- a/databases/fpc-ibase/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Ibase is part of the base packages of Free Pascal, a 32-bit
-Turbo Pascal/Delphi compatible compiler.  Ibase provides an
-interface to Interbase databases.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/databases/fpc-ibase/pkg-plist b/databases/fpc-ibase/pkg-plist
deleted file mode 100644
index 3a31848cbf55..000000000000
--- a/databases/fpc-ibase/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-%%INSTDIR%%/Package.fpc
-%%INSTDIR%%/ibase40.o
-%%INSTDIR%%/ibase40.ppu
-%%INSTDIR%%/ibase60.o
-%%INSTDIR%%/ibase60.ppu
-@dirrm %%INSTDIR%%
-@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd
-@dirrmtry lib/fpc/%%PORTVERSION%%/units
-@dirrmtry lib/fpc/%%PORTVERSION%%
-@dirrmtry lib/fpc
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
index 4dca6de5994e..b79a628680a0 100644
--- a/databases/fpc-mysql/Makefile
+++ b/databases/fpc-mysql/Makefile
@@ -5,66 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mysql
-PORTVERSION=	1.0.10
 CATEGORIES=	databases lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	freepascal
-PKGNAMEPREFIX=	fpc-
-DISTNAME=	fpc-${PORTVERSION}.ELF
-EXTRACT_SUFX=	.tar
+PKGNAMESUFFIX=	-mysql
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal interface to MySQL
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-.include <bsd.port.pre.mk>
+USE_MYSQL=	yes
 
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-PLIST_SUB+=	INSTDIR=lib/fpc/${PORTVERSION}/units/freebsd/mysql \
-		PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
-# further extract base sources
-#
-# mysql sources
-	@${TAR} zxf ${WRKSRC}/sources/unitsmysqlsrc.tar.gz \
-		--directory ${WRKSRC}
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src/fpc-${PORTVERSION} -name \
-		"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/mysql \
-		all
-
-do-install:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/mysql \
-		install
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-mysql/distinfo b/databases/fpc-mysql/distinfo
deleted file mode 100644
index fb00975ada0c..000000000000
--- a/databases/fpc-mysql/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
diff --git a/databases/fpc-mysql/pkg-descr b/databases/fpc-mysql/pkg-descr
deleted file mode 100644
index 51d99e67fe74..000000000000
--- a/databases/fpc-mysql/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Mysql is part of the base packages of Free Pascal, a 32-bit
-Turbo Pascal/Delphi compatible compiler.  Mysql provides an
-interface to MySQL databases.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist
deleted file mode 100644
index fe76ecb3db1d..000000000000
--- a/databases/fpc-mysql/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-%%INSTDIR%%/Package.fpc
-%%INSTDIR%%/mysql.o
-%%INSTDIR%%/mysql.ppu
-%%INSTDIR%%/mysql_com.o
-%%INSTDIR%%/mysql_com.ppu
-%%INSTDIR%%/mysql_version.o
-%%INSTDIR%%/mysql_version.ppu
-@dirrm %%INSTDIR%%
-@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd
-@dirrmtry lib/fpc/%%PORTVERSION%%/units
-@dirrmtry lib/fpc/%%PORTVERSION%%
-@dirrmtry lib/fpc
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
index fbccbc67b901..f8b392166a0c 100644
--- a/databases/fpc-odbc/Makefile
+++ b/databases/fpc-odbc/Makefile
@@ -5,67 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	odbc
-PORTVERSION=	1.0.10
-PORTREVISION=	1
-CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	freepascal
-PKGNAMEPREFIX=	fpc-
-DISTNAME=	fpc-${PORTVERSION}.ELF
-EXTRACT_SUFX=	.tar
+CATEGORIES=	databases lang
+PKGNAMESUFFIX=	-odbc
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal interface to ODBC
 
-.include <bsd.port.pre.mk>
-
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${BUILD_DEPENDS}
-.if ${OSVERSION} >= 500000
-LIB_DEPENDS+=   c.4:${PORTSDIR}/misc/compat4x
-.endif
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
-# further extract base sources
-#
-# odbc sources
-	@${TAR} zxf ${WRKSRC}/sources/unitsodbcsrc.tar.gz \
-		--directory ${WRKSRC}
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src/fpc-${PORTVERSION} -name \
-		"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/odbc && \
-		${GMAKE} ${MAKE_ENV} all
 
-do-install:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/odbc && \
-		${GMAKE} ${MAKE_ENV} install
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-odbc/distinfo b/databases/fpc-odbc/distinfo
deleted file mode 100644
index fb00975ada0c..000000000000
--- a/databases/fpc-odbc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
diff --git a/databases/fpc-odbc/pkg-descr b/databases/fpc-odbc/pkg-descr
deleted file mode 100644
index e88dc6794d31..000000000000
--- a/databases/fpc-odbc/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Odbc is part of the base packages of Free Pascal, a 32-bit
-Turbo Pascal/Delphi compatible compiler.  Odbc provides an
-interface to ODBC.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/databases/fpc-odbc/pkg-plist b/databases/fpc-odbc/pkg-plist
deleted file mode 100644
index 095c7bcb3c64..000000000000
--- a/databases/fpc-odbc/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/freebsd/odbc/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/odbc/odbcsql.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/odbc/odbcsql.ppu
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/odbc
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
index 11ab8768a07d..afab56fc3a54 100644
--- a/databases/fpc-oracle/Makefile
+++ b/databases/fpc-oracle/Makefile
@@ -5,70 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	oracle
-PORTVERSION=	1.0.10
 CATEGORIES=	databases lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	freepascal
-PKGNAMEPREFIX=	fpc-
-DISTNAME=	fpc-${PORTVERSION}.ELF
-EXTRACT_SUFX=	.tar
+PKGNAMESUFFIX=	-oracle
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal interface to Oracle
 
-.include <bsd.port.pre.mk>
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
 
-ORACLE7_LIB=	${LOCALBASE}/oracle7/rdbms/lib
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		${ORACLE7_LIB}/libnlsrtl3.a:${PORTSDIR}/databases/oracle7-client
-RUN_DEPENDS=	${BUILD_DEPENDS}
-.if ${OSVERSION} >= 500000
-LIB_DEPENDS+=	c.4:${PORTSDIR}/misc/compat4x
-.endif
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
+ORACLE8_LIB=	${LOCALBASE}/oracle8-client/rdbms/lib
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
-# further extract base sources
-#
-# postgres sources
-	@${TAR} zxf ${WRKSRC}/sources/unitsoraclesrc.tar.gz \
-		--directory ${WRKSRC}
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src/fpc-${PORTVERSION} -name \
-		"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-	${REINPLACE_CMD} 's|/usr/local/oracle8cli/lib|${ORACLE7_LIB}|g' \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/oracle/Makefile.fpc
-
-do-build:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/oracle && \
-		${GMAKE} ${MAKE_ENV} all
-
-do-install:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/oracle && \
-		${GMAKE} ${MAKE_ENV} install
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-oracle/distinfo b/databases/fpc-oracle/distinfo
deleted file mode 100644
index fb00975ada0c..000000000000
--- a/databases/fpc-oracle/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
diff --git a/databases/fpc-oracle/files/patch-share::src::fpc-1.0.10::packages::base::oracle::Makefile.fpc b/databases/fpc-oracle/files/patch-share::src::fpc-1.0.10::packages::base::oracle::Makefile.fpc
deleted file mode 100644
index a2913d74f42f..000000000000
--- a/databases/fpc-oracle/files/patch-share::src::fpc-1.0.10::packages::base::oracle::Makefile.fpc
+++ /dev/null
@@ -1,10 +0,0 @@
---- share/src/fpc-1.0.10/packages/base/oracle/Makefile.fpc.bak	Sun Apr  6 07:44:46 2003
-+++ share/src/fpc-1.0.10/packages/base/oracle/Makefile.fpc	Thu Jan  8 22:16:08 2004
-@@ -21,5 +21,5 @@
- 
- # in libdir variable must be path to libraries
- # libclntsh.*,libnlsrtl3.*
--#[compiler]
--#libdir=/usr/local/oracle8cli/lib
-+[compiler]
-+libdir=/usr/local/oracle8cli/lib
diff --git a/databases/fpc-oracle/pkg-descr b/databases/fpc-oracle/pkg-descr
deleted file mode 100644
index b2339e674843..000000000000
--- a/databases/fpc-oracle/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Oracle is part of the base packages of Free Pascal, a 32-bit
-Turbo Pascal/Delphi compatible compiler.  Oracle provides an
-interface to Oracle databases.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/databases/fpc-oracle/pkg-plist b/databases/fpc-oracle/pkg-plist
deleted file mode 100644
index 5f3c88c894d2..000000000000
--- a/databases/fpc-oracle/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/freebsd/oracle/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/oracle/oraoci.ppu
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/oracle
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
index 92389c661b15..2acd4f55f23c 100644
--- a/databases/fpc-postgres/Makefile
+++ b/databases/fpc-postgres/Makefile
@@ -5,67 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	postgres
-PORTVERSION=	1.0.10
-PORTREVISION=	1
-CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	freepascal
-PKGNAMEPREFIX=	fpc-
-DISTNAME=	fpc-${PORTVERSION}.ELF
-EXTRACT_SUFX=	.tar
+CATEGORIES=	databases lang
+PKGNAMESUFFIX=	-postgres
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal interface to PostGreSQL
 
-.include <bsd.port.pre.mk>
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
 USE_PGSQL=	yes
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${BUILD_DEPENDS}
-.if ${OSVERSION} >= 500000
-LIB_DEPENDS+=	c.4:${PORTSDIR}/misc/compat4x
-.endif
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
-# further extract base sources
-#
-# postgres sources
-	@${TAR} zxf ${WRKSRC}/sources/unitspostgressrc.tar.gz \
-		--directory ${WRKSRC}
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src/fpc-${PORTVERSION} -name \
-		"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/postgres && \
-		${GMAKE} ${MAKE_ENV} all
-
-do-install:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/postgres && \
-		${GMAKE} ${MAKE_ENV} install
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-postgres/distinfo b/databases/fpc-postgres/distinfo
deleted file mode 100644
index fb00975ada0c..000000000000
--- a/databases/fpc-postgres/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
diff --git a/databases/fpc-postgres/pkg-descr b/databases/fpc-postgres/pkg-descr
deleted file mode 100644
index a3d5e3e7fd2d..000000000000
--- a/databases/fpc-postgres/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Postgres is part of the base packages of Free Pascal, a 32-bit
-Turbo Pascal/Delphi compatible compiler.  Postgres provides an
-interface to PostGreSQL.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/databases/fpc-postgres/pkg-plist b/databases/fpc-postgres/pkg-plist
deleted file mode 100644
index 2ee576a195d6..000000000000
--- a/databases/fpc-postgres/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/freebsd/postgres/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/postgres/dllist.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/postgres/dllist.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/postgres/postgres.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/postgres/postgres.ppu
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/postgres
diff --git a/devel/fpc-fv/Makefile b/devel/fpc-fv/Makefile
index f7b6f38e1e44..1f8daf91a6a7 100644
--- a/devel/fpc-fv/Makefile
+++ b/devel/fpc-fv/Makefile
@@ -5,57 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	fv
-PORTVERSION=	2.0.2
 CATEGORIES=	devel 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
-PKGNAMEPREFIX=	fpc-
-DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}.${BUILDNAME}
-EXTRACT_SUFX=	.tar
+PKGNAMESUFFIX=	-fv
 
 MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	FreeVision is a Free Pascal unit for Delphi support
 
-EXAMPLESDIR=	share/examples/${PKGNAMEPREFIX}${PORTVERSION}
-ONLY_FOR_ARCHS=	i386
-NO_BUILD=	yes
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-BUILDNAME=	i386-freebsd
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
-		BUILDNAME=${BUILDNAME}
-
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar \
-		--directory ${WRKSRC}
-	@${TAR} xf ${WRKSRC}/binary.${BUILDNAME}.tar \
-		--directory ${WRKSRC}
-
-# unpack binary and fv distribution
-	@${MKDIR} ${WRKSRC}/${PORTNAME}
-	@${TAR} zxf ${WRKSRC}/units-${PORTNAME}.${BUILDNAME}.tar.gz \
-		--directory ${WRKSRC}/${PORTNAME}
-
-do-install:
-.for DIRE in lib
-	@cd ${WRKSRC}/${PORTNAME}/${DIRE} && \
-		${FIND} * -type d -exec ${MKDIR} "{}" "${PREFIX}/${DIRE}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_SCRIPT} "{}" "${PREFIX}/${DIRE}/{}" \;
-.endfor
-
-post-install:
-.if !defined (NOPORTDOCS)
-	@cd ${WRKSRC}/${PORTNAME}/share && \
-		${FIND} * -type d -exec ${MKDIR} "{}" "${PREFIX}/share/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/{}" \;
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fv/distinfo b/devel/fpc-fv/distinfo
deleted file mode 100644
index 80f3f200b2ed..000000000000
--- a/devel/fpc-fv/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/devel/fpc-fv/pkg-descr b/devel/fpc-fv/pkg-descr
deleted file mode 100644
index 6c164506bc79..000000000000
--- a/devel/fpc-fv/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The fvision unit is a package developed with Free Pascal,
-a 32-bit Turbo Pascal/Delphi compatible compiler.  This unit
-provides some of the interfaces in Delphi Vision.
-
-WWW: http://www.freepascal.org/
diff --git a/devel/fpc-fv/pkg-plist b/devel/fpc-fv/pkg-plist
deleted file mode 100644
index 9f6b3a5294fd..000000000000
--- a/devel/fpc-fv/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/colortxt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/drivers.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvcommon.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvconsts.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/gadgets.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/histlist.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/inplong.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/memory.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/menus.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/resource.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/statuses.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/tabs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/time.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/validate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/views.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/sysmsg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/colortxt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/drivers.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvcommon.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvconsts.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/gadgets.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/histlist.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/inplong.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/memory.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/menus.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/resource.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/statuses.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/tabs.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/time.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/validate.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/views.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/sysmsg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpcolortxt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpdialogs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpdrivers.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpeditors.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpfvcommon.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpfvconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpgadgets.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libphistlist.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpinplong.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpmemory.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpmenus.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpmsgbox.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpstatuses.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpstddlg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptabs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptime.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpvalidate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpviews.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpsysmsg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpasciitab.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptimeddlg.a
-%%PORTDOCS%%%%EXAMPLESDIR%%/fv/tfileio.pas
-%%PORTDOCS%%%%EXAMPLESDIR%%/fv/testapp.pas
-%%PORTDOCS%%%%EXAMPLESDIR%%/fv/platform.inc
-%%PORTDOCS%%%%EXAMPLESDIR%%/fv/Makefile.fpc
-%%PORTDOCS%%%%EXAMPLESDIR%%/fv/Makefile
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fv
-%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
-@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv
-@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
-@dirrmtry lib/fpc/%%PORTVERSION%%/units
-@dirrmtry lib/fpc/%%PORTVERSION%%
-@dirrmtry lib/fpc
diff --git a/devel/fpc-gdbint/Makefile b/devel/fpc-gdbint/Makefile
index 76400f4b9227..83661d4d515c 100644
--- a/devel/fpc-gdbint/Makefile
+++ b/devel/fpc-gdbint/Makefile
@@ -5,67 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdbint
-PORTVERSION=	1.0.10
-PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	freepascal
-PKGNAMEPREFIX=	fpc-
-DISTNAME=	fpc-${PORTVERSION}.ELF
-EXTRACT_SUFX=	.tar
+PKGNAMESUFFIX=	-gdbint
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal unit providing interface to gdb
 
-.include <bsd.port.pre.mk>
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-BUILD_DEPENDS+=	ppc386:${PORTSDIR}/lang/fpc \
-		gdbfpc:${PORTSDIR}/devel/fpc-gdb
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		GDBLIBDIR=${LOCALBASE}/lib/fpc/${PORTVERSION}/units/freebsd/gdbint/libgdb \
-		RELEASE=1
-
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
-# further extract base sources
-#
-# gdbint sources
-	@${TAR} zxf ${WRKSRC}/sources/unitsgdbintsrc.tar.gz \
-		--directory ${WRKSRC}
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src/fpc-${PORTVERSION} -name \
-		"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/gdbint \
-		all
-
-do-install:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/gdbint \
-		install
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-gdbint/distinfo b/devel/fpc-gdbint/distinfo
deleted file mode 100644
index fb00975ada0c..000000000000
--- a/devel/fpc-gdbint/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
diff --git a/devel/fpc-gdbint/pkg-descr b/devel/fpc-gdbint/pkg-descr
deleted file mode 100644
index 021279f1a7f4..000000000000
--- a/devel/fpc-gdbint/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The gdbint unit is part of the base packages of Free Pascal,
-a 32-bit Turbo Pascal/Delphi compatible compiler.  This unit
-provides an interface to gdb.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/devel/fpc-gdbint/pkg-plist b/devel/fpc-gdbint/pkg-plist
deleted file mode 100644
index 9326665abe89..000000000000
--- a/devel/fpc-gdbint/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/freebsd/gdbint/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/gdbint/gdbcon.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/gdbint/gdbcon.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/gdbint/gdbint.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/gdbint/gdbint.ppu
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/gdbint
diff --git a/devel/fpc-regexpr/Makefile b/devel/fpc-regexpr/Makefile
index dfc00a14f395..2867bc28f164 100644
--- a/devel/fpc-regexpr/Makefile
+++ b/devel/fpc-regexpr/Makefile
@@ -5,72 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	regexpr
-PORTVERSION=	1.0.10
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/FreeBSD/ \
-		ftp://planetmirror.com/pub/fpc/dist/FreeBSD/ \
-		ftp://ftp.jp.freepascal.org/mirror/fpc/dist/FreeBSD/ \
-		ftp://freepascal.stack.nl/pub/fpc/dist/FreeBSD/ \
-		ftp://ftp.no.freepascal.org/pub/fpc/dist/FreeBSD/ \
-		ftp://ftp.us.freepascal.org/pub/fpc/dist/FreeBSD/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	freepascal
-PKGNAMEPREFIX=	fpc-
-DISTNAME=	fpc-${PORTVERSION}.ELF
-EXTRACT_SUFX=	.tar
+CATEGORIES=	devel lang
+PKGNAMESUFFIX=	-regexpr
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal regular expression routines
 
-.include <bsd.port.pre.mk>
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${BUILD_DEPENDS}
-.if ${OSVERSION} >= 500000
-LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
-.endif
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
-# further extract base sources
-#
-# regexpr sources
-	@${TAR} zxf ${WRKSRC}/sources/unitsregexprsrc.tar.gz \
-		--directory ${WRKSRC}
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src/fpc-${PORTVERSION} -name \
-		"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/regexpr && \
-		${GMAKE} ${MAKE_ENV} all
-
-do-install:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/regexpr && \
-		${GMAKE} ${MAKE_ENV} install
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-regexpr/distinfo b/devel/fpc-regexpr/distinfo
deleted file mode 100644
index fb00975ada0c..000000000000
--- a/devel/fpc-regexpr/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
diff --git a/devel/fpc-regexpr/pkg-descr b/devel/fpc-regexpr/pkg-descr
deleted file mode 100644
index 4305d3772783..000000000000
--- a/devel/fpc-regexpr/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Regexpr is part of the base packages of Free Pascal,
-a 32-bit Turbo Pascal/Delphi compatible compiler.  Regexpr
-provides regular expression routines.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/devel/fpc-regexpr/pkg-plist b/devel/fpc-regexpr/pkg-plist
deleted file mode 100644
index 457d480a190d..000000000000
--- a/devel/fpc-regexpr/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/freebsd/regexpr/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/regexpr/regexpr.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/regexpr/regexpr.ppu
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/regexpr
diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile
index ba34606c8015..ec6fafe50b52 100644
--- a/editors/fpc-ide/Makefile
+++ b/editors/fpc-ide/Makefile
@@ -5,77 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ide
-PORTVERSION=	1.0.10
 CATEGORIES=	editors lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	freepascal
-PKGNAMEPREFIX=	fpc-
-DISTNAME=	fpc-${PORTVERSION}.ELF
-EXTRACT_SUFX=	.tar
+PKGNAMESUFFIX=	-ide
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal integrated IDE/compiler
 
-BROKEN=		Waiting for fpc-* updated to 2.0.2
+RUN_DEPENDS=	${UNITSDIR}/fv/Package.fpc:${PORTSDIR}/devel/fpc-fv
 
-.include <bsd.port.pre.mk>
+UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
+UNITPREFIX=	# none
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-BUILD_DEPENDS+=	ppc386:${PORTSDIR}/lang/fpc \
-		${LOCALBASE}/lib/fpc/${PORTVERSION}/units/freebsd/gdbint/gdbint.ppu:${PORTSDIR}/devel/fpc-gdbint \
-		${LOCALBASE}/lib/fpc/${PORTVERSION}/units/freebsd/fv/drivers.ppu:${PORTSDIR}/devel/fpc-fv
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
-
-DOCSDIR=	${PREFIX}/share/doc/fpc
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		INSTALL_DOCDIR=${DOCSDIR} \
-		GCCLIBDIR=/usr/lib \
-		GDBLIBDIR=${LOCALBASE}/lib/fpc/${PORTVERSION}/units/freebsd/gdbint/libgdb \
-		RELEASE=1
-
-do-extract:
-# unpack distribution
-	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
-# further extract base sources
-#
-# ide and compiler sources
-	@${TAR} zxf ${WRKSRC}/sources/compilersrc.tar.gz \
-		--directory ${WRKSRC}
-	@${TAR} zxf ${WRKSRC}/sources/idesrc.tar.gz \
-		--directory ${WRKSRC}
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src -name "Makefile*" | \
-		${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-pre-build:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/ide/compiler && \
-		fpcmake
-
-do-build:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/ide \
-		all
-
-do-install:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/ide \
-		install
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/editors/fpc-ide/distinfo b/editors/fpc-ide/distinfo
deleted file mode 100644
index fb00975ada0c..000000000000
--- a/editors/fpc-ide/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
diff --git a/editors/fpc-ide/files/patch-share::src::fpc-1.0.10::ide::compiler::Makefile.fpc b/editors/fpc-ide/files/patch-share::src::fpc-1.0.10::ide::compiler::Makefile.fpc
deleted file mode 100644
index baf0f516754e..000000000000
--- a/editors/fpc-ide/files/patch-share::src::fpc-1.0.10::ide::compiler::Makefile.fpc
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/src/fpc-1.0.10/ide/compiler/Makefile.fpc.old	Fri Jan 16 00:23:44 2004
-+++ share/src/fpc-1.0.10/ide/compiler/Makefile.fpc	Fri Jan 16 00:25:03 2004
-@@ -18,7 +18,7 @@
- fpcdir=../..
- 
- [prerules]
--COMPILERDIR=$(FPCDIR)/compiler
-+COMPILERDIR=../../compiler
- 
- # Use 1.0.2 and 1.0.4 require -Ca to generate simple ppu
- ifneq ($(findstring 1.0.2,$(FPC_VERSION)),)
diff --git a/editors/fpc-ide/pkg-descr b/editors/fpc-ide/pkg-descr
deleted file mode 100644
index 4305d3772783..000000000000
--- a/editors/fpc-ide/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Regexpr is part of the base packages of Free Pascal,
-a 32-bit Turbo Pascal/Delphi compatible compiler.  Regexpr
-provides regular expression routines.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/editors/fpc-ide/pkg-plist b/editors/fpc-ide/pkg-plist
deleted file mode 100644
index fed731fcfab1..000000000000
--- a/editors/fpc-ide/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-bin/fp
-lib/fpc/%%PORTVERSION%%/ide/cvsco.tdf
-lib/fpc/%%PORTVERSION%%/ide/cvsdiff.tdf
-lib/fpc/%%PORTVERSION%%/ide/cvsup.tdf
-lib/fpc/%%PORTVERSION%%/ide/fp.ans
-lib/fpc/%%PORTVERSION%%/ide/gplprog.pt
-lib/fpc/%%PORTVERSION%%/ide/gplunit.pt
-lib/fpc/%%PORTVERSION%%/ide/grep.tdf
-lib/fpc/%%PORTVERSION%%/ide/program.pt
-lib/fpc/%%PORTVERSION%%/ide/tpgrep.tdf
-lib/fpc/%%PORTVERSION%%/ide/unit.pt
-%%DOCSDIR%%/readme.ide
-@dirrm %%DOCSDIR%%
-@dirrm lib/fpc/%%PORTVERSION%%/ide
-@dirrm lib/fpc/%%PORTVERSION%%
-@dirrm lib/fpc
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index 98c11949ff72..86d81ef1c448 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -5,34 +5,40 @@
 # $FreeBSD$
 #
 
-PORTNAME=	fpc-base
-PORTVERSION=	1.0.10
-CATEGORIES=	lang devel
+PORTNAME=	base
+PORTVERSION=	2.0.2
+CATEGORIES=	lang
 MASTER_SITES=	# empty
+PKGNAMEPREFIX=	fpc-
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Meta package to install all of the Free Pascal base
 
-RUN_DEPENDS=	fp:${PORTSDIR}/editors/fpc-ide \
-		${PAKGDIR}/ibase/ibase60.ppu:${PORTSDIR}/databases/fpc-ibase \
-		${PAKGDIR}/mysql/mysql.ppu:${PORTSDIR}/databases/fpc-mysql \
-		${PAKGDIR}/odbc/odbcsql.ppu:${PORTSDIR}/databases/fpc-odbc \
-		${PAKGDIR}/postgres/postgres.ppu:${PORTSDIR}/databases/fpc-postgres \
-		${PAKGDIR}/oracle/oraoci.ppu:${PORTSDIR}/databases/fpc-oracle \
-		${PAKGDIR}/regexpr/regexpr.ppu:${PORTSDIR}/devel/fpc-regexpr \
-		${PAKGDIR}/inet/inet.ppu:${PORTSDIR}/net/fpc-inet \
-		${PAKGDIR}/md5/md5.ppu:${PORTSDIR}/security/fpc-md5 \
-		${PAKGDIR}/paszlib/paszlib.ppu:${PORTSDIR}/archivers/fpc-paszlib
-
-PAKGDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/freebsd
-DOCSDIR=	${LOCALBASE}/share/doc/fpc
-EXAMPLESDIR=	${LOCALBASE}/share/examples/fpc
+RUN_DEPENDS=	${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
+
+UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
+DOCSDIR=	${LOCALBASE}/share/doc/fpc-${PORTVERSION}
+EXAMPLESDIR=	${LOCALBASE}/share/examples/fpc-${PORTVERSION}
+BUILDNAME=	i386-freebsd
 
 .if !defined(NOPORTDOCS)
-RUN_DEPENDS+=	${DOCSDIR}/user.pdf:${PORTSDIR}/lang/fpc-docs \
-		${EXAMPLESDIR}/Makefile.fpc:${PORTSDIR}/lang/fpc-demo
+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
 .endif
 
 NO_BUILD=	yes
diff --git a/lang/fpc-base/pkg-descr b/lang/fpc-base/pkg-descr
index 85e8f52c6d21..5ffb112f5cce 100644
--- a/lang/fpc-base/pkg-descr
+++ b/lang/fpc-base/pkg-descr
@@ -4,6 +4,3 @@ This collection constitutes the base packages and utilities for Free
 Pascal.
 
 WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/lang/fpc-demo/Makefile b/lang/fpc-demo/Makefile
index c3e5d9dcd1ba..b5dd20c2708a 100644
--- a/lang/fpc-demo/Makefile
+++ b/lang/fpc-demo/Makefile
@@ -6,61 +6,51 @@
 #
 
 PORTNAME=	demo
-PORTVERSION=	1.0.10
+PORTVERSION=	2.0.2
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+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
 PKGNAMEPREFIX=	fpc-
-DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}.ELF
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}.${BUILDNAME}
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal compiler examples
 
-EXAMPLESDIR=	${PREFIX}/share/examples/fpc
+DEMODIR=	share/doc/${PKGNAMEPREFIX}${PORTVERSION}/${PORTNAME}
 NO_BUILD=	yes
 
-SRCDOCDIR=	${WRKSRC}/share/doc/fpc-${PORTVERSION}/demo
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
+BUILDNAME=	i386-freebsd
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		DEMODIR=${DEMODIR}
+SUB_LIST+=	DEMODIR=${DEMODIR}
+SUB_FILES=	pkg-message
 
 do-extract:
 # unpack distribution
 	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack docs distribution
-	@${TAR} zxf ${WRKSRC}/demo.tar.gz --directory ${WRKSRC}
+	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar \
+		--directory ${WRKSRC}
+	@${TAR} xf ${WRKSRC}/binary.${BUILDNAME}.tar \
+		--directory ${WRKSRC}
+
+# unpack binary and demo distribution
+	@${MKDIR} ${WRKSRC}/${PORTNAME}
+	@${TAR} zxf ${WRKSRC}/demo.tar.gz \
+		--directory ${WRKSRC}/${PORTNAME}
 
 do-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${SRCDOCDIR}/ && \
-		${INSTALL_DATA} Makefile Makefile.fpc fpcdemos.txt \
-		${EXAMPLESDIR}
-	@${MKDIR} ${EXAMPLESDIR}/graph
-	@${INSTALL_DATA} `${LS} ${SRCDOCDIR}/graph/*` \
-		${EXAMPLESDIR}/graph
-	@${MKDIR} ${EXAMPLESDIR}/linux
-	@${INSTALL_DATA} `${LS} ${SRCDOCDIR}/linux/*` \
-		${EXAMPLESDIR}/linux
-	@${MKDIR} ${EXAMPLESDIR}/modex
-	@${INSTALL_DATA} `${LS} ${SRCDOCDIR}/modex/*` \
-		${EXAMPLESDIR}/modex
-	@${MKDIR} ${EXAMPLESDIR}/os2
-	@${INSTALL_DATA} `${LS} ${SRCDOCDIR}/os2/*` \
-		${EXAMPLESDIR}/os2
-	@${MKDIR} ${EXAMPLESDIR}/palmos
-	@${INSTALL_DATA} `${LS} ${SRCDOCDIR}/palmos/*` \
-		${EXAMPLESDIR}/palmos
-	@${MKDIR} ${EXAMPLESDIR}/text
-	@${INSTALL_DATA} `${LS} ${SRCDOCDIR}/text/*` \
-		${EXAMPLESDIR}/text
-	@${MKDIR} ${EXAMPLESDIR}/win32
-	@${INSTALL_DATA} `${LS} ${SRCDOCDIR}/win32/*` \
-		${EXAMPLESDIR}/win32
+	@cd ${WRKSRC}/${PORTNAME}/share && \
+		${FIND} * -type d -exec ${MKDIR} "{}" "${PREFIX}/share/{}" \; && \
+			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/{}" \;
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/fpc-demo/distinfo b/lang/fpc-demo/distinfo
index fb00975ada0c..80f3f200b2ed 100644
--- a/lang/fpc-demo/distinfo
+++ b/lang/fpc-demo/distinfo
@@ -1,3 +1,3 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
+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
diff --git a/lang/fpc-demo/files/pkg-message.in b/lang/fpc-demo/files/pkg-message.in
new file mode 100644
index 000000000000..f60f99688596
--- /dev/null
+++ b/lang/fpc-demo/files/pkg-message.in
@@ -0,0 +1,7 @@
+###############################################################################
+
+1) You can see all examples of freepascal in :
+
+   * %%DOCSDIR%%
+
+###############################################################################
diff --git a/lang/fpc-demo/pkg-descr b/lang/fpc-demo/pkg-descr
index 7c27d6628532..a78afbf62c2e 100644
--- a/lang/fpc-demo/pkg-descr
+++ b/lang/fpc-demo/pkg-descr
@@ -1,9 +1,5 @@
-These are the examples for Free Pascal, a 32 bit Turbo 
-Pascal-compatible Pascal compiler for DOS, Linux, Win32,
-OS/2, (based on an older version) the AmigaOS,
-FreeBSD/ELF, and BeOS.
+These are the examples for Free Pascal, a 32 bit Turbo Pascal-compatible Pascal
+compiler for DOS, Linux, Win32,OS/2, (based on an older version) the AmigaOS,
+FreeBSD, and BeOS.
 
 WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/lang/fpc-demo/pkg-plist b/lang/fpc-demo/pkg-plist
index a0144afb2d45..cc2a49331d3d 100644
--- a/lang/fpc-demo/pkg-plist
+++ b/lang/fpc-demo/pkg-plist
@@ -1,58 +1,497 @@
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/Makefile.fpc
-%%EXAMPLESDIR%%/fpcdemos.txt
-%%EXAMPLESDIR%%/graph/Makefile
-%%EXAMPLESDIR%%/graph/Makefile.fpc
-%%EXAMPLESDIR%%/graph/fpcgames.txt
-%%EXAMPLESDIR%%/graph/fpctris.pp
-%%EXAMPLESDIR%%/graph/ftrisgr.inc
-%%EXAMPLESDIR%%/graph/ftristxt.inc
-%%EXAMPLESDIR%%/graph/gameunit.pp
-%%EXAMPLESDIR%%/graph/gravwars.pp
-%%EXAMPLESDIR%%/graph/mandel.pp
-%%EXAMPLESDIR%%/graph/maze.pp
-%%EXAMPLESDIR%%/graph/quad.pp
-%%EXAMPLESDIR%%/graph/quaddata.dat
-%%EXAMPLESDIR%%/graph/samegame.pp
-%%EXAMPLESDIR%%/linux/Makefile
-%%EXAMPLESDIR%%/linux/Makefile.fpc
-%%EXAMPLESDIR%%/linux/daemon.pp
-%%EXAMPLESDIR%%/modex/Makefile
-%%EXAMPLESDIR%%/modex/Makefile.fpc
-%%EXAMPLESDIR%%/modex/fpcmodex.txt
-%%EXAMPLESDIR%%/modex/voxel.pp
-%%EXAMPLESDIR%%/os2/Makefile
-%%EXAMPLESDIR%%/os2/Makefile.fpc
-%%EXAMPLESDIR%%/os2/basicpm.pas
-%%EXAMPLESDIR%%/os2/getctry.pas
-%%EXAMPLESDIR%%/os2/pmdemo1.h
-%%EXAMPLESDIR%%/os2/pmdemo1.pp
-%%EXAMPLESDIR%%/os2/pmdemo1.rc
-%%EXAMPLESDIR%%/palmos/pilrc.bmp
-%%EXAMPLESDIR%%/palmos/pilrcic.bmp
-%%EXAMPLESDIR%%/palmos/pilrctst.h
-%%EXAMPLESDIR%%/palmos/pilrctst.pp
-%%EXAMPLESDIR%%/palmos/pilrctst.rcp
-%%EXAMPLESDIR%%/text/Makefile
-%%EXAMPLESDIR%%/text/Makefile.fpc
-%%EXAMPLESDIR%%/text/blackbox.pp
-%%EXAMPLESDIR%%/text/eratos.pp
-%%EXAMPLESDIR%%/text/hello.pp
-%%EXAMPLESDIR%%/text/lines.pp
-%%EXAMPLESDIR%%/text/magic.pp
-%%EXAMPLESDIR%%/text/qsort.pp
-%%EXAMPLESDIR%%/win32/Makefile
-%%EXAMPLESDIR%%/win32/Makefile.fpc
-%%EXAMPLESDIR%%/win32/dlltest.pp
-%%EXAMPLESDIR%%/win32/edit.pp
-%%EXAMPLESDIR%%/win32/menu.pp
-%%EXAMPLESDIR%%/win32/testdll.pp
-%%EXAMPLESDIR%%/win32/winhello.pp
-@dirrm %%EXAMPLESDIR%%/win32
-@dirrm %%EXAMPLESDIR%%/text
-@dirrm %%EXAMPLESDIR%%/palmos
-@dirrm %%EXAMPLESDIR%%/os2
-@dirrm %%EXAMPLESDIR%%/modex
-@dirrm %%EXAMPLESDIR%%/linux
-@dirrm %%EXAMPLESDIR%%/graph
-@dirrm %%EXAMPLESDIR%%
+%%DEMODIR%%/freebsd/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/freebsd/.svn/text-base/sysmousetest.pas.svn-base
+%%DEMODIR%%/freebsd/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/freebsd/.svn/text-base/fontdemo.pas.svn-base
+%%DEMODIR%%/freebsd/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/freebsd/.svn/prop-base/sysmousetest.pas.svn-base
+%%DEMODIR%%/freebsd/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/freebsd/.svn/prop-base/fontdemo.pas.svn-base
+%%DEMODIR%%/freebsd/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/freebsd/.svn/props/sysmousetest.pas.svn-work
+%%DEMODIR%%/freebsd/.svn/props/Makefile.svn-work
+%%DEMODIR%%/freebsd/.svn/props/fontdemo.pas.svn-work
+%%DEMODIR%%/freebsd/.svn/entries
+%%DEMODIR%%/freebsd/.svn/empty-file
+%%DEMODIR%%/freebsd/.svn/README.txt
+%%DEMODIR%%/freebsd/.svn/format
+%%DEMODIR%%/freebsd/sysmousetest.pas
+%%DEMODIR%%/freebsd/Makefile.fpc
+%%DEMODIR%%/freebsd/fontdemo.pas
+%%DEMODIR%%/freebsd/Makefile
+%%DEMODIR%%/graph/.svn/text-base/ftristxt.inc.svn-base
+%%DEMODIR%%/graph/.svn/text-base/fpcgames.txt.svn-base
+%%DEMODIR%%/graph/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/graph/.svn/text-base/gameunit.pp.svn-base
+%%DEMODIR%%/graph/.svn/text-base/fpctris.pp.svn-base
+%%DEMODIR%%/graph/.svn/text-base/ftrisgr.inc.svn-base
+%%DEMODIR%%/graph/.svn/text-base/quad.pp.svn-base
+%%DEMODIR%%/graph/.svn/text-base/gravwars.pp.svn-base
+%%DEMODIR%%/graph/.svn/text-base/maze.pp.svn-base
+%%DEMODIR%%/graph/.svn/text-base/quaddata.dat.svn-base
+%%DEMODIR%%/graph/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/graph/.svn/text-base/samegame.pp.svn-base
+%%DEMODIR%%/graph/.svn/text-base/mandel.pp.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/ftristxt.inc.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/fpcgames.txt.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/gameunit.pp.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/fpctris.pp.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/ftrisgr.inc.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/quad.pp.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/gravwars.pp.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/maze.pp.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/quaddata.dat.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/samegame.pp.svn-base
+%%DEMODIR%%/graph/.svn/prop-base/mandel.pp.svn-base
+%%DEMODIR%%/graph/.svn/props/ftristxt.inc.svn-work
+%%DEMODIR%%/graph/.svn/props/fpcgames.txt.svn-work
+%%DEMODIR%%/graph/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/graph/.svn/props/gameunit.pp.svn-work
+%%DEMODIR%%/graph/.svn/props/fpctris.pp.svn-work
+%%DEMODIR%%/graph/.svn/props/ftrisgr.inc.svn-work
+%%DEMODIR%%/graph/.svn/props/quad.pp.svn-work
+%%DEMODIR%%/graph/.svn/props/gravwars.pp.svn-work
+%%DEMODIR%%/graph/.svn/props/maze.pp.svn-work
+%%DEMODIR%%/graph/.svn/props/quaddata.dat.svn-work
+%%DEMODIR%%/graph/.svn/props/Makefile.svn-work
+%%DEMODIR%%/graph/.svn/props/samegame.pp.svn-work
+%%DEMODIR%%/graph/.svn/props/mandel.pp.svn-work
+%%DEMODIR%%/graph/.svn/entries
+%%DEMODIR%%/graph/.svn/empty-file
+%%DEMODIR%%/graph/.svn/README.txt
+%%DEMODIR%%/graph/.svn/format
+%%DEMODIR%%/graph/ftristxt.inc
+%%DEMODIR%%/graph/fpcgames.txt
+%%DEMODIR%%/graph/Makefile.fpc
+%%DEMODIR%%/graph/gameunit.pp
+%%DEMODIR%%/graph/fpctris.pp
+%%DEMODIR%%/graph/ftrisgr.inc
+%%DEMODIR%%/graph/quad.pp
+%%DEMODIR%%/graph/gravwars.pp
+%%DEMODIR%%/graph/maze.pp
+%%DEMODIR%%/graph/quaddata.dat
+%%DEMODIR%%/graph/Makefile
+%%DEMODIR%%/graph/samegame.pp
+%%DEMODIR%%/graph/mandel.pp
+%%DEMODIR%%/linux/.svn/text-base/daemon.pp.svn-base
+%%DEMODIR%%/linux/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/linux/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/linux/.svn/prop-base/daemon.pp.svn-base
+%%DEMODIR%%/linux/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/linux/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/linux/.svn/props/daemon.pp.svn-work
+%%DEMODIR%%/linux/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/linux/.svn/props/Makefile.svn-work
+%%DEMODIR%%/linux/.svn/entries
+%%DEMODIR%%/linux/.svn/empty-file
+%%DEMODIR%%/linux/.svn/README.txt
+%%DEMODIR%%/linux/.svn/format
+%%DEMODIR%%/linux/daemon.pp
+%%DEMODIR%%/linux/Makefile.fpc
+%%DEMODIR%%/linux/Makefile
+%%DEMODIR%%/lister/.svn/text-base/flist.pas.svn-base
+%%DEMODIR%%/lister/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/lister/.svn/text-base/lister.pas.svn-base
+%%DEMODIR%%/lister/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/lister/.svn/prop-base/flist.pas.svn-base
+%%DEMODIR%%/lister/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/lister/.svn/prop-base/lister.pas.svn-base
+%%DEMODIR%%/lister/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/lister/.svn/props/flist.pas.svn-work
+%%DEMODIR%%/lister/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/lister/.svn/props/lister.pas.svn-work
+%%DEMODIR%%/lister/.svn/props/Makefile.svn-work
+%%DEMODIR%%/lister/.svn/entries
+%%DEMODIR%%/lister/.svn/empty-file
+%%DEMODIR%%/lister/.svn/README.txt
+%%DEMODIR%%/lister/.svn/format
+%%DEMODIR%%/lister/flist.pas
+%%DEMODIR%%/lister/Makefile.fpc
+%%DEMODIR%%/lister/lister.pas
+%%DEMODIR%%/lister/Makefile
+%%DEMODIR%%/macos/.svn/text-base/HelloMac.pp.svn-base
+%%DEMODIR%%/macos/.svn/text-base/HelloMac.r.svn-base
+%%DEMODIR%%/macos/.svn/prop-base/HelloMac.pp.svn-base
+%%DEMODIR%%/macos/.svn/prop-base/HelloMac.r.svn-base
+%%DEMODIR%%/macos/.svn/props/HelloMac.pp.svn-work
+%%DEMODIR%%/macos/.svn/props/HelloMac.r.svn-work
+%%DEMODIR%%/macos/.svn/entries
+%%DEMODIR%%/macos/.svn/empty-file
+%%DEMODIR%%/macos/.svn/README.txt
+%%DEMODIR%%/macos/.svn/format
+%%DEMODIR%%/macos/HelloMac.pp
+%%DEMODIR%%/macos/HelloMac.r
+%%DEMODIR%%/modex/.svn/text-base/fpcmodex.txt.svn-base
+%%DEMODIR%%/modex/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/modex/.svn/text-base/voxel.pp.svn-base
+%%DEMODIR%%/modex/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/modex/.svn/prop-base/fpcmodex.txt.svn-base
+%%DEMODIR%%/modex/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/modex/.svn/prop-base/voxel.pp.svn-base
+%%DEMODIR%%/modex/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/modex/.svn/props/fpcmodex.txt.svn-work
+%%DEMODIR%%/modex/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/modex/.svn/props/voxel.pp.svn-work
+%%DEMODIR%%/modex/.svn/props/Makefile.svn-work
+%%DEMODIR%%/modex/.svn/entries
+%%DEMODIR%%/modex/.svn/empty-file
+%%DEMODIR%%/modex/.svn/README.txt
+%%DEMODIR%%/modex/.svn/format
+%%DEMODIR%%/modex/fpcmodex.txt
+%%DEMODIR%%/modex/Makefile.fpc
+%%DEMODIR%%/modex/voxel.pp
+%%DEMODIR%%/modex/Makefile
+%%DEMODIR%%/morphos/.svn/text-base/process.pas.svn-base
+%%DEMODIR%%/morphos/.svn/text-base/asltest.pas.svn-base
+%%DEMODIR%%/morphos/.svn/text-base/ahitest.pas.svn-base
+%%DEMODIR%%/morphos/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/morphos/.svn/text-base/window.pas.svn-base
+%%DEMODIR%%/morphos/.svn/text-base/openlib.pas.svn-base
+%%DEMODIR%%/morphos/.svn/text-base/getvolumes.pas.svn-base
+%%DEMODIR%%/morphos/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/morphos/.svn/prop-base/process.pas.svn-base
+%%DEMODIR%%/morphos/.svn/prop-base/asltest.pas.svn-base
+%%DEMODIR%%/morphos/.svn/prop-base/ahitest.pas.svn-base
+%%DEMODIR%%/morphos/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/morphos/.svn/prop-base/window.pas.svn-base
+%%DEMODIR%%/morphos/.svn/prop-base/openlib.pas.svn-base
+%%DEMODIR%%/morphos/.svn/prop-base/getvolumes.pas.svn-base
+%%DEMODIR%%/morphos/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/morphos/.svn/props/process.pas.svn-work
+%%DEMODIR%%/morphos/.svn/props/asltest.pas.svn-work
+%%DEMODIR%%/morphos/.svn/props/ahitest.pas.svn-work
+%%DEMODIR%%/morphos/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/morphos/.svn/props/window.pas.svn-work
+%%DEMODIR%%/morphos/.svn/props/openlib.pas.svn-work
+%%DEMODIR%%/morphos/.svn/props/getvolumes.pas.svn-work
+%%DEMODIR%%/morphos/.svn/props/Makefile.svn-work
+%%DEMODIR%%/morphos/.svn/entries
+%%DEMODIR%%/morphos/.svn/empty-file
+%%DEMODIR%%/morphos/.svn/README.txt
+%%DEMODIR%%/morphos/.svn/format
+%%DEMODIR%%/morphos/getvolumes.pas
+%%DEMODIR%%/morphos/process.pas
+%%DEMODIR%%/morphos/asltest.pas
+%%DEMODIR%%/morphos/ahitest.pas
+%%DEMODIR%%/morphos/Makefile.fpc
+%%DEMODIR%%/morphos/window.pas
+%%DEMODIR%%/morphos/openlib.pas
+%%DEMODIR%%/morphos/Makefile
+%%DEMODIR%%/netware/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/netware/.svn/text-base/nutconnection.pp.svn-base
+%%DEMODIR%%/netware/.svn/text-base/nuttest.pp.svn-base
+%%DEMODIR%%/netware/.svn/text-base/check.pp.svn-base
+%%DEMODIR%%/netware/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/netware/.svn/text-base/nutmon.pp.svn-base
+%%DEMODIR%%/netware/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/netware/.svn/prop-base/nutconnection.pp.svn-base
+%%DEMODIR%%/netware/.svn/prop-base/nuttest.pp.svn-base
+%%DEMODIR%%/netware/.svn/prop-base/check.pp.svn-base
+%%DEMODIR%%/netware/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/netware/.svn/prop-base/nutmon.pp.svn-base
+%%DEMODIR%%/netware/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/netware/.svn/props/nutconnection.pp.svn-work
+%%DEMODIR%%/netware/.svn/props/nuttest.pp.svn-work
+%%DEMODIR%%/netware/.svn/props/check.pp.svn-work
+%%DEMODIR%%/netware/.svn/props/Makefile.svn-work
+%%DEMODIR%%/netware/.svn/props/nutmon.pp.svn-work
+%%DEMODIR%%/netware/.svn/entries
+%%DEMODIR%%/netware/.svn/empty-file
+%%DEMODIR%%/netware/.svn/README.txt
+%%DEMODIR%%/netware/.svn/format
+%%DEMODIR%%/netware/nutconnection.pp
+%%DEMODIR%%/netware/Makefile.fpc
+%%DEMODIR%%/netware/nuttest.pp
+%%DEMODIR%%/netware/check.pp
+%%DEMODIR%%/netware/Makefile
+%%DEMODIR%%/netware/nutmon.pp
+%%DEMODIR%%/netwlibc/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/netwlibc/.svn/text-base/nuttest.pp.svn-base
+%%DEMODIR%%/netwlibc/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/netwlibc/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/netwlibc/.svn/prop-base/nuttest.pp.svn-base
+%%DEMODIR%%/netwlibc/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/netwlibc/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/netwlibc/.svn/props/nuttest.pp.svn-work
+%%DEMODIR%%/netwlibc/.svn/props/Makefile.svn-work
+%%DEMODIR%%/netwlibc/.svn/entries
+%%DEMODIR%%/netwlibc/.svn/empty-file
+%%DEMODIR%%/netwlibc/.svn/README.txt
+%%DEMODIR%%/netwlibc/.svn/format
+%%DEMODIR%%/netwlibc/Makefile.fpc
+%%DEMODIR%%/netwlibc/nuttest.pp
+%%DEMODIR%%/netwlibc/Makefile
+%%DEMODIR%%/os2/.svn/text-base/basicpm.pas.svn-base
+%%DEMODIR%%/os2/.svn/text-base/pmdemo1.pp.svn-base
+%%DEMODIR%%/os2/.svn/text-base/getctry.pas.svn-base
+%%DEMODIR%%/os2/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/os2/.svn/text-base/pmdemo1.rc.svn-base
+%%DEMODIR%%/os2/.svn/text-base/pmdemo1.h.svn-base
+%%DEMODIR%%/os2/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/os2/.svn/prop-base/basicpm.pas.svn-base
+%%DEMODIR%%/os2/.svn/prop-base/pmdemo1.pp.svn-base
+%%DEMODIR%%/os2/.svn/prop-base/getctry.pas.svn-base
+%%DEMODIR%%/os2/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/os2/.svn/prop-base/pmdemo1.rc.svn-base
+%%DEMODIR%%/os2/.svn/prop-base/pmdemo1.h.svn-base
+%%DEMODIR%%/os2/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/os2/.svn/props/basicpm.pas.svn-work
+%%DEMODIR%%/os2/.svn/props/pmdemo1.pp.svn-work
+%%DEMODIR%%/os2/.svn/props/getctry.pas.svn-work
+%%DEMODIR%%/os2/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/os2/.svn/props/pmdemo1.rc.svn-work
+%%DEMODIR%%/os2/.svn/props/pmdemo1.h.svn-work
+%%DEMODIR%%/os2/.svn/props/Makefile.svn-work
+%%DEMODIR%%/os2/.svn/entries
+%%DEMODIR%%/os2/.svn/empty-file
+%%DEMODIR%%/os2/.svn/README.txt
+%%DEMODIR%%/os2/.svn/format
+%%DEMODIR%%/os2/basicpm.pas
+%%DEMODIR%%/os2/pmdemo1.pp
+%%DEMODIR%%/os2/getctry.pas
+%%DEMODIR%%/os2/Makefile.fpc
+%%DEMODIR%%/os2/pmdemo1.rc
+%%DEMODIR%%/os2/pmdemo1.h
+%%DEMODIR%%/os2/Makefile
+%%DEMODIR%%/palmos/.svn/text-base/pilrcic.bmp.svn-base
+%%DEMODIR%%/palmos/.svn/text-base/pilrctst.pp.svn-base
+%%DEMODIR%%/palmos/.svn/text-base/pilrc.bmp.svn-base
+%%DEMODIR%%/palmos/.svn/text-base/pilrctst.rcp.svn-base
+%%DEMODIR%%/palmos/.svn/text-base/pilrctst.h.svn-base
+%%DEMODIR%%/palmos/.svn/prop-base/pilrcic.bmp.svn-base
+%%DEMODIR%%/palmos/.svn/prop-base/pilrctst.pp.svn-base
+%%DEMODIR%%/palmos/.svn/prop-base/pilrc.bmp.svn-base
+%%DEMODIR%%/palmos/.svn/prop-base/pilrctst.rcp.svn-base
+%%DEMODIR%%/palmos/.svn/prop-base/pilrctst.h.svn-base
+%%DEMODIR%%/palmos/.svn/props/pilrcic.bmp.svn-work
+%%DEMODIR%%/palmos/.svn/props/pilrctst.pp.svn-work
+%%DEMODIR%%/palmos/.svn/props/pilrc.bmp.svn-work
+%%DEMODIR%%/palmos/.svn/props/pilrctst.rcp.svn-work
+%%DEMODIR%%/palmos/.svn/props/pilrctst.h.svn-work
+%%DEMODIR%%/palmos/.svn/entries
+%%DEMODIR%%/palmos/.svn/empty-file
+%%DEMODIR%%/palmos/.svn/README.txt
+%%DEMODIR%%/palmos/.svn/format
+%%DEMODIR%%/palmos/pilrcic.bmp
+%%DEMODIR%%/palmos/pilrctst.pp
+%%DEMODIR%%/palmos/pilrc.bmp
+%%DEMODIR%%/palmos/pilrctst.rcp
+%%DEMODIR%%/palmos/pilrctst.h
+%%DEMODIR%%/text/.svn/text-base/hello.pp.svn-base
+%%DEMODIR%%/text/.svn/text-base/blackbox.pp.svn-base
+%%DEMODIR%%/text/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/text/.svn/text-base/qsort.pp.svn-base
+%%DEMODIR%%/text/.svn/text-base/lines.pp.svn-base
+%%DEMODIR%%/text/.svn/text-base/eratos.pp.svn-base
+%%DEMODIR%%/text/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/text/.svn/text-base/magic.pp.svn-base
+%%DEMODIR%%/text/.svn/prop-base/hello.pp.svn-base
+%%DEMODIR%%/text/.svn/prop-base/blackbox.pp.svn-base
+%%DEMODIR%%/text/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/text/.svn/prop-base/qsort.pp.svn-base
+%%DEMODIR%%/text/.svn/prop-base/lines.pp.svn-base
+%%DEMODIR%%/text/.svn/prop-base/eratos.pp.svn-base
+%%DEMODIR%%/text/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/text/.svn/prop-base/magic.pp.svn-base
+%%DEMODIR%%/text/.svn/props/hello.pp.svn-work
+%%DEMODIR%%/text/.svn/props/blackbox.pp.svn-work
+%%DEMODIR%%/text/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/text/.svn/props/qsort.pp.svn-work
+%%DEMODIR%%/text/.svn/props/lines.pp.svn-work
+%%DEMODIR%%/text/.svn/props/eratos.pp.svn-work
+%%DEMODIR%%/text/.svn/props/Makefile.svn-work
+%%DEMODIR%%/text/.svn/props/magic.pp.svn-work
+%%DEMODIR%%/text/.svn/entries
+%%DEMODIR%%/text/.svn/empty-file
+%%DEMODIR%%/text/.svn/README.txt
+%%DEMODIR%%/text/.svn/format
+%%DEMODIR%%/text/blackbox.pp
+%%DEMODIR%%/text/hello.pp
+%%DEMODIR%%/text/Makefile.fpc
+%%DEMODIR%%/text/qsort.pp
+%%DEMODIR%%/text/lines.pp
+%%DEMODIR%%/text/eratos.pp
+%%DEMODIR%%/text/Makefile
+%%DEMODIR%%/text/magic.pp
+%%DEMODIR%%/win32/.svn/text-base/winhello.pp.svn-base
+%%DEMODIR%%/win32/.svn/text-base/menu.pp.svn-base
+%%DEMODIR%%/win32/.svn/text-base/edit.pp.svn-base
+%%DEMODIR%%/win32/.svn/text-base/Makefile.fpc.svn-base
+%%DEMODIR%%/win32/.svn/text-base/dlltest.pp.svn-base
+%%DEMODIR%%/win32/.svn/text-base/testdll.pp.svn-base
+%%DEMODIR%%/win32/.svn/text-base/Makefile.svn-base
+%%DEMODIR%%/win32/.svn/prop-base/winhello.pp.svn-base
+%%DEMODIR%%/win32/.svn/prop-base/menu.pp.svn-base
+%%DEMODIR%%/win32/.svn/prop-base/edit.pp.svn-base
+%%DEMODIR%%/win32/.svn/prop-base/Makefile.fpc.svn-base
+%%DEMODIR%%/win32/.svn/prop-base/dlltest.pp.svn-base
+%%DEMODIR%%/win32/.svn/prop-base/testdll.pp.svn-base
+%%DEMODIR%%/win32/.svn/prop-base/Makefile.svn-base
+%%DEMODIR%%/win32/.svn/props/winhello.pp.svn-work
+%%DEMODIR%%/win32/.svn/props/menu.pp.svn-work
+%%DEMODIR%%/win32/.svn/props/edit.pp.svn-work
+%%DEMODIR%%/win32/.svn/props/Makefile.fpc.svn-work
+%%DEMODIR%%/win32/.svn/props/dlltest.pp.svn-work
+%%DEMODIR%%/win32/.svn/props/testdll.pp.svn-work
+%%DEMODIR%%/win32/.svn/props/Makefile.svn-work
+%%DEMODIR%%/win32/.svn/entries
+%%DEMODIR%%/win32/.svn/empty-file
+%%DEMODIR%%/win32/.svn/README.txt
+%%DEMODIR%%/win32/.svn/format
+%%DEMODIR%%/win32/winhello.pp
+%%DEMODIR%%/win32/menu.pp
+%%DEMODIR%%/win32/edit.pp
+%%DEMODIR%%/win32/Makefile.fpc
+%%DEMODIR%%/win32/dlltest.pp
+%%DEMODIR%%/win32/testdll.pp
+%%DEMODIR%%/win32/Makefile
+%%DEMODIR%%/fpcdemos.txt
+%%DEMODIR%%/Makefile
+%%DEMODIR%%/Makefile.fpc
+@dirrmtry share/doc/fpc-%%PORTVERSION%%/fpc
+@dirrmtry %%DEMODIR%%/win32/.svn/wcprops
+@dirrmtry %%DEMODIR%%/win32/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/win32/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/win32/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/win32/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/win32/.svn/tmp
+@dirrmtry %%DEMODIR%%/win32/.svn/text-base
+@dirrmtry %%DEMODIR%%/win32/.svn/props
+@dirrmtry %%DEMODIR%%/win32/.svn/prop-base
+@dirrmtry %%DEMODIR%%/win32/.svn
+@dirrmtry %%DEMODIR%%/win32
+@dirrmtry %%DEMODIR%%/text/.svn/wcprops
+@dirrmtry %%DEMODIR%%/text/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/text/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/text/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/text/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/text/.svn/tmp
+@dirrmtry %%DEMODIR%%/text/.svn/text-base
+@dirrmtry %%DEMODIR%%/text/.svn/props
+@dirrmtry %%DEMODIR%%/text/.svn/prop-base
+@dirrmtry %%DEMODIR%%/text/.svn
+@dirrmtry %%DEMODIR%%/text
+@dirrmtry %%DEMODIR%%/palmos/.svn/wcprops
+@dirrmtry %%DEMODIR%%/palmos/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/palmos/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/palmos/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/palmos/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/palmos/.svn/tmp
+@dirrmtry %%DEMODIR%%/palmos/.svn/text-base
+@dirrmtry %%DEMODIR%%/palmos/.svn/props
+@dirrmtry %%DEMODIR%%/palmos/.svn/prop-base
+@dirrmtry %%DEMODIR%%/palmos/.svn
+@dirrmtry %%DEMODIR%%/palmos
+@dirrmtry %%DEMODIR%%/os2/.svn/wcprops
+@dirrmtry %%DEMODIR%%/os2/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/os2/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/os2/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/os2/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/os2/.svn/tmp
+@dirrmtry %%DEMODIR%%/os2/.svn/text-base
+@dirrmtry %%DEMODIR%%/os2/.svn/props
+@dirrmtry %%DEMODIR%%/os2/.svn/prop-base
+@dirrmtry %%DEMODIR%%/os2/.svn
+@dirrmtry %%DEMODIR%%/os2
+@dirrmtry %%DEMODIR%%/netwlibc/.svn/wcprops
+@dirrmtry %%DEMODIR%%/netwlibc/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/netwlibc/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/netwlibc/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/netwlibc/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/netwlibc/.svn/tmp
+@dirrmtry %%DEMODIR%%/netwlibc/.svn/text-base
+@dirrmtry %%DEMODIR%%/netwlibc/.svn/props
+@dirrmtry %%DEMODIR%%/netwlibc/.svn/prop-base
+@dirrmtry %%DEMODIR%%/netwlibc/.svn
+@dirrmtry %%DEMODIR%%/netwlibc
+@dirrmtry %%DEMODIR%%/netware/.svn/wcprops
+@dirrmtry %%DEMODIR%%/netware/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/netware/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/netware/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/netware/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/netware/.svn/tmp
+@dirrmtry %%DEMODIR%%/netware/.svn/text-base
+@dirrmtry %%DEMODIR%%/netware/.svn/props
+@dirrmtry %%DEMODIR%%/netware/.svn/prop-base
+@dirrmtry %%DEMODIR%%/netware/.svn
+@dirrmtry %%DEMODIR%%/netware
+@dirrmtry %%DEMODIR%%/morphos/.svn/wcprops
+@dirrmtry %%DEMODIR%%/morphos/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/morphos/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/morphos/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/morphos/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/morphos/.svn/tmp
+@dirrmtry %%DEMODIR%%/morphos/.svn/text-base
+@dirrmtry %%DEMODIR%%/morphos/.svn/props
+@dirrmtry %%DEMODIR%%/morphos/.svn/prop-base
+@dirrmtry %%DEMODIR%%/morphos/.svn
+@dirrmtry %%DEMODIR%%/morphos
+@dirrmtry %%DEMODIR%%/modex/.svn/wcprops
+@dirrmtry %%DEMODIR%%/modex/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/modex/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/modex/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/modex/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/modex/.svn/tmp
+@dirrmtry %%DEMODIR%%/modex/.svn/text-base
+@dirrmtry %%DEMODIR%%/modex/.svn/props
+@dirrmtry %%DEMODIR%%/modex/.svn/prop-base
+@dirrmtry %%DEMODIR%%/modex/.svn
+@dirrmtry %%DEMODIR%%/modex
+@dirrmtry %%DEMODIR%%/macos/.svn/wcprops
+@dirrmtry %%DEMODIR%%/macos/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/macos/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/macos/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/macos/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/macos/.svn/tmp
+@dirrmtry %%DEMODIR%%/macos/.svn/text-base
+@dirrmtry %%DEMODIR%%/macos/.svn/props
+@dirrmtry %%DEMODIR%%/macos/.svn/prop-base
+@dirrmtry %%DEMODIR%%/macos/.svn
+@dirrmtry %%DEMODIR%%/macos
+@dirrmtry %%DEMODIR%%/lister/.svn/wcprops
+@dirrmtry %%DEMODIR%%/lister/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/lister/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/lister/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/lister/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/lister/.svn/tmp
+@dirrmtry %%DEMODIR%%/lister/.svn/text-base
+@dirrmtry %%DEMODIR%%/lister/.svn/props
+@dirrmtry %%DEMODIR%%/lister/.svn/prop-base
+@dirrmtry %%DEMODIR%%/lister/.svn
+@dirrmtry %%DEMODIR%%/lister
+@dirrmtry %%DEMODIR%%/linux/.svn/wcprops
+@dirrmtry %%DEMODIR%%/linux/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/linux/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/linux/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/linux/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/linux/.svn/tmp
+@dirrmtry %%DEMODIR%%/linux/.svn/text-base
+@dirrmtry %%DEMODIR%%/linux/.svn/props
+@dirrmtry %%DEMODIR%%/linux/.svn/prop-base
+@dirrmtry %%DEMODIR%%/linux/.svn
+@dirrmtry %%DEMODIR%%/linux
+@dirrmtry %%DEMODIR%%/graph/.svn/wcprops
+@dirrmtry %%DEMODIR%%/graph/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/graph/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/graph/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/graph/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/graph/.svn/tmp
+@dirrmtry %%DEMODIR%%/graph/.svn/text-base
+@dirrmtry %%DEMODIR%%/graph/.svn/props
+@dirrmtry %%DEMODIR%%/graph/.svn/prop-base
+@dirrmtry %%DEMODIR%%/graph/.svn
+@dirrmtry %%DEMODIR%%/graph
+@dirrmtry %%DEMODIR%%/freebsd/.svn/wcprops
+@dirrmtry %%DEMODIR%%/freebsd/.svn/tmp/wcprops
+@dirrmtry %%DEMODIR%%/freebsd/.svn/tmp/text-base
+@dirrmtry %%DEMODIR%%/freebsd/.svn/tmp/props
+@dirrmtry %%DEMODIR%%/freebsd/.svn/tmp/prop-base
+@dirrmtry %%DEMODIR%%/freebsd/.svn/tmp
+@dirrmtry %%DEMODIR%%/freebsd/.svn/text-base
+@dirrmtry %%DEMODIR%%/freebsd/.svn/props
+@dirrmtry %%DEMODIR%%/freebsd/.svn/prop-base
+@dirrmtry %%DEMODIR%%/freebsd/.svn
+@dirrmtry %%DEMODIR%%/freebsd
+@dirrmtry %%DEMODIR%%
+@dirrmtry share/doc/fpc-%%PORTVERSION%%
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 58338382bce5..37915eb89631 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -6,40 +6,52 @@
 #
 
 PORTNAME=	docs
-PORTVERSION=	1.0.10
+PORTVERSION=	2.0.2
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+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
 PKGNAMEPREFIX=	fpc-
-DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}.ELF
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}.${BUILDNAME}
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal compiler Adobe Acrobat(tm) documentation
 
-DOCSDIR=	${PREFIX}/share/doc/fpc
+ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
-PORTDOCS=	fcl.pdf fpdoc.pdf prog.pdf ref.pdf units.pdf user.pdf
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
+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}
-# unpack docs distribution
-	@${MKDIR} ${WRKSRC}/docs
-	@${TAR} zxf ${WRKSRC}/docs.tar.gz --directory ${WRKSRC}/docs
+	@${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:
-	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	@${INSTALL_MAN} ${WRKSRC}/docs/${f} ${DOCSDIR}
-.endfor
+	@cd ${WRKSRC}/${PORTNAME}/share && \
+		${FIND} * -type d -exec ${MKDIR} "{}" "${PREFIX}/share/{}" \; && \
+			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/{}" \;
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index fb00975ada0c..80f3f200b2ed 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
+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
diff --git a/lang/fpc-docs/files/pkg-message.in b/lang/fpc-docs/files/pkg-message.in
new file mode 100644
index 000000000000..df92838472ef
--- /dev/null
+++ b/lang/fpc-docs/files/pkg-message.in
@@ -0,0 +1,9 @@
+###############################################################################
+
+1) You can see all documentation of freepascal in :
+
+   * %%DOCSDIR%%
+
+   The documentation is on pdf format, you need some pdf viewer.
+
+###############################################################################
diff --git a/lang/fpc-docs/pkg-descr b/lang/fpc-docs/pkg-descr
index 6005c632f714..be9e08aa3ede 100644
--- a/lang/fpc-docs/pkg-descr
+++ b/lang/fpc-docs/pkg-descr
@@ -1,9 +1,6 @@
 This is the documentation, in Adobe Acrobat(tm) format, for Free
 Pascal, a 32 bit Turbo Pascal-compatible Pascal compiler for DOS,
 Linux, Win32, OS/2, (based on an older version) the AmigaOS,
-FreeBSD/ELF, and BeOS.
+FreeBSD, and BeOS.
 
 WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 317a3b28139a..0c7b8156142c 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -6,170 +6,99 @@
 #
 
 PORTNAME=	fpc
-PORTVERSION=	1.0.10
-PORTREVISION=	3
-CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+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
-DISTNAME=	${PORTNAME}-${PORTVERSION}.ELF
+DISTNAME=	${PORTNAME}-${PORTVERSION}.${BUILDNAME}
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Free Pascal compiler with Turbo, Delphi and other extensions
+MAINTAINER?=	acardenas@bsd.org.pe
+COMMENT?=	Free Pascal compiler with Turbo and Delphi
 
-.include <bsd.port.pre.mk>
-
-LIB_DEPENDS+=	gds.1:${PORTSDIR}/databases/firebird-client
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_MYSQL=	yes
-USE_GMAKE=	yes
+BUILDNAME=	i386-freebsd
 ONLY_FOR_ARCHS=	i386
-PKGDEINSTALL=	${PKGINSTALL}
+NO_BUILD=	yes
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		BUILDNAME=${BUILDNAME}
+SUB_FILES=	pkg-message
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+.include <bsd.port.pre.mk>
 
-MAN1=	delp.1 fpc.1 fpcmake.1 fpdoc.1 h2pas.1 plex.1 ppc386.1 ppdep.1 \
-	ppudump.1 ppufiles.1 ppumove.1 ptop.1 pyacc.1 rstconv.1
+.if !defined(PKGNAMESUFFIX)
+MAN1=	bin2obj.1 \
+	data2inc.1 \
+	delp.1 \
+	fd2pascal.1 \
+	fpc.1 \
+	fpcmake.1 \
+	fpdoc.1 \
+	fprcp.1 \
+	h2pas.1 \
+	h2paspp.1 \
+	makeskel.1 \
+	plex.1 \
+	postw32.1 \
+	ppc386.1 \
+	ppcarm.1 \
+	ppcppc.1 \
+	ppcsparc.1 \
+	ppcx64.1 \
+	ppdep.1 \
+	ppudump.1 \
+	ppufiles.1 \
+	ppumove.1 \
+	ptop.1 \
+	pyacc.1 \
+	rstconv.1 \
+	unitdiff.1
 MAN5=	fpc.cfg.5 fpcmake.5 ptop.cfg.5
 
-NO_LATEST_LINK=	yes
-
-# FreePascal is not self-bootstrapping.  Hence, the need for a working
-# pppc386.  Check for ppc386 in a manner similar to lang/gnat.
-#
-# Look in PREFIX
-.ifdef PREFIX
-have_boot!=	if [ -x ${PREFIX}/bin/ppc386 ]; then \
-			${ECHO_CMD} "${PREFIX}/bin"; \
-		else \
-			${ECHO_CMD} ""; \
-		fi
-.else
-have_boot=
-.endif
-
-# Then look in LOCALBASE
-.if empty(have_boot)
-have_boot!=	if [ -x ${LOCALBASE}/bin/ppc386 ]; then \
-			${ECHO_CMD} "${LOCALBASE}/bin"; \
-		else \
-			${ECHO_CMD} ""; \
-		fi
-.endif
-
-.if empty(have_boot)
-have_boot=	${WRKSRC}/boot/bin
 # only need misc/compat4x if using the pre-built ppc386
-.if ${OSVERSION} >= 500000
-LIB_DEPENDS+=	c.4:${PORTSDIR}/misc/compat4x
-.endif
+.if ${OSVERSION} >= 600000
+LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 .endif
 
-MAKE_ENV+=	PATH=${have_boot}:$$PATH \
-		FPC=${have_boot}/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
 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.tar --directory ${WRKSRC}/binary
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
+	@${TAR} xf ${WRKSRC}/binary.${BUILDNAME}.tar --directory ${WRKSRC}/binary
 # create a local binary ppc386
 	@${MKDIR} ${WRKSRC}/boot
-	@${TAR} zxf ${WRKSRC}/binary/basefreebsd.tar.gz \
+	@${TAR} zxf ${WRKSRC}/binary/base.${BUILDNAME}.tar.gz \
 		--directory ${WRKSRC}/boot
-	@${TAR} zxf ${WRKSRC}/binary/utilfreebsd.tar.gz \
+	@${TAR} zxf ${WRKSRC}/binary/utils.${BUILDNAME}.tar.gz \
 		--directory ${WRKSRC}/boot
-	@${LN} -sf ${WRKSRC}/boot/lib/fpc/${PORTVERSION}/ppc386 \
-		${WRKSRC}/boot/bin/ppc386
-# further extract base sources
-#
-# mandatory sources
-	@${TAR} zxf ${WRKSRC}/sources/basesrc.tar.gz \
-		--directory ${WRKSRC}
-	@${TAR} zxf ${WRKSRC}/sources/compilersrc.tar.gz \
-		--directory ${WRKSRC}
-	@${TAR} zxf ${WRKSRC}/sources/rtlsrc.tar.gz \
-		--directory ${WRKSRC}
-# dependencies of FCL
-	@${TAR} zxf ${WRKSRC}/sources/unitspaszlibsrc.tar.gz \
-		--directory ${WRKSRC}
-	@${TAR} zxf ${WRKSRC}/sources/unitsnetdbsrc.tar.gz \
-		--directory ${WRKSRC}
-	@${TAR} zxf ${WRKSRC}/sources/unitslibasyncsrc.tar.gz \
-		--directory ${WRKSRC}
-	@${TAR} zxf ${WRKSRC}/sources/unitsmysqlsrc.tar.gz \
-		--directory ${WRKSRC}
-	@${TAR} zxf ${WRKSRC}/sources/unitsibasesrc.tar.gz \
-		--directory ${WRKSRC}
-# FCL is required for some of the compiler utilities
-	@${TAR} zxf ${WRKSRC}/sources/fclsrc.tar.gz \
-		--directory ${WRKSRC}
-# compiler utilities
-	@${TAR} zxf ${WRKSRC}/sources/utilssrc.tar.gz \
-		--directory ${WRKSRC}
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src/fpc-${PORTVERSION} -name \
-		"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/rtl \
-		all
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/compiler \
-		all
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/libasync \
-		all
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/fcl \
-		all
-# kludge so that bin2obj finds ZSTREAM and builds
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION} && \
-		${CP} fcl/inc/zstream.pp utils
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/utils \
-		all
 
 do-install:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/rtl \
-		install
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/compiler \
-		install
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/libasync \
-		install
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/fcl \
-		install
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/utils \
-		install
-	@${MKDIR} ${PREFIX}/man/man1
-	cd ${WRKSRC}/boot/man/man1 && ${INSTALL_MAN} ${MAN1} \
-		${PREFIX}/man/man1
-	@${MKDIR} ${PREFIX}/man/man5
-	cd ${WRKSRC}/boot/man/man5 && ${INSTALL_MAN} ${MAN5} \
-		${PREFIX}/man/man5
+	# 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 manpages
+	${INSTALL_DATA} ${WRKSRC}/boot/man/man1/* ${MAN1PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/boot/man/man5/* ${MAN1PREFIX}/man/man5
 
 post-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
-		${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	if [ -e "${PREFIX}/bin/ppc386" ]; then ${RM} -f "${PREFIX}/bin/ppc386"; fi
+	${LN} -s "${PREFIX}/lib/fpc/${PORTVERSION}/ppc386" "${PREFIX}/bin"
+	${SH} "${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" "${PREFIX}/lib/fpc/${PORTVERSION}" "${PREFIX}/etc"
+	@${CAT} ${PKGMESSAGE}
 
+.else
+.include "${MASTERDIR}/Makefile.units"
+.endif
 .include <bsd.port.post.mk>
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
new file mode 100644
index 000000000000..2e44768f6e42
--- /dev/null
+++ b/lang/fpc/Makefile.units
@@ -0,0 +1,65 @@
+UNITPREFIX?=    		units-
+UNITEXTRACT_SUFX=	.tar.gz
+UNITNAME=		${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX}
+UNITDIR=		${LOCALBASE}/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
+
+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
+.endif
+	@${CAT} ${TMPPLIST}.FILES > ${TMPPLIST} && ${CAT} ${TMPPLIST}.DIRS >> ${TMPPLIST}
+
+security-check: fpc-check-install
+
+fpc-check-install:
+check-makevars::
+	@${ECHO_CMD} "*****************************************************************"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} " The following freepascal unit will be installed in your system: "
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} " * ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "*****************************************************************"
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index fb00975ada0c..80f3f200b2ed 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,3 +1,3 @@
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
+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
diff --git a/lang/fpc/files/patch-share::src::fpc-1.0.10::compiler::utils::samplecfg b/lang/fpc/files/patch-share::src::fpc-1.0.10::compiler::utils::samplecfg
deleted file mode 100644
index ce27939c844f..000000000000
--- a/lang/fpc/files/patch-share::src::fpc-1.0.10::compiler::utils::samplecfg
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/src/fpc-1.0.10/compiler/utils/samplecfg.old	Sun Jan  4 04:15:50 2004
-+++ share/src/fpc-1.0.10/compiler/utils/samplecfg	Sun Jan  4 04:17:59 2004
-@@ -38,7 +38,7 @@
- fi
- 
- # Find path to libgcc.a
--GCCSPEC=`(gcc -v 2>&1)| head -n 1| awk '{ print $4 } '`
-+GCCSPEC=`gcc -print-file-name=libgcc.a`
- GCCDIR=`dirname $GCCSPEC`
- echo Found libgcc.a in $GCCDIR
- 
diff --git a/lang/fpc/files/pkg-message.in b/lang/fpc/files/pkg-message.in
new file mode 100644
index 000000000000..af58d20d7b9e
--- /dev/null
+++ b/lang/fpc/files/pkg-message.in
@@ -0,0 +1,21 @@
+###############################################################################
+
+1) You can to install additional units from:
+
+   * lang/fpc-units
+
+2) If you want see all documentation about FreePascal, you can to install
+
+   * lang/fpc-docs
+
+3) Also you can to install all examples that you can test with FreePascal
+
+   * lang/fpc-demo
+
+4) Optionally, you can to install textmode IDE with delphi support 
+
+   * editors/fpc-ide
+
+5) Enjoy it ;)
+
+###############################################################################
diff --git a/lang/fpc/pkg-descr b/lang/fpc/pkg-descr
index 5eccdefeb2c2..d4820cba0798 100644
--- a/lang/fpc/pkg-descr
+++ b/lang/fpc/pkg-descr
@@ -1,8 +1,6 @@
 Originally named FPK-Pascal, the Free Pascal compiler is a 32 bit
 Turbo Pascal compatible Pascal compiler for DOS, Linux, Win32, OS/2,
-(based on an older version) the AmigaOS, FreeBSD/ELF, and BeOS.
+(based on an older version) the AmigaOS, FreeBSD/ELF, BeOS, Darwin(OSX)
+and others.
 
 WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/lang/fpc/pkg-install b/lang/fpc/pkg-install
deleted file mode 100644
index eef589442dc6..000000000000
--- a/lang/fpc/pkg-install
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-[ $# != 2 ] && exit 1
-PKGNAME=$1
-ACTION=$2
-
-FILES_DELETE="bin/ppc386 etc/fpc.cfg etc/fpc.cfg.orig"
-
-LIBDIR=${PKG_PREFIX}/lib/fpc/1.0.10
-
-CHMOD=/bin/chmod
-LN=/bin/ln
-RM=/bin/rm
-SH=/bin/sh
-
-case "$ACTION" in
-
-POST-INSTALL)
-		${CHMOD} 0555 ${LIBDIR}/ppc386
-		${CHMOD} 0555 ${LIBDIR}/samplecfg
-		${LN} -sf ${LIBDIR}/ppc386 ${PKG_PREFIX}/bin/ppc386
-		${SH} ${LIBDIR}/samplecfg ${LIBDIR} ${PKG_PREFIX}/etc
-	;;
-
-DEINSTALL)
-	for file in ${FILES_DELETE}
-	do
-		if [ -f ${PKG_PREFIX}/${file} ]; then
-			${RM} ${PKG_PREFIX}/${file}
-		fi
-	done
-	;;
-
-PRE-INSTALL|POST-DEINSTALL)
-	;;
-
-*)
-	exit 1
-	;;
-esac
-
-exit
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index 4f7b251a2c88..d7303590a102 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,14 +1,20 @@
+@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.5 2006-06-21 16:52:56 garga 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/mkxmlrpc
 bin/plex
 bin/postw32
 bin/ppdep
@@ -18,191 +24,215 @@ bin/ppumove
 bin/ptop
 bin/pyacc
 bin/rstconv
+bin/unitdiff
+bin/ppc386
+lib/fpc/%%PORTVERSION%%/msg/errorues.msg
 lib/fpc/%%PORTVERSION%%/msg/errord.msg
 lib/fpc/%%PORTVERSION%%/msg/errore.msg
 lib/fpc/%%PORTVERSION%%/msg/errores.msg
 lib/fpc/%%PORTVERSION%%/msg/errorf.msg
+lib/fpc/%%PORTVERSION%%/msg/errorhe.msg
 lib/fpc/%%PORTVERSION%%/msg/errorn.msg
 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/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%%/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.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/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.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.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/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/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/getopts.o
+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/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/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/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/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/libpgetopts.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/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/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/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/%%PORTVERSION%%/units/freebsd/fcl/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/base64.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/base64.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/cachecls.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/cachecls.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/cgiapp.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/cgiapp.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/classes.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/classes.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/contnrs.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/contnrs.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/custapp.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/custapp.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/db.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/db.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/dbf.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/dbf.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/ddg_ds.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/ddg_ds.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/ddg_rec.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/doc_text.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/doc_text.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/dom.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/dom.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/dom_html.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/dom_html.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/eventlog.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/eventlog.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/ezcgi.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/ezcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/fpasync.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/fpasync.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/gettext.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/gettext.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/htmldefs.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/htmldefs.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/htmwrite.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/htmwrite.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/http.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/http.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/httpsvlt.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/httpsvlt.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/idea.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/idea.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/inifiles.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/inifiles.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/interbase.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/interbase.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/iostream.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/iostream.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/mysqldb.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/mysqldb.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/pastree.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/pastree.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/paswrite.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/paswrite.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/pipes.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/pipes.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/pparser.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/pparser.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/process.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/process.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/pscanner.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/pscanner.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/registry.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/registry.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/resolve.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/resolve.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/rtfpars.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/rtfpars.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/sax.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/sax.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/sax_html.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/sax_html.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/servlets.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/servlets.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/sh_pas.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/sh_pas.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/sh_xml.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/sh_xml.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/shedit.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/shedit.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/ssockets.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/ssockets.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xhtml.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xhtml.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlcfg.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlcfg.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlread.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlread.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlreg.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlreg.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlrpc.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlrpc.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlstreaming.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlstreaming.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlwrite.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xmlwrite.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xpath.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/xpath.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/zstream.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/fcl/zstream.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/lexlib.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/lexlib.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/libasync/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/libasync/libasync.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/libasync/libasync.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/console.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/console.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/cprt0.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/cpu.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/cpu.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/crt.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/crt.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/dos.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/dos.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/errors.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/errors.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/getopts.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/getopts.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/gpm.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/gpm.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/gprt0.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/heaptrc.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/heaptrc.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/initc.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/ipc.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/ipc.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/keyboard.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/keyboard.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/lineinfo.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/lineinfo.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/linux.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/linux.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/math.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/math.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/mmx.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/mmx.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/mouse.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/mouse.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/objects.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/objects.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/objpas.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/objpas.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/printer.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/printer.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/prt0.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/serial.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/serial.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/sockets.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/sockets.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/strings.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/strings.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/sysbsd.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/sysbsd.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/sysutils.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/sysutils.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/terminfo.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/terminfo.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/typinfo.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/typinfo.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/video.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/rtl/video.ppu
-lib/fpc/%%PORTVERSION%%/units/freebsd/yacclib.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/yacclib.ppu
-lib/fpc/lexyacc/yylex.cod
 lib/fpc/lexyacc/yyparse.cod
-@dirrm lib/fpc/lexyacc
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/rtl
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/libasync
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/fcl
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd
-@dirrm lib/fpc/%%PORTVERSION%%/units
-@dirrm lib/fpc/%%PORTVERSION%%/msg
-@dirrm lib/fpc/%%PORTVERSION%%
-@dirrm lib/fpc
+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
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%/msg
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
diff --git a/security/fpc-hash/Makefile b/security/fpc-hash/Makefile
index b1ce4ff0e54a..70058bca6f35 100644
--- a/security/fpc-hash/Makefile
+++ b/security/fpc-hash/Makefile
@@ -5,41 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	md5
-PORTVERSION=	1.0.10
 CATEGORIES=	security lang
-MASTER_SITES=	http://www.borgsdemons.com/distfiles/
-PKGNAMEPREFIX=	fpc-
+PKGNAMESUFFIX=	-md5
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal unit for MD5 hash routines
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKDIR}/packages/base/md5 -name "Makefile*" | \
-		${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKDIR}/packages/base/md5 all
-
-do-install:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKDIR}/packages/base/md5 install
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/security/fpc-hash/distinfo b/security/fpc-hash/distinfo
deleted file mode 100644
index 3ba7742e5f57..000000000000
--- a/security/fpc-hash/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (md5-1.0.10.tar.gz) = 45a5474d459a8bc481749f276566f0e5
-SHA256 (md5-1.0.10.tar.gz) = 5390d970089adc554f58c74c5862fbae708b33fc4712ceb3a2550ab5da5b0d32
-SIZE (md5-1.0.10.tar.gz) = 10675
diff --git a/security/fpc-hash/pkg-descr b/security/fpc-hash/pkg-descr
deleted file mode 100644
index e1e2b8a7b5a9..000000000000
--- a/security/fpc-hash/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The md5 unit is part of the base packages for Free Pascal,
-a 32-bit Turbo Pascal/Delphi compatible compiler.  This unit
-provides MD5 hash routines.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/security/fpc-hash/pkg-plist b/security/fpc-hash/pkg-plist
deleted file mode 100644
index b37dc5e394e6..000000000000
--- a/security/fpc-hash/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/freebsd/md5/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/md5/md5.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/md5/md5.ppu
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/md5
diff --git a/security/fpc-md5/Makefile b/security/fpc-md5/Makefile
index b1ce4ff0e54a..70058bca6f35 100644
--- a/security/fpc-md5/Makefile
+++ b/security/fpc-md5/Makefile
@@ -5,41 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	md5
-PORTVERSION=	1.0.10
 CATEGORIES=	security lang
-MASTER_SITES=	http://www.borgsdemons.com/distfiles/
-PKGNAMEPREFIX=	fpc-
+PKGNAMESUFFIX=	-md5
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal unit for MD5 hash routines
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
+MASTERDIR=	${.CURDIR}/../../lang/fpc
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
-
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKDIR}/packages/base/md5 -name "Makefile*" | \
-		${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKDIR}/packages/base/md5 all
-
-do-install:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKDIR}/packages/base/md5 install
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/security/fpc-md5/distinfo b/security/fpc-md5/distinfo
deleted file mode 100644
index 3ba7742e5f57..000000000000
--- a/security/fpc-md5/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (md5-1.0.10.tar.gz) = 45a5474d459a8bc481749f276566f0e5
-SHA256 (md5-1.0.10.tar.gz) = 5390d970089adc554f58c74c5862fbae708b33fc4712ceb3a2550ab5da5b0d32
-SIZE (md5-1.0.10.tar.gz) = 10675
diff --git a/security/fpc-md5/pkg-descr b/security/fpc-md5/pkg-descr
deleted file mode 100644
index e1e2b8a7b5a9..000000000000
--- a/security/fpc-md5/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The md5 unit is part of the base packages for Free Pascal,
-a 32-bit Turbo Pascal/Delphi compatible compiler.  This unit
-provides MD5 hash routines.
-
-WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff --git a/security/fpc-md5/pkg-plist b/security/fpc-md5/pkg-plist
deleted file mode 100644
index b37dc5e394e6..000000000000
--- a/security/fpc-md5/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/freebsd/md5/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/md5/md5.o
-lib/fpc/%%PORTVERSION%%/units/freebsd/md5/md5.ppu
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/md5
author	Renato Botelho <garga@FreeBSD.org>	2006-06-21 16:52:57 +0000
committer	Renato Botelho <garga@FreeBSD.org>	2006-06-21 16:52:57 +0000
commit	b06153abd6cff3313971e58ae665e96b0bf447bf (patch)
tree	d671f1e410fe2766e67c77bc1573fd986720b550
parent	acca2dab6cf8bdfcdf61189c830d87fae34e8118 (diff)
download	ports-b06153abd6cff3313971e58ae665e96b0bf447bf.tar.gz ports-b06153abd6cff3313971e58ae665e96b0bf447bf.zip