- Update `cad/zcad' to version 0.9.8.4; switch from using

  pre-generated distfile to new official one from GitHub
- Switch from my custom makefile-based build to Lazarus one
  and thus remove MAKE_JOBS_UNSAFE which should no longer
  be required (hopefully)
- Drop Qt4-related CONFLICTS_INSTALL, Qt4 is already gone

PR:		236345
Submitted by:	acm

5 files changed, 182 insertions, 378 deletions

diff --git a/cad/zcad/Makefile b/cad/zcad/Makefile
index 0ba6b4be237a..e7b693e74565 100644
--- a/cad/zcad/Makefile
+++ b/cad/zcad/Makefile
@@ -2,42 +2,54 @@
 # $FreeBSD$
 
 PORTNAME=	zcad
-PORTVERSION=	0.9.8
-PORTREVISION=	3
+PORTVERSION=	0.9.8.4
 CATEGORIES=	cad
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
-MASTER_SITES=	LOCAL/danfe
-DISTNAME=	${PORTNAME}-trunk-r2259
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Simple CAD program
 
-BROKEN=		fails to build
-
 USES=		fpc lazarus:flavors tar:xz
+USE_GITHUB=	yes
+GH_ACCOUNT=	zamtmn
 USE_FPC=	cairo chm fcl-base fcl-image fcl-json fcl-stl fcl-xml opengl \
 		pasjpeg rtl-extra rtl-objpas x11
 
-EXTRACT_CMD=	LC_ALL=en_US.UTF-8 ${TAR}	# for non-ASCII filenames
-
 MAKE_ENV=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
 		LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
 		LCL_PLATFORM="${LCL_PLATFORM}" \
 		LAZARUS_DIR="${LAZARUS_DIR}" \
 		INSTANTFPCCACHE="${WRKSRC}/.cache"
 
-NO_LAZBUILD=	yes
-WRKSRC=		${WRKDIR}/trunk
 BUILD_WRKSRC=	${WRKSRC}/cad_source
 INSTALL_WRKSRC=	${WRKSRC}/cad
 
-LAZBUILD_ARGS=	-d --pcp=${WRKSRC}/tmppcp
-LAZARUS_NO_FLAVORS=qt5
+LAZARUS_PROJECT_FILES=	anchordocking/anchordocking.lpk \
+			fpvectorial/fpvectorialpkg.lpk \
+			lclextensions/lclextensions_package.lpk \
+			virtualtreeview/virtualtreeview_package.lpk \
+			other/rtl-generics_for_FPC304/rtl_generics.lpk \
+			components/zebase/zebase.lpk \
+			components/zcontainers/zcontainers.lpk \
+			components/zcontrols/zcontrols.lpk \
+			components/zmath/zmath.lpk \
+			components/zscriptbase/zscriptbase.lpk \
+			components/zscript/zscript.lpk \
+			components/zundostack/zundostack.lpk \
+			components/zobjectinspector/zobjectinspector.lpk \
+			components/ztoolbars/ztoolbars.lpk \
+			other/AGraphLaz/lazarus/ag_vectors.lpk \
+			other/AGraphLaz/lazarus/ag_attr.lpk \
+			other/AGraphLaz/lazarus/ag_math.lpk \
+			other/AGraphLaz/lazarus/ag_graph.lpk \
+			other/uniqueinstance/uniqueinstance_package.lpk \
+			utils/typeexporter.lpi
 
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4
-qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+LAZBUILD_ARGS=	-d --pcp=${WRKSRC}/tmppcp
+LLD_UNSAFE=	yes
 
-MAKE_JOBS_UNSAFE=	yes
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 PORTDOCS=	UserGuide.odt UserGuide.pdf
 
@@ -48,16 +60,16 @@ MAKE_ENV+=	GUI=gtk2
 .endif
 
 post-patch:
-	@${EGREP} -lR 'IFN?DEF LINUX' ${BUILD_WRKSRC} | ${XARGS} \
+	@${EGREP} -lR 'IFN?DEF LINUX' ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -E '/IFN?DEF LINUX/s,LINUX,UNIX,g'
 	@${REINPLACE_CMD} -e '/}Linux{/d' \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VStream.pas \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VFStream.pas \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VFileSys.pas \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VStrm64.pas
-	${CP} ${FILESDIR}/makefile ${BUILD_WRKSRC}/Makefile
+	@${REINPLACE_CMD} '1,6d' ${WRKSRC}/environment/makeenv_zcad.sh
 
-pre-build:
+post-configure:
 # OpenGL component must be fixed and rebuilt locally (to avoid touching
 # filesystem outside working directory)
 	${SED} -e 's,Linux,${OPSYS},' \
@@ -67,24 +79,27 @@ pre-build:
 		${LAZARUS_DIR}/components/opengl/glqtcontext.pas \
 		${LAZARUS_DIR}/components/opengl/openglcontext.res \
 		${BUILD_WRKSRC}
-# Build components that do not come with precompiled *.ppu files (also
-# copy them locally first for the same reason as above)
-	${CP} -a  ${LAZARUS_DIR}/components/fpvectorial \
-		${LAZARUS_DIR}/components/anchordocking ${WRKSRC}
-	${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \
-		--lazarusdir=${LAZARUS_DIR} \
-			${WRKSRC}/fpvectorial/fpvectorialpkg.lpk
-	${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \
-		--lazarusdir=${LAZARUS_DIR} \
-			${WRKSRC}/anchordocking/anchordocking.lpk
+	${CP} -a ${LAZARUS_DIR}/components/fpvectorial \
+		${LAZARUS_DIR}/components/anchordocking \
+		${LAZARUS_DIR}/components/virtualtreeview \
+		${LAZARUS_DIR}/components/lclextensions ${BUILD_WRKSRC}
+
+post-build:
+	@${MKDIR} ${WRKSRC}/cad
+	@${CP} -a ${WRKSRC}/environment/runtimefiles/common/* ${WRKSRC}/cad
+	@${CP} -a ${WRKSRC}/environment/runtimefiles/zcad/* ${WRKSRC}/cad
+	@cd ${WRKSRC}/environment && ${SH} makeenv_zcad.sh
+	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} \
+		${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \
+		--lazarusdir=${LAZARUS_DIR} zcad.lpi
 
 do-install:
 # Not ready for hier(7)-conforming installation yet
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/${PORTNAME}
-	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "blocks components \
-		fonts images languages menu programdb rtl sample \
+	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "autosave components \
+		fonts images languages log menu plugins rtl sample \
 		template" ${STAGEDIR}${PREFIX}/${PORTNAME}
 
 do-install-DOCS-on:
@@ -93,3 +108,5 @@ do-install-DOCS-on:
 		${INSTALL_WRKSRC}/UserGuide.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
+
+PATCH_ARGS+=	-l
diff --git a/cad/zcad/distinfo b/cad/zcad/distinfo
index e1b4a307bfab..eb9b5397bc32 100644
--- a/cad/zcad/distinfo
+++ b/cad/zcad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493632254
-SHA256 (zcad-trunk-r2259.tar.xz) = 9e441aee52313b8b6eb380dd3a92a9c61e35ff0c9f0bc9e71abc38c4579faff2
-SIZE (zcad-trunk-r2259.tar.xz) = 8789888
+TIMESTAMP = 1540234218
+SHA256 (zamtmn-zcad-0.9.8.4_GH0.tar.gz) = ba26a7d181712af104ae1c447b08ce48a3eb727c73d53e6cf80e1f4c2e3687f6
+SIZE (zamtmn-zcad-0.9.8.4_GH0.tar.gz) = 10040591
diff --git a/cad/zcad/files/makefile b/cad/zcad/files/makefile
deleted file mode 100644
index 442eb3ccdb8b..000000000000
--- a/cad/zcad/files/makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# $FreeBSD$
-
-OUTSUFX=	lib/$(ARCH)-$(OPSYS:tl)
-
-# XXX: sometimes the build crashes with ``An unhandled exception occurred
-# at $0814EBB3'' message (EAccessViolation: Access violation).  It might
-# be some concurrency issue, but it occurs even with MAKE_JOBS_UNSAFE, so
-# use the following simple workaround for the time being.
-ZEALOUS_BUILD=	sh -c 'i=0 ; until $(LAZBUILD_CMD) $(LAZBUILD_ARGS) --ws=$(LCL_PLATFORM) --lazarusdir=$(LAZARUS_DIR) $$0 ; do \
-		test $$i -lt 4 || return ; i=$$((i+1)) ; done'
-
-all: ../$(OUTSUFX)/zcad.compiled
-
-ZCAD_DEPS= \
-	other/AGraphLaz/lazarus/$(OUTSUFX)/ag_graph.compiled \
-	other/VirtualTreeView-Lazarus/Source/$(OUTSUFX)-$(GUI)/virtualtreeview_package.compiled \
-	components/zmath/$(OUTSUFX)/zmath.compiled \
-	components/zobjectinspector/$(OUTSUFX)/zobjectinspector.compiled
-
-AG_GRAPH_DEPS= \
-	other/AGraphLaz/lazarus/$(OUTSUFX)/ag_vectors.compiled \
-	other/AGraphLaz/lazarus/$(OUTSUFX)/ag_attr.compiled \
-	other/AGraphLaz/lazarus/$(OUTSUFX)/ag_math.compiled \
-
-VTV_DEPS= \
-	other/lclextensions/$(OUTSUFX)-$(GUI)/lclextensions_package.compiled
-
-ZMATH_DEPS= \
-	components/zebase/$(OUTSUFX)/zebase.compiled
-
-ZOBJINST_DEPS= \
-	components/zscript/$(OUTSUFX)/zscript.compiled \
-	components/zcontrols/$(OUTSUFX)/zcontrols.compiled \
-	components/zundostack/$(OUTSUFX)/zundostack.compiled
-
-ZSCRIPT_DEPS= \
-	components/zscriptbase/$(OUTSUFX)/zscriptbase.compiled
-
-ZSCRIPTBASE_DEPS= \
-	components/zcontainers/$(OUTSUFX)/zcontainers.compiled
-
-../$(OUTSUFX)/zcad.compiled: $(ZCAD_DEPS)
-	$(ZEALOUS_BUILD) zcad.lpi
-
-other/AGraphLaz/lazarus/$(OUTSUFX)/ag_graph.compiled: $(AG_GRAPH_DEPS)
-	$(ZEALOUS_BUILD) other/AGraphLaz/lazarus/ag_graph.lpk
-
-other/AGraphLaz/lazarus/$(OUTSUFX)/ag_vectors.compiled:
-	$(ZEALOUS_BUILD) other/AGraphLaz/lazarus/ag_vectors.lpk
-
-other/AGraphLaz/lazarus/$(OUTSUFX)/ag_attr.compiled:
-	$(ZEALOUS_BUILD) other/AGraphLaz/lazarus/ag_attr.lpk
-
-other/AGraphLaz/lazarus/$(OUTSUFX)/ag_math.compiled:
-	$(ZEALOUS_BUILD) other/AGraphLaz/lazarus/ag_math.lpk
-
-other/VirtualTreeView-Lazarus/Source/$(OUTSUFX)-$(GUI)/virtualtreeview_package.compiled: $(VTV_DEPS)
-	$(ZEALOUS_BUILD) other/VirtualTreeView-Lazarus/Source/virtualtreeview_package.lpk
-
-other/lclextensions/$(OUTSUFX)-$(GUI)/lclextensions_package.compiled:
-	$(ZEALOUS_BUILD) other/lclextensions/lclextensions_package.lpk
-
-components/zmath/$(OUTSUFX)/zmath.compiled: $(ZMATH_DEPS)
-	$(ZEALOUS_BUILD) components/zmath/zmath.lpk
-
-components/zebase/$(OUTSUFX)/zebase.compiled:
-	$(ZEALOUS_BUILD) components/zebase/zebase.lpk
-
-components/zobjectinspector/$(OUTSUFX)/zobjectinspector.compiled: $(ZOBJINST_DEPS)
-	$(ZEALOUS_BUILD) components/zobjectinspector/zobjectinspector.lpk
-
-components/zscript/$(OUTSUFX)/zscript.compiled: $(ZSCRIPT_DEPS)
-	$(ZEALOUS_BUILD) components/zscript/zscript.lpk
-
-components/zscriptbase/$(OUTSUFX)/zscriptbase.compiled: $(ZSCRIPTBASE_DEPS)
-	$(ZEALOUS_BUILD) components/zscriptbase/zscriptbase.lpk
-
-components/zcontainers/$(OUTSUFX)/zcontainers.compiled: $(ZMATH_DEPS)
-	$(ZEALOUS_BUILD) components/zcontainers/zcontainers.lpk
-
-components/zcontrols/$(OUTSUFX)/zcontrols.compiled:
-	$(ZEALOUS_BUILD) components/zcontrols/zcontrols.lpk
-
-components/zundostack/$(OUTSUFX)/zundostack.compiled: $(ZSCRIPT_DEPS)
-	$(ZEALOUS_BUILD) components/zundostack/zundostack.lpk
diff --git a/cad/zcad/files/patch-cad__source_zcad.lpi b/cad/zcad/files/patch-cad__source_zcad.lpi
index ef0a5bf29179..a401caad916b 100644
--- a/cad/zcad/files/patch-cad__source_zcad.lpi
+++ b/cad/zcad/files/patch-cad__source_zcad.lpi
@@ -2,10 +2,10 @@
 +++ cad_source/zcad.lpi
 @@ -220,7 +220,7 @@
          <PackageName Value="AnchorDocking"/>
-       </Item15>
-       <Item16>
--        <PackageName Value="LazOpenGLContext"/>
-+        <Filename Value="openglcontext.pas"/>
        </Item16>
        <Item17>
+-        <PackageName Value="LazOpenGLContext"/>
++        <Filename Value="openglcontext.pas"/>
+       </Item17>
+       <Item18>
          <PackageName Value="LCL"/>
diff --git a/cad/zcad/pkg-plist b/cad/zcad/pkg-plist
index 2983c4de52e0..055ae1dc35c8 100644
--- a/cad/zcad/pkg-plist
+++ b/cad/zcad/pkg-plist
@@ -1,126 +1,127 @@
-zcad/blocks/el/general/DEVICE_CABLE_MARK.pas
-zcad/blocks/el/general/DEVICE_CONNECTOR.pas
-zcad/blocks/el/general/DEVICE_CONNECTOR_POINT.pas
-zcad/blocks/el/general/DEVICE_CONNECTOR_SQUARE.pas
-zcad/blocks/el/general/DEVICE_CONNECTOR_TERMINAL.pas
-zcad/blocks/el/general/DEVICE_EL_CABLE_BREAK.pas
-zcad/blocks/el/general/DEVICE_EL_CABLE_DOWN.pas
-zcad/blocks/el/general/DEVICE_EL_CABLE_FROMDOWN.pas
-zcad/blocks/el/general/DEVICE_EL_CABLE_FROMUP.pas
-zcad/blocks/el/general/DEVICE_EL_CABLE_UP.pas
-zcad/blocks/el/general/DEVICE_EL_CONTACTOR.pas
-zcad/blocks/el/general/DEVICE_EL_LIGHT_FBULB.pas
-zcad/blocks/el/general/DEVICE_EL_LIGHT_LBULB.pas
-zcad/blocks/el/general/DEVICE_EL_LIGHT_SWITH.pas
-zcad/blocks/el/general/DEVICE_EL_MOTOR.pas
-zcad/blocks/el/general/DEVICE_EL_SHU.pas
-zcad/blocks/el/general/DEVICE_EL_SHUV.pas
-zcad/blocks/el/general/DEVICE_EL_SR.pas
-zcad/blocks/el/general/DEVICE_EL_YARV.pas
-zcad/blocks/el/general/DEVICE_KIP_ACTUATOR.pas
-zcad/blocks/el/general/DEVICE_KIP_AUTOMATION_BOX.pas
-zcad/blocks/el/general/DEVICE_KIP_CONNECTION_BOX.pas
-zcad/blocks/el/general/DEVICE_KIP_DETECTOR.pas
-zcad/blocks/el/general/DEVICE_KIP_DEVICE.pas
-zcad/blocks/el/general/DEVICE_KIP_KDU.pas
-zcad/blocks/el/general/DEVICE_KIP_KNOPKA.pas
-zcad/blocks/el/general/DEVICE_KIP_KNOPKA_PKE.pas
-zcad/blocks/el/general/DEVICE_KIP_KOROBKA.pas
-zcad/blocks/el/general/DEVICE_KIP_KPV.pas
-zcad/blocks/el/general/DEVICE_KIP_OZK.pas
-zcad/blocks/el/general/DEVICE_KIP_SENSOR.pas
-zcad/blocks/el/general/DEVICE_KIP_SOLENOID.pas
-zcad/blocks/el/general/DEVICE_KIP_SPZH.pas
-zcad/blocks/el/general/DEVICE_KIP_UKP.pas
-zcad/blocks/el/general/DEVICE_KIP_VALVE.pas
-zcad/blocks/el/general/DEVICE_OPS_AHL.pas
-zcad/blocks/el/general/DEVICE_OPS_DISTRIBUTION_BOX.pas
-zcad/blocks/el/general/DEVICE_OPS_GB2.pas
-zcad/blocks/el/general/DEVICE_OPS_PKU.pas
-zcad/blocks/el/general/DEVICE_OPS_SHPS.pas
-zcad/blocks/el/general/DEVICE_OPS_UZ.pas
-zcad/blocks/el/general/DEVICE_OS_DAT_BGB.pas
-zcad/blocks/el/general/DEVICE_OS_DAT_BGL.pas
-zcad/blocks/el/general/DEVICE_OS_DAT_BGL2.pas
-zcad/blocks/el/general/DEVICE_OS_DAT_BGLI.pas
-zcad/blocks/el/general/DEVICE_OS_DAT_BGLR.pas
-zcad/blocks/el/general/DEVICE_OS_DAT_BGOI.pas
-zcad/blocks/el/general/DEVICE_OS_DAT_BGOR.pas
-zcad/blocks/el/general/DEVICE_OS_DAT_BGT.pas
-zcad/blocks/el/general/DEVICE_OS_ELLOCK.pas
-zcad/blocks/el/general/DEVICE_OS_KNOPKA.pas
-zcad/blocks/el/general/DEVICE_OS_READER.pas
-zcad/blocks/el/general/DEVICE_PS_AR1.pas
-zcad/blocks/el/general/DEVICE_PS_AR2.pas
-zcad/blocks/el/general/DEVICE_PS_AR8.pas
-zcad/blocks/el/general/DEVICE_PS_ARK_DEVICE.pas
-zcad/blocks/el/general/DEVICE_PS_BIAD_RUPOR.pas
-zcad/blocks/el/general/DEVICE_PS_BIAL.pas
-zcad/blocks/el/general/DEVICE_PS_BIAS.pas
-zcad/blocks/el/general/DEVICE_PS_BIASL.pas
-zcad/blocks/el/general/DEVICE_PS_BRIZ.pas
-zcad/blocks/el/general/DEVICE_PS_DAT_HAND.pas
-zcad/blocks/el/general/DEVICE_PS_DAT_SMOKE.pas
-zcad/blocks/el/general/DEVICE_PS_DAT_SMOKE_AVTON.pas
-zcad/blocks/el/general/DEVICE_PS_DAT_SMOKE_FALSH.pas
-zcad/blocks/el/general/DEVICE_PS_DAT_SMOKE_FALSH2.pas
-zcad/blocks/el/general/DEVICE_PS_DAT_TERMO.pas
-zcad/blocks/el/general/DEVICE_PS_ET.pas
-zcad/blocks/el/general/DEVICE_PS_GB.pas
-zcad/blocks/el/general/DEVICE_PS_KOROBKA.pas
-zcad/blocks/el/general/DEVICE_PS_KPB.pas
-zcad/blocks/el/general/DEVICE_PS_SP1.pas
-zcad/blocks/el/general/DEVICE_PS_TABLO_ARROW.pas
-zcad/blocks/el/general/DEVICE_PS_TABLO_EXIT.pas
-zcad/blocks/el/general/DEVICE_PS_TABLO_EXIT_RESERVE.pas
-zcad/blocks/el/general/DEVICE_PS_TABLO_PNVHODI.pas
-zcad/blocks/el/general/DEVICE_PS_TABLO_PUHODI.pas
-zcad/blocks/el/general/DEVICE_PS_UKVK.pas
-zcad/blocks/el/general/DEVICE_PS_VUOS.pas
-zcad/blocks/el/general/DEVICE_SPDS_AXIS.pas
-zcad/blocks/el/general/DEVICE_SS_19.pas
-zcad/blocks/el/general/DEVICE_SS_ATS.pas
-zcad/blocks/el/general/DEVICE_SS_BIAS.pas
-zcad/blocks/el/general/DEVICE_SS_MIC.pas
-zcad/blocks/el/general/DEVICE_SS_PRICLOCK.pas
-zcad/blocks/el/general/DEVICE_SS_RJSOCKET.pas
-zcad/blocks/el/general/DEVICE_SS_RT.pas
-zcad/blocks/el/general/DEVICE_SS_SECCLOCK.pas
-zcad/blocks/el/general/DEVICE_SS_VCAM.pas
-zcad/blocks/el/general/DEVICE_SS_VCAMTC.pas
-zcad/blocks/el/general/_KIP.dxf
-zcad/blocks/el/general/_OPS.dxf
-zcad/blocks/el/general/_connector.dxf
-zcad/blocks/el/general/_el.dxf
-zcad/blocks/el/general/_nok.dxf
-zcad/blocks/el/general/_spds.dxf
-zcad/blocks/el/general/_ss.dxf
-zcad/blocks/el/general/zcadblocks.lst
-zcad/blocks/ops/PS_DAT_SMOKE.dxf
-zcad/blocks/ops/PS_DAT_TERMO.dxf
-zcad/components/22inch_1680x1050.xml
+zcad/autosave/empty.txt
+zcad/components/32inch_2560x1440.xml
 zcad/components/_sys.dxf
 zcad/components/autorun.cmd
 zcad/components/defaultlayout.xml
 zcad/components/defaultlayoutbackup.xml
 zcad/components/empty.dxf
-zcad/components/klayout.xml
+zcad/components/empty_dxf.txt
 zcad/components/logo.png
 zcad/components/main.sf
+zcad/components/myfulscreen.xml
+zcad/components/oldpalette.rgb
 zcad/components/palette.rgb
-zcad/components/undocked.xml
-zcad/components/vdock.xml
+zcad/components/stage0.cmd
+zcad/components/testlayout.xml
 zcad/components/zcad.lin
 zcad/fonts/GEWIND.SHX
 zcad/fonts/OpenGostTypeA-Regular.ttf
 zcad/fonts/OpenGostTypeB-Regular.ttf
 zcad/fonts/_mipGost.shx
 zcad/fonts/ltypeshp.shx
+zcad/images/actions/about.png
+zcad/images/actions/addtoowner.png
+zcad/images/actions/bedit.png
+zcad/images/actions/bottom.png
+zcad/images/actions/close.png
+zcad/images/actions/colors.png
+zcad/images/actions/copy.png
+zcad/images/actions/copyclip.png
+zcad/images/actions/cutclip.png
+zcad/images/actions/dimstyles.png
+zcad/images/actions/dist.png
+zcad/images/actions/draw/arc.png
+zcad/images/actions/draw/circle.png
+zcad/images/actions/draw/circle2p.png
+zcad/images/actions/draw/circle3p.png
+zcad/images/actions/draw/circlecd.png
+zcad/images/actions/draw/dim/dimaligned.png
+zcad/images/actions/draw/dim/dimdiametric.png
+zcad/images/actions/draw/dim/dimlinear.png
+zcad/images/actions/draw/dim/dimradial.png
+zcad/images/actions/draw/insert.png
+zcad/images/actions/draw/line.png
+zcad/images/actions/draw/pline.png
+zcad/images/actions/draw/rectangle.png
+zcad/images/actions/draw/text.png
+zcad/images/actions/erase.png
+zcad/images/actions/exit.png
+zcad/images/actions/find.png
+zcad/images/actions/grid.png
+zcad/images/actions/isone.png
+zcad/images/actions/isonw.png
+zcad/images/actions/isose.png
+zcad/images/actions/isosw.png
+zcad/images/actions/layers.png
+zcad/images/actions/left.png
+zcad/images/actions/linetypes.png
+zcad/images/actions/matchprop.png
+zcad/images/actions/mirror.png
+zcad/images/actions/move.png
+zcad/images/actions/mvarman.png
+zcad/images/actions/new.png
+zcad/images/actions/open.png
+zcad/images/actions/options.png
+zcad/images/actions/pandown.png
+zcad/images/actions/panleft.png
+zcad/images/actions/panright.png
+zcad/images/actions/panup.png
+zcad/images/actions/pasteclip.png
+zcad/images/actions/perspective.png
+zcad/images/actions/polyed.png
+zcad/images/actions/print.png
+zcad/images/actions/projecttree.png
+zcad/images/actions/qload.png
+zcad/images/actions/qsave.png
+zcad/images/actions/redo.png
+zcad/images/actions/regen.png
+zcad/images/actions/regenz.png
+zcad/images/actions/right.png
+zcad/images/actions/rotate.png
+zcad/images/actions/save.png
+zcad/images/actions/saveas.png
+zcad/images/actions/scale.png
+zcad/images/actions/snap/snaptoapparentintersection.png
+zcad/images/actions/snap/snaptocenter.png
+zcad/images/actions/snap/snaptoend.png
+zcad/images/actions/snap/snaptoinsert.png
+zcad/images/actions/snap/snaptointersection.png
+zcad/images/actions/snap/snaptomid.png
+zcad/images/actions/snap/snaptonearest.png
+zcad/images/actions/snap/snaptoparalel.png
+zcad/images/actions/snap/snaptoperpendicular.png
+zcad/images/actions/snap/snaptoquadrant.png
+zcad/images/actions/snap/snaptotangent.png
+zcad/images/actions/stretch.png
+zcad/images/actions/stripmtextall.png
+zcad/images/actions/stripmtextsel.png
+zcad/images/actions/textstyles.png
+zcad/images/actions/top.png
+zcad/images/actions/undo.png
+zcad/images/actions/varman.png
+zcad/images/actions/velec/superline.png
+zcad/images/actions/zelectro/array.png
+zcad/images/actions/zelectro/cable.png
+zcad/images/actions/zelectro/cablesroute.png
+zcad/images/actions/zelectro/cabpluscab.png
+zcad/images/actions/zelectro/csel.png
+zcad/images/actions/zelectro/leader.png
+zcad/images/actions/zelectro/ps.png
+zcad/images/actions/zelectro/removeautocables.png
+zcad/images/actions/zelectro/wire.png
+zcad/images/actions/zoomall.png
+zcad/images/actions/zoomin.png
+zcad/images/actions/zoomout.png
+zcad/images/actions/zoomwindow.png
 zcad/images/basket.png
 zcad/images/bug.png
+zcad/images/caddie.png
 zcad/images/dxf.png
 zcad/images/freze.png
+zcad/images/grid.png
+zcad/images/inspectlistitem.png
 zcad/images/lock.png
+zcad/images/lwt.png
 zcad/images/minus.png
 zcad/images/navgroup.png
 zcad/images/navigator.ima
@@ -129,195 +130,66 @@ zcad/images/ok.png
 zcad/images/on.png
 zcad/images/ondiagram.png
 zcad/images/onplan.png
+zcad/images/osnap.png
 zcad/images/plus.png
+zcad/images/polar.png
 zcad/images/print.png
 zcad/images/purge.png
 zcad/images/refresh.png
+zcad/images/snap.png
+zcad/images/snaptogrid.png
+zcad/images/sub.png
 zcad/images/unfreze.png
 zcad/images/unlock.png
 zcad/images/unprint.png
 zcad/languages/anchordockstr.ru.po
 zcad/languages/lclstrconsts.ru.po
+zcad/languages/rtzcad.po
+zcad/languages/rtzcad.ru.po
 zcad/languages/zcad.po
 zcad/languages/zcad.ru.po
-zcad/menu/BMP/1.bmp
-zcad/menu/BMP/El_Wire.bmp
-zcad/menu/BMP/about.bmp
-zcad/menu/BMP/addtoowner.bmp
-zcad/menu/BMP/arc.bmp
-zcad/menu/BMP/array.bmp
-zcad/menu/BMP/autocable.bmp
-zcad/menu/BMP/bedit.bmp
-zcad/menu/BMP/bottom.bmp
-zcad/menu/BMP/circle.bmp
-zcad/menu/BMP/circle2p.bmp
-zcad/menu/BMP/circle3p.bmp
-zcad/menu/BMP/circlecd.bmp
-zcad/menu/BMP/close.bmp
-zcad/menu/BMP/colors.bmp
-zcad/menu/BMP/copy.bmp
-zcad/menu/BMP/copyclip.bmp
+zcad/log/empty.txt
 zcad/menu/BMP/copyclipbase.bmp
-zcad/menu/BMP/cutclip.bmp
-zcad/menu/BMP/dimaligned.bmp
-zcad/menu/BMP/dimdiametric.bmp
-zcad/menu/BMP/dimlinear.bmp
-zcad/menu/BMP/dimradial.bmp
-zcad/menu/BMP/dimstyles.bmp
-zcad/menu/BMP/dist.bmp
-zcad/menu/BMP/el_cable.bmp
-zcad/menu/BMP/el_leader.bmp
-zcad/menu/BMP/erase.bmp
-zcad/menu/BMP/exit.bmp
-zcad/menu/BMP/find.bmp
 zcad/menu/BMP/help.bmp
-zcad/menu/BMP/insert.bmp
-zcad/menu/BMP/isone.bmp
-zcad/menu/BMP/isonw.bmp
-zcad/menu/BMP/isose.bmp
-zcad/menu/BMP/isosw.bmp
-zcad/menu/BMP/layer.bmp
-zcad/menu/BMP/left.bmp
-zcad/menu/BMP/line.bmp
-zcad/menu/BMP/linestyles.bmp
-zcad/menu/BMP/load.bmp
-zcad/menu/BMP/lwt.bmp
-zcad/menu/BMP/magnet.bmp
 zcad/menu/BMP/main.png
-zcad/menu/BMP/matchprop.bmp
-zcad/menu/BMP/mirror.bmp
-zcad/menu/BMP/move.bmp
-zcad/menu/BMP/mvarman.bmp
-zcad/menu/BMP/new.bmp
 zcad/menu/BMP/noimage.bmp
-zcad/menu/BMP/one.bmp
-zcad/menu/BMP/options.bmp
-zcad/menu/BMP/osnap.bmp
-zcad/menu/BMP/pandown.bmp
-zcad/menu/BMP/panleft.bmp
-zcad/menu/BMP/panright.bmp
-zcad/menu/BMP/panup.bmp
-zcad/menu/BMP/pasteclip.bmp
-zcad/menu/BMP/perspective.bmp
-zcad/menu/BMP/pline.bmp
-zcad/menu/BMP/polar.bmp
-zcad/menu/BMP/polyed.bmp
-zcad/menu/BMP/print.bmp
-zcad/menu/BMP/ps.bmp
-zcad/menu/BMP/rectangle.bmp
-zcad/menu/BMP/redo.bmp
-zcad/menu/BMP/regen.bmp
-zcad/menu/BMP/removeautocable.bmp
-zcad/menu/BMP/right.bmp
-zcad/menu/BMP/rotate.bmp
-zcad/menu/BMP/save.bmp
-zcad/menu/BMP/saveas.bmp
-zcad/menu/BMP/scale.bmp
-zcad/menu/BMP/snaptoapparentintersection.bmp
-zcad/menu/BMP/snaptocenter.bmp
-zcad/menu/BMP/snaptoend.bmp
-zcad/menu/BMP/snaptogrid.bmp
-zcad/menu/BMP/snaptoinsert.bmp
-zcad/menu/BMP/snaptointersection.bmp
-zcad/menu/BMP/snaptomid.bmp
-zcad/menu/BMP/snaptonearest.bmp
-zcad/menu/BMP/snaptoparalel.bmp
-zcad/menu/BMP/snaptoperpendicular.bmp
-zcad/menu/BMP/snaptoquadrant.bmp
-zcad/menu/BMP/snaptotangent.bmp
 zcad/menu/BMP/spec.bmp
-zcad/menu/BMP/sub.bmp
-zcad/menu/BMP/superline.bmp
-zcad/menu/BMP/text.bmp
-zcad/menu/BMP/textstyles.bmp
-zcad/menu/BMP/top.bmp
-zcad/menu/BMP/treeview.bmp
-zcad/menu/BMP/undo.bmp
-zcad/menu/BMP/varman.bmp
-zcad/menu/BMP/zoomall.bmp
-zcad/menu/BMP/zoomin.bmp
-zcad/menu/BMP/zoomout.bmp
-zcad/menu/BMP/zoomwindow.bmp
-zcad/menu/actions.acn
+zcad/menu/actionscontent.xml
 zcad/menu/default.cla
-zcad/menu/electrotech.acn
-zcad/menu/mainmenu.mn
-zcad/programdb/_startup.pas
-zcad/programdb/amk/ksspv.pas
-zcad/programdb/argusspectr/оповещение/am.pas
-zcad/programdb/argusspectr/оповещение/pu.pas
-zcad/programdb/bastion/ибп/ibp.pas
-zcad/programdb/bolid/ППКОП/ppkop.pas
-zcad/programdb/bolid/ППКОП/pu.pas
-zcad/programdb/danfoss/esm.pas
-zcad/programdb/danfoss/kpi35.pas
-zcad/programdb/irset/Шлейфовые извещатели/izv.pas
-zcad/programdb/kamkabel/pvs.pas
-zcad/programdb/kamkabel/svvp.pas
-zcad/programdb/kazteplocontrol/tb.pas
-zcad/programdb/manotom/mp3u.pas
-zcad/programdb/owen/dts.pas
-zcad/programdb/paritet/ksspv.pas
-zcad/programdb/rele/rp21.pas
-zcad/programdb/rubezh/Шлейфовые извещатели/C2000-4.pas
-zcad/programdb/saranskcabel/1.pas
-zcad/programdb/sevcabel/_EQ_SEVCABLEkvvg.csv
-zcad/programdb/sevcabel/kvvg.pas
-zcad/programdb/sevcabel/vvg.pas
-zcad/programdb/sevcabel/vvgngafrls.pas
-zcad/programdb/speccable/cable.pas
-zcad/programdb/spkbtehno/cable.pas
-zcad/programdb/ufimcabel/mks.pas
-zcad/programdb/ООО Электротехника и Автоматика/op.pas
-zcad/rtl/BlockCategory.cat
-zcad/rtl/EqCategory.cat
-zcad/rtl/cables.pas
-zcad/rtl/connectors.pas
+zcad/menu/menus.xml
+zcad/menu/menuscontent.xml
+zcad/menu/toolbarscontent.xml
+zcad/plugins/empty.txt
 zcad/rtl/devicebase.pas
-zcad/rtl/devices.pas
 zcad/rtl/dwg/DrawingDeviceBase.pas
 zcad/rtl/dwg/DrawingVars.pas
-zcad/rtl/objcalc/opsmark.pas
-zcad/rtl/objcalc/opsmarkdef.pas
-zcad/rtl/objdefunits/cable.pas
-zcad/rtl/objdefunits/elwire.pas
-zcad/rtl/objdefunits/include/_addtocable.pas
-zcad/rtl/objdefunits/include/_riser.pas
-zcad/rtl/objdefunits/include/_riserlink.pas
-zcad/rtl/objdefunits/include/_ss_socket.pas
-zcad/rtl/objdefunits/include/bglsensor.pas
-zcad/rtl/objdefunits/include/blocktype.pas
-zcad/rtl/objdefunits/include/cablename.pas
-zcad/rtl/objdefunits/include/connector.pas
-zcad/rtl/objdefunits/include/firesensor.pas
-zcad/rtl/objdefunits/include/objconnect.pas
-zcad/rtl/objdefunits/include/objgroup.pas
-zcad/rtl/objdefunits/include/objmaterial.pas
-zcad/rtl/objdefunits/include/objname.pas
-zcad/rtl/objdefunits/include/rip.pas
-zcad/rtl/objdefunits/include/slcabagenmodul.pas
 zcad/rtl/objdefunits/objroot.pas
-zcad/rtl/objdefunits/superline.pas
-zcad/rtl/objdefunits/trace.pas
 zcad/rtl/savedvar.pas
-zcad/rtl/styles/OPS_shleif.pas
-zcad/rtl/styles/styles.pas
 zcad/rtl/system.pas
 zcad/rtl/sysvar.pas
-zcad/rtl/sysvar_original.pas
 zcad/sample/entities.dxf
 zcad/sample/enttree/nonregular.dwg
+zcad/sample/enttree/nonregular.dxf
 zcad/sample/enttree/nonregular2.dwg
+zcad/sample/enttree/nonregular2.dxf
 zcad/sample/enttree/regular.dwg
+zcad/sample/enttree/regular.dxf
+zcad/sample/test_dxf/1.csv
 zcad/sample/test_dxf/3d_mount.dxf
 zcad/sample/test_dxf/by_trace.csv
 zcad/sample/test_dxf/by_trace.dxf
 zcad/sample/test_dxf/by_trace.dxf.dbpas
 zcad/sample/test_dxf/currenttest.dxf
 zcad/sample/test_dxf/currenttest.dxf.dbpas
+zcad/sample/test_dxf/debug.dxf
+zcad/sample/test_dxf/dxf.ltp
 zcad/sample/test_dxf/em.dxf
 zcad/sample/test_dxf/em.dxf.dbpas
 zcad/sample/test_dxf/ops.dxf
+zcad/sample/test_dxf/ops.dxf.dbpas
+zcad/sample/test_dxf/ops_arial.dxf
+zcad/sample/test_dxf/ops_text.dxf
+zcad/sample/test_dxf/ops_times.dxf
 zcad/sample/test_dxf/teapot.dxf
 zcad/sample/test_dxf/test.dxf
 zcad/sample/test_dxf/truetype.dxf