qcad-2.0.5.0 Community Edition at last imported from wip. While the old

1.5.4 release was something of a toy, QCad was thoroughly reworked for 2.0
and could now be called usable for many practical purposes.

Versions 2.0.4.0 (initially) to 2.0.5.0 have been usable in wip for a bit
more than a year, and so seem ready to import.

  "Yes, that should be fine. Please watch the bulk builds for it and
   try to fix any problems that might appear." -wiz@

Updates to pkglint now produce some new suggestions, which I will make and
commit after confirming they don't break anything; at least this version I
already know to build successfully for me.

1 files changed, 22 insertions, 54 deletions

diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa
index 8a893905555..060796b1d84 100644
--- a/cad/qcad/patches/patch-aa
+++ b/cad/qcad/patches/patch-aa
@@ -1,55 +1,23 @@
-$NetBSD: patch-aa,v 1.9 2006/01/05 16:24:37 joerg Exp $
+$NetBSD: patch-aa,v 1.10 2006/06/15 08:26:58 chap Exp $
 
---- Makefile.orig	2002-09-20 19:26:57.000000000 +0200
-+++ Makefile
-@@ -8,20 +8,20 @@
- 
- ####### Compiler, tools and options
- 
--CC       = gcc
--CXX      = g++
--LEX      = flex
--YACC     = yacc
--CFLAGS   = -pipe -Wall -W -O2  -DQT_NO_DEBUG
--CXXFLAGS = -pipe -Wall -W -O2  -DQT_NO_DEBUG
-+CC       ?= gcc
-+CXX      ?= g++
-+LEX      ?= flex
-+YACC     ?= yacc
-+CFLAGS   += -Wall -W -DQT_NO_DEBUG
-+CXXFLAGS += -Wall -W -DQT_NO_DEBUG
- LEXFLAGS = 
- YACCFLAGS= -d
--INCPATH  = -I$(QTDIR)/include -I$(QTDIR)/mkspecs/linux-g++
-+INCPATH  = -I$(QTDIR)/include -I$(X11BASE)/include
- LINK     = g++
- LFLAGS   = 
--LIBS     = $(SUBLIBS)  -Wl,-rpath,$(QTDIR)/lib  -L$(QTDIR)/lib  -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
--AR       = ar cqs
--RANLIB   = 
-+LIBS     = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-+AR       ?= ar cqs
-+RANLIB   ?= 
- MOC      = $(QTDIR)/bin/moc
- UIC      = $(QTDIR)/bin/uic
- QMAKE    = qmake
-@@ -1766,6 +1766,9 @@ moc_ractzoom.o: moc_ractzoom.cpp ractzoo
- 
- moc_rappwin.o: moc_rappwin.cpp rappwin.h ractiondef.h \
- 		rprgdef.h
-+.if (${MACHINE_ARCH} == "alpha")
-+	$(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rappwin.cpp
-+.endif
- 
- moc_rattribdialog.o: moc_rattribdialog.cpp rattribdialog.h rcombobox.h \
- 		rgraphdef.h \
-@@ -1836,6 +1839,9 @@ moc_rgraphic.o: moc_rgraphic.cpp rgraphi
- 		rtypes.h \
- 		rprgdef.h \
- 		rmathdef.h
-+.if (${MACHINE_ARCH} == "alpha")
-+	$(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rgraphic.cpp
-+.endif
- 
- moc_rgroupbox.o: moc_rgroupbox.cpp rgroupbox.h 
- 
+--- qcad/src/qc_applicationwindow.cpp.orig	2005-11-22 06:49:33.000000000 -0500
++++ qcad/src/qc_applicationwindow.cpp
+@@ -2917,6 +2917,9 @@ void QC_ApplicationWindow::slotHelpAbout
+                        "<br>" +
+                        tr("Modules: %1").arg(modulesString) + "<br>" +
+                        QString("http://www.ribbonsoft.com")
++                       + QString("<hr>")
++                       + QString("<br>Installed with pkgsrc: www.pkgsrc.org")
++                       + QString("<br>use pkg_info for build details")
+ #ifdef QC_ABOUT_ADD_COMPANY
+                        + QString("<br>") + QC_ABOUT_ADD_COMPANY
+                        + QString("</center>")
+@@ -2943,7 +2946,7 @@ void QC_ApplicationWindow::slotHelpManua
+                         RS_SYSTEM->getAppDir().latin1());
+         RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s",
+                         RS_SYSTEM->getAppDir().latin1());
+-        assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this);
++        assistant = new QAssistantClient("@QTDIR@/bin", this);
+ 		connect(assistant, SIGNAL(error(const QString&)), 
+ 			this, SLOT(slotError(const QString&)));
+         QStringList args;