Fix pkg-plist

2 files changed, 67 insertions, 85 deletions

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 3da5e33e26c1..2da01c83a63c 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 0504d5ca368d..76aca538b331 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -30,7 +30,6 @@ share/appdata/kicad.appdata.xml
 %%DESKTOPDIR%%/kicad.desktop
 %%DESKTOPDIR%%/pcbcalculator.desktop
 %%DESKTOPDIR%%/pcbnew.desktop
-%%PORTDOCS%%%%DOCSDIR%%/scripts/ddr3_length_match.py
 %%PORTDOCS%%%%DOCSDIR%%/scripts/lib_convert.py
 %%PORTDOCS%%%%DOCSDIR%%/scripts/test_kicad_plugin.py
 %%PORTDOCS%%%%DOCSDIR%%/scripts/test_plugin.py
@@ -106,74 +105,66 @@ share/icons/hicolor/scalable/apps/pcbnew.svg
 share/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg
 share/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg
 share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
-%%DATADIR%%/demos/complex_hierarchy/ampli_ht.sch
+%%DATADIR%%/demos/complex_hierarchy/ampli_ht.kicad_sch
 %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy-cache.lib
 %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.kicad_pcb
-%%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.net
-%%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.pro
-%%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.sch
+%%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.kicad_pro
+%%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.kicad_sch
+%%DATADIR%%/demos/complex_hierarchy/complex_hierarchy_schlib.kicad_sym
 %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy_schlib.lib
 %%DATADIR%%/demos/complex_hierarchy/fp-lib-table
 %%DATADIR%%/demos/complex_hierarchy/sym-lib-table
-%%DATADIR%%/demos/custom_pads_test/custom_pads_schlib.dcm
+%%DATADIR%%/demos/custom_pads_test/custom_pads_schlib.kicad_sym
 %%DATADIR%%/demos/custom_pads_test/custom_pads_schlib.lib
-%%DATADIR%%/demos/custom_pads_test/custom_pads_test-cache.lib
 %%DATADIR%%/demos/custom_pads_test/custom_pads_test.kicad_pcb
+%%DATADIR%%/demos/custom_pads_test/custom_pads_test.kicad_pro
+%%DATADIR%%/demos/custom_pads_test/custom_pads_test.kicad_sch
 %%DATADIR%%/demos/custom_pads_test/custom_pads_test.lib
-%%DATADIR%%/demos/custom_pads_test/custom_pads_test.net
-%%DATADIR%%/demos/custom_pads_test/custom_pads_test.pro
-%%DATADIR%%/demos/custom_pads_test/custom_pads_test.sch
 %%DATADIR%%/demos/custom_pads_test/sym-lib-table
 %%DATADIR%%/demos/ecc83/3d_shapes/ecc83.wrl
-%%DATADIR%%/demos/ecc83/ecc83-pp-cache.lib
 %%DATADIR%%/demos/ecc83/ecc83-pp.kicad_pcb
-%%DATADIR%%/demos/ecc83/ecc83-pp.pro
-%%DATADIR%%/demos/ecc83/ecc83-pp.sch
-%%DATADIR%%/demos/ecc83/ecc83-pp_v2-cache.lib
+%%DATADIR%%/demos/ecc83/ecc83-pp.kicad_pro
+%%DATADIR%%/demos/ecc83/ecc83-pp.kicad_sch
 %%DATADIR%%/demos/ecc83/ecc83-pp_v2.kicad_pcb
-%%DATADIR%%/demos/ecc83/ecc83-pp_v2.pro
-%%DATADIR%%/demos/ecc83/ecc83-pp_v2.sch
-%%DATADIR%%/demos/ecc83/ecc83_schlib.dcm
-%%DATADIR%%/demos/ecc83/ecc83_schlib.lib
+%%DATADIR%%/demos/ecc83/ecc83-pp_v2.kicad_pro
+%%DATADIR%%/demos/ecc83/ecc83-pp_v2.kicad_sch
+%%DATADIR%%/demos/ecc83/ecc83_schlib.kicad_sym
 %%DATADIR%%/demos/ecc83/fp-lib-table
 %%DATADIR%%/demos/ecc83/sym-lib-table
-%%DATADIR%%/demos/electric/elec-unifil.dcm
-%%DATADIR%%/demos/electric/elec-unifil.lib
-%%DATADIR%%/demos/electric/electric-cache.lib
-%%DATADIR%%/demos/electric/electric.pro
-%%DATADIR%%/demos/electric/electric.sch
+%%DATADIR%%/demos/electric/elec-unifil.kicad_sym
+%%DATADIR%%/demos/electric/electric.kicad_pro
+%%DATADIR%%/demos/electric/electric.kicad_sch
 %%DATADIR%%/demos/electric/sym-lib-table
-%%DATADIR%%/demos/flat_hierarchy/flat_hierarchy-cache.lib
 %%DATADIR%%/demos/flat_hierarchy/flat_hierarchy.kicad_pcb
-%%DATADIR%%/demos/flat_hierarchy/flat_hierarchy.net
+%%DATADIR%%/demos/flat_hierarchy/flat_hierarchy.kicad_pro
+%%DATADIR%%/demos/flat_hierarchy/flat_hierarchy.kicad_sch
 %%DATADIR%%/demos/flat_hierarchy/flat_hierarchy.pro
 %%DATADIR%%/demos/flat_hierarchy/flat_hierarchy.sch
-%%DATADIR%%/demos/flat_hierarchy/flat_hierarchy_schlib.lib
-%%DATADIR%%/demos/flat_hierarchy/pic_programmer.sch
-%%DATADIR%%/demos/flat_hierarchy/pic_sockets.sch
+%%DATADIR%%/demos/flat_hierarchy/fp-lib-table
+%%DATADIR%%/demos/flat_hierarchy/libs/3d_shapes/adjustable_rx2v4.wrl
+%%DATADIR%%/demos/flat_hierarchy/libs/flat_hierarchy_schlib.kicad_sym
+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/RV2X4.kicad_mod
+%%DATADIR%%/demos/flat_hierarchy/pic_programmer.kicad_sch
+%%DATADIR%%/demos/flat_hierarchy/pic_sockets.kicad_sch
 %%DATADIR%%/demos/flat_hierarchy/sym-lib-table
 %%DATADIR%%/demos/interf_u/fp-lib-table
 %%DATADIR%%/demos/interf_u/interf_u.kicad_pcb
+%%DATADIR%%/demos/interf_u/interf_u.kicad_pro
 %%DATADIR%%/demos/interf_u/interf_u.kicad_sch
-%%DATADIR%%/demos/interf_u/interf_u.net
 %%DATADIR%%/demos/interf_u/interf_u.pretty/BUS_PC.kicad_mod
 %%DATADIR%%/demos/interf_u/interf_u.pretty/PGA120.kicad_mod
-%%DATADIR%%/demos/interf_u/interf_u.pro
-%%DATADIR%%/demos/interf_u/interf_u_schlib.dcm
-%%DATADIR%%/demos/interf_u/interf_u_schlib.lib
+%%DATADIR%%/demos/interf_u/interf_u_schlib.kicad_sym
 %%DATADIR%%/demos/interf_u/pagelayout_logo.kicad_wks
 %%DATADIR%%/demos/interf_u/sym-lib-table
 %%DATADIR%%/demos/interf_u/tux.bmp
 %%DATADIR%%/demos/interf_u/tux.kicad_mod
 %%DATADIR%%/demos/interf_u/tux.lib
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/fp-lib-table
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-coldfire_schlib.dcm
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-coldfire_schlib.lib
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.lib
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.kicad_sch
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-coldfire_schlib.kicad_sym
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pro
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_sch
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/FSUPCMS.kicad_mod
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/JACK_ALIM.kicad_mod
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/SM1206POL.kicad_mod
@@ -189,7 +180,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wings
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wrl
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/sym-lib-table
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/xilinx.kicad_sch
 %%DATADIR%%/demos/microwave/microwave.kicad_pcb
 %%DATADIR%%/demos/microwave/microwave.pro
 %%DATADIR%%/demos/microwave/shape1.txt
@@ -212,77 +203,68 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/simulation/laser_driver/ad8009.lib
 %%DATADIR%%/demos/simulation/laser_driver/fzt1049a.lib
 %%DATADIR%%/demos/simulation/laser_driver/laser.lib
-%%DATADIR%%/demos/simulation/laser_driver/laser_driver-cache.lib
-%%DATADIR%%/demos/simulation/laser_driver/laser_driver.pro
-%%DATADIR%%/demos/simulation/laser_driver/laser_driver.sch
-%%DATADIR%%/demos/simulation/laser_driver/laser_driver_schlib.lib
+%%DATADIR%%/demos/simulation/laser_driver/laser_driver.kicad_pro
+%%DATADIR%%/demos/simulation/laser_driver/laser_driver.kicad_sch
+%%DATADIR%%/demos/simulation/laser_driver/laser_driver_schlib.kicad_sym
 %%DATADIR%%/demos/simulation/laser_driver/sym-lib-table
-%%DATADIR%%/demos/simulation/pspice/pspice-cache.lib
-%%DATADIR%%/demos/simulation/pspice/pspice.pro
-%%DATADIR%%/demos/simulation/pspice/pspice.sch
-%%DATADIR%%/demos/simulation/pspice/schematic_libspice.dcm
-%%DATADIR%%/demos/simulation/pspice/schematic_libspice.lib
+%%DATADIR%%/demos/simulation/pspice/pspice.kicad_pro
+%%DATADIR%%/demos/simulation/pspice/pspice.kicad_sch
+%%DATADIR%%/demos/simulation/pspice/schematic_libspice.kicad_sym
 %%DATADIR%%/demos/simulation/pspice/sym-lib-table
 %%DATADIR%%/demos/simulation/rectifier/diode.mod
-%%DATADIR%%/demos/simulation/rectifier/rectifier-cache.lib
+%%DATADIR%%/demos/simulation/rectifier/rectifier.kicad_pro
 %%DATADIR%%/demos/simulation/rectifier/rectifier.kicad_sch
-%%DATADIR%%/demos/simulation/rectifier/rectifier.pro
-%%DATADIR%%/demos/simulation/rectifier/rectifier_schlib.lib
+%%DATADIR%%/demos/simulation/rectifier/rectifier_schlib.kicad_sym
 %%DATADIR%%/demos/simulation/rectifier/sym-lib-table
 %%DATADIR%%/demos/simulation/sallen_key/ad8051.lib
-%%DATADIR%%/demos/simulation/sallen_key/sallen_key-cache.lib
-%%DATADIR%%/demos/simulation/sallen_key/sallen_key.pro
-%%DATADIR%%/demos/simulation/sallen_key/sallen_key.sch
-%%DATADIR%%/demos/simulation/sallen_key/sallen_key_schlib.lib
+%%DATADIR%%/demos/simulation/sallen_key/sallen_key.kicad_pro
+%%DATADIR%%/demos/simulation/sallen_key/sallen_key.kicad_sch
+%%DATADIR%%/demos/simulation/sallen_key/sallen_key_schlib.kicad_sym
 %%DATADIR%%/demos/simulation/sallen_key/sym-lib-table
-%%DATADIR%%/demos/simulation/v_i_sources/v_i_sources-cache.lib
-%%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.pro
-%%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.sch
+%%DATADIR%%/demos/simulation/v_i_sources/sym-lib-table
+%%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.kicad_pro
+%%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.kicad_sch
+%%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.kicad_sym
 %%DATADIR%%/demos/sonde xilinx/fp-lib-table
-%%DATADIR%%/demos/sonde xilinx/sonde xilinx-cache.lib
 %%DATADIR%%/demos/sonde xilinx/sonde xilinx.kicad_pcb
-%%DATADIR%%/demos/sonde xilinx/sonde xilinx.net
-%%DATADIR%%/demos/sonde xilinx/sonde xilinx.pro
-%%DATADIR%%/demos/sonde xilinx/sonde xilinx.sch
-%%DATADIR%%/demos/sonde xilinx/sonde xilinx_schlib.lib
+%%DATADIR%%/demos/sonde xilinx/sonde xilinx.kicad_pro
+%%DATADIR%%/demos/sonde xilinx/sonde xilinx.kicad_sch
+%%DATADIR%%/demos/sonde xilinx/sonde_xilinx_schlib.kicad_sym
 %%DATADIR%%/demos/sonde xilinx/sym-lib-table
 %%DATADIR%%/demos/test_pads_inside_pads/sym-lib-table
-%%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads-cache.lib
 %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb
 %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pro
 %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_sch
-%%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.pro
-%%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.sch
-%%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads_schlib.dcm
 %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads_schlib.kicad_sym
-%%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads_schlib.lib
-%%DATADIR%%/demos/test_xil_95108/carte_test-cache.lib
 %%DATADIR%%/demos/test_xil_95108/carte_test.kicad_pcb
-%%DATADIR%%/demos/test_xil_95108/carte_test.pro
-%%DATADIR%%/demos/test_xil_95108/carte_test.sch
-%%DATADIR%%/demos/test_xil_95108/carte_test_schlib.dcm
-%%DATADIR%%/demos/test_xil_95108/carte_test_schlib.lib
+%%DATADIR%%/demos/test_xil_95108/carte_test.kicad_pro
+%%DATADIR%%/demos/test_xil_95108/carte_test.kicad_sch
+%%DATADIR%%/demos/test_xil_95108/carte_test_schlib.kicad_sym
 %%DATADIR%%/demos/test_xil_95108/fp-lib-table
 %%DATADIR%%/demos/test_xil_95108/sym-lib-table
-%%DATADIR%%/demos/video/bus_pci.sch
+%%DATADIR%%/demos/video/bus_pci.kicad_sch
+%%DATADIR%%/demos/video/esvideo.kicad_sch
 %%DATADIR%%/demos/video/esvideo.sch
 %%DATADIR%%/demos/video/fp-lib-table
-%%DATADIR%%/demos/video/graphic.sch
+%%DATADIR%%/demos/video/graphic.kicad_sch
+%%DATADIR%%/demos/video/libs/footprints.pretty/CV3-30PF.kicad_mod
+%%DATADIR%%/demos/video/libs/footprints.pretty/LED_D3.0mm.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/LRTDK.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/PLCC68.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/PLCC84.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/sim72.kicad_mod
-%%DATADIR%%/demos/video/libs/video_schlib.dcm
-%%DATADIR%%/demos/video/libs/video_schlib.lib
-%%DATADIR%%/demos/video/modul.sch
-%%DATADIR%%/demos/video/muxdata.sch
-%%DATADIR%%/demos/video/pal-ntsc.sch
-%%DATADIR%%/demos/video/rams.sch
+%%DATADIR%%/demos/video/libs/footprints.pretty/subclick.kicad_mod
+%%DATADIR%%/demos/video/libs/fp.3dshapes/subclick_horiz.wings
+%%DATADIR%%/demos/video/libs/fp.3dshapes/subclick_horiz.wrl
+%%DATADIR%%/demos/video/libs/video_schlib.kicad_sym
+%%DATADIR%%/demos/video/modul.kicad_sch
+%%DATADIR%%/demos/video/muxdata.kicad_sch
+%%DATADIR%%/demos/video/pal-ntsc.kicad_sch
+%%DATADIR%%/demos/video/rams.kicad_sch
 %%DATADIR%%/demos/video/sym-lib-table
-%%DATADIR%%/demos/video/video-cache.lib
 %%DATADIR%%/demos/video/video.kicad_pcb
-%%DATADIR%%/demos/video/video.pro
-%%DATADIR%%/demos/video/video.sch
+%%DATADIR%%/demos/video/video.kicad_pro
+%%DATADIR%%/demos/video/video.kicad_sch
 %%DATADIR%%/plugins/README-bom.txt
 %%DATADIR%%/plugins/bom2csv.xsl
 %%DATADIR%%/plugins/bom2grouped_csv.xsl