diff options
Diffstat (limited to 'devel/p5-P4-Client/files')
-rw-r--r-- | devel/p5-P4-Client/files/patch-Client.xs | 11 | ||||
-rw-r--r-- | devel/p5-P4-Client/files/patch-Makefile.PL | 55 |
2 files changed, 66 insertions, 0 deletions
diff --git a/devel/p5-P4-Client/files/patch-Client.xs b/devel/p5-P4-Client/files/patch-Client.xs new file mode 100644 index 000000000000..6326f96b0dcb --- /dev/null +++ b/devel/p5-P4-Client/files/patch-Client.xs @@ -0,0 +1,11 @@ +--- ../P4-Client-2.2596/Client.xs Tue Oct 15 16:22:15 2002 ++++ Client.xs Tue Sep 2 09:45:09 2003 +@@ -131,7 +131,7 @@ static int GetFlag( const char *flag, SV + warn( "Can't dereference object!!!" ); + return 0; + } +- tmp = hv_fetch( (HV *)SvRV(obj), flag, strlen( flag ), 0 ); ++ tmp = hv_fetch( (HV *)SvRV(obj), (char *)flag, strlen( flag ), 0 ); + if ( ! tmp ) return 0; + return SvIV( *tmp ); + } diff --git a/devel/p5-P4-Client/files/patch-Makefile.PL b/devel/p5-P4-Client/files/patch-Makefile.PL new file mode 100644 index 000000000000..d2b57a9c06ef --- /dev/null +++ b/devel/p5-P4-Client/files/patch-Makefile.PL @@ -0,0 +1,55 @@ +--- ../P4-Client-2.2596/Makefile.PL Wed Apr 24 17:56:37 2002 ++++ Makefile.PL Tue Sep 2 10:17:51 2003 +@@ -68,14 +68,16 @@ before continuing. + EOF + + # Get the path to the Perforce API +- my $apipath = ""; +- print( "Where is the Perforce API to be found: " ); +- $apipath = <STDIN>; +- $apipath =~ s/\n//; +- +- # Filthy support for ~/ type paths ( NOT ~user/ though! ) +- $apipath =~ s#\~/#$ENV{HOME}/#; +- $apipath = abs_path( $apipath ); ++ my $apiinc = "%%LOCALBASE%%/include/perforce"; ++ my $apilib = "%%LOCALBASE%%/lib/perforce"; ++ # my $apipath = ""; ++ # print( "Where is the Perforce API to be found: " ); ++ # $apipath = <STDIN>; ++ # $apipath =~ s/\n//; ++ ++ # # Filthy support for ~/ type paths ( NOT ~user/ though! ) ++ # $apipath =~ s#\~/#$ENV{HOME}/#; ++ # $apipath = abs_path( $apipath ); + + # These two aren't in the hints file because some variant of them is + # needed on every OS so it's better to have it visible. +@@ -86,15 +88,15 @@ EOF + foreach my $libset (@$libs ) + { + push( @{$flags->{LIBS}}, +- "-L$apipath -lclient -lrpc -lsupp $libset" ); ++ "-L$apilib -lclient -lrpc -lsupp $libset" ); + print("Added P4 libs to $libset\n" ); + } + } + else + { +- push( @{$flags->{LIBS}}, "-L$apipath -lclient -lrpc -lsupp" ); ++ push( @{$flags->{LIBS}}, "-L$apilib -lclient -lrpc -lsupp" ); + } +- $flags->{ 'INC' } = "-I$apipath -Ilib"; ++ $flags->{ 'INC' } = "-I$apiinc -Ilib"; + + + # Last thing to do is to get the address of their perforce +@@ -107,7 +109,7 @@ the tests + + EOF + print( "Enter the address of your Perforce server: [localhost:1666]: "); +- my $p4port = <STDIN>; ++ my $p4port = ""; #<STDIN>; + $p4port =~ s/\n//; + $p4port = "localhost:1666" if ( $p4port =~ /^$/ ); + |