Update to 0.6.3

PR:		ports/72730
Submitted by:	maintainer

6 files changed, 122 insertions, 59 deletions

diff --git a/devel/esvn/Makefile b/devel/esvn/Makefile
index bb549beba380..fcecfd0c64bf 100644
--- a/devel/esvn/Makefile
+++ b/devel/esvn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	esvn
-PORTVERSION=	0.5.5
+PORTVERSION=	0.6.4
 CATEGORIES=	devel
 MASTER_SITES=	http://esvn.umputun.com/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
@@ -19,6 +19,7 @@ RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
 
 ESVN_DIST=	esvn
 ESVNPRO=	esvn.pro esvn-diff-wrapper.pro
+ESVNDOCS=	html-docs html-docs/common html-docs/common/admon html-docs/common/navig html-docs/images
 
 WRKSRC=		${WRKDIR}/${ESVN_DIST}
 
@@ -32,37 +33,34 @@ CONFIGURE_ARGS=	--qtdir=${X11BASE}
 MAKE_ARGS+=	QTDIR=${X11BASE} \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
-PORTDOCS=	AUTHORS ChangeLog README VERSION
-
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/bin/kde-config)
+PLIST_SUB+=	KDE=""
+.else
+PLIST_SUB+=	KDE="@comment "
+.endif
+
 do-configure:
 	@for proj in ${ESVNPRO}; do \
 	cd ${WRKSRC}; \
 	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ $${proj}; \
 	done
 
-post-configure:
-.if exists(/boot/modules/nvidia.ko) && ${OSVERSION} > 502122
-	${REINPLACE_CMD} -e 's#-lpthread#-lc_r#' ${WRKSRC}/esvn.mak ${WRKSRC}/esvn-diff-wrapper.mak
-.endif
-
-post-build:
-	${REINPLACE_CMD} -e 's#esvn.png#${PREFIX}/share/pixmaps/esvn.png#' ${WRKSRC}/eSvn.desktop
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/esvn ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/esvn-diff-wrapper ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/eSvn.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/esvn.png ${PREFIX}/share/pixmaps
+.if exists(${LOCALBASE}/bin/kde-config)
+	${INSTALL_DATA} ${WRKSRC}/eSvn.desktop ${LOCALBASE}/share/applnk
+	${INSTALL_DATA} ${WRKSRC}/images/esvn.png ${LOCALBASE}/share/icons/hicolor/48x48/apps
+.endif
 
-post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	for f in ${PORTDOCS}; do \
-	    ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
+	for d in ${ESVNDOCS}; do \
+	    ${MKDIR} ${DOCSDIR}/$$d; \
+	    ${CP} -Rp ${WRKSRC}/$$d/* ${DOCSDIR}/$$d/; \
 	done
-.endif				  
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/esvn/distinfo b/devel/esvn/distinfo
index e2923caa35fb..e44140545d06 100644
--- a/devel/esvn/distinfo
+++ b/devel/esvn/distinfo
@@ -1,2 +1,2 @@
-MD5 (esvn-0.5.5-1.tar.gz) = 9ec15f575237a24738957816156cd249
-SIZE (esvn-0.5.5-1.tar.gz) = 949208
+MD5 (esvn-0.6.4-1.tar.gz) = 640534d87c0896da35d280d49d65e0f3
+SIZE (esvn-0.6.4-1.tar.gz) = 1945827
diff --git a/devel/esvn/files/patch-src-cmd_lineedit.cpp b/devel/esvn/files/patch-src-cmd_lineedit.cpp
deleted file mode 100644
index 8dac0da775f4..000000000000
--- a/devel/esvn/files/patch-src-cmd_lineedit.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- cmd_lineedit.cpp	Sun Aug 22 03:18:28 2004
-+++ src/cmd_lineedit.cpp	Tue Aug 24 13:11:50 2004
-@@ -29,9 +29,9 @@
- void Cmd_LineEdit::keyPressEvent( QKeyEvent * e )

- {

- 	if( ( e->key() == Qt::Key_Up ) && ( pos > 0) )

--		setText(cmd_hist.at(--pos));

-+		setText(cmd_hist[--pos]);

- 	else if( ( e->key() == Qt::Key_Down ) &&  ( pos + 1 < cmd_hist.size() ) )

--			setText(cmd_hist.at(++pos));

-+			setText(cmd_hist[++pos]);

- 	else

- 		QLineEdit::keyPressEvent(e);

- }

diff --git a/devel/esvn/files/patch-src-entries_parser.h b/devel/esvn/files/patch-src-entries_parser.h
deleted file mode 100644
index 28199737f095..000000000000
--- a/devel/esvn/files/patch-src-entries_parser.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- entries_parser.h.orig	Fri Aug 20 06:09:58 2004
-+++ src/entries_parser.h	Mon Aug 23 18:43:51 2004
-@@ -24,6 +24,8 @@
- #include <qstring.h>
- #include <qdir.h>
- 
-+#include <sys/types.h>
-+#include <time.h>
- #include <map>
- #include <iostream>
- 
diff --git a/devel/esvn/files/patch-src-mainwindow.cpp b/devel/esvn/files/patch-src-mainwindow.cpp
deleted file mode 100644
index 84dfbe481385..000000000000
--- a/devel/esvn/files/patch-src-mainwindow.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- mainwindow.cpp.orig	Sun Aug 22 02:22:34 2004
-+++ src/mainwindow.cpp	Mon Aug 23 18:44:41 2004
-@@ -16,6 +16,7 @@
- 
- #include "mainwindow.h"
- 
-+#include <unistd.h>
- #include <qlistview.h>
- #include <qtextcodec.h> 
- #include <qsocket.h>
diff --git a/devel/esvn/pkg-plist b/devel/esvn/pkg-plist
index 2a3c3e87c272..0ffab92e9c49 100644
--- a/devel/esvn/pkg-plist
+++ b/devel/esvn/pkg-plist
@@ -1,6 +1,106 @@
 bin/esvn
 bin/esvn-diff-wrapper
-share/applications/eSvn.desktop
-share/pixmaps/esvn.png
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/apa.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/apb.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/apbs02.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/apbs03.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/apc.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch02s02.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch02s03.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s02.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s03.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s04.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s05.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s06.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s07.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s08.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s09.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s10.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s11.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s12.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s13.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s14.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s15.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s16.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s17.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s18.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s19.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s20.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s21.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s22.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s23.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s24.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s25.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s26.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s27.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s28.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s29.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s30.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s31.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s32.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ch03s33.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/admon/caution.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/admon/important.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/admon/note.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/admon/tip.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/admon/warning.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/navig/home.gif
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/navig/next.gif
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/navig/prev.gif
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/navig/toc-blank.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/navig/toc-minus.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/navig/toc-plus.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/common/navig/up.gif
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/corpstyle.css
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/FileAdded16x16.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/FileConflict16x16.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/FileModified16x16.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/FileNeedsPatch16x16.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/FileRemoved16x16.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/FileUnknown16x16.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/FileWriteable16x16.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/b-16x16.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/browse-view.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/diff-url-wiz.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/diff-url-wiz1.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/diff.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/esvn-big.gif
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/folder_blue.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/folder_blue_open.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/folder_exec_3.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/folder_green.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/folder_green_open.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/folder_grey_3.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/folder_grey_open_3.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/folder_red.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/main.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/processing_checkout.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/properties-add.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/properties-edit.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/properties.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/quick-diff.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/startup.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/t-16x16.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/toolbar-file.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/toolbar-modify.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/toolbar-query.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/toolbar-view.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/images/ws_manager6.png
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/ln-d4e10.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/pr01.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/pr01s02.html
+%%PORTDOCS%%%%DOCSDIR%%/html-docs/pr01s03.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html-docs/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html-docs/common/navig
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html-docs/common/admon
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html-docs/common
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html-docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%KDE%%@cwd %%LOCALBASE%%
+%%KDE%%share/applnk/eSvn.desktop
+%%KDE%%share/icons/hicolor/48x48/apps/esvn.png