Update to 1.4.4

PR:		21573
Submitted by:	Ports Fury

18 files changed, 764 insertions, 568 deletions

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 13f3e606cb76..3edc516be18b 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qcad
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.4
 CATEGORIES=	cad
 MASTER_SITES=	http://www.qcad.org/archives/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -14,29 +14,27 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
-MAKE_ENV=	CC="${CXX}"
 USE_QT2=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
+MAKE_ENV=	QTDIR="${X11BASE}"
 
-QCADDIR=	${PREFIX}/lib/qcad
-QCADDOCDIR=	${PREFIX}/share/doc/qcad
-QCADSAMPLEDIR=	${PREFIX}/share/examples/qcad
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.cpp
 
 do-install:
-	@${MKDIR} ${QCADDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/qcad ${QCADDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/qcad ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/qcad
 .for dir in cur fonts hatches messages xpm
-	${CP} -R ${WRKSRC}/${dir} ${QCADDIR}
+	${TAR} -C ${WRKSRC} -cf - ${dir} | \
+		${TAR} -C ${PREFIX}/share/qcad --unlink -xf -
 .endfor
+	@${MKDIR} ${PREFIX}/share/examples/qcad
+	${TAR} -C ${WRKSRC}/examples -cf - . | \
+		${TAR} -C ${PREFIX}/share/examples/qcad --unlink -xf -
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${QCADDOCDIR}
-	${CP} -R ${WRKSRC}/doc/* ${QCADDOCDIR}
-	@${LN} -sf ${QCADDOCDIR} ${QCADDIR}/doc
+	@${MKDIR} ${PREFIX}/share/doc/qcad
+	${TAR} -C ${WRKSRC}/doc -cf - . | \
+		${TAR} -C ${PREFIX}/share/doc/qcad --unlink -xf -
+	@${LN} -sf ${PREFIX}/share/doc/qcad ${PREFIX}/share/qcad/doc
 .endif
-	@${MKDIR} ${QCADSAMPLEDIR}
-	${CP} -R ${WRKSRC}/examples/* ${QCADSAMPLEDIR}
-	${SED} -e "s;%%PREFIX%%;${PREFIX};g" \
-		< ${FILESDIR}/qcad.in > ${PREFIX}/bin/qcad
-	${CHMOD} +x ${PREFIX}/bin/qcad
 
 .include <bsd.port.mk>
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index c69542cf9fac..b588640e5aff 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1 +1 @@
-MD5 (qcad-1.4.1-src.tar.gz) = 47db435586609a25a2a35c4f9137a92a
+MD5 (qcad-1.4.4-src.tar.gz) = a8ebe3d43ce7a633e8543f71c01bb04a
diff --git a/cad/qcad/files/patch-aa b/cad/qcad/files/patch-aa
index 00324d454cee..0da0db8c2b33 100644
--- a/cad/qcad/files/patch-aa
+++ b/cad/qcad/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri May  5 12:57:18 2000
-+++ Makefile	Thu May 11 16:03:04 2000
-@@ -7,13 +7,12 @@
+--- Makefile.orig	Sat Aug 12 03:31:54 2000
++++ Makefile	Sat Sep 23 06:33:52 2000
+@@ -7,13 +7,15 @@
  
  ####### Compiler, tools and options
  
@@ -11,12 +11,36 @@
 -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
++CC	?=	gcc
++CXX	?=	g++
++CFLAGS	?=	-Wall -W -O2 -fno-strength-reduce
++CXXFLAGS?=	-Wall -W -O2 -fno-strength-reduce
++INCPATH	=	-I$(QTDIR)/include/qt2
 +LINK	=	$(CXX)
 +LFLAGS	=	
-+LIBS	=	-L$(X11BASE)/lib -lqt2 -lX11
-+MOC	=	moc2
++LIBS	=	-L$(QTDIR)/lib -lqt2
++MOC	=	$(QTDIR)/bin/moc2
  
  ####### Files
  
+@@ -351,16 +353,16 @@
+ .SUFFIXES: .cpp .cxx .cc .C .c
+ 
+ .cpp.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .cxx.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .cc.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .C.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
diff --git a/cad/qcad/files/patch-ab b/cad/qcad/files/patch-ab
new file mode 100644
index 000000000000..ffb6900b8b8b
--- /dev/null
+++ b/cad/qcad/files/patch-ab
@@ -0,0 +1,11 @@
+--- rappwin.cpp.orig	Sat Aug 12 03:31:54 2000
++++ rappwin.cpp	Sat Sep 23 14:37:46 2000
+@@ -3292,7 +3292,7 @@
+     case 0:
+       if(true) {
+         if(!QFileInfo(manualStr).exists()) {
+-          manualStr = "	/usr/share/doc/qcad/html/index.html";
++          manualStr = "	%%PREFIX%%/share/doc/qcad/html/index.html";
+         }
+ 
+         RLOG("\nEXEC:");
diff --git a/cad/qcad/files/patch-ac b/cad/qcad/files/patch-ac
new file mode 100644
index 000000000000..0add977c2877
--- /dev/null
+++ b/cad/qcad/files/patch-ac
@@ -0,0 +1,20 @@
+--- rconfig.cpp.orig	Sat Sep 23 14:33:24 2000
++++ rconfig.cpp	Sat Sep 23 14:36:05 2000
+@@ -178,7 +178,7 @@
+   addSetting( "Print:PrintAdjustmentFactor", "1.0");
+ 
+   addSetting( "Paths:BrowserPath", (RUNNING_WINDOWS ? "C:\\Progra~1\\Intern~1\\Iexplore.exe" : "netscape"));
+-  addSetting( "Paths:LibraryPath1", "/usr/share/qcad/libraries" );
++  addSetting( "Paths:LibraryPath1", "%%PREFIX%%/share/qcad/libraries" );
+ 
+   verbose=false;
+ }
+@@ -579,7 +579,7 @@
+ 
+   // Search in /usr/share/qcad/... dir:
+   if(!QFileInfo(path).exists()) {
+-    path = QString("/usr/share/")+DEF_APPNAME_L+"/"+_relPath;
++    path = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/"+_relPath;
+   }
+ #endif
+ 
diff --git a/cad/qcad/files/patch-ad b/cad/qcad/files/patch-ad
new file mode 100644
index 000000000000..65f540115e0b
--- /dev/null
+++ b/cad/qcad/files/patch-ad
@@ -0,0 +1,11 @@
+--- relement.cpp.orig	Sat Aug 12 03:31:54 2000
++++ relement.cpp	Sat Sep 23 14:37:06 2000
+@@ -3681,7 +3681,7 @@
+ 
+   // Search pattern in /usr/share/<proj>/hatches dir:
+   if(!QFileInfo(patternPath).exists()) {
+-    patternPath = QString("/usr/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf";
++    patternPath = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf";
+   }
+ #endif
+   */
diff --git a/cad/qcad/files/patch-ae b/cad/qcad/files/patch-ae
new file mode 100644
index 000000000000..3a98da5fee03
--- /dev/null
+++ b/cad/qcad/files/patch-ae
@@ -0,0 +1,20 @@
+--- rfile.cpp.orig	Sat Aug 12 03:31:54 2000
++++ rfile.cpp	Sat Sep 23 14:38:35 2000
+@@ -295,7 +295,7 @@
+ 
+ #ifndef DEF_WINDOWS
+   // Test /usr/share/<proj>/...:
+-  ret = QString("/usr/share/")+DEF_APPNAME_L+subdir+"/"+_name;
++  ret = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+subdir+"/"+_name;
+   RLOG("\nret2: "); RLOG(ret);
+   if(QFileInfo(ret).exists()) return ret;
+ 
+@@ -327,7 +327,7 @@
+ #ifndef DEF_WINDOWS
+   if(_prior==0 || _prior==2) {
+     // Test /usr/share/<proj>/...:
+-    ret = QString("/usr/share/")+DEF_APPNAME_L+"/"+_subdir;
++    ret = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/"+_subdir;
+     if(QFileInfo(ret).exists()) return ret;
+   }
+ 
diff --git a/cad/qcad/files/patch-af b/cad/qcad/files/patch-af
new file mode 100644
index 000000000000..cdb56ae5b136
--- /dev/null
+++ b/cad/qcad/files/patch-af
@@ -0,0 +1,14 @@
+--- rfonts.cpp.orig	Sat Aug 12 03:31:54 2000
++++ rfonts.cpp	Sat Sep 23 14:39:57 2000
+@@ -68,10 +68,7 @@
+ 
+ #ifndef DEF_WINDOWS
+   // Lookup from /usr/share/<proj>/fonts:
+-  lookupFonts( QString("/usr/share/")+DEF_APPNAME_L+"/fonts" );
+-
+-  // Lookup from /usr/local/<proj>/fonts:
+-  lookupFonts( QString("/usr/local/")+DEF_APPNAME_L+"/fonts" );
++  lookupFonts( QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/fonts" );
+ 
+   // Lookup from ~/.<proj>/fonts:
+   lookupFonts( RCONFIG->getConfigDir().path()+"/fonts" );
diff --git a/cad/qcad/pkg-plist b/cad/qcad/pkg-plist
index 8509f656e3f4..b34e931895e3 100644
--- a/cad/qcad/pkg-plist
+++ b/cad/qcad/pkg-plist
@@ -1,254 +1,4 @@
 bin/qcad
-lib/qcad/cur/cur_cross_bmp.cur
-lib/qcad/cur/cur_cross_mask.cur
-lib/qcad/cur/cur_glass_bmp.cur
-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
-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/pl.cxl.gz
-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/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
-lib/qcad/xpm/caddimsdiam.xpm
-lib/qcad/xpm/caddimshor.xpm
-lib/qcad/xpm/caddimspara.xpm
-lib/qcad/xpm/caddimsrad.xpm
-lib/qcad/xpm/caddimsver.xpm
-lib/qcad/xpm/cadlinesangle.xpm
-lib/qcad/xpm/cadlinesbisector.xpm
-lib/qcad/xpm/cadlineshor.xpm
-lib/qcad/xpm/cadlinesnormal.xpm
-lib/qcad/xpm/cadlinesortho.xpm
-lib/qcad/xpm/cadlinesortho2.xpm
-lib/qcad/xpm/cadlinespara.xpm
-lib/qcad/xpm/cadlinesrect.xpm
-lib/qcad/xpm/cadlinestan1.xpm
-lib/qcad/xpm/cadlinestan2.xpm
-lib/qcad/xpm/cadlinesver.xpm
-lib/qcad/xpm/cadmenuarc.xpm
-lib/qcad/xpm/cadmenucam.xpm
-lib/qcad/xpm/cadmenucamtool.xpm
-lib/qcad/xpm/cadmenucircle.xpm
-lib/qcad/xpm/cadmenudim.xpm
-lib/qcad/xpm/cadmenuedit.xpm
-lib/qcad/xpm/cadmenuhatch.xpm
-lib/qcad/xpm/cadmenuline.xpm
-lib/qcad/xpm/cadmenumeasure.xpm
-lib/qcad/xpm/cadmenupoint.xpm
-lib/qcad/xpm/cadmenutag.xpm
-lib/qcad/xpm/cadmenutext.xpm
-lib/qcad/xpm/cadmenuzoom.xpm
-lib/qcad/xpm/cadpointsingle.xpm
-lib/qcad/xpm/camauto.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
-lib/qcad/xpm/color02.xpm
-lib/qcad/xpm/color03.xpm
-lib/qcad/xpm/color04.xpm
-lib/qcad/xpm/color05.xpm
-lib/qcad/xpm/color06.xpm
-lib/qcad/xpm/color07.xpm
-lib/qcad/xpm/color08.xpm
-lib/qcad/xpm/color09.xpm
-lib/qcad/xpm/color10.xpm
-lib/qcad/xpm/color11.xpm
-lib/qcad/xpm/color12.xpm
-lib/qcad/xpm/color13.xpm
-lib/qcad/xpm/color14.xpm
-lib/qcad/xpm/color15.xpm
-lib/qcad/xpm/confmachgen.xpm
-lib/qcad/xpm/copy.xpm
-lib/qcad/xpm/cut.xpm
-lib/qcad/xpm/deleteitem.xpm
-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
-lib/qcad/xpm/editlayer.xpm
-lib/qcad/xpm/editmirror.xpm
-lib/qcad/xpm/editmove.xpm
-lib/qcad/xpm/editmoverot.xpm
-lib/qcad/xpm/editpaste.xpm
-lib/qcad/xpm/editrotate.xpm
-lib/qcad/xpm/editrotrot.xpm
-lib/qcad/xpm/editround.xpm
-lib/qcad/xpm/editscale.xpm
-lib/qcad/xpm/editstretch.xpm
-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
-lib/qcad/xpm/filenew.xpm
-lib/qcad/xpm/fileopen.xpm
-lib/qcad/xpm/fileprint.xpm
-lib/qcad/xpm/fileprint01.xpm
-lib/qcad/xpm/fileprintprev.xpm
-lib/qcad/xpm/fileprintsetup.xpm
-lib/qcad/xpm/filerecall.xpm
-lib/qcad/xpm/filesave.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
-lib/qcad/xpm/helpeditmove.xpm
-lib/qcad/xpm/helpeditmoverotate.xpm
-lib/qcad/xpm/helpeditrotate.xpm
-lib/qcad/xpm/helpeditrotaterotate.xpm
-lib/qcad/xpm/helpeditscale.xpm
-lib/qcad/xpm/helpmanual.xpm
-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
-lib/qcad/xpm/moderel.xpm
-lib/qcad/xpm/modesimulation.xpm
-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
-lib/qcad/xpm/shaperoundout.xpm
-lib/qcad/xpm/shapestraight.xpm
-lib/qcad/xpm/simbroken.xpm
-lib/qcad/xpm/simdetails.xpm
-lib/qcad/xpm/simgrid.xpm
-lib/qcad/xpm/simoptions.xpm
-lib/qcad/xpm/simpointing.xpm
-lib/qcad/xpm/simrapidmove.xpm
-lib/qcad/xpm/simsmooth.xpm
-lib/qcad/xpm/simstart.xpm
-lib/qcad/xpm/snapautointer.xpm
-lib/qcad/xpm/snapcenters.xpm
-lib/qcad/xpm/snapdist.xpm
-lib/qcad/xpm/snapendpoints.xpm
-lib/qcad/xpm/snapfree.xpm
-lib/qcad/xpm/snapgrid.xpm
-lib/qcad/xpm/snapkeyar.xpm
-lib/qcad/xpm/snapkeyxy.xpm
-lib/qcad/xpm/snapmaninter.xpm
-lib/qcad/xpm/snapmiddles.xpm
-lib/qcad/xpm/snaponelement.xpm
-lib/qcad/xpm/style00.xpm
-lib/qcad/xpm/style01.xpm
-lib/qcad/xpm/style02.xpm
-lib/qcad/xpm/style03.xpm
-lib/qcad/xpm/style04.xpm
-lib/qcad/xpm/tagall.xpm
-lib/qcad/xpm/tagcontour.xpm
-lib/qcad/xpm/tagdoubles.xpm
-lib/qcad/xpm/tagelement.xpm
-lib/qcad/xpm/tagenough.xpm
-lib/qcad/xpm/taginters.xpm
-lib/qcad/xpm/taginvert.xpm
-lib/qcad/xpm/taglayer.xpm
-lib/qcad/xpm/tagnothing.xpm
-lib/qcad/xpm/tagrange.xpm
-lib/qcad/xpm/tile.xpm
-lib/qcad/xpm/undo.xpm
-lib/qcad/xpm/untaginters.xpm
-lib/qcad/xpm/untagrange.xpm
-lib/qcad/xpm/visiblelayer.xpm
-lib/qcad/xpm/width00.xpm
-lib/qcad/xpm/width01.xpm
-lib/qcad/xpm/width02.xpm
-lib/qcad/xpm/width03.xpm
-lib/qcad/xpm/width04.xpm
-lib/qcad/xpm/width05.xpm
-lib/qcad/xpm/width06.xpm
-lib/qcad/xpm/width07.xpm
-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/en/001.html
 share/doc/qcad/en/002.html
 share/doc/qcad/en/003.html
@@ -484,15 +234,265 @@ 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
+share/qcad/cur/cur_cross_bmp.cur
+share/qcad/cur/cur_cross_mask.cur
+share/qcad/cur/cur_glass_bmp.cur
+share/qcad/cur/cur_glass_mask.cur
+share/qcad/fonts/courier.cxf
+share/qcad/fonts/cursive.cxf
+share/qcad/fonts/cyrillic.cxf
+share/qcad/fonts/normal.cxf
+share/qcad/fonts/romans.cxf
+share/qcad/hatches/0.dxf
+share/qcad/hatches/135.dxf
+share/qcad/hatches/45.dxf
+share/qcad/hatches/90.dxf
+share/qcad/hatches/arcs.dxf
+share/qcad/hatches/concrete.dxf
+share/qcad/hatches/honeycomb.dxf
+share/qcad/hatches/plastic.dxf
+share/qcad/hatches/sand.dxf
+share/qcad/messages/de.cxl
+share/qcad/messages/en.cxl
+share/qcad/messages/es.cxl
+share/qcad/messages/et.cxl
+share/qcad/messages/eu.cxl
+share/qcad/messages/fi.cxl
+share/qcad/messages/fr.cxl
+share/qcad/messages/ga.cxl
+share/qcad/messages/gr.cxl
+share/qcad/messages/hu.cxl
+share/qcad/messages/it.cxl
+share/qcad/messages/jp.cxl
+share/qcad/messages/nl.cxl
+share/qcad/messages/pl.cxl
+share/qcad/messages/pt.cxl
+share/qcad/messages/ru.cxl
+share/qcad/messages/sk.cxl
+share/qcad/xpm/addlayer.xpm
+share/qcad/xpm/aligncenter.xpm
+share/qcad/xpm/alignleft.xpm
+share/qcad/xpm/alignright.xpm
+share/qcad/xpm/applicationicon.xpm
+share/qcad/xpm/apsicon.xpm
+share/qcad/xpm/arcdir1.xpm
+share/qcad/xpm/arcdir2.xpm
+share/qcad/xpm/back.xpm
+share/qcad/xpm/beveltrimoff.xpm
+share/qcad/xpm/beveltrimon.xpm
+share/qcad/xpm/cadarcscraa.xpm
+share/qcad/xpm/cadarcspara.xpm
+share/qcad/xpm/cadarcsppp.xpm
+share/qcad/xpm/cadcircles3p.xpm
+share/qcad/xpm/cadcirclescl.xpm
+share/qcad/xpm/cadcirclescr.xpm
+share/qcad/xpm/caddimsangle.xpm
+share/qcad/xpm/caddimsarrow.xpm
+share/qcad/xpm/caddimsdiam.xpm
+share/qcad/xpm/caddimshor.xpm
+share/qcad/xpm/caddimspara.xpm
+share/qcad/xpm/caddimsrad.xpm
+share/qcad/xpm/caddimsver.xpm
+share/qcad/xpm/cadlinesangle.xpm
+share/qcad/xpm/cadlinesbisector.xpm
+share/qcad/xpm/cadlineshor.xpm
+share/qcad/xpm/cadlinesnormal.xpm
+share/qcad/xpm/cadlinesortho.xpm
+share/qcad/xpm/cadlinesortho2.xpm
+share/qcad/xpm/cadlinespara.xpm
+share/qcad/xpm/cadlinesrect.xpm
+share/qcad/xpm/cadlinestan1.xpm
+share/qcad/xpm/cadlinestan2.xpm
+share/qcad/xpm/cadlinesver.xpm
+share/qcad/xpm/cadmenuarc.xpm
+share/qcad/xpm/cadmenucam.xpm
+share/qcad/xpm/cadmenucamtool.xpm
+share/qcad/xpm/cadmenucircle.xpm
+share/qcad/xpm/cadmenudim.xpm
+share/qcad/xpm/cadmenuedit.xpm
+share/qcad/xpm/cadmenuhatch.xpm
+share/qcad/xpm/cadmenuline.xpm
+share/qcad/xpm/cadmenumeasure.xpm
+share/qcad/xpm/cadmenupoint.xpm
+share/qcad/xpm/cadmenutag.xpm
+share/qcad/xpm/cadmenutext.xpm
+share/qcad/xpm/cadmenuzoom.xpm
+share/qcad/xpm/cadpointsingle.xpm
+share/qcad/xpm/camauto.xpm
+share/qcad/xpm/camexp.xpm
+share/qcad/xpm/camexpintro.xpm
+share/qcad/xpm/cammanual.xpm
+share/qcad/xpm/color00.xpm
+share/qcad/xpm/color01.xpm
+share/qcad/xpm/color02.xpm
+share/qcad/xpm/color03.xpm
+share/qcad/xpm/color04.xpm
+share/qcad/xpm/color05.xpm
+share/qcad/xpm/color06.xpm
+share/qcad/xpm/color07.xpm
+share/qcad/xpm/color08.xpm
+share/qcad/xpm/color09.xpm
+share/qcad/xpm/color10.xpm
+share/qcad/xpm/color11.xpm
+share/qcad/xpm/color12.xpm
+share/qcad/xpm/color13.xpm
+share/qcad/xpm/color14.xpm
+share/qcad/xpm/color15.xpm
+share/qcad/xpm/confmachgen.xpm
+share/qcad/xpm/copy.xpm
+share/qcad/xpm/cut.xpm
+share/qcad/xpm/deleteitem.xpm
+share/qcad/xpm/document.xpm
+share/qcad/xpm/edit.xpm
+share/qcad/xpm/editattrib.xpm
+share/qcad/xpm/editbevel.xpm
+share/qcad/xpm/editclip.xpm
+share/qcad/xpm/editcopy.xpm
+share/qcad/xpm/editcut.xpm
+share/qcad/xpm/editdelete.xpm
+share/qcad/xpm/editlayer.xpm
+share/qcad/xpm/editmirror.xpm
+share/qcad/xpm/editmove.xpm
+share/qcad/xpm/editmoverot.xpm
+share/qcad/xpm/editpaste.xpm
+share/qcad/xpm/editrotate.xpm
+share/qcad/xpm/editrotrot.xpm
+share/qcad/xpm/editround.xpm
+share/qcad/xpm/editscale.xpm
+share/qcad/xpm/editstretch.xpm
+share/qcad/xpm/edittext.xpm
+share/qcad/xpm/edittextelement.xpm
+share/qcad/xpm/edittrim.xpm
+share/qcad/xpm/edittrim2.xpm
+share/qcad/xpm/edittrim3.xpm
+share/qcad/xpm/editzero.xpm
+share/qcad/xpm/fileclose.xpm
+share/qcad/xpm/filecloseoutput.xpm
+share/qcad/xpm/filenew.xpm
+share/qcad/xpm/fileopen.xpm
+share/qcad/xpm/fileprint.xpm
+share/qcad/xpm/fileprint01.xpm
+share/qcad/xpm/fileprintprev.xpm
+share/qcad/xpm/fileprintsetup.xpm
+share/qcad/xpm/filerecall.xpm
+share/qcad/xpm/filesave.xpm
+share/qcad/xpm/folderclosed.xpm
+share/qcad/xpm/folderopen.xpm
+share/qcad/xpm/forward.xpm
+share/qcad/xpm/helpabout.xpm
+share/qcad/xpm/helpeditlayer.xpm
+share/qcad/xpm/helpeditmirror.xpm
+share/qcad/xpm/helpeditmove.xpm
+share/qcad/xpm/helpeditmoverotate.xpm
+share/qcad/xpm/helpeditrotate.xpm
+share/qcad/xpm/helpeditrotaterotate.xpm
+share/qcad/xpm/helpeditscale.xpm
+share/qcad/xpm/helpmanual.xpm
+share/qcad/xpm/helpsnapkeyar.xpm
+share/qcad/xpm/helpsnapkeyxy.xpm
+share/qcad/xpm/hiddenlayer.xpm
+share/qcad/xpm/info.xpm
+share/qcad/xpm/init.xpm
+share/qcad/xpm/insertitem.xpm
+share/qcad/xpm/layerlist.xpm
+share/qcad/xpm/librarybrowser.xpm
+share/qcad/xpm/lock.xpm
+share/qcad/xpm/lock01.xpm
+share/qcad/xpm/lock02.xpm
+share/qcad/xpm/measureanglelnln.xpm
+share/qcad/xpm/measureeditelement.xpm
+share/qcad/xpm/measurelnpt.xpm
+share/qcad/xpm/measureparallellines.xpm
+share/qcad/xpm/measureptpt.xpm
+share/qcad/xpm/modeabs.xpm
+share/qcad/xpm/modecomparison.xpm
+share/qcad/xpm/modeconstruction.xpm
+share/qcad/xpm/moderel.xpm
+share/qcad/xpm/modesimulation.xpm
+share/qcad/xpm/mouse.xpm
+share/qcad/xpm/paste.xpm
+share/qcad/xpm/qcad.xpm
+share/qcad/xpm/qcadintro.xpm
+share/qcad/xpm/qcadsgi.xpm
+share/qcad/xpm/redo.xpm
+share/qcad/xpm/removeemptylayers.xpm
+share/qcad/xpm/removelayer.xpm
+share/qcad/xpm/renamelayer.xpm
+share/qcad/xpm/ribbonsoft.xpm
+share/qcad/xpm/roundtrimoff.xpm
+share/qcad/xpm/roundtrimon.xpm
+share/qcad/xpm/shaperoundin.xpm
+share/qcad/xpm/shaperoundout.xpm
+share/qcad/xpm/shapestraight.xpm
+share/qcad/xpm/simbroken.xpm
+share/qcad/xpm/simdetails.xpm
+share/qcad/xpm/simgrid.xpm
+share/qcad/xpm/simoptions.xpm
+share/qcad/xpm/simpointing.xpm
+share/qcad/xpm/simrapidmove.xpm
+share/qcad/xpm/simsmooth.xpm
+share/qcad/xpm/simstart.xpm
+share/qcad/xpm/snapautointer.xpm
+share/qcad/xpm/snapcenters.xpm
+share/qcad/xpm/snapdist.xpm
+share/qcad/xpm/snapendpoints.xpm
+share/qcad/xpm/snapfree.xpm
+share/qcad/xpm/snapgrid.xpm
+share/qcad/xpm/snapkeyar.xpm
+share/qcad/xpm/snapkeyxy.xpm
+share/qcad/xpm/snapmaninter.xpm
+share/qcad/xpm/snapmiddles.xpm
+share/qcad/xpm/snaponelement.xpm
+share/qcad/xpm/style00.xpm
+share/qcad/xpm/style01.xpm
+share/qcad/xpm/style02.xpm
+share/qcad/xpm/style03.xpm
+share/qcad/xpm/style04.xpm
+share/qcad/xpm/tagall.xpm
+share/qcad/xpm/tagcontour.xpm
+share/qcad/xpm/tagdoubles.xpm
+share/qcad/xpm/tagelement.xpm
+share/qcad/xpm/tagenough.xpm
+share/qcad/xpm/taginters.xpm
+share/qcad/xpm/taginvert.xpm
+share/qcad/xpm/taglayer.xpm
+share/qcad/xpm/tagnothing.xpm
+share/qcad/xpm/tagrange.xpm
+share/qcad/xpm/tile.xpm
+share/qcad/xpm/undo.xpm
+share/qcad/xpm/untaginters.xpm
+share/qcad/xpm/untagrange.xpm
+share/qcad/xpm/visiblelayer.xpm
+share/qcad/xpm/width00.xpm
+share/qcad/xpm/width01.xpm
+share/qcad/xpm/width02.xpm
+share/qcad/xpm/width03.xpm
+share/qcad/xpm/width04.xpm
+share/qcad/xpm/width05.xpm
+share/qcad/xpm/width06.xpm
+share/qcad/xpm/width07.xpm
+share/qcad/xpm/width08.xpm
+share/qcad/xpm/zero.xpm
+share/qcad/xpm/zerorel.xpm
+share/qcad/xpm/zerorelwhite.xpm
+share/qcad/xpm/zerosmall.xpm
+share/qcad/xpm/zoomauto.xpm
+share/qcad/xpm/zoomdecrease.xpm
+share/qcad/xpm/zoomincrease.xpm
+share/qcad/xpm/zoomone.xpm
+share/qcad/xpm/zoompan.xpm
+share/qcad/xpm/zoomredraw.xpm
+share/qcad/xpm/zoomtagged.xpm
+share/qcad/xpm/zoomtopage.xpm
+share/qcad/xpm/zoomwindow.xpm
+@exec ln -sf %D/share/doc/qcad %D/share/qcad/doc
+@unexec rm -f %D/share/qcad/doc
+@dirrm share/qcad/xpm
+@dirrm share/qcad/messages
+@dirrm share/qcad/hatches
+@dirrm share/qcad/fonts
+@dirrm share/qcad/cur
+@dirrm share/qcad
 @dirrm share/examples/qcad
 @dirrm share/doc/qcad/en/img
 @dirrm share/doc/qcad/en
-@dirrm share/doc/qcad
-@dirrm lib/qcad/xpm
-@dirrm lib/qcad/messages
-@dirrm lib/qcad/hatches
-@dirrm lib/qcad/fonts
-@dirrm lib/qcad/cur
-@dirrm lib/qcad
diff --git a/cad/qcad2/Makefile b/cad/qcad2/Makefile
index 13f3e606cb76..3edc516be18b 100644
--- a/cad/qcad2/Makefile
+++ b/cad/qcad2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qcad
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.4
 CATEGORIES=	cad
 MASTER_SITES=	http://www.qcad.org/archives/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -14,29 +14,27 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
-MAKE_ENV=	CC="${CXX}"
 USE_QT2=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
+MAKE_ENV=	QTDIR="${X11BASE}"
 
-QCADDIR=	${PREFIX}/lib/qcad
-QCADDOCDIR=	${PREFIX}/share/doc/qcad
-QCADSAMPLEDIR=	${PREFIX}/share/examples/qcad
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.cpp
 
 do-install:
-	@${MKDIR} ${QCADDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/qcad ${QCADDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/qcad ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/qcad
 .for dir in cur fonts hatches messages xpm
-	${CP} -R ${WRKSRC}/${dir} ${QCADDIR}
+	${TAR} -C ${WRKSRC} -cf - ${dir} | \
+		${TAR} -C ${PREFIX}/share/qcad --unlink -xf -
 .endfor
+	@${MKDIR} ${PREFIX}/share/examples/qcad
+	${TAR} -C ${WRKSRC}/examples -cf - . | \
+		${TAR} -C ${PREFIX}/share/examples/qcad --unlink -xf -
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${QCADDOCDIR}
-	${CP} -R ${WRKSRC}/doc/* ${QCADDOCDIR}
-	@${LN} -sf ${QCADDOCDIR} ${QCADDIR}/doc
+	@${MKDIR} ${PREFIX}/share/doc/qcad
+	${TAR} -C ${WRKSRC}/doc -cf - . | \
+		${TAR} -C ${PREFIX}/share/doc/qcad --unlink -xf -
+	@${LN} -sf ${PREFIX}/share/doc/qcad ${PREFIX}/share/qcad/doc
 .endif
-	@${MKDIR} ${QCADSAMPLEDIR}
-	${CP} -R ${WRKSRC}/examples/* ${QCADSAMPLEDIR}
-	${SED} -e "s;%%PREFIX%%;${PREFIX};g" \
-		< ${FILESDIR}/qcad.in > ${PREFIX}/bin/qcad
-	${CHMOD} +x ${PREFIX}/bin/qcad
 
 .include <bsd.port.mk>
diff --git a/cad/qcad2/distinfo b/cad/qcad2/distinfo
index c69542cf9fac..b588640e5aff 100644
--- a/cad/qcad2/distinfo
+++ b/cad/qcad2/distinfo
@@ -1 +1 @@
-MD5 (qcad-1.4.1-src.tar.gz) = 47db435586609a25a2a35c4f9137a92a
+MD5 (qcad-1.4.4-src.tar.gz) = a8ebe3d43ce7a633e8543f71c01bb04a
diff --git a/cad/qcad2/files/patch-aa b/cad/qcad2/files/patch-aa
index 00324d454cee..0da0db8c2b33 100644
--- a/cad/qcad2/files/patch-aa
+++ b/cad/qcad2/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri May  5 12:57:18 2000
-+++ Makefile	Thu May 11 16:03:04 2000
-@@ -7,13 +7,12 @@
+--- Makefile.orig	Sat Aug 12 03:31:54 2000
++++ Makefile	Sat Sep 23 06:33:52 2000
+@@ -7,13 +7,15 @@
  
  ####### Compiler, tools and options
  
@@ -11,12 +11,36 @@
 -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
++CC	?=	gcc
++CXX	?=	g++
++CFLAGS	?=	-Wall -W -O2 -fno-strength-reduce
++CXXFLAGS?=	-Wall -W -O2 -fno-strength-reduce
++INCPATH	=	-I$(QTDIR)/include/qt2
 +LINK	=	$(CXX)
 +LFLAGS	=	
-+LIBS	=	-L$(X11BASE)/lib -lqt2 -lX11
-+MOC	=	moc2
++LIBS	=	-L$(QTDIR)/lib -lqt2
++MOC	=	$(QTDIR)/bin/moc2
  
  ####### Files
  
+@@ -351,16 +353,16 @@
+ .SUFFIXES: .cpp .cxx .cc .C .c
+ 
+ .cpp.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .cxx.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .cc.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .C.o:
+-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
diff --git a/cad/qcad2/files/patch-ab b/cad/qcad2/files/patch-ab
new file mode 100644
index 000000000000..ffb6900b8b8b
--- /dev/null
+++ b/cad/qcad2/files/patch-ab
@@ -0,0 +1,11 @@
+--- rappwin.cpp.orig	Sat Aug 12 03:31:54 2000
++++ rappwin.cpp	Sat Sep 23 14:37:46 2000
+@@ -3292,7 +3292,7 @@
+     case 0:
+       if(true) {
+         if(!QFileInfo(manualStr).exists()) {
+-          manualStr = "	/usr/share/doc/qcad/html/index.html";
++          manualStr = "	%%PREFIX%%/share/doc/qcad/html/index.html";
+         }
+ 
+         RLOG("\nEXEC:");
diff --git a/cad/qcad2/files/patch-ac b/cad/qcad2/files/patch-ac
new file mode 100644
index 000000000000..0add977c2877
--- /dev/null
+++ b/cad/qcad2/files/patch-ac
@@ -0,0 +1,20 @@
+--- rconfig.cpp.orig	Sat Sep 23 14:33:24 2000
++++ rconfig.cpp	Sat Sep 23 14:36:05 2000
+@@ -178,7 +178,7 @@
+   addSetting( "Print:PrintAdjustmentFactor", "1.0");
+ 
+   addSetting( "Paths:BrowserPath", (RUNNING_WINDOWS ? "C:\\Progra~1\\Intern~1\\Iexplore.exe" : "netscape"));
+-  addSetting( "Paths:LibraryPath1", "/usr/share/qcad/libraries" );
++  addSetting( "Paths:LibraryPath1", "%%PREFIX%%/share/qcad/libraries" );
+ 
+   verbose=false;
+ }
+@@ -579,7 +579,7 @@
+ 
+   // Search in /usr/share/qcad/... dir:
+   if(!QFileInfo(path).exists()) {
+-    path = QString("/usr/share/")+DEF_APPNAME_L+"/"+_relPath;
++    path = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/"+_relPath;
+   }
+ #endif
+ 
diff --git a/cad/qcad2/files/patch-ad b/cad/qcad2/files/patch-ad
new file mode 100644
index 000000000000..65f540115e0b
--- /dev/null
+++ b/cad/qcad2/files/patch-ad
@@ -0,0 +1,11 @@
+--- relement.cpp.orig	Sat Aug 12 03:31:54 2000
++++ relement.cpp	Sat Sep 23 14:37:06 2000
+@@ -3681,7 +3681,7 @@
+ 
+   // Search pattern in /usr/share/<proj>/hatches dir:
+   if(!QFileInfo(patternPath).exists()) {
+-    patternPath = QString("/usr/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf";
++    patternPath = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf";
+   }
+ #endif
+   */
diff --git a/cad/qcad2/files/patch-ae b/cad/qcad2/files/patch-ae
new file mode 100644
index 000000000000..3a98da5fee03
--- /dev/null
+++ b/cad/qcad2/files/patch-ae
@@ -0,0 +1,20 @@
+--- rfile.cpp.orig	Sat Aug 12 03:31:54 2000
++++ rfile.cpp	Sat Sep 23 14:38:35 2000
+@@ -295,7 +295,7 @@
+ 
+ #ifndef DEF_WINDOWS
+   // Test /usr/share/<proj>/...:
+-  ret = QString("/usr/share/")+DEF_APPNAME_L+subdir+"/"+_name;
++  ret = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+subdir+"/"+_name;
+   RLOG("\nret2: "); RLOG(ret);
+   if(QFileInfo(ret).exists()) return ret;
+ 
+@@ -327,7 +327,7 @@
+ #ifndef DEF_WINDOWS
+   if(_prior==0 || _prior==2) {
+     // Test /usr/share/<proj>/...:
+-    ret = QString("/usr/share/")+DEF_APPNAME_L+"/"+_subdir;
++    ret = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/"+_subdir;
+     if(QFileInfo(ret).exists()) return ret;
+   }
+ 
diff --git a/cad/qcad2/files/patch-af b/cad/qcad2/files/patch-af
new file mode 100644
index 000000000000..cdb56ae5b136
--- /dev/null
+++ b/cad/qcad2/files/patch-af
@@ -0,0 +1,14 @@
+--- rfonts.cpp.orig	Sat Aug 12 03:31:54 2000
++++ rfonts.cpp	Sat Sep 23 14:39:57 2000
+@@ -68,10 +68,7 @@
+ 
+ #ifndef DEF_WINDOWS
+   // Lookup from /usr/share/<proj>/fonts:
+-  lookupFonts( QString("/usr/share/")+DEF_APPNAME_L+"/fonts" );
+-
+-  // Lookup from /usr/local/<proj>/fonts:
+-  lookupFonts( QString("/usr/local/")+DEF_APPNAME_L+"/fonts" );
++  lookupFonts( QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/fonts" );
+ 
+   // Lookup from ~/.<proj>/fonts:
+   lookupFonts( RCONFIG->getConfigDir().path()+"/fonts" );
diff --git a/cad/qcad2/pkg-plist b/cad/qcad2/pkg-plist
index 8509f656e3f4..b34e931895e3 100644
--- a/cad/qcad2/pkg-plist
+++ b/cad/qcad2/pkg-plist
@@ -1,254 +1,4 @@
 bin/qcad
-lib/qcad/cur/cur_cross_bmp.cur
-lib/qcad/cur/cur_cross_mask.cur
-lib/qcad/cur/cur_glass_bmp.cur
-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
-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/pl.cxl.gz
-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/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
-lib/qcad/xpm/caddimsdiam.xpm
-lib/qcad/xpm/caddimshor.xpm
-lib/qcad/xpm/caddimspara.xpm
-lib/qcad/xpm/caddimsrad.xpm
-lib/qcad/xpm/caddimsver.xpm
-lib/qcad/xpm/cadlinesangle.xpm
-lib/qcad/xpm/cadlinesbisector.xpm
-lib/qcad/xpm/cadlineshor.xpm
-lib/qcad/xpm/cadlinesnormal.xpm
-lib/qcad/xpm/cadlinesortho.xpm
-lib/qcad/xpm/cadlinesortho2.xpm
-lib/qcad/xpm/cadlinespara.xpm
-lib/qcad/xpm/cadlinesrect.xpm
-lib/qcad/xpm/cadlinestan1.xpm
-lib/qcad/xpm/cadlinestan2.xpm
-lib/qcad/xpm/cadlinesver.xpm
-lib/qcad/xpm/cadmenuarc.xpm
-lib/qcad/xpm/cadmenucam.xpm
-lib/qcad/xpm/cadmenucamtool.xpm
-lib/qcad/xpm/cadmenucircle.xpm
-lib/qcad/xpm/cadmenudim.xpm
-lib/qcad/xpm/cadmenuedit.xpm
-lib/qcad/xpm/cadmenuhatch.xpm
-lib/qcad/xpm/cadmenuline.xpm
-lib/qcad/xpm/cadmenumeasure.xpm
-lib/qcad/xpm/cadmenupoint.xpm
-lib/qcad/xpm/cadmenutag.xpm
-lib/qcad/xpm/cadmenutext.xpm
-lib/qcad/xpm/cadmenuzoom.xpm
-lib/qcad/xpm/cadpointsingle.xpm
-lib/qcad/xpm/camauto.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
-lib/qcad/xpm/color02.xpm
-lib/qcad/xpm/color03.xpm
-lib/qcad/xpm/color04.xpm
-lib/qcad/xpm/color05.xpm
-lib/qcad/xpm/color06.xpm
-lib/qcad/xpm/color07.xpm
-lib/qcad/xpm/color08.xpm
-lib/qcad/xpm/color09.xpm
-lib/qcad/xpm/color10.xpm
-lib/qcad/xpm/color11.xpm
-lib/qcad/xpm/color12.xpm
-lib/qcad/xpm/color13.xpm
-lib/qcad/xpm/color14.xpm
-lib/qcad/xpm/color15.xpm
-lib/qcad/xpm/confmachgen.xpm
-lib/qcad/xpm/copy.xpm
-lib/qcad/xpm/cut.xpm
-lib/qcad/xpm/deleteitem.xpm
-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
-lib/qcad/xpm/editlayer.xpm
-lib/qcad/xpm/editmirror.xpm
-lib/qcad/xpm/editmove.xpm
-lib/qcad/xpm/editmoverot.xpm
-lib/qcad/xpm/editpaste.xpm
-lib/qcad/xpm/editrotate.xpm
-lib/qcad/xpm/editrotrot.xpm
-lib/qcad/xpm/editround.xpm
-lib/qcad/xpm/editscale.xpm
-lib/qcad/xpm/editstretch.xpm
-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
-lib/qcad/xpm/filenew.xpm
-lib/qcad/xpm/fileopen.xpm
-lib/qcad/xpm/fileprint.xpm
-lib/qcad/xpm/fileprint01.xpm
-lib/qcad/xpm/fileprintprev.xpm
-lib/qcad/xpm/fileprintsetup.xpm
-lib/qcad/xpm/filerecall.xpm
-lib/qcad/xpm/filesave.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
-lib/qcad/xpm/helpeditmove.xpm
-lib/qcad/xpm/helpeditmoverotate.xpm
-lib/qcad/xpm/helpeditrotate.xpm
-lib/qcad/xpm/helpeditrotaterotate.xpm
-lib/qcad/xpm/helpeditscale.xpm
-lib/qcad/xpm/helpmanual.xpm
-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
-lib/qcad/xpm/moderel.xpm
-lib/qcad/xpm/modesimulation.xpm
-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
-lib/qcad/xpm/shaperoundout.xpm
-lib/qcad/xpm/shapestraight.xpm
-lib/qcad/xpm/simbroken.xpm
-lib/qcad/xpm/simdetails.xpm
-lib/qcad/xpm/simgrid.xpm
-lib/qcad/xpm/simoptions.xpm
-lib/qcad/xpm/simpointing.xpm
-lib/qcad/xpm/simrapidmove.xpm
-lib/qcad/xpm/simsmooth.xpm
-lib/qcad/xpm/simstart.xpm
-lib/qcad/xpm/snapautointer.xpm
-lib/qcad/xpm/snapcenters.xpm
-lib/qcad/xpm/snapdist.xpm
-lib/qcad/xpm/snapendpoints.xpm
-lib/qcad/xpm/snapfree.xpm
-lib/qcad/xpm/snapgrid.xpm
-lib/qcad/xpm/snapkeyar.xpm
-lib/qcad/xpm/snapkeyxy.xpm
-lib/qcad/xpm/snapmaninter.xpm
-lib/qcad/xpm/snapmiddles.xpm
-lib/qcad/xpm/snaponelement.xpm
-lib/qcad/xpm/style00.xpm
-lib/qcad/xpm/style01.xpm
-lib/qcad/xpm/style02.xpm
-lib/qcad/xpm/style03.xpm
-lib/qcad/xpm/style04.xpm
-lib/qcad/xpm/tagall.xpm
-lib/qcad/xpm/tagcontour.xpm
-lib/qcad/xpm/tagdoubles.xpm
-lib/qcad/xpm/tagelement.xpm
-lib/qcad/xpm/tagenough.xpm
-lib/qcad/xpm/taginters.xpm
-lib/qcad/xpm/taginvert.xpm
-lib/qcad/xpm/taglayer.xpm
-lib/qcad/xpm/tagnothing.xpm
-lib/qcad/xpm/tagrange.xpm
-lib/qcad/xpm/tile.xpm
-lib/qcad/xpm/undo.xpm
-lib/qcad/xpm/untaginters.xpm
-lib/qcad/xpm/untagrange.xpm
-lib/qcad/xpm/visiblelayer.xpm
-lib/qcad/xpm/width00.xpm
-lib/qcad/xpm/width01.xpm
-lib/qcad/xpm/width02.xpm
-lib/qcad/xpm/width03.xpm
-lib/qcad/xpm/width04.xpm
-lib/qcad/xpm/width05.xpm
-lib/qcad/xpm/width06.xpm
-lib/qcad/xpm/width07.xpm
-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/en/001.html
 share/doc/qcad/en/002.html
 share/doc/qcad/en/003.html
@@ -484,15 +234,265 @@ 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
+share/qcad/cur/cur_cross_bmp.cur
+share/qcad/cur/cur_cross_mask.cur
+share/qcad/cur/cur_glass_bmp.cur
+share/qcad/cur/cur_glass_mask.cur
+share/qcad/fonts/courier.cxf
+share/qcad/fonts/cursive.cxf
+share/qcad/fonts/cyrillic.cxf
+share/qcad/fonts/normal.cxf
+share/qcad/fonts/romans.cxf
+share/qcad/hatches/0.dxf
+share/qcad/hatches/135.dxf
+share/qcad/hatches/45.dxf
+share/qcad/hatches/90.dxf
+share/qcad/hatches/arcs.dxf
+share/qcad/hatches/concrete.dxf
+share/qcad/hatches/honeycomb.dxf
+share/qcad/hatches/plastic.dxf
+share/qcad/hatches/sand.dxf
+share/qcad/messages/de.cxl
+share/qcad/messages/en.cxl
+share/qcad/messages/es.cxl
+share/qcad/messages/et.cxl
+share/qcad/messages/eu.cxl
+share/qcad/messages/fi.cxl
+share/qcad/messages/fr.cxl
+share/qcad/messages/ga.cxl
+share/qcad/messages/gr.cxl
+share/qcad/messages/hu.cxl
+share/qcad/messages/it.cxl
+share/qcad/messages/jp.cxl
+share/qcad/messages/nl.cxl
+share/qcad/messages/pl.cxl
+share/qcad/messages/pt.cxl
+share/qcad/messages/ru.cxl
+share/qcad/messages/sk.cxl
+share/qcad/xpm/addlayer.xpm
+share/qcad/xpm/aligncenter.xpm
+share/qcad/xpm/alignleft.xpm
+share/qcad/xpm/alignright.xpm
+share/qcad/xpm/applicationicon.xpm
+share/qcad/xpm/apsicon.xpm
+share/qcad/xpm/arcdir1.xpm
+share/qcad/xpm/arcdir2.xpm
+share/qcad/xpm/back.xpm
+share/qcad/xpm/beveltrimoff.xpm
+share/qcad/xpm/beveltrimon.xpm
+share/qcad/xpm/cadarcscraa.xpm
+share/qcad/xpm/cadarcspara.xpm
+share/qcad/xpm/cadarcsppp.xpm
+share/qcad/xpm/cadcircles3p.xpm
+share/qcad/xpm/cadcirclescl.xpm
+share/qcad/xpm/cadcirclescr.xpm
+share/qcad/xpm/caddimsangle.xpm
+share/qcad/xpm/caddimsarrow.xpm
+share/qcad/xpm/caddimsdiam.xpm
+share/qcad/xpm/caddimshor.xpm
+share/qcad/xpm/caddimspara.xpm
+share/qcad/xpm/caddimsrad.xpm
+share/qcad/xpm/caddimsver.xpm
+share/qcad/xpm/cadlinesangle.xpm
+share/qcad/xpm/cadlinesbisector.xpm
+share/qcad/xpm/cadlineshor.xpm
+share/qcad/xpm/cadlinesnormal.xpm
+share/qcad/xpm/cadlinesortho.xpm
+share/qcad/xpm/cadlinesortho2.xpm
+share/qcad/xpm/cadlinespara.xpm
+share/qcad/xpm/cadlinesrect.xpm
+share/qcad/xpm/cadlinestan1.xpm
+share/qcad/xpm/cadlinestan2.xpm
+share/qcad/xpm/cadlinesver.xpm
+share/qcad/xpm/cadmenuarc.xpm
+share/qcad/xpm/cadmenucam.xpm
+share/qcad/xpm/cadmenucamtool.xpm
+share/qcad/xpm/cadmenucircle.xpm
+share/qcad/xpm/cadmenudim.xpm
+share/qcad/xpm/cadmenuedit.xpm
+share/qcad/xpm/cadmenuhatch.xpm
+share/qcad/xpm/cadmenuline.xpm
+share/qcad/xpm/cadmenumeasure.xpm
+share/qcad/xpm/cadmenupoint.xpm
+share/qcad/xpm/cadmenutag.xpm
+share/qcad/xpm/cadmenutext.xpm
+share/qcad/xpm/cadmenuzoom.xpm
+share/qcad/xpm/cadpointsingle.xpm
+share/qcad/xpm/camauto.xpm
+share/qcad/xpm/camexp.xpm
+share/qcad/xpm/camexpintro.xpm
+share/qcad/xpm/cammanual.xpm
+share/qcad/xpm/color00.xpm
+share/qcad/xpm/color01.xpm
+share/qcad/xpm/color02.xpm
+share/qcad/xpm/color03.xpm
+share/qcad/xpm/color04.xpm
+share/qcad/xpm/color05.xpm
+share/qcad/xpm/color06.xpm
+share/qcad/xpm/color07.xpm
+share/qcad/xpm/color08.xpm
+share/qcad/xpm/color09.xpm
+share/qcad/xpm/color10.xpm
+share/qcad/xpm/color11.xpm
+share/qcad/xpm/color12.xpm
+share/qcad/xpm/color13.xpm
+share/qcad/xpm/color14.xpm
+share/qcad/xpm/color15.xpm
+share/qcad/xpm/confmachgen.xpm
+share/qcad/xpm/copy.xpm
+share/qcad/xpm/cut.xpm
+share/qcad/xpm/deleteitem.xpm
+share/qcad/xpm/document.xpm
+share/qcad/xpm/edit.xpm
+share/qcad/xpm/editattrib.xpm
+share/qcad/xpm/editbevel.xpm
+share/qcad/xpm/editclip.xpm
+share/qcad/xpm/editcopy.xpm
+share/qcad/xpm/editcut.xpm
+share/qcad/xpm/editdelete.xpm
+share/qcad/xpm/editlayer.xpm
+share/qcad/xpm/editmirror.xpm
+share/qcad/xpm/editmove.xpm
+share/qcad/xpm/editmoverot.xpm
+share/qcad/xpm/editpaste.xpm
+share/qcad/xpm/editrotate.xpm
+share/qcad/xpm/editrotrot.xpm
+share/qcad/xpm/editround.xpm
+share/qcad/xpm/editscale.xpm
+share/qcad/xpm/editstretch.xpm
+share/qcad/xpm/edittext.xpm
+share/qcad/xpm/edittextelement.xpm
+share/qcad/xpm/edittrim.xpm
+share/qcad/xpm/edittrim2.xpm
+share/qcad/xpm/edittrim3.xpm
+share/qcad/xpm/editzero.xpm
+share/qcad/xpm/fileclose.xpm
+share/qcad/xpm/filecloseoutput.xpm
+share/qcad/xpm/filenew.xpm
+share/qcad/xpm/fileopen.xpm
+share/qcad/xpm/fileprint.xpm
+share/qcad/xpm/fileprint01.xpm
+share/qcad/xpm/fileprintprev.xpm
+share/qcad/xpm/fileprintsetup.xpm
+share/qcad/xpm/filerecall.xpm
+share/qcad/xpm/filesave.xpm
+share/qcad/xpm/folderclosed.xpm
+share/qcad/xpm/folderopen.xpm
+share/qcad/xpm/forward.xpm
+share/qcad/xpm/helpabout.xpm
+share/qcad/xpm/helpeditlayer.xpm
+share/qcad/xpm/helpeditmirror.xpm
+share/qcad/xpm/helpeditmove.xpm
+share/qcad/xpm/helpeditmoverotate.xpm
+share/qcad/xpm/helpeditrotate.xpm
+share/qcad/xpm/helpeditrotaterotate.xpm
+share/qcad/xpm/helpeditscale.xpm
+share/qcad/xpm/helpmanual.xpm
+share/qcad/xpm/helpsnapkeyar.xpm
+share/qcad/xpm/helpsnapkeyxy.xpm
+share/qcad/xpm/hiddenlayer.xpm
+share/qcad/xpm/info.xpm
+share/qcad/xpm/init.xpm
+share/qcad/xpm/insertitem.xpm
+share/qcad/xpm/layerlist.xpm
+share/qcad/xpm/librarybrowser.xpm
+share/qcad/xpm/lock.xpm
+share/qcad/xpm/lock01.xpm
+share/qcad/xpm/lock02.xpm
+share/qcad/xpm/measureanglelnln.xpm
+share/qcad/xpm/measureeditelement.xpm
+share/qcad/xpm/measurelnpt.xpm
+share/qcad/xpm/measureparallellines.xpm
+share/qcad/xpm/measureptpt.xpm
+share/qcad/xpm/modeabs.xpm
+share/qcad/xpm/modecomparison.xpm
+share/qcad/xpm/modeconstruction.xpm
+share/qcad/xpm/moderel.xpm
+share/qcad/xpm/modesimulation.xpm
+share/qcad/xpm/mouse.xpm
+share/qcad/xpm/paste.xpm
+share/qcad/xpm/qcad.xpm
+share/qcad/xpm/qcadintro.xpm
+share/qcad/xpm/qcadsgi.xpm
+share/qcad/xpm/redo.xpm
+share/qcad/xpm/removeemptylayers.xpm
+share/qcad/xpm/removelayer.xpm
+share/qcad/xpm/renamelayer.xpm
+share/qcad/xpm/ribbonsoft.xpm
+share/qcad/xpm/roundtrimoff.xpm
+share/qcad/xpm/roundtrimon.xpm
+share/qcad/xpm/shaperoundin.xpm
+share/qcad/xpm/shaperoundout.xpm
+share/qcad/xpm/shapestraight.xpm
+share/qcad/xpm/simbroken.xpm
+share/qcad/xpm/simdetails.xpm
+share/qcad/xpm/simgrid.xpm
+share/qcad/xpm/simoptions.xpm
+share/qcad/xpm/simpointing.xpm
+share/qcad/xpm/simrapidmove.xpm
+share/qcad/xpm/simsmooth.xpm
+share/qcad/xpm/simstart.xpm
+share/qcad/xpm/snapautointer.xpm
+share/qcad/xpm/snapcenters.xpm
+share/qcad/xpm/snapdist.xpm
+share/qcad/xpm/snapendpoints.xpm
+share/qcad/xpm/snapfree.xpm
+share/qcad/xpm/snapgrid.xpm
+share/qcad/xpm/snapkeyar.xpm
+share/qcad/xpm/snapkeyxy.xpm
+share/qcad/xpm/snapmaninter.xpm
+share/qcad/xpm/snapmiddles.xpm
+share/qcad/xpm/snaponelement.xpm
+share/qcad/xpm/style00.xpm
+share/qcad/xpm/style01.xpm
+share/qcad/xpm/style02.xpm
+share/qcad/xpm/style03.xpm
+share/qcad/xpm/style04.xpm
+share/qcad/xpm/tagall.xpm
+share/qcad/xpm/tagcontour.xpm
+share/qcad/xpm/tagdoubles.xpm
+share/qcad/xpm/tagelement.xpm
+share/qcad/xpm/tagenough.xpm
+share/qcad/xpm/taginters.xpm
+share/qcad/xpm/taginvert.xpm
+share/qcad/xpm/taglayer.xpm
+share/qcad/xpm/tagnothing.xpm
+share/qcad/xpm/tagrange.xpm
+share/qcad/xpm/tile.xpm
+share/qcad/xpm/undo.xpm
+share/qcad/xpm/untaginters.xpm
+share/qcad/xpm/untagrange.xpm
+share/qcad/xpm/visiblelayer.xpm
+share/qcad/xpm/width00.xpm
+share/qcad/xpm/width01.xpm
+share/qcad/xpm/width02.xpm
+share/qcad/xpm/width03.xpm
+share/qcad/xpm/width04.xpm
+share/qcad/xpm/width05.xpm
+share/qcad/xpm/width06.xpm
+share/qcad/xpm/width07.xpm
+share/qcad/xpm/width08.xpm
+share/qcad/xpm/zero.xpm
+share/qcad/xpm/zerorel.xpm
+share/qcad/xpm/zerorelwhite.xpm
+share/qcad/xpm/zerosmall.xpm
+share/qcad/xpm/zoomauto.xpm
+share/qcad/xpm/zoomdecrease.xpm
+share/qcad/xpm/zoomincrease.xpm
+share/qcad/xpm/zoomone.xpm
+share/qcad/xpm/zoompan.xpm
+share/qcad/xpm/zoomredraw.xpm
+share/qcad/xpm/zoomtagged.xpm
+share/qcad/xpm/zoomtopage.xpm
+share/qcad/xpm/zoomwindow.xpm
+@exec ln -sf %D/share/doc/qcad %D/share/qcad/doc
+@unexec rm -f %D/share/qcad/doc
+@dirrm share/qcad/xpm
+@dirrm share/qcad/messages
+@dirrm share/qcad/hatches
+@dirrm share/qcad/fonts
+@dirrm share/qcad/cur
+@dirrm share/qcad
 @dirrm share/examples/qcad
 @dirrm share/doc/qcad/en/img
 @dirrm share/doc/qcad/en
-@dirrm share/doc/qcad
-@dirrm lib/qcad/xpm
-@dirrm lib/qcad/messages
-@dirrm lib/qcad/hatches
-@dirrm lib/qcad/fonts
-@dirrm lib/qcad/cur
-@dirrm lib/qcad