25 files changed, 126 insertions, 517 deletions
diff --git a/cad/gattrib/distinfo b/cad/gattrib/distinfo
index 651bf34f0ed..82c0b8d77f8 100644
--- a/cad/gattrib/distinfo
+++ b/cad/gattrib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2006/10/23 09:43:12 dmcmahill Exp $
+$NetBSD: distinfo,v 1.14 2007/02/21 13:23:53 dmcmahill Exp $
 
-SHA1 (geda/geda-gattrib-20061020.tar.gz) = 970fe10bc4d8b714dc04a37fcb27f2bbd0d50c3f
-RMD160 (geda/geda-gattrib-20061020.tar.gz) = a8183e9547a41221f067180e4cf7e2829afa3625
-Size (geda/geda-gattrib-20061020.tar.gz) = 271549 bytes
+SHA1 (geda/geda-gattrib-20070216.tar.gz) = 869bd629013d4b366b9dc922ba4b8f90829abdb6
+RMD160 (geda/geda-gattrib-20070216.tar.gz) = dc11bdf8ab2e990c1dd35c5add93c2a46ecff13b
+Size (geda/geda-gattrib-20070216.tar.gz) = 274582 bytes
diff --git a/cad/geda-docs/Makefile b/cad/geda-docs/Makefile
index ac0ae293c5f..9faab661457 100644
--- a/cad/geda-docs/Makefile
+++ b/cad/geda-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/09/01 12:00:43 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/21 13:23:56 dmcmahill Exp $
 #
 
 DISTNAME=		geda-docs-${PKGVERSION}
@@ -16,5 +16,16 @@ CONFLICTS+=		gEDA<19991011
 .include "../../cad/geda/Makefile.common"
 
 GNU_CONFIGURE=		YES
+USE_TOOLS+=		find
+
+PLIST_SRC=		${WRKDIR}/PLIST
+
+post-install:
+	${CAT} ${.CURDIR}/PLIST.pre > ${PLIST_SRC}
+	${FIND} ${PREFIX}/share/doc/geda-doc/wiki -type f -print | \
+		${SORT} | ${SED} 's;^${PREFIX}/;;g' >> ${PLIST_SRC}
+	${FIND} ${PREFIX}/share/doc/geda-doc/wiki -type d -print | \
+		${SORT} -r | ${SED} 's;^${PREFIX}/;@dirrm ;g' >> ${PLIST_SRC}
+	${CAT} ${.CURDIR}/PLIST.post >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-docs/PLIST b/cad/geda-docs/PLIST
deleted file mode 100644
index 24d14b0c800..00000000000
--- a/cad/geda-docs/PLIST
+++ /dev/null
@@ -1,367 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2006/10/23 09:43:13 dmcmahill Exp $
-share/doc/geda-doc/gedadocs.html
-share/doc/geda-doc/tutorials/gsch2pcb/gschem-warmup.html
-share/doc/geda-doc/tutorials/gsch2pcb/images/board-1.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/board-2.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/board-3.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/board-4.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/board-5.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/board-6.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/gschem-sym-1.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/gschem-sym-2.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/gschem-sym-3.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/one-sch-1.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/one-sch-2.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/one-sch-3.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/paper1.gif
-share/doc/geda-doc/tutorials/gsch2pcb/images/pcb-el-1.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/pcb-el-2.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/two-sch-1.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/two-sch-2.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/warmup-0.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/warmup-1.png
-share/doc/geda-doc/tutorials/gsch2pcb/images/warmup-2.png
-share/doc/geda-doc/tutorials/gsch2pcb/transistor-guide.html
-share/doc/geda-doc/tutorials/gsch2pcb/tutorial-old.html
-share/doc/geda-doc/tutorials/gsch2pcb/tutorial.html
-share/doc/geda-doc/wiki/001geda_debian.html
-share/doc/geda-doc/wiki/001geda_documentation.html
-share/doc/geda-doc/wiki/001geda_faq-attribs.html
-share/doc/geda-doc/wiki/001geda_faq-gnetlist.html
-share/doc/geda-doc/wiki/001geda_faq-gsch2pcb.html
-share/doc/geda-doc/wiki/001geda_faq-gschem.html
-share/doc/geda-doc/wiki/001geda_faq-simulation.html
-share/doc/geda-doc/wiki/001geda_faq.html
-share/doc/geda-doc/wiki/001geda_glossary.html
-share/doc/geda-doc/wiki/001geda_gschem_mp.html
-share/doc/geda-doc/wiki/001geda_gschem_ug.html
-share/doc/geda-doc/wiki/001geda_hse_howto.html
-share/doc/geda-doc/wiki/001geda_installation.html
-share/doc/geda-doc/wiki/001geda_kig_howto.html
-share/doc/geda-doc/wiki/001geda_pcb-quick_reference.html
-share/doc/geda-doc/wiki/001geda_pcb_tips.html
-share/doc/geda-doc/wiki/001geda_scg.html
-share/doc/geda-doc/wiki/001geda_suse_10.html
-share/doc/geda-doc/wiki/001geda_tasks.html
-share/doc/geda-doc/wiki/001geda_todos.html
-share/doc/geda-doc/wiki/001geda_usage.html
-share/doc/geda-doc/wiki/_detail/001geda_design_flow.html
-share/doc/geda-doc/wiki/_detail/geda_ambiguous1.html
-share/doc/geda-doc/wiki/_detail/geda_ambiguous1_fixed.html
-share/doc/geda-doc/wiki/_detail/geda_coordinatespace.html
-share/doc/geda-doc/wiki/_detail/geda_design_flow.html
-share/doc/geda-doc/wiki/_detail/geda_faq_attrib.html
-share/doc/geda-doc/wiki/_detail/geda_fileformat_textgraphic.html
-share/doc/geda-doc/wiki/_detail/geda_geda_flow.html
-share/doc/geda-doc/wiki/_detail/geda_gschem_screenshot_001.html
-share/doc/geda-doc/wiki/_detail/geda_gschem_workflow_01.html
-share/doc/geda-doc/wiki/_detail/geda_net.html
-share/doc/geda-doc/wiki/_detail/geda_nets.html
-share/doc/geda-doc/wiki/_detail/geda_rf_cascade_figure1.html
-share/doc/geda-doc/wiki/_detail/geda_rf_cascade_figure2.html
-share/doc/geda-doc/wiki/_detail/geda_status_screenshot.html
-share/doc/geda-doc/wiki/_detail/geda_switcap_figure1.html
-share/doc/geda-doc/wiki/_detail/geda_switcap_figure2.html
-share/doc/geda-doc/wiki/_detail/geda_switcap_figure3.html
-share/doc/geda-doc/wiki/_detail/geda_switcap_figure4.html
-share/doc/geda-doc/wiki/_detail/geda_terminal_screenshot_001.html
-share/doc/geda-doc/wiki/_detail/tragesym_acroread_selectiontable.html
-share/doc/geda-doc/wiki/_detail/tragesym_gschem_finished.html
-share/doc/geda-doc/wiki/_detail/tragesym_gschem_showhidden.html
-share/doc/geda-doc/wiki/_detail/tragesym_kpdf_pinconfiguration.html
-share/doc/geda-doc/wiki/_detail/tragesym_kpdf_pindescription.html
-share/doc/geda-doc/wiki/_detail/tragesym_ooo_attributes.html
-share/doc/geda-doc/wiki/_detail/tragesym_ooo_changedpins.html
-share/doc/geda-doc/wiki/_detail/tragesym_ooo_rearanged.html
-share/doc/geda-doc/wiki/_detail/tragesym_ooo_selection.html
-share/doc/geda-doc/wiki/_detail/tragesym_xemacs_modifiedselection.html
-share/doc/geda-doc/wiki/_detail/tragesym_xemacs_rawselection.html
-share/doc/geda-doc/wiki/_media/001geda_ambiguous1.png
-share/doc/geda-doc/wiki/_media/001geda_ambiguous1_fixed.png
-share/doc/geda-doc/wiki/_media/001geda_coordinatespace.jpg
-share/doc/geda-doc/wiki/_media/001geda_design_flow.jpg
-share/doc/geda-doc/wiki/_media/001geda_faq_attrib.jpg
-share/doc/geda-doc/wiki/_media/001geda_fileformat_textgraphic.jpg
-share/doc/geda-doc/wiki/_media/001geda_geda_flow.png
-share/doc/geda-doc/wiki/_media/001geda_gschem_screenshot_001.jpg
-share/doc/geda-doc/wiki/_media/001geda_gschem_workflow_01.jpg
-share/doc/geda-doc/wiki/_media/001geda_net.jpg
-share/doc/geda-doc/wiki/_media/001geda_nets.jpg
-share/doc/geda-doc/wiki/_media/001geda_rf_cascade_figure1.jpg
-share/doc/geda-doc/wiki/_media/001geda_rf_cascade_figure2.jpg
-share/doc/geda-doc/wiki/_media/001geda_status_screenshot.jpg
-share/doc/geda-doc/wiki/_media/001geda_switcap_figure1.jpg
-share/doc/geda-doc/wiki/_media/001geda_switcap_figure2.jpg
-share/doc/geda-doc/wiki/_media/001geda_switcap_figure3.jpg
-share/doc/geda-doc/wiki/_media/001geda_switcap_figure4.jpg
-share/doc/geda-doc/wiki/_media/001geda_terminal_screenshot_001.jpg
-share/doc/geda-doc/wiki/_media/001tragesym_acroread_selectiontable.png
-share/doc/geda-doc/wiki/_media/001tragesym_gschem_finished.png
-share/doc/geda-doc/wiki/_media/001tragesym_gschem_showhidden.png
-share/doc/geda-doc/wiki/_media/001tragesym_kpdf_pinconfiguration.png
-share/doc/geda-doc/wiki/_media/001tragesym_kpdf_pindescription.png
-share/doc/geda-doc/wiki/_media/001tragesym_ooo_attributes.png
-share/doc/geda-doc/wiki/_media/001tragesym_ooo_changedpins.png
-share/doc/geda-doc/wiki/_media/001tragesym_ooo_rearanged.png
-share/doc/geda-doc/wiki/_media/001tragesym_ooo_selection.png
-share/doc/geda-doc/wiki/_media/001tragesym_xemacs_modifiedselection.png
-share/doc/geda-doc/wiki/_media/001tragesym_xemacs_rawselection.png
-share/doc/geda-doc/wiki/_media/002geda_ambiguous1.png
-share/doc/geda-doc/wiki/_media/002geda_ambiguous1_fixed.png
-share/doc/geda-doc/wiki/_media/002geda_coordinatespace.jpg
-share/doc/geda-doc/wiki/_media/002geda_design_flow.jpg
-share/doc/geda-doc/wiki/_media/002geda_faq_attrib.jpg
-share/doc/geda-doc/wiki/_media/002geda_fileformat_textgraphic.jpg
-share/doc/geda-doc/wiki/_media/002geda_geda_flow.png
-share/doc/geda-doc/wiki/_media/002geda_gschem_screenshot_001.jpg
-share/doc/geda-doc/wiki/_media/002geda_gschem_workflow_01.jpg
-share/doc/geda-doc/wiki/_media/002geda_net.jpg
-share/doc/geda-doc/wiki/_media/002geda_nets.jpg
-share/doc/geda-doc/wiki/_media/002geda_rf_cascade_figure1.jpg
-share/doc/geda-doc/wiki/_media/002geda_rf_cascade_figure2.jpg
-share/doc/geda-doc/wiki/_media/002geda_status_screenshot.jpg
-share/doc/geda-doc/wiki/_media/002geda_switcap_figure1.jpg
-share/doc/geda-doc/wiki/_media/002geda_switcap_figure2.jpg
-share/doc/geda-doc/wiki/_media/002geda_switcap_figure3.jpg
-share/doc/geda-doc/wiki/_media/002geda_switcap_figure4.jpg
-share/doc/geda-doc/wiki/_media/002geda_terminal_screenshot_001.jpg
-share/doc/geda-doc/wiki/_media/002tragesym_acroread_selectiontable.png
-share/doc/geda-doc/wiki/_media/002tragesym_gschem_finished.png
-share/doc/geda-doc/wiki/_media/002tragesym_gschem_showhidden.png
-share/doc/geda-doc/wiki/_media/002tragesym_kpdf_pinconfiguration.png
-share/doc/geda-doc/wiki/_media/002tragesym_kpdf_pindescription.png
-share/doc/geda-doc/wiki/_media/002tragesym_ooo_attributes.png
-share/doc/geda-doc/wiki/_media/002tragesym_ooo_changedpins.png
-share/doc/geda-doc/wiki/_media/002tragesym_ooo_rearanged.png
-share/doc/geda-doc/wiki/_media/002tragesym_ooo_selection.png
-share/doc/geda-doc/wiki/_media/002tragesym_xemacs_modifiedselection.png
-share/doc/geda-doc/wiki/_media/002tragesym_xemacs_rawselection.png
-share/doc/geda-doc/wiki/_media/geda_ambiguous1.png
-share/doc/geda-doc/wiki/_media/geda_ambiguous1_fixed.png
-share/doc/geda-doc/wiki/_media/geda_coordinatespace.jpg
-share/doc/geda-doc/wiki/_media/geda_design_flow.jpg
-share/doc/geda-doc/wiki/_media/geda_faq_attrib.jpg
-share/doc/geda-doc/wiki/_media/geda_fileformat_textgraphic.jpg
-share/doc/geda-doc/wiki/_media/geda_geda_flow.png
-share/doc/geda-doc/wiki/_media/geda_gschem_screenshot_001.jpg
-share/doc/geda-doc/wiki/_media/geda_gschem_workflow_01.jpg
-share/doc/geda-doc/wiki/_media/geda_net.jpg
-share/doc/geda-doc/wiki/_media/geda_nets.jpg
-share/doc/geda-doc/wiki/_media/geda_rf_cascade_figure1.jpg
-share/doc/geda-doc/wiki/_media/geda_rf_cascade_figure2.jpg
-share/doc/geda-doc/wiki/_media/geda_status_screenshot.jpg
-share/doc/geda-doc/wiki/_media/geda_switcap_figure1.jpg
-share/doc/geda-doc/wiki/_media/geda_switcap_figure2.jpg
-share/doc/geda-doc/wiki/_media/geda_switcap_figure3.jpg
-share/doc/geda-doc/wiki/_media/geda_switcap_figure4.jpg
-share/doc/geda-doc/wiki/_media/geda_terminal_screenshot_001.jpg
-share/doc/geda-doc/wiki/_media/tragesym_acroread_selectiontable.png
-share/doc/geda-doc/wiki/_media/tragesym_gschem_finished.png
-share/doc/geda-doc/wiki/_media/tragesym_gschem_showhidden.png
-share/doc/geda-doc/wiki/_media/tragesym_kpdf_pinconfiguration.png
-share/doc/geda-doc/wiki/_media/tragesym_kpdf_pindescription.png
-share/doc/geda-doc/wiki/_media/tragesym_ooo_attributes.png
-share/doc/geda-doc/wiki/_media/tragesym_ooo_changedpins.png
-share/doc/geda-doc/wiki/_media/tragesym_ooo_rearanged.png
-share/doc/geda-doc/wiki/_media/tragesym_ooo_selection.png
-share/doc/geda-doc/wiki/_media/tragesym_template
-share/doc/geda-doc/wiki/_media/tragesym_template.txt
-share/doc/geda-doc/wiki/_media/tragesym_xemacs_modifiedselection.png
-share/doc/geda-doc/wiki/_media/tragesym_xemacs_rawselection.png
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_app_a.html
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_app_b.html
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_app_c.html
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_components_symbols_objects_attributes.html
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_electrical_connectivity.html
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_how_to_ask_questions.html
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_installing_gschem.html
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_resources.html
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_the_main_window.html
-share/doc/geda-doc/wiki/docs_20060124_gschem_ug_the_status_window.html
-share/doc/geda-doc/wiki/geda_bom_readme.html
-share/doc/geda-doc/wiki/geda_covered_mp.html
-share/doc/geda-doc/wiki/geda_covered_rv.html
-share/doc/geda-doc/wiki/geda_csygas.html
-share/doc/geda-doc/wiki/geda_cygwin.html
-share/doc/geda-doc/wiki/geda_debian.html
-share/doc/geda-doc/wiki/geda_documentation.html
-share/doc/geda-doc/wiki/geda_eagle_pcb_netlister_readme.html
-share/doc/geda-doc/wiki/geda_example_hsm.html
-share/doc/geda-doc/wiki/geda_example_usbjtag.html
-share/doc/geda-doc/wiki/geda_faq-attribs.html
-share/doc/geda-doc/wiki/geda_faq-gnetlist.html
-share/doc/geda-doc/wiki/geda_faq-gsch2pcb.html
-share/doc/geda-doc/wiki/geda_faq-gschem.html
-share/doc/geda-doc/wiki/geda_faq-simulation.html
-share/doc/geda-doc/wiki/geda_faq.html
-share/doc/geda-doc/wiki/geda_fbabgapp.html
-share/doc/geda-doc/wiki/geda_fc1.html
-share/doc/geda-doc/wiki/geda_fc2.html
-share/doc/geda-doc/wiki/geda_fc3.html
-share/doc/geda-doc/wiki/geda_fc4.html
-share/doc/geda-doc/wiki/geda_file_format_spec.html
-share/doc/geda-doc/wiki/geda_footprint_creation.html
-share/doc/geda-doc/wiki/geda_gattrib_readme.html
-share/doc/geda-doc/wiki/geda_gerbv_mp.html
-share/doc/geda-doc/wiki/geda_gerbv_pnp_readme.html
-share/doc/geda-doc/wiki/geda_gfdl.html
-share/doc/geda-doc/wiki/geda_glossary.html
-share/doc/geda-doc/wiki/geda_gnetlist_mp.html
-share/doc/geda-doc/wiki/geda_gnetlist_ug.html
-share/doc/geda-doc/wiki/geda_grcsan.html
-share/doc/geda-doc/wiki/geda_grenum_mp.html
-share/doc/geda-doc/wiki/geda_gsch2pcb_readme.html
-share/doc/geda-doc/wiki/geda_gschem2pcb_readme.html
-share/doc/geda-doc/wiki/geda_gschem_mp.html
-share/doc/geda-doc/wiki/geda_gschem_ug.html
-share/doc/geda-doc/wiki/geda_gsymcheck_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_lxt2miner_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_lxt2vcd_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_mvl2lxt_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_mvl2vcd_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_tex2vcd_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_tla2vcd_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_vcd2lxt2_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_vcd2lxt_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_vcd2vzt_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_vzt2vcd_mp.html
-share/doc/geda-doc/wiki/geda_gtkwave_vztminer_mp.html
-share/doc/geda-doc/wiki/geda_hse_howto.html
-share/doc/geda-doc/wiki/geda_icarus_anc.html
-share/doc/geda-doc/wiki/geda_icarus_extensions.html
-share/doc/geda-doc/wiki/geda_icarus_glossary.html
-share/doc/geda-doc/wiki/geda_icarus_ieee1364.html
-share/doc/geda-doc/wiki/geda_icarus_mp.html
-share/doc/geda-doc/wiki/geda_icarus_opcodes.html
-share/doc/geda-doc/wiki/geda_icarus_quick_start.html
-share/doc/geda-doc/wiki/geda_icarus_readme.html
-share/doc/geda-doc/wiki/geda_icarus_vpi_mp.html
-share/doc/geda-doc/wiki/geda_icarus_vpi_within_vvp.html
-share/doc/geda-doc/wiki/geda_icarus_vvp_runtime.html
-share/doc/geda-doc/wiki/geda_icarus_vvp_simulation.html
-share/doc/geda-doc/wiki/geda_icarus_xilinx_hints.html
-share/doc/geda-doc/wiki/geda_icarus_xnf.html
-share/doc/geda-doc/wiki/geda_igarus_fpga_lcg.html
-share/doc/geda-doc/wiki/geda_installation.html
-share/doc/geda-doc/wiki/geda_installed_plugins.html
-share/doc/geda-doc/wiki/geda_kig_howto.html
-share/doc/geda-doc/wiki/geda_master_attributes_list.html
-share/doc/geda-doc/wiki/geda_mcalc_readme.html
-share/doc/geda-doc/wiki/geda_na_howto.html
-share/doc/geda-doc/wiki/geda_ngnutmeg_mp.html
-share/doc/geda-doc/wiki/geda_ngsconvert_mp.html
-share/doc/geda-doc/wiki/geda_ngspice_mp.html
-share/doc/geda-doc/wiki/geda_olib_readme.html
-share/doc/geda-doc/wiki/geda_pcb-quick_reference.html
-share/doc/geda-doc/wiki/geda_pcb.html
-share/doc/geda-doc/wiki/geda_pcb_mp.html
-share/doc/geda-doc/wiki/geda_pcb_tips.html
-share/doc/geda-doc/wiki/geda_pcb_ug.html
-share/doc/geda-doc/wiki/geda_scg.html
-share/doc/geda-doc/wiki/geda_sdb_howto.html
-share/doc/geda-doc/wiki/geda_sn_readme.html
-share/doc/geda-doc/wiki/geda_ssan.html
-share/doc/geda-doc/wiki/geda_style_guide.html
-share/doc/geda-doc/wiki/geda_suse_10.html
-share/doc/geda-doc/wiki/geda_suse_9.html
-share/doc/geda-doc/wiki/geda_syntax_features.html
-share/doc/geda-doc/wiki/geda_systemc_netlister_readme.html
-share/doc/geda-doc/wiki/geda_tasks.html
-share/doc/geda-doc/wiki/geda_todos.html
-share/doc/geda-doc/wiki/geda_tragesym_readme.html
-share/doc/geda-doc/wiki/geda_tragesym_tutorial.html
-share/doc/geda-doc/wiki/geda_ubuntu.html
-share/doc/geda-doc/wiki/geda_usage.html
-share/doc/geda-doc/wiki/geda_vams_netlister_readme.html
-share/doc/geda-doc/wiki/geda_verilog_netlister_readme.html
-share/doc/geda-doc/wiki/geda_vhdl_netlister_readme.html
-share/doc/geda-doc/wiki/geda_wcalc_mp.html
-share/doc/geda-doc/wiki/geda_wcalc_readme.html
-share/doc/geda-doc/wiki/geda_wcalc_stdio_mp.html
-share/doc/geda-doc/wiki/index.html
-share/doc/geda-doc/wiki/lib/exe/001css
-share/doc/geda-doc/wiki/lib/exe/css
-share/doc/geda-doc/wiki/lib/images/error.png
-share/doc/geda-doc/wiki/lib/images/fileicons/conf.png
-share/doc/geda-doc/wiki/lib/images/fileicons/deb.png
-share/doc/geda-doc/wiki/lib/images/fileicons/doc.png
-share/doc/geda-doc/wiki/lib/images/fileicons/file.png
-share/doc/geda-doc/wiki/lib/images/fileicons/gz.png
-share/doc/geda-doc/wiki/lib/images/fileicons/htm.png
-share/doc/geda-doc/wiki/lib/images/fileicons/html.png
-share/doc/geda-doc/wiki/lib/images/fileicons/odc.png
-share/doc/geda-doc/wiki/lib/images/fileicons/odf.png
-share/doc/geda-doc/wiki/lib/images/fileicons/odg.png
-share/doc/geda-doc/wiki/lib/images/fileicons/odi.png
-share/doc/geda-doc/wiki/lib/images/fileicons/odp.png
-share/doc/geda-doc/wiki/lib/images/fileicons/ods.png
-share/doc/geda-doc/wiki/lib/images/fileicons/odt.png
-share/doc/geda-doc/wiki/lib/images/fileicons/pdf.png
-share/doc/geda-doc/wiki/lib/images/fileicons/ppt.png
-share/doc/geda-doc/wiki/lib/images/fileicons/ps.png
-share/doc/geda-doc/wiki/lib/images/fileicons/rpm.png
-share/doc/geda-doc/wiki/lib/images/fileicons/rtf.png
-share/doc/geda-doc/wiki/lib/images/fileicons/sxc.png
-share/doc/geda-doc/wiki/lib/images/fileicons/sxd.png
-share/doc/geda-doc/wiki/lib/images/fileicons/sxi.png
-share/doc/geda-doc/wiki/lib/images/fileicons/sxw.png
-share/doc/geda-doc/wiki/lib/images/fileicons/tgz.png
-share/doc/geda-doc/wiki/lib/images/fileicons/txt.png
-share/doc/geda-doc/wiki/lib/images/fileicons/xls.png
-share/doc/geda-doc/wiki/lib/images/fileicons/xml.png
-share/doc/geda-doc/wiki/lib/images/fileicons/zip.png
-share/doc/geda-doc/wiki/lib/images/info.png
-share/doc/geda-doc/wiki/lib/images/interwiki.png
-share/doc/geda-doc/wiki/lib/images/interwiki/amazon.de.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/amazon.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/amazon.uk.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/bug.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/coral.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/doku.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/google.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/meatball.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/phpfn.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/sb.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/wiki.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/wp.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/wpde.gif
-share/doc/geda-doc/wiki/lib/images/interwiki/wpmeta.gif
-share/doc/geda-doc/wiki/lib/images/smileys/icon_smile.gif
-share/doc/geda-doc/wiki/lib/images/smileys/icon_wink.gif
-share/doc/geda-doc/wiki/lib/images/success.png
-share/doc/geda-doc/wiki/lib/plugins/definitionlist/images/bullet.gif
-share/doc/geda-doc/wiki/lib/plugins/note/images/important.png
-share/doc/geda-doc/wiki/lib/plugins/note/images/note.png
-share/doc/geda-doc/wiki/lib/plugins/note/images/tip.png
-share/doc/geda-doc/wiki/lib/plugins/note/images/warning.png
-share/doc/geda-doc/wiki/lib/tpl/default/images/closed.gif
-share/doc/geda-doc/wiki/lib/tpl/default/images/favicon
-share/doc/geda-doc/wiki/lib/tpl/default/images/link_icon.gif
-share/doc/geda-doc/wiki/lib/tpl/default/images/mail_icon.gif
-share/doc/geda-doc/wiki/lib/tpl/default/images/open.gif
-share/doc/geda-doc/wiki/lib/tpl/default/images/tocdot2.gif
-share/doc/geda-doc/wiki/lib/tpl/default/images/windows.gif
-share/doc/geda-doc/wiki/start_es.html
-share/doc/geda-doc/wiki/start_fr.html
-@dirrm share/doc/geda-doc/wiki/lib/tpl/default/images
-@dirrm share/doc/geda-doc/wiki/lib/tpl/default
-@dirrm share/doc/geda-doc/wiki/lib/tpl
-@dirrm share/doc/geda-doc/wiki/lib/plugins/note/images
-@dirrm share/doc/geda-doc/wiki/lib/plugins/note
-@dirrm share/doc/geda-doc/wiki/lib/plugins/definitionlist/images
-@dirrm share/doc/geda-doc/wiki/lib/plugins/definitionlist
-@dirrm share/doc/geda-doc/wiki/lib/plugins
-@dirrm share/doc/geda-doc/wiki/lib/images/smileys
-@dirrm share/doc/geda-doc/wiki/lib/images/interwiki
-@dirrm share/doc/geda-doc/wiki/lib/images/fileicons
-@dirrm share/doc/geda-doc/wiki/lib/images
-@dirrm share/doc/geda-doc/wiki/lib/exe
-@dirrm share/doc/geda-doc/wiki/lib
-@dirrm share/doc/geda-doc/wiki/_media
-@dirrm share/doc/geda-doc/wiki/_detail
-@dirrm share/doc/geda-doc/wiki
-@dirrm share/doc/geda-doc/tutorials/gsch2pcb/images
-@dirrm share/doc/geda-doc/tutorials/gsch2pcb
-@dirrm share/doc/geda-doc/tutorials
-@unexec ${RMDIR} %D/share/doc/geda-doc 2>/dev/null || ${TRUE}
diff --git a/cad/geda-docs/PLIST.post b/cad/geda-docs/PLIST.post
new file mode 100644
index 00000000000..205c029091d
--- /dev/null
+++ b/cad/geda-docs/PLIST.post
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.post,v 1.1 2007/02/21 13:23:57 dmcmahill Exp $
+@dirrm share/doc/geda-doc/tutorials/gsch2pcb/images
+@dirrm share/doc/geda-doc/tutorials/gsch2pcb
+@dirrm share/doc/geda-doc/tutorials
+@unexec ${RMDIR} %D/share/doc/geda-doc 2>/dev/null || ${TRUE}
diff --git a/cad/geda-docs/PLIST.pre b/cad/geda-docs/PLIST.pre
new file mode 100644
index 00000000000..eec41d78b57
--- /dev/null
+++ b/cad/geda-docs/PLIST.pre
@@ -0,0 +1,26 @@
+@comment $NetBSD: PLIST.pre,v 1.1 2007/02/21 13:23:57 dmcmahill Exp $
+share/doc/geda-doc/gedadocs.html
+share/doc/geda-doc/tutorials/gsch2pcb/gschem-warmup.html
+share/doc/geda-doc/tutorials/gsch2pcb/images/board-1.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/board-2.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/board-3.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/board-4.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/board-5.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/board-6.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/gschem-sym-1.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/gschem-sym-2.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/gschem-sym-3.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/one-sch-1.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/one-sch-2.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/one-sch-3.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/paper1.gif
+share/doc/geda-doc/tutorials/gsch2pcb/images/pcb-el-1.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/pcb-el-2.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/two-sch-1.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/two-sch-2.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/warmup-0.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/warmup-1.png
+share/doc/geda-doc/tutorials/gsch2pcb/images/warmup-2.png
+share/doc/geda-doc/tutorials/gsch2pcb/transistor-guide.html
+share/doc/geda-doc/tutorials/gsch2pcb/tutorial-old.html
+share/doc/geda-doc/tutorials/gsch2pcb/tutorial.html
diff --git a/cad/geda-docs/distinfo b/cad/geda-docs/distinfo
index 173d57278be..9a5d4c94e3e 100644
--- a/cad/geda-docs/distinfo
+++ b/cad/geda-docs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2006/10/23 09:43:13 dmcmahill Exp $
+$NetBSD: distinfo,v 1.18 2007/02/21 13:23:57 dmcmahill Exp $
 
-SHA1 (geda/geda-docs-20061020.tar.gz) = 8b93c1518deff6f18133a2b896f9d72b5440bcd6
-RMD160 (geda/geda-docs-20061020.tar.gz) = 6a37af4c04e784df98eec2fd9713b88c4980ae50
-Size (geda/geda-docs-20061020.tar.gz) = 3110190 bytes
+SHA1 (geda/geda-docs-20070216.tar.gz) = 04a74038e37672e567972f8ecdcc608c659687c7
+RMD160 (geda/geda-docs-20070216.tar.gz) = 70977902fe4cd9545f5f6a42138680c7c702848f
+Size (geda/geda-docs-20070216.tar.gz) = 3364816 bytes
diff --git a/cad/geda-examples/PLIST b/cad/geda-examples/PLIST
index f3c9e2c247c..e3f434b1265 100644
--- a/cad/geda-examples/PLIST
+++ b/cad/geda-examples/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/06/15 01:50:58 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/02/21 13:23:57 dmcmahill Exp $
 share/examples/geda/AUTHORS
 share/examples/geda/COPYING
 share/examples/geda/ChangeLog
@@ -76,7 +76,6 @@ share/examples/geda/lightning_detector/lightning.sch.bom
 share/examples/geda/lightning_detector/sym/2N4401.sym
 share/examples/geda/lightning_detector/sym/2N4403.sym
 share/examples/geda/missing
-share/examples/geda/mkinstalldirs
 @dirrm share/examples/geda/lightning_detector/sym
 @dirrm share/examples/geda/lightning_detector
 @dirrm share/examples/geda/gTAG
diff --git a/cad/geda-examples/distinfo b/cad/geda-examples/distinfo
index a9740fb7aaf..b5a645d313a 100644
--- a/cad/geda-examples/distinfo
+++ b/cad/geda-examples/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2006/10/23 09:43:13 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2007/02/21 13:23:57 dmcmahill Exp $
 
-SHA1 (geda/geda-examples-20061020.tar.gz) = 324ae7c23018b76b74c847487be231eecc9e9959
-RMD160 (geda/geda-examples-20061020.tar.gz) = 241d15dc4f48578ac1977579450fc2ab8a9295a8
-Size (geda/geda-examples-20061020.tar.gz) = 247995 bytes
+SHA1 (geda/geda-examples-20070216.tar.gz) = e135b83124259002e9dee7e1da37d34a392639b7
+RMD160 (geda/geda-examples-20070216.tar.gz) = 458550f836e3681bfbdec38552b1681b4a7fcabf
+Size (geda/geda-examples-20070216.tar.gz) = 253241 bytes
diff --git a/cad/geda-symbols/PLIST b/cad/geda-symbols/PLIST
index 702f63ee592..27b84907fee 100644
--- a/cad/geda-symbols/PLIST
+++ b/cad/geda-symbols/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2006/10/23 09:43:13 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/02/21 13:23:55 dmcmahill Exp $
 share/doc/geda-doc/nc.pdf
 share/gEDA/sym/4000/4000-1.sym
 share/gEDA/sym/4000/4000-2.sym
@@ -786,6 +786,7 @@ share/gEDA/sym/font/N-acute-accent.sym
 share/gEDA/sym/font/N-tilde.sym
 share/gEDA/sym/font/N.sym
 share/gEDA/sym/font/O-acute-accent.sym
+share/gEDA/sym/font/O-double-acute-accent.sym
 share/gEDA/sym/font/O-diaeresis.sym
 share/gEDA/sym/font/O-slash.sym
 share/gEDA/sym/font/O.sym
@@ -797,6 +798,7 @@ share/gEDA/sym/font/S.sym
 share/gEDA/sym/font/T.sym
 share/gEDA/sym/font/U-acute-accent.sym
 share/gEDA/sym/font/U-diaeresis.sym
+share/gEDA/sym/font/U-double-acute-accent.sym
 share/gEDA/sym/font/U.sym
 share/gEDA/sym/font/V.sym
 share/gEDA/sym/font/W.sym
@@ -848,12 +850,14 @@ share/gEDA/sym/font/lparen.sym
 share/gEDA/sym/font/m_.sym
 share/gEDA/sym/font/minus.sym
 share/gEDA/sym/font/more.sym
+share/gEDA/sym/font/mu_.sym
 share/gEDA/sym/font/n_-acute-accent.sym
 share/gEDA/sym/font/n_-tilde.sym
 share/gEDA/sym/font/n_.sym
 share/gEDA/sym/font/newline.sym
 share/gEDA/sym/font/o_-acute-accent.sym
 share/gEDA/sym/font/o_-diaeresis.sym
+share/gEDA/sym/font/o_-double-acute-accent.sym
 share/gEDA/sym/font/o_-slash.sym
 share/gEDA/sym/font/o_.sym
 share/gEDA/sym/font/p_.sym
diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo
index a21d18244c9..aa362d85267 100644
--- a/cad/geda-symbols/distinfo
+++ b/cad/geda-symbols/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2006/10/23 09:43:13 dmcmahill Exp $
+$NetBSD: distinfo,v 1.18 2007/02/21 13:23:55 dmcmahill Exp $
 
-SHA1 (geda/geda-symbols-20061020.tar.gz) = cfb93b9f15e70bf14021f75731960092230d809e
-RMD160 (geda/geda-symbols-20061020.tar.gz) = 8ebb5252b33948d2c08f208662bc25595b50b58e
-Size (geda/geda-symbols-20061020.tar.gz) = 685214 bytes
+SHA1 (geda/geda-symbols-20070216.tar.gz) = 26c04131ea0791492ade3a5b9d687eecc8767a46
+RMD160 (geda/geda-symbols-20070216.tar.gz) = 4aa2b27bfb8c4585dd8c730466d2e14ff42c10cc
+Size (geda/geda-symbols-20070216.tar.gz) = 704359 bytes
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index e4b209457b1..919073f35ce 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/09/01 12:00:43 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.39 2007/02/21 13:23:54 dmcmahill Exp $
 #
 
 DISTNAME=		geda-utils-${PKGVERSION}
@@ -15,7 +15,14 @@ CONFLICTS+=		gEDA<19991011
 .include "../../cad/geda/Makefile.common"
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		lex perl:run pkg-config
+# for gsch2pcb
+EVAL_PREFIX+=		PCBDIR=pcb
+CONFIGURE_ARGS+=	--with-pcb-datadir=${PCBDIR}/share
+USE_TOOLS+=		gawk:run lex perl:run pkg-config
+
+# for gnet_hier_verilog.sh.  It looks to be fairly bash
+# dependent
+DEPENDS+=		bash-[0-9]*{,nb[0-9]*}:../../shells/bash
 
 # let (f)lex rebuild this file.  The distributed one doesn't
 # always work.
@@ -29,6 +36,12 @@ REPLACE.python.old=	.*/bin/python
 REPLACE.python.new=	${PYDIR}/bin/python
 REPLACE_FILES.python=	scripts/tragesym
 
+EVAL_PREFIX+=		BASHDIR=bash
+REPLACE_INTERPRETER+=	bash
+REPLACE.bash.old=	.*/bin/bash
+REPLACE.bash.new=	${BASHDIR}/bin/bash
+REPLACE_FILES.bash=	scripts/gnet_hier_verilog.sh
+
 REPLACE_PERL+=		scripts/pads_backannotate \
 			scripts/gschupdate \
 			scripts/gsymfix.pl \
diff --git a/cad/geda-utils/PLIST b/cad/geda-utils/PLIST
index 26fda6549b1..282eae989f5 100644
--- a/cad/geda-utils/PLIST
+++ b/cad/geda-utils/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2005/08/23 00:02:20 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/02/21 13:23:54 dmcmahill Exp $
 bin/convert_sym
 bin/garchive
 bin/gmk_sym
+bin/gnet_hier_verilog.sh
 bin/grenum
 bin/gsch2pcb
 bin/gschemdoc
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index a89eafe1535..004aea9b8b5 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.18 2006/12/20 23:43:40 dmcmahill Exp $
+$NetBSD: distinfo,v 1.19 2007/02/21 13:23:54 dmcmahill Exp $
 
-SHA1 (geda/geda-utils-20061020.tar.gz) = 892ff9fd664054838f6e1f925e959f85cfcee916
-RMD160 (geda/geda-utils-20061020.tar.gz) = 0a93851ae554edf1b30ffa3021e7c22b9fd9b781
-Size (geda/geda-utils-20061020.tar.gz) = 268215 bytes
-SHA1 (patch-aa) = 5be550c049164dfe780f80032965fd18ab34c86b
+SHA1 (geda/geda-utils-20070216.tar.gz) = 19c702b4b485d0d6c8e32f357d7cb972b52da021
+RMD160 (geda/geda-utils-20070216.tar.gz) = b5d88ca52e4c003c4e0f8d3c7de68b30a7efd92f
+Size (geda/geda-utils-20070216.tar.gz) = 290743 bytes
diff --git a/cad/geda-utils/patches/patch-aa b/cad/geda-utils/patches/patch-aa
deleted file mode 100644
index b68f9f0f380..00000000000
--- a/cad/geda-utils/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/12/20 23:43:40 dmcmahill Exp $
-
-Already exists upstream.  Needed for compilers such as sun studio compilers
-that do not define __FUNCTION__
-
---- src/convert_sym.c.orig	2006-08-02 09:34:19.000000000 -0400
-+++ src/convert_sym.c
-@@ -51,4 +51,12 @@
- #endif
- 
-+
-+/* __FUNCTION__ seems to be a gcc thing */
-+#ifndef __GNUC__
-+#define __FUNCTION1(a,b) a ":" #b
-+#define __FUNCTION2(a,b) __FUNCTION1(a,b)
-+#define __FUNCTION__ __FUNCTION2(__FILE__,__LINE__)
-+#endif
-+
- #if 0 /* removed by AVH just to make a -Wall -Werror happy */
- #ifndef lint
diff --git a/cad/geda/Makefile.common b/cad/geda/Makefile.common
index fe548640548..a2ffed61446 100644
--- a/cad/geda/Makefile.common
+++ b/cad/geda/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.10 2006/10/23 09:43:13 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.11 2007/02/21 13:23:57 dmcmahill Exp $
 #
 
 DIST_SUBDIR=	geda
-PKGVERSION=	20061020
+PKGVERSION=	20070216
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 		http://www.geda.seul.org/devel/${PKGVERSION}/
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index f753c66d240..2fb5a70b108 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2006/12/21 00:19:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.22 2007/02/21 13:23:53 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20061020.tar.gz) = b4f2121464ff22db8f0eb08a398df91b055032b2
-RMD160 (geda/geda-gnetlist-20061020.tar.gz) = c05d3bee1db520c8f86c0e4ca6b1707b9c0b4cf8
-Size (geda/geda-gnetlist-20061020.tar.gz) = 332027 bytes
+SHA1 (geda/geda-gnetlist-20070216.tar.gz) = 873a8cec8cb674e0a9d2656baf6255d6d3d2a19e
+RMD160 (geda/geda-gnetlist-20070216.tar.gz) = eea0076b964d178c8d8dab71aab0978da6ebb6de
+Size (geda/geda-gnetlist-20070216.tar.gz) = 355709 bytes
 SHA1 (patch-aa) = 1fdc681538545f5712a423bc62b1ce89fbc7ff4c
diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa
deleted file mode 100644
index e1d0ba69872..00000000000
--- a/cad/gnetlist/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2006/12/21 00:19:54 dmcmahill Exp $
-
-work around compilers without __FUNCTION__ like sun studio compilers.
-Patch is already in the upstream sources.
-
---- utils/mk_verilog_syms.c.orig	2005-02-04 18:14:31.000000000 -0500
-+++ utils/mk_verilog_syms.c
-@@ -46,6 +46,12 @@
- #define CYAN		6
- #define GREY		7
- 
-+/* __FUNCTION__ seems to be a gcc extension */
-+#ifndef __GNUC__
-+#define __FUNCTION1(a,b) a ":" #b
-+#define __FUNCTION2(a,b) __FUNCTION1(a,b)
-+#define __FUNCTION__ __FUNCTION2(__FILE__,__LINE__)
-+#endif
- 
- /* external prototypes */
- int GetStringDisplayLength(char *str,int font_size);  /* char_width.c */
diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST
index 2cb8b8dcaef..ac3d4ff9cf7 100644
--- a/cad/gschem/PLIST
+++ b/cad/gschem/PLIST
@@ -1,17 +1,34 @@
-@comment $NetBSD: PLIST,v 1.17 2006/10/21 19:22:23 rillig Exp $
+@comment $NetBSD: PLIST,v 1.18 2007/02/21 13:23:53 dmcmahill Exp $
 bin/gschem
 man/man1/gschem.1
+share/gEDA/bitmap/gschem-alignment_bottomright.png
+share/gEDA/bitmap/gschem-alignment_middlecenter.png
+share/gEDA/bitmap/gschem-alignment_middleleft.png
+share/gEDA/bitmap/gschem-alignment_middleright.png
+share/gEDA/bitmap/gschem-alignment_topcenter.png
+share/gEDA/bitmap/gschem-alignment_topleft.png
+share/gEDA/bitmap/gschem-alignment_topright.png
+share/gEDA/bitmap/gschem-alignment_unchanged.png
+share/gEDA/bitmap/gschem-bottom2top.png
 share/gEDA/bitmap/gschem-bus.xpm
 share/gEDA/bitmap/gschem-comp.xpm
 share/gEDA/bitmap/gschem-copy.xpm
 share/gEDA/bitmap/gschem-delete.xpm
+share/gEDA/bitmap/gschem-diagonal.png
 share/gEDA/bitmap/gschem-edit.xpm
+share/gEDA/bitmap/gschem-fileorder.png
+share/gEDA/bitmap/gschem-filltype_filled.png
+share/gEDA/bitmap/gschem-filltype_hatch.png
+share/gEDA/bitmap/gschem-filltype_hollow.png
+share/gEDA/bitmap/gschem-filltype_mesh.png
+share/gEDA/bitmap/gschem-left2right.png
 share/gEDA/bitmap/gschem-mirror.xpm
 share/gEDA/bitmap/gschem-move.xpm
 share/gEDA/bitmap/gschem-net.xpm
 share/gEDA/bitmap/gschem-new.xpm
 share/gEDA/bitmap/gschem-open.xpm
 share/gEDA/bitmap/gschem-redo.xpm
+share/gEDA/bitmap/gschem-right2left.png
 share/gEDA/bitmap/gschem-rotate.xpm
 share/gEDA/bitmap/gschem-save.xpm
 share/gEDA/bitmap/gschem-select.xpm
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index 3dbfe05e554..46bb4da0ab7 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.23 2006/12/24 10:20:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.24 2007/02/21 13:23:53 dmcmahill Exp $
 
-SHA1 (geda/geda-gschem-20061020.tar.gz) = 828bc6517fefc3a5f36c7e5a57752e0315eb2c6e
-RMD160 (geda/geda-gschem-20061020.tar.gz) = 83166aae8be23d7a21ebf82d82a5b4cae97f1350
-Size (geda/geda-gschem-20061020.tar.gz) = 943519 bytes
-SHA1 (patch-aa) = 3f95395d0b9563422401b04e929ee1ef406f5313
-SHA1 (patch-ab) = cea6b45ebd34dd846bcef6a0967b4644e077cc7e
-SHA1 (patch-ac) = 5468fa9fb00b7a193a8139078a7383f4b4d543ac
+SHA1 (geda/geda-gschem-20070216.tar.gz) = 7aaa669f8e25f89f99259f0bfb39efee2f932a86
+RMD160 (geda/geda-gschem-20070216.tar.gz) = 76924c6970784a02d54ed47c5a72bd0325805dba
+Size (geda/geda-gschem-20070216.tar.gz) = 1053241 bytes
+SHA1 (patch-aa) = 6e1f3926d3f9019ed7032575bd81faeefe2b3d2e
diff --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa
deleted file mode 100644
index 3977e8b200e..00000000000
--- a/cad/gschem/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2006/12/21 02:49:28 dmcmahill Exp $
-
-Make this work with non-gcc.  Patch in upstream sources already.
-
---- include/globals.h.orig	2006-09-30 13:03:21.000000000 -0400
-+++ include/globals.h
-@@ -97,5 +97,19 @@ extern SCM new_page_hook;
- # define N_(String) (String)
- #endif
- 
-+/*
-+ * __attribute__((unused)) is a gcc extension so define
-+ * a portable macro, ATTRIBUTE_UNUSED, to use instead
-+ */
-+#ifndef GCC_VERSION
-+#define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-+#endif /* GCC_VERSION */
-+
-+#if GCC_VERSION > 2007
-+#define ATTRIBUTE_UNUSED __attribute__((unused))
-+#else
-+#define ATTRIBUTE_UNUSED
-+#endif
-+
- /*EK* used by prototype.h */
- #include "../include/x_states.h"
diff --git a/cad/gschem/patches/patch-ab b/cad/gschem/patches/patch-ab
deleted file mode 100644
index 91015b2d9ff..00000000000
--- a/cad/gschem/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2006/10/21 19:22:12 rillig Exp $
-
---- scripts/makeimages.orig	2006-02-26 20:33:59.000000000 +0100
-+++ scripts/makeimages	2006-10-21 21:19:12.000000000 +0200
-@@ -7,9 +7,9 @@
- # 	- ghostscript (I use aladdin gs)
- #
- 
--if [ "$1" == "" ] 
-+if [ $# -ne 1 ]
- then
--	echo "usage: makeimages path_to_libary" 
-+	echo "usage: makeimages path_to_libary" 1>&2
- 	exit 1
- fi
- 
diff --git a/cad/gschem/patches/patch-ac b/cad/gschem/patches/patch-ac
deleted file mode 100644
index 45b5280ab50..00000000000
--- a/cad/gschem/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2006/12/24 10:20:34 dmcmahill Exp $
-
-Make this work with non-gcc.  Patch in upstream sources already.
-
---- src/x_menus.c.orig	2006-08-06 12:45:29.000000000 -0400
-+++ src/x_menus.c
-@@ -239,7 +239,7 @@ void get_main_menu(TOPLEVEL * w_current,
-  *
-  */
- static gchar* gettext_fn(const gchar *path,
--			 gpointer func_data __attribute__((unused)))
-+			 gpointer func_data ATTRIBUTE_UNUSED)
- {
- 	return gettext(path);
- }
diff --git a/cad/gsymcheck/distinfo b/cad/gsymcheck/distinfo
index 2096746ba19..58d9f51d187 100644
--- a/cad/gsymcheck/distinfo
+++ b/cad/gsymcheck/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2006/10/23 09:43:13 dmcmahill Exp $
+$NetBSD: distinfo,v 1.18 2007/02/21 13:23:54 dmcmahill Exp $
 
-SHA1 (geda/geda-gsymcheck-20061020.tar.gz) = 2902c254dfa8c7e7906bc2be8a83301ad5dc05ba
-RMD160 (geda/geda-gsymcheck-20061020.tar.gz) = de9536f60ec9ab8522e19a587b15a6833fe7952b
-Size (geda/geda-gsymcheck-20061020.tar.gz) = 138184 bytes
+SHA1 (geda/geda-gsymcheck-20070216.tar.gz) = a1ccd05b484eecfa167edb973a89c6ee269f5760
+RMD160 (geda/geda-gsymcheck-20070216.tar.gz) = e9314ea34712955b2bd2bb3d035419fee5519f37
+Size (geda/geda-gsymcheck-20070216.tar.gz) = 144701 bytes
diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk
index b049ab201b5..0a2b91339ee 100644
--- a/cad/libgeda/buildlink3.mk
+++ b/cad/libgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2006/10/23 09:43:12 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2007/02/21 13:23:52 dmcmahill Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGEDA_BUILDLINK3_MK:=	${LIBGEDA_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libgeda
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgeda
 
 .if !empty(LIBGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libgeda+=	libgeda-20061020{,nb[0-9]*}
-BUILDLINK_ABI_DEPENDS.libgeda?=	libgeda>=20061020
+BUILDLINK_API_DEPENDS.libgeda+=	libgeda-20070216{,nb[0-9]*}
+BUILDLINK_ABI_DEPENDS.libgeda?=	libgeda-20070216{,nb[0-9]*}
 BUILDLINK_PKGSRCDIR.libgeda?=	../../cad/libgeda
 .endif	# LIBGEDA_BUILDLINK3_MK
 
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index 17fe075ebf1..176b82deccc 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2006/10/23 09:43:12 dmcmahill Exp $
+$NetBSD: distinfo,v 1.18 2007/02/21 13:23:52 dmcmahill Exp $
 
-SHA1 (geda/libgeda-20061020.tar.gz) = eaa691ce88a60f85925bff3f8ee8c9dc5d8a76d6
-RMD160 (geda/libgeda-20061020.tar.gz) = b62ef82138c967f0c935d0bc7d6a0bf319c46f0d
-Size (geda/libgeda-20061020.tar.gz) = 615370 bytes
+SHA1 (geda/libgeda-20070216.tar.gz) = 61deb94b64cff6dec251e87af639da6aa5ebce0a
+RMD160 (geda/libgeda-20070216.tar.gz) = ca8441cfc3caa21c59ccbe2dbc47455dd4264071
+Size (geda/libgeda-20070216.tar.gz) = 625853 bytes