diff options
Diffstat (limited to 'lang/fpc')
| -rw-r--r-- | lang/fpc/Makefile | 9 | ||||
| -rw-r--r-- | lang/fpc/Makefile.units | 95 | ||||
| -rw-r--r-- | lang/fpc/distinfo | 12 | ||||
| -rw-r--r-- | lang/fpc/files/patch-compiler-utils_samplecfg | 14 | ||||
| -rw-r--r-- | lang/fpc/pkg-plist | 8 |
5 files changed, 49 insertions, 89 deletions
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 876579fa281f..b7163dd9ef29 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -6,8 +6,8 @@ # PORTNAME= fpc -PORTVERSION= 2.2.0 -PORTREVISION?= 2 +PORTVERSION= 2.2.2 +PORTREVISION?= 0 CATEGORIES?= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \ ftp://planetmirror.com/pub/fpc/dist/source-${PORTVERSION}/:source \ @@ -25,8 +25,6 @@ DIST_SUBDIR= freepascal MAINTAINER?= acm@FreeBSD.org COMMENT?= Free Pascal compiler with Turbo and Delphi -LIB_DEPENDS= c.5:${PORTSDIR}/misc/compat5x - USE_GMAKE= yes ONLY_FOR_ARCHS= i386 @@ -47,7 +45,8 @@ MAKE_ENV+= PP=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/lib/${PORTNAME}/${P FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake \ FPCTARGET=${BUILDNAME} \ OPT="${OPT}" \ - BSDHIER=1 + BSDHIER=1 + MAN1= bin2obj.1 \ data2inc.1 \ delp.1 \ diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index 73e7b6e2aaab..0014c7be48d6 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -19,29 +19,22 @@ MAKE_ENV+= PP=${LOCALBASE}/bin/ppc386 \ OPT="${OPT}" \ BSDHIER=1 -.if ${PKGNAMESUFFIX} == "-gdbint" -HAVE_EXAMPLES= true -.endif - .if ${PKGNAMESUFFIX} == "-ibase" . if defined(WITH_IBASE) USE_FIREBIRD= yes . endif -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-mysql" . if defined(WITH_MYSQL) USE_MYSQL= yes . endif -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-odbc" . if defined(WITH_ODBC) LIB_DEPENDS= odbc.1:${PORTSDIR}/databases/unixODBC . endif -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-oracle" @@ -49,26 +42,12 @@ HAVE_EXAMPLES= true ORACLE8_LIB= ${LOCALBASE}/oracle8-client/rdbms/lib RUN_DEPENDS= ${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client . endif -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-postgres" . if defined(WITH_PGSQL) USE_PGSQL= yes . endif -HAVE_EXAMPLES= true -.endif - -.if ${PKGNAMESUFFIX} == "-pasjpeg" -HAVE_EXAMPLES= true -.endif - -.if ${PKGNAMESUFFIX} == "-paszlib" -HAVE_EXAMPLES= true -.endif - -.if ${PKGNAMESUFFIX} == "-regexpr" -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-sqlite" @@ -89,7 +68,13 @@ LIB_DEPENDS= fftw3.4:${PORTSDIR}/math/fftw3 . endif .endif -.if ${PKGNAMESUFFIX} == "-forms" +.if ${PKGNAMESUFFIX} == "-imagemagick" +. if defined(WITH_IMAGEMAGICK) +LIB_DEPENDS= Magick:${PORTSDIR}/graphics/ImageMagick +. endif +.endif + +.if ${PKGNAMESUFFIX} == "-xforms" . if defined(WITH_XFORMS) LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms . endif @@ -97,9 +82,9 @@ HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-fcl-db" -OPT+= -Fuunits/${ARCH}-freebsd -Fu../units/${ARCH}-freebsd \ - -Fu../src -Fu../../units/${ARCH}-freebsd -Fu../../../units/${ARCH}-freebsd -HAVE_EXAMPLES= true +OPT+= -Fuunits/${ARCH}-freebsd -Fu../units/${ARCH}-freebsd -Fu../* \ + -Fu../../units/${ARCH}-freebsd -Fu../../../units/${ARCH}-freebsd \ + -Fu../sqldb/* .endif .if ${PKGNAMESUFFIX} == "-fcl-net" @@ -117,29 +102,19 @@ USE_GNOME= gtk12 HAVE_EXAMPLES= true .endif -.if ${PKGNAMESUFFIX} == "-gconf" -. if defined(WITH_GCONF) -.include <${PORTSDIR}/Mk/bsd.gnome.mk> -USE_GNOME= gconf -. endif -HAVE_EXAMPLES= true -.endif - .if ${PKGNAMESUFFIX} == "-gdbm" . if defined(WITH_GDBM) LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm . endif -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-ggi" . if defined(WITH_LIBGGI) LIB_DEPENDS= ggi:${PORTSDIR}/graphics/libggi . endif -HAVE_EXAMPLES= true .endif -.if ${PKGNAMESUFFIX} == "-gtk" +.if ${PKGNAMESUFFIX} == "-gtk1" . if defined(WITH_GTK1) .include <${PORTSDIR}/Mk/bsd.gnome.mk> USE_GNOME= gtk12 @@ -156,17 +131,19 @@ USE_GNOME= gtk20 HAVE_EXAMPLES= true .endif -.if ${PKGNAMESUFFIX} == "-hash" -HAVE_EXAMPLES= true -.endif - -.if ${PKGNAMESUFFIX} == "-httpd" -. if defined(WITH_APACHE12) +.if ${PKGNAMESUFFIX} == "-httpd13" +. if defined(WITH_APACHE13) USE_APACHE= 13 . endif +.endif + +.if ${PKGNAMESUFFIX} == "-httpd20" . if defined(WITH_APACHE20) USE_APACHE= 20 . endif +.endif + +.if ${PKGNAMESUFFIX} == "-httpd22" . if defined(WITH_APACHE22) USE_APACHE= 22 . endif @@ -189,14 +166,12 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo . if defined(WITH_LIBCURL) LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl . endif -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-libgd" . if defined(WITH_LIBGD) LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd . endif -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-libpng" @@ -205,14 +180,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png . endif .endif -.if ${PKGNAMESUFFIX} == "-ncurses" -HAVE_EXAMPLES= true -.endif - -.if ${PKGNAMESUFFIX} == "-netdb" -HAVE_EXAMPLES= true -.endif - .if ${PKGNAMESUFFIX} == "-opengl" . if defined(WITH_OPENGL) USE_GL= yes @@ -233,22 +200,22 @@ LIB_DEPENDS= pcap:${PORTSDIR}/net/libpcap . endif .endif +.if ${PKGNAMESUFFIX} == "-sdl" +. if defined(WITH_SDL) +USE_SDL= sdl image mixer ttf gfx +. endif +.endif + .if ${PKGNAMESUFFIX} == "-svgalib" . if defined(WITH_SVGA) LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib . endif -HAVE_EXAMPLES= true -.endif - -.if ${PKGNAMESUFFIX} == "-syslog" -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-tcl" . if defined(WITH_TCL) RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 . endif -HAVE_EXAMPLES= true .endif .if ${PKGNAMESUFFIX} == "-unzip" @@ -261,24 +228,12 @@ RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip OPT+=-Fu../fcl/* .endif -.if ${PKGNAMESUFFIX} == "-utmp" -HAVE_EXAMPLES= true -.endif - .if ${PKGNAMESUFFIX} == "-x11" . if defined(WITH_X11) USE_XLIB= yes . endif .endif -.if ${PKGNAMESUFFIX} == "-zvt" -. if defined(WITH_ZVT) -.include <${PORTSDIR}/Mk/bsd.gnome.mk> -USE_GNOME= libzvt -. endif -HAVE_EXAMPLES= true -.endif - post-extract: @cd ${WRKDIR}/${WRKUNITDIR} && \ ${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo index 31dd69b3f38c..d15033505743 100644 --- a/lang/fpc/distinfo +++ b/lang/fpc/distinfo @@ -1,6 +1,6 @@ -MD5 (freepascal/fpc-2.2.0.source.tar.gz) = 870965d5352ef23dccc1cf277e6edfee -SHA256 (freepascal/fpc-2.2.0.source.tar.gz) = 2176cb79076f357095554eacf9df02b4b4471e54fe7e0214f61c4fc94535957f -SIZE (freepascal/fpc-2.2.0.source.tar.gz) = 20616222 -MD5 (freepascal/fpc-2.2.0.bin.tar.gz) = 998b0dcf38c414f9c62bf995e41e8069 -SHA256 (freepascal/fpc-2.2.0.bin.tar.gz) = 442f791cc047b549adc0b5a8ebc4718026d6043ccdef14f58d81f8f0c791ff86 -SIZE (freepascal/fpc-2.2.0.bin.tar.gz) = 7787026 +MD5 (freepascal/fpc-2.2.2.source.tar.gz) = a4e2dd83fe8b5ccaecb3f22b8604abbc +SHA256 (freepascal/fpc-2.2.2.source.tar.gz) = 33390c715b4d93d8380df5c5c25c4e5f181c2b830e60be54373d2bbac5f7543f +SIZE (freepascal/fpc-2.2.2.source.tar.gz) = 22329435 +MD5 (freepascal/fpc-2.2.2.bin.tar.gz) = 4747acc862f0bd7497dcf6d6481cfdca +SHA256 (freepascal/fpc-2.2.2.bin.tar.gz) = 8e0c3cf0b6852f021242603d98885865769efa248a0b4e2dbe1b85c12f465e81 +SIZE (freepascal/fpc-2.2.2.bin.tar.gz) = 8438137 diff --git a/lang/fpc/files/patch-compiler-utils_samplecfg b/lang/fpc/files/patch-compiler-utils_samplecfg index 134c4253b9a1..29d81563f18d 100644 --- a/lang/fpc/files/patch-compiler-utils_samplecfg +++ b/lang/fpc/files/patch-compiler-utils_samplecfg @@ -1,11 +1,11 @@ ---- compiler/utils/samplecfg 2008-01-06 01:17:24.468239657 +0300 -+++ compiler/utils/samplecfg 2008-01-06 01:36:20.388869514 +0300 -@@ -72,7 +72,7 @@ +--- compiler/utils/samplecfg 2008-06-04 13:06:36.000000000 -0500 ++++ compiler/utils/samplecfg 2009-01-06 22:35:23.000000000 -0500 +@@ -50,7 +50,7 @@ # Detect if we have write permission in root. - if [ -w $sysdir ] ; then + if [ -w "$sysdir" ] ; then echo Write permission in $sysdir. -- thefile=$sysdir/fpc.cfg -+ thefile=$sysdir/fpc.cfg.sample +- thefile="$sysdir"/fpc.cfg ++ thefile="$sysdir"/fpc.cfg.sample else echo No write premission in $sysdir. - thefile=$HOME/.fpc.cfg + thefile="$HOME"/.fpc.cfg diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist index 335c9e42cc38..291cf9b91bb8 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.10 2008-06-24 15:18:12 acm Exp $ +@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.11 2009-01-14 06:12:03 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 @@ -39,6 +39,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/bsd.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/bsd.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/classes.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/clocale.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/clocale.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cmem.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/console.o @@ -68,6 +70,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/errors.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.o +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/exeinfo.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fgl.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/fmtbcd.o @@ -88,6 +92,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/keyboard.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbaseunix.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpbsd.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclasses.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpclocale.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpcmem.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconsole.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpconvutils.a @@ -102,6 +107,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdl.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdos.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpdynlibs.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libperrors.a +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpexeinfo.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfgl.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfmtbcd.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/libpfreebsd.a |