6 files changed, 9 insertions, 46 deletions

diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index dc54a2b2c8f1..2f877adc4d69 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	emelfm2
-PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTVERSION=	0.3.5
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.emelfm2.net/rel/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/x11-fm/emelfm2/distinfo b/x11-fm/emelfm2/distinfo
index 3d05f7c10258..2b5c8dbd9406 100644
--- a/x11-fm/emelfm2/distinfo
+++ b/x11-fm/emelfm2/distinfo
@@ -1,3 +1,3 @@
-MD5 (emelfm2-0.3.4.tar.gz) = 08e28e4bb54fc731560402157df63af8
-SHA256 (emelfm2-0.3.4.tar.gz) = a0a6e60d54c5ca52b1a6467b79d25b1001d662f5ffb51c8446541826e068f8c8
-SIZE (emelfm2-0.3.4.tar.gz) = 992183
+MD5 (emelfm2-0.3.5.tar.gz) = 4f5a065a7d35371a920533153f24e362
+SHA256 (emelfm2-0.3.5.tar.gz) = 8eeacc5dad3fcb562bde6b8817c4beee3ec2354d1f5f38ec4bd656f0bf9d0b0a
+SIZE (emelfm2-0.3.5.tar.gz) = 1081106
diff --git a/x11-fm/emelfm2/files/patch-Makefile b/x11-fm/emelfm2/files/patch-Makefile
index 036e5aa6cfba..d5db8958e0d6 100644
--- a/x11-fm/emelfm2/files/patch-Makefile
+++ b/x11-fm/emelfm2/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat May 26 16:15:40 2007
-+++ Makefile	Sat May 26 16:17:20 2007
+--- Makefile.orig	Sat Jul 28 10:40:12 2007
++++ Makefile	Sat Jul 28 10:42:14 2007
 @@ -56,7 +56,7 @@
  
  #these are only used here for installation purposes
@@ -9,7 +9,7 @@
  #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)
-@@ -202,7 +202,7 @@
+@@ -203,7 +203,7 @@
  
  lLDFLAGS = $(LDFLAGS)
  # -lrt needed for clock_gettime()
@@ -18,7 +18,7 @@
  ifeq ($(USE_FAM),1)
  lLIBS += -lfam
  endif
-@@ -220,10 +220,10 @@
+@@ -221,10 +221,10 @@
  endif
  # should not need translation
  OPSYS := $(shell uname)
@@ -33,7 +33,7 @@
  
  #for gvfs development
  ifeq ($(WITH_GVFS),1)
-@@ -253,7 +253,6 @@
+@@ -254,7 +254,6 @@
  	done
  	@install -d $(MAN_DIR)
  	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);
diff --git a/x11-fm/emelfm2/files/patch-Makefile.config b/x11-fm/emelfm2/files/patch-Makefile.config
deleted file mode 100644
index a4549c80db45..000000000000
--- a/x11-fm/emelfm2/files/patch-Makefile.config
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.config.orig	Sat May 26 16:15:48 2007
-+++ Makefile.config	Sat May 26 16:18:11 2007
-@@ -137,9 +137,9 @@
- ifeq ($(DEBUG), 1)
- #additional CFLAGS -g -O0 will always be added when in debug mode
- #CFLAGS = -Wall -Wextra -Wno-unused -Winline
--CFLAGS = -Wall -Winline
-+CFLAGS ?= -Wall -Winline
- else
--CFLAGS = -O2 -Wall
-+CFLAGS ?= -O2 -Wall
- #CFLAGS = -O3 -Wall -march=athlon-tbird -mtune=athlon-tbird
- #CFLAGS = -O3 -Wall -march=pentium -mtune=pentium4
- endif
diff --git a/x11-fm/emelfm2/files/patch-e2_fileview.h b/x11-fm/emelfm2/files/patch-e2_fileview.h
deleted file mode 100644
index 148fe5bfb6f5..000000000000
--- a/x11-fm/emelfm2/files/patch-e2_fileview.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/e2_fileview.h.orig	Sat Nov  4 14:39:08 2006
-+++ src/e2_fileview.h	Sat Nov  4 14:39:26 2006
-@@ -21,6 +21,7 @@
- #ifndef E2_FILEVIEW_H
- #define E2_FILEVIEW_H
- 
-+#include <pthread.h>
- #include "emelfm2.h"
- 
- #ifdef E2_VFS
diff --git a/x11-fm/emelfm2/files/patch-e2_fs.c b/x11-fm/emelfm2/files/patch-e2_fs.c
deleted file mode 100644
index 3f0adccadcd8..000000000000
--- a/x11-fm/emelfm2/files/patch-e2_fs.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/filesystem/e2_fs.c.orig	Sat May 26 16:19:06 2007
-+++ src/filesystem/e2_fs.c	Sat May 26 16:20:08 2007
-@@ -40,7 +40,8 @@
- #include <langinfo.h>
- #include <pwd.h>
- #include <grp.h>
--#include <sys/statfs.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
- #ifndef MNT_LOCAL
- # include <sys/statvfs.h>
- #endif