diff -Nur emelfm2/Makefile emelfm2.new/Makefile
--- emelfm2/Makefile	Sat Mar 12 11:52:48 2005
+++ emelfm2.new/Makefile	Wed Sep 14 19:41:25 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	emelfm2
-PORTVERSION=	0.0.9
-PORTREVISION=	2
+PORTVERSION=	0.1.2
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.emelfm2.org/rel/
 
@@ -20,25 +19,18 @@
 USE_GETOPT_LONG=yes
 INSTALLS_SHLIB=	yes
 
-MAKE_ENV=	CC=${CC} LDFLAGS="${LDFLAGS}" DOCSDIR="${DOCSDIR}"
+MAKE_ENV=	CC=${CC} LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}"
 
 PLUGINDIR=	${WRKSRC}/objs/plugins
-PLUGINS=	cdburner.so clone.so copy_to_clipboard.so cpbar.so du.so for_each.so \
-		glob.so mvbar.so pack.so rename_ext.so sort_by_ext.so unpack.so view.so
+PLUGINS=	e2p_clone.so e2p_cpbar.so e2p_du.so e2p_find.so \
+		e2p_for_each.so e2p_glob.so e2p_mvbar.so e2p_names_clip.so \
+		e2p_pack.so e2p_rename_ext.so e2p_sort_by_ext.so \
+		e2p_upgrade.so e2p_unpack.so e2p_view.so
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
 USE_GCC=	3.4
-.endif
-
-.if defined(NOPORTDOCS)
-do-install::
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.for pfile in ${PLUGINS}
-	@${MKDIR} ${PREFIX}/lib/emelfm2/plugins
-	${INSTALL_PROGRAM} ${PLUGINDIR}/${pfile} ${PREFIX}/lib/emelfm2/plugins
-.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff -Nur emelfm2/distinfo emelfm2.new/distinfo
--- emelfm2/distinfo	Mon Aug 16 13:43:27 2004
+++ emelfm2.new/distinfo	Wed Sep 14 19:41:44 2005
@@ -1,2 +1,2 @@
-MD5 (emelfm2-0.0.9.tar.gz) = d627839065b51ad90ded488e9d34c4a8
-SIZE (emelfm2-0.0.9.tar.gz) = 467516
+MD5 (emelfm2-0.1.2.tar.gz) = 33b0f1bd8f0119c9a6122f39d6073710
+SIZE (emelfm2-0.1.2.tar.gz) = 652648
diff -Nur emelfm2/files/patch-Makefile emelfm2.new/files/patch-Makefile
--- emelfm2/files/patch-Makefile	Mon Aug 16 13:43:27 2004
+++ emelfm2.new/files/patch-Makefile	Wed Sep 14 19:43:02 2005
@@ -1,16 +1,16 @@
---- Makefile.orig	Tue Aug 10 01:43:19 2004
-+++ Makefile	Sun Aug 15 20:25:56 2004
-@@ -98,10 +98,10 @@
- lLIBS_CFLAGS += -shared -fPIC -DPIC
- lLDFLAGS = $(LDFLAGS)
- lLDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0`
+--- Makefile.orig	Tue Sep 13 02:06:53 2005
++++ Makefile	Wed Sep 14 19:42:41 2005
+@@ -124,10 +124,10 @@
+ ifeq ($(USE_FAM),1)
+ 	lLDFLAGS += -lfam
+ endif
 -ifeq ($(OPSY),FreeBSD)
--OSREL = $(shell sysctl -n kern.osreldate)
--lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
+-	OSREL = $(shell sysctl -n kern.osreldate)
+-	lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
 -endif
 +#ifeq ($(OPSY),FreeBSD)
-+#OSREL = $(shell sysctl -n kern.osreldate)
-+#lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
++#	OSREL = $(shell sysctl -n kern.osreldate)
++#	lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
 +#endif
  
  .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \
diff -Nur emelfm2/pkg-descr emelfm2.new/pkg-descr
--- emelfm2/pkg-descr	Fri Feb 11 14:28:46 2005
+++ emelfm2.new/pkg-descr	Wed Sep 14 20:11:06 2005
@@ -4,4 +4,4 @@
 and a built-in command line for executing commands 
 without opening a xterm. 
 
-WWW: http://www.emelfm.org/rel/
+WWW: http://www.emelfm2.org/
diff -Nur emelfm2/pkg-plist emelfm2.new/pkg-plist
--- emelfm2/pkg-plist	Wed Jun 15 04:43:36 2005
+++ emelfm2.new/pkg-plist	Wed Sep 14 20:04:03 2005
@@ -1,57 +1,89 @@
 bin/emelfm2
-lib/emelfm2/plugins/cdburner.so
-lib/emelfm2/plugins/clone.so
-lib/emelfm2/plugins/copy_to_clipboard.so
-lib/emelfm2/plugins/cpbar.so
-lib/emelfm2/plugins/du.so
-lib/emelfm2/plugins/for_each.so
-lib/emelfm2/plugins/glob.so
-lib/emelfm2/plugins/mvbar.so
-lib/emelfm2/plugins/pack.so
-lib/emelfm2/plugins/rename_ext.so
-lib/emelfm2/plugins/sort_by_ext.so
-lib/emelfm2/plugins/unpack.so
-lib/emelfm2/plugins/view.so
-share/applications-registry/emelfm2.applications
+lib/emelfm2/plugins/e2p_clone.so
+lib/emelfm2/plugins/e2p_cpbar.so
+lib/emelfm2/plugins/e2p_du.so
+lib/emelfm2/plugins/e2p_find.so
+lib/emelfm2/plugins/e2p_for_each.so
+lib/emelfm2/plugins/e2p_glob.so
+lib/emelfm2/plugins/e2p_mvbar.so
+lib/emelfm2/plugins/e2p_names_clip.so
+lib/emelfm2/plugins/e2p_pack.so
+lib/emelfm2/plugins/e2p_rename_ext.so
+lib/emelfm2/plugins/e2p_sort_by_ext.so
+lib/emelfm2/plugins/e2p_unpack.so
+lib/emelfm2/plugins/e2p_upgrade.so
+lib/emelfm2/plugins/e2p_view.so
+share/application-registry/emelfm2.applications
 share/applications/emelfm2.desktop
+%%PORTDOCS%%%%DOCSDIR%%/ACTIONS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/CONFIGURATION
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/GPL
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LGPL
 %%PORTDOCS%%%%DOCSDIR%%/PLUGINS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ROADMAP
 %%PORTDOCS%%%%DOCSDIR%%/SPEC
 %%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/USAGE
 %%PORTDOCS%%%%DOCSDIR%%/WARNING
 %%PORTDOCS%%%%DOCSDIR%%/help.txt
-share/pixmaps/emelfm2/icon_bookmark_24.png
-share/pixmaps/emelfm2/icon_copy_24.png
-share/pixmaps/emelfm2/icon_dirparent.xpm
-share/pixmaps/emelfm2/icon_down.xpm
-share/pixmaps/emelfm2/icon_emelfm2.svg
-share/pixmaps/emelfm2/icon_emelfm2_016.png
-share/pixmaps/emelfm2/icon_emelfm2_024.png
-share/pixmaps/emelfm2/icon_emelfm2_032.png
-share/pixmaps/emelfm2/icon_emelfm2_048.png
-share/pixmaps/emelfm2/icon_emelfm2_064.png
-share/pixmaps/emelfm2/icon_emelfm2_128.png
-share/pixmaps/emelfm2/icon_emelfm2_256.png
-share/pixmaps/emelfm2/icon_emelfm2_alt_016.png
-share/pixmaps/emelfm2/icon_emelfm2_alt_024.png
-share/pixmaps/emelfm2/icon_emelfm2_alt_032.png
-share/pixmaps/emelfm2/icon_emelfm2_alt_048.png
-share/pixmaps/emelfm2/icon_emelfm2_alt_064.png
-share/pixmaps/emelfm2/icon_emelfm2_alt_128.png
-share/pixmaps/emelfm2/icon_emelfm2_alt_256.png
-share/pixmaps/emelfm2/icon_emelfm2_alt_346.png
-share/pixmaps/emelfm2/icon_move2_24.png
-share/pixmaps/emelfm2/icon_move_24.png
-share/pixmaps/emelfm2/icon_up.xpm
+share/pixmaps/emelfm2/apply_all_48.png
+share/pixmaps/emelfm2/bookmark_48.png
+share/pixmaps/emelfm2/cl_clear_48.png
+share/pixmaps/emelfm2/copy_as_48.png
+share/pixmaps/emelfm2/emelfm2_1_24.png
+share/pixmaps/emelfm2/emelfm2_1_32.png
+share/pixmaps/emelfm2/emelfm2_1_48.png
+share/pixmaps/emelfm2/emelfm2_24.png
+share/pixmaps/emelfm2/emelfm2_2_24.png
+share/pixmaps/emelfm2/emelfm2_2_32.png
+share/pixmaps/emelfm2/emelfm2_2_48.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_copy_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_unpack_48.png
+share/pixmaps/emelfm2/ps_48.png
+share/pixmaps/emelfm2/split_horiz_48.png
+share/pixmaps/emelfm2/split_vert_48.png
+share/pixmaps/emelfm2/star_48.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
 @dirrm share/pixmaps/emelfm2
-@dirrm share/applications-registry
-@dirrm share/applications
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %%PREFIX%%/share/applications 2> /dev/null || true
+@unexec rmdir %%PREFIX%%/share/application-registry 2> /dev/null || true
 @dirrm lib/emelfm2/plugins
 @dirrm lib/emelfm2