<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/21f3ef5fa4aa2187c070c1d15428338dad2b5fee">https://github.com/macports/macports-ports/commit/21f3ef5fa4aa2187c070c1d15428338dad2b5fee</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 21f3ef5fa4a molmol: fix build on Big Sur
</span>21f3ef5fa4a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 21f3ef5fa4aa2187c070c1d15428338dad2b5fee
</span>Author: jwhowarth <howarth.mailing.lists@gmail.com>
AuthorDate: Thu Jun 3 22:35:25 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> molmol: fix build on Big Sur
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - using MacPorts zlib and removing deprecated OpenGL framework linkage
</span><span style='display:block; white-space:pre;color:#404040;'> - modernize checksums
</span><span style='display:block; white-space:pre;color:#404040;'> - add license
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62865
</span>---
science/molmol/Portfile | 24 ++++++++++++++++--------
science/molmol/files/molmol-build.diff | 2 +-
2 files changed, 17 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/molmol/Portfile b/science/molmol/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ff28c527e1..ac6703f109a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/molmol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/molmol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compilers 1.0
</span>
name molmol
version 2k.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 12
</span> categories science chemistry
maintainers {gmail.com:howarth.at.macports @jwhowarth} openmaintainer
description Molecular graphics display program
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,15 +17,18 @@ long_description MOLMOL is a molecular graphics program for displaying, analy
</span> properly with RNA.
homepage http://www.mol.biol.ethz.ch/wuthrich/software/molmol/
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license Restrictive/Distributable
</span> master_sites ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip
distfiles molmol-${version}-src.tar.gz \
molmol-${version}-doc.tar.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums molmol-${version}-src.tar.gz md5 e1f4416d8041a67fa08cadb03ed91c7c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 09482a1dea601563ca64e773dc0ec47019e22c63 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b1de89953631dd9b11928751d7853cb511bf45f0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- molmol-${version}-doc.tar.gz md5 517545b60b0179ab691a679ed29903a7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 b47551283fa19f57f4d5edcbd52f725055d80b7f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 08b3e21ab6eb7c9044e59373334181ff91ca8a53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums molmol-2k.2.0-src.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b1de89953631dd9b11928751d7853cb511bf45f0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1104dcb1b2517581c7d6b1695ff2e92f4076ad34afc48dd896eec38e5acf2287 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1088805 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ molmol-2k.2.0-doc.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 08b3e21ab6eb7c9044e59373334181ff91ca8a53 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 07e1c3fd04ffe7c9e9d91eaefa0bf72e6d0913a981eec3bf0879bfc65537a6be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1062297
</span> depends_lib port:openmotif \
port:mesa \
port:libGLU \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +36,9 @@ depends_lib port:openmotif \
</span> port:tiff \
path:include/turbojpeg.h:libjpeg-turbo \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xpm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles molmol-build.diff molmol-warnings.diff molmol-png.diff
compilers.choose cc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +55,9 @@ post-patch {
</span> if {${os.major} == 12} {
reinplace "s|SYSLIB = |SYSLIB = -isysroot `xcode-select --print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk |g" ${worksrcpath}/makedef
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib ||g" ${worksrcpath}/makedef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
destroot {
# prune installed files
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/molmol/files/molmol-build.diff b/science/molmol/files/molmol-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 59edc658e07..0c8f5245124 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/molmol/files/molmol-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/molmol/files/molmol-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@
</span> + JPEGDIR = @PREFIX@/lib
+
+ PNGDIR = @PREFIX@/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ZLIBDIR = /usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ZLIBDIR = @PREFIX@/lib
</span> +
+# If you configured any of the above three image formats, uncomment
+# the following four lines, and delete the non-relevant parts if
</pre><pre style='margin:0'>
</pre>