6 files changed, 76 insertions, 5 deletions

diff --git a/graphics/kgraphviewer/Makefile b/graphics/kgraphviewer/Makefile
index 1c06459466dd..653a2ed489b2 100644
--- a/graphics/kgraphviewer/Makefile
+++ b/graphics/kgraphviewer/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kgraphviewer
 PORTVERSION=	${APP_VER}.${EXTRA_VER}
-PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${EXTRA_VER}/src/extragear
@@ -17,6 +16,9 @@ DIST_SUBDIR=	KDE/extragear
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	GraphViz dot graph viewer for KDE
 
+BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 USE_QT_VER=	4
@@ -24,6 +26,6 @@ QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 
 APP_VER=	2.0.2
-EXTRA_VER=	4.2.3
+EXTRA_VER=	4.3.0
 
 .include <bsd.port.mk>
diff --git a/graphics/kgraphviewer/distinfo b/graphics/kgraphviewer/distinfo
index dddb261187ff..486840cf2fd3 100644
--- a/graphics/kgraphviewer/distinfo
+++ b/graphics/kgraphviewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/extragear/kgraphviewer-2.0.2-kde4.2.3.tar.bz2) = b76671be5a4e548ac76327b718523446
-SHA256 (KDE/extragear/kgraphviewer-2.0.2-kde4.2.3.tar.bz2) = ede8cefa8aa02e62aca2a2933f1234245de5fa208b00600f86ac3c9ad070ac42
-SIZE (KDE/extragear/kgraphviewer-2.0.2-kde4.2.3.tar.bz2) = 867533
+MD5 (KDE/extragear/kgraphviewer-2.0.2-kde4.3.0.tar.bz2) = 23935e28a7c316d20b17e13c9089d727
+SHA256 (KDE/extragear/kgraphviewer-2.0.2-kde4.3.0.tar.bz2) = aada39888ad6c7f3a14d539f2e56fb244d48783ed569af60b47fe600ef0e5fc3
+SIZE (KDE/extragear/kgraphviewer-2.0.2-kde4.3.0.tar.bz2) = 1065567
diff --git a/graphics/kgraphviewer/files/patch-CMakeLists.txt b/graphics/kgraphviewer/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..ed3b3007cd5c
--- /dev/null
+++ b/graphics/kgraphviewer/files/patch-CMakeLists.txt
@@ -0,0 +1,30 @@
+--- CMakeLists.txt.orig	2009-07-30 23:28:35.000000000 +1100
++++ CMakeLists.txt	2009-08-03 02:17:59.000000000 +1100
+@@ -7,6 +7,18 @@
+ include (KDE4Defaults)
+ include (MacroLibrary)
+ 
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(LIBGVC libgvc>=2.24.0)
++FIND_PATH(LIBGVC_INCLUDE NAMES gvc.h
++  PATHS ${LIBGVC_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/include NO_DEFAULT_PATH)
++FIND_LIBRARY(LIBGVC_LIBRARY NAMES gvc graph cdt pathplan	
++  PATHS ${LIBGVC_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/lib NO_DEFAULT_PATH)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGVC DEFAULT_MSG LIBGVC_INCLUDE LIBGVC_LIBRARY_DIRS)
++SET(LIBGVC_LIBRARIES ${LIBGVC_LIBRARY})
++SET(LIBGVC_INCLUDES ${LIBGVC_INCLUDE})
++
+ # are these two really required ?
+ find_package(ZLIB REQUIRED)
+ if (APPLE)
+@@ -14,7 +26,7 @@
+ endif (APPLE)
+ find_package(KdepimLibs REQUIRED)
+ 
+-FIND_PROGRAM(DOT_EXECUTABLE NAMES dot  PATHS /usr/bin/  )
++FIND_PROGRAM(DOT_EXECUTABLE NAMES dot  PATHS /usr/bin/ /usr/local/bin/  )
+ if(NOT DOT_EXECUTABLE)
+    MESSAGE(STATUS "GraphViz not found. You will need it at runtime")
+ endif(NOT DOT_EXECUTABLE)
diff --git a/graphics/kgraphviewer/files/patch-src_CMakeLists.txt b/graphics/kgraphviewer/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..bf793c74695e
--- /dev/null
+++ b/graphics/kgraphviewer/files/patch-src_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/CMakeLists.txt.orig	2009-07-30 23:25:29.000000000 +1100
++++ src/CMakeLists.txt	2009-08-03 02:07:27.000000000 +1100
+@@ -15,7 +15,7 @@
+ 
+ kde4_add_executable(kgraphviewer ${kgraphviewer_SRCS})
+ 
+-target_link_libraries(kgraphviewer  ${QT_AND_KDECORE_LIBS} ${KDE4_KHTML_LIBS}  gvc graph pathplan cdt)
++target_link_libraries(kgraphviewer  ${QT_AND_KDECORE_LIBS} ${KDE4_KHTML_LIBS} ${LIBGVC_LIBRARY} gvc graph pathplan cdt)
+ 
+ install( TARGETS kgraphviewer ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
diff --git a/graphics/kgraphviewer/files/patch-src_part_CMakeLists.txt b/graphics/kgraphviewer/files/patch-src_part_CMakeLists.txt
new file mode 100644
index 000000000000..06f65b1beea4
--- /dev/null
+++ b/graphics/kgraphviewer/files/patch-src_part_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/part/CMakeLists.txt.orig	2009-07-30 23:25:29.000000000 +1100
++++ src/part/CMakeLists.txt	2009-08-03 02:07:52.000000000 +1100
+@@ -15,7 +15,7 @@
+ kde4_add_plugin(kgraphviewerpart ${kgraphviewerpart_PART_SRCS})
+ 
+ add_definitions(-DQT_STL)
+-target_link_libraries(kgraphviewerpart  ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KWALLETCLIENT_LIBS} ${KDE4_KDESU_LIBS} gvc graph pathplan cdt)
++target_link_libraries(kgraphviewerpart  ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KWALLETCLIENT_LIBS} ${KDE4_KDESU_LIBS} ${LIBGVC_LIBRARY} gvc graph pathplan cdt)
+ 
+ install( TARGETS kgraphviewerpart DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
diff --git a/graphics/kgraphviewer/pkg-plist b/graphics/kgraphviewer/pkg-plist
index e84d820311df..58da06660c64 100644
--- a/graphics/kgraphviewer/pkg-plist
+++ b/graphics/kgraphviewer/pkg-plist
@@ -55,6 +55,21 @@ share/doc/HTML/pt/kgraphviewer/index.docbook
 share/doc/HTML/sv/kgraphviewer/common
 share/doc/HTML/sv/kgraphviewer/index.cache.bz2
 share/doc/HTML/sv/kgraphviewer/index.docbook
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-ask1.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-ask2.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-ask3.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-config1.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-config2.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-config3.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-init.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-main.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-pagesmarges.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-ppview1.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-ppview2.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-ppview3.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-psetup1.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-zmax.png
+share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-zmin.png
 share/doc/HTML/uk/kgraphviewer/common
 share/doc/HTML/uk/kgraphviewer/index.cache.bz2
 share/doc/HTML/uk/kgraphviewer/index.docbook
@@ -75,6 +90,7 @@ share/locale/ga/LC_MESSAGES/kgraphviewer.mo
 share/locale/gl/LC_MESSAGES/kgraphviewer.mo
 share/locale/hi/LC_MESSAGES/kgraphviewer.mo
 share/locale/hne/LC_MESSAGES/kgraphviewer.mo
+share/locale/is/LC_MESSAGES/kgraphviewer.mo
 share/locale/it/LC_MESSAGES/kgraphviewer.mo
 share/locale/ja/LC_MESSAGES/kgraphviewer.mo
 share/locale/km/LC_MESSAGES/kgraphviewer.mo
@@ -98,6 +114,7 @@ share/locale/tr/LC_MESSAGES/kgraphviewer.mo
 share/locale/uk/LC_MESSAGES/kgraphviewer.mo
 share/locale/vi/LC_MESSAGES/kgraphviewer.mo
 share/locale/zh_CN/LC_MESSAGES/kgraphviewer.mo
+share/locale/zh_TW/LC_MESSAGES/kgraphviewer.mo
 @dirrmtry share/locale/se/LC_MESSAGES
 @dirrmtry share/locale/se
 @dirrmtry share/locale/mai/LC_MESSAGES