aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.fpc.mk5
-rw-r--r--devel/fpc-fcl-async/Makefile2
-rw-r--r--devel/fpc-fcl-base/pkg-plist3
-rw-r--r--devel/fpc-fcl-db/pkg-plist71
-rw-r--r--devel/fpc-fcl-image/pkg-plist29
-rw-r--r--devel/fpc-fcl-web/Makefile4
-rw-r--r--devel/fpc-fcl-web/pkg-plist3
-rw-r--r--ftp/fpc-libcurl/Makefile2
-rw-r--r--graphics/fpc-opengl/Makefile2
-rw-r--r--lang/fpc-base/Makefile3
-rw-r--r--lang/fpc-docs/Makefile14
-rw-r--r--lang/fpc-docs/distinfo6
-rw-r--r--lang/fpc-units/Makefile6
-rw-r--r--lang/fpc-utils/pkg-plist1
-rw-r--r--lang/fpc/Makefile16
-rw-r--r--lang/fpc/Makefile.units4
-rw-r--r--lang/fpc/distinfo12
-rw-r--r--lang/fpc/files/patch-compiler-utils_samplecfg14
-rw-r--r--misc/fpc-chm/pkg-plist6
-rw-r--r--sysutils/fpc-users/pkg-plist22
-rw-r--r--x11-toolkits/fpc-gtk1/Makefile2
-rw-r--r--x11-toolkits/fpc-gtk2/Makefile2
-rw-r--r--x11-toolkits/fpc-gtk2/files/patch-packages-gtk2-src-gtk+-gtk_gtkfilesystem.inc53
-rw-r--r--x11-toolkits/fpc-gtk2/pkg-plist3
24 files changed, 142 insertions, 143 deletions
diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
index 81feb7d94eb0..2a204d773fc5 100644
--- a/Mk/bsd.fpc.mk
+++ b/Mk/bsd.fpc.mk
@@ -30,7 +30,7 @@ _FPCMKINCLUDED= yes
FPC_Include_MAINTAINER= acm@FreeBSD.org
FPC_Pre_Include= bsd.fpc.mk
-DEFAULT_FPC_VER= 2.2.2
+DEFAULT_FPC_VER= 2.2.4
FPC_VER= ${DEFAULT_FPC_VER}
.if exists(${LOCALBASE}/bin/fpc)
@@ -58,7 +58,7 @@ check-makevars::
_FPC_ALL_UNITS= aspell bfd cairo chm fcl-async fcl-base fcl-db fcl-fpcunit fcl-image \
fcl-json fcl-net fcl-passrc fcl-process fcl-registry fcl-web fcl-xml fftw \
fpmkunit fpgtk fv gdbint gdbm ggi gnome1 graph gtk1 gtk2 hash httpd13 httpd20 \
- httpd22 ibase imagemagick imlib libcurl libgd libpng mysql ncurses numlib \
+ httpd22 ibase iconvenc imagemagick imlib libcurl libgd libpng mysql ncurses numlib \
odbc opengl openssl oracle pasjpeg paszlib pcap postgres pthreads pxlib \
regexpr sdl sqlite svgalib symbolic syslog tcl unzip users utmp x11 xforms \
zlib
@@ -131,6 +131,7 @@ ggi_UNIT= graphics/fpc-ggi
gnome1_UNIT= x11-toolkits/fpc-gnome1
gtk1_UNIT= x11-toolkits/fpc-gtk1
gtk2_UNIT= x11-toolkits/fpc-gtk2
+iconvenc_UNIT= converters/fpc-iconvenc
imagemagick_UNIT= graphics/fpc-imagemagick
imlib_UNIT= graphics/fpc-imlib
libcurl_UNIT= ftp/fpc-libcurl
diff --git a/devel/fpc-fcl-async/Makefile b/devel/fpc-fcl-async/Makefile
index 7d52b512c708..c2400de0905f 100644
--- a/devel/fpc-fcl-async/Makefile
+++ b/devel/fpc-fcl-async/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-async
diff --git a/devel/fpc-fcl-base/pkg-plist b/devel/fpc-fcl-base/pkg-plist
index 12058870d724..e23a76e2f169 100644
--- a/devel/fpc-fcl-base/pkg-plist
+++ b/devel/fpc-fcl-base/pkg-plist
@@ -24,6 +24,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/daemonapp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.ppu
@@ -52,6 +53,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/daemonapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.o
@@ -80,6 +82,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libppooledmm.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libplibtar.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamcoll.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpmaskutils.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfpexprpars.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpsyncobjs.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpdaemonapp.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptimer.a
diff --git a/devel/fpc-fcl-db/pkg-plist b/devel/fpc-fcl-db/pkg-plist
index 4a87fa91befe..097c19008569 100644
--- a/devel/fpc-fcl-db/pkg-plist
+++ b/devel/fpc-fcl-db/pkg-plist
@@ -36,58 +36,61 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3conn.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbconst.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdb.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbwhtml.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset_parser.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbcoll.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlscript.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbconst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbwhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset_parser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbcoll.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_wtil.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_collate.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_common.a
@@ -147,6 +150,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfptexexport.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfprtfexport.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpstdexports.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.ppu
@@ -159,6 +163,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.o
@@ -171,6 +176,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdatadict.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddiff.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddbf.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqldb.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddfb.a
@@ -187,16 +193,19 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddcodegen.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgcreatedbf.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgdbcoll.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgsqlconst.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgtiopf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpopcode.a
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
@dirrmtry lib/fpc/%%PORTVERSION%%/units
diff --git a/devel/fpc-fcl-image/pkg-plist b/devel/fpc-fcl-image/pkg-plist
index 5058c4219d82..df1751968f8a 100644
--- a/devel/fpc-fcl-image/pkg-plist
+++ b/devel/fpc-fcl-image/pkg-plist
@@ -1,10 +1,4 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepcx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppcxcomn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpcx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritepcx.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.ppu
@@ -25,6 +19,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpnm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepnm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadjpeg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritejpeg.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepcx.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fptiffcmn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtiff.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetiff.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/targacmn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtga.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetga.ppu
@@ -36,9 +36,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepcx.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.o
@@ -59,6 +56,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpnm.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepnm.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadjpeg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritejpeg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepcx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fptiffcmn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtiff.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetiff.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/targacmn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtga.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetga.o
@@ -90,15 +93,21 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpnm.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritepnm.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadjpeg.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritejpeg.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppcxcomn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpcx.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritepcx.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfptiffcmn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadtiff.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritetiff.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libptargacmn.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadtga.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritetga.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpellipses.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpcolhash.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfreetypeh.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpditherer.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpquantizer.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpextinterpolation.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfreetypeh.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfreetype.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpftfont.a
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image
diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile
index 42bc9bb85dd6..ba1f7f53ef44 100644
--- a/devel/fpc-fcl-web/Makefile
+++ b/devel/fpc-fcl-web/Makefile
@@ -12,8 +12,8 @@ PKGNAMESUFFIX= -fcl-web
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-USE_FPC= fcl-async fcl-base fcl-db fcl-process fcl-xml hash ibase mysql odbc \
- oracle paszlib postgres pthreads sqlite
+USE_FPC= fcl-async fcl-base fcl-db fcl-process fcl-xml hash httpd13 httpd20 \
+ httpd22 ibase mysql odbc oracle paszlib postgres pthreads sqlite
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-web/pkg-plist b/devel/fpc-fcl-web/pkg-plist
index d52ea51a6cb3..6b2de3e8d60e 100644
--- a/devel/fpc-fcl-web/pkg-plist
+++ b/devel/fpc-fcl-web/pkg-plist
@@ -4,6 +4,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fptemplate.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.ppu
@@ -16,6 +17,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fptemplate.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.o
@@ -23,6 +25,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpapache.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcgiapp.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpezcgi.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libphttpdefs.a
diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile
index fa9fc66970ff..b2a2d8841086 100644
--- a/ftp/fpc-libcurl/Makefile
+++ b/ftp/fpc-libcurl/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= ftp lang
PKGNAMESUFFIX= -libcurl
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index cbead3c8c2ff..ee2b81495ef9 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= graphics lang
PKGNAMESUFFIX= -opengl
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index a819d45d2f87..59b3a7555691 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= base
-PORTVERSION= 2.2.2
-PORTREVISION= 1
+PORTVERSION= 2.2.4
CATEGORIES= lang
MASTER_SITES= # empty
PKGNAMEPREFIX= fpc-
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 5468cba6106d..818b75bfc9ed 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= docs
-PORTVERSION= 2.2.2
+PORTVERSION= 2.2.4
CATEGORIES= lang
-MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/docs-${PORTVERSION}/ \
- ftp://planetmirror.com/pub/fpc/dist/docs-${PORTVERSION}/ \
- ftp://ftp.jp.freepascal.org/mirror/fpc/dist/docs-${PORTVERSION}/ \
- ftp://freepascal.stack.nl/pub/fpc/dist/docs-${PORTVERSION}/ \
- ftp://ftp.no.freepascal.org/pub/fpc/dist/docs-${PORTVERSION}/ \
- ftp://ftp.us.freepascal.org/pub/fpc/dist/docs-${PORTVERSION}/
+MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \
+ ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/docs/ \
+ ftp://ftp.jp.freepascal.org/mirror/fpc/dist/${PORTVERSION}/docs/ \
+ ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/docs/ \
+ ftp://ftp.no.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \
+ ftp://ftp.us.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/
PKGNAMEPREFIX= fpc-
DISTNAME= ${PORTNAME:S/s//}-pdf
DIST_SUBDIR= freepascal
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index 13a0d9f8f458..101b4622a9d4 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (freepascal/doc-pdf.tar.gz) = bd46950c782444964e19cc631302d806
-SHA256 (freepascal/doc-pdf.tar.gz) = 230d765381095f5278efbf04acbd165db5f2ea2708d3b5aa3d0ae0f7b70180ec
-SIZE (freepascal/doc-pdf.tar.gz) = 6350521
+MD5 (freepascal/doc-pdf.tar.gz) = 3a99d6bafb7bc2306128b4bd11748506
+SHA256 (freepascal/doc-pdf.tar.gz) = c60fda3b9184727181aa12d46b38eaf8beb56b4caa47c5d6a736352362313805
+SIZE (freepascal/doc-pdf.tar.gz) = 6436837
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index af367f76b9b2..89c3695137f4 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= units
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.4
CATEGORIES= lang
MASTER_SITES= # none
PKGNAMEPREFIX= fpc-
@@ -47,6 +46,7 @@ OPTIONS= ASPELL "Interface to aspell spelling checker" on \
GNOME1 "Free Pascal unit to create programs for GNOME" on \
GTK1 "Interface to gtk libraries" on \
GTK2 "Interface to gtk2 libraries" on \
+ ICONVENC "Free Pascal interface to iconv library" on \
IMAGEMAGICK "Free Pascal interface to ImageMagick" on \
IMLIB "Interface to imlib library" on \
LIBCURL "Interface to curl library" on \
@@ -80,7 +80,7 @@ OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options
ALL_OPTIONS= ASPELL BFD CAIRO CHM FCL-ASYNC FCL-BASE FCL-DB FCL-FPCUNIT FCL-IMAGE \
FCL-JSON FCL-NET FCL-PASSRC FCL-PROCESS FCL-REGISTRY FCL-WEB FCL-XML \
- FFTW FPMKUNIT FPGTK FV GDBM GGI GNOME1 GTK1 GTK2 IMAGEMAGICK IMLIB LIBCURL \
+ FFTW FPMKUNIT FPGTK FV GDBM GGI GNOME1 GTK1 GTK2 ICONVENC IMAGEMAGICK IMLIB LIBCURL \
LIBGD LIBPNG NCURSES NUMLIB OPENGL OPENSSL PCAP PXLIB SDL SVGALIB SYMBOLIC \
SYSLOG TCL UNZIP USERS UTMP X11 XFORMS ZLIB
diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist
index d2d428eddbe3..f6ae5a29e72e 100644
--- a/lang/fpc-utils/pkg-plist
+++ b/lang/fpc-utils/pkg-plist
@@ -1,6 +1,7 @@
bin/bin2obj
bin/data2inc
bin/delp
+bin/fpclasschart
bin/fpcres
bin/fpdoc
bin/fppkg
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
diff --git a/misc/fpc-chm/pkg-plist b/misc/fpc-chm/pkg-plist
index 8471fc32c5b6..45cf30f7c873 100644
--- a/misc/fpc-chm/pkg-plist
+++ b/misc/fpc-chm/pkg-plist
@@ -13,6 +13,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmsitemap.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmwriter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfilewriter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmreader.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlindexer.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfiftimain.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/fasthtmlparser.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlutil.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzx.o
@@ -25,6 +27,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmsitemap.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmwriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfilewriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmreader.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlindexer.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfiftimain.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpfasthtmlparser.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libphtmlutil.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslzx.a
@@ -37,6 +41,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmsitemap.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmwriter.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmfilewriter.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmreader.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libphtmlindexer.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmfiftimain.a
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
@dirrmtry lib/fpc/%%PORTVERSION%%/units
diff --git a/sysutils/fpc-users/pkg-plist b/sysutils/fpc-users/pkg-plist
index e9ba606e26f3..4e6495231a37 100644
--- a/sysutils/fpc-users/pkg-plist
+++ b/sysutils/fpc-users/pkg-plist
@@ -1,14 +1,14 @@
-lib/fpc/2.2.2/units/i386-freebsd/users/Package.fpc
-lib/fpc/2.2.2/units/i386-freebsd/users/grp.ppu
-lib/fpc/2.2.2/units/i386-freebsd/users/pwd.ppu
-lib/fpc/2.2.2/units/i386-freebsd/users/users.ppu
-lib/fpc/2.2.2/units/i386-freebsd/users/grp.o
-lib/fpc/2.2.2/units/i386-freebsd/users/pwd.o
-lib/fpc/2.2.2/units/i386-freebsd/users/users.o
-lib/fpc/2.2.2/units/i386-freebsd/users/libpgrp.a
-lib/fpc/2.2.2/units/i386-freebsd/users/libppwd.a
-lib/fpc/2.2.2/units/i386-freebsd/users/libpusers.a
-@dirrm lib/fpc/2.2.2/units/i386-freebsd/users
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/grp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/pwd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/users.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/grp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/pwd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/users.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/libpgrp.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/libppwd.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/libpusers.a
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
@dirrmtry lib/fpc/%%PORTVERSION%%/units
@dirrmtry lib/fpc/%%PORTVERSION%%
diff --git a/x11-toolkits/fpc-gtk1/Makefile b/x11-toolkits/fpc-gtk1/Makefile
index 109393c78586..1d6b6373e7c4 100644
--- a/x11-toolkits/fpc-gtk1/Makefile
+++ b/x11-toolkits/fpc-gtk1/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -gtk1
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index 86375a3b1124..fa3930823acd 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -gtk2
diff --git a/x11-toolkits/fpc-gtk2/files/patch-packages-gtk2-src-gtk+-gtk_gtkfilesystem.inc b/x11-toolkits/fpc-gtk2/files/patch-packages-gtk2-src-gtk+-gtk_gtkfilesystem.inc
deleted file mode 100644
index ce27e1dc8582..000000000000
--- a/x11-toolkits/fpc-gtk2/files/patch-packages-gtk2-src-gtk+-gtk_gtkfilesystem.inc
+++ /dev/null
@@ -1,53 +0,0 @@
---- packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc 2009-01-20 15:43:50.000000000 -0500
-+++ packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc 2009-01-20 15:48:04.000000000 -0500
-@@ -115,17 +115,14 @@
-
- {$IFDEF read_interface_rest}
-
-+{$ifdef HasGTK_FileSystem}
-
- { GError enumeration for GtkFileSystem }
-
- function GTK_FILE_SYSTEM_ERROR : TGQuark;
-
--
--
- function gtk_file_system_error_quark:TGQuark;cdecl;external gtklib name 'gtk_file_system_error_quark';
-
--
--
- { Boxed-type for gtk_file_folder_get_info() results }
-
- function GTK_TYPE_FILE_INFO : GType;
-@@ -244,11 +241,16 @@
- { GtkFileSystem modules support }
-
- function _gtk_file_system_create(file_system_name:Pchar):PGtkFileSystem;cdecl;external gtklib name '_gtk_file_system_create';
-+
-+{$endif HasGTK_FileSystem}
-+
- {$endif} {read_interface_rest}
-
-
- {$ifdef read_implementation}
-
-+{$ifdef HasGTK_FileSystem}
-+
- function GTK_FILE_SYSTEM_ERROR : TGQuark;
- begin
- GTK_FILE_SYSTEM_ERROR:=gtk_file_system_error_quark;
-@@ -301,12 +303,13 @@
- end;
-
-
--
- function GTK_FILE_FOLDER_GET_IFACE(inst : pointer) : PGtkFileSystemIface;
- begin
- GTK_FILE_FOLDER_GET_IFACE:=G_TYPE_INSTANCE_GET_INTERFACE(inst,GTK_TYPE_FILE_FOLDER);
- end;
-
-+{$endif HasGTK_FileSystem}
-+
- function gtk_file_path_new_dup(str : Pgchar) : PGtkFilePath;
- begin
- gtk_file_path_new_dup:=PGtkFilePath(g_strdup(str));
diff --git a/x11-toolkits/fpc-gtk2/pkg-plist b/x11-toolkits/fpc-gtk2/pkg-plist
index 566d9e82f006..b4ec912f912d 100644
--- a/x11-toolkits/fpc-gtk2/pkg-plist
+++ b/x11-toolkits/fpc-gtk2/pkg-plist
@@ -7,6 +7,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.ppu
@@ -19,6 +20,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.o
@@ -30,6 +32,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2pixbuf.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2x.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtk2.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtk2ext.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libplibglade2.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtkglext.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdkglext.a