Change 16940: Fix various Makefile.PL for string/array conflicts

Change 16940 by pudge@pudge-mobile on 2002/05/31 20:49:19

	Fix various Makefile.PL for string/array conflicts

Affected files ...

.... //depot/macperl/macos/ext/Mac/Controls/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Dialogs/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Events/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Files/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Fonts/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Lists/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Menus/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/MoreFiles/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Movies/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Navigation/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Notification/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/OSA/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/QDOffscreen/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/QuickTimeVR/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/SAT/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Sound/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/StandardFile/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/TextEdit/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/Mac/Windows/Makefile.PL#2 edit
.... //depot/macperl/macos/ext/MacPerl/Makefile.PL#2 edit

Differences ...

==== //depot/macperl/macos/ext/Mac/Controls/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Controls/Makefile.PL
--- macperl/macos/ext/Mac/Controls/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Controls/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::Controls),
 	'VERSION_FROM'		=> 'Controls.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap',
+	TYPEMAPS		=> ['::QuickDraw:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/Dialogs/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Dialogs/Makefile.PL
--- macperl/macos/ext/Mac/Dialogs/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Dialogs/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::Dialogs),
 	'VERSION_FROM'		=> 'Dialogs.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap ::Controls:typemap ::Events:typemap',
+	TYPEMAPS		=> [qw'::QuickDraw:typemap ::Controls:typemap ::Events:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/Events/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Events/Makefile.PL
--- macperl/macos/ext/Mac/Events/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Events/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::Events),
 	'VERSION_FROM'		=> 'Events.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap',
+	TYPEMAPS		=> ['::QuickDraw:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/Files/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Files/Makefile.PL
--- macperl/macos/ext/Mac/Files/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Files/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::Files),
 	'VERSION_FROM'		=> 'Files.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap',
+	TYPEMAPS		=> ['::QuickDraw:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/Fonts/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Fonts/Makefile.PL
--- macperl/macos/ext/Mac/Fonts/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Fonts/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::Fonts),
 	'VERSION_FROM'		=> 'Fonts.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap',
+	TYPEMAPS		=> ['::QuickDraw:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/Lists/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Lists/Makefile.PL
--- macperl/macos/ext/Mac/Lists/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Lists/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::Lists),
 	'VERSION_FROM'		=> 'Lists.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap ::Controls:typemap',
+	TYPEMAPS		=> [qw'::QuickDraw:typemap ::Controls:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/Menus/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Menus/Makefile.PL
--- macperl/macos/ext/Mac/Menus/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Menus/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::Menus),
 	'VERSION_FROM'		=> 'Menus.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap',
+	TYPEMAPS		=> ['::QuickDraw:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/MoreFiles/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/MoreFiles/Makefile.PL
--- macperl/macos/ext/Mac/MoreFiles/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/MoreFiles/Makefile.PL	Fri May 31 13:49:19 2002
@@ -3,7 +3,7 @@
 WriteMakefile(
 	NAME			=> q(Mac::MoreFiles),
 	'VERSION_FROM'		=> 'MoreFiles.pm',
-	'LINKTYPE'		=> ['static', 'dynamic'],
+	'LINKTYPE'		=> 'static dynamic',
 	XSPROTOARG 		=> '-noprototypes', 		# XXX remove later?
 	'INC'			=> '-i "$(PERL_SRC):MoreFiles:CHeaders:"',
 	OBJECT			=> 'MF.c'

==== //depot/macperl/macos/ext/Mac/Movies/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Movies/Makefile.PL
--- macperl/macos/ext/Mac/Movies/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Movies/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,7 +4,7 @@
 	NAME			=> q(Mac::Movies),
 	'VERSION_FROM'		=> 'Movies.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS  		=> '::Components:typemap ::Events:typemap ::QuickDraw:typemap ::QDOffscreen:typemap ::Menus:typemap',
+	TYPEMAPS  		=> [qw'::Components:typemap ::Events:typemap ::QuickDraw:typemap ::QDOffscreen:typemap ::Menus:typemap'],
 	XSPROTOARG 		=> '-noprototypes', 		# XXX remove later?
 	MACLIBS_SHARED		=> '"{{SharedLibraries}}"QuickTimeLib',   # e.g., '-lm' 
 );

==== //depot/macperl/macos/ext/Mac/Navigation/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Navigation/Makefile.PL
--- macperl/macos/ext/Mac/Navigation/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Navigation/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,7 +4,7 @@
 	NAME			=> q(Mac::Navigation),
 	'VERSION_FROM'	=> 'Navigation.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> 'typemap ::Events:typemap ::Files:typemap ::QuickDraw:typemap',
+	TYPEMAPS		=> [qw'typemap ::Events:typemap ::Files:typemap ::QuickDraw:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 	'MACLIBS_SHARED'=> '"{{SharedLibraries}}"NavigationLib',   # e.g., '-lm' 
 );

==== //depot/macperl/macos/ext/Mac/Notification/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Notification/Makefile.PL
--- macperl/macos/ext/Mac/Notification/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Notification/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::Notification),
 	'VERSION_FROM'		=> 'Notification.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> 'typemap',
+	TYPEMAPS		=> ['typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/OSA/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/OSA/Makefile.PL
--- macperl/macos/ext/Mac/OSA/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/OSA/Makefile.PL	Fri May 31 13:49:19 2002
@@ -5,6 +5,6 @@
 	'VERSION_FROM'		=> 'OSA.pm',
 	'LINKTYPE'		=> 'static dynamic',
 	XSPROTOARG 		=> '-noprototypes', 		# XXX remove later?
-	TYPEMAPS   		=> '::Components:typemap',
+	TYPEMAPS   		=> ['::Components:typemap'],
 	MACLIBS_SHARED		=> '"{{SharedLibraries}}"AppleScriptLib',   # e.g., '-lm' 
 );

==== //depot/macperl/macos/ext/Mac/QDOffscreen/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/QDOffscreen/Makefile.PL
--- macperl/macos/ext/Mac/QDOffscreen/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/QDOffscreen/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::QDOffscreen),
 	'VERSION_FROM'		=> 'QDOffscreen.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap',
+	TYPEMAPS		=> ['::QuickDraw:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/QuickTimeVR/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/QuickTimeVR/Makefile.PL
--- macperl/macos/ext/Mac/QuickTimeVR/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/QuickTimeVR/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,7 +4,7 @@
 	NAME			=> q(Mac::QuickTimeVR),
 	'VERSION_FROM'		=> 'QuickTimeVR.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS   		=> '::Components:typemap ::Movies:typemap ::QuickDraw:typemap',
+	TYPEMAPS   		=> [qw'::Components:typemap ::Movies:typemap ::QuickDraw:typemap'],
 	XSPROTOARG 		=> '-noprototypes', 		# XXX remove later?
 	'MACLIBS_ALL_PPC'	=> '"{{SharedLibraries}}"QuickTimeVRLib',   # e.g., '-lm' 
 );

==== //depot/macperl/macos/ext/Mac/SAT/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/SAT/Makefile.PL
--- macperl/macos/ext/Mac/SAT/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/SAT/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::SAT),
 	'VERSION_FROM'		=> 'SAT.pm',
 	'LIBS'			=> [':SAT:lib:SAT(PPC).lib SATDummyCFM68KLib'],
-	TYPEMAPS		=> '::QuickDraw:typemap',
+	TYPEMAPS		=> ['::QuickDraw:typemap'],
 	'INC'			=> "-i :SAT:include"
 );

==== //depot/macperl/macos/ext/Mac/Sound/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Sound/Makefile.PL
--- macperl/macos/ext/Mac/Sound/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Sound/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,7 +4,7 @@
 	NAME			=> q(Mac::Sound),
 	'VERSION_FROM'		=> 'Sound.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS   		=> '::QuickDraw:typemap',
+	TYPEMAPS   		=> ['::QuickDraw:typemap'],
 	XSPROTOARG 		=> '-noprototypes', 		# XXX remove later?
 	'MACLIBS_SHARED'	=> '"{{SharedLibraries}}"SoundLib',   # e.g., '-lm' 
 );

==== //depot/macperl/macos/ext/Mac/StandardFile/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/StandardFile/Makefile.PL
--- macperl/macos/ext/Mac/StandardFile/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/StandardFile/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::StandardFile),
 	'VERSION_FROM'		=> 'StandardFile.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap ::Events:typemap ::Files:typemap',
+	TYPEMAPS		=> [qw'::QuickDraw:typemap ::Events:typemap ::Files:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/TextEdit/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/TextEdit/Makefile.PL
--- macperl/macos/ext/Mac/TextEdit/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/TextEdit/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::TextEdit),
 	'VERSION_FROM'		=> 'TextEdit.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap',
+	TYPEMAPS		=> ['::QuickDraw:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/Mac/Windows/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/Mac/Windows/Makefile.PL
--- macperl/macos/ext/Mac/Windows/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/Mac/Windows/Makefile.PL	Fri May 31 13:49:19 2002
@@ -4,6 +4,6 @@
 	NAME			=> q(Mac::Windows),
 	'VERSION_FROM'		=> 'Windows.pm',
 	'LINKTYPE'		=> 'static dynamic',
-	TYPEMAPS		=> '::QuickDraw:typemap ::Controls:typemap',
+	TYPEMAPS		=> ['::QuickDraw:typemap ::Controls:typemap'],
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
 );

==== //depot/macperl/macos/ext/MacPerl/Makefile.PL#2 (text) ====
Index: macperl/macos/ext/MacPerl/Makefile.PL
--- macperl/macos/ext/MacPerl/Makefile.PL#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/ext/MacPerl/Makefile.PL	Fri May 31 13:49:19 2002
@@ -2,7 +2,7 @@
 
 WriteMakefile(
 	'NAME' 		=> q(MacPerl),
-    	'LINKTYPE'	=> ['static'],
+    	'LINKTYPE'	=> 'static',
 	SKIP		=> [qw(dynamic dynamic_lib dynamic_bs)],
 	'OBJECT'   	=> 'MacPerl.c XL.c OSA.c',
 	'INC' 		=> "-i :::::XL:"
End of Patch.