4 files changed, 30 insertions, 22 deletions

diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 4e4042333345..21a49995ec2a 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fpc
-PORTVERSION=	2.0.2
-PORTREVISION?=	1
+PORTVERSION=	2.0.4
+PORTREVISION?=	0
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
 		ftp://planetmirror.com/pub/fpc/dist/source-${PORTVERSION}/:source \
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:sourc
 		${MASTER_SITE_LOCAL:S|$|acm/freepascal/:bin|}
 MASTER_SITE_SUBDIR=	freepascal
 DISTNAME=	${PORTNAME}-${PORTVERSION}
-DISTFILES=	${DISTNAME:S/$/.source/}${EXTRACT_SUFX}:source
+DISTFILES=	${PORTNAME:S/$/build/}-${PORTVERSION}${EXTRACT_SUFX}:source
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	acm@FreeBSD.org
@@ -36,11 +36,12 @@ MAKE_ENV=	PREFIX=${PREFIX} \
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		BUILDNAME=${BUILDNAME}
 SUB_FILES=	pkg-message
+FPCSRCDIR=	${PORTNAME:S/$/build_/}${PORTVERSION:S/$/_exp/}/${PORTNAME:S/$/src/}
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=	does not compile
+BROKEN=		does not compile
 .endif
 
 .if !defined(PKGNAMESUFFIX)
@@ -51,10 +52,12 @@ MAN1=	bin2obj.1 \
 	data2inc.1 \
 	delp.1 \
 	fd2pascal.1 \
+	fp.1 \
 	fpc.1 \
 	fpcmake.1 \
 	fpdoc.1 \
 	fprcp.1 \
+	grab_vcsa.1 \
 	h2pas.1 \
 	h2paspp.1 \
 	makeskel.1 \
@@ -87,20 +90,18 @@ do-extract:
 		${WRKDIR}
 # unpack source distribution
 	@cd ${WRKDIR} && \
-		${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} \
-			| ${TAR} xf - ${PORTNAME}/compiler ${PORTNAME}/rtl
+		${GZIP_CMD} -dc ${_DISTDIR}/${PORTNAME:S/$/build/}-${PORTVERSION}${EXTRACT_SUFX} \
+			| ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl
 
 do-build:
 # build fpc compiler
-	@cd ${WRKDIR}/${PORTNAME}/compiler && ${GMAKE} cycle ${MAKE_ENV}
-# build fpc runtime
-#	@cd ${WRKDIR}/${PORTNAME}/rtl && ${GMAKE} all ${MAKE_ENV}
+	@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} cycle ${MAKE_ENV}
 
 do-install:
 	# Installing fpc compiler
-	@cd ${WRKDIR}/${PORTNAME}/rtl && ${GMAKE} install ${MAKE_ENV}
+	@cd ${WRKDIR}/${FPCSRCDIR}/rtl && ${GMAKE} install ${MAKE_ENV}
       	# Installing fpc runtime
-	@cd ${WRKDIR}/${PORTNAME}/compiler && ${GMAKE} install ${MAKE_ENV}
+	@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} install ${MAKE_ENV}
 	# Installing manpages
 	${INSTALL_DATA} ${WRKDIR}/fpc-bin/man/man1/* ${MAN1PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKDIR}/fpc-bin/man/man5/* ${MAN1PREFIX}/man/man5
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index d683f80ef3f6..1ec3e57344cd 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -1,6 +1,6 @@
 PLIST=	${.CURDIR}/pkg-plist
 PATCHDIR=	${.CURDIR}/files
-WRKSRC=	${WRKDIR}/${PORTNAME}
+WRKSRC=	${WRKDIR}/${PORTNAME:S/$/build_/}${PORTVERSION:S/$/_exp/}
 
 UNITPREFIX=    		unit-
 UNITEXTRACT_SUFX=	.tar.gz
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index 12f100cdf84a..0239a2c0760e 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,6 +1,6 @@
-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/fpc-2.0.2.bin.tar.gz) = 026cf7313d6c8e66fdbb50720f1bb7ee
-SHA256 (freepascal/fpc-2.0.2.bin.tar.gz) = 8ca1018d20da019c24cfe250a1b65dcd299c8074f57589a869af4284c21838a0
-SIZE (freepascal/fpc-2.0.2.bin.tar.gz) = 7035128
+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
+MD5 (freepascal/fpc-2.0.4.bin.tar.gz) = f3a837ef02edc534a0f2e82a4593672b
+SHA256 (freepascal/fpc-2.0.4.bin.tar.gz) = 0e5dc03bbdba55e368e2fef08362a7d9f1f92e0f02a27fdcfa9598d724c9d3fb
+SIZE (freepascal/fpc-2.0.4.bin.tar.gz) = 4894031
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index 3b4f3411d814..5f4939d20973 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.6 2006-07-24 11:21:24 acm Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.7 2006-09-07 21:32:23 acm Exp $
 
 @unexec rm -f %D/etc/fpc.cfg > /dev/null 2>&1 || true
 bin/fpc
@@ -11,10 +11,14 @@ bin/ppumove
 bin/ppc386
 lib/fpc/%%PORTVERSION%%/msg/errorct.msg
 lib/fpc/%%PORTVERSION%%/msg/errord.msg
+lib/fpc/%%PORTVERSION%%/msg/errorda.msg
 lib/fpc/%%PORTVERSION%%/msg/errore.msg
 lib/fpc/%%PORTVERSION%%/msg/errores.msg
 lib/fpc/%%PORTVERSION%%/msg/errorf.msg
+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/errorn.msg
 lib/fpc/%%PORTVERSION%%/msg/errorpl.msg
 lib/fpc/%%PORTVERSION%%/msg/errorpli.msg
@@ -28,6 +32,8 @@ lib/fpc/%%PORTVERSION%%/samplecfg
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/baseunix.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/baseunix.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/bsd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/bsd.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.o
@@ -61,11 +67,11 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpmkunit.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpmkunit.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/getopts.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/getopts.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/gprt0.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/graph.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/graph.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/heaptrc.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/heaptrc.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.o
@@ -75,6 +81,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.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
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbsd.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclasses.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcmem.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconsole.a
@@ -91,8 +98,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdos.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdynlibs.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libperrors.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfpmkunit.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfreebsd.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgetopts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgraph.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