- Update to 2.2.0

11 files changed, 181 insertions, 62 deletions

diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index ee2feede9f39..bd3c1882e840 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	base
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.0
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	fpc-
@@ -30,7 +30,8 @@ RUN_DEPENDS=	${UNITSDIR}/gdbint/Package.fpc:${PORTSDIR}/devel/fpc-gdbint \
 		${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads \
 		${UNITSDIR}/postgres/Package.fpc:${PORTSDIR}/databases/fpc-postgres \
 		${UNITSDIR}/regexpr/Package.fpc:${PORTSDIR}/devel/fpc-regexpr \
-		${UNITSDIR}/sqlite/Package.fpc:${PORTSDIR}/databases/fpc-sqlite
+		${UNITSDIR}/sqlite/Package.fpc:${PORTSDIR}/databases/fpc-sqlite \
+		${UNITSDIR}/httpd-1.3/Package.fpc:${PORTSDIR}/www/fpc-httpd
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 BUILDNAME=	${ARCH}-freebsd
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 54d34fd689fb..419f87234cf3 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	docs
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.0
 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-docs/distinfo b/lang/fpc-docs/distinfo
index 9f583796ba4d..45d6139fba5a 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (freepascal/doc-pdf.tar.gz) = a4d4014d93848788be8c662368ba695a
-SHA256 (freepascal/doc-pdf.tar.gz) = f90ed3bbae42af5734ced5661bc09fcab42dd8d36b43969e138a848ed66e6586
-SIZE (freepascal/doc-pdf.tar.gz) = 6912274
+MD5 (freepascal/doc-pdf.tar.gz) = 6143da8ae881a9ecab6a0462e918d935
+SHA256 (freepascal/doc-pdf.tar.gz) = f9f20f68a37de75b4a02a0fef40f669409a903f8e8b970b121c98540eafc6b64
+SIZE (freepascal/doc-pdf.tar.gz) = 7284104
diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile
index 13ad2fefdd21..dd59645af282 100644
--- a/lang/fpc-tcl/Makefile
+++ b/lang/fpc-tcl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-tcl
 
@@ -14,7 +14,7 @@ COMMENT=	Free Pascal interface to the tcl/tk interpreter
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils \
-		${UNITSDIR}/fcl/Package.fpc:${PORTSDIR}/devel/fpc-fcl \
+		${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
 		${UNITSDIR}/gdbint/Package.fpc:${PORTSDIR}/devel/fpc-gdbint \
 		${UNITSDIR}/graph/Package.fpc:${PORTSDIR}/graphics/fpc-graph \
 		${UNITSDIR}/ibase/Package.fpc:${PORTSDIR}/databases/fpc-ibase \
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 6570f6bcc53a..7b50dbeae650 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	units
-PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	lang
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	fpc-
@@ -23,8 +22,18 @@ NO_BUILD=	yes
 BUILDNAME=	${ARCH}-freebsd
 
 OPTIONS=	BFD	"Interface to GNU Binary Format description"	on \
-		FCL	"Free Pascal Component Library"	on \
-		FFTW	"interface to the FFTW3 library" on \
+		CAIRO	"Interface to cairo 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_NET	"Free Pascal Component Library (net)"	on \
+		FCL_PASSRC	"Free Pascal Component Library (passrc)"	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 \
@@ -34,11 +43,15 @@ OPTIONS=	BFD	"Interface to GNU Binary Format description"	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 \
 		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 \
 		OPENGL	"Interface to opengl library"	on \
+		OPENSSL	"Interface to openssl library"	on \
+		PCAP	"Interface to pcap library"	on \
 		SVGALIB	"Interface to svgalib library"	on \
 		SYSLOG	"Interface to system logger"	on \
 		TCL	"Interface to tcl/tk interpreter"	on \
@@ -51,13 +64,24 @@ OPTIONS=	BFD	"Interface to GNU Binary Format description"	on \
 .include <bsd.port.pre.mk>
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
-ALL_OPTIONS=	BFD FCL FFTW FORMS FPGTK FV GCONF GDBM GGI GNOME GTK GTK2 \
-		IMLIB LIBGD LIBPNG NCURSES OPENGL SVGALIB \
-		SYSLOG TCL UNZIP UTMP X11 ZLIB ZVT
+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
 
 BFD_UNIT=	devel/fpc-bfd
-FCL_UNIT=	devel/fpc-fcl
+CAIRO_UNIT=	graphics/fpc-cairo
+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_NET_UNIT=	devel/fpc-fcl-net
+FCL_PASSRC_UNIT=	devel/fpc-fcl-passrc
+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
@@ -67,11 +91,15 @@ GGI_UNIT=	graphics/fpc-ggi
 GNOME_UNIT=	x11-toolkits/fpc-gnome
 GTK_UNIT=	x11-toolkits/fpc-gtk
 GTK2_UNIT=	x11-toolkits/fpc-gtk2
+HTTPD_UNIT=	www/fpc-httpd
 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
 OPENGL_UNIT=	graphics/fpc-opengl
+OPENSSL_UNIT=	security/fpc-openssl
+PCAP_UNIT=	net/fpc-pcap
 SVGALIB_UNIT=	graphics/fpc-svgalib
 SYSLOG_UNIT=	sysutils/fpc-syslog
 TCL_UNIT=	lang/fpc-tcl
@@ -83,7 +111,7 @@ ZVT_UNIT=	x11-toolkits/fpc-zvt
 
 .for OPT in ${ALL_OPTIONS}
 .	if defined(WITH_${OPT})  && !defined(WITHOUT_${OPT})
-RUN_DEPENDS+=	${UNITSDIR}/${OPT:L}/Package.fpc:${PORTSDIR}/${${OPT}_UNIT}
+RUN_DEPENDS+=	${UNITSDIR}/${OPT:L:S/httpd/httpd-1.3/}/Package.fpc:${PORTSDIR}/${${OPT:S/-/_/}_UNIT}
 .	endif
 .endfor
 
diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile
index 0da2e704603f..3c875fc12e91 100644
--- a/lang/fpc-utils/Makefile
+++ b/lang/fpc-utils/Makefile
@@ -13,11 +13,14 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Compiler utils
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		mkxmlrpc:${PORTSDIR}/devel/fpc-fcl \
+		${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
+		${UNITSDIR}/fcl-passrc/Package.fpc:${PORTSDIR}/devel/fpc-fcl-passrc \
+		${UNITSDIR}/fcl-xml/Package.fpc:${PORTSDIR}/devel/fpc-fcl-xml \
 		${UNITSDIR}/gdbint/Package.fpc:${PORTSDIR}/devel/fpc-gdbint \
 		${UNITSDIR}/graph/Package.fpc:${PORTSDIR}/graphics/fpc-graph \
 		${UNITSDIR}/ibase/Package.fpc:${PORTSDIR}/databases/fpc-ibase \
 		${UNITSDIR}/libasync/Package.fpc:${PORTSDIR}/net/fpc-libasync \
+		${UNITSDIR}/libcurl/Package.fpc:${PORTSDIR}/ftp/fpc-libcurl \
 		${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash \
 		${UNITSDIR}/mysql/Package.fpc:${PORTSDIR}/databases/fpc-mysql \
 		${UNITSDIR}/netdb/Package.fpc:${PORTSDIR}/net/fpc-netdb \
diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist
index fc0ea4518d1c..7cd757577e45 100644
--- a/lang/fpc-utils/pkg-plist
+++ b/lang/fpc-utils/pkg-plist
@@ -1,20 +1,65 @@
-bin/ppdep
-bin/ptop
-bin/rstconv
+bin/bin2obj
 bin/data2inc
 bin/delp
-bin/bin2obj
-bin/postw32
 bin/fpcmake
-bin/plex
-bin/pyacc
+bin/fpcres
+bin/fpdoc
+bin/fppkg
+bin/fprcp
 bin/h2pas
 bin/h2paspp
-bin/fprcp
-bin/fpdoc
 bin/makeskel
+bin/plex
+bin/postw32
+bin/ppdep
+bin/ptop
+bin/pyacc
+bin/rmcvsdir
+bin/rstconv
 bin/unitdiff
-bin/fpcres
+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/fprepos.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgglobals.ppu
+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/fprepos.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgglobals.o
+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/libpfprepos.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpfpxmlrep.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgoptions.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgglobals.a
+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
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/lexlib.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/yacclib.ppu
@@ -24,6 +69,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/libplexlib.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/libpyacclib.a
 lib/fpc/lexyacc/yyparse.cod
 lib/fpc/lexyacc/yylex.cod
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index ff75044218fe..cfc84faf71d8 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fpc
-PORTVERSION=	2.0.4
-PORTREVISION?=	1
+PORTVERSION=	2.2.0
+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 \
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:sourc
 		${MASTER_SITE_LOCAL:S|$|acm/freepascal/:bin|}
 MASTER_SITE_SUBDIR=	freepascal
 DISTNAME=	${PORTNAME}-${PORTVERSION}
-DISTFILES=	${PORTNAME:S/$/build/}-${PORTVERSION}${EXTRACT_SUFX}:source
+DISTFILES=	${DISTNAME:S/$/.source/}${EXTRACT_SUFX}:source
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	acm@FreeBSD.org
@@ -33,21 +33,18 @@ MAKE_ENV=	PREFIX=${PREFIX} \
 		FPCTARGET=${BUILDNAME} \
 		OPT="${OPT}" \
 		BSDHIER=1
+OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		BUILDNAME=${BUILDNAME}
 SUB_FILES=	pkg-message
-FPCSRCDIR=	${PORTNAME:S/$/build_/}${PORTVERSION:S/$/_exp/}/${PORTNAME:S/$/src/}
+FPCSRCDIR=	${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
 .if !defined(PKGNAMESUFFIX)
 DISTFILES+=	${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
-MAKE_ENV+=	PP=${WRKDIR}/${PORTNAME:S/$/-bin/}/lib/${PORTNAME}/${PORTVERSION}/ppc386 \
-		FPCMAKE=${WRKDIR}/${PORTNAME:S/$/-bin/}/bin/fpcmake
+MAKE_ENV+=	PP=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/lib/${PORTNAME}/${PORTVERSION}/ppc386 \
+		FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake
 MAN1=	bin2obj.1 \
 	data2inc.1 \
 	delp.1 \
@@ -90,7 +87,7 @@ do-extract:
 		${WRKDIR}
 # unpack source distribution
 	@cd ${WRKDIR} && \
-		${GZIP_CMD} -dc ${_DISTDIR}/${PORTNAME:S/$/build/}-${PORTVERSION}${EXTRACT_SUFX} \
+		${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} \
 			| ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl
 
 do-build:
@@ -103,8 +100,8 @@ do-install:
       	# Installing fpc runtime
 	@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} install ${MAKE_ENV}
 	# Installing manpages
-	${INSTALL_DATA} ${WRKDIR}/fpc-bin/man/man1/* ${MAN1PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKDIR}/fpc-bin/man/man5/* ${MAN1PREFIX}/man/man5
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/man/man1/* ${MAN1PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/man/man5/* ${MAN1PREFIX}/man/man5
 
 post-install:
 	if [ -e "${PREFIX}/bin/ppc386" ]; then ${RM} -f "${PREFIX}/bin/ppc386"; fi
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 454e1317a7b7..e9e4fcf3e039 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -1,6 +1,6 @@
 PLIST=	${.CURDIR}/pkg-plist
 PATCHDIR=	${.CURDIR}/files
-WRKSRC=	${WRKDIR}/${PORTNAME:S/$/build_/}${PORTVERSION:S/$/_exp/}
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 UNITPREFIX=    		unit-
 UNITEXTRACT_SUFX=	.tar.gz
@@ -13,9 +13,9 @@ OPT=-CX
 MAKE_ENV+=	PP=${LOCALBASE}/bin/ppc386
 
 .if !exists(${LOCALBASE}/bin/fpcmake)
-EXTRACTUNITDIR+=	fpc-bin
+EXTRACTUNITDIR+=	${PORTNAME}-${PORTVERSION:S/$/.bin/}
 DISTFILES+=	${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
-MAKE_ENV+=	FPCMAKE=${WRKDIR}/${PORTNAME:S/$/-bin/}/bin/fpcmake
+MAKE_ENV+=	FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake
 .endif
 
 .if ${PKGNAMESUFFIX} == "-gdbint"
@@ -95,12 +95,10 @@ LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 HAVE_EXAMPLES=	true
 .endif
 
-.if ${PKGNAMESUFFIX} == "-fcl"
+.if ${PKGNAMESUFFIX} == "-fcl-db"
 OPT+=	-Fuunits/${ARCH}-freebsd -Fu../units/${ARCH}-freebsd \
-	-Fuxml/units/${ARCH}-freebsd -Fu../xml/units/${ARCH}-freebsd \
-	-Fudb/units/${ARCH}-freebsd -Fu../db/units/${ARCH}-freebsd \
-	-Fu../../units/${ARCH}-freebsd -Fu../passrc/units/${ARCH}-freebsd
-HAVE_EXAMPLES=	true
+	-Fu../src -Fu../../units/${ARCH}-freebsd -Fu../../../units/${ARCH}-freebsd
+HAVE_EXAMPLES=  true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-fpgtk"
@@ -157,6 +155,18 @@ HAVE_EXAMPLES=	true
 HAVE_EXAMPLES=	true
 .endif
 
+.if ${PKGNAMESUFFIX} == "-httpd"
+.	if defined(WITH_APACHE12)
+USE_APACHE=	13
+.	endif
+.	if defined(WITH_APACHE20)
+USE_APACHE=	20
+.	endif
+.	if defined(WITH_APACHE22)
+USE_APACHE=	22
+.	endif
+.endif
+
 .if ${PKGNAMESUFFIX} == "-imlib"
 .	if defined(WITH_IMLIB)
 .include <${PORTSDIR}/Mk/bsd.gnome.mk>
@@ -164,6 +174,19 @@ USE_GNOME=	imlib
 .	endif
 .endif
 
+.if ${PKGNAMESUFFIX} == "-cairo"
+.	if defined(WITH_LIBCAIRO)
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-libcurl"
+.	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
@@ -193,6 +216,18 @@ LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 HAVE_EXAMPLES=	true
 .endif
 
+.if ${PKGNAMESUFFIX} == "-openssl"
+.       if defined(WITH_OPENSSL)
+USE_OPENSSL=	yes
+.       endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-pcap"
+.	if defined(WITH_LIBPCAP)
+LIB_DEPENDS=    pcap:${PORTSDIR}/net/libpcap
+.	endif
+.endif
+
 .if ${PKGNAMESUFFIX} == "-svgalib"
 .	if defined(WITH_SVGA)
 LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
@@ -260,10 +295,10 @@ security-check: fpc-check-install
 
 fpc-check-install:
 check-makevars::
-	@${ECHO_CMD} "*****************************************************************"
+	@${ECHO_CMD} "#################################################################"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} " The following freepascal unit will be installed in your system: "
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} " * ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}"
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "*****************************************************************"
+	@${ECHO_CMD} "#################################################################"
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index 0239a2c0760e..31dd69b3f38c 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,6 +1,6 @@
-MD5 (freepascal/fpcbuild-2.0.4.tar.gz) = 1ff8b80d1f5f564983bb4e1550b8b53a
-SHA256 (freepascal/fpcbuild-2.0.4.tar.gz) = 4cb307dcb0d0d5cf0a3d0cd6abca917c7002ffb1fc96363ce42121dfa9aeaf6b
-SIZE (freepascal/fpcbuild-2.0.4.tar.gz) = 26749033
-MD5 (freepascal/fpc-2.0.4.bin.tar.gz) = f3a837ef02edc534a0f2e82a4593672b
-SHA256 (freepascal/fpc-2.0.4.bin.tar.gz) = 0e5dc03bbdba55e368e2fef08362a7d9f1f92e0f02a27fdcfa9598d724c9d3fb
-SIZE (freepascal/fpc-2.0.4.bin.tar.gz) = 4894031
+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
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index 5f4939d20973..b997824ac432 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,10 +1,9 @@
-@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.7 2006-09-07 21:32:23 acm Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.8 2007-09-18 06:53:23 acm Exp $
 
 @unexec rm -f %D/etc/fpc.cfg > /dev/null 2>&1 || true
 bin/fpc
 bin/fpcmkcfg
 bin/fpcsubst
-bin/fppkg
 bin/ppudump
 bin/ppufiles
 bin/ppumove
@@ -12,6 +11,7 @@ bin/ppc386
 lib/fpc/%%PORTVERSION%%/msg/errorct.msg
 lib/fpc/%%PORTVERSION%%/msg/errord.msg
 lib/fpc/%%PORTVERSION%%/msg/errorda.msg
+lib/fpc/%%PORTVERSION%%/msg/errordu.msg
 lib/fpc/%%PORTVERSION%%/msg/errore.msg
 lib/fpc/%%PORTVERSION%%/msg/errores.msg
 lib/fpc/%%PORTVERSION%%/msg/errorf.msg
@@ -65,8 +65,10 @@ 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/fpmkunit.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpmkunit.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/getopts.o
@@ -97,7 +99,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdl.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdos.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdynlibs.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libperrors.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfpmkunit.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfgl.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfmtbcd.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfreebsd.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgetopts.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpheaptrc.a
@@ -105,6 +108,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpinitc.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpipc.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpkeyboard.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplineinfo.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplnfodwrf.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmacpas.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmath.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmatrix.a
@@ -117,6 +121,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpprinter.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libprtlconsts.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpserial.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsockets.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstdconvs.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstrings.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstrutils.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsyscall.a
@@ -136,6 +141,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvariants.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvarutils.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvideo.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpx86.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lnfodwrf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lnfodwrf.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lineinfo.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lineinfo.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/macpas.o
@@ -163,6 +170,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/serial.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/serial.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sockets.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sockets.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/stdconvs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/stdconvs.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strings.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strings.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strutils.o