5 files changed, 66 insertions, 11 deletions

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index d3fed891bcd3..5be34a777337 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -64,6 +64,8 @@ RUN_DEPENDS+=	xpdf:${PORTSDIR}/graphics/xpdf
 .endif
 
 .if defined(BOOTSTRAP)
+BOOST_RELEASE=	     1.54.0
+BOOST_VERS=         ${BOOST_RELEASE:S|.|_|g}
 BZR_SRC_REV!=        bzr revno lp:kicad
 BZR_LIB_REV!=        bzr revno lp:~kicad-lib-committers/kicad/library
 BZR_DOC_REV!=        bzr revno lp:~kicad-developers/kicad/doc
@@ -85,6 +87,13 @@ BZR_DOC_REV!=        bzr revno lp:~kicad-developers/kicad/doc
 FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
 FETCH_DEPENDS+= bzr:${PORTSDIR}/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}"
+
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	${ECHO} ${WRKSRC}
@@ -93,9 +102,13 @@ do-fetch:
 	bzr export -r ${BZR_DOC_REV} ${WRKDIR}/kicad-doc lp:~kicad-developers/kicad/doc
 	svn export \
 		http://svn.openmoko.org/trunk/gta02-core/kicad-patches ${WRKDIR}/kicad-patches
+	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 cvfy ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 \
 		${DISTNAME} kicad-library kicad-doc kicad-patches
-	echo "BZR_SRC_REV=  ${BZR_SRC_REV}" > ${MASTERDIR}/Makefile.bzr_rev
+	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
 .endif
diff --git a/cad/kicad-devel/Makefile.bzr_rev b/cad/kicad-devel/Makefile.bzr_rev
index 2a80833e7691..37eb4ddedc7d 100644
--- a/cad/kicad-devel/Makefile.bzr_rev
+++ b/cad/kicad-devel/Makefile.bzr_rev
@@ -1,3 +1,5 @@
+BOOST_RELEASE=  1.54.0
+BOOST_VERS=  1_54_0
 BZR_SRC_REV=  4313
 BZR_LIB_REV=  267
 BZR_DOC_REV=  487
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 3953f860c971..a30af0343484 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad/kicad-r4313.tar.bz2) = 5e813ecdbfe9f4742bc6285d57f56f078e895e1b1a3871edee81fb309464e69d
-SIZE (kicad/kicad-r4313.tar.bz2) = 179794564
+SHA256 (kicad/kicad-r4313.tar.bz2) = 854b9175804bb7d891bde3c94ee75b9094c21c617a55467caf5f451a1eaf8e4b
+SIZE (kicad/kicad-r4313.tar.bz2) = 238026194
diff --git a/cad/kicad-devel/files/patch-CMakeModules-download_boost.cmake b/cad/kicad-devel/files/patch-CMakeModules-download_boost.cmake
new file mode 100644
index 000000000000..8730fef7c573
--- /dev/null
+++ b/cad/kicad-devel/files/patch-CMakeModules-download_boost.cmake
@@ -0,0 +1,48 @@
+--- CMakeModules/download_boost.cmake.orig	2013-09-13 07:40:43.000000000 +0000
++++ CMakeModules/download_boost.cmake	2013-10-22 21:38:43.909426514 +0000
+@@ -103,9 +103,9 @@
+         PREFIX          "${PREFIX}"
+         DOWNLOAD_DIR    "${DOWNLOAD_DIR}"
+-        URL             http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/boost_${BOOST_VERS}.tar.bz2
++        URL             file://${PROJECT_SOURCE_DIR}/boost_${BOOST_VERS}.tar.bz2
+         URL_MD5         ${BOOST_MD5}
+ 
+         # The patch command executes with the working directory set to <SOURCE_DIR>
+-        PATCH_COMMAND   bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch"
++        PATCH_COMMAND   env BZR_HOME="${PROJECT_SOURCE_DIR}" bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch"
+ 
+         # [Mis-]use this step to erase all the boost headers and libraries before
+@@ -140,9 +140,9 @@
+         PREFIX          "${PREFIX}"
+         DOWNLOAD_DIR    "${DOWNLOAD_DIR}"
+-        URL             http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/boost_${BOOST_VERS}.tar.bz2
++        URL             file://${PROJECT_SOURCE_DIR}/boost_${BOOST_VERS}.tar.bz2
+         URL_MD5         ${BOOST_MD5}
+ 
+         # The patch command executes with the working directory set to <SOURCE_DIR>
+-        PATCH_COMMAND   bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch"
++        PATCH_COMMAND   env BZR_HOME=${PROJECT_SOURCE_DIR} bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch"
+ 
+         # Dick 18-Aug-2013:
+@@ -167,5 +168,6 @@
+ 
+ ExternalProject_Add_Step( boost bzr_commit_boost
+-    COMMAND bzr ci -q -m pristine <SOURCE_DIR>
++    COMMAND env BZR_HOME=${PROJECT_SOURCE_DIR} bzr whoami "M R <mr@freebsd.org>"
++    COMMAND env BZR_HOME=${PROJECT_SOURCE_DIR} bzr ci -q -m pristine <SOURCE_DIR>
+     COMMENT "committing pristine boost files to 'boost scratch repo'"
+     DEPENDERS patch
+@@ -175,5 +177,5 @@
+ ExternalProject_Add_Step( boost bzr_add_boost
+     # add only the headers to the scratch repo, repo = "../.bzr" from ${headers_src}
+-    COMMAND bzr add -q ${headers_src}
++    COMMAND env BZR_HOME=${PROJECT_SOURCE_DIR} bzr add -q ${headers_src}
+     COMMENT "adding pristine boost files to 'boost scratch repo'"
+     DEPENDERS bzr_commit_boost
+@@ -182,5 +184,5 @@
+ 
+ ExternalProject_Add_Step( boost bzr_init_boost
+-    COMMAND bzr init -q <SOURCE_DIR>
++    COMMAND env BZR_HOME=${PROJECT_SOURCE_DIR} bzr init -q <SOURCE_DIR>
+     COMMENT "creating 'boost scratch repo' specifically for boost to track boost patches"
+     DEPENDERS bzr_add_boost
diff --git a/cad/kicad-devel/files/patch-download_boost.cmake b/cad/kicad-devel/files/patch-download_boost.cmake
deleted file mode 100644
index a7fd1c62bcb0..000000000000
--- a/cad/kicad-devel/files/patch-download_boost.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
---- CMakeModules/download_boost.cmake.orig	2013-09-17 18:50:32.424234883 +0000
-+++ CMakeModules/download_boost.cmake	2013-09-17 18:33:58.024299100 +0000
-@@ -167,4 +167,5 @@
- 
- ExternalProject_Add_Step( boost bzr_commit_boost
-+    COMMAND bzr whoami "M R <mr@freebsd.org>"
-     COMMAND bzr ci -q -m pristine <SOURCE_DIR>
-     COMMENT "committing pristine boost files to 'boost scratch repo'"