diff options
| author | acm <acm@FreeBSD.org> | 2010-08-17 01:45:15 +0800 |
|---|---|---|
| committer | acm <acm@FreeBSD.org> | 2010-08-17 01:45:15 +0800 |
| commit | 8498bd6e31c48fc8febc6bb8775b17afff9069b4 (patch) | |
| tree | a1316e0caa456c9e38598ab08aed004d76efbae1 | |
| parent | 1b3e6c18e2ab19ced93288a613246608c34042ec (diff) | |
| download | freebsd-ports-gnome-8498bd6e31c48fc8febc6bb8775b17afff9069b4.tar.gz freebsd-ports-gnome-8498bd6e31c48fc8febc6bb8775b17afff9069b4.tar.zst freebsd-ports-gnome-8498bd6e31c48fc8febc6bb8775b17afff9069b4.zip | |
- Update to 2.4.0
- Add support for amd64 [1]
- Add 23 new ports to to bsd.fpc.mk
- Remove obsolete patch file patch-packages-fcl-db_Makefile
- Turn off some optional dependencies like databases/unixODBC,
graphics/svgalib, databases/oracle8-client for avoid break amd64 support
- Clean up
PR: ports/146001
Submmitted by: Christopher Key <cjk32__ at _cam.ac.uk>
Patch reviewed by: marcov_ at _pascalprogramming.com (fpc developer)[1]
50 files changed, 436 insertions, 127 deletions
diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk index 2e4da5d54b44..a12f541000d3 100644 --- a/Mk/bsd.fpc.mk +++ b/Mk/bsd.fpc.mk @@ -30,8 +30,9 @@ _FPCMKINCLUDED= yes FPC_Include_MAINTAINER= acm@FreeBSD.org FPC_Pre_Include= bsd.fpc.mk -DEFAULT_FPC_VER= 2.2.4 +DEFAULT_FPC_VER= 2.4.0 FPC_VER= ${DEFAULT_FPC_VER} +FPC_ARCH= ${ARCH:S/amd64/x86_64/} .if exists(${LOCALBASE}/bin/fpc) FPC_CURRENT_VER!= ${LOCALBASE}/bin/fpc -iV @@ -40,9 +41,15 @@ IGNORE= incompatible fpc ${FPC_CURRENT_VER} compiler, please install ${FPC_VER} . endif .endif -BUILD_DEPENDS+= ppc386:${PORTSDIR}/lang/fpc +.if ${ARCH} == "i386" +PPNAME= ppc386 +.elif ${ARCH} == "amd64" +PPNAME= ppcx64 +.endif + +BUILD_DEPENDS+= ${PPNAME}:${PORTSDIR}/lang/fpc -BUILDNAME= ${ARCH}-freebsd +BUILDNAME= ${FPC_ARCH}-freebsd UNITSDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME} fpc-check-install: @@ -57,18 +64,20 @@ check-makevars:: @${ECHO_CMD} "#################################################################" .endif -_FPC_ALL_UNITS= aspell bfd cairo chm fcl-async fcl-base fcl-db fcl-fpcunit fcl-image \ - fcl-json fcl-net fcl-passrc fcl-process fcl-registry fcl-web fcl-xml fftw \ - fpmkunit fpgtk fv gdbint gdbm ggi gnome1 graph gtk1 gtk2 hash httpd13 httpd20 \ - httpd22 ibase iconvenc imagemagick imlib libcurl libgd libpng mysql ncurses numlib \ - odbc opengl openssl oracle pasjpeg paszlib pcap postgres pthreads pxlib \ - regexpr sdl sqlite svgalib symbolic syslog tcl unzip users utmp x11 xforms \ - zlib +_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 \ + fv gdbint gdbm ggi gmp gnome1 graph gtk1 gtk2 hash hermes httpd13 \ + httpd20 httpd22 ibase iconvenc imagemagick imlib ldap libcurl libgd \ + libpng libxml2 lua mad matroska modplug mysql ncurses newt numlib \ + odbc oggvorbis openal opengl openssl oracle pasjpeg paszlib pcap \ + postgres proj4 pthreads pxlib regexpr rexx rsvg sdl sndfile sqlite \ + svgalib symbolic syslog tcl unzip users utmp uuid x11 xforms zlib .if defined(WANT_FPC_BASE) . if ${WANT_FPC_BASE:L} == "yes" -USE_FPC= gdbint graph ibase hash httpd13 httpd20 httpd22 mysql odbc oracle \ - pasjpeg paszlib pthreads postgres regexpr sqlite +USE_FPC= gdbint graph hash httpd13 httpd20 httpd22 ibase mysql odbc oracle \ + pasjpeg paszlib postgres pthreads regexpr sqlite . else IGNORE= unknown value, please use "yes" instead of . endif @@ -93,26 +102,31 @@ IGNORE= cannot install: unknown FPC unit ${UNITS} # Base units gdbint_UNIT= devel/fpc-gdbint graph_UNIT= graphics/fpc-graph -ibase_UNIT= databases/fpc-ibase hash_UNIT= security/fpc-hash httpd13_UNIT= www/fpc-httpd13 httpd20_UNIT= www/fpc-httpd20 httpd22_UNIT= www/fpc-httpd22 +ibase_UNIT= databases/fpc-ibase mysql_UNIT= databases/fpc-mysql odbc_UNIT= databases/fpc-odbc oracle_UNIT= databases/fpc-oracle pasjpeg_UNIT= graphics/fpc-pasjpeg paszlib_UNIT= archivers/fpc-paszlib -pthreads_UNIT= devel/fpc-pthreads postgres_UNIT= databases/fpc-postgres +pthreads_UNIT= devel/fpc-pthreads regexpr_UNIT= devel/fpc-regexpr sqlite_UNIT= databases/fpc-sqlite # Extra units +a52_UNIT= audio/fpc-a52 aspell_UNIT= textproc/fpc-aspell bfd_UNIT= devel/fpc-bfd +bzip2_UNIT= archivers/fpc-bzip2 cairo_UNIT= graphics/fpc-cairo chm_UNIT= misc/fpc-chm +dbus_UNIT= devel/fpc-dbus +dts_UNIT= multimedia/fpc-dts +fastcgi_UNIT= www/fpc-fastcgi fcl_async_UNIT= devel/fpc-fcl-async fcl_base_UNIT= devel/fpc-fcl-base fcl_db_UNIT= devel/fpc-fcl-db @@ -123,30 +137,47 @@ fcl_net_UNIT= devel/fpc-fcl-net fcl_passrc_UNIT= devel/fpc-fcl-passrc fcl_process_UNIT= devel/fpc-fcl-process fcl_registry_UNIT= devel/fpc-fcl-registry +fcl_res_UNIT= devel/fpc-fcl-res fcl_web_UNIT= devel/fpc-fcl-web fcl_xml_UNIT= devel/fpc-fcl-xml fftw_UNIT= math/fpc-fftw fpmkunit_UNIT= devel/fpc-fpmkunit fpgtk_UNIT= graphics/fpc-fpgtk +fpvectorial_UNIT= graphics/fpc-fpvectorial fv_UNIT= devel/fpc-fv +hermes_UNIT= graphics/fpc-hermes gdbm_UNIT= databases/fpc-gdbm ggi_UNIT= graphics/fpc-ggi +gmp_UNIT= math/fpc-gmp gnome1_UNIT= x11-toolkits/fpc-gnome1 gtk1_UNIT= x11-toolkits/fpc-gtk1 gtk2_UNIT= x11-toolkits/fpc-gtk2 iconvenc_UNIT= converters/fpc-iconvenc imagemagick_UNIT= graphics/fpc-imagemagick imlib_UNIT= graphics/fpc-imlib +ldap_UNIT= net/fpc-ldap libcurl_UNIT= ftp/fpc-libcurl libgd_UNIT= graphics/fpc-libgd libpng_UNIT= graphics/fpc-libpng +libxml2_UNIT= textproc/fpc-libxml2 +lua_UNIT= lang/fpc-lua +mad_UNIT= audio/fpc-mad +matroska_UNIT= multimedia/fpc-matroska +modplug_UNIT= audio/fpc-modplug +newt_UNIT= devel/fpc-newt ncurses_UNIT= graphics/fpc-ncurses numlib_UNIT= math/fpc-numlib +oggvorbis_UNIT= audio/fpc-oggvorbis +openal_UNIT= audio/fpc-openal opengl_UNIT= graphics/fpc-opengl openssl_UNIT= security/fpc-openssl pcap_UNIT= net/fpc-pcap +proj4_UNIT= graphics/fpc-proj4 pxlib_UNIT= databases/fpc-pxlib +rexx_UNIT= lang/fpc-rexx +rsvg_UNIT= graphics/fpc-rsvg sdl_UNIT= devel/fpc-sdl +sndfile_UNIT= audio/fpc-sndfile svgalib_UNIT= graphics/fpc-svgalib symbolic_UNIT= devel/fpc-symbolic syslog_UNIT= sysutils/fpc-syslog @@ -154,6 +185,7 @@ tcl_UNIT= lang/fpc-tcl unzip_UNIT= archivers/fpc-unzip users_UNIT= sysutils/fpc-users utmp_UNIT= sysutils/fpc-utmp +uuid_UNIT= sysutils/fpc-uuid x11_UNIT= x11/fpc-x11 xforms_UNIT= x11-toolkits/fpc-xforms zlib_UNIT= devel/fpc-zlib diff --git a/archivers/fpc-unzip/pkg-plist b/archivers/fpc-unzip/pkg-plist index d6c04494f779..972effb1b18b 100644 --- a/archivers/fpc-unzip/pkg-plist +++ b/archivers/fpc-unzip/pkg-plist @@ -1,10 +1,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/libpziptypes.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/libpunzip.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/libpunzip51g.a @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/converters/fpc-iconvenc/pkg-plist b/converters/fpc-iconvenc/pkg-plist index 45e8e53de260..46ded27ee5d3 100644 --- a/converters/fpc-iconvenc/pkg-plist +++ b/converters/fpc-iconvenc/pkg-plist @@ -1,7 +1,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc_dyn.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/iconvenc_dyn.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/libpiconvenc.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc/libpiconvenc_dyn.a @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/iconvenc @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile index 2bb30d108425..b2618799814c 100644 --- a/databases/fpc-odbc/Makefile +++ b/databases/fpc-odbc/Makefile @@ -18,6 +18,6 @@ MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR+= ${WRKUNITDIR} -OPTIONS= ODBC "Install ODBC library suite for Unix" on +OPTIONS= ODBC "Install ODBC library suite for Unix" off .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile index 9da736f8dc76..8421dbecc3b2 100644 --- a/databases/fpc-oracle/Makefile +++ b/databases/fpc-oracle/Makefile @@ -18,6 +18,6 @@ MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR+= ${WRKUNITDIR} -OPTIONS= ORACLE "Install oracle client" on +OPTIONS= ORACLE "Install oracle client" off .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-pxlib/Makefile b/databases/fpc-pxlib/Makefile index ad9311e27505..7d0089ccfd4b 100644 --- a/databases/fpc-pxlib/Makefile +++ b/databases/fpc-pxlib/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTVERSION= 0 +PORTREVISION= 0 CATEGORIES= databases lang PKGNAMESUFFIX= -pxlib diff --git a/devel/fpc-fcl-base/pkg-plist b/devel/fpc-fcl-base/pkg-plist index e23a76e2f169..1a116242a47b 100644 --- a/devel/fpc-fcl-base/pkg-plist +++ b/devel/fpc-fcl-base/pkg-plist @@ -1,4 +1,5 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/Package.fpc +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rtfpars.ppu @@ -28,6 +29,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/daemonapp.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rtfpars.o @@ -57,6 +59,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/daemonapp.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpascii85.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcontnrs.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpinifiles.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libprtfpars.a diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile index 0e3024bd0164..cc414331520d 100644 --- a/devel/fpc-fcl-db/Makefile +++ b/devel/fpc-fcl-db/Makefile @@ -12,8 +12,6 @@ PKGNAMESUFFIX= -fcl-db MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal Component Library -BROKEN= does not build - USE_FPC= fcl-async fcl-base fcl-xml hash ibase mysql odbc oracle paszlib postgres \ pthreads pxlib sqlite diff --git a/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile b/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile deleted file mode 100644 index ddfd7f2ab5df..000000000000 --- a/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- packages/fcl-db/Makefile 2009-01-07 21:56:28.000000000 -0500 -+++ packages/fcl-db/Makefile 2009-01-07 22:18:51.000000000 -0500 -@@ -2203,17 +2203,17 @@ - endif - $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) - endif --ifdef INSTALL_CREATEPACKAGEFPC --ifdef FPCMAKE --ifdef PACKAGE_VERSION --ifneq ($(wildcard Makefile.fpc),) -+#ifdef INSTALL_CREATEPACKAGEFPC -+#ifdef FPCMAKE -+#ifdef PACKAGE_VERSION -+#ifneq ($(wildcard Makefile.fpc),) - $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc - $(MKDIR) $(INSTALL_UNITDIR) - $(INSTALL) Package.fpc $(INSTALL_UNITDIR) --endif --endif --endif --endif -+#endif -+#endif -+#endif -+#endif - ifdef INSTALLPPUFILES - $(MKDIR) $(INSTALL_UNITDIR) - $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR) diff --git a/devel/fpc-fcl-db/pkg-plist b/devel/fpc-fcl-db/pkg-plist index 097c19008569..622b87cf5e30 100644 --- a/devel/fpc-fcl-db/pkg-plist +++ b/devel/fpc-fcl-db/pkg-plist @@ -206,6 +206,9 @@ 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/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-image/Makefile b/devel/fpc-fcl-image/Makefile index b81785621323..bbe89fb1909e 100644 --- a/devel/fpc-fcl-image/Makefile +++ b/devel/fpc-fcl-image/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-image diff --git a/devel/fpc-fcl-image/pkg-plist b/devel/fpc-fcl-image/pkg-plist index df1751968f8a..e791da34f2a8 100644 --- a/devel/fpc-fcl-image/pkg-plist +++ b/devel/fpc-fcl-image/pkg-plist @@ -2,7 +2,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadgif.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpng.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpsd.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxpm.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.ppu @@ -36,10 +39,14 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/xwdfile.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadgif.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpng.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpsd.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxpm.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.o @@ -73,10 +80,14 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/xwdfile.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimgcmn.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimage.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppngcomn.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadgif.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpng.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpsd.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadxwd.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritepng.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadxpm.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritexpm.a @@ -110,6 +121,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpquantizer.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpextinterpolation.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfreetype.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpftfont.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpxwdfile.a @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile index ba1f7f53ef44..998bf0760be6 100644 --- a/devel/fpc-fcl-web/Makefile +++ b/devel/fpc-fcl-web/Makefile @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -fcl-web MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal Component Library -USE_FPC= fcl-async fcl-base fcl-db fcl-process fcl-xml hash httpd13 httpd20 \ +USE_FPC= fastcgi fcl-async fcl-base fcl-db fcl-process fcl-xml hash httpd13 httpd20 \ httpd22 ibase mysql odbc oracle paszlib postgres pthreads sqlite MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-fcl-web/pkg-plist b/devel/fpc-fcl-web/pkg-plist index 6b2de3e8d60e..1cb1ec4f1a0e 100644 --- a/devel/fpc-fcl-web/pkg-plist +++ b/devel/fpc-fcl-web/pkg-plist @@ -4,8 +4,11 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.ppu +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/fptemplate.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.ppu @@ -17,8 +20,11 @@ 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/fpapache.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fptemplate.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.o @@ -30,8 +36,11 @@ 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/libpfptemplate.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphtml.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebsession.a diff --git a/devel/fpc-fcl-xml/Makefile b/devel/fpc-fcl-xml/Makefile index eedbe1a8e9b6..376be53fb7ee 100644 --- a/devel/fpc-fcl-xml/Makefile +++ b/devel/fpc-fcl-xml/Makefile @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -fcl-xml MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal Component Library -USE_FPC= fcl-async fcl-base hash paszlib pthreads +USE_FPC= fcl-async fcl-base hash iconvenc paszlib pthreads MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fcl-xml/pkg-plist b/devel/fpc-fcl-xml/pkg-plist index 59c9e5d26467..392535ea148e 100644 --- a/devel/fpc-fcl-xml/pkg-plist +++ b/devel/fpc-fcl-xml/pkg-plist @@ -7,6 +7,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_html.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom_html.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmliconv.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlread.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlstreaming.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlwrite.ppu @@ -24,6 +25,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_html.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom_html.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmliconv.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlread.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlstreaming.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlwrite.o @@ -41,6 +43,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdom.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax_html.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdom_html.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlcfg.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmliconv.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlread.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlstreaming.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlwrite.a diff --git a/devel/fpc-sdl/Makefile b/devel/fpc-sdl/Makefile index da3b28bf4cee..9643985b8e32 100644 --- a/devel/fpc-sdl/Makefile +++ b/devel/fpc-sdl/Makefile @@ -6,7 +6,6 @@ # PORTVERSION= 0 -PORTREVISION= 3 CATEGORIES= devel lang PKGNAMESUFFIX= -sdl diff --git a/devel/fpc-sdl/pkg-plist b/devel/fpc-sdl/pkg-plist index 5383a0a980a6..da58e8ba0bc5 100644 --- a/devel/fpc-sdl/pkg-plist +++ b/devel/fpc-sdl/pkg-plist @@ -8,7 +8,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/logger.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.ppu +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_image.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer.o @@ -18,7 +18,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/logger.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.o +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_image.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_mixer.a @@ -28,7 +28,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_gfx.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_net.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsmpeg.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libplogger.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdlutils.a +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdlutils.a @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile index c880c1f90731..cc40c85f65c8 100644 --- a/editors/fpc-ide/Makefile +++ b/editors/fpc-ide/Makefile @@ -5,15 +5,13 @@ # $FreeBSD$ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= editors lang PKGNAMESUFFIX= -ide MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal integrated IDE/compiler -BROKEN= does not build - USE_FPC= chm fcl-async fcl-base fv gdbint graph ibase hash mysql odbc \ oracle pasjpeg paszlib pthreads postgres regexpr sqlite diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile index fa9fc66970ff..b2a2d8841086 100644 --- a/ftp/fpc-libcurl/Makefile +++ b/ftp/fpc-libcurl/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= ftp lang PKGNAMESUFFIX= -libcurl diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile index bb6a1421ebf2..ac619e63dbf9 100644 --- a/graphics/fpc-cairo/Makefile +++ b/graphics/fpc-cairo/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics lang PKGNAMESUFFIX= -cairo diff --git a/graphics/fpc-graph/Makefile b/graphics/fpc-graph/Makefile index a29a742c0809..a663a7cf6436 100644 --- a/graphics/fpc-graph/Makefile +++ b/graphics/fpc-graph/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= graphics lang PKGNAMESUFFIX= -graph diff --git a/graphics/fpc-graph/pkg-plist b/graphics/fpc-graph/pkg-plist index 326a9f03468a..ce17ba149127 100644 --- a/graphics/fpc-graph/pkg-plist +++ b/graphics/fpc-graph/pkg-plist @@ -1,13 +1,13 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.ppu +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.o +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpgraph.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpggigraph.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpsdlgraph.a +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpsdlgraph.a @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index d16eef7905dc..af5f0057b928 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= graphics lang PKGNAMESUFFIX= -imagemagick diff --git a/graphics/fpc-imlib/Makefile b/graphics/fpc-imlib/Makefile index 664568628b7b..48f243618505 100644 --- a/graphics/fpc-imlib/Makefile +++ b/graphics/fpc-imlib/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= graphics lang PKGNAMESUFFIX= -imlib diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile index 74238995a79e..e930cb3a1c42 100644 --- a/graphics/fpc-libgd/Makefile +++ b/graphics/fpc-libgd/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= graphics lang PKGNAMESUFFIX= -libgd diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile index 85b3df6c972a..b9b2f7a8e4b8 100644 --- a/graphics/fpc-libpng/Makefile +++ b/graphics/fpc-libpng/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics lang PKGNAMESUFFIX= -libpng diff --git a/graphics/fpc-opengl/pkg-plist b/graphics/fpc-opengl/pkg-plist index 5e182c0aff09..59630ac0dbb1 100644 --- a/graphics/fpc-opengl/pkg-plist +++ b/graphics/fpc-opengl/pkg-plist @@ -15,6 +15,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglu.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglut.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglx.a %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemo.pp +%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemova.pp %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/morph3d.pp %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/glxtest.pp %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/radblur.pp diff --git a/graphics/fpc-pasjpeg/pkg-plist b/graphics/fpc-pasjpeg/pkg-plist index 34865a7724d0..2ee41e438a35 100644 --- a/graphics/fpc-pasjpeg/pkg-plist +++ b/graphics/fpc-pasjpeg/pkg-plist @@ -15,6 +15,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcomapi.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcparam.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcphuff.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcprepct.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jctrans.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jctrans.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcsample.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapimin.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapistd.ppu @@ -114,6 +116,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcomapi.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcparam.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcphuff.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcprepct.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjctrans.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcsample.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdapimin.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdapistd.a diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile index b3bb8728ed59..8f25a66c846e 100644 --- a/graphics/fpc-svgalib/Makefile +++ b/graphics/fpc-svgalib/Makefile @@ -18,6 +18,6 @@ MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR+= ${WRKUNITDIR} -OPTIONS= SVGA "Install svgalib low level console graphics library" on +OPTIONS= SVGA "Install svgalib low level console graphics library" off .include "${MASTERDIR}/Makefile" diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile index 715507dfccc3..f405a147aa79 100644 --- a/lang/fpc-base/Makefile +++ b/lang/fpc-base/Makefile @@ -6,8 +6,7 @@ # PORTNAME= base -PORTVERSION= 2.2.4 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= lang MASTER_SITES= # empty PKGNAMEPREFIX= fpc- @@ -23,8 +22,6 @@ WANT_FPC_BASE= yes RUN_DEPENDS+= ${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:${PORTSDIR}/lang/fpc-docs .endif -BROKEN= does not build - NO_BUILD= yes do-install: # empty diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile index e2163ecc4f9b..80f42d7f7eb3 100644 --- a/lang/fpc-docs/Makefile +++ b/lang/fpc-docs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= docs -PORTVERSION= 2.2.4 +PORTVERSION= 2.4.0 CATEGORIES= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \ ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/docs/ \ @@ -21,7 +21,7 @@ DIST_SUBDIR= freepascal MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal compiler Adobe Acrobat(tm) documentation -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes DOCSDIR= ${PREFIX}/share/doc/fpdocs-${PORTVERSION} diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo index 101b4622a9d4..63130687bb4d 100644 --- a/lang/fpc-docs/distinfo +++ b/lang/fpc-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (freepascal/doc-pdf.tar.gz) = 3a99d6bafb7bc2306128b4bd11748506 -SHA256 (freepascal/doc-pdf.tar.gz) = c60fda3b9184727181aa12d46b38eaf8beb56b4caa47c5d6a736352362313805 -SIZE (freepascal/doc-pdf.tar.gz) = 6436837 +MD5 (freepascal/doc-pdf.tar.gz) = 20c1d67974c4d3f4fc5d8c7f4136840e +SHA256 (freepascal/doc-pdf.tar.gz) = ba11897d6734da631f93764ff87cecc475e8f43be0c64e5ec8a6cfb69fe6d24e +SIZE (freepascal/doc-pdf.tar.gz) = 7192775 diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile index 11bf8a54c511..155ac9bc997b 100644 --- a/lang/fpc-utils/Makefile +++ b/lang/fpc-utils/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= lang PKGNAMESUFFIX= -utils diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist index f6ae5a29e72e..1684ee560d8e 100644 --- a/lang/fpc-utils/pkg-plist +++ b/lang/fpc-utils/pkg-plist @@ -18,6 +18,7 @@ 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 @@ -31,6 +32,7 @@ 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 @@ -44,6 +46,7 @@ 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 5b83da1555e7..242788740367 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fpc -PORTVERSION= 2.2.4 +PORTVERSION= 2.4.0 PORTREVISION?= 0 CATEGORIES?= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \ @@ -16,8 +16,10 @@ MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:sourc ftp://ftp.no.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \ ftp://ftp.us.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \ SF/freepascal/Source/${PORTVERSION}:source \ - ${MASTER_SITE_GOOGLE_CODE}:bin \ - ${MASTER_SITE_LOCAL:S|$|acm/freepascal/:bin|} + ${MASTER_SITE_GOOGLE_CODE}:bootstrap \ + ${MASTER_SITE_LOCAL:S|$|acm/freepascal/:bootstrap|} \ + ${MASTER_SITE_GOOGLE_CODE}:man \ + ${MASTER_SITE_LOCAL:S|$|acm/freepascal/:man|} DISTNAME= ${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME:S/$/.source/}${EXTRACT_SUFX}:source DIST_SUBDIR= freepascal @@ -27,7 +29,7 @@ COMMENT?= Free Pascal compiler with Turbo and Delphi PROJECTHOST= bsdistfiles USE_GMAKE= yes -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= i386 amd64 OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options SUB_FILES= pkg-message @@ -37,14 +39,28 @@ FPCSRCDIR= ${PORTNAME}-${PORTVERSION} .include <bsd.port.pre.mk> +.if ${ARCH} == "i386" +PPNAME= ppc386 +FPC_ARCH= i386 +PLIST_SUB= FPC_I386="" \ + FPC_AMD64="@comment " +.elif ${ARCH} == "amd64" +PPNAME= ppcx64 +FPC_ARCH= x86_64 +PLIST_SUB= FPC_I386="@comment " \ + FPC_AMD64="" +.endif + .if !defined(PKGNAMESUFFIX) -BUILDNAME= ${ARCH}-freebsd -PLIST_SUB= PORTVERSION=${PORTVERSION} \ +BUILDNAME= ${FPC_ARCH}-freebsd +PLIST_SUB+= PORTVERSION=${PORTVERSION} \ BUILDNAME=${BUILDNAME} -DISTFILES+= ${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin -MAKE_ENV+= PP=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/lib/${PORTNAME}/${PORTVERSION}/ppc386 \ - FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake \ +DISTFILES+= ${PPNAME}-${PORTVERSION}-${OPSYS:L}${EXTRACT_SUFX}:bootstrap \ + ${DISTNAME:S/$/.man/}${EXTRACT_SUFX}:man +MAKE_ENV+= PP=${WRKDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:L} \ + FPCMAKE=${WRKDIR}/${FPCSRCDIR}/utils/fpcm/fpcmake \ FPCTARGET=${BUILDNAME} \ + ARCH=${FPC_ARCH} \ OPT="${OPT}" \ BSDHIER=1 @@ -89,7 +105,10 @@ MAN5= fpc.cfg.5 fpcmake.5 ptop.cfg.5 do-extract: # unpack binary distribution @${MKDIR} ${WRKDIR} - @${TAR} xfz ${_DISTDIR}/${DISTNAME:S/$/.bin/}${EXTRACT_SUFX} --directory \ + @${TAR} xfz ${_DISTDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:L}${EXTRACT_SUFX} --directory \ + ${WRKDIR} && ${CHMOD} +x ${WRKDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:L} +# unpack man files + @${TAR} xfz ${_DISTDIR}/${DISTNAME:S/$/.man/}${EXTRACT_SUFX} --directory \ ${WRKDIR} # unpack source distribution @cd ${WRKDIR} && \ @@ -97,8 +116,13 @@ do-extract: | ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/utils/fpcm post-patch: -# patch fpc rtl - @${REINPLACE_CMD} -i "" -e 's|504000|${OSVERSION}|g' ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${ARCH}/cprt0.as +.if ${ARCH} == "i386" + @${REINPLACE_CMD} -i "" -e 's|504000|${OSVERSION}|g' ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/cprt0.as +.elif ${ARCH} == "amd64" + @${REINPLACE_CMD} -i "" -e 's|700055|${OSVERSION}|g' ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/cprt0.as + @${REINPLACE_CMD} -i "" -e 's|502110|${OSVERSION}|g' ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/gprt0.as + @${REINPLACE_CMD} -i "" -e 's|700055|${OSVERSION}|g' ${WRKDIR}/${FPCSRCDIR}/rtl/freebsd/${FPC_ARCH}/prt0.as +.endif do-build: # build fpc compiler @@ -114,12 +138,12 @@ do-install: # Installng fpcmake @@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} install ${MAKE_ENV} # Installing manpages - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/man/man1/* ${MAN1PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/man/man5/* ${MAN1PREFIX}/man/man5 + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.man/}/man/man1/* ${MAN1PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.man/}/man/man5/* ${MAN1PREFIX}/man/man5 post-install: - if [ -e "${PREFIX}/bin/ppc386" ]; then ${RM} -f "${PREFIX}/bin/ppc386"; fi - ${LN} -s "${PREFIX}/lib/fpc/${PORTVERSION}/ppc386" "${PREFIX}/bin" + if [ -e "${PREFIX}/bin/${PPNAME}" ]; then ${RM} -f "${PREFIX}/bin/${PPNAME}"; fi + ${LN} -s "${PREFIX}/lib/fpc/${PORTVERSION}/${PPNAME}" "${PREFIX}/bin" ${SH} "${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" "${PREFIX}/lib/fpc/${PORTVERSION}" "${PREFIX}/etc" @if [ ! -f ${PREFIX}/etc/fpc.cfg ]; then \ ${CP} ${PREFIX}/etc/fpc.cfg.sample ${PREFIX}/etc/fpc.cfg; \ diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index 49b945c23ddb..e1aa56fef17b 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -1,4 +1,6 @@ -PLIST_SUB= PORTVERSION=${PORTVERSION} \ +BUILDNAME= ${FPC_ARCH}-freebsd + +PLIST_SUB+= PORTVERSION=${PORTVERSION} \ BUILDNAME=${BUILDNAME} PLIST= ${.CURDIR}/pkg-plist @@ -13,9 +15,10 @@ UNITDIR= lib/fpc/${PORTVERSION}/units/${BUILDNAME} EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${EXTRACTUNITDIR} OPT=-CX -MAKE_ENV+= PP=${LOCALBASE}/bin/ppc386 \ +MAKE_ENV+= PP=${LOCALBASE}/bin/${PPNAME} \ FPCMAKE=${LOCALBASE}/bin/fpcmake \ FPCTARGET=${BUILDNAME} \ + ARCH=${FPC_ARCH} \ OPT="${OPT}" \ BSDHIER=1 @@ -82,8 +85,8 @@ HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-fcl-db" -OPT+= -Fuunits/${ARCH}-freebsd -Fu../units/${ARCH}-freebsd -Fu../* \ - -Fu../../units/${ARCH}-freebsd -Fu../../../units/${ARCH}-freebsd \ +OPT+= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \ + -Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME} \ -Fu../sqldb/* .endif @@ -235,6 +238,117 @@ USE_XLIB= yes USE_ICONV= yes .endif +.if ${PKGNAMESUFFIX} == "-a52" +. if defined(WITH_LIBA52) +LIB_DEPENDS= a52:${PORTSDIR}/audio/liba52 +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-dbus" +. if defined(WITH_DBUS) +LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-dts" +. if defined(WITH_LIBDCA) +LIB_DEPENDS= dca:${PORTSDIR}/multimedia/libdca +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-gmp" +. if defined(WITH_GMP) +LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-ldap" +. if defined(WITH_OPENLDAP) +USE_OPENLDAP= yes +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-libxml2" +. if defined(WITH_LIBXML2) +LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-lua" +. if defined(WITH_LUA) +LIB_DEPENDS= lua-5.1:${PORTSDIR}/lang/lua +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-mad" +. if defined(WITH_LIBMAD) +LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-matroska" +. if defined(WITH_LIBMATROSKA) +LIB_DEPENDS= matroska:${PORTSDIR}/multimedia/libmatroska +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-modplug" +. if defined(WITH_LIBMODPLUG) +LIB_DEPENDS= modplug:${PORTSDIR}/audio/libmodplug +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-newt" +. if defined(WITH_NEWT) +LIB_DEPENDS= newt:${PORTSDIR}/devel/newt +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-oggvorbis" +. if defined(WITH_LIBOGG) +LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg +. endif +. if defined(WITH_LIBVORBIS) +LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-openal" +. if defined(WITH_OPENAL) +LIB_DEPENDS= openal:${PORTSDIR}/audio/openal +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-proj4" +. if defined(WITH_PROJ) +LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-rexx" +. if defined(WITH_REXX_REGINA) +LIB_DEPENDS= regina:${PORTSDIR}/lang/rexx-regina +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-rsvg" +. if defined(WITH_LIBRSVG2) +LIB_DEPENDS= rsvg-2:${PORTSDIR}/graphics/librsvg2 +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-sndfile" +. if defined(WITH_LIBSNDFILE) +LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-hermes" +. if defined(WITH_HERMES) +LIB_DEPENDS= Hermes:${PORTSDIR}/graphics/Hermes +. endif +.endif + post-extract: @cd ${WRKDIR}/${WRKUNITDIR} && \ ${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf @@ -251,7 +365,7 @@ do-build: @cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} all ${MAKE_ENV} do-install: - @cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} install ${MAKE_ENV} + @cd ${WRKDIR}/${WRKUNITDIR} && FPCDIR=${UNITDIR} ${GMAKE} install ${MAKE_ENV} . if !defined(NOPORTSDOCS) . if defined(HAVE_EXAMPLES) @cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} fpc_exampleinstall diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo index 6aae983bda49..e12e08f8e140 100644 --- a/lang/fpc/distinfo +++ b/lang/fpc/distinfo @@ -1,6 +1,12 @@ -MD5 (freepascal/fpc-2.2.4.source.tar.gz) = ba75e0942f6ff6acc94f66ef2cc0a54e -SHA256 (freepascal/fpc-2.2.4.source.tar.gz) = 40756e9eef16b68a4628dd2225e8eacee9a2e4c2015e4db59d2ef9319a0067c8 -SIZE (freepascal/fpc-2.2.4.source.tar.gz) = 22851265 -MD5 (freepascal/fpc-2.2.4.bin.tar.gz) = 249fb81a82585114c4213db45113af5d -SHA256 (freepascal/fpc-2.2.4.bin.tar.gz) = c0f7c4dcedd95d172f6d24c4f1e3e66c460c0b32c655b8b46e2a30a350099cf5 -SIZE (freepascal/fpc-2.2.4.bin.tar.gz) = 8773896 +MD5 (freepascal/fpc-2.4.0.source.tar.gz) = d1c14576efc007efe876b95b3427df01 +SHA256 (freepascal/fpc-2.4.0.source.tar.gz) = 11bc81df2102325645955613737f2027a8acb0f2c9e8d564ad7318ca425e4f69 +SIZE (freepascal/fpc-2.4.0.source.tar.gz) = 25981207 +MD5 (freepascal/ppc386-2.4.0-freebsd.tar.gz) = 1fd7df3740d1758d2c58c1e276073904 +SHA256 (freepascal/ppc386-2.4.0-freebsd.tar.gz) = 870290e502c342d8eb56383bf717854cae38c84e66a4445d81efd7ea1a1166cd +SIZE (freepascal/ppc386-2.4.0-freebsd.tar.gz) = 809641 +MD5 (freepascal/ppcx64-2.4.0-freebsd.tar.gz) = 513be074ddb5db8b82442aae5143caa6 +SHA256 (freepascal/ppcx64-2.4.0-freebsd.tar.gz) = 9ce78fda4560c541a9fe9e0230e6fad1833940115ca9771443f07292ccbdad7d +SIZE (freepascal/ppcx64-2.4.0-freebsd.tar.gz) = 812761 +MD5 (freepascal/fpc-2.4.0.man.tar.gz) = 46d17eb2cfc63901ac44eedf0ee20aee +SHA256 (freepascal/fpc-2.4.0.man.tar.gz) = ee5dee733c4dc5bedd8117a019f19217425629ca6cc6e5d8917d61d9639f6368 +SIZE (freepascal/fpc-2.4.0.man.tar.gz) = 30300 diff --git a/lang/fpc/files/patch-rtl-bsd-x86_64_syscall.inc b/lang/fpc/files/patch-rtl-bsd-x86_64_syscall.inc new file mode 100644 index 000000000000..e024f7e44594 --- /dev/null +++ b/lang/fpc/files/patch-rtl-bsd-x86_64_syscall.inc @@ -0,0 +1,89 @@ +--- rtl/bsd/x86_64/syscall.inc 2008-09-13 19:17:13.000000000 +0100 ++++ rtl/bsd/x86_64/syscall.inc 2010-08-12 11:35:15.000000000 +0100 +@@ -219,7 +219,6 @@ + .LSyscOK: + end; + +- + function fpsysCall(sysnr,param1,param2,param3,param4,param5,param6 : TSysParam):TSysResult; assembler;[public,alias:'FPC_DOSYS6']; + + asm +@@ -232,7 +231,6 @@ + movq param6,%r9 + syscall { Do the system call. } + jnb .LSyscOK { branch to exit if ok, errorhandler otherwise} +- + movq %rax,%rdx + {$ifdef FPC_PIC} + movq fpc_threadvar_relocate_proc@GOTPCREL(%rip),%rax +@@ -257,50 +255,11 @@ + .LSyscOK: + + end; +-// edi esi edx ecx r8 r9 stack +-function fp_sysCall(sysnr,param1,param2,param3,param4,param5,param6 : TSysParam):TSysResult; assembler;[public,alias:'FPC__DOSYS']; + +-asm +- movq sysnr,%rax { Syscall number -> rax. } +- movq param1,%rdi { shift arg1 - arg6. } +- movq param2,%rsi +- movq param3,%rdx +- movq param4,%r10 +- movq param5,%r8 +- movq param6,%r9 +- syscall { Do the system call. } +- jnb .LSyscOK { branch to exit if ok, errorhandler otherwise} +- movq %rax,%rdx +-{$ifdef FPC_PIC} +- movq fpc_threadvar_relocate_proc@GOTPCREL(%rip),%rax +- movq (%rax),%rax +- movq Errno@GOTPCREL(%rip),%r11 +-{$else FPC_PIC} +- movq fpc_threadvar_relocate_proc,%rax +- leaq Errno,%r11 +-{$endif FPC_PIC} +- testq %rax,%rax +- jne .LThread +- movl %edx,8(%r11) +- jmp .LNoThread +-.LThread: +- pushq %rdx +- movq (%r11),%rdi +- call *%rax +- popq %rdx +- movl %edx,(%rax) +-.LNoThread: +- movq $-1,%rax +-.LSyscOK: +- add $0x18,%rsp +-end; +- +- +-// edi esi edx ecx r8 r9 stack stack +-function fp_sysCall(sysnr,param1,param2,param3,param4,param5,param6,param7 : TSysParam):TSysResult; assembler;[public,alias:'FPC__DOSYS7']; ++function fp_sysCall(sysnr,param1,param2,param3,param4,param5,param6,param7 : TSysParam):TSysResult; assembler;[public,alias:'FPC_DOSYS7']; + + asm +- sub $0x10,%rsp ++ subq $0x10,%rsp + movq sysnr,%rax { Syscall number -> rax. } + movq param1,%rdi { shift arg1 - arg6. } + movq param2,%rsi +@@ -309,7 +268,7 @@ + movq param5,%r8 + movq param6,%r9 + movq param7,%r11 +- movq %r11,(%rsp) ++ movq %r11,8(%rsp) + syscall { Do the system call. } + jnb .LSyscOK { branch to exit if ok, errorhandler otherwise} + movq %rax,%rdx +@@ -334,6 +293,6 @@ + .LNoThread: + movq $-1,%rax + .LSyscOK: +- add $0x10,%rsp ++ addq $0x10,%rsp + end; + + diff --git a/lang/fpc/files/patch-rtl-bsd-x86_64_syscallh.inc b/lang/fpc/files/patch-rtl-bsd-x86_64_syscallh.inc new file mode 100644 index 000000000000..89f0fe567c90 --- /dev/null +++ b/lang/fpc/files/patch-rtl-bsd-x86_64_syscallh.inc @@ -0,0 +1,10 @@ +--- rtl/bsd/x86_64/syscallh.inc 2008-10-31 18:19:44.000000000 +0000 ++++ rtl/bsd/x86_64/syscallh.inc 2010-08-12 11:35:15.000000000 +0100 +@@ -41,7 +41,5 @@ + function do_sysCall(sysnr,param1,param2,param3,param4,param5,param6:TSysParam):int64; external name 'FPC_DOSYS6'; + function do_sysCall(sysnr,param1,param2,param3,param4,param5,param6,param7:TSysParam):int64; external name 'FPC_DOSYS7'; + +-// special +-function do__sysCall(sysnr,param1,param2,param3,param4,param5,param6,param7,Param8:TSysParam):TSysResult; external name 'FPC__DOSYS'; + {$endif} + diff --git a/lang/fpc/files/patch-rtl-bsd_ossysc.inc b/lang/fpc/files/patch-rtl-bsd_ossysc.inc new file mode 100644 index 000000000000..8dabd322eb68 --- /dev/null +++ b/lang/fpc/files/patch-rtl-bsd_ossysc.inc @@ -0,0 +1,17 @@ +--- rtl/bsd/ossysc.inc 2009-05-02 10:40:44.000000000 +0100 ++++ rtl/bsd/ossysc.inc 2010-08-12 11:36:07.000000000 +0100 +@@ -94,11 +94,11 @@ + + begin + {$ifdef CPU64} +- Fpmmap:=pointer(ptruint(do__syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),TSysParam(offst),0,0))); ++ Fpmmap:=pointer(ptruint(do_syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),0,TSysParam(offst)))); + {$else} +- Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd, ++ Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,0, + {$ifdef FPC_BIG_ENDIAN} hi(offst),lo(offst){$endif} +- {$ifdef FPC_LITTLE_ENDIAN} lo(offst),hi(offst){$endif},0 ++ {$ifdef FPC_LITTLE_ENDIAN} lo(offst),hi(offst){$endif} + ))); + {$endif} + end; diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist index 291cf9b91bb8..bdb49eb2999e 100644 --- a/lang/fpc/pkg-plist +++ b/lang/fpc/pkg-plist @@ -1,4 +1,4 @@ -@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.11 2009-01-14 06:12:03 acm Exp $ +@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.12 2010-08-16 17:45:10 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 @@ -7,10 +7,13 @@ bin/fpc bin/fpcmake bin/fpcmkcfg bin/fpcsubst +bin/mkarmins +bin/mkx86ins bin/ppudump bin/ppufiles bin/ppumove -bin/ppc386 +%%FPC_I386%%bin/ppc386 +%%FPC_AMD64%%bin/ppcx64 lib/fpc/%%PORTVERSION%%/msg/errorct.msg lib/fpc/%%PORTVERSION%%/msg/errord.msg lib/fpc/%%PORTVERSION%%/msg/errorda.msg @@ -30,7 +33,8 @@ lib/fpc/%%PORTVERSION%%/msg/errorptw.msg lib/fpc/%%PORTVERSION%%/msg/errorues.msg lib/fpc/%%PORTVERSION%%/msg/errorr.msg lib/fpc/%%PORTVERSION%%/msg/errorrw.msg -lib/fpc/%%PORTVERSION%%/ppc386 +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/ppc386 +%%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/ppcx64 lib/fpc/%%PORTVERSION%%/samplecfg lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/baseunix.o @@ -48,8 +52,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 -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.ppu +%%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/crt.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/crt.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.o @@ -76,6 +80,9 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpintres.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fpintres.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfpintres.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/freebsd.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/getopts.o @@ -96,7 +103,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 -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcpu.a +%%FPC_I386%%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 @@ -121,7 +128,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libplnfodwrf.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmacpas.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmath.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmatrix.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmmx.a +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmmx.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpmouse.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpobjects.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpobjpas.a @@ -160,8 +167,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/math.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/math.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/matrix.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/matrix.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.ppu +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.o +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mouse.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mouse.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objects.o diff --git a/math/fpc-fftw/Makefile b/math/fpc-fftw/Makefile index 81b4b6d78944..cac7f8d65c98 100644 --- a/math/fpc-fftw/Makefile +++ b/math/fpc-fftw/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= math lang PKGNAMESUFFIX= -fftw diff --git a/security/fpc-hash/pkg-plist b/security/fpc-hash/pkg-plist index dbc4f22ab8a8..53180ad4407a 100644 --- a/security/fpc-hash/pkg-plist +++ b/security/fpc-hash/pkg-plist @@ -8,7 +8,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/ntlm.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpcrc.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpmd5.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpntlm.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpsha1.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/libpuuid.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/sha1.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/sha1.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash/uuid.ppu @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hash diff --git a/sysutils/fpc-users/Makefile b/sysutils/fpc-users/Makefile index febe7e01ab52..6f43df830410 100644 --- a/sysutils/fpc-users/Makefile +++ b/sysutils/fpc-users/Makefile @@ -6,7 +6,7 @@ # PORTREVISION= 0 -CATEGORIES= sysutils +CATEGORIES= sysutils lang PKGNAMESUFFIX= -users MAINTAINER= acm@FreeBSD.org diff --git a/textproc/fpc-aspell/pkg-plist b/textproc/fpc-aspell/pkg-plist index 1db57304d30e..51301145165a 100644 --- a/textproc/fpc-aspell/pkg-plist +++ b/textproc/fpc-aspell/pkg-plist @@ -1,11 +1,14 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspell.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspelldyn.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/spellcheck.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspell.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/aspelldyn.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/spellcheck.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/libpaspell.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/libpaspelldyn.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell/libpspellcheck.a -@dirrm lib/fpc/%%PORTVERSION%%/units/i386-freebsd/aspell +@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/aspell @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%% diff --git a/x11-toolkits/fpc-gnome1/Makefile b/x11-toolkits/fpc-gnome1/Makefile index ca3e6440b5a9..e802ed61aa44 100644 --- a/x11-toolkits/fpc-gnome1/Makefile +++ b/x11-toolkits/fpc-gnome1/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= x11-toolkits lang PKGNAMESUFFIX= -gnome1 diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile index 5ccbd804e048..375a2c100f79 100644 --- a/x11-toolkits/fpc-gtk2/Makefile +++ b/x11-toolkits/fpc-gtk2/Makefile @@ -5,14 +5,14 @@ # $FreeBSD$ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= x11-toolkits lang PKGNAMESUFFIX= -gtk2 MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal interface to the GTK2 libraries -USE_FPC= x11 +USE_FPC= cairo x11 MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/x11-toolkits/fpc-gtk2/pkg-plist b/x11-toolkits/fpc-gtk2/pkg-plist index b4ec912f912d..4e7517997852 100644 --- a/x11-toolkits/fpc-gtk2/pkg-plist +++ b/x11-toolkits/fpc-gtk2/pkg-plist @@ -1,9 +1,9 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/buildgtk2.ppu -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkhtml.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.ppu @@ -13,10 +13,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/buildgtk2.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkhtml.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.o @@ -28,6 +28,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpglib2.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpatk.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libppango.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libppangocairo.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2pixbuf.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2x.a @@ -36,7 +37,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtk2ext.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libplibglade2.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtkglext.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdkglext.a -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtkhtml.a @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile index 228c76f11d22..326a2c258cc4 100644 --- a/x11-toolkits/fpc-xforms/Makefile +++ b/x11-toolkits/fpc-xforms/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= x11-toolkits lang PKGNAMESUFFIX= -xforms |