Update of /cvsroot/fink/dists/10.2/stable/main/finkinfo/sci
In directory sc8-pr-cvs1:/tmp/cvs-serv31360
Added Files:
pymol-0.82-3.info pymol-0.82-3.patch
Removed Files:
pymol-0.82-2.info pymol-0.82-2.patch
Log Message:
Moved to stable
--- NEW FILE: pymol-0.82-3.info ---
Package: pymol
Version: 0.82
Revision: 3
Maintainer: Matt Stephenson <[EMAIL PROTECTED]>
GCC: 3.1
Source: mirror:sourceforge:%n/%n-0_82-src.tgz
Source-MD5: d01bf39dbaa3ada27809a0ba013a162a
SourceDirectory: %n-%v
Depends: libpng-shlibs, numeric, tcltk, povray, pmw (>= 0.8.5-2), python (>= 2.2.1-8),
glut-shlibs (>= 3.7-3)
BuildDepends: libpng, glut (>= 3.7-3), db3 (>= 3.3.11-8), readline (>= 4.3-5), gdbm,
gmp, expat, tcltk-dev, dlcompat-dev
PatchScript: sed 's|@prefix@|%p|g' <%a/%f.patch | patch -p1
CompileScript: <<
(cd setup; cp Rules.osx-hybrid %b/Rules.make)
make
<<
InstallScript: <<
mkdir -p %i/bin
mkdir -p %i/lib/%n
(cd setup; cp pymol.com.template %i/bin/pymol)
cp -r modules examples test %i/lib/%n
<<
DocFiles: CHANGES DEVELOPERS LICENSE README
Description: Molecular graphics system
DescDetail: <<
PyMOL is a molecular graphics system with an embedded Python interpreter
designed for real-time visualization and rapid generation of high-quality
molecular graphics images and animations.
<<
DescUsage: Just type 'pymol' at the command prompt inside an X environment.
License: OSI-Approved
Homepage: http://pymol.sourceforge.net
--- NEW FILE: pymol-0.82-3.patch ---
--- pymol-0.82/setup/Rules.osx-hybrid 2002-05-19 22:14:12.000000000 +1000
+++ pymol-0.82-patched/setup/Rules.osx-hybrid 2002-06-17 10:41:03.000000000 +1000
@@ -1,51 +1,44 @@
-NOTE: This Rules.make file has not yet been successfully used to build
-PyMOL on OSX. However, the idea behind it is to build using the
-python, libpng, and Tcl/Tk dependencies from Darwin while linking
-against Apple's OpenGL and GLUT libraries.
-
#---------------------------------------------------------------------
# PyMOL Makefile Rules
#---------------------------------------------------------------------
#
#- Building ----------------------------------------------------------
#--- Tell "make" how to get to PyMOL
-PYMOL_PATH = /usr/local/pymol
+PYMOL_PATH = @prefix@/lib/pymol
#---------------------------------------------------------------------
#
#- Dependencies ------------------------------------------------------
#--- X-windows
-XLIB_DIR =
-XINC_DIR =
+XLIB_DIR = -L/usr/X11R6/lib
+XINC_DIR = -I/usr/X11R6/include
#--- Python
-PYTHON_EXE = /usr/local/python
-PYTHON_LIB = -lpython2.0
-PYTHON_LIB_DIR = -L/usr/local/lib/python2.0/config
-PYTHON_INC_DIR = -I/usr/local/include/python2.0
+PYTHON_EXE = @prefix@/bin/python
+PYTHON_LIB = -lpython2.2
+PYTHON_LIB_DIR = -L@prefix@/lib/python2.2/config
+PYTHON_INC_DIR = -I@prefix@/include/python2.2
#--- Other external dependencies
-EXT_INC_DIR = -I/usr/local/include \
- -I/System/Library/Frameworks/OpenGL.framework/Headers/ \
- -I/System/Library/Frameworks/Foundation.framework/Headers/ \
- -I/System/Library/Frameworks/AppKit.framework/Headers/ \
- -I/System/Library/Frameworks/ApplicationServices.framework/Headers/ \
- -I$(PYMOL_PATH)/layerOSX
-EXT_LIB_DIR = -L/usr/local/lib
+EXT_INC_DIR = -I@prefix@/include \
+ -I/usr/X11R6/include \
+ -I/usr/include
+EXT_LIB_DIR = -L@prefix@/lib \
+ -L/usr/lib \
+ -L/usr/X11R6/lib
#---------------------------------------------------------------------
#
#- Build for OSX-Darwin as an importable module ----------------------
#--- System libraries
-LIBS = -lpng $(PYTHON_LIB) $(ZLIB) -lm -framework OpenGL \
- -framework AppKit -framework ApplicationServices -framework Foundation
+LIBS = -lpng -ltk -ltcl -ldl -lX11 -lXext $(PYTHON_LIB) $(ZLIB) -lm -lGL -lGLU -lglut
#--- PyMOL configuration
-DEFS = -D_PYMOL_MODULE -D_PYMOL_OSX
+DEFS = -D_PYMOL_MODULE -D_PYMOL_NUMPY
# -D_PYMOL_NUMPY
#--- How we build shared libraries
-BUILD = -bundle -undefined warning -flat_namespace
+BUILD = -bundle -bundle_loader @prefix@/bin/python -flat_namespace -undefined suppress
#--- What are we trying to build?
DEST = -o modules/_cmd.so
#--- CC options
-CCOPT1 = -ffast-math
+CCOPT1 = -ffast-math -no-cpp-precomp
#--- libraries for PyOpenGL
-PYOGL_LIB = -framework OpenGL
+PYOGL_LIB = -lglut -lGL -lGLU -lXmu -lXi -lpython2.2
#---------------------------------------------------------------------
#
#- Choose One --------------------------------------------------------
@@ -62,7 +55,7 @@
#- Choose One Pair ---------------------------------------------------
#--- Libpng2 available and contains zlib
PNG = -D_HAVE_LIBPNG
-ZLIB =
+ZLIB = -L/usr/lib -lz
#--- Libpng2 available but needs zlib
#PNG = -D_HAVE_LIBPNG
#ZLIB = -lz
--- pymol-0.82/contrib/pyopengl/_glumodule.c 2002-03-17 08:25:40.000000000 +1100
+++ pymol-0.82-patched/contrib/pyopengl/_glumodule.c 2002-06-17 11:06:38.000000000
++1000
@@ -634,7 +634,7 @@
#ifdef NUMERIC
#if defined(HAVE_ARRAYOBJECT_H)
-#include "arrayobject.h"
+#include <Numeric/arrayobject.h>
#elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
#include "Extensions/arrayobject.h"
#elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
--- pymol-0.82/contrib/pyopengl/_openglmodule.c 2002-03-17 08:25:40.000000000 +1100
+++ pymol-0.82-patched/contrib/pyopengl/_openglmodule.c 2002-06-17 11:07:22.000000000
++1000
@@ -89,7 +89,7 @@
#ifdef NUMERIC
#if defined(HAVE_ARRAYOBJECT_H)
-#include "arrayobject.h"
+#include <Numeric/arrayobject.h>
#elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
#include "Extensions/arrayobject.h"
#elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
--- pymol-0.82/contrib/pyopengl/openglutil.h 2001-02-24 12:01:01.000000000 +1100
+++ pymol-0.82-patched/contrib/pyopengl/openglutil.h 2002-06-17 11:07:56.000000000
++1000
@@ -16,7 +16,7 @@
{-1, GL_UNSIGNED_BYTE, GL_BYTE, GL_SHORT, GL_INT, -1, GL_FLOAT, -1, -1, -1, -1, -1};
#if defined(HAVE_ARRAYOBJECT_H)
-#include "arrayobject.h"
+#include <Numeric/arrayobject.h>
#elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
#include "Extensions/arrayobject.h"
#elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
--- pymol-0.82/setup/pymol.com.template 2002-05-19 22:14:12.000000000 +1000
+++ pymol-0.82-patched/setup/pymol.com.template 2002-06-17 10:52:20.000000000 +1000
@@ -5,15 +5,15 @@
# ==============================================================
# Set PYMOL_PATH to point at the correct location on your system
#
-setenv PYMOL_PATH ${HOME}/pymol
+setenv PYMOL_PATH @prefix@/lib/pymol
#
# ==============================================================
# (no changes usually required below here)
#
-setenv PYMOL_EXTLIBPATH ${PYMOL_PATH}/ext/lib
+setenv PYMOL_EXTLIBPATH @prefix@/lib
#
# Tcl/Tk path
-setenv TCL_LIBRARY $PYMOL_EXTLIBPATH/tcl8.3
+setenv TCL_LIBRARY @prefix@/lib/tcl
#
# dynamic linking
#
@@ -26,13 +26,13 @@
# python modules
#
if ( $?PYTHONPATH ) then
-setenv PYTHONPATH ${PYMOL_PATH}/modules:${PYMOL_EXTLIBPATH}/python2.1:${PYTHONPATH}
+setenv PYTHONPATH ${PYMOL_PATH}/modules:${PYMOL_EXTLIBPATH}/python2.2:${PYTHONPATH}
else
-setenv PYTHONPATH ${PYMOL_PATH}/modules:${PYMOL_EXTLIBPATH}/python2.1
+setenv PYTHONPATH ${PYMOL_PATH}/modules:${PYMOL_EXTLIBPATH}/python2.2
endif
#
#
#dbx $PYMOL_PATH/ext/bin/python
#gdb $PYMOL_PATH/ext/bin/python
-$PYMOL_PATH/ext/bin/python $PYMOL_PATH/modules/launch_pymol.py $*
+@prefix@/bin/python $PYMOL_PATH/modules/launch_pymol.py $*
--- pymol-0.82/contrib/modules/Makefile.pre.in.src 2002-01-27 06:08:54.000000000
+1100
+++ pymol-0.82-patched/contrib/modules/Makefile.pre.in.src 2002-06-17
+12:14:37.000000000 +1000
@@ -91,7 +91,7 @@
TARGET= python
# Installed python binary (used only by boot target)
-#PYTHON=
+PYTHON= python
# Add more -I and -D options here
CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
@@ -111,7 +111,7 @@
# === Variables from configure (through sedscript) ===
VERSION= @VERSION@
-CC= @CC@
+CC= cc
LINKCC= @LINKCC@
SGI_ABI= @SGI_ABI@
OPT= @OPT@
@@ -130,7 +130,7 @@
#@SET_CCC@
# Install prefix for architecture-independent files
-prefix= /usr/local
+prefix= @prefix@
# Install prefix for architecture-dependent files
exec_prefix= $(prefix)
@@ -167,7 +167,7 @@
MAKEFILE= $(LIBPL)/Makefile
CONFIGC= $(LIBPL)/config.c
CONFIGCIN= $(LIBPL)/config.c.in
-SETUP= $(LIBPL)/Setup.thread $(LIBPL)/Setup.local $(LIBPL)/Setup
+SETUP= $(LIBPL)/Setup.config $(LIBPL)/Setup.local $(LIBPL)/Setup
SYSLIBS= $(LIBM) $(LIBC)
--- pymol-0.82-2.info DELETED ---
--- pymol-0.82-2.patch DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
