Date: Thu, 5 Jun 2014 12:30:47 +0000 (UTC) From: Michael Reifenberger <mr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356629 - in head/cad/kicad-devel: . files Message-ID: <201406051230.s55CUlAo035631@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mr Date: Thu Jun 5 12:30:47 2014 New Revision: 356629 URL: http://svnweb.freebsd.org/changeset/ports/356629 QAT: https://qat.redports.org/buildarchive/r356629/ Log: Update to r4913. Added: head/cad/kicad-devel/files/patch-utils-idftools-idf_parser.cpp (contents, props changed) Modified: head/cad/kicad-devel/Makefile head/cad/kicad-devel/Makefile.bzr_rev head/cad/kicad-devel/distinfo head/cad/kicad-devel/pkg-plist Modified: head/cad/kicad-devel/Makefile ============================================================================== --- head/cad/kicad-devel/Makefile Thu Jun 5 11:36:31 2014 (r356628) +++ head/cad/kicad-devel/Makefile Thu Jun 5 12:30:47 2014 (r356629) @@ -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 .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}" Modified: head/cad/kicad-devel/Makefile.bzr_rev ============================================================================== --- head/cad/kicad-devel/Makefile.bzr_rev Thu Jun 5 11:36:31 2014 (r356628) +++ head/cad/kicad-devel/Makefile.bzr_rev Thu Jun 5 12:30:47 2014 (r356629) @@ -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 Modified: head/cad/kicad-devel/distinfo ============================================================================== --- head/cad/kicad-devel/distinfo Thu Jun 5 11:36:31 2014 (r356628) +++ head/cad/kicad-devel/distinfo Thu Jun 5 12:30:47 2014 (r356629) @@ -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 Added: head/cad/kicad-devel/files/patch-utils-idftools-idf_parser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/kicad-devel/files/patch-utils-idftools-idf_parser.cpp Thu Jun 5 12:30:47 2014 (r356629) @@ -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 ) Modified: head/cad/kicad-devel/pkg-plist ============================================================================== --- head/cad/kicad-devel/pkg-plist Thu Jun 5 11:36:31 2014 (r356628) +++ head/cad/kicad-devel/pkg-plist Thu Jun 5 12:30:47 2014 (r356629) @@ -10,6 +10,7 @@ bin/dxf2idf bin/eeschema bin/freeroute.jnlp bin/gerbview +bin/idf2vrml bin/idfcyl bin/idfrect bin/kicad
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406051230.s55CUlAo035631>