Update to QCAD 3.24.0.1, with ChangeLog:

3.24.0.1:

    Bug fixes:
        FS#2017 - Rendering of arcs in blocks with scale factor > 1

3.24.0 (2019/12/19):

    Draw:
        Ellipse > Inscribed in Quadrilateral:
            Create circle if appropriate
    Performance:
        Use of multiple CPU cores for display
    Modify:
        Scale:
            Improved support for non-uniform scaling
    Blocks:
        Improved support for non-uniform scaling
    Snap > Reference:
        Snap to reference point of block reference for block reference entities
    Edit > Application Preferences:
        File > Open/Save:
            Add preference to override "last saved by" file information for DXF/DWG export
    Misc > Script Examples > Mathematics > FlexPainter
        Paint complex patterns along existing lines and curves (see forum announcement)
    macOS 10.15:
        Update to Qt 5.13.2
            Fix mouse cursor display
    Linux:
        Provide packages linked against Qt 5.13
            Wayland support
            Fix keyboard layout switching under Wayland
    Bug fixes:
        FS#1931 - File > SVG Export: hatch arc interpolation
        FS#1933 - File > Advanced SVG export: file overwrite check doesn't use updated filename
        FS#1942 - Draw > Circle > Two tangents and point: fails for case with point on bisector
        FS#1946 - CAM > Cam Legacy Export: Cut inner paths before outer paths has no effect
        FS#1948 - Modify > Offset (through Point): Point orthogonal to end point of line segment not accepted
        FS#1949 - Modify > Break out: Leftover (zero length line) after using tool on ray
        FS#1950 - File > Save As: File dialog offers unsupported export formats (DWG R9, R10, R2.6, R2.5)
        FS#1962 - CAM > Drill Toolpaths: Cannot be edited / updated from source entities
        FS#1973 - File > SVG Export: polylines with large arc segments (> 180°) not exported correctly
        FS#1975 - RPolyline::getOrientation: Wrong orientation for polylines with large arcs
        FS#1979 - View > Layer List: icon spacing
        FS#1984 - Block > Create Block from Selection: Slow for large number of entities
        FS#1985 - Hatch dots are rendered as lines with fixed lenght of 0.02 units
        FS#1986 - Page Tags set as default not displayed
        FS#1987 - File > SVG Export: full circle hatch
        FS#1990 - Layer > Duplicate Layer: fails for layer "0"
        FS#1991 - Modify > Divide: Preview indicator fails on infinitive lines
        FS#1993 - Draw > Insert Bitmap: relative zero point not set
        FS#1996 - File > Save: DXF header variable CECOLOR changed
        FS#2000 - CAM > Nesting: misleading "Sheet added" confirmation
        FS#2001 - CAM > Nesting: Alignment fails
        FS#2002 - Draw > Viewport > Add Viewport: Hatch is offset incorrectly in Viewport
        FS#2007 - bbox.bat cannot write log file
        FS#2012 - Draw > Hatch > Hatch from Selection: block transforms not taken into account

8 files changed, 229 insertions, 126 deletions

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 91817eeba5b..ac0c8aea3a9 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2019/12/07 07:44:36 plunky Exp $
+# $NetBSD: Makefile,v 1.81 2019/12/29 12:44:15 plunky Exp $
 #
 
-DISTNAME=		qcad-3.23.0.0
-PKGREVISION=		5
+DISTNAME=		qcad-3.24.0.1
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_GITHUB:=qcad/}
 EXTRACT_USING=		bsdtar
diff --git a/cad/qcad/PLIST b/cad/qcad/PLIST
index a16463e6732..de04f1d4a14 100644
--- a/cad/qcad/PLIST
+++ b/cad/qcad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2019/10/27 15:43:23 nia Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/12/29 12:44:15 plunky Exp $
 bin/qcad
 lib/libdxflib.so
 lib/libopennurbs.so
@@ -175,10 +175,19 @@ lib/qcad/patterns/imperial/ar-parq1.pat
 lib/qcad/patterns/imperial/ar-rroof.pat
 lib/qcad/patterns/imperial/ar-rshke.pat
 lib/qcad/patterns/imperial/ar-sand.pat
+lib/qcad/patterns/imperial/blocks-01.pat
+lib/qcad/patterns/imperial/blocks-02.pat
+lib/qcad/patterns/imperial/box-overlap.pat
 lib/qcad/patterns/imperial/box.pat
+lib/qcad/patterns/imperial/boxjoin-01.pat
+lib/qcad/patterns/imperial/boxjoin-02.pat
 lib/qcad/patterns/imperial/brass.pat
 lib/qcad/patterns/imperial/brick.pat
 lib/qcad/patterns/imperial/brstone.pat
+lib/qcad/patterns/imperial/celtic-01.pat
+lib/qcad/patterns/imperial/celtic-02.pat
+lib/qcad/patterns/imperial/circles-02.pat
+lib/qcad/patterns/imperial/circles.pat
 lib/qcad/patterns/imperial/clay.pat
 lib/qcad/patterns/imperial/cork.pat
 lib/qcad/patterns/imperial/cross.pat
@@ -187,26 +196,44 @@ lib/qcad/patterns/imperial/dolmit.pat
 lib/qcad/patterns/imperial/dots.pat
 lib/qcad/patterns/imperial/earth.pat
 lib/qcad/patterns/imperial/escher.pat
+lib/qcad/patterns/imperial/explosion.pat
 lib/qcad/patterns/imperial/flex.pat
 lib/qcad/patterns/imperial/grass.pat
 lib/qcad/patterns/imperial/grate.pat
 lib/qcad/patterns/imperial/gravel.pat
 lib/qcad/patterns/imperial/hex.pat
+lib/qcad/patterns/imperial/hexagons.pat
+lib/qcad/patterns/imperial/hexjoin-01.pat
+lib/qcad/patterns/imperial/hexjoin-02.pat
+lib/qcad/patterns/imperial/holly.pat
 lib/qcad/patterns/imperial/honey.pat
 lib/qcad/patterns/imperial/hound.pat
 lib/qcad/patterns/imperial/insul.pat
+lib/qcad/patterns/imperial/lattice-01.pat
+lib/qcad/patterns/imperial/lattice-02.pat
+lib/qcad/patterns/imperial/lattice-03.pat
+lib/qcad/patterns/imperial/lattice-04.pat
+lib/qcad/patterns/imperial/lattice-05.pat
+lib/qcad/patterns/imperial/lattice-06.pat
 lib/qcad/patterns/imperial/line.pat
+lib/qcad/patterns/imperial/maze-01.pat
+lib/qcad/patterns/imperial/maze-02.pat
 lib/qcad/patterns/imperial/mudst.pat
 lib/qcad/patterns/imperial/net.pat
 lib/qcad/patterns/imperial/net3.pat
 lib/qcad/patterns/imperial/plast.pat
 lib/qcad/patterns/imperial/plasti.pat
+lib/qcad/patterns/imperial/qcad-logo.pat
 lib/qcad/patterns/imperial/sacncr.pat
+lib/qcad/patterns/imperial/scaffold.pat
 lib/qcad/patterns/imperial/square.pat
+lib/qcad/patterns/imperial/squiggle-01.pat
+lib/qcad/patterns/imperial/squiggle-02.pat
 lib/qcad/patterns/imperial/stars.pat
 lib/qcad/patterns/imperial/steel.pat
 lib/qcad/patterns/imperial/swamp.pat
 lib/qcad/patterns/imperial/trans.pat
+lib/qcad/patterns/imperial/tri-overlap.pat
 lib/qcad/patterns/imperial/triang.pat
 lib/qcad/patterns/imperial/zigzag.pat
 lib/qcad/patterns/metric/acad_iso02w100.pat
@@ -243,10 +270,19 @@ lib/qcad/patterns/metric/ar-parq1.pat
 lib/qcad/patterns/metric/ar-rroof.pat
 lib/qcad/patterns/metric/ar-rshke.pat
 lib/qcad/patterns/metric/ar-sand.pat
+lib/qcad/patterns/metric/blocks-01.pat
+lib/qcad/patterns/metric/blocks-02.pat
+lib/qcad/patterns/metric/box-overlap.pat
 lib/qcad/patterns/metric/box.pat
+lib/qcad/patterns/metric/boxjoin-01.pat
+lib/qcad/patterns/metric/boxjoin-02.pat
 lib/qcad/patterns/metric/brass.pat
 lib/qcad/patterns/metric/brick.pat
 lib/qcad/patterns/metric/brstone.pat
+lib/qcad/patterns/metric/celtic-01.pat
+lib/qcad/patterns/metric/celtic-02.pat
+lib/qcad/patterns/metric/circles-02.pat
+lib/qcad/patterns/metric/circles.pat
 lib/qcad/patterns/metric/clay.pat
 lib/qcad/patterns/metric/cork.pat
 lib/qcad/patterns/metric/cross.pat
@@ -255,11 +291,16 @@ lib/qcad/patterns/metric/dolmit.pat
 lib/qcad/patterns/metric/dots.pat
 lib/qcad/patterns/metric/earth.pat
 lib/qcad/patterns/metric/escher.pat
+lib/qcad/patterns/metric/explosion.pat
 lib/qcad/patterns/metric/flex.pat
 lib/qcad/patterns/metric/grass.pat
 lib/qcad/patterns/metric/grate.pat
 lib/qcad/patterns/metric/gravel.pat
 lib/qcad/patterns/metric/hex.pat
+lib/qcad/patterns/metric/hexagons.pat
+lib/qcad/patterns/metric/hexjoin-01.pat
+lib/qcad/patterns/metric/hexjoin-02.pat
+lib/qcad/patterns/metric/holly.pat
 lib/qcad/patterns/metric/honey.pat
 lib/qcad/patterns/metric/hound.pat
 lib/qcad/patterns/metric/insul.pat
@@ -274,18 +315,31 @@ lib/qcad/patterns/metric/jis_rc_30.pat
 lib/qcad/patterns/metric/jis_stn_1e.pat
 lib/qcad/patterns/metric/jis_stn_2.5.pat
 lib/qcad/patterns/metric/jis_wood.pat
+lib/qcad/patterns/metric/lattice-01.pat
+lib/qcad/patterns/metric/lattice-02.pat
+lib/qcad/patterns/metric/lattice-03.pat
+lib/qcad/patterns/metric/lattice-04.pat
+lib/qcad/patterns/metric/lattice-05.pat
+lib/qcad/patterns/metric/lattice-06.pat
 lib/qcad/patterns/metric/line.pat
+lib/qcad/patterns/metric/maze-01.pat
+lib/qcad/patterns/metric/maze-02.pat
 lib/qcad/patterns/metric/mudst.pat
 lib/qcad/patterns/metric/net.pat
 lib/qcad/patterns/metric/net3.pat
 lib/qcad/patterns/metric/plast.pat
 lib/qcad/patterns/metric/plasti.pat
+lib/qcad/patterns/metric/qcad-logo.pat
 lib/qcad/patterns/metric/sacncr.pat
+lib/qcad/patterns/metric/scaffold.pat
 lib/qcad/patterns/metric/square.pat
+lib/qcad/patterns/metric/squiggle-01.pat
+lib/qcad/patterns/metric/squiggle-02.pat
 lib/qcad/patterns/metric/stars.pat
 lib/qcad/patterns/metric/steel.pat
 lib/qcad/patterns/metric/swamp.pat
 lib/qcad/patterns/metric/trans.pat
+lib/qcad/patterns/metric/tri-overlap.pat
 lib/qcad/patterns/metric/triang.pat
 lib/qcad/patterns/metric/zigzag.pat
 lib/qcad/platforminputcontexts/libcomposeplatforminputcontextplugin.so
@@ -1429,9 +1483,11 @@ lib/qcad/scripts/Draw/Circle/Circle2TP/Circle2TPInit.js
 lib/qcad/scripts/Draw/Circle/Circle2TP/Tests/Circle2TPTest00.js
 lib/qcad/scripts/Draw/Circle/Circle2TP/Tests/Circle2TPTest01.js
 lib/qcad/scripts/Draw/Circle/Circle2TP/Tests/Circle2TPTest02.js
+lib/qcad/scripts/Draw/Circle/Circle2TP/Tests/Circle2TPTest03.js
 lib/qcad/scripts/Draw/Circle/Circle2TP/Tests/required/Circle2TPTest00_000.dxf
 lib/qcad/scripts/Draw/Circle/Circle2TP/Tests/required/Circle2TPTest01_000.dxf
 lib/qcad/scripts/Draw/Circle/Circle2TP/Tests/required/Circle2TPTest02_000.dxf
+lib/qcad/scripts/Draw/Circle/Circle2TP/Tests/required/Circle2TPTest03_000.dxf
 lib/qcad/scripts/Draw/Circle/Circle2TP/doc/Circle2TP.png
 lib/qcad/scripts/Draw/Circle/Circle2TP/doc/Circle2TP_de.html
 lib/qcad/scripts/Draw/Circle/Circle2TP/doc/Circle2TP_desc_de.html
@@ -5056,6 +5112,7 @@ lib/qcad/scripts/Help/About/doc/About_desc_ru.html
 lib/qcad/scripts/Help/About/doc/About_desc_sl.html
 lib/qcad/scripts/Help/About/doc/About_ja.html
 lib/qcad/scripts/Help/About/doc/About_nl.html
+lib/qcad/scripts/Help/About/doc/About_pt.html
 lib/qcad/scripts/Help/About/doc/About_ru.html
 lib/qcad/scripts/Help/About/doc/About_sl.html
 lib/qcad/scripts/Help/BrowseUserManual/BrowseUserManual-inverse.svg
@@ -5095,6 +5152,7 @@ lib/qcad/scripts/Help/FAQ/doc/FAQ_desc_ru.html
 lib/qcad/scripts/Help/FAQ/doc/FAQ_desc_sl.html
 lib/qcad/scripts/Help/FAQ/doc/FAQ_ja.html
 lib/qcad/scripts/Help/FAQ/doc/FAQ_nl.html
+lib/qcad/scripts/Help/FAQ/doc/FAQ_pt.html
 lib/qcad/scripts/Help/FAQ/doc/FAQ_ru.html
 lib/qcad/scripts/Help/FAQ/doc/FAQ_sl.html
 lib/qcad/scripts/Help/Forum/Forum.js
@@ -5113,6 +5171,7 @@ lib/qcad/scripts/Help/Forum/doc/Forum_desc_ru.html
 lib/qcad/scripts/Help/Forum/doc/Forum_desc_sl.html
 lib/qcad/scripts/Help/Forum/doc/Forum_ja.html
 lib/qcad/scripts/Help/Forum/doc/Forum_nl.html
+lib/qcad/scripts/Help/Forum/doc/Forum_pt.html
 lib/qcad/scripts/Help/Forum/doc/Forum_ru.html
 lib/qcad/scripts/Help/Forum/doc/Forum_sl.html
 lib/qcad/scripts/Help/Help.js
@@ -5133,6 +5192,7 @@ lib/qcad/scripts/Help/ReportBug/doc/ReportBug_desc_ru.html
 lib/qcad/scripts/Help/ReportBug/doc/ReportBug_desc_sl.html
 lib/qcad/scripts/Help/ReportBug/doc/ReportBug_ja.html
 lib/qcad/scripts/Help/ReportBug/doc/ReportBug_nl.html
+lib/qcad/scripts/Help/ReportBug/doc/ReportBug_pt.html
 lib/qcad/scripts/Help/ReportBug/doc/ReportBug_ru.html
 lib/qcad/scripts/Help/ReportBug/doc/ReportBug_sl.html
 lib/qcad/scripts/Help/ReportTranslationError/ReportTranslationError.js
@@ -5141,6 +5201,7 @@ lib/qcad/scripts/Help/ReportTranslationError/ReportTranslationErrorInit.js
 lib/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_de.html
 lib/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_ja.html
 lib/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_nl.html
+lib/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_pt.html
 lib/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_ru.html
 lib/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_sl.html
 lib/qcad/scripts/Help/ShowReadme/ShowReadme.js
@@ -5150,6 +5211,7 @@ lib/qcad/scripts/Help/ShowReadme/ShowReadmeInit.js
 lib/qcad/scripts/Help/ShowReadme/doc/ShowReadme_de.html
 lib/qcad/scripts/Help/ShowReadme/doc/ShowReadme_ja.html
 lib/qcad/scripts/Help/ShowReadme/doc/ShowReadme_nl.html
+lib/qcad/scripts/Help/ShowReadme/doc/ShowReadme_pt.html
 lib/qcad/scripts/Help/ShowReadme/doc/ShowReadme_ru.html
 lib/qcad/scripts/Help/ShowReadme/doc/ShowReadme_sl.html
 lib/qcad/scripts/Help/Website/Website.js
@@ -5168,12 +5230,14 @@ lib/qcad/scripts/Help/Website/doc/Website_desc_ru.html
 lib/qcad/scripts/Help/Website/doc/Website_desc_sl.html
 lib/qcad/scripts/Help/Website/doc/Website_ja.html
 lib/qcad/scripts/Help/Website/doc/Website_nl.html
+lib/qcad/scripts/Help/Website/doc/Website_pt.html
 lib/qcad/scripts/Help/Website/doc/Website_ru.html
 lib/qcad/scripts/Help/Website/doc/Website_sl.html
 lib/qcad/scripts/Help/dir/dir.pro
 lib/qcad/scripts/Help/doc/Help_de.html
 lib/qcad/scripts/Help/doc/Help_ja.html
 lib/qcad/scripts/Help/doc/Help_nl.html
+lib/qcad/scripts/Help/doc/Help_pt.html
 lib/qcad/scripts/Help/doc/Help_ru.html
 lib/qcad/scripts/Help/doc/Help_sl.html
 lib/qcad/scripts/ImportExport/ImportExport.pro
@@ -6032,6 +6096,47 @@ lib/qcad/scripts/Misc/Examples/MathExamples/ExMandelbrot/ExMandelbrot.js
 lib/qcad/scripts/Misc/Examples/MathExamples/ExMandelbrot/ExMandelbrot.pro
 lib/qcad/scripts/Misc/Examples/MathExamples/ExMathSpiral/ExMathSpiral.js
 lib/qcad/scripts/Misc/Examples/MathExamples/ExMathSpiral/ExMathSpiral.pro
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/CurtainRope.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.js
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterDialog.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterDialog.ui
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterTemplates/PainterConstruct_Rope.dxf
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterTemplates/PainterTestEntities.dxf
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/1OrthoPointGlobal.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/1OrthoPointGlobalFlex.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/2OrthoPointsGlobal.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/2OrthoPointsGlobalFlex.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/3PhaseWaveGlobal.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/AllPainterDataTypes.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/CurtainRopeProto.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/CurtainRopeProtoKnot.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/GreekMeander15.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/GreekMeander15Flexing.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/OrthogonalBar.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/OrthogonalMark.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/RailwayTrackConcrete.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/RailwayTrackLineArt.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/RulerInch.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/RulerMetric.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SawtoothWave.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SawtoothWaveGlobal.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SinusoidWave.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SinusoidWaveGlobal.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqaureWave.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqaureWaveFlexing.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqaureWaveGlobal.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqauredShape.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqauredShapeFlexing.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SteppedWave.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SteppedWaveGlobal.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/TelephoneCoilMedio.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/TriangleWave.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/TriangleWaveGlobal.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/PreserveLookOff.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/PreserveLookOffSq.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/PreserveLookOn.svg
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/PreserveLookOnSq.svg
 lib/qcad/scripts/Misc/Examples/MathExamples/MathExamples.js
 lib/qcad/scripts/Misc/Examples/MathExamples/MathExamples.pro
 lib/qcad/scripts/Misc/Examples/MathExamples/dir/dir.pro
@@ -7308,9 +7413,11 @@ lib/qcad/scripts/Modify/Scale/Tests/ScaleTest05.js
 lib/qcad/scripts/Modify/Scale/Tests/ScaleTest06.js
 lib/qcad/scripts/Modify/Scale/Tests/ScaleTest07.js
 lib/qcad/scripts/Modify/Scale/Tests/ScaleTest08.js
+lib/qcad/scripts/Modify/Scale/Tests/ScaleTest09.js
 lib/qcad/scripts/Modify/Scale/Tests/data/arcs.dxf
 lib/qcad/scripts/Modify/Scale/Tests/data/circles.dxf
 lib/qcad/scripts/Modify/Scale/Tests/data/ellipses_ellipse_arcs.dxf
+lib/qcad/scripts/Modify/Scale/Tests/data/entities.dxf
 lib/qcad/scripts/Modify/Scale/Tests/data/lines.dxf
 lib/qcad/scripts/Modify/Scale/Tests/data/mtext.dxf
 lib/qcad/scripts/Modify/Scale/Tests/data/points.dxf
@@ -7326,6 +7433,7 @@ lib/qcad/scripts/Modify/Scale/Tests/required/ScaleTest05_000.dxf
 lib/qcad/scripts/Modify/Scale/Tests/required/ScaleTest06_000.dxf
 lib/qcad/scripts/Modify/Scale/Tests/required/ScaleTest07_000.dxf
 lib/qcad/scripts/Modify/Scale/Tests/required/ScaleTest08_000.dxf
+lib/qcad/scripts/Modify/Scale/Tests/required/ScaleTest09_000.dxf
 lib/qcad/scripts/Modify/Scale/doc/ByMouse.png
 lib/qcad/scripts/Modify/Scale/doc/ByMouseSq.png
 lib/qcad/scripts/Modify/Scale/doc/KeepProportionsOff.png
@@ -9733,6 +9841,9 @@ lib/qcad/scripts/Widgets/LibraryBrowser/doc/ShowOptionsDown.png
 lib/qcad/scripts/Widgets/LibraryBrowser/doc/ShowOptionsUp.png
 lib/qcad/scripts/Widgets/LibraryBrowser/doc/Sync.png
 lib/qcad/scripts/Widgets/LibraryBrowser/doc/Tag.png
+lib/qcad/scripts/Widgets/MenuBar/MenuBar.js
+lib/qcad/scripts/Widgets/MenuBar/MenuBar.pro
+lib/qcad/scripts/Widgets/MenuBar/PreferencesPage.ui
 lib/qcad/scripts/Widgets/MouseDisplay/Mouse-inverse.svg
 lib/qcad/scripts/Widgets/MouseDisplay/Mouse.svg
 lib/qcad/scripts/Widgets/MouseDisplay/MouseDisplay.js
@@ -10598,6 +10709,8 @@ share/qcad/libraries/templates/metric/dl3dl/Vorlage_Qcad_Din6771-1_quer_A4.dxf
 share/qcad/libraries/templates/metric/dl3dl/Vorlage_Qcad_Din6771_quer_A3.dxf
 share/qcad/libraries/templates/metric/dl3dl/Vorlage_Qcad_Din7200_quer_A3.dxf
 share/qcad/libraries/templates/metric/dl3dl/Vorlage_Qcad_Plankopf gross_quer_A3.dxf
+share/qcad/libraries/templates/metric/dl3dl/Vorlage_elt_2.dxf
+share/qcad/libraries/templates/metric/dl3dl/Vorlage_elt_3.dxf
 share/qcad/libraries/templates/metric/dl3dl/_META/meta.rdf
 share/qcad/libraries/templates/metric/dl3dl/nur Plankopf.dxf
 share/qcad/libraries/templates/metric/iso_en_a0.dxf
@@ -10620,3 +10733,111 @@ share/qcad/libraries/templates/metric/iso_en_a4_metric_portrait_aec.rdf
 share/qcad/libraries/templates/metric/title_block_80mm_x_80mm.dxf
 share/qcad/libraries/templates/metric/title_block_80mm_x_80mm.rdf
 share/qcad/readme.txt
+@pkgdir lib/qcad/scripts/Snap/SnapMiddleManual/Tests/actual
+@pkgdir lib/qcad/scripts/Snap/SnapIntersectionManual/Tests/actual
+@pkgdir lib/qcad/scripts/Snap/SnapIntersection/Tests/actual
+@pkgdir lib/qcad/scripts/Snap/SnapDistanceManual/Tests/actual
+@pkgdir lib/qcad/scripts/Projection/IsometricProjection/IsoProject/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/TrimBoth/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Trim/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/TranslateRotate/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Translate/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Stretch/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Scale/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Round/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Rotate2/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Rotate/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Reverse/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Offset/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Mirror/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Lengthen/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/FlipVertical/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/FlipHorizontal/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Explode/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Divide/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/BreakOutManual/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/BreakOutGap/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/BreakOut/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/Bevel/Tests/actual
+@pkgdir lib/qcad/scripts/Modify/AutoTrim/Tests/actual
+@pkgdir lib/qcad/scripts/Layer/AddLayer/Tests/actual
+@pkgdir lib/qcad/scripts/Information/InfoPolylineArea/Tests/actual
+@pkgdir lib/qcad/scripts/Information/InfoDistancePP/Tests/actual
+@pkgdir lib/qcad/scripts/Information/InfoDistanceEP/Tests/actual
+@pkgdir lib/qcad/scripts/Information/InfoDistanceEE/Tests/actual
+@pkgdir lib/qcad/scripts/Edit/Paste/Tests/actual
+@pkgdir lib/qcad/scripts/Edit/Esc/Tests/actual
+@pkgdir lib/qcad/scripts/Edit/Duplicate/Tests/actual
+@pkgdir lib/qcad/scripts/Edit/Delete/Tests/actual
+@pkgdir lib/qcad/scripts/Edit/CutWithReference/Tests/actual
+@pkgdir lib/qcad/scripts/Edit/Cut/Tests/actual
+@pkgdir lib/qcad/scripts/Edit/CopyWithReference/Tests/actual
+@pkgdir lib/qcad/scripts/Edit/Copy/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Text/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Spline/SplineControlPoints/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Shape/ShapeRectangleSize/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Shape/ShapePolygonPP/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Shape/ShapePolygonCP/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Shape/ShapePolygonAFPP/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Shape/ShapePolygonAFCP/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Polyline/DrawPolyline/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Point/Point1P/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineVertical/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineTangent2/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineTangent1/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineRelativeAngle/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineParallelThrough/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineParallel/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineOrthogonalTangent/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineOrthogonal/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineHorizontal/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineBisector/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/LineAngle/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Line/Line2P/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseRR/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseOffsetThrough/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseOffset/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseDD/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseCPP/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseArcCPPA/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Dimension/Leader/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Dimension/DimVertical/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Dimension/DimRotated/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Dimension/DimRadial/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Dimension/DimOrdinate/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Dimension/DimHorizontal/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Dimension/DimDiametric/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Dimension/DimAngular/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Dimension/DimAligned/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/CircleTPR/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/CircleT2P/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/CircleConcentricThrough/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/CircleConcentric/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/CircleCR/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/CircleCP/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/CircleCD/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/Circle3T/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/Circle3P/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/Circle2TR/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/Circle2TP/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Circle/Circle2P/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/ArcTangential/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/ArcConcentricThrough/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/ArcConcentric/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/ArcCPA/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/Arc3P/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/Arc2PR/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/Arc2PL/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/Arc2PH/Tests/actual
+@pkgdir lib/qcad/scripts/Draw/Arc/Arc2PA/Tests/actual
+@pkgdir lib/qcad/scripts/Block/RenameBlock/Tests/actual
+@pkgdir lib/qcad/scripts/Block/RemoveBlock/Tests/actual
+@pkgdir lib/qcad/scripts/Block/InsertBlock/Tests/actual
+@pkgdir lib/qcad/scripts/Block/EditFromReference/Tests/actual
+@pkgdir lib/qcad/scripts/Block/EditBlock/Tests/actual
+@pkgdir lib/qcad/scripts/Block/CreateBlock/Tests/actual
+@pkgdir lib/qcad/scripts/Block/AddBlock/Tests/actual
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index f21661b3448..7f13afb82ae 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,28 +1,23 @@
-$NetBSD: distinfo,v 1.33 2019/09/19 21:59:36 nia Exp $
+$NetBSD: distinfo,v 1.34 2019/12/29 12:44:15 plunky Exp $
 
-SHA1 (qcad-3.23.0.0.tar.gz) = 4d54082ae447f8bd388708ffaa845fb4b0b5b572
-RMD160 (qcad-3.23.0.0.tar.gz) = 277073e7ceaf713aa8c8e7a99dab95dd278da7ad
-SHA512 (qcad-3.23.0.0.tar.gz) = defec8cedfe2f7ef9963b4802a441172cef53d54cb9e30109b999c787f93b86f1ca4901a3960711ba54f05eee4c7a60d7a0a7807413826d1be621355c5956dd1
-Size (qcad-3.23.0.0.tar.gz) = 33296984 bytes
+SHA1 (qcad-3.24.0.1.tar.gz) = 39cf137348dfa28ddfa565b6d894da539a17fd44
+RMD160 (qcad-3.24.0.1.tar.gz) = e5a6c008443546f1f35939ba0c439df2b619e8fa
+SHA512 (qcad-3.24.0.1.tar.gz) = 1c4c03a0fdfb768285dca75469309bfd2cb65ddb6990f39b4990f1596f4ce3efbfa38f18d81b16290bcb5003ac55e8d25a8e0a2356f4a9ab74fdd8a452c7ed93
+Size (qcad-3.24.0.1.tar.gz) = 33773334 bytes
 SHA1 (patch-qcad.pro) = b8dafdf3105ff3580815bb82a6a84b71f4d0b172
-SHA1 (patch-scripts_Help_About_About.js) = c1d12d2dc6cdf5a4452d9872a11bc887c6729ce5
 SHA1 (patch-scripts_Help_ShowReadme_ShowReadme.js) = 96412237a7c4422f02dc5d2ab3634457b376a2d2
-SHA1 (patch-scripts_Widgets_CommandLine_CommandLine.js) = 3e8313d04f43a0115949d8a20b01a7cbbe097ef3
 SHA1 (patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js) = 65f988e553259eb93217ea12e9cb429fe52f05be
 SHA1 (patch-shared.pri) = f0b3ca615636c7fc2edc1af3b25b7aef2d9393ac
 SHA1 (patch-shared__app.pri) = a3957987228dcadb6eb8a8bb282d6d8baee643c2
 SHA1 (patch-src_3rdparty_3rdparty.pro) = e0954d186ef57d26fe9af5e29160e25ad6aea2ab
 SHA1 (patch-src_3rdparty_dxflib_dxflib.pro) = 7229800bfa5f04a475111f68cf26581e6ea41e83
-SHA1 (patch-src_3rdparty_dxflib_src_dl__writer.h) = 7009daf3a87ca82f3299f5b22b936e149c0ed036
 SHA1 (patch-src_3rdparty_opennurbs_opennurbs.pro) = d96e1ce129d32703fc474aea71afdae1d4b537ed
 SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp) = 26385c45b2132909470aba79181c242c785614a7
 SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.h) = 333fe1510cc5ea2457eefd7d07ccaf034ee5d22f
 SHA1 (patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro) = 7120c49027d4a50c23b1e9e60c44a1e0a239d6ac
 SHA1 (patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro) = d3af7c7c8da0d3bc297fb8cd19d0c91125bfcdfe
 SHA1 (patch-src_3rdparty_stemmer_stemmer.pro) = 22e2e937f6a19277608bad11676b156e87cf1826
-SHA1 (patch-src_core_RMetaTypes.h) = 8e3a2c7c7fc08a8608dcb64c9521c5449dd13fe8
 SHA1 (patch-src_core_RS.cpp) = 7864f7a99904401ad9eae01dfd1304f062a52d6a
-SHA1 (patch-src_core_RSPlatform.cpp) = 6df8bce2057748955873cd564512a1a3f88421f5
 SHA1 (patch-src_core_RSettings.cpp) = 3fc5cea42fae1b9ace651f68f38dad62dfe0e88a
 SHA1 (patch-src_core_core.pro) = 3b2c68139457f08205896b94e44ebf6c09eb6bfe
 SHA1 (patch-src_customwidgets_customwidgets.pro) = 8bac25b8f02092464591019be961470a45c810cc
diff --git a/cad/qcad/patches/patch-scripts_Help_About_About.js b/cad/qcad/patches/patch-scripts_Help_About_About.js
deleted file mode 100644
index 8d1d825b633..00000000000
--- a/cad/qcad/patches/patch-scripts_Help_About_About.js
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-scripts_Help_About_About.js,v 1.2 2019/09/05 13:39:10 nia Exp $
-
-add some system information to About window
-
---- scripts/Help/About/About.js.orig	2019-07-18 15:47:56.000000000 +0000
-+++ scripts/Help/About/About.js
-@@ -451,6 +451,16 @@ About.prototype.initAboutSystem = functi
-     if (RS.getSystemId()==="linux") {
-         text += "Linux";
-     }
-+    if (RS.getSystemId()==="netbsd") {
-+        text += "NetBSD";
-+    }
-+    if (RS.getSystemId()==="freebsd") {
-+        text += "FreeBSD";
-+    }
-+    if (RS.getSystemId()==="solaris") {
-+        text += "Solaris";
-+    }
-+    text += " [via pkgsrc]";
-     text += "\nOS version: " + RSettings.getOSVersion();
- 
-     text += "\n";
diff --git a/cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine.js b/cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine.js
deleted file mode 100644
index 3c0853f85c8..00000000000
--- a/cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine.js
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-scripts_Widgets_CommandLine_CommandLine.js,v 1.1 2019/07/31 19:30:21 plunky Exp $
-
-handle system IDs for common systems
-
---- scripts/Widgets/CommandLine/CommandLine.js.orig	2019-03-05 22:23:06.533419113 +0000
-+++ scripts/Widgets/CommandLine/CommandLine.js
-@@ -448,6 +448,15 @@ CommandLine.init = function(basePath) {
-     case "linux":
-         system = "Linux";
-         break;
-+    case "netbsd":
-+	system = "NetBSD";
-+	break;
-+    case "freebsd":
-+	system = "FreeBSD";
-+	break;
-+    case "solaris":
-+	system = "Solaris";
-+	break;
-     }
-     EAction.handleUserMessage(
-                 "%1 %2 / %3 %4"
diff --git a/cad/qcad/patches/patch-src_3rdparty_dxflib_src_dl__writer.h b/cad/qcad/patches/patch-src_3rdparty_dxflib_src_dl__writer.h
deleted file mode 100644
index d0c49e5d3f5..00000000000
--- a/cad/qcad/patches/patch-src_3rdparty_dxflib_src_dl__writer.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_3rdparty_dxflib_src_dl__writer.h,v 1.2 2019/09/05 13:39:10 nia Exp $
-
-apply fix for PR 45392
-
---- src/3rdparty/dxflib/src/dl_writer.h.orig	2019-07-18 15:47:56.000000000 +0000
-+++ src/3rdparty/dxflib/src/dl_writer.h
-@@ -36,6 +36,7 @@
- #pragma once
- #endif // _MSC_VER > 1000
- 
-+#include <cstring>
- #include <iostream>
- #include <algorithm>
- 
diff --git a/cad/qcad/patches/patch-src_core_RMetaTypes.h b/cad/qcad/patches/patch-src_core_RMetaTypes.h
deleted file mode 100644
index a5b94a328fe..00000000000
--- a/cad/qcad/patches/patch-src_core_RMetaTypes.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_core_RMetaTypes.h,v 1.1 2016/10/09 21:35:18 dholland Exp $
-
-Fix 32-bit build, where some of the integer types overlap. PR 51509.
-
---- src/core/RMetaTypes.h~	2016-08-29 06:49:22.000000000 +0000
-+++ src/core/RMetaTypes.h
-@@ -140,7 +140,9 @@
- #include "RSingleApplication.h"
- 
- Q_DECLARE_METATYPE(int*)
-+#ifdef _LP64
- Q_DECLARE_METATYPE(unsigned int*)
-+#endif
- Q_DECLARE_METATYPE(qint64*)
- 
- #if !defined Q_OS_WIN && !defined Q_OS_LINUX && !defined Q_OS_FREEBSD
diff --git a/cad/qcad/patches/patch-src_core_RSPlatform.cpp b/cad/qcad/patches/patch-src_core_RSPlatform.cpp
deleted file mode 100644
index dbadbdb925a..00000000000
--- a/cad/qcad/patches/patch-src_core_RSPlatform.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-src_core_RSPlatform.cpp,v 1.2 2019/09/05 13:39:10 nia Exp $
-
-enhance getSystemId for some common platforms
-
---- src/core/RSPlatform.cpp.orig	2019-07-18 15:47:56.000000000 +0000
-+++ src/core/RSPlatform.cpp
-@@ -43,7 +43,7 @@
- QString RS::getHostId() {
-     return QString("%1_%2")
-             .arg(getSystemId())
--#if defined(Q_OS_LINUX)
-+#if defined(Q_OS_LINUX) || defined(Q_OS_NETBSD) || defined(Q_OS_FREEBSD) || defined(Q_OS_SOLARIS)
-     .arg(getenv("HOSTNAME"));
- #elif defined(Q_OS_MAC)
-     // environment variable HOSTNAME not exported on OS X by default:
-@@ -56,7 +56,7 @@ QString RS::getHostId() {
- }
- 
- /**
-- * \return Unique system ID ("linux", "osx", "win").
-+ * \return Unique system ID ("linux", "osx", "win", "netbsd", "freebsd", "solaris").
-  */
- QString RS::getSystemId() {
- #if defined(Q_OS_LINUX)
-@@ -65,6 +65,12 @@ QString RS::getSystemId() {
-     return "osx";
- #elif defined(Q_OS_WIN)
-     return "win";
-+#elif defined(Q_OS_NETBSD)
-+    return "netbsd";
-+#elif defined(Q_OS_FREEBSD)
-+    return "freebsd";
-+#elif defined(Q_OS_SOLARIS)
-+    return "solaris";
- #else
-     return "unknown";
- #endif