Update to version 1.5.4.

Changes include:

* Updated to use qt3
* New functions
* New language translations
* New fonts added
* Many bug fixes

5 files changed, 65 insertions, 96 deletions

diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa
index 2a437058be8..32448a69b8b 100644
--- a/cad/qcad/patches/patch-aa
+++ b/cad/qcad/patches/patch-aa
@@ -1,71 +1,67 @@
-$NetBSD: patch-aa,v 1.5 2003/03/15 00:25:42 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2003/04/29 21:51:54 jtb Exp $
 
---- Makefile.orig	Sun Mar 25 06:17:10 2001
-+++ Makefile	Fri Mar 14 07:13:56 2003
-@@ -8,11 +8,13 @@
- ####### Compiler, tools and options
- 
--CC	=	g++
--CFLAGS	=	-Wall -W -O2 -fno-strength-reduce
-+#CC	=	g++
-+CXXFLAGS+=	-fno-strength-reduce
-+CFLAGS+=	-fno-strength-reduce
-+CXXFLAGS_NOOPT=	${CXXFLAGS:C/-O[0-9]*//g}
- INCPATH	=	-I$(QTDIR)/include
--LINK	=	g++
--LFLAGS	=	-static
--LIBS	=	-L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
--MOC	=	moc
-+LINK	=	$(CXX)
-+LFLAGS	=	${LDFLAGS}
-+LIBS	=	-L$(QTDIR)/lib -lqt -L${X11BASE}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg
-+MOC	=	$(QTDIR)/bin/moc
- 
- ####### Files
-@@ -368,11 +370,11 @@
- 
- .cpp.o:
--	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+--- Makefile.orig
++++ Makefile
+@@ -8,20 +8,20 @@
  
- .cxx.o:
--	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ ####### Compiler, tools and options
  
- .cc.o:
--	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+-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
++AR       ?= ar cqs
++RANLIB   ?= 
+ MOC      = $(QTDIR)/bin/moc
+ UIC      = $(QTDIR)/bin/uic
+ QMAKE    = qmake
+@@ -1766,10 +1766,16 @@
  
- .C.o:
-@@ -1791,4 +1793,7 @@
- 		ractiondef.h \
+ 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 \
-@@ -1869,4 +1874,7 @@
- 		rfontdialog.h \
- 		rgraphdef.h
+ moc_rattribdialog.o: moc_rattribdialog.cpp rattribdialog.h rcombobox.h \
+ 		rgraphdef.h \
+ 		rprgdef.h
 +.if (${MACHINE_ARCH} == "alpha")
 +	$(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rfontdialog.cpp
 +.endif
  
- moc_rgraphic.o: moc_rgraphic.cpp \
-@@ -1882,4 +1890,7 @@
- 		rmath.h \
+ moc_rbuttongroup.o: moc_rbuttongroup.cpp rbuttongroup.h 
+ 
+@@ -1836,8 +1842,14 @@
+ 		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 \
-@@ -1963,4 +1974,7 @@
- 		rlistboxitem.h \
- 		rwidget.h
+ moc_rgroupbox.o: moc_rgroupbox.cpp rgroupbox.h 
 +.if (${MACHINE_ARCH} == "alpha")
 +	$(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rlayerwidget.cpp
 +.endif
  
- moc_rlibrarybrowser.o: moc_rlibrarybrowser.cpp \
+ moc_rhatchdialog.o: moc_rhatchdialog.cpp rhatchdialog.h rcombobox.h \
+ 		rgraphdef.h \
diff --git a/cad/qcad/patches/patch-ac b/cad/qcad/patches/patch-ac
index 481c4b1acbb..8898a4d5e4a 100644
--- a/cad/qcad/patches/patch-ac
+++ b/cad/qcad/patches/patch-ac
@@ -1,22 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/26 20:53:54 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2003/04/29 21:51:54 jtb Exp $
 
---- rconfig.cpp.orig	Tue Feb 20 21:28:44 2001
-+++ rconfig.cpp
-@@ -178,7 +178,7 @@
-   addSetting( "Print:PrintAdjustmentFactor", "1.0");
+--- rprgdef.h.orig
++++ rprgdef.h
+@@ -28,7 +28,7 @@
+ #define RUNNING_WINDOWS false
+ #define RUNNING_SOLARIS false
+ #define RUNNING_IRIX    false
+-#define DATADIR         "/usr/share"
++#define DATADIR         "@PREFIX@/share"
  
-   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
  
+ #ifdef __FreeBSD__
diff --git a/cad/qcad/patches/patch-ad b/cad/qcad/patches/patch-ad
index 14e4b355929..570562e495f 100644
--- a/cad/qcad/patches/patch-ad
+++ b/cad/qcad/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/26 20:53:54 jtb Exp $
+$NetBSD: patch-ad,v 1.2 2003/04/29 21:51:54 jtb Exp $
 
---- relement.cpp.orig	Tue Feb 20 21:30:40 2001
+--- relement.cpp.orig
 +++ relement.cpp
-@@ -3681,7 +3681,7 @@
+@@ -3683,7 +3683,7 @@
  
    // Search pattern in /usr/share/<proj>/hatches dir:
    if(!QFileInfo(patternPath).exists()) {
diff --git a/cad/qcad/patches/patch-ae b/cad/qcad/patches/patch-ae
deleted file mode 100644
index 5267e228595..00000000000
--- a/cad/qcad/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/03/26 20:53:54 jtb Exp $
-
---- rfile.cpp.orig	Tue Feb 20 21:31:27 2001
-+++ rfile.cpp
-@@ -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/patches/patch-af b/cad/qcad/patches/patch-af
index 4b254feb62a..ef9147ee2ac 100644
--- a/cad/qcad/patches/patch-af
+++ b/cad/qcad/patches/patch-af
@@ -1,13 +1,17 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/26 20:53:54 jtb Exp $
+$NetBSD: patch-af,v 1.2 2003/04/29 21:51:54 jtb Exp $
 
---- rfonts.cpp.orig	Tue Feb 20 21:32:17 2001
+--- rfonts.cpp.orig
 +++ rfonts.cpp
-@@ -68,7 +68,7 @@
+@@ -69,10 +69,10 @@
  
  #ifndef DEF_WINDOWS
    // Lookup from /usr/share/<proj>/fonts:
 -  lookupFonts( QString("/usr/share/")+DEF_APPNAME_L+"/fonts" );
 +  lookupFonts( QString("@PREFIX@/share/")+DEF_APPNAME_L+"/fonts" );
+   
+   // Lookup from /usr/X11R6/<proj>/fonts:
+-  lookupFonts( QString("/usr/X11R6/")+DEF_APPNAME_L+"/fonts" );
++  lookupFonts( QString("@X11BASE@/")+DEF_APPNAME_L+"/fonts" );
  
    // Lookup from /usr/local/<proj>/fonts:
    lookupFonts( QString("/usr/local/")+DEF_APPNAME_L+"/fonts" );