Add ucsclris, upsqiid, xdimsum & xray IRAF package definitions.

35 files changed, 398 insertions, 0 deletions

diff --git a/iraf.ucsclris/bld.bat b/iraf.ucsclris/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.ucsclris/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.ucsclris/build.sh b/iraf.ucsclris/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.ucsclris/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.ucsclris/meta.yaml b/iraf.ucsclris/meta.yaml
new file mode 100644
index 0000000..d4f5354
--- /dev/null
+++ b/iraf.ucsclris/meta.yaml
@@ -0,0 +1,26 @@
+about:
+    home: http://iraf.noao.edu/
+    license: IRAF MIT/X11 variant
+    summary: UCSCLRIS 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.ucsclris
+    version: "2013_01_02"
+source:
+    fn: ucsclris-src-2013-01-02.tar.gz
+    url: http://astroconda-source:4440/ucsclris-src-2013-01-02.tar.gz
+requirements:
+    build:
+    - astroconda-iraf-helpers
+    - iraf !=2.16.1,>=2.16.UR
+    run:
+    - iraf !=2.16.1,>=2.16.UR
+    - iraf.stsdas  # used only by prep.qmask_plot
+
diff --git a/iraf.ucsclris/post-link.sh b/iraf.ucsclris/post-link.sh
new file mode 100644
index 0000000..d8731e4
--- /dev/null
+++ b/iraf.ucsclris/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" ucsclris
diff --git a/iraf.ucsclris/pre-unlink.sh b/iraf.ucsclris/pre-unlink.sh
new file mode 100644
index 0000000..877c924
--- /dev/null
+++ b/iraf.ucsclris/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove ucsclris
diff --git a/iraf.ucsclris/ur_extern.pkg b/iraf.ucsclris/ur_extern.pkg
new file mode 100644
index 0000000..179bc4a
--- /dev/null
+++ b/iraf.ucsclris/ur_extern.pkg
@@ -0,0 +1,6 @@
+# ftp://iraf.noao.edu/iraf/v216/REPO
+reset ucsclris = UR_VDIR
+task  ucsclris.pkg = ucsclris$ucsclris.cl
+reset helpdb= ( envget("helpdb") + ",ucsclris$lib/helpdb.mip" )
+reset aproposdb= ( envget("aproposdb") + ",ucsclris$lib/apropos.db" )
+
diff --git a/iraf.ucsclris/ur_mkpkg_patterns b/iraf.ucsclris/ur_mkpkg_patterns
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/iraf.ucsclris/ur_mkpkg_patterns
diff --git a/iraf.upsqiid/ac.iraf.upsqiid.patch b/iraf.upsqiid/ac.iraf.upsqiid.patch
new file mode 100644
index 0000000..fef35f8
--- /dev/null
+++ b/iraf.upsqiid/ac.iraf.upsqiid.patch
@@ -0,0 +1,13 @@
+diff -Nur ../original/upsqiid.cl ./upsqiid.cl
+--- ../original/upsqiid.cl	2003-01-17 12:27:55.000000000 -0300
++++ ./upsqiid.cl	2016-12-12 17:13:31.812406000 -0300
+@@ -20,7 +20,8 @@
+ #    local
+ 
+ # change sqiiddir to point to SQIID directory in target system
+-set     upsqdir       = "home$myprog/upsqiid/"
++# set     upsqdir       = "home$myprog/upsqiid/"
++set     upsqdir       = "upsqiid$"
+ 
+ package upsqiid
+ 
diff --git a/iraf.upsqiid/bld.bat b/iraf.upsqiid/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.upsqiid/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.upsqiid/build.sh b/iraf.upsqiid/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.upsqiid/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.upsqiid/meta.yaml b/iraf.upsqiid/meta.yaml
new file mode 100644
index 0000000..a402245
--- /dev/null
+++ b/iraf.upsqiid/meta.yaml
@@ -0,0 +1,27 @@
+about:
+    home: http://iraf.noao.edu/
+    license: IRAF MIT/X11 variant
+    summary: UPSQIID 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.upsqiid
+    version: "2013_01_02"
+source:
+    fn: upsqiid-universal-2013-01-02.tar.gz
+    url: http://astroconda-source:4440/upsqiid-universal-2013-01-02.tar.gz
+    patches:
+    - ac.iraf.upsqiid.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.upsqiid/post-link.sh b/iraf.upsqiid/post-link.sh
new file mode 100644
index 0000000..29bb887
--- /dev/null
+++ b/iraf.upsqiid/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" upsqiid
diff --git a/iraf.upsqiid/pre-unlink.sh b/iraf.upsqiid/pre-unlink.sh
new file mode 100644
index 0000000..b3049a4
--- /dev/null
+++ b/iraf.upsqiid/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove upsqiid
diff --git a/iraf.upsqiid/ur_extern.pkg b/iraf.upsqiid/ur_extern.pkg
new file mode 100644
index 0000000..95b4131
--- /dev/null
+++ b/iraf.upsqiid/ur_extern.pkg
@@ -0,0 +1,5 @@
+# ftp://iraf.noao.edu/iraf/v216/REPO
+reset upsqiid = UR_VDIR
+task  upsqiid.pkg = upsqiid$upsqiid.cl
+# upsqiid contains no help
+
diff --git a/iraf.upsqiid/ur_mkhelp_cmd b/iraf.upsqiid/ur_mkhelp_cmd
new file mode 100644
index 0000000..9467f1e
--- /dev/null
+++ b/iraf.upsqiid/ur_mkhelp_cmd
@@ -0,0 +1 @@
+echo "No help to build for upsquiid"
diff --git a/iraf.upsqiid/ur_mkpkg_cmd b/iraf.upsqiid/ur_mkpkg_cmd
new file mode 100644
index 0000000..24d2743
--- /dev/null
+++ b/iraf.upsqiid/ur_mkpkg_cmd
@@ -0,0 +1 @@
+echo "Nothing to do!"
diff --git a/iraf.upsqiid/ur_mkpkg_patterns b/iraf.upsqiid/ur_mkpkg_patterns
new file mode 100644
index 0000000..ecbb459
--- /dev/null
+++ b/iraf.upsqiid/ur_mkpkg_patterns
@@ -0,0 +1 @@
+^Nothing to do*
diff --git a/iraf.xdimsum/bld.bat b/iraf.xdimsum/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.xdimsum/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.xdimsum/build.sh b/iraf.xdimsum/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.xdimsum/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.xdimsum/meta.yaml b/iraf.xdimsum/meta.yaml
new file mode 100644
index 0000000..d375f07
--- /dev/null
+++ b/iraf.xdimsum/meta.yaml
@@ -0,0 +1,27 @@
+about:
+    home: http://iraf.noao.edu/
+    license: IRAF MIT/X11 variant
+    summary: XDIMSUM 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.xdimsum
+    version: "2010_11_18"
+source:
+    fn: xdimsum-src-2010-11-18.tar.gz
+    url: http://astroconda-source:4440/xdimsum-src-2010-11-18.tar.gz
+requirements:
+    build:
+    - astroconda-iraf-helpers
+    - iraf !=2.16.1,>=2.16.UR
+    run:
+    - iraf !=2.16.1,>=2.16.UR
+    # One task also uses STSDAS but it lives in the "obsolete" dir, so don't
+    # pull in all of STSDAS just for that (unless user installs it manually).
+
diff --git a/iraf.xdimsum/post-link.sh b/iraf.xdimsum/post-link.sh
new file mode 100644
index 0000000..e02380e
--- /dev/null
+++ b/iraf.xdimsum/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" xdimsum
diff --git a/iraf.xdimsum/pre-unlink.sh b/iraf.xdimsum/pre-unlink.sh
new file mode 100644
index 0000000..c03a7d9
--- /dev/null
+++ b/iraf.xdimsum/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove xdimsum
diff --git a/iraf.xdimsum/ur_extern.pkg b/iraf.xdimsum/ur_extern.pkg
new file mode 100644
index 0000000..3eddc12
--- /dev/null
+++ b/iraf.xdimsum/ur_extern.pkg
@@ -0,0 +1,6 @@
+# ftp://iraf.noao.edu/iraf/v215/REPO
+reset xdimsum = UR_VDIR
+task  xdimsum.pkg = xdimsum$xdimsum.cl
+reset helpdb= ( envget("helpdb") + ",xdimsum$lib/helpdb.mip" )
+reset aproposdb= ( envget("aproposdb") + ",xdimsum$lib/apropos.db" )
+
diff --git a/iraf.xdimsum/ur_manifest b/iraf.xdimsum/ur_manifest
new file mode 100644
index 0000000..266a7b5
--- /dev/null
+++ b/iraf.xdimsum/ur_manifest
@@ -0,0 +1 @@
+bin/x_xdimsum.e
diff --git a/iraf.xdimsum/ur_mkpkg_patterns b/iraf.xdimsum/ur_mkpkg_patterns
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/iraf.xdimsum/ur_mkpkg_patterns
diff --git a/iraf.xray/ac.iraf.xray.patch b/iraf.xray/ac.iraf.xray.patch
new file mode 100644
index 0000000..02cccb0
--- /dev/null
+++ b/iraf.xray/ac.iraf.xray.patch
@@ -0,0 +1,171 @@
+diff -Nur ../original/lib/mkpkg.inc ./lib/mkpkg.inc
+--- ../original/lib/mkpkg.inc	2002-02-14 15:36:16.000000000 -0300
++++ ./lib/mkpkg.inc	2016-05-03 13:31:59.000000000 -0300
+@@ -53,11 +53,11 @@
+ ### Installation version ( Optimized) at sites ###
+ # 	compile flags
+ $ifeq (MACH, ddec) then
+-$set XFLAGS     = "-c -g2 -q -p xray -p tables"
++$set XFLAGS     = "-c -q -p xray -p tables"
+ $else $ifeq (MACH,dsux) then
+-$set XFLAGS     = "-c -g2 -q -p xray -p tables"
++$set XFLAGS     = "-c -q -p xray -p tables"
+ $else $ifeq (MACH, linux, redhat, freebsd) then
+-$set XFLAGS     = "-c -g2 -p xray -p tables"
++$set XFLAGS     = "-c -p xray -p tables"
+ $else
+ $set XFLAGS     = "$(XFLAGS) -c -O -q -p xray -p tables"
+ $end
+diff -Nur ../original/lib/qpcreate/uhead2qp.x ./lib/qpcreate/uhead2qp.x
+--- ../original/lib/qpcreate/uhead2qp.x	2001-03-26 16:59:51.000000000 -0400
++++ ./lib/qpcreate/uhead2qp.x	2016-05-03 13:31:59.000000000 -0300
+@@ -522,7 +522,7 @@
+ int	ip				# l: index for ctoi
+ int	ctoi()				# l: convert ascii to int
+ int	read()				# l: read data
+-int	cvti2()				# l: convert DG I*2
++short	cvti2()				# l: convert DG I*2
+ 
+ begin
+     # try to read the header
+diff -Nur ../original/xproto/evalvg/evalvg_subs.x ./xproto/evalvg/evalvg_subs.x
+--- ../original/xproto/evalvg/evalvg_subs.x	2001-03-26 17:05:15.000000000 -0400
++++ ./xproto/evalvg/evalvg_subs.x	2016-05-03 13:31:59.000000000 -0300
+@@ -607,6 +607,8 @@
+ double	jd			# l: returned julian day
+ double	refday			# l : reference julian day
+ 
++char	msg[15]                 # UR: avoid xc producing invalid ForTran
++
+ COMMON/BBLK1/MON
+ DATA MON/0,31,59,90,120,151,181,212,243,273,304,334,
+          0,31,60,91,121,152,182,213,244,274,305,335 /
+@@ -616,7 +618,14 @@
+    #               has been updated to 4 digits (YYYY)
+    #nyear = YEAR(utclk)  ## JCC
+    nyear = YEAR(utclk) - 1900
+-   call printf("  nyear = %d\n ")
++
++   # UR: silly workaround to avoid xc producing invalid ForTran by adding
++   # variable declarations after the DATA statement.
++   # Encoded string is: "  nyear = %d\n "
++   msg[0]=32; msg[1]=32; msg[2]=110; msg[3]=121; msg[4]=101; msg[5]=97
++   msg[6]=114; msg[7]=32; msg[8]=61; msg[9]=32; msg[10]=37; msg[11]=100
++   msg[12]=10; msg[13]=32; msg[14]=0
++   call printf(msg)
+    call pargi(nyear)
+ 
+    month = MONTH(utclk)
+diff -Nur ../original/xspectral/qpspec/qpspec.h ./xspectral/qpspec/qpspec.h
+--- ../original/xspectral/qpspec/qpspec.h	1997-11-06 13:43:34.000000000 -0300
++++ ./xspectral/qpspec/qpspec.h	2016-05-03 13:31:59.000000000 -0300
+@@ -40,21 +40,21 @@
+ define	N_OAHBINS	65
+ define	SZ_BINNING	(19 + N_OAHBINS*2)
+ 
+-define BN_INST		Memi($1 + 0)		# instrument
+-define BN_FULL		Memi($1 + 1)
+-define BN_XREF		Memi($1 + 2)		# the optical axis
+-define BN_YREF		Memi($1 + 3)
+-define BN_BOFF		Memi($1 + 4)		# binning offset 
+-define BN_XOFF		Memi($1 + 5)		# x offset
+-define BN_YOFF		Memi($1 + 6)		# y offset
+-define BN_INDICES	Memi($1 + 7)		# source indices
+-define BN_GOODTIME	Memd(P2D(($1)+8))	# good time from qpoe
+-define BN_UNORM		Memr($1 + 10)		# user norm factor
+-define BN_TNORM		Memr($1 + 11)		# time norm factor
+-define BN_NORMFACTOR	Memr($1 + 12)		# normalization factor
+-define BN_RADIUS	Memr($1 + 13)		# inst. radius
+-define BN_LTCOR		Memr($1 + 14)		# instr. live time corr.
+-define BN_ARCFRAC      	Memr($1 + 15)		# instr. arcing frac.
+-define BN_NOAH		Memi($1 + 16)		# number of offaxis bins
+-define BN_OAHAN		Memr($1 + 17 + $2)	# inner raduis of bin
+-define BN_OAH		Memr($1 + 18 + N_OAHBINS + $2)	# histogram bins
++define BN_INST		Memi[$1 + 0]		# instrument
++define BN_FULL		Memi[$1 + 1]
++define BN_XREF		Memi[$1 + 2]		# the optical axis
++define BN_YREF		Memi[$1 + 3]
++define BN_BOFF		Memi[$1 + 4]		# binning offset 
++define BN_XOFF		Memi[$1 + 5]		# x offset
++define BN_YOFF		Memi[$1 + 6]		# y offset
++define BN_INDICES	Memi[$1 + 7]		# source indices
++define BN_GOODTIME	Memd[P2D(($1)+8)]	# good time from qpoe
++define BN_UNORM		Memr[$1 + 10]		# user norm factor
++define BN_TNORM		Memr[$1 + 11]		# time norm factor
++define BN_NORMFACTOR	Memr[$1 + 12]		# normalization factor
++define BN_RADIUS	Memr[$1 + 13]		# inst. radius
++define BN_LTCOR		Memr[$1 + 14]		# instr. live time corr.
++define BN_ARCFRAC      	Memr[$1 + 15]		# instr. arcing frac.
++define BN_NOAH		Memi[$1 + 16]		# number of offaxis bins
++define BN_OAHAN		Memr[$1 + 17 + $2]	# inner raduis of bin
++define BN_OAH		Memr[$1 + 18 + N_OAHBINS + $2]	# histogram bins
+diff -Nur ../original/xspectral/source/logerror.x ./xspectral/source/logerror.x
+--- ../original/xspectral/source/logerror.x	1969-12-31 21:00:00.000000000 -0300
++++ ./xspectral/source/logerror.x	2016-05-03 13:31:59.000000000 -0300
+@@ -0,0 +1,13 @@
++include <math.h>
++include <mach.h>
++
++define MAX_EXPD double(MAX_EXPONENTD)
++define BAD_EXPD (-MAX_EXPD-1.0D0)
++
++double procedure logerror(value)
++double value
++#--
++
++begin
++	return BAD_EXPD
++end
+diff -Nur ../original/xspectral/source/mkpkg ./xspectral/source/mkpkg
+--- ../original/xspectral/source/mkpkg	1997-11-06 13:42:44.000000000 -0300
++++ ./xspectral/source/mkpkg	2016-05-03 13:31:59.000000000 -0300
+@@ -286,6 +286,8 @@
+ 				<einstein.h>	<rosat.h>	<astrod.h> \
+ 				<axaf.h>	<srg.h>
+ 
++        logerror.x
++
+ 	models.x		<spectral.h>	<qpoe.h>	<missions.h> \
+ 				<einstein.h>	<rosat.h>	<astrod.h> \
+ 				<axaf.h>	<srg.h>
+diff -Nur ../original/xspectral/source/models.x ./xspectral/source/models.x
+--- ../original/xspectral/source/models.x	1997-11-06 13:42:04.000000000 -0300
++++ ./xspectral/source/models.x	2016-05-03 13:31:59.000000000 -0300
+@@ -299,6 +299,7 @@
+ double	bin_energy()			# energy of this bin
+ double	gauint()			# calculate integral of gaussian
+ extern	logerror()
++#double	logerror()  # Examples exist with both extern X() & double X() decls.
+ 
+ begin
+ 
+@@ -372,13 +373,19 @@
+ 
+ end
+ 
+-define MAX_EXPD double(MAX_EXPONENTD)
+-define BAD_EXPD (-MAX_EXPD-1.0D0)
+-
+-double procedure logerror(value)
+-double value
+-#--
+-
+-begin
+-	return BAD_EXPD
+-end
++# UR: Moved this to a separate file to stop the fortran compiler complaining
++# that there are conflicting definitions (one being "extern"). I *think* this
++# is a valid way to work around the compilation error, though I wouldn't like
++# to bet my house on it. At least it gets the executable compiled with a load
++# of other stuff in it - JT.
++#
++# define MAX_EXPD double(MAX_EXPONENTD)
++# define BAD_EXPD (-MAX_EXPD-1.0D0)
++#
++# double procedure logerror(value)
++# double value
++# #--
++
++# begin
++# 	return BAD_EXPD
++# end
diff --git a/iraf.xray/bld.bat b/iraf.xray/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.xray/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.xray/build.sh b/iraf.xray/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.xray/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.xray/meta.yaml b/iraf.xray/meta.yaml
new file mode 100644
index 0000000..3a1a5fe
--- /dev/null
+++ b/iraf.xray/meta.yaml
@@ -0,0 +1,31 @@
+about:
+    home: http://iraf.noao.edu/
+    license: IRAF MIT/X11 variant (from SAO)
+    summary: XRAY 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.xray
+    version: "2.5.y2k"
+source:
+    fn: xray_src_2.5.y2k.tar.gz
+    url: http://astroconda-source:4440/xray_src_2.5.y2k.tar.gz
+    patches:
+    - ac.iraf.xray.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
+    # The ctio package is also used by xapropos but we're building apropos
+    # databases for the stsdas version instead.
+
diff --git a/iraf.xray/post-link.sh b/iraf.xray/post-link.sh
new file mode 100644
index 0000000..2f718d0
--- /dev/null
+++ b/iraf.xray/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" xray
diff --git a/iraf.xray/pre-unlink.sh b/iraf.xray/pre-unlink.sh
new file mode 100644
index 0000000..a2ffe31
--- /dev/null
+++ b/iraf.xray/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove xray
diff --git a/iraf.xray/ur_extern.pkg b/iraf.xray/ur_extern.pkg
new file mode 100644
index 0000000..05eebf2
--- /dev/null
+++ b/iraf.xray/ur_extern.pkg
@@ -0,0 +1,5 @@
+reset xray = UR_VDIR
+task  xray.pkg = xray$xray.cl
+reset helpdb= ( envget("helpdb") + ",xray$lib/helpdb.mip" )
+reset aproposdb= ( envget("aproposdb") + ",xray$lib/apropos.db" )
+
diff --git a/iraf.xray/ur_manifest b/iraf.xray/ur_manifest
new file mode 100644
index 0000000..6a100d0
--- /dev/null
+++ b/iraf.xray/ur_manifest
@@ -0,0 +1,14 @@
+bin/x_detect.e
+bin/x_eincdrom.e
+bin/x_eintools.e
+bin/x_imcalc.e
+bin/x_immodel.e
+bin/x_timcor.e
+bin/x_xdataio.e
+bin/x_ximages.e
+bin/x_xplot.e
+bin/x_xproto.e
+bin/x_xray.e
+bin/x_xspatial.e
+bin/x_xspectral.e
+bin/x_xtiming.e
diff --git a/iraf.xray/ur_mkpkg_cmd b/iraf.xray/ur_mkpkg_cmd
new file mode 100644
index 0000000..1fbefbf
--- /dev/null
+++ b/iraf.xray/ur_mkpkg_cmd
@@ -0,0 +1,3 @@
+# cd xray  # pre-IRAF-2.15
+mkpkg -p xray
+
diff --git a/iraf.xray/ur_mkpkg_patterns b/iraf.xray/ur_mkpkg_patterns
new file mode 100644
index 0000000..0b389af
--- /dev/null
+++ b/iraf.xray/ur_mkpkg_patterns
@@ -0,0 +1,4 @@
+^[ 	]*here [0-9][0-9]*, previously
+^[ 	]*here subroutine, previously
+^[ 	]*here integer function, previously
+^[ 	]arg [0-9][0-9]*: here