Upgrade to 20080825.

6 files changed, 117 insertions, 168 deletions

diff --git a/cad/kicad/files/patch-3d-viewer_makefile.include b/cad/kicad/files/patch-3d-viewer_makefile.include
index e0ae0ad16521..4e3c2def1346 100644
--- a/cad/kicad/files/patch-3d-viewer_makefile.include
+++ b/cad/kicad/files/patch-3d-viewer_makefile.include
@@ -1,9 +1,9 @@
---- 3d-viewer/makefile.include.orig	Mon Jul  2 19:55:19 2007
-+++ 3d-viewer/makefile.include	Mon Jul  2 19:57:07 2007
+--- 3d-viewer/makefile.include.orig	2007-12-29 20:15:58.000000000 +0100
++++ 3d-viewer/makefile.include	2008-09-20 18:47:08.000000000 +0200
 @@ -1,5 +1,5 @@
  EXTRALIBS =
--EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew
-+EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${LOCALBASE}/include
+-EXTRACPPFLAGS= -I./ -I../include -I../common -I../polygon -I../pcbnew
++EXTRACPPFLAGS= -I./ -I../include -I../common -I../polygon -I../pcbnew -I${LOCALBASE}/include
  
  CPPFLAGS += $(EXTRACPPFLAGS)
  
diff --git a/cad/kicad/files/patch-cvpcb_makefile.include b/cad/kicad/files/patch-cvpcb_makefile.include
index 89f4e6c7c105..428587135cce 100644
--- a/cad/kicad/files/patch-cvpcb_makefile.include
+++ b/cad/kicad/files/patch-cvpcb_makefile.include
@@ -1,11 +1,12 @@
---- 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
+--- cvpcb/makefile.include.orig	2008-08-01 20:41:51.000000000 +0200
++++ cvpcb/makefile.include	2008-09-20 18:51:04.000000000 +0200
+@@ -3,7 +3,8 @@
  
--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${LOCALBASE}/include
- EXTRALIBS = ../common/common.a
+ EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing\
+ 	-I./ -I../cvpcb -I../include -Ibitmaps\
+-	-I../pcbnew -I../3d-viewer -I ../polygon
++	-I../pcbnew -I../3d-viewer -I ../polygon\
++	-I${LOCALBASE}/include
  
- LIBVIEWER3D = ../3d-viewer/3d-viewer.a
+ EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a\
+     ../polygon/lib_polygon.a\
diff --git a/cad/kicad/files/patch-gerbview_makefile.include b/cad/kicad/files/patch-gerbview_makefile.include
index 72f76b601d20..20c7e12ba9c4 100644
--- a/cad/kicad/files/patch-gerbview_makefile.include
+++ b/cad/kicad/files/patch-gerbview_makefile.include
@@ -1,10 +1,11 @@
---- 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${LOCALBASE}/include
+--- gerbview/makefile.include.orig	2008-06-02 13:23:50.000000000 +0200
++++ gerbview/makefile.include	2008-09-20 18:58:29.000000000 +0200
+@@ -4,7 +4,7 @@
+ EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing\
+ 	-I./ -I../gerbview -I../include\
+ 	-I../share -I../pcbnew -I../3d-viewer\
+-	-I../polygon
++	-I../polygon -I${LOCALBASE}/include
  
- #COMMON = pcbnew.h struct.h
  
+ #COMMON = pcbnew.h struct.h
diff --git a/cad/kicad/files/patch-libs.FreeBSD b/cad/kicad/files/patch-libs.FreeBSD
index faea1d41e9a2..9cc864c95e67 100644
--- a/cad/kicad/files/patch-libs.FreeBSD
+++ b/cad/kicad/files/patch-libs.FreeBSD
@@ -1,172 +1,117 @@
---- 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 @@
+--- libs.FreeBSD.orig	2008-09-21 21:25:03.000000000 +0200
++++ libs.FreeBSD	2008-09-21 23:12:06.000000000 +0200
+@@ -18,7 +18,7 @@
+ # STD_INSTALL = 2 is used only to make static link (only useful when kicad run on an other
+ # linux distribution than the distributions used to compil kicad.
+ 
+-STD_INSTALL = 0
++STD_INSTALL = 1
+ 
+ #*******************************************
+ #*******************************************
+@@ -34,17 +34,16 @@
+ endif
  
- 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
+ ifeq ($(STD_INSTALL), 1)                # Used to build linux distribs
+-PREFIX = /usr                           # (can also be /usr/local)
+ KICAD_BIN = $(PREFIX)/bin               # Install main binaries here
+ KICAD_PLUGINS = $(KICAD_BIN)            # Install other binaries here
+ KICAD_DOCS=$(PREFIX)/share/doc/kicad    # Install doc files here
+-KICAD_DATA=$(PREFIX)/share/kicad        # Install libraries and others files here
++# Install libraries and others files here
++KICAD_DATA = $(PREFIX)/share/kicad
+ 
+ else    # Install ALL files in /usr/local/kicad
+ # when STD_INSTALL = 0 or STD_INSTALL = 2
+ # STD_INSTALL = 0 is used to build kicad intalled in /usr/local
+ # STD_INSTALL = 2 is used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local
+-PREFIX = /usr/local/kicad
+ KICAD_BIN = $(PREFIX)/bin
+ KICAD_PLUGINS = $(KICAD_BIN)/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 
+@@ -57,7 +56,7 @@
+ KICAD_TEMPLATE=$(KICAD_DATA)/template
+ 
+ # define compil and link
+-LD  = g++
++LD  = $(CXX)
+ 
+ SRCSUFF = .cpp
+ OBJSUFF = .o
+@@ -71,12 +70,12 @@
+ # 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
+-WXXFLAGS := $(shell wx-config --debug --cxxflags)
+-CPPFLAGS = -Wall -g3 -ggdb3 ${WXXFLAGS} -fno-strict-aliasing -DDEBUG -D_UNICODE
+-LDFLAGS = -g3 -ggdb3 #-v
++WXXFLAGS := `${WX_CONFIG} --debug --cxxflags`
++CPPFLAGS = -Wall -g ${WXXFLAGS} -fno-strict-aliasing -DDEBUG -D_UNICODE
++LDFLAGS = -g #-v
  else
--CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -fno-strict-aliasing
-+CPPFLAGS = -Wall `${WX_CONFIG} --cxxflags` -fno-strict-aliasing
+-WXXFLAGS := $(shell wx-config --cxxflags)
+-CPPFLAGS = -Wall -O2 ${WXXFLAGS} -fno-strict-aliasing -D_UNICODE
++WXXFLAGS := `${WX_CONFIG} --cxxflags`
++CPPFLAGS+= -Wall ${WXXFLAGS} -fno-strict-aliasing -D_UNICODE
  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
+@@ -88,28 +87,28 @@
  
  ifdef KICAD_PYTHON
--PYTHON_VERSION=2.5
+ 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
+ PYLIBS+= -lboost_python-mt
 -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
+ # mesa (free opengl library) libs
 -MESALIBSPATH = /usr/local/lib
++MESALIBSPATH = ${LOCALBASE}/lib
+ 
+ #for static link: add wx gl lib
+-LIBVERSION=`wx-config --release`
 -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
++LIBVERSION=`${WX_CONFIG} --release`
 +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
+ SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a
+ 
+ ifeq ($(DEBUG), 1)
+ # debug wxWidgets
+-WXSYSLIB= `wx-config --debug --libs std`
++WXSYSLIB= `${WX_CONFIG} --debug --libs std`
  else
- # Or Use static link for libsupc++ or libstdc++ (more easy!!)
- LIBSTDC = -lstdc++
+ # or use "standard command" for wxWidgets
+-WXSYSLIB= `wx-config --libs std`
++WXSYSLIB= `${WX_CONFIG} --libs std`
  endif
  
+ # use link static
+@@ -119,16 +118,16 @@
  
--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 \
-+        ${LOCALBASE}/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 \
-+	${LOCALBASE}/lib/libXinerama.a \
-+        ${LOCALBASE}/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
+ # attention a l'ordre des libairies
 -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\
-+LIBS = -L${LOCALBASE}/lib\
- 	$(EXTRALIBS) $(WXSYSLIB)\
- 	$(LIBSTDC) $(PYLIBS)
++LIBS = -L${LOCALBASE}/lib \
+ 	$(EXTRALIBS) $(WXSYSLIB) $(PYLIBS)
  
 -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\
-+LIBS_WITH_GL = -L${LOCALBASE}/lib\
- 	$(EXTRALIBS) $(WXSYSLIB_WITH_GL)\
- 	$(LIBSTDC) $(PYLIBS)
++LIBS_WITH_GL = -L${LOCALBASE}/lib \
+ 	$(EXTRALIBS) $(WXSYSLIB_WITH_GL) $(PYLIBS)
diff --git a/cad/kicad/files/patch-pcbnew__class_module.cpp b/cad/kicad/files/patch-pcbnew__class_module.cpp
index 6ba99924cdf3..ff0cbbf80cb3 100644
--- a/cad/kicad/files/patch-pcbnew__class_module.cpp
+++ b/cad/kicad/files/patch-pcbnew__class_module.cpp
@@ -1,11 +1,11 @@
---- ./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,", ");

+--- ./pcbnew/class_module.cpp.orig	2008-08-09 11:05:42.000000000 +0200
++++ ./pcbnew/class_module.cpp	2008-09-20 22:18:34.000000000 +0200
+@@ -1060,7 +1060,7 @@
+     pos += 6;
+     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/files/patch-pcbnew_makefile.include b/cad/kicad/files/patch-pcbnew_makefile.include
index d680604d742f..0570ec677804 100644
--- a/cad/kicad/files/patch-pcbnew_makefile.include
+++ b/cad/kicad/files/patch-pcbnew_makefile.include
@@ -1,9 +1,11 @@
---- 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${LOCALBASE}/include
+--- pcbnew/makefile.include.orig	2008-07-12 10:25:35.000000000 +0200
++++ pcbnew/makefile.include	2008-09-20 22:20:40.000000000 +0200
+@@ -4,7 +4,7 @@
+             ../polygon/kbool/src/libkbool.a
+ 
+ EXTRACPPFLAGS += -DPCBNEW  -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share\
+-	-I../pcbnew -I../3d-viewer -I../polygon -I/opt/local/include
++	-I../pcbnew -I../3d-viewer -I../polygon -I${LOCALBASE}/include
  
  #COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \
  #		class_edge_mod.h class_equipot.h