aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cad/kicad-devel/Makefile9
-rw-r--r--cad/kicad-devel/distinfo18
-rw-r--r--cad/kicad-devel/files/patch-makefile.gtk14
-rw-r--r--cad/kicad-devel/pkg-plist105
-rw-r--r--cad/kicad/Makefile9
-rw-r--r--cad/kicad/distinfo18
-rw-r--r--cad/kicad/files/patch-makefile.gtk14
-rw-r--r--cad/kicad/pkg-plist105
8 files changed, 192 insertions, 100 deletions
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 497e4a280706..a21e2251ebc5 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kicad
-DISTVERSION= 2006-04-24
+DISTVERSION= 2006-06-26
CATEGORIES= cad
MASTER_SITES= ftp://iut-tice.ujf-grenoble.fr/cao/:dat \
ftp://ftp.lis.inpg.fr/uploads/kicad/:dat \
@@ -26,7 +26,7 @@ LIB_DEPENDS= wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
.if !defined(NOPORTDOCS)
DISTFILES+= doc_components-${DOCVERSION}.tgz:dat
-DOCVERSION= 2006-04-24
+DOCVERSION= 2006-06-26
.endif
WRKSRC= ${WRKDIR}/kicad-dev
@@ -44,6 +44,7 @@ WX_CONFIG= wxgtk2-2.6-config
INSTDIR= ${PORTNAME}
PLIST_SUB= INSTDIR=${INSTDIR} OPSYS=${OPSYS}
+DOS2CNV= makefile.gtk makefile.include
BINS= cvpcb eeschema gerbview kicad pcbnew
.include <bsd.port.pre.mk>
@@ -59,10 +60,12 @@ BROKEN= Does not compile on ${OSVERSION}
.endif
post-extract:
- for f in `${FIND} ${WRKSRC} -name ${MAKEFILE}`; do \
+.for df in ${DOS2CNV}
+ for f in `${FIND} ${WRKSRC} -name ${df}`; do \
${CP} $$f $$f.dos && \
${TR} -d '\r' < $$f.dos > $$f ; \
done
+.endfor
${CP} ${WRKSRC}/libs.linux ${WRKSRC}/libs.${OPSYS}
${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \
${WRKSRC}/libs.${OPSYS}
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 32a2fe5b9f2a..dfde5e370070 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,9 +1,9 @@
-MD5 (kicad/kicad-2006-04-24.tgz) = c0073b57e6420934ad8846965f967524
-SHA256 (kicad/kicad-2006-04-24.tgz) = bbab5bef39e27009d99f2fce1d79c54397296c9e0b44e7e5d870a8226646b0b5
-SIZE (kicad/kicad-2006-04-24.tgz) = 56566245
-MD5 (kicad/kicad-sources-2006-04-24.zip) = 9b6060cce2fbe9668f6e63ea5a1b2de1
-SHA256 (kicad/kicad-sources-2006-04-24.zip) = e6dd4b17f0dbc668695a09511b39e7c64a3d07796afeed77712d5efb407958e8
-SIZE (kicad/kicad-sources-2006-04-24.zip) = 1545835
-MD5 (kicad/doc_components-2006-04-24.tgz) = 61e91ac3e5f9a3569876e1058cf2eeb8
-SHA256 (kicad/doc_components-2006-04-24.tgz) = ecfba35cafd070a6b517a8cb2ff632f93c9e311f8546a81de0f8b30b03c31042
-SIZE (kicad/doc_components-2006-04-24.tgz) = 64078752
+MD5 (kicad/kicad-2006-06-26.tgz) = 482d2ac90446fcc9704e4a7c2103683e
+SHA256 (kicad/kicad-2006-06-26.tgz) = 88d24bf753ceca85814883f621299a1c189722b284d9685009f7668477a02337
+SIZE (kicad/kicad-2006-06-26.tgz) = 57903490
+MD5 (kicad/kicad-sources-2006-06-26.zip) = 336d04c10d18ea8da60f53d6e5f2d746
+SHA256 (kicad/kicad-sources-2006-06-26.zip) = 8d6a091e3b2720850240adff7ce5aababce8e73e89e238ea3ce557cdd6f72dab
+SIZE (kicad/kicad-sources-2006-06-26.zip) = 1549647
+MD5 (kicad/doc_components-2006-06-26.tgz) = 5f58c01d991803b54d6bfbeb722e8b1b
+SHA256 (kicad/doc_components-2006-06-26.tgz) = 48e46eeb1d837ebcc8f1b873608f7317a215e580591f348e7dd2d3a807264f2c
+SIZE (kicad/doc_components-2006-06-26.tgz) = 65865107
diff --git a/cad/kicad-devel/files/patch-makefile.gtk b/cad/kicad-devel/files/patch-makefile.gtk
index e145c4f264ab..4f20fe2db624 100644
--- a/cad/kicad-devel/files/patch-makefile.gtk
+++ b/cad/kicad-devel/files/patch-makefile.gtk
@@ -1,15 +1,15 @@
---- makefile.gtk.orig Thu Dec 1 20:47:21 2005
-+++ makefile.gtk Thu Dec 1 20:56:41 2005
-@@ -1,15 +1,16 @@
+--- 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
- ERASE = rm -f *.o
all:
- @for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE)); done
@@ -17,8 +17,8 @@
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 && $(ERASE)); done
+- @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-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 332fb8439cb0..db5764525cd5 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -83,7 +83,6 @@
%%INSTDIR%%/help/de/docs_src/eeschema/Eeschema_Teil_12_DE.sxw
%%INSTDIR%%/help/en/contents.hhc
%%INSTDIR%%/help/en/cvpcb/cvpcb-en.html
-%%INSTDIR%%/help/en/cvpcb/cvpcb-en.pdf
%%INSTDIR%%/help/en/cvpcb/cvpcb-en_html_10907a97.png
%%INSTDIR%%/help/en/cvpcb/cvpcb-en_html_10ca5232.png
%%INSTDIR%%/help/en/cvpcb/cvpcb-en_html_15f50cc9.png
@@ -238,7 +237,6 @@
%%INSTDIR%%/help/es/docs_src/pcbnew/cap9.sxw
%%INSTDIR%%/help/es/docs_src/pcbnew/pcbnew-es.html
%%INSTDIR%%/help/es/docs_src/pcbnew/pcbnew.sxg
-%%INSTDIR%%/help/es/eeschema/Eeschema_Chapter1_ES.html
%%INSTDIR%%/help/es/eeschema/doc_eeschema-es.zip
%%INSTDIR%%/help/es/eeschema/eeschema-es.html
%%INSTDIR%%/help/es/file_formats/file_formats-es.html
@@ -309,7 +307,9 @@
%%INSTDIR%%/help/fr/docs_src/eeschema/eeschema.html
%%INSTDIR%%/help/fr/docs_src/eeschema/eeschema.sxg
%%INSTDIR%%/help/fr/docs_src/eeschema/eeschema_covers_FR.sxw
+%%INSTDIR%%/help/fr/docs_src/file_formats/board_file_format.odt
%%INSTDIR%%/help/fr/docs_src/file_formats/board_file_format.sxw
+%%INSTDIR%%/help/fr/docs_src/file_formats/file_formats.html
%%INSTDIR%%/help/fr/docs_src/file_formats/library_file_format.sxw
%%INSTDIR%%/help/fr/docs_src/file_formats/schematic_file_format.sxw
%%INSTDIR%%/help/fr/docs_src/footprint-for-pcbnew-doc/conn_DBxx.ps
@@ -374,31 +374,30 @@
%%INSTDIR%%/help/fr/pcbnew/pcbnew.html
%%INSTDIR%%/help/pt/contents.hhc
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt.html
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_1918808a.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_22c3c896.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_2f1d3378.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_11370164.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_30f04152.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_3b802d32.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_3e393164.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_37fab2f2.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_41084b87.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_535e1801.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_53814bf1.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_54965dbb.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_5470c784.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_55ad0c61.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_618c7091.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_653a1d44.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_66d42369.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_674e844.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_6c43823e.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_88d72ec.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_d4c3c28.gif
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_eecbfff.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m13b5b7a1.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m21e00917.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m28ba58c.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m30efa244.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m47bb838d.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m48305158.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m49c35e7f.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m4eda1ccc.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m56bbc47c.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb.pdf
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m50b52a88.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m6575c7c8.gif
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m78416bcd.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_mfaa4758.png
%%INSTDIR%%/help/pt/docs_src/cvpcb/cvpcb-pt.sxg
%%INSTDIR%%/help/pt/docs_src/cvpcb/cvpcb-pt.sxw
%%INSTDIR%%/help/pt/docs_src/cvpcb/cvpcb_capa_pt_br.sxw
@@ -451,31 +450,55 @@
%%INSTDIR%%/help/pt/docs_src/pcbnew/pcbnew_chap9_pt_BR.sxw
%%INSTDIR%%/help/pt/eeschema/doc_eeschema-pt.zip
%%INSTDIR%%/help/pt/eeschema/eeschema-pt.html
-%%INSTDIR%%/help/pt/eeschema/eeschema.pdf
%%INSTDIR%%/help/pt/file_formats/file_formats.html
%%INSTDIR%%/help/pt/file_formats/file_formats.zip
%%INSTDIR%%/help/pt/gerbview/doc_gerbview.zip
%%INSTDIR%%/help/pt/gerbview/gerbview.html
%%INSTDIR%%/help/pt/kicad.hhp
%%INSTDIR%%/help/pt/kicad/kicad-pt.html
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_1f2b2ef9.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_21af0dc0.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_3d3a3f29.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_450a70e8.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_4e2d3537.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_5c707ff7.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m121af765.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m1b04bf.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m1d9ca2c7.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m20d2b210.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m260932da.gif
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m341a8791.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m662f19ea.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m7b8f8a74.png
-%%INSTDIR%%/help/pt/kicad/kicad.pdf
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR.html
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_1f2b2ef9.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_21af0dc0.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_240131a9.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_3d3a3f29.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_450a70e8.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_5c707ff7.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m121af765.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m1b04bf.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m1d9ca2c7.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m20d2b210.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m260932da.gif
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m3262df08.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m341a8791.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m662f19ea.png
%%INSTDIR%%/help/pt/pcbnew/doc_pcbnew.zip
%%INSTDIR%%/help/pt/pcbnew/pcbnew.html
-%%INSTDIR%%/help/pt/pcbnew/pcbnew.pdf
+%%INSTDIR%%/help/ru/contents.hhc
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter10_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter11_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter12_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter1_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter2_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter3_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter4_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter5_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter6_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter7_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter8_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter9_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/eeschema_ru.html
+%%INSTDIR%%/help/ru/docs_src/kicad/kicad_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap1_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap2_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap3_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap4_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap5_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_ru.html
+%%INSTDIR%%/help/ru/eeschema/doc_eeschema.zip
+%%INSTDIR%%/help/ru/eeschema/eeschema_ru.html
+%%INSTDIR%%/help/ru/kicad.hhp
+%%INSTDIR%%/help/ru/pcbnew/doc_pcbnew.zip
+%%INSTDIR%%/help/ru/pcbnew/pcbnew_ru.html
%%INSTDIR%%/how-to-build-kicad.txt
%%INSTDIR%%/how-to-build-kicad.txt~
%%INSTDIR%%/install.txt
@@ -488,6 +511,8 @@
%%INSTDIR%%/internat/hu/kicad.po
%%INSTDIR%%/internat/it/kicad.mo
%%INSTDIR%%/internat/it/kicad.po
+%%INSTDIR%%/internat/ko/kicad.mo
+%%INSTDIR%%/internat/ko/kicad.po
%%INSTDIR%%/internat/pl/kicad.mo
%%INSTDIR%%/internat/pl/kicad.po
%%INSTDIR%%/internat/pt/kicad.mo
@@ -522,6 +547,7 @@
%%INSTDIR%%/library/digital-audio.lib
%%INSTDIR%%/library/display.dcm
%%INSTDIR%%/library/display.lib
+%%INSTDIR%%/library/doc/microchip/PIC16F819.pdf
%%INSTDIR%%/library/dsp.dcm
%%INSTDIR%%/library/dsp.lib
%%INSTDIR%%/library/elec-unifil.dcm
@@ -595,6 +621,7 @@
%%INSTDIR%%/modules/docpackages/so24.pdf
%%INSTDIR%%/modules/iut.mdc
%%INSTDIR%%/modules/iut.mod
+%%INSTDIR%%/modules/libcms.bak
%%INSTDIR%%/modules/libcms.brd
%%INSTDIR%%/modules/libcms.mdc
%%INSTDIR%%/modules/libcms.mod
@@ -706,6 +733,7 @@
%%INSTDIR%%/modules/packages3d/dil/dil_8.wrl
%%INSTDIR%%/modules/packages3d/dil/textool_40.wings
%%INSTDIR%%/modules/packages3d/dil/textool_40.wrl
+%%INSTDIR%%/modules/packages3d/discret/#push_butt_shape1_blue.wings#
%%INSTDIR%%/modules/packages3d/discret/adjustable_rx2.wings
%%INSTDIR%%/modules/packages3d/discret/adjustable_rx2.wrl
%%INSTDIR%%/modules/packages3d/discret/adjustable_rx2v4.wings
@@ -741,6 +769,13 @@
%%INSTDIR%%/modules/packages3d/discret/led3_vertical.wings
%%INSTDIR%%/modules/packages3d/discret/led5_vertical.wings
%%INSTDIR%%/modules/packages3d/discret/led5_vertical.wrl
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1.wings~
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_blue.wings
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_blue.wrl
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_green.wings
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_green.wrl
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_red.wings
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_red.wrl
%%INSTDIR%%/modules/packages3d/discret/r_pack8.wings
%%INSTDIR%%/modules/packages3d/discret/r_pack8.wrl
%%INSTDIR%%/modules/packages3d/discret/r_pack9.wings
@@ -1124,11 +1159,19 @@
@dirrm %%INSTDIR%%/internat/sl
@dirrm %%INSTDIR%%/internat/pt
@dirrm %%INSTDIR%%/internat/pl
+@dirrm %%INSTDIR%%/internat/ko
@dirrm %%INSTDIR%%/internat/it
@dirrm %%INSTDIR%%/internat/hu
@dirrm %%INSTDIR%%/internat/fr
@dirrm %%INSTDIR%%/internat/es
@dirrm %%INSTDIR%%/internat
+@dirrm %%INSTDIR%%/help/ru/pcbnew
+@dirrm %%INSTDIR%%/help/ru/eeschema
+@dirrm %%INSTDIR%%/help/ru/docs_src/pcbnew
+@dirrm %%INSTDIR%%/help/ru/docs_src/kicad
+@dirrm %%INSTDIR%%/help/ru/docs_src/eeschema
+@dirrm %%INSTDIR%%/help/ru/docs_src
+@dirrm %%INSTDIR%%/help/ru
@dirrm %%INSTDIR%%/help/pt/pcbnew
@dirrm %%INSTDIR%%/help/pt/kicad
@dirrm %%INSTDIR%%/help/pt/gerbview
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 497e4a280706..a21e2251ebc5 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kicad
-DISTVERSION= 2006-04-24
+DISTVERSION= 2006-06-26
CATEGORIES= cad
MASTER_SITES= ftp://iut-tice.ujf-grenoble.fr/cao/:dat \
ftp://ftp.lis.inpg.fr/uploads/kicad/:dat \
@@ -26,7 +26,7 @@ LIB_DEPENDS= wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
.if !defined(NOPORTDOCS)
DISTFILES+= doc_components-${DOCVERSION}.tgz:dat
-DOCVERSION= 2006-04-24
+DOCVERSION= 2006-06-26
.endif
WRKSRC= ${WRKDIR}/kicad-dev
@@ -44,6 +44,7 @@ WX_CONFIG= wxgtk2-2.6-config
INSTDIR= ${PORTNAME}
PLIST_SUB= INSTDIR=${INSTDIR} OPSYS=${OPSYS}
+DOS2CNV= makefile.gtk makefile.include
BINS= cvpcb eeschema gerbview kicad pcbnew
.include <bsd.port.pre.mk>
@@ -59,10 +60,12 @@ BROKEN= Does not compile on ${OSVERSION}
.endif
post-extract:
- for f in `${FIND} ${WRKSRC} -name ${MAKEFILE}`; do \
+.for df in ${DOS2CNV}
+ for f in `${FIND} ${WRKSRC} -name ${df}`; do \
${CP} $$f $$f.dos && \
${TR} -d '\r' < $$f.dos > $$f ; \
done
+.endfor
${CP} ${WRKSRC}/libs.linux ${WRKSRC}/libs.${OPSYS}
${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \
${WRKSRC}/libs.${OPSYS}
diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo
index 32a2fe5b9f2a..dfde5e370070 100644
--- a/cad/kicad/distinfo
+++ b/cad/kicad/distinfo
@@ -1,9 +1,9 @@
-MD5 (kicad/kicad-2006-04-24.tgz) = c0073b57e6420934ad8846965f967524
-SHA256 (kicad/kicad-2006-04-24.tgz) = bbab5bef39e27009d99f2fce1d79c54397296c9e0b44e7e5d870a8226646b0b5
-SIZE (kicad/kicad-2006-04-24.tgz) = 56566245
-MD5 (kicad/kicad-sources-2006-04-24.zip) = 9b6060cce2fbe9668f6e63ea5a1b2de1
-SHA256 (kicad/kicad-sources-2006-04-24.zip) = e6dd4b17f0dbc668695a09511b39e7c64a3d07796afeed77712d5efb407958e8
-SIZE (kicad/kicad-sources-2006-04-24.zip) = 1545835
-MD5 (kicad/doc_components-2006-04-24.tgz) = 61e91ac3e5f9a3569876e1058cf2eeb8
-SHA256 (kicad/doc_components-2006-04-24.tgz) = ecfba35cafd070a6b517a8cb2ff632f93c9e311f8546a81de0f8b30b03c31042
-SIZE (kicad/doc_components-2006-04-24.tgz) = 64078752
+MD5 (kicad/kicad-2006-06-26.tgz) = 482d2ac90446fcc9704e4a7c2103683e
+SHA256 (kicad/kicad-2006-06-26.tgz) = 88d24bf753ceca85814883f621299a1c189722b284d9685009f7668477a02337
+SIZE (kicad/kicad-2006-06-26.tgz) = 57903490
+MD5 (kicad/kicad-sources-2006-06-26.zip) = 336d04c10d18ea8da60f53d6e5f2d746
+SHA256 (kicad/kicad-sources-2006-06-26.zip) = 8d6a091e3b2720850240adff7ce5aababce8e73e89e238ea3ce557cdd6f72dab
+SIZE (kicad/kicad-sources-2006-06-26.zip) = 1549647
+MD5 (kicad/doc_components-2006-06-26.tgz) = 5f58c01d991803b54d6bfbeb722e8b1b
+SHA256 (kicad/doc_components-2006-06-26.tgz) = 48e46eeb1d837ebcc8f1b873608f7317a215e580591f348e7dd2d3a807264f2c
+SIZE (kicad/doc_components-2006-06-26.tgz) = 65865107
diff --git a/cad/kicad/files/patch-makefile.gtk b/cad/kicad/files/patch-makefile.gtk
index e145c4f264ab..4f20fe2db624 100644
--- a/cad/kicad/files/patch-makefile.gtk
+++ b/cad/kicad/files/patch-makefile.gtk
@@ -1,15 +1,15 @@
---- makefile.gtk.orig Thu Dec 1 20:47:21 2005
-+++ makefile.gtk Thu Dec 1 20:56:41 2005
-@@ -1,15 +1,16 @@
+--- 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
- ERASE = rm -f *.o
all:
- @for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE)); done
@@ -17,8 +17,8 @@
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 && $(ERASE)); done
+- @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/pkg-plist b/cad/kicad/pkg-plist
index 332fb8439cb0..db5764525cd5 100644
--- a/cad/kicad/pkg-plist
+++ b/cad/kicad/pkg-plist
@@ -83,7 +83,6 @@
%%INSTDIR%%/help/de/docs_src/eeschema/Eeschema_Teil_12_DE.sxw
%%INSTDIR%%/help/en/contents.hhc
%%INSTDIR%%/help/en/cvpcb/cvpcb-en.html
-%%INSTDIR%%/help/en/cvpcb/cvpcb-en.pdf
%%INSTDIR%%/help/en/cvpcb/cvpcb-en_html_10907a97.png
%%INSTDIR%%/help/en/cvpcb/cvpcb-en_html_10ca5232.png
%%INSTDIR%%/help/en/cvpcb/cvpcb-en_html_15f50cc9.png
@@ -238,7 +237,6 @@
%%INSTDIR%%/help/es/docs_src/pcbnew/cap9.sxw
%%INSTDIR%%/help/es/docs_src/pcbnew/pcbnew-es.html
%%INSTDIR%%/help/es/docs_src/pcbnew/pcbnew.sxg
-%%INSTDIR%%/help/es/eeschema/Eeschema_Chapter1_ES.html
%%INSTDIR%%/help/es/eeschema/doc_eeschema-es.zip
%%INSTDIR%%/help/es/eeschema/eeschema-es.html
%%INSTDIR%%/help/es/file_formats/file_formats-es.html
@@ -309,7 +307,9 @@
%%INSTDIR%%/help/fr/docs_src/eeschema/eeschema.html
%%INSTDIR%%/help/fr/docs_src/eeschema/eeschema.sxg
%%INSTDIR%%/help/fr/docs_src/eeschema/eeschema_covers_FR.sxw
+%%INSTDIR%%/help/fr/docs_src/file_formats/board_file_format.odt
%%INSTDIR%%/help/fr/docs_src/file_formats/board_file_format.sxw
+%%INSTDIR%%/help/fr/docs_src/file_formats/file_formats.html
%%INSTDIR%%/help/fr/docs_src/file_formats/library_file_format.sxw
%%INSTDIR%%/help/fr/docs_src/file_formats/schematic_file_format.sxw
%%INSTDIR%%/help/fr/docs_src/footprint-for-pcbnew-doc/conn_DBxx.ps
@@ -374,31 +374,30 @@
%%INSTDIR%%/help/fr/pcbnew/pcbnew.html
%%INSTDIR%%/help/pt/contents.hhc
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt.html
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_1918808a.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_22c3c896.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_2f1d3378.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_11370164.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_30f04152.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_3b802d32.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_3e393164.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_37fab2f2.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_41084b87.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_535e1801.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_53814bf1.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_54965dbb.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_5470c784.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_55ad0c61.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_618c7091.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_653a1d44.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_66d42369.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_674e844.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_6c43823e.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_88d72ec.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_d4c3c28.gif
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_eecbfff.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m13b5b7a1.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m21e00917.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m28ba58c.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m30efa244.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m47bb838d.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m48305158.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m49c35e7f.png
%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m4eda1ccc.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m56bbc47c.png
-%%INSTDIR%%/help/pt/cvpcb/cvpcb.pdf
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m50b52a88.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m6575c7c8.gif
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_m78416bcd.png
+%%INSTDIR%%/help/pt/cvpcb/cvpcb-pt_html_mfaa4758.png
%%INSTDIR%%/help/pt/docs_src/cvpcb/cvpcb-pt.sxg
%%INSTDIR%%/help/pt/docs_src/cvpcb/cvpcb-pt.sxw
%%INSTDIR%%/help/pt/docs_src/cvpcb/cvpcb_capa_pt_br.sxw
@@ -451,31 +450,55 @@
%%INSTDIR%%/help/pt/docs_src/pcbnew/pcbnew_chap9_pt_BR.sxw
%%INSTDIR%%/help/pt/eeschema/doc_eeschema-pt.zip
%%INSTDIR%%/help/pt/eeschema/eeschema-pt.html
-%%INSTDIR%%/help/pt/eeschema/eeschema.pdf
%%INSTDIR%%/help/pt/file_formats/file_formats.html
%%INSTDIR%%/help/pt/file_formats/file_formats.zip
%%INSTDIR%%/help/pt/gerbview/doc_gerbview.zip
%%INSTDIR%%/help/pt/gerbview/gerbview.html
%%INSTDIR%%/help/pt/kicad.hhp
%%INSTDIR%%/help/pt/kicad/kicad-pt.html
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_1f2b2ef9.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_21af0dc0.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_3d3a3f29.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_450a70e8.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_4e2d3537.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_5c707ff7.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m121af765.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m1b04bf.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m1d9ca2c7.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m20d2b210.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m260932da.gif
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m341a8791.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m662f19ea.png
-%%INSTDIR%%/help/pt/kicad/kicad-pt_html_m7b8f8a74.png
-%%INSTDIR%%/help/pt/kicad/kicad.pdf
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR.html
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_1f2b2ef9.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_21af0dc0.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_240131a9.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_3d3a3f29.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_450a70e8.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_5c707ff7.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m121af765.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m1b04bf.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m1d9ca2c7.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m20d2b210.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m260932da.gif
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m3262df08.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m341a8791.png
+%%INSTDIR%%/help/pt/kicad/kicad_pt_BR_html_m662f19ea.png
%%INSTDIR%%/help/pt/pcbnew/doc_pcbnew.zip
%%INSTDIR%%/help/pt/pcbnew/pcbnew.html
-%%INSTDIR%%/help/pt/pcbnew/pcbnew.pdf
+%%INSTDIR%%/help/ru/contents.hhc
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter10_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter11_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter12_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter1_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter2_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter3_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter4_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter5_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter6_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter7_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter8_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/Eeschema_Chapter9_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/eeschema/eeschema_ru.html
+%%INSTDIR%%/help/ru/docs_src/kicad/kicad_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap1_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap2_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap3_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap4_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_chap5_RU.sxw
+%%INSTDIR%%/help/ru/docs_src/pcbnew/pcbnew_ru.html
+%%INSTDIR%%/help/ru/eeschema/doc_eeschema.zip
+%%INSTDIR%%/help/ru/eeschema/eeschema_ru.html
+%%INSTDIR%%/help/ru/kicad.hhp
+%%INSTDIR%%/help/ru/pcbnew/doc_pcbnew.zip
+%%INSTDIR%%/help/ru/pcbnew/pcbnew_ru.html
%%INSTDIR%%/how-to-build-kicad.txt
%%INSTDIR%%/how-to-build-kicad.txt~
%%INSTDIR%%/install.txt
@@ -488,6 +511,8 @@
%%INSTDIR%%/internat/hu/kicad.po
%%INSTDIR%%/internat/it/kicad.mo
%%INSTDIR%%/internat/it/kicad.po
+%%INSTDIR%%/internat/ko/kicad.mo
+%%INSTDIR%%/internat/ko/kicad.po
%%INSTDIR%%/internat/pl/kicad.mo
%%INSTDIR%%/internat/pl/kicad.po
%%INSTDIR%%/internat/pt/kicad.mo
@@ -522,6 +547,7 @@
%%INSTDIR%%/library/digital-audio.lib
%%INSTDIR%%/library/display.dcm
%%INSTDIR%%/library/display.lib
+%%INSTDIR%%/library/doc/microchip/PIC16F819.pdf
%%INSTDIR%%/library/dsp.dcm
%%INSTDIR%%/library/dsp.lib
%%INSTDIR%%/library/elec-unifil.dcm
@@ -595,6 +621,7 @@
%%INSTDIR%%/modules/docpackages/so24.pdf
%%INSTDIR%%/modules/iut.mdc
%%INSTDIR%%/modules/iut.mod
+%%INSTDIR%%/modules/libcms.bak
%%INSTDIR%%/modules/libcms.brd
%%INSTDIR%%/modules/libcms.mdc
%%INSTDIR%%/modules/libcms.mod
@@ -706,6 +733,7 @@
%%INSTDIR%%/modules/packages3d/dil/dil_8.wrl
%%INSTDIR%%/modules/packages3d/dil/textool_40.wings
%%INSTDIR%%/modules/packages3d/dil/textool_40.wrl
+%%INSTDIR%%/modules/packages3d/discret/#push_butt_shape1_blue.wings#
%%INSTDIR%%/modules/packages3d/discret/adjustable_rx2.wings
%%INSTDIR%%/modules/packages3d/discret/adjustable_rx2.wrl
%%INSTDIR%%/modules/packages3d/discret/adjustable_rx2v4.wings
@@ -741,6 +769,13 @@
%%INSTDIR%%/modules/packages3d/discret/led3_vertical.wings
%%INSTDIR%%/modules/packages3d/discret/led5_vertical.wings
%%INSTDIR%%/modules/packages3d/discret/led5_vertical.wrl
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1.wings~
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_blue.wings
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_blue.wrl
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_green.wings
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_green.wrl
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_red.wings
+%%INSTDIR%%/modules/packages3d/discret/push_butt_shape1_red.wrl
%%INSTDIR%%/modules/packages3d/discret/r_pack8.wings
%%INSTDIR%%/modules/packages3d/discret/r_pack8.wrl
%%INSTDIR%%/modules/packages3d/discret/r_pack9.wings
@@ -1124,11 +1159,19 @@
@dirrm %%INSTDIR%%/internat/sl
@dirrm %%INSTDIR%%/internat/pt
@dirrm %%INSTDIR%%/internat/pl
+@dirrm %%INSTDIR%%/internat/ko
@dirrm %%INSTDIR%%/internat/it
@dirrm %%INSTDIR%%/internat/hu
@dirrm %%INSTDIR%%/internat/fr
@dirrm %%INSTDIR%%/internat/es
@dirrm %%INSTDIR%%/internat
+@dirrm %%INSTDIR%%/help/ru/pcbnew
+@dirrm %%INSTDIR%%/help/ru/eeschema
+@dirrm %%INSTDIR%%/help/ru/docs_src/pcbnew
+@dirrm %%INSTDIR%%/help/ru/docs_src/kicad
+@dirrm %%INSTDIR%%/help/ru/docs_src/eeschema
+@dirrm %%INSTDIR%%/help/ru/docs_src
+@dirrm %%INSTDIR%%/help/ru
@dirrm %%INSTDIR%%/help/pt/pcbnew
@dirrm %%INSTDIR%%/help/pt/kicad
@dirrm %%INSTDIR%%/help/pt/gerbview