5 files changed, 38 insertions, 33 deletions

diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index 6126b701ee13..89f1a38eba80 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -1,30 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	emelfm2
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://emelfm2.net/rel/
 
 MAINTAINER=	mva@FreeBSD.org
-COMMENT=	The gtk2 port of emelfm, a fast graphical filemanager
+COMMENT=	The gtk2+ port of emelfm, a fast graphical filemanager
 
 LICENSE=	GPLv3
 
 USE_BZIP2=	yes
-USE_GNOME=	gtk20
 USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
-MAKE_ENV=	DOC_DIR="${DOCSDIR}/"
+MAKE_ENV=	DOC_DIR="${DOCSDIR}/" \
+		WITH_OUTPUTSTYLES=1 \
+		WITH_CUSTOMMOUSE=1
 
 DOCFILES=	ACTIONS CONFIGURATION CREDITS GPL HACKING INSTALL LGPL NEWS \
 		README SPEC TODO USAGE WARNING
 
-OPTIONS_DEFINE=	DEBUG DOCS GAMIN THUMB TRACKER HAL NLS
-OPTIONS_DEFAULT=
+OPTIONS_DEFINE=		DEBUG DOCS GAMIN THUMB TRACKER HAL NLS
+OPTIONS_DEFAULT=	GTK2
+OPTIONS_RADIO=		GTK
+OPTIONS_RADIO_GTK=	GTK2 GTK3
 OPTIONS_SUB=	yes
 
 DEBUG_DESC=	Debugging messages
@@ -36,6 +39,10 @@ HAL_DESC=	Use HAL for automated device detection
 DEBUG_MAKE_ENV=		DEBUG=1
 GAMIN_USES=		fam:gamin
 GAMIN_MAKE_ENV=		USE_GAMIN=1
+GTK2_MAKE_ENV=		WITH_GTK2=1 WITH_GTK3=0
+GTK2_USE=		GNOME=gtk20
+GTK3_MAKE_ENV=		WITH_GTK2=0 WITH_GTK3=1
+GTK3_USE=		GNOME=gtk30
 THUMB_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
 THUMB_MAKE_ENV=		WITH_THUMB=1
 TRACKER_MAKE_ENV=	WITH_TRACKER=1
@@ -47,7 +54,7 @@ HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
 post-patch:
 # fix cross-arch compiling, which sets ${TARGET}
 .for mfile in Makefile Makefile.config
-	@${REINPLACE_CMD} -e 's|TARGET|BINTARGET|' ${WRKSRC}/${mfile}
+	@${REINPLACE_CMD} -e 's|TARGET|BINTARGET|g' ${WRKSRC}/${mfile}
 .endfor
 
 do-install:
diff --git a/x11-fm/emelfm2/distinfo b/x11-fm/emelfm2/distinfo
index 162713f7727a..79f137871456 100644
--- a/x11-fm/emelfm2/distinfo
+++ b/x11-fm/emelfm2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emelfm2-0.9.0.tar.bz2) = 0f50b859e82ec26bd71eb23a5de9f1223b3af2d05744afa6eb395cdbb28f5fdb
-SIZE (emelfm2-0.9.0.tar.bz2) = 1135533
+SHA256 (emelfm2-0.9.1.tar.bz2) = bfb94ff4e40c0a9c0d2a6aeb0efa22e177accbf6abd3096226d93daecd23642f
+SIZE (emelfm2-0.9.1.tar.bz2) = 1217126
diff --git a/x11-fm/emelfm2/files/patch-Makefile b/x11-fm/emelfm2/files/patch-Makefile
index 377189db7f00..8c2371152f12 100644
--- a/x11-fm/emelfm2/files/patch-Makefile
+++ b/x11-fm/emelfm2/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2012-12-05 02:03:10.000000000 +0100
-+++ Makefile	2012-12-21 10:29:40.000000000 +0100
-@@ -288,7 +288,7 @@
+--- Makefile.orig	2014-01-24 22:07:36.000000000 +0100
++++ Makefile	2014-02-18 18:57:41.000000000 +0100
+@@ -292,7 +292,7 @@
   lLIBS += $(shell pkg-config --libs gmodule-2.0)
  endif
  # -lrt needed for clock_gettime(), explicit -lm, -ldl needed for some arch-linux distros
@@ -9,19 +9,10 @@
  ifeq ($(USE_GAMIN), 1)
  #gamin code is a superset of FAM code, so gamin needs fam as well
  lLIBS += -lfam
-@@ -305,7 +305,7 @@
-  ifeq ($(EXTDBUS), 1)
-   lLIBS += $(shell pkg-config --libs dbus-1 dbus-glib-1 hal hal-storage)
-  else
--  lLIBS += $(shell pkg-config --libs dbus-1 hal hal-storage)
-+  lLIBS += $(shell pkg-config --libs dbus-1 dbus-glib-1 hal hal-storage)
-  endif
- endif
- endif
-@@ -333,10 +333,6 @@
- 	@for file in `ls $(ICONS)/ |grep -v svn`; do \
- 		install -m 644 $(ICONS)/$$file $(ICON_DIR); \
+@@ -347,16 +347,12 @@
+ 		install -m 644 $$file $(ICON_DIR)/stock; \
  	done
+ endif
 -	@install -d $(DOC_DIR)
 -	@for file in `ls $(DOCS)/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v emelfm2.1`; do \
 -		install -m 644 $(DOCS)/$$file $(DOC_DIR); \
@@ -29,3 +20,10 @@
  	@install -d $(MAN_DIR)
  	@install -m 644 $(DOCS)/emelfm2.1 $(MAN_DIR)/$(TARGET).1;
  
+ 	@if [ "`grep "#define E2_XDG" $(BUILD_FILE)`" = "#define E2_XDG" ]; then \
+ 		install -d $(XDG_DESKTOP_DIR); \
+-		install -m 644 -T $(DOCS)/desktop_environment/$(TARGET).desktop $(XDG_DESKTOP_DIR)/$(TARGET).desktop; \
++		install -m 644 $(DOCS)/desktop_environment/$(TARGET).desktop $(XDG_DESKTOP_DIR)/$(TARGET).desktop; \
+ 	fi
+ 
+ # no i18n install unless specific target used
diff --git a/x11-fm/emelfm2/pkg-descr b/x11-fm/emelfm2/pkg-descr
index 529a4b9f26e6..a3aee9b2a217 100644
--- a/x11-fm/emelfm2/pkg-descr
+++ b/x11-fm/emelfm2/pkg-descr
@@ -1,6 +1,6 @@
 This is a port of emelFM2. emelFM2 is a file manager that 
 implements the popular two-pane design. It features a 
-simple GTK+2 interface, a flexible file typing scheme,
+simple GTK+ interface, a flexible file typing scheme,
 and a built-in command line for executing commands 
 without opening a xterm. 
 
diff --git a/x11-fm/emelfm2/pkg-plist b/x11-fm/emelfm2/pkg-plist
index a0bc891715a1..25bd08858856 100644
--- a/x11-fm/emelfm2/pkg-plist
+++ b/x11-fm/emelfm2/pkg-plist
@@ -1,28 +1,27 @@
 bin/emelfm2
+lib/emelfm2/plugins/e2p_clipnames.so
 lib/emelfm2/plugins/e2p_clone.so
 lib/emelfm2/plugins/e2p_config.so
-lib/emelfm2/plugins/e2p_cpbar.so
+lib/emelfm2/plugins/e2p_copy.so
 lib/emelfm2/plugins/e2p_crypt.so
 lib/emelfm2/plugins/e2p_dircmp.so
 lib/emelfm2/plugins/e2p_du.so
+lib/emelfm2/plugins/e2p_extsort.so
 lib/emelfm2/plugins/e2p_find.so
-lib/emelfm2/plugins/e2p_for_each.so
+lib/emelfm2/plugins/e2p_foreach.so
 lib/emelfm2/plugins/e2p_glob.so
-lib/emelfm2/plugins/e2p_mvbar.so
-lib/emelfm2/plugins/e2p_names_clip.so
+lib/emelfm2/plugins/e2p_move.so
 lib/emelfm2/plugins/e2p_pack.so
 lib/emelfm2/plugins/e2p_rename.so
 lib/emelfm2/plugins/e2p_selmatch.so
 lib/emelfm2/plugins/e2p_shred.so
-lib/emelfm2/plugins/e2p_sort_by_ext.so
 lib/emelfm2/plugins/e2p_tag.so
-lib/emelfm2/plugins/e2p_times.so
+lib/emelfm2/plugins/e2p_timeset.so
 %%TRACKER%%lib/emelfm2/plugins/e2p_track.so
 lib/emelfm2/plugins/e2p_unpack.so
 lib/emelfm2/plugins/e2p_upgrade.so
 lib/emelfm2/plugins/e2p_view.so
 man/man1/emelfm2.1.gz
-share/application-registry/emelfm2.applications
 share/applications/emelfm2.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ACTIONS
 %%PORTDOCS%%%%DOCSDIR%%/CONFIGURATION
@@ -56,7 +55,6 @@ share/pixmaps/emelfm2/emelfm2_32.png
 share/pixmaps/emelfm2/emelfm2_48.png
 share/pixmaps/emelfm2/filter_48.png
 share/pixmaps/emelfm2/filter_off_48.png
-share/pixmaps/emelfm2/gtk-discard_20.png
 share/pixmaps/emelfm2/hidden_noshow_48.png
 share/pixmaps/emelfm2/hidden_show_48.png
 share/pixmaps/emelfm2/mirror_horiz_48.png
@@ -94,6 +92,7 @@ share/pixmaps/emelfm2/ps_48.png
 share/pixmaps/emelfm2/save_selection_32.png
 share/pixmaps/emelfm2/split_horiz_48.png
 share/pixmaps/emelfm2/split_vert_48.png
+share/pixmaps/emelfm2/stock/gtk-discard_20.png
 share/pixmaps/emelfm2/su_48.png
 share/pixmaps/emelfm2/switch_48.png
 share/pixmaps/emelfm2/symlink_48.png
@@ -102,6 +101,7 @@ share/pixmaps/emelfm2/terminal_48.png
 share/pixmaps/emelfm2/trash_48.png
 share/pixmaps/emelfm2/user_commands_48.png
 share/pixmaps/emelfm2/view_48.png
+@dirrm share/pixmaps/emelfm2/stock
 @dirrm share/pixmaps/emelfm2
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/emelfm2/plugins