ports/56385: [patch] Authors of textproc/redland re-rolled distfile

[Simon Barner]

>Number:         56385
>Category:       ports
>Synopsis:       [patch] Authors of textproc/redland re-rolled distfile
>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:   Wed Sep 03 16:30:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Simon Barner
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD zi025.glhnet.mhn.de 4.8-STABLE FreeBSD 4.8-STABLE #0: Thu Aug 7 04:04:01 CEST 2003 toor at zi025.glhnet.mhn.de:/usr/src/sys/compile/KISTE i386

>Description:

The contents of the port's distfile changed without a version bump.
Luckyly, the authors have put both versions on their web server

http://www.redland.opensource.ac.uk/dist/source/old/redland-0.9.13-orig.tar.gz
http://www.redland.opensource.ac.uk/dist/source/redland-0.9.13.tar.gz.

There seem to be only minor modifications between those versions. For
your reference, here is a diff:

diff -urN orig/redland-0.9.13/perl/lib/RDF/Redland/Node.pm new/redland-0.9.13/perl/lib/RDF/Redland/Node.pm
--- orig/redland-0.9.13/perl/lib/RDF/Redland/Node.pm	Sat Aug 23 23:13:37 2003
+++ new/redland-0.9.13/perl/lib/RDF/Redland/Node.pm	Thu Aug 28 21:54:01 2003
@@ -2,7 +2,7 @@
 #
 # Node.pm - Redland Perl RDF Node module
 #
-# $Id: Node.pm,v 1.32 2003/08/23 20:33:34 cmdjb Exp $
+# $Id: Node.pm,v 1.34 2003/08/28 19:49:56 cmdjb Exp $
 #
 # Copyright (C) 2000-2001 David Beckett - http://purl.org/net/dajobe/
 # Institute for Learning and Research Technology - http://www.ilrt.org/
@@ -94,11 +94,11 @@
   if($arg) {
     if(my $arg_class=ref($arg)) {
       # Try several classes
-      if(UNIVERSAL::isa($arg_class, 'RDF::Redland::Node')) {
+      if(UNIVERSAL::isa($arg, 'RDF::Redland::Node')) {
         return $arg->clone;
-      } elsif(UNIVERSAL::isa($arg_class, 'RDF::Redland::URI')) {
+      } elsif(UNIVERSAL::isa($arg, 'RDF::Redland::URI')) {
         $self->{NODE}=&RDF::Redland::CORE::librdf_new_node_from_uri_string($RDF::Redland::World->{WORLD},$arg->as_string);
-      } elsif (UNIVERSAL::isa($arg_class, 'URI')) {
+      } elsif (UNIVERSAL::isa($arg, 'URI::URL')) {
 	$self->{NODE}=&RDF::Redland::CORE::librdf_new_node_from_uri_string($RDF::Redland::World->{WORLD},$arg->as_string);
       } else {
 	die "RDF::Redland::Node::new - Cannot make a node from an object of class $arg_class\n";
@@ -142,9 +142,9 @@
   my $class = ref($proto) || $proto;
   my $self  = {};
   if(my $class=ref $arg) {
-    if(UNIVERSAL::isa($class, 'RDF::Redland::URI')) {
+    if(UNIVERSAL::isa($arg, 'RDF::Redland::URI')) {
       $self->{NODE}=&RDF::Redland::CORE::librdf_new_node_from_uri($RDF::Redland::World->{WORLD},$arg->{URI});
-    } elsif (UNIVERSAL::isa($class, 'URI')) {
+    } elsif (UNIVERSAL::isa($arg, 'URI::URL')) {
       $self->{NODE}=&RDF::Redland::CORE::librdf_new_node_from_uri_string($RDF::Redland::World->{WORLD},$arg->as_string);
     } else {
       die "RDF::Redland::Node::new_from_uri - Cannot make a Node from an object of class $class\n";
@@ -185,9 +185,9 @@
   my $self  = {};
   my $dt_uri=undef;
   if(defined $dt) {
-    if(my $class=ref $dt && UNIVERSAL::isa($class, 'RDF::Redland::URI')) {
+    if(UNIVERSAL::isa($dt, 'RDF::Redland::URI')) {
       $dt_uri=$dt;
-    } elsif (UNIVERSAL::isa($class, 'URI')) {
+    } elsif (UNIVERSAL::isa($dt, 'URI::URL')) {
       $dt_uri=new RDF::Redland::URI($dt->as_string);
     } else {
       $dt_uri=new RDF::Redland::URI($dt);
@@ -449,12 +449,11 @@
 # from other perl objects.
 sub _ensure ($) {
   my $node=shift;
-  my $class=ref($node);
-  if(UNIVERSAL::isa($class, 'RDF::Redland::Node')) {
+  if(UNIVERSAL::isa($node, 'RDF::Redland::Node')) {
     $node=&RDF::Redland::CORE::librdf_new_node_from_node($node->{NODE});
-  } elsif(UNIVERSAL::isa($class, 'RDF::Redland::URI')) {
+  } elsif(UNIVERSAL::isa($node, 'RDF::Redland::URI')) {
     $node=&RDF::Redland::CORE::librdf_new_node_from_uri($RDF::Redland::World->{WORLD},$node->{URI});
-  } elsif (UNIVERSAL::isa($class, 'URI')) {
+  } elsif (UNIVERSAL::isa($node, 'URI::URL')) {
     $node=&RDF::Redland::CORE::librdf_new_node_from_uri_string($RDF::Redland::World->{WORLD},$node->as_string);	
   } else {
     $node=undef;
diff -urN orig/redland-0.9.13/perl/lib/RDF/Redland/URI.pm new/redland-0.9.13/perl/lib/RDF/Redland/URI.pm
--- orig/redland-0.9.13/perl/lib/RDF/Redland/URI.pm	Wed Aug 20 15:26:20 2003
+++ new/redland-0.9.13/perl/lib/RDF/Redland/URI.pm	Thu Aug 28 21:54:01 2003
@@ -2,7 +2,7 @@
 #
 # URI.pm - Redland Perl RDF URI module
 #
-# $Id: URI.pm,v 1.14 2003/08/20 13:26:20 cmdjb Exp $
+# $Id: URI.pm,v 1.18 2003/08/28 19:49:58 cmdjb Exp $
 #
 # Copyright (C) 2000-2001 David Beckett - http://purl.org/net/dajobe/
 # Institute for Learning and Research Technology - http://www.ilrt.org/
@@ -67,13 +67,13 @@
   my $class = ref($proto) || $proto;
   my $self  = {};
 
-  if(ref($arg)) {
-    if(UNIVERSAL::isa($class, 'RDF::Redland::URI')) {
-      return $self->clone;
-    } elsif($class =~ '^URI') {
+  if(my $arg_class=ref($arg)) {
+    if(UNIVERSAL::isa($arg, 'RDF::Redland::URI')) {
+      return $arg->clone;
+    } elsif (UNIVERSAL::isa($arg, 'URI::URL')) {
       $arg=$arg->as_string;
     } else {
-      die "RDF::Redland::URI::new - Cannot make a URI from an object of class $class\n";
+      die "RDF::Redland::URI::new - Cannot make a URI from an object of class $arg_class\n";
     }
   }
   

>How-To-Repeat:

>Fix:
Update the md5 to the new version (patch enclosed).

--- distinfo.orig       Wed Sep  3 02:13:57 2003
+++ distinfo    Thu Sep  4 01:26:58 2003
@@ -1 +1 @@
-MD5 (redland-0.9.13.tar.gz) = 090d3da7a8a063c5292243637e4719b9
+MD5 (redland-0.9.13.tar.gz) = 8ae0f6e001d84c4381cd91f28b498282
>Release-Note:
>Audit-Trail:
>Unformatted: