6 files changed, 45 insertions, 18 deletions

diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index c4966add9cbd..544fcba62bdc 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	emelfm2
-PORTVERSION=	0.0.5
-PORTREVISION=	1
+PORTVERSION=	0.0.6
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://dasui.prima.de/~tooar/
 
@@ -24,8 +23,8 @@ INSTALLS_SHLIB=	yes
 MAKE_ENV=	CC=${CC} LDFLAGS="${LDFLAGS}" DOCSDIR="${DOCSDIR}"
 
 PLUGINDIR=	${WRKSRC}/objs/plugins
-PLUGINS=	cdburner.so clone.so copy_to_clipboard.so du.so for_each.so \
-		glob.so pack.so rename_ext.so sort_by_ext.so unpack.so view.so
+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
 
 .if defined(NOPORTDOCS)
 do-install::
diff --git a/x11-fm/emelfm2/distinfo b/x11-fm/emelfm2/distinfo
index 959744a24280..e5fc2752d245 100644
--- a/x11-fm/emelfm2/distinfo
+++ b/x11-fm/emelfm2/distinfo
@@ -1 +1,2 @@
-MD5 (emelfm2-0.0.5.tar.gz) = cf12654d158679b03985524e6ba8d6c9
+MD5 (emelfm2-0.0.6.tar.gz) = adeb714cce330fa3d6ea7e41e6a9e017
+SIZE (emelfm2-0.0.6.tar.gz) = 215093
diff --git a/x11-fm/emelfm2/files/patch-Makefile b/x11-fm/emelfm2/files/patch-Makefile
new file mode 100644
index 000000000000..2b783de1498d
--- /dev/null
+++ b/x11-fm/emelfm2/files/patch-Makefile
@@ -0,0 +1,21 @@
+--- Makefile.orig	Fri Feb 27 11:23:08 2004
++++ Makefile	Wed Mar  3 16:32:42 2004
+@@ -78,9 +78,6 @@
+ lLIBS_CFLAGS += -shared -fPIC -DPIC
+ lLDFLAGS = $(LDFLAGS)
+ lLDFLAGS += `pkg-config --libs gtk+-2.0`
+-ifeq ($(OPSY),FreeBSD)
+-lLDFLAGS += -lgnugetopt
+-endif
+ # gthread-2.0
+ 
+ .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc clean dist-src dist-bin dist dist-pre deps marshals test test2
+@@ -92,7 +89,7 @@
+ 
+ install: all install_plugins
+ 	@echo "installing $(TARGET) to prefix '$(PREFIX)'"
+-	@install -D -c -s -m 755 $(TARGET) $(BIN_DIR)/$(TARGET)
++	@install -c -s -m 755 $(TARGET) $(BIN_DIR)/$(TARGET)
+ 	@install -d $(ICON_DIR)
+ 	@for file in `ls icons/ |grep -v CVS`; do \
+ 		install -c -m 644 icons/$$file $(ICON_DIR); \
diff --git a/x11-fm/emelfm2/files/patch-Makefile.config b/x11-fm/emelfm2/files/patch-Makefile.config
index 3e4651e2e542..56ad1fb32c89 100644
--- a/x11-fm/emelfm2/files/patch-Makefile.config
+++ b/x11-fm/emelfm2/files/patch-Makefile.config
@@ -1,16 +1,9 @@
---- Makefile.config.orig	Sun Jan  4 14:44:43 2004
-+++ Makefile.config	Sun Jan 11 18:02:59 2004
-@@ -5,13 +5,13 @@
- BIN_DIR ?= $(PREFIX)/bin
- endif
- PLUGINS_DIR ?= $(PREFIX)/lib/emelfm2/plugins/
--DOC_DIR ?= $(PREFIX)/share/doc/emelfm2/
-+DOC_DIR ?= $(DOCSDIR)
- ICON_DIR ?= $(PREFIX)/share/pixmaps/
+--- Makefile.config.orig	Sun Feb 15 04:35:18 2004
++++ Makefile.config	Wed Mar  3 15:57:06 2004
+@@ -12,7 +12,7 @@
  
- CC ?= gcc
- 
- #CFLAGS = -O2 -Wall
+ #CFLAGS += -O2 -Wall
+ #CFLAGS += -Wall -O3 -march=athlon-tbird -mcpu=athlon-tbird 
 -CFLAGS += -Wall
 +CFLAGS ?= -Wall
  
diff --git a/x11-fm/emelfm2/pkg-descr b/x11-fm/emelfm2/pkg-descr
index e818fb8ec9ff..b7d97f7fc319 100644
--- a/x11-fm/emelfm2/pkg-descr
+++ b/x11-fm/emelfm2/pkg-descr
@@ -4,4 +4,4 @@ simple GTK+2 interface, a flexible file typing scheme,
 and a built-in command line for executing commands 
 without opening a xterm. 
 
-WWW: http://freshmeat.net/projects/emelfm2
+WWW: http://dasui.prima.de/e2wiki
diff --git a/x11-fm/emelfm2/pkg-plist b/x11-fm/emelfm2/pkg-plist
index 438435e72100..93ff97d31fb0 100644
--- a/x11-fm/emelfm2/pkg-plist
+++ b/x11-fm/emelfm2/pkg-plist
@@ -22,6 +22,19 @@ lib/emelfm2/plugins/view.so
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/WARNING
 %%PORTDOCS%%%%DOCSDIR%%/help.txt
+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_up.xpm
+@dirrm share/pixmaps/emelfm2
+@dirrm share/pixmaps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/emelfm2/plugins
 @dirrm lib/emelfm2