Updated.

4 files changed, 61 insertions, 6 deletions

diff --git a/plan9/config.plan9 b/plan9/config.plan9
index d59a75933b..eccf2fb1b3 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -748,6 +748,15 @@
 #define FILE_bufsiz(fp)	((fp)->_cnt + (fp)->_ptr - (fp)->_base)
 #endif
 
+/* FILE_filbuf:
+ *	This macro is used to access the internal stdio _filbuf function
+ *	(or equivalent), if STDIO_CNT_LVALUE and STDIO_PTR_LVALUE
+ *	are defined.  It is typically either _filbuf or __filbuf.
+ *	This macro will only be defined if both STDIO_CNT_LVALUE and
+ *	STDIO_PTR_LVALUE are defined.
+ */
+#undef FILE_filbuf
+
 /* HAS_STRCHR:
  *	This symbol is defined to indicate that the strchr()/strrchr()
  *	functions are available for string searching. If not, try the
@@ -1305,7 +1314,7 @@
 
 #define OSNAME "plan9"
 
-#define BIN_SH "/bin/rc"
+#define BIN_SH "/bin/rc"			/* config-skip */
 
 /* MYMALLOC:
  *	This symbol, if defined, indicates that we're using our own malloc.
@@ -1313,7 +1322,7 @@
 #undef MYMALLOC			/**/
 
 
-#undef VMS
+#undef VMS				/* config-skip */
 
 /* LOC_SED:
  *	This symbol holds the complete pathname to the sed program.
@@ -1325,6 +1334,7 @@
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define ARCHLIB_EXP "/_P9P_OBJTYPE/lib/perl/_P9P_VERSION"
+#define ARCHLIB "/_P9P_OBJTYPE/lib/perl/_P9P_VERSION"
 
 /* BYTEORDER:
  *	This symbol hold the hexadecimal constant defined in byteorder,
@@ -1488,12 +1498,14 @@
  *	run-time.
  */
 #undef OLDARCHLIB_EXP		/**/
+#undef OLDARCHLIB	/**/
 
 /* PRIVLIB_EXP:
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define PRIVLIB_EXP "/sys/lib/perl"		/* */
+#define PRIVLIB "/sys/lib/perl"		/* */
 
 /* SIG_NAME:
  *	This symbol contains a list of signal names in order of
@@ -1531,12 +1543,14 @@
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define SITELIB_EXP  "/sys/lib/perl/site_perl"	/* */
+#define SITELIB  "/sys/lib/perl/site_perl"	/* */
 
 /* SITEARCH_EXP:
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define SITEARCH_EXP  "/_P9P_OBJTYPE/lib/perl/_P9P_VERSION/site_perl"		/* */
+#define SITEARCH  "/_P9P_OBJTYPE/lib/perl/_P9P_VERSION/site_perl"		/* */
 
 /* STARTPERL:
  *	This variable contains the string to put in front of a perl
@@ -1545,6 +1559,48 @@
  */
 #define STARTPERL "#!/bin/perl"		/**/
 
+/* SH_PATH:
+  *	Just here to shut up compiler warnings.
+*/
+#define SH_PATH	"/bin/rc"			/**/
+
+#define PERLIO_IS_STDIO			/* config-skip */
+#undef I_SFIO
+
+/* USE_PERLIO:
+ *	This symbol, if defined, indicates that the PerlIO abstraction should
+ *	be used throughout.  If not defined, stdio should be
+ *	used in a fully backward compatible manner.
+ */
+#undef	USE_PERLIO		/**/
+
+/* USE_SFIO:
+ *	This symbol, if defined, indicates that sfio should
+ *	be used.
+ */
+#undef	USE_SFIO		/**/
+
+
+/* I_SYS_RESOURCE:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sys/resource.h>.
+ */
+#define I_SYS_RESOURCE		/**/
+
+/* I_SYS_WAIT:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sys/wait.h>.
+ */
+#define I_SYS_WAIT	/**/
+
+/* I_VALUES:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <values.h> to get definition of symbols like MINFLOAT or
+ *	MAXLONG, i.e. machine dependant limitations.  Probably, you
+ *	should use <limits.h> instead, if it is available.
+ */
+#undef I_VALUES		/**/
+
 /* VOIDFLAGS:
  *	This symbol indicates how much support of the void type is given by this
  *	compiler.  What various bits mean:
diff --git a/plan9/fndvers b/plan9/fndvers
index ad622e7fe8..a848de2b6d 100644
--- a/plan9/fndvers
+++ b/plan9/fndvers
@@ -2,7 +2,7 @@
 
 . plan9/buildinfo
 
-ed config.plan9 <<!
+ed plan9/config.plan9 <<!
 g/_P9P_VERSION/s//$p9pvers/g
 g/_P9P_OBJTYPE/s//$objtype/g
 w config.h
diff --git a/plan9/mkfile b/plan9/mkfile
index 64f9fa46b7..eeeb045a4b 100644
--- a/plan9/mkfile
+++ b/plan9/mkfile
@@ -31,7 +31,7 @@ ext_xs = IO.xs Socket.xs Opcode.xs  dl_none.xs Fcntl.xs FileHandle.xs POSIX.xs
 ext_c = ${ext_xs:%.xs=%.c}
 ext_obj = ${ext_xs:%.xs=%.$O}
 
-obj = gv.$O toke.$O perly.$O op.$O regcomp.$O dump.$O util.$O mg.$O  hv.$O av.$O run.$O pp_hot.$O sv.$O pp.$O scope.$O pp_ctl.$O pp_sys.$O doop.$O doio.$O regexec.$O taint.$O deb.$O globals.$O plan9.$O universal.$O
+obj = gv.$O toke.$O perly.$O op.$O regcomp.$O dump.$O util.$O mg.$O  hv.$O av.$O run.$O pp_hot.$O sv.$O pp.$O scope.$O pp_ctl.$O pp_sys.$O doop.$O doio.$O regexec.$O taint.$O deb.$O globals.$O plan9.$O universal.$O perlio.$O
 
 OBJS = perl.$O $obj
 
@@ -65,7 +65,7 @@ perlmain.$O:	config.h perlmain.c
 perlmain.c:	miniperl vms/writemain.pl
 			./miniperl vms/writemain.pl $extensions
 
-config.h:		config.plan9 plan9/fndvers
+config.h:		plan9/fndvers
 			plan9/fndvers 
 			cp config.h $archlib/CORE
 
diff --git a/plan9/setup.rc b/plan9/setup.rc
index 6ac56dfe99..037ecfb25c 100644
--- a/plan9/setup.rc
+++ b/plan9/setup.rc
@@ -22,7 +22,6 @@ if (test ! -d $sourcedir) mkdir $sourcedir
 #Populate source directory
 echo Building source directories ...
 {cd $builddir ; tar c .} | { cd $sourcedir ; tar x}
-cp $builddir/plan9/config.plan9 $sourcedir/config.plan9
 cp $builddir/plan9/plan9.c $builddir/plan9/plan9ish.h $builddir/plan9/mkfile $sourcedir
 cd $sourcedir/lib ; rm -rf *