From 75e7a88ce078e8e7f28d48f0413c87154cf4df08 Mon Sep 17 00:00:00 2001 From: Christoph Schmidt-Hieber Date: Tue, 15 Nov 2022 20:44:23 +0100 Subject: [PATCH] Update macports distribution --- .gitignore | 1 + dist/macosx/macports/insert_checksums.sh | 17 +++++++++-------- dist/macosx/macports/python/py-stfio/Portfile | 4 ++-- dist/macosx/macports/science/stimfit/Portfile | 16 +++++++--------- .../macosx/macports/science/stimfit/Portfile.in | 9 ++++----- dist/macosx/macports/upload_stimfit.in | 2 ++ 6 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 dist/macosx/macports/upload_stimfit.in diff --git a/.gitignore b/.gitignore index 215198b4..5902be1d 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,7 @@ dist/macosx/macports/science/stimfit/work/* dist/macosx/macports/python/py-stfio/work dist/macosx/macports/python/py-stfio/work/* dist/macosx/macports/*.diff +dist/macosx/macports/upload_stimfit # build files diff --git a/dist/macosx/macports/insert_checksums.sh b/dist/macosx/macports/insert_checksums.sh index aba97c6f..2c97dbe3 100755 --- a/dist/macosx/macports/insert_checksums.sh +++ b/dist/macosx/macports/insert_checksums.sh @@ -2,13 +2,20 @@ STFVERSION="0.16.2" MPDIR=`pwd` +GSED=`which gsed` +if [ "${GSED}" = "" ] +then + GSED=`which sed` +fi + if [ "$1" != "" ]; then cd ../../../ && ./autogen.sh cd build/release - ./conf_macports_release.sh + ./../../dist/macosx/scripts/conf_macports_release.sh make dist - scp stimfit-${STFVERSION}.tar.gz p8210991@ftp.schmidt-hieber.de:/kunden/homepages/32/d34288459/htdocs/StimfitJ/ + ${GSED} 's/STFVERSION/'${STFVERSION}'/g' ${MPDIR}/upload_stimfit.in > ${MPDIR}/upload_stimfit + sftp -b ${MPDIR}/upload_stimfit p8210991@ftp.schmidt-hieber.de cd ${MPDIR} fi @@ -18,12 +25,6 @@ SHA256=`openssl sha256 -r ../../../build/release/stimfit-${STFVERSION}.tar.gz | echo "rmd160:" ${RMD160} echo "sha256:" ${SHA256} -GSED=`which gsed` -if [ "${GSED}" = "" ] -then - GSED=`which sed` -fi - ${GSED} 's/RMD160/'${RMD160}'/g' ${MPDIR}/science/stimfit/Portfile.in > ${MPDIR}/science/stimfit/Portfile ${GSED} -i 's/SHA256/'${SHA256}'/g' ${MPDIR}/science/stimfit/Portfile ${GSED} -i 's/STFVERSION/'${STFVERSION}'/g' ${MPDIR}/science/stimfit/Portfile diff --git a/dist/macosx/macports/python/py-stfio/Portfile b/dist/macosx/macports/python/py-stfio/Portfile index 4b0f3d50..64b30dfd 100644 --- a/dist/macosx/macports/python/py-stfio/Portfile +++ b/dist/macosx/macports/python/py-stfio/Portfile @@ -15,8 +15,8 @@ homepage http://www.stimfit.org master_sites ${homepage} distname stimfit-${version} -checksums rmd160 ba8ea20c5a9b554a082b38b895c77a662ef8e51e \ - sha256 8914a8765c1be8eba0716e460a4c85d0f8335a4b6d2320e2ecbf705d166a5a1a +checksums rmd160 bab67cce67e60bc8251942c83f73f643fae15a5c \ + sha256 309cd3381caabb2d2fdc258520d376e11f8ab2ab047ba7851c3e6ab3ee78e20f python.versions 27 35 36 37 diff --git a/dist/macosx/macports/science/stimfit/Portfile b/dist/macosx/macports/science/stimfit/Portfile index 4aa9b08f..c39f918a 100644 --- a/dist/macosx/macports/science/stimfit/Portfile +++ b/dist/macosx/macports/science/stimfit/Portfile @@ -1,5 +1,5 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 - +# $Id$ PortSystem 1.0 PortGroup wxWidgets 1.0 @@ -14,8 +14,8 @@ long_description A program for viewing and analyzing electrophysiological dat homepage http://www.stimfit.org master_sites ${homepage} -checksums rmd160 ba8ea20c5a9b554a082b38b895c77a662ef8e51e \ - sha256 8914a8765c1be8eba0716e460a4c85d0f8335a4b6d2320e2ecbf705d166a5a1a +checksums rmd160 bab67cce67e60bc8251942c83f73f643fae15a5c \ + sha256 309cd3381caabb2d2fdc258520d376e11f8ab2ab047ba7851c3e6ab3ee78e20f wxWidgets.use wxWidgets-3.2 @@ -26,15 +26,16 @@ depends_lib port:fftw-3 \ configure.args --disable-dependency-tracking \ --disable-python \ --with-biosiglite \ - --with-wx-config=${wxWidgets.wxconfig} \ - --enable-debug + --with-wx-config=${wxWidgets.wxconfig} + +default_variants +python310 set python_branches {3.9 3.10} foreach python_branch ${python_branches} { set python_version [join [lrange [split ${python_branch} .] 0 1] ""] - set variant_line {variant python${python_version} description "Enable Python ${python_version} shell"} + set variant_line {variant python${python_version} description "Enable Python ${python_branch} shell"} foreach over ${python_branches} { if {${python_branch} == ${over}} { @@ -61,7 +62,6 @@ foreach python_branch ${python_branches} { depends_lib-append \ port:python${python_version} \ - port:py${python_version}-wxpython-4.0 \ port:py${python_version}-numpy \ port:py${python_version}-matplotlib \ port:py${python_version}-cvxopt @@ -87,8 +87,6 @@ variant atlas description {Use MacPorts ATLAS libraries.} { --with-lapack-lib=${prefix}/lib/libatlas.a } -default_variants +python310 - configure.ldflags-append \ -headerpad_max_install_names diff --git a/dist/macosx/macports/science/stimfit/Portfile.in b/dist/macosx/macports/science/stimfit/Portfile.in index 1b2a3acf..53e86e9c 100644 --- a/dist/macosx/macports/science/stimfit/Portfile.in +++ b/dist/macosx/macports/science/stimfit/Portfile.in @@ -1,5 +1,5 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 - +# $Id$ PortSystem 1.0 PortGroup wxWidgets 1.0 @@ -28,12 +28,14 @@ configure.args --disable-dependency-tracking \ --with-biosiglite \ --with-wx-config=${wxWidgets.wxconfig} +default_variants +python310 + set python_branches {3.9 3.10} foreach python_branch ${python_branches} { set python_version [join [lrange [split ${python_branch} .] 0 1] ""] - set variant_line {variant python${python_version} description "Enable Python ${python_version} shell"} + set variant_line {variant python${python_version} description "Enable Python ${python_branch} shell"} foreach over ${python_branches} { if {${python_branch} == ${over}} { @@ -60,7 +62,6 @@ foreach python_branch ${python_branches} { depends_lib-append \ port:python${python_version} \ - port:py${python_version}-wxpython-4.0 \ port:py${python_version}-numpy \ port:py${python_version}-matplotlib \ port:py${python_version}-cvxopt @@ -86,8 +87,6 @@ variant atlas description {Use MacPorts ATLAS libraries.} { --with-lapack-lib=${prefix}/lib/libatlas.a } -default_variants +python310 - configure.ldflags-append \ -headerpad_max_install_names diff --git a/dist/macosx/macports/upload_stimfit.in b/dist/macosx/macports/upload_stimfit.in new file mode 100644 index 00000000..75c8fa46 --- /dev/null +++ b/dist/macosx/macports/upload_stimfit.in @@ -0,0 +1,2 @@ +cd StimfitJ +put stimfit-STFVERSION.tar.gz