Ticket #11503: trac-11503-jmol-spkg.2.patch

File trac-11503-jmol-spkg.2.patch, 1.3 KB (added by ppurka, 10 years ago)

Rebased to sage-5.0beta11

  • spkg/install

    # HG changeset patch
    # User Jason Grout <jason.grout@drake.edu>
    # Date 1326780964 21600
    # Node ID 044b51b9ed7b76ec0c08ff1d005d3eae427b2a7d
    # Parent  0f8202bf191d60ad64d978a957933bfedd1b1a23
    Add dependencies for the new jmol spkg
    
    diff --git a/spkg/install b/spkg/install
    a b  
    167167IML=`newest_version iml`
    168168IPYTHON=`newest_version ipython`
    169169JINJA2=`newest_version jinja2`
     170JMOL=`newest_version jmol`
    170171LAPACK=`newest_version lapack`
    171172LCALC=`newest_version lcalc`
    172173LIBGCRYPT=`newest_version libgcrypt`
  • spkg/standard/deps

    diff --git a/spkg/standard/deps b/spkg/standard/deps
    a b  
    6161     $(INST)/$(IML) \
    6262     $(INST)/$(IPYTHON) \
    6363     $(INST)/$(JINJA2) \
     64     $(INST)/$(JMOL) \
    6465     $(INST)/$(LAPACK) \
    6566     $(INST)/$(LCALC) \
    6667     $(INST)/$(LIBGCRYPT) \
     
    338339$(INST)/$(ZLIB): $(BASE) $(INST)/$(PATCH)
    339340        +$(PIPE) "$(SAGE_SPKG) $(ZLIB) 2>&1" "tee -a $(SAGE_LOGS)/$(ZLIB).log"
    340341
     342$(INST)/$(JMOL): $(BASE) $(INST)/$(SAGENB) $(INST)/$(PATCH)
     343        +$(PIPE) "$(SAGE_SPKG) $(JMOL) 2>&1" "tee -a $(SAGE_LOGS)/$(JMOL).log"
     344
    341345##  << NON-GUI matplotlib >>
    342346$(INST)/$(FREETYPE): $(BASE) $(INST)/$(PATCH)
    343347        +$(PIPE) "$(SAGE_SPKG) $(FREETYPE) 2>&1" "tee -a $(SAGE_LOGS)/$(FREETYPE).log"