Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15233
Modified Files: coot.info coot-pre.info refmac.info Log Message: fixed cheesy nonrobust symlink hack in coot for refmac monomer lib Index: coot.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/coot.info,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- coot.info 27 Aug 2013 16:43:41 -0000 1.27 +++ coot.info 5 Sep 2013 02:35:51 -0000 1.28 @@ -1,6 +1,6 @@ Package: coot Version: 0.7.1.0 -Revision: 6 +Revision: 7 SourceDirectory: %n-0.7.1 Distribution: 10.6, 10.7, 10.8 GCC: 4.0 @@ -141,7 +141,6 @@ PatchFile-MD5: ac51a219f71aae370e33b68dbd80030d PatchScript: << sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1 -#perl -pi -e 's|ccp4c=ccp4c|ccp4c=gpp4|g' configure perl -pi -e 's|CXX\=\"libtool --mode\=link \$CXX\"|#CXX|g' configure << ############################################################################### @@ -227,10 +226,6 @@ install_name_tool -change /System/Library/Frameworks/Python.framework/Versions/2.6/Python %p/lib/python2.6/config/libpython2.6.dylib %i/bin/coot-real fi -# This consolidates the refmac monomer library -mkdir -p %i/share/coot/lib/data -ln -s %p/share/refmac/monomers/ener_lib.cif %i/share/coot/lib/. -ln -s %p/share/refmac/monomers %i/share/coot/lib/data/. # Reference structures should be in %i/share/coot/reference-structures cp -R ../reference-structures %i/share/coot/. cp -R * %i/share/coot/etc/. @@ -241,7 +236,7 @@ echo '#!/bin/sh -f ' > %i/bin/coot echo 'export GUILE_WARN_DEPRECATED="no"' >> %i/bin/coot echo "export LC_NUMERIC=C" >> %i/bin/coot -echo "export COOT_REFMAC_LIB_DIR=%p/share/coot/lib" >> %i/bin/coot +echo "export COOT_REFMAC_LIB_DIR=%p/share/refmac" >> %i/bin/coot echo "export COOT_PYTHON_DIR=%p/share/coot/python" >> %i/bin/coot echo 'export COOT_SBASE_DIR="%p/share/ccp4"' >> %i/bin/coot echo 'export CLIBD="%p/share/ccp4"' >> %i/bin/coot Index: refmac.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/refmac.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- refmac.info 29 Aug 2013 23:14:20 -0000 1.2 +++ refmac.info 5 Sep 2013 02:35:52 -0000 1.3 @@ -1,6 +1,6 @@ Package: refmac Version: 5.7.0032 -Revision: 2 +Revision: 3 Source: http://www2.mrc-lmb.cam.ac.uk/groups/murshudov/content/%n/SourceEtal/%n5.7_source_v%v.tar.gz Source-MD5: 6bde74d6fc1c7f32026ced6fd8741c99 Source2: http://www2.mrc-lmb.cam.ac.uk/groups/murshudov/content/%n/Dictionary/%n_dictionary_v5.41.tar.gz @@ -20,12 +20,12 @@ InstallScript: << #!/bin/bash -efv mkdir -p %i/bin -mkdir -p %i/share/%n +mkdir -p %i/share/%n/data mkdir -p %i/etc/profile.d cp refmac5 %i/bin/. cp refmac5 %i/bin/%n touch %i/share/%n/environ.def %i/share/%n/default.def -cp -R monomers %i/share/%n/. +cp -R monomers %i/share/%n/data/. # echo 'if [[ ! -f ${CINCL}/environ.def ]];then' > %i/etc/profile.d/refmac.sh echo ' export CINCL=%p/share/%n' >> %i/etc/profile.d/refmac.sh @@ -38,7 +38,7 @@ echo 'endif' >> %i/etc/profile.d/refmac.csh << RunTimeVars: << -CLIBD_MON: %p/share/%n/monomers/ +CLIBD_MON: %p/share/%n/data/monomers/ SYMINFO: %p/share/ccp4/syminfo.lib ATOMSF: %p/share/ccp4/atomsf.lib << Index: coot-pre.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/coot-pre.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- coot-pre.info 27 Aug 2013 16:48:24 -0000 1.1 +++ coot-pre.info 5 Sep 2013 02:35:52 -0000 1.2 @@ -1,11 +1,11 @@ Package: coot-pre Version: 0.8-pre -Revision: 4747 +Revision: 4749 SourceDirectory: coot-%v Distribution: 10.6, 10.7, 10.8 GCC: 4.0 Source: http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/pre-releases/coot-%v-revision-%r.tar.gz -Source-MD5: 049a0af2bbeda5d4a9761c682f74c8a0 +Source-MD5: acbce0f1e9eaeebab24f7e33a56e4460 Source2: http://www.ysbl.york.ac.uk/~emsley/software/extras/reference-structures.tar.gz Source2-MD5: 257ab90d44f1c877ada96720dbb87c13 ############################################################################### @@ -228,10 +228,6 @@ install_name_tool -change /System/Library/Frameworks/Python.framework/Versions/2.6/Python %p/lib/python2.6/config/libpython2.6.dylib %i/bin/coot-real fi -# This consolidates the refmac monomer library -mkdir -p %i/share/coot/lib/data -ln -s %p/share/refmac/monomers/ener_lib.cif %i/share/coot/lib/. -ln -s %p/share/refmac/monomers %i/share/coot/lib/data/. # Reference structures should be in %i/share/coot/reference-structures cp -R ../reference-structures %i/share/coot/. cp -R * %i/share/coot/etc/. @@ -242,7 +238,7 @@ echo '#!/bin/sh -f ' > %i/bin/coot echo 'export GUILE_WARN_DEPRECATED="no"' >> %i/bin/coot echo "export LC_NUMERIC=C" >> %i/bin/coot -echo "export COOT_REFMAC_LIB_DIR=%p/share/coot/lib" >> %i/bin/coot +echo "export COOT_REFMAC_LIB_DIR=%p/share/refmac" >> %i/bin/coot echo "export COOT_PYTHON_DIR=%p/share/coot/python" >> %i/bin/coot echo 'export COOT_SBASE_DIR="%p/share/ccp4"' >> %i/bin/coot echo 'export CLIBD="%p/share/ccp4"' >> %i/bin/coot ------------------------------------------------------------------------------ Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs