Actuall excise 'Apollo DomainOS' support. We officially killed it in 5.11.0. It

hadn't worked for years before that.

14 files changed, 5 insertions, 113 deletions

diff --git a/MANIFEST b/MANIFEST
index 3a2438301b..72063e10d0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,3 @@
-apollo/netinet/in.h	Apollo DomainOS port: C header file frontend
 Artistic		The "Artistic License"
 AUTHORS			Contact info for contributors
 autodoc.pl		Creates pod/perlintern.pod and pod/perlapi.pod
@@ -3598,7 +3597,6 @@ hints/aix_4.sh			Hints for named architecture
 hints/aix.sh			Hints for named architecture
 hints/altos486.sh		Hints for named architecture
 hints/amigaos.sh		Hints for named architecture
-hints/apollo.sh			Hints for named architecture
 hints/atheos.sh			Hints for named architecture
 hints/aux_3.sh			Hints for named architecture
 hints/beos.sh			Hints for named architecture
@@ -4388,7 +4386,6 @@ qnx/qnx.c			QNX silent matherr callback
 README				The Instructions
 README.aix			Perl notes for AIX
 README.amiga			Perl notes for AmigaOS
-README.apollo			Perl notes for Apollo DomainOS
 README.beos			Perl notes for BeOS
 README.bs2000			Perl notes for POSIX-BC BS2000
 README.ce			Perl notes for WinCE
diff --git a/Porting/perlhist_calculate.pl b/Porting/perlhist_calculate.pl
index 437628e775..b03fef480d 100755
--- a/Porting/perlhist_calculate.pl
+++ b/Porting/perlhist_calculate.pl
@@ -133,7 +133,7 @@ sub calc_longtable {
 
 	print "\n\nTable\n";
 
-	foreach my $dir (qw(apollo beos)) {
+	foreach my $dir (qw(beos)) {
 		calc_dir($dir);
 	}
 
diff --git a/README.apollo b/README.apollo
deleted file mode 100644
index cc12e6a5cd..0000000000
--- a/README.apollo
+++ /dev/null
@@ -1,23 +0,0 @@
-If you read this file _as_is_, just ignore the funny characters you see.
-It is written in the POD format (see pod/perlpod.pod) which is specially
-designed to be readable as is.
-
-=head1 NAME
-
-README.apollo - Perl version 5 on Apollo DomainOS
-
-=head1 DESCRIPTION
-
-The following tests are known to fail as of Perl 5.005_03:
-
-comp/decl..........FAILED at test 0
-op/write...........FAILED at test 0
-lib/filefind.......FAILED at test 2
-lib/io_udp.........FAILED at test 2
-lib/findbin........stat(/ressel/ABT/USER/vta/jk/proj.local/perl/perl5.005_03-MAINT_TRIAL_5/t/lib/): No such file or directory at ../lib/FindBin.pm line 162
-stat(/ressel/ABT/USER/vta/jk/proj.local/perl/perl5.005_03-MAINT_TRIAL_5/t/lib/): No such file or directory at ../lib/FindBin.pm line 163
-FAILED at test 1
-
-=head1 AUTHOR
-
-Johann Klasek <jk@auto.tuwien.ac.at>
diff --git a/apollo/netinet/in.h b/apollo/netinet/in.h
deleted file mode 100644
index cfbc0485d0..0000000000
--- a/apollo/netinet/in.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Apollo's <netinet/in.h> isn't protected against multiple inclusion. */
-
-#ifndef _NETINET_IN_INCLUDED
-#define _NETINET_IN_INCLUDED
-
-#include "/bsd4.3/usr/include/netinet/in.h"
-
-#endif /* _NETINET_IN_INCLUDED */
diff --git a/dist/IO/t/io_udp.t b/dist/IO/t/io_udp.t
index 6b139dd83f..d7e95a8829 100644
--- a/dist/IO/t/io_udp.t
+++ b/dist/IO/t/io_udp.t
@@ -11,9 +11,6 @@ BEGIN {
     elsif ($ENV{PERL_CORE} and $Config{'extensions'} !~ /\bIO\b/) {
       $reason = 'IO was not built';
     }
-    elsif ($^O eq 'apollo') {
-      $reason = "unknown *FIXME*";
-    }
     undef $reason if $^O eq 'VMS' and $Config{d_socket};
     skip_all($reason) if $reason;
 }
diff --git a/ext/Sys-Hostname/Hostname.pm b/ext/Sys-Hostname/Hostname.pm
index 5bed5ec609..0b7948c791 100644
--- a/ext/Sys-Hostname/Hostname.pm
+++ b/ext/Sys-Hostname/Hostname.pm
@@ -113,13 +113,6 @@ sub hostname {
 	$host = `uname -n 2>/dev/null`; ## sysVish
     }
 
-    # method 6 - Apollo pre-SR10
-    || eval {
-	local $SIG{__DIE__};
-        my($a,$b,$c,$d);
-	($host,$a,$b,$c,$d)=split(/[:\. ]/,`/com/host`,6);
-    }
-
     # bummer
     || croak "Cannot get host name of local machine";  
 
diff --git a/hints/apollo.sh b/hints/apollo.sh
deleted file mode 100644
index 9b88a9307a..0000000000
--- a/hints/apollo.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-# Info from Johann Klasek <jk@auto.tuwien.ac.at>
-# Merged by Andy Dougherty  <doughera@lafayette.edu>
-# Last revised	Tue Mar 16 19:12:22 EET 1999 by
-# Jarkko Hietaniemi <jhi@iki.fi>
-
-# uname -a looks like
-# DomainOS newton 10.4.1 bsd4.3 425t
-
-# We want to use both BSD includes and some of the features from the
-# /sys5 includes.
-ccflags="$ccflags -A cpu,mathchip -I`pwd`/apollo -I/usr/include -I/sys5/usr/include"
-
-# When Apollo runs a script with "#!", it sets argv[0] to the script name.
-toke_cflags='ccflags="$ccflags -DARG_ZERO_IS_SCRIPT"'
-
-# These adjustments are necessary (why?) to compile malloc.c.
-freetype='void'
-i_malloc='undef'
-malloctype='void *'
-
-# This info is left over from perl4.  
-cat <<'EOF' >&4
-Some tests may fail unless you use 'chacl -B'.  Also, op/stat
-test 2 may fail occasionally because Apollo doesn't guarantee
-that mtime will be equal to ctime on a newly created unmodified
-file.  Finally, the sleep test will sometimes fail.  See the
-sleep(3) man page to learn why.
-
-See hints/apollo.sh for hints on running h2ph.
-
-And a note on ccflags:
-
-    Lastly, while -A cpu,mathchip generates optimal code for your DN3500
-    running sr10.3, be aware that you should be using -A cpu,mathlib_sr10
-    if your perl must also run on any machines running sr10.0, sr10.1, or
-    sr10.2.  The -A cpu,mathchip option generates code that doesn't work on
-    pre-sr10.3 nodes.  See the cc(1) man page for more details.
-						-- Steve Vinoski
-
-EOF
-
-# Running h2ph, on the other hand, presents a challenge. 
-
-#The perl header files have to be generated with following commands
-
-#sed 's|/usr/include|/sys5/usr/include|g' h2ph >h2ph.new && chmod +x h2ph.new
-#(set cdir=`pwd`; cd /sys5/usr/include; $cdir/h2ph.new sys/* )
-#(set cdir=`pwd`; cd /usr/include; $cdir/h2ph * sys/* machine/*)
-
-#The SYS5 headers (only sys) are overlayed by the BSD headers.  It  seems
-#all ok, but once I am going into details,  a  lot  of  limitations  from
-#'h2ph' are coming up. Lines like "#define NODEV (dev_t)(-1)"  result  in
-#syntax errors as converted by h2ph. 
-
-# Generally, h2ph might need a lot of help.
diff --git a/lib/perl5db.pl b/lib/perl5db.pl
index 711d1988a8..041218399f 100644
--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
@@ -8130,7 +8130,6 @@ my @pods = qw(
     amiga
     apio
     api
-    apollo
     artistic
     beos
     book
diff --git a/plan9/mkfile b/plan9/mkfile
index 5e5d62fc5b..2d7b4bf013 100644
--- a/plan9/mkfile
+++ b/plan9/mkfile
@@ -23,7 +23,7 @@ installman3dir = /sys/man/2
 podnames = perl perlbook perlboot perlbot perldata perldebtut perldiag perldsc perlform perlfunc perlipc perllexwarn perllol perlmod perlmodlib perlmodinstall perlnewmod perlop perlopentut perlpacktut perlpod perlport perlrequick perlretut perlref perlreftut perlrequick perlrun perlsec perlstyle perlsub perlsyn perltie perltoc perltooc perltoot perltrap perlutil perlunifaq perluniintro perlvar
 faqpodnames = perlfaq perlfaq1 perlfaq2 perlfaq3 perlfaq4 perlfaq5 perlfaq6 perlfaq7 perlfaq8 perlfaq9
 advpodnames = perlapi perlapio perlcall perlclib perlcompile perldebguts perldbmfilter perldebug perldelta perldiag perlebcdic perlembed perlfilter perlfork perlguts perlhack perlintern perliol perllocale perlnumber perlobj perlpodspec perlre perlthrtut perltodo perlunicode perlxs perlxs perlxstut
-archpodnames = perlaix perlamiga perlapollo perlbeos perlbs2000 perlce perlcygwin perldgux perldos perlepoc perlfreebsd perlhpux perlhurd perlirix perlmacos perlmpeix perlnetware perlos2 perlos390 perlos400 perlplan9 perlqnx perlsolaris perltru64 perluts perlvmesa perlvms perlvos perlwin32
+archpodnames = perlaix perlamiga perlbeos perlbs2000 perlce perlcygwin perldgux perldos perlepoc perlfreebsd perlhpux perlhurd perlirix perlmacos perlmpeix perlnetware perlos2 perlos390 perlos400 perlplan9 perlqnx perlsolaris perltru64 perluts perlvmesa perlvms perlvos perlwin32
 histpods = perl5004delta perl5005delta perl561delta perl56delta perl570delta perl571delta perl572delta perl573delta perl58delta perlhist
 
 libpods = ${podnames:%=pod/%.pod}
diff --git a/pod.lst b/pod.lst
index c2687e4b50..40580748b0 100644
--- a/pod.lst
+++ b/pod.lst
@@ -197,7 +197,6 @@ h Platform-Specific
 
 r perlaix		Perl notes for AIX
 r perlamiga		Perl notes for AmigaOS
-r perlapollo		Perl notes for Apollo DomainOS
 r perlbeos		Perl notes for BeOS
 r perlbs2000		Perl notes for POSIX-BC BS2000
 r perlce		Perl notes for WinCE
diff --git a/pod/.gitignore b/pod/.gitignore
index cdc58654e8..30778721c1 100644
--- a/pod/.gitignore
+++ b/pod/.gitignore
@@ -1,7 +1,6 @@
 # arch-specific pods
 /perlaix.pod
 /perlamiga.pod
-/perlapollo.pod
 /perlbeos.pod
 /perlbs2000.pod
 /perlce.pod
diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index 44c8141977..4631efbce6 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -408,7 +408,7 @@ pod5 = [.lib.pods]perl56delta.pod [.lib.pods]perl570delta.pod [.lib.pods]perl571
 pod6 = [.lib.pods]perl581delta.pod [.lib.pods]perl582delta.pod [.lib.pods]perl583delta.pod [.lib.pods]perl584delta.pod [.lib.pods]perl585delta.pod
 pod7 = [.lib.pods]perl586delta.pod [.lib.pods]perl587delta.pod [.lib.pods]perl588delta.pod [.lib.pods]perl589delta.pod [.lib.pods]perl58delta.pod
 pod8 = [.lib.pods]perl590delta.pod [.lib.pods]perl591delta.pod [.lib.pods]perl592delta.pod [.lib.pods]perl593delta.pod [.lib.pods]perl594delta.pod
-pod9 = [.lib.pods]perl595delta.pod [.lib.pods]perlaix.pod [.lib.pods]perlamiga.pod [.lib.pods]perlapi.pod [.lib.pods]perlapio.pod [.lib.pods]perlapollo.pod
+pod9 = [.lib.pods]perl595delta.pod [.lib.pods]perlaix.pod [.lib.pods]perlamiga.pod [.lib.pods]perlapi.pod [.lib.pods]perlapio.pod
 pod10 = [.lib.pods]perlartistic.pod [.lib.pods]perlbeos.pod [.lib.pods]perlbook.pod [.lib.pods]perlboot.pod [.lib.pods]perlbot.pod [.lib.pods]perlbs2000.pod
 pod11 = [.lib.pods]perlcall.pod [.lib.pods]perlce.pod [.lib.pods]perlcheat.pod [.lib.pods]perlclib.pod [.lib.pods]perlcn.pod [.lib.pods]perlcommunity.pod
 pod12 = [.lib.pods]perlcompile.pod [.lib.pods]perlcygwin.pod [.lib.pods]perldata.pod [.lib.pods]perldbmfilter.pod [.lib.pods]perldebguts.pod
@@ -900,10 +900,6 @@ makeppport : $(MINIPERL_EXE) $(ARCHDIR)Config.pm nonxsext
 	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
 	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
 
-[.lib.pods]perlapollo.pod : [.pod]perlapollo.pod
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
 [.lib.pods]perlartistic.pod : [.pod]perlartistic.pod
 	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
 	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
diff --git a/win32/Makefile b/win32/Makefile
index dea0cae8f7..79040792e6 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1024,7 +1024,6 @@ utils: $(PERLEXE) $(X2P)
 	cd ..\pod
 	copy ..\README.aix      ..\pod\perlaix.pod
 	copy ..\README.amiga    ..\pod\perlamiga.pod
-	copy ..\README.apollo   ..\pod\perlapollo.pod
 	copy ..\README.beos     ..\pod\perlbeos.pod
 	copy ..\README.bs2000   ..\pod\perlbs2000.pod
 	copy ..\README.ce       ..\pod\perlce.pod
@@ -1153,7 +1152,7 @@ distclean: realclean
 	-if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API
 	-cd $(PODDIR) && del /f *.html *.bat \
 	    perl5139delta.pod perlaix.pod perlamiga.pod perlapi.pod \
-	    perlapollo.pod perlbeos.pod perlbs2000.pod perlce.pod \
+	    perlbeos.pod perlbs2000.pod perlce.pod \
 	    perlcn.pod perlcygwin.pod perldgux.pod perldos.pod perlepoc.pod \
 	    perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \
 	    perlintern.pod perlirix.pod perljp.pod perlko.pod perllinux.pod \
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 74f157c4c8..f85dcc917a 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1410,7 +1410,6 @@ utils: $(PERLEXE) $(X2P)
 	cd ..\utils && $(MAKE) PERL=$(MINIPERL)
 	copy ..\README.aix      ..\pod\perlaix.pod
 	copy ..\README.amiga    ..\pod\perlamiga.pod
-	copy ..\README.apollo   ..\pod\perlapollo.pod
 	copy ..\README.beos     ..\pod\perlbeos.pod
 	copy ..\README.bs2000   ..\pod\perlbs2000.pod
 	copy ..\README.ce       ..\pod\perlce.pod
@@ -1538,7 +1537,7 @@ distclean: realclean
 	-if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API
 	-cd $(PODDIR) && del /f *.html *.bat \
 	    perl5139delta.pod perlaix.pod perlamiga.pod perlapi.pod \
-	    perlapollo.pod perlbeos.pod perlbs2000.pod perlce.pod \
+	    perlbeos.pod perlbs2000.pod perlce.pod \
 	    perlcn.pod perlcygwin.pod perldgux.pod perldos.pod perlepoc.pod \
 	    perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \
 	    perlintern.pod perlirix.pod perljp.pod perlko.pod perllinux.pod \