diff options
author | Michael Reifenberger <mr@FreeBSD.org> | 2014-06-03 09:20:54 +0000 |
---|---|---|
committer | Michael Reifenberger <mr@FreeBSD.org> | 2014-06-03 09:20:54 +0000 |
commit | 62479ded654b79c4002f31d556759cfe91ff76ea (patch) | |
tree | 8448b35ee8ab75ef8f78d5f4ef06a6424ca830ea /cad | |
parent | 72dfba0d11a0e3c4667772071d76d0dcad7b5a58 (diff) | |
download | ports-62479ded654b79c4002f31d556759cfe91ff76ea.tar.gz ports-62479ded654b79c4002f31d556759cfe91ff76ea.zip |
Try to avoid bzr leftovers.
Use boost from ports.
Request same compiler as boost.
Notes
Notes:
svn path=/head/; revision=356313
Diffstat (limited to 'cad')
-rw-r--r-- | cad/kicad-devel/Makefile | 8 | ||||
-rw-r--r-- | cad/kicad-devel/files/patch-CMakeModules-download_boost.cmake | 56 |
2 files changed, 30 insertions, 34 deletions
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 232ccbd1ea86..12fb516d5bd7 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= kicad DISTVERSION= r${BZR_SRC_REV} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mr @@ -37,14 +37,14 @@ PLIST_SUB= OPSYS=${OPSYS} \ BINS= cvpcb eeschema gerbview kicad pcbnew EXTRAS2RM= linux-non_unicode linux wings3d LINUX.README \ contrib_makefiles.txt running_kicad_under_W98.txt -#USE_GCC= yes -USES= tar:bzip2 cmake gettext +USES= desktop-file-utils shared-mime-info compiler:c++11-lang tar:bzip2 cmake gettext CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_BUILD_TYPE="Debug" \ -DKICAD_TESTING_VERSION=ON \ -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \ - -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" + -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ + -DKICAD_SKIP_BOOST=YES .if exists(${LOCALBASE}/bin/konqueror) RUN_DEPENDS+= konqueror:${PORTSDIR}/x11/kde4-baseapps diff --git a/cad/kicad-devel/files/patch-CMakeModules-download_boost.cmake b/cad/kicad-devel/files/patch-CMakeModules-download_boost.cmake index b8c63dee35bd..3f0974ff7b5a 100644 --- a/cad/kicad-devel/files/patch-CMakeModules-download_boost.cmake +++ b/cad/kicad-devel/files/patch-CMakeModules-download_boost.cmake @@ -1,5 +1,5 @@ ---- CMakeModules/download_boost.cmake.orig 2014-05-23 10:58:30.000000000 +0200 -+++ CMakeModules/download_boost.cmake 2014-05-23 15:23:06.883291854 +0200 +--- CMakeModules/download_boost.cmake.orig 2014-05-23 16:28:19.000000000 +0200 ++++ CMakeModules/download_boost.cmake 2014-06-03 10:26:43.963718518 +0200 @@ -93,5 +93,5 @@ # Default Toolset @@ -21,11 +21,14 @@ + URL file://${PROJECT_SOURCE_DIR}/boost_${BOOST_VERS}.tar.bz2 DOWNLOAD_DIR "${DOWNLOAD_DIR}" TIMEOUT 1200 # 20 minutes -@@ -206,5 +206,5 @@ - PATCH_COMMAND bzr revert +@@ -204,7 +204,7 @@ + # fails when applying a patch to the branch twice and doesn't have a switch + # to ignore previously applied patches +- PATCH_COMMAND bzr revert ++ PATCH_COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr revert # bzr revert is insufficient to remove "added" files: - COMMAND bzr clean-tree -q --force -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr clean-tree -q --force ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr clean-tree -q --force COMMAND ${PATCH_STR_CMD} "${PROJECT_SOURCE_DIR}/patches/boost_minkowski.patch" @@ -213,6 +213,6 @@ @@ -33,8 +36,8 @@ # tell bzr about "added" files by last patch: - COMMAND bzr add libs/context/src/asm/jump_i386_x86_64_sysv_macho_gas.S - COMMAND bzr add libs/context/src/asm/make_i386_x86_64_sysv_macho_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_i386_x86_64_sysv_macho_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_i386_x86_64_sysv_macho_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_i386_x86_64_sysv_macho_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_i386_x86_64_sysv_macho_gas.S COMMAND ${PATCH_STR_CMD} "${PROJECT_SOURCE_DIR}/patches/boost_macosx_x86_build.patch" #https://svn.boost.org/trac/boost/ticket/8266 @@ -221,18 +221,18 @@ @@ -44,10 +47,10 @@ - COMMAND bzr add libs/context/src/asm/jump_i386_ms_pe_gas.S - COMMAND bzr add libs/context/src/asm/make_x86_64_ms_pe_gas.S - COMMAND bzr add libs/context/src/asm/jump_x86_64_ms_pe_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_i386_ms_pe_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_i386_ms_pe_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_x86_64_ms_pe_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_x86_64_ms_pe_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_i386_ms_pe_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_i386_ms_pe_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_x86_64_ms_pe_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_x86_64_ms_pe_gas.S COMMAND ${PATCH_STR_CMD} "${PROJECT_SOURCE_DIR}/patches/patch_macosx_context_ppc_v2.patch" #https://svn.boost.org/trac/boost/ticket/8266 - COMMAND bzr add libs/context/build/Jamfile.v2 @@ -58,42 +61,35 @@ - COMMAND bzr add libs/context/src/asm/make_combined_sysv_macho_gas.S - COMMAND bzr add libs/context/src/asm/make_ppc32_sysv_macho_gas.S - COMMAND bzr add libs/context/src/asm/make_ppc64_sysv_macho_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/build/Jamfile.v2 -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/build/architecture.jam -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_combined_sysv_macho_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_ppc32_sysv_macho_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_ppc64_sysv_macho_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_combined_sysv_macho_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_ppc32_sysv_macho_gas.S -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_ppc64_sysv_macho_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/build/Jamfile.v2 ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/build/architecture.jam ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_combined_sysv_macho_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_ppc32_sysv_macho_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/jump_ppc64_sysv_macho_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_combined_sysv_macho_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_ppc32_sysv_macho_gas.S ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add libs/context/src/asm/make_ppc64_sysv_macho_gas.S # [Mis-]use this step to erase all the boost headers and libraries before -@@ -240,5 +240,5 @@ - UPDATE_COMMAND ${CMAKE_COMMAND} -E remove_directory "${BOOST_ROOT}" - -- BINARY_DIR "${PREFIX}/src/boost/" -+ BINARY_DIR "${PREFIX}/src/boost" - CONFIGURE_COMMAND ${bootstrap} - @@ -297,5 +297,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 BZR_HOME=${PROJECT_SOURCE_DIR} bzr ci -q -m pristine <SOURCE_DIR> ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr whoami "M R <mr@freebsd.org>" ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr ci -q -m pristine <SOURCE_DIR> COMMENT "committing pristine boost files to 'boost scratch repo'" DEPENDERS patch @@ -305,5 +306,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 ${PREFIX}/src/boost -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add -q ${PREFIX}/src/boost ++ COMMAND BZR_LOG=/dev/null BZR_HOME=${PROJECT_SOURCE_DIR} bzr add -q ${PREFIX}/src/boost COMMENT "adding pristine boost files to 'boost scratch repo'" DEPENDERS bzr_commit_boost @@ -312,5 +313,5 @@ ExternalProject_Add_Step( boost bzr_init_boost - COMMAND bzr init -q <SOURCE_DIR> -+ COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr init -q <SOURCE_DIR> ++ COMMAND BZR_LOG=/dev/null 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 |