ports/77452: [PATCH] devel/subversion: fix broken patch.

[Andrey Slusar]

>Number:         77452
>Category:       ports
>Synopsis:       [PATCH] devel/subversion: fix broken patch.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 13 13:10:26 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Slusar
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.3-STABLE FreeBSD 5.3-STABLE #0: Wed Feb 2 00:58:56 EET 2005 anray at santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
>Description:
files/patch-patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
is incorrect.
>How-To-Repeat:
	cd ports/devel/subversion && make patch:
	===>  Patching for subversion-1.1.3
	===>  Applying FreeBSD patches for subversion-1.1.3
	1 out of 6 hunks failed--saving rejects to subversion/bindings/swig/perl/native/Makefile.PL.in.rej
	=> Patch patch-subversion::bindings::swig::perl::natives::Makefle.PL.in failed to apply cleanly.
	=> Patch(es) patch-ac-helpers::ltmain.sh patch-subversion::bindings::swig::perl::native::Makefile.PL.in patch-subversion::bindings::swig::perl::natives::Base.pm applied cleanly.
	*** Error code 1

	Stop in /usr/ports/devel/subversion.
>Fix:

--- subversion.diff begins here ---
diff -ru devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in devel/subversion.new/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
--- devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in	Fri Nov  5 17:42:05 2004
+++ devel/subversion.new/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in	Mon Feb  7 02:52:30 2005
@@ -1,5 +1,5 @@
---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	2004-09-14 20:32:08.000000000 +0400
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in	2004-11-05 11:51:01.000000000 +0300
+--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	Mon Feb  7 02:46:34 2005
++++ subversion/bindings/swig/perl/native/Makefile.PL.in	Mon Feb  7 02:51:08 2005
 @@ -1,4 +1,5 @@
 -#!/usr/bin/perl
 +#!/usr/bin/perl -w
@@ -20,15 +20,7 @@
  my $swig_version = @SWIG_VERSION@;
  my $swig = '@SWIG@';
  
-@@ -41,15 +48,14 @@
- 
- my %config = (
-     ABSTRACT => 'Perl bindings for Subversion',
--    INC  => join(' ',$apr_cflags, $apu_cflags, 
-+    INC  => join(' ',$ENV{'CCFLAGS'} || '',$apr_cflags, $apu_cflags, 
-                  " -I$swig_srcdir/perl/libsvn_swig_perl",
-                  " -I$svnlib_srcdir/include",
-                  " -I$swig_srcdir -g"),
+@@ -48,8 +55,7 @@
      OBJECT => q/$(O_FILES)/,
      LIBS => [join(' ', $apr_ldflags,
                    (map {$_ = abs_path($_); "-L$_"} @ldpaths),
--- subversion.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: