Two quick patches

--r5Pyd7+fXNt84Ff3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

One uses the probed value for sed, which makes osx like comp.cpp.  The
other renames setenv to PL_setenv as there's a conflicting sub in the
standard libraries.

I've also just discovered http://www.etla.org/retroperl/perl1/ which
has patches 11-14, so I'll see if they apply over the top of my now
patched 10.

-- 
Richard Clamp <[email protected]>

--r5Pyd7+fXNt84Ff3
Content-Type: message/rfc822
Content-Disposition: inline

Return-Path: <[email protected]>
Delivered-To: [email protected]
Received: from mirth.unixbeard.net (mirth [127.0.0.1])
	by mirth (Postfix) with ESMTP id 1D9795136
	for <richardc>; Sun,  4 Aug 2002 16:09:24 +0100 (BST)
From: [email protected]
To: [email protected]
Subject: perl1 perly.c,1.4,1.5 config_h.SH,1.2,1.3
Message-Id: <20020804150924.1D9795136@mirth>
Date: Sun,  4 Aug 2002 16:09:24 +0100 (BST)

Update of /home/richardc/cvs-repository/perl1
In directory mirth.unixbeard.net:/tmp/cvs-serv15082

Modified Files:
	perly.c config_h.SH 
Log Message:
use the sed that Configure found


Index: perly.c
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/perly.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** perly.c	4 Aug 2002 10:33:19 -0000	1.4
--- perly.c	4 Aug 2002 15:09:21 -0000	1.5
***************
*** 2,7 ****
  /*
   * $Log$
!  * Revision 1.4  2002/08/04 10:33:19  richardc
!  * seed sources 1.0.8
   *
   * Revision 1.0.1.3  88/01/28  10:28:31  root
--- 2,7 ----
  /*
   * $Log$
!  * Revision 1.5  2002/08/04 15:09:21  richardc
!  * use the sed that Configure found
   *
   * Revision 1.0.1.3  88/01/28  10:28:31  root
***************
*** 124,128 ****
      if (preprocess) {
  	sprintf(buf, "\
! /bin/sed -e '/^[^#]/b' \
   -e '/^#[ 	]*include[ 	]/b' \
   -e '/^#[ 	]*define[ 	]/b' \
--- 124,128 ----
      if (preprocess) {
  	sprintf(buf, "\
! %s -e '/^[^#]/b' \
   -e '/^#[ 	]*include[ 	]/b' \
   -e '/^#[ 	]*define[ 	]/b' \
***************
*** 133,137 ****
   -e 's/^#.*//' \
   %s | %s -C %s%s",
! 	  argv[0], CPP, str_get(str), CPPMINUS);
  	rsfp = popen(buf,"r");
      }
--- 133,137 ----
   -e 's/^#.*//' \
   %s | %s -C %s%s",
! 	  SED, argv[0], CPP, str_get(str), CPPMINUS);
  	rsfp = popen(buf,"r");
      }

Index: config_h.SH
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/config_h.SH,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config_h.SH	4 Aug 2002 11:00:40 -0000	1.2
--- config_h.SH	4 Aug 2002 15:09:21 -0000	1.3
***************
*** 63,66 ****
--- 63,71 ----
  #define CPPMINUS "$cppminus"
  
+ /* SED:
+  *     Your sed binary
+  */
+ #define SED "$sed"
+ 
  /* CHARSPRINTF:
   *	This symbol is defined if this system declares "char *sprintf()" in


--r5Pyd7+fXNt84Ff3
Content-Type: message/rfc822
Content-Disposition: inline

Return-Path: <[email protected]>
Delivered-To: [email protected]
Received: from mirth.unixbeard.net (mirth [127.0.0.1])
	by mirth (Postfix) with ESMTP id 916675136
	for <richardc>; Sun,  4 Aug 2002 16:19:46 +0100 (BST)
From: [email protected]
To: [email protected]
Subject: perl1 util.c,1.2,1.3 util.h,1.1,1.2 stab.c,1.3,1.4
Message-Id: <20020804151946.916675136@mirth>
Date: Sun,  4 Aug 2002 16:19:46 +0100 (BST)

Update of /home/richardc/cvs-repository/perl1
In directory mirth.unixbeard.net:/tmp/cvs-serv15150

Modified Files:
	util.c util.h stab.c 
Log Message:
rename setenv to PL_setenv to avoid clash


Index: util.c
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- util.c	4 Aug 2002 10:33:19 -0000	1.2
+++ util.c	4 Aug 2002 15:19:44 -0000	1.3
@@ -1,8 +1,8 @@
 /* $Header$
  *
  * $Log$
- * Revision 1.2  2002/08/04 10:33:19  richardc
- * seed sources 1.0.8
+ * Revision 1.3  2002/08/04 15:19:44  richardc
+ * rename setenv to PL_setenv to avoid clash
  *
  * Revision 1.0.1.1  88/01/28  11:06:35  root
  * patch8: changed fatal() to support eval operator with exiting.
@@ -226,7 +226,7 @@
 extern char **environ;
 
 void
-setenv(nam,val)
+PL_setenv(nam,val)
 char *nam, *val;
 {
     register int i=envix(nam);		/* where does it go? */

Index: util.h
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/util.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- util.h	4 Aug 2002 10:29:41 -0000	1.1
+++ util.h	4 Aug 2002 15:19:44 -0000	1.2
@@ -1,8 +1,8 @@
 /* $Header$
  *
  * $Log$
- * Revision 1.1  2002/08/04 10:29:41  richardc
- * seed sources 1.0
+ * Revision 1.2  2002/08/04 15:19:44  richardc
+ * rename setenv to PL_setenv to avoid clash
  *
  * Revision 1.0  87/12/18  13:06:33  root
  * Initial revision
@@ -31,7 +31,7 @@
 char	*get_a_line();
 char	*savestr();
 int	makedir();
-void	setenv();
+void	PL_setenv();
 int	envix();
 void	notincl();
 char	*getval();

Index: stab.c
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/stab.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- stab.c	4 Aug 2002 10:48:29 -0000	1.3
+++ stab.c	4 Aug 2002 15:19:44 -0000	1.4
@@ -1,8 +1,8 @@
 /* $Header$
  *
  * $Log$
- * Revision 1.3  2002/08/04 10:48:29  richardc
- * errno isn't only used in stab_str
+ * Revision 1.4  2002/08/04 15:19:44  richardc
+ * rename setenv to PL_setenv to avoid clash
  *
  * Revision 1.0.1.1  88/01/28  10:35:17  root
  * patch8: changed some stabents to support eval operator.
@@ -244,7 +244,7 @@
 	}
     }
     else if (stab == envstab && envname) {
-	setenv(envname,str_get(str));
+	PL_setenv(envname,str_get(str));
 				/* And you'll never guess what the dog had */
 	safefree(envname);	/*   in its mouth... */
 	envname = Nullch;


--r5Pyd7+fXNt84Ff3--