Update ROX-filer to version 2.10 fixing the infamous piboard error

7 files changed, 188 insertions, 130 deletions

diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index c2336307d7f..39ece286b0e 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.47 2009/08/26 19:58:20 sno Exp $
+# $NetBSD: Makefile,v 1.48 2009/11/05 19:50:54 reinoud Exp $
 #
 
-DISTNAME=	rox-2.4.1
-PKGREVISION=	9
+DISTNAME=	rox-filer-2.10
+#PKGREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://rox.sourceforge.net/
@@ -65,6 +65,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/rox/PLIST b/sysutils/rox/PLIST
index eaa9fe76d8d..e47b44a497b 100644
--- a/sysutils/rox/PLIST
+++ b/sysutils/rox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:16:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/11/05 19:50:54 reinoud Exp $
 bin/rox
 libexec/rox/ROX-Filer
 man/man1/rox.1
@@ -18,117 +18,111 @@ share/rox/ROX-Filer/Help/README
 share/rox/ROX-Filer/Help/README-es
 share/rox/ROX-Filer/Help/TODO
 share/rox/ROX-Filer/Messages/README
-share/rox/ROX-Filer/Messages/cs.gmo
-share/rox/ROX-Filer/Messages/da.gmo
-share/rox/ROX-Filer/Messages/de.gmo
-share/rox/ROX-Filer/Messages/es.gmo
-share/rox/ROX-Filer/Messages/et_EE.gmo
-share/rox/ROX-Filer/Messages/eu.gmo
-share/rox/ROX-Filer/Messages/fi.gmo
-share/rox/ROX-Filer/Messages/fr.gmo
-share/rox/ROX-Filer/Messages/hu.gmo
-share/rox/ROX-Filer/Messages/it.gmo
-share/rox/ROX-Filer/Messages/ja.gmo
-share/rox/ROX-Filer/Messages/nl.gmo
-share/rox/ROX-Filer/Messages/no.gmo
-share/rox/ROX-Filer/Messages/pl.gmo
-share/rox/ROX-Filer/Messages/pt_BR.gmo
-share/rox/ROX-Filer/Messages/pt_PT.gmo
-share/rox/ROX-Filer/Messages/ro.gmo
-share/rox/ROX-Filer/Messages/ru.gmo
-share/rox/ROX-Filer/Messages/sv.gmo
-share/rox/ROX-Filer/Messages/zh_CN.gmo
-share/rox/ROX-Filer/Messages/zh_TW.gmo
+share/rox/ROX-Filer/Messages/cs/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/da/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/de/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/es/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/et_EE/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/eu/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/fi/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/fr/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/hu/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/it/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/ja/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/nl/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/no/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/pl/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/pt_BR/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/pt_PT/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/ro/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/ru/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/sv/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/zh_CN/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/zh_TW/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Options.xml
-share/rox/ROX-Filer/ROX/MIME/mime-application.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:pdf.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:pgp.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:postscript.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.ms-access.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.ms-excel.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.ms-office.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.ms-powerpoint.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.ms-word.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.rn-realmedia.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.stardivision.writer.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.calc.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.calc.template.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.draw.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.draw.template.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.impress.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.impress.template.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.impress.template2.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.writer.global.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.writer.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:vnd.sun.xml.writer.template.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-abiword.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-bzip-compressed-tar.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-bzip.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-compressed-tar.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-deb.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-dia-diagram.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-dvi.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-executable.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-font-afm.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-font-linux-psf.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-font-pcf.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-font-speedo.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-font-ttf.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-font.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-glade.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-gnumeric.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-gzip.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-gzpostscript.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-jar.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-java.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-lyx.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-object.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-perl.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-rpm.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-sharedlib.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-shellscript.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-tar.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-texmacs.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-trash.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-troff-man-compressed.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-troff-man.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:x-troff.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:xhtml+xml.png
-share/rox/ROX-Filer/ROX/MIME/mime-application:zip.png
-share/rox/ROX-Filer/ROX/MIME/mime-audio.png
-share/rox/ROX-Filer/ROX/MIME/mime-audio:midi.png
-share/rox/ROX-Filer/ROX/MIME/mime-audio:mpeg.png
-share/rox/ROX-Filer/ROX/MIME/mime-audio:x-mod.png
-share/rox/ROX-Filer/ROX/MIME/mime-audio:x-mp3.png
-share/rox/ROX-Filer/ROX/MIME/mime-audio:x-pn-realaudio.png
-share/rox/ROX-Filer/ROX/MIME/mime-audio:x-wav.png
-share/rox/ROX-Filer/ROX/MIME/mime-image.png
-share/rox/ROX-Filer/ROX/MIME/mime-image:gif.png
-share/rox/ROX-Filer/ROX/MIME/mime-image:jpeg.png
-share/rox/ROX-Filer/ROX/MIME/mime-image:x-xpixmap.png
-share/rox/ROX-Filer/ROX/MIME/mime-inode:blockdevice.png
-share/rox/ROX-Filer/ROX/MIME/mime-inode:chardevice.png
-share/rox/ROX-Filer/ROX/MIME/mime-inode:core.png
-share/rox/ROX-Filer/ROX/MIME/mime-inode:directory.png
-share/rox/ROX-Filer/ROX/MIME/mime-inode:fifo.png
-share/rox/ROX-Filer/ROX/MIME/mime-inode:mount-point.png
-share/rox/ROX-Filer/ROX/MIME/mime-inode:socket.png
-share/rox/ROX-Filer/ROX/MIME/mime-message.png
-share/rox/ROX-Filer/ROX/MIME/mime-text.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:html.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:x-c++src.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:x-copying.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:x-csrc.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:x-diff.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:x-java.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:x-makefile.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:x-python.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:x-tcl.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:x-tex.png
-share/rox/ROX-Filer/ROX/MIME/mime-text:xml.png
-share/rox/ROX-Filer/ROX/MIME/mime-video.png
-share/rox/ROX-Filer/ROX/MIME/mime-video:mpeg.png
-share/rox/ROX-Filer/ROX/MIME/mime-video:quicktime.png
+share/rox/ROX-Filer/ROX/MIME/application-pdf.png
+share/rox/ROX-Filer/ROX/MIME/application-pgp.png
+share/rox/ROX-Filer/ROX/MIME/application-postscript.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-access.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-excel.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-office.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-powerpoint.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-office.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.rn-realmedia.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.stardivision.writer.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.calc.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.calc.template.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.draw.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.draw.template.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.impress.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.impress.template.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.impress.template2.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.writer.global.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.writer.png
+share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.writer.template.png
+share/rox/ROX-Filer/ROX/MIME/application-x-abiword.png
+share/rox/ROX-Filer/ROX/MIME/application-x-bzip-compressed-tar.png
+share/rox/ROX-Filer/ROX/MIME/application-x-bzip.png
+share/rox/ROX-Filer/ROX/MIME/application-x-compressed-tar.png
+share/rox/ROX-Filer/ROX/MIME/application-x-deb.png
+share/rox/ROX-Filer/ROX/MIME/application-x-dia-diagram.png
+share/rox/ROX-Filer/ROX/MIME/application-x-dvi.png
+share/rox/ROX-Filer/ROX/MIME/application-x-executable.png
+share/rox/ROX-Filer/ROX/MIME/application-x-font-afm.png
+share/rox/ROX-Filer/ROX/MIME/application-x-font-linux-psf.png
+share/rox/ROX-Filer/ROX/MIME/application-x-font-pcf.png
+share/rox/ROX-Filer/ROX/MIME/application-x-font-speedo.png
+share/rox/ROX-Filer/ROX/MIME/application-x-font-ttf.png
+share/rox/ROX-Filer/ROX/MIME/application-x-font.png
+share/rox/ROX-Filer/ROX/MIME/application-x-glade.png
+share/rox/ROX-Filer/ROX/MIME/application-x-gnumeric.png
+share/rox/ROX-Filer/ROX/MIME/application-x-gzip.png
+share/rox/ROX-Filer/ROX/MIME/application-x-gzpostscript.png
+share/rox/ROX-Filer/ROX/MIME/application-x-jar.png
+share/rox/ROX-Filer/ROX/MIME/application-x-java.png
+share/rox/ROX-Filer/ROX/MIME/application-x-lyx.png
+share/rox/ROX-Filer/ROX/MIME/application-x-object.png
+share/rox/ROX-Filer/ROX/MIME/application-x-perl.png
+share/rox/ROX-Filer/ROX/MIME/application-x-rpm.png
+share/rox/ROX-Filer/ROX/MIME/application-x-sharedlib.png
+share/rox/ROX-Filer/ROX/MIME/application-x-shellscript.png
+share/rox/ROX-Filer/ROX/MIME/application-x-tar.png
+share/rox/ROX-Filer/ROX/MIME/application-x-texmacs.png
+share/rox/ROX-Filer/ROX/MIME/application-x-trash.png
+share/rox/ROX-Filer/ROX/MIME/application-x-troff-man-compressed.png
+share/rox/ROX-Filer/ROX/MIME/application-x-troff-man.png
+share/rox/ROX-Filer/ROX/MIME/application-x-troff.png
+share/rox/ROX-Filer/ROX/MIME/application-xhtml+xml.png
+share/rox/ROX-Filer/ROX/MIME/application-zip.png
+share/rox/ROX-Filer/ROX/MIME/audio-midi.png
+share/rox/ROX-Filer/ROX/MIME/audio-mpeg.png
+share/rox/ROX-Filer/ROX/MIME/audio-x-mod.png
+share/rox/ROX-Filer/ROX/MIME/audio-x-mp3.png
+share/rox/ROX-Filer/ROX/MIME/audio-x-pn-realaudio.png
+share/rox/ROX-Filer/ROX/MIME/audio-x-wav.png
+share/rox/ROX-Filer/ROX/MIME/image-gif.png
+share/rox/ROX-Filer/ROX/MIME/image-jpeg.png
+share/rox/ROX-Filer/ROX/MIME/image-x-xpixmap.png
+share/rox/ROX-Filer/ROX/MIME/inode-blockdevice.png
+share/rox/ROX-Filer/ROX/MIME/inode-chardevice.png
+share/rox/ROX-Filer/ROX/MIME/inode-core.png
+share/rox/ROX-Filer/ROX/MIME/inode-directory.png
+share/rox/ROX-Filer/ROX/MIME/inode-fifo.png
+share/rox/ROX-Filer/ROX/MIME/inode-mount-point.png
+share/rox/ROX-Filer/ROX/MIME/inode-socket.png
+share/rox/ROX-Filer/ROX/MIME/text-html.png
+share/rox/ROX-Filer/ROX/MIME/text-x-c++src.png
+share/rox/ROX-Filer/ROX/MIME/text-x-copying.png
+share/rox/ROX-Filer/ROX/MIME/text-x-csrc.png
+share/rox/ROX-Filer/ROX/MIME/text-x-diff.png
+share/rox/ROX-Filer/ROX/MIME/text-x-java.png
+share/rox/ROX-Filer/ROX/MIME/text-x-makefile.png
+share/rox/ROX-Filer/ROX/MIME/text-x-python.png
+share/rox/ROX-Filer/ROX/MIME/text-x-tcl.png
+share/rox/ROX-Filer/ROX/MIME/text-x-tex.png
+share/rox/ROX-Filer/ROX/MIME/text-xml.png
+share/rox/ROX-Filer/ROX/MIME/video-mpeg.png
+share/rox/ROX-Filer/ROX/MIME/video-quicktime.png
 share/rox/ROX-Filer/ROX/index.theme
 share/rox/ROX-Filer/images/application.png
 share/rox/ROX-Filer/images/dirs.png
diff --git a/sysutils/rox/distinfo b/sysutils/rox/distinfo
index bde50589696..68017aebaeb 100644
--- a/sysutils/rox/distinfo
+++ b/sysutils/rox/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.9 2006/01/30 06:28:01 rxg Exp $
+$NetBSD: distinfo,v 1.10 2009/11/05 19:50:54 reinoud Exp $
 
-SHA1 (rox/rox-2.4.1.tgz) = 9e2fea71d1eb347200c23b28117651be7fccbcdc
-RMD160 (rox/rox-2.4.1.tgz) = 083facc66d10bce157eb1964c6387aac89b01013
-Size (rox/rox-2.4.1.tgz) = 2366048 bytes
-SHA1 (patch-aa) = 63b78f04e0d65f78857359cd250d1704170aff87
+SHA1 (rox/rox-filer-2.10.tar.bz2) = 691297d18be69a883db0a38130f5df99f9e1bc29
+RMD160 (rox/rox-filer-2.10.tar.bz2) = 48b64ccaceb96b59fbd2467aa65d8e128ebd960d
+Size (rox/rox-filer-2.10.tar.bz2) = 1903129 bytes
+SHA1 (patch-aa) = 20cf42090c9cd3149af6e7be59f826624062d759
+SHA1 (patch-ab) = e7e27a71fdea3257f85fdfc3f8d1352d0f1f0968
+SHA1 (patch-ac) = 4c5555ac12e7d037344f85440378ff021a7fe2c6
+SHA1 (patch-ad) = 3a8fef42c3749bb9aa2fc17f292a940aacd596b3
diff --git a/sysutils/rox/patches/patch-aa b/sysutils/rox/patches/patch-aa
index f3dd192b7f7..1d8e9ca7223 100644
--- a/sysutils/rox/patches/patch-aa
+++ b/sysutils/rox/patches/patch-aa
@@ -1,13 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2006/01/19 23:25:25 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2009/11/05 19:50:54 reinoud Exp $
 
---- ROX-Filer/src/xdgmimemagic.c.orig	2006-01-19 23:19:48.000000000 +0000
-+++ ROX-Filer/src/xdgmimemagic.c
-@@ -48,8 +48,6 @@
- #define	TRUE	(!FALSE)
- #endif
+--- ROX-Filer/src/config.h.in.orig	2009-07-18 16:23:18.000000000 +0200
++++ ROX-Filer/src/config.h.in
+@@ -60,9 +60,9 @@
  
--extern int errno;
--
- typedef struct XdgMimeMagicMatch XdgMimeMagicMatch;
- typedef struct XdgMimeMagicMatchlet XdgMimeMagicMatchlet;
+ /* printf format string to print file sizes */
+ #ifdef LARGE_FILE_SUPPORT
+-# define SIZE_FMT G_GINT64_MODIFIER "d"
++# define SIZE_FMT G_GINT64_MODIFIER "jd"
+ #else
+-# define SIZE_FMT G_GINT32_MODIFIER "d"
++# define SIZE_FMT G_GINT32_MODIFIER "jd"
+ #endif
  
+ #if 1
diff --git a/sysutils/rox/patches/patch-ab b/sysutils/rox/patches/patch-ab
new file mode 100644
index 00000000000..c0dd35dfc36
--- /dev/null
+++ b/sysutils/rox/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.4 2009/11/05 19:50:54 reinoud Exp $
+
+--- ROX-Filer/src/infobox.c.orig	2009-07-18 16:23:18.000000000 +0200
++++ ROX-Filer/src/infobox.c
+@@ -435,7 +435,7 @@ static void insert_size(DU *du, const ch
+ 	cell = (size >= PRETTY_SIZE_LIMIT)
+ 		? g_strdup_printf("%s (%" SIZE_FMT " %s)",
+ 				format_size(size),
+-				size, _("bytes"))
++				(intmax_t) size, _("bytes"))
+ 		: g_strdup(format_size(size));
+ 
+ 	set_cell(du->store, du->path, cell);
+@@ -576,7 +576,7 @@ static GtkWidget *make_details(const guc
+ 				 item->size >= PRETTY_SIZE_LIMIT
+ 				 ? g_strdup_printf("%s (%" SIZE_FMT " %s)",
+ 						   format_size(item->size),
+-						   item->size, _("bytes"))
++						   (intmax_t) item->size, _("bytes"))
+ 				 : g_strdup(format_size(item->size)));
+ 	}
+ 	else
diff --git a/sysutils/rox/patches/patch-ac b/sysutils/rox/patches/patch-ac
new file mode 100644
index 00000000000..745a732c9d8
--- /dev/null
+++ b/sysutils/rox/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2009/11/05 19:50:54 reinoud Exp $
+
+--- ROX-Filer/src/pixmaps.c.orig	2009-07-18 16:23:18.000000000 +0200
++++ ROX-Filer/src/pixmaps.c
+@@ -432,7 +432,7 @@ static void save_thumbnail(const char *p
+ 
+ 	swidth = g_strdup_printf("%d", original_width);
+ 	sheight = g_strdup_printf("%d", original_height);
+-	ssize = g_strdup_printf("%" SIZE_FMT, info.st_size);
++	ssize = g_strdup_printf("%" SIZE_FMT, (intmax_t) info.st_size);
+ 	smtime = g_strdup_printf("%ld", (long) info.st_mtime);
+ 
+ 	path = pathdup(pathname);
diff --git a/sysutils/rox/patches/patch-ad b/sysutils/rox/patches/patch-ad
new file mode 100644
index 00000000000..63f0075c87f
--- /dev/null
+++ b/sysutils/rox/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.3 2009/11/05 19:50:54 reinoud Exp $
+
+--- ROX-Filer/src/support.c.orig	2009-07-18 16:23:18.000000000 +0200
++++ ROX-Filer/src/support.c
+@@ -272,7 +272,7 @@ const char *format_size(off_t size)
+ 		units = _("B");
+ 
+ 	g_free(buffer);
+-	buffer = g_strdup_printf("%" SIZE_FMT " %s", size, units);
++	buffer = g_strdup_printf("%" SIZE_FMT " %s", (intmax_t) size, units);
+ 
+ 	return buffer;
+ }
+@@ -309,7 +309,7 @@ const char *format_size_aligned(off_t si
+ 		units = ' ';
+ 
+ 	g_free(buffer);
+-	buffer = g_strdup_printf("%4" SIZE_FMT "%c", size, units);
++	buffer = g_strdup_printf("%4" SIZE_FMT "%c", (intmax_t) size, units);
+ 	
+ 	return buffer;
+ }