10 files changed, 34 insertions, 38 deletions

diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index 171b4968894c..583061f5d444 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	base
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.4
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	fpc-
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 5dec3f4018f9..3dc1c462d290 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	docs
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.4
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \
 		ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/docs/ \
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index bb6cf3fc4815..0d88fe7dfc8f 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freepascal/doc-pdf.tar.gz) = b528d320adc5597883745bc27efecc1155e6445ca2480fb0d3b82209ef374151
-SIZE (freepascal/doc-pdf.tar.gz) = 7408440
+SHA256 (freepascal/doc-pdf.tar.gz) = 79db51937bab98e20a275ef7549d3a57d4f79ee6d101054b2eebe90191211f16
+SIZE (freepascal/doc-pdf.tar.gz) = 7393643
diff --git a/lang/fpc-lua/files/patch-Makefile b/lang/fpc-lua/files/patch-Makefile
deleted file mode 100644
index b3f56a58c0df..000000000000
--- a/lang/fpc-lua/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- packages/lua/Makefile	2010-04-22 22:04:10.000000000 +0100
-+++ packages/lua/Makefile	2010-04-22 22:04:29.000000000 +0100
-@@ -264,7 +264,7 @@
- UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
- endif
- PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
--override PACKAGE_NAME=bfd
-+override PACKAGE_NAME=lua
- override PACKAGE_VERSION=2.4.2
- ifeq ($(FULL_TARGET),i386-linux)
- override TARGET_UNITS+=lua lualib lauxlib
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 15b0d4dfc7ac..87d9cb50b674 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	units
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.4.4
 CATEGORIES=	lang
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	fpc-
diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist
index 1684ee560d8e..67e38f333e8a 100644
--- a/lang/fpc-utils/pkg-plist
+++ b/lang/fpc-utils/pkg-plist
@@ -2,6 +2,7 @@ bin/bin2obj
 bin/data2inc
 bin/delp
 bin/fpclasschart
+bin/fpcmkcfg
 bin/fpcres
 bin/fpdoc
 bin/fppkg
@@ -18,7 +19,6 @@ bin/rmcvsdir
 bin/rstconv
 bin/unitdiff
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/buildfppkg.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.ppu
@@ -32,7 +32,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgdownload.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfpmake.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/buildfppkg.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.o
@@ -46,7 +45,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgdownload.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfpmake.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpbuildfppkg.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgwget.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkglnet.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgrepos.a
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 25fb70733457..cb80232ccbe8 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fpc
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.4
 PORTREVISION?=	0
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
@@ -31,8 +31,8 @@ USE_GMAKE=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
-SUB_FILES=	pkg-message
 
+#OPT?=-Ur -CX
 OPT?=-CX
 FPCSRCDIR=	${PORTNAME}-${PORTVERSION}
 
@@ -51,6 +51,8 @@ PLIST_SUB=	FPC_I386="@comment " \
 .endif
 
 .if !defined(PKGNAMESUFFIX)
+SUB_FILES=	pkg-message
+
 BUILDNAME=	${FPC_ARCH}-freebsd
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		BUILDNAME=${BUILDNAME}
@@ -138,8 +140,8 @@ do-install:
 	# Installng fpcmake
 	@@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} install ${MAKE_ENV}
 	# Installing manpages
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.man/}/man/man1/* ${MAN1PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.man/}/man/man5/* ${MAN1PREFIX}/man/man5
+	${INSTALL_DATA} ${WRKDIR}/man/man1/* ${MAN1PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKDIR}/man/man5/* ${MAN1PREFIX}/man/man5
 
 post-install:
 	if [ -e "${PREFIX}/bin/${PPNAME}" ]; then ${RM} -f "${PREFIX}/bin/${PPNAME}"; fi
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 8a64241a8b30..73aeaa5de693 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -5,6 +5,7 @@ PLIST_SUB+=		PORTVERSION=${PORTVERSION} \
 
 PLIST=			${.CURDIR}/pkg-plist
 PATCHDIR=		${.CURDIR}/files
+FILESDIR=		${.CURDIR}/files
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 UNITPREFIX=    		unit-
@@ -94,6 +95,11 @@ OPT+=	-Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \
 OPT+=	-Fu${WRKDIR}/${WRKUNITDIR}/*
 .endif
 
+.if ${PKGNAMESUFFIX} == "-fcl-web"
+OPT+=	-Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \
+	-Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME}
+.endif
+
 .if ${PKGNAMESUFFIX} == "-fpgtk"
 .	if defined(WITH_GTK1)
 .include <${PORTSDIR}/Mk/bsd.gnome.mk>
@@ -352,10 +358,13 @@ LIB_DEPENDS=	Hermes:${PORTSDIR}/graphics/Hermes
 post-extract:
 	@cd ${WRKDIR}/${WRKUNITDIR} && \
 		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
+.if ${PKGNAMESUFFIX} == "-fpvectorial"
+	@${CP} ${FILESDIR}/fpvutils.pas ${WRKDIR}/${WRKUNITDIR}/src
+.endif
 
 post-patch:
 .if ${PKGNAMESUFFIX} == "-utils"
-	@${REINPLACE_CMD} -e 's|fpcm||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \
+	@${REINPLACE_CMD} -e 's|fpcm ||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \
 		${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
 .endif
 
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index 5ab58a609884..f827c86bbea3 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,8 +1,8 @@
-SHA256 (freepascal/fpc-2.4.2.source.tar.gz) = ecbc7be56633ec80338ff25682a0ac644f9c0ead769cd573d0cda9d3f4343ca1
-SIZE (freepascal/fpc-2.4.2.source.tar.gz) = 25278167
-SHA256 (freepascal/ppc386-2.4.2-freebsd.tar.gz) = 2647f5967bd84f3c91bb445e1ef093ae3518c6c8dbcb2155b469e95301c0e36d
-SIZE (freepascal/ppc386-2.4.2-freebsd.tar.gz) = 847877
-SHA256 (freepascal/ppcx64-2.4.2-freebsd.tar.gz) = a2e72b1df65c337c9fc4319df53754b0c6a8f9ffd3728878c5c99e04e5577dc1
-SIZE (freepascal/ppcx64-2.4.2-freebsd.tar.gz) = 856404
-SHA256 (freepascal/fpc-2.4.2.man.tar.gz) = 5fe8a7b601586d722254b93b3aa7036e28ae522ad92b9e105063ed9814b4a55e
-SIZE (freepascal/fpc-2.4.2.man.tar.gz) = 30504
+SHA256 (freepascal/fpc-2.4.4.source.tar.gz) = eea053f8440f5e8db6295a72b11be65d69bd2bc90a38136e1fa947ab2785f677
+SIZE (freepascal/fpc-2.4.4.source.tar.gz) = 26144591
+SHA256 (freepascal/ppc386-2.4.4-freebsd.tar.gz) = afee76f5b260942c2b508a4228c93bd5a14dcf3b34084c9cabbc41c8bfc7a30b
+SIZE (freepascal/ppc386-2.4.4-freebsd.tar.gz) = 849445
+SHA256 (freepascal/ppcx64-2.4.4-freebsd.tar.gz) = a437941c468c553c261d81e006cdec026759f7382ae8dcfbb495a91922897e79
+SIZE (freepascal/ppcx64-2.4.4-freebsd.tar.gz) = 859847
+SHA256 (freepascal/fpc-2.4.4.man.tar.gz) = 0c362d0b065eb0af28f0506bfc2bee81e2fe8a4ec00fe86632a84b60f04db964
+SIZE (freepascal/fpc-2.4.4.man.tar.gz) = 31414
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index bdb49eb2999e..fa81a2b591cc 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,11 +1,10 @@
-@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.12 2010-08-16 17:45:10 acm Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.13 2011-06-23 05:05:26 acm Exp $
 
 @unexec if cmp -s %D/etc/fpc.cfg.sample %D/etc/fpc.cfg; then rm -f %D/etc/fpc.cfg; fi
 etc/fpc.cfg.sample
 @exec if [ ! -f %D/etc/fpc.cfg ] ; then cp -p %D/%F %B/fpc.cfg; fi
 bin/fpc
 bin/fpcmake
-bin/fpcmkcfg
 bin/fpcsubst
 bin/mkarmins
 bin/mkx86ins
@@ -52,8 +51,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/console.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/convutils.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/convutils.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cprt0.o
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.o
@@ -103,7 +102,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclocale.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcmem.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconsole.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconvutils.a
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcpu.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcpu.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcrt.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcthreads.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpctypes.a