From 46d8ea4032fd33122a8217d9d480c8f75d803794 Mon Sep 17 00:00:00 2001
From: joequant <joequant@gmail.com>
Date: Sat, 29 Jun 2013 23:21:45 +0800
Subject: [PATCH] fix dependecies

---
 pkg/cl/mkpkg   | 66 ++++++++++++++++++++++----------------------
 pkg/ecl/mkpkg  | 75 ++++++++++++++++++++++----------------------------
 pkg/vocl/mkpkg | 68 ++++++++++++++++++++++-----------------------
 sys/libc/mkpkg | 74 ++++++++++++++++++++++++-------------------------
 4 files changed, 137 insertions(+), 146 deletions(-)

diff --git a/pkg/cl/mkpkg b/pkg/cl/mkpkg
index 0957f5af0..06d4d868c 100644
--- a/pkg/cl/mkpkg
+++ b/pkg/cl/mkpkg
@@ -43,9 +43,9 @@ relink:
 
 	#$set	xflags = "$(xflags) -x"
 	$omake  cl.x
-	$omake	globals.c <libc/libc.h> <libc/stdio.h> <libc/spp.h>\
+	$omake	globals.c <libc/libc.h> <libc/iraf/stdio.h> <libc/spp.h>\
 		construct.h eparam.h operand.h param.h task.h
-	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/stdio.h> config.h\
+	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h> config.h\
 		construct.h errs.h grammar.h mem.h opcodes.h operand.h\
 		param.h task.h
 link:
@@ -61,120 +61,120 @@ libpkg.a:
 	#$set	xflags = "$(xflags) -qx"
 
 	binop.c		<libc/spp.h> <libc/libc.h> <libc/xnames.h>\
-			<libc/math.h> <libc/ctype.h> config.h\
+			<libc/math.h> <libc/iraf/ctype.h> config.h\
 			operand.h errs.h
 
-	bkg.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/knames.h> <libc/xwhen.h> <libc/ctype.h>\
+	bkg.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/knames.h> <libc/xwhen.h> <libc/iraf/ctype.h>\
 			clmodes.h config.h operand.h clmodes.h\
 			mem.h errs.h param.h task.h
 
 	builtin.c	<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/error.h> <libc/ctype.h> <libc/stdio.h>\
+			<libc/error.h> <libc/iraf/ctype.h> <libc/iraf/stdio.h>\
 			<libc/alloc.h> <libc/ttset.h> clmodes.h\
 			config.h mem.h operand.h param.h task.h errs.h
 
-	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h\
 			task.h errs.h
 
-	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h
 
 	compile.c	<libc/spp.h> <libc/libc.h> config.h\
 			operand.h opcodes.h mem.h errs.h
 
-	debug.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	debug.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			operand.h mem.h grammar.h opcodes.h config.h param.h\
 			task.h
 
-	decl.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	decl.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h opcodes.h config.h\
 			param.h task.h errs.h construct.h ytab.h
 
-	edcap.c		<libc/stdio.h> <libc/libc.h> <libc/ctype.h>\
+	edcap.c		<libc/iraf/stdio.h> <libc/libc.h> <libc/iraf/ctype.h>\
 			<libc/fset.h> <libc/spp.h> config.h operand.h\
 			param.h task.h eparam.h
 
-	eparam.c	<libc/stdio.h> <libc/libc.h> <libc/error.h>\
-			<libc/ctype.h> <libc/ttset.h> <libc/fset.h>\
+	eparam.c	<libc/iraf/stdio.h> <libc/libc.h> <libc/error.h>\
+			<libc/iraf/ctype.h> <libc/ttset.h> <libc/fset.h>\
 			<libc/spp.h> config.h mem.h operand.h\
 			errs.h param.h grammar.h task.h eparam.h
 
 	errs.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/stdio.h> <libc/setjmp.h> <libc/knames.h>\
+			<libc/iraf/stdio.h> <libc/knames.h>\
 			<libc/xnames.h> clmodes.h\
 			config.h operand.h param.h task.h mem.h errs.h\
 			grammar.h construct.h
 
-	exec.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	exec.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xwhen.h> clmodes.h config.h mem.h\
 			opcodes.h operand.h param.h task.h errs.h\
 			grammar.h
 
-	gquery.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gquery.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h clmodes.h
 
-	gram.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gram.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h\
 			opcodes.h config.h param.h task.h errs.h construct.h\
 			ytab.h
 
-	history.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/fset.h> <libc/ctype.h> config.h errs.h\
+	history.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/fset.h> <libc/iraf/ctype.h> config.h errs.h\
 			mem.h operand.h param.h task.h clmodes.h grammar.h
 
-	lists.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	lists.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h mem.h operand.h param.h\
 			task.h errs.h
 
 	main.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/main.h> <libc/stdio.h> <libc/error.h>\
-			<libc/setjmp.h> <libc/knames.h> <libc/prtype.h>\
+			<libc/main.h> <libc/iraf/stdio.h> <libc/error.h>\
+			<libc/knames.h> <libc/prtype.h>\
 			<libc/xwhen.h> <libc/xnames.h> grammar.h\
 			opcodes.h operand.h param.h config.h clmodes.h task.h\
 			errs.h mem.h
 
 	modes.c		<libc/spp.h> <libc/libc.h>\
-			<libc/stdio.h> <libc/ctype.h> clmodes.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> clmodes.h\
 			config.h construct.h operand.h param.h grammar.h\
 			mem.h task.h errs.h
 
-	operand.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	operand.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h config.h operand.h param.h grammar.h\
 			mem.h task.h construct.h eparam.h
 
-	param.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	param.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h mem.h\
 			task.h errs.h clmodes.h construct.h
 
 	pfiles.c	<libc/spp.h> <libc/libc.h> <libc/finfo.h>\
-			<libc/stdio.h> <libc/ctype.h> config.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> config.h\
 			errs.h operand.h mem.h param.h task.h grammar.h
 
-	prcache.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	prcache.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/error.h> <libc/finfo.h> <libc/prstat.h>\
 			config.h errs.h task.h
 
-	scan.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	scan.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h errs.h
 
-	stack.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	stack.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			mem.h operand.h config.h param.h task.h\
 			errs.h
 
-	task.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	task.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h mem.h task.h\
 			errs.h clmodes.h
 
-	unop.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	unop.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h> <libc/math.h> config.h\
 			operand.h errs.h task.h param.h
 
-	ytab.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/ctype.h> config.h mem.h operand.h\
+	ytab.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/iraf/ctype.h> config.h mem.h operand.h\
 			param.h grammar.h opcodes.h clmodes.h task.h\
 			construct.h errs.h lexyy.c lexicon.c
 	;
diff --git a/pkg/ecl/mkpkg b/pkg/ecl/mkpkg
index af74d79f7..214356ef6 100644
--- a/pkg/ecl/mkpkg
+++ b/pkg/ecl/mkpkg
@@ -54,12 +54,9 @@ relink:
 
 	$ifeq (MACH, sparc) then
 	    $set    XFLAGS          = "$(XFLAGS) -/DNO_READLINE"
-<<<<<<< HEAD
-=======
 	$else  $ifneq (MACH, linux, linux64) then
 	    $call	libs@readline
         $endif
->>>>>>> 7b0ad9d... remove readline
 	$endif
 
 	$update libpkg.a
@@ -67,26 +64,20 @@ relink:
 	#$set	xflags = "$(xflags) -x -/DYYDEBUG"
 	$set	xflags = "$(xflags) -x"
 	$omake  ecl.x
-	$omake	globals.c <libc/libc.h> <libc/stdio.h> <libc/spp.h>\
+	$omake	globals.c <libc/libc.h> <libc/iraf/stdio.h> <libc/spp.h>\
 		construct.h eparam.h operand.h param.h task.h
-	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/stdio.h> config.h\
+	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h> config.h\
 		construct.h errs.h grammar.h mem.h opcodes.h operand.h\
 		param.h task.h
 link:
 	$set	LIBS = "-lc -lcur -lds -lstg"
 	$ifneq (MACH, sparc) then
 	  $ifeq (MACH, linux) then
-<<<<<<< HEAD
-	    $set	LIBS2 = "-/L/usr/lib32 -lreadline -lncurses"
-	  $else
-	    $set	LIBS2 = "-lreadline -lncurses"
-=======
 	    $set	LIBS2 = "-lreadline -/L/usr/lib32 -lncurses"
 	  $else $ifeq (MACH, linux64) then
 	    $set	LIBS2 = "-lreadline -lncurses"
     	  $else
 	    $set	LIBS2 = "libreadline.a -lncurses"
->>>>>>> 7b0ad9d... remove readline
 	  $endif
 	  $endif
 	$else
@@ -104,120 +95,120 @@ libpkg.a:
 	$set	xflags = "$(xflags) -qx"
 
 	binop.c		<libc/spp.h> <libc/libc.h> <libc/xnames.h>\
-			<libc/math.h> <libc/ctype.h> config.h\
+			<libc/math.h> <libc/iraf/ctype.h> config.h\
 			operand.h errs.h
 
-	bkg.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/knames.h> <libc/xwhen.h> <libc/ctype.h>\
+	bkg.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/knames.h> <libc/xwhen.h> <libc/iraf/ctype.h>\
 			clmodes.h config.h operand.h clmodes.h\
 			mem.h errs.h param.h task.h
 
 	builtin.c	<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/error.h> <libc/ctype.h> <libc/stdio.h>\
+			<libc/error.h> <libc/iraf/ctype.h> <libc/iraf/stdio.h>\
 			<libc/alloc.h> <libc/ttset.h> clmodes.h\
 			config.h mem.h operand.h param.h task.h errs.h
 
-	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h\
 			task.h errs.h
 
-	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h
 
 	compile.c	<libc/spp.h> <libc/libc.h> config.h\
 			operand.h opcodes.h mem.h errs.h
 
-	debug.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	debug.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			operand.h mem.h grammar.h opcodes.h config.h param.h\
 			task.h
 
-	decl.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	decl.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h opcodes.h config.h\
 			param.h task.h errs.h construct.h ytab.h
 
-	edcap.c		<libc/stdio.h> <libc/libc.h> <libc/ctype.h>\
+	edcap.c		<libc/iraf/stdio.h> <libc/libc.h> <libc/iraf/ctype.h>\
 			<libc/fset.h> <libc/spp.h> config.h operand.h\
 			param.h task.h eparam.h
 
-	eparam.c	<libc/stdio.h> <libc/libc.h> <libc/error.h>\
-			<libc/ctype.h> <libc/ttset.h> <libc/fset.h>\
+	eparam.c	<libc/iraf/stdio.h> <libc/libc.h> <libc/error.h>\
+			<libc/iraf/ctype.h> <libc/ttset.h> <libc/fset.h>\
 			<libc/spp.h> config.h mem.h operand.h\
 			errs.h param.h grammar.h task.h eparam.h
 
 	errs.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/stdio.h> <libc/setjmp.h> <libc/knames.h>\
+			<libc/iraf/stdio.h> <libc/knames.h>\
 			<libc/xnames.h> clmodes.h\
 			config.h operand.h param.h task.h mem.h errs.h\
 			grammar.h construct.h
 
-	exec.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	exec.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xwhen.h> clmodes.h config.h mem.h\
 			opcodes.h operand.h param.h task.h errs.h\
 			grammar.h
 
-	gquery.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gquery.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h clmodes.h
 
-	gram.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gram.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h\
 			opcodes.h config.h param.h task.h errs.h construct.h\
 			ytab.h
 
-	history.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/fset.h> <libc/ctype.h> config.h errs.h\
+	history.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/fset.h> <libc/iraf/ctype.h> config.h errs.h\
 			mem.h operand.h param.h task.h clmodes.h grammar.h
 
-	lists.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	lists.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h mem.h operand.h param.h\
 			task.h errs.h
 
 	main.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/main.h> <libc/stdio.h> <libc/error.h>\
-			<libc/setjmp.h> <libc/knames.h> <libc/prtype.h>\
+			<libc/main.h> <libc/iraf/stdio.h> <libc/error.h>\
+			<libc/knames.h> <libc/prtype.h>\
 			<libc/xwhen.h> <libc/xnames.h> grammar.h\
 			opcodes.h operand.h param.h config.h clmodes.h task.h\
 			errs.h mem.h
 
 	modes.c		<libc/spp.h> <libc/libc.h>\
-			<libc/stdio.h> <libc/ctype.h> clmodes.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> clmodes.h\
 			config.h construct.h operand.h param.h grammar.h\
 			mem.h task.h errs.h
 
-	operand.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	operand.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h config.h operand.h param.h grammar.h\
 			mem.h task.h construct.h eparam.h
 
-	param.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	param.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h mem.h\
 			task.h errs.h clmodes.h construct.h
 
 	pfiles.c	<libc/spp.h> <libc/libc.h> <libc/finfo.h>\
-			<libc/stdio.h> <libc/ctype.h> config.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> config.h\
 			errs.h operand.h mem.h param.h task.h grammar.h
 
-	prcache.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	prcache.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/error.h> <libc/finfo.h> <libc/prstat.h>\
 			config.h errs.h task.h
 
-	scan.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	scan.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h errs.h
 
-	stack.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	stack.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			mem.h operand.h config.h param.h task.h\
 			errs.h
 
-	task.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	task.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h mem.h task.h\
 			errs.h clmodes.h
 
-	unop.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	unop.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h> <libc/math.h> config.h\
 			operand.h errs.h task.h param.h
 
-	ytab.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/ctype.h> config.h mem.h operand.h\
+	ytab.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/iraf/ctype.h> config.h mem.h operand.h\
 			param.h grammar.h opcodes.h clmodes.h task.h\
 			construct.h errs.h lexyy.c lexicon.c
 	;
diff --git a/pkg/vocl/mkpkg b/pkg/vocl/mkpkg
index 04e45a00f..6cc06e2b9 100644
--- a/pkg/vocl/mkpkg
+++ b/pkg/vocl/mkpkg
@@ -64,9 +64,9 @@ relink:
 	#$set	xflags = "$(xflags) -x -/DYYDEBUG"
 	$set	xflags = "$(xflags) -x -/I../../vendor/ -I./"
 	$omake  vocl.x
-	$omake	globals.c <libc/libc.h> <libc/stdio.h> <libc/spp.h>\
+	$omake	globals.c <libc/libc.h> <libc/iraf/stdio.h> <libc/spp.h>\
 		construct.h eparam.h operand.h param.h task.h
-	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/stdio.h> config.h\
+	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h> config.h\
 		construct.h errs.h grammar.h mem.h opcodes.h operand.h\
 		param.h task.h
 link:
@@ -95,125 +95,125 @@ libpkg.a:
 	$set	xflags = "$(xflags) -x -/I../../vendor/ -I./"
 
 	binop.c		<libc/spp.h> <libc/libc.h> <libc/xnames.h>\
-			<libc/math.h> <libc/ctype.h> config.h\
+			<libc/math.h> <libc/iraf/ctype.h> config.h\
 			operand.h errs.h
 
-	bkg.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/knames.h> <libc/xwhen.h> <libc/ctype.h>\
+	bkg.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/knames.h> <libc/xwhen.h> <libc/iraf/ctype.h>\
 			clmodes.h config.h operand.h clmodes.h\
 			mem.h errs.h param.h task.h
 
 	builtin.c	<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/error.h> <libc/ctype.h> <libc/stdio.h>\
+			<libc/error.h> <libc/iraf/ctype.h> <libc/iraf/stdio.h>\
 			<libc/alloc.h> <libc/ttset.h> clmodes.h\
 			config.h mem.h operand.h param.h task.h errs.h
 
-	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h\
 			task.h errs.h
 
-	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h
 
 	compile.c	<libc/spp.h> <libc/libc.h> config.h\
 			operand.h opcodes.h mem.h errs.h
 
-	debug.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	debug.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			operand.h mem.h grammar.h opcodes.h config.h param.h\
 			task.h
 
-	decl.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	decl.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h opcodes.h config.h\
 			param.h task.h errs.h construct.h ytab.h
 
-	edcap.c		<libc/stdio.h> <libc/libc.h> <libc/ctype.h>\
+	edcap.c		<libc/iraf/stdio.h> <libc/libc.h> <libc/iraf/ctype.h>\
 			<libc/fset.h> <libc/spp.h> config.h operand.h\
 			param.h task.h eparam.h
 
-	eparam.c	<libc/stdio.h> <libc/libc.h> <libc/error.h>\
-			<libc/ctype.h> <libc/ttset.h> <libc/fset.h>\
+	eparam.c	<libc/iraf/stdio.h> <libc/libc.h> <libc/error.h>\
+			<libc/iraf/ctype.h> <libc/ttset.h> <libc/fset.h>\
 			<libc/spp.h> config.h mem.h operand.h\
 			errs.h param.h grammar.h task.h eparam.h
 
 	errs.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/stdio.h> <libc/setjmp.h> <libc/knames.h>\
+			<libc/iraf/stdio.h> <libc/knames.h>\
 			<libc/xnames.h> clmodes.h\
 			config.h operand.h param.h task.h mem.h errs.h\
 			grammar.h construct.h
 
-	exec.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	exec.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xwhen.h> clmodes.h config.h mem.h\
 			opcodes.h operand.h param.h task.h errs.h\
 			grammar.h
 
-	gquery.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gquery.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h clmodes.h
 
-	gram.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gram.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h\
 			opcodes.h config.h param.h task.h errs.h construct.h\
 			ytab.h
 
-	history.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/fset.h> <libc/ctype.h> config.h errs.h\
+	history.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/fset.h> <libc/iraf/ctype.h> config.h errs.h\
 			mem.h operand.h param.h task.h clmodes.h grammar.h
 
-	lists.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	lists.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h mem.h operand.h param.h\
 			task.h errs.h
 
 	main.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/main.h> <libc/stdio.h> <libc/error.h>\
-			<libc/setjmp.h> <libc/knames.h> <libc/prtype.h>\
+			<libc/main.h> <libc/iraf/stdio.h> <libc/error.h>\
+			<libc/knames.h> <libc/prtype.h>\
 			<libc/xwhen.h> <libc/xnames.h> grammar.h\
 			opcodes.h operand.h param.h config.h clmodes.h task.h\
 			errs.h mem.h
 
 	modes.c		<libc/spp.h> <libc/libc.h>\
-			<libc/stdio.h> <libc/ctype.h> clmodes.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> clmodes.h\
 			config.h construct.h operand.h param.h grammar.h\
 			mem.h task.h errs.h
 
-        multop.c        <libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+        multop.c        <libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
                         clmodes.h operand.h mem.h grammar.h\
                         opcodes.h config.h param.h task.h errs.h construct.h\
                         ytab.h
 
-	operand.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	operand.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h config.h operand.h param.h grammar.h\
 			mem.h task.h construct.h eparam.h
 
-	param.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	param.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h mem.h\
 			task.h errs.h clmodes.h construct.h
 
 	pfiles.c	<libc/spp.h> <libc/libc.h> <libc/finfo.h>\
-			<libc/stdio.h> <libc/ctype.h> config.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> config.h\
 			errs.h operand.h mem.h param.h task.h grammar.h
 
-	prcache.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	prcache.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/error.h> <libc/finfo.h> <libc/prstat.h>\
 			config.h errs.h task.h
 
-	scan.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	scan.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h errs.h
 
-	stack.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	stack.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			mem.h operand.h config.h param.h task.h\
 			errs.h
 
-	task.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	task.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h mem.h task.h\
 			errs.h clmodes.h
 
-	unop.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	unop.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h> <libc/math.h> config.h\
 			operand.h errs.h task.h param.h
 
-	ytab.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/ctype.h> config.h mem.h operand.h\
+	ytab.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/iraf/ctype.h> config.h mem.h operand.h\
 			param.h grammar.h opcodes.h clmodes.h task.h\
 			construct.h errs.h lexyy.c lexicon.c
 
diff --git a/sys/libc/mkpkg b/sys/libc/mkpkg
index 74349a1a7..9e8b87978 100644
--- a/sys/libc/mkpkg
+++ b/sys/libc/mkpkg
@@ -12,10 +12,10 @@ $exit
 libc.a:
 	$set	XFLAGS	= "$(XFLAGS) -/Wall"
 
-	atof.c		<libc/ctype.h> <libc/libc.h> <libc/spp.h>\
+	atof.c		<libc/iraf/ctype.h> <libc/libc.h> <libc/spp.h>\
 			<libc/xnames.h>
-	atoi.c		<libc/ctype.h> <libc/libc.h> <libc/spp.h>
-	atol.c		<libc/ctype.h> <libc/libc.h> <libc/spp.h>
+	atoi.c		<libc/iraf/ctype.h> <libc/libc.h> <libc/spp.h>
+	atol.c		<libc/iraf/ctype.h> <libc/libc.h> <libc/spp.h>
 	caccess.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	calloc.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	callocate.c	<libc/spp.h> <libc/libc.h> <libc/xnames.h>
@@ -34,11 +34,11 @@ libc.a:
 	cerrget.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	cerror.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	cfchdir.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
-	cfilbuf.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>\
+	cfilbuf.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h>
 	cfinfo.c	<libc/libc.h> <libc/xnames.h> <libc/finfo.h>\
 			<libc/spp.h>
-	cflsbuf.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>\
+	cflsbuf.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h>
 	cflush.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	cfmapfn.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
@@ -56,7 +56,7 @@ libc.a:
 	cimaccess.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	cimdrcur.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	ckimapc.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
-	clexnum.c	<libc/ctype.h> <libc/lexnum.h> <libc/spp.h>\
+	clexnum.c	<libc/iraf/ctype.h> <libc/lexnum.h> <libc/spp.h>\
 			<libc/xnames.h> <libc/libc.h>
 	cmktemp.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	cnote.c		<libc/libc.h> <libc/xnames.h> <libc/fset.h> <libc/spp.h>
@@ -65,14 +65,14 @@ libc.a:
 	cndopen.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	cpoll.c		<libc/libc.h> <libc/spp.h> <libc/xnames.h>\
 			<libc/fpoll.h>
-	cprcon.c	<libc/libc.h> <libc/prstat.h> <libc/stdio.h>\
+	cprcon.c	<libc/libc.h> <libc/prstat.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h> <libc/spp.h>
 	cprdet.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	cprintf.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	crcursor.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	crdukey.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	cread.c		<libc/libc.h> <libc/xnames.h> <libc/error.h>\
-			<libc/fset.h> <libc/spp.h> <libc/stdio.h>
+			<libc/fset.h> <libc/spp.h> <libc/iraf/stdio.h>
 	crename.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	creopen.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	csalloc.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
@@ -99,12 +99,12 @@ libc.a:
 	cttyseti.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	cttyso.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	cttystati.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
-	ctype.c		<libc/ctype.h>
+	ctype.c		<libc/iraf/ctype.h>
 	cungetc.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	cungetl.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	cvfnbrk.c	<libc/libc.h> <libc/spp.h> <libc/knames.h>
 	cwrite.c	<libc/libc.h> <libc/xnames.h> <libc/error.h>\
-			<libc/fset.h> <libc/spp.h> <libc/stdio.h>
+			<libc/fset.h> <libc/spp.h> <libc/iraf/stdio.h>
 	cxgmes.c	<libc/knames.h> <libc/libc.h> <libc/spp.h>\
 			<libc/xnames.h>
 	cxonerr.c	<libc/libc.h> <libc/xnames.h>
@@ -112,44 +112,44 @@ libc.a:
 	cxwhen.c	<libc/xwhen.h> <libc/knames.h> <libc/libc.h>\
 			<libc/spp.h> <libc/xnames.h>
 	cwmsec.c	<libc/libc.h> <libc/spp.h> <libc/knames.h>
-	eprintf.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	fclose.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>\
+	eprintf.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	fclose.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h>
-	fdopen.c	<libc/fset.h> <libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	fflush.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>\
+	fdopen.c	<libc/fset.h> <libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	fflush.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h>
-	fgetc.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	fgets.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	fopen.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>\
+	fgetc.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	fgets.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	fopen.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h>
-	fputc.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	fputs.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	fread.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	freadline.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>
+	fputc.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	fputs.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	fread.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	freadline.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>	
 	free.c		<libc/libc.h> <libc/xnames.h> <libc/spp.h>
-	freopen.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	fseek.c		<libc/fset.h> <libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	ftell.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	fwrite.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	gets.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	getw.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
+	freopen.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	fseek.c		<libc/fset.h> <libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	ftell.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	fwrite.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	gets.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	getw.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
 	index.c		<libc/libc.h> <libc/spp.h>
 	isatty.c	<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	malloc.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
 	mathf.f
 	mktemp.c	<libc/libc.h> <libc/spp.h>
-	perror.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>\
+	perror.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h>
-	printf.c	<libc/ctype.h> <libc/libc.h> <libc/spp.h>\
-			<libc/stdio.h> <libc/xnames.h>
-	puts.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	putw.c		<libc/libc.h> <libc/spp.h> <libc/stdio.h>
+	printf.c	<libc/iraf/ctype.h> <libc/libc.h> <libc/spp.h>\
+			<libc/iraf/stdio.h> <libc/xnames.h>
+	puts.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	putw.c		<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
 	qsort.c		<libc/libc.h>
 	realloc.c	<libc/libc.h> <libc/xnames.h> <libc/spp.h>
-	rewind.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>
+	rewind.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
 	rindex.c	<libc/libc.h> <libc/spp.h>
-	scanf.c		<libc/ctype.h> <libc/libc.h> <libc/spp.h> <libc/stdio.h>
-	setbuf.c	<libc/fset.h> <libc/libc.h> <libc/spp.h> <libc/stdio.h>
+	scanf.c		<libc/iraf/ctype.h> <libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
+	setbuf.c	<libc/fset.h> <libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>
 	stgio.c		<libc/libc.h> <libc/spp.h> <libc/xnames.h>
 	strcat.c	<libc/libc.h>
 	strcmp.c	<libc/libc.h>
@@ -160,9 +160,9 @@ libc.a:
 	strncmp.c	<libc/libc.h>
 	strncpy.c	<libc/libc.h>
 	spf.c		<libc/libc.h> <libc/spp.h> <libc/xnames.h>
-	sprintf.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>\
+	sprintf.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h>
 	system.c	<libc/knames.h> <libc/libc.h> <libc/spp.h>
-	ungetc.c	<libc/libc.h> <libc/spp.h> <libc/stdio.h>\
+	ungetc.c	<libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h>
 	;