- Update to 2.2.2

90 files changed, 443 insertions, 386 deletions

diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
index 68025b9edd9d..54e3a30a1d5c 100644
--- a/Mk/bsd.fpc.mk
+++ b/Mk/bsd.fpc.mk
@@ -30,7 +30,7 @@ _FPCMKINCLUDED=	yes
 FPC_Include_MAINTAINER=	acm@FreeBSD.org
 FPC_Pre_Include=	bsd.fpc.mk
 
-DEFAULT_FPC_VER=	2.2.0
+DEFAULT_FPC_VER=	2.2.2
 FPC_VER=		${DEFAULT_FPC_VER}
 
 .if exists(${LOCALBASE}/bin/fpc)
@@ -55,21 +55,21 @@ check-makevars::
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "#################################################################"
 
-_FPC_BASE_UNITS=gdbint graph ibase libasync hash httpd mysql netdb odbc oracle \
-		pasjpeg paszlib pthreads postgres regexpr sqlite
-
-_FPC_ALL_UNITS=${_FPC_BASE_UNITS} bfd cairo fcl-base fcl-db fcl-fpcunit fcl-image \
-		fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fftw fpmkunit \
-		forms fpgtk fv gconf gdbm ggi gnome gtk gtk2 imlib libcurl \
-		libgd libpng ncurses opengl openssl pcap svgalib syslog tcl \
-		unzip utmp x11 zlib zvt
+_FPC_ALL_UNITS=	aspell bfd cairo chm fcl-async fcl-base fcl-db fcl-fpcunit fcl-image \
+		fcl-json fcl-net fcl-passrc fcl-process fcl-registry fcl-web fcl-xml fftw \
+		fpmkunit fpgtk fv gdbint gdbm ggi gnome1 graph gtk1 gtk2 hash httpd13 \
+		httpd20 httpd22 ibase imagemagick imlib libcurl libgd libpng mysql ncurses \
+		odbc opengl openssl oracle pasjpeg paszlib pcap postgres pthreads pxlib \
+		regexpr sdl sqlite svgalib symbolic syslog tcl unzip users utmp x11 xforms \
+		zlib
 
 .if defined(WANT_FPC_BASE)
-.	if ${WANT_FPC_BASE:L} == "yes"
-USE_FPC=	${_FPC_BASE_UNITS}
-.	else
-IGNORE=	unknown value, please use "yes" instead of
-.	endif
+.       if ${WANT_FPC_BASE:L} == "yes"
+USE_FPC=	gdbint graph ibase hash httpd13 httpd20 httpd22 mysql odbc oracle \
+		pasjpeg paszlib	pthreads postgres regexpr sqlite
+.       else
+IGNORE= unknown value, please use "yes" instead of
+.       endif
 .endif
 
 .if defined(WANT_FPC_ALL)
@@ -91,11 +91,11 @@ IGNORE= cannot install: unknown FPC unit ${UNITS}
 gdbint_UNIT=	devel/fpc-gdbint
 graph_UNIT=	graphics/fpc-graph
 ibase_UNIT=	databases/fpc-ibase
-libasync_UNIT=	net/fpc-libasync
 hash_UNIT=	security/fpc-hash
-httpd_UNIT=	www/fpc-httpd
+httpd13_UNIT=	www/fpc-httpd13
+httpd20_UNIT=	www/fpc-httpd20
+httpd22_UNIT=	www/fpc-httpd22
 mysql_UNIT=	databases/fpc-mysql
-netdb_UNIT=	net/fpc-netdb
 odbc_UNIT=	databases/fpc-odbc
 oracle_UNIT=	databases/fpc-oracle
 pasjpeg_UNIT=	graphics/fpc-pasjpeg
@@ -106,50 +106,58 @@ regexpr_UNIT=	devel/fpc-regexpr
 sqlite_UNIT=	databases/fpc-sqlite
 
 # Extra units
+aspell_UNIT=	textproc/fpc-aspell
 bfd_UNIT=	devel/fpc-bfd
 cairo_UNIT=	graphics/fpc-cairo
+chm_UNIT=	misc/fpc-chm
+fcl_async_UNIT=	devel/fpc-fcl-async
 fcl_base_UNIT=	devel/fpc-fcl-base
 fcl_db_UNIT=	devel/fpc-fcl-db
 fcl_fpcunit_UNIT=	devel/fpc-fcl-fpcunit
 fcl_image_UNIT=	devel/fpc-fcl-image
+fcl_json_UNIT=	devel/fpc-fcl-json
 fcl_net_UNIT=	devel/fpc-fcl-net
 fcl_passrc_UNIT=	devel/fpc-fcl-passrc
+fcl_process_UNIT=	devel/fpc-fcl-process
 fcl_registry_UNIT=	devel/fpc-fcl-registry
 fcl_web_UNIT=	devel/fpc-fcl-web
 fcl_xml_UNIT=	devel/fpc-fcl-xml
 fftw_UNIT=	math/fpc-fftw
 fpmkunit_UNIT=	devel/fpc-fpmkunit
-forms_UNIT=	x11-toolkits/fpc-forms
 fpgtk_UNIT=	graphics/fpc-fpgtk
 fv_UNIT=	devel/fpc-fv
-gconf_UNIT=	devel/fpc-gconf
 gdbm_UNIT=	databases/fpc-gdbm
 ggi_UNIT=	graphics/fpc-ggi
-gnome_UNIT=	x11-toolkits/fpc-gnome
-gtk_UNIT=	x11-toolkits/fpc-gtk
+gnome1_UNIT=	x11-toolkits/fpc-gnome1
+gtk1_UNIT=	x11-toolkits/fpc-gtk1
 gtk2_UNIT=	x11-toolkits/fpc-gtk2
-httpd_UNIT=	www/fpc-httpd
+imagemagick_UNIT=	graphics/fpc-imagemagick
 imlib_UNIT=	graphics/fpc-imlib
 libcurl_UNIT=	ftp/fpc-libcurl
 libgd_UNIT=	graphics/fpc-libgd
 libpng_UNIT=	graphics/fpc-libpng
 ncurses_UNIT=	graphics/fpc-ncurses
+numlib_UNIT=	math/fpc-numlib
 opengl_UNIT=	graphics/fpc-opengl
 openssl_UNIT=	security/fpc-openssl
 pcap_UNIT=	net/fpc-pcap
+pxlib_UNIT=	databases/fpc-pxlib
+sdl_UNIT=	devel/fpc-sdl
 svgalib_UNIT=	graphics/fpc-svgalib
+symbolic_UNIT=	devel/fpc-symbolic
 syslog_UNIT=	sysutils/fpc-syslog
 tcl_UNIT=	lang/fpc-tcl
 unzip_UNIT=	archivers/fpc-unzip
+users_UNIT=	sysutils/fpc-users
 utmp_UNIT=	sysutils/fpc-utmp
 x11_UNIT=	x11/fpc-x11
+xforms_UNIT=	x11-toolkits/fpc-xforms
 zlib_UNIT=	devel/fpc-zlib
-zvt_UNIT=	x11-toolkits/fpc-zvt
 
 .	for UNITS in ${USE_FPC}
 .		if ${_FPC_ALL_UNITS:M${UNITS}}!=""
-BUILD_DEPENDS+=	${UNITSDIR}/${UNITS:S/httpd/httpd-1.3/}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
-RUN_DEPENDS+=	${UNITSDIR}/${UNITS:S/httpd/httpd-1.3/}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
+BUILD_DEPENDS+=	${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
+RUN_DEPENDS+=	${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
 security-check: fpc-check-install
 .		endif
 .	endfor
diff --git a/archivers/fpc-paszlib/Makefile b/archivers/fpc-paszlib/Makefile
index 30e01aa23343..da4d6c5c6268 100644
--- a/archivers/fpc-paszlib/Makefile
+++ b/archivers/fpc-paszlib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	archivers devel
 PKGNAMESUFFIX=	-paszlib
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal unit for native compression IO
 USE_FPC=	hash
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/archivers/fpc-paszlib/pkg-plist b/archivers/fpc-paszlib/pkg-plist
index 216f4bc18b57..397c1694a802 100644
--- a/archivers/fpc-paszlib/pkg-plist
+++ b/archivers/fpc-paszlib/pkg-plist
@@ -21,11 +21,16 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinffast.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinftrees.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfutil.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libppaszlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpunzip.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libptrees.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzbase.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzcompres.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzdeflate.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzinflate.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzip.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzipper.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpziputils.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzstream.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzuncompr.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.ppu
@@ -37,16 +42,22 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zip.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zip.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/unzip.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/unzip.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/ziputils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/ziputils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.ppu
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/paszlib/minigzip.pas
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/paszlib/example.pas
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/paszlib
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/archivers/fpc-unzip/Makefile b/archivers/fpc-unzip/Makefile
index 66b35c39bc7d..da02dab88bc2 100644
--- a/archivers/fpc-unzip/Makefile
+++ b/archivers/fpc-unzip/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	archivers lang
 PKGNAMESUFFIX=	-unzip
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal routines for unzipping zip files
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	UNZIP	"Install unzip tools"	on
diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
index 6013f13b4dfc..e651bc9d8dbc 100644
--- a/databases/fpc-gdbm/Makefile
+++ b/databases/fpc-gdbm/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-gdbm
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the GNU database system
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	GDBM	"Install the GNU database manager"	on
diff --git a/databases/fpc-gdbm/pkg-plist b/databases/fpc-gdbm/pkg-plist
index 19f58ca1c092..27a7e6aa452a 100644
--- a/databases/fpc-gdbm/pkg-plist
+++ b/databases/fpc-gdbm/pkg-plist
@@ -2,12 +2,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/libpgdbm.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gdbm/testgdbm2.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gdbm/testgdbm.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%/gdbm
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
index fd3a53e791d9..28d4eb85abe7 100644
--- a/databases/fpc-ibase/Makefile
+++ b/databases/fpc-ibase/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-ibase
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to interbase
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	IBASE	"Install Interbase/Firebird client"	on
diff --git a/databases/fpc-ibase/pkg-plist b/databases/fpc-ibase/pkg-plist
index 1d6378987e9a..4c5d87b14401 100644
--- a/databases/fpc-ibase/pkg-plist
+++ b/databases/fpc-ibase/pkg-plist
@@ -8,12 +8,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/libpibase40.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/libpibase60.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/libpibase60dyn.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ibase/testib60.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ibase/testib40.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/ibase
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
index 92677d8b23bd..434e05b80d3b 100644
--- a/databases/fpc-mysql/Makefile
+++ b/databases/fpc-mysql/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-mysql
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to MySQL
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	MYSQL	"Install MySQL client"	on
diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist
index b751df046339..9ff00c35307d 100644
--- a/databases/fpc-mysql/pkg-plist
+++ b/databases/fpc-mysql/pkg-plist
@@ -50,12 +50,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql41.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql41dyn.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql50.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql50dyn.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/mysql/testdb3.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/mysql/testdb4.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%/mysql
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
index 337434f9d54e..2bb30d108425 100644
--- a/databases/fpc-odbc/Makefile
+++ b/databases/fpc-odbc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-odbc
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to ODBC
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	ODBC	"Install ODBC library suite for Unix"	on
diff --git a/databases/fpc-odbc/pkg-plist b/databases/fpc-odbc/pkg-plist
index 3780e008d4ca..f71ce879f20f 100644
--- a/databases/fpc-odbc/pkg-plist
+++ b/databases/fpc-odbc/pkg-plist
@@ -5,11 +5,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/libpodbcsql.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/libpodbcsqldyn.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/odbc/testodbc.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/odbc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
index 00c3ae8daa36..9da736f8dc76 100644
--- a/databases/fpc-oracle/Makefile
+++ b/databases/fpc-oracle/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-oracle
 
@@ -15,7 +15,9 @@ COMMENT=	Free Pascal interface to Oracle
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	ORACLE	"Install oracle client"	on
+
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-oracle/pkg-plist b/databases/fpc-oracle/pkg-plist
index 184a2dda071e..4809715c00a6 100644
--- a/databases/fpc-oracle/pkg-plist
+++ b/databases/fpc-oracle/pkg-plist
@@ -11,14 +11,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oratypes.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oratypes.ppu
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/oracle/test01.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/oracle/oraclew.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/oracle/Makefile.fpc
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/oracle/Makefile
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/oracle
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
index 31bda127609c..b72b5dabbcdb 100644
--- a/databases/fpc-postgres/Makefile
+++ b/databases/fpc-postgres/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-postgres
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to PostGreSQL
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	PGSQL	"Install PostgreSQL client"	on
diff --git a/databases/fpc-postgres/pkg-plist b/databases/fpc-postgres/pkg-plist
index 1cc768cba64d..018094796a0c 100644
--- a/databases/fpc-postgres/pkg-plist
+++ b/databases/fpc-postgres/pkg-plist
@@ -14,12 +14,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libpdllistdyn.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libppostgres.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libppostgres3.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libppostgres3dyn.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/postgres/testpg2.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/postgres/testpg1.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/postgres
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
index 9b3e243a93b9..02b0fe88be6d 100644
--- a/databases/fpc-sqlite/Makefile
+++ b/databases/fpc-sqlite/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-sqlite
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to SQLite
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	SQLITE	"Install SQLite database engine"	on
diff --git a/databases/fpc-sqlite/pkg-plist b/databases/fpc-sqlite/pkg-plist
index 8d89c0debe55..7078bc4ca113 100644
--- a/databases/fpc-sqlite/pkg-plist
+++ b/databases/fpc-sqlite/pkg-plist
@@ -2,6 +2,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3db.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3dyn.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlitedb.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.ppu
@@ -9,6 +10,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3db.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3db.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.ppu
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite
diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile
index 0d3649bd108d..5fee81eaf3d9 100644
--- a/devel/fpc-bfd/Makefile
+++ b/devel/fpc-bfd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-bfd
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface for the GNU Binary Format description
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	LIBBFD	"Install Universal BFD library from GNU binutils"	on
diff --git a/devel/fpc-fcl-base/Makefile b/devel/fpc-fcl-base/Makefile
index c79b6a27d90a..c4f02b29b664 100644
--- a/devel/fpc-fcl-base/Makefile
+++ b/devel/fpc-fcl-base/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-base
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Component Library
 
-USE_FPC=	libasync hash netdb paszlib pthreads
+USE_FPC=	hash paszlib pthreads
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-base/pkg-plist b/devel/fpc-fcl-base/pkg-plist
index 3fc450b89624..12058870d724 100644
--- a/devel/fpc-fcl-base/pkg-plist
+++ b/devel/fpc-fcl-base/pkg-plist
@@ -1,56 +1,44 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ezcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pipes.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rtfpars.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/idea.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/gettext.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/zstream.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/avl_tree.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cgiapp.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wformat.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/whtml.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wtex.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ezcgi.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/zipper.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/process.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ssockets.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/resolve.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpasync.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/simpleipc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/dbugmsg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/dbugintf.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/daemonapp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pipes.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rtfpars.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/idea.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/gettext.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/zstream.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/avl_tree.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cgiapp.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wformat.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/whtml.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wtex.o
@@ -58,36 +46,27 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/zipper.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/process.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ssockets.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/resolve.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpasync.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/simpleipc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/dbugmsg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/dbugintf.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/daemonapp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcontnrs.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpinifiles.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpezcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libppipes.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libprtfpars.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpidea.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpbase64.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpgettext.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpiostream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpzstream.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcachecls.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpavl_tree.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpuriparser.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpeventlog.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcustapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcgiapp.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwformat.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwhtml.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwtex.a
@@ -95,21 +74,15 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libprttiutils.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpbufstream.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamex.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpblowfish.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpzipper.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamio.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpinicol.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libppooledmm.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libplibtar.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamcoll.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpprocess.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpssockets.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpresolve.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfpasync.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpmaskutils.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpsyncobjs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpsimpleipc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpdbugmsg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpdbugintf.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpdaemonapp.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptimer.a
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile
index 68bcc33b6d7b..079a4c6702db 100644
--- a/devel/fpc-fcl-db/Makefile
+++ b/devel/fpc-fcl-db/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-db
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Component Library
 
-USE_FPC=	fcl-base hash ibase mysql netdb odbc oracle paszlib postgres pthreads \
-		libasync sqlite
+USE_FPC=	fcl-async fcl-base hash ibase mysql odbc oracle paszlib postgres \
+		pthreads pxlib sqlite
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile b/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile
new file mode 100644
index 000000000000..ddfd7f2ab5df
--- /dev/null
+++ b/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile
@@ -0,0 +1,28 @@
+--- packages/fcl-db/Makefile	2009-01-07 21:56:28.000000000 -0500
++++ packages/fcl-db/Makefile	2009-01-07 22:18:51.000000000 -0500
+@@ -2203,17 +2203,17 @@
+ endif
+ 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
+ endif
+-ifdef INSTALL_CREATEPACKAGEFPC
+-ifdef FPCMAKE
+-ifdef PACKAGE_VERSION
+-ifneq ($(wildcard Makefile.fpc),)
++#ifdef INSTALL_CREATEPACKAGEFPC
++#ifdef FPCMAKE
++#ifdef PACKAGE_VERSION
++#ifneq ($(wildcard Makefile.fpc),)
+ 	$(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
+ 	$(MKDIR) $(INSTALL_UNITDIR)
+ 	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
+-endif
+-endif
+-endif
+-endif
++#endif
++#endif
++#endif
++#endif
+ ifdef INSTALLPPUFILES
+ 	$(MKDIR) $(INSTALL_UNITDIR)
+ 	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
diff --git a/devel/fpc-fcl-db/pkg-plist b/devel/fpc-fcl-db/pkg-plist
index d53594fb355a..4a87fa91befe 100644
--- a/devel/fpc-fcl-db/pkg-plist
+++ b/devel/fpc-fcl-db/pkg-plist
@@ -1,19 +1,4 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbconst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbwhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset_parser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsdfdata.a
@@ -40,48 +25,69 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql40conn.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql41conn.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql50conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql4conn.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpodbcconn.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libporacleconnection.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3conn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbconst.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdb.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbwhtml.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset_parser.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbcoll.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_wtil.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_collate.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_common.a
@@ -107,6 +113,90 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3ds.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpcustomsqliteds.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqliteds.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3ds.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpparadox.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbexport.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcsvexport.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpfixedexport.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlexport.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplexmlexport.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplejsonexport.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbfexport.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfptexexport.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfprtfexport.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpstdexports.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdatadict.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddbf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqldb.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddfb.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql40.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql41.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql50.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddodbc.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpq.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddoracle.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqlite3.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddregstd.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddcodegen.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgcreatedbf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgdbcoll.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgsqlconst.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgtiopf.a
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
diff --git a/devel/fpc-fcl-fpcunit/Makefile b/devel/fpc-fcl-fpcunit/Makefile
index e4c4da4f20d3..467a4cc0abbe 100644
--- a/devel/fpc-fcl-fpcunit/Makefile
+++ b/devel/fpc-fcl-fpcunit/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-fpcunit
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Component Library
 
-USE_FPC=	fcl-base fcl-xml hash libasync netdb paszlib pthreads
+USE_FPC=	fcl-async fcl-base fcl-xml hash paszlib pthreads
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-fpcunit/pkg-plist b/devel/fpc-fcl-fpcunit/pkg-plist
index 98dd69bd8362..69dcdce9a1ba 100644
--- a/devel/fpc-fcl-fpcunit/pkg-plist
+++ b/devel/fpc-fcl-fpcunit/pkg-plist
@@ -1,4 +1,5 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/digesttestreport.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testregistry.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testreport.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.ppu
@@ -10,6 +11,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmltestreport.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/plaintestreport.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/digesttestreport.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testregistry.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testreport.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.o
@@ -21,6 +23,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmltestreport.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/plaintestreport.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpdigesttestreport.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestregistry.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestreport.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestdecorator.a
diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile
index ed7ab28963fb..bbe89fb1909e 100644
--- a/devel/fpc-fcl-image/Makefile
+++ b/devel/fpc-fcl-image/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-image
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Component Library
 
-USE_FPC=	fcl-base hash netdb pasjpeg paszlib pthreads libasync libpng
+USE_FPC=	fcl-async fcl-base hash pasjpeg paszlib pthreads libpng
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-image/pkg-plist b/devel/fpc-fcl-image/pkg-plist
index 7eaa79ead277..5058c4219d82 100644
--- a/devel/fpc-fcl-image/pkg-plist
+++ b/devel/fpc-fcl-image/pkg-plist
@@ -1,4 +1,10 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepcx.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppcxcomn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpcx.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritepcx.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.ppu
@@ -30,6 +36,9 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepcx.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.o
diff --git a/devel/fpc-fcl-net/Makefile b/devel/fpc-fcl-net/Makefile
index 588f9f3bb389..d13a0c6b7380 100644
--- a/devel/fpc-fcl-net/Makefile
+++ b/devel/fpc-fcl-net/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-net
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Component Library
 
-USE_FPC=	fcl-base fcl-xml fcl-passrc hash libasync netdb paszlib pthreads
+USE_FPC=	fcl-async fcl-base fcl-xml fcl-passrc hash paszlib pthreads
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-net/pkg-plist b/devel/fpc-fcl-net/pkg-plist
index 0ae11a76cefe..a4e320d6f052 100644
--- a/devel/fpc-fcl-net/pkg-plist
+++ b/devel/fpc-fcl-net/pkg-plist
@@ -1,17 +1,26 @@
 bin/mkxmlrpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/servlets.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpbase.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpclient.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpsvlt.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/xmlrpc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/servlets.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpbase.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpclient.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpsvlt.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/xmlrpc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpnetdb.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpresolve.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpssockets.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpservlets.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpfpsock.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libphttpbase.a
diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile
index db48ca88163b..7cd2d190ac6a 100644
--- a/devel/fpc-fcl-passrc/Makefile
+++ b/devel/fpc-fcl-passrc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-passrc
 
diff --git a/devel/fpc-fcl-registry/Makefile b/devel/fpc-fcl-registry/Makefile
index 9afad6d8685b..0f6d75932d72 100644
--- a/devel/fpc-fcl-registry/Makefile
+++ b/devel/fpc-fcl-registry/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-registry
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Component Library
 
-USE_FPC=	fcl-base fcl-xml hash libasync netdb paszlib pthreads
+USE_FPC=	fcl-async fcl-base fcl-xml hash paszlib pthreads
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile
index 2e585b6ce08d..42bc9bb85dd6 100644
--- a/devel/fpc-fcl-web/Makefile
+++ b/devel/fpc-fcl-web/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-web
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Component Library
 
-USE_FPC=	fcl-base fcl-xml fcl-db hash ibase libasync mysql netdb odbc oracle \
-		paszlib postgres pthreads sqlite
+USE_FPC=	fcl-async fcl-base fcl-db fcl-process fcl-xml hash ibase mysql odbc \
+		oracle paszlib postgres pthreads sqlite
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-web/pkg-plist b/devel/fpc-fcl-web/pkg-plist
index 62fd9baeec12..d52ea51a6cb3 100644
--- a/devel/fpc-fcl-web/pkg-plist
+++ b/devel/fpc-fcl-web/pkg-plist
@@ -1,4 +1,6 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.ppu
@@ -9,6 +11,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.o
@@ -19,6 +23,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcgiapp.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpezcgi.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libphttpdefs.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpcgi.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttp.a
diff --git a/devel/fpc-fcl-xml/Makefile b/devel/fpc-fcl-xml/Makefile
index 7bc5a0963583..eedbe1a8e9b6 100644
--- a/devel/fpc-fcl-xml/Makefile
+++ b/devel/fpc-fcl-xml/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-xml
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Component Library
 
-USE_FPC=	fcl-base hash libasync netdb paszlib pthreads
+USE_FPC=	fcl-async fcl-base hash paszlib pthreads
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-xml/pkg-plist b/devel/fpc-fcl-xml/pkg-plist
index f93f21ffb1d4..59c9e5d26467 100644
--- a/devel/fpc-fcl-xml/pkg-plist
+++ b/devel/fpc-fcl-xml/pkg-plist
@@ -1,4 +1,5 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_xml.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmldefs.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlutils.ppu
@@ -16,6 +17,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlelements.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmldefs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_xml.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlutils.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.o
@@ -31,6 +33,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xpath.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlelements.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax_xml.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmldefs.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlutils.a
diff --git a/devel/fpc-fpmkunit/Makefile b/devel/fpc-fpmkunit/Makefile
index a76ff1b0aa75..d7354bcec056 100644
--- a/devel/fpc-fpmkunit/Makefile
+++ b/devel/fpc-fpmkunit/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fpmkunit
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal build system unit
 
-USE_FPC=	yes
+USE_FPC=	fcl-process paszlib
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fv/Makefile b/devel/fpc-fv/Makefile
index 9284799e8b33..653b04815dfe 100644
--- a/devel/fpc-fv/Makefile
+++ b/devel/fpc-fv/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fv
 
@@ -15,7 +15,7 @@ COMMENT=	FreeVision is a Free Pascal unit for Delphi support
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fv/pkg-plist b/devel/fpc-fv/pkg-plist
index 7f1ddaf6df73..e142b0736c80 100644
--- a/devel/fpc-fv/pkg-plist
+++ b/devel/fpc-fv/pkg-plist
@@ -12,6 +12,7 @@ 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/outline.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
@@ -34,6 +35,7 @@ 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/outline.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
@@ -56,6 +58,7 @@ 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/libpoutline.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
diff --git a/devel/fpc-gdbint/Makefile b/devel/fpc-gdbint/Makefile
index 1ed0f18af876..62eb0986dd59 100644
--- a/devel/fpc-gdbint/Makefile
+++ b/devel/fpc-gdbint/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-gdbint
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal unit providing interface to gdb
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-gdbint/pkg-plist b/devel/fpc-gdbint/pkg-plist
index 76009cd42029..5d6e48dfce1c 100644
--- a/devel/fpc-gdbint/pkg-plist
+++ b/devel/fpc-gdbint/pkg-plist
@@ -4,12 +4,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbcon.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbint.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbcon.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/libpgdbcon.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gdbint/symify.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gdbint/testgdb.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gdbint
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/devel/fpc-pthreads/Makefile b/devel/fpc-pthreads/Makefile
index aa3670f82b6a..9e9fba00615a 100644
--- a/devel/fpc-pthreads/Makefile
+++ b/devel/fpc-pthreads/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-pthreads
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal wraper for the pthreads library
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-regexpr/Makefile b/devel/fpc-regexpr/Makefile
index 495c2fc82634..4466f6abce0b 100644
--- a/devel/fpc-regexpr/Makefile
+++ b/devel/fpc-regexpr/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-regexpr
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal regular expression routines
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-regexpr/pkg-plist b/devel/fpc-regexpr/pkg-plist
index d5174791bf6b..2d7fc5abc912 100644
--- a/devel/fpc-regexpr/pkg-plist
+++ b/devel/fpc-regexpr/pkg-plist
@@ -1,12 +1,12 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpregex.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpregexpr.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/regexpr/testreg1.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/regexpr
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/devel/fpc-zlib/Makefile b/devel/fpc-zlib/Makefile
index b015378b3ebc..1ea4defa2a5c 100644
--- a/devel/fpc-zlib/Makefile
+++ b/devel/fpc-zlib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-zlib
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the zlib compression library
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile
index 25a34e42979d..f29e720897fb 100644
--- a/editors/fpc-ide/Makefile
+++ b/editors/fpc-ide/Makefile
@@ -5,19 +5,19 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	editors lang
 PKGNAMESUFFIX=	-ide
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal integrated IDE/compiler
 
-USE_FPC=	gdbint graph ibase libasync hash mysql netdb odbc oracle pasjpeg \
+USE_FPC=	fcl-async gdbint graph ibase hash mysql odbc oracle pasjpeg \
 		paszlib pthreads postgres regexpr sqlite fcl-base fv
 
 UNITPREFIX=	# none
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/fv
+EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/fv
 
 .include "${MASTERDIR}/Makefile"
diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile
index c77d94b0a96b..b2a2d8841086 100644
--- a/ftp/fpc-libcurl/Makefile
+++ b/ftp/fpc-libcurl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	ftp lang
 PKGNAMESUFFIX=	-libcurl
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to libcurl
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	LIBCURL	"Install curl tools and library "	on
diff --git a/ftp/fpc-libcurl/pkg-plist b/ftp/fpc-libcurl/pkg-plist
index 6f5e839c423c..ddcbc316d911 100644
--- a/ftp/fpc-libcurl/pkg-plist
+++ b/ftp/fpc-libcurl/pkg-plist
@@ -2,12 +2,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libcurl.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libcurl.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libplibcurl.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/libcurl/teststream.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/libcurl/testcurl.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/libcurl
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile
index 84ab6270eece..ac619e63dbf9 100644
--- a/graphics/fpc-cairo/Makefile
+++ b/graphics/fpc-cairo/Makefile
@@ -5,18 +5,18 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-cairo
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to cairo library
 
-USE_FPC=	fcl-base fcl-image hash libasync netdb pasjpeg paszlib pthreads \
+USE_FPC=	fcl-async fcl-base fcl-image hash pasjpeg paszlib pthreads \
 		x11
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	LIBCAIRO	"Install cairo vector graphics library"	on
diff --git a/graphics/fpc-cairo/pkg-plist b/graphics/fpc-cairo/pkg-plist
index 763df47d60c7..2ae12f1df7bb 100644
--- a/graphics/fpc-cairo/pkg-plist
+++ b/graphics/fpc-cairo/pkg-plist
@@ -1,7 +1,13 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairo.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoft.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoft.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoxlib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoxlib.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/libpcairo.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/libpcairoft.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/libpcairoxlib.a
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
diff --git a/graphics/fpc-fpgtk/Makefile b/graphics/fpc-fpgtk/Makefile
index 11c179efe0f7..dbdabfde9ee9 100644
--- a/graphics/fpc-fpgtk/Makefile
+++ b/graphics/fpc-fpgtk/Makefile
@@ -5,18 +5,17 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-fpgtk
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Component Library for create programs with gtk
 
-USE_FPC=	fcl-base gdbint graph ibase libasync hash mysql netdb odbc oracle \
-		pasjpeg paszlib pthreads regexpr sqlite gtk x11 opengl
+USE_FPC=	fcl-base gtk1 x11 opengl
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	GTK1	"Gimp Toolkit for X11 GUI (version 1.x)"	on
diff --git a/graphics/fpc-ggi/Makefile b/graphics/fpc-ggi/Makefile
index d91dd9c1f68c..ae30c25a6ece 100644
--- a/graphics/fpc-ggi/Makefile
+++ b/graphics/fpc-ggi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-ggi
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to libggi
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	LIBGGI	"Install ggi library"	on
diff --git a/graphics/fpc-ggi/pkg-plist b/graphics/fpc-ggi/pkg-plist
index a3801c6d7f97..239f0a943841 100644
--- a/graphics/fpc-ggi/pkg-plist
+++ b/graphics/fpc-ggi/pkg-plist
@@ -8,11 +8,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ggi/ggi2d.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ggi/libpgii.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ggi/libpggi.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ggi/libpggi2d.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ggi/ggi1.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ggi
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%/ggi
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/graphics/fpc-graph/Makefile b/graphics/fpc-graph/Makefile
index 7e6b1fd389fa..a663a7cf6436 100644
--- a/graphics/fpc-graph/Makefile
+++ b/graphics/fpc-graph/Makefile
@@ -5,17 +5,17 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-graph
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to graphical applications
 
-USE_FPC=	yes
+USE_FPC=	x11 sdl pthreads
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-graph/pkg-plist b/graphics/fpc-graph/pkg-plist
index 28dbe19bf84f..326a9f03468a 100644
--- a/graphics/fpc-graph/pkg-plist
+++ b/graphics/fpc-graph/pkg-plist
@@ -1,10 +1,13 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpgraph.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpggigraph.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpsdlgraph.a
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
diff --git a/graphics/fpc-imlib/Makefile b/graphics/fpc-imlib/Makefile
index 24389e1f3509..48f243618505 100644
--- a/graphics/fpc-imlib/Makefile
+++ b/graphics/fpc-imlib/Makefile
@@ -5,17 +5,17 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imlib
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to imlib library
 
-USE_FPC=	gtk x11 opengl
+USE_FPC=	gtk1 x11 opengl
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	IMLIB	"Install imlib graphic library"	on
diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile
index 4f961da02f79..e930cb3a1c42 100644
--- a/graphics/fpc-libgd/Makefile
+++ b/graphics/fpc-libgd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-libgd
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to libgd for producing graphics files
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	LIBGD	"Install gd graphic library"	on
diff --git a/graphics/fpc-libgd/pkg-plist b/graphics/fpc-libgd/pkg-plist
index 2a92cfbfbb44..88f6488a9208 100644
--- a/graphics/fpc-libgd/pkg-plist
+++ b/graphics/fpc-libgd/pkg-plist
@@ -2,11 +2,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/gd.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/gd.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/libpgd.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/libgd/gdtest.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/libgd
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile
index cb0e6fae4c5e..b9b2f7a8e4b8 100644
--- a/graphics/fpc-libpng/Makefile
+++ b/graphics/fpc-libpng/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-libpng
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to libpng, for reading PNG image files
 USE_FPC=	zlib
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	LIBPNG	"Install png library for manipulating PNG images"	on
diff --git a/graphics/fpc-ncurses/Makefile b/graphics/fpc-ncurses/Makefile
index a29febdeb37e..7472496ba21c 100644
--- a/graphics/fpc-ncurses/Makefile
+++ b/graphics/fpc-ncurses/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-ncurses
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the ncurses library
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-ncurses/pkg-plist b/graphics/fpc-ncurses/pkg-plist
index de6d4a75a06f..05b915e0e167 100644
--- a/graphics/fpc-ncurses/pkg-plist
+++ b/graphics/fpc-ncurses/pkg-plist
@@ -1,29 +1,24 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/form.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncrt.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ocrt.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/menu.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/form.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncrt.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ocrt.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/menu.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpform.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpncurses.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libppanel.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpncrt.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpocrt.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpmenu.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ncurses/screen_demo.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ncurses/db_demo.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ncurses/edit_demo.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ncurses/ocrt_demo.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ncurses/testn.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ncurses/firework.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/ncurses
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index e72779cd5f47..ee2b81495ef9 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-opengl
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the OpenGL library
 USE_FPC=	x11
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	OPENGL	"Install opengl libraries"	on
diff --git a/graphics/fpc-pasjpeg/Makefile b/graphics/fpc-pasjpeg/Makefile
index 4ea5dc872eed..3e08332b98d0 100644
--- a/graphics/fpc-pasjpeg/Makefile
+++ b/graphics/fpc-pasjpeg/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-pasjpeg
 
@@ -15,7 +15,7 @@ COMMENT=	Handling JPEG files with Pascal
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-pasjpeg/pkg-plist b/graphics/fpc-pasjpeg/pkg-plist
index 02cfdf8fdb79..34865a7724d0 100644
--- a/graphics/fpc-pasjpeg/pkg-plist
+++ b/graphics/fpc-pasjpeg/pkg-plist
@@ -149,15 +149,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjpeglib.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjquant1.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjquant2.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjutils.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/pasjpeg/rdjpgcom.pas
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/pasjpeg/jpegtran.pas
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/pasjpeg/djpeg.pas
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/pasjpeg/demo.pas
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/pasjpeg/cjpeg.pas
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/pasjpeg
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile
index 9adc819324c4..b3bb8728ed59 100644
--- a/graphics/fpc-svgalib/Makefile
+++ b/graphics/fpc-svgalib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-svgalib
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the SVGA graphics library
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	SVGA	"Install svgalib low level console graphics library"	on
diff --git a/graphics/fpc-svgalib/pkg-plist b/graphics/fpc-svgalib/pkg-plist
index 00462184f90b..0471c9032367 100644
--- a/graphics/fpc-svgalib/pkg-plist
+++ b/graphics/fpc-svgalib/pkg-plist
@@ -5,12 +5,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/svgalib.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/vgamouse.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/libpsvgalib.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/libpvgamouse.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/svgalib/vgatest.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/svgalib/testvga.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%/svgalib
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index deede9691138..2a6aad2c6d7b 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	base
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	2.2.2
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	fpc-
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 419f87234cf3..e5c15ef5a00b 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	docs
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/docs-${PORTVERSION}/ \
 		ftp://planetmirror.com/pub/fpc/dist/docs-${PORTVERSION}/ \
diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile
index d27703351f85..aad6e3417140 100644
--- a/lang/fpc-tcl/Makefile
+++ b/lang/fpc-tcl/Makefile
@@ -5,18 +5,17 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-tcl
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the tcl/tk interpreter
 
-USE_FPC=	fcl-base gdbint graph ibase libasync hash mysql netdb odbc \
-		oracle pasjpeg paszlib pthreads postgres regexpr sqlite
+USE_FPC=	fcl-base
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	TCL	"Install tool commnad language"	on
diff --git a/lang/fpc-tcl/pkg-plist b/lang/fpc-tcl/pkg-plist
index 554df91651a9..3bf3629af31a 100644
--- a/lang/fpc-tcl/pkg-plist
+++ b/lang/fpc-tcl/pkg-plist
@@ -2,11 +2,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/tcl80.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/tcl80.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/libptcl80.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/tcl/tcl_demo.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/tcl
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index fea5d07cd793..aa14e86eed44 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	units
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	2.2.2
 CATEGORIES=	lang
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	fpc-
@@ -22,45 +21,53 @@ NO_BUILD=	yes
 
 BUILDNAME=	${ARCH}-freebsd
 
-OPTIONS=	BFD	"Interface to GNU Binary Format description"	on \
+OPTIONS=	ASPELL "Interface to aspell spelling checker"	on \
+		BFD	"Interface to GNU Binary Format description"	on \
 		CAIRO	"Interface to cairo library" on \
+		CHM	"Free Pbscal unit to manipulate chm files" on \
+		FCL_ASYNC "Free Pascal interface to async library" on \
 		FCL_BASE	"Free Pascal Component Library (base)"	on \
 		FCL_DB	"Free Pascal Component Library (db)"	on \
 		FCL_FPCUNIT	"Free Pascal Component Library (fpcunit)"	on \
 		FCL_IMAGE	"Free Pascal Component Library (image)"	on \
+		FCL_JSON	"Free Pascal implementation of JSON"	on \
 		FCL_NET	"Free Pascal Component Library (net)"	on \
 		FCL_PASSRC	"Free Pascal Component Library (passrc)"	on \
+		FCL_PROCESS	"Free Pascal unit to start and manipulate other programs"	on \
 		FCL_REGISTRY	"Free Pascal Component Library (registry)"	on \
 		FCL_WEB	"Free Pascal Component Library (web)"	on \
 		FCL_XML	"Free Pascal Component Library (xml)"	on \
 		FFTW	"Interface to the FFTW3 library" on \
 		FPMKUNIT "Free Pascal build system unit" on \
-		FORMS	"Interface to X-Forms"	on \
 		FPGTK	"Interface to create programs with gtk"	on \
 		FV	"Free Pascal unit for Delphi support" on \
-		GCONF	"Interface to GConf" on \
 		GDBM	"Interface to the GNU database system"	on \
 		GGI	"Interface to libggi library"	on \
 		GNOME	"Free Pascal unit to create programs for GNOME" on \
 		GTK	"Interface to gtk libraries"	on \
 		GTK2	"Interface to gtk2 libraries"	on \
-		HTTPD	"Free Pascal httpd unit" on \
+		IMAGEMAGICK	"Free Pascal interface to ImageMagick"	on \
 		IMLIB	"Interface to imlib library"	on \
 		LIBCURL	"Interface to curl library"	on \
 		LIBGD	"Interface to gd library"	on \
 		LIBPNG	"Interface to png library"	on \
 		NCURSES	"Interface to ncurses library"	on \
+		NUMLIB	"Free Pascal unit for numerical methods"	on \
 		OPENGL	"Interface to opengl library"	on \
 		OPENSSL	"Interface to openssl library"	on \
 		PCAP	"Interface to pcap library"	on \
+		PXLIB	"Free Pascal unit to read various Paradox file"	on \
+		SDL	"Free Pascal interface to SDL library"	on \
 		SVGALIB	"Interface to svgalib library"	on \
+		SYMBOLIC	"FreePascal unit to simple expression parsing and evaluating"	on \
 		SYSLOG	"Interface to system logger"	on \
 		TCL	"Interface to tcl/tk interpreter"	on \
 		UNZIP	"Routines for unzipping zip files"	on \
+		USERS	"Free Pascal interfaces to manipulate users"	on \
 		UTMP	"Interface to gather information from the utmp file"	on \
 		X11	"Interface to X windows server"	on \
+		XFORMS	"Interface to X-Forms"	on \
 		ZLIB	"Interface to the zlib compression library"	on \
-		ZVT	"Interface to Zed's Virtual Terminal"	on
 
 PORT_DBDIR?=	/var/db/ports
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
@@ -70,10 +77,11 @@ OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
 .include "${OPTIONSFILE}"
 .endif
 
-ALL_OPTIONS=	BFD CAIRO FCL-BASE FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-NET FCL-PASSRC \
-		FCL-REGISTRY FCL-WEB FCL-XML FFTW FPMKUNIT FORMS FPGTK FV GCONF GDBM \
-		GGI GNOME GTK GTK2 HTTPD IMLIB LIBCURL LIBGD LIBPNG NCURSES OPENGL \
-		OPENSSL PCAP SVGALIB SYSLOG TCL UNZIP UTMP X11 ZLIB ZVT
+ALL_OPTIONS=	ASPELL BFD CAIRO CHM FCL-ASYNC FCL-BASE FCL-DB FCL-FPCUNIT FCL-IMAGE \
+		FCL-JSON FCL-NET FCL-PASSRC FCL-PROCESS FCL-REGISTRY FCL-WEB FCL-XML \
+		FFTW FPMKUNIT FPGTK FV GDBM GGI GNOME GTK GTK2 IMAGEMAGICK IMLIB LIBCURL \
+		LIBGD LIBPNG NCURSES NUMLIB OPENGL OPENSSL PCAP PXLIB SDL SVGALIB SYMBOLIC \
+		SYSLOG TCL UNZIP USERS UTMP X11 XFORMS ZLIB
 
 UNITS_SELECTED=		#
 .for OPT in ${ALL_OPTIONS}
diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile
index f7147516b94a..155ac9bc997b 100644
--- a/lang/fpc-utils/Makefile
+++ b/lang/fpc-utils/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-utils
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Compiler utils
 
-USE_FPC=	fcl-base fcl-passrc fcl-xml gdbint graph ibase libasync libcurl \
-		hash mysql netdb odbc oracle pasjpeg paszlib pthreads postgres \
-		regexpr sqlite
+USE_FPC=	chm fcl-async fcl-base fcl-net fcl-passrc fcl-process fcl-xml gdbint \
+		graph ibase libcurl hash mysql oracle pasjpeg paszlib pthreads \
+		postgres regexpr sqlite
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist
index 7a71da6e60eb..d2d428eddbe3 100644
--- a/lang/fpc-utils/pkg-plist
+++ b/lang/fpc-utils/pkg-plist
@@ -19,7 +19,7 @@ bin/unitdiff
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglibcurl.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.ppu
@@ -28,12 +28,11 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkghandler.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgdownload.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgarchive.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfpmake.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglibcurl.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.o
@@ -42,12 +41,11 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkghandler.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgdownload.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgarchive.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfpmake.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgwget.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkglnet.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkglibcurl.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgrepos.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpfprepos.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpfpxmlrep.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgoptions.a
@@ -56,7 +54,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgmessages.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkghandler.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgmkconv.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgdownload.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgarchive.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgfpmake.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgcommands.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/Package.fpc
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 876579fa281f..b7163dd9ef29 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fpc
-PORTVERSION=	2.2.0
-PORTREVISION?=	2
+PORTVERSION=	2.2.2
+PORTREVISION?=	0
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
 		ftp://planetmirror.com/pub/fpc/dist/source-${PORTVERSION}/:source \
@@ -25,8 +25,6 @@ DIST_SUBDIR=	freepascal
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	Free Pascal compiler with Turbo and Delphi
 
-LIB_DEPENDS=	c.5:${PORTSDIR}/misc/compat5x
-
 USE_GMAKE=	yes
 ONLY_FOR_ARCHS=	i386
 
@@ -47,7 +45,8 @@ MAKE_ENV+=	PP=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/lib/${PORTNAME}/${P
 		FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake \
 		FPCTARGET=${BUILDNAME} \
 		OPT="${OPT}" \
-		BSDHIER=1	
+		BSDHIER=1
+
 MAN1=	bin2obj.1 \
 	data2inc.1 \
 	delp.1 \
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 73e7b6e2aaab..0014c7be48d6 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -19,29 +19,22 @@ MAKE_ENV+=		PP=${LOCALBASE}/bin/ppc386 \
 			OPT="${OPT}" \
 			BSDHIER=1
 
-.if ${PKGNAMESUFFIX} == "-gdbint"
-HAVE_EXAMPLES=	true
-.endif
-
 .if ${PKGNAMESUFFIX} == "-ibase"
 .	if defined(WITH_IBASE)
 USE_FIREBIRD=	yes
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-mysql"
 .	if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-odbc"
 .	if defined(WITH_ODBC)
 LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-oracle"
@@ -49,26 +42,12 @@ HAVE_EXAMPLES=	true
 ORACLE8_LIB=	${LOCALBASE}/oracle8-client/rdbms/lib
 RUN_DEPENDS=	${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-postgres"
 .	if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 .	endif
-HAVE_EXAMPLES=	true
-.endif
-
-.if ${PKGNAMESUFFIX} == "-pasjpeg"
-HAVE_EXAMPLES=  true
-.endif
-
-.if ${PKGNAMESUFFIX} == "-paszlib"
-HAVE_EXAMPLES=	true
-.endif
-
-.if ${PKGNAMESUFFIX} == "-regexpr"
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-sqlite"
@@ -89,7 +68,13 @@ LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-forms"
+.if ${PKGNAMESUFFIX} == "-imagemagick"
+.	if defined(WITH_IMAGEMAGICK)
+LIB_DEPENDS=	Magick:${PORTSDIR}/graphics/ImageMagick
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-xforms"
 .	if defined(WITH_XFORMS)
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 .	endif
@@ -97,9 +82,9 @@ HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-fcl-db"
-OPT+=	-Fuunits/${ARCH}-freebsd -Fu../units/${ARCH}-freebsd \
-	-Fu../src -Fu../../units/${ARCH}-freebsd -Fu../../../units/${ARCH}-freebsd
-HAVE_EXAMPLES=  true
+OPT+=	-Fuunits/${ARCH}-freebsd -Fu../units/${ARCH}-freebsd -Fu../* \
+	-Fu../../units/${ARCH}-freebsd -Fu../../../units/${ARCH}-freebsd \
+	-Fu../sqldb/*
 .endif
 
 .if ${PKGNAMESUFFIX} == "-fcl-net"
@@ -117,29 +102,19 @@ USE_GNOME=	gtk12
 HAVE_EXAMPLES=	true
 .endif
 
-.if ${PKGNAMESUFFIX} == "-gconf"
-.	if defined(WITH_GCONF)
-.include <${PORTSDIR}/Mk/bsd.gnome.mk>
-USE_GNOME=      gconf
-.	endif
-HAVE_EXAMPLES=	true
-.endif
-
 .if ${PKGNAMESUFFIX} == "-gdbm"
 .	if defined(WITH_GDBM)
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-ggi"
 .	if defined(WITH_LIBGGI)
 LIB_DEPENDS=	ggi:${PORTSDIR}/graphics/libggi
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
-.if ${PKGNAMESUFFIX} == "-gtk"
+.if ${PKGNAMESUFFIX} == "-gtk1"
 .	if defined(WITH_GTK1)
 .include <${PORTSDIR}/Mk/bsd.gnome.mk>
 USE_GNOME=	gtk12
@@ -156,17 +131,19 @@ USE_GNOME=	gtk20
 HAVE_EXAMPLES=	true
 .endif
 
-.if ${PKGNAMESUFFIX} == "-hash"
-HAVE_EXAMPLES=	true
-.endif
-
-.if ${PKGNAMESUFFIX} == "-httpd"
-.	if defined(WITH_APACHE12)
+.if ${PKGNAMESUFFIX} == "-httpd13"
+.	if defined(WITH_APACHE13)
 USE_APACHE=	13
 .	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-httpd20"
 .	if defined(WITH_APACHE20)
 USE_APACHE=	20
 .	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-httpd22"
 .	if defined(WITH_APACHE22)
 USE_APACHE=	22
 .	endif
@@ -189,14 +166,12 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 .	if defined(WITH_LIBCURL)
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-libgd"
 .	if defined(WITH_LIBGD)
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-libpng"
@@ -205,14 +180,6 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-ncurses"
-HAVE_EXAMPLES=	true
-.endif
-
-.if ${PKGNAMESUFFIX} == "-netdb"
-HAVE_EXAMPLES=	true
-.endif
-
 .if ${PKGNAMESUFFIX} == "-opengl"
 .	if defined(WITH_OPENGL)
 USE_GL=		yes
@@ -233,22 +200,22 @@ LIB_DEPENDS=    pcap:${PORTSDIR}/net/libpcap
 .	endif
 .endif
 
+.if ${PKGNAMESUFFIX} == "-sdl"
+.	if defined(WITH_SDL)
+USE_SDL=	sdl image mixer ttf gfx 
+.	endif
+.endif
+
 .if ${PKGNAMESUFFIX} == "-svgalib"
 .	if defined(WITH_SVGA)
 LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
 .	endif
-HAVE_EXAMPLES=	true
-.endif
-
-.if ${PKGNAMESUFFIX} == "-syslog"
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-tcl"
 .	if defined(WITH_TCL)
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-unzip"
@@ -261,24 +228,12 @@ RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 OPT+=-Fu../fcl/*
 .endif
 
-.if ${PKGNAMESUFFIX} == "-utmp"
-HAVE_EXAMPLES=	true
-.endif
-
 .if ${PKGNAMESUFFIX} == "-x11"
 .	if defined(WITH_X11)
 USE_XLIB=	yes
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-zvt"
-.	if defined(WITH_ZVT)
-.include <${PORTSDIR}/Mk/bsd.gnome.mk>
-USE_GNOME=	libzvt
-.	endif
-HAVE_EXAMPLES=	true
-.endif
-
 post-extract:
 	@cd ${WRKDIR}/${WRKUNITDIR} && \
 		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index 31dd69b3f38c..d15033505743 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,6 +1,6 @@
-MD5 (freepascal/fpc-2.2.0.source.tar.gz) = 870965d5352ef23dccc1cf277e6edfee
-SHA256 (freepascal/fpc-2.2.0.source.tar.gz) = 2176cb79076f357095554eacf9df02b4b4471e54fe7e0214f61c4fc94535957f
-SIZE (freepascal/fpc-2.2.0.source.tar.gz) = 20616222
-MD5 (freepascal/fpc-2.2.0.bin.tar.gz) = 998b0dcf38c414f9c62bf995e41e8069
-SHA256 (freepascal/fpc-2.2.0.bin.tar.gz) = 442f791cc047b549adc0b5a8ebc4718026d6043ccdef14f58d81f8f0c791ff86
-SIZE (freepascal/fpc-2.2.0.bin.tar.gz) = 7787026
+MD5 (freepascal/fpc-2.2.2.source.tar.gz) = a4e2dd83fe8b5ccaecb3f22b8604abbc
+SHA256 (freepascal/fpc-2.2.2.source.tar.gz) = 33390c715b4d93d8380df5c5c25c4e5f181c2b830e60be54373d2bbac5f7543f
+SIZE (freepascal/fpc-2.2.2.source.tar.gz) = 22329435
+MD5 (freepascal/fpc-2.2.2.bin.tar.gz) = 4747acc862f0bd7497dcf6d6481cfdca
+SHA256 (freepascal/fpc-2.2.2.bin.tar.gz) = 8e0c3cf0b6852f021242603d98885865769efa248a0b4e2dbe1b85c12f465e81
+SIZE (freepascal/fpc-2.2.2.bin.tar.gz) = 8438137
diff --git a/lang/fpc/files/patch-compiler-utils_samplecfg b/lang/fpc/files/patch-compiler-utils_samplecfg
index 134c4253b9a1..29d81563f18d 100644
--- a/lang/fpc/files/patch-compiler-utils_samplecfg
+++ b/lang/fpc/files/patch-compiler-utils_samplecfg
@@ -1,11 +1,11 @@
---- compiler/utils/samplecfg       2008-01-06 01:17:24.468239657 +0300
-+++ compiler/utils/samplecfg    2008-01-06 01:36:20.388869514 +0300
-@@ -72,7 +72,7 @@
+--- compiler/utils/samplecfg	2008-06-04 13:06:36.000000000 -0500
++++ compiler/utils/samplecfg	2009-01-06 22:35:23.000000000 -0500
+@@ -50,7 +50,7 @@
  # Detect if we have write permission in root.
- if [ -w $sysdir ] ; then
+ if [ -w "$sysdir" ] ; then
    echo Write permission in $sysdir.
--  thefile=$sysdir/fpc.cfg
-+  thefile=$sysdir/fpc.cfg.sample
+-  thefile="$sysdir"/fpc.cfg
++  thefile="$sysdir"/fpc.cfg.sample
  else
    echo No write premission in $sysdir.
-   thefile=$HOME/.fpc.cfg
+   thefile="$HOME"/.fpc.cfg
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index 335c9e42cc38..291cf9b91bb8 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.10 2008-06-24 15:18:12 acm Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.11 2009-01-14 06:12:03 acm Exp $
 
 @unexec if cmp -s %D/etc/fpc.cfg.sample %D/etc/fpc.cfg; then rm -f %D/etc/fpc.cfg; fi
 etc/fpc.cfg.sample
@@ -39,6 +39,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/bsd.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/bsd.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/clocale.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/clocale.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/console.o
@@ -68,6 +70,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.o
@@ -88,6 +92,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbaseunix.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbsd.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclasses.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclocale.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcmem.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconsole.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconvutils.a
@@ -102,6 +107,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdl.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdos.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdynlibs.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libperrors.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpexeinfo.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfgl.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfmtbcd.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfreebsd.a
diff --git a/math/fpc-fftw/Makefile b/math/fpc-fftw/Makefile
index b6bd46ad318c..cac7f8d65c98 100644
--- a/math/fpc-fftw/Makefile
+++ b/math/fpc-fftw/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	math lang
 PKGNAMESUFFIX=	-fftw
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the FFTW3 library
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	FFTW3	"Install FFTW3 library"	on
diff --git a/net/fpc-pcap/Makefile b/net/fpc-pcap/Makefile
index b0784411d2f4..5e446fec30e2 100644
--- a/net/fpc-pcap/Makefile
+++ b/net/fpc-pcap/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net lang
 PKGNAMESUFFIX=	-pcap
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal unit for libpcap library
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	LIBPCAP	"Install ubiquitous network traffic capture library"	on
diff --git a/security/fpc-hash/Makefile b/security/fpc-hash/Makefile
index fe519092cdba..ea165115efab 100644
--- a/security/fpc-hash/Makefile
+++ b/security/fpc-hash/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	security lang
 PKGNAMESUFFIX=	-hash
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal unit for MD5 hash routines
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/fpc-hash/pkg-plist b/security/fpc-hash/pkg-plist
index 86f7813ea837..dbc4f22ab8a8 100644
--- a/security/fpc-hash/pkg-plist
+++ b/security/fpc-hash/pkg-plist
@@ -11,11 +11,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpntlm.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpuuid.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.ppu
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/hash/mdtest.pas
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%/hash
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/security/fpc-openssl/Makefile b/security/fpc-openssl/Makefile
index aab6a7ebebdd..df5c91f5d249 100644
--- a/security/fpc-openssl/Makefile
+++ b/security/fpc-openssl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	security lang
 PKGNAMESUFFIX=	-openssl
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal unit for OpenSSL
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	OPENSSL	"Install SSL and crypto library"	on
diff --git a/sysutils/fpc-syslog/Makefile b/sysutils/fpc-syslog/Makefile
index 6c836249664c..c5b9b4fdae94 100644
--- a/sysutils/fpc-syslog/Makefile
+++ b/sysutils/fpc-syslog/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	sysutils lang
 PKGNAMESUFFIX=	-syslog
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the system logger
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/fpc-syslog/pkg-plist b/sysutils/fpc-syslog/pkg-plist
index ae3edd1810e5..5ee04224321c 100644
--- a/sysutils/fpc-syslog/pkg-plist
+++ b/sysutils/fpc-syslog/pkg-plist
@@ -2,11 +2,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/libpsystemlog.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/syslog/testlog.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%/syslog
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/sysutils/fpc-utmp/Makefile b/sysutils/fpc-utmp/Makefile
index 55804417c0d2..a830a539178a 100644
--- a/sysutils/fpc-utmp/Makefile
+++ b/sysutils/fpc-utmp/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	sysutils lang
 PKGNAMESUFFIX=	-utmp
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal unit to gather information from the utmp file
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/fpc-utmp/pkg-plist b/sysutils/fpc-utmp/pkg-plist
index 26202c8307f2..945e947ac0f5 100644
--- a/sysutils/fpc-utmp/pkg-plist
+++ b/sysutils/fpc-utmp/pkg-plist
@@ -2,11 +2,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/libputmp.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/utmp/testutmp.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/utmp
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index 704243069d5f..fa3930823acd 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk2
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the GTK2 libraries
 USE_FPC=	x11
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	GTK2	"Gimp Toolkit for X11 GUI (version 2.x)"	on
diff --git a/x11-toolkits/fpc-gtk2/pkg-plist b/x11-toolkits/fpc-gtk2/pkg-plist
index e381a0e9e060..d5d39b455b52 100644
--- a/x11-toolkits/fpc-gtk2/pkg-plist
+++ b/x11-toolkits/fpc-gtk2/pkg-plist
@@ -1,4 +1,6 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/buildgtk2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkhtml.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu
@@ -9,6 +11,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/buildgtk2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkhtml.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.o
@@ -29,6 +33,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtk2.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libplibglade2.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtkglext.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdkglext.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtkhtml.a
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gnome-calendar.png
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gtk-logo-rgb.gif
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gnome-gimp.png
diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile
index fd13e3fea4e8..4eafccb4120a 100644
--- a/x11/fpc-x11/Makefile
+++ b/x11/fpc-x11/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11 lang
 PKGNAMESUFFIX=	-x11
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to X windows server
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	X11	"Install X libraries"	on