Update to 1.2.4, no release notes available.

7 files changed, 34 insertions, 78 deletions

diff --git a/sysutils/pcmanfm/DESCR b/sysutils/pcmanfm/DESCR
index 90287581048..c00239efe34 100644
--- a/sysutils/pcmanfm/DESCR
+++ b/sysutils/pcmanfm/DESCR
@@ -16,3 +16,4 @@ Features:
     * Provide icon view and detailed list view
     * Standard compliant (Follows FreeDesktop.org)
     * Clean and user-friendly interface (GTK+ 2)
+    * Handles icons and backgrounds on root window too
diff --git a/sysutils/pcmanfm/Makefile b/sysutils/pcmanfm/Makefile
index 000e865b0de..3a298629ae1 100644
--- a/sysutils/pcmanfm/Makefile
+++ b/sysutils/pcmanfm/Makefile
@@ -1,24 +1,31 @@
-# $NetBSD: Makefile,v 1.30 2015/04/25 14:24:54 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2016/05/22 22:51:44 youri Exp $
 #
 
-DISTNAME=	pcmanfm-0.1.8.9
-PKGREVISION=	24
+DISTNAME=	pcmanfm-1.2.4
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcmanfm/}
+EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	youri@NetBSD.org
 HOMEPAGE=	http://pcmanfm.sourceforge.net/
 COMMENT=	Extremly fast and lightweight file manager
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		intltool pkg-config
 
-DEPENDS+=	gamin>=0.1.10:../../sysutils/gamin
+CONF=			share/examples/pcmanfm
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/${CONF}
 
-.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"
+PKG_SYSCONFSUBDIR=	xdg
+MAKE_DIRS=		${PKG_SYSCONFDIR}/pcmanfm/default
+CONF_FILES+=		${CONF}/xdg/pcmanfm/default/pcmanfm.conf \
+			${PKG_SYSCONFDIR}/pcmanfm/default/pcmanfm.conf
+
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/menu-cache/buildlink3.mk"
+.include "../../sysutils/libfm/buildlink3.mk"
+.include "../../sysutils/libfm-extra/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pcmanfm/PLIST b/sysutils/pcmanfm/PLIST
index cfade2696e9..112b3b1e1a6 100644
--- a/sysutils/pcmanfm/PLIST
+++ b/sysutils/pcmanfm/PLIST
@@ -1,6 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/05/22 22:51:44 youri Exp $
 bin/pcmanfm
-share/locale/fr/LC_MESSAGES/pcmanfm.mo
-share/locale/hu/LC_MESSAGES/pcmanfm.mo
-share/locale/zh_CN/LC_MESSAGES/pcmanfm.mo
-share/locale/zh_TW/LC_MESSAGES/pcmanfm.mo
+include/pcmanfm-modules.h
+man/man1/pcmanfm.1
+share/applications/pcmanfm-desktop-pref.desktop
+share/applications/pcmanfm.desktop
+share/examples/pcmanfm/xdg/pcmanfm/default/pcmanfm.conf
+share/pcmanfm/ui/about.ui
+share/pcmanfm/ui/autorun.ui
+share/pcmanfm/ui/connect.ui
+share/pcmanfm/ui/desktop-pref.ui
+share/pcmanfm/ui/pref.ui
diff --git a/sysutils/pcmanfm/distinfo b/sysutils/pcmanfm/distinfo
index fa11f57d2fe..7eac9430345 100644
--- a/sysutils/pcmanfm/distinfo
+++ b/sysutils/pcmanfm/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:32:26 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/05/22 22:51:44 youri Exp $
 
-SHA1 (pcmanfm-0.1.8.9.tar.gz) = 12415788dfa93cb767329c45caef32b23e9ab9e6
-RMD160 (pcmanfm-0.1.8.9.tar.gz) = b75784afa73509de6aa0de33ba3e65cc78296773
-SHA512 (pcmanfm-0.1.8.9.tar.gz) = df3be1013d655f9f6e12505617a6b6b0c3682abf42557c891258c56d5584fb382c18ea3a9421e684d235d7b56efaf44da8338db87b11fc0abdee7e8bd95fecbd
-Size (pcmanfm-0.1.8.9.tar.gz) = 261303 bytes
-SHA1 (patch-aa) = d97b81fa583de90973e6339eadf7570931f8d53e
-SHA1 (patch-src_filebrowser.c) = 58ac8013594f610f613833455e15245080cf6eef
-SHA1 (patch-src_fileoperation.c) = 340d7c1c0cea6d68b9dba69b7f284095f6b1f8ee
+SHA1 (pcmanfm-1.2.4.tar.xz) = 4768ee564a36021977e4af8c33270b6835b3391d
+RMD160 (pcmanfm-1.2.4.tar.xz) = 493f436ef8c33a3eab74ba6c62e8f5b3f231998b
+SHA512 (pcmanfm-1.2.4.tar.xz) = f4d0ed9d5dcc1b01643715fd54b94ff46967801f0c6d1dde6d196fadbedb5551cfda536d548237b187e5545cceea0a987f7c1c8e38659cae109b6483f14798f7
+Size (pcmanfm-1.2.4.tar.xz) = 417316 bytes
diff --git a/sysutils/pcmanfm/patches/patch-aa b/sysutils/pcmanfm/patches/patch-aa
deleted file mode 100644
index 3394b0fdf7d..00000000000
--- a/sysutils/pcmanfm/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/03/25 20:00:34 joerg Exp $
-
---- 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;
- 
diff --git a/sysutils/pcmanfm/patches/patch-src_filebrowser.c b/sysutils/pcmanfm/patches/patch-src_filebrowser.c
deleted file mode 100644
index ec409fabd67..00000000000
--- a/sysutils/pcmanfm/patches/patch-src_filebrowser.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_filebrowser.c,v 1.1 2013/03/28 21:39:32 joerg Exp $
-
---- src/filebrowser.c.orig	2013-03-28 20:32:19.000000000 +0000
-+++ src/filebrowser.c
-@@ -1193,13 +1193,13 @@ gboolean update_folder_view_visible_regi
-   if( data->view_mode == FBVM_ICON_VIEW ) {
-     if( !ptk_icon_view_get_visible_range ( PTK_ICON_VIEW(folder_view),
-                                            &start_path, &end_path ) )
--        return;
-+        return FALSE;
-     model = ptk_icon_view_get_model( PTK_ICON_VIEW(folder_view) );
-   }
-   else if( data->view_mode == FBVM_LIST_VIEW ) {
-     if( !gtk_tree_view_get_visible_range ( GTK_TREE_VIEW(folder_view),
-                                            &start_path, &end_path ) )
--      return;
-+      return FALSE;
-     model = gtk_tree_view_get_model( GTK_TREE_VIEW(folder_view) );
-   }
- 
-@@ -1216,7 +1216,7 @@ gboolean update_folder_view_visible_regi
-       gtk_tree_path_free( start_path );
-     if( end_path )
-       gtk_tree_path_free( end_path );
--    return;
-+    return FALSE;
-   }
- 
-   model_sorter = PTK_TREE_MODEL_SORT( gtk_tree_model_filter_get_model(
diff --git a/sysutils/pcmanfm/patches/patch-src_fileoperation.c b/sysutils/pcmanfm/patches/patch-src_fileoperation.c
deleted file mode 100644
index d88600bd9e8..00000000000
--- a/sysutils/pcmanfm/patches/patch-src_fileoperation.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_fileoperation.c,v 1.1 2013/03/28 21:39:32 joerg Exp $
-
---- src/fileoperation.c.orig	2013-03-28 20:33:04.000000000 +0000
-+++ src/fileoperation.c
-@@ -347,7 +347,7 @@ file_operation_copy_do ( const char* src
- 
-   check_cancel( file_operation );
-   if( file_operation->state == FOS_CANCELLED )  {
--    return NULL;
-+    return;
-   }
- 
-   file_operation->current_file = src_file;