diff options
author | Tilman Keskinoz <arved@FreeBSD.org> | 2002-11-19 16:43:51 +0000 |
---|---|---|
committer | Tilman Keskinoz <arved@FreeBSD.org> | 2002-11-19 16:43:51 +0000 |
commit | d169e68a8df723ba15177ebe509ffedf037abdf7 (patch) | |
tree | 3ddd771a81fdb7e6e9feeb6a8d46e0cee0642bfd /cad | |
parent | Update to 1.5.4 (diff) |
Remove obsolete patches left over from previous commit
Notes
Notes:
svn path=/head/; revision=70504
Diffstat (limited to 'cad')
-rw-r--r-- | cad/qcad/files/patch-aa | 29 | ||||
-rw-r--r-- | cad/qcad/files/patch-ab | 11 | ||||
-rw-r--r-- | cad/qcad/files/patch-ac | 20 | ||||
-rw-r--r-- | cad/qcad/files/patch-ad | 11 | ||||
-rw-r--r-- | cad/qcad/files/patch-ae | 20 | ||||
-rw-r--r-- | cad/qcad/files/patch-af | 14 | ||||
-rw-r--r-- | cad/qcad2/files/patch-aa | 29 | ||||
-rw-r--r-- | cad/qcad2/files/patch-ab | 11 | ||||
-rw-r--r-- | cad/qcad2/files/patch-ac | 20 | ||||
-rw-r--r-- | cad/qcad2/files/patch-ad | 11 | ||||
-rw-r--r-- | cad/qcad2/files/patch-ae | 20 | ||||
-rw-r--r-- | cad/qcad2/files/patch-af | 14 |
12 files changed, 0 insertions, 210 deletions
diff --git a/cad/qcad/files/patch-aa b/cad/qcad/files/patch-aa deleted file mode 100644 index 70da0384b931..000000000000 --- a/cad/qcad/files/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.orig Mon May 27 00:08:53 2002 -+++ Makefile Thu May 30 02:58:38 2002 -@@ -7,16 +7,16 @@ - - ####### Compiler, tools and options - --CC = gcc --CXX = g++ --CFLAGS = -pipe -Wall -W -O2 -DNO_DEBUG --CXXFLAGS= -pipe -Wall -W -O2 -DNO_DEBUG --INCPATH = -I$(QTDIR)/include --LINK = g++ --LFLAGS = -static --LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm --MOC = $(QTDIR)/bin/moc --UIC = $(QTDIR)/bin/uic -+CC ?= gcc -+CXX ?= g++ -+CFLAGS += -DNO_DEBUG -+CXXFLAGS+= -DNO_DEBUG -+INCPATH = ${QTCPPFLAGS} -+LINK = ${CXX} -+LFLAGS = -+LIBS = ${QTCFGLIBS} ${LIBQT} -+MOC ?= ${X11BASE}/bin/moc2 -+UIC ?= ${X11BASE}/bin/uic - - TAR = tar -cf - GZIP = gzip -9f diff --git a/cad/qcad/files/patch-ab b/cad/qcad/files/patch-ab deleted file mode 100644 index ffb6900b8b8b..000000000000 --- a/cad/qcad/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 0add977c2877..000000000000 --- a/cad/qcad/files/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index 65f540115e0b..000000000000 --- a/cad/qcad/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 3a98da5fee03..000000000000 --- a/cad/qcad/files/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index cdb56ae5b136..000000000000 --- a/cad/qcad/files/patch-af +++ /dev/null @@ -1,14 +0,0 @@ ---- 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/files/patch-aa b/cad/qcad2/files/patch-aa deleted file mode 100644 index 70da0384b931..000000000000 --- a/cad/qcad2/files/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.orig Mon May 27 00:08:53 2002 -+++ Makefile Thu May 30 02:58:38 2002 -@@ -7,16 +7,16 @@ - - ####### Compiler, tools and options - --CC = gcc --CXX = g++ --CFLAGS = -pipe -Wall -W -O2 -DNO_DEBUG --CXXFLAGS= -pipe -Wall -W -O2 -DNO_DEBUG --INCPATH = -I$(QTDIR)/include --LINK = g++ --LFLAGS = -static --LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm --MOC = $(QTDIR)/bin/moc --UIC = $(QTDIR)/bin/uic -+CC ?= gcc -+CXX ?= g++ -+CFLAGS += -DNO_DEBUG -+CXXFLAGS+= -DNO_DEBUG -+INCPATH = ${QTCPPFLAGS} -+LINK = ${CXX} -+LFLAGS = -+LIBS = ${QTCFGLIBS} ${LIBQT} -+MOC ?= ${X11BASE}/bin/moc2 -+UIC ?= ${X11BASE}/bin/uic - - TAR = tar -cf - GZIP = gzip -9f diff --git a/cad/qcad2/files/patch-ab b/cad/qcad2/files/patch-ab deleted file mode 100644 index ffb6900b8b8b..000000000000 --- a/cad/qcad2/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 0add977c2877..000000000000 --- a/cad/qcad2/files/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index 65f540115e0b..000000000000 --- a/cad/qcad2/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 3a98da5fee03..000000000000 --- a/cad/qcad2/files/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index cdb56ae5b136..000000000000 --- a/cad/qcad2/files/patch-af +++ /dev/null @@ -1,14 +0,0 @@ ---- 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" ); |