- Update to 2.0.4

- Add new dependencies to editors/lazarus

Approved by:	garga (mentor,implicit)

3 files changed, 21 insertions, 16 deletions

diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile
index da1ec3024333..ababab9f5076 100644
--- a/editors/fpc-ide/Makefile
+++ b/editors/fpc-ide/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	editors lang
 PKGNAMESUFFIX=	-ide
 
@@ -15,9 +15,10 @@ COMMENT=	Free Pascal integrated IDE/compiler
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils \
 		${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}/md5/Package.fpc:${PORTSDIR}/security/fpc-md5 \
+		${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash \
 		${UNITSDIR}/mysql/Package.fpc:${PORTSDIR}/databases/fpc-mysql \
 		${UNITSDIR}/netdb/Package.fpc:${PORTSDIR}/net/fpc-netdb \
 		${UNITSDIR}/odbc/Package.fpc:${PORTSDIR}/databases/fpc-odbc \
@@ -34,7 +35,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 UNITPREFIX=	# none
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+=	${WRKUNITDIR} ${PORTNAME}/compiler ${PORTNAME}/rtl ${PORTNAME}/fv
+WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${PORTNAME}/fv
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index c30429095bf6..518e921f057e 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -7,11 +7,12 @@
 
 PORTNAME=	lazarus
 PORTVERSION=	0.9.16
+PORTREVISION=	1
 CATEGORIES=	devel editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${PORTNAME}-${PORTVERSION:S/$/-0/}${EXTRACT_SUFX} \
-		fpc-${FPC_MINVER:S/$/.source/}${EXTRACT_SUFX}
+		fpcbuild-${FPC_MINVER}${EXTRACT_SUFX}
 DIST_SUBDIR=	freepascal
 
 MAINTAINER=	acm@FreeBSD.org
@@ -28,23 +29,25 @@ USE_GNOME=	gtk12 gdkpixbuf
 USE_GMAKE=	yes
 
 MAKE_ENV=	OPT="-Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib -Fl${X11BASE}/lib"
-EXTRACT_AFTER_ARGS=	| ${TAR} xf - fpc/fcl/image fpc/fcl/inc lazarus
+EXTRACT_AFTER_ARGS=	| ${TAR} xf - ${FPCSRCDIR}/fcl/image ${FPCSRCDIR}/fcl/inc lazarus
+FPCSRCDIR=	fpcbuild_${FPC_MINVER:S/$/_exp/}/fpcsrc
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
 BUILDNAME=	${ARCH}-freebsd
-FPC_MINVER=	2.0.2
+FPC_MINVER=	2.0.4
 UNITSDIR=	${LOCALBASE}/lib/fpc/${FPC_MINVER}/units/${BUILDNAME}
-BASE_UNITS=	GDBINT IBASE LIBASYNC MD5 MYSQL NETDB ODBC ORACLE \
+BASE_UNITS=	GDBINT GRAPH IBASE LIBASYNC HASH MYSQL NETDB ODBC ORACLE \
 		PASJPEG PASZLIB PTHREADS POSTGRES REGEXPR SQLITE
-ALL_UNITS=	${BASE_UNITS} BFD FCL FORMS FPGTK FV GCONF GDBM GGI GNOME GTK GTK2 \
+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
 
 # Base units
 GDBINT_UNIT=	devel/fpc-gdbint
+GRAPH_UNIT=	graphics/fpc-graph
 IBASE_UNIT=	databases/fpc-ibase
 LIBASYNC_UNIT=	net/fpc-libasync
-MD5_UNIT=	security/fpc-md5
+HASH_UNIT=	security/fpc-hash
 MYSQL_UNIT=	databases/fpc-mysql
 NETDB_UNIT=	net/fpc-netdb
 ODBC_UNIT=	databases/fpc-odbc
@@ -59,6 +62,7 @@ SQLITE_UNIT=	databases/fpc-sqlite
 # Extra units
 BFD_UNIT=	devel/fpc-bfd
 FCL_UNIT=	devel/fpc-fcl
+FFTW_UNIT=	math/fpc-fftw
 FORMS_UNIT=	x11-toolkits/fpc-forms
 FPGTK_UNIT=	graphics/fpc-fpgtk
 FV_UNIT=	devel/fpc-fv
@@ -89,9 +93,9 @@ BUILD_DEPENDS+=	${UNITSDIR}/${OPT:L}/Package.fpc:${PORTSDIR}/${${OPT}_UNIT}
 .endfor
 
 post-extract:
-	${CP} ${WRKDIR}/fpc/fcl/inc/zstream.pp ${WRKSRC}/lcl && \
-		${CP} ${WRKDIR}/fpc/fcl/image/fpreadpng.pp \
-			${WRKDIR}/fpc/fcl/image/fpwritepng.pp ${WRKSRC}/lcl
+	${CP} ${WRKDIR}/${FPCSRCDIR}/fcl/inc/zstream.pp ${WRKSRC}/lcl && \
+		${CP} ${WRKDIR}/${FPCSRCDIR}/fcl/image/fpreadpng.pp \
+			${WRKDIR}/${FPCSRCDIR}/fcl/image/fpwritepng.pp ${WRKSRC}/lcl
 
 post-depends:
 .if exists(${LOCALBASE}/bin/fpc)
diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo
index 55db376763f6..9e1c8df5c322 100644
--- a/editors/lazarus/distinfo
+++ b/editors/lazarus/distinfo
@@ -1,6 +1,6 @@
 MD5 (freepascal/lazarus-0.9.16-0.tar.gz) = 6ad709b389856c0514e94b52a0aaf344
 SHA256 (freepascal/lazarus-0.9.16-0.tar.gz) = e2f920f7af0549a76d6a5ae5b68542c11b4f350e1f05e4dccc81fc3872c63b00
 SIZE (freepascal/lazarus-0.9.16-0.tar.gz) = 9655279
-MD5 (freepascal/fpc-2.0.2.source.tar.gz) = 0a48954021273fec6b7fdba9038acdcc
-SHA256 (freepascal/fpc-2.0.2.source.tar.gz) = b49a9044392484b7fe54163ab6e5fa7cb4fb47c8851c6934edadfb0de0796cc3
-SIZE (freepascal/fpc-2.0.2.source.tar.gz) = 13404431
+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