ports/125069: lang/ruby18 make patch fails

[Dorian Büttner]

>Number:         125069
>Category:       ports
>Synopsis:       lang/ruby18 make patch fails
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 28 08:00:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Dorian Büttner
>Release:        Releng_7
>Organization:
>Environment:
i386 P4
>Description:
1st of all, I see some port update activity in 124837, so this problem might be overhauled soon anyway, but for now, the port fails to make patch. It drops a .rej to ./work/ruby-1.8.6-p111/lib/rexml/rexml.rb.rej with following content:
***************
*** 20,29 ****
  # or can be accessed
  # online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
  module REXML
-   COPYRIGHT = "Copyright \xc2\xa9 2001-2007 Sean Russell <ser at germane-software
.com>"
-   DATE = "2007/209"
-   VERSION = "3.1.7.1"
-   REVISION = "$Revision: 1.1 $".gsub(/\$Revision: 1.1 $/,'').strip

    Copyright = COPYRIGHT
    Version = VERSION
--- 22,31 ----
  # or can be accessed
  # online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
  module REXML
+   COPYRIGHT = "Copyright \xC2\xA9 2001-2006 Sean Russell <ser at germane-software
.com>"
+   VERSION = "3.1.7.2"
+   DATE = "2007/275"
+   REVISION = "$Revision: 1.1 $".gsub(/\$Revision: 1.1 $/,'').strip

    Copyright = COPYRIGHT
    Version = VERSION

which leads me to the assumtion, there there at some time mustr have been a ./work/ruby-1.8.6-p111/lib/rexml/rexml.rb file that had version 3.1.7.2 in it - make extract however places a version 3.1.7.1 of rexml.rb, which appears to be one minor number lower, right?

So the hunk in question is found in files/patch-rexml-update, and for some reason, the whole patch story is against ruby-1.8.6.114 'though the version to extract seems to be ruby-1.8.6.111_4,1 - I believe maintainer should look at here...


>How-To-Repeat:
cd /usr/ports/lang/ruby18
make extract
make patch
>Fix:
make patch drops a .rej to ./work/ruby-1.8.6-p111/lib/rexml/rexml.rb.rej with following content:
***************
*** 20,29 ****
  # or can be accessed
  # online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
  module REXML
-   COPYRIGHT = "Copyright \xc2\xa9 2001-2007 Sean Russell <ser at germane-software
.com>"
-   DATE = "2007/209"
-   VERSION = "3.1.7.1"
-   REVISION = "$Revision: 1.1 $".gsub(/\$Revision: 1.1 $/,'').strip

    Copyright = COPYRIGHT
    Version = VERSION
--- 22,31 ----
  # or can be accessed
  # online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
  module REXML
+   COPYRIGHT = "Copyright \xC2\xA9 2001-2006 Sean Russell <ser at germane-software
.com>"
+   VERSION = "3.1.7.2"
+   DATE = "2007/275"
+   REVISION = "$Revision: 1.1 $".gsub(/\$Revision: 1.1 $/,'').strip

    Copyright = COPYRIGHT
    Version = VERSION

which leads me to the assumtion, there there at some time mustr have been a ./work/ruby-1.8.6-p111/lib/rexml/rexml.rb file that had version 3.1.7.2 in it - make extract however places a version 3.1.7.1 of rexml.rb, which appears to be one minor number lower, right?

So the hunk in question is found in files/patch-rexml-update, and for some reason, the whole patch story is against ruby-1.8.6.114 'though the version to extract seems to be ruby-1.8.6.111_4,1 - I believe maintainer should look at here...

In the end, what I did is to remove the patch-part to rexml.rb from patch-rexml-update and the ruby story builds fine again.

I hope my ports-tree isn't messed up and that somebody else can see this problem.


Patch attached with submission follows:

--- files/patch-rexml-update.orig	2008-06-28 09:11:02.000000000 +0200
+++ files/patch-rexml-update	2008-06-28 09:14:35.000000000 +0200
@@ -253,41 +253,6 @@
          rescue
            raise ParseException.new( $!.message, @parser.source, @parser, $! )
          end
-diff -ruN ruby-1.8.6-p111/lib/rexml/rexml.rb ruby-1.8.6-p114/lib/rexml/rexml.rb
---- lib/rexml/rexml.rb	2007-07-28 17:24:46.000000000 +0400
-+++ lib/rexml/rexml.rb	2007-11-04 07:50:15.000000000 +0300
-@@ -1,3 +1,4 @@
-+# -*- encoding: utf-8 -*-
- # REXML is an XML toolkit for Ruby[http://www.ruby-lang.org], in Ruby.
- #
- # REXML is a _pure_ Ruby, XML 1.0 conforming,
-@@ -10,8 +11,9 @@
- #
- # Main page:: http://www.germane-software.com/software/rexml
- # Author:: Sean Russell <serATgermaneHYPHENsoftwareDOTcom>
--# Version:: 3.1.7.1
--# Date:: 2007/209
-+# Version:: 3.1.7.2
-+# Date:: 2007/275
-+# Revision:: $Revision: 1.1 $
- # 
- # This API documentation can be downloaded from the REXML home page, or can
- # be accessed online[http://www.germane-software.com/software/rexml_doc]
-@@ -20,10 +22,10 @@
- # or can be accessed 
- # online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
- module REXML
--  COPYRIGHT = "Copyright © 2001-2007 Sean Russell <ser at germane-software.com>"
--  DATE = "2007/209"
--  VERSION = "3.1.7.1"
--  REVISION = "$Revision: 1.1 $".gsub(/\$Revision: 1.1 $/,'').strip
-+  COPYRIGHT = "Copyright \xC2\xA9 2001-2006 Sean Russell <ser at germane-software.com>"
-+  VERSION = "3.1.7.2"
-+  DATE = "2007/275"
-+  REVISION = "$Revision: 1.1 $".gsub(/\$Revision: 1.1 $/,'').strip
- 
-   Copyright = COPYRIGHT
-   Version = VERSION
 diff -ruN ruby-1.8.6-p111/lib/rexml/source.rb ruby-1.8.6-p114/lib/rexml/source.rb
 --- lib/rexml/source.rb	2007-07-28 06:46:08.000000000 +0400
 +++ lib/rexml/source.rb	2007-11-04 07:50:15.000000000 +0300


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