Index: head/x11-fm/emelfm2/Makefile
===================================================================
--- head/x11-fm/emelfm2/Makefile	(revision 438147)
+++ head/x11-fm/emelfm2/Makefile	(revision 438148)
@@ -1,71 +1,72 @@
 # $FreeBSD$
 
 PORTNAME=	emelfm2
 PORTVERSION=	0.9.1
 PORTREVISION=	2
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://emelfm2.net/rel/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The gtk2+ port of emelfm, a fast graphical filemanager
+COMMENT=	Gtk2+ port of emelfm, a fast graphical filemanager
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install
 
 LDFLAGS+=	-lpthread
 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
+DOCFILES=	ACTIONS CONFIGURATION CREDITS HACKING NEWS \
+		README TODO USAGE WARNING
 
 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
 GAMIN_DESC=	Use Gamin for file monitoring
 THUMB_DESC=	Thumbnail plugin
 TRACKER_DESC=	Tracker-UI plugin
 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:graphics/gimp
 THUMB_MAKE_ENV=		WITH_THUMB=1
 TRACKER_MAKE_ENV=	WITH_TRACKER=1
 NLS_USES=		gettext
 NLS_INSTALL_TARGET=	install_i18n
 HAL_MAKE_ENV=		WITH_HAL=1
 HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
 
 post-patch:
 # fix cross-arch compiling, which sets ${TARGET}
 .for mfile in Makefile Makefile.config
 	@${REINPLACE_CMD} -e 's|TARGET|BINTARGET|g' ${WRKSRC}/${mfile}
 .endfor
 
 do-install:
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		PREFIX="${STAGEDIR}/${PREFIX}" \
 		MAN_DIR="${STAGEDIR}${MAN1PREFIX}/man/man1" \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${STAGEDIR}${DOCSDIR}
+.for f in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-fm/emelfm2/files/patch-Makefile
===================================================================
--- head/x11-fm/emelfm2/files/patch-Makefile	(revision 438147)
+++ head/x11-fm/emelfm2/files/patch-Makefile	(revision 438148)
@@ -1,29 +1,29 @@
---- Makefile.orig	2014-01-24 22:07:36.000000000 +0100
-+++ Makefile	2014-02-18 18:57:41.000000000 +0100
-@@ -292,7 +292,7 @@
+--- Makefile.orig	2014-01-24 21:07:36 UTC
++++ Makefile
+@@ -292,7 +292,7 @@ else
   lLIBS += $(shell pkg-config --libs gmodule-2.0)
  endif
  # -lrt needed for clock_gettime(), explicit -lm, -ldl needed for some arch-linux distros
 -lLIBS += -lrt -lm -ldl
 +lLIBS += -lrt -lm
  ifeq ($(USE_GAMIN), 1)
  #gamin code is a superset of FAM code, so gamin needs fam as well
  lLIBS += -lfam
-@@ -347,16 +347,12 @@
+@@ -347,16 +347,12 @@ else
  		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); \
 -	done
  	@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
Index: head/x11-fm/emelfm2/pkg-plist
===================================================================
--- head/x11-fm/emelfm2/pkg-plist	(revision 438147)
+++ head/x11-fm/emelfm2/pkg-plist	(revision 438148)
@@ -1,103 +1,99 @@
 bin/emelfm2
 lib/emelfm2/plugins/e2p_clipnames.so
 lib/emelfm2/plugins/e2p_clone.so
 lib/emelfm2/plugins/e2p_config.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_foreach.so
 lib/emelfm2/plugins/e2p_glob.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_tag.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/applications/emelfm2.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ACTIONS
 %%PORTDOCS%%%%DOCSDIR%%/CONFIGURATION
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/GPL
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LGPL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/SPEC
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/USAGE
 %%PORTDOCS%%%%DOCSDIR%%/WARNING
 %%NLS%%share/locale/de/LC_MESSAGES/emelfm2.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/emelfm2.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/emelfm2.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/emelfm2.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/emelfm2.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/emelfm2.mo
 share/pixmaps/emelfm2/add_mark_bottom_48.png
 share/pixmaps/emelfm2/add_mark_top_48.png
 share/pixmaps/emelfm2/apply_all_32.png
 share/pixmaps/emelfm2/bookmark_48.png
 share/pixmaps/emelfm2/cl_clear_48.png
 share/pixmaps/emelfm2/copy_as_48.png
 share/pixmaps/emelfm2/delete_48.png
 share/pixmaps/emelfm2/dragsel.png
 share/pixmaps/emelfm2/emelfm2_24.png
 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/hidden_noshow_48.png
 share/pixmaps/emelfm2/hidden_show_48.png
 share/pixmaps/emelfm2/mirror_horiz_48.png
 share/pixmaps/emelfm2/mirror_vert_48.png
 share/pixmaps/emelfm2/mounts_48.png
 share/pixmaps/emelfm2/move_48.png
 share/pixmaps/emelfm2/move_as_48.png
 share/pixmaps/emelfm2/open_with_48.png
 share/pixmaps/emelfm2/output_hide_48.png
 share/pixmaps/emelfm2/output_show_48.png
 share/pixmaps/emelfm2/owners_48.png
 share/pixmaps/emelfm2/permissions_48.png
 share/pixmaps/emelfm2/plugin_clip_48.png
 share/pixmaps/emelfm2/plugin_clone_48.png
 share/pixmaps/emelfm2/plugin_config_48.png
 share/pixmaps/emelfm2/plugin_copy_48.png
 share/pixmaps/emelfm2/plugin_crypt_48.png
 share/pixmaps/emelfm2/plugin_dircmp_48.png
 share/pixmaps/emelfm2/plugin_du_48.png
 share/pixmaps/emelfm2/plugin_extsort_48.png
 share/pixmaps/emelfm2/plugin_find_48.png
 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_rename_48.png
 share/pixmaps/emelfm2/plugin_selmatch_48.png
 share/pixmaps/emelfm2/plugin_shred_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
 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
 share/pixmaps/emelfm2/symlink_as_48.png
 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