svn commit: r326511 - head/lang/fpc
Guido Falsi
madpilot at FreeBSD.org
Fri Sep 6 15:15:11 UTC 2013
Author: madpilot
Date: Fri Sep 6 15:15:10 2013
New Revision: 326511
URL: http://svnweb.freebsd.org/changeset/ports/326511
Log:
Teach fpc not to try to link to libiconv on head after the iconv change.
This fixes the lang/fpc-utils port build.
Bump PORTREVISION due to runtime behaviour change on head.
Approved by: portmgr (bapt, implicit)
Modified:
head/lang/fpc/Makefile
head/lang/fpc/Makefile.units
Modified: head/lang/fpc/Makefile
==============================================================================
--- head/lang/fpc/Makefile Fri Sep 6 15:08:07 2013 (r326510)
+++ head/lang/fpc/Makefile Fri Sep 6 15:15:10 2013 (r326511)
@@ -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 at 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
Modified: head/lang/fpc/Makefile.units
==============================================================================
--- head/lang/fpc/Makefile.units Fri Sep 6 15:08:07 2013 (r326510)
+++ head/lang/fpc/Makefile.units Fri Sep 6 15:15:10 2013 (r326511)
@@ -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"
More information about the svn-ports-all
mailing list