- Update to 2.6.0

12 files changed, 196 insertions, 220 deletions

diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index 583061f5d44..8615d73c963 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	base
-PORTVERSION=	2.4.4
+PORTVERSION=	2.6.0
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	fpc-
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 3dc1c462d29..5418f156444 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	docs
-PORTVERSION=	2.4.4
+PORTVERSION=	2.6.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \
 		ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/docs/ \
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index 0d88fe7dfc8..16b35080ed0 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freepascal/doc-pdf.tar.gz) = 79db51937bab98e20a275ef7549d3a57d4f79ee6d101054b2eebe90191211f16
-SIZE (freepascal/doc-pdf.tar.gz) = 7393643
+SHA256 (freepascal/doc-pdf.tar.gz) = b1b6cca6f1a1c341822fb86200e7c2cb88ed80b7d93bdbeb7c82cd5fba9e6f14
+SIZE (freepascal/doc-pdf.tar.gz) = 7521336
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 8cb50638c9c..ec0a4beb8af 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	units
-PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	lang
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	fpc-
@@ -46,6 +45,7 @@ OPTIONS=	A52	"Interface to a52 library"	on \
 		FCL_XML	"Free Pascal Component Library (xml)"	on \
 		FFTW	"Interface to the FFTW3 library" on \
 		FPGTK	"Interface to create programs with gtk"	on \
+		FPPKG	"Free Pascal package unit"	on \
 		FPMKUNIT "Free Pascal build system unit" on \
 		FPVECTORIAL	"Free Pascal fpvectorial unit"	on \
 		FV	"Free Pascal unit for Delphi support" on \
@@ -100,7 +100,7 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 
 ALL_OPTIONS=	A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DTS FASTCGI FCL-ASYNC FCL-BASE \
 		FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JSON FCL-NET FCL-PASSRC FCL-PROCESS \
-		FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPMKUNIT FPVECTORIAL \
+		FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPMKUNIT FPPKG FPVECTORIAL \
 		FV GDBM GGI GMP GNOME1 GTK1 GTK2 HERMES ICONVENC IMAGEMAGICK IMLIB \
 		LDAP LIBCURL LIBGD LIBPNG LIBXML2 LUA MAD MATROSKA MODPLUG NCURSES \
 		NEWT NUMLIB OGGVORBIS OPENAL OPENGL OPENSSL PCAP PROJ4 PXLIB RSVG \
diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile
index b7ef11726a5..00505947472 100644
--- a/lang/fpc-utils/Makefile
+++ b/lang/fpc-utils/Makefile
@@ -12,9 +12,7 @@ PKGNAMESUFFIX=	-utils
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal Compiler utils
 
-USE_FPC=	chm fcl-async fcl-base fcl-net fcl-passrc fcl-process fcl-res fcl-xml gdbint \
-		graph ibase libcurl hash mysql oracle pasjpeg paszlib pthreads \
-		postgres regexpr sqlite
+USE_FPC=	chm fcl-base fcl-net fcl-process fcl-res fppkg libcurl
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist
index 67e38f333e8..a91f20fae49 100644
--- a/lang/fpc-utils/pkg-plist
+++ b/lang/fpc-utils/pkg-plist
@@ -2,13 +2,13 @@ bin/bin2obj
 bin/data2inc
 bin/delp
 bin/fpclasschart
-bin/fpcmkcfg
 bin/fpcres
 bin/fpdoc
 bin/fppkg
 bin/fprcp
 bin/h2pas
 bin/h2paspp
+bin/instantfpc
 bin/makeskel
 bin/plex
 bin/postw32
@@ -18,46 +18,9 @@ bin/pyacc
 bin/rmcvsdir
 bin/rstconv
 bin/unitdiff
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkglnet.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.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
-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/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/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
-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/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/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
-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/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
@@ -67,8 +30,8 @@ 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%%/fppkg/
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index f2278a58429..72fff691d13 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fpc
-PORTVERSION=	2.4.4
+PORTVERSION=	2.6.0
 PORTREVISION?=	0
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
@@ -115,7 +115,9 @@ do-extract:
 # unpack source distribution
 	@cd ${WRKDIR} && \
 		${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} \
-			| ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/utils/fpcm
+			| ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl \
+				${FPCSRCDIR}/utils/fpcmkcfg ${FPCSRCDIR}/packages/fcl-base \
+					${FPCSRCDIR}/packages/fcl-process ${FPCSRCDIR}/utils/fpcm
 
 post-patch:
 .if ${ARCH} == "i386"
@@ -129,16 +131,21 @@ post-patch:
 do-build:
 # build fpc compiler
 	@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} cycle ${MAKE_ENV}
-# build fpcmake
+# build fpcmkcfg
 	@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} ${MAKE_ENV}
+	@cd ${WRKDIR}/${FPCSRCDIR}/packages/fcl-base && ${GMAKE} ${MAKE_ENV}
+	@cd ${WRKDIR}/${FPCSRCDIR}/packages/fcl-process && ${GMAKE} ${MAKE_ENV}
+	@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && ${GMAKE} ${MAKE_ENV}
 
 do-install:
 # 	Installing fpc compiler
 	@cd ${WRKDIR}/${FPCSRCDIR}/rtl && ${GMAKE} install ${MAKE_ENV}
 # 	Installing fpc runtime
 	@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} install ${MAKE_ENV}
+# 	Installng fpcmkcfg
+	@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && ${GMAKE} install ${MAKE_ENV}
 # 	Installng fpcmake
-	@@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} install ${MAKE_ENV}
+	@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} install ${MAKE_ENV}
 # 	Installing manpages
 	${INSTALL_DATA} ${WRKDIR}/man/man1/* ${MAN1PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKDIR}/man/man5/* ${MAN1PREFIX}/man/man5
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 9b2cc928723..f78e624f748 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -23,40 +23,9 @@ MAKE_ENV+=		PP=${LOCALBASE}/bin/${PPNAME} \
 			OPT="${OPT}" \
 			BSDHIER=1
 
-.if ${PKGNAMESUFFIX} == "-ibase"
-.	if defined(WITH_IBASE)
-USE_FIREBIRD=	yes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-mysql"
-.	if defined(WITH_MYSQL)
-USE_MYSQL=	yes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-odbc"
-.	if defined(WITH_ODBC)
-LIB_DEPENDS=	odbc.2:${PORTSDIR}/databases/unixODBC
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-oracle"
-.	if defined(WITH_ORACLE)
-ORACLE8_LIB=	${LOCALBASE}/oracle8-client/rdbms/lib
-RUN_DEPENDS=	${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-postgres"
-.	if defined(WITH_PGSQL)
-USE_PGSQL=	yes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-sqlite"
-.	if defined(WITH_SQLITE)
-USE_SQLITE=	yes
+.if ${PKGNAMESUFFIX} == "-a52"
+.	if defined(WITH_LIBA52)
+LIB_DEPENDS=	a52:${PORTSDIR}/audio/liba52
 .	endif
 .endif
 
@@ -66,23 +35,22 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-fftw"
-.	if defined(WITH_FFTW)
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
+.if ${PKGNAMESUFFIX} == "-cairo"
+.	if defined(WITH_LIBCAIRO)
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-imagemagick"
-.	if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS=	Magick:${PORTSDIR}/graphics/ImageMagick
+.if ${PKGNAMESUFFIX} == "-dbus"
+.	if defined(WITH_DBUS)
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-xforms"
-.	if defined(WITH_XFORMS)
-LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms
+.if ${PKGNAMESUFFIX} == "-dts"
+.	if defined(WITH_LIBDCA)
+LIB_DEPENDS=	dca:${PORTSDIR}/multimedia/libdca
 .	endif
-HAVE_EXAMPLES=	true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-fcl-db"
@@ -100,6 +68,12 @@ OPT+=	-Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \
 	-Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME}
 .endif
 
+.if ${PKGNAMESUFFIX} == "-fftw"
+.	if defined(WITH_FFTW)
+LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
+.	endif
+.endif
+
 .if ${PKGNAMESUFFIX} == "-fpgtk"
 .	if defined(WITH_GTK1)
 .include <${PORTSDIR}/Mk/bsd.gnome.mk>
@@ -123,6 +97,12 @@ LIB_DEPENDS=	ggi:${PORTSDIR}/graphics/libggi
 .	endif
 .endif
 
+.if ${PKGNAMESUFFIX} == "-gmp"
+.	if defined(WITH_GMP)
+LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
+.	endif
+.endif
+
 .if ${PKGNAMESUFFIX} == "-gtk1"
 .	if defined(WITH_GTK1)
 .include <${PORTSDIR}/Mk/bsd.gnome.mk>
@@ -138,9 +118,9 @@ USE_GNOME=	gtk20
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-httpd20"
-.	if defined(WITH_APACHE20)
-USE_APACHE=	20
+.if ${PKGNAMESUFFIX} == "-hermes"
+.	if defined(WITH_HERMES)
+LIB_DEPENDS=	Hermes:${PORTSDIR}/graphics/Hermes
 .	endif
 .endif
 
@@ -150,16 +130,32 @@ USE_APACHE=	22
 .	endif
 .endif
 
+.if ${PKGNAMESUFFIX} == "-ibase"
+.	if defined(WITH_IBASE)
+USE_FIREBIRD=	yes
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-iconvenc"
+USE_ICONV=	yes
+.endif
+
+.if ${PKGNAMESUFFIX} == "-imagemagick"
+.	if defined(WITH_IMAGEMAGICK)
+LIB_DEPENDS=	Magick:${PORTSDIR}/graphics/ImageMagick
+.	endif
+.endif
+
 .if ${PKGNAMESUFFIX} == "-imlib"
 .	if defined(WITH_IMLIB)
-.include <${PORTSDIR}/Mk/bsd.gnome.mk>
-USE_GNOME=	imlib
+.include <${PORTSDIR}/Mk/bsd.efl.mk>
+USE_EFL=	imlib2
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-cairo"
-.	if defined(WITH_LIBCAIRO)
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
+.if ${PKGNAMESUFFIX} == "-ldap"
+.	if defined(WITH_OPENLDAP)
+USE_OPENLDAP=	yes
 .	endif
 .endif
 
@@ -181,185 +177,190 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-opengl"
-.	if defined(WITH_OPENGL)
-USE_GL=		glut
+.if ${PKGNAMESUFFIX} == "-libxml2"
+.	if defined(WITH_LIBXML2)
+LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 .	endif
-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
+.if ${PKGNAMESUFFIX} == "-lua"
+.	if defined(WITH_LUA)
+LIB_DEPENDS=	lua-5.1:${PORTSDIR}/lang/lua
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-sdl"
-.	if defined(WITH_SDL)
-USE_SDL=	sdl image mixer ttf gfx 
+.if ${PKGNAMESUFFIX} == "-mad"
+.if defined(WITH_LIBMAD)
+LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-svgalib"
-.	if defined(WITH_SVGA)
-LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
+.if ${PKGNAMESUFFIX} == "-matroska"
+.	if defined(WITH_LIBMATROSKA)
+LIB_DEPENDS=	matroska:${PORTSDIR}/multimedia/libmatroska
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-tcl"
-.	if defined(WITH_TCL)
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+.if ${PKGNAMESUFFIX} == "-modplug"
+.	if defined(WITH_LIBMODPLUG)
+LIB_DEPENDS=	modplug:${PORTSDIR}/audio/libmodplug
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-unzip"
-.	if defined(WITH_UNZIP)
-RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+.if ${PKGNAMESUFFIX} == "-mysql"
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-utils"
-OPT+=-Fu../fcl/*
+.if ${PKGNAMESUFFIX} == "-newt"
+.	if defined(WITH_NEWT)
+LIB_DEPENDS=	newt:${PORTSDIR}/devel/newt
+.	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-x11"
-.	if defined(WITH_X11)
-USE_XLIB=	yes
+.if ${PKGNAMESUFFIX} == "-odbc"
+.	if defined(WITH_ODBC)
+LIB_DEPENDS=	odbc.2:${PORTSDIR}/databases/unixODBC
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-iconvenc"
-USE_ICONV=	yes
+.if ${PKGNAMESUFFIX} == "-oggvorbis"
+.	if defined(WITH_LIBOGG)
+LIB_DEPENDS+=	ogg:${PORTSDIR}/audio/libogg
+.	endif
+.	if defined(WITH_LIBVORBIS)
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+.	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-a52"
-.	if defined(WITH_LIBA52)
-LIB_DEPENDS=	a52:${PORTSDIR}/audio/liba52
+.if ${PKGNAMESUFFIX} == "-openal"
+.	if defined(WITH_OPENAL)
+USE_OPENAL=	soft
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-dbus"
-.	if defined(WITH_DBUS)
-LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
+.if ${PKGNAMESUFFIX} == "-opengl"
+.	if defined(WITH_OPENGL)
+USE_GL=		glut
 .	endif
+HAVE_EXAMPLES=	true
 .endif
 
-.if ${PKGNAMESUFFIX} == "-dts"
-.	if defined(WITH_LIBDCA)
-LIB_DEPENDS=	dca:${PORTSDIR}/multimedia/libdca
+.if ${PKGNAMESUFFIX} == "-openssl"
+.	if defined(WITH_OPENSSL)
+USE_OPENSSL=    yes
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-gmp"
-.	if defined(WITH_GMP)
-LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
+.if ${PKGNAMESUFFIX} == "-oracle"
+.	if defined(WITH_ORACLE)
+ORACLE8_LIB=	${LOCALBASE}/oracle8-client/rdbms/lib
+RUN_DEPENDS=	${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-ldap"
-.	if defined(WITH_OPENLDAP)
-USE_OPENLDAP=	yes
-.	endif
+.if ${PKGNAMESUFFIX} == "-pcap"
+.       if defined(WITH_LIBPCAP)
+LIB_DEPENDS=    pcap:${PORTSDIR}/net/libpcap
+.       endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-libxml2"
-.	if defined(WITH_LIBXML2)
-LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
+.if ${PKGNAMESUFFIX} == "-postgres"
+.	if defined(WITH_PGSQL)
+USE_PGSQL=	yes
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-lua"
-.	if defined(WITH_LUA)
-LIB_DEPENDS=	lua-5.1:${PORTSDIR}/lang/lua
+.if ${PKGNAMESUFFIX} == "-proj4"
+.	if defined(WITH_PROJ)
+LIB_DEPENDS=	proj:${PORTSDIR}/graphics/proj
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-mad"
-.	if defined(WITH_LIBMAD)
-LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad
+.if ${PKGNAMESUFFIX} == "-rexx"
+.	if defined(WITH_REXX_REGINA)
+RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-matroska"
-.	if defined(WITH_LIBMATROSKA)
-LIB_DEPENDS=	matroska:${PORTSDIR}/multimedia/libmatroska
+.if ${PKGNAMESUFFIX} == "-rsvg"
+.	if defined(WITH_LIBRSVG2)
+LIB_DEPENDS=	rsvg-2:${PORTSDIR}/graphics/librsvg2
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-modplug"
-.	if defined(WITH_LIBMODPLUG)
-LIB_DEPENDS=	modplug:${PORTSDIR}/audio/libmodplug
+.if ${PKGNAMESUFFIX} == "-sdl"
+.	if defined(WITH_SDL)
+USE_SDL=	sdl image mixer ttf gfx
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-newt"
-.	if defined(WITH_NEWT)
-LIB_DEPENDS=	newt:${PORTSDIR}/devel/newt
+.if ${PKGNAMESUFFIX} == "-sndfile"
+.	if defined(WITH_LIBSNDFILE)
+LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-oggvorbis"
-.	if defined(WITH_LIBOGG)
-LIB_DEPENDS+=	ogg:${PORTSDIR}/audio/libogg
-.	endif
-.	if defined(WITH_LIBVORBIS)
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+.if ${PKGNAMESUFFIX} == "-sqlite"
+.	if defined(WITH_SQLITE)
+USE_SQLITE=	yes
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-openal"
-.	if defined(WITH_OPENAL)
-LIB_DEPENDS=	openal:${PORTSDIR}/audio/openal
+.if ${PKGNAMESUFFIX} == "-svgalib"
+.	if defined(WITH_SVGA)
+LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-proj4"
-.	if defined(WITH_PROJ)
-LIB_DEPENDS=	proj:${PORTSDIR}/graphics/proj
+.if ${PKGNAMESUFFIX} == "-tcl"
+.	if defined(WITH_TCL)
+RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-rexx"
-.	if defined(WITH_REXX_REGINA)
-RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
+.if ${PKGNAMESUFFIX} == "-unzip"
+.	if defined(WITH_UNZIP)
+RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-rsvg"
-.	if defined(WITH_LIBRSVG2)
-LIB_DEPENDS=	rsvg-2:${PORTSDIR}/graphics/librsvg2
-.	endif
+.if ${PKGNAMESUFFIX} == "-utils"
+OPT+=-Fu../fcl/*
 .endif
 
-.if ${PKGNAMESUFFIX} == "-sndfile"
-.	if defined(WITH_LIBSNDFILE)
-LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile
+.if ${PKGNAMESUFFIX} == "-x11"
+.	if defined(WITH_X11)
+USE_XLIB=	yes
 .	endif
 .endif
 
-.if ${PKGNAMESUFFIX} == "-hermes"
-.	if defined(WITH_HERMES)
-LIB_DEPENDS=	Hermes:${PORTSDIR}/graphics/Hermes
+.if ${PKGNAMESUFFIX} == "-xforms"
+.	if defined(WITH_XFORMS)
+LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms
 .	endif
+HAVE_EXAMPLES=	true
 .endif
 
 post-extract:
 	@cd ${WRKDIR}/${WRKUNITDIR} && \
 		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
-.if ${PKGNAMESUFFIX} == "-fpvectorial"
-	@${CP} ${FILESDIR}/fpvutils.pas ${WRKDIR}/${WRKUNITDIR}/src
-.endif
 
 post-patch:
+.if ${PKGNAMESUFFIX} == "-fpmkunit"
+	@${REINPLACE_CMD} -e 's|\[Linux\]|\[Linux,FreeBSD,NetBSD,OpenBSD\]|g' \
+		${WRKDIR}/${WRKUNITDIR}/src/${PKGNAMESUFFIX:S/-//}.pp
+.endif
+.if ${PKGNAMESUFFIX} == "-fppkg"
+	@${REINPLACE_CMD} -e 's|packages_freebsd=fcl-net fcl-web|packages_freebsd=fcl-net|g' \
+		${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
+.endif
 .if ${PKGNAMESUFFIX} == "-utils"
-	@${REINPLACE_CMD} -e 's|fpcm ||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \
+	@${REINPLACE_CMD} -e 's| fpcmkcfg||g' -e 's| fpcm||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \
 		${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
+	@${REINPLACE_CMD} -e 's|$$(INSTALL) Package.fpc $$(INSTALL_UNITDIR)||g' \
+		${WRKDIR}/${WRKUNITDIR}/fppkg/Makefile
 .endif
 
 do-build:
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index f827c86bbea..f271ac99ae7 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,8 +1,8 @@
-SHA256 (freepascal/fpc-2.4.4.source.tar.gz) = eea053f8440f5e8db6295a72b11be65d69bd2bc90a38136e1fa947ab2785f677
-SIZE (freepascal/fpc-2.4.4.source.tar.gz) = 26144591
-SHA256 (freepascal/ppc386-2.4.4-freebsd.tar.gz) = afee76f5b260942c2b508a4228c93bd5a14dcf3b34084c9cabbc41c8bfc7a30b
-SIZE (freepascal/ppc386-2.4.4-freebsd.tar.gz) = 849445
-SHA256 (freepascal/ppcx64-2.4.4-freebsd.tar.gz) = a437941c468c553c261d81e006cdec026759f7382ae8dcfbb495a91922897e79
-SIZE (freepascal/ppcx64-2.4.4-freebsd.tar.gz) = 859847
-SHA256 (freepascal/fpc-2.4.4.man.tar.gz) = 0c362d0b065eb0af28f0506bfc2bee81e2fe8a4ec00fe86632a84b60f04db964
-SIZE (freepascal/fpc-2.4.4.man.tar.gz) = 31414
+SHA256 (freepascal/fpc-2.6.0.source.tar.gz) = b1ffe118bd6ce86775ac3a22ab71a88c28b91cbda6a85a8f74797a04ea7c4b8f
+SIZE (freepascal/fpc-2.6.0.source.tar.gz) = 28932564
+SHA256 (freepascal/ppc386-2.6.0-freebsd.tar.gz) = 10685d5bfc4fbf02dcd1398689d5c6e5e35831f1a38e1b34ed2312fb10099fe3
+SIZE (freepascal/ppc386-2.6.0-freebsd.tar.gz) = 958065
+SHA256 (freepascal/ppcx64-2.6.0-freebsd.tar.gz) = 7d2dbd57ea2c6986b4c6e0fc9b3a9461b19b5d9dbabe9e1a6512e97a6d9a5ef8
+SIZE (freepascal/ppcx64-2.6.0-freebsd.tar.gz) = 1026395
+SHA256 (freepascal/fpc-2.6.0.man.tar.gz) = 0a41d93d25e27f0a15ec7396586854c7001cbafd46a5a19a284e016573c261a4
+SIZE (freepascal/fpc-2.6.0.man.tar.gz) = 31808
diff --git a/lang/fpc/files/patch-compiler-utils_samplecfg b/lang/fpc/files/patch-compiler-utils_samplecfg
index cdac9ea6a5b..68a4b2f1ae2 100644
--- a/lang/fpc/files/patch-compiler-utils_samplecfg
+++ b/lang/fpc/files/patch-compiler-utils_samplecfg
@@ -1,11 +1,13 @@
---- compiler/utils/samplecfg	2009-02-28 17:54:01.000000000 -0500
-+++ compiler/utils/samplecfg	2009-04-26 13:53:57.000000000 -0500
-@@ -55,7 +55,7 @@
+--- compiler/utils/samplecfg	2011-12-10 07:59:24.000000000 -0500
++++ compiler/utils/samplecfg	2012-02-23 15:47:13.000000000 -0500
+@@ -37,8 +37,8 @@
  # Detect if we have write permission in sysdir.
  if [ -w "$sysdir" ] ; then
    echo Write permission in $sysdir.
 -  fpccfgfile="$sysdir"/fpc.cfg
+-  fppkgfile="$sysdir"/fppkg.cfg
 +  fpccfgfile="$sysdir"/fpc.cfg.sample
++  fppkgfile="$sysdir"/fppkg.cfg.sample
+   defaultfile="$sysdir"/fppkg/default
+   compilerconfigdir="-d CompilerConfigDir=$sysdir/fppkg"
  else
-   echo No write premission in $sysdir.
-   fpccfgfile="$HOME"/.fpc.cfg
diff --git a/lang/fpc/pkg-descr b/lang/fpc/pkg-descr
index d4820cba079..fcef753125b 100644
--- a/lang/fpc/pkg-descr
+++ b/lang/fpc/pkg-descr
@@ -1,4 +1,4 @@
-Originally named FPK-Pascal, the Free Pascal compiler is a 32 bit
+Originally named FPK-Pascal, the Free Pascal compiler is a 32 bit and 64 bit
 Turbo Pascal compatible Pascal compiler for DOS, Linux, Win32, OS/2,
 (based on an older version) the AmigaOS, FreeBSD/ELF, BeOS, Darwin(OSX)
 and others.
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index fa81a2b591c..be0703a5c5f 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,11 +1,12 @@
-@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.13 2011-06-23 05:05:26 acm Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.14 2012-04-19 06:19:58 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
 @exec if [ ! -f %D/etc/fpc.cfg ] ; then cp -p %D/%F %B/fpc.cfg; fi
 bin/fpc
-bin/fpcmake
 bin/fpcsubst
+bin/fpcmake
+bin/fpcmkcfg
 bin/mkarmins
 bin/mkx86ins
 bin/ppudump
@@ -24,14 +25,15 @@ lib/fpc/%%PORTVERSION%%/msg/errorfi.msg
 lib/fpc/%%PORTVERSION%%/msg/errorhe.msg
 lib/fpc/%%PORTVERSION%%/msg/errorheu.msg
 lib/fpc/%%PORTVERSION%%/msg/errorid.msg
+lib/fpc/%%PORTVERSION%%/msg/erroriu.msg
+lib/fpc/%%PORTVERSION%%/msg/errorru.msg
 lib/fpc/%%PORTVERSION%%/msg/errorn.msg
 lib/fpc/%%PORTVERSION%%/msg/errorpl.msg
 lib/fpc/%%PORTVERSION%%/msg/errorpli.msg
-lib/fpc/%%PORTVERSION%%/msg/errorptd.msg
-lib/fpc/%%PORTVERSION%%/msg/errorptw.msg
+lib/fpc/%%PORTVERSION%%/msg/errorpt.msg
+lib/fpc/%%PORTVERSION%%/msg/errorptu.msg
 lib/fpc/%%PORTVERSION%%/msg/errorues.msg
 lib/fpc/%%PORTVERSION%%/msg/errorr.msg
-lib/fpc/%%PORTVERSION%%/msg/errorrw.msg
 %%FPC_I386%%lib/fpc/%%PORTVERSION%%/ppc386
 %%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/ppcx64
 lib/fpc/%%PORTVERSION%%/samplecfg
@@ -93,6 +95,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/iso7185.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/iso7185.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbaseunix.a
@@ -121,6 +125,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgetopts.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpheaptrc.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpinitc.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpipc.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpiso7185.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpkeyboard.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplineinfo.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplnfodwrf.a