- Update to 2.0.4

- Add new dependencies to editors/lazarus

Approved by:	garga (mentor,implicit)

2 files changed, 28 insertions, 32 deletions

diff --git a/archivers/fpc-paszlib/Makefile b/archivers/fpc-paszlib/Makefile
index af5237b35202..1262e3ed1fda 100644
--- a/archivers/fpc-paszlib/Makefile
+++ b/archivers/fpc-paszlib/Makefile
@@ -5,17 +5,19 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	archivers devel
 PKGNAMESUFFIX=	-paszlib
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal unit for native compression IO
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash
 
+UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/archivers/fpc-paszlib/pkg-plist b/archivers/fpc-paszlib/pkg-plist
index bdc0d5424cda..216f4bc18b57 100644
--- a/archivers/fpc-paszlib/pkg-plist
+++ b/archivers/fpc-paszlib/pkg-plist
@@ -1,52 +1,46 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzcrc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzcrc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zutil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libppaszlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpadler.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpgzcrc.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpgzio.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfblock.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfcodes.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinffast.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinftrees.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfutil.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libppaszlib.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libptrees.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzbase.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzcompres.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzdeflate.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzinflate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzbase.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzuncompr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzutil.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.ppu
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/paszlib/minigzip.pas
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/paszlib/example.pas
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib