6 files changed, 0 insertions, 222 deletions
diff --git a/cad/kicad-devel/files/patch-3d-viewer_makefile.include b/cad/kicad-devel/files/patch-3d-viewer_makefile.include
deleted file mode 100644
index 4afef4eda549..000000000000
--- a/cad/kicad-devel/files/patch-3d-viewer_makefile.include
+++ /dev/null
@@ -1,9 +0,0 @@
---- 3d-viewer/makefile.include.orig	Mon Jul  2 19:55:19 2007
-+++ 3d-viewer/makefile.include	Mon Jul  2 19:57:07 2007
-@@ -1,5 +1,5 @@
- EXTRALIBS =
--EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew
-+EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${X11BASE}/include
- 
- CPPFLAGS += $(EXTRACPPFLAGS)
- 
diff --git a/cad/kicad-devel/files/patch-cvpcb_makefile.include b/cad/kicad-devel/files/patch-cvpcb_makefile.include
deleted file mode 100644
index abe33ee6ad6e..000000000000
--- a/cad/kicad-devel/files/patch-cvpcb_makefile.include
+++ /dev/null
@@ -1,11 +0,0 @@
---- cvpcb/makefile.include.orig	Mon Jul  2 22:44:14 2007
-+++ cvpcb/makefile.include	Mon Jul  2 22:46:55 2007
-@@ -1,7 +1,7 @@
- # makefile pour cvpcb (mingw)
- OBJSUFF = o
- 
--EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer
-+EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${X11BASE}/include
- EXTRALIBS = ../common/common.a
- 
- LIBVIEWER3D = ../3d-viewer/3d-viewer.a
diff --git a/cad/kicad-devel/files/patch-gerbview_makefile.include b/cad/kicad-devel/files/patch-gerbview_makefile.include
deleted file mode 100644
index 0479d921db13..000000000000
--- a/cad/kicad-devel/files/patch-gerbview_makefile.include
+++ /dev/null
@@ -1,10 +0,0 @@
---- gerbview/makefile.include.orig	Mon Jul  2 22:33:47 2007
-+++ gerbview/makefile.include	Mon Jul  2 22:35:17 2007
-@@ -1,6 +1,6 @@
- EXTRALIBS = ../common/common.a
- EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing -I./ -I../gerbview -I../include\
--	-I../share -I../pcbnew -I../3d-viewer
-+	-I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include
- 
- #COMMON = pcbnew.h struct.h
- 
diff --git a/cad/kicad-devel/files/patch-libs.FreeBSD b/cad/kicad-devel/files/patch-libs.FreeBSD
deleted file mode 100644
index ceff2834948a..000000000000
--- a/cad/kicad-devel/files/patch-libs.FreeBSD
+++ /dev/null
@@ -1,172 +0,0 @@
---- libs.FreeBSD.orig	Thu Jul  5 22:16:04 2007
-+++ libs.FreeBSD	Thu Jul  5 22:19:03 2007
-@@ -13,9 +13,8 @@
- STD_INSTALL = 1
- 
- ifeq ($(STD_INSTALL), 1)
--PREFIX = /usr
--KICAD_BIN = $(PREFIX)/linux
--KICAD_PLUGINS = $(PREFIX)/lib/kicad/plugins
-+KICAD_BIN = $(PREFIX)/kicad/FreeBSD
-+KICAD_PLUGINS = $(PREFIX)/kicad/FreeBSD/plugins
- KICAD_DOCS=$(PREFIX)/share/doc/kicad
- KICAD_DATA=$(PREFIX)/share/kicad
- KICAD_MODULES=$(KICAD_DATA)/modules
-@@ -25,9 +24,8 @@
- 
- else
- # used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0)
--PREFIX = /usr/local/linux
--KICAD_BIN = $(PREFIX)/bin
--KICAD_PLUGINS = $(PREFIX)/linux/plugins
-+KICAD_BIN = ${PREFIX}/kicad/FreeBSD
-+KICAD_PLUGINS = $(PREFIX)/kicad/FreeBSD/plugins
- KICAD_DOCS=$(PREFIX)/help
- KICAD_DATA=$(PREFIX)
- KICAD_MODULES=$(KICAD_DATA)/modules
-@@ -52,10 +50,10 @@
- # common CPPFLAGS to all components, further CPPFLAGS customization in 
- # directory specific makefile.gtk files.
- ifeq ($(DEBUG), 1)
--CPPFLAGS = -Wall -g `wx-config --debug --cxxflags` -fno-strict-aliasing
-+CPPFLAGS = -Wall -g `${WX_CONFIG} --debug --cxxflags` -fno-strict-aliasing
- LDFLAGS = -g #-v
- else
--CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -fno-strict-aliasing
-+CPPFLAGS = -Wall `${WX_CONFIG} --cxxflags` -fno-strict-aliasing
- LDFLAGS = -s #-v
- endif
- 
-@@ -66,47 +64,47 @@
- # You must uncomment these lines for static link (or build with "make -f makefile.gtk KICAD_STATIC_LINK=1")
- # dynamic link is less difficult than static link and is what you would normally want
- # to use if kicad is running only on your system or one with same level of libraries.
--ifndef KICAD_PYTHON
--ifeq ($(STD_INSTALL), 0)
--KICAD_STATIC_LINK = 1
--endif
--endif
-+#ifndef KICAD_PYTHON
-+#ifeq ($(STD_INSTALL), 0)
-+#KICAD_STATIC_LINK = 1
-+#endif
-+#endif
- 
- ifeq ($(KICAD_STATIC_LINK), 1)
--LD  = gcc
-+LD  = ${CC}
- else
--LD  = g++
-+LD  = ${CXX}
- endif
- 
- ifdef KICAD_PYTHON
--PYTHON_VERSION=2.5
--PYLIBS= -L/usr/lib
--PYLIBS+= -L /usr/include/python
-+PYTHON_VERSION=2.4
-+PYLIBS= -L${LOCALBASE}/lib
-+PYLIBS+= -L${LOCALBASE}/lib/python$(PYTHON_VERSION)
- PYLIBS+= -lpython$(PYTHON_VERSION)
- PYLIBS+= -lboost_python
--EXTRACPPFLAGS+=-I /usr/include/python$(PYTHON_VERSION) -DKICAD_PYTHON -fno-strict-aliasing
-+EXTRACPPFLAGS+=-I ${LOCALBASE}/python$(PYTHON_VERSION) -DKICAD_PYTHON -fno-strict-aliasing
- endif
- 
- # path and version definition for wxWidgets and mesa libs
--MESALIBSPATH = /usr/local/lib
--WXPATH = `wx-config --prefix`/lib
--PREFIX_WX_LIBS = lib`wx-config --basename`
--SUFFIX_WX_LIBSTD = `wx-config --utility=`
--SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a
-+MESALIBSPATH = ${LOCALBASE}/lib
-+WXPATH = `${WX_CONFIG} --prefix`/lib
-+PREFIX_WX_LIBS = lib`${WX_CONFIG} --basename`
-+SUFFIX_WX_LIBSTD = `${WX_CONFIG} --utility=`
-+SUFFIX_WX_LIBGL = _gl-$(LIBVERSION)
- 
- # Use static link for libstdc++.a (sometimes also libsupc++.a)
- # locate libstdc++.a and copy it in kicad_dev/syslibs
- ifeq ($(KICAD_STATIC_LINK), 1)
- #define path for a copy of libstdc++.a or/and libsupc++.a:
--LIBSTDC = ../syslibs/libstdc++.a
-+LIBSTDC = /usr/lib/libstdc++.a
- else
- # Or Use static link for libsupc++ or libstdc++ (more easy!!)
- LIBSTDC = -lstdc++
- endif
- 
- 
--LIBVERSION=`wx-config --release`
--LIBREGEX=$(WXPATH)/libwxregexu-$(LIBVERSION).a
-+LIBVERSION=`${WX_CONFIG} --release`
-+LIBREGEX=
- 
- # use link static for wxWidgets
- ifeq ($(KICAD_STATIC_LINK), 1)
-@@ -114,11 +112,11 @@
- 	 $(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a
- 
- WXSYSLIB= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
--	$(WXPATH)/libwxpng-$(LIBVERSION).a\
--	$(WXPATH)/libwxjpeg-$(LIBVERSION).a\
--	$(WXPATH)/libwxzlib-$(LIBVERSION).a\
-+	-lpng\
-+	-ljpeg\
-+	-lz\
- 	$(LIBREGEX)\
--        /usr/X11R6/lib/libXinerama.a \
-+        ${X11BASE}/lib/libXinerama.a \
- 		-lgtk-x11-2.0 -lgdk-x11-2.0 \
-         -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\
-         -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\
-@@ -127,37 +125,37 @@
- 
- 
- WXSYSLIB_WITH_GL= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
--	$(WXPATH)/libwxpng-$(LIBVERSION).a\
--	$(WXPATH)/libwxjpeg-$(LIBVERSION).a\
--	$(WXPATH)/libwxzlib-$(LIBVERSION).a\
-+	-lpng\
-+	-ljpeg\
-+	-lz\
- 	$(LIBS3D)\
--       /usr/X11R6/lib/libXinerama.a \
--        /usr/X11R6/lib/libXxf86vm.a \
-+	${X11BASE}/lib/libXinerama.a \
-+        ${X11BASE}/lib/libXxf86vm.a \
- 		-lgtk-x11-2.0 -lgdk-x11-2.0 \
-         -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\
-         -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\
-         -lglib-2.0 -lpangoft2-1.0 -lSM\
--       -L/usr/lib $(PYLIBS)
-+	-L${LOCALBASE}/lib $(PYLIBS)
- else
- 
- ifeq ($(DEBUG), 1)
- # debug wxWidgets
--WXSYSLIB= `wx-config --debug --libs std`
--WXSYSLIB_WITH_GL= `wx-config --debug --libs std,gl`
-+WXSYSLIB= `${WX_CONFIG} --debug --libs std`
-+WXSYSLIB_WITH_GL= `${WX_CONFIG} --debug --libs std,gl`
- else
- # or use "standard command" for wxWidgets
--WXSYSLIB= `wx-config --libs std`
--WXSYSLIB_WITH_GL= `wx-config --libs std,gl`
-+WXSYSLIB= `${WX_CONFIG} --libs std`
-+WXSYSLIB_WITH_GL= `${WX_CONFIG} --libs std,gl`
- endif
- 
- endif
- 
- 
- # attention � l'ordre des libairies
--LIBS = -L/usr/local/lib -L/usr/X11R6/lib\
-+LIBS = -L${LOCALBASE}/lib -L${X11BASE}/lib\
- 	$(EXTRALIBS) $(WXSYSLIB)\
- 	$(LIBSTDC) $(PYLIBS)
- 
--LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\
-+LIBS_WITH_GL = -L${LOCALBASE}/lib -L${X11BASE}/lib\
- 	$(EXTRALIBS) $(WXSYSLIB_WITH_GL)\
- 	$(LIBSTDC) $(PYLIBS)
diff --git a/cad/kicad-devel/files/patch-pcbnew__class_module.cpp b/cad/kicad-devel/files/patch-pcbnew__class_module.cpp
deleted file mode 100644
index 6ba99924cdf3..000000000000
--- a/cad/kicad-devel/files/patch-pcbnew__class_module.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./pcbnew/class_module.cpp.orig	Mon Dec  5 09:47:56 2005
-+++ ./pcbnew/class_module.cpp	Sun Dec 25 16:55:30 2005
-@@ -1020,7 +1020,7 @@
- 	pos += 14;
- 	if ( flag )	// Affichage date de modification (utile en Module Editor)
- 	{
--		strcpy(Line, ctime(&m_LastEdit_Time));
-+		strcpy(Line, ctime((time_t*) &m_LastEdit_Time));
- 		strtok(Line," \n\r");
- 		strcpy( bufcar, strtok(NULL," \n\r") ); strcat(bufcar," ");
- 		strcat( bufcar, strtok(NULL," \n\r") ); strcat(bufcar,", ");
diff --git a/cad/kicad-devel/files/patch-pcbnew_makefile.include b/cad/kicad-devel/files/patch-pcbnew_makefile.include
deleted file mode 100644
index 69b12eb75c10..000000000000
--- a/cad/kicad-devel/files/patch-pcbnew_makefile.include
+++ /dev/null
@@ -1,9 +0,0 @@
---- pcbnew/makefile.include.orig	Mon Jul  2 22:44:14 2007
-+++ pcbnew/makefile.include	Mon Jul  2 22:45:08 2007
-@@ -1,5 +1,5 @@
- EXTRALIBS = ../common/common.a
--EXTRACPPFLAGS += -DPCBNEW  -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer
-+EXTRACPPFLAGS += -DPCBNEW  -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include
- 
- #COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \
- #		class_edge_mod.h class_equipot.h