diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2011-06-23 05:05:29 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2011-06-23 05:05:29 +0000 |
| commit | 424718714b52206f08164bb60bdcad7eb5d6063e (patch) | |
| tree | 62d300b0c505b96ade04b54da22ed014fc6367a5 | |
| parent | ee76890c35c83e7fd596c8403773ea98cfa24bbc (diff) | |
- Update to 2.4.4
Notes
Notes:
svn path=/head/; revision=276093
26 files changed, 2041 insertions, 278 deletions
diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk index e1691c66904a..bf505d01ead4 100644 --- a/Mk/bsd.fpc.mk +++ b/Mk/bsd.fpc.mk @@ -30,7 +30,7 @@ _FPCMKINCLUDED= yes FPC_Include_MAINTAINER= acm@FreeBSD.org FPC_Pre_Include= bsd.fpc.mk -DEFAULT_FPC_VER= 2.4.2 +DEFAULT_FPC_VER= 2.4.4 FPC_VER= ${DEFAULT_FPC_VER} FPC_ARCH= ${ARCH:S/amd64/x86_64/} @@ -52,18 +52,6 @@ BUILD_DEPENDS+= ${PPNAME}:${PORTSDIR}/lang/fpc BUILDNAME= ${FPC_ARCH}-freebsd UNITSDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME} -fpc-check-install: -check-makevars:: -.if defined(UNITPREFIX) && defined(PKGNAMESUFFIX) - @${ECHO_CMD} "#################################################################" - @${ECHO_CMD} "" - @${ECHO_CMD} " The following freepascal unit will be installed in your system: " - @${ECHO_CMD} "" - @${ECHO_CMD} " * ${UNITPREFIX}${PKGNAMESUFFIX:S/-//} " - @${ECHO_CMD} "" - @${ECHO_CMD} "#################################################################" -.endif - _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-registry fcl-res fcl-web fcl-xml fftw fpgtk fpmkunit fpvectorial \ @@ -201,7 +189,18 @@ RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNI security-check: fpc-check-install . endif . endfor + +fpc-check-install: +.if defined(UNITPREFIX) && defined(PKGNAMESUFFIX) + @${ECHO_CMD} "#################################################################" + @${ECHO_CMD} "" + @${ECHO_CMD} " The following freepascal unit has been installed in your system:" + @${ECHO_CMD} "" + @${ECHO_CMD} " * ${UNITPREFIX}${PKGNAMESUFFIX:S/-//} " + @${ECHO_CMD} "" + @${ECHO_CMD} "#################################################################" .endif +.endif #.endif # End of bsd.fpc.mk file diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist index 9ff00c35307d..dfa9959e12e1 100644 --- a/databases/fpc-mysql/pkg-plist +++ b/databases/fpc-mysql/pkg-plist @@ -16,6 +16,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.o @@ -33,6 +35,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmy4_sys.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_com.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_version.a @@ -50,6 +54,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql41.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql41dyn.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql50.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql50dyn.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql51.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql51dyn.a @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/devel/fpc-fcl-db/pkg-plist b/devel/fpc-fcl-db/pkg-plist index 622b87cf5e30..2542945df4b4 100644 --- a/devel/fpc-fcl-db/pkg-plist +++ b/devel/fpc-fcl-db/pkg-plist @@ -1,97 +1,125 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/Package.fpc -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsdfdata.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmemds.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqldb.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqldb.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqldb.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpibconnection.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libppqconnection.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql40conn.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql41conn.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql50conn.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql4conn.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpodbcconn.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libporacleconnection.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3conn.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/customsqliteds.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/customsqliteds.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbconst.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdb.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbwhtml.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset_parser.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbcoll.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlscript.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlparser.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlparser.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlscanner.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlscanner.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqltree.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqltree.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset_parser.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpcustomsqliteds.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdb.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbcoll.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbconst.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_wtil.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_collate.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_common.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_cursor.a @@ -107,108 +135,92 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_prscore.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_prsdef.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_prssupp.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_str.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/customsqliteds.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3ds.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/customsqliteds.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3ds.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpcustomsqliteds.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqliteds.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3ds.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpparadox.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbexport.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_wtil.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbwhtml.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgcreatedbf.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgdbcoll.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgsqlconst.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgtiopf.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcsvexport.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpfixedexport.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlexport.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplexmlexport.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplejsonexport.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbfexport.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfptexexport.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfprtfexport.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpstdexports.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdatadict.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddiff.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbexport.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbfexport.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddcodegen.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddbf.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqldb.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddiff.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddfb.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql40.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql41.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql50.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddodbc.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpq.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddoracle.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqlite3.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddregstd.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddcodegen.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgcreatedbf.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgdbcoll.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgsqlconst.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgtiopf.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpopcode.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpq.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddregstd.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqldb.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqlite3.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpfixedexport.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfprtfexport.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplejsonexport.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplexmlexport.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlexport.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlparser.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlscanner.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqltree.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpstdexports.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfptexexport.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpibconnection.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/libpmysql41conn.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql4conn.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql50conn.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql51conn.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpodbcconn.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libporacleconnection.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpparadox.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libppqconnection.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsdfdata.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqldb.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3conn.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3ds.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqliteds.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlscript.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpxmldatapacketreader.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql51conn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql51conn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqldb.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqldb.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3ds.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3ds.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/xmldatapacketreader.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/xmldatapacketreader.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpxmldatapacketreader.a @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/devel/fpc-fcl-json/pkg-plist b/devel/fpc-fcl-json/pkg-plist index eda871bb08a3..2f464cd230f6 100644 --- a/devel/fpc-fcl-json/pkg-plist +++ b/devel/fpc-fcl-json/pkg-plist @@ -1,13 +1,16 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpfpjson.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpfpjsonrtti.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpjsonscanner.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpjsonparser.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpjsonconf.a diff --git a/devel/fpc-fcl-web/pkg-plist b/devel/fpc-fcl-web/pkg-plist index 2daa2fd3750c..cd019afbc654 100644 --- a/devel/fpc-fcl-web/pkg-plist +++ b/devel/fpc-fcl-web/pkg-plist @@ -1,49 +1,79 @@ 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.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.ppu +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/custweb.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.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/extjsxml.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.o +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.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.ppu +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/fpfcgi.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.ppu +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/fpjsonrpc.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpapache.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcgiapp.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpezcgi.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libphttpdefs.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpcgi.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpfcgi.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttp.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/libpcustweb.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpextjsjson.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpextjsxml.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpezcgi.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpapache.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/libpfpextdirect.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpextjs.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpfcgi.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphtml.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebsession.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttp.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpjsonrpc.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpweb.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpwebdata.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpsqldbwebdata.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libphttpdefs.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebjsonrpc.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebpage.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebsession.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebutil.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpdatasetform.a +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/webjsonrpc.o +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.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.ppu @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/graphics/fpc-fpvectorial/files/fpvutils.pas b/graphics/fpc-fpvectorial/files/fpvutils.pas new file mode 100644 index 000000000000..d88393ad8eff --- /dev/null +++ b/graphics/fpc-fpvectorial/files/fpvutils.pas @@ -0,0 +1,114 @@ +{ +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. + diff --git a/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_avisocncgcodewriter.pas b/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_avisocncgcodewriter.pas new file mode 100644 index 000000000000..04207c012f34 --- /dev/null +++ b/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_avisocncgcodewriter.pas @@ -0,0 +1,66 @@ +--- 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; diff --git a/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_fpvectorial.pas b/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_fpvectorial.pas new file mode 100644 index 000000000000..c95a9aca78fa --- /dev/null +++ b/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_fpvectorial.pas @@ -0,0 +1,703 @@ +--- 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; diff --git a/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_fpvtocanvas.pas b/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_fpvtocanvas.pas new file mode 100644 index 000000000000..4d89d2c45735 --- /dev/null +++ b/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_fpvtocanvas.pas @@ -0,0 +1,540 @@ +--- 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. diff --git a/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_svgvectorialwriter.pas b/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_svgvectorialwriter.pas new file mode 100644 index 000000000000..4aad8819a5a5 --- /dev/null +++ b/graphics/fpc-fpvectorial/files/patch-packages-fpvectorial-src_svgvectorialwriter.pas @@ -0,0 +1,273 @@ +--- 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; + diff --git a/graphics/fpc-fpvectorial/pkg-plist b/graphics/fpc-fpvectorial/pkg-plist index 0d9ad7111c7a..91b02bad35ae 100644 --- a/graphics/fpc-fpvectorial/pkg-plist +++ b/graphics/fpc-fpvectorial/pkg-plist @@ -2,30 +2,36 @@ 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/avisocncgcodewriter.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/avisozlib.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/cdrvectorialreader.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvectorial.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/fpvtocanvas.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvectorialreader.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvrlexico.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/pdfvrsemantico.o 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/libpavisocncgcodewriter.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpavisozlib.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpcdrvectorialreader.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpfpvectorial.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libpfpvtocanvas.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial/libppdfvectorialreader.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 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpvectorial @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/graphics/fpc-opengl/pkg-plist b/graphics/fpc-opengl/pkg-plist index 59630ac0dbb1..5626917cdc3c 100644 --- a/graphics/fpc-opengl/pkg-plist +++ b/graphics/fpc-opengl/pkg-plist @@ -1,4 +1,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/Package.fpc +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/freeglut.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/freeglut.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/gl.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/gl.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glext.o @@ -9,6 +11,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glut.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glut.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glx.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glx.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpfreeglut.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpgl.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglext.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglu.a diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile index 171b4968894c..583061f5d444 100644 --- a/lang/fpc-base/Makefile +++ b/lang/fpc-base/Makefile @@ -6,7 +6,7 @@ # PORTNAME= base -PORTVERSION= 2.4.2 +PORTVERSION= 2.4.4 CATEGORIES= lang MASTER_SITES= # empty PKGNAMEPREFIX= fpc- diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile index 5dec3f4018f9..3dc1c462d290 100644 --- a/lang/fpc-docs/Makefile +++ b/lang/fpc-docs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= docs -PORTVERSION= 2.4.2 +PORTVERSION= 2.4.4 CATEGORIES= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \ ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/docs/ \ diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo index bb6cf3fc4815..0d88fe7dfc8f 100644 --- a/lang/fpc-docs/distinfo +++ b/lang/fpc-docs/distinfo @@ -1,2 +1,2 @@ -SHA256 (freepascal/doc-pdf.tar.gz) = b528d320adc5597883745bc27efecc1155e6445ca2480fb0d3b82209ef374151 -SIZE (freepascal/doc-pdf.tar.gz) = 7408440 +SHA256 (freepascal/doc-pdf.tar.gz) = 79db51937bab98e20a275ef7549d3a57d4f79ee6d101054b2eebe90191211f16 +SIZE (freepascal/doc-pdf.tar.gz) = 7393643 diff --git a/lang/fpc-lua/files/patch-Makefile b/lang/fpc-lua/files/patch-Makefile deleted file mode 100644 index b3f56a58c0df..000000000000 --- a/lang/fpc-lua/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- packages/lua/Makefile 2010-04-22 22:04:10.000000000 +0100 -+++ packages/lua/Makefile 2010-04-22 22:04:29.000000000 +0100 -@@ -264,7 +264,7 @@ - UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) - endif - PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) --override PACKAGE_NAME=bfd -+override PACKAGE_NAME=lua - override PACKAGE_VERSION=2.4.2 - ifeq ($(FULL_TARGET),i386-linux) - override TARGET_UNITS+=lua lualib lauxlib diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile index 15b0d4dfc7ac..87d9cb50b674 100644 --- a/lang/fpc-units/Makefile +++ b/lang/fpc-units/Makefile @@ -6,8 +6,7 @@ # PORTNAME= units -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.4.4 CATEGORIES= lang MASTER_SITES= # none PKGNAMEPREFIX= fpc- diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist index 1684ee560d8e..67e38f333e8a 100644 --- a/lang/fpc-utils/pkg-plist +++ b/lang/fpc-utils/pkg-plist @@ -2,6 +2,7 @@ bin/bin2obj bin/data2inc bin/delp bin/fpclasschart +bin/fpcmkcfg bin/fpcres bin/fpdoc bin/fppkg @@ -18,7 +19,6 @@ bin/rmcvsdir bin/rstconv bin/unitdiff lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/Package.fpc -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/buildfppkg.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.ppu @@ -32,7 +32,6 @@ 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/buildfppkg.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkglnet.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.o @@ -46,7 +45,6 @@ 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/libpbuildfppkg.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgwget.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkglnet.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgrepos.a diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 25fb70733457..cb80232ccbe8 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fpc -PORTVERSION= 2.4.2 +PORTVERSION= 2.4.4 PORTREVISION?= 0 CATEGORIES?= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \ @@ -31,8 +31,8 @@ USE_GMAKE= yes ONLY_FOR_ARCHS= i386 amd64 OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -SUB_FILES= pkg-message +#OPT?=-Ur -CX OPT?=-CX FPCSRCDIR= ${PORTNAME}-${PORTVERSION} @@ -51,6 +51,8 @@ PLIST_SUB= FPC_I386="@comment " \ .endif .if !defined(PKGNAMESUFFIX) +SUB_FILES= pkg-message + BUILDNAME= ${FPC_ARCH}-freebsd PLIST_SUB+= PORTVERSION=${PORTVERSION} \ BUILDNAME=${BUILDNAME} @@ -138,8 +140,8 @@ do-install: # Installng fpcmake @@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} install ${MAKE_ENV} # Installing manpages - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.man/}/man/man1/* ${MAN1PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.man/}/man/man5/* ${MAN1PREFIX}/man/man5 + ${INSTALL_DATA} ${WRKDIR}/man/man1/* ${MAN1PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKDIR}/man/man5/* ${MAN1PREFIX}/man/man5 post-install: if [ -e "${PREFIX}/bin/${PPNAME}" ]; then ${RM} -f "${PREFIX}/bin/${PPNAME}"; fi diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index 8a64241a8b30..73aeaa5de693 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -5,6 +5,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} \ PLIST= ${.CURDIR}/pkg-plist PATCHDIR= ${.CURDIR}/files +FILESDIR= ${.CURDIR}/files WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} UNITPREFIX= unit- @@ -94,6 +95,11 @@ OPT+= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \ OPT+= -Fu${WRKDIR}/${WRKUNITDIR}/* .endif +.if ${PKGNAMESUFFIX} == "-fcl-web" +OPT+= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \ + -Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME} +.endif + .if ${PKGNAMESUFFIX} == "-fpgtk" . if defined(WITH_GTK1) .include <${PORTSDIR}/Mk/bsd.gnome.mk> @@ -352,10 +358,13 @@ LIB_DEPENDS= Hermes:${PORTSDIR}/graphics/Hermes post-extract: @cd ${WRKDIR}/${WRKUNITDIR} && \ ${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf +.if ${PKGNAMESUFFIX} == "-fpvectorial" + @${CP} ${FILESDIR}/fpvutils.pas ${WRKDIR}/${WRKUNITDIR}/src +.endif post-patch: .if ${PKGNAMESUFFIX} == "-utils" - @${REINPLACE_CMD} -e 's|fpcm||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \ + @${REINPLACE_CMD} -e 's|fpcm ||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \ ${WRKDIR}/${WRKUNITDIR}/Makefile.fpc .endif diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo index 5ab58a609884..f827c86bbea3 100644 --- a/lang/fpc/distinfo +++ b/lang/fpc/distinfo @@ -1,8 +1,8 @@ -SHA256 (freepascal/fpc-2.4.2.source.tar.gz) = ecbc7be56633ec80338ff25682a0ac644f9c0ead769cd573d0cda9d3f4343ca1 -SIZE (freepascal/fpc-2.4.2.source.tar.gz) = 25278167 -SHA256 (freepascal/ppc386-2.4.2-freebsd.tar.gz) = 2647f5967bd84f3c91bb445e1ef093ae3518c6c8dbcb2155b469e95301c0e36d -SIZE (freepascal/ppc386-2.4.2-freebsd.tar.gz) = 847877 -SHA256 (freepascal/ppcx64-2.4.2-freebsd.tar.gz) = a2e72b1df65c337c9fc4319df53754b0c6a8f9ffd3728878c5c99e04e5577dc1 -SIZE (freepascal/ppcx64-2.4.2-freebsd.tar.gz) = 856404 -SHA256 (freepascal/fpc-2.4.2.man.tar.gz) = 5fe8a7b601586d722254b93b3aa7036e28ae522ad92b9e105063ed9814b4a55e -SIZE (freepascal/fpc-2.4.2.man.tar.gz) = 30504 +SHA256 (freepascal/fpc-2.4.4.source.tar.gz) = eea053f8440f5e8db6295a72b11be65d69bd2bc90a38136e1fa947ab2785f677 +SIZE (freepascal/fpc-2.4.4.source.tar.gz) = 26144591 +SHA256 (freepascal/ppc386-2.4.4-freebsd.tar.gz) = afee76f5b260942c2b508a4228c93bd5a14dcf3b34084c9cabbc41c8bfc7a30b +SIZE (freepascal/ppc386-2.4.4-freebsd.tar.gz) = 849445 +SHA256 (freepascal/ppcx64-2.4.4-freebsd.tar.gz) = a437941c468c553c261d81e006cdec026759f7382ae8dcfbb495a91922897e79 +SIZE (freepascal/ppcx64-2.4.4-freebsd.tar.gz) = 859847 +SHA256 (freepascal/fpc-2.4.4.man.tar.gz) = 0c362d0b065eb0af28f0506bfc2bee81e2fe8a4ec00fe86632a84b60f04db964 +SIZE (freepascal/fpc-2.4.4.man.tar.gz) = 31414 diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist index bdb49eb2999e..fa81a2b591cc 100644 --- a/lang/fpc/pkg-plist +++ b/lang/fpc/pkg-plist @@ -1,11 +1,10 @@ -@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.12 2010-08-16 17:45:10 acm Exp $ +@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.13 2011-06-23 05:05:26 acm Exp $ @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 @exec if [ ! -f %D/etc/fpc.cfg ] ; then cp -p %D/%F %B/fpc.cfg; fi bin/fpc bin/fpcmake -bin/fpcmkcfg bin/fpcsubst bin/mkarmins bin/mkx86ins @@ -52,8 +51,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/console.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/convutils.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/convutils.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cprt0.o -%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o -%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.o @@ -103,7 +102,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclocale.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcmem.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconsole.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconvutils.a -%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcpu.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcpu.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcrt.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcthreads.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpctypes.a diff --git a/misc/fpc-chm/pkg-plist b/misc/fpc-chm/pkg-plist index eee1e6ad35b2..52a4d9f9f38a 100644 --- a/misc/fpc-chm/pkg-plist +++ b/misc/fpc-chm/pkg-plist @@ -1,51 +1,60 @@ bin/chmcmd bin/chmls lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/Package.fpc -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/fasthtmlparser.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlutil.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzx.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzxcomp.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslznonslide.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/lzxcompressthread.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmbase.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmbase.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmtypes.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmspecialfiles.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmsitemap.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmwriter.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfiftimain.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfiftimain.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfilewriter.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfilewriter.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmreader.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmreader.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlindexer.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfiftimain.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/fasthtmlparser.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlutil.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzx.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzxcomp.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslznonslide.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/lzxcompressthread.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmbase.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmtypes.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmspecialfiles.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmsitemap.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmsitemap.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmspecialfiles.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmspecialfiles.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmtypes.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmtypes.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmwriter.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfilewriter.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmreader.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmwriter.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/fasthtmlparser.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/fasthtmlparser.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlindexer.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/chmfiftimain.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpfasthtmlparser.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libphtmlutil.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslzx.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslzxcomp.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslznonslide.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libplzxcompressthread.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlindexer.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlutil.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/htmlutil.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itolitlsreader.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itolitlsreader.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itolitlstypes.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itolitlstypes.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itsftransform.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/itsftransform.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmbase.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmtypes.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmspecialfiles.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmsitemap.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmwriter.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmfiftimain.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmfilewriter.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmreader.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmsitemap.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmspecialfiles.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmtypes.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmwriter.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpfasthtmlparser.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libphtmlindexer.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpchmfiftimain.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libphtmlutil.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpitolitlsreader.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpitolitlstypes.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libpitsftransform.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libplzxcompressthread.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslznonslide.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslzx.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/libppaslzxcomp.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/lzxcompressthread.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/lzxcompressthread.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslznonslide.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslznonslide.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzx.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzx.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzxcomp.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm/paslzxcomp.ppu @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/chm @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/multimedia/fpc-matroska/Makefile b/multimedia/fpc-matroska/Makefile index 7477c46786df..3e151313bf7b 100644 --- a/multimedia/fpc-matroska/Makefile +++ b/multimedia/fpc-matroska/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= multimedia lang PKGNAMESUFFIX= -matroska diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile index 407815335f54..7133eb01abec 100644 --- a/net/fpc-ldap/Makefile +++ b/net/fpc-ldap/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= net lang PKGNAMESUFFIX= -ldap diff --git a/textproc/fpc-libxml2/pkg-plist b/textproc/fpc-libxml2/pkg-plist index 388b9dfa66b8..3a11361c7a64 100644 --- a/textproc/fpc-libxml2/pkg-plist +++ b/textproc/fpc-libxml2/pkg-plist @@ -1,10 +1,13 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xml2.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xmlxsd.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xmlxsdparser.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xml2.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xmlxsd.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/xmlxsdparser.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/libpxml2.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/libpxmlxsd.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2/libpxmlxsdparser.a @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libxml2 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units |