4.4BSD support.

SCCS-vsn: contrib/perl-4.036/Configure 1.2
SCCS-vsn: contrib/perl-4.036/Makefile.SH 1.2
SCCS-vsn: contrib/perl-4.036/cflags.SH 1.2
SCCS-vsn: contrib/perl-4.036/config_h.SH 1.2
SCCS-vsn: contrib/perl-4.036/h2ph.SH 1.2
SCCS-vsn: contrib/perl-4.036/installperl 1.2
SCCS-vsn: contrib/perl-4.036/makedepend.SH 1.2
SCCS-vsn: contrib/perl-4.036/x2p/Makefile.SH 1.2
SCCS-vsn: contrib/perl-4.036/x2p/cflags.SH 1.2
SCCS-vsn: contrib/jove-4.14.6/macvert.c 5.2

diff --git a/usr/src/contrib/jove-4.14.6/macvert.c b/usr/src/contrib/jove-4.14.6/macvert.c
index 265b4c7..6618c79 100644 (file)
--- a/usr/src/contrib/jove-4.14.6/macvert.c
+++ b/usr/src/contrib/jove-4.14.6/macvert.c
@@ -42,6 +42,7 @@ static int    int_how = NEWWAY;
 
 /* Formatting int's the old way or the new "improved" way? */
 
 
 /* Formatting int's the old way or the new "improved" way? */
 

+#ifdef notdef

 #if    defined(vax) || defined(pdp11)
 
 static long
 #if    defined(vax) || defined(pdp11)
 
 static long


@@ -63,6 +64,7 @@ register long x;
        return x;
 }
 
        return x;
 }
 

+#endif

 #endif
 
 static int
 #endif
 
 static int

diff --git a/usr/src/contrib/perl-4.036/Configure b/usr/src/contrib/perl-4.036/Configure
index ddfd7e2..0b9eb4b 100644 (file)
--- a/usr/src/contrib/perl-4.036/Configure
+++ b/usr/src/contrib/perl-4.036/Configure
@@ -492,12 +492,12 @@ esac
 while expr "X\$ans" : "X!" >/dev/null; do
     read ans
     case "\$ans" in
 while expr "X\$ans" : "X!" >/dev/null; do
     read ans
     case "\$ans" in

-    !)
+    \!)

        sh
        echo " "
        echo $n "\$rp $c"
        ;;
        sh
        echo " "
        echo $n "\$rp $c"
        ;;

-    !*)
+    \!*)

        set \`expr "X\$ans" : "X!\(.*\)\$"\`
        sh -c "\$*"
        echo " "
        set \`expr "X\$ans" : "X!\(.*\)\$"\`
        sh -c "\$*"
        echo " "


@@ -1408,7 +1408,7 @@ case "$cppflags" in
 '');;
 *)  set X $cppflags
     cppflags=''
 '');;
 *)  set X $cppflags
     cppflags=''

-    for flag do
+    for flag; do

        case $flag in
        -D*|-U*|-I*|-traditional|-ansi|-nostdinc) cppflags="$cppflags $flag";;
        esac
        case $flag in
        -D*|-U*|-I*|-traditional|-ansi|-nostdinc) cppflags="$cppflags $flag";;
        esac

diff --git a/usr/src/contrib/perl-4.036/Makefile.SH b/usr/src/contrib/perl-4.036/Makefile.SH
index a3130ef..fe5728e 100644 (file)
--- a/usr/src/contrib/perl-4.036/Makefile.SH
+++ b/usr/src/contrib/perl-4.036/Makefile.SH
@@ -320,6 +320,10 @@ perly.o: perly.c perly.h $(h)
        $(CCCMD) perly.c
 
 install: all
        $(CCCMD) perly.c
 
 install: all

+       nroff -man perl.man > /usr/contrib/man/cat1/perl.0
+       nroff -man h2ph.man > /usr/contrib/man/cat1/h2ph.0
+       nroff -man x2p/s2p.man > /usr/contrib/man/cat1/s2p.0
+       nroff -man x2p/a2p.man > /usr/contrib/man/cat1/a2p.0

        ./perl installperl
 
 clean:
        ./perl installperl
 
 clean:

diff --git a/usr/src/contrib/perl-4.036/cflags.SH b/usr/src/contrib/perl-4.036/cflags.SH
index c1510ea..6a004c0 100644 (file)
--- a/usr/src/contrib/perl-4.036/cflags.SH
+++ b/usr/src/contrib/perl-4.036/cflags.SH
@@ -51,7 +51,7 @@ esac
 
 set `echo "$* " | sed 's/\.[oc] / /g'`
 
 
 set `echo "$* " | sed 's/\.[oc] / /g'`
 

-for file do
+for file; do

 
     case "$#" in
     1) ;;
 
     case "$#" in
     1) ;;

diff --git a/usr/src/contrib/perl-4.036/config_h.SH b/usr/src/contrib/perl-4.036/config_h.SH
index 03667bd..ededfa6 100644 (file)
--- a/usr/src/contrib/perl-4.036/config_h.SH
+++ b/usr/src/contrib/perl-4.036/config_h.SH
@@ -46,12 +46,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef!/\*#undef!'
  */
 #define LOC_SED "$sed"             /**/
 
  */
 #define LOC_SED "$sed"             /**/
 

-/* ALIGNBYTES
- *     This symbol contains the number of bytes required to align a double.
- *     Usual values are 2, 4, and 8.
- */
-#define ALIGNBYTES $alignbytes         /**/
-

 /* BIN
  *     This symbol holds the name of the directory in which the user wants
  *     to keep publicly executable images for the package in question.  It
 /* BIN
  *     This symbol holds the name of the directory in which the user wants
  *     to keep publicly executable images for the package in question.  It

diff --git a/usr/src/contrib/perl-4.036/h2ph.SH b/usr/src/contrib/perl-4.036/h2ph.SH
index f6925db..9600962 100644 (file)
--- a/usr/src/contrib/perl-4.036/h2ph.SH
+++ b/usr/src/contrib/perl-4.036/h2ph.SH
@@ -237,6 +237,8 @@ sub expr {
 .nr nl 0-1             \" fake up transition to first page again
 .nr % 0                        \" start at page 1
 '; __END__ ############# From here on it's a standard manual page ############
 .nr nl 0-1             \" fake up transition to first page again
 .nr % 0                        \" start at page 1
 '; __END__ ############# From here on it's a standard manual page ############

+!NO!SUBS!
+cat << ENDOFMAN > h2ph.man

 .TH H2PH 1 "August 8, 1990"
 .AT 3
 .SH NAME
 .TH H2PH 1 "August 8, 1990"
 .AT 3
 .SH NAME


@@ -278,8 +280,6 @@ that it can translate.
 It's only intended as a rough tool.
 You may need to dicker with the files produced.
 .ex
 It's only intended as a rough tool.
 You may need to dicker with the files produced.
 .ex

-!NO!SUBS!
+ENDOFMAN

 chmod 755 h2ph
 $eunicefix h2ph
 chmod 755 h2ph
 $eunicefix h2ph

-rm -f h2ph.man
-ln h2ph h2ph.man

diff --git a/usr/src/contrib/perl-4.036/installperl b/usr/src/contrib/perl-4.036/installperl
index 4f3fc00..7dc0ce4 100644 (file)
--- a/usr/src/contrib/perl-4.036/installperl
+++ b/usr/src/contrib/perl-4.036/installperl
@@ -112,29 +112,31 @@ for (@scripts) {
     s#.*/##; &chmod(0755, "$installscr/$_");
 }
 
     s#.*/##; &chmod(0755, "$installscr/$_");
 }
 

-# Install man pages.
-
-if ($mansrc ne '') {
-    &makedir($mansrc);
-
-    ($mdev,$mino) = stat($mansrc);
-    if ($mdev != $ddev || $mino != $dino) {
-       for (@manpages) {
-           ($new = $_) =~ s/man$/$manext/;
-           $new =~ s#.*/##;
-           print STDERR "  Installing $mansrc/$new\n";
-           next if $nonono;
-           open(MI,$_) || warn "Can't open $_: $!\n";
-           open(MO,">$mansrc/$new") || warn "Can't install $mansrc/$new: $!\n";
-           print MO ".ds RP Release $release Patchlevel $patchlevel\n";
-           while (<MI>) {
-               print MO;
-           }
-           close MI;
-           close MO;
-       }
-    }
-}
+# BSD modification -- install them in makefile.
+
+# Install man pages. 
+#
+#if ($mansrc ne '') {
+#    &makedir($mansrc);
+#
+#    ($mdev,$mino) = stat($mansrc);
+#    if ($mdev != $ddev || $mino != $dino) {
+#      for (@manpages) {
+#          ($new = $_) =~ s/man$/$manext/;
+#          $new =~ s#.*/##;
+#          print STDERR "  Installing $mansrc/$new\n";
+#          next if $nonono;
+#          open(MI,$_) || warn "Can't open $_: $!\n";
+#          open(MO,">$mansrc/$new") || warn "Can't install $mansrc/$new: $!\n";
+#          print MO ".ds RP Release $release Patchlevel $patchlevel\n";
+#          while (<MI>) {
+#              print MO;
+#          }
+#          close MI;
+#          close MO;
+#      }
+#    }
+#}

 
 # Install library files.
 
 
 # Install library files.
 

diff --git a/usr/src/contrib/perl-4.036/makedepend.SH b/usr/src/contrib/perl-4.036/makedepend.SH
index 4665624..45bc838 100644 (file)
--- a/usr/src/contrib/perl-4.036/makedepend.SH
+++ b/usr/src/contrib/perl-4.036/makedepend.SH
@@ -93,7 +93,7 @@ for file in `$cat .clist`; do
     *.y) filebase=`basename $file .y` ;;
     esac
     case "$file" in
     *.y) filebase=`basename $file .y` ;;
     esac
     case "$file" in

-    */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
+    */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;;

     *)   finc= ;;
     esac
     $echo "Finding dependencies for $filebase.o."
     *)   finc= ;;
     esac
     $echo "Finding dependencies for $filebase.o."

diff --git a/usr/src/contrib/perl-4.036/x2p/Makefile.SH b/usr/src/contrib/perl-4.036/x2p/Makefile.SH
index 6d8d735..c085960 100644 (file)
--- a/usr/src/contrib/perl-4.036/x2p/Makefile.SH
+++ b/usr/src/contrib/perl-4.036/x2p/Makefile.SH
@@ -88,7 +88,7 @@ a2p: $(obj) a2p.o
        $(CC) $(LDFLAGS) $(obj) a2p.o $(libs) -o a2p
 
 a2p.c: a2p.y
        $(CC) $(LDFLAGS) $(obj) a2p.o $(libs) -o a2p
 
 a2p.c: a2p.y

-       @ echo Expect 231 shift/reduce conflicts...
+       @echo Expect 231 shift/reduce conflicts...

        $(YACC) a2p.y
        mv y.tab.c a2p.c
 
        $(YACC) a2p.y
        mv y.tab.c a2p.c
 


@@ -146,7 +146,7 @@ malloc.c: ../malloc.c
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
 $(obj):
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
 $(obj):

-       @ echo "You haven't done a "'"make depend" yet!'; exit 1
+       @echo "You haven't done a "'"make depend" yet!'; exit 1

 makedepend: makedepend.SH
        /bin/sh $(shellflags) makedepend.SH
 !NO!SUBS!
 makedepend: makedepend.SH
        /bin/sh $(shellflags) makedepend.SH
 !NO!SUBS!

diff --git a/usr/src/contrib/perl-4.036/x2p/cflags.SH b/usr/src/contrib/perl-4.036/x2p/cflags.SH
index db857c0..95abb4b 100644 (file)
--- a/usr/src/contrib/perl-4.036/x2p/cflags.SH
+++ b/usr/src/contrib/perl-4.036/x2p/cflags.SH
@@ -51,7 +51,7 @@ esac
 
 set `echo "$* " | sed 's/\.[oc] / /g'`
 
 
 set `echo "$* " | sed 's/\.[oc] / /g'`
 

-for file do
+for file; do

 
     case "$#" in
     1) ;;
 
     case "$#" in
     1) ;;