--- bin/analysis.orig 1970-01-01 01:00:00.000000000 +0100 +++ bin/analysis 2005-12-23 20:42:39.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +export MallocLogFile=/dev/null + +if [ ${SSH_TTY} ]; then + export LIBGL_ALWAYS_INDIRECT=1 +fi + +@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5 --- bin/formatConverter.orig 1970-01-01 01:00:00.000000000 +0100 +++ bin/formatConverter 2005-12-23 20:44:06.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +export MallocLogFile=/dev/null + +if [ ${SSH_TTY} ]; then + export LIBGL_ALWAYS_INDIRECT=1 +fi + +@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/format/gui/FormatConverter.py $1 $2 --- bin/pipe2azara.orig 1970-01-01 01:00:00.000000000 +0100 +++ bin/pipe2azara 2005-12-23 20:44:06.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +export MallocLogFile=/dev/null + +if [ ${SSH_TTY} ]; then + export LIBGL_ALWAYS_INDIRECT=1 +fi + +@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/analysis/NmrPipeData.py $1 $2 $3 --- ccpnmr2.1/c/environment-opengl.txt.orig 1970-01-01 01:00:00.000000000 +0100 +++ ccpnmr2.1/c/environment-opengl.txt 2005-12-23 21:37:59.000000000 +0000 @@ -0,0 +1,55 @@ +#Environment file for use with fink to build ccpnmr suite - environment.txt + +CC = gcc +LINK = $(CC) +MAKE = make +CO_NAME = -c $< +OUT_NAME = -o $@ +OBJ_SUFFIX = o +DYLIB_SUFFIX = so +RM = rm -f +WIN_FLAG = + +MALLOC_FLAG = +FPIC_FLAG = -fPIC +CFLAGS = -O3 $(MALLOC_FLAG) $(FPIC_FLAG) -fno-common -ffast-math + +LINK_LIBRARIES = sh linkSharedObjs +COPY_LIBRARIES = sh copySharedObjs + +GL_FLAG = -DUSE_GL_TRUE +#GL_FLAG = -DUSE_GL_FALSE + +#GLUT_NEED_INIT = +GLUT_NEED_INIT = -DNEED_GLUT_INIT +#GLUT_NOT_IN_GL = -DGLUT_IN_OWN_DIR +GLUT_FLAG = $(GLUT_NEED_INIT) $(GLUT_NOT_IN_GL) + +SHARED_FLAGS = -L@PREFIX@/lib -bundle -bundle_loader @PYTHON_BIN@ "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" + +MATH_LIB = -lm + +X11_DIR = /usr/X11R6 +X11_LIB = -lX11 -lXext +X11_INCLUDE_FLAGS = -I$(X11_DIR)/include +X11_LIB_FLAGS = -L$(X11_DIR)/lib + +TCL_DIR = @PREFIX@ +TCL_LIB = -ltcl +TCL_INCLUDE_FLAGS = -I$(TCL_DIR)/include +TCL_LIB_FLAGS = -L$(TCL_DIR)/lib + +TK_DIR = @PREFIX@ +TK_LIB = -ltk +TK_INCLUDE_FLAGS = -I$(TK_DIR)/include +TK_LIB_FLAGS = -L$(TK_DIR)/lib + +PYTHON_DIR = @PREFIX@ +PYTHON_LIB = +PYTHON_INCLUDE_FLAGS = -I@PYTHON_INCL@ +PYTHON_LIB_FLAGS = -L@PREFIX@ -lpython2.6 + +GL_DIR = /usr/X11R6 +GL_LIB = -lglut -lGLU -lGL +GL_INCLUDE_FLAGS = -I$(GL_DIR)/include -I@PREFIX@/include +GL_LIB_FLAGS = -L$(GL_DIR)/lib -L@PREFIX@/lib --- ccpnmr2.1/c/ccp/structure/Makefile.orig 2006-01-13 21:52:17.000000000 +0000 +++ ccpnmr2.1/c/ccp/structure/Makefile 2006-01-13 21:56:46.000000000 +0000 @@ -35,11 +35,11 @@ $(GLOBAL_DIR)/py_ps_handler.o \ $(GLOBAL_DIR)/py_tk_handler.o -ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \ +ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \ $(X11_INCLUDE_FLAGS) \ - $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS) + $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) -ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS) +ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB) --- ccpnmr2.1/c/ccpnmr/analysis/Makefile.orig 2006-01-13 21:52:45.000000000 +0000 +++ ccpnmr2.1/c/ccpnmr/analysis/Makefile 2006-01-13 21:57:29.000000000 +0000 @@ -40,11 +40,11 @@ $(GLOBAL_DIR)/py_ps_handler.o \ $(GLOBAL_DIR)/py_tk_handler.o -ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \ +ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \ $(X11_INCLUDE_FLAGS) \ - $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS) + $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) -ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS) +ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB) --- ccpnmr2.1/c/memops/global/Makefile.orig 2006-01-13 20:57:07.000000000 +0000 +++ ccpnmr2.1/c/memops/global/Makefile 2006-01-13 20:59:57.000000000 +0000 @@ -99,10 +99,10 @@ TCLTK_LIB = $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB) -ALL_INCLUDE_FLAGS = $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \ - $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS) +ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \ + $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) -ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS) +ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB) --- bin/dataShifter.orig 1970-01-01 01:00:00.000000000 +0100 +++ bin/dataShifter 2008-03-24 19:03:07.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +export MallocLogFile=/dev/null + +if [ ${SSH_TTY} ]; then + export LIBGL_ALWAYS_INDIRECT=1 +fi + +@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/format/gui/DataShifter.py --- bin/updateAll.orig 1970-01-01 01:00:00.000000000 +0100 +++ bin/updateAll 2008-03-24 19:04:31.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +export MallocLogFile=/dev/null + +if [ ${SSH_TTY} ]; then + export LIBGL_ALWAYS_INDIRECT=1 +fi + +@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/update/UpdateAuto.py --- bin/updateCheck.orig 1970-01-01 01:00:00.000000000 +0100 +++ bin/updateCheck 2008-03-24 19:06:16.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +export MallocLogFile=/dev/null + +if [ ${SSH_TTY} ]; then + export LIBGL_ALWAYS_INDIRECT=1 +fi + +@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/update/UpdatePopup.py