4 files changed, 75 insertions, 34 deletions

diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index ff75044218fe..cfc84faf71d8 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fpc
-PORTVERSION=	2.0.4
-PORTREVISION?=	1
+PORTVERSION=	2.2.0
+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=	${PORTNAME:S/$/build/}-${PORTVERSION}${EXTRACT_SUFX}:source
+DISTFILES=	${DISTNAME:S/$/.source/}${EXTRACT_SUFX}:source
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	acm@FreeBSD.org
@@ -33,21 +33,18 @@ MAKE_ENV=	PREFIX=${PREFIX} \
 		FPCTARGET=${BUILDNAME} \
 		OPT="${OPT}" \
 		BSDHIER=1
+OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		BUILDNAME=${BUILDNAME}
 SUB_FILES=	pkg-message
-FPCSRCDIR=	${PORTNAME:S/$/build_/}${PORTVERSION:S/$/_exp/}/${PORTNAME:S/$/src/}
+FPCSRCDIR=	${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
 .if !defined(PKGNAMESUFFIX)
 DISTFILES+=	${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
-MAKE_ENV+=	PP=${WRKDIR}/${PORTNAME:S/$/-bin/}/lib/${PORTNAME}/${PORTVERSION}/ppc386 \
-		FPCMAKE=${WRKDIR}/${PORTNAME:S/$/-bin/}/bin/fpcmake
+MAKE_ENV+=	PP=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/lib/${PORTNAME}/${PORTVERSION}/ppc386 \
+		FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake
 MAN1=	bin2obj.1 \
 	data2inc.1 \
 	delp.1 \
@@ -90,7 +87,7 @@ do-extract:
 		${WRKDIR}
 # unpack source distribution
 	@cd ${WRKDIR} && \
-		${GZIP_CMD} -dc ${_DISTDIR}/${PORTNAME:S/$/build/}-${PORTVERSION}${EXTRACT_SUFX} \
+		${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} \
 			| ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl
 
 do-build:
@@ -103,8 +100,8 @@ do-install:
       	# Installing fpc runtime
 	@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
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/man/man1/* ${MAN1PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/man/man5/* ${MAN1PREFIX}/man/man5
 
 post-install:
 	if [ -e "${PREFIX}/bin/ppc386" ]; then ${RM} -f "${PREFIX}/bin/ppc386"; fi
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 454e1317a7b7..e9e4fcf3e039 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:S/$/build_/}${PORTVERSION:S/$/_exp/}
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 UNITPREFIX=    		unit-
 UNITEXTRACT_SUFX=	.tar.gz
@@ -13,9 +13,9 @@ OPT=-CX
 MAKE_ENV+=	PP=${LOCALBASE}/bin/ppc386
 
 .if !exists(${LOCALBASE}/bin/fpcmake)
-EXTRACTUNITDIR+=	fpc-bin
+EXTRACTUNITDIR+=	${PORTNAME}-${PORTVERSION:S/$/.bin/}
 DISTFILES+=	${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
-MAKE_ENV+=	FPCMAKE=${WRKDIR}/${PORTNAME:S/$/-bin/}/bin/fpcmake
+MAKE_ENV+=	FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake
 .endif
 
 .if ${PKGNAMESUFFIX} == "-gdbint"
@@ -95,12 +95,10 @@ LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 HAVE_EXAMPLES=	true
 .endif
 
-.if ${PKGNAMESUFFIX} == "-fcl"
+.if ${PKGNAMESUFFIX} == "-fcl-db"
 OPT+=	-Fuunits/${ARCH}-freebsd -Fu../units/${ARCH}-freebsd \
-	-Fuxml/units/${ARCH}-freebsd -Fu../xml/units/${ARCH}-freebsd \
-	-Fudb/units/${ARCH}-freebsd -Fu../db/units/${ARCH}-freebsd \
-	-Fu../../units/${ARCH}-freebsd -Fu../passrc/units/${ARCH}-freebsd
-HAVE_EXAMPLES=	true
+	-Fu../src -Fu../../units/${ARCH}-freebsd -Fu../../../units/${ARCH}-freebsd
+HAVE_EXAMPLES=  true
 .endif
 
 .if ${PKGNAMESUFFIX} == "-fpgtk"
@@ -157,6 +155,18 @@ HAVE_EXAMPLES=	true
 HAVE_EXAMPLES=	true
 .endif
 
+.if ${PKGNAMESUFFIX} == "-httpd"
+.	if defined(WITH_APACHE12)
+USE_APACHE=	13
+.	endif
+.	if defined(WITH_APACHE20)
+USE_APACHE=	20
+.	endif
+.	if defined(WITH_APACHE22)
+USE_APACHE=	22
+.	endif
+.endif
+
 .if ${PKGNAMESUFFIX} == "-imlib"
 .	if defined(WITH_IMLIB)
 .include <${PORTSDIR}/Mk/bsd.gnome.mk>
@@ -164,6 +174,19 @@ USE_GNOME=	imlib
 .	endif
 .endif
 
+.if ${PKGNAMESUFFIX} == "-cairo"
+.	if defined(WITH_LIBCAIRO)
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-libcurl"
+.	if defined(WITH_LIBCURL)
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
 .if ${PKGNAMESUFFIX} == "-libgd"
 .	if defined(WITH_LIBGD)
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
@@ -193,6 +216,18 @@ LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 HAVE_EXAMPLES=	true
 .endif
 
+.if ${PKGNAMESUFFIX} == "-openssl"
+.       if defined(WITH_OPENSSL)
+USE_OPENSSL=	yes
+.       endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-pcap"
+.	if defined(WITH_LIBPCAP)
+LIB_DEPENDS=    pcap:${PORTSDIR}/net/libpcap
+.	endif
+.endif
+
 .if ${PKGNAMESUFFIX} == "-svgalib"
 .	if defined(WITH_SVGA)
 LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
@@ -260,10 +295,10 @@ security-check: fpc-check-install
 
 fpc-check-install:
 check-makevars::
-	@${ECHO_CMD} "*****************************************************************"
+	@${ECHO_CMD} "#################################################################"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} " The following freepascal unit will be installed in your system: "
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} " * ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}"
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "*****************************************************************"
+	@${ECHO_CMD} "#################################################################"
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index 0239a2c0760e..31dd69b3f38c 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (freepascal/fpc-2.2.0.source.tar.gz) = 870965d5352ef23dccc1cf277e6edfee
+SHA256 (freepascal/fpc-2.2.0.source.tar.gz) = 2176cb79076f357095554eacf9df02b4b4471e54fe7e0214f61c4fc94535957f
+SIZE (freepascal/fpc-2.2.0.source.tar.gz) = 20616222
+MD5 (freepascal/fpc-2.2.0.bin.tar.gz) = 998b0dcf38c414f9c62bf995e41e8069
+SHA256 (freepascal/fpc-2.2.0.bin.tar.gz) = 442f791cc047b549adc0b5a8ebc4718026d6043ccdef14f58d81f8f0c791ff86
+SIZE (freepascal/fpc-2.2.0.bin.tar.gz) = 7787026
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index 5f4939d20973..b997824ac432 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,10 +1,9 @@
-@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.7 2006-09-07 21:32:23 acm Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.8 2007-09-18 06:53:23 acm Exp $
 
 @unexec rm -f %D/etc/fpc.cfg > /dev/null 2>&1 || true
 bin/fpc
 bin/fpcmkcfg
 bin/fpcsubst
-bin/fppkg
 bin/ppudump
 bin/ppufiles
 bin/ppumove
@@ -12,6 +11,7 @@ bin/ppc386
 lib/fpc/%%PORTVERSION%%/msg/errorct.msg
 lib/fpc/%%PORTVERSION%%/msg/errord.msg
 lib/fpc/%%PORTVERSION%%/msg/errorda.msg
+lib/fpc/%%PORTVERSION%%/msg/errordu.msg
 lib/fpc/%%PORTVERSION%%/msg/errore.msg
 lib/fpc/%%PORTVERSION%%/msg/errores.msg
 lib/fpc/%%PORTVERSION%%/msg/errorf.msg
@@ -65,8 +65,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.ppu
 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/fgl.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.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
@@ -97,7 +99,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdl.a
 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/libpfgl.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfmtbcd.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfreebsd.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgetopts.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpheaptrc.a
@@ -105,6 +108,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpinitc.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpipc.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpkeyboard.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplineinfo.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplnfodwrf.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmacpas.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmath.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmatrix.a
@@ -117,6 +121,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpprinter.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libprtlconsts.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpserial.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsockets.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstdconvs.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstrings.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpstrutils.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsyscall.a
@@ -136,6 +141,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvariants.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvarutils.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpvideo.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpx86.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lnfodwrf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lnfodwrf.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lineinfo.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lineinfo.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/macpas.o
@@ -163,6 +170,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/serial.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/serial.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sockets.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sockets.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/stdconvs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/stdconvs.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strings.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strings.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strutils.o