- Update to 2.0.4

- Add new dependencies to editors/lazarus

Approved by:	garga (mentor,implicit)

10 files changed, 26 insertions, 28 deletions

diff --git a/graphics/fpc-fpgtk/Makefile b/graphics/fpc-fpgtk/Makefile
index d26fc513b8e3..375f2d193615 100644
--- a/graphics/fpc-fpgtk/Makefile
+++ b/graphics/fpc-fpgtk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-fpgtk
 
@@ -16,9 +16,10 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils \
 		${UNITSDIR}/fcl/Package.fpc:${PORTSDIR}/devel/fpc-fcl \
 		${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 \
@@ -37,7 +38,7 @@ USE_GNOME=	gtk12
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-ggi/Makefile b/graphics/fpc-ggi/Makefile
index 653a47a4683a..bc528fd0c6d6 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
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 LIB_DEPENDS=	ggi:${PORTSDIR}/graphics/libggi
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/graphics/fpc-imlib/Makefile b/graphics/fpc-imlib/Makefile
index 6161500694b8..1959af0991b8 100644
--- a/graphics/fpc-imlib/Makefile
+++ b/graphics/fpc-imlib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imlib
 
@@ -22,7 +22,7 @@ USE_GNOME=	imlib
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile
index 43ff518ca2bf..f98116dd4dd2 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
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile
index 814c0c0fb6a1..5fb6bc484aa1 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
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-ncurses/Makefile b/graphics/fpc-ncurses/Makefile
index 61726f92ee24..a9a3412f6beb 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
 
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index 16da950ca73a..821c75f14ac9 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
 
@@ -21,7 +21,7 @@ USE_GL=	yes
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/graphics/fpc-opengl/pkg-plist b/graphics/fpc-opengl/pkg-plist
index d0d6afac8881..5e182c0aff09 100644
--- a/graphics/fpc-opengl/pkg-plist
+++ b/graphics/fpc-opengl/pkg-plist
@@ -1,21 +1,18 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/gl.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/gl.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glu.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glut.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glext.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glext.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/dllfuncs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/gl.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glu.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glu.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glut.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/dllfuncs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glut.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glx.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpgl.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglext.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglu.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglut.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglext.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpdllfuncs.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglx.a
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemo.pp
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/morph3d.pp
diff --git a/graphics/fpc-pasjpeg/Makefile b/graphics/fpc-pasjpeg/Makefile
index c5832cb2510e..76033512fca5 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
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile
index 0898e8e0a1c4..f5fc1f47a577 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
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true