- Rebuild bootstrap (ppcx64 and ppc386) with ld patches

- Fix build on 12-STABLE and CURRENT (amd64 and i386)
- Bump PORTREVISION for all ports that depends of lang/fpc
- Add USE_BINUTILS to fpc and lazarus based ports
- Add binutils dependency to Uses/fpc.mk and Uses/lazarus.mk

PR:		240293 239934 233413 214864
Exp-run by:	antoine

44 files changed, 97 insertions, 54 deletions

diff --git a/Mk/Uses/fpc.mk b/Mk/Uses/fpc.mk
index f7761f606689..2438fca5ec15 100644
--- a/Mk/Uses/fpc.mk
+++ b/Mk/Uses/fpc.mk
@@ -61,7 +61,8 @@ ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 .endif
 
-BUILD_DEPENDS+=		${PPNAME}:lang/fpc
+BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			${PPNAME}:lang/fpc
 
 BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
 UNITSDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk
index d6151d51aa4f..d619be008a1d 100644
--- a/Mk/Uses/lazarus.mk
+++ b/Mk/Uses/lazarus.mk
@@ -72,7 +72,8 @@ LAZARUS_DIR?=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 
-BUILD_DEPENDS+=		fpcres:lang/fpc-utils
+BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			fpcres:lang/fpc-utils
 
 BUILDNAME=		${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_UNITS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile
index 3d0a5fe9fb9d..4feb17245b71 100644
--- a/archivers/peazip/Makefile
+++ b/archivers/peazip/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	peazip
 PORTVERSION=	6.8.1
+PORTREVISION=	1
 CATEGORIES=	archivers
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/
diff --git a/archivers/peazip/pkg-plist b/archivers/peazip/pkg-plist
index 36c3bf0d0321..ac4aa7acb18f 100644
--- a/archivers/peazip/pkg-plist
+++ b/archivers/peazip/pkg-plist
@@ -44,6 +44,7 @@ share/icons/hicolor/256x256/apps/peazip.png
 %%DATADIR%%/res/lang/ru.txt
 %%DATADIR%%/res/lang/si.txt
 %%DATADIR%%/res/lang/sk.txt
+%%DATADIR%%/res/lang/sl.txt
 %%DATADIR%%/res/lang/sv.txt
 %%DATADIR%%/res/lang/tj.txt
 %%DATADIR%%/res/lang/tr.txt
diff --git a/cad/zcad/Makefile b/cad/zcad/Makefile
index bb711583fb8a..5735b0134bd2 100644
--- a/cad/zcad/Makefile
+++ b/cad/zcad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zcad
 PORTVERSION=	0.9.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 437dbfdb0c8f..bf683e4d0abe 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	cqrlog
 PORTVERSION=	2.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
diff --git a/databases/fpc-fpindexer/Makefile b/databases/fpc-fpindexer/Makefile
index 1db606c1b495..c159449394b6 100644
--- a/databases/fpc-fpindexer/Makefile
+++ b/databases/fpc-fpindexer/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-fpindexer
 
diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
index 373d9305795a..309ce4689c3c 100644
--- a/databases/fpc-gdbm/Makefile
+++ b/databases/fpc-gdbm/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-gdbm
 
diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
index c862f28fdd5b..472a99069cd6 100644
--- a/databases/fpc-ibase/Makefile
+++ b/databases/fpc-ibase/Makefile
@@ -1,7 +1,7 @@
 # Created by: John Merryweather Cooper
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-ibase
 
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
index 77da65850b0e..bf635ab82767 100644
--- a/databases/fpc-postgres/Makefile
+++ b/databases/fpc-postgres/Makefile
@@ -1,7 +1,7 @@
 # Created by: John Merryweather Cooper et al
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-postgres
 
diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile
index eb99b90e30d0..c2ff97180215 100644
--- a/devel/fpc-fcl-db/Makefile
+++ b/devel/fpc-fcl-db/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-db
 
diff --git a/devel/fpc-fcl-js/Makefile b/devel/fpc-fcl-js/Makefile
index 0c80b9817eea..3f75b376cd1f 100644
--- a/devel/fpc-fcl-js/Makefile
+++ b/devel/fpc-fcl-js/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-js
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Free Pascal Javascript scanner/parser/syntax tree (FCL)
 
diff --git a/devel/fpc-fcl-json/Makefile b/devel/fpc-fcl-json/Makefile
index 2b1baf3cfbc1..9c8b6d4db00c 100644
--- a/devel/fpc-fcl-json/Makefile
+++ b/devel/fpc-fcl-json/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-json
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Free Pascal JavaScript Object Notation implemenation (FCL)
 
diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile
index c0236d78bbc2..51a3e34bb912 100644
--- a/devel/fpc-fcl-passrc/Makefile
+++ b/devel/fpc-fcl-passrc/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-passrc
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Free Pascal language parsing library (FPC)
 
diff --git a/devel/fpc-fcl-pdf/Makefile b/devel/fpc-fcl-pdf/Makefile
index 012b8ee42ef4..8d78a4b62949 100644
--- a/devel/fpc-fcl-pdf/Makefile
+++ b/devel/fpc-fcl-pdf/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-pdf
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Free Pascal pdf (FCL)
 
diff --git a/devel/fpc-fcl-sdo/Makefile b/devel/fpc-fcl-sdo/Makefile
index dca8b4f88370..5a601b57617c 100644
--- a/devel/fpc-fcl-sdo/Makefile
+++ b/devel/fpc-fcl-sdo/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-sdo
 
diff --git a/devel/fpc-fcl-stl/Makefile b/devel/fpc-fcl-stl/Makefile
index c04a58fe5f62..1efe8912bbe8 100644
--- a/devel/fpc-fcl-stl/Makefile
+++ b/devel/fpc-fcl-stl/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-stl
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Free Pascal generic container library (FCL)
 
diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile
index 5f6f27d555f0..f7cfec408098 100644
--- a/devel/fpc-fcl-web/Makefile
+++ b/devel/fpc-fcl-web/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-web
-PORTREVISION=	4
+PORTREVISION=	5
 
 COMMENT=	Free Pascal web application libary (FCL)
 
diff --git a/devel/fpc-fppkg/Makefile b/devel/fpc-fppkg/Makefile
index 35cef601ac18..598f495820aa 100644
--- a/devel/fpc-fppkg/Makefile
+++ b/devel/fpc-fppkg/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fppkg
 
diff --git a/devel/fpc-sdl/Makefile b/devel/fpc-sdl/Makefile
index 9b5d77dda4c1..43a95a13576b 100644
--- a/devel/fpc-sdl/Makefile
+++ b/devel/fpc-sdl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-sdl
 
diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index 2309f515985d..bfa27868b284 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cudatext
 PORTVERSION=	1.84.2
+PORTREVISION=	1
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 0aa0ec460d04..7bf337ed0c26 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	lazarus
 PORTVERSION=	2.0.4
 PKGNAMESUFFIX?=  -gtk2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
 		LOCAL/acm/freepascal
@@ -14,8 +14,10 @@ COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler (GTK2)
 
 CONFLICTS?=	${PORTNAME}-qt5-*
 
-BUILD_DEPENDS?=	fpcres:lang/fpc-utils
-RUN_DEPENDS?=	fpcres:lang/fpc-utils \
+BUILD_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils \
+		fpcres:lang/fpc-utils
+RUN_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils \
+		fpcres:lang/fpc-utils \
 		${LOCALBASE}/share/fpc-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc-source
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
index 713eca4bacec..636fc5604b50 100644
--- a/editors/picpas/Makefile
+++ b/editors/picpas/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	picpas
 PORTVERSION=	0.8.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index fb536a44c63b..4e8adee97b6f 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hedgewars
 PORTVERSION=	0.9.25
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.hedgewars.org/download/releases/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -27,7 +27,6 @@ USE_QT=		core gui widgets network \
 		qmake_build buildtools_build \
 		linguisttools_build
 USE_GL=		gl glu glew
-LLD_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	bin/${PORTNAME} bin/hwengine \
diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile
index 864730b5f5bd..eb8532cb159b 100644
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imagemagick
diff --git a/graphics/lazpaint/Makefile b/graphics/lazpaint/Makefile
index da122bc9b35a..da9ffc7432a0 100644
--- a/graphics/lazpaint/Makefile
+++ b/graphics/lazpaint/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	lazpaint
 PORTVERSION=	6.4.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index a0a28ad2a0c5..950908b45b17 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	base
 PORTVERSION=	3.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 PKGNAMEPREFIX=	fpc-
 
diff --git a/lang/fpc-rtl-objpas/Makefile b/lang/fpc-rtl-objpas/Makefile
index 675809c9d8e2..5f902a6368b4 100644
--- a/lang/fpc-rtl-objpas/Makefile
+++ b/lang/fpc-rtl-objpas/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-rtl-objpas
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Free Pascal compatibility unit with Delphi
 
diff --git a/lang/fpc-source/Makefile b/lang/fpc-source/Makefile
index eabf8191c28c..8d7f2f818028 100644
--- a/lang/fpc-source/Makefile
+++ b/lang/fpc-source/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	fpc
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 DISTVERSIONSUFFIX=.source
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/ \
diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile
index 6230819b781e..d86457602bd4 100644
--- a/lang/fpc-utils/Makefile
+++ b/lang/fpc-utils/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-utils
 
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 45ca18b7cc39..909ee3e05500 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fpc
 PORTVERSION=	3.0.4
-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 \
@@ -24,10 +24,11 @@ COMMENT?=	Free Pascal compiler with Turbo and Delphi
 ONLY_FOR_ARCHS=	amd64 i386
 
 USES+=		gmake iconv
+USE_BINUTILS=	yes
 BOOTVER=	3.0.4
 MANVER=		3.0.4
 
-LDPATH=		"/usr/bin/ld.bfd"
+LDPATH=		"${LOCALBASE}/bin/ld.bfd"
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	fpc-svn
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index 5a753b704a7b..8c9e8da22029 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1565836737
+TIMESTAMP = 1567485058
 SHA256 (freepascal/fpc-3.0.4.source.tar.gz) = 69b3b7667b72b6759cf27226df5eb54112ce3515ff5efb79d95ac14bac742845
 SIZE (freepascal/fpc-3.0.4.source.tar.gz) = 40347617
-SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 08a4435a9c68a63bbd121444f66e5456e0fbe8fdf379731e2614857907fc7eca
-SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1121403
-SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = c7d52af013d589a9bf473c40ee388d39fa6bc6d3af1158bd7e06b83ae1349f0d
-SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1217045
+SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 5cb99da20f8b7526aacdd6f3b242debb7608127e55a65a362f78717cd2592c7a
+SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1121502
+SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = c5b55d450a0835de33613ea1147245c5442525caf029f71f62dd77f771753c7e
+SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1198446
 SHA256 (freepascal/fpc-3.0.4.man.tar.gz) = bc5357fc6e56d77eeeb5d820023f7f721f5febcc684837f296a598c6c772b26c
 SIZE (freepascal/fpc-3.0.4.man.tar.gz) = 47294
diff --git a/lang/fpc/files/patch-compiler_systems_t__bsd.pas b/lang/fpc/files/patch-compiler_systems_t__bsd.pas
index 7f5d7d2d5a89..92098f7cc7ea 100644
--- a/lang/fpc/files/patch-compiler_systems_t__bsd.pas
+++ b/lang/fpc/files/patch-compiler_systems_t__bsd.pas
@@ -1,5 +1,45 @@
 --- compiler/systems/t_bsd.pas	2014-12-07 15:27:02.000000000 -0500
-+++ compiler/systems/t_bsd.pas	2019-08-15 01:12:52.940972000 -0500
++++ compiler/systems/t_bsd.pas	2019-09-02 21:10:43.316197000 -0500
+@@ -146,8 +146,8 @@
+        begin
+          if not(target_info.system in systems_darwin) then
+            begin
+-             ExeCmd[1]:='ld $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $CATRES';
+-             DllCmd[1]:='ld $TARGET $EMUL $OPT -shared -L. -o $EXE $CATRES'
++             ExeCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $CATRES';
++             DllCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT -shared -L. -o $EXE $CATRES'
+            end
+          else
+            begin
+@@ -166,22 +166,22 @@
+                programs with problems that require Valgrind will have more
+                than 60KB of data (first 4KB of address space is always invalid)
+              }
+-               ExeCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES';
++               ExeCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES';
+              if not(cs_gdb_valgrind in current_settings.globalswitches) then
+                ExeCmd[1]:=ExeCmd[1]+' -pagezero_size 0x10000';
+ {$else ndef cpu64bitaddr}
+-             ExeCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES';
++             ExeCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES';
+ {$endif ndef cpu64bitaddr}
+              if (apptype<>app_bundle) then
+-               DllCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -dylib -multiply_defined suppress -L. -o $EXE $CATRES'
++               DllCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -dylib -multiply_defined suppress -L. -o $EXE $CATRES'
+              else
+-               DllCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -bundle -multiply_defined suppress -L. -o $EXE $CATRES'
++               DllCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -bundle -multiply_defined suppress -L. -o $EXE $CATRES'
+            end
+        end
+      else
+        begin
+-         ExeCmd[1]:='ld $TARGET $EMUL $OPT $DYNLINK $STATIC  $GCSECTIONS $STRIP -L. -o $EXE $RES';
+-         DllCmd[1]:='ld $TARGET $EMUL $OPT $INIT $FINI $SONAME -shared -L. -o $EXE $RES';
++         ExeCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT $DYNLINK $STATIC  $GCSECTIONS $STRIP -L. -o $EXE $RES';
++         DllCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT $INIT $FINI $SONAME -shared -L. -o $EXE $RES';
+        end;
+      if not(target_info.system in systems_darwin) then
+        DllCmd[2]:='strip --strip-unneeded $EXE'
 @@ -192,6 +192,8 @@
        DynamicLinker:='/usr/libexec/ld.so'
       else if target_info.system in systems_netbsd then
@@ -14,7 +54,7 @@
        begin
          S:=SharedLibFiles.GetFirst;
 -        if (s<>'c') or reorder then
-+        if ((((((s<>'c') and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) or reorder then
++        if (((((((s<>'c') and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) or reorder then
           begin
             i:=Pos(target_info.sharedlibext,S);
             if i>0 then
diff --git a/lang/nbc/Makefile b/lang/nbc/Makefile
index 152d2e10c7c0..03e20ced4131 100644
--- a/lang/nbc/Makefile
+++ b/lang/nbc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		nbc
 PORTVERSION=		1.2.1.r4
-PORTREVISION=		13
+PORTREVISION=		14
 CATEGORIES=		lang
 MASTER_SITES=		SF/bricxcc/NBC_NXC/NBC%20release%20${PORTVERSION:S/.r/%20r/}
 DISTNAME=		${PORTNAME}-${PORTVERSION}.src
@@ -33,8 +33,6 @@ PLIST_FILES=		bin/nbc \
 PORTDOCS=		Changelog \
 			Readme
 
-LLD_UNSAFE=		yes # PR 228613, needs FPC changes?
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' ${WRKSRC}/${MAKEFILE}
diff --git a/multimedia/fpc-libvlc/Makefile b/multimedia/fpc-libvlc/Makefile
index 7a8c4531a9f5..53dfa28b93d5 100644
--- a/multimedia/fpc-libvlc/Makefile
+++ b/multimedia/fpc-libvlc/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia lang
 PKGNAMESUFFIX=	-libvlc
 
diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index e995c896b9d5..5eec674bb965 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WinFF
 PORTVERSION=	1.5.5
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia
 MASTER_SITES=	http://winff.org/docs/source/
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
diff --git a/net-p2p/awgg/Makefile b/net-p2p/awgg/Makefile
index f7d6e16bb75d..8614fd25eb03 100644
--- a/net-p2p/awgg/Makefile
+++ b/net-p2p/awgg/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	awgg
 PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
index b5d1ec22482a..66d8ded7c802 100644
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	transmission-remote-gui
 PORTVERSION=	5.17.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile
index feed04b945c9..5b8d6665feb5 100644
--- a/russian/emkatic/Makefile
+++ b/russian/emkatic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	emkatic
 PORTVERSION=	0.36
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	russian emulators
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	SF/${PORTNAME}/eMKatic%20Source
diff --git a/science/checkmol/Makefile b/science/checkmol/Makefile
index 9b8725c54c2a..cee51a8ce97d 100644
--- a/science/checkmol/Makefile
+++ b/science/checkmol/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	checkmol
 PORTVERSION=	0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 MASTER_SITES=	http://merian.pch.univie.ac.at/pch/download/chemistry/checkmol/
 EXTRACT_SUFX=	.pas
@@ -23,8 +23,6 @@ USES=		fpc
 
 PLIST_FILES=	bin/checkmol bin/matchmol
 
-LLD_UNSAFE=	yes
-
 do-build:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/fpc ${EXTRACT_ONLY} -S2 -O3)
 
diff --git a/science/mol2ps/Makefile b/science/mol2ps/Makefile
index a8cc409fcdb5..e055a86362d6 100644
--- a/science/mol2ps/Makefile
+++ b/science/mol2ps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mol2ps
 PORTVERSION=	0.4b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	http://merian.pch.univie.ac.at/pch/download/chemistry/${PORTNAME}/
 DISTNAME=	${PORTNAME}
@@ -26,8 +26,6 @@ USE_FPC=	rtl-objpas
 
 PLIST_FILES=	bin/mol2eps bin/mol2ps bin/mol2svg %%DATADIR%%/color.conf
 
-LLD_UNSAFE=	yes
-
 do-build:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/fpc mol2ps -S2 -O3)
 
diff --git a/www/fpc-googleapi/Makefile b/www/fpc-googleapi/Makefile
index 6d82956df646..161df50dcfa2 100644
--- a/www/fpc-googleapi/Makefile
+++ b/www/fpc-googleapi/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www lang
 PKGNAMESUFFIX=	-googleapi
 
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index b227e07a4204..8921dc296fc0 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	doublecmd
 PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile
index 40dab44b250f..5151c2a376f0 100644
--- a/x11/fpc-x11/Makefile
+++ b/x11/fpc-x11/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES=	x11 lang
 PKGNAMESUFFIX=	-x11
-PORTREVISION=	3
+PORTREVISION=	4
 
 COMMENT=	Free Pascal interface to X windows server