4 files changed, 32 insertions, 14 deletions

diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index b7163dd9ef29..f5c3f74a6193 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fpc
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.4
 PORTREVISION?=	0
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
@@ -16,6 +16,7 @@ MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:sourc
 		ftp://ftp.no.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
 		ftp://ftp.us.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
 		${MASTER_SITE_SOURCEFORGE}:source \
+		${MASTER_SITE_GOOGLE_CODE}:bin \
 		${MASTER_SITE_LOCAL:S|$|acm/freepascal/:bin|}
 MASTER_SITE_SUBDIR=	freepascal
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -25,6 +26,7 @@ DIST_SUBDIR=	freepascal
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	Free Pascal compiler with Turbo and Delphi
 
+PROJECTHOST=	bsdistfiles
 USE_GMAKE=	yes
 ONLY_FOR_ARCHS=	i386
 
@@ -48,18 +50,25 @@ MAKE_ENV+=	PP=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/lib/${PORTNAME}/${P
 		BSDHIER=1
 
 MAN1=	bin2obj.1 \
+	chmcmd.1 \
+	chmls.1 \
 	data2inc.1 \
 	delp.1 \
 	fd2pascal.1 \
 	fp.1 \
 	fpc.1 \
 	fpcmake.1 \
+	fpcmkcfg.1 \
 	fpdoc.1 \
 	fprcp.1 \
+	fpcres.1 \
+	fpcsubst.1 \
+	fppkg.1 \
 	grab_vcsa.1 \
 	h2pas.1 \
 	h2paspp.1 \
 	makeskel.1 \
+	mkxmlrpc.1 \
 	plex.1 \
 	postw32.1 \
 	ppc386.1 \
@@ -73,6 +82,7 @@ MAN1=	bin2obj.1 \
 	ppumove.1 \
 	ptop.1 \
 	pyacc.1 \
+	rmcvsdir.1 \
 	rstconv.1 \
 	unitdiff.1
 MAN5=	fpc.cfg.5 fpcmake.5 ptop.cfg.5
@@ -87,6 +97,10 @@ do-extract:
 		${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} \
 			| ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/utils/fpcm
 
+post-patch:
+# patch fpc rtl
+	@${REINPLACE_CMD} -i "" -e 's|504000|${OSVERSION}|g' ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${ARCH}/cprt0.as
+
 do-build:
 # build fpc compiler
 	@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} cycle ${MAKE_ENV}
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index d58ba73ac76c..9ed7ffa4ff51 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -231,6 +231,10 @@ USE_XLIB=	yes
 .	endif
 .endif
 
+.if ${PKGNAMESUFFIX} == "-iconvenc"
+USE_ICONV=	yes
+.endif
+
 post-extract:
 	@cd ${WRKDIR}/${WRKUNITDIR} && \
 		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index d15033505743..6aae983bda49 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,6 +1,6 @@
-MD5 (freepascal/fpc-2.2.2.source.tar.gz) = a4e2dd83fe8b5ccaecb3f22b8604abbc
-SHA256 (freepascal/fpc-2.2.2.source.tar.gz) = 33390c715b4d93d8380df5c5c25c4e5f181c2b830e60be54373d2bbac5f7543f
-SIZE (freepascal/fpc-2.2.2.source.tar.gz) = 22329435
-MD5 (freepascal/fpc-2.2.2.bin.tar.gz) = 4747acc862f0bd7497dcf6d6481cfdca
-SHA256 (freepascal/fpc-2.2.2.bin.tar.gz) = 8e0c3cf0b6852f021242603d98885865769efa248a0b4e2dbe1b85c12f465e81
-SIZE (freepascal/fpc-2.2.2.bin.tar.gz) = 8438137
+MD5 (freepascal/fpc-2.2.4.source.tar.gz) = ba75e0942f6ff6acc94f66ef2cc0a54e
+SHA256 (freepascal/fpc-2.2.4.source.tar.gz) = 40756e9eef16b68a4628dd2225e8eacee9a2e4c2015e4db59d2ef9319a0067c8
+SIZE (freepascal/fpc-2.2.4.source.tar.gz) = 22851265
+MD5 (freepascal/fpc-2.2.4.bin.tar.gz) = 249fb81a82585114c4213db45113af5d
+SHA256 (freepascal/fpc-2.2.4.bin.tar.gz) = c0f7c4dcedd95d172f6d24c4f1e3e66c460c0b32c655b8b46e2a30a350099cf5
+SIZE (freepascal/fpc-2.2.4.bin.tar.gz) = 8773896
diff --git a/lang/fpc/files/patch-compiler-utils_samplecfg b/lang/fpc/files/patch-compiler-utils_samplecfg
index 29d81563f18d..cdac9ea6a5b9 100644
--- a/lang/fpc/files/patch-compiler-utils_samplecfg
+++ b/lang/fpc/files/patch-compiler-utils_samplecfg
@@ -1,11 +1,11 @@
---- compiler/utils/samplecfg	2008-06-04 13:06:36.000000000 -0500
-+++ compiler/utils/samplecfg	2009-01-06 22:35:23.000000000 -0500
-@@ -50,7 +50,7 @@
- # Detect if we have write permission in root.
+--- compiler/utils/samplecfg	2009-02-28 17:54:01.000000000 -0500
++++ compiler/utils/samplecfg	2009-04-26 13:53:57.000000000 -0500
+@@ -55,7 +55,7 @@
+ # Detect if we have write permission in sysdir.
  if [ -w "$sysdir" ] ; then
    echo Write permission in $sysdir.
--  thefile="$sysdir"/fpc.cfg
-+  thefile="$sysdir"/fpc.cfg.sample
+-  fpccfgfile="$sysdir"/fpc.cfg
++  fpccfgfile="$sysdir"/fpc.cfg.sample
  else
    echo No write premission in $sysdir.
-   thefile="$HOME"/.fpc.cfg
+   fpccfgfile="$HOME"/.fpc.cfg