Add mtools, nfextern & optic AstroConda IRAF packages.

26 files changed, 141 insertions, 7 deletions

diff --git a/iraf.mtools/ac.iraf.mtools.patch b/iraf.mtools/ac.iraf.mtools.patch
new file mode 100644
index 0000000..f6dab9b
--- /dev/null
+++ b/iraf.mtools/ac.iraf.mtools.patch
@@ -0,0 +1,5 @@
+diff -Nur ../original/numrec_list.txt ./numrec_list.txt
+--- ../original/numrec_list.txt	1969-12-31 21:00:00.000000000 -0300
++++ ./numrec_list.txt	2016-05-03 13:32:15.000000000 -0300
+@@ -0,0 +1 @@
++chart/spitlist.x
diff --git a/iraf.mtools/bld.bat b/iraf.mtools/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.mtools/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.mtools/build.sh b/iraf.mtools/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.mtools/build.sh
@@ -0,0 +1,8 @@
+# Configure the environment for IRAF, since conda build appears not to do
+# "source activate" after installing dependencies (this would instead need to
+# eval $PREFIX/iraf/unix/hlib/setup directly if "--level" needs specifying):
+. setup_iraf.sh
+
+# Build from source in envs/_build (using build script from astroconda-utils):
+ac_build_iraf_pkg
+
diff --git a/iraf.mtools/meta.yaml b/iraf.mtools/meta.yaml
new file mode 100644
index 0000000..6a1a19c
--- /dev/null
+++ b/iraf.mtools/meta.yaml
@@ -0,0 +1,27 @@
+about:
+    home: http://iraf.noao.edu/
+    license: IRAF MIT/X11 variant, Numerical Recipes
+    summary: MTOOLS package for IRAF
+build:
+    binary_relocation: False
+    number: '0'
+    # These must be copied from astroconda-iraf-helpers, since conda disallows
+    # the post-install step from depending on other packages:
+    always_include_files:
+    - bin/ac_config_iraf_pkg
+    - bin/ac_update_extern_pkg
+package:
+    name: iraf.mtools
+    version: "2013_01_02"
+source:
+    fn: mtools-src-2013-01-02.tar.gz
+    url: http://astroconda-source:4440/mtools-src-2013-01-02.tar.gz
+    patches:
+    - ac.iraf.mtools.patch
+requirements:
+    build:
+    - astroconda-iraf-helpers
+    - iraf !=2.16.1,>=2.16.UR
+    run:
+    - iraf !=2.16.1,>=2.16.UR
+
diff --git a/iraf.mtools/post-link.sh b/iraf.mtools/post-link.sh
new file mode 100644
index 0000000..32626bb
--- /dev/null
+++ b/iraf.mtools/post-link.sh
@@ -0,0 +1,3 @@
+# Call a common script that updates extern.pkg for the new IRAF package:
+
+"$PREFIX/bin/ac_config_iraf_pkg" mtools
diff --git a/iraf.mtools/pre-unlink.sh b/iraf.mtools/pre-unlink.sh
new file mode 100644
index 0000000..7911520
--- /dev/null
+++ b/iraf.mtools/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove mtools
diff --git a/iraf.mtools/ur_extern.pkg b/iraf.mtools/ur_extern.pkg
new file mode 100644
index 0000000..5ba98bb
--- /dev/null
+++ b/iraf.mtools/ur_extern.pkg
@@ -0,0 +1,6 @@
+# ftp://iraf.noao.edu/iraf/v216/REPO
+reset mtools = UR_VDIR
+task  mtools.pkg = mtools$mtools.cl
+reset helpdb= ( envget("helpdb") + ",mtools$lib/helpdb.mip" )
+reset aproposdb= ( envget("aproposdb") + ",mtools$lib/apropos.db" )
+
diff --git a/iraf.mtools/ur_mkpkg_cmd b/iraf.mtools/ur_mkpkg_cmd
new file mode 100644
index 0000000..762d6bf
--- /dev/null
+++ b/iraf.mtools/ur_mkpkg_cmd
@@ -0,0 +1 @@
+mkpkg -p noao update
diff --git a/iraf.mtools/ur_mkpkg_patterns b/iraf.mtools/ur_mkpkg_patterns
new file mode 100644
index 0000000..302f588
--- /dev/null
+++ b/iraf.mtools/ur_mkpkg_patterns
@@ -0,0 +1,3 @@
+^copy *
+^!touch*
+^(/.*/)?libtool: warning same member name *
diff --git a/iraf.nfextern/ac.iraf.nfextern.patch b/iraf.nfextern/ac.iraf.nfextern.patch
new file mode 100644
index 0000000..e2b1cfc
--- /dev/null
+++ b/iraf.nfextern/ac.iraf.nfextern.patch
@@ -0,0 +1,6 @@
+diff -Nur ../original/numrec_list.txt ./numrec_list.txt
+--- ../original/numrec_list.txt	1969-12-31 21:00:00.000000000 -0300
++++ ./numrec_list.txt	2016-05-03 13:32:07.000000000 -0300
+@@ -0,0 +1,2 @@
++src/msctools/mscdisplay/src/gamma.x
++src/msctools/mscdisplay/src/imexam/iejimexam.x
diff --git a/iraf.nfextern/bld.bat b/iraf.nfextern/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.nfextern/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.nfextern/build.sh b/iraf.nfextern/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.nfextern/build.sh
@@ -0,0 +1,8 @@
+# Configure the environment for IRAF, since conda build appears not to do
+# "source activate" after installing dependencies (this would instead need to
+# eval $PREFIX/iraf/unix/hlib/setup directly if "--level" needs specifying):
+. setup_iraf.sh
+
+# Build from source in envs/_build (using build script from astroconda-utils):
+ac_build_iraf_pkg
+
diff --git a/iraf.nfextern/meta.yaml b/iraf.nfextern/meta.yaml
new file mode 100644
index 0000000..742865b
--- /dev/null
+++ b/iraf.nfextern/meta.yaml
@@ -0,0 +1,29 @@
+about:
+    home: http://iraf.noao.edu/
+    license: IRAF MIT/X11 variant, Numerical Recipes
+    summary: NFEXTERN package for IRAF
+build:
+    binary_relocation: False
+    number: '0'
+    # These must be copied from astroconda-iraf-helpers, since conda disallows
+    # the post-install step from depending on other packages:
+    always_include_files:
+    - bin/ac_config_iraf_pkg
+    - bin/ac_update_extern_pkg
+package:
+    name: iraf.nfextern
+    version: "2013_01_02"
+source:
+    fn: nfextern-src-2013-01-02.tar.gz
+    url: http://astroconda-source:4440/nfextern-src-2013-01-02.tar.gz
+    patches:
+    - ac.iraf.nfextern.patch
+requirements:
+    build:
+    - astroconda-iraf-helpers
+    - iraf !=2.16.1,>=2.16.UR
+    - iraf.tables
+    run:
+    - iraf !=2.16.1,>=2.16.UR
+    - iraf.tables
+
diff --git a/iraf.nfextern/post-link.sh b/iraf.nfextern/post-link.sh
new file mode 100644
index 0000000..3102aa3
--- /dev/null
+++ b/iraf.nfextern/post-link.sh
@@ -0,0 +1,3 @@
+# Call a common script that updates extern.pkg for the new IRAF package:
+
+"$PREFIX/bin/ac_config_iraf_pkg" nfextern
diff --git a/iraf.nfextern/pre-unlink.sh b/iraf.nfextern/pre-unlink.sh
new file mode 100644
index 0000000..a3a3660
--- /dev/null
+++ b/iraf.nfextern/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove nfextern
diff --git a/iraf.nfextern/ur_extern.pkg b/iraf.nfextern/ur_extern.pkg
new file mode 100644
index 0000000..1095bc1
--- /dev/null
+++ b/iraf.nfextern/ur_extern.pkg
@@ -0,0 +1,6 @@
+# ftp://iraf.noao.edu/iraf/v216/REPO
+reset nfextern = UR_VDIR
+task  nfextern.pkg = nfextern$nfextern.cl
+reset helpdb= ( envget("helpdb") + ",nfextern$lib/helpdb.mip" )
+reset aproposdb= ( envget("aproposdb") + ",nfextern$lib/apropos.db" )
+
diff --git a/iraf.nfextern/ur_mkpkg_cmd b/iraf.nfextern/ur_mkpkg_cmd
new file mode 100644
index 0000000..e6761d9
--- /dev/null
+++ b/iraf.nfextern/ur_mkpkg_cmd
@@ -0,0 +1 @@
+mkpkg -p noao -p nfextern update
diff --git a/iraf.nfextern/ur_mkpkg_patterns b/iraf.nfextern/ur_mkpkg_patterns
new file mode 100644
index 0000000..7fe2053
--- /dev/null
+++ b/iraf.nfextern/ur_mkpkg_patterns
@@ -0,0 +1 @@
+^copy *
diff --git a/iraf.optic/bld.bat b/iraf.optic/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.optic/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.optic/build.sh b/iraf.optic/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.optic/build.sh
@@ -0,0 +1,8 @@
+# Configure the environment for IRAF, since conda build appears not to do
+# "source activate" after installing dependencies (this would instead need to
+# eval $PREFIX/iraf/unix/hlib/setup directly if "--level" needs specifying):
+. setup_iraf.sh
+
+# Build from source in envs/_build (using build script from astroconda-utils):
+ac_build_iraf_pkg
+
diff --git a/iraf.finder/meta.yaml~ b/iraf.optic/meta.yaml
index 00e6c19..27e8579 100644
--- a/iraf.finder/meta.yaml~
+++ b/iraf.optic/meta.yaml
@@ -1,7 +1,7 @@
 about:
     home: http://iraf.noao.edu/
     license: IRAF MIT/X11 variant
-    summary: FINDER package for IRAF
+    summary: OPTIC package for IRAF
 build:
     binary_relocation: False
     number: '0'
@@ -11,17 +11,16 @@ build:
     - bin/ac_config_iraf_pkg
     - bin/ac_update_extern_pkg
 package:
-    name: iraf.finder
-    version: "2.2"
+    name: iraf.optic
+    version: "2013_01_02"
 source:
-    fn: finder-src-2.2.tar.gz
-    url: http://astroconda-source:4440/finder-src-2.2.tar.gz
+    fn: optic-universal-2013-01-02.tar.gz
+    url: http://astroconda-source:4440/optic-universal-2013-01-02.tar.gz
 requirements:
     build:
     - astroconda-iraf-helpers
     - iraf !=2.16.1,>=2.16.UR
-    - iraf.tables
     run:
     - iraf !=2.16.1,>=2.16.UR
-    - iraf.tables
+    - iraf.mscred
 
diff --git a/iraf.optic/post-link.sh b/iraf.optic/post-link.sh
new file mode 100644
index 0000000..78486c4
--- /dev/null
+++ b/iraf.optic/post-link.sh
@@ -0,0 +1,3 @@
+# Call a common script that updates extern.pkg for the new IRAF package:
+
+"$PREFIX/bin/ac_config_iraf_pkg" optic
diff --git a/iraf.optic/pre-unlink.sh b/iraf.optic/pre-unlink.sh
new file mode 100644
index 0000000..01a044b
--- /dev/null
+++ b/iraf.optic/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove optic
diff --git a/iraf.optic/ur_extern.pkg b/iraf.optic/ur_extern.pkg
new file mode 100644
index 0000000..316c35f
--- /dev/null
+++ b/iraf.optic/ur_extern.pkg
@@ -0,0 +1,6 @@
+# ftp://iraf.noao.edu/iraf/v216/REPO
+reset optic = UR_VDIR
+task  optic.pkg = optic$optic.cl
+reset helpdb= ( envget("helpdb") + ",optic$lib/helpdb.mip" )
+reset aproposdb= ( envget("aproposdb") + ",optic$lib/apropos.db" )
+
diff --git a/iraf.optic/ur_mkpkg_cmd b/iraf.optic/ur_mkpkg_cmd
new file mode 100644
index 0000000..24d2743
--- /dev/null
+++ b/iraf.optic/ur_mkpkg_cmd
@@ -0,0 +1 @@
+echo "Nothing to do!"
diff --git a/iraf.optic/ur_mkpkg_patterns b/iraf.optic/ur_mkpkg_patterns
new file mode 100644
index 0000000..ecbb459
--- /dev/null
+++ b/iraf.optic/ur_mkpkg_patterns
@@ -0,0 +1 @@
+^Nothing to do*