5 files changed, 6 insertions, 96 deletions

diff --git a/misc/vifm/Makefile b/misc/vifm/Makefile
index fec00768fab7..eb69220d5b92 100644
--- a/misc/vifm/Makefile
+++ b/misc/vifm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vifm
-PORTVERSION=	0.7.4b
+PORTVERSION=	0.7.6
 CATEGORIES=	misc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -12,8 +12,7 @@ COMMENT=	Ncurses based file manager with vi like keybindings
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake ncurses
-USE_BZIP2=	yes
+USES=		gmake ncurses tar:bzip2
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--without-gtk
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
@@ -24,6 +23,8 @@ PLIST_FILES=	bin/vifm \
 		bin/vifm-pause \
 		%%DATADIR%%/vifm-help.txt \
 		%%DATADIR%%/vifmrc \
+		share/applications/vifm.desktop \
+		share/pixmaps/vifm.png \
 		man/man1/vifm-pause.1.gz \
 		man/man1/vifm.1.gz \
 		man/man1/vifmrc-converter.1.gz
diff --git a/misc/vifm/distinfo b/misc/vifm/distinfo
index 243d4a7e0a9e..f2ba68e9c1bd 100644
--- a/misc/vifm/distinfo
+++ b/misc/vifm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vifm-0.7.4b.tar.bz2) = 90b4fb64501e436d7ac8699f0cc75d013a72aa471f978ada0ce9b90506213c57
-SIZE (vifm-0.7.4b.tar.bz2) = 562778
+SHA256 (vifm-0.7.6.tar.bz2) = 861798592d6fccc5d330a66e68f1c5a747732b9df587f15d892c6ff72a04650f
+SIZE (vifm-0.7.6.tar.bz2) = 609855
diff --git a/misc/vifm/files/patch-configure.in b/misc/vifm/files/patch-configure.in
deleted file mode 100644
index 0e6c754363be..000000000000
--- a/misc/vifm/files/patch-configure.in
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.in.orig	2013-04-02 18:52:13.000000000 +0300
-+++ configure.in	2013-04-02 18:53:57.000000000 +0300
-@@ -24,7 +24,6 @@
- AC_CHECK_HEADER([limits.h], [], [AC_MSG_ERROR([limits.h header not found.])])
- AC_CHECK_HEADER([locale.h], [], [AC_MSG_ERROR([locale.h header not found.])])
- AC_CHECK_HEADER([math.h], [], [AC_MSG_ERROR([math.h header not found.])])
--AC_CHECK_HEADER([mntent.h], [], [AC_MSG_ERROR([mntent.h header not found.])])
- AC_CHECK_HEADER([pwd.h], [], [AC_MSG_ERROR([pwd.h header not found.])])
- AC_CHECK_HEADER([signal.h], [], [AC_MSG_ERROR([signal.h header not found.])])
- AC_CHECK_HEADER([stdarg.h], [], [AC_MSG_ERROR([stdarg.h header not found.])])
-@@ -69,7 +68,6 @@
- AC_CHECK_FUNC([closedir], [], [AC_MSG_ERROR([closedir() function not found.])])
- AC_CHECK_FUNC([dup], [], [AC_MSG_ERROR([dup() function not found.])])
- AC_CHECK_FUNC([dup2], [], [AC_MSG_ERROR([dup2() function not found.])])
--AC_CHECK_FUNC([endmntent], [], [AC_MSG_ERROR([endmntent() function not found.])])
- AC_CHECK_FUNC([execve], [], [AC_MSG_ERROR([execve() function not found.])])
- AC_CHECK_FUNC([execvp], [], [AC_MSG_ERROR([execvp() function not found.])])
- AC_CHECK_FUNC([exit], [], [AC_MSG_ERROR([exit() function not found.])])
-@@ -91,7 +89,6 @@
- AC_CHECK_FUNC([getgrgid], [], [AC_MSG_ERROR([getgrgid() function not found.])])
- AC_CHECK_FUNC([getgrgid_r], [], [AC_MSG_ERROR([getgrgid_r() function not found.])])
- AC_CHECK_FUNC([getgrnam], [], [AC_MSG_ERROR([getgrnam() function not found.])])
--AC_CHECK_FUNC([getmntent], [], [AC_MSG_ERROR([getmntent() function not found.])])
- AC_CHECK_FUNC([getpid], [], [AC_MSG_ERROR([getpid() function not found.])])
- AC_CHECK_FUNC([getppid], [], [AC_MSG_ERROR([getppid() function not found.])])
- AC_CHECK_FUNC([getpwent], [], [AC_MSG_ERROR([getpwent() function not found.])])
-@@ -132,7 +129,6 @@
- AC_CHECK_FUNC([setenv], [], [AC_MSG_ERROR([setenv() function not found.])])
- AC_CHECK_FUNC([setgrent], [], [AC_MSG_ERROR([setgrent() function not found.])])
- AC_CHECK_FUNC([setlocale], [], [AC_MSG_ERROR([setlocale() function not found.])])
--AC_CHECK_FUNC([setmntent], [], [AC_MSG_ERROR([setmntent() function not found.])])
- AC_CHECK_FUNC([setpgid], [], [AC_MSG_ERROR([setpgid() function not found.])])
- AC_CHECK_FUNC([setpwent], [], [AC_MSG_ERROR([setpwent() function not found.])])
- AC_CHECK_FUNC([setsid], [], [AC_MSG_ERROR([setsid() function not found.])])
-@@ -164,7 +160,6 @@
- AC_CHECK_FUNC([strtok_r], [], [AC_MSG_ERROR([strtok_r() function not found.])])
- AC_CHECK_FUNC([strtol], [], [AC_MSG_ERROR([strtol() function not found.])])
- AC_CHECK_FUNC([strtoll], [], [AC_MSG_ERROR([strtoll() function not found.])])
--AC_CHECK_FUNC([strverscmp], [], [AC_MSG_ERROR([strverscmp() function not found.])])
- AC_CHECK_FUNC([sysconf], [], [AC_MSG_ERROR([sysconf() function not found.])])
- AC_CHECK_FUNC([time], [], [AC_MSG_ERROR([time() function not found.])])
- AC_CHECK_FUNC([tolower], [], [AC_MSG_ERROR([tolower() function not found.])])
diff --git a/misc/vifm/files/patch-src-sort.c b/misc/vifm/files/patch-src-sort.c
deleted file mode 100644
index 941867742009..000000000000
--- a/misc/vifm/files/patch-src-sort.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/sort.c.orig	2013-04-02 18:55:08.000000000 +0300
-+++ src/sort.c	2013-04-02 18:37:26.000000000 +0300
-@@ -46,7 +46,7 @@
- 
- static int sort_dir_list(const void *one, const void *two);
- TSTATIC int strnumcmp(const char s[], const char t[]);
--#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__)
- static int vercmp(const char s[], const char t[]);
- #else
- static char * skip_leading_zeros(const char str[]);
-@@ -106,7 +106,7 @@
- TSTATIC int
- strnumcmp(const char s[], const char t[])
- {
--#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__)
- 	return vercmp(s, t);
- #else
- 	const char *new_s = skip_leading_zeros(s);
-@@ -115,7 +115,7 @@
- #endif
- }
- 
--#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__)
- static int
- vercmp(const char s[], const char t[])
- {
diff --git a/misc/vifm/files/patch-src-utils-utils.c b/misc/vifm/files/patch-src-utils-utils.c
deleted file mode 100644
index 2366599176ae..000000000000
--- a/misc/vifm/files/patch-src-utils-utils.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/utils/utils.c.orig	2013-04-02 18:56:49.000000000 +0300
-+++ src/utils/utils.c	2013-04-02 18:21:24.000000000 +0300
-@@ -34,7 +34,7 @@
- #include <sys/wait.h> /* waitpid() */
- #endif
- 
--#if !defined(_WIN32) && !defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <mntent.h> /* getmntent() */
- #endif
- 
-@@ -267,7 +267,7 @@
- int
- is_on_slow_fs(const char *full_path)
- {
--#if defined(_WIN32) || defined(__APPLE__)
-+#if defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
- 	return 0;
- #else
- 	FILE *f;