1 files changed, 26 insertions, 9 deletions

diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index e8932ab69e87..c1ca588aea8f 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lazarus
 PORTVERSION=	0.9.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/$/-0/}
@@ -32,13 +32,15 @@ PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 BUILDNAME=	${ARCH}-freebsd
-FPC_MINVER=	2.0.4
+FPC_MINVER=	2.2.0
 UNITSDIR=	${LOCALBASE}/lib/fpc/${FPC_MINVER}/units/${BUILDNAME}
-BASE_UNITS=	GDBINT GRAPH IBASE LIBASYNC HASH MYSQL NETDB ODBC ORACLE \
+BASE_UNITS=	GDBINT GRAPH IBASE LIBASYNC HASH HTTPD MYSQL NETDB ODBC ORACLE \
 		PASJPEG PASZLIB PTHREADS POSTGRES REGEXPR SQLITE
-ALL_UNITS=	${BASE_UNITS} 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_UNITS=	${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
 
 # Base units
 GDBINT_UNIT=	devel/fpc-gdbint
@@ -46,6 +48,7 @@ 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
 MYSQL_UNIT=	databases/fpc-mysql
 NETDB_UNIT=	net/fpc-netdb
 ODBC_UNIT=	databases/fpc-odbc
@@ -59,8 +62,18 @@ SQLITE_UNIT=	databases/fpc-sqlite
 
 # Extra units
 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
@@ -70,11 +83,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
@@ -84,7 +101,7 @@ X11_UNIT=	x11/fpc-x11
 ZLIB_UNIT=	devel/fpc-zlib
 ZVT_UNIT=	x11-toolkits/fpc-zvt
 
-OPTIONS=	GTK2	"Use gtk20 interface instead of gtk12" off \
+OPTIONS=	GTK2	"Use gtk20 interface instead of gtk12"	off \
 		BIGIDE	"Compile additional components"	off
 
 .include <bsd.port.pre.mk>
@@ -102,7 +119,7 @@ LAZARUS_TARGET=	bigide lazbuilder
 .endif
 
 .for OPT in ${ALL_UNITS}
-BUILD_DEPENDS+=	${UNITSDIR}/${OPT:L}/Package.fpc:${PORTSDIR}/${${OPT}_UNIT}
+BUILD_DEPENDS+=	${UNITSDIR}/${OPT:L:S/httpd/httpd-1.3/}/Package.fpc:${PORTSDIR}/${${OPT:S/-/_/}_UNIT}
 .endfor
 
 post-depends: