[93009] trunk/dports/science/molmol
ryandesign at macports.org
ryandesign at macports.org
Sun May 13 17:51:53 PDT 2012
Revision: 93009
https://trac.macports.org/changeset/93009
Author: ryandesign at macports.org
Date: 2012-05-13 17:51:53 -0700 (Sun, 13 May 2012)
Log Message:
-----------
molmol: maintainer update to fix build on Lion to respond to mouse movements, and also remove some unnecessary files and change how libpng is used; see #34408
Modified Paths:
--------------
trunk/dports/science/molmol/Portfile
trunk/dports/science/molmol/files/molmol-build.diff
Added Paths:
-----------
trunk/dports/science/molmol/files/molmol-png.diff
trunk/dports/science/molmol/files/molmol-warnings.diff
Modified: trunk/dports/science/molmol/Portfile
===================================================================
--- trunk/dports/science/molmol/Portfile 2012-05-14 00:41:28 UTC (rev 93008)
+++ trunk/dports/science/molmol/Portfile 2012-05-14 00:51:53 UTC (rev 93009)
@@ -5,7 +5,7 @@
name molmol
version 2k.2.0
-revision 2
+revision 3
categories science
maintainers bromo.med.uc.edu:howarth
description Molecular graphics display program
@@ -33,7 +33,7 @@
port:jpeg \
port:libpng \
port:xpm
-patchfiles molmol-build.diff
+patchfiles molmol-build.diff molmol-warnings.diff molmol-png.diff
use_configure no
use_parallel_build no
build.target-delete all
@@ -43,9 +43,18 @@
${worksrcpath}/molmol
}
destroot {
+ # prune installed files
+ foreach d {main motif win} {
+ system -W ${worksrcpath} "rm -f src/${d}/*.h src/${d}/*.c src/${d}/*.o"
+ }
# Install example files not installed by the Makefile
- file copy ${worksrcpath} \
- ${destroot}${prefix}/share/${name}
+ file mkdir ${destroot}${prefix}/share/${name}/src
+ foreach d {auxil COPYING data help HISTORY macros man molmol README README.UNIX setup tips} {
+ copy ${worksrcpath}/${d} ${destroot}${prefix}/share/${name}
+ }
+ foreach d {main motif win} {
+ copy ${worksrcpath}/src/${d} ${destroot}${prefix}/share/${name}/src
+ }
ln -s ${prefix}/share/${name}/${name} ${destroot}${prefix}/bin/${name}
file mkdir ${destroot}${prefix}/share/doc/${name}
ln -s ${prefix}/share/${name}/COPYING ${destroot}${prefix}/share/doc/${name}/COPYING
Modified: trunk/dports/science/molmol/files/molmol-build.diff
===================================================================
--- trunk/dports/science/molmol/files/molmol-build.diff 2012-05-14 00:41:28 UTC (rev 93008)
+++ trunk/dports/science/molmol/files/molmol-build.diff 2012-05-14 00:51:53 UTC (rev 93009)
@@ -28,11 +28,11 @@
+
+CPP = /usr/bin/cpp
+
-+MCPPFLAGS = -DMAXINT=INT_MAX -I at PREFIX@/include -bind_at_load -I$(TOP)
++MCPPFLAGS = -DMAXINT=INT_MAX -I at PREFIX@/include -I$(TOP)
+
+CC = gcc
+
-+MCFLAGS = -O -bind_at_load -Wall
++MCFLAGS = -O -Wall
+
+RANLIB = /usr/bin/ranlib
+
@@ -65,7 +65,7 @@
+++ molmol 2005-05-28 09:44:48.000000000 -0700
@@ -1,9 +1,9 @@
-#!/bin/ksh
-+#!/bin/zsh
++#!/bin/zsh -f
#
# startup script for MOLMOL
#
@@ -141,7 +141,7 @@
+ echo "LineBond solid 1 " >>| $startmacro ; @PREFIX@/share/molmol/src/main/molmol $xopt
else
- $MOLMOLHOME/molmol.$arch $xopt < /dev/null
-+ echo "LineBond solid 1 " >>| $startmacro ; @PREFIX@/share/molmol/src/main/molmol $xopt < /dev/null
++ echo "LineBond solid 1 " >>| $startmacro ; @PREFIX@/share/molmol/src/main/molmol $xopt
fi
--- src/iodev/IODev.c.orig 2001-05-27 14:03:30.000000000 -0700
+++ src/iodev/IODev.c 2005-05-28 11:03:09.000000000 -0700
Added: trunk/dports/science/molmol/files/molmol-png.diff
===================================================================
--- trunk/dports/science/molmol/files/molmol-png.diff (rev 0)
+++ trunk/dports/science/molmol/files/molmol-png.diff 2012-05-14 00:51:53 UTC (rev 93009)
@@ -0,0 +1,32 @@
+--- 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)
+ {
+ IORaiseError(errMsg);
+- longjmp(pngStrucP->jmpbuf, 1);
++ longjmp(png_jmpbuf(pngStrucP), 1);
+ }
+ #endif
+
+@@ -357,7 +357,7 @@
+ return IO_RES_ERR;
+ }
+
+- if (setjmp(pngStrucP->jmpbuf)) {
++ if (setjmp(png_jmpbuf(pngStrucP))) {
+ if (cBuf != NULL)
+ free(cBuf);
+ if (fBuf != NULL)
+@@ -368,10 +368,7 @@
+
+ png_init_io(pngStrucP, ImgFileP);
+
+- pngInfoP->width = imgW;
+- pngInfoP->height = imgH;
+- pngInfoP->bit_depth = 8;
+- pngInfoP->color_type = PNG_COLOR_TYPE_RGB;
++ png_set_IHDR(pngStrucP, pngInfoP, imgW, imgH, 8, PNG_COLOR_TYPE_RGB, 0, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+ png_write_info(pngStrucP, pngInfoP);
+ }
+ #endif
Added: trunk/dports/science/molmol/files/molmol-warnings.diff
===================================================================
--- trunk/dports/science/molmol/files/molmol-warnings.diff (rev 0)
+++ trunk/dports/science/molmol/files/molmol-warnings.diff 2012-05-14 00:51:53 UTC (rev 93009)
@@ -0,0 +1,261 @@
+--- src/calc/CalcRmsd.c.orig 2001-05-27 20:30:09.000000000 -0400
++++ src/calc/CalcRmsd.c 2012-05-12 12:03:51.000000000 -0400
+@@ -1025,10 +1025,10 @@
+ }
+
+ for (propI = 0; propI < 2; propI++) {
+- if (groupNo == 0 || propI == 0 && ! calc1)
++ if (groupNo == 0 || (propI == 0 && ! calc1))
+ continue;
+
+- if (groupNo == 0 || propI == 1 && ! calc2)
++ if (groupNo == 0 || (propI == 1 && ! calc2))
+ continue;
+
+ Report("\nAverage RMSD, dev., min. and max of ");
+@@ -1052,8 +1052,8 @@
+ Report(" ");
+
+ for (groupI2 = 0; groupI2 < groupNo; groupI2++) {
+- if (groupI1 < groupI2 &&
+- groupInfoP[groupI1].membNo != groupInfoP[groupI2].membNo ||
++ if (((groupI1 < groupI2) &&
++ (groupInfoP[groupI1].membNo != groupInfoP[groupI2].membNo)) ||
+ groupInfoP[groupI1].membNo == 0 ||
+ groupInfoP[groupI2].membNo == 0) {
+ groupInfoP[groupI2].stat.avg = 0.0f;
+--- src/cmdfig/FigUtil.c.orig 2001-05-27 19:42:22.000000000 -0400
++++ src/cmdfig/FigUtil.c 2012-05-12 11:37:16.000000000 -0400
+@@ -44,29 +44,29 @@
+ } TabEntry;
+
+ static TabEntry GreekTab[] = {
+- "ALPHA", 'a',
+- "BETA", 'b',
+- "CHI", 'c',
+- "DELTA", 'd',
+- "EPSILON", 'e',
+- "PHI" , 'f',
+- "GAMMA", 'g',
+- "ETA", 'h',
+- "IOTA", 'i',
+- "KAPPA", 'k',
+- "LAMBDA", 'l',
+- "MU", 'm',
+- "NU", 'n',
+- "PI", 'p',
+- "THETA", 'q',
+- "RHO", 'r',
+- "SIGMA", 's',
+- "TAU", 't',
+- "UPSILON", 'u',
+- "OMEGA", 'w',
+- "XI", 'x',
+- "PSI", 'y',
+- "ZETA", 'z'
++ {"ALPHA", 'a'},
++ {"BETA", 'b'},
++ {"CHI", 'c'},
++ {"DELTA", 'd'},
++ {"EPSILON", 'e'},
++ {"PHI" , 'f'},
++ {"GAMMA", 'g'},
++ {"ETA", 'h'},
++ {"IOTA", 'i'},
++ {"KAPPA", 'k'},
++ {"LAMBDA", 'l'},
++ {"MU", 'm'},
++ {"NU", 'n'},
++ {"PI", 'p'},
++ {"THETA", 'q'},
++ {"RHO", 'r'},
++ {"SIGMA", 's'},
++ {"TAU", 't'},
++ {"UPSILON", 'u'},
++ {"OMEGA", 'w'},
++ {"XI", 'x'},
++ {"PSI", 'y'},
++ {"ZETA", 'z'}
+ };
+
+ int
+--- src/cmdio/ExWriteSec.c.orig 1997-02-17 11:09:08.000000000 -0500
++++ src/cmdio/ExWriteSec.c 2012-05-12 11:42:32.000000000 -0400
+@@ -250,9 +250,9 @@
+
+ if (neighLStart != NO_RES) {
+ if (num != neighLEnd + 1 ||
+- neighNum != neighREnd + 1 && neighNum != neighREnd - 1 ||
+- neighREnd > neighRStart && neighNum != neighREnd + 1 ||
+- neighREnd < neighRStart && neighNum != neighREnd - 1) {
++ (neighNum != neighREnd + 1 && neighNum != neighREnd - 1) ||
++ (neighREnd > neighRStart && neighNum != neighREnd + 1) ||
++ (neighREnd < neighRStart && neighNum != neighREnd - 1)) {
+ writeNeigh(neighLStart, neighLEnd, neighRStart, neighREnd);
+ neighLStart = NO_RES;
+ } else {
+--- src/data/DataDist.c.orig 1999-10-30 20:28:28.000000000 -0400
++++ src/data/DataDist.c 2012-05-12 12:15:49.000000000 -0400
+@@ -116,7 +116,7 @@
+ entryP->atom2I = DhAtomGetNumber(atom2P);
+
+ if (entryP->res1I > entryP->res2I ||
+- entryP->res1I == entryP->res2I && entryP->atom1I > entryP->atom2I) {
++ (entryP->res1I == entryP->res2I && entryP->atom1I > entryP->atom2I)) {
+ t = entryP->res1I;
+ entryP->res1I = entryP->res2I;
+ entryP->res2I = t;
+--- src/data/DataHand.c.orig 2001-05-27 17:07:42.000000000 -0400
++++ src/data/DataHand.c 2012-05-12 12:17:31.000000000 -0400
+@@ -2043,8 +2043,8 @@
+ groupNum1 = getGroupNum(bondAddP->res1P->molP);
+ groupNum2 = getGroupNum(bondAddP->res2P->molP);
+ if (atom1P->state == AS_VALID && atom2P->state == AS_VALID &&
+- (groupNum1 == groupNum && groupNum2 == groupNum ||
+- groupNum < 0 && groupNum1 != groupNum2))
++ ((groupNum1 == groupNum && groupNum2 == groupNum) ||
++ (groupNum < 0 && groupNum1 != groupNum2)))
+ applyF(bondP, atom1P, atom2P, clientData);
+ }
+ bondAddP = nextBondAddP;
+@@ -2367,8 +2367,8 @@
+ groupNum1 = getGroupNum(distP->res1P->molP);
+ groupNum2 = getGroupNum(distP->res2P->molP);
+ if (atom1P->state == AS_VALID && atom2P->state == AS_VALID &&
+- (groupNum1 == groupNum && groupNum2 == groupNum ||
+- groupNum < 0 && groupNum1 != groupNum2))
++ ((groupNum1 == groupNum && groupNum2 == groupNum) ||
++ (groupNum < 0 && groupNum1 != groupNum2)))
+ applyF(distP, atom1P, atom2P, clientData);
+ }
+ }
+--- src/expr/ExprScan.c.orig 2001-05-27 18:07:12.000000000 -0400
++++ src/expr/ExprScan.c 2012-05-12 12:14:33.000000000 -0400
+@@ -221,7 +221,7 @@
+ for (;;) {
+ if (isdigit(ch)) {
+ DStrAppChar(StrVal, ch);
+- } else if (ch == '.' && ExprStr[1] != '.' ||
++ } else if ((ch == '.' && ExprStr[1] != '.') ||
+ ch == 'e' || ch == 'E') {
+ DStrAppChar(StrVal, ch);
+ isFloat = TRUE;
+--- src/motif/MotifDial.c.orig 2001-05-27 17:53:08.000000000 -0400
++++ src/motif/MotifDial.c 2012-05-12 11:48:25.000000000 -0400
+@@ -1323,7 +1323,7 @@
+
+ switch (type) {
+ case PU_CT_ACTIVATE:
+- if (gType == GIZMO_TEXT_FIELD || GIZMO_TEXT)
++ if (gType == (GIZMO_TEXT_FIELD | GIZMO_TEXT))
+ XtAddCallback(gizmo, XmNactivateCallback, textActivateCB, infoP);
+ else if (gType == GIZMO_BUTTON)
+ XtAddCallback(gizmo, XmNactivateCallback, gizmoGenCB, infoP);
+--- src/motif/MotifMainW.c.orig 2001-05-27 17:36:10.000000000 -0400
++++ src/motif/MotifMainW.c 2012-05-12 11:49:49.000000000 -0400
+@@ -80,8 +80,8 @@
+ {
+ Window *winP = (Window *) arg;
+
+- return eventP->type == ButtonPress && eventP->xbutton.window == *winP ||
+- eventP->type == Expose && eventP->xexpose.window == *winP;
++ return (eventP->type == ButtonPress && eventP->xbutton.window == *winP) ||
++ (eventP->type == Expose && eventP->xexpose.window == *winP);
+ }
+
+ static void
+--- src/os/GFile.c.orig 2001-06-17 14:59:17.000000000 -0400
++++ src/os/GFile.c 2012-05-12 12:18:32.000000000 -0400
+@@ -383,7 +383,7 @@
+ {
+ if (gf->format == GF_FORMAT_MEMORY)
+ return gf->currP == NULL ||
+- gf->currP->nextP == NULL && gf->currPos == gf->currP->len;
++ (gf->currP->nextP == NULL && gf->currPos == gf->currP->len);
+ else
+ return feof(gf->fp);
+ }
+--- src/prim/PrimDraw.c.orig 2001-05-27 16:41:49.000000000 -0400
++++ src/prim/PrimDraw.c 2012-05-12 12:06:03.000000000 -0400
+@@ -461,7 +461,7 @@
+ }
+
+ if (partP->paint == RP_ATOM ||
+- partP->paint == RP_ATOM_SMOOTH && partP->polyNo > 0)
++ (partP->paint == RP_ATOM_SMOOTH && partP->polyNo > 0))
+ SgSetColor(attrP->colR, attrP->colG, attrP->colB);
+
+ if (partP->paint == RP_ATOM_SMOOTH)
+--- src/prim/RibbonCalc.c.orig 2001-05-27 16:40:14.000000000 -0400
++++ src/prim/RibbonCalc.c 2012-05-12 12:13:41.000000000 -0400
+@@ -907,7 +907,7 @@
+ getSplinePoints(partP, ribbonP, ePar, partP->endPar, ePNo + 1,
+ parA + sPNo + mPNo - 1, xA + sPNo + mPNo - 1, dzA + sPNo + mPNo - 1);
+
+- if (partP->style == RS_ROUND && partP->midRad == 0.0f ||
++ if ((partP->style == RS_ROUND && partP->midRad == 0.0f) ||
+ BreakInterrupted()) {
+ /* draw only one line */
+ partP->traceNo = 1;
+@@ -1128,15 +1128,15 @@
+ Vec3Copy(partP->traceA[traceI].nvA[pointI], nv);
+ }
+
+- if (pointI == 0 && partP->startStyle == RE_SHARP ||
+- pointI == pointNo - ePNo && partP->endStyle == RE_ARROW)
++ if ((pointI == 0 && partP->startStyle == RE_SHARP) ||
++ (pointI == pointNo - ePNo && partP->endStyle == RE_ARROW))
+ Vec3Copy(partP->polyA[polyI].xA[traceNo - 1 - traceI], x);
+ else if (pointI == pointNo - 1 && partP->endStyle == RE_SHARP)
+ Vec3Copy(partP->polyA[polyI].xA[traceI], x);
+ }
+
+- if (pointI == 0 && partP->startStyle == RE_SHARP ||
+- pointI == pointNo - ePNo && partP->endStyle == RE_ARROW) {
++ if ((pointI == 0 && partP->startStyle == RE_SHARP) ||
++ (pointI == pointNo - ePNo && partP->endStyle == RE_ARROW)) {
+ Vec3Copy(x, dy);
+ Vec3Cross(x, dx);
+ Vec3Copy(partP->polyA[polyI].nv, x);
+@@ -1327,7 +1327,7 @@
+
+ if (! partP->pointValid || prec != partP->prec ||
+ startRad != partP->startRad ||
+- partP->style == RS_ROUND && midRad != partP->midRad ||
++ (partP->style == RS_ROUND && midRad != partP->midRad) ||
+ endRad != partP->endRad || radChanged) {
+ for (i = 0; i < partP->traceNo; i++) {
+ free(partP->traceA[i].xA);
+--- src/pudev/PuMainW.c.orig 1996-02-06 05:48:36.000000000 -0500
++++ src/pudev/PuMainW.c 2012-05-12 11:50:50.000000000 -0400
+@@ -57,7 +57,7 @@
+ if (text[0] != LOCK_CHAR)
+ return;
+ text++;
+- if (text[0] == '\0' || text[0] == ' ' && text[1] == '\0') {
++ if (text[0] == '\0' || (text[0] == ' ' && text[1] == '\0')) {
+ StatusLocked = FALSE;
+ text = " ";
+ }
+--- src/tty/TTY.c.orig 2001-05-27 17:13:51.000000000 -0400
++++ src/tty/TTY.c 2012-05-12 11:47:32.000000000 -0400
+@@ -164,7 +164,7 @@
+ void
+ PuTTYSetTextField(PuTextFieldChoice fieldChoice, char *text)
+ {
+- if (text[0] == '\0' || text[0] == ' ' && text[1] == '\0')
++ if (text[0] == '\0' || (text[0] == ' ' && text[1] == '\0'))
+ return;
+
+ switch (fieldChoice) {
+--- tools/src/IsoSurface.c.orig 2001-07-04 19:26:21.000000000 -0400
++++ tools/src/IsoSurface.c 2012-05-12 12:24:17.000000000 -0400
+@@ -158,7 +158,7 @@
+ static BOOL
+ equalPair(int i00, int i01, int i10, int i11)
+ {
+- return i00 == i10 && i01 == i11 || i00 == i11 && i01 == i10;
++ return (i00 == i10 && i01 == i11) || (i00 == i11 && i01 == i10);
+ }
+
+ static int
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120513/f94a369d/attachment-0001.html>
More information about the macports-changes
mailing list