Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16702
Modified Files: molmol.info molmol.patch Log Message: revision for molmol so it builds identically on 10.4 and 10.5 and as an extra bonus fixes a 4 year old bug that caused the Xserver to crash when plotting a jpg Index: molmol.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/molmol.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- molmol.patch 22 Jul 2007 14:24:51 -0000 1.3 +++ molmol.patch 10 Nov 2007 19:13:55 -0000 1.4 @@ -3,7 +3,7 @@ +++ molmol/makedef 2005-05-28 09:44:47.000000000 -0700 @@ -0,0 +1,60 @@ + TIFFDIR = @PREFIX@/lib -+ ++ MESADIR = $(TOP)/widgets-sgi + JPEGDIR = @PREFIX@/lib + + PNGDIR = @PREFIX@/lib @@ -29,7 +29,7 @@ + +CPP = /usr/bin/cpp + -+MCPPFLAGS = -DMAXINT=INT_MAX -I/usr/X11R6/include [EMAIL PROTECTED]@/include -bind_at_load ++MCPPFLAGS = -DMAXINT=INT_MAX -I/usr/X11R6/include [EMAIL PROTECTED]@/include -bind_at_load -I$(TOP) + +CC = /usr/bin/gcc + @@ -57,8 +57,8 @@ +MOTIFDEF = -DFUNCPROTO + +SYSLIB = -L/usr/lib [EMAIL PROTECTED]@/lib -L/usr/X11R6/lib \ -+ -lX11 -lXm -lXmu -lXt -lXp -lXpm -lX11 -lXext \ -+ -lSM -lICE -lm -lc -lGLU -lGL -lGLw -lmx ++ -lX11 -lXm -lGLU -lGL /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib $(MESADIR)/libGLw.a \ ++ -lXmu -lXt -lXp -lXpm -lX11 -lXext -lSM -lICE -lm -lc -lmx + +TOOLSDIR = $(TOP)/tools +SGDIR = $(TOP)/sg @@ -73,7 +73,7 @@ # -MOLMOLHOME=/opt/group/MOLMOL [EMAIL PROTECTED]@/share/molmol [EMAIL PROTECTED]@/share/molmol;MOLMOLDEV="Motif/OpenGL" export MOLMOLHOME export MOLMOLDEV @@ -565,3 +565,14 @@ @@ -0,0 +1,2 @@ +#include <math.h> +#include <limits.h> +--- molmol-2k.2.0-1035/src/motogl/MotOGL.c.sav 2007-11-10 12:41:40.000000000 -0500 ++++ molmol-2k.2.0-1035/src/motogl/MotOGL.c 2007-11-10 12:43:37.000000000 -0500 +@@ -31,7 +31,7 @@ + #include <Xm/XmStrDefs.h> + + #define BOOL MOTIF_BOOL /* hack to avoid naming conflict */ +-#include <GL/GLwMDrawA.h> ++#include <widgets-sgi/GL/GLwMDrawA.h> + #undef BOOL + + #include <sg.h> Index: molmol.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/molmol.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- molmol.info 22 Jul 2007 14:24:51 -0000 1.6 +++ molmol.info 10 Nov 2007 19:13:54 -0000 1.7 @@ -1,6 +1,6 @@ Package: molmol Version: 2k.2.0 -Revision: 1034 +Revision: 1036 CustomMirror: << eur-CH: ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/ nam-US:http://freedom7.swmed.edu/pub/software/MOLMOL/ @@ -10,6 +10,8 @@ SourceDirectory: ../%f Source2: mirror:custom:unix-gzip/%n-%v-doc.tar.gz Source2-MD5: 517545b60b0179ab691a679ed29903a7 +Source3: mirror:custom:unix-gzip/widgets-sgi.tar.gz +Source3-MD5: 83509f5ee7ecd9287a3334cfd8585d08 Depends: x11, freeglut-shlibs, openmotif3-shlibs, libtiff-shlibs, libjpeg-shlibs, libpng3-shlibs BuildDepends: freeglut, openmotif3-shlibs, openmotif3, libtiff, libjpeg, libpng3, x11-dev PatchScript: << @@ -17,6 +19,15 @@ sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 << CompileScript: << +#!/bin/sh -ev +cd widgets-sgi +cc -bind_at_load -I/usr/X11R6/include -I/%p/include -O3 -c GLwDrawA.c +cc -bind_at_load -I/usr/X11R6/include -I/%p/include -O3 -c GLwMDrawA.c +ar rv libGLw.a GLwDrawA.o GLwMDrawA.o +ranlib libGLw.a +mkdir GL +mv *.h GL +cd .. make << InstallScript: << @@ -32,6 +43,11 @@ << Homepage: http://www.mol.biol.ethz.ch/wuthrich/software/molmol/ Description: Molecular graphics display program +DescPackaging: << +Build molmol against a local copy of the original widgets-sgi +sources for libGLw.a until Apple updates Leopard with a libGLw +which is actually built with Motif support again. +<< DescDetail: << MOLMOL is a molecular graphics program for displaying, analyzing, and manipulating the three-dimensional structure of biological ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs