Ticket #37644: ccpnmr.diff

File ccpnmr.diff, 5.2 KB (added by g5pw (Aljaž Srebrnič), 11 years ago)

  • Portfile

     
    44PortSystem          1.0
    55
    66name                ccpnmr
    7 version             2.2.2
    8 revision            2
     7version             2.3.0
    98set branch          [join [lrange [split $version .] 0 1] .]
    109categories          science python
    1110maintainers         bromo.med.uc.edu:howarth
    … …  
    2019homepage            http://www.ccpn.ac.uk/ccpn/software/ccpnmr-suite
    2120master_sites        http://www2.ccpn.ac.uk/download/ccpnmr/
    2221distname            analysis${version}
    23 checksums           md5     a3ede39ed484d261eb82137055dc66a1 \
    24                     sha1    825ad7487ef6191baac0e5aa3d0ec6a6ed94a04f
     22checksums           rmd160  1124fa7d38fb6e709bbd078b630f6619bc433bd9 \
     23                    sha256  b36ed5b773ca6b0d7a09ff705cf98256cbc093f57d51f6945ac021c5d2a380f1
    2524worksrcdir          ${name}
    2625depends_lib         port:py27-scipy port:mesa port:freeglut port:tk port:py27-tkinter
    2726patchfiles          ccpnmr.patch

  • files/ccpnmr.patch

     
    99+    export LIBGL_ALWAYS_INDIRECT=1
    1010+fi
    1111+
    12 +@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5
     12+@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5
    1313--- bin/formatConverter.orig    1970-01-01 01:00:00.000000000 +0100
    1414+++ bin/formatConverter 2005-12-23 20:44:06.000000000 +0000
    1515@@ -0,0 +1,9 @@
    … …  
    2121+    export LIBGL_ALWAYS_INDIRECT=1
    2222+fi
    2323+
    24 +@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/format/gui/FormatConverter.py $1 $2
     24+@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/format/gui/FormatConverter.py $1 $2
    2525--- bin/pipe2azara.orig 1970-01-01 01:00:00.000000000 +0100
    2626+++ bin/pipe2azara      2005-12-23 20:44:06.000000000 +0000
    2727@@ -0,0 +1,9 @@
    … …  
    3333+    export LIBGL_ALWAYS_INDIRECT=1
    3434+fi
    3535+
    36 +@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/analysis/NmrPipeData.py $1 $2 $3
     36+@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/analysis/NmrPipeData.py $1 $2 $3
    3737--- bin/dataShifter.orig        1970-01-01 01:00:00.000000000 +0100
    3838+++ bin/dataShifter     2008-03-24 19:03:07.000000000 +0000
    3939@@ -0,0 +1,9 @@
    … …  
    4545+    export LIBGL_ALWAYS_INDIRECT=1
    4646+fi
    4747+
    48 +@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/format/gui/DataShifter.py
     48+@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/format/gui/DataShifter.py
    4949--- bin/updateAll.orig  1970-01-01 01:00:00.000000000 +0100
    5050+++ bin/updateAll       2008-03-24 19:04:31.000000000 +0000
    5151@@ -0,0 +1,9 @@
    … …  
    5757+    export LIBGL_ALWAYS_INDIRECT=1
    5858+fi
    5959+
    60 +@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/update/UpdateAuto.py
     60+@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/update/UpdateAuto.py
    6161--- bin/updateCheck.orig        1970-01-01 01:00:00.000000000 +0100
    6262+++ bin/updateCheck     2008-03-24 19:06:16.000000000 +0000
    6363@@ -0,0 +1,9 @@
    … …  
    6969+    export LIBGL_ALWAYS_INDIRECT=1
    7070+fi
    7171+
    72 +@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/update/UpdatePopup.py
    73 --- ccpnmr2.2/c/ccp/structure/Makefile.orig     2012-03-13 12:30:17.000000000 -0400
    74 +++ ccpnmr2.2/c/ccp/structure/Makefile  2012-04-08 17:19:22.000000000 -0400
     72+@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/update/UpdatePopup.py
     73--- ccpnmr2.3/c/ccp/structure/Makefile.orig     2012-03-13 12:30:17.000000000 -0400
     74+++ ccpnmr2.3/c/ccp/structure/Makefile  2012-04-08 17:19:22.000000000 -0400
    7575@@ -40,11 +40,11 @@
    7676        $(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
    7777        $(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
    … …  
    8888 
    8989 ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
    9090 
    91 --- ccpnmr2.2/c/ccpnmr/analysis/Makefile.orig   2012-03-13 12:30:17.000000000 -0400
    92 +++ ccpnmr2.2/c/ccpnmr/analysis/Makefile        2012-04-08 17:18:17.000000000 -0400
     91--- ccpnmr2.3/c/ccpnmr/analysis/Makefile.orig   2012-03-13 12:30:17.000000000 -0400
     92+++ ccpnmr2.3/c/ccpnmr/analysis/Makefile        2012-04-08 17:18:17.000000000 -0400
    9393@@ -55,11 +55,11 @@
    9494        $(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
    9595        $(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
    … …  
    106106 
    107107 ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
    108108 
    109 --- ccpnmr2.2/c/memops/global/Makefile.orig     2012-03-13 12:30:17.000000000 -0400
    110 +++ ccpnmr2.2/c/memops/global/Makefile  2012-04-08 17:11:36.000000000 -0400
     109--- ccpnmr2.3/c/memops/global/Makefile.orig     2012-03-13 12:30:17.000000000 -0400
     110+++ ccpnmr2.3/c/memops/global/Makefile  2012-04-08 17:11:36.000000000 -0400
    111111@@ -137,10 +137,10 @@
    112112 
    113113 TCLTK_LIB = $(TK_LIB) $(X11_LIB) $(MATH_LIB)
    … …  
    122122 
    123123 ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
    124124 
    125 --- ccpnmr2.2/c/environment-opengl.txt.orig     2012-04-08 17:31:08.000000000 -0400
    126 +++ ccpnmr2.2/c/environment-opengl.txt  2012-04-08 17:33:55.000000000 -0400
     125--- ccpnmr2.3/c/environment-opengl.txt.orig     2012-04-08 17:31:08.000000000 -0400
     126+++ ccpnmr2.3/c/environment-opengl.txt  2012-04-08 17:33:55.000000000 -0400
    127127@@ -0,0 +1,56 @@
    128128+#Environment file for use with fink to build ccpnmr suite - environment.txt
    129129+