Change 11421 by pudge@pudge-mobile on 2001/07/20 18:03:28
Add Filter::Util::Call to config/make files; edit utils
to recognize the module (it was descended too far down).
Bump version to 5.6.1a4.
Affected files ...
... //depot/maint-5.6/macperl/macos/InstallBLIB#2 edit
... //depot/maint-5.6/macperl/macos/MPVersion.r#2 edit
... //depot/maint-5.6/macperl/macos/Makefile.mk#4 edit
... //depot/maint-5.6/macperl/macos/config.sh#4 edit
... //depot/maint-5.6/macperl/macos/lib/ExtUtils/MM_MacOS.pm#2 edit
... //depot/maint-5.6/macperl/macos/macperl/Makefile.mk#4 edit
... //depot/maint-5.6/macperl/macos/xsubpp.patch#3 edit
Differences ...
==== //depot/maint-5.6/macperl/macos/InstallBLIB#2 (text) ====
Index: perl/macos/InstallBLIB
--- perl/macos/InstallBLIB.~1~ Fri Jul 20 12:15:06 2001
+++ perl/macos/InstallBLIB Fri Jul 20 12:15:06 2001
@@ -5,7 +5,7 @@
$name = shift;
if (($prefix) = $name =~ /(.*::)/) {
- $prefix =~ s/::/:/;
+ $prefix =~ s/::/:/g;
}
$mkpath = shift;
==== //depot/maint-5.6/macperl/macos/MPVersion.r#2 (text) ====
Index: perl/macos/MPVersion.r
--- perl/macos/MPVersion.r.~1~ Fri Jul 20 12:15:06 2001
+++ perl/macos/MPVersion.r Fri Jul 20 12:15:06 2001
@@ -20,9 +20,9 @@
*
*/
-#define MPDate "2001-07-07"
-#define MPVersionStr "5.6.1a3"
+#define MPDate "2001-07-20"
+#define MPVersionStr "5.6.1a4"
#define MPRevision 0x05
#define MPVersion 0x61
-#define MPBuild 0x03
+#define MPBuild 0x04
#define MPState alpha
==== //depot/maint-5.6/macperl/macos/Makefile.mk#4 (text) ====
Index: perl/macos/Makefile.mk
--- perl/macos/Makefile.mk.~1~ Fri Jul 20 12:15:06 2001
+++ perl/macos/Makefile.mk Fri Jul 20 12:15:06 2001
@@ -126,15 +126,20 @@
Dynamic_Ext_Mac = Mac
Dynamic_Ext_Std =
Dynamic_Ext_Xtr =
+Static_Lib_Mac = \
+ ExtUtils:MM_MacOS ExtUtils:Miniperl Config Errno \
+ Mac:Hooks Mac:Pane \
+ Mac:AppleEvents:Simple Mac:BuildTools Mac:Apps:Launch
+
+########
+# sync all extensions with both config.sh and macperl/Makefile.mk!
+########
Static_Ext_Xtr = \
- Time:HiRes:HiRes \
- Compress:Zlib:Zlib Digest:MD5:MD5 HTML:Parser:Parser \
- MIME:Base64:Base64 Storable:Storable List:Util:Util
+ Compress:Zlib:Zlib Digest:MD5:MD5 Filter:Util:Call:Call \
+ HTML:Parser:Parser List:Util:Util MIME:Base64:Base64 \
+ Storable:Storable Time:HiRes:HiRes
Static_Ext_Mac = \
MacPerl:MacPerl
-########
-# sync all extensions with both config.sh and macperl/Makefile.mk!
-########
Static_Ext_Std = \
B:B ByteLoader:ByteLoader Data:Dumper:Dumper DB_File:DB_File \
Devel:DProf:DProf Devel:Peek:Peek DynaLoader:DynaLoader \
@@ -146,9 +151,6 @@
# not going to be built:
# GDBM_File:GDBM_File ODBM_File:ODBM_File IPC:IPC:SysV
# SDBM_File:SDBM_File Sys:Syslog:Syslog Thread:Thread
-Static_Lib_Mac = \
- ExtUtils:MM_MacOS ExtUtils:Miniperl Config Errno \
- Mac:Hooks Mac:Pane
Static_Ext_AutoInit = $(Static_Ext_Mac) $(Static_Ext_Std) $(Static_Ext_Xtr)
More_Static_Ext = OSA XL
==== //depot/maint-5.6/macperl/macos/config.sh#4 (text) ====
Index: perl/macos/config.sh
--- perl/macos/config.sh.~1~ Fri Jul 20 12:15:06 2001
+++ perl/macos/config.sh Fri Jul 20 12:15:06 2001
@@ -418,7 +418,7 @@
eunicefix=':'
exe_ext=''
expr='expr'
-extensions='B ByteLoader Data/Dumper DB_File Devel/DProf Devel/Peek DynaLoader Fcntl
File/Glob IO NDBM_File Opcode POSIX Socket Sys/Hostname attrs re Compress/Zlib
Digest/MD5 HTML/Parser List/Util MIME/Base64 Storable Time/HiRes'
+extensions='B ByteLoader Data/Dumper DB_File Devel/DProf Devel/Peek DynaLoader Fcntl
+File/Glob IO NDBM_File Opcode POSIX Socket Sys/Hostname attrs re Filter/Util/Call
+Compress/Zlib Digest/MD5 HTML/Parser List/Util MIME/Base64 Storable Time/HiRes'
fflushNULL='define'
fflushall='undef'
find=''
@@ -735,7 +735,7 @@
ssizetype='ssize_t'
startperl="Perl -Sx \"{0}\" {\"Parameters\"}; Exit {Status}\n#!perl"
startsh=''
-static_ext='B ByteLoader Data/Dumper DB_File Devel/DProf Devel/Peek DynaLoader Fcntl
File/Glob IO NDBM_File Opcode POSIX Socket Sys/Hostname attrs re Compress/Zlib
Digest/MD5 HTML/Parser List/Util MIME/Base64 Storable Time/HiRes'
+static_ext='B ByteLoader Data/Dumper DB_File Devel/DProf Devel/Peek DynaLoader Fcntl
+File/Glob IO NDBM_File Opcode POSIX Socket Sys/Hostname attrs re Filter/Util/Call
+Compress/Zlib Digest/MD5 HTML/Parser List/Util MIME/Base64 Storable Time/HiRes'
stdchar='char'
stdio_base=''
stdio_bufsiz=''
==== //depot/maint-5.6/macperl/macos/lib/ExtUtils/MM_MacOS.pm#2 (text) ====
Index: perl/macos/lib/ExtUtils/MM_MacOS.pm
--- perl/macos/lib/ExtUtils/MM_MacOS.pm.~1~ Fri Jul 20 12:15:06 2001
+++ perl/macos/lib/ExtUtils/MM_MacOS.pm Fri Jul 20 12:15:06 2001
@@ -267,7 +267,7 @@
unless ($self->{PERL_SRC}){
my($dir);
- foreach $dir (qw(:: ::: :::: :::::)){
+ foreach $dir (qw(:: ::: :::: ::::: ::::::)){
if (-f "${dir}perl.h") {
$self->{PERL_SRC}=$dir ;
last;
==== //depot/maint-5.6/macperl/macos/macperl/Makefile.mk#4 (text) ====
Index: perl/macos/macperl/Makefile.mk
--- perl/macos/macperl/Makefile.mk.~1~ Fri Jul 20 12:15:06 2001
+++ perl/macos/macperl/Makefile.mk Fri Jul 20 12:15:06 2001
@@ -13,7 +13,7 @@
DB = $(PERL_SRC):db:
XL = $(PERL_SRC):XL:
GD = :perl:macos:ext:GD:libgd:
-AEGizmos = ::::AEGizmos:
+AEGizmos = $(PERL_SRC):AEGizmos:
IC = $(PERL_SRC):IC:
SFIO = "{{SFIO}}"
GUSI = "{{GUSI}}"
@@ -62,12 +62,12 @@
ObjectsMrC = {$(MacPerlSources) $(PerlSources)}.MrC.o
Static_Ext_Xtr = \
- Time:HiRes:HiRes \
- Compress:Zlib:Zlib Digest:MD5:MD5 HTML:Parser:Parser \
- MIME:Base64:Base64 Storable:Storable List:Util:Util
+ Compress:Zlib:Zlib Digest:MD5:MD5 Filter:Util:Call:Call \
+ HTML:Parser:Parser List:Util:Util MIME:Base64:Base64 \
+ Storable:Storable Time:HiRes:HiRes
Static_Ext_Mac = \
MacPerl:MacPerl
-Static_Ext_Std = \
+Static_Ext_Std = \
B:B ByteLoader:ByteLoader Data:Dumper:Dumper DB_File:DB_File \
Devel:DProf:DProf Devel:Peek:Peek DynaLoader:DynaLoader \
Fcntl:Fcntl File:Glob:Glob IO:IO \
@@ -78,7 +78,8 @@
# not going to be built:
# GDBM_File:GDBM_File ODBM_File:ODBM_File IPC:IPC:SysV
# SDBM_File:SDBM_File Sys:Syslog:Syslog Thread:Thread
-Static_Ext_Prefix = $(MACPERL_SRC)ext:{$(Static_Ext_Mac)}
$(PERL_SRC)ext:{$(Static_Ext_Std)} $(MACPERL_SRC)bundled_ext:{$(Static_Ext_Xtr)}
+
+Static_Ext_Prefix = $(MACPERL_SRC)ext:{$(Static_Ext_Mac)}
+$(PERL_SRC)ext:{$(Static_Ext_Std)} $(MACPERL_SRC)bundled_ext:{$(Static_Ext_Xtr)}
Static_Ext_AutoInit_PPC = {$(Static_Ext_Prefix)}.Lib.PPC
Static_Ext_AutoInit_68K = {$(Static_Ext_Prefix)}.Lib.68K
Static_Ext_AutoInit_SC = {$(Static_Ext_Prefix)}.Lib.SC
==== //depot/maint-5.6/macperl/macos/xsubpp.patch#3 (text) ====
Index: perl/macos/xsubpp.patch
--- perl/macos/xsubpp.patch.~1~ Fri Jul 20 12:15:06 2001
+++ perl/macos/xsubpp.patch Fri Jul 20 12:15:06 2001
@@ -21,7 +21,7 @@
}
-unshift @tm, qw(../../../../lib/ExtUtils/typemap ../../../lib/ExtUtils/typemap
+if ($Is_MacOS) { my @tmp;
-+ foreach (qw(:::: ::: :: :)) {
++ foreach (qw(::::: :::: ::: :: :)) {
+ push @tmp, "$_:lib:ExtUtils:typemap";
+ push @tmp, "$_:macos:lib:ExtUtils:typemap";
+ push @tmp, "$_:Mac:typemap";
End of Patch.
