3 files changed, 23 insertions, 7 deletions

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 1cf6a93fe5da..185ad304301d 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qcad
-PORTVERSION=	3.15.2.0
+PORTVERSION=	3.15.4.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	cad
@@ -65,7 +65,7 @@ do-install:
 	${LN} -sf qcad-bin ${STAGEDIR}${PREFIX}/bin/qcad
 .for lib in ${SHRLIBS:C|^|lib|:C|$|.so|}
 	${INSTALL_LIB} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/${lib}.0
-	${LN} -sf lib/${lib}.0 ${STAGEDIR}${PREFIX}/lib/${lib}
+	${LN} -sf ../lib/${lib}.0 ${STAGEDIR}${PREFIX}/lib/${lib}
 .endfor
 .for lib in ${STALIBS:C|^|lib|:C|$|.a|}
 	${INSTALL_DATA} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index af25c3f7e3b1..27f210f7d01c 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465413968
-SHA256 (qcad/qcad-qcad-v3.15.2.0_GH0.tar.gz) = 4b8909e49a34a542b1b6aae37880707eca4eaa03da9ebfdcb4998391d79ce947
-SIZE (qcad/qcad-qcad-v3.15.2.0_GH0.tar.gz) = 21944465
+TIMESTAMP = 1470171972
+SHA256 (qcad/qcad-qcad-v3.15.4.0_GH0.tar.gz) = 1e412d1348240fd06926f9ddb7b321483c55a0caaf23c863a54bb2501bdbf74e
+SIZE (qcad/qcad-qcad-v3.15.4.0_GH0.tar.gz) = 22014615
diff --git a/cad/qcad/pkg-plist b/cad/qcad/pkg-plist
index 6f9ab13d5261..4ff2ddbe3dc2 100644
--- a/cad/qcad/pkg-plist
+++ b/cad/qcad/pkg-plist
@@ -24,6 +24,7 @@ lib/libqcadzip.so.0
 lib/libspatialindexnavel.so
 lib/libspatialindexnavel.so.0
 lib/libstemmer.a
+share/applications/usr_local_%%QT_BINDIR%%_qcad%%QT_BINDIR%%.desktop
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.dxf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.dxf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example00.dxf
@@ -11249,6 +11250,17 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerCustomProperty/ts/ExLayerCustomProperty_sk.ts
 %%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerCustomProperty/ts/ExLayerCustomProperty_sl.qm
 %%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerCustomProperty/ts/ExLayerCustomProperty_sl.ts
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ExLayerFromHatches.js
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ExLayerFromHatches.pro
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ExLayerFromHatchesInit.js
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ts/ExLayerFromHatches_de.qm
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ts/ExLayerFromHatches_de.ts
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ts/ExLayerFromHatches_ru.qm
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ts/ExLayerFromHatches_ru.ts
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ts/ExLayerFromHatches_sk.qm
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ts/ExLayerFromHatches_sk.ts
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ts/ExLayerFromHatches_sl.qm
+%%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerFromHatches/ts/ExLayerFromHatches_sl.ts
 %%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerWhiteToBlack/ExLayerWhiteToBlack.js
 %%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerWhiteToBlack/ExLayerWhiteToBlack.pro
 %%DATADIR%%/scripts/Misc/Examples/LayerExamples/ExLayerWhiteToBlack/ts/ExLayerWhiteToBlack_de.qm
@@ -11434,6 +11446,7 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.pro
 %%DATADIR%%/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.svg
 %%DATADIR%%/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.ui
+%%DATADIR%%/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShellDialog.ui
 %%DATADIR%%/scripts/Misc/MiscDevelopment/EcmaScriptShell/ToggleTitleBar-inverse.svg
 %%DATADIR%%/scripts/Misc/MiscDevelopment/EcmaScriptShell/ToggleTitleBar.svg
 %%DATADIR%%/scripts/Misc/MiscDevelopment/EcmaScriptShell/ts/EcmaScriptShell_de.qm
@@ -12655,10 +12668,14 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Lengthen/LengthenInit.js
 %%DATADIR%%/scripts/Modify/Lengthen/Tests/LengthenTest00.js
 %%DATADIR%%/scripts/Modify/Lengthen/Tests/LengthenTest01.js
+%%DATADIR%%/scripts/Modify/Lengthen/Tests/LengthenTest02.js
+%%DATADIR%%/scripts/Modify/Lengthen/Tests/LengthenTest03.js
 %%DATADIR%%/scripts/Modify/Lengthen/Tests/actual/.gitignore
 %%DATADIR%%/scripts/Modify/Lengthen/Tests/data/lines.dxf
 %%DATADIR%%/scripts/Modify/Lengthen/Tests/required/LengthenTest00_000.dxf
 %%DATADIR%%/scripts/Modify/Lengthen/Tests/required/LengthenTest01_000.dxf
+%%DATADIR%%/scripts/Modify/Lengthen/Tests/required/LengthenTest02_000.dxf
+%%DATADIR%%/scripts/Modify/Lengthen/Tests/required/LengthenTest03_000.dxf
 %%DATADIR%%/scripts/Modify/Lengthen/doc/Lengthen.dxf
 %%DATADIR%%/scripts/Modify/Lengthen/doc/Lengthen.svg
 %%DATADIR%%/scripts/Modify/Lengthen/doc/Lengthen_de.html
@@ -18291,8 +18308,7 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/Viewport/Templates/32_FourLeft.ui
 %%DATADIR%%/scripts/Widgets/Viewport/Viewport.js
 %%DATADIR%%/scripts/Widgets/Viewport/Viewport.pro
-%%DATADIR%%/scripts/Widgets/Viewport/Viewport.ui
-%%DATADIR%%/scripts/Widgets/Viewport/ViewportGl.ui
+%%DATADIR%%/scripts/Widgets/Viewport/ViewportQt.ui
 %%DATADIR%%/scripts/Widgets/Viewport/ts/Viewport_cs.qm
 %%DATADIR%%/scripts/Widgets/Viewport/ts/Viewport_cs.ts
 %%DATADIR%%/scripts/Widgets/Viewport/ts/Viewport_de.qm