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

Teach fpc not to try to link to libiconv on head after the iconv change.

Browse source 
This fixes the lang/fpc-utils port build.

Bump PORTREVISION due to runtime behaviour change on head.

Approved by:	portmgr (bapt, implicit)
This commit is contained in:
Guido Falsi 2013-09-06 15:15:10 +00:00
parent f984209e90
commit 083576c0af
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=326511
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lang/fpc/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= fpc
PORTVERSION= 2.6.2
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES?= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
@ -23,7 +23,7 @@ MAINTAINER?= acm@FreeBSD.org
COMMENT?= Free Pascal compiler with Turbo and Delphi
PROJECTHOST= bsdistfiles
USE_GMAKE= yes
USES= gmake iconv
ONLY_FOR_ARCHS= i386 amd64
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
@ -122,6 +122,12 @@ post-patch:
@${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
.if empty(ICONV_LIB)
@${REINPLACE_CMD} -e "s|if (s<>'c') or reorder then|if ((s<>'c') and (s<>'iconv')) or reorder then|" \
${WRKDIR}/${FPCSRCDIR}/compiler/systems/t_bsd.pas
@${REINPLACE_CMD} -e 's|defined(bsd) and not ||' \
${WRKDIR}/${FPCSRCDIR}/rtl/unix/cwstring.pp
.endif
do-build:
# build fpc compiler

3
lang/fpc/Makefile.units
View file

@ -139,7 +139,8 @@ USE_FIREBIRD= yes
.endif
.if ${PKGNAMESUFFIX} == "-iconvenc"
USES+= iconv
# added to main port to make it compile on 10 with iconv in libc
# USES+=iconv
.endif
.if ${PKGNAMESUFFIX} == "-ide"