mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-08 06:48:28 +00:00
Code Issues Releases Activity

Update to r4886 and stagify.

Browse Source 
This version should contain the CERN push&shove router.
This commit is contained in:
Michael Reifenberger 2014-05-23 16:27:38 +00:00
parent 5425147bad
commit 37f6262686
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=354940
6 changed files with 1791 additions and 799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
cad/kicad-devel/Makefile
View File

@ -25,38 +25,29 @@ CONFLICTS= kicad-2013*
DOCVERSION= 1.1 DOCVERSION= 1.1
LIBVERSION= 1.0 LIBVERSION= 1.0
USE_BZIP2= yes USES= tar:bzip2
#USE_GMAKE= yes #USE_GMAKE= yes
USE_GL= yes USE_GL= glew glu
USE_WX= 2.8 USE_WX= 2.8
WX_UNICODE= yes WX_UNICODE= yes
USE_GNOME= atk # Required by libwx_gtk2_aui-2.8.so USE_GNOME= atk # Required by libwx_gtk2_aui-2.8.so
USE_PYTHON= yes USE_PYTHON= yes
#OPTIONS= GTA2CORE "Apply additional Openmoko GTA2_CORE patches" off
PLIST_SUB= OPSYS=${OPSYS} \ PLIST_SUB= OPSYS=${OPSYS} \
DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||} DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
BINS= cvpcb eeschema gerbview kicad pcbnew BINS= cvpcb eeschema gerbview kicad pcbnew
EXTRAS2RM= linux-non_unicode linux wings3d LINUX.README \ EXTRAS2RM= linux-non_unicode linux wings3d LINUX.README \
contrib_makefiles.txt running_kicad_under_W98.txt contrib_makefiles.txt running_kicad_under_W98.txt
USE_GCC= yes #USE_GCC= yes
USES= cmake gettext USES= cmake gettext
CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE="Debug" \
-DKICAD_TESTING_VERSION=ON \ -DKICAD_TESTING_VERSION=ON \
-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \ -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}"
NO_STAGE= yes
#.if !defined(WITHOUT_GTA2CORE)
#PATCH_STRIP= -p1
#EXTRA_PATCHES+= \
# ${WRKDIR}/kicad-patches/eeschema-plot-only-mode.patch \
# ${WRKDIR}/kicad-patches/streamline-erc.patch
#.endif
.if exists(${LOCALBASE}/bin/konqueror) .if exists(${LOCALBASE}/bin/konqueror)
RUN_DEPENDS+= konqueror:${PORTSDIR}/x11/kde4-baseapps RUN_DEPENDS+= konqueror:${PORTSDIR}/x11/kde4-baseapps
.else .else
@ -67,7 +58,6 @@ RUN_DEPENDS+= xpdf:${PORTSDIR}/graphics/xpdf
BOOST_RELEASE= 1.54.0 BOOST_RELEASE= 1.54.0
BOOST_VERS= ${BOOST_RELEASE:S|.|_|g} BOOST_VERS= ${BOOST_RELEASE:S|.|_|g}
BZR_SRC_REV!= bzr revno lp:kicad 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 BZR_DOC_REV!= bzr revno lp:~kicad-developers/kicad/doc
.else .else
.include "Makefile.bzr_rev" .include "Makefile.bzr_rev"
@ -77,12 +67,8 @@ BZR_DOC_REV!= bzr revno lp:~kicad-developers/kicad/doc
# Updating to new rev: # Updating to new rev:
# make BOOTSTRAP=YES do-fetch # make BOOTSTRAP=YES do-fetch
# make makesum && make && make install # make makesum && make && make makeplist
# < Check PLIST_FILE_LIST below > # < Check PLIST_FILE_LIST below >
# make build-plist
# make deinstall && make install && make package
# pkg_deinstall /var/db/pkg/kicad-devel*
# pkg_add /usr/ports/pkg_amd64/All/kicad-devel*
FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
FETCH_DEPENDS+= bzr:${PORTSDIR}/devel/bzr FETCH_DEPENDS+= bzr:${PORTSDIR}/devel/bzr
@ -98,14 +84,14 @@ do-fetch:
${MKDIR} ${WRKDIR} ${MKDIR} ${WRKDIR}
${ECHO} ${WRKSRC} ${ECHO} ${WRKSRC}
bzr export -r ${BZR_SRC_REV} ${WRKSRC} lp:kicad bzr export -r ${BZR_SRC_REV} ${WRKSRC} lp:kicad
bzr export -r ${BZR_LIB_REV} ${WRKDIR}/kicad-library lp:~kicad-lib-committers/kicad/library ${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 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 \ fetch -o ${WRKDIR}/${DISTNAME}/boost_${BOOST_VERS}.tar.bz2 \
http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/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 \ cd ${WRKDIR}; \
${DISTNAME} kicad-library kicad-doc kicad-patches tar xvf master.zip; \
tar cvfy ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 \
${DISTNAME} kicad-library-master kicad-doc kicad-patches
echo "BOOST_RELEASE= ${BOOST_RELEASE}" > ${MASTERDIR}/Makefile.bzr_rev echo "BOOST_RELEASE= ${BOOST_RELEASE}" > ${MASTERDIR}/Makefile.bzr_rev
echo "BOOST_VERS= ${BOOST_VERS}" >> ${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_SRC_REV= ${BZR_SRC_REV}" >> ${MASTERDIR}/Makefile.bzr_rev
@ -141,11 +127,11 @@ pre-install:
@echo "${DATADIR}, ${DOCSDIR}" @echo "${DATADIR}, ${DOCSDIR}"
post-install: post-install:
.for subdir in library modules .for subdir in library modules template
${CP} -Rp ${WRKDIR}/kicad-library/${subdir} ${DATADIR} ${CP} -Rp ${WRKDIR}/kicad-library-master/${subdir} ${STAGEDIR}${DATADIR}
.endfor .endfor
.for subdir in internat .for subdir in internat
${CP} -Rp ${WRKDIR}/kicad-doc/${subdir} ${DOCSDIR} ${CP} -Rp ${WRKDIR}/kicad-doc/${subdir} ${STAGEDIR}${DOCSDIR}
.endfor .endfor
PLIST_FILE_LIST= bin/freeroute.jnlp \ PLIST_FILE_LIST= bin/freeroute.jnlp \
@ -178,21 +164,21 @@ PLIST_SHAREDDIR_LIST= share/mimelnk/application \
build-plist: build-plist:
${RM} -f ${PLIST} ${RM} -f ${PLIST}
cd ${PREFIX} && \ cd ${STAGEDIR}${PREFIX} && \
(ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \ (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \
${SORT} >> ${PLIST} ${SORT} >> ${PLIST}
${FIND} ${DATADIR} ${DOCSDIR} -type f | \ ${FIND} ${STAGEDIR}${DATADIR} ${DOCSDIR} -type f | \
${SED} -e 's|${DATADIR}|%%DATADIR%%|' \ ${SED} -e 's|${STAGEDIR}${DATADIR}|%%DATADIR%%|' \
-e 's|${DOCSDIR}|%%DOCSDIR%%|' | ${SORT} >> ${PLIST} -e 's|${STAGEDIR}${DOCSDIR}|%%DOCSDIR%%|' | ${SORT} >> ${PLIST}
cd ${PREFIX} && \ cd ${STAGEDIR}${PREFIX} && \
${FIND} ${PLIST_DIR_LIST} -type d | \ ${FIND} ${PLIST_DIR_LIST} -type d | \
${SORT} -r | ${SED} -e 's|^|@dirrm |' >> ${PLIST} ${SORT} -r | ${SED} -e 's|^|@dirrm |' >> ${PLIST}
.for subdir in ${PLIST_SHAREDDIR_LIST} .for subdir in ${PLIST_SHAREDDIR_LIST}
@${ECHO_CMD} '@unexec ${RMDIR} %D/${subdir} 2> /dev/null || true' >> ${PLIST} @${ECHO_CMD} '@unexec ${RMDIR} %D/${subdir} 2> /dev/null || true' >> ${PLIST}
.endfor .endfor
${FIND} ${DATADIR} ${DOCSDIR} -type d | ${SORT} -r | \ ${FIND} ${STAGEDIR}${DATADIR} ${STAGEDIR}${DOCSDIR} -type d | ${SORT} -r | \
${SED} -e 's|${DATADIR}|%%DATADIR%%|' \ ${SED} -e 's|${STAGEDIR}${DATADIR}|%%DATADIR%%|' \
-e 's|${DOCSDIR}|%%DOCSDIR%%|' \ -e 's|${STAGEDIR}${DOCSDIR}|%%DOCSDIR%%|' \
-e 's|^|@dirrm |' >> ${PLIST} -e 's|^|@dirrm |' >> ${PLIST}
.include <bsd.port.mk> .include <bsd.port.mk>

6
cad/kicad-devel/Makefile.bzr_rev
View File

@ -1,5 +1,5 @@
BOOST_RELEASE= 1.54.0 BOOST_RELEASE= 1.54.0
BOOST_VERS= 1_54_0 BOOST_VERS= 1_54_0
BZR_SRC_REV= 4313 BZR_SRC_REV= 4886
BZR_LIB_REV= 267 BZR_LIB_REV=
BZR_DOC_REV= 487 BZR_DOC_REV= 576

4
cad/kicad-devel/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kicad/kicad-r4313.tar.bz2) = 854b9175804bb7d891bde3c94ee75b9094c21c617a55467caf5f451a1eaf8e4b SHA256 (kicad/kicad-r4886.tar.bz2) = eb511c488983dcef2e365b37c2ec61a5d23100749937ba34a5aa3d3287d44dc0
SIZE (kicad/kicad-r4313.tar.bz2) = 238026194 SIZE (kicad/kicad-r4886.tar.bz2) = 255339930

109
cad/kicad-devel/files/patch-CMakeModules-download_boost.cmake
View File

@ -1,48 +1,99 @@
--- CMakeModules/download_boost.cmake.orig 2013-09-13 07:40:43.000000000 +0000 --- CMakeModules/download_boost.cmake.orig 2014-05-23 10:58:30.000000000 +0200
+++ CMakeModules/download_boost.cmake 2013-10-22 21:38:43.909426514 +0000 +++ CMakeModules/download_boost.cmake 2014-05-23 15:23:06.883291854 +0200
@@ -103,9 +103,9 @@ @@ -93,5 +93,5 @@
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> # Default Toolset
- PATCH_COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch" -set( BOOST_TOOLSET "toolset=gcc" )
+ PATCH_COMMAND env BZR_HOME="${PROJECT_SOURCE_DIR}" bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch" +set( BOOST_TOOLSET "toolset=clang" )
# [Mis-]use this step to erase all the boost headers and libraries before if( KICAD_BUILD_STATIC OR APPLE )
@@ -140,9 +140,9 @@ @@ -131,5 +131,5 @@
PREFIX "${PREFIX}" #message( STATUS "libs_csv:${libs_csv}" )
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> - set( bootstrap ./bootstrap.sh --with-libraries=${libs_csv} )
- PATCH_COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch" + set( bootstrap ./bootstrap.sh --with-${BOOST_TOOLSET} --with-libraries=${libs_csv} )
+ PATCH_COMMAND env BZR_HOME=${PROJECT_SOURCE_DIR} bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch" # pass to *both* C and C++ compilers
set( BOOST_CFLAGS "cflags=${PIC_FLAG}" )
@@ -186,5 +186,5 @@
PREFIX "${PREFIX}"
# Dick 18-Aug-2013: - URL http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/boost_${BOOST_VERS}.tar.bz2
@@ -167,5 +168,6 @@ + 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
# 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 ${PATCH_STR_CMD} "${PROJECT_SOURCE_DIR}/patches/boost_minkowski.patch"
@@ -213,6 +213,6 @@
COMMAND ${PATCH_STR_CMD} "${PROJECT_SOURCE_DIR}/patches/boost_macosx_x86.patch" #https://svn.boost.org/trac/boost/ticket/8266
# 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 ${PATCH_STR_CMD} "${PROJECT_SOURCE_DIR}/patches/boost_macosx_x86_build.patch" #https://svn.boost.org/trac/boost/ticket/8266
@@ -221,18 +221,18 @@
COMMAND ${PATCH_STR_CMD} "${PROJECT_SOURCE_DIR}/patches/boost_mingw.patch" #https://svn.boost.org/trac/boost/ticket/7262
# tell bzr about "added" files by last patch:
- COMMAND bzr add libs/context/src/asm/make_i386_ms_pe_gas.S
- 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 ${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
- COMMAND bzr add libs/context/build/architecture.jam
- COMMAND bzr add libs/context/src/asm/jump_combined_sysv_macho_gas.S
- COMMAND bzr add libs/context/src/asm/jump_ppc32_sysv_macho_gas.S
- COMMAND bzr add libs/context/src/asm/jump_ppc64_sysv_macho_gas.S
- 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
# [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 ExternalProject_Add_Step( boost bzr_commit_boost
- COMMAND bzr ci -q -m pristine <SOURCE_DIR> - 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 whoami "M R <mr@freebsd.org>"
+ COMMAND env BZR_HOME=${PROJECT_SOURCE_DIR} bzr ci -q -m pristine <SOURCE_DIR> + COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr ci -q -m pristine <SOURCE_DIR>
COMMENT "committing pristine boost files to 'boost scratch repo'" COMMENT "committing pristine boost files to 'boost scratch repo'"
DEPENDERS patch DEPENDERS patch
@@ -175,5 +177,5 @@ @@ -305,5 +306,5 @@
ExternalProject_Add_Step( boost bzr_add_boost ExternalProject_Add_Step( boost bzr_add_boost
# add only the headers to the scratch repo, repo = "../.bzr" from ${headers_src} # add only the headers to the scratch repo, repo = "../.bzr" from ${headers_src}
- COMMAND bzr add -q ${headers_src} - COMMAND bzr add -q ${PREFIX}/src/boost
+ COMMAND env BZR_HOME=${PROJECT_SOURCE_DIR} bzr add -q ${headers_src} + COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr add -q ${PREFIX}/src/boost
COMMENT "adding pristine boost files to 'boost scratch repo'" COMMENT "adding pristine boost files to 'boost scratch repo'"
DEPENDERS bzr_commit_boost DEPENDERS bzr_commit_boost
@@ -182,5 +184,5 @@ @@ -312,5 +313,5 @@
ExternalProject_Add_Step( boost bzr_init_boost ExternalProject_Add_Step( boost bzr_init_boost
- COMMAND bzr init -q <SOURCE_DIR> - COMMAND bzr init -q <SOURCE_DIR>
+ COMMAND env BZR_HOME=${PROJECT_SOURCE_DIR} bzr init -q <SOURCE_DIR> + COMMAND BZR_HOME=${PROJECT_SOURCE_DIR} bzr init -q <SOURCE_DIR>
COMMENT "creating 'boost scratch repo' specifically for boost to track boost patches" COMMENT "creating 'boost scratch repo' specifically for boost to track boost patches"
DEPENDERS bzr_add_boost DEPENDERS bzr_add_boost

9
cad/kicad-devel/files/patch-include-kiway.h Normal file
View File

@ -0,0 +1,9 @@
--- include/kiway.h.orig 2014-05-23 15:44:36.884457126 +0200
+++ include/kiway.h 2014-05-23 15:45:05.138279780 +0200
@@ -115,5 +115,5 @@
#define KIFACE_INSTANCE_NAME_AND_VERSION "KIFACE_1"
-#if defined(__linux__)
+#if defined(__FreeBSD__)
#define LIB_ENV_VAR wxT( "LD_LIBRARY_PATH" )
#elif defined(__WXMAC__)

2404
cad/kicad-devel/pkg-plist
View File

File diff suppressed because it is too large Load Diff