5 files changed, 95 insertions, 298 deletions

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 5f0462c9e0ea..ff0c224d9cd8 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kicad
-DISTVERSION=	r${BZR_SRC_REV}
+DISTVERSION=	r${GIT_SRC_DATE}
 #PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	LOCAL/mr
@@ -12,11 +12,12 @@ DIST_SUBDIR=		${PORTNAME}
 MAINTAINER=		mr@FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 
-BUILD_DEPENDS=	bzr:devel/bzr \
-		${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/bzrlib/plugins/bzrtools/bzrtools.py:devel/bzrtools \
-		${LOCALBASE}/include/glm/glm.hpp:math/glm
+LICENSE=	GPLv3
 
-LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
+BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm
+
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libcurl.so:ftp/curl
 
 CONFLICTS=	kicad-2014*
 
@@ -24,11 +25,12 @@ DOCVERSION=	1.1
 LIBVERSION=	1.0
 
 #CXXFLAGS+=	-std=c++11
-USE_GL=		glew glu
+CXXFLAGS+=	-msse
+USE_GL=		glew glu gl
 USE_WX=		3.0
 WX_COMPS=	wx
 WX_UNICODE=	yes
-USE_GNOME=	atk	# Required by libwx_gtk2_aui-2.8.so
+USE_GNOME=	atk cairo	# Required by libwx_gtk2_aui-2.8.so
 
 OPTIONS_DEFINE=	DOCS
 
@@ -39,7 +41,7 @@ BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
 USES=		desktop-file-utils shared-mime-info compiler:c++11-lib tar:bzip2 cmake \
-		gettext python
+		gettext python ssl
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Debug" \
@@ -58,46 +60,66 @@ RUN_DEPENDS+=	xpdf:graphics/xpdf
 .if defined(BOOTSTRAP)
 BOOST_RELEASE=	1.54.0
 BOOST_VERS=	${BOOST_RELEASE:S|.|_|g}
-BZR_SRC_REV!=	bzr revno lp:kicad
-#BZR_DOC_REV!=	bzr revno lp:~kicad-developers/kicad/doc
+
+GIT_SRC_HASH=`cd ${WRKDIR}/kicad; git log -n 1 --pretty=format:"%H"`
+GIT_SRC_DATE=`cd "${WRKDIR}/kicad"; git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" | \
+	cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'`
+
 .else
-.include "Makefile.bzr_rev"
+.include "Makefile.git_rev"
 .endif
 
+showversions:
+	@${ECHO} "BOOST_RELEASE: ${BOOST_RELEASE}"
+	@${ECHO} "BOOST_VERS: ${BOOST_VERS}"
+	@${ECHO} "GIT_SRC_HASH: ${GIT_SRC_HASH}"
+	@${ECHO} "GIT_SRC_DATE: ${GIT_SRC_DATE}"
+	@${ECHO} "DISTDIR: ${DISTDIR}"
+	@${ECHO} "DIST_SUBDIR: ${DIST_SUBDIR}"
+	@${ECHO} "DISTNAME: ${DISTNAME}"
+	@${ECHO} "DISTVERSION: ${DISTVERSION}"
+
 .if defined(BOOTSTRAP)
 
 # Updating to new rev:
-# make do-fetch BOOTSTRAP=YES && make makesum && make clean
+# make do-fetch BOOTSTRAP=YES && make do-revisions BOOTSTRAP=YES && make do-distfile BOOTSTRAP=YES
+# make makesum && make clean
 # make && make makeplist && make generate-plist && make check-plist
 # < Check PLIST_FILE_LIST below >
 
 FETCH_DEPENDS+=	svn:devel/subversion
-FETCH_DEPENDS+=	bzr:devel/bzr
-
-showversions:
-	@${ECHO} "BOOST_RELEASE: ${BOOST_RELEASE}"
-	@${ECHO} "BOOST_VERS: ${BOOST_VERS}"
-	@${ECHO} "BZR_SRC_REV: ${BZR_SRC_REV}"
-	@${ECHO} "BZR_LIB_REV: ${BZR_LIB_REV}"
-	@${ECHO} "BZR_DOC_REV: ${BZR_DOC_REV}"
+BUILD_DEPENDS+=	git:devel/git
+FETCH_DEPENDS+=	git:devel/git
+
+do-distfile:
+	@if [ \! -d "${WRKDIR}/kicad-r${GIT_SRC_DATE}" ]; then \
+	  cd ${WRKDIR}; \
+	  mkdir "${WRKDIR}/kicad-r${GIT_SRC_DATE}"; \
+	  cd kicad; \
+	  find . -type d -name .git -prune -o -print | cpio -pdamuv "../kicad-r${GIT_SRC_DATE}"; \
+	fi;
+	@cd ${WRKDIR}; \
+	  tar xvf master.zip; \
+	  tar cvfy ${DISTDIR}/${DIST_SUBDIR}/kicad-r${GIT_SRC_DATE}.tar.bz2 \
+	    kicad-r${GIT_SRC_DATE} kicad-library-master
+
+do-revisions:
+	echo "BOOST_RELEASE=  ${BOOST_RELEASE}" > ${MASTERDIR}/Makefile.git_rev
+	echo "BOOST_VERS=  ${BOOST_VERS}"   >> ${MASTERDIR}/Makefile.git_rev
+	echo "GIT_SRC_HASH=  ${GIT_SRC_HASH}"   >> ${MASTERDIR}/Makefile.git_rev
+	echo "GIT_SRC_DATE=  ${GIT_SRC_DATE}"   >> ${MASTERDIR}/Makefile.git_rev
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
-	${ECHO} ${WRKSRC}
-	bzr export -r ${BZR_SRC_REV} ${WRKSRC} lp:kicad
-	${FETCH_CMD} --no-verify-peer -o ${WRKDIR}/master.zip https://github.com/KiCad/kicad-library/archive/master.zip
-#	bzr export -r ${BZR_DOC_REV} ${WRKDIR}/kicad-doc lp:~kicad-developers/kicad/doc
-#	fetch -o ${WRKDIR}/${DISTNAME}/boost_${BOOST_VERS}.tar.bz2 \
-#		http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/boost_${BOOST_VERS}.tar.bz2
-	cd ${WRKDIR}; \
-	tar xvf master.zip; \
-	tar cvfy ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 \
-		${DISTNAME} kicad-library-master
-	echo "BOOST_RELEASE=  ${BOOST_RELEASE}" > ${MASTERDIR}/Makefile.bzr_rev
-	echo "BOOST_VERS=  ${BOOST_VERS}"   >> ${MASTERDIR}/Makefile.bzr_rev
-	echo "BZR_SRC_REV=  ${BZR_SRC_REV}" >> ${MASTERDIR}/Makefile.bzr_rev
-	echo "BZR_LIB_REV=  ${BZR_LIB_REV}" >> ${MASTERDIR}/Makefile.bzr_rev
-#	echo "BZR_DOC_REV=  ${BZR_DOC_REV}" >> ${MASTERDIR}/Makefile.bzr_rev
+	@${ECHO} ${WRKSRC}
+	@if [ \! -d "${WRKDIR}/kicad" ]; then \
+	  cd ${WRKDIR}; \
+	  echo git clone https://git.launchpad.net/kicad; \
+	fi;
+	@if [ \! -f "${WRKDIR}/master.zip" ]; then \
+	  ${FETCH_CMD} --no-verify-peer -o ${WRKDIR}/master.zip https://github.com/KiCad/kicad-library/archive/master.zip; \
+	fi;
+
 .endif
 
 tmp:
diff --git a/cad/kicad-devel/Makefile.bzr_rev b/cad/kicad-devel/Makefile.bzr_rev
deleted file mode 100644
index 1fdb7dd898e3..000000000000
--- a/cad/kicad-devel/Makefile.bzr_rev
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOST_RELEASE=  1.54.0
-BOOST_VERS=  1_54_0
-BZR_SRC_REV=  6904
-BZR_LIB_REV=  
diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev
new file mode 100644
index 000000000000..51cf741dd88a
--- /dev/null
+++ b/cad/kicad-devel/Makefile.git_rev
@@ -0,0 +1,4 @@
+BOOST_RELEASE=  1.54.0
+BOOST_VERS=  1_54_0
+GIT_SRC_HASH=  7ad2f37391e3e0debb7b96cd7164961d118f44c1
+GIT_SRC_DATE=  20160910202359
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 84cb5b192c92..2650ecb55597 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465418419
-SHA256 (kicad/kicad-r6904.tar.bz2) = 4afc25cb2e290bf0632e546ed42d1a60fd987dad81ab8000da5aaff7ca773a25
-SIZE (kicad/kicad-r6904.tar.bz2) = 94165593
+TIMESTAMP = 1473692391
+SHA256 (kicad/kicad-r20160910202359.tar.bz2) = d0a7bb35b02ba73a5459a91ab92f277f1385c8eea2fb64680c9e4c620c4607ed
+SIZE (kicad/kicad-r20160910202359.tar.bz2) = 81263306
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 30a0b89573ca..3909c03760ff 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -48,8 +48,6 @@ lib/libkicad_3dsg.so.2.0.0
 %%PORTDOCS%%%%DOCSDIR%%/scripts/library-repos-install.bat
 %%PORTDOCS%%%%DOCSDIR%%/scripts/library-repos-install.sh
 %%PORTDOCS%%%%DOCSDIR%%/scripts/mk_mime_icons.py
-%%PORTDOCS%%%%DOCSDIR%%/scripts/osx_build_wx.sh
-%%PORTDOCS%%%%DOCSDIR%%/scripts/osx_fixbundle.sh
 %%PORTDOCS%%%%DOCSDIR%%/scripts/test_kicad_plugin.py
 %%PORTDOCS%%%%DOCSDIR%%/scripts/test_plugin.py
 share/icons/hicolor/128x128/apps/bitmap2component.png
@@ -197,6 +195,19 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/pspice/pspice.sch
 %%DATADIR%%/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py
 %%DATADIR%%/demos/python_scripts_examples/plot_board.py
+%%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/rectifier/rectifier-cache.lib
+%%DATADIR%%/demos/simulation/rectifier/rectifier.pro
+%%DATADIR%%/demos/simulation/rectifier/rectifier.sch
+%%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/sonde xilinx/sonde xilinx-cache.lib
 %%DATADIR%%/demos/sonde xilinx/sonde xilinx.kicad_pcb
 %%DATADIR%%/demos/sonde xilinx/sonde xilinx.net
@@ -319,10 +330,12 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/library/Buildingblocks/KiCAD-HierarchcalSchematicsAndBuildingBlocksRevA-EN.pdf
 %%DATADIR%%/library/Buildingblocks/KiCAD-HierarchischeSchaltplaeneUndBuildingBlocks3-DE.pdf
 %%DATADIR%%/library/CMakeLists.txt
+%%DATADIR%%/library/ESD_Protection.dcm
 %%DATADIR%%/library/ESD_Protection.lib
 %%DATADIR%%/library/Lattice.dcm
 %%DATADIR%%/library/Lattice.lib
 %%DATADIR%%/library/Oscillators.lib
+%%DATADIR%%/library/Power_Management.dcm
 %%DATADIR%%/library/Power_Management.lib
 %%DATADIR%%/library/Worldsemi.dcm
 %%DATADIR%%/library/Worldsemi.lib
@@ -493,249 +506,15 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/library/video.lib
 %%DATADIR%%/library/xilinx.dcm
 %%DATADIR%%/library/xilinx.lib
-%%DATADIR%%/modules/7Segment_16Sep2013.kicad_pcb
-%%DATADIR%%/modules/BNC-Sockets_RevA.kicad_pcb
-%%DATADIR%%/modules/Buzzer_Beeper_RevA_25Oct2010.kicad_pcb
 %%DATADIR%%/modules/CMakeLists.txt
-%%DATADIR%%/modules/Capacitors_Elko_ThroughHole.kicad_pcb
-%%DATADIR%%/modules/Capacitors_ThroughHole_RevA.kicad_pcb
-%%DATADIR%%/modules/Choke_Axial_ThroughHole_RevB.kicad_pcb
-%%DATADIR%%/modules/Choke_Radial_ThroughHole_CD_Bobin_RevA.kicad_pcb
-%%DATADIR%%/modules/Choke_SMD_RevB_28Dez2012.kicad_pcb
-%%DATADIR%%/modules/Choke_Toroid_ThroughHole_RevC_06Aug2010.kicad_pcb
-%%DATADIR%%/modules/CommonModeChoke_Wuerth_Type-WE-CMB_RevA_24Oct2010.kicad_pcb
-%%DATADIR%%/modules/Connectors_Serial_MOLEX.kicad_pcb
-%%DATADIR%%/modules/Crystals.kicad_pcb
-%%DATADIR%%/modules/DCDC-ACDC-Converter_1_RevC_20Jul2012.kicad_pcb
-%%DATADIR%%/modules/DCDC-ACDC-Converter_2_RevC_20Jul2012.kicad_pcb
-%%DATADIR%%/modules/DIP_Sockets.brd
-%%DATADIR%%/modules/DIP_Sockets_Special.brd
-%%DATADIR%%/modules/Diodes_SMD.kicad_pcb
-%%DATADIR%%/modules/Diodes_ThroughHole.kicad_pcb
-%%DATADIR%%/modules/Discret1.brd
-%%DATADIR%%/modules/Display.brd
-%%DATADIR%%/modules/EuroBoardoutline_RevC_Part1.kicad_pcb
-%%DATADIR%%/modules/EuroBoardoutline_RevC_Part2.kicad_pcb
-%%DATADIR%%/modules/EuroBoardoutline_RevC_Part3.kicad_pcb
-%%DATADIR%%/modules/EuroBoardoutline_RevC_Part4.kicad_pcb
-%%DATADIR%%/modules/EuroBoardoutline_RevC_Part5.kicad_pcb
-%%DATADIR%%/modules/EuroBoardoutline_RevC_Part6.kicad_pcb
-%%DATADIR%%/modules/EuroBoardoutline_RevC_Part7.kicad_pcb
-%%DATADIR%%/modules/Fiducials.kicad_pcb
-%%DATADIR%%/modules/Footprint_Symbols.kicad_pcb
-%%DATADIR%%/modules/Fuse_Holders_and_Fuses.kicad_pcb
-%%DATADIR%%/modules/Heatsinks.kicad_pcb
-%%DATADIR%%/modules/Housings_ROHM.kicad_pcb
-%%DATADIR%%/modules/Housings_SIP9.kicad_pcb
-%%DATADIR%%/modules/Housings_SOT.kicad_pcb
-%%DATADIR%%/modules/Housings_SOT23_SOT143_TSOT6.kicad_pcb
-%%DATADIR%%/modules/Housings_TO-50.kicad_pcb
-%%DATADIR%%/modules/Housings_TO-78.kicad_pcb
-%%DATADIR%%/modules/IR-DirectFETs.kicad_pcb
-%%DATADIR%%/modules/LEDs.brd
-%%DATADIR%%/modules/LEM_HallEffectTransducers_RevA_13Oct2012.kicad_pcb
-%%DATADIR%%/modules/LQFP_TQFP_RevA_06Oct2013.kicad_pcb
-%%DATADIR%%/modules/Label_RevA_21Mar2011.brd
-%%DATADIR%%/modules/Measurement_Points.kicad_pcb
-%%DATADIR%%/modules/Measurement_Scales.kicad_pcb
-%%DATADIR%%/modules/Mechanical_Sockets.kicad_pcb
-%%DATADIR%%/modules/NF-Transformers_ETAL.kicad_pcb
-%%DATADIR%%/modules/Neosid_Air-Coils_SML.kicad_pcb
-%%DATADIR%%/modules/Neosid_Filters_HF-Coils.kicad_pcb
-%%DATADIR%%/modules/Neosid_Inductors.kicad_pcb
-%%DATADIR%%/modules/Oddities.kicad_pcb
-%%DATADIR%%/modules/OldSowjetAera_Transistor_RevA.kicad_pcb
-%%DATADIR%%/modules/Opto-Devices.kicad_pcb
-%%DATADIR%%/modules/Oscillator-Modules.kicad_pcb
-%%DATADIR%%/modules/Oscillators.kicad_pcb
-%%DATADIR%%/modules/PFF_PSF_PSS_Leadforms.kicad_pcb
-%%DATADIR%%/modules/Pentawatts.kicad_pcb
-%%DATADIR%%/modules/Potentiometer_Part2_RevB_02Aug2010.kicad_pcb
-%%DATADIR%%/modules/Potentiometers.kicad_pcb
-%%DATADIR%%/modules/Power_Packages_SMD.kicad_pcb
-%%DATADIR%%/modules/Printtrafo_CHK_Part1_RevA_04Aug2010.kicad_pcb
-%%DATADIR%%/modules/Printtrafo_CHK_Part2_RevA_04Aug2010.kicad_pcb
-%%DATADIR%%/modules/Printtrafo_CHK_Part3_RevA_04Aug2010.kicad_pcb
-%%DATADIR%%/modules/Relays_ThroughHole.kicad_pcb
-%%DATADIR%%/modules/Resistor_ThroughHole.kicad_pcb
-%%DATADIR%%/modules/Resistors_SMD.kicad_pcb
-%%DATADIR%%/modules/Resistors_ThroughHole.kicad_pcb
-%%DATADIR%%/modules/Resistors_Universal.kicad_pcb
-%%DATADIR%%/modules/SOT89-3_SOT89-5_Housing_RevA_02Sep2012.kicad_pcb
-%%DATADIR%%/modules/Socket_WAGO734.kicad_pcb
-%%DATADIR%%/modules/Sockets_MOLEX_KK-System.kicad_pcb
-%%DATADIR%%/modules/Sockets_Mini-Universal.kicad_pcb
-%%DATADIR%%/modules/TO-92_Housings_06Jun2013_Part1.kicad_pcb
-%%DATADIR%%/modules/TO-92_Housings_06Jun2013_Part2.kicad_pcb
-%%DATADIR%%/modules/TO-92_Housings_06Jun2013_Part3.kicad_pcb
-%%DATADIR%%/modules/TantalCapacitors_SMD_RevA_28Aug2012.kicad_pcb
-%%DATADIR%%/modules/Terminal_Blocks.kicad_pcb
-%%DATADIR%%/modules/Transformers_SMPS_ThroughHole.kicad_pcb
-%%DATADIR%%/modules/Transistor_TO-220_RevC_28Feb2014.kicad_pcb
-%%DATADIR%%/modules/Transistor_TO-247_RevC_Part1.kicad_pcb
-%%DATADIR%%/modules/Transistor_TO-247_RevC_Part2.kicad_pcb
-%%DATADIR%%/modules/Wire_Connections_Bridges.kicad_pcb
-%%DATADIR%%/modules/Wire_Pads.kicad_pcb
-%%DATADIR%%/modules/affich.brd
-%%DATADIR%%/modules/capa_pol.equ
-%%DATADIR%%/modules/ci.equ
-%%DATADIR%%/modules/conn_DBxx.brd
-%%DATADIR%%/modules/conn_HExx.brd
-%%DATADIR%%/modules/connect1.brd
-%%DATADIR%%/modules/connect2.brd
-%%DATADIR%%/modules/devcms.equ
-%%DATADIR%%/modules/device.equ
-%%DATADIR%%/modules/footprints_doc/7Segment_16Sep2013.pdf
-%%DATADIR%%/modules/footprints_doc/7Segment_16Sep2013.ps
-%%DATADIR%%/modules/footprints_doc/Allegro_HallSensors_CB-PFF_CB-PSF_CB-FSS_Housings_24Oct2012.pdf
-%%DATADIR%%/modules/footprints_doc/Allegro_HallSensors_CB-PFF_CB-PSF_CB-FSS_Housings_24Oct2012.ps
-%%DATADIR%%/modules/footprints_doc/BNC-Sockets_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/BNC-Sockets_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Buzzer_Beeper_RevA_25Oct2010.pdf
-%%DATADIR%%/modules/footprints_doc/Buzzer_Beeper_RevA_25Oct2010.ps
-%%DATADIR%%/modules/footprints_doc/Capacitors_SMD_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Capacitors_SMD_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Capacitors_ThroughHole_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Capacitors_ThroughHole_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Choke_Axial_ThroughHole_RevB.pdf
-%%DATADIR%%/modules/footprints_doc/Choke_Axial_ThroughHole_RevB.ps
-%%DATADIR%%/modules/footprints_doc/Choke_Radial_ThroughHole_CD_Bobin_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Choke_Radial_ThroughHole_CD_Bobin_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Choke_SMD_RevB_28Dez2012.pdf
-%%DATADIR%%/modules/footprints_doc/Choke_SMD_RevB_28Dez2012.ps
-%%DATADIR%%/modules/footprints_doc/Choke_Toroid_ThroughHole_RevB_06Aug2010.pdf
-%%DATADIR%%/modules/footprints_doc/Choke_Toroid_ThroughHole_RevC_06Aug2010.ps
-%%DATADIR%%/modules/footprints_doc/CommonModeChoke_Wuerth_Type-WE-CMB_RevA_24Oct2010.pdf
-%%DATADIR%%/modules/footprints_doc/CommonModeChoke_Wuerth_Type-WE-CMB_RevA_24Oct2010.ps
-%%DATADIR%%/modules/footprints_doc/Crystals_RevB_20Apr2013.pdf
-%%DATADIR%%/modules/footprints_doc/Crystals_RevB_20Apr2013.ps
-%%DATADIR%%/modules/footprints_doc/DCDC-ACDC-Converter_1_RevC_20Jul2012.ps
-%%DATADIR%%/modules/footprints_doc/DCDC-ACDC-Converter_2_RevC_20Jul2012.ps
-%%DATADIR%%/modules/footprints_doc/DCDC-ACDC-Converter_RevC_20Jul2012.pdf
-%%DATADIR%%/modules/footprints_doc/Dioden_SMD_RevA_31May2013.pdf
-%%DATADIR%%/modules/footprints_doc/Dioden_SMD_RevA_31May2013.ps
-%%DATADIR%%/modules/footprints_doc/Dioden_ThroughHole_RevC.pdf
-%%DATADIR%%/modules/footprints_doc/Dioden_ThroughHole_RevC.ps
-%%DATADIR%%/modules/footprints_doc/Elko_ThroughHole_RevB-3_30Dec2011.pdf
-%%DATADIR%%/modules/footprints_doc/Elko_ThroughHole_RevB-3_30Dec2011.ps
-%%DATADIR%%/modules/footprints_doc/EuroBoardoutline_RevC.pdf
-%%DATADIR%%/modules/footprints_doc/Fiducials_RevC_04Aug2012.pdf
-%%DATADIR%%/modules/footprints_doc/Fiducials_RevC_04Aug2012.ps
-%%DATADIR%%/modules/footprints_doc/Footprint-Symbols_RevD_28Aug2012.pdf
-%%DATADIR%%/modules/footprints_doc/Footprint-Symbols_RevD_28Aug2012.ps
-%%DATADIR%%/modules/footprints_doc/FuseholderAndFuses_RevD_02Oct2013.pdf
-%%DATADIR%%/modules/footprints_doc/FuseholderAndFuses_RevD_02Oct2013.ps
-%%DATADIR%%/modules/footprints_doc/Heatsinks_RevC.pdf
-%%DATADIR%%/modules/footprints_doc/Heatsinks_RevC.ps
-%%DATADIR%%/modules/footprints_doc/IR-directFET_Packages_RevB.pdf
-%%DATADIR%%/modules/footprints_doc/IR-directFET_Packages_RevB.ps
-%%DATADIR%%/modules/footprints_doc/LEM_HallEffectTransducers_RevA_13Oct2012.pdf
-%%DATADIR%%/modules/footprints_doc/LEM_HallEffectTransducers_RevA_13Oct2012.ps
-%%DATADIR%%/modules/footprints_doc/LQFP_TQFP_RevA_06Oct2013.pdf
-%%DATADIR%%/modules/footprints_doc/LQFP_TQFP_RevA_06Oct2013.ps
-%%DATADIR%%/modules/footprints_doc/Label_RevA_21Mar2011.pdf
-%%DATADIR%%/modules/footprints_doc/Label_RevA_21Mar2011.ps
-%%DATADIR%%/modules/footprints_doc/Measurement-Scala_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Measurement-Scala_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Measurement_Point_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Measurement_Point_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Mechanical_Socket-Plug_DIN41612-Stuff_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Mechanical_Socket-Plug_DIN41612-Stuff_RevA.ps
-%%DATADIR%%/modules/footprints_doc/MiniUniversalMate-N-LokSockets_13Aug2012.pdf
-%%DATADIR%%/modules/footprints_doc/MiniUniversalMate-N-LokSockets_13Aug2012.ps
-%%DATADIR%%/modules/footprints_doc/NF-Transformer_ETAL_RevA_28Aug2012.pdf
-%%DATADIR%%/modules/footprints_doc/NF-Transformer_ETAL_RevA_28Aug2012.ps
-%%DATADIR%%/modules/footprints_doc/Neosid_Air-Coil_SML_HAMxx31A_HDMxx31A_RevA_25Apr2012.pdf
-%%DATADIR%%/modules/footprints_doc/Neosid_Air-Coil_SML_HAMxx31A_HDMxx31A_RevA_25Apr2012.ps
-%%DATADIR%%/modules/footprints_doc/Neosid_Filter_HF-Coil_25Apr2012.pdf
-%%DATADIR%%/modules/footprints_doc/Neosid_Filter_HF-Coil_25Apr2012.ps
-%%DATADIR%%/modules/footprints_doc/Neosid_Inductor_21Apr2012.pdf
-%%DATADIR%%/modules/footprints_doc/Neosid_Inductor_21Apr2012.ps
-%%DATADIR%%/modules/footprints_doc/Oddities_RevA_10Mar2011.pdf
-%%DATADIR%%/modules/footprints_doc/Oddities_RevA_10Mar2011.ps
-%%DATADIR%%/modules/footprints_doc/OldSowjetAera_Transistor_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/OldSowjetAera_Transistor_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Opto-Devices_RevC_03Oct2012.pdf
-%%DATADIR%%/modules/footprints_doc/Opto-Devices_RevC_03Oct2012.ps
-%%DATADIR%%/modules/footprints_doc/Oscillator-Modul_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Oscillator-Modul_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Pentawatt_RevB_30Apr2011.pdf
-%%DATADIR%%/modules/footprints_doc/Pentawatt_RevB_30Apr2011.ps
-%%DATADIR%%/modules/footprints_doc/Potentiometer_Part1_RevB_02Aug2010.ps
-%%DATADIR%%/modules/footprints_doc/Potentiometer_Part2_RevB_02Aug2010.ps
-%%DATADIR%%/modules/footprints_doc/Potentiometer_RevB_02Aug2010.pdf
-%%DATADIR%%/modules/footprints_doc/Power_Packages_SMD.pdf
-%%DATADIR%%/modules/footprints_doc/Power_Packages_SMD.ps
-%%DATADIR%%/modules/footprints_doc/Printtrafo_CHK_Part1_RevA_04Aug2010.ps
-%%DATADIR%%/modules/footprints_doc/Printtrafo_CHK_Part2_RevA_04Aug2010.ps
-%%DATADIR%%/modules/footprints_doc/Printtrafo_CHK_Part3_RevA_04Aug2010.ps
-%%DATADIR%%/modules/footprints_doc/Printtrafo_CHK_RevA_04Aug2010.pdf
-%%DATADIR%%/modules/footprints_doc/Relay_ThroughHole_RevC_07Oct2013.pdf
-%%DATADIR%%/modules/footprints_doc/Relay_ThroughHole_RevC_07Oct2013.ps
-%%DATADIR%%/modules/footprints_doc/Resistor_SMD_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Resistor_SMD_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Resistor_ThroughHole_RevB_22Apr2011.pdf
-%%DATADIR%%/modules/footprints_doc/Resistor_ThroughHole_RevB_22Apr2011.ps
-%%DATADIR%%/modules/footprints_doc/Resistor_Universal-Experimental_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Resistor_Universal-Experimental_RevA.ps
-%%DATADIR%%/modules/footprints_doc/SI570_SI571_Oscillator_RevA_11Jun2012.pdf
-%%DATADIR%%/modules/footprints_doc/SI570_SI571_Oscillator_RevA_11Jun2012.ps
-%%DATADIR%%/modules/footprints_doc/SIP9_Housing_14Jun2013.pdf
-%%DATADIR%%/modules/footprints_doc/SIP9_Housing_14Jun2013.ps
-%%DATADIR%%/modules/footprints_doc/SOT126_SOT32_Housings_RevA_22Oct2012.pdf
-%%DATADIR%%/modules/footprints_doc/SOT126_SOT32_Housings_RevA_22Oct2012.ps
-%%DATADIR%%/modules/footprints_doc/SOT23_SOT143_SOT143R_TSOT6_MK06A_SC70-6_Housing_26Jul2012.pdf
-%%DATADIR%%/modules/footprints_doc/SOT23_SOT143_SOT143R_TSOT6_MK06A_SC70-6_Housing_26Jul2012.ps
-%%DATADIR%%/modules/footprints_doc/SOT89-3_SOT89-5_Housing_RevA_02Sep2012.pdf
-%%DATADIR%%/modules/footprints_doc/SOT89-3_SOT89-5_Housing_RevA_02Sep2012.ps
-%%DATADIR%%/modules/footprints_doc/Socket_MOLEX-KK-System.pdf
-%%DATADIR%%/modules/footprints_doc/Socket_MOLEX-KK-System.ps
-%%DATADIR%%/modules/footprints_doc/Socket_WAGO734_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/Socket_WAGO734_RevA.ps
-%%DATADIR%%/modules/footprints_doc/TO-12_TO-18_TO-43_TO-42_Housings_11Jun2013.ps
-%%DATADIR%%/modules/footprints_doc/TO-50_Housings_RevA_21Apr2013.pdf
-%%DATADIR%%/modules/footprints_doc/TO-50_Housings_RevA_21Apr2013.ps
-%%DATADIR%%/modules/footprints_doc/TO-78_Housing_RevA_04Jun2013.pdf
-%%DATADIR%%/modules/footprints_doc/TO-78_Housing_RevA_04Jun2013.ps
-%%DATADIR%%/modules/footprints_doc/TO-92_Housings_06Jun2013.pdf
-%%DATADIR%%/modules/footprints_doc/TO-92_Housings_06Jun2013_Part1.ps
-%%DATADIR%%/modules/footprints_doc/TO-92_Housings_06Jun2013_Part2.ps
-%%DATADIR%%/modules/footprints_doc/TO-92_Housings_06Jun2013_Part3.ps
-%%DATADIR%%/modules/footprints_doc/TantalCapacitors_SMD_RevA_28Aug2012.pdf
-%%DATADIR%%/modules/footprints_doc/TantalCapacitors_SMD_RevA_28Aug2012.ps
-%%DATADIR%%/modules/footprints_doc/TerminalBlock_WAGO236-RM5mm_RevA2.pdf
-%%DATADIR%%/modules/footprints_doc/TerminalBlock_WAGO236-RM5mm_RevA2.ps
-%%DATADIR%%/modules/footprints_doc/TransformerSMPS_ThroughHole_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/TransformerSMPS_ThroughHole_RevA.ps
-%%DATADIR%%/modules/footprints_doc/Transistor_TO-220_RevB_03Sep2012.pdf
-%%DATADIR%%/modules/footprints_doc/Transistor_TO-220_RevB_03Sep2012.ps
-%%DATADIR%%/modules/footprints_doc/Transistor_TO-247_RevC.pdf
-%%DATADIR%%/modules/footprints_doc/Transistor_TO-247_RevC_Part1.ps
-%%DATADIR%%/modules/footprints_doc/Transistor_TO-247_RevC_Part2.ps
-%%DATADIR%%/modules/footprints_doc/VML0806_Housing_Rohm_RevA_26Oct2012.pdf
-%%DATADIR%%/modules/footprints_doc/VML0806_Housing_Rohm_RevA_26Oct2012.ps
-%%DATADIR%%/modules/footprints_doc/WireConnections-Bridges_RevA.pdf
-%%DATADIR%%/modules/footprints_doc/WirePads_RevA_15Jun2010.pdf
-%%DATADIR%%/modules/footprints_doc/conn_DBxx.ps
-%%DATADIR%%/modules/footprints_doc/conn_HExx.ps
-%%DATADIR%%/modules/footprints_doc/connect1.ps
-%%DATADIR%%/modules/footprints_doc/connect2.ps
-%%DATADIR%%/modules/footprints_doc/discret1.ps
-%%DATADIR%%/modules/footprints_doc/libcms-bga.ps
-%%DATADIR%%/modules/footprints_doc/libcms.ps
-%%DATADIR%%/modules/footprints_doc/merge_ps-files.bat
-%%DATADIR%%/modules/footprints_doc/merge_ps-files.ps
-%%DATADIR%%/modules/footprints_doc/miscellaneous.ps
-%%DATADIR%%/modules/footprints_doc/pin_array.ps
-%%DATADIR%%/modules/footprints_doc/sockets_DIP.ps
-%%DATADIR%%/modules/footprints_doc/sockets_DIP_special.ps
-%%DATADIR%%/modules/footprints_doc/sockets_PGA.ps
-%%DATADIR%%/modules/footprints_doc/sockets_miscellaneous.ps
-%%DATADIR%%/modules/libcms-bga.brd
-%%DATADIR%%/modules/libcms.brd
-%%DATADIR%%/modules/miscellaneous.brd
-%%DATADIR%%/modules/miscellaneous.equ
-%%DATADIR%%/modules/muonde.brd
+%%DATADIR%%/modules/packages3d/Buttons_Switches_SMD.3dshapes/SW_SPST_EVQQ2_01W.wings
+%%DATADIR%%/modules/packages3d/Buttons_Switches_SMD.3dshapes/SW_SPST_EVQQ2_01W.wrl
+%%DATADIR%%/modules/packages3d/Buttons_Switches_SMD.3dshapes/SW_SPST_EVQQ2_02W.wings
+%%DATADIR%%/modules/packages3d/Buttons_Switches_SMD.3dshapes/SW_SPST_EVQQ2_02W.wrl
+%%DATADIR%%/modules/packages3d/Buttons_Switches_SMD.3dshapes/SW_SPST_EVQQ2_03W.wings
+%%DATADIR%%/modules/packages3d/Buttons_Switches_SMD.3dshapes/SW_SPST_EVQQ2_03W.wrl
+%%DATADIR%%/modules/packages3d/Buttons_Switches_SMD.3dshapes/SW_SPST_PTS645.wings
+%%DATADIR%%/modules/packages3d/Buttons_Switches_SMD.3dshapes/SW_SPST_PTS645.wrl
 %%DATADIR%%/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/Push_E-Switch_KS01Q01.wings
 %%DATADIR%%/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/Push_E-Switch_KS01Q01.wrl
 %%DATADIR%%/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x10_Piano.wings
@@ -1159,6 +938,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-130-xxx-x-DV-A-S.wrl
 %%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-140-xxx-x-DV-A-N.wrl
 %%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-140-xxx-x-DV-A-S.wrl
+%%DATADIR%%/modules/packages3d/Converters_DCDC_ACDC.3dshapes/DCDC-Conv_TRACO_TSR-1.wings
+%%DATADIR%%/modules/packages3d/Converters_DCDC_ACDC.3dshapes/DCDC-Conv_TRACO_TSR-1.wrl
 %%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_MC-146.wrl
 %%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_MC-156.wrl
 %%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_MC-306.wrl
@@ -1228,6 +1009,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Diodes_SMD.3dshapes/SMC_Handsoldering.wrl
 %%DATADIR%%/modules/packages3d/Diodes_SMD.3dshapes/SMC_Standard.wings
 %%DATADIR%%/modules/packages3d/Diodes_SMD.3dshapes/SMC_Standard.wrl
+%%DATADIR%%/modules/packages3d/Diodes_SMD.3dshapes/SOD-323.wrl
 %%DATADIR%%/modules/packages3d/Diodes_SMD.3dshapes/TUMD2.wings
 %%DATADIR%%/modules/packages3d/Diodes_SMD.3dshapes/TUMD2.wrl
 %%DATADIR%%/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_DO-35_SOD27_Horizontal_RM10.wings
@@ -1706,6 +1488,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/MSOP-8-1EP_3x3mm_Pitch0.65mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/MSOP-8_3x3mm_Pitch0.65mm.wings
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/MSOP-8_3x3mm_Pitch0.65mm.wrl
+%%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/PSOP-44_27.17x16.9mm_Pitch1.27mm.wings
+%%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/PSOP-44_27.17x16.9mm_Pitch1.27mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/QSOP-16_3.9x4.9mm_Pitch0.635mm.wings
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/QSOP-16_3.9x4.9mm_Pitch0.635mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/SSOP-14_5.3x6.2mm_Pitch0.65mm.wings
@@ -1836,6 +1620,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_0805.wrl
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_1206.wings
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_1206.wrl
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_PLCC_2835.wrl
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_WS2812-PLCC6.wrl
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_WS2812B-PLCC4.wrl
 %%DATADIR%%/modules/packages3d/Measurement_Points.3dshapes/Test_Point.wrl
@@ -2926,6 +2711,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300.wrl
 %%DATADIR%%/modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300_ELL.wings
 %%DATADIR%%/modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300_ELL.wrl
+%%DATADIR%%/modules/packages3d/Sockets_MOLEX_KK-System.3dshapes/47053-1000.wings
+%%DATADIR%%/modules/packages3d/Sockets_MOLEX_KK-System.3dshapes/47053-1000.wrl
 %%DATADIR%%/modules/packages3d/Sockets_PGA.3dshapes/U9.wings
 %%DATADIR%%/modules/packages3d/Sockets_PGA.3dshapes/U9.wrl
 %%DATADIR%%/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/PowerMacro_M234_NoHole.wings
@@ -4130,18 +3917,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3h.wrl
 %%DATADIR%%/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3v.wings
 %%DATADIR%%/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3v.wrl
-%%DATADIR%%/modules/pga_sockets.brd
-%%DATADIR%%/modules/pin_array.brd
-%%DATADIR%%/modules/smd_active.equ
-%%DATADIR%%/modules/smd_capa_0805.equ
-%%DATADIR%%/modules/smd_capa_1206.equ
-%%DATADIR%%/modules/smd_capa_pol.equ
-%%DATADIR%%/modules/smd_passive.equ
-%%DATADIR%%/modules/smd_resistor_0805.equ
-%%DATADIR%%/modules/smd_resistor_1206.equ
-%%DATADIR%%/modules/smd_trans-diodes.equ
-%%DATADIR%%/modules/sockets_miscellaneous.brd
-%%DATADIR%%/modules/standard-trans-diodes.equ
 %%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno-cache.lib
 %%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno.cmp
 %%DATADIR%%/template/Arduino_As_Uno_R3/Arduino_As_Uno.kicad_pcb