sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 2.6.0

Browse source
This commit is contained in:
Jose Alonso Cardenas Marquez 2012-04-19 06:20:01 +00:00
parent 5ab903e5a5
commit 0fde88adba
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295093
36 changed files with 554 additions and 2157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Mk/bsd.fpc.mk
View file

@ -30,7 +30,7 @@ _FPCMKINCLUDED= yes
FPC_Include_MAINTAINER= acm@FreeBSD.org FPC_Include_MAINTAINER= acm@FreeBSD.org
FPC_Pre_Include= bsd.fpc.mk FPC_Pre_Include= bsd.fpc.mk
DEFAULT_FPC_VER= 2.4.4 DEFAULT_FPC_VER= 2.6.0
FPC_VER= ${DEFAULT_FPC_VER} FPC_VER= ${DEFAULT_FPC_VER}
FPC_ARCH= ${ARCH:S/amd64/x86_64/} FPC_ARCH= ${ARCH:S/amd64/x86_64/}
@ -58,18 +58,20 @@ UNITSDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
_FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dbus dts fastcgi fcl-async fcl-base \ _FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dbus dts fastcgi fcl-async fcl-base \
fcl-db fcl-fpcunit fcl-image fcl-json fcl-net fcl-passrc fcl-process \ fcl-db fcl-fpcunit fcl-image fcl-json fcl-net fcl-passrc fcl-process \
fcl-registry fcl-res fcl-web fcl-xml fftw fpgtk fpmkunit fpvectorial \ fcl-registry fcl-res fcl-web fcl-xml fftw fpgtk fpmkunit fppkg fpvectorial \
fv gdbint gdbm ggi gmp gnome1 graph gtk1 gtk2 hash hermes httpd13 \ fv gdbint gdbm ggi gmp gnome1 graph gtk1 gtk2 hash hermes httpd22 \
httpd20 httpd22 ibase iconvenc imagemagick imlib ldap libcurl libgd \ ibase iconvenc imagemagick imlib ldap libcurl libgd libpng libxml2 \
libpng libxml2 lua mad matroska modplug mysql ncurses newt numlib \ lua mad matroska modplug mysql ncurses newt numlib odbc oggvorbis \
odbc oggvorbis openal opengl openssl oracle pasjpeg paszlib pcap \ openal opengl openssl oracle pasjpeg paszlib pcap postgres proj4 \
postgres proj4 pthreads pxlib regexpr rexx rsvg sdl sndfile sqlite \ pthreads pxlib regexpr rexx rsvg sdl sndfile sqlite svgalib symbolic \
svgalib symbolic syslog tcl unzip users utmp uuid x11 xforms zlib syslog tcl unzip users utmp uuid x11 xforms zlib
_FPC_CFG_UNITS= fastcgi fcl-web
.if defined(WANT_FPC_BASE) .if defined(WANT_FPC_BASE)
. if ${WANT_FPC_BASE:L} == "yes" . if ${WANT_FPC_BASE:L} == "yes"
USE_FPC= gdbint graph hash httpd13 httpd20 httpd22 ibase mysql odbc oracle \ USE_FPC= gdbint graph hash httpd22 ibase mysql odbc oracle pasjpeg paszlib \
pasjpeg paszlib postgres pthreads regexpr sqlite postgres pthreads regexpr sqlite
. else . else
IGNORE= unknown value, please use "yes" instead of IGNORE= unknown value, please use "yes" instead of
. endif . endif
@ -95,8 +97,6 @@ IGNORE= cannot install: unknown FPC unit ${UNITS}
gdbint_UNIT= devel/fpc-gdbint gdbint_UNIT= devel/fpc-gdbint
graph_UNIT= graphics/fpc-graph graph_UNIT= graphics/fpc-graph
hash_UNIT= security/fpc-hash hash_UNIT= security/fpc-hash
httpd13_UNIT= www/fpc-httpd13
httpd20_UNIT= www/fpc-httpd20
httpd22_UNIT= www/fpc-httpd22 httpd22_UNIT= www/fpc-httpd22
ibase_UNIT= databases/fpc-ibase ibase_UNIT= databases/fpc-ibase
mysql_UNIT= databases/fpc-mysql mysql_UNIT= databases/fpc-mysql
@ -135,6 +135,7 @@ fcl_xml_UNIT= devel/fpc-fcl-xml
fftw_UNIT= math/fpc-fftw fftw_UNIT= math/fpc-fftw
fpmkunit_UNIT= devel/fpc-fpmkunit fpmkunit_UNIT= devel/fpc-fpmkunit
fpgtk_UNIT= graphics/fpc-fpgtk fpgtk_UNIT= graphics/fpc-fpgtk
fppkg_UNIT= devel/fpc-fppkg
fpvectorial_UNIT= graphics/fpc-fpvectorial fpvectorial_UNIT= graphics/fpc-fpvectorial
fv_UNIT= devel/fpc-fv fv_UNIT= devel/fpc-fv
hermes_UNIT= graphics/fpc-hermes hermes_UNIT= graphics/fpc-hermes
@ -185,11 +186,16 @@ zlib_UNIT= devel/fpc-zlib
.endif .endif
.if defined(_POSTMKINCLUDED) && defined(USE_FPC) .if defined(_POSTMKINCLUDED) && defined(USE_FPC)
. for UNITS in ${USE_FPC} . for UNITS in ${USE_FPC}
. if ${_FPC_ALL_UNITS:M${UNITS}}!="" . if ${_FPC_ALL_UNITS:M${UNITS}}!=""
BUILD_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} . if ${_FPC_CFG_UNITS:M${UNITS}}!=""
RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} BUILD_DEPENDS+= ${UNITSDIR}/${UNITS}/fpunits.cfg:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/fpunits.cfg:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
. else
BUILD_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
. endif
security-check: fpc-check-install security-check: fpc-check-install
. endif . endif
. endfor . endfor

159
devel/fpc-fcl-base/pkg-plist
View file

@ -1,94 +1,97 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rtfpars.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/idea.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/gettext.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/avl_tree.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wformat.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/whtml.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wtex.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptemplate.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rtfpars.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/idea.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/gettext.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/avl_tree.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/avl_tree.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/avl_tree.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wformat.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/whtml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wtex.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.o 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/custapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.ppu
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/fpexprpars.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.ppu
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/fptemplate.o 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/fptimer.o 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
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/gettext.ppu
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/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/libpascii85.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcontnrs.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpinifiles.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libprtfpars.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpidea.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpbase64.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpgettext.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpiostream.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcachecls.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpavl_tree.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpavl_tree.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpuriparser.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpbase64.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpeventlog.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/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/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/libpwformat.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwhtml.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/libpwtex.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libprttiutils.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpbufstream.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamex.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpblowfish.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamio.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpinicol.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libppooledmm.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rtfpars.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libplibtar.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rtfpars.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamcoll.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpmaskutils.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfpexprpars.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpsyncobjs.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptimer.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptemplate.a 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/syncobjs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wformat.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wformat.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/whtml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/whtml.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wtex.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/wtex.ppu
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
@dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%%/units

3
devel/fpc-fcl-db/pkg-plist
View file

@ -111,6 +111,8 @@ 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/fpstdexports.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.o 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.ppu
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/ibconnection.o 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/ibconnection.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a
@ -169,6 +171,7 @@ 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/libpfpsqltree.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpstdexports.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/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/libpibconnection.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmemds.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmemds.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql40conn.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql40conn.a

34
devel/fpc-fcl-net/pkg-plist
View file

@ -1,35 +1,19 @@
bin/mkxmlrpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/servlets.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpbase.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpclient.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpsvlt.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/xmlrpc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/servlets.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpbase.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpclient.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/httpsvlt.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/xmlrpc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpcnetdb.a 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/libpnetdb.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpresolve.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/libpssockets.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpservlets.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpfpsock.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libphttpbase.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libphttpclient.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libphttpsvlt.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpxmlrpc.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.ppu
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
@dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%%/units

25
devel/fpc-fcl-process/pkg-plist
View file

@ -1,19 +1,22 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.o 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/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/libpprocess.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpsimpleipc.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpsimpleipc.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpdbugmsg.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpdbugintf.a 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
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
@dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%%/units

4
devel/fpc-fcl-web/Makefile
View file

@ -13,8 +13,8 @@ MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library COMMENT= Free Pascal Component Library
USE_FPC= fastcgi fcl-async fcl-base fcl-db fcl-json fcl-net fcl-process \ USE_FPC= fastcgi fcl-async fcl-base fcl-db fcl-json fcl-net fcl-process \
fcl-xml hash httpd13 httpd20 httpd22 ibase mysql odbc oracle \ fcl-xml hash httpd22 ibase mysql odbc oracle paszlib postgres \
paszlib postgres pthreads sqlite pthreads sqlite
MASTERDIR= ${.CURDIR}/../../lang/fpc MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}

49
devel/fpc-fcl-web/files/patch-packages-fcl-web_Makefile Normal file
View file

@ -0,0 +1,49 @@
--- 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

54
devel/fpc-fcl-web/pkg-plist
View file

@ -1,71 +1,111 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.rst
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/custhttpapp.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.o 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/ezcgi.ppu
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/fpcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.rst
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/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.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.o 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/fpfcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.rst
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/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/fpjsonrpc.o 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.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/fpweb.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.rst
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/httpdefs.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.rst
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/libpcgiapp.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustcgi.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/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/libpcustweb.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpextjsjson.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/libpextjsxml.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpezcgi.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/libpfpapache.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/libpfpcgi.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfcgigate.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpdatasetform.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/libpfpextdirect.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpextjs.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/libpfpfcgi.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphtml.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/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/libpfpjsonrpc.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpweb.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/libpfpwebdata.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpsqldbwebdata.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/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/libpwebjsonrpc.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebpage.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/libpwebsession.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebutil.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebutil.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.o 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.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.rst
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webjsonrpc.o 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/webjsonrpc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webpage.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webpage.o

87
devel/fpc-fcl-xml/pkg-plist
View file

@ -1,58 +1,61 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_xml.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmldefs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_html.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom_html.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmliconv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlread.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlstreaming.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlwrite.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xhtml.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmwrite.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xpath.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlelements.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmldefs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_xml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_html.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom_html.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom_html.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom_html.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmliconv.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dtdmodel.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlread.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dtdmodel.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlstreaming.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmldefs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlwrite.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmldefs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xhtml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmwrite.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xpath.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlelements.o 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.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax_xml.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmwrite.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmldefs.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmwrite.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlutils.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdom.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdom.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax_html.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdom_html.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/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/libpxmliconv.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlread.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/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/libpxmlwrite.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxhtml.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmwrite.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxpath.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxpath.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmlelements.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmlwriter.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlconf.a 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
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_xml.ppu
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/xmlconf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.ppu
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/xmlstreaming.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlstreaming.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
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
@dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%%/units

3
devel/fpc-regexpr/pkg-plist
View file

@ -1,8 +1,11 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/oldregexpr.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/oldregexpr.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.o 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/libpregex.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpregexpr.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpregexpr.a
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr

114
graphics/fpc-fpvectorial/files/fpvutils.pas
View file

@ -1,114 +0,0 @@
{
fpvutils.pas
Vector graphics document
License: The same modified LGPL as the Free Pascal RTL
See the file COPYING.modifiedLGPL for more details
AUTHORS: Felipe Monteiro de Carvalho
Pedro Sol Pegorini L de Lima
}
unit fpvutils;
{$ifdef fpc}
{$mode delphi}
{$endif}
interface
uses
Classes, SysUtils, Math,
fpvectorial, fpimage;
type
T10Strings = array[0..9] of shortstring;
// Color Conversion routines
function FPColorToRGBHexString(AColor: TFPColor): string;
function RGBToFPColor(AR, AG, AB: byte): TFPColor; inline;
// Other routine
function CanvasCoordsToFPVectorial(AY: Integer; AHeight: Integer): Integer; inline;
function CanvasTextPosToFPVectorial(AY: Integer; ACanvasHeight, ATextHeight: Integer): Integer;
function SeparateString(AString: string; ASeparator: char): T10Strings;
implementation
{@@ This function is utilized by the SVG writer and some other places, so
it shouldn't be changed.
}
function FPColorToRGBHexString(AColor: TFPColor): string;
begin
Result := Format('%.2x%.2x%.2x', [AColor.Red shr 8, AColor.Green shr 8, AColor.Blue shr 8]);
end;
function RGBToFPColor(AR, AG, AB: byte): TFPColor; inline;
begin
Result.Red := (AR shl 8) + AR;
Result.Green := (AG shl 8) + AG;
Result.Blue := (AB shl 8) + AB;
Result.Alpha := $FFFF;
end;
{@@ Converts the coordinate system from a TCanvas to FPVectorial
The basic difference is that the Y axis is positioned differently and
points upwards in FPVectorial and downwards in TCanvas.
The X axis doesn't change. The fix is trivial and requires only the Height of
the Canvas as extra info.
@param AHeight Should receive TCanvas.Height
}
function CanvasCoordsToFPVectorial(AY: Integer; AHeight: Integer): Integer; inline;
begin
Result := AHeight - AY;
end;
{@@
LCL Text is positioned based on the top-left corner of the text.
Besides that, one also needs to take the general coordinate change into account too.
@param ACanvasHeight Should receive TCanvas.Height
@param ATextHeight Should receive TFont.Size
}
function CanvasTextPosToFPVectorial(AY: Integer; ACanvasHeight, ATextHeight: Integer): Integer;
begin
Result := CanvasCoordsToFPVectorial(AY, ACanvasHeight) - ATextHeight;
end;
{@@
Reads a string and separates it in substring
using ASeparator to delimite them.
Limits:
Number of substrings: 10 (indexed 0 to 9)
Length of each substring: 255 (they are shortstrings)
}
function SeparateString(AString: string; ASeparator: char): T10Strings;
var
i, CurrentPart: integer;
begin
CurrentPart := 0;
{ Clears the result }
for i := 0 to 9 do
Result[i] := '';
{ Iterates througth the string, filling strings }
for i := 1 to Length(AString) do
begin
if Copy(AString, i, 1) = ASeparator then
begin
Inc(CurrentPart);
{ Verifies if the string capacity wasn't exceeded }
if CurrentPart > 9 then
Exit;
end
else
Result[CurrentPart] := Result[CurrentPart] + Copy(AString, i, 1);
end;
end;
end.

66
graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_avisocncgcodewriter.pas
View file

@ -1,66 +0,0 @@
--- packages/fpvectorial/src/avisocncgcodewriter.pas 2011/01/14 14:45:03 16765
+++ packages/fpvectorial/src/avisocncgcodewriter.pas 2011/03/08 14:28:26 17092
@@ -36,6 +36,10 @@
i, j: Integer;
Str: string;
APath: TPath;
+ CurSegment: T2DSegment;
+ Cur3DSegment: T3DSegment;
+ Cur2DBezierSegment: T2DBezierSegment;
+ Cur3DBezierSegment: T3DBezierSegment;
begin
AStrings.Clear;
@@ -51,25 +55,39 @@
// levanta a broca
AStrings.Add('P01 // Sobe a cabeça de gravação');
// vai para o ponto inicial
+ CurSegment := T2DSegment(APath.Points);
AStrings.Add(Format('G01 X%f Y%f',
- [APath.Points[0].X, APath.Points[0].Y]));
+ [CurSegment.X, CurSegment.Y]));
AStrings.Add('P02 // Abaixa a cabeça de gravação');
for j := 1 to APath.Len - 1 do
begin
- case APath.Points[j].SegmentType of
+ CurSegment := T2DSegment(CurSegment.Next);
+ case CurSegment.SegmentType of
st2DLine: AStrings.Add(Format('G01 X%f Y%f',
- [APath.Points[j].X, APath.Points[j].Y]));
- st3DLine: AStrings.Add(Format('G01 X%f Y%f Z%f',
- [APath.Points[j].X, APath.Points[j].Y, APath.Points[j].Z]));
- st2DBezier: AStrings.Add(Format('B02 X%f Y%f X%f Y%f X%f Y%f',
- [APath.Points[j].X2, APath.Points[j].Y2,
- APath.Points[j].X3, APath.Points[j].Y3,
- APath.Points[j].X, APath.Points[j].Y]));
- st3DBezier: AStrings.Add(Format('B03 X%f Y%f Z%f X%f Y%f Z%f X%f Y%f Z%f',
- [APath.Points[j].X2, APath.Points[j].Y2, APath.Points[j].Z2,
- APath.Points[j].X3, APath.Points[j].Y3, APath.Points[j].Z3,
- APath.Points[j].X, APath.Points[j].Y, APath.Points[j].Z]));
+ [CurSegment.X, CurSegment.Y]));
+ st3DLine:
+ begin
+ Cur3DSegment := T3DSegment(CurSegment);
+ AStrings.Add(Format('G01 X%f Y%f Z%f',
+ [Cur3DSegment.X, Cur3DSegment.Y, Cur3DSegment.Z]));
+ end;
+ st2DBezier:
+ begin
+ Cur2DBezierSegment := T2DBezierSegment(CurSegment);
+ AStrings.Add(Format('B02 X%f Y%f X%f Y%f X%f Y%f',
+ [Cur2DBezierSegment.X2, Cur2DBezierSegment.Y2,
+ Cur2DBezierSegment.X3, Cur2DBezierSegment.Y3,
+ Cur2DBezierSegment.X, Cur2DBezierSegment.Y]));
+ end;
+ st3DBezier:
+ begin
+ Cur3DBezierSegment := T3DBezierSegment(CurSegment);
+ AStrings.Add(Format('B03 X%f Y%f Z%f X%f Y%f Z%f X%f Y%f Z%f',
+ [Cur3DBezierSegment.X2, Cur3DBezierSegment.Y2, Cur3DBezierSegment.Z2,
+ Cur3DBezierSegment.X3, Cur3DBezierSegment.Y3, Cur3DBezierSegment.Z3,
+ Cur3DBezierSegment.X, Cur3DBezierSegment.Y, Cur3DBezierSegment.Z]));
+ end;
end;
end;
end;

703
graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_fpvectorial.pas
View file

@ -1,703 +0,0 @@
--- packages/fpvectorial/src/fpvectorial.pas 2011/01/30 15:51:36 16850
+++ packages/fpvectorial/src/fpvectorial.pas 2011/06/17 09:52:19 17765
@@ -18,14 +18,17 @@
interface
uses
- Classes, SysUtils, Math;
+ Classes, SysUtils, Math,
+ fpcanvas, fpimage;
type
TvVectorialFormat = (
{ Multi-purpose document formats }
- vfPDF, vfPostScript, vfSVG, vfCorelDrawCDR, vfWindowsMetafileWMF,
+ vfPDF, vfSVG, vfCorelDrawCDR, vfWindowsMetafileWMF,
{ CAD formats }
vfDXF,
+ { Printing formats }
+ vfPostScript, vfEncapsulatedPostScript,
{ GCode formats }
vfGCodeAvisoCNCPrototipoV5, vfGCodeAvisoCNCPrototipoV6);
@@ -37,10 +40,45 @@
STR_SVG_EXTENSION = '.svg';
STR_CORELDRAW_EXTENSION = '.cdr';
STR_WINMETAFILE_EXTENSION = '.wmf';
+ STR_AUTOCAD_EXCHANGE_EXTENSION = '.dxf';
+ STR_ENCAPSULATEDPOSTSCRIPT_EXTENSION = '.eps';
type
+ { Pen, Brush and Font }
+
+ TvPen = record
+ Color: TFPColor;
+ Style: TFPPenStyle;
+ Width: Integer;
+ end;
+
+ TvBrush = record
+ Color: TFPColor;
+ Style: TFPBrushStyle;
+ end;
+
+ TvFont = record
+ Color: TFPColor;
+ Size: integer;
+ Name: utf8string;
+ {@@
+ Font orientation is measured in degrees and uses the
+ same direction as the LCL TFont.orientation, which is counter-clockwise.
+ Zero is the normal, horizontal, orientation.
+ }
+ Orientation: Double;
+ end;
+
+ { Coordinates and polyline segments }
+
+ T3DPoint = record
+ X, Y, Z: Double;
+ end;
+
+ P3DPoint = ^T3DPoint;
+
TSegmentType = (
- st2DLine, st2DBezier,
+ st2DLine, st2DLineWithPen, st2DBezier,
st3DLine, st3DBezier, stMoveTo);
{@@
@@ -70,6 +108,11 @@
X, Y: Double;
end;
+ T2DSegmentWithPen = class(T2DSegment)
+ public
+ Pen: TvPen;
+ end;
+
{@@
In Bezier segments, we remain using the X and Y coordinates for the ending point.
The starting point is where the previous segment ended, so that the intermediary
@@ -96,13 +139,30 @@
X3, Y3, Z3: Double;
end;
- TPath = class
+ { Now all elements }
+
+ {@@
+ All elements should derive from TvEntity, regardless of whatever properties
+ they might contain.
+ }
+
+ TvEntity = class
+ public
+ {@@ The global Pen for the entire entity. In the case of paths, individual
+ elements might be able to override this setting. }
+ Pen: TvPen;
+ {@@ The global Brush for the entire entity. In the case of paths, individual
+ elements might be able to override this setting. }
+ Brush: TvBrush;
+ constructor Create; virtual;
+ end;
+
+ TPath = class(TvEntity)
Len: Integer;
Points: TPathSegment; // Beginning of the double-linked list
PointsEnd: TPathSegment; // End of the double-linked list
CurPoint: TPathSegment; // Used in PrepareForSequentialReading and Next
- procedure Assign(APath: TPath);
- function Count(): TPathSegment;
+ procedure Assign(ASource: TPath);
procedure PrepareForSequentialReading;
function Next(): TPathSegment;
end;
@@ -113,18 +173,11 @@
At the moment fonts are unsupported, only simple texts
up to 255 chars are supported.
}
- TvText = class
+ TvText = class(TvEntity)
public
X, Y, Z: Double; // Z is ignored in 2D formats
- FontSize: integer;
- FontName: utf8string;
Value: utf8string;
- end;
-
- {@@
- }
- TvEntity = class
- public
+ Font: TvFont;
end;
{@@
@@ -145,9 +198,6 @@
{@@
}
-
- { TvEllipse }
-
TvEllipse = class(TvEntity)
public
// Mandatory fields
@@ -159,6 +209,24 @@
procedure CalculateBoundingRectangle;
end;
+ {@@
+ The brush has no effect in this class
+
+ DimensionLeft ---text--- DimensionRight
+ | |
+ | | BaseRight
+ |
+ | BaseLeft
+ }
+
+ { TvAlignedDimension }
+
+ TvAlignedDimension = class(TvEntity)
+ public
+ // Mandatory fields
+ BaseLeft, BaseRight, DimensionLeft, DimensionRight: T3DPoint;
+ end;
+
type
TvCustomVectorialWriter = class;
@@ -168,8 +236,6 @@
TvVectorialDocument = class
private
- FPaths: TFPList;
- FTexts: TFPList;
FEntities: TFPList;
FTmpPath: TPath;
FTmpText: TvText;
@@ -184,10 +250,14 @@
{ Base methods }
constructor Create;
destructor Destroy; override;
- procedure WriteToFile(AFileName: string; AFormat: TvVectorialFormat);
+ procedure Assign(ASource: TvVectorialDocument);
+ procedure AssignTo(ADest: TvVectorialDocument);
+ procedure WriteToFile(AFileName: string; AFormat: TvVectorialFormat); overload;
+ procedure WriteToFile(AFileName: string); overload;
procedure WriteToStream(AStream: TStream; AFormat: TvVectorialFormat);
procedure WriteToStrings(AStrings: TStrings; AFormat: TvVectorialFormat);
- procedure ReadFromFile(AFileName: string; AFormat: TvVectorialFormat);
+ procedure ReadFromFile(AFileName: string; AFormat: TvVectorialFormat); overload;
+ procedure ReadFromFile(AFileName: string); overload;
procedure ReadFromStream(AStream: TStream; AFormat: TvVectorialFormat);
procedure ReadFromStrings(AStrings: TStrings; AFormat: TvVectorialFormat);
class function GetFormatFromExtension(AFileName: string): TvVectorialFormat;
@@ -195,27 +265,35 @@
{ Data reading methods }
function GetPath(ANum: Cardinal): TPath;
function GetPathCount: Integer;
- function GetText(ANum: Cardinal): TvText;
- function GetTextCount: Integer;
function GetEntity(ANum: Cardinal): TvEntity;
- function GetEntityCount: Integer;
+ function GetEntitiesCount: Integer;
{ Data removing methods }
procedure Clear;
- procedure RemoveAllPaths;
- procedure RemoveAllTexts;
{ Data writing methods }
- procedure AddPath(APath: TPath);
- procedure StartPath(AX, AY: Double);
+ procedure AddEntity(AEntity: TvEntity);
+ procedure AddPathCopyMem(APath: TPath);
+ procedure StartPath(AX, AY: Double); overload;
+ procedure StartPath(); overload;
+ procedure AddMoveToPath(AX, AY: Double);
procedure AddLineToPath(AX, AY: Double); overload;
+ procedure AddLineToPath(AX, AY: Double; AColor: TFPColor); overload;
procedure AddLineToPath(AX, AY, AZ: Double); overload;
+ procedure GetCurrenPathPenPos(var AX, AY: Double);
procedure AddBezierToPath(AX1, AY1, AX2, AY2, AX3, AY3: Double); overload;
procedure AddBezierToPath(AX1, AY1, AZ1, AX2, AY2, AZ2, AX3, AY3, AZ3: Double); overload;
+ procedure SetBrushColor(AColor: TFPColor);
+ procedure SetBrushStyle(AStyle: TFPBrushStyle);
+ procedure SetPenColor(AColor: TFPColor);
+ procedure SetPenStyle(AStyle: TFPPenStyle);
+ procedure SetPenWidth(AWidth: Integer);
procedure EndPath();
procedure AddText(AX, AY, AZ: Double; FontName: string; FontSize: integer; AText: utf8string); overload;
procedure AddText(AX, AY, AZ: Double; AStr: utf8string); overload;
procedure AddCircle(ACenterX, ACenterY, ACenterZ, ARadius: Double);
- procedure AddCircularArc(ACenterX, ACenterY, ACenterZ, ARadius, AStartAngle, AEndAngle: Double);
+ procedure AddCircularArc(ACenterX, ACenterY, ACenterZ, ARadius, AStartAngle, AEndAngle: Double; AColor: TFPColor);
procedure AddEllipse(CenterX, CenterY, CenterZ, MajorHalfAxis, MinorHalfAxis, Angle: Double);
+ // Dimensions
+ procedure AddAlignedDimension(BaseLeft, BaseRight, DimLeft, DimRight: T3DPoint);
{ properties }
property PathCount: Integer read GetPathCount;
property Paths[Index: Cardinal]: TPath read GetPath;
@@ -272,6 +350,7 @@
procedure RegisterVectorialWriter(
AWriterClass: TvVectorialWriterClass;
AFormat: TvVectorialFormat);
+function Make2DPoint(AX, AY: Double): T3DPoint;
implementation
@@ -362,6 +441,23 @@
end;
end;
+function Make2DPoint(AX, AY: Double): T3DPoint;
+begin
+ Result.X := AX;
+ Result.Y := AY;
+ Result.Z := 0;
+end;
+
+{ TvEntity }
+
+constructor TvEntity.Create;
+begin
+ Pen.Style := psSolid;
+ Pen.Color := colBlack;
+ Brush.Style := bsClear;
+ Brush.Color := colBlue;
+end;
+
{ TvEllipse }
procedure TvEllipse.CalculateBoundingRectangle;
@@ -415,8 +511,6 @@
begin
inherited Create;
- FPaths := TFPList.Create;
- FTexts := TFPList.Create;
FEntities := TFPList.Create;
FTmpPath := TPath.Create;
end;
@@ -428,40 +522,35 @@
begin
Clear;
- FPaths.Free;
- FTexts.Free;
FEntities.Free;
inherited Destroy;
end;
-{@@
- Clears the list of Vectors and releases their memory.
-}
-procedure TvVectorialDocument.RemoveAllPaths;
+procedure TvVectorialDocument.Assign(ASource: TvVectorialDocument);
+var
+ i: Integer;
begin
-// FPaths.ForEachCall(RemoveCallback, nil);
- FPaths.Clear;
+ Clear;
+
+ for i := 0 to ASource.GetEntitiesCount - 1 do
+ Self.AddEntity(ASource.GetEntity(i));
end;
-procedure TvVectorialDocument.RemoveAllTexts;
+procedure TvVectorialDocument.AssignTo(ADest: TvVectorialDocument);
begin
-// FTexts.ForEachCall(RemoveCallback, nil);
- FTexts.Clear;
+ ADest.Assign(Self);
end;
-procedure TvVectorialDocument.AddPath(APath: TPath);
+procedure TvVectorialDocument.AddPathCopyMem(APath: TPath);
var
lPath: TPath;
Len: Integer;
begin
lPath := TPath.Create;
lPath.Assign(APath);
- FPaths.Add(Pointer(lPath));
+ AddEntity(lPath);
//WriteLn(':>TvVectorialDocument.AddPath 1 Len = ', Len);
- //WriteLn(':>TvVectorialDocument.AddPath 2');
- //WriteLn(':>TvVectorialDocument.AddPath 3');
- //WriteLn(':>TvVectorialDocument.AddPath 4');
end;
{@@
@@ -487,6 +576,23 @@
FTmpPath.PointsEnd := segment;
end;
+procedure TvVectorialDocument.StartPath();
+begin
+ ClearTmpPath();
+end;
+
+procedure TvVectorialDocument.AddMoveToPath(AX, AY: Double);
+var
+ segment: T2DSegment;
+begin
+ segment := T2DSegment.Create;
+ segment.SegmentType := stMoveTo;
+ segment.X := AX;
+ segment.Y := AY;
+
+ AppendSegmentToTmpPath(segment);
+end;
+
{@@
Adds one more point to the end of a Path being
writing in multiple steps.
@@ -509,6 +615,19 @@
AppendSegmentToTmpPath(segment);
end;
+procedure TvVectorialDocument.AddLineToPath(AX, AY: Double; AColor: TFPColor);
+var
+ segment: T2DSegmentWithPen;
+begin
+ segment := T2DSegmentWithPen.Create;
+ segment.SegmentType := st2DLineWithPen;
+ segment.X := AX;
+ segment.Y := AY;
+ segment.Pen.Color := AColor;
+
+ AppendSegmentToTmpPath(segment);
+end;
+
procedure TvVectorialDocument.AddLineToPath(AX, AY, AZ: Double);
var
segment: T3DSegment;
@@ -523,6 +642,18 @@
end;
{@@
+ Gets the current Pen Pos in the temporary path
+}
+procedure TvVectorialDocument.GetCurrenPathPenPos(var AX, AY: Double);
+begin
+ // Check if we are the first segment in the tmp path
+ if FTmpPath.PointsEnd = nil then raise Exception.Create('[TvVectorialDocument.GetCurrenPathPenPos] One cannot obtain the Pen Pos if there are no segments in the temporary path');
+
+ AX := T2DSegment(FTmpPath.PointsEnd).X;
+ AY := T2DSegment(FTmpPath.PointsEnd).Y;
+end;
+
+{@@
Adds a bezier element to the path. It starts where the previous element ended
and it goes throw the control points [AX1, AY1] and [AX2, AY2] and ends
in [AX3, AY3].
@@ -564,6 +695,31 @@
AppendSegmentToTmpPath(segment);
end;
+procedure TvVectorialDocument.SetBrushColor(AColor: TFPColor);
+begin
+ FTmPPath.Brush.Color := AColor;
+end;
+
+procedure TvVectorialDocument.SetBrushStyle(AStyle: TFPBrushStyle);
+begin
+ FTmPPath.Brush.Style := AStyle;
+end;
+
+procedure TvVectorialDocument.SetPenColor(AColor: TFPColor);
+begin
+ FTmPPath.Pen.Color := AColor;
+end;
+
+procedure TvVectorialDocument.SetPenStyle(AStyle: TFPPenStyle);
+begin
+ FTmPPath.Pen.Style := AStyle;
+end;
+
+procedure TvVectorialDocument.SetPenWidth(AWidth: Integer);
+begin
+ FTmPPath.Pen.Width := AWidth;
+end;
+
{@@
Finishes writing a Path, which was created in multiple
steps using StartPath and AddPointToPath,
@@ -577,7 +733,7 @@
procedure TvVectorialDocument.EndPath();
begin
if FTmPPath.Len = 0 then Exit;
- AddPath(FTmPPath);
+ AddPathCopyMem(FTmPPath);
ClearTmpPath();
end;
@@ -590,9 +746,9 @@
lText.X := AX;
lText.Y := AY;
lText.Z := AZ;
- lText.FontName := FontName;
- lText.FontSize := FontSize;
- FTexts.Add(lText);
+ lText.Font.Name := FontName;
+ lText.Font.Size := FontSize;
+ AddEntity(lText);
end;
procedure TvVectorialDocument.AddText(AX, AY, AZ: Double; AStr: utf8string);
@@ -609,11 +765,11 @@
lCircle.CenterY := ACenterY;
lCircle.CenterZ := ACenterZ;
lCircle.Radius := ARadius;
- FEntities.Add(lCircle);
+ AddEntity(lCircle);
end;
procedure TvVectorialDocument.AddCircularArc(ACenterX, ACenterY, ACenterZ,
- ARadius, AStartAngle, AEndAngle: Double);
+ ARadius, AStartAngle, AEndAngle: Double; AColor: TFPColor);
var
lCircularArc: TvCircularArc;
begin
@@ -624,7 +780,8 @@
lCircularArc.Radius := ARadius;
lCircularArc.StartAngle := AStartAngle;
lCircularArc.EndAngle := AEndAngle;
- FEntities.Add(lCircularArc);
+ lCircularArc.Pen.Color := AColor;
+ AddEntity(lCircularArc);
end;
procedure TvVectorialDocument.AddEllipse(CenterX, CenterY, CenterZ,
@@ -639,7 +796,28 @@
lEllipse.MajorHalfAxis := MajorHalfAxis;
lEllipse.MinorHalfAxis := MinorHalfAxis;
lEllipse.Angle := Angle;
- FEntities.Add(lEllipse);
+ AddEntity(lEllipse);
+end;
+
+{@@
+ Don't free the passed TvText because it will be added directly to the list
+}
+procedure TvVectorialDocument.AddEntity(AEntity: TvEntity);
+begin
+ FEntities.Add(Pointer(AEntity));
+end;
+
+procedure TvVectorialDocument.AddAlignedDimension(BaseLeft, BaseRight,
+ DimLeft, DimRight: T3DPoint);
+var
+ lDim: TvAlignedDimension;
+begin
+ lDim := TvAlignedDimension.Create;
+ lDim.BaseLeft := BaseLeft;
+ lDim.BaseRight := BaseRight;
+ lDim.DimensionLeft := DimLeft;
+ lDim.DimensionRight := DimRight;
+ AddEntity(lDim);
end;
{@@
@@ -655,12 +833,13 @@
for i := 0 to Length(GvVectorialFormats) - 1 do
if GvVectorialFormats[i].Format = AFormat then
begin
- Result := GvVectorialFormats[i].WriterClass.Create;
+ if GvVectorialFormats[i].WriterClass <> nil then
+ Result := GvVectorialFormats[i].WriterClass.Create;
Break;
end;
- if Result = nil then raise Exception.Create('Unsuported vector graphics format.');
+ if Result = nil then raise Exception.Create('Unsupported vector graphics format.');
end;
{@@
@@ -676,12 +855,13 @@
for i := 0 to Length(GvVectorialFormats) - 1 do
if GvVectorialFormats[i].Format = AFormat then
begin
- Result := GvVectorialFormats[i].ReaderClass.Create;
+ if GvVectorialFormats[i].ReaderClass <> nil then
+ Result := GvVectorialFormats[i].ReaderClass.Create;
Break;
end;
- if Result = nil then raise Exception.Create('Unsuported vector graphics format.');
+ if Result = nil then raise Exception.Create('Unsupported vector graphics format.');
end;
procedure TvVectorialDocument.ClearTmpPath();
@@ -700,14 +880,28 @@
FTmpPath.Points := nil;
FTmpPath.PointsEnd := nil;
FTmpPath.Len := 0;
+ FTmpPath.Brush.Color := colBlue;
+ FTmpPath.Brush.Style := bsClear;
+ FTmpPath.Pen.Color := colBlack;
+ FTmpPath.Pen.Style := psSolid;
+ FTmpPath.Pen.Width := 1;
end;
procedure TvVectorialDocument.AppendSegmentToTmpPath(ASegment: TPathSegment);
var
L: Integer;
begin
+ // Check if we are the first segment in the tmp path
if FTmpPath.PointsEnd = nil then
- Exception.Create('[TvVectorialDocument.AppendSegmentToTmpPath]' + Str_Error_Nil_Path);
+ begin
+ if FTmpPath.Len <> 0 then
+ Exception.Create('[TvVectorialDocument.AppendSegmentToTmpPath]' + Str_Error_Nil_Path);
+
+ FTmpPath.Points := ASegment;
+ FTmpPath.PointsEnd := ASegment;
+ FTmpPath.Len := 1;
+ Exit;
+ end;
L := FTmpPath.Len;
Inc(FTmpPath.Len);
@@ -736,6 +930,14 @@
end;
end;
+procedure TvVectorialDocument.WriteToFile(AFileName: string);
+var
+ lFormat: TvVectorialFormat;
+begin
+ lFormat := GetFormatFromExtension(ExtractFileExt(AFileName));
+ WriteToFile(AFileName, lFormat);
+end;
+
{@@
Writes the document to a stream
}
@@ -787,6 +989,17 @@
end;
{@@
+ Reads the document from a file. A variant that auto-detects the format from the extension.
+}
+procedure TvVectorialDocument.ReadFromFile(AFileName: string);
+var
+ lFormat: TvVectorialFormat;
+begin
+ lFormat := GetFormatFromExtension(ExtractFileExt(AFileName));
+ ReadFromFile(AFileName, lFormat);
+end;
+
+{@@
Reads the document from a stream.
Any current contents will be removed.
@@ -832,6 +1045,8 @@
else if AnsiCompareText(lExt, STR_SVG_EXTENSION) = 0 then Result := vfSVG
else if AnsiCompareText(lExt, STR_CORELDRAW_EXTENSION) = 0 then Result := vfCorelDrawCDR
else if AnsiCompareText(lExt, STR_WINMETAFILE_EXTENSION) = 0 then Result := vfWindowsMetafileWMF
+ else if AnsiCompareText(lExt, STR_AUTOCAD_EXCHANGE_EXTENSION) = 0 then Result := vfDXF
+ else if AnsiCompareText(lExt, STR_ENCAPSULATEDPOSTSCRIPT_EXTENSION) = 0 then Result := vfEncapsulatedPostScript
else
raise Exception.Create('TvVectorialDocument.GetFormatFromExtension: The extension (' + lExt + ') doesn''t match any supported formats.');
end;
@@ -842,31 +1057,32 @@
end;
function TvVectorialDocument.GetPath(ANum: Cardinal): TPath;
+var
+ i: Integer;
+ Index: Integer = - 1;
begin
- if ANum >= FPaths.Count then raise Exception.Create('TvVectorialDocument.GetPath: Path number out of bounds');
+ Result := nil;
- if FPaths.Items[ANum] = nil then raise Exception.Create('TvVectorialDocument.GetPath: Invalid Path number');
+ if ANum >= FEntities.Count then raise Exception.Create('TvVectorialDocument.GetPath: Path number out of bounds');
- Result := TPath(FPaths.Items[ANum]);
+ for i := 0 to FEntities.Count - 1 do
+ begin
+ if TvEntity(FEntities.Items[i]) is TPath then
+ begin
+ Inc(Index);
+ if Index = ANum then Result := TPath(FEntities.Items[i]);
+ end;
+ end;
end;
function TvVectorialDocument.GetPathCount: Integer;
+var
+ i: Integer;
begin
- Result := FPaths.Count;
-end;
-
-function TvVectorialDocument.GetText(ANum: Cardinal): TvText;
-begin
- if ANum >= FTexts.Count then raise Exception.Create('TvVectorialDocument.GetText: Text number out of bounds');
+ Result := 0;
- if FTexts.Items[ANum] = nil then raise Exception.Create('TvVectorialDocument.GetText: Invalid Text number');
-
- Result := TvText(FTexts.Items[ANum]);
-end;
-
-function TvVectorialDocument.GetTextCount: Integer;
-begin
- Result := FTexts.Count;
+ for i := 0 to FEntities.Count - 1 do
+ if TvEntity(FEntities.Items[i]) is TPath then Inc(Result);
end;
function TvVectorialDocument.GetEntity(ANum: Cardinal): TvEntity;
@@ -878,7 +1094,7 @@
Result := TvEntity(FEntities.Items[ANum]);
end;
-function TvVectorialDocument.GetEntityCount: Integer;
+function TvVectorialDocument.GetEntitiesCount: Integer;
begin
Result := FEntities.Count;
end;
@@ -888,8 +1104,7 @@
}
procedure TvVectorialDocument.Clear;
begin
- RemoveAllPaths();
- RemoveAllTexts();
+ FEntities.Clear();
end;
{ TvCustomVectorialReader }
@@ -1000,17 +1215,14 @@
{ TPath }
-procedure TPath.Assign(APath: TPath);
+procedure TPath.Assign(ASource: TPath);
begin
- Len := APath.Len;
- Points := APath.Points;
- PointsEnd := APath.PointsEnd;
- CurPoint := APath.CurPoint;
-end;
-
-function TPath.Count(): TPathSegment;
-begin
-
+ Len := ASource.Len;
+ Points := ASource.Points;
+ PointsEnd := ASource.PointsEnd;
+ CurPoint := ASource.CurPoint;
+ Pen := ASource.Pen;
+ Brush := ASource.Brush;
end;
procedure TPath.PrepareForSequentialReading;

540
graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_fpvtocanvas.pas
View file

@ -1,540 +0,0 @@
--- packages/fpvectorial/src/fpvtocanvas.pas 2011/01/30 15:51:36 16850
+++ packages/fpvectorial/src/fpvtocanvas.pas 2011/06/17 09:52:19 17765
@@ -10,21 +10,30 @@
Classes, SysUtils, Math,
{$ifdef USE_LCL_CANVAS}
Graphics, LCLIntf,
- {$else}
- fpcanvas,
{$endif}
+ fpcanvas,
+ fpimage,
fpvectorial;
procedure DrawFPVectorialToCanvas(ASource: TvVectorialDocument;
- {$ifdef USE_LCL_CANVAS}
- ADest: TCanvas;
- {$else}
ADest: TFPCustomCanvas;
- {$endif}
+ ADestX: Integer = 0; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0);
+procedure DrawFPVPathToCanvas(ASource: TvVectorialDocument; CurPath: TPath;
+ ADest: TFPCustomCanvas;
+ ADestX: Integer = 0; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0);
+procedure DrawFPVEntityToCanvas(ASource: TvVectorialDocument; CurEntity: TvEntity;
+ ADest: TFPCustomCanvas;
+ ADestX: Integer = 0; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0);
+procedure DrawFPVTextToCanvas(ASource: TvVectorialDocument; CurText: TvText;
+ ADest: TFPCustomCanvas;
ADestX: Integer = 0; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0);
implementation
+{$ifndef Windows}
+{$define FPVECTORIALDEBUG}
+{$endif}
+
function Rotate2DPoint(P,Fix :TPoint; alpha:double): TPoint;
var
sinus, cosinus : Extended;
@@ -37,17 +46,16 @@
end;
procedure DrawRotatedEllipse(
- {$ifdef USE_LCL_CANVAS}
- ADest: TCanvas;
- {$else}
ADest: TFPCustomCanvas;
- {$endif}
CurEllipse: TvEllipse;
ADestX: Integer = 0; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0);
var
PointList: array[0..6] of TPoint;
f: TPoint;
dk, x1, x2, y1, y2: Integer;
+ {$ifdef USE_LCL_CANVAS}
+ ALCLDest: TCanvas absolute ADest;
+ {$endif}
begin
{$ifdef USE_LCL_CANVAS}
CurEllipse.CalculateBoundingRectangle();
@@ -72,7 +80,7 @@
// Conrollpoint of secondpart endpoint
PointList[6] := PointList[0]; // Endpoint of
// Back to the startpoint
- ADest.PolyBezier(Pointlist[0]);
+ ALCLDest.PolyBezier(Pointlist[0]);
{$endif}
end;
@@ -90,15 +98,48 @@
DrawFPVectorialToCanvas(ASource, ADest, 0, ASource.Height, 1.0, -1.0);
}
+{.$define FPVECTORIAL_TOCANVAS_DEBUG}
procedure DrawFPVectorialToCanvas(ASource: TvVectorialDocument;
- {$ifdef USE_LCL_CANVAS}
- ADest: TCanvas;
- {$else}
ADest: TFPCustomCanvas;
+ ADestX: Integer = 0; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0);
+var
+ i: Integer;
+ CurEntity: TvEntity;
+begin
+ {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
+ WriteLn(':>DrawFPVectorialToCanvas');
+ {$endif}
+
+ for i := 0 to ASource.GetEntitiesCount - 1 do
+ begin
+ CurEntity := ASource.GetEntity(i);
+
+ if CurEntity is TPath then DrawFPVPathToCanvas(ASource, TPath(CurEntity), ADest, ADestX, ADestY, AMulX, AMulY)
+ else if CurEntity is TvText then DrawFPVTextToCanvas(ASource, TvText(CurEntity), ADest, ADestX, ADestY, AMulX, AMulY)
+ else DrawFPVEntityToCanvas(ASource, CurEntity, ADest, ADestX, ADestY, AMulX, AMulY);
+ end;
+
+ {$ifdef FPVECTORIALDEBUG}
+ WriteLn(':<DrawFPVectorialToCanvas');
{$endif}
+end;
+
+procedure DrawFPVPathToCanvas(ASource: TvVectorialDocument; CurPath: TPath;
+ ADest: TFPCustomCanvas;
ADestX: Integer = 0; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0);
+
+ function CoordToCanvasX(ACoord: Double): Integer;
+ begin
+ Result := Round(ADestX + AmulX * ACoord);
+ end;
+
+ function CoordToCanvasY(ACoord: Double): Integer;
+ begin
+ Result := Round(ADestY + AmulY * ACoord);
+ end;
+
var
- i, j, k: Integer;
+ j, k: Integer;
PosX, PosY: Integer; // Not modified by ADestX, etc
CurSegment: TPathSegment;
Cur2DSegment: T2DSegment absolute CurSegment;
@@ -107,123 +148,327 @@
CurX, CurY: Integer; // Not modified by ADestX, etc
CurveLength: Integer;
t: Double;
- // For text
- CurText: TvText;
- // For entities
- CurEntity: TvEntity;
- CurCircle: TvCircle;
- CurEllipse: TvEllipse;
- CurArc: TvCircularArc;
begin
- {$ifdef FPVECTORIALDEBUG}
- WriteLn(':>DrawFPVectorialToCanvas');
- {$endif}
-
PosX := 0;
PosY := 0;
+ ADest.Brush.Style := bsClear;
ADest.MoveTo(ADestX, ADestY);
- // Draws all paths
- for i := 0 to ASource.PathCount - 1 do
+ CurPath.PrepareForSequentialReading;
+
+ // Set the path Pen and Brush options
+ ADest.Pen.Style := CurPath.Pen.Style;
+ ADest.Pen.Width := CurPath.Pen.Width;
+ ADest.Brush.Style := CurPath.Brush.Style;
+ ADest.Pen.FPColor := CurPath.Pen.Color;
+ ADest.Brush.FPColor := CurPath.Brush.Color;
+
+ {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
+ Write(Format('[Path] ID=%d', [i]));
+ {$endif}
+
+ for j := 0 to CurPath.Len - 1 do
begin
- //WriteLn('i = ', i);
- ASource.Paths[i].PrepareForSequentialReading;
+ //WriteLn('j = ', j);
+ CurSegment := TPathSegment(CurPath.Next());
- for j := 0 to ASource.Paths[i].Len - 1 do
+ case CurSegment.SegmentType of
+ stMoveTo:
+ begin
+ ADest.MoveTo(CoordToCanvasX(Cur2DSegment.X), CoordToCanvasY(Cur2DSegment.Y));
+ {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
+ Write(Format(' M%d,%d', [CoordToCanvasX(Cur2DSegment.X), CoordToCanvasY(Cur2DSegment.Y)]));
+ {$endif}
+ end;
+ // This element can override temporarely the Pen
+ st2DLineWithPen:
begin
- //WriteLn('j = ', j);
- CurSegment := TPathSegment(ASource.Paths[i].Next());
+ ADest.Pen.FPColor := T2DSegmentWithPen(Cur2DSegment).Pen.Color;
- case CurSegment.SegmentType of
- stMoveTo:
- begin
- ADest.MoveTo(
- Round(ADestX + AMulX * Cur2DSegment.X),
- Round(ADestY + AMulY * Cur2DSegment.Y)
- );
- end;
- st2DLine, st3DLine:
- begin
- ADest.LineTo(
- Round(ADestX + AMulX * Cur2DSegment.X),
- Round(ADestY + AMulY * Cur2DSegment.Y)
- );
- end;
- { To draw a bezier we need to divide the interval in parts and make
- lines between this parts }
- st2DBezier, st3DBezier:
+ ADest.LineTo(CoordToCanvasX(Cur2DSegment.X), CoordToCanvasY(Cur2DSegment.Y));
+
+ ADest.Pen.FPColor := CurPath.Pen.Color;
+
+ {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
+ Write(Format(' L%d,%d', [CoordToCanvasX(Cur2DSegment.X), CoordToCanvasY(Cur2DSegment.Y)]));
+ {$endif}
+ end;
+ st2DLine, st3DLine:
+ begin
+ ADest.LineTo(CoordToCanvasX(Cur2DSegment.X), CoordToCanvasY(Cur2DSegment.Y));
+ {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
+ Write(Format(' L%d,%d', [CoordToCanvasX(Cur2DSegment.X), CoordToCanvasY(Cur2DSegment.Y)]));
+ {$endif}
+ end;
+ { To draw a bezier we need to divide the interval in parts and make
+ lines between this parts }
+ st2DBezier, st3DBezier:
+ begin
+ CurveLength :=
+ Round(sqrt(sqr(Cur2DBSegment.X3 - PosX) + sqr(Cur2DBSegment.Y3 - PosY))) +
+ Round(sqrt(sqr(Cur2DBSegment.X2 - Cur2DBSegment.X3) + sqr(Cur2DBSegment.Y2 - Cur2DBSegment.Y3))) +
+ Round(sqrt(sqr(Cur2DBSegment.X - Cur2DBSegment.X3) + sqr(Cur2DBSegment.Y - Cur2DBSegment.Y3)));
+
+ for k := 1 to CurveLength do
begin
- CurveLength :=
- Round(sqrt(sqr(Cur2DBSegment.X3 - PosX) + sqr(Cur2DBSegment.Y3 - PosY))) +
- Round(sqrt(sqr(Cur2DBSegment.X2 - Cur2DBSegment.X3) + sqr(Cur2DBSegment.Y2 - Cur2DBSegment.Y3))) +
- Round(sqrt(sqr(Cur2DBSegment.X - Cur2DBSegment.X3) + sqr(Cur2DBSegment.Y - Cur2DBSegment.Y3)));
-
- for k := 1 to CurveLength do
- begin
- t := k / CurveLength;
- CurX := Round(sqr(1 - t) * (1 - t) * PosX + 3 * t * sqr(1 - t) * Cur2DBSegment.X2 + 3 * t * t * (1 - t) * Cur2DBSegment.X3 + t * t * t * Cur2DBSegment.X);
- CurY := Round(sqr(1 - t) * (1 - t) * PosY + 3 * t * sqr(1 - t) * Cur2DBSegment.Y2 + 3 * t * t * (1 - t) * Cur2DBSegment.Y3 + t * t * t * Cur2DBSegment.Y);
- ADest.LineTo(
- Round(ADestX + AMulX * CurX),
- Round(ADestY + AMulY * CurY));
- end;
- PosX := Round(Cur2DBSegment.X);
- PosY := Round(Cur2DBSegment.Y);
- end;
+ t := k / CurveLength;
+ CurX := Round(sqr(1 - t) * (1 - t) * PosX + 3 * t * sqr(1 - t) * Cur2DBSegment.X2 + 3 * t * t * (1 - t) * Cur2DBSegment.X3 + t * t * t * Cur2DBSegment.X);
+ CurY := Round(sqr(1 - t) * (1 - t) * PosY + 3 * t * sqr(1 - t) * Cur2DBSegment.Y2 + 3 * t * t * (1 - t) * Cur2DBSegment.Y3 + t * t * t * Cur2DBSegment.Y);
+ ADest.LineTo(CoordToCanvasX(CurX), CoordToCanvasY(CurY));
end;
+ PosX := Round(Cur2DBSegment.X);
+ PosY := Round(Cur2DBSegment.Y);
+ end;
end;
end;
+ {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
+ WriteLn('');
+ {$endif}
+end;
+
+procedure DrawFPVEntityToCanvas(ASource: TvVectorialDocument; CurEntity: TvEntity;
+ ADest: TFPCustomCanvas;
+ ADestX: Integer = 0; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0);
- // Draws all entities
- for i := 0 to ASource.GetEntityCount - 1 do
+ function CoordToCanvasX(ACoord: Double): Integer;
begin
- CurEntity := ASource.GetEntity(i);
- if CurEntity is TvCircle then
+ Result := Round(ADestX + AmulX * ACoord);
+ end;
+
+ function CoordToCanvasY(ACoord: Double): Integer;
+ begin
+ Result := Round(ADestY + AmulY * ACoord);
+ end;
+
+var
+ i: Integer;
+ {$ifdef USE_LCL_CANVAS}
+ ALCLDest: TCanvas;
+ {$endif}
+ // For entities
+ CurCircle: TvCircle;
+ CurEllipse: TvEllipse;
+ //
+ CurArc: TvCircularArc;
+ FinalStartAngle, FinalEndAngle: double;
+ BoundsLeft, BoundsTop, BoundsRight, BoundsBottom,
+ IntStartAngle, IntAngleLength, IntTmp: Integer;
+ //
+ CurDim: TvAlignedDimension;
+ Points: array of TPoint;
+ UpperDim, LowerDim: T3DPoint;
+begin
+ {$ifdef USE_LCL_CANVAS}
+ ALCLDest := TCanvas(ADest);
+ {$endif}
+
+ ADest.Brush.Style := CurEntity.Brush.Style;
+ ADest.Pen.Style := CurEntity.Pen.Style;
+ ADest.Pen.FPColor := CurEntity.Pen.Color;
+ ADest.Brush.FPColor := CurEntity.Brush.Color;
+
+ if CurEntity is TvCircle then
+ begin
+ CurCircle := CurEntity as TvCircle;
+ ADest.Ellipse(
+ CoordToCanvasX(CurCircle.CenterX - CurCircle.Radius),
+ CoordToCanvasY(CurCircle.CenterY - CurCircle.Radius),
+ CoordToCanvasX(CurCircle.CenterX + CurCircle.Radius),
+ CoordToCanvasY(CurCircle.CenterY + CurCircle.Radius)
+ );
+ end
+ else if CurEntity is TvEllipse then
+ begin
+ CurEllipse := CurEntity as TvEllipse;
+ DrawRotatedEllipse(ADest, CurEllipse);
+ end
+ else if CurEntity is TvCircularArc then
+ begin
+ CurArc := CurEntity as TvCircularArc;
+ {$ifdef USE_LCL_CANVAS}
+ // ToDo: Consider a X axis inversion
+ // If the Y axis is inverted, then we need to mirror our angles as well
+ BoundsLeft := CoordToCanvasX(CurArc.CenterX - CurArc.Radius);
+ BoundsTop := CoordToCanvasY(CurArc.CenterY - CurArc.Radius);
+ BoundsRight := CoordToCanvasX(CurArc.CenterX + CurArc.Radius);
+ BoundsBottom := CoordToCanvasY(CurArc.CenterY + CurArc.Radius);
+ {if AMulY > 0 then
+ begin}
+ FinalStartAngle := CurArc.StartAngle;
+ FinalEndAngle := CurArc.EndAngle;
+ {end
+ else // AMulY is negative
begin
- CurCircle := CurEntity as TvCircle;
- ADest.Ellipse(
- Round(ADestX + AmulX * (CurCircle.CenterX - CurCircle.Radius)),
- Round(ADestY + AMulY * (CurCircle.CenterY - CurCircle.Radius)),
- Round(ADestX + AmulX * (CurCircle.CenterX + CurCircle.Radius)),
- Round(ADestY + AMulY * (CurCircle.CenterY + CurCircle.Radius))
- );
- end
- else if CurEntity is TvEllipse then
+ // Inverting the angles generates the correct result for Y axis inversion
+ if CurArc.EndAngle = 0 then FinalStartAngle := 0
+ else FinalStartAngle := 360 - 1* CurArc.EndAngle;
+ if CurArc.StartAngle = 0 then FinalEndAngle := 0
+ else FinalEndAngle := 360 - 1* CurArc.StartAngle;
+ end;}
+ IntStartAngle := Round(16*FinalStartAngle);
+ IntAngleLength := Round(16*(FinalEndAngle - FinalStartAngle));
+ // On Gtk2 and Carbon, the Left really needs to be to the Left of the Right position
+ // The same for the Top and Bottom
+ // On Windows it works fine either way
+ // On Gtk2 if the positions are inverted then the arcs are screwed up
+ // In Carbon if the positions are inverted, then the arc is inverted
+ if BoundsLeft > BoundsRight then
+ begin
+ IntTmp := BoundsLeft;
+ BoundsLeft := BoundsRight;
+ BoundsRight := IntTmp;
+ end;
+ if BoundsTop > BoundsBottom then
+ begin
+ IntTmp := BoundsTop;
+ BoundsTop := BoundsBottom;
+ BoundsBottom := IntTmp;
+ end;
+ // Arc(ALeft, ATop, ARight, ABottom, Angle16Deg, Angle16DegLength: Integer);
+ {$ifdef FPVECTORIALDEBUG}
+ WriteLn(Format('Drawing Arc Center=%f,%f Radius=%f StartAngle=%f AngleLength=%f',
+ [CurArc.CenterX, CurArc.CenterY, CurArc.Radius, IntStartAngle/16, IntAngleLength/16]));
+ {$endif}
+ ADest.Pen.FPColor := CurArc.Pen.Color;
+ ALCLDest.Arc(
+ BoundsLeft, BoundsTop, BoundsRight, BoundsBottom,
+ IntStartAngle, IntAngleLength
+ );
+ ADest.Pen.FPColor := colBlack;
+ // Debug info
+// {$define FPVECTORIALDEBUG}
+// {$ifdef FPVECTORIALDEBUG}
+// WriteLn(Format('Drawing Arc x1y1=%d,%d x2y2=%d,%d start=%d end=%d',
+// [BoundsLeft, BoundsTop, BoundsRight, BoundsBottom, IntStartAngle, IntAngleLength]));
+// {$endif}
+{ ADest.TextOut(CoordToCanvasX(CurArc.CenterX), CoordToCanvasY(CurArc.CenterY),
+ Format('R=%d S=%d L=%d', [Round(CurArc.Radius*AMulX), Round(FinalStartAngle),
+ Abs(Round((FinalEndAngle - FinalStartAngle)))]));
+ ADest.Pen.Color := TColor($DDDDDD);
+ ADest.Rectangle(
+ BoundsLeft, BoundsTop, BoundsRight, BoundsBottom);
+ ADest.Pen.Color := clBlack;}
+ {$endif}
+ end
+ else if CurEntity is TvAlignedDimension then
+ begin
+ CurDim := CurEntity as TvAlignedDimension;
+ //
+ // Draws this shape:
+ // vertical horizontal
+ // ___
+ // | | or ---| X cm
+ // | --|
+ // Which marks the dimension
+ ADest.MoveTo(CoordToCanvasX(CurDim.BaseRight.X), CoordToCanvasY(CurDim.BaseRight.Y));
+ ADest.LineTo(CoordToCanvasX(CurDim.DimensionRight.X), CoordToCanvasY(CurDim.DimensionRight.Y));
+ ADest.LineTo(CoordToCanvasX(CurDim.DimensionLeft.X), CoordToCanvasY(CurDim.DimensionLeft.Y));
+ ADest.LineTo(CoordToCanvasX(CurDim.BaseLeft.X), CoordToCanvasY(CurDim.BaseLeft.Y));
+ // Now the arrows
+ // horizontal
+ SetLength(Points, 3);
+ if CurDim.DimensionRight.Y = CurDim.DimensionLeft.Y then
begin
- CurEllipse := CurEntity as TvEllipse;
- DrawRotatedEllipse(ADest, CurEllipse);
+ ADest.Brush.FPColor := colBlack;
+ ADest.Brush.Style := bsSolid;
+ // Left arrow
+ Points[0] := Point(CoordToCanvasX(CurDim.DimensionLeft.X), CoordToCanvasY(CurDim.DimensionLeft.Y));
+ Points[1] := Point(Points[0].X + 7, Points[0].Y - 3);
+ Points[2] := Point(Points[0].X + 7, Points[0].Y + 3);
+ ADest.Polygon(Points);
+ // Right arrow
+ Points[0] := Point(CoordToCanvasX(CurDim.DimensionRight.X), CoordToCanvasY(CurDim.DimensionRight.Y));
+ Points[1] := Point(Points[0].X - 7, Points[0].Y - 3);
+ Points[2] := Point(Points[0].X - 7, Points[0].Y + 3);
+ ADest.Polygon(Points);
+ ADest.Brush.Style := bsClear;
+ // Dimension text
+ Points[0].X := CoordToCanvasX((CurDim.DimensionLeft.X+CurDim.DimensionRight.X)/2);
+ Points[0].Y := CoordToCanvasY(CurDim.DimensionLeft.Y);
+ LowerDim.X := CurDim.DimensionRight.X-CurDim.DimensionLeft.X;
+ ADest.Font.Size := 10;
+ ADest.TextOut(Points[0].X, Points[0].Y, Format('%.1f', [LowerDim.X]));
end
- else if CurEntity is TvCircularArc then
+ else
begin
- CurArc := CurEntity as TvCircularArc;
- {$ifdef USE_LCL_CANVAS}
- // Arc(ALeft, ATop, ARight, ABottom, Angle16Deg, Angle16DegLength: Integer);
- ADest.Arc(
- Round(ADestX + AmulX * (CurArc.CenterX - CurArc.Radius)),
- Round(ADestY + AmulY * (CurArc.CenterY - CurArc.Radius)),
- Round(ADestX + AmulX * (CurArc.CenterX + CurArc.Radius)),
- Round(ADestY + AmulY * (CurArc.CenterY + CurArc.Radius)),
- Round(16*CurArc.StartAngle),
- Round(16*CurArc.EndAngle - CurArc.StartAngle)
- );
- {$endif}
+ ADest.Brush.FPColor := colBlack;
+ ADest.Brush.Style := bsSolid;
+ // There is no upper/lower preference for DimensionLeft/Right, so we need to check
+ if CurDim.DimensionLeft.Y > CurDim.DimensionRight.Y then
+ begin
+ UpperDim := CurDim.DimensionLeft;
+ LowerDim := CurDim.DimensionRight;
+ end
+ else
+ begin
+ UpperDim := CurDim.DimensionRight;
+ LowerDim := CurDim.DimensionLeft;
+ end;
+ // Upper arrow
+ Points[0] := Point(CoordToCanvasX(UpperDim.X), CoordToCanvasY(UpperDim.Y));
+ Points[1] := Point(Points[0].X + Round(AMulX), Points[0].Y - Round(AMulY*3));
+ Points[2] := Point(Points[0].X - Round(AMulX), Points[0].Y - Round(AMulY*3));
+ ADest.Polygon(Points);
+ // Lower arrow
+ Points[0] := Point(CoordToCanvasX(LowerDim.X), CoordToCanvasY(LowerDim.Y));
+ Points[1] := Point(Points[0].X + Round(AMulX), Points[0].Y + Round(AMulY*3));
+ Points[2] := Point(Points[0].X - Round(AMulX), Points[0].Y + Round(AMulY*3));
+ ADest.Polygon(Points);
+ ADest.Brush.Style := bsClear;
+ // Dimension text
+ Points[0].X := CoordToCanvasX(CurDim.DimensionLeft.X);
+ Points[0].Y := CoordToCanvasY((CurDim.DimensionLeft.Y+CurDim.DimensionRight.Y)/2);
+ LowerDim.Y := CurDim.DimensionRight.Y-CurDim.DimensionLeft.Y;
+ if LowerDim.Y < 0 then LowerDim.Y := -1 * LowerDim.Y;
+ ADest.Font.Size := 10;
+ ADest.TextOut(Points[0].X, Points[0].Y, Format('%.1f', [LowerDim.Y]));
end;
+ SetLength(Points, 0);
+{ // Debug info
+ ADest.TextOut(CoordToCanvasX(CurDim.BaseRight.X), CoordToCanvasY(CurDim.BaseRight.Y), 'BR');
+ ADest.TextOut(CoordToCanvasX(CurDim.DimensionRight.X), CoordToCanvasY(CurDim.DimensionRight.Y), 'DR');
+ ADest.TextOut(CoordToCanvasX(CurDim.DimensionLeft.X), CoordToCanvasY(CurDim.DimensionLeft.Y), 'DL');
+ ADest.TextOut(CoordToCanvasX(CurDim.BaseLeft.X), CoordToCanvasY(CurDim.BaseLeft.Y), 'BL');}
end;
+end;
- // Draws all text
- for i := 0 to ASource.GetTextCount - 1 do
+procedure DrawFPVTextToCanvas(ASource: TvVectorialDocument; CurText: TvText;
+ ADest: TFPCustomCanvas;
+ ADestX: Integer = 0; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0);
+
+ function CoordToCanvasX(ACoord: Double): Integer;
begin
- CurText := ASource.GetText(i);
- ADest.Font.Height := Round(AmulY * CurText.FontSize);
- ADest.Pen.Style := psSolid;
- ADest.Pen.Color := clBlack;
- ADest.TextOut(Round(CurText.X), Round(CurText.Y), CurText.Value);
+ Result := Round(ADestX + AmulX * ACoord);
end;
- {$ifdef FPVECTORIALDEBUG}
- WriteLn(':<DrawFPVectorialToCanvas');
+ function CoordToCanvasY(ACoord: Double): Integer;
+ begin
+ Result := Round(ADestY + AmulY * ACoord);
+ end;
+
+var
+ i: Integer;
+ {$ifdef USE_LCL_CANVAS}
+ ALCLDest: TCanvas;
{$endif}
+ //
+ LowerDim: T3DPoint;
+begin
+ {$ifdef USE_LCL_CANVAS}
+ ALCLDest := TCanvas(ADest);
+ {$endif}
+
+ ADest.Font.Size := Round(AmulX * CurText.Font.Size);
+ ADest.Pen.Style := psSolid;
+ ADest.Pen.FPColor := colBlack;
+ ADest.Brush.Style := bsClear;
+ {$ifdef USE_LCL_CANVAS}
+ ALCLDest.Font.Orientation := Round(CurText.Font.Orientation * 16);
+ {$endif}
+
+ LowerDim.Y := CurText.Y + CurText.Font.Size;
+ ADest.TextOut(CoordToCanvasX(CurText.X), CoordToCanvasY(LowerDim.Y), CurText.Value);
end;
end.

273
graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_svgvectorialwriter.pas
View file

@ -1,273 +0,0 @@
--- packages/fpvectorial/src/svgvectorialwriter.pas 2011/01/14 14:45:03 16765
+++ packages/fpvectorial/src/svgvectorialwriter.pas 2011/06/17 09:52:19 17765
@@ -13,7 +13,7 @@
interface
uses
- Classes, SysUtils, math, fpvectorial;
+ Classes, SysUtils, math, fpvectorial, fpvutils, fpcanvas;
type
{ TvSVGVectorialWriter }
@@ -23,8 +23,9 @@
FPointSeparator, FCommaSeparator: TFormatSettings;
procedure WriteDocumentSize(AStrings: TStrings; AData: TvVectorialDocument);
procedure WriteDocumentName(AStrings: TStrings; AData: TvVectorialDocument);
- procedure WritePaths(AStrings: TStrings; AData: TvVectorialDocument);
- procedure WriteTexts(AStrings: TStrings; AData: TvVectorialDocument);
+ procedure WritePath(AIndex: Integer; APath: TPath; AStrings: TStrings; AData: TvVectorialDocument);
+ procedure WriteText(AStrings: TStrings; lText: TvText; AData: TvVectorialDocument);
+ procedure WriteEntities(AStrings: TStrings; AData: TvVectorialDocument);
procedure ConvertFPVCoordinatesToSVGCoordinates(
const AData: TvVectorialDocument;
const ASrcX, ASrcY: Double; var ADestX, ADestY: double);
@@ -74,90 +75,106 @@
SVG uses commas "," to separate the X,Y coordinates, so it always uses points
"." as decimal separators and uses no thousand separators
}
-procedure TvSVGVectorialWriter.WritePaths(AStrings: TStrings; AData: TvVectorialDocument);
+procedure TvSVGVectorialWriter.WritePath(AIndex: Integer; APath: TPath; AStrings: TStrings;
+ AData: TvVectorialDocument);
var
- i, j: Integer;
+ j: Integer;
PathStr: string;
- lPath: TPath;
PtX, PtY, OldPtX, OldPtY: double;
BezierCP1X, BezierCP1Y, BezierCP2X, BezierCP2Y: double;
segment: TPathSegment;
l2DSegment: T2DSegment absolute segment;
l2DBSegment: T2DBezierSegment absolute segment;
+ // Pen properties
+ lPenWidth: Integer;
+ lPenColor: string;
+ // Brush properties
+ lFillColor: string;
begin
- for i := 0 to AData.GetPathCount() - 1 do
- begin
- OldPtX := 0;
- OldPtY := 0;
+ OldPtX := 0;
+ OldPtY := 0;
+ PathStr := '';
- PathStr := '';
- lPath := AData.GetPath(i);
- lPath.PrepareForSequentialReading;
+ APath.PrepareForSequentialReading();
- for j := 0 to lPath.Len - 1 do
- begin
- segment := TPathSegment(lPath.Next());
+ for j := 0 to APath.Len - 1 do
+ begin
+ segment := TPathSegment(APath.Next());
+
+ if (segment.SegmentType <> st2DLine)
+ and (segment.SegmentType <> stMoveTo)
+ and (segment.SegmentType <> st2DBezier)
+ then Break; // unsupported line type
- if (segment.SegmentType <> st2DLine)
- and (segment.SegmentType <> stMoveTo)
- and (segment.SegmentType <> st2DBezier)
- then Break; // unsupported line type
+ // Coordinate conversion from fpvectorial to SVG
+ ConvertFPVCoordinatesToSVGCoordinates(
+ AData, l2DSegment.X, l2DSegment.Y, PtX, PtY);
+ PtX := PtX - OldPtX;
+ PtY := PtY - OldPtY;
- // Coordinate conversion from fpvectorial to SVG
+ if (segment.SegmentType = stMoveTo) then
+ begin
+ PathStr := PathStr + 'm '
+ + FloatToStr(PtX, FPointSeparator) + ','
+ + FloatToStr(PtY, FPointSeparator) + ' ';
+ end
+ else if (segment.SegmentType = st2DLine) then
+ begin
+ PathStr := PathStr + 'l '
+ + FloatToStr(PtX, FPointSeparator) + ','
+ + FloatToStr(PtY, FPointSeparator) + ' ';
+ end
+ else if (segment.SegmentType = st2DBezier) then
+ begin
+ // Converts all coordinates to absolute values
ConvertFPVCoordinatesToSVGCoordinates(
- AData, l2DSegment.X, l2DSegment.Y, PtX, PtY);
- PtX := PtX - OldPtX;
- PtY := PtY - OldPtY;
-
- if (segment.SegmentType = stMoveTo) then
- begin
- PathStr := PathStr + 'm '
- + FloatToStr(PtX, FPointSeparator) + ','
- + FloatToStr(PtY, FPointSeparator) + ' ';
- end
- else if (segment.SegmentType = st2DLine) then
- begin
- PathStr := PathStr + 'l '
- + FloatToStr(PtX, FPointSeparator) + ','
- + FloatToStr(PtY, FPointSeparator) + ' ';
- end
- else if (segment.SegmentType = st2DBezier) then
- begin
- // Converts all coordinates to absolute values
- ConvertFPVCoordinatesToSVGCoordinates(
- AData, l2DBSegment.X2, l2DBSegment.Y2, BezierCP1X, BezierCP1Y);
- ConvertFPVCoordinatesToSVGCoordinates(
- AData, l2DBSegment.X3, l2DBSegment.Y3, BezierCP2X, BezierCP2Y);
-
- // Transforms them into values relative to the initial point
- BezierCP1X := BezierCP1X - OldPtX;
- BezierCP1Y := BezierCP1Y - OldPtY;
- BezierCP2X := BezierCP2X - OldPtX;
- BezierCP2Y := BezierCP2Y - OldPtY;
-
- // PtX and PtY already contains the destination point
-
- // Now render our 2D cubic bezier
- PathStr := PathStr + 'c '
- + FloatToStr(BezierCP1X, FPointSeparator) + ','
- + FloatToStr(BezierCP1Y, FPointSeparator) + ' '
- + FloatToStr(BezierCP2X, FPointSeparator) + ','
- + FloatToStr(BezierCP2Y, FPointSeparator) + ' '
- + FloatToStr(PtX, FPointSeparator) + ','
- + FloatToStr(PtY, FPointSeparator) + ' '
- ;
- end;
-
- // Store the current position for future points
- OldPtX := OldPtX + PtX;
- OldPtY := OldPtY + PtY;
+ AData, l2DBSegment.X2, l2DBSegment.Y2, BezierCP1X, BezierCP1Y);
+ ConvertFPVCoordinatesToSVGCoordinates(
+ AData, l2DBSegment.X3, l2DBSegment.Y3, BezierCP2X, BezierCP2Y);
+
+ // Transforms them into values relative to the initial point
+ BezierCP1X := BezierCP1X - OldPtX;
+ BezierCP1Y := BezierCP1Y - OldPtY;
+ BezierCP2X := BezierCP2X - OldPtX;
+ BezierCP2Y := BezierCP2Y - OldPtY;
+
+ // PtX and PtY already contains the destination point
+
+ // Now render our 2D cubic bezier
+ PathStr := PathStr + 'c '
+ + FloatToStr(BezierCP1X, FPointSeparator) + ','
+ + FloatToStr(BezierCP1Y, FPointSeparator) + ' '
+ + FloatToStr(BezierCP2X, FPointSeparator) + ','
+ + FloatToStr(BezierCP2Y, FPointSeparator) + ' '
+ + FloatToStr(PtX, FPointSeparator) + ','
+ + FloatToStr(PtY, FPointSeparator) + ' '
+ ;
end;
- AStrings.Add(' <path');
- AStrings.Add(' style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"');
- AStrings.Add(' d="' + PathStr + '"');
- AStrings.Add(' id="path' + IntToStr(i) + '" />');
+ // Store the current position for future points
+ OldPtX := OldPtX + PtX;
+ OldPtY := OldPtY + PtY;
end;
+
+ // Get the Pen Width
+ if APath.Pen.Width >= 1 then lPenWidth := APath.Pen.Width
+ else lPenWidth := 1;
+
+ // Get the Pen Color and Style
+ if APath.Pen.Style = psClear then lPenColor := 'none'
+ else lPenColor := '#' + FPColorToRGBHexString(APath.Pen.Color);
+
+ // Get the Brush color and style
+ if APath.Brush.Style = bsClear then lFillColor := 'none'
+ else lFillColor := '#' + FPColorToRGBHexString(APath.Brush.Color);
+
+ // Now effectively write the path
+ AStrings.Add(' <path');
+ AStrings.Add(Format(' style="fill:%s;stroke:%s;stroke-width:%dpx;'
+ + 'stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"',
+ [lFillColor, lPenColor, lPenWidth]));
+ AStrings.Add(' d="' + PathStr + '"');
+ AStrings.Add(' id="path' + IntToStr(AIndex) + '" />');
end;
procedure TvSVGVectorialWriter.ConvertFPVCoordinatesToSVGCoordinates(
@@ -197,43 +214,52 @@
// Now data
AStrings.Add(' <g id="layer1">');
- WritePaths(AStrings, AData);
- WriteTexts(AStrings, AData);
+ WriteEntities(AStrings, AData);
AStrings.Add(' </g>');
// finalization
AStrings.Add('</svg>');
end;
-procedure TvSVGVectorialWriter.WriteTexts(AStrings: TStrings; AData: TvVectorialDocument);
+procedure TvSVGVectorialWriter.WriteText(AStrings: TStrings; lText: TvText; AData: TvVectorialDocument);
var
i, j, FontSize: Integer;
TextStr, FontName, SVGFontFamily: string;
- lText: TvText;
PtX, PtY: double;
begin
- for i := 0 to AData.GetTextCount() - 1 do
- begin
- TextStr := '';
- lText := AData.GetText(i);
+ TextStr := '';
- ConvertFPVCoordinatesToSVGCoordinates(
- AData, lText.X, lText.Y, PtX, PtY);
+ ConvertFPVCoordinatesToSVGCoordinates(
+ AData, lText.X, lText.Y, PtX, PtY);
- TextStr := lText.Value;
- FontSize:= ceil(lText.FontSize / FLOAT_MILIMETERS_PER_PIXEL);
- SVGFontFamily := 'Arial, sans-serif';//lText.FontName;
-
- AStrings.Add(' <text ');
- AStrings.Add(' x="' + FloatToStr(PtX, FPointSeparator) + '"');
- AStrings.Add(' y="' + FloatToStr(PtY, FPointSeparator) + '"');
+ TextStr := lText.Value;
+ FontSize:= ceil(lText.Font.Size / FLOAT_MILIMETERS_PER_PIXEL);
+ SVGFontFamily := 'Arial, sans-serif';//lText.FontName;
+
+ AStrings.Add(' <text ');
+ AStrings.Add(' x="' + FloatToStr(PtX, FPointSeparator) + '"');
+ AStrings.Add(' y="' + FloatToStr(PtY, FPointSeparator) + '"');
// AStrings.Add(' font-size="' + IntToStr(FontSize) + '"'); Doesn't seam to work, we need to use the tspan
- AStrings.Add(' font-family="' + SVGFontFamily + '">');
- AStrings.Add(' <tspan ');
- AStrings.Add(' style="font-size:' + IntToStr(FontSize) + '" ');
+ AStrings.Add(' font-family="' + SVGFontFamily + '">');
+ AStrings.Add(' <tspan ');
+ AStrings.Add(' style="font-size:' + IntToStr(FontSize) + '" ');
// AStrings.Add(' id="tspan2828" ');
- AStrings.Add(' >');
- AStrings.Add(TextStr + '</tspan></text>');
+ AStrings.Add(' >');
+ AStrings.Add(TextStr + '</tspan></text>');
+end;
+
+procedure TvSVGVectorialWriter.WriteEntities(AStrings: TStrings;
+ AData: TvVectorialDocument);
+var
+ lEntity: TvEntity;
+ i: Integer;
+begin
+ for i := 0 to AData.GetEntitiesCount() - 1 do
+ begin
+ lEntity := AData.GetEntity(i);
+
+ if lEntity is TPath then WritePath(i, TPath(lEntity), AStrings, AData)
+ else if lEntity is TvText then WriteText(AStrings, TvText(lEntity), AData);
end;
end;

34
graphics/fpc-fpvectorial/pkg-plist
View file

@ -1,37 +1,31 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisocncgcodereader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisocncgcodewriter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisozlib.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/cdrvectorialreader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvectorial.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvtocanvas.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvectorialreader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvrlexico.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvrsemantico.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvrsintatico.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/svgvectorialwriter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisocncgcodereader.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisocncgcodereader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisocncgcodereader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisocncgcodewriter.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisocncgcodewriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisocncgcodewriter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisozlib.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisozlib.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisozlib.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/cdrvectorialreader.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/cdrvectorialreader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/cdrvectorialreader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/epsvectorialreader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/epsvectorialreader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvectorial.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvectorial.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvectorial.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvtocanvas.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvtocanvas.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvectorialreader.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvtocanvas.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvrlexico.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvrsemantico.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvrsintatico.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/svgvectorialwriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpavisocncgcodereader.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpavisocncgcodereader.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpavisocncgcodewriter.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpavisocncgcodewriter.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpavisozlib.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpavisozlib.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpcdrvectorialreader.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpcdrvectorialreader.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpepsvectorialreader.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpfpvectorial.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpfpvectorial.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpfpvtocanvas.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpfpvtocanvas.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libppdfvectorialreader.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpfpvutils.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libppdfvrlexico.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libppdfvrsemantico.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libppdfvrsintatico.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpsvgvectorialwriter.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpsvgvectorialwriter.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/svgvectorialwriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/svgvectorialwriter.ppu
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
@dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%%/units

5
graphics/fpc-hermes/pkg-plist
View file

@ -1,9 +1,4 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/Package.fpc
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/mmx_clr.o
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/mmxp_32.o
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/mmx_main.o
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/mmxp2_32.o
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hm_i386.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/libphermes.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/libphermes.a

2
graphics/fpc-imlib/Makefile
View file

@ -18,6 +18,6 @@ MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR} EXTRACTUNITDIR+= ${WRKUNITDIR}
OPTIONS= IMLIB "Install imlib graphic library" on OPTIONS= IMLIB2 "Install imlib graphic library" on
.include "${MASTERDIR}/Makefile" .include "${MASTERDIR}/Makefile"

2
graphics/fpc-opengl/Makefile
View file

@ -5,7 +5,7 @@
# $FreeBSD$ # $FreeBSD$
# #
PORTREVISION= 1 PORTREVISION= 0
CATEGORIES= graphics lang CATEGORIES= graphics lang
PKGNAMESUFFIX= -opengl PKGNAMESUFFIX= -opengl

2
lang/fpc-base/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= base PORTNAME= base
PORTVERSION= 2.4.4 PORTVERSION= 2.6.0
CATEGORIES= lang CATEGORIES= lang
MASTER_SITES= # empty MASTER_SITES= # empty
PKGNAMEPREFIX= fpc- PKGNAMEPREFIX= fpc-

2
lang/fpc-docs/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= docs PORTNAME= docs
PORTVERSION= 2.4.4 PORTVERSION= 2.6.0
CATEGORIES= lang CATEGORIES= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \ MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \
ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/docs/ \ ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/docs/ \

4
lang/fpc-docs/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (freepascal/doc-pdf.tar.gz) = 79db51937bab98e20a275ef7549d3a57d4f79ee6d101054b2eebe90191211f16 SHA256 (freepascal/doc-pdf.tar.gz) = b1b6cca6f1a1c341822fb86200e7c2cb88ed80b7d93bdbeb7c82cd5fba9e6f14
SIZE (freepascal/doc-pdf.tar.gz) = 7393643 SIZE (freepascal/doc-pdf.tar.gz) = 7521336

6
lang/fpc-units/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= units PORTNAME= units
PORTVERSION= 2.4.4 PORTVERSION= 2.6.0
PORTREVISION= 1
CATEGORIES= lang CATEGORIES= lang
MASTER_SITES= # none MASTER_SITES= # none
PKGNAMEPREFIX= fpc- PKGNAMEPREFIX= fpc-
@ -46,6 +45,7 @@ OPTIONS= A52 "Interface to a52 library" on \
FCL_XML "Free Pascal Component Library (xml)" on \ FCL_XML "Free Pascal Component Library (xml)" on \
FFTW "Interface to the FFTW3 library" on \ FFTW "Interface to the FFTW3 library" on \
FPGTK "Interface to create programs with gtk" on \ FPGTK "Interface to create programs with gtk" on \
FPPKG "Free Pascal package unit" on \
FPMKUNIT "Free Pascal build system unit" on \ FPMKUNIT "Free Pascal build system unit" on \
FPVECTORIAL "Free Pascal fpvectorial unit" on \ FPVECTORIAL "Free Pascal fpvectorial unit" on \
FV "Free Pascal unit for Delphi support" on \ FV "Free Pascal unit for Delphi support" on \
@ -100,7 +100,7 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}
ALL_OPTIONS= A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DTS FASTCGI FCL-ASYNC FCL-BASE \ ALL_OPTIONS= A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DTS FASTCGI FCL-ASYNC FCL-BASE \
FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JSON FCL-NET FCL-PASSRC FCL-PROCESS \ FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JSON FCL-NET FCL-PASSRC FCL-PROCESS \
FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPMKUNIT FPVECTORIAL \ FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPMKUNIT FPPKG FPVECTORIAL \
FV GDBM GGI GMP GNOME1 GTK1 GTK2 HERMES ICONVENC IMAGEMAGICK IMLIB \ FV GDBM GGI GMP GNOME1 GTK1 GTK2 HERMES ICONVENC IMAGEMAGICK IMLIB \
LDAP LIBCURL LIBGD LIBPNG LIBXML2 LUA MAD MATROSKA MODPLUG NCURSES \ LDAP LIBCURL LIBGD LIBPNG LIBXML2 LUA MAD MATROSKA MODPLUG NCURSES \
NEWT NUMLIB OGGVORBIS OPENAL OPENGL OPENSSL PCAP PROJ4 PXLIB RSVG \ NEWT NUMLIB OGGVORBIS OPENAL OPENGL OPENSSL PCAP PROJ4 PXLIB RSVG \

4
lang/fpc-utils/Makefile
View file

@ -12,9 +12,7 @@ PKGNAMESUFFIX= -utils
MAINTAINER= acm@FreeBSD.org MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Compiler utils COMMENT= Free Pascal Compiler utils
USE_FPC= chm fcl-async fcl-base fcl-net fcl-passrc fcl-process fcl-res fcl-xml gdbint \ USE_FPC= chm fcl-base fcl-net fcl-process fcl-res fppkg libcurl
graph ibase libcurl hash mysql oracle pasjpeg paszlib pthreads \
postgres regexpr sqlite
MASTERDIR= ${.CURDIR}/../../lang/fpc MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//} WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}

45
lang/fpc-utils/pkg-plist
View file

@ -2,13 +2,13 @@ bin/bin2obj
bin/data2inc bin/data2inc
bin/delp bin/delp
bin/fpclasschart bin/fpclasschart
bin/fpcmkcfg
bin/fpcres bin/fpcres
bin/fpdoc bin/fpdoc
bin/fppkg bin/fppkg
bin/fprcp bin/fprcp
bin/h2pas bin/h2pas
bin/h2paspp bin/h2paspp
bin/instantfpc
bin/makeskel bin/makeskel
bin/plex bin/plex
bin/postw32 bin/postw32
@ -18,46 +18,9 @@ bin/pyacc
bin/rmcvsdir bin/rmcvsdir
bin/rstconv bin/rstconv
bin/unitdiff bin/unitdiff
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgglobals.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkghandler.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgdownload.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfpmake.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgglobals.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkghandler.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgdownload.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgfpmake.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgwget.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkglnet.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkglnet.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgrepos.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpfprepos.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpfpxmlrep.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgoptions.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgglobals.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgmessages.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkghandler.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgmkconv.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgdownload.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgfpmake.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgcommands.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/lexlib.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/lexlib.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/yacclib.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/yacclib.ppu
@ -67,8 +30,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/libplexlib.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/libpyacclib.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/libpyacclib.a
lib/fpc/lexyacc/yyparse.cod lib/fpc/lexyacc/yyparse.cod
lib/fpc/lexyacc/yylex.cod lib/fpc/lexyacc/yylex.cod
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/ @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/lexyacc/
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
@dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%%/units
@dirrmtry lib/fpc/%%PORTVERSION%% @dirrmtry lib/fpc/%%PORTVERSION%%

15
lang/fpc/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= fpc PORTNAME= fpc
PORTVERSION= 2.4.4 PORTVERSION= 2.6.0
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES?= lang CATEGORIES?= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \ MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
@ -115,7 +115,9 @@ do-extract:
# unpack source distribution # unpack source distribution
@cd ${WRKDIR} && \ @cd ${WRKDIR} && \
${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} \ ${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} \
| ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/utils/fpcm | ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl \
${FPCSRCDIR}/utils/fpcmkcfg ${FPCSRCDIR}/packages/fcl-base \
${FPCSRCDIR}/packages/fcl-process ${FPCSRCDIR}/utils/fpcm
post-patch: post-patch:
.if ${ARCH} == "i386" .if ${ARCH} == "i386"
@ -129,16 +131,21 @@ post-patch:
do-build: do-build:
# build fpc compiler # build fpc compiler
@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} cycle ${MAKE_ENV} @cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} cycle ${MAKE_ENV}
# build fpcmake # build fpcmkcfg
@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} ${MAKE_ENV} @cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} ${MAKE_ENV}
@cd ${WRKDIR}/${FPCSRCDIR}/packages/fcl-base && ${GMAKE} ${MAKE_ENV}
@cd ${WRKDIR}/${FPCSRCDIR}/packages/fcl-process && ${GMAKE} ${MAKE_ENV}
@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && ${GMAKE} ${MAKE_ENV}
do-install: do-install:
# Installing fpc compiler # Installing fpc compiler
@cd ${WRKDIR}/${FPCSRCDIR}/rtl && ${GMAKE} install ${MAKE_ENV} @cd ${WRKDIR}/${FPCSRCDIR}/rtl && ${GMAKE} install ${MAKE_ENV}
# Installing fpc runtime # Installing fpc runtime
@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} install ${MAKE_ENV} @cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} install ${MAKE_ENV}
# Installng fpcmkcfg
@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && ${GMAKE} install ${MAKE_ENV}
# Installng fpcmake # Installng fpcmake
@@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} install ${MAKE_ENV} @cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} install ${MAKE_ENV}
# Installing manpages # Installing manpages
${INSTALL_DATA} ${WRKDIR}/man/man1/* ${MAN1PREFIX}/man/man1 ${INSTALL_DATA} ${WRKDIR}/man/man1/* ${MAN1PREFIX}/man/man1
${INSTALL_DATA} ${WRKDIR}/man/man5/* ${MAN1PREFIX}/man/man5 ${INSTALL_DATA} ${WRKDIR}/man/man5/* ${MAN1PREFIX}/man/man5

351
lang/fpc/Makefile.units
View file

@ -23,40 +23,9 @@ MAKE_ENV+= PP=${LOCALBASE}/bin/${PPNAME} \
OPT="${OPT}" \ OPT="${OPT}" \
BSDHIER=1 BSDHIER=1
.if ${PKGNAMESUFFIX} == "-ibase" .if ${PKGNAMESUFFIX} == "-a52"
. if defined(WITH_IBASE) . if defined(WITH_LIBA52)
USE_FIREBIRD= yes LIB_DEPENDS= a52:${PORTSDIR}/audio/liba52
. endif
.endif
.if ${PKGNAMESUFFIX} == "-mysql"
. if defined(WITH_MYSQL)
USE_MYSQL= yes
. endif
.endif
.if ${PKGNAMESUFFIX} == "-odbc"
. if defined(WITH_ODBC)
LIB_DEPENDS= odbc.2:${PORTSDIR}/databases/unixODBC
. endif
.endif
.if ${PKGNAMESUFFIX} == "-oracle"
. if defined(WITH_ORACLE)
ORACLE8_LIB= ${LOCALBASE}/oracle8-client/rdbms/lib
RUN_DEPENDS= ${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
. endif
.endif
.if ${PKGNAMESUFFIX} == "-postgres"
. if defined(WITH_PGSQL)
USE_PGSQL= yes
. endif
.endif
.if ${PKGNAMESUFFIX} == "-sqlite"
. if defined(WITH_SQLITE)
USE_SQLITE= yes
. endif . endif
.endif .endif
@ -66,23 +35,22 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-fftw" .if ${PKGNAMESUFFIX} == "-cairo"
. if defined(WITH_FFTW) . if defined(WITH_LIBCAIRO)
LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-imagemagick" .if ${PKGNAMESUFFIX} == "-dbus"
. if defined(WITH_IMAGEMAGICK) . if defined(WITH_DBUS)
LIB_DEPENDS= Magick:${PORTSDIR}/graphics/ImageMagick LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-xforms" .if ${PKGNAMESUFFIX} == "-dts"
. if defined(WITH_XFORMS) . if defined(WITH_LIBDCA)
LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms LIB_DEPENDS= dca:${PORTSDIR}/multimedia/libdca
. endif . endif
HAVE_EXAMPLES= true
.endif .endif
.if ${PKGNAMESUFFIX} == "-fcl-db" .if ${PKGNAMESUFFIX} == "-fcl-db"
@ -100,6 +68,12 @@ OPT+= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \
-Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME} -Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME}
.endif .endif
.if ${PKGNAMESUFFIX} == "-fftw"
. if defined(WITH_FFTW)
LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3
. endif
.endif
.if ${PKGNAMESUFFIX} == "-fpgtk" .if ${PKGNAMESUFFIX} == "-fpgtk"
. if defined(WITH_GTK1) . if defined(WITH_GTK1)
.include <${PORTSDIR}/Mk/bsd.gnome.mk> .include <${PORTSDIR}/Mk/bsd.gnome.mk>
@ -123,6 +97,12 @@ LIB_DEPENDS= ggi:${PORTSDIR}/graphics/libggi
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-gmp"
. if defined(WITH_GMP)
LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp
. endif
.endif
.if ${PKGNAMESUFFIX} == "-gtk1" .if ${PKGNAMESUFFIX} == "-gtk1"
. if defined(WITH_GTK1) . if defined(WITH_GTK1)
.include <${PORTSDIR}/Mk/bsd.gnome.mk> .include <${PORTSDIR}/Mk/bsd.gnome.mk>
@ -138,9 +118,9 @@ USE_GNOME= gtk20
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-httpd20" .if ${PKGNAMESUFFIX} == "-hermes"
. if defined(WITH_APACHE20) . if defined(WITH_HERMES)
USE_APACHE= 20 LIB_DEPENDS= Hermes:${PORTSDIR}/graphics/Hermes
. endif . endif
.endif .endif
@ -150,16 +130,32 @@ USE_APACHE= 22
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-imlib" .if ${PKGNAMESUFFIX} == "-ibase"
. if defined(WITH_IMLIB) . if defined(WITH_IBASE)
.include <${PORTSDIR}/Mk/bsd.gnome.mk> USE_FIREBIRD= yes
USE_GNOME= imlib
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-cairo" .if ${PKGNAMESUFFIX} == "-iconvenc"
. if defined(WITH_LIBCAIRO) USE_ICONV= yes
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo .endif
.if ${PKGNAMESUFFIX} == "-imagemagick"
. if defined(WITH_IMAGEMAGICK)
LIB_DEPENDS= Magick:${PORTSDIR}/graphics/ImageMagick
. endif
.endif
.if ${PKGNAMESUFFIX} == "-imlib"
. if defined(WITH_IMLIB)
.include <${PORTSDIR}/Mk/bsd.efl.mk>
USE_EFL= imlib2
. endif
.endif
.if ${PKGNAMESUFFIX} == "-ldap"
. if defined(WITH_OPENLDAP)
USE_OPENLDAP= yes
. endif . endif
.endif .endif
@ -181,6 +177,69 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-libxml2"
. if defined(WITH_LIBXML2)
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
. endif
.endif
.if ${PKGNAMESUFFIX} == "-lua"
. if defined(WITH_LUA)
LIB_DEPENDS= lua-5.1:${PORTSDIR}/lang/lua
. endif
.endif
.if ${PKGNAMESUFFIX} == "-mad"
.if defined(WITH_LIBMAD)
LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad
. endif
.endif
.if ${PKGNAMESUFFIX} == "-matroska"
. if defined(WITH_LIBMATROSKA)
LIB_DEPENDS= matroska:${PORTSDIR}/multimedia/libmatroska
. endif
.endif
.if ${PKGNAMESUFFIX} == "-modplug"
. if defined(WITH_LIBMODPLUG)
LIB_DEPENDS= modplug:${PORTSDIR}/audio/libmodplug
. endif
.endif
.if ${PKGNAMESUFFIX} == "-mysql"
.if defined(WITH_MYSQL)
USE_MYSQL= yes
. endif
.endif
.if ${PKGNAMESUFFIX} == "-newt"
. if defined(WITH_NEWT)
LIB_DEPENDS= newt:${PORTSDIR}/devel/newt
. endif
.endif
.if ${PKGNAMESUFFIX} == "-odbc"
. if defined(WITH_ODBC)
LIB_DEPENDS= odbc.2:${PORTSDIR}/databases/unixODBC
. endif
.endif
.if ${PKGNAMESUFFIX} == "-oggvorbis"
. if defined(WITH_LIBOGG)
LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg
. endif
. if defined(WITH_LIBVORBIS)
LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
. endif
.endif
.if ${PKGNAMESUFFIX} == "-openal"
. if defined(WITH_OPENAL)
USE_OPENAL= soft
. endif
.endif
.if ${PKGNAMESUFFIX} == "-opengl" .if ${PKGNAMESUFFIX} == "-opengl"
. if defined(WITH_OPENGL) . if defined(WITH_OPENGL)
USE_GL= glut USE_GL= glut
@ -189,14 +248,45 @@ HAVE_EXAMPLES= true
.endif .endif
.if ${PKGNAMESUFFIX} == "-openssl" .if ${PKGNAMESUFFIX} == "-openssl"
. if defined(WITH_OPENSSL) . if defined(WITH_OPENSSL)
USE_OPENSSL= yes USE_OPENSSL= yes
. endif . endif
.endif
.if ${PKGNAMESUFFIX} == "-oracle"
. if defined(WITH_ORACLE)
ORACLE8_LIB= ${LOCALBASE}/oracle8-client/rdbms/lib
RUN_DEPENDS= ${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
. endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-pcap" .if ${PKGNAMESUFFIX} == "-pcap"
. if defined(WITH_LIBPCAP) . if defined(WITH_LIBPCAP)
LIB_DEPENDS= pcap:${PORTSDIR}/net/libpcap LIB_DEPENDS= pcap:${PORTSDIR}/net/libpcap
. endif
.endif
.if ${PKGNAMESUFFIX} == "-postgres"
. if defined(WITH_PGSQL)
USE_PGSQL= yes
. endif
.endif
.if ${PKGNAMESUFFIX} == "-proj4"
. if defined(WITH_PROJ)
LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj
. endif
.endif
.if ${PKGNAMESUFFIX} == "-rexx"
. if defined(WITH_REXX_REGINA)
RUN_DEPENDS= rexx:${PORTSDIR}/lang/rexx-regina
. endif
.endif
.if ${PKGNAMESUFFIX} == "-rsvg"
. if defined(WITH_LIBRSVG2)
LIB_DEPENDS= rsvg-2:${PORTSDIR}/graphics/librsvg2
. endif . endif
.endif .endif
@ -206,6 +296,18 @@ USE_SDL= sdl image mixer ttf gfx
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-sndfile"
. if defined(WITH_LIBSNDFILE)
LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile
. endif
.endif
.if ${PKGNAMESUFFIX} == "-sqlite"
. if defined(WITH_SQLITE)
USE_SQLITE= yes
. endif
.endif
.if ${PKGNAMESUFFIX} == "-svgalib" .if ${PKGNAMESUFFIX} == "-svgalib"
. if defined(WITH_SVGA) . if defined(WITH_SVGA)
LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib
@ -234,133 +336,32 @@ USE_XLIB= yes
. endif . endif
.endif .endif
.if ${PKGNAMESUFFIX} == "-iconvenc" .if ${PKGNAMESUFFIX} == "-xforms"
USE_ICONV= yes . if defined(WITH_XFORMS)
.endif LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms
.if ${PKGNAMESUFFIX} == "-a52"
. if defined(WITH_LIBA52)
LIB_DEPENDS= a52:${PORTSDIR}/audio/liba52
. endif
.endif
.if ${PKGNAMESUFFIX} == "-dbus"
. if defined(WITH_DBUS)
LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus
. endif
.endif
.if ${PKGNAMESUFFIX} == "-dts"
. if defined(WITH_LIBDCA)
LIB_DEPENDS= dca:${PORTSDIR}/multimedia/libdca
. endif
.endif
.if ${PKGNAMESUFFIX} == "-gmp"
. if defined(WITH_GMP)
LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp
. endif
.endif
.if ${PKGNAMESUFFIX} == "-ldap"
. if defined(WITH_OPENLDAP)
USE_OPENLDAP= yes
. endif
.endif
.if ${PKGNAMESUFFIX} == "-libxml2"
. if defined(WITH_LIBXML2)
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
. endif
.endif
.if ${PKGNAMESUFFIX} == "-lua"
. if defined(WITH_LUA)
LIB_DEPENDS= lua-5.1:${PORTSDIR}/lang/lua
. endif
.endif
.if ${PKGNAMESUFFIX} == "-mad"
. if defined(WITH_LIBMAD)
LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad
. endif
.endif
.if ${PKGNAMESUFFIX} == "-matroska"
. if defined(WITH_LIBMATROSKA)
LIB_DEPENDS= matroska:${PORTSDIR}/multimedia/libmatroska
. endif
.endif
.if ${PKGNAMESUFFIX} == "-modplug"
. if defined(WITH_LIBMODPLUG)
LIB_DEPENDS= modplug:${PORTSDIR}/audio/libmodplug
. endif
.endif
.if ${PKGNAMESUFFIX} == "-newt"
. if defined(WITH_NEWT)
LIB_DEPENDS= newt:${PORTSDIR}/devel/newt
. endif
.endif
.if ${PKGNAMESUFFIX} == "-oggvorbis"
. if defined(WITH_LIBOGG)
LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg
. endif
. if defined(WITH_LIBVORBIS)
LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
. endif
.endif
.if ${PKGNAMESUFFIX} == "-openal"
. if defined(WITH_OPENAL)
LIB_DEPENDS= openal:${PORTSDIR}/audio/openal
. endif
.endif
.if ${PKGNAMESUFFIX} == "-proj4"
. if defined(WITH_PROJ)
LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj
. endif
.endif
.if ${PKGNAMESUFFIX} == "-rexx"
. if defined(WITH_REXX_REGINA)
RUN_DEPENDS= rexx:${PORTSDIR}/lang/rexx-regina
. endif
.endif
.if ${PKGNAMESUFFIX} == "-rsvg"
. if defined(WITH_LIBRSVG2)
LIB_DEPENDS= rsvg-2:${PORTSDIR}/graphics/librsvg2
. endif
.endif
.if ${PKGNAMESUFFIX} == "-sndfile"
. if defined(WITH_LIBSNDFILE)
LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile
. endif
.endif
.if ${PKGNAMESUFFIX} == "-hermes"
. if defined(WITH_HERMES)
LIB_DEPENDS= Hermes:${PORTSDIR}/graphics/Hermes
. endif . endif
HAVE_EXAMPLES= true
.endif .endif
post-extract: post-extract:
@cd ${WRKDIR}/${WRKUNITDIR} && \ @cd ${WRKDIR}/${WRKUNITDIR} && \
${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf ${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
.if ${PKGNAMESUFFIX} == "-fpvectorial"
@${CP} ${FILESDIR}/fpvutils.pas ${WRKDIR}/${WRKUNITDIR}/src
.endif
post-patch: post-patch:
.if ${PKGNAMESUFFIX} == "-utils" .if ${PKGNAMESUFFIX} == "-fpmkunit"
@${REINPLACE_CMD} -e 's|fpcm ||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \ @${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_freebsd=fcl-net fcl-web|packages_freebsd=fcl-net|g' \
${WRKDIR}/${WRKUNITDIR}/Makefile.fpc ${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
.endif .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
do-build: do-build:
@${ECHO_CMD} ${MAKE_ENV} @${ECHO_CMD} ${MAKE_ENV}

16
lang/fpc/distinfo
View file

@ -1,8 +1,8 @@
SHA256 (freepascal/fpc-2.4.4.source.tar.gz) = eea053f8440f5e8db6295a72b11be65d69bd2bc90a38136e1fa947ab2785f677 SHA256 (freepascal/fpc-2.6.0.source.tar.gz) = b1ffe118bd6ce86775ac3a22ab71a88c28b91cbda6a85a8f74797a04ea7c4b8f
SIZE (freepascal/fpc-2.4.4.source.tar.gz) = 26144591 SIZE (freepascal/fpc-2.6.0.source.tar.gz) = 28932564
SHA256 (freepascal/ppc386-2.4.4-freebsd.tar.gz) = afee76f5b260942c2b508a4228c93bd5a14dcf3b34084c9cabbc41c8bfc7a30b SHA256 (freepascal/ppc386-2.6.0-freebsd.tar.gz) = 10685d5bfc4fbf02dcd1398689d5c6e5e35831f1a38e1b34ed2312fb10099fe3
SIZE (freepascal/ppc386-2.4.4-freebsd.tar.gz) = 849445 SIZE (freepascal/ppc386-2.6.0-freebsd.tar.gz) = 958065
SHA256 (freepascal/ppcx64-2.4.4-freebsd.tar.gz) = a437941c468c553c261d81e006cdec026759f7382ae8dcfbb495a91922897e79 SHA256 (freepascal/ppcx64-2.6.0-freebsd.tar.gz) = 7d2dbd57ea2c6986b4c6e0fc9b3a9461b19b5d9dbabe9e1a6512e97a6d9a5ef8
SIZE (freepascal/ppcx64-2.4.4-freebsd.tar.gz) = 859847 SIZE (freepascal/ppcx64-2.6.0-freebsd.tar.gz) = 1026395
SHA256 (freepascal/fpc-2.4.4.man.tar.gz) = 0c362d0b065eb0af28f0506bfc2bee81e2fe8a4ec00fe86632a84b60f04db964 SHA256 (freepascal/fpc-2.6.0.man.tar.gz) = 0a41d93d25e27f0a15ec7396586854c7001cbafd46a5a19a284e016573c261a4
SIZE (freepascal/fpc-2.4.4.man.tar.gz) = 31414 SIZE (freepascal/fpc-2.6.0.man.tar.gz) = 31808

12
lang/fpc/files/patch-compiler-utils_samplecfg
View file

@ -1,11 +1,13 @@
--- compiler/utils/samplecfg 2009-02-28 17:54:01.000000000 -0500 --- compiler/utils/samplecfg 2011-12-10 07:59:24.000000000 -0500
+++ compiler/utils/samplecfg 2009-04-26 13:53:57.000000000 -0500 +++ compiler/utils/samplecfg 2012-02-23 15:47:13.000000000 -0500
@@ -55,7 +55,7 @@ @@ -37,8 +37,8 @@
# Detect if we have write permission in sysdir. # Detect if we have write permission in sysdir.
if [ -w "$sysdir" ] ; then if [ -w "$sysdir" ] ; then
echo Write permission in $sysdir. echo Write permission in $sysdir.
- fpccfgfile="$sysdir"/fpc.cfg - fpccfgfile="$sysdir"/fpc.cfg
- fppkgfile="$sysdir"/fppkg.cfg
+ fpccfgfile="$sysdir"/fpc.cfg.sample + fpccfgfile="$sysdir"/fpc.cfg.sample
+ fppkgfile="$sysdir"/fppkg.cfg.sample
defaultfile="$sysdir"/fppkg/default
compilerconfigdir="-d CompilerConfigDir=$sysdir/fppkg"
else else
echo No write premission in $sysdir.
fpccfgfile="$HOME"/.fpc.cfg

2
lang/fpc/pkg-descr
View file

@ -1,4 +1,4 @@
Originally named FPK-Pascal, the Free Pascal compiler is a 32 bit Originally named FPK-Pascal, the Free Pascal compiler is a 32 bit and 64 bit
Turbo Pascal compatible Pascal compiler for DOS, Linux, Win32, OS/2, Turbo Pascal compatible Pascal compiler for DOS, Linux, Win32, OS/2,
(based on an older version) the AmigaOS, FreeBSD/ELF, BeOS, Darwin(OSX) (based on an older version) the AmigaOS, FreeBSD/ELF, BeOS, Darwin(OSX)
and others. and others.

15
lang/fpc/pkg-plist
View file

@ -1,11 +1,12 @@
@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.13 2011-06-23 05:05:26 acm Exp $ @comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.14 2012-04-19 06:19:58 acm Exp $
@unexec if cmp -s %D/etc/fpc.cfg.sample %D/etc/fpc.cfg; then rm -f %D/etc/fpc.cfg; fi @unexec if cmp -s %D/etc/fpc.cfg.sample %D/etc/fpc.cfg; then rm -f %D/etc/fpc.cfg; fi
etc/fpc.cfg.sample etc/fpc.cfg.sample
@exec if [ ! -f %D/etc/fpc.cfg ] ; then cp -p %D/%F %B/fpc.cfg; fi @exec if [ ! -f %D/etc/fpc.cfg ] ; then cp -p %D/%F %B/fpc.cfg; fi
bin/fpc bin/fpc
bin/fpcmake
bin/fpcsubst bin/fpcsubst
bin/fpcmake
bin/fpcmkcfg
bin/mkarmins bin/mkarmins
bin/mkx86ins bin/mkx86ins
bin/ppudump bin/ppudump
@ -24,14 +25,15 @@ lib/fpc/%%PORTVERSION%%/msg/errorfi.msg
lib/fpc/%%PORTVERSION%%/msg/errorhe.msg lib/fpc/%%PORTVERSION%%/msg/errorhe.msg
lib/fpc/%%PORTVERSION%%/msg/errorheu.msg lib/fpc/%%PORTVERSION%%/msg/errorheu.msg
lib/fpc/%%PORTVERSION%%/msg/errorid.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/errorn.msg
lib/fpc/%%PORTVERSION%%/msg/errorpl.msg lib/fpc/%%PORTVERSION%%/msg/errorpl.msg
lib/fpc/%%PORTVERSION%%/msg/errorpli.msg lib/fpc/%%PORTVERSION%%/msg/errorpli.msg
lib/fpc/%%PORTVERSION%%/msg/errorptd.msg lib/fpc/%%PORTVERSION%%/msg/errorpt.msg
lib/fpc/%%PORTVERSION%%/msg/errorptw.msg lib/fpc/%%PORTVERSION%%/msg/errorptu.msg
lib/fpc/%%PORTVERSION%%/msg/errorues.msg lib/fpc/%%PORTVERSION%%/msg/errorues.msg
lib/fpc/%%PORTVERSION%%/msg/errorr.msg lib/fpc/%%PORTVERSION%%/msg/errorr.msg
lib/fpc/%%PORTVERSION%%/msg/errorrw.msg
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/ppc386 %%FPC_I386%%lib/fpc/%%PORTVERSION%%/ppc386
%%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/ppcx64 %%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/ppcx64
lib/fpc/%%PORTVERSION%%/samplecfg lib/fpc/%%PORTVERSION%%/samplecfg
@ -93,6 +95,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/initc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ipc.ppu 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.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbaseunix.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbaseunix.a
@ -121,6 +125,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpgetopts.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpheaptrc.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpheaptrc.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpinitc.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpinitc.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpipc.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/libpkeyboard.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplineinfo.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplineinfo.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplnfodwrf.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplnfodwrf.a

2
multimedia/fpc-matroska/Makefile
View file

@ -5,7 +5,7 @@
# $FreeBSD$ # $FreeBSD$
# #
PORTREVISION= 3 PORTREVISION= 0
CATEGORIES= multimedia lang CATEGORIES= multimedia lang
PKGNAMESUFFIX= -matroska PKGNAMESUFFIX= -matroska

2
www/fpc-fastcgi/Makefile
View file

@ -12,7 +12,7 @@ PKGNAMESUFFIX= -fastcgi
MAINTAINER= acm@FreeBSD.org MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal fastcgi unit COMMENT= Free Pascal fastcgi unit
USE_FPC= yes USE_FPC= fpmkunit
MASTERDIR= ${.CURDIR}/../../lang/fpc MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}

34
www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile Normal file
View file

@ -0,0 +1,34 @@
--- 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

2
www/fpc-fastcgi/pkg-plist
View file

@ -1,6 +1,6 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fastcgi.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fastcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fastcgi.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fastcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fpunits.cfg
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/libpfastcgi.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/libpfastcgi.a
@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi
@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%

2
x11-toolkits/fpc-xforms/Makefile
View file

@ -5,7 +5,7 @@
# $FreeBSD$ # $FreeBSD$
# #
PORTREVISION= 1 PORTREVISION= 0
CATEGORIES= x11-toolkits lang CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -xforms PKGNAMESUFFIX= -xforms