Date: Wed, 9 Sep 2020 13:25:13 +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: r548089 - in head/cad/kicad-devel: . files Message-ID: <202009091325.089DPD16081501@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mr Date: Wed Sep 9 13:25:12 2020 New Revision: 548089 URL: https://svnweb.freebsd.org/changeset/ports/548089 Log: Switch to the gitlab repo and update to 20200902162151 Modified: head/cad/kicad-devel/Makefile head/cad/kicad-devel/Makefile.git_rev head/cad/kicad-devel/distinfo head/cad/kicad-devel/files/newVersion.sh head/cad/kicad-devel/pkg-plist Modified: head/cad/kicad-devel/Makefile ============================================================================== --- head/cad/kicad-devel/Makefile Wed Sep 9 13:23:39 2020 (r548088) +++ head/cad/kicad-devel/Makefile Wed Sep 9 13:25:12 2020 (r548089) @@ -3,7 +3,7 @@ PORTNAME= kicad DISTVERSION= r${GIT_SRC_DATE} -PORTREVISION= 2 +#PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel DIST_SUBDIR= ${PORTNAME} @@ -24,10 +24,11 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ CONFLICTS= kicad-4.* -USE_GITHUB= yes -GH_ACCOUNT= KiCad -GH_PROJECT= kicad-source-mirror -GH_TAGNAME= ${GIT_SRC_HASH} +USE_GITLAB= yes +GL_ACCOUNT= kicad +GL_PROJECT= code/kicad +GL_COMMIT= ${GIT_SRC_HASH} +WRKSRC= ${WRKDIR}/${PORTNAME}-${GL_COMMIT}-${GL_COMMIT} CXXFLAGS+= --std=c++14 -I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include USE_GL= gl glew glu glut Modified: head/cad/kicad-devel/Makefile.git_rev ============================================================================== --- head/cad/kicad-devel/Makefile.git_rev Wed Sep 9 13:23:39 2020 (r548088) +++ head/cad/kicad-devel/Makefile.git_rev Wed Sep 9 13:25:12 2020 (r548089) @@ -1,2 +1,2 @@ -GIT_SRC_HASH= 449c90a0aef2b33add21261329b46da6c48e117c -GIT_SRC_DATE= 20200530133233 +GIT_SRC_HASH= bd23d003d219cb513b01feb4d9763879c9248f53 +GIT_SRC_DATE= 20200902162151 Modified: head/cad/kicad-devel/distinfo ============================================================================== --- head/cad/kicad-devel/distinfo Wed Sep 9 13:23:39 2020 (r548088) +++ head/cad/kicad-devel/distinfo Wed Sep 9 13:25:12 2020 (r548089) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590841957 -SHA256 (kicad/KiCad-kicad-source-mirror-r20200530133233-449c90a0aef2b33add21261329b46da6c48e117c_GH0.tar.gz) = 0e8c55da146b562e9391ed8b85ca5ac4e9cb6162c16583409e2fcd4144d222df -SIZE (kicad/KiCad-kicad-source-mirror-r20200530133233-449c90a0aef2b33add21261329b46da6c48e117c_GH0.tar.gz) = 28558152 +TIMESTAMP = 1599063795 +SHA256 (kicad/kicad-code/kicad-bd23d003d219cb513b01feb4d9763879c9248f53_GL0.tar.gz) = 9d444a7002a2e1a52e79dd08143b2f271801930f6972dcddd9263989de6bd7f5 +SIZE (kicad/kicad-code/kicad-bd23d003d219cb513b01feb4d9763879c9248f53_GL0.tar.gz) = 28805890 Modified: head/cad/kicad-devel/files/newVersion.sh ============================================================================== --- head/cad/kicad-devel/files/newVersion.sh Wed Sep 9 13:23:39 2020 (r548088) +++ head/cad/kicad-devel/files/newVersion.sh Wed Sep 9 13:25:12 2020 (r548089) @@ -1,25 +1,14 @@ #!/bin/sh -#GIT_SRC_HASH=`cd kicad-repo; git log -n 1 --pretty=format:"%H"` -#GIT_SRC_DATE=`cd kicad-repo; git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" | \ -# cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'` - CURDIR=`pwd` WRKDIR=`pwd`/work #mkdir -p "${WRKDIR}" -#if [ \! -d "${CURDIR}/kicad-library" ]; then -# git clone https://github.com/KiCad/kicad-library.git -b master "${CURDIR}/kicad-library"; -#else -# cd "${CURDIR}/kicad-library" -# git pull; -#fi - if [ \! -d "${CURDIR}/kicad-repo" ]; then - git clone https://github.com/KiCad/kicad-source-mirror.git -b master "${CURDIR}/kicad-repo"; + git clone https://gitlab.com/kicad/code/kicad.git -b master "${CURDIR}/kicad-repo"; else cd "${CURDIR}/kicad-repo" - git pull https://github.com/KiCad/kicad-source-mirror.git; + git pull https://gitlab.com/kicad/code/kicad.git; fi cd "${CURDIR}/kicad-repo" @@ -31,12 +20,3 @@ echo "$GIT_SRC_HASH, $GIT_SRC_DATE" echo "GIT_SRC_HASH= ${GIT_SRC_HASH}" > ${CURDIR}/Makefile.git_rev echo "GIT_SRC_DATE= ${GIT_SRC_DATE}" >> ${CURDIR}/Makefile.git_rev -#mkdir -p "${WRKDIR}/kicad-library-master" -#mkdir -p "${WRKDIR}/kicad-r${GIT_SRC_DATE}" -#cd "${CURDIR}/kicad-repo" -#find . -type d -name .git -prune -o -print | cpio -pdamuv "${WRKDIR}/kicad-r${GIT_SRC_DATE}"; -#cd "${CURDIR}/kicad-library" -#find . -type d -name .git -prune -o -print | cpio -pdamuv "${WRKDIR}/kicad-library-master" -#cd "${WRKDIR}" -#tar cvfy /usr/ports/distfiles/kicad/kicad-r${GIT_SRC_DATE}.tar.bz2 \ -# kicad-r${GIT_SRC_DATE} kicad-library-master Modified: head/cad/kicad-devel/pkg-plist ============================================================================== --- head/cad/kicad-devel/pkg-plist Wed Sep 9 13:23:39 2020 (r548088) +++ head/cad/kicad-devel/pkg-plist Wed Sep 9 13:25:12 2020 (r548089) @@ -154,13 +154,12 @@ share/icons/hicolor/scalable/mimetypes/application-x-k %%DATADIR%%/demos/flat_hierarchy/pic_sockets.sch %%DATADIR%%/demos/flat_hierarchy/sym-lib-table %%DATADIR%%/demos/interf_u/fp-lib-table -%%DATADIR%%/demos/interf_u/interf_u-cache.lib %%DATADIR%%/demos/interf_u/interf_u.kicad_pcb +%%DATADIR%%/demos/interf_u/interf_u.kicad_sch %%DATADIR%%/demos/interf_u/interf_u.net %%DATADIR%%/demos/interf_u/interf_u.pretty/BUS_PC.kicad_mod %%DATADIR%%/demos/interf_u/interf_u.pretty/PGA120.kicad_mod %%DATADIR%%/demos/interf_u/interf_u.pro -%%DATADIR%%/demos/interf_u/interf_u.sch %%DATADIR%%/demos/interf_u/interf_u_schlib.dcm %%DATADIR%%/demos/interf_u/interf_u_schlib.lib %%DATADIR%%/demos/interf_u/pagelayout_logo.kicad_wks @@ -227,9 +226,10 @@ share/icons/hicolor/scalable/mimetypes/application-x-k %%DATADIR%%/demos/simulation/pspice/schematic_libspice.dcm %%DATADIR%%/demos/simulation/pspice/schematic_libspice.lib %%DATADIR%%/demos/simulation/pspice/sym-lib-table +%%DATADIR%%/demos/simulation/rectifier/diode.mod %%DATADIR%%/demos/simulation/rectifier/rectifier-cache.lib +%%DATADIR%%/demos/simulation/rectifier/rectifier.kicad_sch %%DATADIR%%/demos/simulation/rectifier/rectifier.pro -%%DATADIR%%/demos/simulation/rectifier/rectifier.sch %%DATADIR%%/demos/simulation/rectifier/rectifier_schlib.lib %%DATADIR%%/demos/simulation/rectifier/sym-lib-table %%DATADIR%%/demos/simulation/sallen_key/ad8051.lib @@ -308,6 +308,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-k %%DATADIR%%/scripting/plugins/circular_pad_array_wizard.py %%DATADIR%%/scripting/plugins/kicad_qrcode.py %%DATADIR%%/scripting/plugins/microMatch_connectors.py +%%DATADIR%%/scripting/plugins/mutualcap_button_wizard.py %%DATADIR%%/scripting/plugins/qfn_wizard.py %%DATADIR%%/scripting/plugins/qfp_wizard.py %%DATADIR%%/scripting/plugins/qrcode_footprint_wizard.py @@ -315,6 +316,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-k %%DATADIR%%/scripting/plugins/touch_slider_wizard.py %%DATADIR%%/scripting/plugins/uss39_barcode.py %%DATADIR%%/scripting/plugins/zip_wizard.py -%%DATADIR%%/template/kicad.pro +%%DATADIR%%/template/kicad.kicad_pro share/mime/packages/kicad-gerbers.xml share/mime/packages/kicad-kicad.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009091325.089DPD16081501>