molmol: change openmotif to motif and bump revision

* Refresh PNG patch
* Remove unneeded dependency on libXp
* Fix port linting nits
This commit is contained in:
Tim Hentenaar
2026-04-28 11:58:07 -04:00
committed by Renee Otten
parent fc702c8597
commit 1e81aa3723
3 changed files with 26 additions and 23 deletions
+2 -3
View File
@@ -5,7 +5,7 @@ PortGroup compilers 1.0
name molmol
version 2k.2.0
revision 13
revision 14
categories science chemistry
maintainers {gmail.com:howarth.at.macports @jwhowarth} openmaintainer
description Molecular graphics display program
@@ -16,7 +16,6 @@ long_description MOLMOL is a molecular graphics program for displaying, analy
and Windows NT/95/98/2000 and is freely available. It does not work \
properly with RNA.
homepage http://www.mol.biol.ethz.ch/wuthrich/software/molmol/
platforms darwin
license Restrictive/Distributable
master_sites ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip
distfiles molmol-${version}-src.tar.gz \
@@ -29,7 +28,7 @@ checksums molmol-2k.2.0-src.tar.gz \
rmd160 08b3e21ab6eb7c9044e59373334181ff91ca8a53 \
sha256 07e1c3fd04ffe7c9e9d91eaefa0bf72e6d0913a981eec3bf0879bfc65537a6be \
size 1062297
depends_lib port:openmotif \
depends_lib port:motif \
port:mesa \
port:libGLU \
port:glw \
+1 -1
View File
@@ -57,7 +57,7 @@
+
+SYSLIB = -L/usr/lib -L@PREFIX@/lib \
+ -lX11 -lXm -lGLU -lGL /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib @PREFIX@/lib/libGLw.dylib \
+ -lXmu -lXt -lXp -lXpm -lX11 -lXext -lSM -lICE -lm -lc -lmx
+ -lXmu -lXt -lXpm -lX11 -lXext -lSM -lICE -lm -lc -lmx
+
+TOOLSDIR = $(TOP)/tools
+SGDIR = $(TOP)/sg
+8 -4
View File
@@ -1,7 +1,11 @@
--- src/motogl/MotOGLDump.c.orig 2012-05-10 19:56:16.000000000 -0400
+++ src/motogl/MotOGLDump.c 2012-05-10 20:03:37.000000000 -0400
@@ -248,7 +248,7 @@
pngErrHand(png_structp pngStrucP, char *errMsg)
--- src/motogl/MotOGLDump.c 2001-07-07 21:21:34.000000000 -0400
+++ src/motogl/MotOGLDump.c 2026-04-30 16:54:06.000000000 -0400
@@ -245,10 +245,10 @@
#ifdef PNG_SUPPORT
static void
-pngErrHand(png_structp pngStrucP, char *errMsg)
+pngErrHand(png_structp pngStrucP, const char *errMsg)
{
IORaiseError(errMsg);
- longjmp(pngStrucP->jmpbuf, 1);