- update kicad to 20100505

* update homepage * re-order Makefile * various other tweaks/fixes
2011-05-03 18:31:14 +00:00 · 2011-05-03 18:31:14 +00:00 · b3c1964bf9
commit b3c1964bf9
parent 521b15376a
20 changed files with 308 additions and 1319 deletions
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@ -1,93 +1,77 @@
-# $OpenBSD: Makefile,v 1.11 2010/11/15 00:22:49 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2011/05/03 18:31:14 jasper Exp $

-COMMENT-main=	circuit drawing and schematic capture
+COMMENT-main=	schematic and PCB editing software
 COMMENT-docs=	documentation for the kicad library of components

-V=		2007-01-15
-DISTNAME=	kicad-sources-${V}
-PKGNAME=	kicad-20070115
-PKGNAME-main=	kicad-20070115
-REVISION-main=	0
-PKGNAME-docs=	kicad-docs-20070115
+V=		2010-05-05
+S=		BZR2356-stable
+DISTNAME=	kicad-sources-${V}-${S}
+PKGNAME=	kicad-${V:S/-//g}
+PKGNAME-main=	kicad-${V:S/-//g}
+PKGNAME-docs=	kicad-docs-${V:S/-//g}

 CATEGORIES=	cad

-HOMEPAGE=	http://www.lis.inpg.fr/realise_au_lis/kicad/
+HOMEPAGE=	http://kicad.sourceforge.net/

-# GPL 
+# LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=	ftp://iut-tice.ujf-grenoble.fr/cao/sources/
-MASTER_SITES0=	ftp://iut-tice.ujf-grenoble.fr/cao/
+MASTER_SITES=	ftp://iut-tice.ujf-grenoble.fr/cao/

-MODULES=	devel/gettext
+DOCDIST=	doc_components-${V}-${S}.tgz
+DISTFILES=	${DISTNAME}.zip ${DOCDIST}
+EXTRACT_ONLY=	${DISTNAME}.zip
+DIST_SUBDIR=	kicad

 MULTI_PACKAGES=	-main -docs

-WANTLIB-main=	${WANTLIB} GL GLU c m pthread stdc++
+MODULES=	devel/cmake \
+		devel/gettext
+
+BUILD_DEPENDS=		misc/shared-mime-info
+RUN_DEPENDS-main=	cad/kicad-library \
+			devel/desktop-file-utils \
+			misc/shared-mime-info
+
+LIB_DEPENDS=	x11/wxWidgets
+
+WANTLIB-main += ${WANTLIB} GL GLU c m pthread stdc++
+WANTLIB-main += ICE SM X11 Xext wx_base wx_base_net wx_gtk2_adv wx_gtk2_aui
+WANTLIB-main += wx_gtk2_core wx_gtk2_gl wx_gtk2_html z
 WANTLIB-docs=
 RUN_DEPENDS-docs=
 LIB_DEPENDS-docs=
 PKG_ARCH-docs=	*

-LIB_DEPENDS = x11/wxWidgets
-WANTLIB-main += wx_base wx_base_net wx_base_odbc wx_base_xml
-WANTLIB-main += wx_gtk2_adv wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_gl 
-WANTLIB-main += wx_gtk2_html wx_gtk2_qa wx_gtk2_xrc wx_gtk2_aui 
-WANTLIB-main += wx_gtk2_richtext
-
-DOCDIST=	doc_components-2006-12-08.zip
-PKGDIST=	kicad-${V}.tgz
-DISTFILES=	${DISTNAME}.zip ${PKGDIST}:0 ${DOCDIST}:0
-EXTRACT_ONLY=	${DISTNAME}.zip ${PKGDIST}
-DIST_SUBDIR=	kicad
-
-WRKDIST=	${WRKDIR}/kicad-dev
-MAKE_FILE=	makefile.gtk
-USE_GMAKE=	Yes
+WRKDIST=	${WRKDIR}/kicad-sources-${V}-${S:S/-stable//}

 MAKE_FLAGS=	CC=${CXX} CXX=${CXX} LD=${CXX} \
 		CXXFLAGS="${CXXFLAGS}" X11BASE=${X11BASE}

-KICADBIN=	eeschema pcbnew cvpcb kicad gerbview
-LANGS=		de es fr hu it ko pl pt sl
-
-pre-patch:
-	@find ${WRKSRC} -type f -exec perl -pi -e 's/\r$$//' {} \;
+LANGS=		ca cs de es fi fr hu it ko nl pl pt ru sl sv zh_CN

 pre-configure:
-	@perl -pi -e 's,/usr/bin,${LOCALBASE}/bin,g' \
-		${WRKSRC}/common/eda_doc.cpp
-	@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
-		${WRKSRC}/common/edaappl.cpp ${WRKSRC}/common/gestfich.cpp
+	${SUBST_CMD} ${WRKSRC}/CMakeLists.txt ${WRKSRC}/common/gestfich.cpp

 post-build:
 .for l in ${LANGS}
-	cd ${WRKDIR}/kicad/internat/$l && rm -f *.mo && \
+	cd ${WRKSRC}/internat/$l && rm -f *.mo && \
 		msgfmt -o kicad.mo kicad.po
 .endfor

-do-install:
-.for k in ${KICADBIN}
-	${INSTALL_PROGRAM} ${WRKBUILD}/$k/$k ${PREFIX}/bin
-.endfor
-	${INSTALL_PROGRAM} ${WRKBUILD}/eeschema/plugins/netlist_form_pads-pcb \
-		${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kicad
-	cd ${WRKDIR}/kicad && tar -cf - help library modules | tar \
-		-C ${PREFIX}/share/kicad -xf -
-	rmdir ${PREFIX}/share/kicad/modules/packages3d/conn_HExx
+post-install:
 .for l in ${LANGS}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/locale/$l/LC_MESSAGES
-	${INSTALL_DATA} ${WRKDIR}/kicad/internat/$l/kicad.mo \
+	${INSTALL_DATA} ${WRKSRC}/internat/$l/kicad.mo \
 		${PREFIX}/share/locale/$l/LC_MESSAGES
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kicad/library
 	cd ${PREFIX}/share/doc/kicad/library && \
-		unzip -q ${FULLDISTDIR}/${DOCDIST}
+		tar -xzf ${FULLDISTDIR}/${DOCDIST}
 	cd ${PREFIX}/share/doc/kicad/library/doc && \
 		mv analog_mux\&switches analog_mux_and_switches
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/kicad \
--- a/cad/kicad/distinfo
+++ b/cad/kicad/distinfo
@ -1,15 +1,10 @@
-MD5 (kicad/doc_components-2006-12-08.zip) = I7dvQYEQCXzwNH1qLoG0AQ==
-MD5 (kicad/kicad-2007-01-15.tgz) = 0VMMRKRMYgiU/wyY/VgqAg==
-MD5 (kicad/kicad-sources-2007-01-15.zip) = YaC6YVtnrzE9EhTtGj1aZg==
-RMD160 (kicad/doc_components-2006-12-08.zip) = kyGEEcen/3r5kp4EgviCCIjpbo4=
-RMD160 (kicad/kicad-2007-01-15.tgz) = EiMTqEereLyOfHlpVrffhOjHidc=
-RMD160 (kicad/kicad-sources-2007-01-15.zip) = hXTZhj+7QEcA0dIJqk0jp5DWgqc=
-SHA1 (kicad/doc_components-2006-12-08.zip) = eMz30Kj6jwN9kwhlsUcyVKFVSc0=
-SHA1 (kicad/kicad-2007-01-15.tgz) = NHMkuvlD77jqbCGnCf76ERmqARk=
-SHA1 (kicad/kicad-sources-2007-01-15.zip) = cxenH5VKhz+ybYjH3lwsjVaadok=
-SHA256 (kicad/doc_components-2006-12-08.zip) = aWTiEChBT5WkfGc2ubUXQJPjG0JOKqSwODiaf/4B6HU=
-SHA256 (kicad/kicad-2007-01-15.tgz) = EKKtpZXdhNVPvgE/MjCJSZmZZmCRZpjq54dz/RaLS6E=
-SHA256 (kicad/kicad-sources-2007-01-15.zip) = 9Ajeyhk7Bxa4IqAPwWHmkZL829AQcRqMlX/fZh0O2dk=
-SIZE (kicad/doc_components-2006-12-08.zip) = 59104238
-SIZE (kicad/kicad-2007-01-15.tgz) = 61333975
-SIZE (kicad/kicad-sources-2007-01-15.zip) = 1666781
+MD5 (kicad/doc_components-2010-05-05-BZR2356-stable.tgz) = rHIAV8mlnCIHjlHEawCLBQ==
+MD5 (kicad/kicad-sources-2010-05-05-BZR2356-stable.zip) = KxvwzsnMMG3l9i/1Jh2qrw==
+RMD160 (kicad/doc_components-2010-05-05-BZR2356-stable.tgz) = u+IgX3rm6BnSwY3PATO4wZw4GW4=
+RMD160 (kicad/kicad-sources-2010-05-05-BZR2356-stable.zip) = +I0cDF949dfLg4u3zuDEPo8P/fE=
+SHA1 (kicad/doc_components-2010-05-05-BZR2356-stable.tgz) = heWIPnl22QUBr8Bv6rhzuP5wdJ8=
+SHA1 (kicad/kicad-sources-2010-05-05-BZR2356-stable.zip) = 8xIzw3d8+isiaZlaWhOgAcXvHgo=
+SHA256 (kicad/doc_components-2010-05-05-BZR2356-stable.tgz) = o96RekA7+5DjZdxtSPtdpKyXiX4DVDlu/fFMN6fOiPo=
+SHA256 (kicad/kicad-sources-2010-05-05-BZR2356-stable.zip) = 9SjIPgvzUXayYvZdrujgtDjLS/X+KTHK70U7dd9pghc=
+SIZE (kicad/doc_components-2010-05-05-BZR2356-stable.tgz) = 71194041
+SIZE (kicad/kicad-sources-2010-05-05-BZR2356-stable.zip) = 9242459
--- a/cad/kicad/patches/patch-3d-viewer_makefile_gtk
+++ b/cad/kicad/patches/patch-3d-viewer_makefile_gtk
@ -1,13 +0,0 @@
-$OpenBSD: patch-3d-viewer_makefile_gtk,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- 3d-viewer/makefile.gtk.orig	Thu Jan  4 14:25:38 2007
-+++ 3d-viewer/makefile.gtk	Thu Jan  4 14:26:13 2007
-@@ -3,7 +3,8 @@ CC = gcc
- 
- # Compiler flags.
- 
-CPPFLAGS =  -Wall -O2 -DPCBNEW  -I../pcbnew -I ../include -I../common\
-+CPPFLAGS =  -Wall -DPCBNEW  -I../pcbnew -I ../include -I../common\
-+	    -I${X11BASE}/include \
- 	  `wx-config --cxxflags`
- 
- 
--- a/cad/kicad/patches/patch-CMakeLists_txt
+++ b/cad/kicad/patches/patch-CMakeLists_txt
@ -0,0 +1,29 @@
+$OpenBSD: patch-CMakeLists_txt,v 1.1 2011/05/03 18:31:14 jasper Exp $
+
+Don't use "-isystem /usr/..." but regular "-I/usr/..."
+Prevents "error: template with C linkage" errors.
+
+http://www.mail-archive.com/cmake@cmake.org/msg13226.html
+
+--- CMakeLists.txt.orig	Thu Apr 22 19:48:48 2010
+++ CMakeLists.txt	Fri Apr 29 13:41:49 2011
+@@ -6,6 +6,8 @@ else(WIN32)
+     cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
+ endif(WIN32)
+ 
+SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
+
+ # Path to local CMake modules.
+ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
+ 
+@@ -163,7 +165,9 @@ endif(EXISTS ${CMAKE_SOURCE_DIR}/include/config.h)
+ 
+ 
+ # Include paths.
+-include_directories(${CMAKE_SOURCE_DIR}/include
+include_directories(${X11BASE}/include/
+		    ${LOCALBASE}/include/
+		    ${CMAKE_SOURCE_DIR}/include
+                     ${CMAKE_SOURCE_DIR}/share
+                     ${CMAKE_BINARY_DIR})
+ 
--- a/cad/kicad/patches/patch-common_edaappl_cpp
+++ b/cad/kicad/patches/patch-common_edaappl_cpp
@ -1,19 +0,0 @@
-$OpenBSD: patch-common_edaappl_cpp,v 1.2 2007/04/16 14:13:14 steven Exp $
--- common/edaappl.cpp.orig	Mon Apr 16 17:05:39 2007
-+++ common/edaappl.cpp	Mon Apr 16 17:05:48 2007
-@@ -359,13 +359,13 @@ bool WinEDA_App::SetLanguage(bool first_time)
- */
- {
- wxString DictionaryName( wxT("kicad"));	// dictionary file name without extend (full name is kicad.mo)
-wxString BaseDictionaryPath( wxT("internat"));	// Real path is kicad/internat/xx_XX or kicad/internat/xx
-+wxString BaseDictionaryPath( wxT("!!LOCALBASE!!/share/locale"));	// Real path is kicad/internat/xx_XX or kicad/internat/xx
- wxString dic_path;
- 
- 	if ( m_Locale != NULL ) delete m_Locale;
- 	m_Locale = new wxLocale();
- 	m_Locale->Init(m_LanguageId);
-	dic_path = ReturnKicadDatasPath() + BaseDictionaryPath;
-+	dic_path = BaseDictionaryPath;
- 	m_Locale->AddCatalogLookupPathPrefix(dic_path);
- 
- 	if ( ! first_time )
--- a/cad/kicad/patches/patch-common_gestfich_cpp
+++ b/cad/kicad/patches/patch-common_gestfich_cpp
@ -1,34 +1,30 @@
-$OpenBSD: patch-common_gestfich_cpp,v 1.2 2007/04/16 14:13:14 steven Exp $
--- common/gestfich.cpp.orig	Mon Apr 16 17:05:39 2007
-+++ common/gestfich.cpp	Mon Apr 16 17:05:48 2007
-@@ -37,8 +37,7 @@ static wxString s_HelpPathList[] = {
- 	wxT("c:/kicad/help/"),
- 	wxT("d:/kicad/help/"),
+$OpenBSD: patch-common_gestfich_cpp,v 1.3 2011/05/03 18:31:14 jasper Exp $
+--- common/gestfich.cpp.orig	Sat Aug 21 11:43:24 2010
+++ common/gestfich.cpp	Sat Aug 21 11:44:44 2010
+@@ -63,7 +63,7 @@ static wxString    s_HelpPathList[] = {
 #else
-	wxT("/usr/local/kicad/help/"),
-	wxT("/usr/share/doc/kicad/"),
-+	wxT("!!LOCALBASE!!/share/kicad/help/"),
- #endif
- 	wxT("end_list")	// End of list symbol, do not change
- };
-@@ -49,8 +48,7 @@ static wxString s_KicadDataPathList[] = {
- 	wxT("c:/kicad/"),
- 	wxT("d:/kicad/"),
+     wxT( "/usr/share/doc/kicad/help/" ),
+     wxT( "/usr/local/share/doc/kicad/help/" ),
+-    wxT( "/usr/local/kicad/doc/help/" ),    // default install for "universal
+    wxT( "${LOCALBASE}/share/kicad/help/" ),    // default install for "universal
+                                             // tarballs" and build for a server
+                                             // (new)
+     wxT( "/usr/local/kicad/help/" ),        // default install for "universal
+@@ -86,7 +86,7 @@ static wxString    s_KicadDataPathList[] = {
+     wxT( "c:/Program Files/kicad/" ),
+     wxT( "d:/Program Files/kicad/" ),
 #else
-	wxT("/usr/local/kicad/"),
-	wxT("/usr/share/kicad/"),
-+	wxT("!!LOCALBASE!!/share/kicad/"),
- #endif
- 	wxT("end_list")	// End of list symbol, do not change
- };
-@@ -61,9 +59,7 @@ static wxString s_KicadBinaryPathList[] = {
- 	wxT("c:/kicad/winexe/"),
- 	wxT("d:/kicad/winexe/"),
+-    wxT( "/usr/share/kicad/" ),
+    wxT( "{LOCALBASE}/share/kicad/" ),
+     wxT( "/usr/local/share/kicad/" ),
+     wxT( "/usr/local/kicad/share/" ),   // default data path for "universal
+                                         // tarballs" and build for a server
+@@ -106,7 +106,7 @@ static wxString    s_KicadBinaryPathList[] = {
+     wxT( "c:/Program Files/kicad/bin/" ),
+     wxT( "d:/Program Files/kicad/bin/" ),
 #else
-	wxT("/usr/local/kicad/linux/"),
-	wxT("/usr/local/bin/"),
-	wxT("/usr/bin/"),
-+	wxT("!!LOCALBASE!!/bin/"),
+-    wxT( "/usr/bin/" ),
+    wxT( "{LOCALBASE}/bin/" ),
+     wxT( "/usr/local/bin/" ),
+     wxT( "/usr/local/kicad/bin/" ),
 #endif
- 	wxT("end_list")	// End of list symbol, do not change
- };
--- a/cad/kicad/patches/patch-common_makefile_gtk
+++ b/cad/kicad/patches/patch-common_makefile_gtk
@ -1,21 +0,0 @@
-$OpenBSD: patch-common_makefile_gtk,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- common/makefile.gtk.orig	Thu Jan  4 18:32:19 2007
-+++ common/makefile.gtk	Thu Jan  4 18:53:14 2007
-@@ -2,7 +2,7 @@
- CC = gcc
- 
- # Compiler flags.
-CPPFLAGS =  -Wall -O2 -I./ -I../include `wx-config --cflags`
-+CPPFLAGS =  -Wall -I./ -I../include `wx-config --cflags`
- 
- EDACPPFLAGS = $(CPPFLAGS)
- 
-@@ -11,7 +11,7 @@ all: common.a
- include makefile.include
- 
- CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-+EDACPPFLAGS = $(CPPFLAGS) $(CXXFLAGS)
- 
- 
- common.a: $(OBJECTS) makefile.gtk makefile.include
--- a/cad/kicad/patches/patch-cvpcb_makefile_gtk
+++ b/cad/kicad/patches/patch-cvpcb_makefile_gtk
@ -1,21 +0,0 @@
-$OpenBSD: patch-cvpcb_makefile_gtk,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- cvpcb/makefile.gtk.orig	Thu Jan  4 18:59:05 2007
-+++ cvpcb/makefile.gtk	Thu Jan  4 19:29:38 2007
-@@ -8,7 +8,7 @@ FINAL = 1
- 
- # Compiler flags.
- 
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags`
-+CPPFLAGS = -Wall `wx-config --cxxflags` -I${X11BASE}/include
- 
- LDFLAGS =  -s
- 
-@@ -24,7 +24,7 @@ all: $(TARGET)
- include makefile.include
- 
- CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-+EDACPPFLAGS = $(CPPFLAGS) $(CXXFLAGS)
- 
- 
- $(TARGET):	$(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux $(LIBVIEWER3D)
--- a/cad/kicad/patches/patch-eeschema_makefile_gtk
+++ b/cad/kicad/patches/patch-eeschema_makefile_gtk
@ -1,28 +0,0 @@
-$OpenBSD: patch-eeschema_makefile_gtk,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- eeschema/makefile.gtk.orig	Thu Jan  4 15:04:43 2007
-+++ eeschema/makefile.gtk	Thu Jan  4 17:19:49 2007
-@@ -13,7 +13,7 @@ include ../libs.linux
- TARGET = eeschema
- 
- 
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags`
-+CPPFLAGS = -Wall `wx-config --cxxflags`
- 
- 
- all: $(TARGET)
-@@ -21,13 +21,13 @@ all: $(TARGET)
- include makefile.include
- 
- CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-+EDACPPFLAGS = $(CPPFLAGS) $(CXXFLAGS)
- 
- $(TARGET):  $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux
- 	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBS) -o $(TARGET)
- 
- netlist_form_pads-pcb: plugins/netlist_form_pads-pcb.cpp makefile.gtk
-	gcc -D__UNIX__ -Wall plugins/netlist_form_pads-pcb.cpp $(LIBSTDC) -o netlist_form_pads-pcb
-+	$(CXX) -D__UNIX__ -Wall $(CXXFLAGS) plugins/netlist_form_pads-pcb.cpp $(LIBSTDC) -o netlist_form_pads-pcb
- 
- 
- install:
--- a/cad/kicad/patches/patch-eeschema_plugins_makefile_gtk
+++ b/cad/kicad/patches/patch-eeschema_plugins_makefile_gtk
@ -1,12 +0,0 @@
-$OpenBSD: patch-eeschema_plugins_makefile_gtk,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- eeschema/plugins/makefile.gtk.orig	Thu Jan  4 16:52:48 2007
-+++ eeschema/plugins/makefile.gtk	Thu Jan  4 16:53:25 2007
-@@ -16,7 +16,7 @@ endif
- all: netlist_form_pads-pcb
- 
- netlist_form_pads-pcb: netlist_form_pads-pcb.cpp makefile.gtk
-	gcc -D__UNIX__  -Wall netlist_form_pads-pcb.cpp -o netlist_form_pads-pcb $(LIBSTDC)
-+	$(CXX) -D__UNIX__ $(CXXFLAGS) -Wall netlist_form_pads-pcb.cpp -o netlist_form_pads-pcb $(LIBSTDC) -lm
- 
- install:
- 	cp -v netlist_form_pads-pcb $(KICAD_BIN)/plugins/
--- a/cad/kicad/patches/patch-gerbview_makefile_gtk
+++ b/cad/kicad/patches/patch-gerbview_makefile_gtk
@ -1,12 +0,0 @@
-$OpenBSD: patch-gerbview_makefile_gtk,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- gerbview/makefile.gtk.orig	Thu Jan  4 14:33:58 2007
-+++ gerbview/makefile.gtk	Thu Jan  4 15:04:03 2007
-@@ -3,7 +3,7 @@ CC = gcc
- LD = gcc
- 
- # Compiler flags.
-CPPFLAGS =  -Wall -O2 `wx-config --cxxflags`
-+CPPFLAGS =  -Wall -I${X11BASE}/include `wx-config --cxxflags`
- 
- LDFLAGS = -s
- 
--- a/cad/kicad/patches/patch-include_fctsys_h
+++ b/cad/kicad/patches/patch-include_fctsys_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-include_fctsys_h,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- include/fctsys.h.orig	Wed Jan  3 18:13:45 2007
-+++ include/fctsys.h	Wed Jan  3 18:14:06 2007
-@@ -18,7 +18,7 @@
- #endif
- 
- #include <stdio.h>
-#ifdef __FreeBSD__
-+#if defined(__OpenBSD__) || defined(__FreeBSD__)
- #include <stdlib.h>
- #else
- # ifndef __DARWIN__
--- a/cad/kicad/patches/patch-kicad_makefile_gtk
+++ b/cad/kicad/patches/patch-kicad_makefile_gtk
@ -1,12 +0,0 @@
-$OpenBSD: patch-kicad_makefile_gtk,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- kicad/makefile.gtk.orig	Thu Jan  4 14:32:49 2007
-+++ kicad/makefile.gtk	Thu Jan  4 14:32:54 2007
-@@ -7,7 +7,7 @@ LD = gcc
- FINAL = 1
- 
- # Compiler flags.
-CPPFLAGS =  -Wall -O2 `wx-config --cxxflags`
-+CPPFLAGS =  -Wall `wx-config --cxxflags`
- LDFLAGS =  -s
- 
- include ../libs.linux
--- a/cad/kicad/patches/patch-libs_linux
+++ b/cad/kicad/patches/patch-libs_linux
@ -1,12 +0,0 @@
-$OpenBSD: patch-libs_linux,v 1.1 2007/02/06 07:16:34 steven Exp $
--- libs.linux.orig	Sat Feb  3 13:03:16 2007
-+++ libs.linux	Sat Feb  3 13:03:24 2007
-@@ -11,7 +11,7 @@ FINAL = 1
- # 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.
-KICAD_STATIC_LINK = 1
-+#KICAD_STATIC_LINK = 1
- 
- # path and version definition for wxWidgets and mesa libs
- MESALIBSPATH = /usr/local/lib
--- a/cad/kicad/patches/patch-makefile_gtk
+++ b/cad/kicad/patches/patch-makefile_gtk
@ -1,24 +0,0 @@
-$OpenBSD: patch-makefile_gtk,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- makefile.gtk.orig	Thu Jan  4 15:04:46 2007
-+++ makefile.gtk	Thu Jan  4 15:04:50 2007
-@@ -1,15 +1,14 @@
- 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
-+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) -f $(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) -f $(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) -f $(MAKEFILE) clean; done
--- a/cad/kicad/patches/patch-pcbnew_class_module_cpp
+++ b/cad/kicad/patches/patch-pcbnew_class_module_cpp
@ -1,12 +1,12 @@
-$OpenBSD: patch-pcbnew_class_module_cpp,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- pcbnew/class_module.cpp.orig	Thu Jan  4 18:57:36 2007
-+++ pcbnew/class_module.cpp	Thu Jan  4 18:58:32 2007
-@@ -1020,7 +1020,7 @@ wxString msg;
- 	pos += 14;
- 	if ( flag )	// Affichage date de modification (utile en Module Editor)
- 	{
-		strcpy(Line, ctime(&m_LastEdit_Time));
-+		strlcpy(Line, ctime((time_t*) &m_LastEdit_Time), sizeof(Line));
- 		strtok(Line," \n\r");
- 		strcpy( bufcar, strtok(NULL," \n\r") ); strcat(bufcar," ");
- 		strcat( bufcar, strtok(NULL," \n\r") ); strcat(bufcar,", ");
+$OpenBSD: patch-pcbnew_class_module_cpp,v 1.2 2011/05/03 18:31:14 jasper Exp $
+--- pcbnew/class_module.cpp.orig	Sat Aug 21 11:49:32 2010
+++ pcbnew/class_module.cpp	Sat Aug 21 11:50:03 2010
+@@ -840,7 +840,7 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
+     if( flag ) // Display last date the component was edited( useful in Module Editor)
+     {
+         time_t edit_time = m_LastEdit_Time;
+-        strcpy( Line, ctime( &edit_time ) );
+	strlcpy(Line, ctime((time_t*) &edit_time), sizeof(Line));
+         strtok( Line, " \n\r" );
+         strcpy( bufcar, strtok( NULL, " \n\r" ) ); strcat( bufcar, " " );
+         strcat( bufcar, strtok( NULL, " \n\r" ) ); strcat( bufcar, ", " );
--- a/cad/kicad/patches/patch-pcbnew_class_pad_cpp
+++ b/cad/kicad/patches/patch-pcbnew_class_pad_cpp
@ -1,13 +0,0 @@
-$OpenBSD: patch-pcbnew_class_pad_cpp,v 1.2 2007/02/06 07:16:34 steven Exp $
--- pcbnew/class_pad.cpp.orig	Sat Feb  3 10:03:16 2007
-+++ pcbnew/class_pad.cpp	Sat Feb  3 10:03:19 2007
-@@ -509,7 +509,8 @@ $EndPAD
- {
- char Line[1024], BufLine[1024], BufCar[256];
- char * PtLine;
-int nn, ll, dx, dy, drill_shape;
-+int nn, ll, dx, dy;
-+char drill_shape;
- 
- 	while( GetLine(File, Line, LineNum ) != NULL )
- 		{
--- a/cad/kicad/patches/patch-pcbnew_makefile_gtk
+++ b/cad/kicad/patches/patch-pcbnew_makefile_gtk
@ -1,21 +0,0 @@
-$OpenBSD: patch-pcbnew_makefile_gtk,v 1.1.1.1 2007/01/09 16:12:55 steven Exp $
--- pcbnew/makefile.gtk.orig	Thu Jan  4 18:32:25 2007
-+++ pcbnew/makefile.gtk	Thu Jan  4 18:54:32 2007
-@@ -4,7 +4,7 @@ LD = gcc
- 
- # Compiler flags.
- 
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags`
-+CPPFLAGS = -Wall `wx-config --cxxflags` -I${X11BASE}/include
- 
- LDFLAGS = -s
- 
-@@ -17,7 +17,7 @@ all: $(TARGET)
- include makefile.include
- 
- CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-+EDACPPFLAGS = $(CPPFLAGS) $(CXXFLAGS)
- 
- 
- 
--- a/cad/kicad/pkg/PLIST-docs
+++ b/cad/kicad/pkg/PLIST-docs
@ -1,11 +1,14 @@
-@comment $OpenBSD: PLIST-docs,v 1.1.1.1 2007/01/09 16:12:57 steven Exp $
+@comment $OpenBSD: PLIST-docs,v 1.2 2011/05/03 18:31:15 jasper Exp $
 share/doc/kicad/
+share/doc/kicad/INSTALL.txt
 share/doc/kicad/library/
 share/doc/kicad/library/doc/
 share/doc/kicad/library/doc/74xx/
+share/doc/kicad/library/doc/74xx/74LS393.pdf
 share/doc/kicad/library/doc/74xx/74f181.pdf
 share/doc/kicad/library/doc/74xx/74hc573.pdf
 share/doc/kicad/library/doc/74xx/74hc_hct74.pdf
+share/doc/kicad/library/doc/74xx/74ls393.pdf
 share/doc/kicad/library/doc/74xx/74ls86.pdf
 share/doc/kicad/library/doc/adc-dac/
 share/doc/kicad/library/doc/adc-dac/ad7533.pdf
@ -16,10 +19,13 @@ share/doc/kicad/library/doc/adc-dac/adc08060.pdf
 share/doc/kicad/library/doc/adc-dac/adc1173.pdf
 share/doc/kicad/library/doc/adc-dac/ltc1406.pdf
 share/doc/kicad/library/doc/analog-dev/
+share/doc/kicad/library/doc/analog-dev/AD9283.pdf
+share/doc/kicad/library/doc/analog-dev/AD9891_9895.pdf
 share/doc/kicad/library/doc/analog-dev/ADuC816.pdf
 share/doc/kicad/library/doc/analog-dev/ad626_c.pdf
 share/doc/kicad/library/doc/analog-dev/ad629_a.pdf
 share/doc/kicad/library/doc/analog-dev/ad9280.pdf
+share/doc/kicad/library/doc/analog-dev/ad9283.pdf
 share/doc/kicad/library/doc/analog-dev/ad9708.pdf
 share/doc/kicad/library/doc/analog-dev/mat02.pdf
 share/doc/kicad/library/doc/analog-dev/mat03.pdf
@ -44,6 +50,9 @@ share/doc/kicad/library/doc/cmos4000/mc14020.pdf
 share/doc/kicad/library/doc/cmos4000/mc14040.pdf
 share/doc/kicad/library/doc/contrib/
 share/doc/kicad/library/doc/contrib/fx614ds.pdf
+share/doc/kicad/library/doc/crystal/
+share/doc/kicad/library/doc/crystal/cs5361.pdf
+share/doc/kicad/library/doc/crystal/cs5396.pdf
 share/doc/kicad/library/doc/digital-audio/
 share/doc/kicad/library/doc/digital-audio/DS1267.pdf
 share/doc/kicad/library/doc/digital-audio/cs5361.pdf
@ -52,6 +61,8 @@ share/doc/kicad/library/doc/digital-audio/cs8406.pdf
 share/doc/kicad/library/doc/digital-audio/cs8413-4.pdf
 share/doc/kicad/library/doc/digital-audio/cs8420.pdf
 share/doc/kicad/library/doc/digital-audio/cs8427-f.pdf
+share/doc/kicad/library/doc/digital-audio/ds1267.pdf
+share/doc/kicad/library/doc/digital-audio/tpa5050.pdf
 share/doc/kicad/library/doc/display/
 share/doc/kicad/library/doc/display/D426GWA.pdf
 share/doc/kicad/library/doc/display/D426SURWAS530A2.pdf
@ -60,8 +71,10 @@ share/doc/kicad/library/doc/display/HDSP-7xxx.pdf
 share/doc/kicad/library/doc/display/LTC-6960HR.pdf
 share/doc/kicad/library/doc/display/LTC-6980HR.pdf
 share/doc/kicad/library/doc/display/MV57164.pdf
+share/doc/kicad/library/doc/display/d426gwa.pdf
 share/doc/kicad/library/doc/display/display-DA04-11GWA.pdf
 share/doc/kicad/library/doc/display/display-DC04-11GWA.pdf
+share/doc/kicad/library/doc/display/mv57164.pdf
 share/doc/kicad/library/doc/elantec/
 share/doc/kicad/library/doc/elantec/el7242.pdf
 share/doc/kicad/library/doc/elantec/el7243.pdf
@ -75,15 +88,23 @@ share/doc/kicad/library/doc/intersil/icl7660.pdf
 share/doc/kicad/library/doc/ir/
 share/doc/kicad/library/doc/ir/ir2110.pdf
 share/doc/kicad/library/doc/linear-tec/
+share/doc/kicad/library/doc/linear-tec/4607f.pdf
 share/doc/kicad/library/doc/linear-tec/lt1086.pdf
 share/doc/kicad/library/doc/linear-tec/lt1108.pdf
 share/doc/kicad/library/doc/linear-tec/lt1129.pdf
 share/doc/kicad/library/doc/linear-tec/lt1175.pdf
 share/doc/kicad/library/doc/linear-tec/lt1611f.pdf
+share/doc/kicad/library/doc/linear-tec/lt1761.pdf
+share/doc/kicad/library/doc/linear-tec/lt1932.pdf
+share/doc/kicad/library/doc/linear-tec/lt3010.pdf
 share/doc/kicad/library/doc/linear-tec/lt3430f.pdf
 share/doc/kicad/library/doc/linear-tec/ltc1594-8.pdf
 share/doc/kicad/library/doc/linear-tec/ltc1624.pdf
 share/doc/kicad/library/doc/linear-tec/ltc1878.pdf
+share/doc/kicad/library/doc/linear-tec/ltc2859-2861.pdf
+share/doc/kicad/library/doc/linear-tec/ltc3442.pdf
+share/doc/kicad/library/doc/linear-tec/ltc3525.pdf
+share/doc/kicad/library/doc/linear-tec/ltc4007.pdf
 share/doc/kicad/library/doc/maxim/
 share/doc/kicad/library/doc/maxim/DS1302.pdf
 share/doc/kicad/library/doc/maxim/MAX1647-MAX1648.pdf
@ -91,6 +112,7 @@ share/doc/kicad/library/doc/maxim/MAX220-MAX249.pdf
 share/doc/kicad/library/doc/maxim/MAX2605-MAX2609.pdf
 share/doc/kicad/library/doc/maxim/MAX5436-MAX5439.pdf
 share/doc/kicad/library/doc/maxim/MAX872-MAX874.pdf
+share/doc/kicad/library/doc/maxim/ds1302.pdf
 share/doc/kicad/library/doc/maxim/ds1621.pdf
 share/doc/kicad/library/doc/maxim/max200-max213.pdf
 share/doc/kicad/library/doc/maxim/max3224-max3245.pdf
@ -105,6 +127,7 @@ share/doc/kicad/library/doc/memory/27c040.pdf
 share/doc/kicad/library/doc/memory/27c080.pdf
 share/doc/kicad/library/doc/memory/28c256.pdf
 share/doc/kicad/library/doc/micrel/
+share/doc/kicad/library/doc/micrel/mic2026.pdf
 share/doc/kicad/library/doc/micrel/mic2177.pdf
 share/doc/kicad/library/doc/microchip/
 share/doc/kicad/library/doc/microchip/PIC16F819.pdf
@ -116,6 +139,7 @@ share/doc/kicad/library/doc/motorola/m68hc12B.pdf
 share/doc/kicad/library/doc/motorola/mmc2114.pdf
 share/doc/kicad/library/doc/ns/
 share/doc/kicad/library/doc/ns/DS7830.pdf
+share/doc/kicad/library/doc/ns/ds7830.pdf
 share/doc/kicad/library/doc/ns/lf398.pdf
 share/doc/kicad/library/doc/ns/lm158.pdf
 share/doc/kicad/library/doc/ns/lm1877.pdf
@ -137,12 +161,14 @@ share/doc/kicad/library/doc/opto/lbb110.pdf
 share/doc/kicad/library/doc/opto/lcc110.pdf
 share/doc/kicad/library/doc/opto/silonex_nsl-32sr3.pdf
 share/doc/kicad/library/doc/philips/
+share/doc/kicad/library/doc/philips/HTRC11001T-hitag_reader.pdf
 share/doc/kicad/library/doc/philips/SA605.pdf
 share/doc/kicad/library/doc/philips/dac08.pdf
 share/doc/kicad/library/doc/philips/pca9516.pdf
 share/doc/kicad/library/doc/philips/pca9516_3.pdf
 share/doc/kicad/library/doc/philips/pcf8574.pdf
 share/doc/kicad/library/doc/philips/pcf8591.pdf
+share/doc/kicad/library/doc/philips/sa605.pdf
 share/doc/kicad/library/doc/philips/tda8702.pdf
 share/doc/kicad/library/doc/regulator/
 share/doc/kicad/library/doc/regulator/LP2985.pdf
@ -152,6 +178,7 @@ share/doc/kicad/library/doc/regulator/lm78lxx.pdf
 share/doc/kicad/library/doc/regulator/lm78xx.pdf
 share/doc/kicad/library/doc/regulator/lm79lxx.pdf
 share/doc/kicad/library/doc/regulator/lm79xx.pdf
+share/doc/kicad/library/doc/regulator/lp2985.pdf
 share/doc/kicad/library/doc/regulator/lp3963.pdf
 share/doc/kicad/library/doc/regulator/lt1372-1377.pdf
 share/doc/kicad/library/doc/regulator/lt1373.pdf
@ -180,13 +207,25 @@ share/doc/kicad/library/doc/transistors/
 share/doc/kicad/library/doc/transistors/bipolar/
 share/doc/kicad/library/doc/transistors/bipolar/2n4401.pdf
 share/doc/kicad/library/doc/transistors/bipolar/BC807.pdf
+share/doc/kicad/library/doc/transistors/bipolar/BC817.pdf
+share/doc/kicad/library/doc/transistors/bipolar/MPSA42.pdf
 share/doc/kicad/library/doc/transistors/bipolar/bc237.pdf
 share/doc/kicad/library/doc/transistors/bipolar/bc307.pdf
+share/doc/kicad/library/doc/transistors/bipolar/bc807.pdf
+share/doc/kicad/library/doc/transistors/bipolar/bc817.pdf
+share/doc/kicad/library/doc/transistors/bipolar/mpsa42.pdf
+share/doc/kicad/library/doc/transistors/bipolar/mpsa92.pdf
 share/doc/kicad/library/doc/transistors/mos/
 share/doc/kicad/library/doc/transistors/mos/2n7000-7002.pdf
+share/doc/kicad/library/doc/transistors/mos/IRFU024.pdf
 share/doc/kicad/library/doc/transistors/mos/irf530.pdf
+share/doc/kicad/library/doc/transistors/mos/irfu024.pdf
+share/doc/kicad/library/doc/transistors/mos/si4569DY.pdf
+share/doc/kicad/library/doc/valves/
+share/doc/kicad/library/doc/valves/philips-em84.pdf
 share/doc/kicad/library/doc/video/
 share/doc/kicad/library/doc/video/av9173.pdf
+share/doc/kicad/library/doc/video/cxd3400n.pdf
 share/doc/kicad/library/doc/xicor/
 share/doc/kicad/library/doc/xicor/x9118.pdf
 share/doc/kicad/library/doc/xicor/x9250.pdf
@ -214,3 +253,13 @@ share/doc/kicad/library/doc/xilinx/xcr3064a.pdf
 share/doc/kicad/library/doc/xilinx/xcr3064xl.pdf
 share/doc/kicad/library/doc/xilinx/xcr3128xl.pdf
 share/doc/kicad/library/doc/xilinx/xcr3256xl.pdf
+share/doc/kicad/scripts/
+share/doc/kicad/scripts/kicad-devel
+share/doc/kicad/scripts/kicad-get-rss
+share/doc/kicad/scripts/packagesrc.sh
+share/doc/kicad/scripts/pcb-dr-adjust/
+share/doc/kicad/scripts/pcb-dr-adjust/example.brd
+share/doc/kicad/scripts/pcb-dr-adjust/howto.txt
+share/doc/kicad/scripts/pcb-dr-adjust/pcb-dr-adjust.cfg
+share/doc/kicad/scripts/pcb-dr-adjust/pcb-dr-adjust.pl
+share/doc/kicad/scripts/setfont.sh
--- a/cad/kicad/pkg/PLIST-main
+++ b/cad/kicad/pkg/PLIST-main