pkg/42451: Update sysutils/pcmanfm to the latest version - 0.5.2

[netbsd%guigui2.net@localhost]

>Number:         42451
>Category:       pkg
>Synopsis:       Update sysutils/pcmanfm to the latest version - 0.5.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Dec 14 22:10:00 +0000 2009
>Originator:     Guillaume Lasmayous
>Release:        NetBSD-current (5.99.22)
>Organization:
>Environment:
NetBSD lopette.guigui2.net 5.99.22 NetBSD 5.99.22 (GENERIC) #0: Sat Nov 28 
07:01:29 UTC 2009  
builds%b8.netbsd.org@localhost:/home/builds/ab/HEAD/i386/200911280000Z-obj/home/builds/ab/HEAD/src/sys/arch/i386/compile/GENERIC
 i386

>Description:
sysutils/pcmanfm should be updated to the latest version, 0.5.2. 
An attempt is included in the patch below. Please review and commit if OK.

Thanks, Guillaume.

% diff -ruN sysutils/pcmanfm wip/pcmanfm

diff -ruN sysutils/pcmanfm/Makefile wip/pcmanfm/Makefile
--- sysutils/pcmanfm/Makefile   2009-08-29 12:35:13.000000000 +0200
+++ wip/pcmanfm/Makefile        2009-12-13 10:24:16.000000000 +0100
@@ -1,10 +1,11 @@
 # $NetBSD: Makefile,v 1.6 2009/03/19 16:11:09 joerg Exp $
 #
 
-DISTNAME=      pcmanfm-0.1.8.9
-PKGREVISION=   3
+DISTNAME=      pcmanfm-0.5.2
+#PKGREVISION=  3
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pcmanfm/}
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://pcmanfm.sourceforge.net/
@@ -14,9 +15,15 @@
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config msgfmt
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+.include "options.mk"
+
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../sysutils/libgamin/buildlink3.mk"
+.include "../../sysutils/fam/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -ruN sysutils/pcmanfm/PLIST wip/pcmanfm/PLIST
--- sysutils/pcmanfm/PLIST      2006-04-17 09:07:34.000000000 +0200
+++ wip/pcmanfm/PLIST   2009-12-13 10:09:21.000000000 +0100
@@ -1,6 +1,60 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/30 06:39:05 xtraeme Exp $
+@comment $NetBSD$
 bin/pcmanfm
+share/applications/pcmanfm-find.desktop
+share/applications/pcmanfm-folder-handler.desktop
+share/applications/pcmanfm.desktop
+share/locale/af/LC_MESSAGES/pcmanfm.mo
+share/locale/ar/LC_MESSAGES/pcmanfm.mo
+share/locale/bg/LC_MESSAGES/pcmanfm.mo
+share/locale/bn_IN/LC_MESSAGES/pcmanfm.mo
+share/locale/ca/LC_MESSAGES/pcmanfm.mo
+share/locale/cs/LC_MESSAGES/pcmanfm.mo
+share/locale/da/LC_MESSAGES/pcmanfm.mo
+share/locale/de/LC_MESSAGES/pcmanfm.mo
+share/locale/el/LC_MESSAGES/pcmanfm.mo
+share/locale/es/LC_MESSAGES/pcmanfm.mo
+share/locale/et/LC_MESSAGES/pcmanfm.mo
+share/locale/eu/LC_MESSAGES/pcmanfm.mo
+share/locale/fa/LC_MESSAGES/pcmanfm.mo
+share/locale/fi/LC_MESSAGES/pcmanfm.mo
 share/locale/fr/LC_MESSAGES/pcmanfm.mo
+share/locale/gl/LC_MESSAGES/pcmanfm.mo
+share/locale/he/LC_MESSAGES/pcmanfm.mo
+share/locale/hr/LC_MESSAGES/pcmanfm.mo
 share/locale/hu/LC_MESSAGES/pcmanfm.mo
+share/locale/id/LC_MESSAGES/pcmanfm.mo
+share/locale/it/LC_MESSAGES/pcmanfm.mo
+share/locale/ja/LC_MESSAGES/pcmanfm.mo
+share/locale/km/LC_MESSAGES/pcmanfm.mo
+share/locale/ko/LC_MESSAGES/pcmanfm.mo
+share/locale/lt/LC_MESSAGES/pcmanfm.mo
+share/locale/ml/LC_MESSAGES/pcmanfm.mo
+share/locale/ms/LC_MESSAGES/pcmanfm.mo
+share/locale/nb/LC_MESSAGES/pcmanfm.mo
+share/locale/nl/LC_MESSAGES/pcmanfm.mo
+share/locale/nn/LC_MESSAGES/pcmanfm.mo
+share/locale/pl/LC_MESSAGES/pcmanfm.mo
+share/locale/ps/LC_MESSAGES/pcmanfm.mo
+share/locale/pt/LC_MESSAGES/pcmanfm.mo
+share/locale/pt_BR/LC_MESSAGES/pcmanfm.mo
+share/locale/ru/LC_MESSAGES/pcmanfm.mo
+share/locale/sk/LC_MESSAGES/pcmanfm.mo
+share/locale/sl/LC_MESSAGES/pcmanfm.mo
+share/locale/sr/LC_MESSAGES/pcmanfm.mo
+share/locale/sv/LC_MESSAGES/pcmanfm.mo
+share/locale/tr/LC_MESSAGES/pcmanfm.mo
+share/locale/uk/LC_MESSAGES/pcmanfm.mo
+share/locale/ur/LC_MESSAGES/pcmanfm.mo
+share/locale/ur_PK/LC_MESSAGES/pcmanfm.mo
+share/locale/vi/LC_MESSAGES/pcmanfm.mo
 share/locale/zh_CN/LC_MESSAGES/pcmanfm.mo
 share/locale/zh_TW/LC_MESSAGES/pcmanfm.mo
+share/mime/packages/libmimetype.xml
+share/pcmanfm/mount.rules
+share/pcmanfm/ui/about-dlg.ui
+share/pcmanfm/ui/appchooserdlg.ui
+share/pcmanfm/ui/file_properties.ui
+share/pcmanfm/ui/find-files.ui
+share/pcmanfm/ui/godlg.ui
+share/pcmanfm/ui/prefdlg.ui
+share/pixmaps/pcmanfm.png
diff -ruN sysutils/pcmanfm/distinfo wip/pcmanfm/distinfo
--- sysutils/pcmanfm/distinfo   2006-03-25 21:00:34.000000000 +0100
+++ wip/pcmanfm/distinfo        2009-12-13 12:44:56.000000000 +0100
@@ -1,6 +1,8 @@
 $NetBSD: distinfo,v 1.1.1.1 2006/01/30 06:39:05 xtraeme Exp $
 
-SHA1 (pcmanfm-0.1.8.9.tar.gz) = 12415788dfa93cb767329c45caef32b23e9ab9e6
-RMD160 (pcmanfm-0.1.8.9.tar.gz) = b75784afa73509de6aa0de33ba3e65cc78296773
-Size (pcmanfm-0.1.8.9.tar.gz) = 261303 bytes
-SHA1 (patch-aa) = d97b81fa583de90973e6339eadf7570931f8d53e
+SHA1 (pcmanfm-0.5.2.tar.bz2) = 4ede3e1cd774a5f789523af102f624d08088d511
+RMD160 (pcmanfm-0.5.2.tar.bz2) = 15828227f302c96cf1096dd29f4c913f0f0a1ec7
+Size (pcmanfm-0.5.2.tar.bz2) = 729039 bytes
+SHA1 (patch-aa) = 9cfc8cb36b2feb0f4fa6b95cd2008041daf5c0fc
+SHA1 (patch-ab) = 3e700b2478a5463325af10a7fd2d272c012c0569
+SHA1 (patch-ac) = cce5099505dfb12888f40e808a60ead01b339859
diff -ruN sysutils/pcmanfm/options.mk wip/pcmanfm/options.mk
--- sysutils/pcmanfm/options.mk 1970-01-01 01:00:00.000000000 +0100
+++ wip/pcmanfm/options.mk      2009-12-13 10:28:18.000000000 +0100
@@ -0,0 +1,12 @@
+PKG_OPTIONS_VAR=       PKG_OPTIONS.pcmanfm
+PKG_SUPPORTED_OPTIONS= hal
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mhal)
+CONFIGURE_ARGS+=       --enable-hal
+.   include "../../sysutils/hal/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-hal
+.endif

diff -ruN sysutils/pcmanfm/patches/patch-aa wip/pcmanfm/patches/patch-aa
--- sysutils/pcmanfm/patches/patch-aa   2006-03-25 21:00:34.000000000 +0100
+++ wip/pcmanfm/patches/patch-aa        2009-12-13 10:07:08.000000000 +0100
@@ -1,13 +1,13 @@
 $NetBSD$
 
---- src/xdgmime/xdgmimemagic.c.orig    2006-03-25 19:56:29.000000000 +0000
-+++ src/xdgmime/xdgmimemagic.c
-@@ -47,8 +47,6 @@
- #define       TRUE    (!FALSE)
- #endif
- 
--extern int errno;
--
- typedef struct XdgMimeMagicMatch XdgMimeMagicMatch;
- typedef struct XdgMimeMagicMatchlet XdgMimeMagicMatchlet;
+--- po/ca.po.orig      2009-10-22 22:07:54.000000000 +0200
++++ po/ca.po
+@@ -301,7 +301,7 @@ msgstr ""
+ "Des de fa una setmana\n"
+ "Des de fa un mes\n"
+ "Des de fa un any\n"
+-"Dins el rang de dates seleccionat\n"
++"Dins el rang de dates seleccionat"
  
+ #: ../data/ui/find-files.glade.h:15
+ msgid "Audio Files (mp3, ogg,...)"
diff -ruN sysutils/pcmanfm/patches/patch-ab wip/pcmanfm/patches/patch-ab
--- sysutils/pcmanfm/patches/patch-ab   1970-01-01 01:00:00.000000000 +0100
+++ wip/pcmanfm/patches/patch-ab        2009-12-13 12:40:52.000000000 +0100
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/vfs/vfs-volume-hal-options.c.orig      2009-04-20 19:39:39.000000000 
+0200
++++ src/vfs/vfs-volume-hal-options.c
+@@ -30,7 +30,7 @@ gboolean vfs_volume_hal_get_options( con
+         for( i = 0; i < n; ++i )
+         {
+             /* replace "uid=" with "uid=<actual uid>" */
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) || !defined(__NetBSD__) || !defined(__DragonFly__) 
|| !defined(sun) || !defined(__APPLE__)
+             if (strcmp (ret->mount_options[i], "uid=") == 0) {
+                 g_free (ret->mount_options[i]);
+                 ret->mount_options[i] = g_strdup_printf ("uid=%u", getuid ());
diff -ruN sysutils/pcmanfm/patches/patch-ac wip/pcmanfm/patches/patch-ac
--- sysutils/pcmanfm/patches/patch-ac   1970-01-01 01:00:00.000000000 +0100
+++ wip/pcmanfm/patches/patch-ac        2009-12-13 12:44:00.000000000 +0100
@@ -0,0 +1,87 @@
+$NetBSD$
+
+--- src/vfs/vfs-volume-hal.c.orig      2009-04-20 19:39:39.000000000 +0200
++++ src/vfs/vfs-volume-hal.c
+@@ -86,13 +86,17 @@
+ #endif
+ 
+ /* For fstab related things */
+-#if !defined(sun) && !defined(__FreeBSD__)
++#if !defined(sun) && !defined(__FreeBSD__) && !defined(__DragonFly__) && 
!defined(__APPLE__) && !defined(__NetBSD__)
+ #include <mntent.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__)
+ #include <fstab.h>
+ #include <sys/param.h>
+ #include <sys/ucred.h>
+ #include <sys/mount.h>
++#elif defined(__NetBSD__)
++#include <fstab.h>
++#include <sys/param.h>
++#include <sys/mount.h>
+ #elif defined(sun)
+ #include <sys/mnttab.h>
+ #endif
+@@ -1520,7 +1524,7 @@ gboolean vfs_volume_requires_eject( VFSV
+ static gboolean
+ fstab_open (gpointer *handle)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || 
defined(__APPLE__)
+     return setfsent () == 1;
+ #else
+     *handle = fopen ("/etc/fstab", "r");
+@@ -1531,7 +1535,7 @@ fstab_open (gpointer *handle)
+ static char *
+ fstab_next (gpointer handle, char **mount_point)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || 
defined(__APPLE__)
+     struct fstab *fstab;
+ 
+     fstab = getfsent ();
+@@ -1559,7 +1563,7 @@ fstab_next (gpointer handle, char **moun
+ static void
+ fstab_close (gpointer handle)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || 
defined(__APPLE__)
+     endfsent ();
+ #else
+     fclose (handle);
+@@ -1808,7 +1812,7 @@ out:
+     return ret;
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || 
defined(__APPLE__)
+ #define MOUNT       "/sbin/mount"
+ #define UMOUNT      "/sbin/umount"
+ #else
+@@ -2430,7 +2434,7 @@ vfs_volume_hal_mount (ExoMountHalDevice 
+             {
+               /* this is currently mostly Linux specific noise */
+               if (
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) || !defined(__NetBSD__) || !defined(__DragonFly__) 
|| !defined(__APPLE__)
+                     strcmp (device->fsoptions[m], "uid=") == 0
+ #else
+                     strcmp (ret->mount_options[i], "-u=") == 0
+@@ -2440,7 +2444,7 @@ vfs_volume_hal_mount (ExoMountHalDevice 
+                    || strcmp (device->fstype, "udf") == 0
+                    || device->volume == NULL))
+                 {
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) || !defined(__NetBSD__) || !defined(__DragonFly__) 
|| !defined(__APPLE__)
+                   options[n++] = g_strdup_printf ("uid=%u", (guint) getuid 
());
+ #else
+                   options[n++] = g_strdup_printf ("-u=%u", (guint) getuid ());
+@@ -2591,7 +2595,7 @@ oom:      g_set_error (error, G_FILE_ERR
+           continue;
+         }
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || 
defined(__APPLE__)
+       /* check if an unknown error occurred while trying to mount a floppy */
+       if (strcmp (derror.name, "org.freedesktop.Hal.Device.UnknownError") == 0
+           && libhal_drive_get_type (device->drive) == 
LIBHAL_DRIVE_TYPE_FLOPPY)

>How-To-Repeat:

>Fix: