Skip to content

Commit

Permalink
FPC ecosystem: Upgrade version 2.6.4 => 3.0.0
Browse files Browse the repository at this point in the history
This is the first major release of FreePascal in nearly four years.
There are a ton of new features, way more to list here. see:
http://wiki.freepascal.org/FPC_New_Features_3.0

Several new unit ports were added, some were contracted.  Most of
those were absorbed into the main FPC packages, but two units are
no longer supported: sndfile and matroshka.

All 99 remaining ports (including Lazarus ports) were build tested
on FreeBSD i386 and amd64 Release 10.2
  • Loading branch information
jrmarino committed Dec 5, 2015
1 parent 7a38e43 commit 02a040d
Show file tree
Hide file tree
Showing 227 changed files with 1,588 additions and 2,010 deletions.
8 changes: 7 additions & 1 deletion MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -8036,4 +8036,10 @@ databases/java-mybatis||2015-11-28|Has expired: Broken for more than 6 months
databases/openbase-jdbc||2015-11-28|Has expired: Broken for more than 6 months
www/mediawiki119|www/mediawiki125|2015-11-28|Has expired: Please upgrade to mediawiki-1.25
www/R-cran-Rpad||2015-11-28|Has expired: Unmaintained upstream
archivers/py-liblzma|py-pyliblzma|2015-11-30|Rename to match upstream (PyPI) naming
archivers/py-liblzma|archivers/py-pyliblzma|2015-11-30|Rename to match upstream (PyPI) naming
archivers/fpc-paszlib||2015-12-05|Eliminated during FPC upgrade to 3.0.0
audio/fpc-sndfile||2015-12-05|Eliminated during FPC upgrade to 3.0.0
devel/fpc-fcl-process||2015-12-05|Eliminated during FPC upgrade to 3.0.0
devel/fpc-fpmkunit||2015-12-05|Eliminated during FPC upgrade to 3.0.0
multimedia/fpc-matroska||2015-12-05|Eliminated during FPC upgrade to 3.0.0
security/fpc-hash||2015-12-05|Eliminated during FPC upgrade to 3.0.0
2 changes: 1 addition & 1 deletion Mk/bsd.default-versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ${_l:tu}_DEFAULT= ${lang:C/.*=//g}
.endfor

APACHE_DEFAULT?= 2.4
FPC_DEFAULT?= 2.6.4
FPC_DEFAULT?= 3.0.0
GCC_DEFAULT?= 4.8
LUA_DEFAULT?= 5.2
MYSQL_DEFAULT?= 5.6
Expand Down
60 changes: 28 additions & 32 deletions Mk/bsd.fpc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ _FPCMKINCLUDED= yes
WARNING+= "DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
.endif

FPC_Include_MAINTAINER= acm@FreeBSD.org
FPC_Include_MAINTAINER= freebsd-fpc@FreeBSD.org
FPC_Pre_Include= bsd.fpc.mk

DEFAULT_FPC_VER= ${FPC_DEFAULT}
Expand Down Expand Up @@ -64,22 +64,24 @@ BUILD_DEPENDS+= ${PPNAME}:${PORTSDIR}/lang/fpc

BUILDNAME= ${FPC_ARCH}-freebsd
UNITSDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}

_FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi fcl-async fcl-base \
fcl-db fcl-extra fcl-fpcunit fcl-image fcl-js fcl-json fcl-net fcl-passrc \
fcl-process fcl-registry fcl-res fcl-web fcl-xml fftw fpindexer \
fpmkunit fppkg fv gdbint gdbm gmp graph gtk2 hash \
hermes httpd22 httpd24 ibase iconvenc imagemagick ldap libcurl libgd \
libpng libvlc 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

_FPC_CFG_UNITS= fastcgi fcl-web
MKINSTDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}

_FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \
fcl-async fcl-base fcl-db fcl-extra fcl-fpcunit fcl-image \
fcl-js fcl-json fcl-net fcl-passrc fcl-registry fcl-res \
fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml fftw \
fpindexer fppkg fv gdbint gdbm gmp graph gtk2 hermes \
httpd22 httpd24 ibase iconvenc imagemagick ldap libcurl \
libgd libpng libvlc libxml2 lua mad modplug mysql \
ncurses newt numlib odbc oggvorbis openal opengl openssl \
oracle pasjpeg pcap postgres proj4 pthreads pxlib regexpr \
rexx rsvg rtl-console rtl-extra rtl-objpas rtl-unicode sdl \
sqlite svgalib symbolic syslog tcl unzip users utmp \
uuid x11 xforms zlib

.if defined(WANT_FPC_BASE)
. if ${WANT_FPC_BASE:tl} == "yes"
USE_FPC= gdbint graph hash httpd22 httpd24 ibase mysql odbc oracle pasjpeg paszlib \
USE_FPC= gdbint graph httpd22 httpd24 ibase mysql odbc oracle pasjpeg \
postgres pthreads regexpr sqlite
. else
IGNORE= unknown value, please use "yes" instead of
Expand All @@ -105,15 +107,13 @@ IGNORE= cannot install: unknown FPC unit ${UNITS}
# Base units
gdbint_UNIT= devel/fpc-gdbint
graph_UNIT= graphics/fpc-graph
hash_UNIT= security/fpc-hash
httpd22_UNIT= www/fpc-httpd22
httpd24_UNIT= www/fpc-httpd24
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
postgres_UNIT= databases/fpc-postgres
pthreads_UNIT= devel/fpc-pthreads
regexpr_UNIT= devel/fpc-regexpr
Expand All @@ -140,14 +140,15 @@ fcl_js_UNIT= devel/fpc-fcl-js
fcl_json_UNIT= devel/fpc-fcl-json
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_sdo_UNIT= devel/fpc-fcl-sdo
fcl_sound_UNIT= devel/fpc-fcl-sound
fcl_stl_UNIT= devel/fpc-fcl-stl
fcl_web_UNIT= devel/fpc-fcl-web
fcl_xml_UNIT= devel/fpc-fcl-xml
fftw_UNIT= math/fpc-fftw
fpindexer_UNIT= databases/fpc-fpindexer
fpmkunit_UNIT= devel/fpc-fpmkunit
fppkg_UNIT= devel/fpc-fppkg
fpvectorial_UNIT= graphics/fpc-fpvectorial
fv_UNIT= devel/fpc-fv
Expand All @@ -165,7 +166,6 @@ libvlc_UNIT= multimedia/fpc-libvlc
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
Expand All @@ -179,8 +179,11 @@ proj4_UNIT= graphics/fpc-proj4
pxlib_UNIT= databases/fpc-pxlib
rexx_UNIT= lang/fpc-rexx
rsvg_UNIT= graphics/fpc-rsvg
rtl_console_UNIT= lang/fpc-rtl-console
rtl_extra_UNIT= lang/fpc-rtl-extra
rtl_objpas_UNIT= lang/fpc-rtl-objpas
rtl_unicode_UNIT= lang/fpc-rtl-unicode
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
Expand All @@ -196,18 +199,11 @@ zlib_UNIT= devel/fpc-zlib
.endif

.if defined(_POSTMKINCLUDED) && defined(USE_FPC)
. for UNITS in ${USE_FPC}
. if ${_FPC_ALL_UNITS:M${UNITS}}!=""
. if ${_FPC_CFG_UNITS:M${UNITS}}!=""
BUILD_DEPENDS+= ${UNITSDIR}/${UNITS}/fpunits.cfg:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
. if defined(USE_FPC_RUN)
RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/fpunits.cfg:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
. endif
. else
BUILD_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
. if defined(USE_FPC_RUN)
RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT}
. endif
. for UNIT in ${USE_FPC}
. if ${_FPC_ALL_UNITS:M${UNIT}} != ""
BUILD_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${PORTSDIR}/${${UNIT:S/-/_/}_UNIT}
. if defined(USE_FPC_RUN)
RUN_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${PORTSDIR}/${${UNIT:S/-/_/}_UNIT}
. endif

security-check: fpc-check-install
Expand Down
1 change: 0 additions & 1 deletion archivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
SUBDIR += fastjar
SUBDIR += file-roller
SUBDIR += fpc-bzip2
SUBDIR += fpc-paszlib
SUBDIR += fpc-unzip
SUBDIR += freetar
SUBDIR += freeze
Expand Down
3 changes: 1 addition & 2 deletions archivers/fpc-bzip2/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# Created by: Christopher Key <[email protected]>
# $FreeBSD$

PORTREVISION= 1
CATEGORIES= archivers lang
PKGNAMESUFFIX= -bzip2

MAINTAINER= [email protected]
COMMENT= Free Pascal bzip2 unit

USE_FPC= yes
USE_FPC= rtl-extra

MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
Expand Down
6 changes: 2 additions & 4 deletions archivers/fpc-bzip2/pkg-plist
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/Package.fpc
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/bzip2.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2comn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2comn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2stream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2stream.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/libpbzip2.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/libpbzip2comn.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/libpbzip2stream.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bzip2/bzip2stream.rsj
58 changes: 0 additions & 58 deletions archivers/fpc-paszlib/pkg-plist

This file was deleted.

2 changes: 1 addition & 1 deletion archivers/fpc-unzip/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by: Alonso Cardenas Marquez <[email protected]>
# $FreeBSD$

PORTREVISION= 1
PORTREVISION= 0
CATEGORIES= archivers lang
PKGNAMESUFFIX= -unzip

Expand Down
8 changes: 3 additions & 5 deletions archivers/fpc-unzip/pkg-plist
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/Package.fpc
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.ppu
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/unzip.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip51g.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/libpziptypes.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/libpunzip51g.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.ppu
1 change: 0 additions & 1 deletion audio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
SUBDIR += fpc-modplug
SUBDIR += fpc-oggvorbis
SUBDIR += fpc-openal
SUBDIR += fpc-sndfile
SUBDIR += fplib
SUBDIR += freealut
SUBDIR += freedesktop-sound-theme
Expand Down
1 change: 0 additions & 1 deletion audio/fpc-a52/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Created by: Christopher Key <[email protected]>
# $FreeBSD$

PORTREVISION= 1
CATEGORIES= audio lang
PKGNAMESUFFIX= -a52

Expand Down
11 changes: 11 additions & 0 deletions audio/fpc-a52/files/patch-packages_a52_fpmake.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- packages/a52/fpmake.pp.orig 2015-01-05 19:27:06 UTC
+++ packages/a52/fpmake.pp
@@ -20,7 +20,7 @@ begin
P.Email := '';
P.Description := 'A free library for decoding ATSC A/52 streams.';
P.NeedLibC:= true;
- P.OSes := [linux,win32];
+ P.OSes := [linux,win32,dragonfly,freebsd];

{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
3 changes: 1 addition & 2 deletions audio/fpc-a52/pkg-plist
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/Package.fpc
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/a52.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/a52.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/a52.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/a52/libpa52.a
1 change: 0 additions & 1 deletion audio/fpc-mad/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Created by: Christopher Key <[email protected]>
# $FreeBSD$

PORTREVISION= 2
CATEGORIES= audio lang
PKGNAMESUFFIX= -mad

Expand Down
11 changes: 11 additions & 0 deletions audio/fpc-mad/files/patch-packages_mad_fpmake.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- packages/mad/fpmake.pp.orig 2015-08-29 16:37:05 UTC
+++ packages/mad/fpmake.pp
@@ -17,7 +17,7 @@ begin
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
P.Version:='3.0.0';
- P.OSes := [linux,win32,win64,wii];
+ P.OSes := [linux,win32,win64,wii,freebsd,dragonfly];
P.SourcePath.Add('src');

T:=P.Targets.AddUnit('mad.pas');
3 changes: 1 addition & 2 deletions audio/fpc-mad/pkg-plist
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/Package.fpc
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/mad.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/mad.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/mad.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mad/libpmad.a
1 change: 0 additions & 1 deletion audio/fpc-modplug/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Created by: Christopher Key <[email protected]>
# $FreeBSD$

PORTREVISION= 1
CATEGORIES= audio lang
PKGNAMESUFFIX= -modplug

Expand Down
11 changes: 11 additions & 0 deletions audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- packages/modplug/fpmake.pp.orig 2015-08-07 13:22:31 UTC
+++ packages/modplug/fpmake.pp
@@ -17,7 +17,7 @@ begin
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
P.Version:='3.0.0';
- P.OSes := [linux];
+ P.OSes := [linux,dragonfly,freebsd];
P.SourcePath.Add('src');

T:=P.Targets.AddUnit('modplug.pas');
3 changes: 1 addition & 2 deletions audio/fpc-modplug/pkg-plist
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/Package.fpc
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/modplug.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/modplug.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/modplug.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/modplug/libpmodplug.a
1 change: 0 additions & 1 deletion audio/fpc-oggvorbis/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Created by: Christopher Key <[email protected]>
# $FreeBSD$

PORTREVISION= 2
CATEGORIES= audio lang
PKGNAMESUFFIX= -oggvorbis

Expand Down
11 changes: 11 additions & 0 deletions audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- packages/oggvorbis/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
+++ packages/oggvorbis/fpmake.pp
@@ -19,7 +19,7 @@ begin
{$endif ALLPACKAGES}
P.Version:='3.0.1';
P.SourcePath.Add('src');
- P.OSes := [linux,win32,wince];
+ P.OSes := [linux,win32,wince,dragonfly,freebsd];
// P.Dependencies.Add('x11');

T:=P.Targets.AddUnit('ogg.pas');
6 changes: 2 additions & 4 deletions audio/fpc-oggvorbis/pkg-plist
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/Package.fpc
lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/oggvorbis.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/ogg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/vorbis.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/ogg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/vorbis.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/vorbis.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/libpogg.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oggvorbis/libpvorbis.a
1 change: 0 additions & 1 deletion audio/fpc-openal/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Created by: Christopher Key <[email protected]>
# $FreeBSD$

PORTREVISION= 1
CATEGORIES= audio lang
PKGNAMESUFFIX= -openal

Expand Down
Loading

0 comments on commit 02a040d

Please sign in to comment.