Bug 179611 - running sysutils/pdumpfs fails with ruby19
Summary: running sysutils/pdumpfs fails with ruby19
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-16 10:40 UTC by TsurutaniNaoki
Modified: 2014-01-25 20:10 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (2.41 KB, patch)
2013-06-16 10:40 UTC, TsurutaniNaoki
no flags Details | Diff
pdumpfs.diff (3.27 KB, patch)
2013-06-22 13:36 UTC, TsurutaniNaoki
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description TsurutaniNaoki 2013-06-16 10:40:00 UTC
	sysutils/pdumpfs can be installed with ruby-1.9x, but it cannot run
	with ruby-1.9x.

Fix: here is a patch, which should be stored as files/patch-pdumpfs.in:
How-To-Repeat: 	% pdumpfs /home/turutani /backup/turutani
	/usr/local/lib/ruby/1.9/rubygems/custom_require.rb:36:in `require': cannot load such file -- ftools (LoadError)
	        from /usr/local/lib/ruby/1.9/rubygems/custom_require.rb:36:in `require'
	        from /usr/local/sbin/pdumpfs:51:in `<main>'
	/usr/local/sbin/pdumpfs exit with status 1.
Comment 1 TsurutaniNaoki 2013-06-22 13:36:19 UTC
Sorry, previous patch was not correct.

Here is a new patch to ports tree.
Comment 2 Steve Wills freebsd_committer freebsd_triage 2014-01-21 17:09:59 UTC
Responsible Changed
From-To: freebsd-ports-bugs->swills

I'll take it.
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-25 20:00:41 UTC
Author: swills
Date: Sat Jan 25 20:00:33 2014
New Revision: 341085
URL: http://svnweb.freebsd.org/changeset/ports/341085
QAT: https://qat.redports.org/buildarchive/r341085/

Log:
  - Fix with Ruby 1.9
  
  PR:		ports/179611
  Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>

Added:
  head/sysutils/pdumpfs/files/
  head/sysutils/pdumpfs/files/extrapatch-pdumpfs.in   (contents, props changed)
Modified:
  head/sysutils/pdumpfs/Makefile

Modified: head/sysutils/pdumpfs/Makefile
==============================================================================
--- head/sysutils/pdumpfs/Makefile	Sat Jan 25 19:45:46 2014	(r341084)
+++ head/sysutils/pdumpfs/Makefile	Sat Jan 25 20:00:33 2014	(r341085)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdumpfs
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://0xcc.net/pdumpfs/
 

Added: head/sysutils/pdumpfs/files/extrapatch-pdumpfs.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/pdumpfs/files/extrapatch-pdumpfs.in	Sat Jan 25 20:00:33 2014	(r341085)
@@ -0,0 +1,91 @@
+--- pdumpfs.in.orig	2004-12-21 11:43:12.000000000 +0900
++++ pdumpfs.in	2013-06-22 08:58:34.000000000 +0900
+@@ -48,21 +48,21 @@
+ #
+ 
+ require 'find'
+-require 'ftools'
++require 'fileutils'
+ require 'getoptlong'
+ require 'date'
+ 
+ class File
+   def self.real_file? (path)
+-    File.file?(path) and not File.symlink?(path)
++    FileTest.file?(path) and not FileTest.symlink?(path)
+   end
+ 
+   def self.anything_exist? (path)
+-    File.exist?(path) or File.symlink?(path)
++    FileTest.exist?(path) or FileTest.symlink?(path)
+   end
+ 
+   def self.real_directory? (path)
+-    File.directory?(path) and not File.symlink?(path)
++    FileTest.directory?(path) and not FileTest.symlink?(path)
+   end
+ 
+   def self.force_symlink (src, dest)
+@@ -79,7 +79,7 @@
+   end
+ 
+   def self.readable_file? (path)
+-    File.file?(path) and File.readable?(path)
++    FileTest.file?(path) and FileTest.readable?(path)
+   end
+ 
+   def self.split_all (path)
+@@ -129,7 +129,7 @@
+   GetVolumeInformation = Win32API.new("kernel32", "GetVolumeInformation",
+                                       "PPLPPPPL", "I")
+   def get_filesystem_type (path)
+-    return nil unless(File.exist?(path))
++    return nil unless(FileTest.exist?(path))
+ 
+     drive = File.expand_path(path)[0..2]
+     buff = "\0" * 1024
+@@ -868,7 +868,7 @@
+       today  = File.join(dest, datedir(start_time), base)
+ 
+       File.umask(0077)
+-      File.mkpath(today) unless @dry_run
++      FileUtils.mkpath(today) unless @dry_run
+       if latest
+         update_snapshot(src, latest, today)
+       else
+@@ -1018,7 +1018,7 @@
+ 
+       case type
+       when "directory"
+-        File.mkpath(today)
++        FileUtils.mkpath(today)
+       when "unchanged"
+         File.force_link(latest, today)
+       when "updated"
+@@ -1052,7 +1052,7 @@
+ 
+       Find.find(src) do |s|      # path of the source file
+         if @matcher.exclude?(s)
+-          if File.lstat(s).directory? then Find.prune() else next end
++          if FileTest.directory?(s) then Find.prune() else next end
+         end
+         r = make_relative_path(s, src)
+         l = File.join(latest, r)  # path of the latest  snapshot
+@@ -1077,7 +1077,7 @@
+ 
+       Find.find(src) do |s|
+         if @matcher.exclude?(s)
+-          if File.lstat(s).directory? then Find.prune() else next end
++          if FileTest.directory?(s) then Find.prune() else next end
+         end
+         r = make_relative_path(s, src)
+         t = File.join(dest, r)
+@@ -1089,7 +1089,7 @@
+ 
+           case type
+           when "directory"
+-            File.mkpath(t)
++            FileUtils.mkpath(t)
+           when "new_file"
+             copy(s, t)
+           when "symlink"
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Steve Wills freebsd_committer freebsd_triage 2014-01-25 20:00:45 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!