New iraf.ini, and renamed the old clunker

2 files changed, 63 insertions, 19 deletions

diff --git a/iraf/iraf.ini b/iraf/iraf.ini
index d47870a..9fa8812 100644
--- a/iraf/iraf.ini
+++ b/iraf/iraf.ini
@@ -1,40 +1,44 @@
 [package]
 name: iraf
-version: 2.16
+version: 2.16.1
 
 [about]
-home: http://bitbucket.org/jhunkeler/${package:name}
-license: BSD
-summary: ${package:name} is hard
-#readme: README.md
+home: http://iraf.noao.edu
+license: MIT
+summary: NOAO Image Reduction and Analysis Facility
 
 [source]
-fn: ${package:name}.tar.bz2
+# Remember, always 32-bit! Now feast upon my tears.
+fn: ${package:name}.lnux.x86.fixup.tar.gz
 url: ${cbc_cgi:url}/${fn}
 
 [build]
 number: 1
+detect_binary_files_with_prefix: True
 
 [requirements]
 build:
-    python
+    # Luck
 run:
-    python
+    # Gallant effort
 
 [cbc_build]
 linux:
-    # Replace hard-coded HOST and IRAF defines
-    sed -i -e "/#define\\tHOST/c \\
-    \\#define HOST \"$$PREFIX/iraf/unix/\"" unix/hlib/libc/iraf.h
-    
-    sed -i -e "/#define\\tIRAF/c \\
-    \\#define IRAF \"$$PREFIX/iraf/\"" unix/hlib/libc/iraf.h
-    
-    # Destroy hard-coded header paths. Rely on CFLAGS like normal humans.
-    sed -i -e 's|/home/jhunk/Ureka/iraf/unix/hlib/libc/||g' unix/hlib/libc/iraf.h
-    
-    #Pseudo-install
+    export TERM=xterm
+    FAKEHOME=$$PREFIX/iraf/fakehome
     cp -a `pwd` $$PREFIX
+    cd $$PREFIX/iraf
+    ./install \
+        --accept-defaults \
+        --fakehome $$FAKEHOME
+        #--term xterm \
+        #--mach linux \
+        #--bindir $$FAKEHOME/bin \
+        #--cache $$FAKEHOME/cache \
+        #--imdir $$FAKEHOME/imdir \
+    rm -f bin
+    ln -s bin.linux bin
+    ln -s bin.linux bin.linux64
     
 windows:
     echo Not supported on Windows
diff --git a/iraf_ureka/iraf.ini b/iraf_ureka/iraf.ini
new file mode 100644
index 0000000..d47870a
--- /dev/null
+++ b/iraf_ureka/iraf.ini
@@ -0,0 +1,40 @@
+[package]
+name: iraf
+version: 2.16
+
+[about]
+home: http://bitbucket.org/jhunkeler/${package:name}
+license: BSD
+summary: ${package:name} is hard
+#readme: README.md
+
+[source]
+fn: ${package:name}.tar.bz2
+url: ${cbc_cgi:url}/${fn}
+
+[build]
+number: 1
+
+[requirements]
+build:
+    python
+run:
+    python
+
+[cbc_build]
+linux:
+    # Replace hard-coded HOST and IRAF defines
+    sed -i -e "/#define\\tHOST/c \\
+    \\#define HOST \"$$PREFIX/iraf/unix/\"" unix/hlib/libc/iraf.h
+    
+    sed -i -e "/#define\\tIRAF/c \\
+    \\#define IRAF \"$$PREFIX/iraf/\"" unix/hlib/libc/iraf.h
+    
+    # Destroy hard-coded header paths. Rely on CFLAGS like normal humans.
+    sed -i -e 's|/home/jhunk/Ureka/iraf/unix/hlib/libc/||g' unix/hlib/libc/iraf.h
+    
+    #Pseudo-install
+    cp -a `pwd` $$PREFIX
+    
+windows:
+    echo Not supported on Windows