4 files changed, 28 insertions, 35 deletions

diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index ebce7c6261a6..a9fc64cc595b 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emelfm2
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://emelfm2.net/rel/
 
@@ -18,11 +18,10 @@ USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.5
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
-MAKE_ENV=	LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}/"
+MAKE_ENV=	LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}/" MAN_DIR="${MAN1PREFIX}/man/man1"
 MAN1=		emelfm2.1
 
 OPTIONS=	DEBUG	"Enable debugging messages" off \
diff --git a/x11-fm/emelfm2/distinfo b/x11-fm/emelfm2/distinfo
index 8ccdb8b7a781..c7424edb1f9f 100644
--- a/x11-fm/emelfm2/distinfo
+++ b/x11-fm/emelfm2/distinfo
@@ -1,3 +1,3 @@
-MD5 (emelfm2-0.5.0.tar.bz2) = 26ce3efa9739c601bee082f642c66ac1
-SHA256 (emelfm2-0.5.0.tar.bz2) = 3905941010390762f0d827e5d142238a5c118170afca7c4a7a669a8d4f803e9d
-SIZE (emelfm2-0.5.0.tar.bz2) = 967187
+MD5 (emelfm2-0.5.1.tar.bz2) = f97784e465b0c29685e057052ca39a18
+SHA256 (emelfm2-0.5.1.tar.bz2) = c1f94b1a9682a2526ce12275e9828fb7461a7b2e3609c1a29adf0ea9328900a2
+SIZE (emelfm2-0.5.1.tar.bz2) = 1002588
diff --git a/x11-fm/emelfm2/files/patch-Makefile b/x11-fm/emelfm2/files/patch-Makefile
index 16e7e26b40b8..28c66c52530e 100644
--- a/x11-fm/emelfm2/files/patch-Makefile
+++ b/x11-fm/emelfm2/files/patch-Makefile
@@ -1,32 +1,15 @@
---- Makefile.orig	2008-05-12 02:04:41.000000000 +0200
-+++ Makefile	2008-05-26 08:45:53.000000000 +0200
-@@ -51,7 +51,7 @@
+--- Makefile.orig	2009-02-12 04:47:20.000000000 +0100
++++ Makefile	2009-02-20 09:13:43.000000000 +0100
+@@ -211,7 +211,7 @@
  
- #these are only used here for installation purposes
- BIN_DIR = $(PREFIX)/bin
--MAN_DIR = $(PREFIX)/share/man/man1
-+MAN_DIR = $(PREFIX)/man/man1
- #as well as usage here, all in-code uses of these is assumed localised
- ifeq ($(DOCS_VERSION), 1)
- DOC_DIR = $(PREFIX)/share/doc/$(TARGET)-$(VERSION)
-@@ -215,7 +215,7 @@
- 
- lLDFLAGS = $(LDFLAGS)
+ #setup linking
  # -lrt needed for clock_gettime()
 -lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0) -lrt
 +lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0)
  ifeq ($(USE_FAM),1)
  lLIBS += -lfam
  endif
-@@ -232,6 +232,7 @@
- lLIBS += -lacl
- endif
- ifeq ($(WITH_HAL),1)
-+lCFLAGS += $(shell pkg-config --cflags dbus-1 dbus-glib-1 hal hal-storage)
- lLIBS += $(shell pkg-config --libs dbus-1 dbus-glib-1 hal hal-storage)
- endif
- # for vfs & gvfs development
-@@ -244,10 +245,10 @@
+@@ -223,10 +223,10 @@
  endif
  # should not need translation
  OPSYS := $(shell uname)
@@ -40,15 +23,15 @@
 +#endif
  
  .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \
-         clean deps i18n install_i18n uninstall_i18n \
-@@ -266,10 +267,6 @@
- 	@for file in `ls icons/ |grep -v svn`; do \
- 		install -m 644 icons/$$file $(ICON_DIR); \
+         clean clean_plugins deps i18n install_i18n uninstall_i18n \
+@@ -245,10 +245,6 @@
+ 	@for file in `ls $(ICONS)/ |grep -v svn`; do \
+ 		install -m 644 $(ICONS)/$$file $(ICON_DIR); \
  	done
 -	@install -d $(DOC_DIR)
--	@for file in `ls docs/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v $(TARGET).1`; do \
--		install -m 644 docs/$$file $(DOC_DIR); \
+-	@for file in `ls $(DOCS)/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v $(TARGET).1`; do \
+-		install -m 644 $(DOCS)/$$file $(DOC_DIR); \
 -	done
  	@install -d $(MAN_DIR)
- 	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);
+ 	@install -m 644 $(DOCS)/$(TARGET).1 $(MAN_DIR);
  #	@bzip2 -f $(MAN_DIR)/$(TARGET).1;
diff --git a/x11-fm/emelfm2/files/patch-src_filesystem_e2_fs.c b/x11-fm/emelfm2/files/patch-src_filesystem_e2_fs.c
new file mode 100644
index 000000000000..7cd9eec37f78
--- /dev/null
+++ b/x11-fm/emelfm2/files/patch-src_filesystem_e2_fs.c
@@ -0,0 +1,11 @@
+--- 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;