Index: audio/alure/Makefile =================================================================== --- audio/alure/Makefile +++ audio/alure/Makefile @@ -15,8 +15,9 @@ USES= cmake compiler:c++11-lang openal:soft pkgconfig USE_LDCONFIG= yes -LLD_UNSAFE= yes # lld disallows preemption of protected visibility syms CMAKE_OFF= BUILD_DOCS BUILD_STATIC + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= * PORTEXAMPLES= * Index: audio/freealut/Makefile =================================================================== --- audio/freealut/Makefile +++ audio/freealut/Makefile @@ -16,7 +16,7 @@ LDFLAGS+= -L${LOCALBASE}/lib USES= gmake libtool openal:al pathfix pkgconfig USE_LDCONFIG= yes -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext INSTALL_TARGET= install-strip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: audio/openal-soft/Makefile =================================================================== --- audio/openal-soft/Makefile +++ audio/openal-soft/Makefile @@ -24,10 +24,6 @@ # do not link with librt and libdl. LDFLAGS+= -Wl,--as-needed LDFLAGS_i386= -Wl,-z,notext -# XXX Drop after FreeBSD 12.0 EOL -.if exists(/usr/lib/clang/6.0.1) -LLD_UNSAFE= yes -.endif PLIST_SUB= SOVERSION=${PORTVERSION} Index: devel/love07/Makefile =================================================================== --- devel/love07/Makefile +++ devel/love07/Makefile @@ -32,7 +32,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib \ --program-suffix=07 WRKSRC= ${WRKDIR}/love-HEAD Index: devel/love08/Makefile =================================================================== --- devel/love08/Makefile +++ devel/love08/Makefile @@ -30,7 +30,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib \ --program-suffix=08 WRKSRC= ${WRKDIR}/love-${PORTVERSION} Index: emulators/fs-uae/Makefile =================================================================== --- emulators/fs-uae/Makefile +++ emulators/fs-uae/Makefile @@ -25,12 +25,12 @@ USE_GNOME= glib20 USE_XORG= x11 -LLD_UNSAFE= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-jit CFLAGS+= -Wno-c++11-narrowing +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= DOCS Index: emulators/pcem/Makefile =================================================================== --- emulators/pcem/Makefile +++ emulators/pcem/Makefile @@ -23,10 +23,4 @@ GNU_CONFIGURE= yes ONLY_FOR_ARCHS= amd64 -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 -LDFLAGS+= -fuse-ld=bfd -.endif - .include Index: emulators/rpcs3/Makefile =================================================================== --- emulators/rpcs3/Makefile +++ emulators/rpcs3/Makefile @@ -44,20 +44,6 @@ CMAKE_OFF= USE_NATIVE_INSTRUCTIONS LDFLAGS+= -Wl,--as-needed # GLU -# XXX Drop after FreeBSD 12.0 EOL -.if exists(/usr/lib/clang/6.0.1) -LLD_UNSAFE= yes # XXX ports/219089 -.endif - -# XXX Remove after FreeBSD 11.2/12.0 reach EOL i.e., around 2020-02-01 -.if make(makesum) || (!exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so)) -MASTER_SITES+= https://releases.llvm.org/${LLVM_VER}/:libcxx -DISTFILES+= libcxx-${LLVM_VER}.src.tar.xz:libcxx -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-no-cotire -CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include -LLVM_VER= 8.0.0 # same as FreeBSD 11.3 -.endif - OPTIONS_DEFINE= ALSA EVDEV FAUDIO LLVM PULSEAUDIO VULKAN OPTIONS_DEFAULT=FAUDIO LLVM VULKAN Index: games/OpenTomb/Makefile =================================================================== --- games/OpenTomb/Makefile +++ games/OpenTomb/Makefile @@ -18,7 +18,8 @@ USES= cmake:insource compiler:c++11-lang lua openal sdl USE_GITHUB= yes USE_SDL= sdl2 -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext SUB_FILES= OpenTomb post-patch: Index: games/allacrost/Makefile =================================================================== --- games/allacrost/Makefile +++ games/allacrost/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --datadir=${DATADIR} --enable-editor=no CPPFLAGS+= -isystem${LUA_INCDIR} LDFLAGS+= -L${LUA_LIBDIR} -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: games/apricots/Makefile =================================================================== --- games/apricots/Makefile +++ games/apricots/Makefile @@ -21,7 +21,7 @@ PORTDATA= * PORTDOCS= * CPPFLAGS+= -DAP_PATH="\"${DATADIR}/\"" -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext DESKTOP_ENTRIES="Apricots" \ "${COMMENT}" \ Index: games/aquaria/Makefile =================================================================== --- games/aquaria/Makefile +++ games/aquaria/Makefile @@ -42,11 +42,6 @@ PLIST_FILES= bin/aquaria PORTDATA= * -# XXX Drop after FreeBSD 12.0 EOL -.if exists(/usr/lib/clang/6.0.1) -LLD_UNSAFE= yes # XXX ports/219089 -.endif - DESKTOP_ENTRIES="${GH_PROJECT}" \ "" \ "${DATADIR}/${PORTNAME}.png" \ Index: games/arx-libertatis/Makefile =================================================================== --- games/arx-libertatis/Makefile +++ games/arx-libertatis/Makefile @@ -20,11 +20,11 @@ USES= cmake gl openal sdl tar:xz USE_SDL= sdl USE_GL= gl glew -LLD_UNSAFE= yes CMAKE_ARGS= -DDATA_DIR=arx \ -DSTRICT_USE=ON \ -DBUILD_CRASHREPORTER=OFF CFLAGS_powerpc64+= -mminimal-toc +LDFLAGS_i386= -Wl,-znotext SUB_FILES= pkg-message Index: games/assaultcube/Makefile =================================================================== --- games/assaultcube/Makefile +++ games/assaultcube/Makefile @@ -24,7 +24,8 @@ LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept USES= gmake tar:bzip2 -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext WRKSRC= ${WRKDIR}/AssaultCube_v${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/source/src SUB_FILES= ${PLIST_FILES:Mbin/*:T} Index: games/astromenace/Makefile =================================================================== --- games/astromenace/Makefile +++ games/astromenace/Makefile @@ -29,7 +29,8 @@ USE_GL= gl glu USE_SDL= sdl2 CMAKE_ARGS= -DDATADIR="${DATADIR}" -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDATA= * PORTDOCS= * Index: games/atr3d/Makefile =================================================================== --- games/atr3d/Makefile +++ games/atr3d/Makefile @@ -24,7 +24,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= OPENAL OPTIONS_DEFAULT=OPENAL Index: games/avp/Makefile =================================================================== --- games/avp/Makefile +++ games/avp/Makefile @@ -17,7 +17,8 @@ USE_GL= gl USE_SDL= sdl -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext + PLIST_FILES= bin/${PORTNAME} do-install: Index: games/barony/Makefile =================================================================== --- games/barony/Makefile +++ games/barony/Makefile @@ -29,7 +29,7 @@ CMAKE_ARGS= -DEDITOR_EXE_NAME:STRING="barony-editor" DOS2UNIX_FILES= src/menu.cpp LDFLAGS+= -Wl,--as-needed -LLD_UNSAFE= yes # cf. PR 226980 +LDFLAGS_i386= -Wl,-znotext SUB_FILES= pkg-message Index: games/blackshadeselite/Makefile =================================================================== --- games/blackshadeselite/Makefile +++ games/blackshadeselite/Makefile @@ -21,8 +21,6 @@ USE_SDL= sdl USE_GL= gl glu -LLD_UNSAFE= yes - MAKE_ARGS= CC="${CC}" CXX="${CXX}" WRKSRC= ${WRKDIR}/${PORTNAME} @@ -34,6 +32,8 @@ OPTIONS_DEFINE= DOCS MAKE_JOBS_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext post-extract: @${FIND} ${WRKSRC}/Data -name '._*' -delete Index: games/chromium-bsu/Makefile =================================================================== --- games/chromium-bsu/Makefile +++ games/chromium-bsu/Makefile @@ -26,8 +26,9 @@ --disable-ftgl \ --disable-glut \ --disable-glpng -LLD_UNSAFE= yes MAKE_ARGS= LDFLAGS="${LDFLAGS}" + +LDFLAGS_i386= -Wl,-znotext INSTALLS_ICONS= yes Index: games/colobot/Makefile =================================================================== --- games/colobot/Makefile +++ games/colobot/Makefile @@ -32,7 +32,7 @@ USE_GITHUB= yes GH_TUPLE= colobot:colobot-data:c467bd9:data -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext post-extract: @${MV} ${WRKDIR}/colobot-data-c467bd9/* ${WRKSRC}/data Index: games/dhewm3/Makefile =================================================================== --- games/dhewm3/Makefile +++ games/dhewm3/Makefile @@ -21,7 +21,8 @@ USES= cmake compiler:c++11-lang jpeg openal:al sdl USE_SDL= sdl2 -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext WRKSRC_SUBDIR= neo Index: games/diaspora/Makefile =================================================================== --- games/diaspora/Makefile +++ games/diaspora/Makefile @@ -39,7 +39,8 @@ USE_GL= gl glu USE_SDL= sdl GNU_CONFIGURE= yes -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext WRKDIR_DIASPORA=${WRKDIR}/Diaspora_R1_Linux/Diaspora WRKSRC= ${WRKDIR_DIASPORA}/fs2_open Index: games/el/Makefile =================================================================== --- games/el/Makefile +++ games/el/Makefile @@ -25,7 +25,7 @@ GH_ACCOUNT= raduprv GH_PROJECT= Eternal-Lands LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lX11 -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext ALL_TARGET= el.bin MAKEFILE= Makefile.bsd Index: games/endless-sky/Makefile =================================================================== --- games/endless-sky/Makefile +++ games/endless-sky/Makefile @@ -22,7 +22,8 @@ USE_SDL= sdl2 USE_GL= gl glew INSTALLS_ICONS= yes -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDATA= * Index: games/excido/Makefile =================================================================== --- games/excido/Makefile +++ games/excido/Makefile @@ -22,7 +22,7 @@ USE_GL= gl glu USE_SDL= image sdl ttf -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= DOCS Index: games/flightgear/Makefile =================================================================== --- games/flightgear/Makefile +++ games/flightgear/Makefile @@ -34,14 +34,13 @@ USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glew glu glut -LLD_UNSAFE= yes - DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -DSYSTEM_SQLITE:BOOL=ON \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ -DFGCOM_DATA_PATH:PATH=${DATADIR} LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= DBUS QT5 OPTIONS_DEFAULT= DBUS QT5 Index: games/freedoko/Makefile =================================================================== --- games/freedoko/Makefile +++ games/freedoko/Makefile @@ -21,7 +21,6 @@ USE_CXXSTD= c++14 USE_GNOME= gdkpixbuf2 gtkmm30 -LLD_UNSAFE= yes MAKE_ENV= OS="${OPSYS}" DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" OPTIONS_DEFINE= DOCS NETWORK OPENAL @@ -35,6 +34,8 @@ OPENAL_MAKE_ENV= INCLUDE_SOUND_ALUT="$$(pkg-config --cflags freealut)" \ LIBS_SOUND_ALUT="$$(pkg-config --libs freealut)" \ USE_SOUND=true USE_SOUND_ALUT=true +OPENAL_LDFLAGS= ${_OPENAL_LDFLAGS_${ARCH}} +_OPENAL_LDFLAGS_i386= -Wl,-znotext post-patch: @${REINPLACE_CMD} -e \ Index: games/freeminer/Makefile =================================================================== --- games/freeminer/Makefile +++ games/freeminer/Makefile @@ -18,10 +18,11 @@ USE_GITHUB= yes USES= compiler:c++11-lib cmake -LLD_UNSAFE= yes CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \ -DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \ -DRUN_IN_PLACE=0 + +LDFLAGS_i386= -Wl,-znotext PORTDATA= * PORTDOCS= * Index: games/freeorion/Makefile =================================================================== --- games/freeorion/Makefile +++ games/freeorion/Makefile @@ -35,7 +35,8 @@ USE_GITHUB= yes USES= cmake compiler:c++14-lang python:2.7 -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= ChangeLog.md README.md PORTDATA= * Index: games/fs2open/Makefile =================================================================== --- games/fs2open/Makefile +++ games/fs2open/Makefile @@ -18,7 +18,6 @@ libpng.so:graphics/png USES= cmake compiler:c++11-lang lua:51 jpeg openal pkgconfig sdl -LLD_UNSAFE= yes USE_GITHUB= yes GH_ACCOUNT= scp-fs2open GH_PROJECT= fs2open.github.com @@ -27,6 +26,8 @@ USE_SDL= sdl2 CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen + +LDFLAGS_i386= -Wl,-znotext PLIST_FILES= bin/fs2_open Index: games/glest/Makefile =================================================================== --- games/glest/Makefile +++ games/glest/Makefile @@ -23,9 +23,10 @@ USE_SDL= sdl USE_GL= gl glu USE_XORG= x11 -LLD_UNSAFE= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= mk/linux/configure + +LDFLAGS_i386= -Wl,-znotext SUB_FILES= glest-wrapper pkg-message JAM_CMD= ${LOCALBASE}/bin/jam -q -a -dx Index: games/ioquake3/Makefile =================================================================== --- games/ioquake3/Makefile +++ games/ioquake3/Makefile @@ -53,7 +53,7 @@ TOOLS_CC="${CC}" \ USE_LOCAL_HEADERS=0 ALL_TARGET= release -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext LIBDIR= lib/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= share/doc/${PORTNAME}${PKGNAMESUFFIX} Index: games/iortcw/Makefile =================================================================== --- games/iortcw/Makefile +++ games/iortcw/Makefile @@ -29,8 +29,7 @@ MAKE_ARGS= BINDIR="${STAGEDIR}${PREFIX}/bin" \ COPYDIR="${STAGEDIR}${PREFIX}/${WOLFDIR}" -# cf. PR 226980 -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext PLIST_SUB= ARCH="${ARCH}" \ WOLFDIR="${WOLFDIR}" Index: games/irrlamb/Makefile =================================================================== --- games/irrlamb/Makefile +++ games/irrlamb/Makefile @@ -24,7 +24,8 @@ GH_ACCOUNT= jazztickets USES= cmake compiler:c++11-lib lua:53 openal -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= * PORTDATA= * Index: games/keeperrl/Makefile =================================================================== --- games/keeperrl/Makefile +++ games/keeperrl/Makefile @@ -29,11 +29,12 @@ ALPHA_VERSION= 23 LIBS+= -lexecinfo -LLD_UNSAFE= yes MAKE_ARGS= DATA_DIR="${DATADIR}" GCC="${CXX}" \ LDFLAGS="${LDFLAGS}" RELEASE=true # USE_GCC adds -Wl,-rpath=${_GCC_RUNTIME} which breaks -x c++-header MAKE_ARGS+= PCH= PCHINC= + +LDFLAGS_i386= -Wl,-znotext DESKTOP_ENTRIES="KeeperRL" "" "" "keeper" \ "Game;Simulation;" false Index: games/linwarrior/Makefile =================================================================== --- games/linwarrior/Makefile +++ games/linwarrior/Makefile @@ -15,8 +15,9 @@ USES= compiler:c++11-lang gl gmake openal:al,alut sdl USE_GL= gl glu USE_SDL= sdl -LLD_UNSAFE= yes USE_CXXSTD= gnu++98 + +LDFLAGS_i386= -Wl,-znotext WRKSRC= ${WRKDIR}/${PORTNAME} Index: games/lugaru/Makefile =================================================================== --- games/lugaru/Makefile +++ games/lugaru/Makefile @@ -22,7 +22,8 @@ USE_GL= gl glu USE_SDL= sdl USE_XORG= sm -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= README OPTIONS_DEFINE= DOCS Index: games/megaglest/Makefile =================================================================== --- games/megaglest/Makefile +++ games/megaglest/Makefile @@ -35,9 +35,9 @@ USE_SDL= sdl2 USE_XORG= sm ice x11 xext USE_CXXSTD= c++11 -LLD_UNSAFE= yes LDFLAGS+= -lssl -lcrypto +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= EDITOR DOCS VIEWER OPTIONS_SUB= yes Index: games/minetest/Makefile =================================================================== --- games/minetest/Makefile +++ games/minetest/Makefile @@ -18,9 +18,10 @@ GH_ACCOUNT= minetest USES= cmake compiler:c11 iconv:wchar_t -LLD_UNSAFE= yes CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \ -DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" + +LDFLAGS_i386= -Wl,-znotext PORTDATA= * PORTDOCS= * Index: games/naev/Makefile =================================================================== --- games/naev/Makefile +++ games/naev/Makefile @@ -54,7 +54,6 @@ LUA_JIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit OPENAL_USES= openal OPENAL_CONFIGURE_WITH= openal -OPENAL_VARS= LLD_UNSAFE=yes # cf. PR 226980 SDL_MIXER_DESC= SDL_mixer sound backend SDL_MIXER_CONFIGURE_WITH= sdlmixer SDL2_DESC= Use SDL2 instead of SDL Index: games/openclonk/Makefile =================================================================== --- games/openclonk/Makefile +++ games/openclonk/Makefile @@ -35,7 +35,8 @@ USE_XORG= x11 xpm INSTALLS_ICONS= yes CMAKE_ARGS= -DAudio_TK:STRING="OpenAL" -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext post-patch: @${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \ Index: games/openomf/Makefile =================================================================== --- games/openomf/Makefile +++ games/openomf/Makefile @@ -27,7 +27,8 @@ USES= cmake:insource compiler:c++11-lang gettext openal sdl USE_SDL= sdl2 -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext DESKTOP_ENTRIES="OpenOMF" "" \ "${PREFIX}/share/openomf/openomf_icon.png " \ Index: games/opensurge/Makefile =================================================================== --- games/opensurge/Makefile +++ games/opensurge/Makefile @@ -40,7 +40,8 @@ DESKTOP_ENTRIES="Open Surge" "" "${PORTNAME}" \ "${PORTNAME}" "Game;ArcadeGame;" "" INSTALLS_ICONS= yes -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext SVN_REV= 765 MODS_VER= 20140321 Index: games/retroarch/Makefile =================================================================== --- games/retroarch/Makefile +++ games/retroarch/Makefile @@ -67,8 +67,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc USE_XORG= x11 xcb xext xinerama xv xxf86vm -LLD_UNSAFE= yes SHEBANG_FILES= libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py tools/cg2glsl.py tools/vulkan_loader_generator.py + +LDFLAGS_i386= -Wl,-znotext post-patch: @${REINPLACE_CMD} -e 's|||' \ Index: games/scorched3d/Makefile =================================================================== --- games/scorched3d/Makefile +++ games/scorched3d/Makefile @@ -31,12 +31,12 @@ WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} -LLD_UNSAFE= yes DOS2UNIX_GLOB= *.h *.cpp CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS_i386= -Wl,-znotext SCORCH_VERSION= 43.3d SCORCH_REVISION= # none Index: games/spacezero/Makefile =================================================================== --- games/spacezero/Makefile +++ games/spacezero/Makefile @@ -17,7 +17,6 @@ USES= openal:al,alut gnome pkgconfig xorg USE_GNOME= gtk20 USE_XORG= x11 -LLD_UNSAFE= yes MAKE_ARGS= DATADIR="${DATADIR}" \ INSTALL_DATA_DIR="${DATADIR}" ALL_TARGET= ${PORTNAME} @@ -25,6 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} LDFLAGS+= -lX11 +LDFLAGS_i386= -Wl,-znotext PORTDOCS= * PORTDATA= * Index: games/spring/Makefile =================================================================== --- games/spring/Makefile +++ games/spring/Makefile @@ -30,7 +30,6 @@ USE_GL= gl glu glew USE_XORG= x11 xcursor USE_LDCONFIG= yes -LLD_UNSAFE= yes DOS2UNIX_GLOB= *.h *.hpp *.cpp USES= cmake:insource compiler:c++11-lib dos2unix gl openal:al sdl \ Index: games/springlobby/Makefile =================================================================== --- games/springlobby/Makefile +++ games/springlobby/Makefile @@ -22,7 +22,6 @@ CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ -DENABLE_DEBUG_REPORT=FALSE USE_WX= 2.8+ -LLD_UNSAFE= yes PORTDOCS= * Index: games/stuntrally/Makefile =================================================================== --- games/stuntrally/Makefile +++ games/stuntrally/Makefile @@ -22,7 +22,8 @@ DOS2UNIX_FILES= source/ogre/BaseApp_Create.cpp CMAKE_ARGS= -DSHARE_INSTALL="${DATADIR_REL}" \ -DBULLET_ROOT="${LOCALBASE}" -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= Readme.txt PORTDATA= * Index: games/supertux2/Makefile =================================================================== --- games/supertux2/Makefile +++ games/supertux2/Makefile @@ -28,10 +28,11 @@ CMAKE_ARGS= -DINSTALL_SUBDIR_BIN=bin \ -DBUILD_SHARED_LIBS=off -LLD_UNSAFE= yes DOS2UNIX_FILES= external/squirrel/CMakeLists.txt \ external/squirrel/squirrel/sqvm.cpp + +LDFLAGS_i386= -Wl,-znotext DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE= DOCS Index: games/supertuxkart/Makefile =================================================================== --- games/supertuxkart/Makefile +++ games/supertuxkart/Makefile @@ -28,7 +28,6 @@ USE_GL= gl glu glew USE_SDL= sdl USE_XORG= x11 xrandr -LLD_UNSAFE= yes CMAKE_OFF= USE_WIIUSE BUILD_RECORDER CMAKE_ON= USE_SYSTEM_ENET USE_SYSTEM_GLEW Index: games/tome4/Makefile =================================================================== --- games/tome4/Makefile +++ games/tome4/Makefile @@ -26,7 +26,6 @@ USE_CSTD= gnu89 SUB_FILES= tome4 -LLD_UNSAFE= yes MAKE_JOBS_UNSAFE= yes DESKTOP_ENTRIES="ToME 4" "" "${PORTNAME}" \ @@ -35,6 +34,8 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} WRKSRC= ${WRKDIR}/t-engine4-src-${DISTVERSION} MAKE_ARGS+= config=release verbose=yes ARCH="" CC=${CC} CXX=${CXX} + +LDFLAGS_i386= -Wl,-znotext .include Index: games/trigger-rally/Makefile =================================================================== --- games/trigger-rally/Makefile +++ games/trigger-rally/Makefile @@ -23,7 +23,8 @@ USE_GL= glu glew MAKEFILE= GNUmakefile ALL_TARGET= build -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext INSTALLS_ICONS= yes WRKSRC_SUBDIR= src Index: games/ultimatestunts/Makefile =================================================================== --- games/ultimatestunts/Makefile +++ games/ultimatestunts/Makefile @@ -25,10 +25,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openal MAKE_JOBS_UNSAFE= yes -# XXX Drop after FreeBSD 12.0 EOL -.if exists(/usr/lib/clang/6.0.1) -LLD_UNSAFE= yes -.endif CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_clang= -Wno-c++11-narrowing Index: games/valyriatear/Makefile =================================================================== --- games/valyriatear/Makefile +++ games/valyriatear/Makefile @@ -31,7 +31,8 @@ USE_GL= gl glu glew USE_XORG= x11 xext sm ice INSTALLS_ICONS= yes -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= * PORTDATA= * Index: games/vamos/Makefile =================================================================== --- games/vamos/Makefile +++ games/vamos/Makefile @@ -29,10 +29,10 @@ CONFIGURE_ARGS= ac_cv_lib_freeglut_glutGetModifiers=no \ --disable-unit-tests USE_LDCONFIG= yes -LLD_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib +LDFLAGS_i386= -Wl,-znotext INFO= vamos PORTDOCS= * Index: games/vegastrike/Makefile =================================================================== --- games/vegastrike/Makefile +++ games/vegastrike/Makefile @@ -41,13 +41,14 @@ GNU_CONFIGURE= yes DOS2UNIX_GLOB= *.cpp *.h EXTRACT_AFTER_ARGS= --exclude boost -LLD_UNSAFE= yes # cegui and ffmpeg are not used yet CONFIGURE_ARGS= --disable-cegui --disable-ffmpeg \ --with-data-dir="${LOCALBASE}/share/${PORTNAME}" \ --with-boost=system \ --enable-flags="${CXXFLAGS}" + +LDFLAGS_i386= -Wl,-znotext BIN_FILES= bin/vegastrike bin/vssetup bin/vegaserver PLIST_FILES= ${BIN_FILES} Index: graphics/magnum-examples/Makefile =================================================================== --- graphics/magnum-examples/Makefile +++ graphics/magnum-examples/Makefile @@ -26,8 +26,7 @@ USE_XORG= ice sm x11 xext LDFLAGS+= -lGL # only missing for one example -# for openal cf. PR 226980 -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext CMAKE_ARGS= -DLIB_SUFFIX:STRING="" Index: graphics/reallyslick/Makefile =================================================================== --- graphics/reallyslick/Makefile +++ graphics/reallyslick/Makefile @@ -28,7 +28,8 @@ FREEALUT_DESC= Enable freealut support FREEALUT_CONFIGURE_ENABLE= sound FREEALUT_USES= openal:alut -FREEALUT_VARS= LLD_UNSAFE=yes # cf. PR 226980 +FREEALUT_LDFLAGS= ${_FREEALUT_LDFLAGS_${ARCH}} +_FREEALUT_LDFLAGS_i386= -Wl,-znotext GLEW_DESC= Enable GLEW support GLEW_USE= GL=glew Index: multimedia/mpv/Makefile =================================================================== --- multimedia/mpv/Makefile +++ multimedia/mpv/Makefile @@ -104,7 +104,8 @@ OPENAL_CONFIGURE_ENABLE= openal OPENAL_USES= openal -OPENAL_VARS= LLD_UNSAFE=yes # cf. PR 226980 +OPENAL_LDFLAGS= ${_OPENAL_LDFLAGS_${ARCH}} +_OPENAL_LDFLAGS_i386= -Wl,-znotext OPENGL_USES= gl OPENGL_USE= GL=egl,gbm,gl Index: net-im/toxic/Makefile =================================================================== --- net-im/toxic/Makefile +++ net-im/toxic/Makefile @@ -41,9 +41,9 @@ CFLAGS+= -I${NCURSESINC} LDFLAGS+= -L${NCURSESLIB} +LDFLAGS_i386= -Wl,-znotext MAKE_ENV= USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}" \ MANDIR="${MANPREFIX}/man" -LLD_UNSAFE= yes SUB_FILES= pkg-message post-patch-PYTHON-on: