5 files changed, 41 insertions, 14 deletions

diff --git a/devel/esvn/Makefile b/devel/esvn/Makefile
index a4e0c86bb622..3769c357807b 100644
--- a/devel/esvn/Makefile
+++ b/devel/esvn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	esvn
-PORTVERSION=	0.6.8
+PORTVERSION=	0.6.9
 CATEGORIES=	devel
 MASTER_SITES=	http://esvn.umputun.com/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
@@ -51,6 +51,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/esvn ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/esvn-diff-wrapper ${PREFIX}/bin
 .if exists(${LOCALBASE}/bin/kde-config)
+	${MKDIR} ${LOCALBASE}/share/applnk
+	${MKDIR} ${LOCALBASE}/share/icons/hicolor/48x48/apps
 	${INSTALL_DATA} ${WRKSRC}/eSvn.desktop ${LOCALBASE}/share/applnk
 	${INSTALL_DATA} ${WRKSRC}/images/esvn.png ${LOCALBASE}/share/icons/hicolor/48x48/apps
 .endif
diff --git a/devel/esvn/distinfo b/devel/esvn/distinfo
index e5005f705c4b..e489e7d886e7 100644
--- a/devel/esvn/distinfo
+++ b/devel/esvn/distinfo
@@ -1,2 +1,2 @@
-MD5 (esvn-0.6.8-1.tar.gz) = 1682b7a21217e108cc00cc95b55ffe72
-SIZE (esvn-0.6.8-1.tar.gz) = 1920635
+MD5 (esvn-0.6.9-1.tar.gz) = d9feb055f19073328059b1994a04b19a
+SIZE (esvn-0.6.9-1.tar.gz) = 1921281
diff --git a/devel/esvn/files/patch-esvn_utils.h b/devel/esvn/files/patch-esvn_utils.h
deleted file mode 100644
index cae20356dfc9..000000000000
--- a/devel/esvn/files/patch-esvn_utils.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/esvn_utils.h.orig	Sat Nov 27 12:55:50 2004
-+++ src/esvn_utils.h	Fri Dec 10 10:50:35 2004
-@@ -5,6 +5,8 @@
- #include <qdir.h>
- #include <vector>
- 
-+#include <time.h>
-+
- namespace EsvnUtils
- {
- 	inline QDateTime UTC2Local(const QDateTime& utc)
diff --git a/devel/esvn/files/patch-src-entries_parser.cpp b/devel/esvn/files/patch-src-entries_parser.cpp
new file mode 100644
index 000000000000..8dab927b6c4d
--- /dev/null
+++ b/devel/esvn/files/patch-src-entries_parser.cpp
@@ -0,0 +1,31 @@
+--- src/entries_parser.cpp	Thu Feb 24 08:15:56 2005
++++ src/entries_parser.cpp	Wed Mar 23 15:46:18 2005
+@@ -246,14 +246,27 @@
+ 
+ 	int gm_sec  = isoDateTime.mid(17,2).toInt();
+ 
+-	time_t utc_time = mktime(&m);
++	time_t utc_time;
+ 
++#if defined(__FreeBSD__)
++
++	// BSD has inverse of gmtime()
++	utc_time = timegm(&m);
++
++#else
++
++	// all others do mktime() and adjust timezone
+ 	// mktime assumes broken-down time in local timezone,
+ 	// to get UTC we need to correct result by timezone offset
++
++	utc_time = mktime(&m);
++
+ #if (_WINDOWS || ESVN_WIN )
+ 	utc_time -= _timezone;
+ #else
+ 	utc_time -= timezone;
++#endif
++
+ #endif
+ 
+ 	// round to remove leap seconds in "right" timezones
diff --git a/devel/esvn/pkg-plist b/devel/esvn/pkg-plist
index 678d951059ef..e8690c1fd832 100644
--- a/devel/esvn/pkg-plist
+++ b/devel/esvn/pkg-plist
@@ -107,3 +107,8 @@ bin/esvn-diff-wrapper
 %%KDE%%@cwd %%LOCALBASE%%
 %%KDE%%share/applnk/eSvn.desktop
 %%KDE%%share/icons/hicolor/48x48/apps/esvn.png
+%%KDE%%@unexec rmdir %D/share/applnk 2>/dev/null || true
+%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+%%KDE%%@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+%%KDE%%@unexec rmdir %D/share/icons 2>/dev/null || true