8 files changed, 566 insertions, 450 deletions

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index ff3801fe1759..2204b4bf4f4f 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	qcad
-PORTVERSION=	1.3.3
+PORTVERSION=	1.4.0
 CATEGORIES=	cad
-MASTER_SITES=	http://www.ultraviolet.org/qcad/
-DISTNAME=	qcad_source
+MASTER_SITES=	http://download.sourceforge.net/qcad/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	will@FreeBSD.org
 
 USE_XLIB=	yes
-MAKEFILE=	makefile
 MAKE_ENV=	CC="${CXX}"
 USE_QT2=	yes
-
-BROKEN=		"Compiler error"
+NO_WRKSUBDIR=	yes
 
 QCADDIR=	${PREFIX}/lib/qcad
 QCADDOCDIR=	${PREFIX}/share/doc/qcad
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index 0186d43dc77a..e98078d41917 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1 +1 @@
-MD5 (qcad_source.tar.gz) = 8df27be2563bd998c8af54bac1732bda
+MD5 (qcad-1.4.0-src.tar.gz) = c474a27cfc818483397c7a1c79ac707c
diff --git a/cad/qcad/files/patch-aa b/cad/qcad/files/patch-aa
index e316e7c19fca..00324d454cee 100644
--- a/cad/qcad/files/patch-aa
+++ b/cad/qcad/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.orig	Sun Nov 28 17:17:52 1999
-+++ makefile	Mon Dec 13 16:32:31 1999
+--- Makefile.orig	Fri May  5 12:57:18 2000
++++ Makefile	Thu May 11 16:03:04 2000
 @@ -7,13 +7,12 @@
  
  ####### Compiler, tools and options
@@ -8,12 +8,13 @@
 -CFLAGS	=	-Wall -W -O2 -fno-strength-reduce
 -INCPATH	=	-I$(QTDIR)/include
 -LINK	=	g++
-+CFLAGS	+=	-Wall -W -fno-strength-reduce
-+INCPATH	=	-I$(X11BASE)/include/qt2 -I$(X11BASE)/include
-+LINK	=	$(CC)
- LFLAGS	=	
+-LFLAGS	=	-static
 -LIBS	=	-L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
 -MOC	=	moc
++CFLAGS	+=	-Wall -W -fno-strength-reduce
++INCPATH	=	-I$(X11BASE)/include/qt2 -I$(X11BASE)/include
++LINK	=	$(CXX)
++LFLAGS	=	
 +LIBS	=	-L$(X11BASE)/lib -lqt2 -lX11
 +MOC	=	moc2
  
diff --git a/cad/qcad/pkg-plist b/cad/qcad/pkg-plist
index c8cb3910492c..928e421eac61 100644
--- a/cad/qcad/pkg-plist
+++ b/cad/qcad/pkg-plist
@@ -6,10 +6,12 @@ lib/qcad/cur/cur_glass_mask.cur
 lib/qcad/fonts/courier.cxf
 lib/qcad/fonts/cursive.cxf
 lib/qcad/fonts/normal.cxf
+lib/qcad/fonts/romans.cxf
 lib/qcad/hatches/0.dxf
 lib/qcad/hatches/135.dxf
 lib/qcad/hatches/45.dxf
 lib/qcad/hatches/90.dxf
+lib/qcad/hatches/arcs.dxf
 lib/qcad/hatches/concrete.dxf
 lib/qcad/hatches/honeycomb.dxf
 lib/qcad/hatches/plastic.dxf
@@ -17,24 +19,35 @@ lib/qcad/hatches/sand.dxf
 lib/qcad/messages/de.cxl
 lib/qcad/messages/en.cxl
 lib/qcad/messages/es.cxl
+lib/qcad/messages/et.cxl
+lib/qcad/messages/eu.cxl
+lib/qcad/messages/fi.cxl
 lib/qcad/messages/fr.cxl
 lib/qcad/messages/ga.cxl
+lib/qcad/messages/gr.cxl
+lib/qcad/messages/hu.cxl
 lib/qcad/messages/it.cxl
+lib/qcad/messages/nl.cxl
+lib/qcad/messages/pt.cxl
+lib/qcad/messages/ru.cxl
+lib/qcad/messages/sk.cxl
 lib/qcad/qcad
 lib/qcad/xpm/addlayer.xpm
 lib/qcad/xpm/aligncenter.xpm
 lib/qcad/xpm/alignleft.xpm
 lib/qcad/xpm/alignright.xpm
-lib/qcad/xpm/appender_xpm.sh
 lib/qcad/xpm/applicationicon.xpm
 lib/qcad/xpm/apsicon.xpm
 lib/qcad/xpm/arcdir1.xpm
 lib/qcad/xpm/arcdir2.xpm
+lib/qcad/xpm/back.xpm
 lib/qcad/xpm/beveltrimoff.xpm
 lib/qcad/xpm/beveltrimon.xpm
 lib/qcad/xpm/cadarcscraa.xpm
 lib/qcad/xpm/cadarcspara.xpm
 lib/qcad/xpm/cadarcsppp.xpm
+lib/qcad/xpm/cadcircles3p.xpm
+lib/qcad/xpm/cadcirclescl.xpm
 lib/qcad/xpm/cadcirclescr.xpm
 lib/qcad/xpm/caddimsangle.xpm
 lib/qcad/xpm/caddimsarrow.xpm
@@ -69,7 +82,8 @@ lib/qcad/xpm/cadmenutext.xpm
 lib/qcad/xpm/cadmenuzoom.xpm
 lib/qcad/xpm/cadpointsingle.xpm
 lib/qcad/xpm/camauto.xpm
-lib/qcad/xpm/camexpert.xpm
+lib/qcad/xpm/camexp.xpm
+lib/qcad/xpm/camexpintro.xpm
 lib/qcad/xpm/cammanual.xpm
 lib/qcad/xpm/color00.xpm
 lib/qcad/xpm/color01.xpm
@@ -95,6 +109,7 @@ lib/qcad/xpm/document.xpm
 lib/qcad/xpm/edit.xpm
 lib/qcad/xpm/editattrib.xpm
 lib/qcad/xpm/editbevel.xpm
+lib/qcad/xpm/editclip.xpm
 lib/qcad/xpm/editcopy.xpm
 lib/qcad/xpm/editcut.xpm
 lib/qcad/xpm/editdelete.xpm
@@ -112,6 +127,7 @@ lib/qcad/xpm/edittext.xpm
 lib/qcad/xpm/edittextelement.xpm
 lib/qcad/xpm/edittrim.xpm
 lib/qcad/xpm/edittrim2.xpm
+lib/qcad/xpm/edittrim3.xpm
 lib/qcad/xpm/editzero.xpm
 lib/qcad/xpm/fileclose.xpm
 lib/qcad/xpm/filecloseoutput.xpm
@@ -123,7 +139,9 @@ lib/qcad/xpm/fileprintprev.xpm
 lib/qcad/xpm/fileprintsetup.xpm
 lib/qcad/xpm/filerecall.xpm
 lib/qcad/xpm/filesave.xpm
-lib/qcad/xpm/firmicon.xpm
+lib/qcad/xpm/folderclosed.xpm
+lib/qcad/xpm/folderopen.xpm
+lib/qcad/xpm/forward.xpm
 lib/qcad/xpm/helpabout.xpm
 lib/qcad/xpm/helpeditlayer.xpm
 lib/qcad/xpm/helpeditmirror.xpm
@@ -137,11 +155,18 @@ lib/qcad/xpm/helpsnapkeyar.xpm
 lib/qcad/xpm/helpsnapkeyxy.xpm
 lib/qcad/xpm/hiddenlayer.xpm
 lib/qcad/xpm/info.xpm
+lib/qcad/xpm/init.xpm
 lib/qcad/xpm/insertitem.xpm
 lib/qcad/xpm/layerlist.xpm
+lib/qcad/xpm/librarybrowser.xpm
 lib/qcad/xpm/lock.xpm
 lib/qcad/xpm/lock01.xpm
 lib/qcad/xpm/lock02.xpm
+lib/qcad/xpm/measureanglelnln.xpm
+lib/qcad/xpm/measureeditelement.xpm
+lib/qcad/xpm/measurelnpt.xpm
+lib/qcad/xpm/measureparallellines.xpm
+lib/qcad/xpm/measureptpt.xpm
 lib/qcad/xpm/modeabs.xpm
 lib/qcad/xpm/modecomparison.xpm
 lib/qcad/xpm/modeconstruction.xpm
@@ -151,10 +176,12 @@ lib/qcad/xpm/mouse.xpm
 lib/qcad/xpm/paste.xpm
 lib/qcad/xpm/qcad.xpm
 lib/qcad/xpm/qcadintro.xpm
+lib/qcad/xpm/qcadsgi.xpm
 lib/qcad/xpm/redo.xpm
 lib/qcad/xpm/removeemptylayers.xpm
 lib/qcad/xpm/removelayer.xpm
 lib/qcad/xpm/renamelayer.xpm
+lib/qcad/xpm/ribbonsoft.xpm
 lib/qcad/xpm/roundtrimoff.xpm
 lib/qcad/xpm/roundtrimon.xpm
 lib/qcad/xpm/shaperoundin.xpm
@@ -163,7 +190,6 @@ lib/qcad/xpm/shapestraight.xpm
 lib/qcad/xpm/simbroken.xpm
 lib/qcad/xpm/simdetails.xpm
 lib/qcad/xpm/simgrid.xpm
-lib/qcad/xpm/simgrid.xpm~
 lib/qcad/xpm/simoptions.xpm
 lib/qcad/xpm/simpointing.xpm
 lib/qcad/xpm/simrapidmove.xpm
@@ -195,7 +221,7 @@ lib/qcad/xpm/taginvert.xpm
 lib/qcad/xpm/taglayer.xpm
 lib/qcad/xpm/tagnothing.xpm
 lib/qcad/xpm/tagrange.xpm
-lib/qcad/xpm/test.gif
+lib/qcad/xpm/tile.xpm
 lib/qcad/xpm/undo.xpm
 lib/qcad/xpm/untaginters.xpm
 lib/qcad/xpm/untagrange.xpm
@@ -212,223 +238,256 @@ lib/qcad/xpm/width08.xpm
 lib/qcad/xpm/zero.xpm
 lib/qcad/xpm/zerorel.xpm
 lib/qcad/xpm/zerorelwhite.xpm
+lib/qcad/xpm/zerosmall.xpm
 lib/qcad/xpm/zoomauto.xpm
 lib/qcad/xpm/zoomdecrease.xpm
 lib/qcad/xpm/zoomincrease.xpm
+lib/qcad/xpm/zoomone.xpm
 lib/qcad/xpm/zoompan.xpm
 lib/qcad/xpm/zoomredraw.xpm
 lib/qcad/xpm/zoomtagged.xpm
+lib/qcad/xpm/zoomtopage.xpm
 lib/qcad/xpm/zoomwindow.xpm
-share/doc/qcad/001.html
-share/doc/qcad/002.html
-share/doc/qcad/003.html
-share/doc/qcad/004.html
-share/doc/qcad/005.html
-share/doc/qcad/006.html
-share/doc/qcad/007.html
-share/doc/qcad/008.html
-share/doc/qcad/009.html
-share/doc/qcad/010.html
-share/doc/qcad/011.html
-share/doc/qcad/012.html
-share/doc/qcad/013.html
-share/doc/qcad/014.html
-share/doc/qcad/img/000000.gif
-share/doc/qcad/img/12568c.gif
-share/doc/qcad/img/boxangle.png
-share/doc/qcad/img/boxbevel.png
-share/doc/qcad/img/boxdirection.png
-share/doc/qcad/img/boxdistance.png
-share/doc/qcad/img/boxlength.png
-share/doc/qcad/img/boxround.png
-share/doc/qcad/img/butprev.png
-share/doc/qcad/img/createarcs.png
-share/doc/qcad/img/createarcsparallel.png
-share/doc/qcad/img/createarcspoints.png
-share/doc/qcad/img/createcircles.png
-share/doc/qcad/img/createdimsalign.png
-share/doc/qcad/img/createdimsangle.png
-share/doc/qcad/img/createdimsarrow.png
-share/doc/qcad/img/createdimsdiam.png
-share/doc/qcad/img/createdimshor.png
-share/doc/qcad/img/createdimsrad.png
-share/doc/qcad/img/createdimsver.png
-share/doc/qcad/img/createhatches.png
-share/doc/qcad/img/createlines.png
-share/doc/qcad/img/createlinesangle.png
-share/doc/qcad/img/createlinesbisectors.png
-share/doc/qcad/img/createlineshor.png
-share/doc/qcad/img/createlinesortho.png
-share/doc/qcad/img/createlinesortho2.png
-share/doc/qcad/img/createlinesparallels.png
-share/doc/qcad/img/createlinesrectangles.png
-share/doc/qcad/img/createlinestangents1.png
-share/doc/qcad/img/createlinestangents2.png
-share/doc/qcad/img/createlinesver.png
-share/doc/qcad/img/createpointssingle.png
-share/doc/qcad/img/dialogattrib.png
-share/doc/qcad/img/dialogcam.png
-share/doc/qcad/img/dialoghatch.png
-share/doc/qcad/img/dialogmirror.png
-share/doc/qcad/img/dialogmove.png
-share/doc/qcad/img/dialogmoverotate.png
-share/doc/qcad/img/dialogoptions.png
-share/doc/qcad/img/dialogrotate.png
-share/doc/qcad/img/dialogrotaterotate.png
-share/doc/qcad/img/dialogscale.png
-share/doc/qcad/img/dimensionalign.png
-share/doc/qcad/img/dimensionangle.png
-share/doc/qcad/img/dimensiondiam.png
-share/doc/qcad/img/dimensionhor.png
-share/doc/qcad/img/dimensionrad.png
-share/doc/qcad/img/editattrib.png
-share/doc/qcad/img/editbevel.png
-share/doc/qcad/img/editcut.png
-share/doc/qcad/img/editdelete.png
-share/doc/qcad/img/editlayer.png
-share/doc/qcad/img/editmirror.png
-share/doc/qcad/img/editmove.png
-share/doc/qcad/img/editmoverotate.png
-share/doc/qcad/img/editrotate.png
-share/doc/qcad/img/editrotaterotate.png
-share/doc/qcad/img/editround.png
-share/doc/qcad/img/editscale.png
-share/doc/qcad/img/editstretch.png
-share/doc/qcad/img/edittext.png
-share/doc/qcad/img/edittextelements.png
-share/doc/qcad/img/edittexttoobjects.png
-share/doc/qcad/img/edittrim.png
-share/doc/qcad/img/edittrim2.png
-share/doc/qcad/img/editzero.png
-share/doc/qcad/img/filecloseinput.png
-share/doc/qcad/img/filecloseoutput.png
-share/doc/qcad/img/filenew.png
-share/doc/qcad/img/fileopen.png
-share/doc/qcad/img/filesave.png
-share/doc/qcad/img/fontedit.png
-share/doc/qcad/img/gifs
-share/doc/qcad/img/hatches.png
-share/doc/qcad/img/infoview.png
-share/doc/qcad/img/layadd.png
-share/doc/qcad/img/laydelete.png
-share/doc/qcad/img/layerlist.png
-share/doc/qcad/img/layren.png
-share/doc/qcad/img/layshowall.png
-share/doc/qcad/img/layshownone.png
-share/doc/qcad/img/laytrash.png
-share/doc/qcad/img/logo_qcad.jpeg
-share/doc/qcad/img/logo_camexp.png
-share/doc/qcad/img/logo_qcad.png
-share/doc/qcad/img/menuarcs.png
-share/doc/qcad/img/menucam.png
-share/doc/qcad/img/menucircles.png
-share/doc/qcad/img/menudims.png
-share/doc/qcad/img/menuedit.png
-share/doc/qcad/img/menulines.png
-share/doc/qcad/img/menupoints.png
-share/doc/qcad/img/menuselect.png
-share/doc/qcad/img/menutexts.png
-share/doc/qcad/img/moverotate.png
-share/doc/qcad/img/patterns.png
-share/doc/qcad/img/print.png
-share/doc/qcad/img/printpreview.png
-share/doc/qcad/img/printsetup.png
-share/doc/qcad/img/redo.png
-share/doc/qcad/img/rotaterotate.png
-share/doc/qcad/img/roundings.png
-share/doc/qcad/img/screen.png
-share/doc/qcad/img/screen_cam.png
-share/doc/qcad/img/screen_t.png
-share/doc/qcad/img/showlayerlist.png
-share/doc/qcad/img/simcontours.png
-share/doc/qcad/img/simdetails.png
-share/doc/qcad/img/simedit.png
-share/doc/qcad/img/simengrave.png
-share/doc/qcad/img/simgrid.png
-share/doc/qcad/img/siminfo.png
-share/doc/qcad/img/simlayer.png
-share/doc/qcad/img/simplay.png
-share/doc/qcad/img/simrapid.png
-share/doc/qcad/img/simslow.png
-share/doc/qcad/img/simspeed.png
-share/doc/qcad/img/sketchcenters.png
-share/doc/qcad/img/sketchdistancepoints.png
-share/doc/qcad/img/sketchelements.png
-share/doc/qcad/img/sketchendpoints.png
-share/doc/qcad/img/sketchintersections1.png
-share/doc/qcad/img/sketchintersections2.png
-share/doc/qcad/img/sketchmiddlepoints.png
-share/doc/qcad/img/snapcenters.png
-share/doc/qcad/img/snapdistance.png
-share/doc/qcad/img/snapelement.png
-share/doc/qcad/img/snapendpoints.png
-share/doc/qcad/img/snapfree.png
-share/doc/qcad/img/snapgrid.png
-share/doc/qcad/img/snapintersections1.png
-share/doc/qcad/img/snapintersections2.png
-share/doc/qcad/img/snapkeyar.png
-share/doc/qcad/img/snapkeyxy.png
-share/doc/qcad/img/snapmiddles.png
-share/doc/qcad/img/space.gif
-share/doc/qcad/img/stretch01.png
-share/doc/qcad/img/stretch02.png
-share/doc/qcad/img/tagall.png
-share/doc/qcad/img/tagcontour.png
-share/doc/qcad/img/tagdoubles.png
-share/doc/qcad/img/tagenough.png
-share/doc/qcad/img/tagintersection.png
-share/doc/qcad/img/taginvert.png
-share/doc/qcad/img/taglayer.png
-share/doc/qcad/img/tagnothing.png
-share/doc/qcad/img/tagrange.png
-share/doc/qcad/img/tagsingle.png
-share/doc/qcad/img/textcopy.png
-share/doc/qcad/img/textcourier.png
-share/doc/qcad/img/textcursive.png
-share/doc/qcad/img/textcut.png
-share/doc/qcad/img/textdialog.png
-share/doc/qcad/img/textnew.png
-share/doc/qcad/img/textnormal.png
-share/doc/qcad/img/textopen.png
-share/doc/qcad/img/textparameters1.png
-share/doc/qcad/img/textparameters2.png
-share/doc/qcad/img/textpaste.png
-share/doc/qcad/img/textsave.png
-share/doc/qcad/img/textshapes.png
-share/doc/qcad/img/tile.jpeg
-share/doc/qcad/img/toolbar_cont.png
-share/doc/qcad/img/toolbar_first.png
-share/doc/qcad/img/toolbar_home.png
-share/doc/qcad/img/toolbar_last.png
-share/doc/qcad/img/toolbar_left.png
-share/doc/qcad/img/toolbar_next.png
-share/doc/qcad/img/toolbar_prev.png
-share/doc/qcad/img/toolbar_right.png
-share/doc/qcad/img/toolbarzoom.png
-share/doc/qcad/img/undo.png
-share/doc/qcad/img/untagintersection.png
-share/doc/qcad/img/untagrange.png
-share/doc/qcad/img/zoomauto.png
-share/doc/qcad/img/zoomdecrease.png
-share/doc/qcad/img/zoomincrease.png
-share/doc/qcad/img/zoompan.png
-share/doc/qcad/img/zoomredraw.png
-share/doc/qcad/img/zoomtagged.png
-share/doc/qcad/img/zoomwindow.png
-share/doc/qcad/index.html
-share/doc/qcad/screen.html
-share/doc/qcad/styles.css
-share/examples/qcad/qcad_border.dxf
-share/examples/qcad/qcad_example01.dxf
-share/examples/qcad/qcad_example02.dxf
-share/examples/qcad/qcad_example03.dxf
-share/examples/qcad/qcad_hatchings.dxf
-share/examples/qcad/qcad_styles.dxf
-share/examples/qcad/qcad_texts.dxf
+share/doc/qcad/en/001.html
+share/doc/qcad/en/002.html
+share/doc/qcad/en/003.html
+share/doc/qcad/en/004.html
+share/doc/qcad/en/005.html
+share/doc/qcad/en/006.html
+share/doc/qcad/en/007.html
+share/doc/qcad/en/008.html
+share/doc/qcad/en/009.html
+share/doc/qcad/en/010.html
+share/doc/qcad/en/011.html
+share/doc/qcad/en/012.html
+share/doc/qcad/en/013.html
+share/doc/qcad/en/014.html
+share/doc/qcad/en/015.html
+share/doc/qcad/en/016.html
+share/doc/qcad/en/017.html
+share/doc/qcad/en/018.html
+share/doc/qcad/en/img/000000.png
+share/doc/qcad/en/img/boxangle.png
+share/doc/qcad/en/img/boxbevel.png
+share/doc/qcad/en/img/boxdirection.png
+share/doc/qcad/en/img/boxdistance.png
+share/doc/qcad/en/img/boxlength.png
+share/doc/qcad/en/img/boxround.png
+share/doc/qcad/en/img/createarcs.png
+share/doc/qcad/en/img/createarcsparallel.png
+share/doc/qcad/en/img/createarcspoints.png
+share/doc/qcad/en/img/createcircles.png
+share/doc/qcad/en/img/createdimsalign.png
+share/doc/qcad/en/img/createdimsangle.png
+share/doc/qcad/en/img/createdimsarrow.png
+share/doc/qcad/en/img/createdimsdiam.png
+share/doc/qcad/en/img/createdimshor.png
+share/doc/qcad/en/img/createdimsrad.png
+share/doc/qcad/en/img/createdimsver.png
+share/doc/qcad/en/img/createhatches.png
+share/doc/qcad/en/img/createlines.png
+share/doc/qcad/en/img/createlinesangle.png
+share/doc/qcad/en/img/createlinesbisectors.png
+share/doc/qcad/en/img/createlineshor.png
+share/doc/qcad/en/img/createlinesortho.png
+share/doc/qcad/en/img/createlinesortho2.png
+share/doc/qcad/en/img/createlinesparallels.png
+share/doc/qcad/en/img/createlinesrectangles.png
+share/doc/qcad/en/img/createlinestangents1.png
+share/doc/qcad/en/img/createlinestangents2.png
+share/doc/qcad/en/img/createlinesver.png
+share/doc/qcad/en/img/createpointssingle.png
+share/doc/qcad/en/img/dialogattrib.png
+share/doc/qcad/en/img/dialogcam.png
+share/doc/qcad/en/img/dialogdec.png
+share/doc/qcad/en/img/dialoghatch.png
+share/doc/qcad/en/img/dialogmirror.png
+share/doc/qcad/en/img/dialogmove.png
+share/doc/qcad/en/img/dialogmoverotate.png
+share/doc/qcad/en/img/dialogoptions_camexp.png
+share/doc/qcad/en/img/dialogoptions_qcad.png
+share/doc/qcad/en/img/dialogrotate.png
+share/doc/qcad/en/img/dialogrotaterotate.png
+share/doc/qcad/en/img/dialogscale.png
+share/doc/qcad/en/img/dimensionalign.png
+share/doc/qcad/en/img/dimensionangle.png
+share/doc/qcad/en/img/dimensiondiam.png
+share/doc/qcad/en/img/dimensionhor.png
+share/doc/qcad/en/img/dimensionpanel.png
+share/doc/qcad/en/img/dimensionrad.png
+share/doc/qcad/en/img/editattrib.png
+share/doc/qcad/en/img/editbevel.png
+share/doc/qcad/en/img/editclip.png
+share/doc/qcad/en/img/editcut.png
+share/doc/qcad/en/img/editdelete.png
+share/doc/qcad/en/img/editlayer.png
+share/doc/qcad/en/img/editmirror.png
+share/doc/qcad/en/img/editmove.png
+share/doc/qcad/en/img/editmoverotate.png
+share/doc/qcad/en/img/editrotate.png
+share/doc/qcad/en/img/editrotaterotate.png
+share/doc/qcad/en/img/editround.png
+share/doc/qcad/en/img/editscale.png
+share/doc/qcad/en/img/editstretch.png
+share/doc/qcad/en/img/edittext.png
+share/doc/qcad/en/img/edittextelements.png
+share/doc/qcad/en/img/edittexttoobjects.png
+share/doc/qcad/en/img/edittrim.png
+share/doc/qcad/en/img/edittrim2.png
+share/doc/qcad/en/img/edittrim3.png
+share/doc/qcad/en/img/editzero.png
+share/doc/qcad/en/img/filecloseinput.png
+share/doc/qcad/en/img/filecloseoutput.png
+share/doc/qcad/en/img/filenew.png
+share/doc/qcad/en/img/fileopen.png
+share/doc/qcad/en/img/filesave.png
+share/doc/qcad/en/img/fontedit.png
+share/doc/qcad/en/img/hatches.png
+share/doc/qcad/en/img/infoview.png
+share/doc/qcad/en/img/layadd.png
+share/doc/qcad/en/img/laydelete.png
+share/doc/qcad/en/img/layerlist.png
+share/doc/qcad/en/img/layren.png
+share/doc/qcad/en/img/layshowall.png
+share/doc/qcad/en/img/layshownone.png
+share/doc/qcad/en/img/laytrash.png
+share/doc/qcad/en/img/libborder01.png
+share/doc/qcad/en/img/libborder02.png
+share/doc/qcad/en/img/libbrowser01.png
+share/doc/qcad/en/img/libhierarchy.png
+share/doc/qcad/en/img/librarybrowser.png
+share/doc/qcad/en/img/libscrew01.png
+share/doc/qcad/en/img/libscrew02.png
+share/doc/qcad/en/img/logo_big.jpeg
+share/doc/qcad/en/img/logo_camexp.png
+share/doc/qcad/en/img/logo_qcad.jpeg
+share/doc/qcad/en/img/logo_qcad.png
+share/doc/qcad/en/img/measureangle.png
+share/doc/qcad/en/img/measurecoords.png
+share/doc/qcad/en/img/measurelnln.png
+share/doc/qcad/en/img/measurelnpt.png
+share/doc/qcad/en/img/measureptpt.png
+share/doc/qcad/en/img/menuarcs.png
+share/doc/qcad/en/img/menucam.png
+share/doc/qcad/en/img/menucircles.png
+share/doc/qcad/en/img/menudims.png
+share/doc/qcad/en/img/menuedit.png
+share/doc/qcad/en/img/menulines.png
+share/doc/qcad/en/img/menumeasure.png
+share/doc/qcad/en/img/menupoints.png
+share/doc/qcad/en/img/menuselect.png
+share/doc/qcad/en/img/menutexts.png
+share/doc/qcad/en/img/moverotate.png
+share/doc/qcad/en/img/patterns.png
+share/doc/qcad/en/img/print.png
+share/doc/qcad/en/img/printpreview.png
+share/doc/qcad/en/img/printsetup.png
+share/doc/qcad/en/img/redo.png
+share/doc/qcad/en/img/ribbonsoft.png
+share/doc/qcad/en/img/rotaterotate.png
+share/doc/qcad/en/img/roundings.png
+share/doc/qcad/en/img/screen_cam.png
+share/doc/qcad/en/img/screen_t.png
+share/doc/qcad/en/img/separator.png
+share/doc/qcad/en/img/showlayerlist.png
+share/doc/qcad/en/img/simcontours.png
+share/doc/qcad/en/img/simdetails.png
+share/doc/qcad/en/img/simedit.png
+share/doc/qcad/en/img/simengrave.png
+share/doc/qcad/en/img/simgrid.png
+share/doc/qcad/en/img/siminfo.png
+share/doc/qcad/en/img/simlayer.png
+share/doc/qcad/en/img/simplay.png
+share/doc/qcad/en/img/simrapid.png
+share/doc/qcad/en/img/simslow.png
+share/doc/qcad/en/img/simspeed.png
+share/doc/qcad/en/img/sketchcenters.png
+share/doc/qcad/en/img/sketchclip.png
+share/doc/qcad/en/img/sketchdec01.png
+share/doc/qcad/en/img/sketchdec02.png
+share/doc/qcad/en/img/sketchdec03.png
+share/doc/qcad/en/img/sketchdec04.png
+share/doc/qcad/en/img/sketchdec05.png
+share/doc/qcad/en/img/sketchdec06.png
+share/doc/qcad/en/img/sketchdimension1.png
+share/doc/qcad/en/img/sketchdimension2.png
+share/doc/qcad/en/img/sketchdistancepoints.png
+share/doc/qcad/en/img/sketchelements.png
+share/doc/qcad/en/img/sketchendpoints.png
+share/doc/qcad/en/img/sketchintersections1.png
+share/doc/qcad/en/img/sketchintersections2.png
+share/doc/qcad/en/img/sketchmiddlepoints.png
+share/doc/qcad/en/img/sketchopt01.png
+share/doc/qcad/en/img/snapcenters.png
+share/doc/qcad/en/img/snapdistance.png
+share/doc/qcad/en/img/snapelement.png
+share/doc/qcad/en/img/snapendpoints.png
+share/doc/qcad/en/img/snapfree.png
+share/doc/qcad/en/img/snapgrid.png
+share/doc/qcad/en/img/snapintersections1.png
+share/doc/qcad/en/img/snapintersections2.png
+share/doc/qcad/en/img/snapkeyar.png
+share/doc/qcad/en/img/snapkeyxy.png
+share/doc/qcad/en/img/snapmiddles.png
+share/doc/qcad/en/img/space.png
+share/doc/qcad/en/img/stretch01.png
+share/doc/qcad/en/img/stretch02.png
+share/doc/qcad/en/img/tagall.png
+share/doc/qcad/en/img/tagcontour.png
+share/doc/qcad/en/img/tagdoubles.png
+share/doc/qcad/en/img/tagenough.png
+share/doc/qcad/en/img/tagintersection.png
+share/doc/qcad/en/img/taginvert.png
+share/doc/qcad/en/img/taglayer.png
+share/doc/qcad/en/img/tagnothing.png
+share/doc/qcad/en/img/tagrange.png
+share/doc/qcad/en/img/tagsingle.png
+share/doc/qcad/en/img/textcopy.png
+share/doc/qcad/en/img/textcourier.png
+share/doc/qcad/en/img/textcursive.png
+share/doc/qcad/en/img/textcut.png
+share/doc/qcad/en/img/textdialog.png
+share/doc/qcad/en/img/textnew.png
+share/doc/qcad/en/img/textnormal.png
+share/doc/qcad/en/img/textopen.png
+share/doc/qcad/en/img/textparameters1.png
+share/doc/qcad/en/img/textparameters2.png
+share/doc/qcad/en/img/textpaste.png
+share/doc/qcad/en/img/textsave.png
+share/doc/qcad/en/img/textshapes.png
+share/doc/qcad/en/img/tile.png
+share/doc/qcad/en/img/toolbar_cont.png
+share/doc/qcad/en/img/toolbar_first.png
+share/doc/qcad/en/img/toolbar_home.png
+share/doc/qcad/en/img/toolbar_last.png
+share/doc/qcad/en/img/toolbar_next.png
+share/doc/qcad/en/img/toolbar_prev.png
+share/doc/qcad/en/img/toolbarzoom.png
+share/doc/qcad/en/img/undo.png
+share/doc/qcad/en/img/untagintersection.png
+share/doc/qcad/en/img/untagrange.png
+share/doc/qcad/en/img/viewlayerlist.png
+share/doc/qcad/en/img/zoom1.png
+share/doc/qcad/en/img/zoomauto.png
+share/doc/qcad/en/img/zoomdecrease.png
+share/doc/qcad/en/img/zoomincrease.png
+share/doc/qcad/en/img/zoompan.png
+share/doc/qcad/en/img/zoomredraw.png
+share/doc/qcad/en/img/zoomtagged.png
+share/doc/qcad/en/img/zoomwindow.png
+share/doc/qcad/en/index.html
+share/examples/qcad/border.dxf
+share/examples/qcad/example01.dxf
+share/examples/qcad/example02.dxf
+share/examples/qcad/example03.dxf
+share/examples/qcad/hatches.dxf
+share/examples/qcad/styles.dxf
+share/examples/qcad/texts.dxf
 @exec ln -sf %D/share/doc/qcad %D/lib/qcad/doc
 @unexec rm -f %D/lib/qcad/doc
 @dirrm share/examples/qcad
-@dirrm share/doc/qcad/img
+@dirrm share/doc/qcad/en/img
+@dirrm share/doc/qcad/en
 @dirrm share/doc/qcad
 @dirrm lib/qcad/xpm
 @dirrm lib/qcad/messages
diff --git a/cad/qcad2/Makefile b/cad/qcad2/Makefile
index ff3801fe1759..2204b4bf4f4f 100644
--- a/cad/qcad2/Makefile
+++ b/cad/qcad2/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	qcad
-PORTVERSION=	1.3.3
+PORTVERSION=	1.4.0
 CATEGORIES=	cad
-MASTER_SITES=	http://www.ultraviolet.org/qcad/
-DISTNAME=	qcad_source
+MASTER_SITES=	http://download.sourceforge.net/qcad/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	will@FreeBSD.org
 
 USE_XLIB=	yes
-MAKEFILE=	makefile
 MAKE_ENV=	CC="${CXX}"
 USE_QT2=	yes
-
-BROKEN=		"Compiler error"
+NO_WRKSUBDIR=	yes
 
 QCADDIR=	${PREFIX}/lib/qcad
 QCADDOCDIR=	${PREFIX}/share/doc/qcad
diff --git a/cad/qcad2/distinfo b/cad/qcad2/distinfo
index 0186d43dc77a..e98078d41917 100644
--- a/cad/qcad2/distinfo
+++ b/cad/qcad2/distinfo
@@ -1 +1 @@
-MD5 (qcad_source.tar.gz) = 8df27be2563bd998c8af54bac1732bda
+MD5 (qcad-1.4.0-src.tar.gz) = c474a27cfc818483397c7a1c79ac707c
diff --git a/cad/qcad2/files/patch-aa b/cad/qcad2/files/patch-aa
index e316e7c19fca..00324d454cee 100644
--- a/cad/qcad2/files/patch-aa
+++ b/cad/qcad2/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.orig	Sun Nov 28 17:17:52 1999
-+++ makefile	Mon Dec 13 16:32:31 1999
+--- Makefile.orig	Fri May  5 12:57:18 2000
++++ Makefile	Thu May 11 16:03:04 2000
 @@ -7,13 +7,12 @@
  
  ####### Compiler, tools and options
@@ -8,12 +8,13 @@
 -CFLAGS	=	-Wall -W -O2 -fno-strength-reduce
 -INCPATH	=	-I$(QTDIR)/include
 -LINK	=	g++
-+CFLAGS	+=	-Wall -W -fno-strength-reduce
-+INCPATH	=	-I$(X11BASE)/include/qt2 -I$(X11BASE)/include
-+LINK	=	$(CC)
- LFLAGS	=	
+-LFLAGS	=	-static
 -LIBS	=	-L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
 -MOC	=	moc
++CFLAGS	+=	-Wall -W -fno-strength-reduce
++INCPATH	=	-I$(X11BASE)/include/qt2 -I$(X11BASE)/include
++LINK	=	$(CXX)
++LFLAGS	=	
 +LIBS	=	-L$(X11BASE)/lib -lqt2 -lX11
 +MOC	=	moc2
  
diff --git a/cad/qcad2/pkg-plist b/cad/qcad2/pkg-plist
index c8cb3910492c..928e421eac61 100644
--- a/cad/qcad2/pkg-plist
+++ b/cad/qcad2/pkg-plist
@@ -6,10 +6,12 @@ lib/qcad/cur/cur_glass_mask.cur
 lib/qcad/fonts/courier.cxf
 lib/qcad/fonts/cursive.cxf
 lib/qcad/fonts/normal.cxf
+lib/qcad/fonts/romans.cxf
 lib/qcad/hatches/0.dxf
 lib/qcad/hatches/135.dxf
 lib/qcad/hatches/45.dxf
 lib/qcad/hatches/90.dxf
+lib/qcad/hatches/arcs.dxf
 lib/qcad/hatches/concrete.dxf
 lib/qcad/hatches/honeycomb.dxf
 lib/qcad/hatches/plastic.dxf
@@ -17,24 +19,35 @@ lib/qcad/hatches/sand.dxf
 lib/qcad/messages/de.cxl
 lib/qcad/messages/en.cxl
 lib/qcad/messages/es.cxl
+lib/qcad/messages/et.cxl
+lib/qcad/messages/eu.cxl
+lib/qcad/messages/fi.cxl
 lib/qcad/messages/fr.cxl
 lib/qcad/messages/ga.cxl
+lib/qcad/messages/gr.cxl
+lib/qcad/messages/hu.cxl
 lib/qcad/messages/it.cxl
+lib/qcad/messages/nl.cxl
+lib/qcad/messages/pt.cxl
+lib/qcad/messages/ru.cxl
+lib/qcad/messages/sk.cxl
 lib/qcad/qcad
 lib/qcad/xpm/addlayer.xpm
 lib/qcad/xpm/aligncenter.xpm
 lib/qcad/xpm/alignleft.xpm
 lib/qcad/xpm/alignright.xpm
-lib/qcad/xpm/appender_xpm.sh
 lib/qcad/xpm/applicationicon.xpm
 lib/qcad/xpm/apsicon.xpm
 lib/qcad/xpm/arcdir1.xpm
 lib/qcad/xpm/arcdir2.xpm
+lib/qcad/xpm/back.xpm
 lib/qcad/xpm/beveltrimoff.xpm
 lib/qcad/xpm/beveltrimon.xpm
 lib/qcad/xpm/cadarcscraa.xpm
 lib/qcad/xpm/cadarcspara.xpm
 lib/qcad/xpm/cadarcsppp.xpm
+lib/qcad/xpm/cadcircles3p.xpm
+lib/qcad/xpm/cadcirclescl.xpm
 lib/qcad/xpm/cadcirclescr.xpm
 lib/qcad/xpm/caddimsangle.xpm
 lib/qcad/xpm/caddimsarrow.xpm
@@ -69,7 +82,8 @@ lib/qcad/xpm/cadmenutext.xpm
 lib/qcad/xpm/cadmenuzoom.xpm
 lib/qcad/xpm/cadpointsingle.xpm
 lib/qcad/xpm/camauto.xpm
-lib/qcad/xpm/camexpert.xpm
+lib/qcad/xpm/camexp.xpm
+lib/qcad/xpm/camexpintro.xpm
 lib/qcad/xpm/cammanual.xpm
 lib/qcad/xpm/color00.xpm
 lib/qcad/xpm/color01.xpm
@@ -95,6 +109,7 @@ lib/qcad/xpm/document.xpm
 lib/qcad/xpm/edit.xpm
 lib/qcad/xpm/editattrib.xpm
 lib/qcad/xpm/editbevel.xpm
+lib/qcad/xpm/editclip.xpm
 lib/qcad/xpm/editcopy.xpm
 lib/qcad/xpm/editcut.xpm
 lib/qcad/xpm/editdelete.xpm
@@ -112,6 +127,7 @@ lib/qcad/xpm/edittext.xpm
 lib/qcad/xpm/edittextelement.xpm
 lib/qcad/xpm/edittrim.xpm
 lib/qcad/xpm/edittrim2.xpm
+lib/qcad/xpm/edittrim3.xpm
 lib/qcad/xpm/editzero.xpm
 lib/qcad/xpm/fileclose.xpm
 lib/qcad/xpm/filecloseoutput.xpm
@@ -123,7 +139,9 @@ lib/qcad/xpm/fileprintprev.xpm
 lib/qcad/xpm/fileprintsetup.xpm
 lib/qcad/xpm/filerecall.xpm
 lib/qcad/xpm/filesave.xpm
-lib/qcad/xpm/firmicon.xpm
+lib/qcad/xpm/folderclosed.xpm
+lib/qcad/xpm/folderopen.xpm
+lib/qcad/xpm/forward.xpm
 lib/qcad/xpm/helpabout.xpm
 lib/qcad/xpm/helpeditlayer.xpm
 lib/qcad/xpm/helpeditmirror.xpm
@@ -137,11 +155,18 @@ lib/qcad/xpm/helpsnapkeyar.xpm
 lib/qcad/xpm/helpsnapkeyxy.xpm
 lib/qcad/xpm/hiddenlayer.xpm
 lib/qcad/xpm/info.xpm
+lib/qcad/xpm/init.xpm
 lib/qcad/xpm/insertitem.xpm
 lib/qcad/xpm/layerlist.xpm
+lib/qcad/xpm/librarybrowser.xpm
 lib/qcad/xpm/lock.xpm
 lib/qcad/xpm/lock01.xpm
 lib/qcad/xpm/lock02.xpm
+lib/qcad/xpm/measureanglelnln.xpm
+lib/qcad/xpm/measureeditelement.xpm
+lib/qcad/xpm/measurelnpt.xpm
+lib/qcad/xpm/measureparallellines.xpm
+lib/qcad/xpm/measureptpt.xpm
 lib/qcad/xpm/modeabs.xpm
 lib/qcad/xpm/modecomparison.xpm
 lib/qcad/xpm/modeconstruction.xpm
@@ -151,10 +176,12 @@ lib/qcad/xpm/mouse.xpm
 lib/qcad/xpm/paste.xpm
 lib/qcad/xpm/qcad.xpm
 lib/qcad/xpm/qcadintro.xpm
+lib/qcad/xpm/qcadsgi.xpm
 lib/qcad/xpm/redo.xpm
 lib/qcad/xpm/removeemptylayers.xpm
 lib/qcad/xpm/removelayer.xpm
 lib/qcad/xpm/renamelayer.xpm
+lib/qcad/xpm/ribbonsoft.xpm
 lib/qcad/xpm/roundtrimoff.xpm
 lib/qcad/xpm/roundtrimon.xpm
 lib/qcad/xpm/shaperoundin.xpm
@@ -163,7 +190,6 @@ lib/qcad/xpm/shapestraight.xpm
 lib/qcad/xpm/simbroken.xpm
 lib/qcad/xpm/simdetails.xpm
 lib/qcad/xpm/simgrid.xpm
-lib/qcad/xpm/simgrid.xpm~
 lib/qcad/xpm/simoptions.xpm
 lib/qcad/xpm/simpointing.xpm
 lib/qcad/xpm/simrapidmove.xpm
@@ -195,7 +221,7 @@ lib/qcad/xpm/taginvert.xpm
 lib/qcad/xpm/taglayer.xpm
 lib/qcad/xpm/tagnothing.xpm
 lib/qcad/xpm/tagrange.xpm
-lib/qcad/xpm/test.gif
+lib/qcad/xpm/tile.xpm
 lib/qcad/xpm/undo.xpm
 lib/qcad/xpm/untaginters.xpm
 lib/qcad/xpm/untagrange.xpm
@@ -212,223 +238,256 @@ lib/qcad/xpm/width08.xpm
 lib/qcad/xpm/zero.xpm
 lib/qcad/xpm/zerorel.xpm
 lib/qcad/xpm/zerorelwhite.xpm
+lib/qcad/xpm/zerosmall.xpm
 lib/qcad/xpm/zoomauto.xpm
 lib/qcad/xpm/zoomdecrease.xpm
 lib/qcad/xpm/zoomincrease.xpm
+lib/qcad/xpm/zoomone.xpm
 lib/qcad/xpm/zoompan.xpm
 lib/qcad/xpm/zoomredraw.xpm
 lib/qcad/xpm/zoomtagged.xpm
+lib/qcad/xpm/zoomtopage.xpm
 lib/qcad/xpm/zoomwindow.xpm
-share/doc/qcad/001.html
-share/doc/qcad/002.html
-share/doc/qcad/003.html
-share/doc/qcad/004.html
-share/doc/qcad/005.html
-share/doc/qcad/006.html
-share/doc/qcad/007.html
-share/doc/qcad/008.html
-share/doc/qcad/009.html
-share/doc/qcad/010.html
-share/doc/qcad/011.html
-share/doc/qcad/012.html
-share/doc/qcad/013.html
-share/doc/qcad/014.html
-share/doc/qcad/img/000000.gif
-share/doc/qcad/img/12568c.gif
-share/doc/qcad/img/boxangle.png
-share/doc/qcad/img/boxbevel.png
-share/doc/qcad/img/boxdirection.png
-share/doc/qcad/img/boxdistance.png
-share/doc/qcad/img/boxlength.png
-share/doc/qcad/img/boxround.png
-share/doc/qcad/img/butprev.png
-share/doc/qcad/img/createarcs.png
-share/doc/qcad/img/createarcsparallel.png
-share/doc/qcad/img/createarcspoints.png
-share/doc/qcad/img/createcircles.png
-share/doc/qcad/img/createdimsalign.png
-share/doc/qcad/img/createdimsangle.png
-share/doc/qcad/img/createdimsarrow.png
-share/doc/qcad/img/createdimsdiam.png
-share/doc/qcad/img/createdimshor.png
-share/doc/qcad/img/createdimsrad.png
-share/doc/qcad/img/createdimsver.png
-share/doc/qcad/img/createhatches.png
-share/doc/qcad/img/createlines.png
-share/doc/qcad/img/createlinesangle.png
-share/doc/qcad/img/createlinesbisectors.png
-share/doc/qcad/img/createlineshor.png
-share/doc/qcad/img/createlinesortho.png
-share/doc/qcad/img/createlinesortho2.png
-share/doc/qcad/img/createlinesparallels.png
-share/doc/qcad/img/createlinesrectangles.png
-share/doc/qcad/img/createlinestangents1.png
-share/doc/qcad/img/createlinestangents2.png
-share/doc/qcad/img/createlinesver.png
-share/doc/qcad/img/createpointssingle.png
-share/doc/qcad/img/dialogattrib.png
-share/doc/qcad/img/dialogcam.png
-share/doc/qcad/img/dialoghatch.png
-share/doc/qcad/img/dialogmirror.png
-share/doc/qcad/img/dialogmove.png
-share/doc/qcad/img/dialogmoverotate.png
-share/doc/qcad/img/dialogoptions.png
-share/doc/qcad/img/dialogrotate.png
-share/doc/qcad/img/dialogrotaterotate.png
-share/doc/qcad/img/dialogscale.png
-share/doc/qcad/img/dimensionalign.png
-share/doc/qcad/img/dimensionangle.png
-share/doc/qcad/img/dimensiondiam.png
-share/doc/qcad/img/dimensionhor.png
-share/doc/qcad/img/dimensionrad.png
-share/doc/qcad/img/editattrib.png
-share/doc/qcad/img/editbevel.png
-share/doc/qcad/img/editcut.png
-share/doc/qcad/img/editdelete.png
-share/doc/qcad/img/editlayer.png
-share/doc/qcad/img/editmirror.png
-share/doc/qcad/img/editmove.png
-share/doc/qcad/img/editmoverotate.png
-share/doc/qcad/img/editrotate.png
-share/doc/qcad/img/editrotaterotate.png
-share/doc/qcad/img/editround.png
-share/doc/qcad/img/editscale.png
-share/doc/qcad/img/editstretch.png
-share/doc/qcad/img/edittext.png
-share/doc/qcad/img/edittextelements.png
-share/doc/qcad/img/edittexttoobjects.png
-share/doc/qcad/img/edittrim.png
-share/doc/qcad/img/edittrim2.png
-share/doc/qcad/img/editzero.png
-share/doc/qcad/img/filecloseinput.png
-share/doc/qcad/img/filecloseoutput.png
-share/doc/qcad/img/filenew.png
-share/doc/qcad/img/fileopen.png
-share/doc/qcad/img/filesave.png
-share/doc/qcad/img/fontedit.png
-share/doc/qcad/img/gifs
-share/doc/qcad/img/hatches.png
-share/doc/qcad/img/infoview.png
-share/doc/qcad/img/layadd.png
-share/doc/qcad/img/laydelete.png
-share/doc/qcad/img/layerlist.png
-share/doc/qcad/img/layren.png
-share/doc/qcad/img/layshowall.png
-share/doc/qcad/img/layshownone.png
-share/doc/qcad/img/laytrash.png
-share/doc/qcad/img/logo_qcad.jpeg
-share/doc/qcad/img/logo_camexp.png
-share/doc/qcad/img/logo_qcad.png
-share/doc/qcad/img/menuarcs.png
-share/doc/qcad/img/menucam.png
-share/doc/qcad/img/menucircles.png
-share/doc/qcad/img/menudims.png
-share/doc/qcad/img/menuedit.png
-share/doc/qcad/img/menulines.png
-share/doc/qcad/img/menupoints.png
-share/doc/qcad/img/menuselect.png
-share/doc/qcad/img/menutexts.png
-share/doc/qcad/img/moverotate.png
-share/doc/qcad/img/patterns.png
-share/doc/qcad/img/print.png
-share/doc/qcad/img/printpreview.png
-share/doc/qcad/img/printsetup.png
-share/doc/qcad/img/redo.png
-share/doc/qcad/img/rotaterotate.png
-share/doc/qcad/img/roundings.png
-share/doc/qcad/img/screen.png
-share/doc/qcad/img/screen_cam.png
-share/doc/qcad/img/screen_t.png
-share/doc/qcad/img/showlayerlist.png
-share/doc/qcad/img/simcontours.png
-share/doc/qcad/img/simdetails.png
-share/doc/qcad/img/simedit.png
-share/doc/qcad/img/simengrave.png
-share/doc/qcad/img/simgrid.png
-share/doc/qcad/img/siminfo.png
-share/doc/qcad/img/simlayer.png
-share/doc/qcad/img/simplay.png
-share/doc/qcad/img/simrapid.png
-share/doc/qcad/img/simslow.png
-share/doc/qcad/img/simspeed.png
-share/doc/qcad/img/sketchcenters.png
-share/doc/qcad/img/sketchdistancepoints.png
-share/doc/qcad/img/sketchelements.png
-share/doc/qcad/img/sketchendpoints.png
-share/doc/qcad/img/sketchintersections1.png
-share/doc/qcad/img/sketchintersections2.png
-share/doc/qcad/img/sketchmiddlepoints.png
-share/doc/qcad/img/snapcenters.png
-share/doc/qcad/img/snapdistance.png
-share/doc/qcad/img/snapelement.png
-share/doc/qcad/img/snapendpoints.png
-share/doc/qcad/img/snapfree.png
-share/doc/qcad/img/snapgrid.png
-share/doc/qcad/img/snapintersections1.png
-share/doc/qcad/img/snapintersections2.png
-share/doc/qcad/img/snapkeyar.png
-share/doc/qcad/img/snapkeyxy.png
-share/doc/qcad/img/snapmiddles.png
-share/doc/qcad/img/space.gif
-share/doc/qcad/img/stretch01.png
-share/doc/qcad/img/stretch02.png
-share/doc/qcad/img/tagall.png
-share/doc/qcad/img/tagcontour.png
-share/doc/qcad/img/tagdoubles.png
-share/doc/qcad/img/tagenough.png
-share/doc/qcad/img/tagintersection.png
-share/doc/qcad/img/taginvert.png
-share/doc/qcad/img/taglayer.png
-share/doc/qcad/img/tagnothing.png
-share/doc/qcad/img/tagrange.png
-share/doc/qcad/img/tagsingle.png
-share/doc/qcad/img/textcopy.png
-share/doc/qcad/img/textcourier.png
-share/doc/qcad/img/textcursive.png
-share/doc/qcad/img/textcut.png
-share/doc/qcad/img/textdialog.png
-share/doc/qcad/img/textnew.png
-share/doc/qcad/img/textnormal.png
-share/doc/qcad/img/textopen.png
-share/doc/qcad/img/textparameters1.png
-share/doc/qcad/img/textparameters2.png
-share/doc/qcad/img/textpaste.png
-share/doc/qcad/img/textsave.png
-share/doc/qcad/img/textshapes.png
-share/doc/qcad/img/tile.jpeg
-share/doc/qcad/img/toolbar_cont.png
-share/doc/qcad/img/toolbar_first.png
-share/doc/qcad/img/toolbar_home.png
-share/doc/qcad/img/toolbar_last.png
-share/doc/qcad/img/toolbar_left.png
-share/doc/qcad/img/toolbar_next.png
-share/doc/qcad/img/toolbar_prev.png
-share/doc/qcad/img/toolbar_right.png
-share/doc/qcad/img/toolbarzoom.png
-share/doc/qcad/img/undo.png
-share/doc/qcad/img/untagintersection.png
-share/doc/qcad/img/untagrange.png
-share/doc/qcad/img/zoomauto.png
-share/doc/qcad/img/zoomdecrease.png
-share/doc/qcad/img/zoomincrease.png
-share/doc/qcad/img/zoompan.png
-share/doc/qcad/img/zoomredraw.png
-share/doc/qcad/img/zoomtagged.png
-share/doc/qcad/img/zoomwindow.png
-share/doc/qcad/index.html
-share/doc/qcad/screen.html
-share/doc/qcad/styles.css
-share/examples/qcad/qcad_border.dxf
-share/examples/qcad/qcad_example01.dxf
-share/examples/qcad/qcad_example02.dxf
-share/examples/qcad/qcad_example03.dxf
-share/examples/qcad/qcad_hatchings.dxf
-share/examples/qcad/qcad_styles.dxf
-share/examples/qcad/qcad_texts.dxf
+share/doc/qcad/en/001.html
+share/doc/qcad/en/002.html
+share/doc/qcad/en/003.html
+share/doc/qcad/en/004.html
+share/doc/qcad/en/005.html
+share/doc/qcad/en/006.html
+share/doc/qcad/en/007.html
+share/doc/qcad/en/008.html
+share/doc/qcad/en/009.html
+share/doc/qcad/en/010.html
+share/doc/qcad/en/011.html
+share/doc/qcad/en/012.html
+share/doc/qcad/en/013.html
+share/doc/qcad/en/014.html
+share/doc/qcad/en/015.html
+share/doc/qcad/en/016.html
+share/doc/qcad/en/017.html
+share/doc/qcad/en/018.html
+share/doc/qcad/en/img/000000.png
+share/doc/qcad/en/img/boxangle.png
+share/doc/qcad/en/img/boxbevel.png
+share/doc/qcad/en/img/boxdirection.png
+share/doc/qcad/en/img/boxdistance.png
+share/doc/qcad/en/img/boxlength.png
+share/doc/qcad/en/img/boxround.png
+share/doc/qcad/en/img/createarcs.png
+share/doc/qcad/en/img/createarcsparallel.png
+share/doc/qcad/en/img/createarcspoints.png
+share/doc/qcad/en/img/createcircles.png
+share/doc/qcad/en/img/createdimsalign.png
+share/doc/qcad/en/img/createdimsangle.png
+share/doc/qcad/en/img/createdimsarrow.png
+share/doc/qcad/en/img/createdimsdiam.png
+share/doc/qcad/en/img/createdimshor.png
+share/doc/qcad/en/img/createdimsrad.png
+share/doc/qcad/en/img/createdimsver.png
+share/doc/qcad/en/img/createhatches.png
+share/doc/qcad/en/img/createlines.png
+share/doc/qcad/en/img/createlinesangle.png
+share/doc/qcad/en/img/createlinesbisectors.png
+share/doc/qcad/en/img/createlineshor.png
+share/doc/qcad/en/img/createlinesortho.png
+share/doc/qcad/en/img/createlinesortho2.png
+share/doc/qcad/en/img/createlinesparallels.png
+share/doc/qcad/en/img/createlinesrectangles.png
+share/doc/qcad/en/img/createlinestangents1.png
+share/doc/qcad/en/img/createlinestangents2.png
+share/doc/qcad/en/img/createlinesver.png
+share/doc/qcad/en/img/createpointssingle.png
+share/doc/qcad/en/img/dialogattrib.png
+share/doc/qcad/en/img/dialogcam.png
+share/doc/qcad/en/img/dialogdec.png
+share/doc/qcad/en/img/dialoghatch.png
+share/doc/qcad/en/img/dialogmirror.png
+share/doc/qcad/en/img/dialogmove.png
+share/doc/qcad/en/img/dialogmoverotate.png
+share/doc/qcad/en/img/dialogoptions_camexp.png
+share/doc/qcad/en/img/dialogoptions_qcad.png
+share/doc/qcad/en/img/dialogrotate.png
+share/doc/qcad/en/img/dialogrotaterotate.png
+share/doc/qcad/en/img/dialogscale.png
+share/doc/qcad/en/img/dimensionalign.png
+share/doc/qcad/en/img/dimensionangle.png
+share/doc/qcad/en/img/dimensiondiam.png
+share/doc/qcad/en/img/dimensionhor.png
+share/doc/qcad/en/img/dimensionpanel.png
+share/doc/qcad/en/img/dimensionrad.png
+share/doc/qcad/en/img/editattrib.png
+share/doc/qcad/en/img/editbevel.png
+share/doc/qcad/en/img/editclip.png
+share/doc/qcad/en/img/editcut.png
+share/doc/qcad/en/img/editdelete.png
+share/doc/qcad/en/img/editlayer.png
+share/doc/qcad/en/img/editmirror.png
+share/doc/qcad/en/img/editmove.png
+share/doc/qcad/en/img/editmoverotate.png
+share/doc/qcad/en/img/editrotate.png
+share/doc/qcad/en/img/editrotaterotate.png
+share/doc/qcad/en/img/editround.png
+share/doc/qcad/en/img/editscale.png
+share/doc/qcad/en/img/editstretch.png
+share/doc/qcad/en/img/edittext.png
+share/doc/qcad/en/img/edittextelements.png
+share/doc/qcad/en/img/edittexttoobjects.png
+share/doc/qcad/en/img/edittrim.png
+share/doc/qcad/en/img/edittrim2.png
+share/doc/qcad/en/img/edittrim3.png
+share/doc/qcad/en/img/editzero.png
+share/doc/qcad/en/img/filecloseinput.png
+share/doc/qcad/en/img/filecloseoutput.png
+share/doc/qcad/en/img/filenew.png
+share/doc/qcad/en/img/fileopen.png
+share/doc/qcad/en/img/filesave.png
+share/doc/qcad/en/img/fontedit.png
+share/doc/qcad/en/img/hatches.png
+share/doc/qcad/en/img/infoview.png
+share/doc/qcad/en/img/layadd.png
+share/doc/qcad/en/img/laydelete.png
+share/doc/qcad/en/img/layerlist.png
+share/doc/qcad/en/img/layren.png
+share/doc/qcad/en/img/layshowall.png
+share/doc/qcad/en/img/layshownone.png
+share/doc/qcad/en/img/laytrash.png
+share/doc/qcad/en/img/libborder01.png
+share/doc/qcad/en/img/libborder02.png
+share/doc/qcad/en/img/libbrowser01.png
+share/doc/qcad/en/img/libhierarchy.png
+share/doc/qcad/en/img/librarybrowser.png
+share/doc/qcad/en/img/libscrew01.png
+share/doc/qcad/en/img/libscrew02.png
+share/doc/qcad/en/img/logo_big.jpeg
+share/doc/qcad/en/img/logo_camexp.png
+share/doc/qcad/en/img/logo_qcad.jpeg
+share/doc/qcad/en/img/logo_qcad.png
+share/doc/qcad/en/img/measureangle.png
+share/doc/qcad/en/img/measurecoords.png
+share/doc/qcad/en/img/measurelnln.png
+share/doc/qcad/en/img/measurelnpt.png
+share/doc/qcad/en/img/measureptpt.png
+share/doc/qcad/en/img/menuarcs.png
+share/doc/qcad/en/img/menucam.png
+share/doc/qcad/en/img/menucircles.png
+share/doc/qcad/en/img/menudims.png
+share/doc/qcad/en/img/menuedit.png
+share/doc/qcad/en/img/menulines.png
+share/doc/qcad/en/img/menumeasure.png
+share/doc/qcad/en/img/menupoints.png
+share/doc/qcad/en/img/menuselect.png
+share/doc/qcad/en/img/menutexts.png
+share/doc/qcad/en/img/moverotate.png
+share/doc/qcad/en/img/patterns.png
+share/doc/qcad/en/img/print.png
+share/doc/qcad/en/img/printpreview.png
+share/doc/qcad/en/img/printsetup.png
+share/doc/qcad/en/img/redo.png
+share/doc/qcad/en/img/ribbonsoft.png
+share/doc/qcad/en/img/rotaterotate.png
+share/doc/qcad/en/img/roundings.png
+share/doc/qcad/en/img/screen_cam.png
+share/doc/qcad/en/img/screen_t.png
+share/doc/qcad/en/img/separator.png
+share/doc/qcad/en/img/showlayerlist.png
+share/doc/qcad/en/img/simcontours.png
+share/doc/qcad/en/img/simdetails.png
+share/doc/qcad/en/img/simedit.png
+share/doc/qcad/en/img/simengrave.png
+share/doc/qcad/en/img/simgrid.png
+share/doc/qcad/en/img/siminfo.png
+share/doc/qcad/en/img/simlayer.png
+share/doc/qcad/en/img/simplay.png
+share/doc/qcad/en/img/simrapid.png
+share/doc/qcad/en/img/simslow.png
+share/doc/qcad/en/img/simspeed.png
+share/doc/qcad/en/img/sketchcenters.png
+share/doc/qcad/en/img/sketchclip.png
+share/doc/qcad/en/img/sketchdec01.png
+share/doc/qcad/en/img/sketchdec02.png
+share/doc/qcad/en/img/sketchdec03.png
+share/doc/qcad/en/img/sketchdec04.png
+share/doc/qcad/en/img/sketchdec05.png
+share/doc/qcad/en/img/sketchdec06.png
+share/doc/qcad/en/img/sketchdimension1.png
+share/doc/qcad/en/img/sketchdimension2.png
+share/doc/qcad/en/img/sketchdistancepoints.png
+share/doc/qcad/en/img/sketchelements.png
+share/doc/qcad/en/img/sketchendpoints.png
+share/doc/qcad/en/img/sketchintersections1.png
+share/doc/qcad/en/img/sketchintersections2.png
+share/doc/qcad/en/img/sketchmiddlepoints.png
+share/doc/qcad/en/img/sketchopt01.png
+share/doc/qcad/en/img/snapcenters.png
+share/doc/qcad/en/img/snapdistance.png
+share/doc/qcad/en/img/snapelement.png
+share/doc/qcad/en/img/snapendpoints.png
+share/doc/qcad/en/img/snapfree.png
+share/doc/qcad/en/img/snapgrid.png
+share/doc/qcad/en/img/snapintersections1.png
+share/doc/qcad/en/img/snapintersections2.png
+share/doc/qcad/en/img/snapkeyar.png
+share/doc/qcad/en/img/snapkeyxy.png
+share/doc/qcad/en/img/snapmiddles.png
+share/doc/qcad/en/img/space.png
+share/doc/qcad/en/img/stretch01.png
+share/doc/qcad/en/img/stretch02.png
+share/doc/qcad/en/img/tagall.png
+share/doc/qcad/en/img/tagcontour.png
+share/doc/qcad/en/img/tagdoubles.png
+share/doc/qcad/en/img/tagenough.png
+share/doc/qcad/en/img/tagintersection.png
+share/doc/qcad/en/img/taginvert.png
+share/doc/qcad/en/img/taglayer.png
+share/doc/qcad/en/img/tagnothing.png
+share/doc/qcad/en/img/tagrange.png
+share/doc/qcad/en/img/tagsingle.png
+share/doc/qcad/en/img/textcopy.png
+share/doc/qcad/en/img/textcourier.png
+share/doc/qcad/en/img/textcursive.png
+share/doc/qcad/en/img/textcut.png
+share/doc/qcad/en/img/textdialog.png
+share/doc/qcad/en/img/textnew.png
+share/doc/qcad/en/img/textnormal.png
+share/doc/qcad/en/img/textopen.png
+share/doc/qcad/en/img/textparameters1.png
+share/doc/qcad/en/img/textparameters2.png
+share/doc/qcad/en/img/textpaste.png
+share/doc/qcad/en/img/textsave.png
+share/doc/qcad/en/img/textshapes.png
+share/doc/qcad/en/img/tile.png
+share/doc/qcad/en/img/toolbar_cont.png
+share/doc/qcad/en/img/toolbar_first.png
+share/doc/qcad/en/img/toolbar_home.png
+share/doc/qcad/en/img/toolbar_last.png
+share/doc/qcad/en/img/toolbar_next.png
+share/doc/qcad/en/img/toolbar_prev.png
+share/doc/qcad/en/img/toolbarzoom.png
+share/doc/qcad/en/img/undo.png
+share/doc/qcad/en/img/untagintersection.png
+share/doc/qcad/en/img/untagrange.png
+share/doc/qcad/en/img/viewlayerlist.png
+share/doc/qcad/en/img/zoom1.png
+share/doc/qcad/en/img/zoomauto.png
+share/doc/qcad/en/img/zoomdecrease.png
+share/doc/qcad/en/img/zoomincrease.png
+share/doc/qcad/en/img/zoompan.png
+share/doc/qcad/en/img/zoomredraw.png
+share/doc/qcad/en/img/zoomtagged.png
+share/doc/qcad/en/img/zoomwindow.png
+share/doc/qcad/en/index.html
+share/examples/qcad/border.dxf
+share/examples/qcad/example01.dxf
+share/examples/qcad/example02.dxf
+share/examples/qcad/example03.dxf
+share/examples/qcad/hatches.dxf
+share/examples/qcad/styles.dxf
+share/examples/qcad/texts.dxf
 @exec ln -sf %D/share/doc/qcad %D/lib/qcad/doc
 @unexec rm -f %D/lib/qcad/doc
 @dirrm share/examples/qcad
-@dirrm share/doc/qcad/img
+@dirrm share/doc/qcad/en/img
+@dirrm share/doc/qcad/en
 @dirrm share/doc/qcad
 @dirrm lib/qcad/xpm
 @dirrm lib/qcad/messages