5 files changed, 6 insertions, 99 deletions

diff --git a/x11-fm/walcommander/Makefile b/x11-fm/walcommander/Makefile
index 2aea2f71142b..e75f032d6e0e 100644
--- a/x11-fm/walcommander/Makefile
+++ b/x11-fm/walcommander/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	walcommander
-PORTVERSION=	0.16.1.git20140829
+PORTVERSION=	0.17.0
 CATEGORIES=	x11-fm
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -14,14 +14,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	corporateshark
 GH_PROJECT=	WalCommander
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	7038a3e
+GH_TAGNAME=	release-${PORTVERSION}
+GH_COMMIT=	a73beeb
 
-USES=		cmake:outsource
+USES=		compiler:c++11-lib cmake
 USE_XORG=	x11
 
-CMAKE_SOURCE_PATH=${WRKSRC}/wcm
-
 PORTDOCS=	CHANGELOG CHANGELOG.GitHub README.md readme_eng.txt
 
 PLIST_FILES=	bin/wcm \
diff --git a/x11-fm/walcommander/distinfo b/x11-fm/walcommander/distinfo
index 0614a4249b41..7f738698ec8c 100644
--- a/x11-fm/walcommander/distinfo
+++ b/x11-fm/walcommander/distinfo
@@ -1,2 +1,2 @@
-SHA256 (walcommander-0.16.1.git20140829.tar.gz) = 379f48382878f0d435374f299ad1bce7f2438208127f643abe5f694e38a429ea
-SIZE (walcommander-0.16.1.git20140829.tar.gz) = 4795287
+SHA256 (walcommander-0.17.0.tar.gz) = 6c8b3c9a3f892da0e3ad484737871aa7117accee49ac11058e1c2a5d34c40f07
+SIZE (walcommander-0.17.0.tar.gz) = 4826776
diff --git a/x11-fm/walcommander/files/patch-wcm__CMakeLists.txt b/x11-fm/walcommander/files/patch-wcm__CMakeLists.txt
deleted file mode 100644
index 844ab10bf867..000000000000
--- a/x11-fm/walcommander/files/patch-wcm__CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- wcm/CMakeLists.txt.orig	2014-08-29 02:25:10.000000000 +0400
-+++ wcm/CMakeLists.txt	2014-08-29 19:32:52.178444785 +0400
-@@ -28,12 +28,12 @@
- 	SET(wcm_LIBS ${wcm_LIBS} ${FREETYPE_LIBRARIES})
- ENDIF(WITH_FREETYPE)
- 
--IF(WITH_SSH2)
-+IF(WITH_LIBSSH2)
- 	FIND_PACKAGE(SSH2 REQUIRED)
- 	ADD_DEFINITIONS(-DLIBSSH2_EXIST)
- 	INCLUDE_DIRECTORIES(${SSH2_INCLUDE_DIR})
- 	SET(wcm_LIBS ${wcm_LIBS} ${SSH2_LIBRARY})
--ENDIF(WITH_SSH2)
-+ENDIF(WITH_LIBSSH2)
- 
- IF(WITH_SMBCLIENT)
- 	FIND_PACKAGE(SMBClient REQUIRED)
-@@ -174,3 +174,8 @@
- # targets
- ADD_EXECUTABLE(wcm ${wcm_SOURCES} ${wcm_HEADERS})
- TARGET_LINK_LIBRARIES(wcm ${wcm_LIBS})
-+
-+# install
-+INSTALL(TARGETS wcm RUNTIME DESTINATION bin)
-+INSTALL(FILES wcm.desktop DESTINATION share/applications)
-+INSTALL(FILES small.ico DESTINATION share/pixmaps RENAME wcm.ico)
diff --git a/x11-fm/walcommander/files/patch-wcm__vfs.cpp b/x11-fm/walcommander/files/patch-wcm__vfs.cpp
deleted file mode 100644
index 45adc0706c90..000000000000
--- a/x11-fm/walcommander/files/patch-wcm__vfs.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
---- wcm/vfs.cpp.orig	2014-08-29 02:25:10.000000000 +0400
-+++ wcm/vfs.cpp	2014-08-29 19:14:40.984519553 +0400
-@@ -988,7 +988,14 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <sys/time.h>
--#include <sys/statfs.h>
-+
-+// for statfs()
-+#ifdef __linux__
-+#  include <sys/statfs.h>
-+#elif defined __FreeBSD__
-+#  include <sys/param.h>
-+#  include <sys/mount.h>
-+#endif
- 
- #ifdef __linux__
- #  define OPENFLAG_LARGEFILE (O_LARGEFILE)
-@@ -1211,6 +1218,7 @@
- 
- int64 FSSys::GetFileSystemFreeSpace( FSPath& path, int* err )
- {
-+#ifdef __linux__
- 	struct statfs64 s;
- 
- 	if ( statfs64( path.GetUtf8(), &s ) == -1 )
-@@ -1218,6 +1226,16 @@
- 		SetError( err, errno );
- 		return -1;
- 	}
-+#else
-+	// FreeBSD and probably other systems have 64 bit support in regular statfs
-+	struct statfs s;
-+
-+	if ( statfs( path.GetUtf8(), &s ) == -1 )
-+	{
-+		SetError( err, errno );
-+		return -1;
-+	}
-+#endif
- 
- 	return ( int64 )( s.f_bfree ) * ( int64 )( s.f_bsize );
- }
diff --git a/x11-fm/walcommander/files/patch-wcm__wcm.desktop b/x11-fm/walcommander/files/patch-wcm__wcm.desktop
deleted file mode 100644
index 9c3e2bcfd87c..000000000000
--- a/x11-fm/walcommander/files/patch-wcm__wcm.desktop
+++ /dev/null
@@ -1,22 +0,0 @@
---- wcm/wcm.desktop.orig	2014-08-29 19:26:29.543471554 +0400
-+++ wcm/wcm.desktop	2014-08-29 19:27:05.317468198 +0400
-@@ -0,0 +1,19 @@
-+[Desktop Entry]
-+Version=1.0
-+Encoding=UTF-8
-+Name=Wal Commander
-+GenericName=file manager
-+Comment=2-pane file manager
-+Comment[fr]=2-gestionnaire de fichiers à panneaux
-+Comment[de]=2-Fenster Dateimanager
-+Comment[ja]=2-ペイン ファイル manager
-+Comment[ru]=2-панельный файловый менеджер
-+Comment[pl]=2-okno menedżer plików
-+Comment[zh_CN]=2-面板 文件管理器
-+Type=Application
-+Exec=wcm
-+TryExec=wcm
-+Icon=wcm
-+Terminal=false
-+StartupNotify=false
-+Categories=System;Utility;Core;FileTools;FileManager;