From b434324e977451658ea1789fdfcf785ba5008174 Mon Sep 17 00:00:00 2001 From: jtb Date: Mon, 26 Mar 2001 20:53:47 +0000 Subject: New qcad package: QCad is a simple 2D CAD System. With QCad you can easily construct and modify drawings with ISO-texts, dimensions, hatches and many other features and save them as DXF-files. These DXF-files are the interface to many CAD-systems such as AutoCAD and many others. --- cad/qcad/patches/patch-aa | 51 +++++++++++++++++++++++++++++++++++++++++++++++ cad/qcad/patches/patch-ab | 13 ++++++++++++ cad/qcad/patches/patch-ac | 22 ++++++++++++++++++++ cad/qcad/patches/patch-ad | 13 ++++++++++++ cad/qcad/patches/patch-ae | 22 ++++++++++++++++++++ cad/qcad/patches/patch-af | 13 ++++++++++++ 6 files changed, 134 insertions(+) create mode 100644 cad/qcad/patches/patch-aa create mode 100644 cad/qcad/patches/patch-ab create mode 100644 cad/qcad/patches/patch-ac create mode 100644 cad/qcad/patches/patch-ad create mode 100644 cad/qcad/patches/patch-ae create mode 100644 cad/qcad/patches/patch-af (limited to 'cad/qcad/patches') diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa new file mode 100644 index 00000000000..e9d0e329788 --- /dev/null +++ b/cad/qcad/patches/patch-aa @@ -0,0 +1,51 @@ +$NetBSD: patch-aa,v 1.1.1.1 2001/03/26 20:53:53 jtb Exp $ + +--- Makefile.orig Sun Mar 25 11:17:10 2001 ++++ Makefile +@@ -7,13 +7,14 @@ + + ####### Compiler, tools and options + +-CC = g++ +-CFLAGS = -Wall -W -O2 -fno-strength-reduce ++#CC = g++ ++CXXFLAGS+= -fno-strength-reduce ++CFLAGS+= -fno-strength-reduce + INCPATH = -I$(QTDIR)/include +-LINK = g++ +-LFLAGS = -static +-LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 +-MOC = moc ++LINK = $(CXX) ++#LFLAGS = -static ++LIBS = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -Wl,-R${PNG_PREFIX}/lib -L${PNG_PREFIX}/lib -lpng -lz -Wl,-R${JPEG_PREFIX}/lib -L${JPEG_PREFIX}/lib -ljpeg ++MOC = ${QTDIR}/bin/moc + + ####### Files + +@@ -367,13 +368,13 @@ + .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 $@ $< +@@ -386,7 +387,7 @@ + all: $(TARGET) + + $(TARGET): $(OBJECTS) $(OBJMOC) +- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) ++ $(LINK) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) + + moc: $(SRCMOC) + diff --git a/cad/qcad/patches/patch-ab b/cad/qcad/patches/patch-ab new file mode 100644 index 00000000000..864b9e5576b --- /dev/null +++ b/cad/qcad/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1 2001/03/26 20:53:53 jtb Exp $ + +--- rappwin.cpp.orig Tue Feb 20 21:27:18 2001 ++++ rappwin.cpp +@@ -3292,7 +3292,7 @@ + case 0: + if(true) { + if(!QFileInfo(manualStr).exists()) { +- manualStr = " /usr/share/doc/qcad/html/index.html"; ++ manualStr = " @PREFIX@/share/qcad/doc/en/index.html"; + } + + RLOG("\nEXEC:"); diff --git a/cad/qcad/patches/patch-ac b/cad/qcad/patches/patch-ac new file mode 100644 index 00000000000..481c4b1acbb --- /dev/null +++ b/cad/qcad/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1.1.1 2001/03/26 20:53:54 jtb Exp $ + +--- rconfig.cpp.orig Tue Feb 20 21:28:44 2001 ++++ rconfig.cpp +@@ -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/patches/patch-ad b/cad/qcad/patches/patch-ad new file mode 100644 index 00000000000..14e4b355929 --- /dev/null +++ b/cad/qcad/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1 2001/03/26 20:53:54 jtb Exp $ + +--- relement.cpp.orig Tue Feb 20 21:30:40 2001 ++++ relement.cpp +@@ -3681,7 +3681,7 @@ + + // Search pattern in /usr/share//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/patches/patch-ae b/cad/qcad/patches/patch-ae new file mode 100644 index 00000000000..5267e228595 --- /dev/null +++ b/cad/qcad/patches/patch-ae @@ -0,0 +1,22 @@ +$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//...: +- 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//...: +- 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 new file mode 100644 index 00000000000..4b254feb62a --- /dev/null +++ b/cad/qcad/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1 2001/03/26 20:53:54 jtb Exp $ + +--- rfonts.cpp.orig Tue Feb 20 21:32:17 2001 ++++ rfonts.cpp +@@ -68,7 +68,7 @@ + + #ifndef DEF_WINDOWS + // Lookup from /usr/share//fonts: +- lookupFonts( QString("/usr/share/")+DEF_APPNAME_L+"/fonts" ); ++ lookupFonts( QString("@PREFIX@/share/")+DEF_APPNAME_L+"/fonts" ); + + // Lookup from /usr/local//fonts: + lookupFonts( QString("/usr/local/")+DEF_APPNAME_L+"/fonts" ); -- cgit v1.2.3