4 files changed, 61 insertions, 58 deletions

diff --git a/devel/qsvn/Makefile b/devel/qsvn/Makefile
index 6c5c1668ecda..862ec74bfbc4 100644
--- a/devel/qsvn/Makefile
+++ b/devel/qsvn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qsvn
-DISTVERSION=	0.7.1
+DISTVERSION=	0.8.0
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	devel
 MASTER_SITES=	http://www.anrichter.net/projects/qsvn/chrome/site/
@@ -25,9 +25,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 DESKTOP_ENTRIES="QSvn" "SVN client" "qsvn.png" "qsvn" "" false
 
-# Fix build when qt3 is installed
-post-patch:
-	${REINPLACE_CMD} -e 's:<\(q.*h\):<Qt/\1:' ${WRKSRC}/svnqt/*pp
+SVNQT_INCLUDE_DIR=	include/svnqt4
+PLIST_SUB=	SVNQT_INCLUDE_DIR="${SVNQT_INCLUDE_DIR}"
+
+pre-configure:
+	${REINPLACE_CMD} -e 's,include/svnqt,${SVNQT_INCLUDE_DIR},g' \
+		${WRKSRC}/svnqt/CMakeLists.txt
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/images/qsvn.png ${PREFIX}/share/pixmaps/
diff --git a/devel/qsvn/distinfo b/devel/qsvn/distinfo
index 83865316c1e8..eb52fe2ced84 100644
--- a/devel/qsvn/distinfo
+++ b/devel/qsvn/distinfo
@@ -1,3 +1,3 @@
-MD5 (qsvn-0.7.1-src.tar.gz) = 7e053aa4550455ba4872c88dcf397dc5
-SHA256 (qsvn-0.7.1-src.tar.gz) = c4e4560c54892032c5685858e8db8b43decdddaffbfeef43937937271cded53f
-SIZE (qsvn-0.7.1-src.tar.gz) = 788264
+MD5 (qsvn-0.8.0-src.tar.gz) = e3ed92cbea9af08f8a8a471656b511dd
+SHA256 (qsvn-0.8.0-src.tar.gz) = 74ab11d61899b5b73709260c19c599e465df06534b61e4aa1d76fffbe273a118
+SIZE (qsvn-0.8.0-src.tar.gz) = 771722
diff --git a/devel/qsvn/files/patch-src__CMakeLists.txt b/devel/qsvn/files/patch-src__CMakeLists.txt
index d85e9f859d7b..f2348d39db24 100644
--- a/devel/qsvn/files/patch-src__CMakeLists.txt
+++ b/devel/qsvn/files/patch-src__CMakeLists.txt
@@ -1,15 +1,15 @@
---- ../src/CMakeLists.txt.orig	2007-11-16 21:56:31.000000000 +0300
-+++ ../src/CMakeLists.txt	2008-01-13 23:03:26.000000000 +0300
-@@ -36,7 +36,7 @@
- 	IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
- 	  SET(LIB_SUFFIX "")
- 	ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4)
--	  SET(LIB_SUFFIX 64)
-+	  SET(LIB_SUFFIX "")
- 	ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
- 	SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 	SET(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
-@@ -192,5 +192,5 @@
+--- ./CMakeLists.txt.orig	2008-12-20 19:46:32.000000000 +0300
++++ ./CMakeLists.txt	2008-12-21 15:52:24.000000000 +0300
+@@ -42,7 +42,7 @@
+   IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+     SET(LIB_SUFFIX "")
+   ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-    SET(LIB_SUFFIX 64)
++    SET(LIB_SUFFIX "")
+   ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+   SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+   SET(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+@@ -188,5 +188,5 @@
  ENDIF (WIN32)
  
  # Unit-Tests
diff --git a/devel/qsvn/pkg-plist b/devel/qsvn/pkg-plist
index 6c13c8f8a78d..330f91eb4cca 100644
--- a/devel/qsvn/pkg-plist
+++ b/devel/qsvn/pkg-plist
@@ -1,44 +1,44 @@
 bin/qsvn
-include/svnqt4/annotate_line.hpp
-include/svnqt4/apr.hpp
-include/svnqt4/cache/DatabaseException.hpp
-include/svnqt4/cache/LogCache.hpp
-include/svnqt4/cache/ReposLog.hpp
-include/svnqt4/check.hpp
-include/svnqt4/client.hpp
-include/svnqt4/commititem.hpp
-include/svnqt4/conflictdescription.hpp
-include/svnqt4/conflictresult.hpp
-include/svnqt4/context.hpp
-include/svnqt4/context_listener.hpp
-include/svnqt4/datetime.hpp
-include/svnqt4/diffoptions.hpp
-include/svnqt4/dirent.hpp
-include/svnqt4/entry.hpp
-include/svnqt4/exception.hpp
-include/svnqt4/info_entry.hpp
-include/svnqt4/lock_entry.hpp
-include/svnqt4/log_entry.hpp
-include/svnqt4/path.hpp
-include/svnqt4/pool.hpp
-include/svnqt4/repository.hpp
-include/svnqt4/repositorylistener.hpp
-include/svnqt4/revision.hpp
-include/svnqt4/shared_pointer.hpp
-include/svnqt4/smart_pointer.hpp
-include/svnqt4/status.hpp
-include/svnqt4/stringarray.hpp
-include/svnqt4/svnfilestream.hpp
-include/svnqt4/svnqt_defines.hpp
-include/svnqt4/svnqttypes.hpp
-include/svnqt4/svnstream.hpp
-include/svnqt4/targets.hpp
-include/svnqt4/url.hpp
-include/svnqt4/version_check.hpp
-include/svnqt4/wc.hpp
+%%SVNQT_INCLUDE_DIR%%/annotate_line.hpp
+%%SVNQT_INCLUDE_DIR%%/apr.hpp
+%%SVNQT_INCLUDE_DIR%%/cache/DatabaseException.hpp
+%%SVNQT_INCLUDE_DIR%%/cache/LogCache.hpp
+%%SVNQT_INCLUDE_DIR%%/cache/ReposLog.hpp
+%%SVNQT_INCLUDE_DIR%%/check.hpp
+%%SVNQT_INCLUDE_DIR%%/client.hpp
+%%SVNQT_INCLUDE_DIR%%/commititem.hpp
+%%SVNQT_INCLUDE_DIR%%/conflictdescription.hpp
+%%SVNQT_INCLUDE_DIR%%/conflictresult.hpp
+%%SVNQT_INCLUDE_DIR%%/context.hpp
+%%SVNQT_INCLUDE_DIR%%/context_listener.hpp
+%%SVNQT_INCLUDE_DIR%%/datetime.hpp
+%%SVNQT_INCLUDE_DIR%%/diffoptions.hpp
+%%SVNQT_INCLUDE_DIR%%/dirent.hpp
+%%SVNQT_INCLUDE_DIR%%/entry.hpp
+%%SVNQT_INCLUDE_DIR%%/exception.hpp
+%%SVNQT_INCLUDE_DIR%%/info_entry.hpp
+%%SVNQT_INCLUDE_DIR%%/lock_entry.hpp
+%%SVNQT_INCLUDE_DIR%%/log_entry.hpp
+%%SVNQT_INCLUDE_DIR%%/path.hpp
+%%SVNQT_INCLUDE_DIR%%/pool.hpp
+%%SVNQT_INCLUDE_DIR%%/repository.hpp
+%%SVNQT_INCLUDE_DIR%%/repositorylistener.hpp
+%%SVNQT_INCLUDE_DIR%%/revision.hpp
+%%SVNQT_INCLUDE_DIR%%/shared_pointer.hpp
+%%SVNQT_INCLUDE_DIR%%/smart_pointer.hpp
+%%SVNQT_INCLUDE_DIR%%/status.hpp
+%%SVNQT_INCLUDE_DIR%%/stringarray.hpp
+%%SVNQT_INCLUDE_DIR%%/svnfilestream.hpp
+%%SVNQT_INCLUDE_DIR%%/svnqt_defines.hpp
+%%SVNQT_INCLUDE_DIR%%/svnqttypes.hpp
+%%SVNQT_INCLUDE_DIR%%/svnstream.hpp
+%%SVNQT_INCLUDE_DIR%%/targets.hpp
+%%SVNQT_INCLUDE_DIR%%/url.hpp
+%%SVNQT_INCLUDE_DIR%%/version_check.hpp
+%%SVNQT_INCLUDE_DIR%%/wc.hpp
 lib/libsvnqt4.so
 lib/libsvnqt4.so.5
 lib/libsvnqt4.so.5.0.1
 share/pixmaps/qsvn.png
-@dirrm include/svnqt4/cache
-@dirrm include/svnqt4
+@dirrm %%SVNQT_INCLUDE_DIR%%/cache
+@dirrm %%SVNQT_INCLUDE_DIR%%