Index: fpc/fpcsrc/packages/Makefile.fpc
===================================================================
--- fpc.orig/fpcsrc/packages/Makefile.fpc	2014-07-04 15:07:53.063793862 +0400
+++ fpc/fpcsrc/packages/Makefile.fpc	2014-07-04 15:10:20.504632834 +0400
@@ -35,9 +35,11 @@
 dirs_powerpc64_darwin=opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1  httpd22 httpd24  imlib cocoaint
 dirs_arm_darwin= httpd22 httpd24  opengles objcrtl
 dirs_i386_iphonesim= httpd22 httpd24  opengles objcrtl dblib
-dirs_solaris=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \
-               libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 bfd svgalib fcl-extra \
-               imlib utmp  fpgtk xforms fftw pcap ggi  openssl gnome1  httpd22 httpd24  numlib iconvenc gtk2 cairo dblib fpindexer dblib
+dirs_solaris=fv fcl-web fastcgi fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick \
+               gdbint libpng x11 uuid ldap modplug dts mad  gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 librsvg \
+               a52 bfd aspell svgalib newt users  iconvenc libxml proj4 fcl-extra zorba \
+               imlib utmp  fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1  httpd22 httpd24  \
+               pxlib numlib gmp libsee dblib fpindexer libvlc fppkg
 dirs_netbsd=fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \
                gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 librsvg bfd aspell svgalib \
                imlib utmp  fpgtk xforms fftw pcap ggi sdl openssl gnome1  httpd22 httpd24  pxlib numlib dblib fpindexer
@@ -210,7 +212,7 @@
 fastcgi_release: fpmkunit_release
 fastcgi_shared: fpmkunit_shared
 
-ifneq ($(findstring $(OS_TARGET),linux freebsd openbsd netbsd win32 beos haiku),)
+ifneq ($(findstring $(OS_TARGET),solaris linux freebsd openbsd netbsd win32 beos haiku),)
 fcl-db_all: fcl-xml_all fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all pxlib_all fcl-json_all dblib_all
 fcl-db_debug: fcl-xml_debug fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug pxlib_debug fcl-json_debug dblib_debug
 fcl-db_smart: fcl-xml_smart fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart pxlib_smart fcl-json_smart dblib_smart
@@ -413,7 +415,7 @@
 librsvg_debug: gtk2_debug
 librsvg_release: gtk2_release
 
-ifneq ($(findstring $(OS_TARGET),linux freebsd darwin iphonesim beos haiku),)
+ifneq ($(findstring $(OS_TARGET),solaris linux freebsd darwin iphonesim beos haiku),)
 fcl-xml_all: iconvenc_all
 fcl-xml_shared: iconvenc_shared
 fcl-xml_smart: iconvenc_smart
Index: fpc/fpcsrc/packages/ptc/Makefile.fpc
===================================================================
--- fpc.orig/fpcsrc/packages/ptc/Makefile.fpc	2014-07-04 15:07:53.063830150 +0400
+++ fpc/fpcsrc/packages/ptc/Makefile.fpc	2014-07-04 15:09:27.825655528 +0400
@@ -25,6 +25,7 @@
 [require]
 packages=hermes fcl-base
 packages_linux=x11 opengl
+packages_solaris=x11 opengl
 packages_freebsd=x11 opengl
 packages_win32=opengl
 packages_win64=opengl
Index: fpc/fpcsrc/utils/Makefile.fpc
===================================================================
--- fpc.orig/fpcsrc/utils/Makefile.fpc	2014-07-04 15:07:53.063906394 +0400
+++ fpc/fpcsrc/utils/Makefile.fpc	2014-07-04 15:09:27.827381520 +0400
@@ -20,7 +20,7 @@
 dirs_netbsd=fpcres instantfpc
 dirs_darwin=fpcres fpcreslipo instantfpc
 dirs_iphonesim=fpcres fpcreslipo instantfpc
-dirs_solaris=fpcres instantfpc
+dirs_solaris=fpcres fppkg instantfpc
 dirs_os2=fpmc fpcres rmwait
 dirs_emx=fpmc fpcres rmwait
 dirs_go32v2=rmwait
Index: fpc/fpcdocs/Makefile.fpc
===================================================================
--- fpc.orig/fpcdocs/Makefile.fpc	2014-07-04 15:07:53.063979628 +0400
+++ fpc/fpcdocs/Makefile.fpc	2014-07-04 15:09:27.831253035 +0400
@@ -369,7 +369,7 @@
 HOSTOS=$(OS_SOURCE)
 
 # Classes.pp is in rtl/unix/ for several targets
-ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin netbsd openbsd),)
+ifneq ($(findstring $(OS_SOURCE),solaris linux freebsd darwin netbsd openbsd),)
 CLASSESUNITDIR=unix
 else
 CLASSESUNITDIR=$(OS_SOURCE)
Index: fpc/fpcsrc/packages/pxlib/Makefile.fpc
===================================================================
--- fpc.orig/fpcsrc/packages/pxlib/Makefile.fpc	2014-07-04 15:07:53.063705674 +0400
+++ fpc/fpcsrc/packages/pxlib/Makefile.fpc	2014-07-04 15:09:27.834208471 +0400
@@ -10,6 +10,7 @@
 units_beos=pxlib
 units_haiku=pxlib
 units_linux=pxlib
+units_solaris=pxlib
 units_win32=pxlib
 units_darwin=pxlib
 units_iphonesim=pxlib
@@ -19,6 +20,7 @@
 exampledirs_beos=examples
 exampledirs_haiku=examples
 exampledirs_linux=examples
+exampledirs_solaris=examples
 exampledirs_win32=examples
 exampledirs_darwin=examples
 exampledirs_iphonesim=examples