Upgrade to 20070702.

Changelog at <http://iut-tice.ujf-grenoble.fr/cao/news.txt>.

6 files changed, 109 insertions, 43 deletions

diff --git a/cad/kicad/files/patch-3d-viewer_makefile.include b/cad/kicad/files/patch-3d-viewer_makefile.include
new file mode 100644
index 000000000000..4afef4eda549
--- /dev/null
+++ b/cad/kicad/files/patch-3d-viewer_makefile.include
@@ -0,0 +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
+@@ -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/files/patch-cvpcb_makefile.include b/cad/kicad/files/patch-cvpcb_makefile.include
new file mode 100644
index 000000000000..abe33ee6ad6e
--- /dev/null
+++ b/cad/kicad/files/patch-cvpcb_makefile.include
@@ -0,0 +1,11 @@
+--- 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/files/patch-gerbview_makefile.include b/cad/kicad/files/patch-gerbview_makefile.include
new file mode 100644
index 000000000000..0479d921db13
--- /dev/null
+++ b/cad/kicad/files/patch-gerbview_makefile.include
@@ -0,0 +1,10 @@
+--- 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/files/patch-libs.FreeBSD b/cad/kicad/files/patch-libs.FreeBSD
index 90aa4f91af7d..ceff2834948a 100644
--- a/cad/kicad/files/patch-libs.FreeBSD
+++ b/cad/kicad/files/patch-libs.FreeBSD
@@ -1,26 +1,67 @@
---- libs.FreeBSD.orig	Fri May 25 18:35:26 2007
-+++ libs.FreeBSD	Fri May 25 21:04:46 2007
-@@ -1,6 +1,6 @@
+--- 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
  
- #Configuration for build kicad
--KICAD_BIN = /usr/local/kicad/FreeBSD
-+KICAD_BIN = ${PREFIX}/kicad/FreeBSD
+ 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
  
- SRCSUFF = .cpp
-@@ -14,39 +14,39 @@
- # You must comment or uncomment this line for dynamic or static link
- # dynamic link is less difficult than static link
- # choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system.
+@@ -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.3
+-PYTHON_VERSION=2.5
 -PYLIBS= -L/usr/lib
 -PYLIBS+= -L /usr/include/python
 +PYTHON_VERSION=2.4
@@ -46,7 +87,7 @@
  
  # Use static link for libstdc++.a (sometimes also libsupc++.a)
  # locate libstdc++.a and copy it in kicad_dev/syslibs
- ifdef KICAD_STATIC_LINK
+ 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
@@ -62,8 +103,8 @@
 +LIBREGEX=
  
  # use link static for wxWidgets
- ifdef KICAD_STATIC_LINK
-@@ -54,11 +54,11 @@
+ ifeq ($(KICAD_STATIC_LINK), 1)
+@@ -114,11 +112,11 @@
  	 $(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a
  
  WXSYSLIB= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
@@ -79,7 +120,7 @@
  		-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\
-@@ -67,29 +67,29 @@
+@@ -127,37 +125,37 @@
  
  
  WXSYSLIB_WITH_GL= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
@@ -92,22 +133,32 @@
  	$(LIBS3D)\
 -       /usr/X11R6/lib/libXinerama.a \
 -        /usr/X11R6/lib/libXxf86vm.a \
-+        ${X11BASE}/lib/libXinerama.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)
++	-L${LOCALBASE}/lib $(PYLIBS)
  else
- #or use "standard command" for wxWidgets
+ 
+ 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\
diff --git a/cad/kicad/files/patch-makefile.gtk b/cad/kicad/files/patch-makefile.gtk
deleted file mode 100644
index 4f20fe2db624..000000000000
--- a/cad/kicad/files/patch-makefile.gtk
+++ /dev/null
@@ -1,24 +0,0 @@
---- makefile.gtk.orig	Wed Jun 28 23:32:09 2006
-+++ makefile.gtk	Wed Jun 28 23:35:44 2006
-@@ -1,15 +1,15 @@
- KICAD_SUBDIRS =  common 3d-viewer eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
- KICAD_SUBDIRS_BIN =  eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
- # How to invoke make:
--MAKE = make -k -f makefile.gtk
--MAKE_INSTALL = make -f makefile.gtk install
--MAKE_CLEAN = make -f makefile.gtk clean
-+MAKE_FLAGS = -k -f
-+MAKEFILE = makefile.gtk
-+INSTALL_TARGET = install
- 
- all:
--	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE)); done
-+	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) $(MAKE_FLAGS) $(MAKEFILE)); done
- 
- install:
--	@for d in $(KICAD_SUBDIRS_BIN); do (cd $$d && $(MAKE_INSTALL)); done
-+	@for d in $(KICAD_SUBDIRS_BIN); do (cd $$d && $(MAKE) $(MAKE_FLAGS) $(MAKEFILE) $(INSTALL_TARGET)); done
- 	
- clean:
--	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE_CLEAN)); done
-+	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) $(MAKE_FLAGS) $(MAKEFILE) clean); done
diff --git a/cad/kicad/files/patch-pcbnew_makefile.include b/cad/kicad/files/patch-pcbnew_makefile.include
new file mode 100644
index 000000000000..69b12eb75c10
--- /dev/null
+++ b/cad/kicad/files/patch-pcbnew_makefile.include
@@ -0,0 +1,9 @@
+--- 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