From 27e44adbbd39a3016deeb2bcf280ebe04c8f4fff Mon Sep 17 00:00:00 2001 From: "Justin Lecher (jlec)" Date: Wed, 29 Jul 2009 20:21:37 +0200 Subject: here we can sort and store patches which are used by multiple packages to create tarballs out of them which can be mirrored --- patches/ccp4/6.1.2/fix-baubles.patch | 22 ++++++++++++++++++++++ patches/ccp4/6.1.2/rename-rapper.patch | 12 ++++++++++++ patches/ccp4/6.1.2/rename-superpose.patch | 12 ++++++++++++ patches/ccp4/6.1.2/rename-truncate.patch | 22 ++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 patches/ccp4/6.1.2/fix-baubles.patch create mode 100644 patches/ccp4/6.1.2/rename-rapper.patch create mode 100644 patches/ccp4/6.1.2/rename-superpose.patch create mode 100644 patches/ccp4/6.1.2/rename-truncate.patch (limited to 'patches/ccp4') diff --git a/patches/ccp4/6.1.2/fix-baubles.patch b/patches/ccp4/6.1.2/fix-baubles.patch new file mode 100644 index 000000000..2c5f659b8 --- /dev/null +++ b/patches/ccp4/6.1.2/fix-baubles.patch @@ -0,0 +1,22 @@ +--- ccp4i/etc/configure.def.dist 2009-01-09 16:45:08.000000000 +0100 ++++ ccp4i/etc/configure.def.dist.new 2009-07-07 23:17:26.000000000 +0200 +@@ -53,8 +53,8 @@ + RUN_IMOSFLM _text "ccp4iwish [file join [GetEnvPath CCP4I_TOP] imosflm imosflm.tcl] project [GetCurrentProjectDir [GetCurrentProject]]" + RUN_CCP4MG _text "ccp4mg" + RUN_COOT _text "coot" +-RUN_BAUBLES _text "python [file join [GetEnvPath CCP4] share smartie baubles.py]" +-RUN_DBVIEWER _text "wish [file join [GetEnvPath CCP4] share dbccp4i application viewer.tcl]" ++RUN_BAUBLES _text "python [file join [GetEnvPath CCP4] share ccp4 smartie baubles.py]" ++RUN_DBVIEWER _text "wish [file join [GetEnvPath DBCCP4I_TOP] application viewer.tcl]" + ENABLE_BUBBLE_HELP _logical 1 + DISABLE_TASKS _logical 1 + CCP4_SETUP_COMMAND _text setup_ccp4 +@@ -62,7 +62,7 @@ + BLT_LIBRARY _text "" + MENU_LENGTH _positiveint 25 + HYPERTEXT_VIEWER _text firefox +-START_NETSCAPE _text netscape ++START_NETSCAPE _text firefox + O_MAPMAN _text mapman + MAPMAN_MAXSIZE _positiveint 4194304 + QUANTA_MBKALL _text mbkall diff --git a/patches/ccp4/6.1.2/rename-rapper.patch b/patches/ccp4/6.1.2/rename-rapper.patch new file mode 100644 index 000000000..a50ae6dbd --- /dev/null +++ b/patches/ccp4/6.1.2/rename-rapper.patch @@ -0,0 +1,12 @@ +--- ccp4i/scripts/rapper.script 2009-02-03 11:49:50.000000000 +0100 ++++ ccp4i/scripts/rapper.script.new 2009-03-12 23:34:47.000000000 +0100 +@@ -17,7 +17,7 @@ + + #set up command line + +-set cmd "[BinPath rapper]" ++set cmd "[BinPath rappermc]" + + set rapperdatadir [FileJoin [GetEnvPath CCP4] share rapper] + set paramsfile [FileJoin [GetEnvPath CCP4] share rapper params.xml] + diff --git a/patches/ccp4/6.1.2/rename-superpose.patch b/patches/ccp4/6.1.2/rename-superpose.patch new file mode 100644 index 000000000..90480eb8e --- /dev/null +++ b/patches/ccp4/6.1.2/rename-superpose.patch @@ -0,0 +1,12 @@ +diff -arNu ccp4-6.1.1/ccp4i/scripts/superpose.script ccp4-6.1.1.new/ccp4i/scripts/superpose.script +--- ccp4-6.1.1/ccp4i/scripts/superpose.script 2006-07-26 16:22:49.000000000 +0200 ++++ ccp4-6.1.1.new/ccp4i/scripts/superpose.script 2009-07-05 22:11:59.000000000 +0200 +@@ -21,7 +21,7 @@ + + if { [regexp SSM $SUPERPOSE_MODE ] } { + +- set cmd "[BinPath superpose] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\" -s $SSM_FIXED \"$XYZOUT_LOCAL\"" ++ set cmd "[BinPath superpose-ccp4] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\" -s $SSM_FIXED \"$XYZOUT_LOCAL\"" + set status [Execute $cmd "" program_status report ] + + } elseif { [regexp TOP $SUPERPOSE_MODE ] } { diff --git a/patches/ccp4/6.1.2/rename-truncate.patch b/patches/ccp4/6.1.2/rename-truncate.patch new file mode 100644 index 000000000..26f1cda3e --- /dev/null +++ b/patches/ccp4/6.1.2/rename-truncate.patch @@ -0,0 +1,22 @@ +--- ./ccp4i/templates/truncate.com.orig 2009-03-02 23:31:04.000000000 -0800 ++++ ./ccp4i/templates/truncate.com 2009-03-02 23:31:08.000000000 -0800 +@@ -11,7 +11,7 @@ + $SYMMETRY symmetry $SPACE_GROUP + $CELL cell $CELL_1 $CELL_2 $CELL_3 $CELL_4 $CELL_5 $CELL_6 + +-1 truncate ++1 ftruncate + - { [StringSame $APPLY_TRUNCATE "WILSON" ] } YES | NO + {[IfSet $ANOMALOUS]} anomalous + - $ANOMALOUS YES | NO +--- ./ccp4i/scripts/truncate.script.orig 2009-03-02 23:39:04.000000000 -0800 ++++ ./ccp4i/scripts/truncate.script 2009-03-02 23:39:41.000000000 -0800 +@@ -45,7 +45,7 @@ + + CreateComScript truncate truncate_script + +- set cmd "[BinPath truncate] HKLIN \"$HKLIN\"" ++ set cmd "[BinPath ftruncate] HKLIN \"$HKLIN\"" + if { ![StringSame $INPUT_DATA AMPLITUDES] } { + append cmd " HKLOUT \"$HKL_TRUNCATE\"" + } -- cgit v1.2.3