mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00
Code Issues Releases Activity

Update to r4913.

Browse Source
This commit is contained in:
Michael Reifenberger 2014-06-05 12:30:47 +00:00
parent fd9bee2a35
commit 4c61fee7cd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=356629
5 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cad/kicad-devel/Makefile
View File

@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mr
PKGNAMESUFFIX= -devel
DIST_SUBDIR= ${PORTNAME}
# Additional patches: http://svn.openmoko.org/trunk/gta02-core/kicad-patches/
MAINTAINER= mr@FreeBSD.org
COMMENT= Schematic and PCB editing software
@ -64,7 +63,7 @@ BZR_DOC_REV!= bzr revno lp:~kicad-developers/kicad/doc
.if defined(BOOTSTRAP)
# Updating to new rev:
# make BOOTSTRAP=YES do-fetch
# make do-fetch BOOTSTRAP=YES
# make makesum && make && make makeplist
# < Check PLIST_FILE_LIST below >
@ -89,7 +88,7 @@ do-fetch:
cd ${WRKDIR}; \
tar xvf master.zip; \
tar cvfy ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 \
${DISTNAME} kicad-library-master kicad-doc kicad-patches
${DISTNAME} kicad-library-master kicad-doc
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
@ -97,10 +96,6 @@ do-fetch:
echo "BZR_DOC_REV= ${BZR_DOC_REV}" >> ${MASTERDIR}/Makefile.bzr_rev
.endif
ki:
svn export \
http://svn.openmoko.org/trunk/gta02-core/kicad-patches ${WRKDIR}/kicad-patches
tmp:
echo "${DATADIR} ${DATADIR:H}"

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

@ -1,5 +1,5 @@
BOOST_RELEASE= 1.54.0
BOOST_VERS= 1_54_0
BZR_SRC_REV= 4886
BZR_SRC_REV= 4913
BZR_LIB_REV=
BZR_DOC_REV= 576
BZR_DOC_REV= 577

4
cad/kicad-devel/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kicad/kicad-r4886.tar.bz2) = eb511c488983dcef2e365b37c2ec61a5d23100749937ba34a5aa3d3287d44dc0
SIZE (kicad/kicad-r4886.tar.bz2) = 255339930
SHA256 (kicad/kicad-r4913.tar.bz2) = 5651ecace38272d99b6e90e60a48d5f15aa5363b8a084ce59c90d8d37322ccdf
SIZE (kicad/kicad-r4913.tar.bz2) = 255516016

29
cad/kicad-devel/files/patch-utils-idftools-idf_parser.cpp Normal file
View File

@ -0,0 +1,29 @@
--- utils/idftools/idf_parser.cpp.orig 2014-06-05 12:18:16.912481412 +0000
+++ utils/idftools/idf_parser.cpp 2014-06-05 12:19:15.292871266 +0000
@@ -1489,6 +1489,6 @@
do
{
- std::map<std::string, GROUP_OUTLINE*>::iterator its = olnGroup.begin();
- std::map<std::string, GROUP_OUTLINE*>::iterator ite = olnGroup.end();
+ std::multimap<std::string, GROUP_OUTLINE*>::iterator its = olnGroup.begin();
+ std::multimap<std::string, GROUP_OUTLINE*>::iterator ite = olnGroup.end();
while( its != ite )
@@ -2906,6 +2906,6 @@
do
{
- std::map<std::string, GROUP_OUTLINE*>::iterator its = olnGroup.begin();
- std::map<std::string, GROUP_OUTLINE*>::iterator ite = olnGroup.end();
+ std::multimap<std::string, GROUP_OUTLINE*>::iterator its = olnGroup.begin();
+ std::multimap<std::string, GROUP_OUTLINE*>::iterator ite = olnGroup.end();
while( its != ite )
@@ -4103,6 +4103,6 @@
do
{
- std::map<std::string, GROUP_OUTLINE*>::iterator os = olnGroup.begin();
- std::map<std::string, GROUP_OUTLINE*>::iterator oe = olnGroup.end();
+ std::multimap<std::string, GROUP_OUTLINE*>::iterator os = olnGroup.begin();
+ std::multimap<std::string, GROUP_OUTLINE*>::iterator oe = olnGroup.end();
while( os != oe )

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

@ -10,6 +10,7 @@ bin/dxf2idf
bin/eeschema
bin/freeroute.jnlp
bin/gerbview
bin/idf2vrml
bin/idfcyl
bin/idfrect
bin/kicad