stock perl 5.8.0 from CPAN

6 files changed, 243 insertions, 314 deletions

diff --git a/gnu/usr.bin/perl/epoc/config.sh b/gnu/usr.bin/perl/epoc/config.sh
index 1168ffc6f5b..78b22ac8206 100644
--- a/gnu/usr.bin/perl/epoc/config.sh
+++ b/gnu/usr.bin/perl/epoc/config.sh
@@ -25,23 +25,24 @@ _a='.a'
 _exe='.exe'
 _o='.o'
 afs='false'
+afsroot='/afs'
 alignbytes='8'
 ansi2knr=''
 aphostname=''
 apirevision=''
 apisubversion=''
 apiversion=''
-ar='arm-pe-ar'
-archlib='?:/perl/lib/5.6.1/epoc'
-archlibexp='?:/perl/lib/5.6.1/epoc'
+ar='arm-epoc-pe-ar'
+archlib='/usr/lib/perl/5.8.0/epoc'
+archlibexp='/usr/lib/perl/5.8.0/epoc'
 archname64=''
 archname='epoc'
 archobjs='epoc.o epocish.o epoc_stubs.o'
+asctime_r_proto='0'
 awk='awk'
 baserev='5.0'
 bash=''
 bin=''
-bincompat5005='false'
 binexp=''
 bison='bison'
 byacc=''
@@ -49,14 +50,14 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='cat'
-cc='arm-pe-gcc -B/usr/local/lib/gcc-lib/arm-pe/cygnus-2.7.2-960323/ -nostdinc -D__SYMBIAN32__ -D__PSISOFT32__ -D__GCC32__ -D__EPOC32__ -D__MARM__ -D__EXE__ -I/usr/local/epoc/include/ -I/usr/local/epoc/include/libc -DEPOC'
+cc='arm-epoc-pe-gcc -DEPOC'
 cccdlflags=''
 ccdlflags=''
-ccflags='-Wno-ctor-dtor-privacy -mcpu-arm710 -mapcs-32 -mshort-load-bytes -msoft-float -fcheck-new -fvtable-thunks'
+ccflags=''
 ccsymbols=''
 cf_by='olaf'
 cf_email='o.flebbe@gmx.de'
-cf_time='Dec 1999'
+cf_time='Dec 2001'
 chgrp=''
 chmod=''
 chown=''
@@ -66,19 +67,20 @@ compress=''
 contains='grep'
 cp='cp'
 cpio=''
-cpp='arm-pe-cpp'
+cpp='arm-epoc-pe-cpp'
 cpp_stuff='42'
 cppccsymbols='EPOC=1'
-cppflags=' -nostdinc -D__SYMBIAN32__ -D__PSISOFT32__ -D__GCC32__ -D__EPOC32__ -D__MARM__ -D__EXE__ -I/usr/local/epoc/include/ -I/usr/local/epoc/include/libc'
+cppflags=''
 cpplast='-'
 cppminus='-'
-cpprun='arm-pe-gcc -E  -B/usr/local/lib/gcc-lib/arm-pe/cygnus-2.7.2-960323/'
-cppstdin='arm-pe-gcc -E -B/usr/local/lib/gcc-lib/arm-pe/cygnus-2.7.2-960323/'
+cpprun='arm-epoc-pe-gcc -E'
+cppstdin='arm-epoc-pe-gcc -E'
 cppsymbols=''
-crosscompile='define'
+crypt_r_proto='0'
 cryptlib=''
 csh='csh'
-d__fwalk='undef'
+ctermid_r_proto='0'
+ctime_r_proto='0'
 d_Gconvert='epoc_gcvt((x),(n),(b))'
 d_PRIEUldbl='undef'
 d_PRIFUldbl='undef'
@@ -92,16 +94,17 @@ d_PRIi64='undef'
 d_PRIo64='undef'
 d_PRIu64='undef'
 d_PRIx64='undef'
+d__fwalk='undef'
 d_access='undef'
 d_accessx='undef'
 d_alarm='undef'
 d_archlib='define'
+d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
 d_attribut='undef'
 d_bcmp='define'
 d_bcopy='define'
-d_bincompat5005='undef'
 d_bsd='undef'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
@@ -112,30 +115,45 @@ d_charvspr='undef'
 d_chown='undef'
 d_chroot='undef'
 d_chsize='undef'
+d_class='undef'
 d_closedir='undef'
 d_cmsghdr_s='undef'
+d_cmsghdr_s='undef'
 d_const='define'
 d_crypt='undef'
+d_crypt_r='undef'
 d_csh='undef'
+d_ctermid_r='undef'
+d_ctime_r='undef'
 d_cuserid='undef'
 d_dbl_dig='undef'
+d_dbminitproto='undef'
 d_difftime='define'
+d_dirfd='undef'
 d_dirnamlen='undef'
 d_dlerror='undef'
 d_dlopen='undef'
 d_dlsymun='undef'
 d_dosuid='undef'
+d_drand48_r='undef'
 d_drand48proto='define'
 d_dup2='undef'
 d_eaccess='undef'
 d_endgrent='undef'
+d_endgrent_r='undef'
 d_endhent='undef'
+d_endhostent_r='undef'
 d_endnent='undef'
+d_endnetent_r='undef'
 d_endpent='undef'
+d_endprotoent_r='undef'
 d_endpwent='undef'
+d_endpwent_r='undef'
 d_endsent='undef'
+d_endservent_r='undef'
 d_eofnblk='define'
 d_eunice='undef'
+d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
 d_fcntl='undef'
@@ -144,10 +162,17 @@ d_fd_macros='undef'
 d_fd_set='define'
 d_fds_bits='undef'
 d_fgetpos='define'
+d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
 d_flock='undef'
+d_flockproto='undef'
 d_fork='undef'
+d_fp_class='undef'
 d_fpathconf='undef'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
 d_fpos64_t='undef'
 d_frexpl='undef'
 d_fseeko='undef'
@@ -160,17 +185,28 @@ d_ftime='undef'
 d_getespwnam='undef'
 d_getfsstat='undef'
 d_getgrent='undef'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
 d_getgrps='undef'
 d_gethbyaddr='define'
 d_gethbyname='define'
 d_gethent='undef'
 d_gethname='undef'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
 d_gethostprotos='define'
+d_getitimer='undef'
 d_getlogin='undef'
+d_getlogin_r='undef'
 d_getmntent='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
 d_getnent='undef'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
 d_getnetprotos='define'
 d_getpagsz='undef'
 d_getpbyname='define'
@@ -181,25 +217,37 @@ d_getpgrp2='undef'
 d_getpgrp='undef'
 d_getppid='undef'
 d_getprior='undef'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
 d_getprotoprotos='define'
 d_getprpwnam='undef'
 d_getpwent='undef'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
 d_getsbyname='undef'
 d_getsbyport='undef'
 d_getsent='undef'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
 d_getservprotos='define'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='define'
+d_gmtime_r='undef'
 d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
 d_htonl='define'
-d_iconv='undef'
 d_index='undef'
 d_inetaton='define'
 d_int64_t='undef'
 d_iovec_s='undef'
 d_isascii='define'
+d_isfinite='undef'
+d_isinf='undef'
 d_isnan='define'
 d_isnanl='undef'
 d_killpg='undef'
@@ -207,6 +255,7 @@ d_lchown='undef'
 d_ldbl_dig='undef'
 d_link='undef'
 d_llseek='undef'
+d_localtime_r='undef'
 d_locconv='undef'
 d_lockf='undef'
 d_longdbl='undef'
@@ -227,6 +276,7 @@ d_mkfifo='undef'
 d_mktime='define'
 d_mmap='undef'
 d_modfl='undef'
+d_modfl_pow32_bug='undef'
 d_mprotect='undef'
 d_msg='undef'
 d_msg_ctrunc='undef'
@@ -237,12 +287,14 @@ d_msg_proxy='undef'
 d_msgctl='undef'
 d_msgget='undef'
 d_msghdr_s='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
 d_nice='undef'
+d_nl_langinfo='undef'
 d_off64_t='undef'
 d_old_pthread_create_joinable='undef'
 d_oldpthreads='undef'
@@ -255,6 +307,8 @@ d_phostname='undef'
 d_pipe='undef'
 d_poll='undef'
 d_portable='undef'
+d_procselfexe='undef'
+d_pthread_atfork='undef'
 d_pthread_yield='undef'
 d_pwage='undef'
 d_pwchange='undef'
@@ -265,9 +319,14 @@ d_pwgecos='undef'
 d_pwpasswd='undef'
 d_pwquota='undef'
 d_qgcvt='undef'
+d_random_r='undef'
+d_readdir64_r='undef'
 d_readdir='define'
+d_readdir_r='undef'
 d_readlink='undef'
 d_readv='undef'
+d_readv='undef'
+d_recvmsg='undef'
 d_recvmsg='undef'
 d_rename='define'
 d_rewinddir='define'
@@ -290,18 +349,25 @@ d_sendmsg='undef'
 d_setegid='undef'
 d_seteuid='undef'
 d_setgrent='undef'
+d_setgrent_r='undef'
 d_setgrps='undef'
 d_sethent='undef'
+d_sethostent_r='undef'
+d_setitimer='undef'
 d_setlinebuf='undef'
 d_setlocale='undef'
+d_setlocale_r='undef'
 d_setnent='undef'
+d_setnetent_r='undef'
 d_setpent='undef'
 d_setpgid='undef'
 d_setpgrp2='undef'
 d_setpgrp='undef'
-d_setproctitle='undef'
 d_setprior='undef'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
 d_setpwent='undef'
+d_setpwent_r='undef'
 d_setregid='undef'
 d_setresgid='undef'
 d_setresuid='undef'
@@ -309,6 +375,7 @@ d_setreuid='undef'
 d_setrgid='undef'
 d_setruid='undef'
 d_setsent='undef'
+d_setservent_r='undef'
 d_setsid='undef'
 d_setvbuf='undef'
 d_sfio='undef'
@@ -319,18 +386,25 @@ d_shmctl='undef'
 d_shmdt='undef'
 d_shmget='undef'
 d_sigaction='undef'
+d_sigprocmask='undef'
 d_sigsetjmp='undef'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
 d_socket='define'
 d_sockpair='undef'
 d_socks5_init='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
 d_statblks='define'
 d_statfs='undef'
 d_statfsflags='define'
 d_statvfs='undef'
 d_stdio_cnt_lval='define'
 d_stdio_ptr_lval='define'
-d_stdio_ptr_lval_sets_cnt='undef'
 d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
 d_stdio_stream_array='undef'
 d_stdiobase='undef'
 d_stdstdio='undef'
@@ -339,14 +413,19 @@ d_strcoll='define'
 d_strctcpy='define'
 d_strerrm='strerror(e)'
 d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
 d_strtod='define'
 d_strtol='define'
+d_strtoq='undef'
 d_strtoul='define'
 d_strtoull='undef'
+d_strtouq='undef'
 d_strxfrm='define'
 d_suidsafe='undef'
 d_symlink='undef'
 d_syscall='undef'
+d_syscallproto='undef'
 d_sysconf='define'
 d_sysernlst='undef'
 d_syserrlst='undef'
@@ -357,11 +436,19 @@ d_telldir='define'
 d_telldirproto='define'
 d_time='undef'
 d_times='undef'
+d_tm_tm_gmtoff='undef'
+d_tm_tm_zone='undef'
+d_tmpnam_r='undef'
 d_truncate='undef'
+d_ttyname_r='undef'
 d_tzname='undef'
+d_u32align='define'
+d_ualarm='undef'
 d_umask='undef'
 d_uname='undef'
 d_union_semun='undef'
+d_unordered='undef'
+d_usleepproto='undef'
 d_vendorlib='undef'
 d_vfork='undef'
 d_void_closedir='undef'
@@ -384,16 +471,23 @@ dlext='none'
 dlsrc='dl_none.xs'
 doublesize='8'
 drand01='(rand()/(double)(1U<<RANDBITS))'
+drand48_r_proto='0'
 dynamic_ext=''
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
 egrep='egrep'
 emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='Data/Dumper File/Glob IO Socket Fcntl Sys/Hostname Errno'
+extensions='Data/Dumper Digest/MD5 Errno Fcntl File/Glob Filter/Util/Call IO List/Util MIME/Base64 Opcode PerlIO/scalar Socket Storable Sys/Hostname Unicode/Storable attrs re'
 fflushNULL='undef'
 fflushall='define'
 find=''
@@ -401,12 +495,33 @@ firstmakefile='makefile'
 flex=''
 fpostype='fpos_t'
 freetype='void'
-full_ar='/usr/local/bin/arm-pe-ar'
+full_ar='arm-epoc-pe-ar'
 full_csh=''
 full_sed='/usr/bin/sed'
 gccversion=''
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
 gidtype='gid_t'
 glibpth=''
+gmtime_r_proto='0'
 grep='grep'
 groupcat=''
 groupstype='gid_t'
@@ -417,6 +532,7 @@ hint=''
 hostcat=''
 i_arpainet='define'
 i_bsdioctl='undef'
+i_crypt='undef'
 i_db='undef'
 i_dbm='undef'
 i_dirent='define'
@@ -424,11 +540,13 @@ i_dld='undef'
 i_dlfcn='undef'
 i_fcntl='define'
 i_float='undef'
+i_fp='undef'
+i_fp_class='undef'
 i_gdbm='undef'
 i_grp='undef'
-i_iconv='undef'
 i_ieeefp='undef'
 i_inttypes='undef'
+i_langinfo='undef'
 i_libutil='undef'
 i_limits='define'
 i_locale='undef'
@@ -491,25 +609,12 @@ i_vfork='undef'
 ignore_versioned_solibs=''
 incpath=''
 inews=''
-installarchlib='/home/of/PERL/perl/lib/5.6.0/epoc'
-installbin='/home/of/PERL/System/Programs/'
-installman1dir='/home/of/PERL/man1'
-installman3dir='/home/of/PERL/man3'
-installprefix=''
-installprefixexp=''
-installprivlib='/home/of/PERL/perl/lib/5.6.0/'
-installscript='/home/of/PERL/bin/'
-installsitearch='/home/of/PERL/site/lib/site_perl/5.6.0/epoc'
-installsitelib='/home/of/PERL/perl/lib/site_perl/5.6.0'
-installstyle=''
-installusrbinperl='undef'
-installvendorlib=''
 intsize='4'
 known_extensions='Data/Dumper File/Glob IO Socket Fcntl Sys/Hostname Errno'
 ksh=''
 ld='echo'
 lddlflags=''
-ldflags=''
+ldflags='-Wl,-heap,0x04000000'
 ldlibpthname=''
 less=''
 lib_ext=''
@@ -523,6 +628,7 @@ lint=''
 lkflags=''
 ln='ln'
 lns='/bin/ln -s'
+localtime_r_proto='0'
 locincpth=''
 loclibpth=''
 longdblsize='8'
@@ -573,11 +679,12 @@ mydomain='.gmx.de'
 myhostname='dragon'
 myuname=''
 n='-n'
+need_va_copy='undef'
 netdb_hlen_type='int'
 netdb_host_type='const char *'
 netdb_name_type='const char *'
 netdb_net_type='int'
-nm='arm-pe-nm'
+nm='arm-epoc-pe-nm'
 nm_opt=''
 nm_so_opt=''
 nonxs_ext='Errno'
@@ -606,15 +713,19 @@ pmake=''
 pr=''
 prefix=''
 prefixexp=''
-privlib='?:/perl/lib/5.6.1'
-privlibexp='?:/perl/lib/5.6.1'
+privlib='/usr/lib/perl/5.8.0'
+privlibexp='/usr/lib/perl/5.8.0'
+procselfexe=''
 prototype='define'
 ptrsize='4'
 randbits='31'
 randfunc=''
+random_r_proto='0'
 randseedtype='unsigned'
-ranlib='arm-pe-ranlib'
+ranlib='arm-epoc-pe-ranlib'
 rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
 rm='rm'
 rmail=''
 runnm='false'
@@ -638,6 +749,13 @@ seedfunc='srand'
 selectminbits='32'
 selecttype=''
 sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
 sh='/bin/sh'
 shar=''
 sharpbang='#!'
@@ -645,17 +763,17 @@ shmattype=''
 shortsize='2'
 shrpenv=''
 shsharp=''
-sig_count='ZERO '
 sig_name=''
 sig_name_init='"ZERO", 0'
 sig_num='0'
 sig_num_init='0, 0'
+sig_size='1'
 signal_t='void'
-sitearch='?:/perl/lib/site_perl/5.6.1/epoc'
-sitearchexp='?:/perl/lib/site_perl/5.6.1/epoc'
-sitelib='?:/perl/lib/site_perl/5.6.1/'
-sitelib_stem='?:/perl/lib/site_perl'
-sitelibexp='?:/perl/lib/site_perl/5.6.1/'
+sitearch='/usr/lib/perl/site_perl/5.8.0/epoc'
+sitearchexp='/usr/lib/perl/site_perl/5.8.0/epoc'
+sitelib='/usr/lib/perl/site_perl/5.8.0/'
+sitelib_stem='/usr/lib/perl/site_perl'
+sitelibexp='/usr/lib/perl/site_perl/5.8.0/'
 siteprefix=''
 siteprefixexp=''
 sizesize='4'
@@ -663,12 +781,14 @@ sizetype='size_t'
 sleep=''
 smail=''
 so=''
-socksizetype='size_t'
 sockethdr=''
 socketlib=''
+socksizetype='size_t'
 sort='sort'
 spackage=''
 spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
 src='.'
 ssizetype='long'
 startperl=''
@@ -681,6 +801,7 @@ stdio_cnt=''
 stdio_filbuf=''
 stdio_ptr=''
 stdio_stream_array=''
+strerror_r_proto='0'
 strings=''
 submit=''
 subversion=''
@@ -692,16 +813,19 @@ tee='tee'
 test='test'
 timeincl=''
 timetype='time_t'
+tmpnam_r_proto='0'
 touch='touch'
 tr='tr'
 trnl='\n'
 troff=''
+ttyname_r_proto='0'
 uidsign='1'
 uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 use64bitall='undef'
 use64bitint='undef'
+usecrosscompile='define'
 usedl='undef'
 uselargefiles='undef'
 uselongdouble='undef'
@@ -712,6 +836,7 @@ usenm=''
 useopcode=''
 useperlio='undef'
 useposix=''
+usereentrant='undef'
 usesfio=''
 useshrplib=''
 usesocks='undef'
@@ -725,7 +850,7 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.6.1'
+version='5.8.0'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -753,7 +878,7 @@ PERL_SUBVERSION=1
 PERL_API_REVISION=5
 PERL_API_VERSION=6
 PERL_API_SUBVERSION=0
-CONFIGDOTSH=true
+PERL_CONFIG_SH=true
 # Variables propagated from previous config.sh file.
 pp_sys_cflags=''
 epocish_cflags='ccflags="$cflags -xc++"'
@@ -789,6 +914,7 @@ d_sqrtl='undef'
 d_getmnt='undef'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
+d_usleep='undef'
 d_ustat='undef'
 i_sysstatfs='undef'
 i_sysvfs='undef'
@@ -801,13 +927,14 @@ ivdformat='"ld"'
 uvuformat='"lu"'
 uvoformat='"lo"'
 uvxformat='"lx"'
+uvXUformat='"lX"'
 uidformat='"hu"'
 gidformat='"hu"'
 d_strtold='undef'
 d_strtoll='undef'
 d_strtouq='undef'
 d_nv_preserves_uv='define'
-d_nv_preserves_uv_bits='32'
+nv_preserves_uv_bits='32'
 use5005threads='undef'
 useithreads='undef'
 inc_version_list=' '
@@ -823,7 +950,6 @@ d_munmap='undef'
 d_qgcvt='undef'
 d_socklen_t='undef'
 d_vendorarch=''
-i_iconv='undef'
 i_ieeefp='undef'
 i_sunmath='undef'
 i_syslog='undef'
@@ -856,7 +982,7 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.6.1'
+version='5.8.0'
 vi=''
 voidflags='15'
 xlibpth=''
@@ -952,7 +1078,6 @@ d_munmap='undef'
 d_qgcvt='undef'
 d_socklen_t='undef'
 d_vendorarch=''
-i_iconv='undef'
 i_ieeefp='undef'
 i_sunmath='undef'
 i_syslog='undef'
@@ -981,6 +1106,18 @@ d_SCNfldbl='undef'
 d_perl_otherlibdirs='undef'
 nvsize='16'
 issymlink=''
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
+installarchlib='/home/of/PERL/perl/lib/5.6.0/epoc'
+installbin='/home/of/PERL/System/Programs/'
+installman1dir='/home/of/PERL/man1'
+installman3dir='/home/of/PERL/man3'
+installprefix=''
+installprefixexp=''
+installprivlib='/home/of/PERL/perl/lib/5.6.0/'
+installscript='/home/of/PERL/bin/'
+installsitearch='/home/of/PERL/site/lib/site_perl/5.6.0/epoc'
+installsitelib='/home/of/PERL/perl/lib/site_perl/5.6.0'
+installstyle=''
+installusrbinperl='undef'
+installvendorlib=''
+
+
diff --git a/gnu/usr.bin/perl/epoc/createpkg.pl b/gnu/usr.bin/perl/epoc/createpkg.pl
index b803f4359fa..1190923d436 100644
--- a/gnu/usr.bin/perl/epoc/createpkg.pl
+++ b/gnu/usr.bin/perl/epoc/createpkg.pl
@@ -3,38 +3,39 @@
 use File::Find;
 use Cwd;
 
-$VERSION="5.6";
-$PATCH="1";
-$EPOC_VERSION=26;
-$CROSSCOMPILEPATH=cwd;
-$CROSSREPLACEPATH="H:\\perl";
+$VERSION="5.8.0";
+$EPOC_VERSION=1;
 
 
 sub filefound {
-    my $f = $File::Find::name;
-    
-    return if ( $f =~ /CVS|unicode|CPAN|ExtUtils|IPC|User|DB.pm|\.a$|\.ld$|\.exists$|\.pod$/i);
-    my $back = $f;
-
-    $back =~ s|$CROSSCOMPILEPATH||;
-
-    $back =~ s|/|\\|g;
 
-    my $psiback = $back;
+  my $f = $File::Find::name;
+    
+  return if ( $f =~ /CVS|Unicode|unicore|CPAN|ExtUtils|IPC|User|DB.pm|\.a$|\.ld$|\.exists$|\.pod$|\.t$/i);
+  my $back = $f;
 
-    $psiback =~ s/\\lib\\/\\perl\\lib\\$VERSION.$PATCH\\/i;
+  my $psiback = $back;
 
-    print OUT "\"$CROSSREPLACEPATH$back\"-\"!:$psiback\"\n"  if ( -f $f );
-;
+  $psiback =~ s|.*/lib/|\\emx\\lib\\perl\\$VERSION\\|;
+  $psiback =~ s|/|\\|g;
+  print OUT "\"$back\"-\"!:$psiback\"\n"  if ( -f $f );
 }
 
 open OUT,">perl.pkg";
 
-print OUT "#{\"perl$VERSION\"},(0x100051d8),$PATCH,$EPOC_VERSION,0\n";
-print OUT "\"$CROSSREPLACEPATH\\Artistic\"-\"\",FT,TA\n";
-print OUT "\"$CROSSREPLACEPATH\\perlmain.exe\"-\"!:\\system\\programs\\perl.exe\"\n";
+print OUT "#{\"perl$VERSION\"},(0x100051d8),0,$EPOC_VERSION,0\n";
+print OUT "\"" . cwd . "/Artistic.txt\"-\"\",FT,TC\n";
+print OUT "\"" . cwd . "/perl\"-\"!:\\emx\\bin\\perl.exe\"\n";
 
 find(\&filefound, cwd.'/lib');
-print OUT "@\"G:\\lib\\stdlib.sis\",(0x0100002c3)\n"
 
+open IN,  "<Artistic";
+open OUT, ">Artistic.txt";
+while (my $line = <IN>) {
+  chomp $line;
+  print OUT "$line\r\n";
+}
+
+close IN;
+close OUT;
 
diff --git a/gnu/usr.bin/perl/epoc/epoc.c b/gnu/usr.bin/perl/epoc/epoc.c
index 6652ef0ce1c..d580552ae99 100644
--- a/gnu/usr.bin/perl/epoc/epoc.c
+++ b/gnu/usr.bin/perl/epoc/epoc.c
@@ -10,88 +10,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <sys/unistd.h>
+#include <process.h>
 
-void
-Perl_epoc_init(int *argcp, char ***argvp) {
-  int i;
-  int truecount=0;
-  char **lastcp = (*argvp);
-  char *ptr;
-
-#if 0
-  epoc_spawn_posix_server();
-#endif
-  for (i=0; i< *argcp; i++) {
-    if ((*argvp)[i]) {
-      if (*((*argvp)[i]) == '<') {
-	if (strlen((*argvp)[i]) > 1) {
-	  ptr =((*argvp)[i])+1;
-	} else {
-	  i++;
-	  ptr = ((*argvp)[i]);
-	}
-	freopen(  ptr, "r", stdin);
-      } else if (*((*argvp)[i]) == '>') {
-	if (strlen((*argvp)[i]) > 1) {
-	  ptr =((*argvp)[i])+1;
-	} else {
-	  i++;
-	  ptr = ((*argvp)[i]);
-	}
-	freopen(  ptr, "w", stdout);
-      } else if ((*((*argvp)[i]) == '2') && (*(((*argvp)[i])+1) == '>')) {
-	if (strcmp( (*argvp)[i], "2>&1") == 0) {
-	  dup2( fileno( stdout), fileno( stderr));
-	} else {
-          if (strlen((*argvp)[i]) > 2) {
-            ptr =((*argvp)[i])+2;
-	  } else {
-	    i++;
-	    ptr = ((*argvp)[i]);
-	  }
-	  freopen(  ptr, "w", stderr);
-	}
-      } else {
-	*lastcp++ = (*argvp)[i];
-	truecount++;
-      }
-    } 
-  }
-  *argcp=truecount;
-      
-
-}
-
-
-#ifdef __MARM__
-/* Symbian forgot to include __fixunsdfi into the MARM euser.lib */
-/* This is from libgcc2.c , gcc-2.7.2.3                          */
-
-typedef unsigned int UQItype	__attribute__ ((mode (QI)));
-typedef 	 int SItype	__attribute__ ((mode (SI)));
-typedef unsigned int USItype	__attribute__ ((mode (SI)));
-typedef		 int DItype	__attribute__ ((mode (DI)));
-typedef unsigned int UDItype	__attribute__ ((mode (DI)));
-
-typedef 	float SFtype	__attribute__ ((mode (SF)));
-typedef		float DFtype	__attribute__ ((mode (DF)));
-
-
-
-extern DItype __fixunssfdi (SFtype a);
-extern DItype __fixunsdfdi (DFtype a);
-
-
-USItype
-__fixunsdfsi (a)
-     DFtype a;
-{
-  if (a >= - (DFtype) (- 2147483647L  -1) )
-    return (SItype) (a + (- 2147483647L  -1) ) - (- 2147483647L  -1) ;
-  return (SItype) a;
-}
-
-#endif
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -99,33 +19,14 @@ __fixunsdfsi (a)
 
 int 
 do_spawn( char *cmd) {
-    dTHXo;
-    char *argv0, *ptr;
-    char *cmdptr = cmd;
-    int ret;
-    
-    argv0 = ptr = malloc( strlen(cmd) + 1);
-
-    while (*cmdptr && !isSPACE( *cmdptr)) {
-      *ptr = *cmdptr;
-      if (*ptr == '/') {
-	*ptr = '\\';
-      }
-      ptr++; cmdptr++;
-    }
-    while (*cmdptr && isSPACE( *cmdptr)) {
-      cmdptr++;
-    }
-    *ptr = '\0';
-    ret = epoc_spawn( argv0, cmdptr);
-    free( argv0);
-    return ret;
+    dTHX;
+    return system( cmd);
 }
 
 int
 do_aspawn ( void *vreally, void **vmark, void **vsp) {
 
-    dTHXo;
+    dTHX;
 
     SV *really = (SV*)vreally;
     SV **mark = (SV**)vmark;
@@ -134,12 +35,11 @@ do_aspawn ( void *vreally, void **vmark, void **vsp) {
     char **argv;
     char *str;
     char *p2, **ptr;
-    char *cmd, *cmdline;
+    char *cmd;
 
 
     int  rc;
     int index = 0;
-    int len = 0;
 
     if (sp<=mark)
       return -1;
@@ -151,30 +51,13 @@ do_aspawn ( void *vreally, void **vmark, void **vsp) {
 	argv[index] = str;
       else
 	argv[index] = "";
-      
-      len += strlen(argv[ index++]) + 1;
     }
     argv[index++] = 0;
 
     cmd = strdup((const char*)(really ? SvPV_nolen(really) : argv[0]));
 
-    for (p2=cmd; *p2 != '\0'; p2++) {
-      /* Change / to \ */
-      if ( *p2 == '/') 
-	*p2 = '\\';
-    }
-      
-    cmdline = (char * ) malloc( len + 1);
-    cmdline[ 0] = '\0';
-    while (*argv != NULL) {
-      strcat( cmdline, *ptr++);
-      strcat( cmdline, " ");
-    }
-    
+    rc = spawnvp( P_WAIT, cmd, argv);
     free( argv);
-
-    rc = epoc_spawn( cmd, cmdline);
-    free( cmdline);
     free( cmd);
 
     return rc;
@@ -222,6 +105,9 @@ XS(epoc_getcwd)   /* more or less stolen from win32.c */
 	EXTEND(SP,1);
 	SvPOK_on(sv);
 	ST(0) = sv;
+#ifndef INCOMPLETE_TAINTS
+	SvTAINTED_on(ST(0));
+#endif
 	XSRETURN(1);
     }
     free( buffer);
@@ -232,12 +118,8 @@ XS(epoc_getcwd)   /* more or less stolen from win32.c */
 void
 Perl_init_os_extras(void)
 { 
-  dTHXo;
+  dTHX;
   char *file = __FILE__;
   newXS("EPOC::getcwd", epoc_getcwd, file);
 }
 
-void
-Perl_my_setenv(pTHX_ char *nam,char *val) {
-  setenv( nam, val, 1);
-}
diff --git a/gnu/usr.bin/perl/epoc/epoc_stubs.c b/gnu/usr.bin/perl/epoc/epoc_stubs.c
index c1c6bcf9e09..2d1b09daf69 100644
--- a/gnu/usr.bin/perl/epoc/epoc_stubs.c
+++ b/gnu/usr.bin/perl/epoc/epoc_stubs.c
@@ -6,62 +6,13 @@
  *
  */
 
-#include <string.h>
-
-int getgid() {return 0;}
-int getegid() {return 0;}
-int geteuid() {return 0;}
-int getuid() {return 0;}
 int setgid() {return -1;}
 int setuid() {return -1;}
 
-
-int Perl_my_popen( int a, int b) {
-	 return NULL;
-}
-int Perl_my_pclose( int a) {
-	 return NULL;
-}
-
-int kill() {return -1;}
-signal() { }
-
 int execv() { return -1;}
 int execvp() { return -1;}
 
 void Perl_do_exec() {}
 
-/*------------------------------------------------------------------*/
-/* Two dummy functions implement getproto*                          */
-/*------------------------------------------------------------------*/
-#include <sys/types.h>
-#include <netdb.h>
-#include <netinet/in.h>
-
-
-static struct protoent protos[2] = {
-  {"tcp",  NULL, IPPROTO_TCP} ,
-  {"udp",  NULL, IPPROTO_UDP}};
-
-struct protoent *getprotobyname (const char *st) {
-    
-  if (!strcmp( st, "tcp")) { 
-    return &protos[0];
-  }
-  if (!strcmp( st, "udp")) { 
-    return &protos[1];
-  }
-  return NULL;
-}
-
-struct protoent *getprotobynumber ( int i) {
-  if (i == IPPROTO_TCP) {
-     return &protos[0];
-  }
-  if (i == IPPROTO_UDP) {
-    return &protos[1];
-  }
-  return NULL;
-}
 
 
diff --git a/gnu/usr.bin/perl/epoc/epocish.c b/gnu/usr.bin/perl/epoc/epocish.c
index a8b95972d0e..d457fffcb08 100644
--- a/gnu/usr.bin/perl/epoc/epocish.c
+++ b/gnu/usr.bin/perl/epoc/epocish.c
@@ -15,42 +15,6 @@
 
 extern "C" { 
 
-#if 1
-int
-epoc_spawn( char *cmd, char *cmdline) {
-  RProcess p;
-  TRequestStatus status;
-  TInt rc;
-
-  rc = p.Create( _L( cmd), _L( cmdline));
-  if (rc != KErrNone) {
-    return -1;
-  }
-
-  p.Resume();
-  
-  p.Logon( status);
-  User::WaitForRequest( status);
-  p.Kill( 0);
-  if (status!=KErrNone) {
-    return -1;
-  }
-  return 0;
-}
-#else 
-int
-epoc_spawn( char *cmd, char *cmdline) {
-  int len = strlen(cmd) + strlen(cmdline) + 4;
-  char *n = (char *) malloc( len);
-  int r;
-  strcpy( n, cmd);
-  strcat( n, " ");
-  strcat( n, cmdline);
-  r = system( n);
-  free( n);
-  return r;
-}
-#endif 
 
 /* Workaround for defect strtoul(). Values with leading + are zero */
 
@@ -61,19 +25,6 @@ unsigned long int epoc_strtoul(const char *nptr, char **endptr,
   return strtoul( nptr, endptr, base);
 }
 
-/* Workaround for defect atof(), see java defect list for epoc */
-double epoc_atof( char* str) {
-    TReal64 aRes;
-    
-    while (TChar( *str).IsSpace()) {
-      str++;
-    }
-
-    TLex lex( _L( str));
-    TInt err = lex.Val( aRes, TChar( '.'));
-    return aRes;
-}
-
 void epoc_gcvt( double x, int digits, unsigned char *buf) {
     TRealFormat trel;
 
@@ -87,8 +38,4 @@ void epoc_gcvt( double x, int digits, unsigned char *buf) {
   }
 }
 
-#if 0
-void epoc_spawn_posix_server() {
-  SpawnPosixServerThread(); 
-}
-#endif
+
diff --git a/gnu/usr.bin/perl/epoc/epocish.h b/gnu/usr.bin/perl/epoc/epocish.h
index e365fa2c25d..b9556753cd9 100644
--- a/gnu/usr.bin/perl/epoc/epocish.h
+++ b/gnu/usr.bin/perl/epoc/epocish.h
@@ -105,16 +105,17 @@
 #define Fflush(fp)         fflush(fp)
 #define Mkdir(path,mode)   mkdir((path),(mode))
 
-/* these should be set in a hint file, not here */
+
+/* epocemx setenv bug workaround */
 #ifndef PERL_SYS_INIT
-#    define PERL_SYS_INIT(c,v)  Perl_epoc_init(c,v);   MALLOC_INIT
+#    define PERL_SYS_INIT(c,v)    putenv(".dummy=foo"); putenv(".dummy"); MALLOC_INIT
 #endif
 
 #ifndef PERL_SYS_TERM
 #define PERL_SYS_TERM()		MALLOC_TERM
 #endif
 
-#define BIT_BUCKET "NUL:"
+#define BIT_BUCKET "/dev/null"
 
 #define dXSUB_SYS
 
@@ -122,11 +123,15 @@
 #define  BOGUS_GETNAME_RETURN 8
 
 /* 
-   read() on a socket blocks until buf is filled completly, 
-   recv() returns each massage 
+   read() on a socket is unimplemented in current epocemx
+   use recv() instead
 */
+
 #define PERL_SOCK_SYSREAD_IS_RECV
 
+/* write ditto, use send */
+#define PERL_SOCK_SYSWRITE_IS_SEND
+
 /* No /dev/random available*/
 
 #define PERL_NO_DEV_RANDOM
@@ -136,10 +141,16 @@
    atof() in ER5 stdlib depends on locale. 
 */
 
-double epoc_atof( const char *ptr);
-#define atof(a) epoc_atof(a)
 #define strtoul(a,b,c) epoc_strtoul(a,b,c)
 
 #define init_os_extras Perl_init_os_extras
 
-#define NO_ENVIRON_ARRAY
+#define ARG_MAX 4096
+
+#define ECONNABORTED 0xdead
+
+/* For environ */
+#include <emx.h>
+#define PERL_USE_SAFE_PUTENV
+
+