Try to fix i386 build.

While there update to 3.24.3.8

PR:		234857
Submitted by:	emaste@

3 files changed, 53 insertions, 25 deletions

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 30440b998115..15658f920fa4 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qcad
-PORTVERSION=	3.24.2.0
+PORTVERSION=	3.24.3.8
 #PORTREVISION=
 DISTVERSIONPREFIX=	v
 CATEGORIES=	cad
@@ -54,6 +54,7 @@ OPTIONS_DEFINE=	EXAMPLES
 
 CFLAGS_i386= -fPIC
 CXXFLAGS_i386= -fPIC
+LDFLAGS_i386= -Wl,-z,notext
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-${_QT_VERSION}
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index 1ab0447743a8..cea02a601349 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579377517
-SHA256 (qcad/qcad-qcad-v3.24.2.0_GH0.tar.gz) = 59aaaf2b2b70d0fde7c9b6c97cc7a768e00fbc63210db61f89a1e7526ffcb835
-SIZE (qcad/qcad-qcad-v3.24.2.0_GH0.tar.gz) = 33819329
+TIMESTAMP = 1591468170
+SHA256 (qcad/qcad-qcad-v3.24.3.8_GH0.tar.gz) = 51403535329bdfe1f7e722eda53ce69896de4e0aee534f209ea597deac8eeb91
+SIZE (qcad/qcad-qcad-v3.24.3.8_GH0.tar.gz) = 33939457
diff --git a/cad/qcad/pkg-plist b/cad/qcad/pkg-plist
index bdb8c41911cd..800f1b430bcf 100644
--- a/cad/qcad/pkg-plist
+++ b/cad/qcad/pkg-plist
@@ -361,12 +361,14 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/imperial/ar-b88.pat
 %%DATADIR%%/patterns/imperial/ar-brelm.pat
 %%DATADIR%%/patterns/imperial/ar-brstd.pat
+%%DATADIR%%/patterns/imperial/ar-conc-01.pat
 %%DATADIR%%/patterns/imperial/ar-conc.pat
 %%DATADIR%%/patterns/imperial/ar-hbone.pat
 %%DATADIR%%/patterns/imperial/ar-parq1.pat
 %%DATADIR%%/patterns/imperial/ar-rroof.pat
 %%DATADIR%%/patterns/imperial/ar-rshke.pat
 %%DATADIR%%/patterns/imperial/ar-sand.pat
+%%DATADIR%%/patterns/imperial/barbwire.pat
 %%DATADIR%%/patterns/imperial/blocks-01.pat
 %%DATADIR%%/patterns/imperial/blocks-02.pat
 %%DATADIR%%/patterns/imperial/box-overlap.pat
@@ -376,8 +378,13 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/imperial/brass.pat
 %%DATADIR%%/patterns/imperial/brick.pat
 %%DATADIR%%/patterns/imperial/brstone.pat
+%%DATADIR%%/patterns/imperial/bubbles-01.pat
+%%DATADIR%%/patterns/imperial/bubbles-02.pat
+%%DATADIR%%/patterns/imperial/bubbles-03.pat
 %%DATADIR%%/patterns/imperial/celtic-01.pat
 %%DATADIR%%/patterns/imperial/celtic-02.pat
+%%DATADIR%%/patterns/imperial/celtic-03.pat
+%%DATADIR%%/patterns/imperial/celtic-04.pat
 %%DATADIR%%/patterns/imperial/circles-02.pat
 %%DATADIR%%/patterns/imperial/circles.pat
 %%DATADIR%%/patterns/imperial/clay.pat
@@ -392,7 +399,10 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/imperial/flex.pat
 %%DATADIR%%/patterns/imperial/grass.pat
 %%DATADIR%%/patterns/imperial/grate.pat
+%%DATADIR%%/patterns/imperial/gravel-01.pat
 %%DATADIR%%/patterns/imperial/gravel.pat
+%%DATADIR%%/patterns/imperial/hatch-dots.pat
+%%DATADIR%%/patterns/imperial/hatch-sqrs.pat
 %%DATADIR%%/patterns/imperial/hex.pat
 %%DATADIR%%/patterns/imperial/hexagons.pat
 %%DATADIR%%/patterns/imperial/hexjoin-01.pat
@@ -407,6 +417,10 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/imperial/lattice-04.pat
 %%DATADIR%%/patterns/imperial/lattice-05.pat
 %%DATADIR%%/patterns/imperial/lattice-06.pat
+%%DATADIR%%/patterns/imperial/lattice-07.pat
+%%DATADIR%%/patterns/imperial/leaf-01.pat
+%%DATADIR%%/patterns/imperial/leaf-02.pat
+%%DATADIR%%/patterns/imperial/leaf-03.pat
 %%DATADIR%%/patterns/imperial/line.pat
 %%DATADIR%%/patterns/imperial/looplinks.pat
 %%DATADIR%%/patterns/imperial/maze-01.pat
@@ -417,6 +431,7 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/imperial/plast.pat
 %%DATADIR%%/patterns/imperial/plasti.pat
 %%DATADIR%%/patterns/imperial/qcad-logo.pat
+%%DATADIR%%/patterns/imperial/redback.pat
 %%DATADIR%%/patterns/imperial/sacncr.pat
 %%DATADIR%%/patterns/imperial/scaffold.pat
 %%DATADIR%%/patterns/imperial/square.pat
@@ -428,7 +443,11 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/imperial/trans.pat
 %%DATADIR%%/patterns/imperial/tri-overlap.pat
 %%DATADIR%%/patterns/imperial/triang.pat
+%%DATADIR%%/patterns/imperial/weatherboard.pat
+%%DATADIR%%/patterns/imperial/weaving.pat
 %%DATADIR%%/patterns/imperial/wire-fence.pat
+%%DATADIR%%/patterns/imperial/xmastree-01.pat
+%%DATADIR%%/patterns/imperial/xmastree-02.pat
 %%DATADIR%%/patterns/imperial/zigzag.pat
 %%DATADIR%%/patterns/metric/acad_iso02w100.pat
 %%DATADIR%%/patterns/metric/acad_iso03w100.pat
@@ -458,12 +477,14 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/metric/ar-b88.pat
 %%DATADIR%%/patterns/metric/ar-brelm.pat
 %%DATADIR%%/patterns/metric/ar-brstd.pat
+%%DATADIR%%/patterns/metric/ar-conc-01.pat
 %%DATADIR%%/patterns/metric/ar-conc.pat
 %%DATADIR%%/patterns/metric/ar-hbone.pat
 %%DATADIR%%/patterns/metric/ar-parq1.pat
 %%DATADIR%%/patterns/metric/ar-rroof.pat
 %%DATADIR%%/patterns/metric/ar-rshke.pat
 %%DATADIR%%/patterns/metric/ar-sand.pat
+%%DATADIR%%/patterns/metric/barbwire.pat
 %%DATADIR%%/patterns/metric/blocks-01.pat
 %%DATADIR%%/patterns/metric/blocks-02.pat
 %%DATADIR%%/patterns/metric/box-overlap.pat
@@ -473,8 +494,13 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/metric/brass.pat
 %%DATADIR%%/patterns/metric/brick.pat
 %%DATADIR%%/patterns/metric/brstone.pat
+%%DATADIR%%/patterns/metric/bubbles-01.pat
+%%DATADIR%%/patterns/metric/bubbles-02.pat
+%%DATADIR%%/patterns/metric/bubbles-03.pat
 %%DATADIR%%/patterns/metric/celtic-01.pat
 %%DATADIR%%/patterns/metric/celtic-02.pat
+%%DATADIR%%/patterns/metric/celtic-03.pat
+%%DATADIR%%/patterns/metric/celtic-04.pat
 %%DATADIR%%/patterns/metric/circles-02.pat
 %%DATADIR%%/patterns/metric/circles.pat
 %%DATADIR%%/patterns/metric/clay.pat
@@ -489,7 +515,10 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/metric/flex.pat
 %%DATADIR%%/patterns/metric/grass.pat
 %%DATADIR%%/patterns/metric/grate.pat
+%%DATADIR%%/patterns/metric/gravel-01.pat
 %%DATADIR%%/patterns/metric/gravel.pat
+%%DATADIR%%/patterns/metric/hatch-dots.pat
+%%DATADIR%%/patterns/metric/hatch-sqrs.pat
 %%DATADIR%%/patterns/metric/hex.pat
 %%DATADIR%%/patterns/metric/hexagons.pat
 %%DATADIR%%/patterns/metric/hexjoin-01.pat
@@ -515,6 +544,10 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/metric/lattice-04.pat
 %%DATADIR%%/patterns/metric/lattice-05.pat
 %%DATADIR%%/patterns/metric/lattice-06.pat
+%%DATADIR%%/patterns/metric/lattice-07.pat
+%%DATADIR%%/patterns/metric/leaf-01.pat
+%%DATADIR%%/patterns/metric/leaf-02.pat
+%%DATADIR%%/patterns/metric/leaf-03.pat
 %%DATADIR%%/patterns/metric/line.pat
 %%DATADIR%%/patterns/metric/looplinks.pat
 %%DATADIR%%/patterns/metric/maze-01.pat
@@ -525,6 +558,7 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/metric/plast.pat
 %%DATADIR%%/patterns/metric/plasti.pat
 %%DATADIR%%/patterns/metric/qcad-logo.pat
+%%DATADIR%%/patterns/metric/redback.pat
 %%DATADIR%%/patterns/metric/sacncr.pat
 %%DATADIR%%/patterns/metric/scaffold.pat
 %%DATADIR%%/patterns/metric/square.pat
@@ -536,7 +570,11 @@ lib/libstemmer.a
 %%DATADIR%%/patterns/metric/trans.pat
 %%DATADIR%%/patterns/metric/tri-overlap.pat
 %%DATADIR%%/patterns/metric/triang.pat
+%%DATADIR%%/patterns/metric/weatherboard.pat
+%%DATADIR%%/patterns/metric/weaving.pat
 %%DATADIR%%/patterns/metric/wire-fence.pat
+%%DATADIR%%/patterns/metric/xmastree-01.pat
+%%DATADIR%%/patterns/metric/xmastree-02.pat
 %%DATADIR%%/patterns/metric/zigzag.pat
 %%DATADIR%%/plugins/codecs/readme.txt
 %%DATADIR%%/plugins/designer/libqcadcustomwidgets.so
@@ -4384,10 +4422,6 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ScriptingPreferences.js
 %%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ScriptingPreferences.pro
 %%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ScriptingPreferencesInit.js
-%%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/PreferencesPage.ui
-%%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/StartupPreferences.js
-%%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/StartupPreferences.pro
-%%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/StartupPreferencesInit.js
 %%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/PreferencesPage.ui
 %%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/TextPreferences.js
 %%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/TextPreferences.pro
@@ -6375,6 +6409,7 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Misc/Examples/MathExamples/ExMathSpiral/ExMathSpiral.pro
 %%DATADIR%%/scripts/Misc/Examples/MathExamples/FlexPainter/CurtainRope.svg
 %%DATADIR%%/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.js
+%%DATADIR%%/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.pro
 %%DATADIR%%/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.svg
 %%DATADIR%%/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterDialog.svg
 %%DATADIR%%/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterDialog.ui
@@ -6480,6 +6515,7 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Misc/MiscDraw/Counter/Counter.ui
 %%DATADIR%%/scripts/Misc/MiscDraw/Counter/CounterInit.js
 %%DATADIR%%/scripts/Misc/MiscDraw/Counter/doc/Counter.png
+%%DATADIR%%/scripts/Misc/MiscDraw/Counter/numeral.js
 %%DATADIR%%/scripts/Misc/MiscDraw/Cross/Cross-inverse.svg
 %%DATADIR%%/scripts/Misc/MiscDraw/Cross/Cross.js
 %%DATADIR%%/scripts/Misc/MiscDraw/Cross/Cross.pro
@@ -7779,6 +7815,10 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest03.js
 %%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest05.js
 %%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest06.js
+%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest07.js
+%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest08.js
+%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest09.js
+%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest10.js
 %%DATADIR%%/scripts/Modify/Stretch/Tests/actual/.gitignore
 %%DATADIR%%/scripts/Modify/Stretch/Tests/data/entities0.dxf
 %%DATADIR%%/scripts/Modify/Stretch/Tests/data/entities1.dxf
@@ -7789,6 +7829,10 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest03_000.dxf
 %%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest05_000.dxf
 %%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest06_000.dxf
+%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest07_000.dxf
+%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest08_000.dxf
+%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest09_000.dxf
+%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest10_000.dxf
 %%DATADIR%%/scripts/Modify/Stretch/doc/Stretch.png
 %%DATADIR%%/scripts/Modify/Stretch/doc/StretchFigure.dxf
 %%DATADIR%%/scripts/Modify/Stretch/doc/StretchFigure.png
@@ -10357,24 +10401,7 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/splashscreen.png
 %%DATADIR%%/scripts/splashscreen@2x.png
 %%DATADIR%%/scripts/sprintf.js
-%%DATADIR%%/themes/Dark/checkbox_checked.png
-%%DATADIR%%/themes/Dark/checkbox_checked_disabled.png
-%%DATADIR%%/themes/Dark/checkbox_checked_focus.png
-%%DATADIR%%/themes/Dark/checkbox_unchecked.png
-%%DATADIR%%/themes/Dark/checkbox_unchecked_disabled.png
-%%DATADIR%%/themes/Dark/checkbox_unchecked_focus.png
-%%DATADIR%%/themes/Dark/close-hover.png
-%%DATADIR%%/themes/Dark/close.png
-%%DATADIR%%/themes/Dark/radio_checked.png
-%%DATADIR%%/themes/Dark/radio_checked_disabled.png
-%%DATADIR%%/themes/Dark/radio_checked_focus.png
-%%DATADIR%%/themes/Dark/radio_unchecked.png
-%%DATADIR%%/themes/Dark/radio_unchecked_disabled.png
-%%DATADIR%%/themes/Dark/radio_unchecked_focus.png
 %%DATADIR%%/themes/Dark/stylesheet.css
-%%DATADIR%%/themes/Dark/stylesheet_linux.css
-%%DATADIR%%/themes/Dark/triangle_down.png
-%%DATADIR%%/themes/Dark/triangle_right.png
 %%DATADIR%%/ts/assistant_ar.qm
 %%DATADIR%%/ts/assistant_bg.qm
 %%DATADIR%%/ts/assistant_cs.qm