* fixes for ruby-1.9.

   `ftools' is not recommented prior ruby-1.8 and removed prior 1.9.
* As man page section is 8, install executables in sbin.

Bump PKGREVISION.

4 files changed, 51 insertions, 7 deletions

diff --git a/sysutils/pdumpfs/Makefile b/sysutils/pdumpfs/Makefile
index b215cbd249c..d9ba5f5a576 100644
--- a/sysutils/pdumpfs/Makefile
+++ b/sysutils/pdumpfs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/09/13 14:39:30 taca Exp $
+# $NetBSD: Makefile,v 1.11 2011/01/28 13:28:08 obache Exp $
 #
 
 DISTNAME=	pdumpfs-${VER}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://0xcc.net/pdumpfs/
 
@@ -22,11 +22,11 @@ BUILD_TARGET=	pdumpfs
 
 REPLACE_RUBY=	pdumpfs.in
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 ${PKGMANDIR}/ja_JP.EUC/man8 \
+INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8 ${PKGMANDIR}/ja_JP.EUC/man8 \
 			share/doc/pdumpfs
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/pdumpfs ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/pdumpfs ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/man/man8/pdumpfs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_MAN} ${WRKSRC}/man/ja/man8/pdumpfs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man8
 	cd ${WRKSRC}/doc && \
diff --git a/sysutils/pdumpfs/PLIST b/sysutils/pdumpfs/PLIST
index 33e5fa1df03..eeb29244bc1 100644
--- a/sysutils/pdumpfs/PLIST
+++ b/sysutils/pdumpfs/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:12 joerg Exp $
-bin/pdumpfs
+@comment $NetBSD: PLIST,v 1.3 2011/01/28 13:28:08 obache Exp $
 man/ja_JP.EUC/man8/pdumpfs.8
 man/man8/pdumpfs.8
+sbin/pdumpfs
 share/doc/pdumpfs/images/pdumpfs-ja-mini.png
 share/doc/pdumpfs/images/pdumpfs-ja.png
 share/doc/pdumpfs/images/pdumpfs-mini.png
diff --git a/sysutils/pdumpfs/distinfo b/sysutils/pdumpfs/distinfo
index 7bb8281f06a..807023e129c 100644
--- a/sysutils/pdumpfs/distinfo
+++ b/sysutils/pdumpfs/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/01/03 14:25:50 taca Exp $
+$NetBSD: distinfo,v 1.3 2011/01/28 13:28:08 obache Exp $
 
 SHA1 (pdumpfs-1.3.tar.gz) = 1ce91f0429d730fbc6e6f253d04e80226c145cdf
 RMD160 (pdumpfs-1.3.tar.gz) = a9730349347d50d06dd101b0c1d9a7b3e25777c1
 Size (pdumpfs-1.3.tar.gz) = 68210 bytes
+SHA1 (patch-aa) = 74b5aefb3272d3e65fb257566896bb7ee27730cf
diff --git a/sysutils/pdumpfs/patches/patch-aa b/sysutils/pdumpfs/patches/patch-aa
new file mode 100644
index 00000000000..94812eb55b2
--- /dev/null
+++ b/sysutils/pdumpfs/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.1 2011/01/28 13:28:08 obache Exp $
+
+`ftools' is not recommented prior ruby-1.8 and removed prior 1.9.
+
+--- pdumpfs.in.orig	2004-12-21 02:43:12.000000000 +0000
++++ pdumpfs.in
+@@ -47,8 +47,8 @@
+ # --exclude-* support by Takeshi Komiya <katsuwo@monochrome.jp>
+ #
+ 
++require 'fileutils'
+ require 'find'
+-require 'ftools'
+ require 'getoptlong'
+ require 'date'
+ 
+@@ -868,7 +868,7 @@ module Pdumpfs
+       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 @@ module Pdumpfs
+ 
+       case type
+       when "directory"
+-        File.mkpath(today)
++        FileUtils.mkpath(today)
+       when "unchanged"
+         File.force_link(latest, today)
+       when "updated"
+@@ -1089,7 +1089,7 @@ module Pdumpfs
+ 
+           case type
+           when "directory"
+-            File.mkpath(t)
++            FileUtils.mkpath(t)
+           when "new_file"
+             copy(s, t)
+           when "symlink"