aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2015-12-05 23:29:36 +0000
committerJohn Marino <marino@FreeBSD.org>2015-12-05 23:29:36 +0000
commitf01cba6e50575183cf50dc87ded17319b63e1a14 (patch)
tree6ef0e1020a116341931d3335d3863622b9586ead
parentc502e77d8f318117c0982f8999f2e243e8ef511c (diff)
downloadports-f01cba6e50575183cf50dc87ded17319b63e1a14.tar.gz
ports-f01cba6e50575183cf50dc87ded17319b63e1a14.zip
Notes
-rw-r--r--MOVED8
-rw-r--r--Mk/bsd.default-versions.mk2
-rw-r--r--Mk/bsd.fpc.mk60
-rw-r--r--archivers/Makefile1
-rw-r--r--archivers/fpc-bzip2/Makefile3
-rw-r--r--archivers/fpc-bzip2/pkg-plist6
-rw-r--r--archivers/fpc-paszlib/pkg-plist58
-rw-r--r--archivers/fpc-unzip/Makefile2
-rw-r--r--archivers/fpc-unzip/pkg-plist8
-rw-r--r--audio/Makefile1
-rw-r--r--audio/fpc-a52/Makefile1
-rw-r--r--audio/fpc-a52/files/patch-packages_a52_fpmake.pp11
-rw-r--r--audio/fpc-a52/pkg-plist3
-rw-r--r--audio/fpc-mad/Makefile1
-rw-r--r--audio/fpc-mad/files/patch-packages_mad_fpmake.pp11
-rw-r--r--audio/fpc-mad/pkg-plist3
-rw-r--r--audio/fpc-modplug/Makefile1
-rw-r--r--audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp11
-rw-r--r--audio/fpc-modplug/pkg-plist3
-rw-r--r--audio/fpc-oggvorbis/Makefile1
-rw-r--r--audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp11
-rw-r--r--audio/fpc-oggvorbis/pkg-plist6
-rw-r--r--audio/fpc-openal/Makefile1
-rw-r--r--audio/fpc-openal/files/patch-packages_openal_fpmake.pp14
-rw-r--r--audio/fpc-openal/pkg-plist3
-rw-r--r--audio/fpc-sndfile/Makefile23
-rw-r--r--audio/fpc-sndfile/pkg-plist4
-rw-r--r--converters/fpc-iconvenc/Makefile4
-rw-r--r--converters/fpc-iconvenc/pkg-plist8
-rw-r--r--databases/fpc-dblib/Makefile1
-rw-r--r--databases/fpc-dblib/pkg-plist5
-rw-r--r--databases/fpc-fpindexer/Makefile4
-rw-r--r--databases/fpc-fpindexer/pkg-plist15
-rw-r--r--databases/fpc-gdbm/Makefile1
-rw-r--r--databases/fpc-gdbm/pkg-plist5
-rw-r--r--databases/fpc-ibase/Makefile1
-rw-r--r--databases/fpc-ibase/pkg-plist12
-rw-r--r--databases/fpc-mysql/Makefile1
-rw-r--r--databases/fpc-mysql/pkg-plist88
-rw-r--r--databases/fpc-odbc/Makefile1
-rw-r--r--databases/fpc-odbc/pkg-plist8
-rw-r--r--databases/fpc-oracle/Makefile1
-rw-r--r--databases/fpc-oracle/pkg-plist6
-rw-r--r--databases/fpc-postgres/Makefile1
-rw-r--r--databases/fpc-postgres/pkg-plist18
-rw-r--r--databases/fpc-pxlib/Makefile1
-rw-r--r--databases/fpc-pxlib/pkg-plist5
-rw-r--r--databases/fpc-sqlite/Makefile1
-rw-r--r--databases/fpc-sqlite/pkg-plist10
-rw-r--r--devel/Makefile5
-rw-r--r--devel/fpc-bfd/Makefile1
-rw-r--r--devel/fpc-bfd/pkg-plist5
-rw-r--r--devel/fpc-dbus/Makefile1
-rw-r--r--devel/fpc-dbus/files/patch-packages_dbus_fpmake.pp11
-rw-r--r--devel/fpc-dbus/pkg-plist5
-rw-r--r--devel/fpc-fcl-async/Makefile3
-rw-r--r--devel/fpc-fcl-async/pkg-plist8
-rw-r--r--devel/fpc-fcl-base/Makefile5
-rw-r--r--devel/fpc-fcl-base/pkg-plist57
-rw-r--r--devel/fpc-fcl-db/Makefile11
-rw-r--r--devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile28
-rw-r--r--devel/fpc-fcl-db/pkg-plist128
-rw-r--r--devel/fpc-fcl-extra/Makefile5
-rw-r--r--devel/fpc-fcl-extra/pkg-plist4
-rw-r--r--devel/fpc-fcl-fpcunit/Makefile5
-rw-r--r--devel/fpc-fcl-fpcunit/pkg-plist48
-rw-r--r--devel/fpc-fcl-image/Makefile5
-rw-r--r--devel/fpc-fcl-image/pkg-plist179
-rw-r--r--devel/fpc-fcl-js/Makefile3
-rw-r--r--devel/fpc-fcl-js/pkg-plist13
-rw-r--r--devel/fpc-fcl-json/Makefile5
-rw-r--r--devel/fpc-fcl-json/pkg-plist24
-rw-r--r--devel/fpc-fcl-net/Makefile6
-rw-r--r--devel/fpc-fcl-net/pkg-plist13
-rw-r--r--devel/fpc-fcl-passrc/Makefile5
-rw-r--r--devel/fpc-fcl-passrc/pkg-plist30
-rw-r--r--devel/fpc-fcl-process/pkg-plist19
-rw-r--r--devel/fpc-fcl-registry/Makefile5
-rw-r--r--devel/fpc-fcl-registry/pkg-plist9
-rw-r--r--devel/fpc-fcl-res/Makefile5
-rw-r--r--devel/fpc-fcl-res/pkg-plist47
-rw-r--r--devel/fpc-fcl-sdo/Makefile16
-rw-r--r--devel/fpc-fcl-sdo/pkg-plist77
-rw-r--r--devel/fpc-fcl-sound/Makefile (renamed from devel/fpc-fpmkunit/Makefile)9
-rw-r--r--devel/fpc-fcl-sound/pkg-plist7
-rw-r--r--devel/fpc-fcl-stl/Makefile (renamed from devel/fpc-fcl-process/Makefile)6
-rw-r--r--devel/fpc-fcl-stl/pkg-plist25
-rw-r--r--devel/fpc-fcl-web/Makefile11
-rw-r--r--devel/fpc-fcl-web/files/patch-packages-fcl-web_Makefile49
-rw-r--r--devel/fpc-fcl-web/pkg-plist98
-rw-r--r--devel/fpc-fcl-xml/Makefile5
-rw-r--r--devel/fpc-fcl-xml/pkg-plist30
-rw-r--r--devel/fpc-fpmkunit/pkg-plist4
-rw-r--r--devel/fpc-fppkg/Makefile7
-rw-r--r--devel/fpc-fppkg/pkg-plist19
-rw-r--r--devel/fpc-fv/Makefile3
-rw-r--r--devel/fpc-fv/pkg-plist83
-rw-r--r--devel/fpc-gdbint/Makefile1
-rw-r--r--devel/fpc-gdbint/pkg-plist7
-rw-r--r--devel/fpc-newt/Makefile1
-rw-r--r--devel/fpc-newt/files/patch-packages_newt_fpmake.pp11
-rw-r--r--devel/fpc-newt/pkg-plist5
-rw-r--r--devel/fpc-pthreads/Makefile1
-rw-r--r--devel/fpc-pthreads/pkg-plist5
-rw-r--r--devel/fpc-regexpr/Makefile3
-rw-r--r--devel/fpc-regexpr/pkg-plist12
-rw-r--r--devel/fpc-sdl/Makefile1
-rw-r--r--devel/fpc-sdl/pkg-plist38
-rw-r--r--devel/fpc-symbolic/Makefile1
-rw-r--r--devel/fpc-symbolic/pkg-plist8
-rw-r--r--devel/fpc-zlib/Makefile1
-rw-r--r--devel/fpc-zlib/pkg-plist5
-rw-r--r--editors/fpc-ide/Makefile8
-rw-r--r--editors/fpc-ide/pkg-plist21
-rw-r--r--editors/lazarus-lcl-gtk2/Makefile4
-rw-r--r--editors/lazarus-lcl-nogui/Makefile2
-rw-r--r--editors/lazarus-lcl-qt/Makefile4
-rw-r--r--editors/lazarus-lcl-units/Makefile4
-rw-r--r--editors/lazarus/Makefile10
-rw-r--r--ftp/fpc-libcurl/Makefile1
-rw-r--r--ftp/fpc-libcurl/pkg-plist5
-rw-r--r--graphics/fpc-cairo/Makefile4
-rw-r--r--graphics/fpc-cairo/pkg-plist12
-rw-r--r--graphics/fpc-graph/Makefile3
-rw-r--r--graphics/fpc-graph/files/patch-packages_graph_fpmake.pp67
-rw-r--r--graphics/fpc-graph/pkg-plist11
-rw-r--r--graphics/fpc-hermes/Makefile1
-rw-r--r--graphics/fpc-hermes/files/patch-Makefile10
-rw-r--r--graphics/fpc-hermes/pkg-plist5
-rw-r--r--graphics/fpc-imagemagick/Makefile1
-rw-r--r--graphics/fpc-imagemagick/pkg-plist11
-rw-r--r--graphics/fpc-libgd/Makefile1
-rw-r--r--graphics/fpc-libgd/pkg-plist5
-rw-r--r--graphics/fpc-libpng/Makefile1
-rw-r--r--graphics/fpc-libpng/pkg-plist5
-rw-r--r--graphics/fpc-ncurses/Makefile1
-rw-r--r--graphics/fpc-ncurses/pkg-plist24
-rw-r--r--graphics/fpc-opengl/Makefile1
-rw-r--r--graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp18
-rw-r--r--graphics/fpc-opengl/pkg-plist17
-rw-r--r--graphics/fpc-pasjpeg/Makefile1
-rw-r--r--graphics/fpc-pasjpeg/pkg-plist155
-rw-r--r--graphics/fpc-proj4/Makefile1
-rw-r--r--graphics/fpc-proj4/files/patch-packages_proj4_fpmake.pp11
-rw-r--r--graphics/fpc-proj4/pkg-plist5
-rw-r--r--graphics/fpc-rsvg/Makefile3
-rw-r--r--graphics/fpc-rsvg/pkg-plist7
-rw-r--r--graphics/fpc-svgalib/Makefile1
-rw-r--r--graphics/fpc-svgalib/pkg-plist4
-rw-r--r--lang/Makefile4
-rw-r--r--lang/fpc-base/Makefile6
-rw-r--r--lang/fpc-docs/Makefile13
-rw-r--r--lang/fpc-docs/distinfo4
-rw-r--r--lang/fpc-lua/Makefile1
-rw-r--r--lang/fpc-lua/files/patch-packages_lua_fpmake.pp11
-rw-r--r--lang/fpc-lua/pkg-plist11
-rw-r--r--lang/fpc-rexx/Makefile1
-rw-r--r--lang/fpc-rexx/files/patch-packages_rexx_fpmake.pp11
-rw-r--r--lang/fpc-rexx/pkg-plist5
-rw-r--r--lang/fpc-rtl-console/Makefile (renamed from archivers/fpc-paszlib/Makefile)10
-rw-r--r--lang/fpc-rtl-console/pkg-plist9
-rw-r--r--lang/fpc-rtl-extra/Makefile (renamed from security/fpc-hash/Makefile)8
-rw-r--r--lang/fpc-rtl-extra/pkg-plist15
-rw-r--r--lang/fpc-rtl-objpas/Makefile15
-rw-r--r--lang/fpc-rtl-objpas/pkg-plist17
-rw-r--r--lang/fpc-rtl-unicode/Makefile15
-rw-r--r--lang/fpc-rtl-unicode/pkg-plist29
-rw-r--r--lang/fpc-tcl/Makefile1
-rw-r--r--lang/fpc-tcl/pkg-plist5
-rw-r--r--lang/fpc-units/Makefile185
-rw-r--r--lang/fpc-utils/Makefile17
-rw-r--r--lang/fpc-utils/pkg-plist23
-rw-r--r--lang/fpc/Makefile140
-rw-r--r--lang/fpc/Makefile.units81
-rw-r--r--lang/fpc/distinfo8
-rw-r--r--lang/fpc/files/patch-compiler-systems-t_bsd.pas36
-rw-r--r--lang/fpc/files/patch-compiler-utils_samplecfg6
-rw-r--r--lang/fpc/pkg-plist256
-rw-r--r--math/fpc-fftw/pkg-plist5
-rw-r--r--math/fpc-gmp/pkg-plist3
-rw-r--r--math/fpc-numlib/pkg-plist64
-rw-r--r--misc/fpc-chm/Makefile3
-rw-r--r--misc/fpc-chm/pkg-plist20
-rw-r--r--multimedia/Makefile1
-rw-r--r--multimedia/fpc-dts/Makefile1
-rw-r--r--multimedia/fpc-dts/files/patch-packages_dts_fpmake.pp11
-rw-r--r--multimedia/fpc-dts/pkg-plist5
-rw-r--r--multimedia/fpc-libvlc/Makefile3
-rw-r--r--multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp21
-rw-r--r--multimedia/fpc-libvlc/pkg-plist4
-rw-r--r--multimedia/fpc-matroska/Makefile23
-rw-r--r--multimedia/fpc-matroska/pkg-plist4
-rw-r--r--net/fpc-ldap/Makefile3
-rw-r--r--net/fpc-ldap/files/patch-packages_ldap_fpmake.pp11
-rw-r--r--net/fpc-ldap/pkg-plist4
-rw-r--r--net/fpc-pcap/Makefile3
-rw-r--r--net/fpc-pcap/pkg-plist5
-rw-r--r--security/Makefile1
-rw-r--r--security/fpc-hash/pkg-plist16
-rw-r--r--security/fpc-openssl/Makefile3
-rw-r--r--security/fpc-openssl/pkg-plist7
-rw-r--r--sysutils/fpc-syslog/Makefile1
-rw-r--r--sysutils/fpc-syslog/pkg-plist5
-rw-r--r--sysutils/fpc-users/Makefile1
-rw-r--r--sysutils/fpc-users/pkg-plist12
-rw-r--r--sysutils/fpc-utmp/Makefile1
-rw-r--r--sysutils/fpc-utmp/pkg-plist5
-rw-r--r--sysutils/fpc-uuid/Makefile3
-rw-r--r--sysutils/fpc-uuid/files/patch-packages_uuid_fpmake.pp11
-rw-r--r--sysutils/fpc-uuid/pkg-plist4
-rw-r--r--textproc/fpc-aspell/Makefile1
-rw-r--r--textproc/fpc-aspell/pkg-plist11
-rw-r--r--textproc/fpc-libxml2/Makefile3
-rw-r--r--textproc/fpc-libxml2/pkg-plist19
-rw-r--r--www/fpc-fastcgi/Makefile3
-rw-r--r--www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile34
-rw-r--r--www/fpc-fastcgi/pkg-plist3
-rw-r--r--www/fpc-httpd22/Makefile5
-rw-r--r--www/fpc-httpd22/pkg-plist14
-rw-r--r--www/fpc-httpd24/Makefile5
-rw-r--r--www/fpc-httpd24/pkg-plist4
-rw-r--r--x11-toolkits/fpc-gtk2/Makefile3
-rw-r--r--x11-toolkits/fpc-gtk2/pkg-plist48
-rw-r--r--x11-toolkits/fpc-xforms/Makefile2
-rw-r--r--x11-toolkits/fpc-xforms/pkg-plist62
-rw-r--r--x11/fpc-x11/Makefile1
-rw-r--r--x11/fpc-x11/pkg-plist27
227 files changed, 1588 insertions, 2010 deletions
diff --git a/MOVED b/MOVED
index 6adfa34b57ac..142099efbe44 100644
--- a/MOVED
+++ b/MOVED
@@ -8036,4 +8036,10 @@ databases/java-mybatis||2015-11-28|Has expired: Broken for more than 6 months
databases/openbase-jdbc||2015-11-28|Has expired: Broken for more than 6 months
www/mediawiki119|www/mediawiki125|2015-11-28|Has expired: Please upgrade to mediawiki-1.25
www/R-cran-Rpad||2015-11-28|Has expired: Unmaintained upstream
-archivers/py-liblzma|py-pyliblzma|2015-11-30|Rename to match upstream (PyPI) naming
+archivers/py-liblzma|archivers/py-pyliblzma|2015-11-30|Rename to match upstream (PyPI) naming
+archivers/fpc-paszlib||2015-12-05|Eliminated during FPC upgrade to 3.0.0
+audio/fpc-sndfile||2015-12-05|Eliminated during FPC upgrade to 3.0.0
+devel/fpc-fcl-process||2015-12-05|Eliminated during FPC upgrade to 3.0.0
+devel/fpc-fpmkunit||2015-12-05|Eliminated during FPC upgrade to 3.0.0
+multimedia/fpc-matroska||2015-12-05|Eliminated during FPC upgrade to 3.0.0
+security/fpc-hash||2015-12-05|Eliminated during FPC upgrade to 3.0.0
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index ecadc31de63e..5f07b7156cdb 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -19,7 +19,7 @@ ${_l:tu}_DEFAULT= ${lang:C/.*=//g}
.endfor
APACHE_DEFAULT?= 2.4
-FPC_DEFAULT?= 2.6.4
+FPC_DEFAULT?= 3.0.0
GCC_DEFAULT?= 4.8
LUA_DEFAULT?= 5.2
MYSQL_DEFAULT?= 5.6
diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
index 150df0b7395d..4ae208f18cf7 100644
--- a/Mk/bsd.fpc.mk
+++ b/Mk/bsd.fpc.mk
@@ -36,7 +36,7 @@ _FPCMKINCLUDED= yes
WARNING+= "DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
.endif
-FPC_Include_MAINTAINER= acm@FreeBSD.org
+FPC_Include_MAINTAINER= freebsd-fpc@FreeBSD.org
FPC_Pre_Include= bsd.fpc.mk
DEFAULT_FPC_VER= ${FPC_DEFAULT}
@@ -64,22 +64,24 @@ BUILD_DEPENDS+= ${PPNAME}:${PORTSDIR}/lang/fpc
BUILDNAME= ${FPC_ARCH}-freebsd
UNITSDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
-
-_FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi fcl-async fcl-base \
- fcl-db fcl-extra fcl-fpcunit fcl-image fcl-js fcl-json fcl-net fcl-passrc \
- fcl-process fcl-registry fcl-res fcl-web fcl-xml fftw fpindexer \
- fpmkunit fppkg fv gdbint gdbm gmp graph gtk2 hash \
- hermes httpd22 httpd24 ibase iconvenc imagemagick ldap libcurl libgd \
- libpng libvlc libxml2 lua mad matroska modplug mysql ncurses newt numlib \
- odbc oggvorbis openal opengl openssl oracle pasjpeg paszlib pcap \
- postgres proj4 pthreads pxlib regexpr rexx rsvg sdl sndfile sqlite \
- svgalib symbolic syslog tcl unzip users utmp uuid x11 xforms zlib
-
-_FPC_CFG_UNITS= fastcgi fcl-web
+MKINSTDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
+
+_FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \
+ fcl-async fcl-base fcl-db fcl-extra fcl-fpcunit fcl-image \
+ fcl-js fcl-json fcl-net fcl-passrc fcl-registry fcl-res \
+ fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml fftw \
+ fpindexer fppkg fv gdbint gdbm gmp graph gtk2 hermes \
+ httpd22 httpd24 ibase iconvenc imagemagick ldap libcurl \
+ libgd libpng libvlc libxml2 lua mad modplug mysql \
+ ncurses newt numlib odbc oggvorbis openal opengl openssl \
+ oracle pasjpeg pcap postgres proj4 pthreads pxlib regexpr \
+ rexx rsvg rtl-console rtl-extra rtl-objpas rtl-unicode sdl \
+ sqlite svgalib symbolic syslog tcl unzip users utmp \
+ uuid x11 xforms zlib
.if defined(WANT_FPC_BASE)
. if ${WANT_FPC_BASE:tl} == "yes"
-USE_FPC= gdbint graph hash httpd22 httpd24 ibase mysql odbc oracle pasjpeg paszlib \
+USE_FPC= gdbint graph httpd22 httpd24 ibase mysql odbc oracle pasjpeg \
postgres pthreads regexpr sqlite
. else
IGNORE= unknown value, please use "yes" instead of
@@ -105,7 +107,6 @@ IGNORE= cannot install: unknown FPC unit ${UNITS}
# Base units
gdbint_UNIT= devel/fpc-gdbint
graph_UNIT= graphics/fpc-graph
-hash_UNIT= security/fpc-hash
httpd22_UNIT= www/fpc-httpd22
httpd24_UNIT= www/fpc-httpd24
ibase_UNIT= databases/fpc-ibase
@@ -113,7 +114,6 @@ mysql_UNIT= databases/fpc-mysql
odbc_UNIT= databases/fpc-odbc
oracle_UNIT= databases/fpc-oracle
pasjpeg_UNIT= graphics/fpc-pasjpeg
-paszlib_UNIT= archivers/fpc-paszlib
postgres_UNIT= databases/fpc-postgres
pthreads_UNIT= devel/fpc-pthreads
regexpr_UNIT= devel/fpc-regexpr
@@ -140,14 +140,15 @@ fcl_js_UNIT= devel/fpc-fcl-js
fcl_json_UNIT= devel/fpc-fcl-json
fcl_net_UNIT= devel/fpc-fcl-net
fcl_passrc_UNIT= devel/fpc-fcl-passrc
-fcl_process_UNIT= devel/fpc-fcl-process
fcl_registry_UNIT= devel/fpc-fcl-registry
fcl_res_UNIT= devel/fpc-fcl-res
+fcl_sdo_UNIT= devel/fpc-fcl-sdo
+fcl_sound_UNIT= devel/fpc-fcl-sound
+fcl_stl_UNIT= devel/fpc-fcl-stl
fcl_web_UNIT= devel/fpc-fcl-web
fcl_xml_UNIT= devel/fpc-fcl-xml
fftw_UNIT= math/fpc-fftw
fpindexer_UNIT= databases/fpc-fpindexer
-fpmkunit_UNIT= devel/fpc-fpmkunit
fppkg_UNIT= devel/fpc-fppkg
fpvectorial_UNIT= graphics/fpc-fpvectorial
fv_UNIT= devel/fpc-fv
@@ -165,7 +166,6 @@ libvlc_UNIT= multimedia/fpc-libvlc
libxml2_UNIT= textproc/fpc-libxml2
lua_UNIT= lang/fpc-lua
mad_UNIT= audio/fpc-mad
-matroska_UNIT= multimedia/fpc-matroska
modplug_UNIT= audio/fpc-modplug
newt_UNIT= devel/fpc-newt
ncurses_UNIT= graphics/fpc-ncurses
@@ -179,8 +179,11 @@ proj4_UNIT= graphics/fpc-proj4
pxlib_UNIT= databases/fpc-pxlib
rexx_UNIT= lang/fpc-rexx
rsvg_UNIT= graphics/fpc-rsvg
+rtl_console_UNIT= lang/fpc-rtl-console
+rtl_extra_UNIT= lang/fpc-rtl-extra
+rtl_objpas_UNIT= lang/fpc-rtl-objpas
+rtl_unicode_UNIT= lang/fpc-rtl-unicode
sdl_UNIT= devel/fpc-sdl
-sndfile_UNIT= audio/fpc-sndfile
svgalib_UNIT= graphics/fpc-svgalib
symbolic_UNIT= devel/fpc-symbolic
syslog_UNIT= sysutils/fpc-syslog
@@ -196,18 +199,11 @@ zlib_UNIT= devel/fpc-zlib
.endif
.if defined(_POSTMKINCLUDED) && defined(USE_FPC)
-. for UNITS in ${USE_FPC}
-. if ${_FPC_ALL_UNITS:M${UNITS}}!=""
-. if ${_FPC_CFG_UNITS:M${UNITS}}!=""
-BUILD_DEPENDS+= ${UNITSDIR}/${UNITS}/fpunits.cfg:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
-. if defined(USE_FPC_RUN)
-RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/fpunits.cfg:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
-. endif
-. else
-BUILD_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
-. if defined(USE_FPC_RUN)
-RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
-. endif
+. for UNIT in ${USE_FPC}
+. if ${_FPC_ALL_UNITS:M${UNIT}} != ""
+BUILD_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${PORTSDIR}/${${UNIT:S/-/_/}_UNIT}
+. if defined(USE_FPC_RUN)
+RUN_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${PORTSDIR}/${${UNIT:S/-/_/}_UNIT}
. endif
security-check: fpc-check-install
diff --git a/archivers/Makefile b/archivers/Makefile
index a1142aad878b..ba46a111cf4d 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -27,7 +27,6 @@
SUBDIR += fastjar
SUBDIR += file-roller
SUBDIR += fpc-bzip2
- SUBDIR += fpc-paszlib
SUBDIR += fpc-unzip
SUBDIR += freetar
SUBDIR += freeze
diff --git a/archivers/fpc-bzip2/Makefile b/archivers/fpc-bzip2/Makefile
index 4c1dc75c27b1..d14770889cd9 100644
--- a/archivers/fpc-bzip2/Makefile
+++ b/archivers/fpc-bzip2/Makefile
@@ -1,14 +1,13 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= archivers lang
PKGNAMESUFFIX= -bzip2
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal bzip2 unit
-USE_FPC= yes
+USE_FPC= rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/archivers/fpc-bzip2/pkg-plist b/archivers/fpc-bzip2/pkg-plist
index 59bc6c209603..479edcec8e43 100644
--- a/archivers/fpc-bzip2/pkg-plist
+++ b/archivers/fpc-bzip2/pkg-plist
@@ -1,10 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/bzip2.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2comn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2comn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2stream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2stream.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/libpbzip2.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/libpbzip2comn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/libpbzip2stream.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2stream.rsj
diff --git a/archivers/fpc-paszlib/pkg-plist b/archivers/fpc-paszlib/pkg-plist
deleted file mode 100644
index 305d674947a9..000000000000
--- a/archivers/fpc-paszlib/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpadler.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpgzio.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfblock.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfcodes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinffast.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinftrees.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfutil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libppaszlib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpunzip.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libptrees.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzbase.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzcompres.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzdeflate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzinflate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzip.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzipper.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpziputils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzstream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzuncompr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zip.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zip.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/unzip.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/unzip.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/ziputils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/ziputils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.ppu
diff --git a/archivers/fpc-unzip/Makefile b/archivers/fpc-unzip/Makefile
index 4dfee8114677..fb41d06dea28 100644
--- a/archivers/fpc-unzip/Makefile
+++ b/archivers/fpc-unzip/Makefile
@@ -1,7 +1,7 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= archivers lang
PKGNAMESUFFIX= -unzip
diff --git a/archivers/fpc-unzip/pkg-plist b/archivers/fpc-unzip/pkg-plist
index cc6a11bd0cd2..640baf248ccd 100644
--- a/archivers/fpc-unzip/pkg-plist
+++ b/archivers/fpc-unzip/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/unzip.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/libpziptypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/libpunzip51g.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.ppu
diff --git a/audio/Makefile b/audio/Makefile
index 82cebb58fbf4..1ebf28fea72b 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -165,7 +165,6 @@
SUBDIR += fpc-modplug
SUBDIR += fpc-oggvorbis
SUBDIR += fpc-openal
- SUBDIR += fpc-sndfile
SUBDIR += fplib
SUBDIR += freealut
SUBDIR += freedesktop-sound-theme
diff --git a/audio/fpc-a52/Makefile b/audio/fpc-a52/Makefile
index 300083b7aa1c..321ac532f719 100644
--- a/audio/fpc-a52/Makefile
+++ b/audio/fpc-a52/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= audio lang
PKGNAMESUFFIX= -a52
diff --git a/audio/fpc-a52/files/patch-packages_a52_fpmake.pp b/audio/fpc-a52/files/patch-packages_a52_fpmake.pp
new file mode 100644
index 000000000000..5a0b627cc1c0
--- /dev/null
+++ b/audio/fpc-a52/files/patch-packages_a52_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/a52/fpmake.pp.orig 2015-01-05 19:27:06 UTC
++++ packages/a52/fpmake.pp
+@@ -20,7 +20,7 @@ begin
+ P.Email := '';
+ P.Description := 'A free library for decoding ATSC A/52 streams.';
+ P.NeedLibC:= true;
+- P.OSes := [linux,win32];
++ P.OSes := [linux,win32,dragonfly,freebsd];
+
+ {$ifdef ALLPACKAGES}
+ P.Directory:=ADirectory;
diff --git a/audio/fpc-a52/pkg-plist b/audio/fpc-a52/pkg-plist
index ca1142038af8..2ba372769c0f 100644
--- a/audio/fpc-a52/pkg-plist
+++ b/audio/fpc-a52/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/a52.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/a52.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/a52.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/libpa52.a
diff --git a/audio/fpc-mad/Makefile b/audio/fpc-mad/Makefile
index ebc3da1d8453..e1063450b5cc 100644
--- a/audio/fpc-mad/Makefile
+++ b/audio/fpc-mad/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= audio lang
PKGNAMESUFFIX= -mad
diff --git a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
new file mode 100644
index 000000000000..11910f3c1466
--- /dev/null
+++ b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/mad/fpmake.pp.orig 2015-08-29 16:37:05 UTC
++++ packages/mad/fpmake.pp
+@@ -17,7 +17,7 @@ begin
+ P.Directory:=ADirectory;
+ {$endif ALLPACKAGES}
+ P.Version:='3.0.0';
+- P.OSes := [linux,win32,win64,wii];
++ P.OSes := [linux,win32,win64,wii,freebsd,dragonfly];
+ P.SourcePath.Add('src');
+
+ T:=P.Targets.AddUnit('mad.pas');
diff --git a/audio/fpc-mad/pkg-plist b/audio/fpc-mad/pkg-plist
index 62d70b2e6357..ae4314206041 100644
--- a/audio/fpc-mad/pkg-plist
+++ b/audio/fpc-mad/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/mad.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/mad.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/mad.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/libpmad.a
diff --git a/audio/fpc-modplug/Makefile b/audio/fpc-modplug/Makefile
index 50f031336739..155e04d2f6be 100644
--- a/audio/fpc-modplug/Makefile
+++ b/audio/fpc-modplug/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= audio lang
PKGNAMESUFFIX= -modplug
diff --git a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
new file mode 100644
index 000000000000..8de641e4636e
--- /dev/null
+++ b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/modplug/fpmake.pp.orig 2015-08-07 13:22:31 UTC
++++ packages/modplug/fpmake.pp
+@@ -17,7 +17,7 @@ begin
+ P.Directory:=ADirectory;
+ {$endif ALLPACKAGES}
+ P.Version:='3.0.0';
+- P.OSes := [linux];
++ P.OSes := [linux,dragonfly,freebsd];
+ P.SourcePath.Add('src');
+
+ T:=P.Targets.AddUnit('modplug.pas');
diff --git a/audio/fpc-modplug/pkg-plist b/audio/fpc-modplug/pkg-plist
index 9ded5f68d7ad..d28e24819193 100644
--- a/audio/fpc-modplug/pkg-plist
+++ b/audio/fpc-modplug/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/modplug.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/modplug.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/modplug.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/libpmodplug.a
diff --git a/audio/fpc-oggvorbis/Makefile b/audio/fpc-oggvorbis/Makefile
index 34e03b5e144e..a0cc2969df30 100644
--- a/audio/fpc-oggvorbis/Makefile
+++ b/audio/fpc-oggvorbis/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= audio lang
PKGNAMESUFFIX= -oggvorbis
diff --git a/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp b/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp
new file mode 100644
index 000000000000..8c21acf0a305
--- /dev/null
+++ b/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/oggvorbis/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/oggvorbis/fpmake.pp
+@@ -19,7 +19,7 @@ begin
+ {$endif ALLPACKAGES}
+ P.Version:='3.0.1';
+ P.SourcePath.Add('src');
+- P.OSes := [linux,win32,wince];
++ P.OSes := [linux,win32,wince,dragonfly,freebsd];
+ // P.Dependencies.Add('x11');
+
+ T:=P.Targets.AddUnit('ogg.pas');
diff --git a/audio/fpc-oggvorbis/pkg-plist b/audio/fpc-oggvorbis/pkg-plist
index 264c199b2bb8..bfa06f4601d7 100644
--- a/audio/fpc-oggvorbis/pkg-plist
+++ b/audio/fpc-oggvorbis/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/oggvorbis.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/ogg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/vorbis.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/ogg.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/vorbis.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/vorbis.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/libpogg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/libpvorbis.a
diff --git a/audio/fpc-openal/Makefile b/audio/fpc-openal/Makefile
index 5c144247e3e7..0a6f4c0a0795 100644
--- a/audio/fpc-openal/Makefile
+++ b/audio/fpc-openal/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= audio lang
PKGNAMESUFFIX= -openal
diff --git a/audio/fpc-openal/files/patch-packages_openal_fpmake.pp b/audio/fpc-openal/files/patch-packages_openal_fpmake.pp
new file mode 100644
index 000000000000..791b5f77a045
--- /dev/null
+++ b/audio/fpc-openal/files/patch-packages_openal_fpmake.pp
@@ -0,0 +1,14 @@
+--- packages/openal/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/openal/fpmake.pp
+@@ -19,9 +19,9 @@ begin
+ {$endif ALLPACKAGES}
+ P.Version:='3.0.1';
+ if Defaults.CPU = i386 then
+- P.OSes := [linux,win32,darwin]
++ P.OSes := [linux,win32,darwin,dragonfly,freebsd]
+ else
+- P.OSes := [linux,win32];
++ P.OSes := [linux,win32,dragonfly,freebsd];
+ P.SourcePath.Add('src');
+ P.IncludePath.Add('src');
+
diff --git a/audio/fpc-openal/pkg-plist b/audio/fpc-openal/pkg-plist
index 515c7454b23d..3220dccbf687 100644
--- a/audio/fpc-openal/pkg-plist
+++ b/audio/fpc-openal/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openal/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/openal.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openal/openal.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openal/openal.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openal/libpopenal.a
diff --git a/audio/fpc-sndfile/Makefile b/audio/fpc-sndfile/Makefile
deleted file mode 100644
index 0eba502204b1..000000000000
--- a/audio/fpc-sndfile/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Christopher Key <cjk32@cam.ac.uk>
-# $FreeBSD$
-
-PORTREVISION= 1
-CATEGORIES= audio lang
-PKGNAMESUFFIX= -sndfile
-
-MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Interface to sndfile library
-
-USE_FPC= yes
-
-MASTERDIR= ${.CURDIR}/../../lang/fpc
-WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR= ${WRKUNITDIR}
-
-OPTIONS_DEFINE= LIBSNDFILE
-LIBSNDFILE_DESC= Install sndfile library
-OPTIONS_DEFAULT= LIBSNDFILE
-
-LIBSNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile
-
-.include "${MASTERDIR}/Makefile"
diff --git a/audio/fpc-sndfile/pkg-plist b/audio/fpc-sndfile/pkg-plist
deleted file mode 100644
index 094b3d6f2901..000000000000
--- a/audio/fpc-sndfile/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sndfile/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sndfile/sndfile.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sndfile/sndfile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sndfile/libpsndfile.a
diff --git a/converters/fpc-iconvenc/Makefile b/converters/fpc-iconvenc/Makefile
index 19f620dd7442..f3d06c159e97 100644
--- a/converters/fpc-iconvenc/Makefile
+++ b/converters/fpc-iconvenc/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= converters lang
PKGNAMESUFFIX= -iconvenc
@@ -14,7 +13,4 @@ MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR= ${WRKUNITDIR}
-# added to main port to make it compile on 10 with iconv in libc
-#USES= iconv
-
.include "${MASTERDIR}/Makefile"
diff --git a/converters/fpc-iconvenc/pkg-plist b/converters/fpc-iconvenc/pkg-plist
index 7943af55e3a7..eeedae6327a6 100644
--- a/converters/fpc-iconvenc/pkg-plist
+++ b/converters/fpc-iconvenc/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc_dyn.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/iconvenc.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc_dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/libpiconvenc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/libpiconvenc_dyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc_dyn.ppu
diff --git a/databases/fpc-dblib/Makefile b/databases/fpc-dblib/Makefile
index ae7e1f97e191..8428d910cb18 100644
--- a/databases/fpc-dblib/Makefile
+++ b/databases/fpc-dblib/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -dblib
diff --git a/databases/fpc-dblib/pkg-plist b/databases/fpc-dblib/pkg-plist
index 3c6598fd05ba..62e6e45d7080 100644
--- a/databases/fpc-dblib/pkg-plist
+++ b/databases/fpc-dblib/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/dblib.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/dblib.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/dblib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/libpdblib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/dblib.ppu
diff --git a/databases/fpc-fpindexer/Makefile b/databases/fpc-fpindexer/Makefile
index 34745c319e6f..6ce22662cdb6 100644
--- a/databases/fpc-fpindexer/Makefile
+++ b/databases/fpc-fpindexer/Makefile
@@ -1,14 +1,14 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= databases lang
PKGNAMESUFFIX= -fpindexer
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Database indexer with database/flat file backend
-USE_FPC= chm fcl-base fcl-db fcl-xml ibase sqlite
+USE_FPC= chm dblib fcl-base fcl-db fcl-json fcl-xml ibase mysql odbc \
+ oracle postgres pxlib sqlite rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/databases/fpc-fpindexer/pkg-plist b/databases/fpc-fpindexer/pkg-plist
index b56d005fb150..e2aca4d3d286 100644
--- a/databases/fpc-fpindexer/pkg-plist
+++ b/databases/fpc-fpindexer/pkg-plist
@@ -1,10 +1,11 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fpindexer.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/dbindexer.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/dbindexer.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fbindexdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fbindexdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpindexer.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpindexer.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpindexer.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpmasks.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpmasks.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderhtml.o
@@ -13,16 +14,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderpas.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderpas.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireadertxt.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireadertxt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpdbindexer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpfbindexdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpfpindexer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpfpmasks.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpireaderhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpireaderpas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpireadertxt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpmemindexdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpsqldbindexdb.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqldbindexdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqldbindexdb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqliteindexdb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqliteindexdb.ppu
diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
index f1be67502261..c09f8870bc35 100644
--- a/databases/fpc-gdbm/Makefile
+++ b/databases/fpc-gdbm/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -gdbm
diff --git a/databases/fpc-gdbm/pkg-plist b/databases/fpc-gdbm/pkg-plist
index 116bff00ccb5..63f4bd1bc28a 100644
--- a/databases/fpc-gdbm/pkg-plist
+++ b/databases/fpc-gdbm/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/gdbm.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/libpgdbm.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.ppu
diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
index bbfa1d75d43d..45603a4eedc3 100644
--- a/databases/fpc-ibase/Makefile
+++ b/databases/fpc-ibase/Makefile
@@ -1,7 +1,6 @@
# Created by: John Merryweather Cooper
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -ibase
diff --git a/databases/fpc-ibase/pkg-plist b/databases/fpc-ibase/pkg-plist
index afe62f8fa9b6..a88e1df3b1b3 100644
--- a/databases/fpc-ibase/pkg-plist
+++ b/databases/fpc-ibase/pkg-plist
@@ -1,10 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase40.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/ibase.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase40.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase40.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/libpibase40.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/libpibase60.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/libpibase60dyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.rsj
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
index 5154dc6f6f22..dde1ae6df15f 100644
--- a/databases/fpc-mysql/Makefile
+++ b/databases/fpc-mysql/Makefile
@@ -1,7 +1,6 @@
# Created by: John Merryweather Cooper
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -mysql
diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist
index 78ffa8644b6c..636a2c0be48f 100644
--- a/databases/fpc-mysql/pkg-plist
+++ b/databases/fpc-mysql/pkg-plist
@@ -1,70 +1,54 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/mysql.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmy4_sys.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_com.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_version.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_comdyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3_com.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3_version.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3_comdyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql40.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql40dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql41.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql41dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql50.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql50dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql51.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql51dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql55.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql55dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql56.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql56dyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.rsj
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
index c70671eaa36a..6f3f3c29750a 100644
--- a/databases/fpc-odbc/Makefile
+++ b/databases/fpc-odbc/Makefile
@@ -1,7 +1,6 @@
# Created by: John Merryweather Cooper
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -odbc
diff --git a/databases/fpc-odbc/pkg-plist b/databases/fpc-odbc/pkg-plist
index fb2cd36bca07..5ae1211db17a 100644
--- a/databases/fpc-odbc/pkg-plist
+++ b/databases/fpc-odbc/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/odbc.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/libpodbcsql.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/libpodbcsqldyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.ppu
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
index 86ac7790056b..3fe020119dfa 100644
--- a/databases/fpc-oracle/Makefile
+++ b/databases/fpc-oracle/Makefile
@@ -1,7 +1,6 @@
# Created by: John Merryweather Cooper et al
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -oracle
diff --git a/databases/fpc-oracle/pkg-plist b/databases/fpc-oracle/pkg-plist
index b2f5db866fb2..ca4f22e82aa3 100644
--- a/databases/fpc-oracle/pkg-plist
+++ b/databases/fpc-oracle/pkg-plist
@@ -1,8 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/libpoci.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/libpocidyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/libporaoci.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/libporatypes.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/oracle.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oci.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oci.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/ocidyn.o
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
index fecf1d15f2b8..48c946625f31 100644
--- a/databases/fpc-postgres/Makefile
+++ b/databases/fpc-postgres/Makefile
@@ -1,7 +1,6 @@
# Created by: John Merryweather Cooper et al
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -postgres
diff --git a/databases/fpc-postgres/pkg-plist b/databases/fpc-postgres/pkg-plist
index e2098fe5334c..483d8977088b 100644
--- a/databases/fpc-postgres/pkg-plist
+++ b/databases/fpc-postgres/pkg-plist
@@ -1,16 +1,12 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllist.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllistdyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/postgres.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllist.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllist.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllistdyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllistdyn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libpdllist.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libpdllistdyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libppostgres.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libppostgres3.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libppostgres3dyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.rsj
diff --git a/databases/fpc-pxlib/Makefile b/databases/fpc-pxlib/Makefile
index 3406cae02d1e..8b629b0b5061 100644
--- a/databases/fpc-pxlib/Makefile
+++ b/databases/fpc-pxlib/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -pxlib
diff --git a/databases/fpc-pxlib/pkg-plist b/databases/fpc-pxlib/pkg-plist
index b9c9ba945a5b..ea5fb2c371ee 100644
--- a/databases/fpc-pxlib/pkg-plist
+++ b/databases/fpc-pxlib/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/pxlib.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/pxlib.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/pxlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/libppxlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/pxlib.ppu
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
index 4a35f0547bae..3a4a8f43cf7a 100644
--- a/databases/fpc-sqlite/Makefile
+++ b/databases/fpc-sqlite/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.rog>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= databases lang
PKGNAMESUFFIX= -sqlite
diff --git a/databases/fpc-sqlite/pkg-plist b/databases/fpc-sqlite/pkg-plist
index e36ebf29faee..2043e7d0d6ae 100644
--- a/databases/fpc-sqlite/pkg-plist
+++ b/databases/fpc-sqlite/pkg-plist
@@ -1,16 +1,12 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3db.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlitedb.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/sqlite.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3db.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3db.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.ppu
diff --git a/devel/Makefile b/devel/Makefile
index 6aa2b8a18e91..d39d2108530e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -544,12 +544,13 @@
SUBDIR += fpc-fcl-json
SUBDIR += fpc-fcl-net
SUBDIR += fpc-fcl-passrc
- SUBDIR += fpc-fcl-process
SUBDIR += fpc-fcl-registry
SUBDIR += fpc-fcl-res
+ SUBDIR += fpc-fcl-sdo
+ SUBDIR += fpc-fcl-sound
+ SUBDIR += fpc-fcl-stl
SUBDIR += fpc-fcl-web
SUBDIR += fpc-fcl-xml
- SUBDIR += fpc-fpmkunit
SUBDIR += fpc-fppkg
SUBDIR += fpc-fv
SUBDIR += fpc-gdbint
diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile
index 65e566f20e68..aeadfd13cf9b 100644
--- a/devel/fpc-bfd/Makefile
+++ b/devel/fpc-bfd/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -bfd
diff --git a/devel/fpc-bfd/pkg-plist b/devel/fpc-bfd/pkg-plist
index b9c8e62f5a71..b1c9e1adf7a5 100644
--- a/devel/fpc-bfd/pkg-plist
+++ b/devel/fpc-bfd/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/bfd.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/bfd.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/bfd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/libpbfd.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/bfd.ppu
diff --git a/devel/fpc-dbus/Makefile b/devel/fpc-dbus/Makefile
index 95eeab3cd372..ecc240e106c7 100644
--- a/devel/fpc-dbus/Makefile
+++ b/devel/fpc-dbus/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -dbus
diff --git a/devel/fpc-dbus/files/patch-packages_dbus_fpmake.pp b/devel/fpc-dbus/files/patch-packages_dbus_fpmake.pp
new file mode 100644
index 000000000000..b628f710dd2f
--- /dev/null
+++ b/devel/fpc-dbus/files/patch-packages_dbus_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/dbus/fpmake.pp.orig 2015-01-05 19:27:06 UTC
++++ packages/dbus/fpmake.pp
+@@ -24,7 +24,7 @@ begin
+ P.Email := '';
+ P.Description := 'D-Bus message bus interface. (1.2.16)';
+ P.NeedLibC:= true;
+- P.OSes := [linux];
++ P.OSes := [linux,dragonfly,freebsd];
+
+ P.SourcePath.Add('src');
+ P.IncludePath.Add('src');
diff --git a/devel/fpc-dbus/pkg-plist b/devel/fpc-dbus/pkg-plist
index 57d2d1002f50..9f9889f00856 100644
--- a/devel/fpc-dbus/pkg-plist
+++ b/devel/fpc-dbus/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbus.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/dbus.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbus.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/libpdbus.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbus.ppu
diff --git a/devel/fpc-fcl-async/Makefile b/devel/fpc-fcl-async/Makefile
index 4946e4a92048..439d77612a65 100644
--- a/devel/fpc-fcl-async/Makefile
+++ b/devel/fpc-fcl-async/Makefile
@@ -1,12 +1,11 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-async
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal interface to async library
+COMMENT= Free Pascal asynchronous event management (FCL)
USE_FPC= yes
diff --git a/devel/fpc-fcl-async/pkg-plist b/devel/fpc-fcl-async/pkg-plist
index a31664266524..f81a10661d15 100644
--- a/devel/fpc-fcl-async/pkg-plist
+++ b/devel/fpc-fcl-async/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/fpasync.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-async.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/fpasync.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libasync.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/fpasync.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libasync.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libpfpasync.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libplibasync.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libasync.ppu
diff --git a/devel/fpc-fcl-base/Makefile b/devel/fpc-fcl-base/Makefile
index fef05567a0db..cbe4f8abb652 100644
--- a/devel/fpc-fcl-base/Makefile
+++ b/devel/fpc-fcl-base/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-base
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal Component Library base
-USE_FPC= hash paszlib pthreads
+USE_FPC= fcl-res rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-base/pkg-plist b/devel/fpc-fcl-base/pkg-plist
index ca9d7fbec8d1..51dbe4cf8637 100644
--- a/devel/fpc-fcl-base/pkg-plist
+++ b/devel/fpc-fcl-base/pkg-plist
@@ -1,4 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-base.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/avl_tree.o
@@ -7,22 +7,39 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/csvdocument.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/csvdocument.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/csvreadwrite.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/csvreadwrite.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpmimetypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpmimetypes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpobserver.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpobserver.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpobserver.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptemplate.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptemplate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptemplate.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/gettext.o
@@ -31,46 +48,14 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/idea.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/idea.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpascii85.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpavl_tree.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpbase64.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpblowfish.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpbufstream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcachecls.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcontnrs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcustapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpeventlog.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfpexprpars.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfpmimetypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptemplate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptimer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpgettext.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpidea.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpinicol.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpinifiles.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpiostream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libplibtar.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpmaskutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpnullstream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libppooledmm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libprtfpars.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libprttiutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamcoll.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamex.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamio.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpsyncobjs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpuriparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwformat.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwtex.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/nullstream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/nullstream.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.o
@@ -81,10 +66,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.o
diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile
index c46ac92d35bf..87a54d9430e3 100644
--- a/devel/fpc-fcl-db/Makefile
+++ b/devel/fpc-fcl-db/Makefile
@@ -1,22 +1,17 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-db
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal Database Library (FCL)
-USE_FPC= dblib fcl-async fcl-base fcl-json fcl-xml hash ibase mysql odbc oracle paszlib postgres \
- pthreads pxlib sqlite
+USE_FPC= fcl-base fcl-xml rtl-objpas rtl-extra ibase mysql odbc \
+ oracle postgres sqlite dblib pxlib fcl-json
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR= ${WRKUNITDIR}
-OPT= -Fu../base/units/* -Fu../../base/units/* -Fu../dbase -Fu../../dbase -Fu../ \
- -Fu../sqldb -Fu../sqldb/interbase -Fu../sqldb/mysql -Fu../sqldb/odbc \
- -Fu../sqldb/postgres -Fu../sqldb/oracle -Fu../sqldb/sqlite \
- -Fu../datadict -Ur -CX
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile b/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile
deleted file mode 100644
index ddfd7f2ab5df..000000000000
--- a/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- packages/fcl-db/Makefile 2009-01-07 21:56:28.000000000 -0500
-+++ packages/fcl-db/Makefile 2009-01-07 22:18:51.000000000 -0500
-@@ -2203,17 +2203,17 @@
- endif
- $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
- endif
--ifdef INSTALL_CREATEPACKAGEFPC
--ifdef FPCMAKE
--ifdef PACKAGE_VERSION
--ifneq ($(wildcard Makefile.fpc),)
-+#ifdef INSTALL_CREATEPACKAGEFPC
-+#ifdef FPCMAKE
-+#ifdef PACKAGE_VERSION
-+#ifneq ($(wildcard Makefile.fpc),)
- $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
- $(MKDIR) $(INSTALL_UNITDIR)
- $(INSTALL) Package.fpc $(INSTALL_UNITDIR)
--endif
--endif
--endif
--endif
-+#endif
-+#endif
-+#endif
-+#endif
- ifdef INSTALLPPUFILES
- $(MKDIR) $(INSTALL_UNITDIR)
- $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
diff --git a/devel/fpc-fcl-db/pkg-plist b/devel/fpc-fcl-db/pkg-plist
index da15b4f90e50..9091db1f7894 100644
--- a/devel/fpc-fcl-db/pkg-plist
+++ b/devel/fpc-fcl-db/pkg-plist
@@ -1,16 +1,20 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-db.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/csvdataset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/csvdataset.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/customsqliteds.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/customsqliteds.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.o
@@ -49,6 +53,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbadmin.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbadmin.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbadmin.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbeventmonitor.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbeventmonitor.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.o
@@ -57,22 +62,29 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.o
@@ -91,152 +103,88 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpjsondataset.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpjsondataset.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlparser.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlparser.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlscanner.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlscanner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlscanner.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqltree.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqltree.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpxmlxsdexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpxmlxsdexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpxmlxsdexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset_parser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpcustomsqliteds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbcoll.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbconst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_collate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_common.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_cursor.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_dbffile.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_fields.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_idxcur.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_idxfile.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_lang.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_memo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_parser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_pgfile.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_prscore.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_prsdef.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_prssupp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_str.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_wtil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbwhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfbadmin.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfbeventmonitor.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/libpfpcsvexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdatadict.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbfexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddcodegen.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddbf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddiff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddfb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql40.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql41.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql50.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql51.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql55.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddodbc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddoracle.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpopcode.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpq.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddregstd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqldb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqlite3.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpfixedexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpjsondataset.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfprtfexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplejsonexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplexmlexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlscanner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqltree.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpstdexports.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfptexexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpxmlxsdexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpibconnection.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmemds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmssqlconn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql40conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql41conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql4conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql50conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql51conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql56conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql55conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpodbcconn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libporacleconnection.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpparadox.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libppqconnection.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libppqeventmonitor.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsdfdata.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqldb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqldblib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3backup.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3ds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqliteds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlscript.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpxmldatapacketreader.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mssqlconn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mssqlconn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql51conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql51conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql51conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql55conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql55conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql55conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql56conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql56conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql56conn.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql57conn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql57conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql57conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqeventmonitor.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqeventmonitor.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.o
@@ -255,5 +203,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/xmldatapacketreader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/xmldatapacketreader.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/xmldatapacketreader.rsj
diff --git a/devel/fpc-fcl-extra/Makefile b/devel/fpc-fcl-extra/Makefile
index 5fc3eb87ba6e..3d071c36942d 100644
--- a/devel/fpc-fcl-extra/Makefile
+++ b/devel/fpc-fcl-extra/Makefile
@@ -1,13 +1,12 @@
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-extra
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal extra libraries (FCL)
-USE_FPC= fcl-base
+USE_FPC= fcl-base fcl-res rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-extra/pkg-plist b/devel/fpc-fcl-extra/pkg-plist
index 5bd4cfc94cec..ec0446695008 100644
--- a/devel/fpc-fcl-extra/pkg-plist
+++ b/devel/fpc-fcl-extra/pkg-plist
@@ -1,4 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-extra.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/daemonapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/daemonapp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/libpdaemonapp.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/daemonapp.rsj
diff --git a/devel/fpc-fcl-fpcunit/Makefile b/devel/fpc-fcl-fpcunit/Makefile
index edd5a2212206..0b1c051e960a 100644
--- a/devel/fpc-fcl-fpcunit/Makefile
+++ b/devel/fpc-fcl-fpcunit/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-fpcunit
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal unit testing library (FCL)
-USE_FPC= fcl-async fcl-base fcl-xml hash paszlib pthreads
+USE_FPC= fcl-base fcl-xml
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-fpcunit/pkg-plist b/devel/fpc-fcl-fpcunit/pkg-plist
index 4b998bf9f2fd..95c85c51a2cf 100644
--- a/devel/fpc-fcl-fpcunit/pkg-plist
+++ b/devel/fpc-fcl-fpcunit/pkg-plist
@@ -1,40 +1,28 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-fpcunit.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/consoletestrunner.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/consoletestrunner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/digesttestreport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/digesttestreport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testregistry.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testreport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/ubmockobject.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmlreporter.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunitreport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunitreport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/latextestreport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/latextestreport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmltestreport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/plaintestreport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/plaintestreport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/consoletestrunner.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/digesttestreport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testregistry.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testregistry.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testreport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testreport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/ubmockobject.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/ubmockobject.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmlreporter.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunitreport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/latextestreport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmlreporter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmltestreport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/plaintestreport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpconsoletestrunner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpdigesttestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestregistry.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestdecorator.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpubmockobject.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpxmlreporter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpfpcunitreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libplatextestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpxmltestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpplaintestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpfpcunit.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestutils.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmltestreport.ppu
diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile
index bf3e43e6c341..d92c374d6d03 100644
--- a/devel/fpc-fcl-image/Makefile
+++ b/devel/fpc-fcl-image/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-image
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal image loading and conversion libraries (FCL)
-USE_FPC= fcl-async fcl-base hash pasjpeg paszlib pthreads libpng
+USE_FPC= fcl-base fcl-res pasjpeg rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-image/pkg-plist b/devel/fpc-fcl-image/pkg-plist
index 88dd58878497..5cf14aaa4da1 100644
--- a/devel/fpc-fcl-image/pkg-plist
+++ b/devel/fpc-fcl-image/pkg-plist
@@ -1,127 +1,86 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/Package.fpc
-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/fpimggauss.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadgif.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpng.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpsd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxpm.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/clipping.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pixtools.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritebmp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadbmp.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-image.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/bmpcomn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/bmpcomn.ppu
-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
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/clipping.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/clipping.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ellipses.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ellipses.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcolhash.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcolhash.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpditherer.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpditherer.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.ppu
-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/xwdfile.ppu
-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/fpimage.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimggauss.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimggauss.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadbmp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadbmp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadgif.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadgif.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadjpeg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadjpeg.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpng.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpng.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpnm.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpnm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpsd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpsd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtga.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtga.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtiff.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtiff.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxpm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/clipping.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pixtools.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxpm.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fptiffcmn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fptiffcmn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritebmp.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadbmp.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/bmpcomn.o
-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/fpwritebmp.ppu
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/fpwritejpeg.ppu
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/fpwritepcx.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepnm.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepnm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetga.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ellipses.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcolhash.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpditherer.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetga.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetiff.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetiff.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.o
+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/pcxcomn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pixtools.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pixtools.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/targacmn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/targacmn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/xwdfile.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimgcmn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimage.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimggauss.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppngcomn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadgif.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpng.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpsd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadxwd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritepng.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadxpm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritexpm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpclipping.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpcanvas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppixtools.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfppixlcanv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimgcanv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppscanvas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritebmp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadbmp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpbmpcomn.a
-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/libpfreetype.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpftfont.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpxwdfile.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/xwdfile.ppu
diff --git a/devel/fpc-fcl-js/Makefile b/devel/fpc-fcl-js/Makefile
index 6eb9b7470529..4ddf8582ed7d 100644
--- a/devel/fpc-fcl-js/Makefile
+++ b/devel/fpc-fcl-js/Makefile
@@ -1,12 +1,11 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-js
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal Javascript scanner/parser/syntax tree (FCL)
USE_FPC= yes
diff --git a/devel/fpc-fcl-js/pkg-plist b/devel/fpc-fcl-js/pkg-plist
index 7ffc8ddbe3ba..65b76bc7857e 100644
--- a/devel/fpc-fcl-js/pkg-plist
+++ b/devel/fpc-fcl-js/pkg-plist
@@ -1,13 +1,16 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-js.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsbase.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsbase.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsparser.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsparser.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsscanner.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsscanner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsscanner.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstoken.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstoken.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstree.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstree.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/libpjsbase.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/libpjsparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/libpjsscanner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/libpjstree.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jswriter.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jswriter.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jswriter.rsj
diff --git a/devel/fpc-fcl-json/Makefile b/devel/fpc-fcl-json/Makefile
index c31f88244b9a..44585da6519f 100644
--- a/devel/fpc-fcl-json/Makefile
+++ b/devel/fpc-fcl-json/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-json
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= JSON (JavaScript Object Notation) implementation in FreePascal
+COMMENT= Free Pascal JavaScript Object Notation implemenation (FCL)
-USE_FPC= fcl-base
+USE_FPC= fcl-base rtl-objpas fcl-res
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-json/pkg-plist b/devel/fpc-fcl-json/pkg-plist
index 24fc9ea1ed72..b4103115c007 100644
--- a/devel/fpc-fcl-json/pkg-plist
+++ b/devel/fpc-fcl-json/pkg-plist
@@ -1,16 +1,16 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-json.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpfpjson.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpfpjsonrtti.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpjsonscanner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpjsonparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpjsonconf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.rsj
diff --git a/devel/fpc-fcl-net/Makefile b/devel/fpc-fcl-net/Makefile
index 06ca0ca72724..d3d74239d75f 100644
--- a/devel/fpc-fcl-net/Makefile
+++ b/devel/fpc-fcl-net/Makefile
@@ -1,18 +1,16 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-net
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal network interfaces (FCL)
-USE_FPC= fcl-async fcl-base fcl-xml fcl-passrc hash paszlib pthreads
+USE_FPC= fcl-base openssl fcl-xml fcl-passrc fcl-async rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR= ${WRKUNITDIR}
-OPT= -Fu${WRKDIR}/${WRKUNITDIR}/*
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-net/pkg-plist b/devel/fpc-fcl-net/pkg-plist
index 486fe754963e..4462b3474610 100644
--- a/devel/fpc-fcl-net/pkg-plist
+++ b/devel/fpc-fcl-net/pkg-plist
@@ -1,16 +1,17 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-net.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpcnetdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpfpsock.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpnetdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpresolve.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpssockets.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslsockets.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslsockets.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslsockets.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.rsj
diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile
index 67b3676b65bf..c942c0c7354b 100644
--- a/devel/fpc-fcl-passrc/Makefile
+++ b/devel/fpc-fcl-passrc/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-passrc
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal language parsing library (FPC)
-USE_FPC= yes
+USE_FPC= fcl-base fcl-res rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-passrc/pkg-plist b/devel/fpc-fcl-passrc/pkg-plist
index 0bb8b4d45046..7c0f1cbb226a 100644
--- a/devel/fpc-fcl-passrc/pkg-plist
+++ b/devel/fpc-fcl-passrc/pkg-plist
@@ -1,19 +1,17 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastounittest.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-passrc.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/passrcutil.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/passrcutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastounittest.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/passrcutil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastounittest.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastounittest.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppastree.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppscanner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppassrcutil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppastounittest.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppaswrite.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.rsj
diff --git a/devel/fpc-fcl-process/pkg-plist b/devel/fpc-fcl-process/pkg-plist
deleted file mode 100644
index a7c2d94474ba..000000000000
--- a/devel/fpc-fcl-process/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpdbugintf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpdbugmsg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libppipes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libppipesipc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpprocess.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpsimpleipc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.ppu
diff --git a/devel/fpc-fcl-registry/Makefile b/devel/fpc-fcl-registry/Makefile
index 7ac69078cd18..ee3fba8ce23a 100644
--- a/devel/fpc-fcl-registry/Makefile
+++ b/devel/fpc-fcl-registry/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-registry
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal emulation of Windows registry (FCL)
-USE_FPC= fcl-async fcl-base fcl-xml hash paszlib pthreads
+USE_FPC= fcl-base fcl-xml
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-registry/pkg-plist b/devel/fpc-fcl-registry/pkg-plist
index 6964a567494c..95b072e57fe5 100644
--- a/devel/fpc-fcl-registry/pkg-plist
+++ b/devel/fpc-fcl-registry/pkg-plist
@@ -1,7 +1,6 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/xmlreg.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-registry.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/registry.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/registry.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/registry.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/xmlreg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/registry.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/libpxmlreg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/libpregistry.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/xmlreg.ppu
diff --git a/devel/fpc-fcl-res/Makefile b/devel/fpc-fcl-res/Makefile
index 4e726f62be3e..5349b52ec89e 100644
--- a/devel/fpc-fcl-res/Makefile
+++ b/devel/fpc-fcl-res/Makefile
@@ -1,14 +1,13 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-res
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal resource handlers (FCL)
-USE_FPC= fcl-base
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-res/pkg-plist b/devel/fpc-fcl-res/pkg-plist
index 544a24b02b31..7712dd0959cd 100644
--- a/devel/fpc-fcl-res/pkg-plist
+++ b/devel/fpc-fcl-res/pkg-plist
@@ -1,9 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-res.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/acceleratorsresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/acceleratorsresource.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/bitmapresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/bitmapresource.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/coffconsts.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/coffconsts.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/coffreader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/coffreader.ppu
@@ -37,43 +36,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/groupresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/groupresource.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/icocurtypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/icocurtypes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpacceleratorsresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpbitmapresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpcoffconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpcoffreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpcofftypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpcoffwriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpdfmreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpelfconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpelfreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpelftypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpelfwriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpexternalreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpexternaltypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpexternalwriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpfpcrestypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpgroupcursorresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpgroupiconresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpgroupresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpicocurtypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpmachoconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpmachoreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpmachotypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpmachowriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresdatastream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresfactory.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresmerger.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresourcetree.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpreswriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpstringtableresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpstrtable.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libptlbreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpversionconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpversionresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpversiontypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpwinpeimagereader.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machoconsts.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machoconsts.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machoreader.o
@@ -86,10 +48,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resdatastream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resdatastream.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resfactory.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resfactory.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resfactory.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resmerger.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resmerger.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resource.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resource.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resourcetree.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resourcetree.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resreader.o
@@ -98,15 +62,18 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/reswriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/reswriter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/stringtableresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/stringtableresource.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/stringtableresource.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/strtable.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/strtable.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/tlbreader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/tlbreader.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionconsts.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionconsts.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionresource.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versiontypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versiontypes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versiontypes.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/winpeimagereader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/winpeimagereader.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/xcoffwriter.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/xcoffwriter.ppu
diff --git a/devel/fpc-fcl-sdo/Makefile b/devel/fpc-fcl-sdo/Makefile
new file mode 100644
index 000000000000..844c01574835
--- /dev/null
+++ b/devel/fpc-fcl-sdo/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+CATEGORIES= devel lang
+PKGNAMESUFFIX= -fcl-sdo
+
+MAINTAINER= freebsd-fpc@FreeBSD.org
+COMMENT= Free Pascal Service Data Objects implementation (FCL)
+
+USE_FPC= dblib fcl-base fcl-db fcl-json fcl-xml ibase mysql odbc \
+ oracle postgres pxlib rtl-extra sqlite
+
+MASTERDIR= ${.CURDIR}/../../lang/fpc
+WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR= ${WRKUNITDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-sdo/pkg-plist b/devel/fpc-fcl-sdo/pkg-plist
new file mode 100644
index 000000000000..41f6d4a06f0c
--- /dev/null
+++ b/devel/fpc-fcl-sdo/pkg-plist
@@ -0,0 +1,77 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-sdo.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/data_acces_intf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/data_acces_intf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/data_acces_intf.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/pas_generator.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/pas_generator.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_binary_streamer.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_binary_streamer.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_changesummary.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_changesummary.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_consts.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_consts.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_consts.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_cursor_intf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_cursor_intf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_imp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_imp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_imp.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_datafactory.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_datafactory.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_dataobject.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_dataobject.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_date_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_date_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_date_utils.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_dom_cursors.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_dom_cursors.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_field_imp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_field_imp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_fpc_xml.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_fpc_xml.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_fpc_xml.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_imp_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_imp_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_linked_list.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_linked_list.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_locators.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_locators.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_logger_intf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_logger_intf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_parserutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_parserutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_rtti_filters.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_rtti_filters.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_binary.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_binary.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_xml.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_xml.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_xml.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_type.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_type.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_types.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_types.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xpath_helper.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xpath_helper.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsd_helper.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsd_helper.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsdintf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsdintf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsdparser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsdparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/xsd_consts.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/xsd_consts.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/xsd_generator.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/xsd_generator.ppu
diff --git a/devel/fpc-fpmkunit/Makefile b/devel/fpc-fcl-sound/Makefile
index 8589048e2513..5dfc8d7b8cd1 100644
--- a/devel/fpc-fpmkunit/Makefile
+++ b/devel/fpc-fcl-sound/Makefile
@@ -1,15 +1,12 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= devel lang
-PKGNAMESUFFIX= -fpmkunit
+PKGNAMESUFFIX= -fcl-sound
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal build system unit
+COMMENT= Free Pascal sound loading, storing and converion (FCL)
-USE_FPC= fcl-process hash paszlib
-USE_FPC_RUN= yes
+USE_FPC= fcl-base fcl-res rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-sound/pkg-plist b/devel/fpc-fcl-sound/pkg-plist
new file mode 100644
index 000000000000..ee7417ceb675
--- /dev/null
+++ b/devel/fpc-fcl-sound/pkg-plist
@@ -0,0 +1,7 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-sound.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavformat.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavformat.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavreader.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavreader.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavwriter.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavwriter.ppu
diff --git a/devel/fpc-fcl-process/Makefile b/devel/fpc-fcl-stl/Makefile
index f3129b846fdf..7307e001db70 100644
--- a/devel/fpc-fcl-process/Makefile
+++ b/devel/fpc-fcl-stl/Makefile
@@ -1,12 +1,10 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
-PKGNAMESUFFIX= -fcl-process
+PKGNAMESUFFIX= -fcl-stl
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal unit to start and manipulate other programs
+COMMENT= Free Pascal generic container library (FCL)
USE_FPC= yes
diff --git a/devel/fpc-fcl-stl/pkg-plist b/devel/fpc-fcl-stl/pkg-plist
new file mode 100644
index 000000000000..e6eecc122a8e
--- /dev/null
+++ b/devel/fpc-fcl-stl/pkg-plist
@@ -0,0 +1,25 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-stl.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/garrayutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/garrayutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gdeque.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gdeque.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashmap.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashmap.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashset.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gmap.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gmap.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gpriorityqueue.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gpriorityqueue.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gqueue.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gqueue.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gset.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gstack.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gstack.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gtree.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gtree.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gutil.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gvector.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gvector.ppu
diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile
index b4db570ce837..318fa57cee6f 100644
--- a/devel/fpc-fcl-web/Makefile
+++ b/devel/fpc-fcl-web/Makefile
@@ -1,21 +1,18 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-web
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal web application libary (FCL)
-USE_FPC= fastcgi fcl-async fcl-base fcl-db fcl-json fcl-net fcl-process \
- fcl-xml hash httpd22 httpd24 ibase mysql odbc oracle paszlib postgres \
- pthreads sqlite fpmkunit
+USE_FPC= dblib fcl-async fcl-base fcl-db fcl-xml fcl-json fcl-net \
+ fcl-passrc fastcgi httpd22 httpd24 ibase mysql odbc openssl \
+ oracle postgres pxlib rtl-extra sqlite
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR= ${WRKUNITDIR}
-OPT= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \
- -Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-web/files/patch-packages-fcl-web_Makefile b/devel/fpc-fcl-web/files/patch-packages-fcl-web_Makefile
deleted file mode 100644
index 653f1110c5fa..000000000000
--- a/devel/fpc-fcl-web/files/patch-packages-fcl-web_Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
---- packages/fcl-web/Makefile 2012-02-24 02:00:09.000000000 -0500
-+++ packages/fcl-web/Makefile 2012-02-24 02:01:31.000000000 -0500
-@@ -2057,36 +2057,36 @@
- endif
- .NOTPARALLEL:
- fpmake: fpmake.pp
-- $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
-+ $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
- all: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -CX
- smart: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -XX -o -CX
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -XX -o -CX
- release: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dRELEASE
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dRELEASE
- debug: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG
- ifeq ($(FPMAKE_BIN_CLEAN),)
- clean:
- else
- clean:
-- $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-+ $(FPMAKE_BIN_CLEAN) clean $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
- endif
- ifeq ($(FPMAKE_BIN_CLEAN),)
- distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
- else
- distclean:
- ifdef inUnix
-- { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
-+ { $(FPMAKE_BIN_CLEAN) distclean $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
- else
-- $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-+ $(FPMAKE_BIN_CLEAN) distclean $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
- endif
- -$(DEL) $(LOCALFPMAKE)
- endif
- install: fpmake
- ifdef UNIXHier
-- $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
-+ $(LOCALFPMAKE) install $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
- else
-- $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
-+ $(LOCALFPMAKE) install $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
- endif
- distinstall: install
diff --git a/devel/fpc-fcl-web/pkg-plist b/devel/fpc-fcl-web/pkg-plist
index 655071dfb8cd..6473efa52577 100644
--- a/devel/fpc-fcl-web/pkg-plist
+++ b/devel/fpc-fcl-web/pkg-plist
@@ -1,114 +1,102 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-web.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiprotocol.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiprotocol.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custhttpapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custhttpapp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache24.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache24.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache24.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache24.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdispextdirect.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdispextdirect.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpapp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpclient.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpclient.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpclient.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpclient.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpwebclient.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpwebclient.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.rst
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpunits.cfg
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjwt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjwt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2ini.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2ini.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebclient.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebclient.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpprotocol.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpprotocol.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.rst
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcgiapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustfcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcusthttpapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustweb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpextjsjson.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpextjsxml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpezcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfcgigate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpapache24.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpapache.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpdatasetform.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpextdirect.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpextjs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpfcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttpapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttpclient.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttpserver.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpjsonrpc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpweb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpwebdata.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpwebfile.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libphttpdefs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpiniwebsession.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpsqldbwebdata.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebjsonrpc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebpage.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebsession.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebutil.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restbase.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restbase.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restcodegen.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restcodegen.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webjsonrpc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webjsonrpc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webpage.o
diff --git a/devel/fpc-fcl-xml/Makefile b/devel/fpc-fcl-xml/Makefile
index 85232a8d8955..071948866e3b 100644
--- a/devel/fpc-fcl-xml/Makefile
+++ b/devel/fpc-fcl-xml/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-xml
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal XML and DOM library (FCL)
-USE_FPC= fcl-async fcl-base hash iconvenc paszlib pthreads
+USE_FPC= fcl-base fcl-res rtl-objpas iconvenc
USE_FPC_RUN= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
diff --git a/devel/fpc-fcl-xml/pkg-plist b/devel/fpc-fcl-xml/pkg-plist
index b67df4d98cc7..fedee98bda51 100644
--- a/devel/fpc-fcl-xml/pkg-plist
+++ b/devel/fpc-fcl-xml/pkg-plist
@@ -1,4 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-xml.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom_html.o
@@ -11,29 +11,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlelements.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlelements.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmwrite.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmwrite.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdom.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdom_html.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdtdmodel.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmldefs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmlelements.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmlwriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmwrite.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax_html.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax_xml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlcfg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlconf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmliconv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlread.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlstreaming.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlwrite.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxpath.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_html.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_html.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_xml.o
@@ -42,17 +25,24 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xhtml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xhtml.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmliconv.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmliconv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlread.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlread.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlreader.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlreader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlstreaming.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlstreaming.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmltextreader.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmltextreader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlwrite.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlwrite.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xpath.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xpath.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xpath.rsj
diff --git a/devel/fpc-fpmkunit/pkg-plist b/devel/fpc-fpmkunit/pkg-plist
deleted file mode 100644
index cbd16225892d..000000000000
--- a/devel/fpc-fpmkunit/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/libpfpmkunit.a
diff --git a/devel/fpc-fppkg/Makefile b/devel/fpc-fppkg/Makefile
index 0a45d26f0d33..fc83645434e7 100644
--- a/devel/fpc-fppkg/Makefile
+++ b/devel/fpc-fppkg/Makefile
@@ -1,14 +1,15 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fppkg
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal package unit
+COMMENT= Free Pascal package manager unit
-USE_FPC= fcl-base fcl-net fcl-passrc fcl-process fcl-web fcl-xml fpmkunit
+USE_FPC= dblib fastcgi fcl-async fcl-base fcl-db fcl-json fcl-net \
+ fcl-passrc fcl-web fcl-xml httpd22 httpd24 ibase mysql odbc \
+ openssl oracle postgres pxlib rtl-extra sqlite
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fppkg/pkg-plist b/devel/fpc-fppkg/pkg-plist
index 92dc0cad59ed..6ba236181ab1 100644
--- a/devel/fpc-fppkg/pkg-plist
+++ b/devel/fpc-fppkg/pkg-plist
@@ -1,21 +1,10 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fppkg.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpfprepos.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpfpxmlrep.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgcommands.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgdownload.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgfphttp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgfpmake.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgglobals.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkghandler.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgmessages.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgmkconv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgoptions.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgrepos.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgwget.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgdownload.o
@@ -30,11 +19,13 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkghandler.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkghandler.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.ppu
diff --git a/devel/fpc-fv/Makefile b/devel/fpc-fv/Makefile
index ad1640bff473..20cf9c109a09 100644
--- a/devel/fpc-fv/Makefile
+++ b/devel/fpc-fv/Makefile
@@ -1,14 +1,13 @@
# Created by: John Merryweather Cooper
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fv
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= FreeVision is a Free Pascal unit for Delphi support
-USE_FPC= yes
+USE_FPC= rtl-console rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fv/pkg-plist b/devel/fpc-fv/pkg-plist
index b62ae447c513..0afd2f418efa 100644
--- a/devel/fpc-fv/pkg-plist
+++ b/devel/fpc-fv/pkg-plist
@@ -1,74 +1,51 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fv.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/colortxt.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/colortxt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/drivers.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/drivers.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvcommon.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvcommon.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvconsts.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/gadgets.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/gadgets.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/histlist.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/histlist.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/inplong.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/inplong.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/memory.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/memory.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/menus.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/menus.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/outline.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/outline.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/statuses.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/statuses.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/tabs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/time.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/validate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/views.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/sysmsg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/sysmsg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/colortxt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/drivers.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvcommon.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvconsts.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/gadgets.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/histlist.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/inplong.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/memory.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/menus.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/outline.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/statuses.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/tabs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/tabs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/time.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/time.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/validate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/validate.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/views.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/sysmsg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpcolortxt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpdialogs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpdrivers.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpeditors.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpfvcommon.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpfvconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpgadgets.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libphistlist.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpinplong.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpmemory.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpmenus.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpmsgbox.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpoutline.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpstatuses.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpstddlg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptabs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptime.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpvalidate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpviews.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpsysmsg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpasciitab.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptimeddlg.a
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/testapp.lpi
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/testapp.pas
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/Makefile.fpc
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/Makefile
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/views.ppu
diff --git a/devel/fpc-gdbint/Makefile b/devel/fpc-gdbint/Makefile
index 8af87d36427d..2964ce8de5a6 100644
--- a/devel/fpc-gdbint/Makefile
+++ b/devel/fpc-gdbint/Makefile
@@ -1,7 +1,6 @@
# Created by: John Merryweather Cooper et al
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel
PKGNAMESUFFIX= -gdbint
diff --git a/devel/fpc-gdbint/pkg-plist b/devel/fpc-gdbint/pkg-plist
index 7fee578a5fad..9a93d3f1da98 100644
--- a/devel/fpc-gdbint/pkg-plist
+++ b/devel/fpc-gdbint/pkg-plist
@@ -1,6 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbint.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/gdbint.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbcon.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbcon.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbint.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbcon.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/libpgdbcon.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbint.ppu
diff --git a/devel/fpc-newt/Makefile b/devel/fpc-newt/Makefile
index 2d0a5bb0073e..deefa92aab52 100644
--- a/devel/fpc-newt/Makefile
+++ b/devel/fpc-newt/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -newt
diff --git a/devel/fpc-newt/files/patch-packages_newt_fpmake.pp b/devel/fpc-newt/files/patch-packages_newt_fpmake.pp
new file mode 100644
index 000000000000..ccc6e57a82a4
--- /dev/null
+++ b/devel/fpc-newt/files/patch-packages_newt_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/newt/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/newt/fpmake.pp
+@@ -18,7 +18,7 @@ begin
+ {$endif ALLPACKAGES}
+ P.Version:='3.0.1';
+ P.SourcePath.Add('src');
+- P.OSes:=[Linux];
++ P.OSes:=[Linux,dragonfly,freebsd];
+
+ T:=P.Targets.AddUnit('newt.pp');
+
diff --git a/devel/fpc-newt/pkg-plist b/devel/fpc-newt/pkg-plist
index d1af6a0d9c64..fc8eeedf6fff 100644
--- a/devel/fpc-newt/pkg-plist
+++ b/devel/fpc-newt/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/newt.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/newt.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/newt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/libpnewt.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/newt.ppu
diff --git a/devel/fpc-pthreads/Makefile b/devel/fpc-pthreads/Makefile
index a6e401b845e6..43ae19769d50 100644
--- a/devel/fpc-pthreads/Makefile
+++ b/devel/fpc-pthreads/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -pthreads
diff --git a/devel/fpc-pthreads/pkg-plist b/devel/fpc-pthreads/pkg-plist
index 0084209e365b..bd318c7784dc 100644
--- a/devel/fpc-pthreads/pkg-plist
+++ b/devel/fpc-pthreads/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/pthreads.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/pthreads.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/pthreads.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/libppthreads.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/pthreads.ppu
diff --git a/devel/fpc-regexpr/Makefile b/devel/fpc-regexpr/Makefile
index 986c200e2303..f7da658988e7 100644
--- a/devel/fpc-regexpr/Makefile
+++ b/devel/fpc-regexpr/Makefile
@@ -1,14 +1,13 @@
# Created by: John Merryweather Cooper et al
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -regexpr
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal regular expression routines
-USE_FPC= yes
+USE_FPC= rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-regexpr/pkg-plist b/devel/fpc-regexpr/pkg-plist
index 900bba6964a0..b1cd37e09939 100644
--- a/devel/fpc-regexpr/pkg-plist
+++ b/devel/fpc-regexpr/pkg-plist
@@ -1,10 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/oldregexpr.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/regexpr.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/oldregexpr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/oldregexpr.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpoldregexpr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpregex.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpregexpr.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.ppu
diff --git a/devel/fpc-sdl/Makefile b/devel/fpc-sdl/Makefile
index 3fa01d43b960..692eac7ac4db 100644
--- a/devel/fpc-sdl/Makefile
+++ b/devel/fpc-sdl/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 5
CATEGORIES= devel lang
PKGNAMESUFFIX= -sdl
diff --git a/devel/fpc-sdl/pkg-plist b/devel/fpc-sdl/pkg-plist
index f805b5301e61..4619a2128313 100644
--- a/devel/fpc-sdl/pkg-plist
+++ b/devel/fpc-sdl/pkg-plist
@@ -1,31 +1,21 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_image.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer_nosmpeg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/sdl.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/logger.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/logger.ppu
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_image.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_image.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer_nosmpeg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer_nosmpeg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/logger.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.ppu
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_image.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_mixer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_mixer_nosmpeg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_ttf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_gfx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_net.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsmpeg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libplogger.a
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdlutils.a
+%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.ppu
diff --git a/devel/fpc-symbolic/Makefile b/devel/fpc-symbolic/Makefile
index b9a2fb36fd78..66b54907d9c0 100644
--- a/devel/fpc-symbolic/Makefile
+++ b/devel/fpc-symbolic/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -symbolic
diff --git a/devel/fpc-symbolic/pkg-plist b/devel/fpc-symbolic/pkg-plist
index 6e36901f3af5..88d0fabe5fb6 100644
--- a/devel/fpc-symbolic/pkg-plist
+++ b/devel/fpc-symbolic/pkg-plist
@@ -1,4 +1,6 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/symbolic.ppu
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/symbolic/optimization.txt
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/symbolic/symbolic.txt
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/symbolic.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/symbolic.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/libpsymbolic.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/symbolic.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/symbolic.rsj
diff --git a/devel/fpc-zlib/Makefile b/devel/fpc-zlib/Makefile
index 0b42e94bbbad..d2601796a38c 100644
--- a/devel/fpc-zlib/Makefile
+++ b/devel/fpc-zlib/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -zlib
diff --git a/devel/fpc-zlib/pkg-plist b/devel/fpc-zlib/pkg-plist
index dd2b20dd93f0..0d3cbe1d2eed 100644
--- a/devel/fpc-zlib/pkg-plist
+++ b/devel/fpc-zlib/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/zlib.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/zlib.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/zlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/libpzlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/zlib.ppu
diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile
index 697b253bd81f..52d78a11e565 100644
--- a/editors/fpc-ide/Makefile
+++ b/editors/fpc-ide/Makefile
@@ -1,20 +1,16 @@
# Created by: John Merryweather Cooper et al
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= editors lang
PKGNAMESUFFIX= -ide
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal integrated IDE/compiler
-USE_FPC= chm fcl-async fcl-base fcl-xml fv gdbint graph ibase hash mysql \
- odbc oracle pasjpeg paszlib pthreads postgres regexpr sqlite
+USE_FPC= chm fv gdbint regexpr rtl-extra rtl-console fcl-xml
-FPCDIR= # none
-UNITPREFIX= # none
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR= ${WRKUNITDIR} ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/fv
+EXTRACTUNITDIR= ${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/compiler
.include "${MASTERDIR}/Makefile"
diff --git a/editors/fpc-ide/pkg-plist b/editors/fpc-ide/pkg-plist
index b0158eea2d43..89718ea51ba4 100644
--- a/editors/fpc-ide/pkg-plist
+++ b/editors/fpc-ide/pkg-plist
@@ -1,12 +1,13 @@
+bin/cvsco.tdf
+bin/cvsdiff.tdf
+bin/cvsup.tdf
bin/fp
-lib/fpc/%%PORTVERSION%%/ide/fp.ans
-lib/fpc/%%PORTVERSION%%/ide/gplprog.pt
-lib/fpc/%%PORTVERSION%%/ide/gplunit.pt
-lib/fpc/%%PORTVERSION%%/ide/program.pt
-lib/fpc/%%PORTVERSION%%/ide/unit.pt
-lib/fpc/%%PORTVERSION%%/ide/cvsco.tdf
-lib/fpc/%%PORTVERSION%%/ide/cvsdiff.tdf
-lib/fpc/%%PORTVERSION%%/ide/cvsup.tdf
-lib/fpc/%%PORTVERSION%%/ide/grep.tdf
-lib/fpc/%%PORTVERSION%%/ide/tpgrep.tdf
+bin/fp.ans
+bin/gplprog.pt
+bin/gplunit.pt
+bin/grep.tdf
+bin/program.pt
+bin/tpgrep.tdf
+bin/unit.pt
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/ide.fpm
share/doc/fpc-%%PORTVERSION%%/ide/readme.ide
diff --git a/editors/lazarus-lcl-gtk2/Makefile b/editors/lazarus-lcl-gtk2/Makefile
index 1605bf65a7ba..99aa72b75ba9 100644
--- a/editors/lazarus-lcl-gtk2/Makefile
+++ b/editors/lazarus-lcl-gtk2/Makefile
@@ -1,14 +1,14 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
PKGNAMESUFFIX= -lcl-gtk2
COMMENT= Lazarus components library - GTK2 backend
BUILD_DEPENDS= ${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units
-USE_FPC= cairo fcl-base fcl-db fcl-image fcl-process fcl-res fcl-registry \
+USE_FPC= cairo fcl-base fcl-db fcl-image fcl-res fcl-registry \
fcl-xml gtk2 pasjpeg x11
LCL_INTERFACE= gtk2
diff --git a/editors/lazarus-lcl-nogui/Makefile b/editors/lazarus-lcl-nogui/Makefile
index 7029a74dc1b8..9e7a524cdeb7 100644
--- a/editors/lazarus-lcl-nogui/Makefile
+++ b/editors/lazarus-lcl-nogui/Makefile
@@ -1,7 +1,7 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -lcl-nogui
COMMENT= Lazarus components library - No gui backend
diff --git a/editors/lazarus-lcl-qt/Makefile b/editors/lazarus-lcl-qt/Makefile
index e88a73ae2fdf..349c5a82213a 100644
--- a/editors/lazarus-lcl-qt/Makefile
+++ b/editors/lazarus-lcl-qt/Makefile
@@ -1,14 +1,14 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
+PORTREVISION= 4
PKGNAMESUFFIX= -lcl-qt
COMMENT= Lazarus components library - QT backend
BUILD_DEPENDS= ${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units
-USE_FPC= fcl-base fcl-db fcl-image fcl-process fcl-registry fcl-res \
+USE_FPC= fcl-base fcl-db fcl-image fcl-registry fcl-res \
fcl-xml pasjpeg x11
LCL_INTERFACE= qt
diff --git a/editors/lazarus-lcl-units/Makefile b/editors/lazarus-lcl-units/Makefile
index 476df2069c86..7e6db53141fe 100644
--- a/editors/lazarus-lcl-units/Makefile
+++ b/editors/lazarus-lcl-units/Makefile
@@ -1,12 +1,12 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
PKGNAMESUFFIX= -lcl-units
COMMENT= Lazarus components library units
-USE_FPC= fcl-base fcl-db fcl-image fcl-json fcl-process fcl-registry \
+USE_FPC= fcl-base fcl-db fcl-image fcl-json fcl-registry \
fcl-res fcl-xml iconvenc pasjpeg
LCL_INTERFACE= #
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 84f4c8ebfdd0..a2cb9d2cd22f 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -4,14 +4,14 @@
PORTNAME= lazarus
PORTVERSION= 1.4.2
DISTVERSIONSUFFIX= -0
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= editors devel
MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION:S/.0//} \
LOCAL/acm/freepascal
DIST_SUBDIR= freepascal
MAINTAINER?= freebsd-fpc@FreeBSD.org
-COMMENT?= A portable Delphi-like IDE for the FreePascal compiler
+COMMENT?= Portable Delphi-like IDE for the FreePascal compiler
BUILD_DEPENDS?= #
RUN_DEPENDS?= #
@@ -20,9 +20,9 @@ ONLY_FOR_ARCHS= i386 amd64
USES= gmake
USE_GNOME= #
-USE_FPC?= cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-process \
- fcl-registry fcl-res fcl-xml gtk2 ibase iconvenc mysql numlib odbc oracle \
- pasjpeg postgres sqlite x11
+USE_FPC?= cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json \
+ fcl-registry fcl-res fcl-xml gtk2 ibase iconvenc rtl-extra \
+ mysql numlib odbc oracle pasjpeg postgres sqlite x11
OPT?= "-Sgic "
MAKE_ENV= OPT=${OPT}
diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile
index eb5e5fa5498c..f0a86318a2df 100644
--- a/ftp/fpc-libcurl/Makefile
+++ b/ftp/fpc-libcurl/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= ftp lang
PKGNAMESUFFIX= -libcurl
diff --git a/ftp/fpc-libcurl/pkg-plist b/ftp/fpc-libcurl/pkg-plist
index e268151bbde5..960ac6ffedf9 100644
--- a/ftp/fpc-libcurl/pkg-plist
+++ b/ftp/fpc-libcurl/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libcurl.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libcurl.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libcurl.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libplibcurl.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libcurl.ppu
diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile
index f0020ee382b7..824eec0cb6eb 100644
--- a/graphics/fpc-cairo/Makefile
+++ b/graphics/fpc-cairo/Makefile
@@ -1,15 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -cairo
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal interface to cairo library
-USE_FPC= fcl-async fcl-base fcl-image hash pasjpeg paszlib pthreads \
- x11
+USE_FPC= fcl-base fcl-image fcl-res pasjpeg rtl-objpas x11
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/graphics/fpc-cairo/pkg-plist b/graphics/fpc-cairo/pkg-plist
index 6f7afa8704f7..b1fa418972c7 100644
--- a/graphics/fpc-cairo/pkg-plist
+++ b/graphics/fpc-cairo/pkg-plist
@@ -1,10 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairo.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/cairo.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoft.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairo.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoft.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoft.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairogobject.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairogobject.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoxlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoxlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/libpcairo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/libpcairoft.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/libpcairoxlib.a
diff --git a/graphics/fpc-graph/Makefile b/graphics/fpc-graph/Makefile
index 3100b9c05245..f53a49633c31 100644
--- a/graphics/fpc-graph/Makefile
+++ b/graphics/fpc-graph/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= graphics lang
PKGNAMESUFFIX= -graph
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal interface to graphical applications
-USE_FPC= x11 sdl pthreads
+USE_FPC= sdl x11 ${ARCH:Mi386:S/i386/pthreads/}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/graphics/fpc-graph/files/patch-packages_graph_fpmake.pp b/graphics/fpc-graph/files/patch-packages_graph_fpmake.pp
new file mode 100644
index 000000000000..f40b3671e659
--- /dev/null
+++ b/graphics/fpc-graph/files/patch-packages_graph_fpmake.pp
@@ -0,0 +1,67 @@
+--- packages/graph/fpmake.pp.orig 2015-11-13 21:15:29 UTC
++++ packages/graph/fpmake.pp
+@@ -26,14 +26,14 @@ begin
+ P.NeedLibC:= false; // true for headers that indirectly link to libc? OS specific?
+
+ P.CPUs:=[i386,x86_64,powerpc,i8086];
+- P.OSes:=[go32v2,win32,win64,linux,freebsd,darwin,msdos];
++ P.OSes:=[go32v2,win32,win64,linux,dragonfly,freebsd,darwin,msdos];
+
+- P.Dependencies.Add('sdl',[i386,powerpc],[win32,linux,freebsd,darwin]);
++ P.Dependencies.Add('sdl',[i386,powerpc],[win32,linux,dragonfly,freebsd,darwin]);
+ P.Dependencies.Add('ptc',[win32,win64,linux]);
+
+ // Dependencies for ptc, due to fpcmake bug:
+ P.Dependencies.Add('fcl-base',[win32,win64,linux]);
+- P.Dependencies.Add('x11',[freebsd,linux]); // ptc only depends on reebsd and linux on x11
++ P.Dependencies.Add('x11',[dragonfly,freebsd,linux]); // ptc only depends on reebsd and linux on x11
+ P.Dependencies.Add('hermes',[win32,win64,linux]);
+ P.Dependencies.Add('opengl',[win32,win64,linux]);
+
+@@ -44,15 +44,15 @@ begin
+ P.SourcePath.Add('src/go32v2',[go32v2]);
+ P.SourcePath.Add('src/msdos',[msdos]);
+ P.SourcePath.Add('src/win32',[win32,win64]);
+- P.SourcePath.Add('src/unix',[freebsd,linux]); // Darwin has own.
++ P.SourcePath.Add('src/unix',[dragonfly,freebsd,linux]); // Darwin has own.
+
+ P.IncludePath.Add('src/inc');
+ P.IncludePath.Add('src/go32v2',[go32v2]);
+ P.IncludePath.Add('src/msdos',[msdos]);
+- P.IncludePath.Add('src/unix',[freebsd,linux]); // Darwin has own.
++ P.IncludePath.Add('src/unix',[dragonfly,freebsd,linux]); // Darwin has own.
+ P.IncludePath.Add('src/go32v2',[go32v2]);
+
+- T:=P.Targets.AddUnit('ggigraph.pp',[linux,freebsd]);
++ T:=P.Targets.AddUnit('ggigraph.pp',[linux,dragonfly,freebsd]);
+ with T.Dependencies do
+ begin
+ AddInclude('graphh.inc');
+@@ -76,10 +76,10 @@ begin
+ AddInclude('modes.inc');
+ AddInclude('fills.inc');
+ AddInclude('gtext.inc');
+- AddInclude('graph16.inc',[freebsd,linux]);
++ AddInclude('graph16.inc',[dragonfly,freebsd,linux]);
+ end;
+ // Graph unit other targets
+- T:=P.Targets.AddUnit('graph.pp',[go32v2,amiga,win32,win64,freebsd,msdos]);
++ T:=P.Targets.AddUnit('graph.pp',[go32v2,amiga,win32,win64,dragonfly,freebsd,msdos]);
+ with T.Dependencies do
+ begin
+ AddInclude('graphh.inc');
+@@ -90,12 +90,12 @@ begin
+ AddInclude('modes.inc');
+ AddInclude('fills.inc');
+ AddInclude('gtext.inc');
+- AddInclude('graph16.inc',[freebsd,linux]);
++ AddInclude('graph16.inc',[dragonfly,freebsd,linux]);
+ AddInclude('vesa.inc',[go32v2,msdos]);
+ AddInclude('vesah.inc',[go32v2,msdos]);
+ end;
+
+- T:=P.Targets.AddUnit('src/sdlgraph/sdlgraph.pp',[i386,powerpc],[win32,linux,freebsd,darwin]);
++ T:=P.Targets.AddUnit('src/sdlgraph/sdlgraph.pp',[i386,powerpc],[win32,linux,dragonfly,freebsd,darwin]);
+ with T.Dependencies do
+ begin
+ AddInclude('graphh.inc');
diff --git a/graphics/fpc-graph/pkg-plist b/graphics/fpc-graph/pkg-plist
index b98a7f64be3c..9a8c50420855 100644
--- a/graphics/fpc-graph/pkg-plist
+++ b/graphics/fpc-graph/pkg-plist
@@ -1,10 +1,7 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/graph.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.ppu
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.ppu
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpgraph.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpggigraph.a
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpsdlgraph.a
+%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.ppu
diff --git a/graphics/fpc-hermes/Makefile b/graphics/fpc-hermes/Makefile
index af6e8554c8da..1050ebb75d67 100644
--- a/graphics/fpc-hermes/Makefile
+++ b/graphics/fpc-hermes/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -hermes
diff --git a/graphics/fpc-hermes/files/patch-Makefile b/graphics/fpc-hermes/files/patch-Makefile
deleted file mode 100644
index 040a8e4a79fc..000000000000
--- a/graphics/fpc-hermes/files/patch-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- packages/hermes/Makefile 2009-12-12 15:51:44.000000000 +0000
-+++ packages/hermes/Makefile 2010-04-22 21:52:27.000000000 +0100
-@@ -623,6 +623,7 @@
- ifeq ($(FULL_TARGET),armeb-embedded)
- override TARGET_LOADERS+=$(CPU_LOADERS)
- endif
-+override INSTALL_FPCPACKAGE=y
- ifeq ($(FULL_TARGET),i386-linux)
- override COMPILER_INCLUDEDIR+=src
- endif
diff --git a/graphics/fpc-hermes/pkg-plist b/graphics/fpc-hermes/pkg-plist
index fed3c802da09..21eb47511899 100644
--- a/graphics/fpc-hermes/pkg-plist
+++ b/graphics/fpc-hermes/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/hermes.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/libphermes.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.ppu
diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile
index 4c5100e70a22..5a64ef6e1260 100644
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 5
CATEGORIES= graphics lang
PKGNAMESUFFIX= -imagemagick
diff --git a/graphics/fpc-imagemagick/pkg-plist b/graphics/fpc-imagemagick/pkg-plist
index 159432168e96..592e2df612ed 100644
--- a/graphics/fpc-imagemagick/pkg-plist
+++ b/graphics/fpc-imagemagick/pkg-plist
@@ -1,10 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/buildim.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/magick_wand.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/imagemagick.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/imagemagick.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/imagemagick.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/buildim.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/magick_wand.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/imagemagick.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/libpbuildim.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/libpmagick_wand.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/libpimagemagick.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/magick_wand.ppu
diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile
index 00a1ded781ce..d128a4bf3011 100644
--- a/graphics/fpc-libgd/Makefile
+++ b/graphics/fpc-libgd/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -libgd
diff --git a/graphics/fpc-libgd/pkg-plist b/graphics/fpc-libgd/pkg-plist
index 5dc5a65eaa5f..3a33170c602b 100644
--- a/graphics/fpc-libgd/pkg-plist
+++ b/graphics/fpc-libgd/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/gd.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libgd.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/gd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/libpgd.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/gd.ppu
diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile
index c2553bcdc5aa..293a945bc8f4 100644
--- a/graphics/fpc-libpng/Makefile
+++ b/graphics/fpc-libpng/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= graphics lang
PKGNAMESUFFIX= -libpng
diff --git a/graphics/fpc-libpng/pkg-plist b/graphics/fpc-libpng/pkg-plist
index 0b39935e9e7b..2dd7c6dc6925 100644
--- a/graphics/fpc-libpng/pkg-plist
+++ b/graphics/fpc-libpng/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/png.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libpng.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/png.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/libppng.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/png.ppu
diff --git a/graphics/fpc-ncurses/Makefile b/graphics/fpc-ncurses/Makefile
index 6ec75d77e6aa..656de42ee7ab 100644
--- a/graphics/fpc-ncurses/Makefile
+++ b/graphics/fpc-ncurses/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -ncurses
diff --git a/graphics/fpc-ncurses/pkg-plist b/graphics/fpc-ncurses/pkg-plist
index b9aa8cc7f3d3..1ec760d5e648 100644
--- a/graphics/fpc-ncurses/pkg-plist
+++ b/graphics/fpc-ncurses/pkg-plist
@@ -1,19 +1,13 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/ncurses.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/form.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/form.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncrt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ocrt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/menu.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/menu.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/form.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncrt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncrt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ocrt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/menu.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpform.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpncurses.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libppanel.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpncrt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpocrt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpmenu.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ocrt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.ppu
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index 32c2df562405..a53457f91f26 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= graphics lang
PKGNAMESUFFIX= -opengl
diff --git a/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp b/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp
index 07e43aa21892..4a27d7479a78 100644
--- a/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp
+++ b/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp
@@ -1,19 +1,11 @@
---- packages/opengl/src/glut.pp 2013-03-23 01:19:14.000000000 -0500
-+++ packages/opengl/src/glut.pp 2013-03-23 01:22:47.000000000 -0500
-@@ -765,13 +765,13 @@
+--- packages/opengl/src/glut.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/opengl/src/glut.pp
+@@ -768,7 +768,7 @@ initialization
{$ifdef darwin}
LoadGlut('/System/Library/Frameworks/GLUT.framework/GLUT');
{$else}
- {$IFDEF haiku}
-+ {$if defined(haiku) or defined(freebsd)}
++ {$if defined(haiku) or defined(freebsd) or defined(dragonfly)}
LoadGlut('libglut.so');
-- {$ELSE}
-+ {$else}
+ {$ELSE}
{$IFNDEF MORPHOS}
- LoadGlut('libglut.so.3');
- {$ENDIF}
-- {$ENDIF}
-+ {$endif}
- {$endif}
- {$ENDIF}
-
diff --git a/graphics/fpc-opengl/pkg-plist b/graphics/fpc-opengl/pkg-plist
index b5e2f50749be..d3a58855ebdd 100644
--- a/graphics/fpc-opengl/pkg-plist
+++ b/graphics/fpc-opengl/pkg-plist
@@ -1,4 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/opengl.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/freeglut.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/freeglut.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/gl.o
@@ -11,18 +11,3 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glut.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glut.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glx.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpfreeglut.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpgl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglext.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglu.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglut.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglx.a
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/radblur.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/morph3d.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemo.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemova.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/glxtest.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/freeglutdemo.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/bounce.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/Makefile.fpc
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/Makefile
diff --git a/graphics/fpc-pasjpeg/Makefile b/graphics/fpc-pasjpeg/Makefile
index 5861b71c45c3..75f18c0a58d5 100644
--- a/graphics/fpc-pasjpeg/Makefile
+++ b/graphics/fpc-pasjpeg/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -pasjpeg
diff --git a/graphics/fpc-pasjpeg/pkg-plist b/graphics/fpc-pasjpeg/pkg-plist
index 6efa22697888..e253b9e72a5f 100644
--- a/graphics/fpc-pasjpeg/pkg-plist
+++ b/graphics/fpc-pasjpeg/pkg-plist
@@ -1,154 +1,101 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/buildpasjpeg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/buildpasjpeg.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/pasjpeg.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapimin.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapimin.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapistd.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapistd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccoefct.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccoefct.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccolor.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccolor.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcdctmgr.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcdctmgr.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jchuff.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jchuff.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcinit.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcinit.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmainct.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmainct.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmarker.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmarker.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmaster.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmaster.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcomapi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcomapi.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcparam.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcparam.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcphuff.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcphuff.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcprepct.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcprepct.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcsample.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcsample.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jctrans.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jctrans.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcsample.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapimin.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapimin.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapistd.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapistd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatadst.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatadst.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatasrc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatasrc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcoefct.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcoefct.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcolor.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcolor.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdct.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jddctmgr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdeferr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdhuff.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdinput.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmainct.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmarker.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmaster.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmerge.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdphuff.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdpostct.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdsample.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jerror.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctflt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctfst.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctint.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctflt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctfst.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctint.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctred.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jinclude.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemmgr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemnobs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmorecfg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jpeglib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant1.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapimin.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapistd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccoefct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccolor.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcdctmgr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jchuff.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcinit.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmainct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmarker.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmaster.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcomapi.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcparam.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcphuff.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcprepct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcsample.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapimin.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapistd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatadst.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatasrc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcoefct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcolor.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdct.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jddctmgr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jddctmgr.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdeferr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdeferr.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdhuff.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdhuff.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdinput.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdinput.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmainct.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmainct.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmarker.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmarker.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmaster.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmaster.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmerge.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmerge.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdphuff.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdphuff.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdpostct.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdpostct.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdsample.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdsample.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jerror.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jerror.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctflt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctflt.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctfst.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctfst.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctint.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctint.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctflt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctflt.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctfst.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctfst.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctint.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctint.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctred.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctred.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jinclude.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jinclude.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemmgr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemmgr.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemnobs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemnobs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmorecfg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmorecfg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jpeglib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jpeglib.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant1.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant1.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant2.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpbuildpasjpeg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcapimin.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcapistd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjccoefct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjccolor.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcdctmgr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjchuff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcinit.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcmainct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcmarker.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcmaster.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcomapi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcparam.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcphuff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcprepct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjctrans.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcsample.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdapimin.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdapistd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdatadst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdatasrc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdcoefct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdcolor.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjddctmgr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdeferr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdhuff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdinput.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdmainct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdmarker.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdmaster.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdmerge.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdphuff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdpostct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdsample.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjerror.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjfdctflt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjfdctfst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjfdctint.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjidctflt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjidctfst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjidctint.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjidctred.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjinclude.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjmemmgr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjmemnobs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjmorecfg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjpeglib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjquant1.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjquant2.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjutils.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jutils.ppu
diff --git a/graphics/fpc-proj4/Makefile b/graphics/fpc-proj4/Makefile
index ab45082e6132..53a04984f06c 100644
--- a/graphics/fpc-proj4/Makefile
+++ b/graphics/fpc-proj4/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= graphics lang
PKGNAMESUFFIX= -proj4
diff --git a/graphics/fpc-proj4/files/patch-packages_proj4_fpmake.pp b/graphics/fpc-proj4/files/patch-packages_proj4_fpmake.pp
new file mode 100644
index 000000000000..c8b4511155cb
--- /dev/null
+++ b/graphics/fpc-proj4/files/patch-packages_proj4_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/proj4/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/proj4/fpmake.pp
+@@ -19,7 +19,7 @@ begin
+ P.Version:='3.0.1';
+ P.SourcePath.Add('src');
+ P.IncludePath.Add('src');
+- P.OSes := [linux];
++ P.OSes := [linux,dragonfly,freebsd];
+
+ T:=P.Targets.AddUnit('proj.pas');
+ with T.Dependencies do
diff --git a/graphics/fpc-proj4/pkg-plist b/graphics/fpc-proj4/pkg-plist
index 44dafcd5b241..74047a33bd44 100644
--- a/graphics/fpc-proj4/pkg-plist
+++ b/graphics/fpc-proj4/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/proj.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/proj4.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/proj.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/libpproj.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/proj.ppu
diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile
index 5fea747a4566..a252569f8278 100644
--- a/graphics/fpc-rsvg/Makefile
+++ b/graphics/fpc-rsvg/Makefile
@@ -1,14 +1,13 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -rsvg
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal interface to librsvg2 library
-USE_FPC= cairo fcl-base fcl-image gtk2 hash pasjpeg paszlib x11
+USE_FPC= cairo fcl-base fcl-image fcl-res gtk2 pasjpeg rtl-objpas x11
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//:S/^/lib/}
diff --git a/graphics/fpc-rsvg/pkg-plist b/graphics/fpc-rsvg/pkg-plist
index 8f489c4b4274..1e8204347b57 100644
--- a/graphics/fpc-rsvg/pkg-plist
+++ b/graphics/fpc-rsvg/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rsvg/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rsvg/rsvg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rsvg/rsvg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rsvg/libprsvg.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/rsvg.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/librsvg/rsvg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/librsvg/rsvg.ppu
diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile
index 00b3003caa4a..ebd60c03d1a8 100644
--- a/graphics/fpc-svgalib/Makefile
+++ b/graphics/fpc-svgalib/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -svgalib
diff --git a/graphics/fpc-svgalib/pkg-plist b/graphics/fpc-svgalib/pkg-plist
index 1411f60660b0..8c585f2ece74 100644
--- a/graphics/fpc-svgalib/pkg-plist
+++ b/graphics/fpc-svgalib/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/svgalib.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/svgalib.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/vgamouse.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/svgalib.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/vgamouse.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/libpsvgalib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/libpvgamouse.a
diff --git a/lang/Makefile b/lang/Makefile
index b8d321871ab7..e15be2da4058 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -80,6 +80,10 @@
SUBDIR += fpc-docs
SUBDIR += fpc-lua
SUBDIR += fpc-rexx
+ SUBDIR += fpc-rtl-console
+ SUBDIR += fpc-rtl-extra
+ SUBDIR += fpc-rtl-objpas
+ SUBDIR += fpc-rtl-unicode
SUBDIR += fpc-tcl
SUBDIR += fpc-units
SUBDIR += fpc-utils
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index ce80f516d8be..f24cd2c3b986 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= base
-PORTVERSION= 2.6.4
-PORTREVISION= 2
+PORTVERSION= 3.0.0
CATEGORIES= lang
PKGNAMEPREFIX= fpc-
@@ -16,6 +15,7 @@ WANT_FPC_BASE= yes
OPTIONS_DEFINE= DOCS
-DOCS_RUN_DEPENDS= ${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:${PORTSDIR}/lang/fpc-docs
+# docs not available yet, disable temporarily
+#DOCS_RUN_DEPENDS= ${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:${PORTSDIR}/lang/fpc-docs
.include <bsd.port.mk>
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 3bc0b2894dda..d4c23f846df3 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -2,17 +2,13 @@
# $FreeBSD$
PORTNAME= docs
-PORTVERSION= 2.6.4
+PORTVERSION= 3.0.0
CATEGORIES= lang
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/
+ ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/docs/
PKGNAMEPREFIX= fpc-
DISTNAME= ${PORTNAME:S/s//}-pdf
-DIST_SUBDIR= freepascal
+DIST_SUBDIR= freepascal/${PORTVERSION}
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal compiler Adobe Acrobat(tm) documentation
@@ -21,7 +17,8 @@ ONLY_FOR_ARCHS= i386 amd64
NO_BUILD= yes
DOCSDIR= ${PREFIX}/share/doc/fpdocs-${PORTVERSION}
-PORTDOCS= chart.pdf fcl.pdf fpdoc.pdf prog.pdf ref.pdf rtl.pdf user.pdf
+PORTDOCS= chart.pdf fcl.pdf fclres.pdf fpdoc.pdf prog.pdf ref.pdf \
+ rtl.pdf user.pdf
SUB_FILES= pkg-message
do-install:
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index 20e595cb8358..f73397b3d92b 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freepascal/doc-pdf.tar.gz) = 92eab731debc0d78fce3d0cc25f077892a6cd4cdb53d3829a643acacf7a157c8
-SIZE (freepascal/doc-pdf.tar.gz) = 8120420
+SHA256 (freepascal/3.0.0/doc-pdf.tar.gz) = 0eb586383cea7942b441b72eab8589b2a596b540ff674904e926084e82e0d745
+SIZE (freepascal/3.0.0/doc-pdf.tar.gz) = 8800183
diff --git a/lang/fpc-lua/Makefile b/lang/fpc-lua/Makefile
index 3593bbc1094d..0253263b1cea 100644
--- a/lang/fpc-lua/Makefile
+++ b/lang/fpc-lua/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= lang
PKGNAMESUFFIX= -lua
diff --git a/lang/fpc-lua/files/patch-packages_lua_fpmake.pp b/lang/fpc-lua/files/patch-packages_lua_fpmake.pp
new file mode 100644
index 000000000000..4fa371f696bc
--- /dev/null
+++ b/lang/fpc-lua/files/patch-packages_lua_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/lua/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/lua/fpmake.pp
+@@ -19,7 +19,7 @@ begin
+ P.Version:='3.0.1';
+ P.SourcePath.Add('src');
+ // P.Dependencies.Add('x11');
+- P.OSes := [linux,win32];
++ P.OSes := [linux,win32,dragonfly,freebsd];
+
+ T:=P.Targets.AddUnit('lauxlib.pas');
+ with T.Dependencies do
diff --git a/lang/fpc-lua/pkg-plist b/lang/fpc-lua/pkg-plist
index 30343d8df4b8..eac9fae17725 100644
--- a/lang/fpc-lua/pkg-plist
+++ b/lang/fpc-lua/pkg-plist
@@ -1,10 +1,7 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/lua.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/lualib.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/lua.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/lauxlib.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/lauxlib.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/lua.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/lua.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/lualib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/lauxlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/libplua.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/libplualib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/libplauxlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lua/lualib.ppu
diff --git a/lang/fpc-rexx/Makefile b/lang/fpc-rexx/Makefile
index ce0410950c10..eb1b49c0344e 100644
--- a/lang/fpc-rexx/Makefile
+++ b/lang/fpc-rexx/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= lang
PKGNAMESUFFIX= -rexx
diff --git a/lang/fpc-rexx/files/patch-packages_rexx_fpmake.pp b/lang/fpc-rexx/files/patch-packages_rexx_fpmake.pp
new file mode 100644
index 000000000000..0b9818ac40b0
--- /dev/null
+++ b/lang/fpc-rexx/files/patch-packages_rexx_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/rexx/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/rexx/fpmake.pp
+@@ -18,7 +18,7 @@ begin
+ {$endif ALLPACKAGES}
+ P.Version:='3.0.1';
+ P.SourcePath.Add('src');
+- P.Oses:=[emx,os2];
++ P.Oses:=[emx,os2,dragonfly,freebsd];
+ p.Targets.AddUnit('rexxsaa.pp');
+
+ P.Sources.AddSrc('readme.txt');
diff --git a/lang/fpc-rexx/pkg-plist b/lang/fpc-rexx/pkg-plist
index 23df78447944..642a8b51bb9c 100644
--- a/lang/fpc-rexx/pkg-plist
+++ b/lang/fpc-rexx/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rexx/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rexx/rexxsaa.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/rexx.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rexx/rexxsaa.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rexx/libprexxsaa.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rexx/rexxsaa.ppu
diff --git a/archivers/fpc-paszlib/Makefile b/lang/fpc-rtl-console/Makefile
index 7f9594c2513e..eb1da685a242 100644
--- a/archivers/fpc-paszlib/Makefile
+++ b/lang/fpc-rtl-console/Makefile
@@ -1,14 +1,12 @@
-# Created by: John Merryweather Cooper
# $FreeBSD$
-PORTREVISION= 3
-CATEGORIES= archivers devel
-PKGNAMESUFFIX= -paszlib
+CATEGORIES= lang
+PKGNAMESUFFIX= -rtl-console
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal unit for native compression IO
+COMMENT= Free Pascal console abstraction unit (RTL)
-USE_FPC= hash
+USE_FPC= rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/lang/fpc-rtl-console/pkg-plist b/lang/fpc-rtl-console/pkg-plist
new file mode 100644
index 000000000000..d00d1a94c4b3
--- /dev/null
+++ b/lang/fpc-rtl-console/pkg-plist
@@ -0,0 +1,9 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/rtl-console.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-console/crt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-console/crt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-console/keyboard.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-console/keyboard.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-console/mouse.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-console/mouse.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-console/video.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-console/video.ppu
diff --git a/security/fpc-hash/Makefile b/lang/fpc-rtl-extra/Makefile
index 4d850df77a27..dcca0df35850 100644
--- a/security/fpc-hash/Makefile
+++ b/lang/fpc-rtl-extra/Makefile
@@ -1,12 +1,10 @@
-# Created by: John Merryweather Cooper
# $FreeBSD$
-PORTREVISION= 1
-CATEGORIES= security lang
-PKGNAMESUFFIX= -hash
+CATEGORIES= lang
+PKGNAMESUFFIX= -rtl-extra
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal unit for MD5 hash routines
+COMMENT= Free Pascal rtl-extra unit
USE_FPC= yes
diff --git a/lang/fpc-rtl-extra/pkg-plist b/lang/fpc-rtl-extra/pkg-plist
new file mode 100644
index 000000000000..783af5acfaab
--- /dev/null
+++ b/lang/fpc-rtl-extra/pkg-plist
@@ -0,0 +1,15 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/rtl-extra.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/clocale.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/clocale.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/ipc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/ipc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/matrix.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/matrix.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/objects.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/objects.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/printer.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/printer.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/sockets.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/sockets.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/ucomplex.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-extra/ucomplex.ppu
diff --git a/lang/fpc-rtl-objpas/Makefile b/lang/fpc-rtl-objpas/Makefile
new file mode 100644
index 000000000000..e20af2aa7a01
--- /dev/null
+++ b/lang/fpc-rtl-objpas/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+CATEGORIES= lang
+PKGNAMESUFFIX= -rtl-objpas
+
+MAINTAINER= freebsd-fpc@FreeBSD.org
+COMMENT= Free Pascal compatibility unit with Delphi
+
+USE_FPC= yes
+
+MASTERDIR= ${.CURDIR}/../../lang/fpc
+WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR= ${WRKUNITDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/lang/fpc-rtl-objpas/pkg-plist b/lang/fpc-rtl-objpas/pkg-plist
new file mode 100644
index 000000000000..aa03f7bd1876
--- /dev/null
+++ b/lang/fpc-rtl-objpas/pkg-plist
@@ -0,0 +1,17 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/rtl-objpas.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/convutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/convutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/dateutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/dateutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/fmtbcd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/fmtbcd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/stdconvs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/stdconvs.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/stdconvs.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/strutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/strutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/variants.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/variants.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/variants.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/varutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-objpas/varutils.ppu
diff --git a/lang/fpc-rtl-unicode/Makefile b/lang/fpc-rtl-unicode/Makefile
new file mode 100644
index 000000000000..024c7e83025b
--- /dev/null
+++ b/lang/fpc-rtl-unicode/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+CATEGORIES= lang
+PKGNAMESUFFIX= -rtl-unicode
+
+MAINTAINER= freebsd-fpc@FreeBSD.org
+COMMENT= Free Pascal compatibility unit with Delphi
+
+USE_FPC= yes
+
+MASTERDIR= ${.CURDIR}/../../lang/fpc
+WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR= ${WRKUNITDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/lang/fpc-rtl-unicode/pkg-plist b/lang/fpc-rtl-unicode/pkg-plist
new file mode 100644
index 000000000000..300fd02030ed
--- /dev/null
+++ b/lang/fpc-rtl-unicode/pkg-plist
@@ -0,0 +1,29 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/rtl-unicode.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_de.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_de.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_es.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_es.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_fr_ca.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_fr_ca.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_ja.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_ja.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_ko.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_ko.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_ru.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_ru.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_sv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_sv.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_zh.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/collation_zh.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp895.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp895.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp932.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp932.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp936.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp936.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp949.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp949.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp950.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/cp950.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/unicodeducet.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl-unicode/unicodeducet.ppu
diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile
index 4814bad92bca..5a1ad84b83b5 100644
--- a/lang/fpc-tcl/Makefile
+++ b/lang/fpc-tcl/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= lang
PKGNAMESUFFIX= -tcl
diff --git a/lang/fpc-tcl/pkg-plist b/lang/fpc-tcl/pkg-plist
index 45a4030e6647..4097e91697b0 100644
--- a/lang/fpc-tcl/pkg-plist
+++ b/lang/fpc-tcl/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/tcl80.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/tcl.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/tcl80.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/libptcl80.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/tcl/tcl80.ppu
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 7f70acecdec7..4d12a1904b08 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= units
-PORTVERSION= 2.6.4
-PORTREVISION= 5
+PORTVERSION= 3.0.0
CATEGORIES= lang
PKGNAMEPREFIX= fpc-
@@ -13,110 +12,110 @@ COMMENT= Meta port to install Free Pascal units
ONLY_FOR_ARCHS= i386 amd64
USES= metaport
-BUILDNAME= ${ARCH}-freebsd
+BUILDNAME= ${ARCH}-${OPSYS:tl}
-OPTIONS_DEFINE= A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \
- FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \
- FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPINDEXER \
- FPMKUNIT FPPKG FV GDBM GMP GTK2 HERMES ICONVENC \
- IMAGEMAGICK LDAP LIBCURL LIBGD LIBPNG LIBVLC LIBXML2 LUA MAD MATROSKA \
- MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL OPENSSL PCAP PROJ4 \
- PXLIB RSVG REXX SDL SNDFILE SVGALIB SYMBOLIC SYSLOG TCL UNZIP USERS \
- UTMP UUID X11 XFORMS ZLIB
+ALL_OPTIONS= A52 ASPELL BZIP2 CAIRO CHM DBLIB DBUS DTS FASTCGI \
+ FCL_ASYNC FCL_BASE FCL_DB FCL_EXTRA FCL_FPCUNIT FCL_IMAGE \
+ FCL_JS FCL_JSON FCL_NET FCL_PASSRC FCL_REGISTRY FCL_RES \
+ FCL_SDO FCL_SOUND FCL_STL FCL_WEB FCL_XML FFTW \
+ FPINDEXER FPPKG FV GDBM GMP GTK2 HERMES ICONVENC \
+ IMAGEMAGICK LDAP LIBCURL LIBGD LIBPNG LIBXML2 LIBVLC LUA MAD \
+ MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL \
+ OPENSSL PASJPEG PCAP PROJ4 PXLIB RSVG REXX RTL_CONSOLE \
+ RTL_EXTRA RTL_OBJPAS RTL_UNICODE SDL SVGALIB SYMBOLIC \
+ SYSLOG TCL UNZIP USERS UTMP UUID X11 XFORMS ZLIB
-A52_DESC= Interface to a52 library
-ASPELL_DESC= Interface to aspell spelling checker
-BFD_DESC= Interface to GNU Binary Format description
-BZIP2_DESC= Free Pascal bzip2 unit
-CAIRO_DESC= Interface to cairo library
-CHM_DESC= Free Pbscal unit to manipulate chm files
-DBUS_DESC= Interface to dbus library
-DBLIB_DESC= Interface to dblib library
-DTS_DESC= Interface to dts library
-FASTCGI_DESC= Free Pascal fastcgi unit
-FCL_ASYNC_DESC= Free Pascal interface to async library
-FCL_BASE_DESC= Free Pascal Component Library (base)
-FCL_DB_DESC= Free Pascal Component Library (db)
-FCL_EXTRA_DESC= Free Pascal Component Library (extra)
-FCL_FPCUNIT_DESC= Free Pascal Component Library (fpcunit)
-FCL_IMAGE_DESC= Free Pascal Component Library (image)
-FCL_JS_DESC= Free Pascal implementation of (js)
-FCL_JSON_DESC= Free Pascal implementation of (json)
-FCL_NET_DESC= Free Pascal Component Library (net)
-FCL_PASSRC_DESC= Free Pascal Component Library (passrc)
-FCL_PROCESS_DESC= Unit to start and manipulate other programs
-FCL_REGISTRY_DESC= Free Pascal Component Library (registry)
-FCL_RES_DESC= Free Pascal Component Library (res)
-FCL_WEB_DESC= Free Pascal Component Library (web)
-FCL_XML_DESC= Free Pascal Component Library (xml)
-FFTW_DESC= Interface to the FFTW3 library
-FPPKG_DESC= Free Pascal package unit
-FPMKUNIT_DESC= Free Pascal build system unit
-FV_DESC= Free Pascal unit for Delphi support
-GDBM_DESC= Interface to the GNU database system
-GMP_DESC= Interface to gmp library
-GTK2_DESC= Interface to gtk2 libraries
-HERMES_DESC= Free Pascal hermes unit
-ICONVENC_DESC= Interface to iconv library
-FPINDEXER_DESC= Database indexer with database/flat file backend
-IMAGEMAGICK_DESC= Interface to ImageMagick
-LDAP_DESC= Interface to OpenLDAP
-LIBCURL_DESC= Interface to curl library
-LIBGD_DESC= Interface to gd library
-LIBPNG_DESC= Interface to png library
-LIBVLC_DESC= Free Pascal vlc unit
-LIBXML2_DESC= Interface to libxml2 library
-LUA_DESC= Interface to lua interpreter
-MAD_DESC= Interface to mad library
-MATROSKA_DESC= Interface to matroska library
-MODPLUG_DESC= Interface to modplug library
-NCURSES_DESC= Interface to ncurses library
-NEWT_DESC= Interface to newt library
-NUMLIB_DESC= Free Pascal unit for numerical methods
-OGGVORBIS_DESC= Interaface to ogg & vorbis libraries
-OPENAL_DESC= Interface to openal library
-OPENGL_DESC= Interface to opengl library
-OPENSSL_DESC= Interface to openssl library
-PCAP_DESC= Interface to pcap library
-PROJ4_DESC= Interface to proj library
-PXLIB_DESC= Unit to read various Paradox file
-REXX_DESC= Intrface to rexx-regina library
-RSVG_DESC= Interface to rsvg2 library
-SDL_DESC= Free Pascal interface to SDL library
-SNDFILE_DESC= Interface to sndfile library
-SVGALIB_DESC= Interface to svgalib library
-SYMBOLIC_DESC= Simple expression parsing and evaluating
-SYSLOG_DESC= Interface to system logger
-TCL_DESC= Interface to tcl/tk interpreter
-UNZIP_DESC= Routines for unzipping zip files
-USERS_DESC= Interface to manipulate users
-UTMP_DESC= Gather information from the utmp file
-UUID_DESC= Free Pascal uuid unit
-X11_DESC= Interface to X windows server
-XFORMS_DESC= Interface to X-Forms
-ZLIB_DESC= Interface to the zlib compression library
+OPTIONS_DEFINE= ${ALL_OPTIONS} BFD
+OPTIONS_DEFAULT= ${ALL_OPTIONS}
-OPTIONS_DEFAULT=A52 ASPELL BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \
- FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \
- FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPINDEXER \
- FPMKUNIT FPPKG FV GDBM GMP GTK2 HERMES ICONVENC \
- IMAGEMAGICK LDAP LIBCURL LIBGD LIBPNG LIBVLC LIBXML2 LUA MAD MATROSKA \
- MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL OPENSSL PCAP PROJ4 \
- PXLIB RSVG REXX SDL SNDFILE SVGALIB SYMBOLIC SYSLOG TCL UNZIP USERS \
- UTMP UUID X11 XFORMS ZLIB
+A52_DESC= Interface to a52 library
+ASPELL_DESC= Interface to aspell spelling checker
+BFD_DESC= Interface to GNU Binary Format description
+BZIP2_DESC= Unit for bzip2
+CAIRO_DESC= Interface to cairo library
+CHM_DESC= Unit to manipulate chm files
+DBLIB_DESC= Interface to dblib library
+DBUS_DESC= Interface to dbus library
+DTS_DESC= Interface to dts library
+FASTCGI_DESC= Unit for fastcgi
+FCL_ASYNC_DESC= Component Library (async)
+FCL_BASE_DESC= Component Library (base)
+FCL_DB_DESC= Component Library (db)
+FCL_EXTRA_DESC= Component Library (extra)
+FCL_FPCUNIT_DESC= Component Library (fpcunit)
+FCL_IMAGE_DESC= Component Library (image)
+FCL_JS_DESC= Component Library (js)
+FCL_JSON_DESC= Component Library (json)
+FCL_NET_DESC= Component Library (net)
+FCL_PASSRC_DESC= Component Library (passrc)
+FCL_REGISTRY_DESC= Component Library (registry)
+FCL_RES_DESC= Component Library (res)
+FCL_SDO_DESC= Component Library (sdo)
+FCL_SOUND_DESC= Component Library (sound)
+FCL_STL_DESC= Component Library (stl)
+FCL_WEB_DESC= Component Library (web)
+FCL_XML_DESC= Component Library (xml)
+FFTW_DESC= Interface to the FFTW3 library
+FPINDEXER_DESC= Database indexer
+FPPKG_DESC= Unit for packaging
+FV_DESC= Unit for Delphi support
+GDBM_DESC= Interface to the GNU database system
+GMP_DESC= Interface to gmp library
+GTK2_DESC= Interface to gtk2 libraries
+HERMES_DESC= Unit for hermes
+ICONVENC_DESC= Interface to iconv library
+IMAGEMAGICK_DESC= Interface to ImageMagick
+LDAP_DESC= Interface to OpenLDAP
+LIBCURL_DESC= Interface to curl library
+LIBGD_DESC= Interface to gd library
+LIBPNG_DESC= Interface to png library
+LIBVLC_DESC= Unit for VLC
+LIBXML2_DESC= Interface to libxml2 library
+LUA_DESC= Interface to lua interpreter
+MAD_DESC= Interface to mad library
+MODPLUG_DESC= Interface to modplug library
+NCURSES_DESC= Interface to ncurses library
+NEWT_DESC= Interface to newt library
+NUMLIB_DESC= Unit for numerical methods
+OGGVORBIS_DESC= Interaface to ogg & vorbis libraries
+OPENAL_DESC= Interface to openal library
+OPENGL_DESC= Interface to opengl library
+OPENSSL_DESC= Interface to openssl library
+PASJPEG_DESC= Unit for JPEG image format handling
+PCAP_DESC= Interface to pcap library
+PROJ4_DESC= Interface to proj library
+PXLIB_DESC= Unit to read various Paradox file
+REXX_DESC= Interface to rexx-regina library
+RSVG_DESC= Interface to rsvg2 library
+RTL_CONSOLE_DESC= Run-Time lib for console abstraction
+RTL_EXTRA_DESC= Run-Time lib not needed for bootstrapping
+RTL_OBJPAS_DESC= Rtl-objpas, aux. Delphi compat unit
+RTL_UNICODE_DESC= Rtl-unicode, misc Unicode units
+SDL_DESC= Interface to SDL library
+SVGALIB_DESC= Interface to svgalib library
+SYMBOLIC_DESC= Simple expression parsing and evaluating
+SYSLOG_DESC= Interface to system logger
+TCL_DESC= Interface to tcl/tk interpreter
+UNZIP_DESC= Routines for unzipping zip files
+USERS_DESC= Interface to manipulate users
+UTMP_DESC= Gather information from the utmp file
+UUID_DESC= Unit for UUID
+X11_DESC= Interface to X windows server
+XFORMS_DESC= Interface to X-Forms
+ZLIB_DESC= Interface to the zlib compression library
.if !exists(/usr/include/lwres) # directory only exists on FreeBSD 9
# On FreeBSD 9, CAIRO is built with GCC which pulls in binutils
-# binutils and BFD conflict, so BFD and CAIRO cannot coexist of F9
+# binutils and BFD conflict, so BFD and CAIRO cannot coexist on F9
OPTIONS_DEFAULT+= BFD
.endif
.include <bsd.port.options.mk>
-UNITS_SELECTED= #
+UNITS_SELECTED=
.for OPT in ${OPTIONS_DEFINE}
. if ${PORT_OPTIONS:M${OPT}}
-UNITS_SELECTED+= ${OPT:tl}
+UNITS_SELECTED+= ${OPT:tl:S/rtl_/rtl-/:S/fcl_/fcl-/}
. endif
.endfor
diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile
index 8c3038bc39ee..8e95277a056a 100644
--- a/lang/fpc-utils/Makefile
+++ b/lang/fpc-utils/Makefile
@@ -1,18 +1,23 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= lang
PKGNAMESUFFIX= -utils
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Compiler utils
+COMMENT= Free Pascal Compiler utilities
-USE_FPC= chm fcl-base fcl-net fcl-passrc fcl-process fcl-res fcl-xml fpmkunit fppkg libcurl paszlib
+USE_FPC= chm fcl-base fcl-net fcl-passrc fcl-res fcl-xml fppkg \
+ libcurl fcl-json rtl-extra rtl-objpas openssl fcl-async \
+ fcl-web fcl-db ibase mysql odbc oracle postgres sqlite \
+ dblib pxlib fastcgi httpd22 httpd24
MASTERDIR= ${.CURDIR}/../../lang/fpc
-WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR= ${WRKUNITDIR}
-OPT= -Fu../fcl/*
+WRKUNITDIR= ${FPCSRCDIR}/utils
+EXTRACTUNITDIR= ${WRKUNITDIR} ${FPCSRCDIR}/rtl
+
+post-install:
+ ${RM} ${STAGEDIR}${PREFIX}/bin/fpcmake
+ ${RM} ${STAGEDIR}${PREFIX}/bin/fpcmkcfg
.include "${MASTERDIR}/Makefile"
diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist
index 0724f9eeaa60..9e28dea310f2 100644
--- a/lang/fpc-utils/pkg-plist
+++ b/lang/fpc-utils/pkg-plist
@@ -1,8 +1,10 @@
bin/bin2obj
bin/data2inc
bin/delp
+bin/fpcjres
bin/fpclasschart
bin/fpcres
+bin/fpcsubst
bin/fpdoc
bin/fppkg
bin/fprcp
@@ -10,25 +12,24 @@ bin/h2pas
bin/h2paspp
bin/instantfpc
bin/makeskel
+bin/makeskel.rsj
+bin/mkinsadd
bin/pas2fpm
+bin/pas2jni
bin/pas2ut
bin/plex
bin/postw32
bin/ppdep
bin/ptop
+bin/ptop.rsj
bin/pyacc
bin/rmcvsdir
bin/rstconv
bin/unitdiff
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkglnet.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/lexlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/yacclib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/lexlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/yacclib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/libplexlib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/libpyacclib.a
-lib/fpc/lexyacc/yyparse.cod
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/utils-lexyacc.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/lexlib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/lexlib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/yacclib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utils-lexyacc/yacclib.ppu
lib/fpc/lexyacc/yylex.cod
+lib/fpc/lexyacc/yyparse.cod
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 2edffbfe9e46..de6640f54b66 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -2,32 +2,28 @@
# $FreeBSD$
PORTNAME= fpc
-PORTVERSION= 2.6.4
+PORTVERSION= 3.0.0
PORTREVISION?= 0
CATEGORIES?= lang
-MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
- ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
- ftp://ftp.jp.freepascal.org/mirror/fpc/dist/${PORTVERSION}/source/:source \
- ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/source/:source \
- ftp://ftp.no.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
- ftp://ftp.us.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
- http://leaf.dragonflybsd.org/~marino/dports-src/:DragonFlybootstrap \
- SF/freepascal/Source/${PORTVERSION}:source \
+MASTER_SITES= http://leaf.dragonflybsd.org/~marino/dports-src/:DragonFlybootstrap \
LOCAL/acm/freepascal/:bootstrap \
- LOCAL/acm/freepascal/:man
-DISTFILES= ${DISTNAME}.source.tar.gz:source
+ LOCAL/marino:man
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= freepascal
MAINTAINER?= freebsd-fpc@FreeBSD.org
COMMENT?= Free Pascal compiler with Turbo and Delphi
-PROJECTHOST= bsdistfiles
USES= gmake iconv
ONLY_FOR_ARCHS= i386 amd64
BOOTVER= 2.6.4
+MANVER= 3.0.0
-OPT?=-CX
-FPCSRCDIR= ${PORTNAME}-${PORTVERSION}
+USE_GITHUB= yes
+GH_ACCOUNT= fpc-svn
+GH_PROJECT= fpc
+GH_TAGNAME= release_${DISTVERSION:S/./_/g}
+FPCSRCDIR= ${GH_PROJECT}-${GH_TAGNAME}
.include <bsd.port.pre.mk>
@@ -56,12 +52,16 @@ BUILDNAME= ${FPC_ARCH}-${OPSYS:tl}
PLIST_SUB+= PORTVERSION=${PORTVERSION} \
BUILDNAME=${BUILDNAME}
DISTFILES+= ${BOOTDIR}.tar.gz:${OPSYS:MDragonFly}bootstrap \
- ${DISTNAME}.man.tar.gz:man
-MAKE_ARGS+= FPCMAKE=${WRKDIR}/${FPCSRCDIR}/utils/fpcm/fpcmake \
+ fpc-${MANVER}.man.tar.gz:man
+NEWFPCMAKE= ${WRKDIR}/${FPCSRCDIR}/utils/fpcm/bin/${BUILDNAME}/fpcmake
+MAKE_ARGS+= FPCMAKE=${NEWFPCMAKE} \
FPCTARGET=${BUILDNAME} \
ARCH=${FPC_ARCH} \
OPT="${OPT}" \
BSDHIER=1 \
+ INSTALL="${INSTALL_DATA}" \
+ INSTALLEXE="${INSTALL_PROGRAM}" \
+ INSTALLSCR="${INSTALL_SCRIPT}" \
INSTALL_PREFIX=${STAGEDIR}${PREFIX}
NEWPPC= PP=${WRKSRC}/compiler/${PPNAME}
NEWFPC= FPC=${WRKSRC}/compiler/${PPNAME}
@@ -74,83 +74,105 @@ do-extract:
@${TAR} -xzf ${_DISTDIR}/${BOOTDIR}.tar.gz \
--directory ${WRKDIR} && ${CHMOD} +x ${WRKDIR}/${BOOTDIR}
# unpack man files
- @${TAR} -xzf ${_DISTDIR}/${DISTNAME}.man.tar.gz --directory ${WRKDIR}
+ @${TAR} -xzf ${_DISTDIR}/fpc-${MANVER}.man.tar.gz --directory ${WRKDIR}
# unpack source distribution
- @(cd ${WRKDIR} && \
- ${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME}.source.tar.gz | \
+ @(cd ${WRKDIR} && ${GZIP_CMD} -dc \
+ ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
${TAR} -xf - \
${FPCSRCDIR}/compiler \
${FPCSRCDIR}/rtl \
${FPCSRCDIR}/utils/fpcmkcfg \
${FPCSRCDIR}/packages/fcl-base \
${FPCSRCDIR}/packages/fcl-process \
+ ${FPCSRCDIR}/packages/fcl-res \
+ ${FPCSRCDIR}/packages/fpmkunit \
+ ${FPCSRCDIR}/packages/hash \
+ ${FPCSRCDIR}/packages/libtar \
+ ${FPCSRCDIR}/packages/paszlib \
+ ${FPCSRCDIR}/packages/rtl-objpas \
${FPCSRCDIR}/utils/fpcm)
post-patch:
-.if ${ARCH} == "i386"
- @${REINPLACE_CMD} -i "" -e 's|504000|${OSVERSION}|g' \
- ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/cprt0.as
-.elif ${ARCH} == "amd64"
-. if ${OPSYS} == FreeBSD
- @${REINPLACE_CMD} -i "" -e 's|700055|${OSVERSION}|g' \
- ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/cprt0.as
- @${REINPLACE_CMD} -i "" -e 's|502110|${OSVERSION}|g' \
- ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/gprt0.as
- @${REINPLACE_CMD} -i "" -e 's|700055|${OSVERSION}|g' \
- ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/prt0.as
-. else
+.if ${OPSYS} == FreeBSD
+ @${REINPLACE_CMD} -i "" -e 's|900044|${OSVERSION}|g' \
+ ${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.as
+.else
@${REINPLACE_CMD} -i "" -e 's|400000|${DFLYVERSION}|g' \
- ${WRKSRC}/${FPCSRCDIR}/rtl/dragonfly/${FPC_ARCH}/*.as
-. endif
+ ${WRKSRC}/rtl/dragonfly/${FPC_ARCH}/*.as
.endif
.if empty(ICONV_LIB)
- @${REINPLACE_CMD} -e "s|if (s<>'c') or reorder then|if ((s<>'c') and (s<>'iconv')) or reorder then|" \
+ @${REINPLACE_CMD} -e "s|s<>'c'|(s<>'c') and (s<>'iconv')|" \
${WRKDIR}/${FPCSRCDIR}/compiler/systems/t_bsd.pas
@${REINPLACE_CMD} -e 's|defined(bsd) and not ||' \
${WRKDIR}/${FPCSRCDIR}/rtl/unix/cwstring.pp
.endif
+ @${REINPLACE_CMD} -e '/samplecfg/ {s/INSTALLEXE/INSTALLSCR/;}' \
+ ${WRKDIR}/${FPCSRCDIR}/compiler/Makefile
+ @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
+ ${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit/src/fpmkunit.pp
do-build:
# build fpc compiler
+ @${ECHO_MSG} "##### STARTING COMPILER #####"
(cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${SETENV} ${MAKE_ENV} \
${MAKE_CMD} cycle ${MAKE_ARGS} ${BOOTPPC})
+ @${ECHO_MSG} "##### COMPLETE COMPILER #####"
+
# build fpcmkcfg
- (cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
- (cd ${WRKDIR}/${FPCSRCDIR}/packages/fcl-base && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
- (cd ${WRKDIR}/${FPCSRCDIR}/packages/fcl-process && \
- ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
- (cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && \
+ @${ECHO_MSG} "##### STARTING BOOTSTRAP FPMKUNIT #####"
+ (cd ${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit && ${SETENV} \
+ ${MAKE_ENV} ${MAKE_CMD} bootstrap ${MAKE_ARGS} ${NEWPPC})
+ @${ECHO_MSG} "##### COMPLETE BOOTSTRAP FPMKUNIT #####"
+.for component in fcl-res rtl-objpas fcl-base
+ @${ECHO_MSG} "##### STARTING ${component:tu} #####"
+ (cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
+ @${ECHO_MSG} "##### COMPLETE ${component:tu} #####"
+.endfor
+ @${ECHO_MSG} "##### STARTING FPMAKE #####"
+ (cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${SETENV} \
+ ${MAKE_ENV} ${MAKE_CMD} release ${MAKE_ARGS} ${NEWPPC})
+ @${ECHO_MSG} "##### COMPLETE FPMAKE #####"
+.for component in hash paszlib libtar fcl-process fpmkunit
+ @${ECHO_MSG} "##### STARTING ${component:tu} #####"
+ (cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && ${SETENV} \
+ ${MAKE_ENV} ${MAKE_CMD} release ${MAKE_ARGS} ${NEWPPC})
+ @${ECHO_MSG} "##### COMPLETE ${component:tu} #####"
+.endfor
+ @${ECHO_MSG} "##### STARTING FPCMKCFG #####"
+ (cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && ${SETENV} \
+ ${MAKE_ENV} ${MAKE_CMD} release ${MAKE_ARGS} ${NEWPPC})
+ @${ECHO_MSG} "##### COMPLETE FPCMKCFG #####"
do-install:
-# Installing fpc compiler
+ # Installing fpc compiler
(cd ${WRKDIR}/${FPCSRCDIR}/rtl && ${SETENV} ${MAKE_ENV} \
${MAKE_CMD} install ${MAKE_ARGS} ${NEWFPC})
-# Installing fpc runtime
+ # Installing fpc runtime
(cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${SETENV} ${MAKE_ENV} \
${MAKE_CMD} install ${MAKE_ARGS} ${NEWFPC})
-# Installng fpcmkcfg
- (cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} install ${MAKE_ARGS} ${NEWFPC})
-# Installng fpcmake
- ${INSTALL_PROGRAM} ${WRKDIR}/${FPCSRCDIR}/utils/fpcm/fpcmake \
+ # Installing fpmkunit and its dependencies
+.for component in hash paszlib libtar fcl-process fpmkunit
+ (cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && ${SETENV} \
+ ${MAKE_ENV} ${MAKE_CMD} install ${MAKE_ARGS} ${NEWPPC})
+.endfor
+ # Installing fpcmkcfg
+ ${INSTALL_PROGRAM} ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg/bin/${BUILDNAME}/fpcmkcfg \
${STAGEDIR}${PREFIX}/bin
-# Installing manpages
+ # Installing fpcmake
+ ${INSTALL_PROGRAM} ${NEWFPCMAKE} ${STAGEDIR}${PREFIX}/bin
+ # Installing manpages
${INSTALL_MAN} ${WRKDIR}/man/man1/* ${STAGEDIR}${MAN1PREFIX}/man/man1
${INSTALL_MAN} ${WRKDIR}/man/man5/* ${STAGEDIR}${MAN1PREFIX}/man/man5
-
-post-install:
- if [ -e "${STAGEDIR}${PREFIX}/bin/${PPNAME}" ]; then ${RM} -f "${STAGEDIR}${PREFIX}/bin/${PPNAME}"; fi
- ${LN} -sf "${PREFIX}/lib/fpc/${PORTVERSION}/${PPNAME}" "${STAGEDIR}${PREFIX}/bin"
- ${SH} "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" "${STAGEDIR}${PREFIX}/etc"
+ # symlinking compiler
+ (cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ../lib/fpc/${PORTVERSION}/${PPNAME})
+ # creating sample configuration file
+ ${SH} "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" \
+ "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" \
+ "${STAGEDIR}${PREFIX}/etc"
@${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||' \
- -e 's|^-Fl/usr/local/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt4|g' ${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fpc*
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mk*ins
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ppu*
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/ppc*
+ -e 's|^-Fl/usr/local/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt4|g' \
+ ${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample
.else
.include "${MASTERDIR}/Makefile.units"
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 458384a360d5..4ac795babe48 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -1,35 +1,39 @@
-BUILDNAME= ${FPC_ARCH}-${OPSYS:tl}
-
-PLIST_SUB+= PORTVERSION=${PORTVERSION} \
- BUILDNAME=${BUILDNAME}
-
-PLIST= ${.CURDIR}/pkg-plist
-PATCHDIR= ${.CURDIR}/files
-FILESDIR= ${.CURDIR}/files
-DFLY_PATCHDIR= ${.CURDIR}/dragonfly
-DFLY_FILESDIR= ${.CURDIR}/dragonfly
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-BUILD_WRKSRC= ${WRKDIR}/${WRKUNITDIR}
-INSTALL_WRKSRC= ${WRKDIR}/${WRKUNITDIR}
-
-FPCDIR?= ${LOCALBASE}/lib/${PORTNAME}/${PORTVERSION}
-UNITPREFIX= unit-
-UNITEXTRACT_SUFX= .tar.gz
-UNITNAME= ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX}
-UNITDIR= lib/fpc/${PORTVERSION}/units/${BUILDNAME}
+BUILDNAME= ${FPC_ARCH}-${OPSYS:tl}
+
+PLIST_SUB+= PORTVERSION=${PORTVERSION} \
+ BUILDNAME=${BUILDNAME}
+
+PLIST= ${.CURDIR}/pkg-plist
+PATCHDIR= ${.CURDIR}/files
+FILESDIR= ${.CURDIR}/files
+DFLY_PATCHDIR= ${.CURDIR}/dragonfly
+DFLY_FILESDIR= ${.CURDIR}/dragonfly
+WRKSRC= ${WRKDIR}/${FPCSRCDIR}
+BUILD_WRKSRC= ${WRKDIR}/${WRKUNITDIR}
+INSTALL_WRKSRC= ${WRKDIR}/${WRKUNITDIR}
+
+OPT+= -Ur
+FPCDIR?= ${LOCALBASE}/lib/fpc/${PORTVERSION}
+UNITPREFIX= unit-
+UNITNAME= ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX}
+UNITDIR= lib/fpc/${PORTVERSION}/units/${BUILDNAME}
+UNITEXTRACT_SUFX= .tar.gz
EXTRACT_AFTER_ARGS= ${EXTRACTUNITDIR}
-OPT+= -Ur -CX
-
-MAKE_ARGS= PP=${LOCALBASE}/bin/${PPNAME} \
- FPCDIR=${FPCDIR} \
- FPCMAKE=${LOCALBASE}/bin/fpcmake \
- FPCTARGET=${BUILDNAME} \
- ARCH=${FPC_ARCH} \
- OPT="${OPT}" \
- BSDHIER=1 \
- INSTALL_PREFIX=${STAGEDIR}${PREFIX}
-MAKE_ENV+= FPCDIR=${UNITDIR}
+
+MAKE_ARGS+= PP="${LOCALBASE}/bin/fpc" \
+ FPCFPMAKE="${LOCALBASE}/bin/fpc" \
+ FPCMAKE="${LOCALBASE}/bin/fpcmake" \
+ CPU_TARGET=${FPC_ARCH} \
+ OS_TARGET=${OPSYS:tl} \
+ COMPILER_OPTIONS="${OPT}" \
+ BSDHIER=1 \
+ VERBOSE=1 \
+ INSTALL="${INSTALL_DATA}" \
+ INSTALLEXE="${INSTALL_PROGRAM}" \
+ INSTALLSCR="${INSTALL_SCRIPT}" \
+ INSTALL_PREFIX="${STAGEDIR}${PREFIX}"
+ALL_TARGET= fpc_baseinfo release
.if ${PORT_OPTIONS:MEXAMPLES} && defined(HAVE_EXAMPLES)
LATE_INSTALL_ARGS= fpc_exampleinstall
@@ -38,19 +42,16 @@ LATE_INSTALL_ARGS= fpc_exampleinstall
post-extract:
@cd ${WRKDIR}/${WRKUNITDIR} && \
${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
+.if ${PKGNAMESUFFIX:M-utils} || ${PKGNAMESUFFIX:M-ide}
+ ${REINPLACE_CMD} -e '/globalunit/ s|\.\./packages|${FPCDIR}|' \
+ ${WRKDIR}/${WRKUNITDIR}/Makefile
+.else
+ ${REINPLACE_CMD} -e '/globalunit/ {s|\.\.|${FPCDIR}|;}' \
+ ${WRKDIR}/${WRKUNITDIR}/Makefile
+.endif
post-patch:
-.if ${PKGNAMESUFFIX} == "-fpmkunit"
- @${REINPLACE_CMD} -e 's|\[Linux\]|\[Linux,FreeBSD,NetBSD,OpenBSD\]|g' \
- ${WRKDIR}/${WRKUNITDIR}/src/${PKGNAMESUFFIX:S/-//}.pp
-.endif
.if ${PKGNAMESUFFIX} == "-fppkg"
@${REINPLACE_CMD} -e 's|packages_${OPSYS:tl}=fcl-net fcl-web|packages_${OPSYS:tl}=fcl-net|g' \
${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
.endif
-.if ${PKGNAMESUFFIX} == "-utils"
- @${REINPLACE_CMD} -e 's| fpcmkcfg||g' -e 's| fpcm||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \
- ${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
- @${REINPLACE_CMD} -e 's|$$(INSTALL) Package.fpc $$(INSTALL_UNITDIR)||g' \
- ${WRKDIR}/${WRKUNITDIR}/fppkg/Makefile
-.endif
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index d3a8decb6755..f8d3dce5a85c 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,10 +1,10 @@
-SHA256 (freepascal/fpc-2.6.4.source.tar.gz) = c16f2e6e0274c7afc0f1d2dded22d0fec98fe329b1d5b2f011af1655f3a1cc29
-SIZE (freepascal/fpc-2.6.4.source.tar.gz) = 29904088
+SHA256 (freepascal/fpc-svn-fpc-3.0.0-release_3_0_0_GH0.tar.gz) = 61d5fc9f1f26362f4033eb00599c0f33f96217b57c4d0c8c3474226bd70b0b25
+SIZE (freepascal/fpc-svn-fpc-3.0.0-release_3_0_0_GH0.tar.gz) = 37531012
SHA256 (freepascal/ppc386-2.6.4-freebsd.tar.gz) = 85da7cfae4e9dfe1b426da12f9584ef22af5e0d965f34d6c6f80853cc1b6147e
SIZE (freepascal/ppc386-2.6.4-freebsd.tar.gz) = 967476
SHA256 (freepascal/ppcx64-2.6.4-freebsd.tar.gz) = f74a268a206fbd52d3c92f4e0722cd135ca91c1988a83826401cabdd78b3222b
SIZE (freepascal/ppcx64-2.6.4-freebsd.tar.gz) = 1035650
-SHA256 (freepascal/fpc-2.6.4.man.tar.gz) = c1d5bc37f96d60b37dd0ea85b6c7244306ae61c01df6053226309a75145ab804
-SIZE (freepascal/fpc-2.6.4.man.tar.gz) = 43335
+SHA256 (freepascal/fpc-3.0.0.man.tar.gz) = 49f5934fe2782ce47e5d9a6becc0ba36c3c8621b78e8587165dfebf79ea14525
+SIZE (freepascal/fpc-3.0.0.man.tar.gz) = 47342
SHA256 (freepascal/ppcx64-2.6.4-dragonfly.tar.gz) = d537d84302c0e0cb56d45851ab8da664145b9e2619346d35f1e3797a6f924ef9
SIZE (freepascal/ppcx64-2.6.4-dragonfly.tar.gz) = 4033024
diff --git a/lang/fpc/files/patch-compiler-systems-t_bsd.pas b/lang/fpc/files/patch-compiler-systems-t_bsd.pas
deleted file mode 100644
index 527acf812024..000000000000
--- a/lang/fpc/files/patch-compiler-systems-t_bsd.pas
+++ /dev/null
@@ -1,36 +0,0 @@
---- compiler/systems/t_bsd.pas 2012-04-22 14:47:06.000000000 -0500
-+++ compiler/systems/t_bsd.pas 2013-10-01 21:07:10.000000000 -0500
-@@ -484,10 +484,19 @@
- if linklibc and
- not IsDarwin Then
- begin
-- if librarysearchpath.FindFile('crtbegin.o',false,s) then
-- LinkRes.AddFileName(s);
- if librarysearchpath.FindFile('crti.o',false,s) then
- LinkRes.AddFileName(s);
-+ if cs_create_pic in current_settings.moduleswitches then
-+ begin
-+ if librarysearchpath.FindFile('crtbeginS.o',false,s) then
-+ LinkRes.AddFileName(s);
-+ end
-+ else
-+ if (cs_link_staticflag in current_settings.globalswitches) and
-+ librarysearchpath.FindFile('crtbeginT.o',false,s) then
-+ LinkRes.AddFileName(s)
-+ else if librarysearchpath.FindFile('crtbegin.o',false,s) then
-+ LinkRes.AddFileName(s);
- end;
- { main objectfiles }
- while not ObjectFiles.Empty do
-@@ -572,7 +581,10 @@
- if linklibc and
- not IsDarwin Then
- begin
-- Fl1:=librarysearchpath.FindFile('crtend.o',false,s1);
-+ if cs_create_pic in current_settings.moduleswitches then
-+ Fl1:=librarysearchpath.FindFile('crtendS.o',false,s1)
-+ else
-+ Fl1:=librarysearchpath.FindFile('crtend.o',false,s1);
- Fl2:=librarysearchpath.FindFile('crtn.o',false,s2);
- if Fl1 or Fl2 then
- begin
diff --git a/lang/fpc/files/patch-compiler-utils_samplecfg b/lang/fpc/files/patch-compiler-utils_samplecfg
index 68a4b2f1ae24..901f71d8cf35 100644
--- a/lang/fpc/files/patch-compiler-utils_samplecfg
+++ b/lang/fpc/files/patch-compiler-utils_samplecfg
@@ -1,6 +1,6 @@
---- compiler/utils/samplecfg 2011-12-10 07:59:24.000000000 -0500
-+++ compiler/utils/samplecfg 2012-02-23 15:47:13.000000000 -0500
-@@ -37,8 +37,8 @@
+--- compiler/utils/samplecfg.orig 2015-08-06 19:47:53 UTC
++++ compiler/utils/samplecfg
+@@ -38,8 +38,8 @@ sysfpdir=$sysfpdirbase2/text
# Detect if we have write permission in sysdir.
if [ -w "$sysdir" ] ; then
echo Write permission in $sysdir.
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index fb9b838f08fa..f23f7cfd72f9 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,14 +1,13 @@
bin/fpc
-bin/fpcsubst
bin/fpcmake
bin/fpcmkcfg
bin/mkarmins
bin/mkx86ins
+%%FPC_I386%%bin/ppc386
+%%FPC_AMD64%%bin/ppcx64
bin/ppudump
bin/ppufiles
bin/ppumove
-%%FPC_I386%%bin/ppc386
-%%FPC_AMD64%%bin/ppcx64
@sample etc/fpc.cfg.sample
lib/fpc/%%PORTVERSION%%/msg/errorct.msg
lib/fpc/%%PORTVERSION%%/msg/errord.msg
@@ -22,47 +21,160 @@ lib/fpc/%%PORTVERSION%%/msg/errorhe.msg
lib/fpc/%%PORTVERSION%%/msg/errorheu.msg
lib/fpc/%%PORTVERSION%%/msg/errorid.msg
lib/fpc/%%PORTVERSION%%/msg/erroriu.msg
-lib/fpc/%%PORTVERSION%%/msg/errorru.msg
lib/fpc/%%PORTVERSION%%/msg/errorn.msg
lib/fpc/%%PORTVERSION%%/msg/errorpl.msg
lib/fpc/%%PORTVERSION%%/msg/errorpli.msg
lib/fpc/%%PORTVERSION%%/msg/errorpt.msg
lib/fpc/%%PORTVERSION%%/msg/errorptu.msg
-lib/fpc/%%PORTVERSION%%/msg/errorues.msg
lib/fpc/%%PORTVERSION%%/msg/errorr.msg
+lib/fpc/%%PORTVERSION%%/msg/errorru.msg
+lib/fpc/%%PORTVERSION%%/msg/errorues.msg
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/ppc386
%%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/ppcx64
lib/fpc/%%PORTVERSION%%/samplecfg
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-process.fpm
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fpmkunit.fpm
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/hash.fpm
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libtar.fpm
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/paszlib.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/crc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/crc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/hmac.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/hmac.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/md5.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/md5.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/ntlm.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/ntlm.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/sha1.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/sha1.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libtar/libtar.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libtar/libtar.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/unzip.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/unzip.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zip.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zip.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zipper.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/ziputils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/ziputils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zstream.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.ppu
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/character.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/character.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/clocale.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/clocale.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/console.o
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/cp1250.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1250.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1251.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1251.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1252.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1252.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1253.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1253.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1254.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1254.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1255.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1255.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1256.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1256.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1257.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1257.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1258.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp1258.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp437.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp437.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp646.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp646.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp850.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp850.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp852.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp852.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp856.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp856.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp866.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp866.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp874.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp874.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_1.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_1.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_5.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cp8859_5.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpall.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cprt0.o
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
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ctypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ctypes.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cwstring.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cwstring.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/charset.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dateutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dateutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dl.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dl.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dllprt0.o
@@ -76,11 +188,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.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/fpintres.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpintres.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfpintres.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpwidestring.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpwidestring.ppu
%%FREEBSD%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.o
%%FREEBSD%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/getopts.o
@@ -90,110 +201,27 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/heaptrc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/heaptrc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/iso7185.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/iso7185.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/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
-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
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcwstring.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcharset.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdateutils.a
-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/libpexeinfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfgl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfmtbcd.a
-%%FREEBSD%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfreebsd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgetopts.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
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpiso7185.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
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmmx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmouse.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpobjects.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpobjpas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpports.a
-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
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsysconst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsysctl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsystem.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpsysutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpterminfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libptermio.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libptypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libptypinfo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpucomplex.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpunix.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpunixtype.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpunixutil.a
-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/lnfodwrf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/lnfodwrf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/macpas.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/macpas.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/math.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/math.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/matrix.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/matrix.ppu
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.o
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mouse.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mouse.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objects.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objects.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objpas.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objpas.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/printer.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/printer.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/prt0.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/rtlconsts.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/rtlconsts.ppu
-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
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/strutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/syscall.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/syscall.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysconst.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysconst.ppu
@@ -203,28 +231,26 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/system.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/system.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/sysutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/terminfo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/terminfo.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/termio.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/termio.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/types.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/types.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/typinfo.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/typinfo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ucomplex.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ucomplex.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unicodedata.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unicodedata.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unicodenumtable.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unicodenumtable.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unix.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unix.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixcp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixcp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixtype.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixtype.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixutil.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/variants.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/variants.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/varutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/varutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/video.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/video.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/uuchar.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/uuchar.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.ppu
man/man1/bin2obj.1.gz
@@ -235,6 +261,7 @@ man/man1/delp.1.gz
man/man1/fd2pascal.1.gz
man/man1/fp.1.gz
man/man1/fpc.1.gz
+man/man1/fpcjres.1.gz
man/man1/fpclasschart.1.gz
man/man1/fpcmake.1.gz
man/man1/fpcmkcfg.1.gz
@@ -247,6 +274,9 @@ man/man1/grab_vcsa.1.gz
man/man1/h2pas.1.gz
man/man1/h2paspp.1.gz
man/man1/makeskel.1.gz
+man/man1/pas2fpm.1.gz
+man/man1/pas2jni.1.gz
+man/man1/pas2ut.1.gz
man/man1/plex.1.gz
man/man1/postw32.1.gz
man/man1/ppc386.1.gz
diff --git a/math/fpc-fftw/pkg-plist b/math/fpc-fftw/pkg-plist
index 4c0f55db1a1f..f3e4c8b678ab 100644
--- a/math/fpc-fftw/pkg-plist
+++ b/math/fpc-fftw/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fftw/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fftw/fftw_s.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fftw.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fftw/fftw_s.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fftw/libpfftw_s.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fftw/fftw_s.ppu
diff --git a/math/fpc-gmp/pkg-plist b/math/fpc-gmp/pkg-plist
index 81ecfdb145ec..181ee4d1261c 100644
--- a/math/fpc-gmp/pkg-plist
+++ b/math/fpc-gmp/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gmp/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/gmp.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gmp/gmp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gmp/gmp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gmp/libpgmp.a
diff --git a/math/fpc-numlib/pkg-plist b/math/fpc-numlib/pkg-plist
index 958bdc8218ad..95c4c5d07c70 100644
--- a/math/fpc-numlib/pkg-plist
+++ b/math/fpc-numlib/pkg-plist
@@ -1,55 +1,37 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/typ.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/omv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/dsl.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/mdt.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/numlib.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/det.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/det.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/eig.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/eigh1.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/eigh2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/int.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/inv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/iom.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/ipf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/ode.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/roo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/sle.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/spe.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/spl.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/numlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/typ.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/omv.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/dsl.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/mdt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/det.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/dsl.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/eig.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/eig.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/eigh1.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/eigh1.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/eigh2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/eigh2.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/int.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/int.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/inv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/inv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/iom.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/iom.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/ipf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/ipf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/mdt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/mdt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/numlib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/numlib.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/ode.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/ode.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/omv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/omv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/roo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/roo.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/sle.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/sle.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/spe.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/spe.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/spl.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/numlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libptyp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpomv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpdsl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpmdt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpdet.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpeig.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpeigh1.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpeigh2.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpint.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpinv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpiom.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpipf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpode.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libproo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpsle.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpspe.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpspl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/libpnumlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/spl.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/typ.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/numlib/typ.ppu
diff --git a/misc/fpc-chm/Makefile b/misc/fpc-chm/Makefile
index 23abf8992075..3bb68e8da7f7 100644
--- a/misc/fpc-chm/Makefile
+++ b/misc/fpc-chm/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= misc lang
PKGNAMESUFFIX= -chm
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal unit to manipulate chm files
-USE_FPC= fcl-xml
+USE_FPC= fcl-base fcl-xml
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/misc/fpc-chm/pkg-plist b/misc/fpc-chm/pkg-plist
index cd7112ccc0fc..68a086489dc8 100644
--- a/misc/fpc-chm/pkg-plist
+++ b/misc/fpc-chm/pkg-plist
@@ -1,6 +1,6 @@
bin/chmcmd
bin/chmls
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/chm.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmbase.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmbase.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfiftimain.o
@@ -29,24 +29,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itolitlstypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itolitlstypes.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itsftransform.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itsftransform.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmbase.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmfiftimain.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmfilewriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmsitemap.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmspecialfiles.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmtypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmwriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpfasthtmlparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libphtmlindexer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libphtmlutil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpitolitlsreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpitolitlstypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpitsftransform.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libplzxcompressthread.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslznonslide.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslzx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslzxcomp.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/lzxcompressthread.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/lzxcompressthread.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslznonslide.o
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 740b826e4690..0e24bbae3f08 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -64,7 +64,6 @@
SUBDIR += flvtool++
SUBDIR += fpc-dts
SUBDIR += fpc-libvlc
- SUBDIR += fpc-matroska
SUBDIR += freetuxtv
SUBDIR += freevo
SUBDIR += fxtv
diff --git a/multimedia/fpc-dts/Makefile b/multimedia/fpc-dts/Makefile
index c60659bf48ab..7953675594a2 100644
--- a/multimedia/fpc-dts/Makefile
+++ b/multimedia/fpc-dts/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= multimedia lang
PKGNAMESUFFIX= -dts
diff --git a/multimedia/fpc-dts/files/patch-packages_dts_fpmake.pp b/multimedia/fpc-dts/files/patch-packages_dts_fpmake.pp
new file mode 100644
index 000000000000..28f679260d1c
--- /dev/null
+++ b/multimedia/fpc-dts/files/patch-packages_dts_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/dts/fpmake.pp.orig 2015-01-05 19:27:06 UTC
++++ packages/dts/fpmake.pp
+@@ -24,7 +24,7 @@ begin
+ P.Email := '';
+ P.Description := 'a low-level interface to decoding audio frames encoded using DTS Coherent Acoustics';
+ P.NeedLibC:= true;
+- P.OSes := [linux];
++ P.OSes := [linux,dragonfly,freebsd];
+
+ P.SourcePath.Add('src');
+
diff --git a/multimedia/fpc-dts/pkg-plist b/multimedia/fpc-dts/pkg-plist
index f77a7207c4aa..a796e368b283 100644
--- a/multimedia/fpc-dts/pkg-plist
+++ b/multimedia/fpc-dts/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dts/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dts/dts.o
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/dts.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dts/dts.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dts/libpdts.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dts/dts.o
diff --git a/multimedia/fpc-libvlc/Makefile b/multimedia/fpc-libvlc/Makefile
index ee194258a55c..29e3350074c9 100644
--- a/multimedia/fpc-libvlc/Makefile
+++ b/multimedia/fpc-libvlc/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= multimedia lang
PKGNAMESUFFIX= -libvlc
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal interface to vlc media player library
-USE_FPC= fcl-base
+USE_FPC= fcl-base fcl-res rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp
new file mode 100644
index 000000000000..03387d043616
--- /dev/null
+++ b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp
@@ -0,0 +1,21 @@
+--- packages/libvlc/fpmake.pp.orig 2015-08-07 13:22:31 UTC
++++ packages/libvlc/fpmake.pp
+@@ -15,15 +15,15 @@ begin
+ {$ifdef ALLPACKAGES}
+ P.Directory:=ADirectory;
+ {$endif ALLPACKAGES}
+- P.OSes := [win32, win64, linux, freebsd];
++ P.OSes := [win32, win64, linux, dragonfly, freebsd];
+ P.Dependencies.Add('fcl-base');
+ P.Version:='3.0.0';
+ P.License := 'LGPL with modification';
+ P.HomepageURL := 'www.freepascal.org';
+ P.Email := 'michael@freepascal.org';
+ P.Description := 'VLC library (version 2 or higher) interface and component.';
+- T:=P.Targets.AddUnit('src/libvlc.pp',[linux,win32,win64]);
+- T:=P.Targets.AddUnit('src/vlc.pp',[linux,win32,win64]);
++ T:=P.Targets.AddUnit('src/libvlc.pp',[linux,win32,win64,dragonfly,freebsd]);
++ T:=P.Targets.AddUnit('src/vlc.pp',[linux,win32,win64,dragonfly,freebsd]);
+ with T.Dependencies do
+ begin
+ AddUnit('libvlc');
diff --git a/multimedia/fpc-libvlc/pkg-plist b/multimedia/fpc-libvlc/pkg-plist
index 7708f1aa7d07..04ff18480577 100644
--- a/multimedia/fpc-libvlc/pkg-plist
+++ b/multimedia/fpc-libvlc/pkg-plist
@@ -1,6 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libvlc/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libvlc/libplibvlc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libvlc/libpvlc.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libvlc.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libvlc/libvlc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libvlc/libvlc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libvlc/vlc.o
diff --git a/multimedia/fpc-matroska/Makefile b/multimedia/fpc-matroska/Makefile
deleted file mode 100644
index 37694013fd5c..000000000000
--- a/multimedia/fpc-matroska/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Christopher Key <cjk32@cam.ac.uk>
-# $FreeBSD$
-
-PORTREVISION= 1
-CATEGORIES= multimedia lang
-PKGNAMESUFFIX= -matroska
-
-MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal interface to matroska library
-
-USE_FPC= yes
-
-MASTERDIR= ${.CURDIR}/../../lang/fpc
-WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR= ${WRKUNITDIR}
-
-OPTIONS_DEFINE= LIBMATROSKA
-LIBMATROSKA_DESC= Install matroska library
-OPTIONS_DEFAULT= LIBMATROSKA
-
-LIBMATROSKA_LIB_DEPENDS= libmatroska.so:${PORTSDIR}/multimedia/libmatroska
-
-.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/fpc-matroska/pkg-plist b/multimedia/fpc-matroska/pkg-plist
deleted file mode 100644
index 0edffaef9c8a..000000000000
--- a/multimedia/fpc-matroska/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/matroska/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/matroska/matroska.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/matroska/matroska.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/matroska/libpmatroska.a
diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile
index af46e241b14f..71812a823c8c 100644
--- a/net/fpc-ldap/Makefile
+++ b/net/fpc-ldap/Makefile
@@ -1,14 +1,13 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= net lang
PKGNAMESUFFIX= -ldap
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal interface to OpenLDAP
-USE_FPC= hash
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/net/fpc-ldap/files/patch-packages_ldap_fpmake.pp b/net/fpc-ldap/files/patch-packages_ldap_fpmake.pp
new file mode 100644
index 000000000000..ba274c7dbe37
--- /dev/null
+++ b/net/fpc-ldap/files/patch-packages_ldap_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/ldap/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/ldap/fpmake.pp
+@@ -23,7 +23,7 @@ begin
+ P.Email := '';
+ P.Description := 'Header to openldap, a library that to access directory services';
+ P.NeedLibC:= true; // true for headers that indirectly link to libc?
+- P.OSes := [linux];
++ P.OSes := [linux,dragonfly,freebsd];
+
+
+ P.SourcePath.Add('src');
diff --git a/net/fpc-ldap/pkg-plist b/net/fpc-ldap/pkg-plist
index 92295e897a3f..2150156b09ab 100644
--- a/net/fpc-ldap/pkg-plist
+++ b/net/fpc-ldap/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ldap/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/ldap.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ldap/lber.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ldap/ldap.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ldap/lber.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ldap/ldap.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ldap/libplber.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ldap/libpldap.a
diff --git a/net/fpc-pcap/Makefile b/net/fpc-pcap/Makefile
index 807e0609a40d..333d56280d42 100644
--- a/net/fpc-pcap/Makefile
+++ b/net/fpc-pcap/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= net lang
PKGNAMESUFFIX= -pcap
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal unit for libpcap library
-USE_FPC= yes
+USE_FPC= rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/net/fpc-pcap/pkg-plist b/net/fpc-pcap/pkg-plist
index 82c497f8e927..e3ae8c13c0d5 100644
--- a/net/fpc-pcap/pkg-plist
+++ b/net/fpc-pcap/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pcap/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pcap/pcap.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/pcap.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pcap/pcap.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pcap/libppcap.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pcap/pcap.ppu
diff --git a/security/Makefile b/security/Makefile
index 60e8c4c74dbe..7b2c15767512 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -133,7 +133,6 @@
SUBDIR += firewalk
SUBDIR += fl0p
SUBDIR += flawfinder
- SUBDIR += fpc-hash
SUBDIR += fpc-openssl
SUBDIR += fpm2
SUBDIR += fprint_demo
diff --git a/security/fpc-hash/pkg-plist b/security/fpc-hash/pkg-plist
deleted file mode 100644
index 5d8e012cbc8e..000000000000
--- a/security/fpc-hash/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/crc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/crc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/md5.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/md5.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/ntlm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/ntlm.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpcrc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpmd5.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpntlm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpsha1.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpuuid.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/sha1.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/sha1.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.ppu
diff --git a/security/fpc-openssl/Makefile b/security/fpc-openssl/Makefile
index a95de325519c..547a2274bc42 100644
--- a/security/fpc-openssl/Makefile
+++ b/security/fpc-openssl/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= security lang
PKGNAMESUFFIX= -openssl
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal unit for OpenSSL
-USE_FPC= yes
+USE_FPC= rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/security/fpc-openssl/pkg-plist b/security/fpc-openssl/pkg-plist
index 5021774c9a07..3d9edb4d49ea 100644
--- a/security/fpc-openssl/pkg-plist
+++ b/security/fpc-openssl/pkg-plist
@@ -1,4 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/openssl.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/openssl.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/fpopenssl.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/fpopenssl.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/openssl.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/libpopenssl.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/openssl/openssl.ppu
diff --git a/sysutils/fpc-syslog/Makefile b/sysutils/fpc-syslog/Makefile
index 4890643e8df6..5fef5b21f5cd 100644
--- a/sysutils/fpc-syslog/Makefile
+++ b/sysutils/fpc-syslog/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= sysutils lang
PKGNAMESUFFIX= -syslog
diff --git a/sysutils/fpc-syslog/pkg-plist b/sysutils/fpc-syslog/pkg-plist
index 696ed5835303..ae6cb1f0e4bd 100644
--- a/sysutils/fpc-syslog/pkg-plist
+++ b/sysutils/fpc-syslog/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/syslog.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/libpsystemlog.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.ppu
diff --git a/sysutils/fpc-users/Makefile b/sysutils/fpc-users/Makefile
index e35f1bc1bd20..0a686be85b69 100644
--- a/sysutils/fpc-users/Makefile
+++ b/sysutils/fpc-users/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= sysutils lang
PKGNAMESUFFIX= -users
diff --git a/sysutils/fpc-users/pkg-plist b/sysutils/fpc-users/pkg-plist
index 1b4588c649a8..eb14e8e21efb 100644
--- a/sysutils/fpc-users/pkg-plist
+++ b/sysutils/fpc-users/pkg-plist
@@ -1,10 +1,8 @@
-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%%/fpmkinst/%%BUILDNAME%%/users.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/grp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/grp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/pwd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/pwd.ppu
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
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/users.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/users.rsj
diff --git a/sysutils/fpc-utmp/Makefile b/sysutils/fpc-utmp/Makefile
index 64bf1f8b12f6..174ab5753729 100644
--- a/sysutils/fpc-utmp/Makefile
+++ b/sysutils/fpc-utmp/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= sysutils lang
PKGNAMESUFFIX= -utmp
diff --git a/sysutils/fpc-utmp/pkg-plist b/sysutils/fpc-utmp/pkg-plist
index 0a93edc36138..84ea3228e2e0 100644
--- a/sysutils/fpc-utmp/pkg-plist
+++ b/sysutils/fpc-utmp/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/utmp.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/libputmp.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.ppu
diff --git a/sysutils/fpc-uuid/Makefile b/sysutils/fpc-uuid/Makefile
index 325f43a151dd..a358d9c4f333 100644
--- a/sysutils/fpc-uuid/Makefile
+++ b/sysutils/fpc-uuid/Makefile
@@ -1,14 +1,13 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= sysutils lang
PKGNAMESUFFIX= -uuid
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal uuid unit
-USE_FPC= yes
+USE_FPC= rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/sysutils/fpc-uuid/files/patch-packages_uuid_fpmake.pp b/sysutils/fpc-uuid/files/patch-packages_uuid_fpmake.pp
new file mode 100644
index 000000000000..a31b3e306816
--- /dev/null
+++ b/sysutils/fpc-uuid/files/patch-packages_uuid_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/uuid/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/uuid/fpmake.pp
+@@ -18,7 +18,7 @@ begin
+ {$endif ALLPACKAGES}
+ P.Version:='3.0.1';
+ P.SourcePath.Add('src');
+- P.OSes := [linux];
++ P.OSes := [linux,dragonfly,freebsd];
+ P.Dependencies.Add('rtl-extra');
+
+ T:=P.Targets.AddUnit('libuuid.pp');
diff --git a/sysutils/fpc-uuid/pkg-plist b/sysutils/fpc-uuid/pkg-plist
index 2231289ec16e..8a7740c72264 100644
--- a/sysutils/fpc-uuid/pkg-plist
+++ b/sysutils/fpc-uuid/pkg-plist
@@ -1,6 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/libplibuuid.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/libpmacuuid.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/uuid.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/libuuid.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/libuuid.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/macuuid.o
diff --git a/textproc/fpc-aspell/Makefile b/textproc/fpc-aspell/Makefile
index c1770b119b22..d836b2461f25 100644
--- a/textproc/fpc-aspell/Makefile
+++ b/textproc/fpc-aspell/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= textproc lang
PKGNAMESUFFIX= -aspell
diff --git a/textproc/fpc-aspell/pkg-plist b/textproc/fpc-aspell/pkg-plist
index 93353c64bb3d..e3f3d40738fe 100644
--- a/textproc/fpc-aspell/pkg-plist
+++ b/textproc/fpc-aspell/pkg-plist
@@ -1,10 +1,7 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspell.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspelldyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/spellcheck.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/aspell.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspell.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspell.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspelldyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspelldyn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/spellcheck.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/libpaspell.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/libpaspelldyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/libpspellcheck.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/spellcheck.ppu
diff --git a/textproc/fpc-libxml2/Makefile b/textproc/fpc-libxml2/Makefile
index f675d05e3d9d..a3efdc1ced64 100644
--- a/textproc/fpc-libxml2/Makefile
+++ b/textproc/fpc-libxml2/Makefile
@@ -1,14 +1,13 @@
# Created by: Christoper Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= textproc lang
PKGNAMESUFFIX= -libxml2
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Interface to xml2 library
-USE_FPC= yes
+USE_FPC= rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//:S/2//}
diff --git a/textproc/fpc-libxml2/pkg-plist b/textproc/fpc-libxml2/pkg-plist
index 65cf30358c1e..c6446df620ff 100644
--- a/textproc/fpc-libxml2/pkg-plist
+++ b/textproc/fpc-libxml2/pkg-plist
@@ -1,10 +1,9 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xml2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xmlxsd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xmlxsdparser.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xml2.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xmlxsd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xmlxsdparser.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/libpxml2.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/libpxmlxsd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/libpxmlxsdparser.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libxml2.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml/xml2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml/xml2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml/xmlxsd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml/xmlxsd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml/xmlxsd.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml/xmlxsdparser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml/xmlxsdparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml/xmlxsdparser.rsj
diff --git a/www/fpc-fastcgi/Makefile b/www/fpc-fastcgi/Makefile
index 938fb759c7a9..7ddbe76138b3 100644
--- a/www/fpc-fastcgi/Makefile
+++ b/www/fpc-fastcgi/Makefile
@@ -1,14 +1,13 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= www lang
PKGNAMESUFFIX= -fastcgi
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal fastcgi unit
-USE_FPC= fcl-process fpmkunit hash paszlib
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile b/www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile
deleted file mode 100644
index a5cef75d4514..000000000000
--- a/www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- packages/fastcgi/Makefile 2012-02-24 01:40:44.000000000 -0500
-+++ packages/fastcgi/Makefile 2012-02-24 01:42:02.000000000 -0500
-@@ -2057,15 +2057,15 @@
- endif
- .NOTPARALLEL:
- fpmake: fpmake.pp
-- $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
-+ $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
- all: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -CX
- smart: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -XX -o -CX
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -XX -o -CX
- release: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dRELEASE
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dRELEASE
- debug: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG
- ifeq ($(FPMAKE_BIN_CLEAN),)
- clean:
- else
-@@ -2085,8 +2085,8 @@
- endif
- install: fpmake
- ifdef UNIXHier
-- $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
-+ $(LOCALFPMAKE) install $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
- else
-- $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
-+ $(LOCALFPMAKE) install $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
- endif
- distinstall: install
diff --git a/www/fpc-fastcgi/pkg-plist b/www/fpc-fastcgi/pkg-plist
index c9029564efb4..dfa18a90ed79 100644
--- a/www/fpc-fastcgi/pkg-plist
+++ b/www/fpc-fastcgi/pkg-plist
@@ -1,4 +1,3 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fastcgi.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fastcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fastcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fpunits.cfg
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/libpfastcgi.a
diff --git a/www/fpc-httpd22/Makefile b/www/fpc-httpd22/Makefile
index 8a3a9e143398..5ede3c33affc 100644
--- a/www/fpc-httpd22/Makefile
+++ b/www/fpc-httpd22/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= www lang
PKGNAMESUFFIX= -httpd22
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal httpd unit
+COMMENT= Free Pascal headers for Apache 2.2 series web server
-USE_FPC= yes
+USE_FPC= rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/www/fpc-httpd22/pkg-plist b/www/fpc-httpd22/pkg-plist
index 30048d02e63e..0fd5d04c2ac0 100644
--- a/www/fpc-httpd22/pkg-plist
+++ b/www/fpc-httpd22/pkg-plist
@@ -1,13 +1,9 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/apr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/apriconv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/aprutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/httpd.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/httpd22.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/apr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/apr.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/apriconv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/apriconv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/aprutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/aprutil.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/httpd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/libpapr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/libpapriconv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/libpaprutil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/libphttpd.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd22/httpd.ppu
diff --git a/www/fpc-httpd24/Makefile b/www/fpc-httpd24/Makefile
index efb5fe97000d..104d961d0e52 100644
--- a/www/fpc-httpd24/Makefile
+++ b/www/fpc-httpd24/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= www lang
PKGNAMESUFFIX= -httpd24
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal httpd unit
+COMMENT= Free Pascal headers for Apache 2.4 series web server
-USE_FPC= yes
+USE_FPC= rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/www/fpc-httpd24/pkg-plist b/www/fpc-httpd24/pkg-plist
index 2a30f406e0f9..0de651a26b93 100644
--- a/www/fpc-httpd24/pkg-plist
+++ b/www/fpc-httpd24/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd24/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/httpd24.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd24/apr24.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd24/apr24.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd24/httpd24.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd24/httpd24.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd24/libpapr24.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd24/libphttpd24.a
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index ec3bf7fb8917..c479676502af 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -gtk2
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal interface to the GTK2 libraries
-USE_FPC= cairo fcl-base fcl-image hash pasjpeg paszlib x11
+USE_FPC= cairo fcl-base fcl-image fcl-res pasjpeg rtl-objpas x11
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/x11-toolkits/fpc-gtk2/pkg-plist b/x11-toolkits/fpc-gtk2/pkg-plist
index b93a4686586f..c996052dc6b3 100644
--- a/x11-toolkits/fpc-gtk2/pkg-plist
+++ b/x11-toolkits/fpc-gtk2/pkg-plist
@@ -1,39 +1,25 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/buildgtk2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/gtk2.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.o
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/gdk2pixbuf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/buildgtk2.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpglib2.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpatk.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libppango.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libppangocairo.a
-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
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.ppu
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index fccb125f9bc7..e722da0ab673 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -xforms
@@ -19,6 +18,5 @@ XFORMS_DESC= Install xforms graphical user interface toolkit
OPTIONS_DEFAULT= XFORMS
XFORMS_LIB_DEPENDS= libforms.so:${PORTSDIR}/x11-toolkits/xforms
-HAVE_EXAMPLES= yes
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-xforms/pkg-plist b/x11-toolkits/fpc-xforms/pkg-plist
index d2dcebd663b5..4798e803448e 100644
--- a/x11-toolkits/fpc-xforms/pkg-plist
+++ b/x11-toolkits/fpc-xforms/pkg-plist
@@ -1,62 +1,4 @@
bin/fd2pascal
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/xforms.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/libpxforms.a
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/xyplotover.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/touchbutton.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/srs.xbm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/sliderall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/secretinput.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pushme.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pushbutton.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pup.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/positioner.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/porsche.xpm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objreturn.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objpos.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objinactive.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/nomail.xbm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/newbutton.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ndial.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/multilabel.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/minput.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/menu.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/longlabel.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ll.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ldial.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/lalign.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/invslider.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/inputall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/iconify.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/group.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/goodies.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/free1.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fonts.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/flclock.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fdial.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse1.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/cursor.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/crab45.xpm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/crab.xpm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/counter.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel1.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colbrowser.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/choice.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/chartstrip.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/chartall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/canvas.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/butttypes.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/buttonall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/browserop.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/browserall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/boxtype.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/borderwidth.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/bm2.xbm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/bm1.xbm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/arrowbutton.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile.fpc
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/yesno.pp
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.ppu
diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile
index 7c7a52fe2f6a..c8e050f24005 100644
--- a/x11/fpc-x11/Makefile
+++ b/x11/fpc-x11/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= x11 lang
PKGNAMESUFFIX= -x11
diff --git a/x11/fpc-x11/pkg-plist b/x11/fpc-x11/pkg-plist
index 40f10eb064c8..5468dce7e226 100644
--- a/x11/fpc-x11/pkg-plist
+++ b/x11/fpc-x11/pkg-plist
@@ -1,34 +1,10 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/cursorfont.o
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/x11.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/cursorfont.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/fontconfig.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/fontconfig.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/keysym.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/keysym.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpcursorfont.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpfontconfig.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpkeysym.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxatom.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxcms.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxf86dga.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxf86vmode.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxinerama.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxft.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxkb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxkblib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxlib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxrandr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxrender.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxshm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxutil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxvlib.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/x.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/x.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xatom.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xatom.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xcms.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xcms.ppu
@@ -58,7 +34,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xshm.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xshm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xutil.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xv.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xvlib.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xvlib.ppu