Update to 0.6.0.

Approved by:	miwi (mentor)

6 files changed, 12 insertions, 45 deletions

diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index a9fc64cc595b..a6b1f457835a 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emelfm2
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6.0
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://emelfm2.net/rel/
 
diff --git a/x11-fm/emelfm2/distinfo b/x11-fm/emelfm2/distinfo
index c7424edb1f9f..58438c3b1f2d 100644
--- a/x11-fm/emelfm2/distinfo
+++ b/x11-fm/emelfm2/distinfo
@@ -1,3 +1,3 @@
-MD5 (emelfm2-0.5.1.tar.bz2) = f97784e465b0c29685e057052ca39a18
-SHA256 (emelfm2-0.5.1.tar.bz2) = c1f94b1a9682a2526ce12275e9828fb7461a7b2e3609c1a29adf0ea9328900a2
-SIZE (emelfm2-0.5.1.tar.bz2) = 1002588
+MD5 (emelfm2-0.6.0.tar.bz2) = c153749aea954f342b28a470866ac4b0
+SHA256 (emelfm2-0.6.0.tar.bz2) = 1a459c039a5d32cb481c88364466e1f1ce71b4dfe19043d00df80eb2d6ca7404
+SIZE (emelfm2-0.6.0.tar.bz2) = 1031898
diff --git a/x11-fm/emelfm2/files/patch-Makefile b/x11-fm/emelfm2/files/patch-Makefile
index 28c66c52530e..47f9634a3211 100644
--- a/x11-fm/emelfm2/files/patch-Makefile
+++ b/x11-fm/emelfm2/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2009-02-12 04:47:20.000000000 +0100
-+++ Makefile	2009-02-20 09:13:43.000000000 +0100
-@@ -211,7 +211,7 @@
+--- Makefile.orig	2009-05-05 17:59:32.000000000 +0200
++++ Makefile	2009-05-06 21:49:06.000000000 +0200
+@@ -213,7 +213,7 @@
  
  #setup linking
  # -lrt needed for clock_gettime()
@@ -9,22 +9,7 @@
  ifeq ($(USE_FAM),1)
  lLIBS += -lfam
  endif
-@@ -223,10 +223,10 @@
- endif
- # should not need translation
- OPSYS := $(shell uname)
--ifeq ($(OPSYS),FreeBSD)
--OSREL = $(shell sysctl -n kern.osreldate)
--lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
--endif
-+#ifeq ($(OPSYS),FreeBSD)
-+#OSREL = $(shell sysctl -n kern.osreldate)
-+#lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
-+#endif
- 
- .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \
-         clean clean_plugins deps i18n install_i18n uninstall_i18n \
-@@ -245,10 +245,6 @@
+@@ -247,10 +247,6 @@
  	@for file in `ls $(ICONS)/ |grep -v svn`; do \
  		install -m 644 $(ICONS)/$$file $(ICON_DIR); \
  	done
diff --git a/x11-fm/emelfm2/files/patch-e2_fileview.h b/x11-fm/emelfm2/files/patch-e2_fileview.h
deleted file mode 100644
index 5dacdccf5d93..000000000000
--- a/x11-fm/emelfm2/files/patch-e2_fileview.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/e2_fileview.h.orig	Sat Nov  4 14:39:08 2006
-+++ src/e2_fileview.h	Sat Nov  4 14:39:26 2006
-@@ -21,6 +21,7 @@
- #ifndef E2_FILEVIEW_H
- #define E2_FILEVIEW_H
- 
-+#include <pthread.h>
- #include "emelfm2.h"
- 
- #ifdef E2_VFS
-
diff --git a/x11-fm/emelfm2/files/patch-src_filesystem_e2_fs.c b/x11-fm/emelfm2/files/patch-src_filesystem_e2_fs.c
deleted file mode 100644
index 7cd9eec37f78..000000000000
--- a/x11-fm/emelfm2/files/patch-src_filesystem_e2_fs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/filesystem/e2_fs.c.orig	2009-03-22 12:08:27.000000000 +0100
-+++ src/filesystem/e2_fs.c	2009-03-22 12:08:54.000000000 +0100
-@@ -1046,7 +1046,7 @@
- 	{
- //		if (errno == EINTR)
- //			goto retry;
--		else if (errno == ENOENT && descend && e2_utils_get_parent_path (localpath, TRUE))
-+		if (errno == ENOENT && descend && e2_utils_get_parent_path (localpath, TRUE))
- 			goto retry;
- 		g_free (localpath);
- 		return FALSE;
diff --git a/x11-fm/emelfm2/pkg-plist b/x11-fm/emelfm2/pkg-plist
index 0abc982caab0..e02d716639f8 100644
--- a/x11-fm/emelfm2/pkg-plist
+++ b/x11-fm/emelfm2/pkg-plist
@@ -12,7 +12,9 @@ lib/emelfm2/plugins/e2p_mvbar.so
 lib/emelfm2/plugins/e2p_names_clip.so
 lib/emelfm2/plugins/e2p_pack.so
 lib/emelfm2/plugins/e2p_rename.so
+lib/emelfm2/plugins/e2p_selmatch.so
 lib/emelfm2/plugins/e2p_sort_by_ext.so
+lib/emelfm2/plugins/e2p_tag.so
 lib/emelfm2/plugins/e2p_times.so
 %%TRACKER%%lib/emelfm2/plugins/e2p_track.so
 lib/emelfm2/plugins/e2p_unpack.so
@@ -77,8 +79,10 @@ share/pixmaps/emelfm2/plugin_foreach_48.png
 share/pixmaps/emelfm2/plugin_glob_48.png
 share/pixmaps/emelfm2/plugin_move_48.png
 share/pixmaps/emelfm2/plugin_pack_48.png
+share/pixmaps/emelfm2/plugin_selmatch_48.png
 share/pixmaps/emelfm2/plugin_rename_48.png
 share/pixmaps/emelfm2/plugin_timeset_48.png
+share/pixmaps/emelfm2/plugin_tag_48.png
 %%TRACKER%%share/pixmaps/emelfm2/plugin_track_48.png
 share/pixmaps/emelfm2/plugin_unpack_48.png
 share/pixmaps/emelfm2/proceed_32.png