Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -5456,7 +5456,6 @@ www/trac-revtree||2014-02-27|Has expired: Broken for more than 6 months security/crack||2014-02-27|Has expired: Broken for more than 6 months sysutils/graphicboot||2014-02-27|Has expired: Broken for more than 6 months, upstream disappeared -graphics/kgraphviewer||2014-02-27|Has expired: Broken for more than 6 months sysutils/ckl||2014-02-27|Has expired: Broken for more than 6 months japanese/trac||2014-02-27|Has expired: Broken for more than 6 months lang/opa||2014-02-27|Has expired: Broken for more than 6 months Index: graphics/Makefile =================================================================== --- graphics/Makefile +++ graphics/Makefile @@ -413,6 +413,7 @@ SUBDIR += kf5-kimageformats SUBDIR += kf5-kplotting SUBDIR += kf5-prison + SUBDIR += kgraphviewer SUBDIR += kiconedit SUBDIR += kipi-plugin-acquireimages SUBDIR += kipi-plugin-advancedslideshow Index: graphics/kgraphviewer/Makefile =================================================================== --- graphics/kgraphviewer/Makefile +++ graphics/kgraphviewer/Makefile @@ -1,45 +1,23 @@ -# $FreeBSD$ - PORTNAME= kgraphviewer -PORTVERSION= ${APP_VER}.${EXTRA_VER} -PORTREVISION= 6 +DISTVERSION= 2.4.2 CATEGORIES= graphics kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/extragear -DISTNAME= ${PORTNAME}-${APP_VER}-kde${EXTRA_VER} -DIST_SUBDIR= KDE/extragear +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ +DIST_SUBDIR= KDE/${PORTNAME} MAINTAINER= kde@FreeBSD.org -COMMENT= GraphViz dot graph viewer for KDE - -LIB_DEPENDS= gvc:${PORTSDIR}/graphics/graphviz - -NO_STAGE= yes -# Several problems at once here: -# - The port does not include graphviz's include directory, assuming it is -# always in the compiler's default path (ie. /usr/include). -# - The port includes , while code is expected to include -# instead, and pass -I${LOCALBASE}/graphviz instead of just -# -I${LOCALBASE} to the compiler. -# - The code in the development repository does a better job at fixing the -# problems above, but it still relies on the deprecated libgraph library that -# graphics/graphviz in ports does not install anymore. -BROKEN= does not build -DEPRECATED= Broken for more than 6 month -EXPIRATION_DATE= 2014-02-27 +COMMENT= Graphs-viewer for GraphViz files -USE_BZIP2= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 -USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -APP_VER= 2.0.2 -EXTRA_VER= 4.4.0 +LIB_DEPENDS= libgvc.so:graphics/graphviz -post-patch: -#Fix build with kdelibs>=4.5.0 - ${REINPLACE_CMD} -e 's,V4.1.2-Based,V4.2-Based,g' \ - ${WRKSRC}/doc-translations/*_kgraphviewer/kgraphviewer/index.docbook \ - ${WRKSRC}/doc/index.docbook +USES= cmake:outsource desktop-file-utils kde:5 tar:xz pkgconfig +USE_KDE= auth codecs completion config configwidgets \ + coreaddons i18n iconthemes jobwidgets kio parts service \ + sonnet textwidgets widgetsaddons xmlgui \ + ecm_build +USE_QT5= core dbus gui network printsupport svg widgets xml \ + buildtools_build qmake_build .include Index: graphics/kgraphviewer/distinfo =================================================================== --- graphics/kgraphviewer/distinfo +++ graphics/kgraphviewer/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/extragear/kgraphviewer-2.0.2-kde4.4.0.tar.bz2) = 65963e02b1031b5f1ce3456f2f9f9d53d871d856c892a4bfa0638453a420ac00 -SIZE (KDE/extragear/kgraphviewer-2.0.2-kde4.4.0.tar.bz2) = 1075677 +TIMESTAMP = 1506604380 +SHA256 (KDE/kgraphviewer/kgraphviewer-2.4.2.tar.xz) = 49438b4e6cca69d2e658de50059f045ede42cfe78ee97cece35959e29ffb85c9 +SIZE (KDE/kgraphviewer/kgraphviewer-2.4.2.tar.xz) = 1565692 Index: graphics/kgraphviewer/files/patch-cmake_FindGraphviz.cmake =================================================================== --- /dev/null +++ graphics/kgraphviewer/files/patch-cmake_FindGraphviz.cmake @@ -0,0 +1,44 @@ +--- cmake/FindGraphviz.cmake.orig 2017-09-27 13:15:56 UTC ++++ cmake/FindGraphviz.cmake +@@ -29,10 +29,14 @@ + if ( NOT WIN32 ) + + find_package(PkgConfig) +- pkg_check_modules( graphviz ${REQUIRED} libgvc libcdt libcgraph libpathplan ) +- if ( graphviz_FOUND ) +- set ( graphviz_INCLUDE_DIRECTORIES ${graphviz_INCLUDE_DIRS} ) +- endif ( graphviz_FOUND ) ++ # Don't name-collide with the find_library() calls below, use pc_ prefix ++ pkg_check_modules( pc_graphviz ${REQUIRED} libgvc libcdt libcgraph libpathplan ) ++ if ( pc_graphviz_FOUND ) ++ set ( graphviz_INCLUDE_DIRS ${pc_graphviz_INCLUDE_DIRS} ) ++ set ( graphviz_INCLUDE_DIRECTORIES ${pc_graphviz_INCLUDE_DIRS} ) ++ set ( graphviz_LIBRARY_DIRS ${pc_graphviz_LIBRARY_DIRS} ) ++ set ( graphviz_LIBRARIES ${pc_graphviz_LIBRARIES} ) ++ endif ( pc_graphviz_FOUND ) + + endif ( NOT WIN32 ) + +@@ -90,9 +94,11 @@ if ( graphviz_INCLUDE_DIRECTORIES AND + graphviz_GRAPH_LIBRARY AND graphviz_PATHPLAN_LIBRARY ) + set ( graphviz_FOUND 1 ) + set ( graphviz_LIBRARIES +- "${graphviz_GVC_LIBRARY};${graphviz_GRAPH_LIBRARY};" +- "${graphviz_CDT_LIBRARY};${graphviz_PATHPLAN_LIBRARY}" +- CACHE FILEPATH "Libraries for graphviz" ) ++ ${graphviz_GVC_LIBRARY} ++ ${graphviz_GRAPH_LIBRARY} ++ ${graphviz_CDT_LIBRARY} ++ ${graphviz_PATHPLAN_LIBRARY} ++ ) + else ( graphviz_INCLUDE_DIRECTORIES AND + graphviz_GVC_LIBRARY AND graphviz_CDT_LIBRARY AND + graphviz_GRAPH_LIBRARY AND graphviz_PATHPLAN_LIBRARY ) +@@ -100,7 +106,6 @@ else ( graphviz_INCLUDE_DIRECTORIES AND + endif ( graphviz_INCLUDE_DIRECTORIES AND + graphviz_GVC_LIBRARY AND graphviz_CDT_LIBRARY AND + graphviz_GRAPH_LIBRARY AND graphviz_PATHPLAN_LIBRARY ) +- + + find_program(DOT dot) + Index: graphics/kgraphviewer/files/patch-src_part_CMakeLists.txt =================================================================== --- graphics/kgraphviewer/files/patch-src_part_CMakeLists.txt +++ graphics/kgraphviewer/files/patch-src_part_CMakeLists.txt @@ -1,11 +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}) +--- src/part/CMakeLists.txt.orig 2017-09-27 13:15:56 UTC ++++ src/part/CMakeLists.txt +@@ -79,7 +79,7 @@ set( kgraphviewerpart_PART_SRCS kgraphviewer_part.cpp + add_library(kgraphviewerpart MODULE ${kgraphviewerpart_PART_SRCS}) + generate_export_header(kgraphviewerpart BASE_NAME kgraphviewer) - 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) +-target_link_libraries(kgraphviewerpart Qt5::Core KF5::Parts gvc cgraph pathplan cdt kgraphviewerlib) ++target_link_libraries(kgraphviewerpart Qt5::Core KF5::Parts kgraphviewerlib) - install( TARGETS kgraphviewerpart DESTINATION ${PLUGIN_INSTALL_DIR}) + install( TARGETS kgraphviewerpart DESTINATION ${KDE_INSTALL_PLUGINDIR}) Index: graphics/kgraphviewer/pkg-descr =================================================================== --- graphics/kgraphviewer/pkg-descr +++ graphics/kgraphviewer/pkg-descr @@ -1,6 +1,3 @@ -KGraphViewer is a GraphViz DOT graph viewer for KDE. The GraphViz -programs are free-software layout engines for graphs. KGraphViewer -displays the graphs in a modern, user-friendly GUI with all the -power of a well integrated KDE application. +KGraphViewer is a Graphviz DOT graph file viewer. -WWW: http://extragear.kde.org/apps/kgraphviewer/ +WWW: https://extragear.kde.org/apps/kgraphviewer/ Index: graphics/kgraphviewer/pkg-plist =================================================================== --- graphics/kgraphviewer/pkg-plist +++ graphics/kgraphviewer/pkg-plist @@ -1,21 +1,31 @@ -bin/kgrapheditor bin/kgraphviewer -lib/kde4/kgraphviewerpart.so -share/applications/kde4/kgrapheditor.desktop -share/applications/kde4/kgraphviewer.desktop -share/apps/kgrapheditor/kgrapheditorui.rc -share/apps/kgraphviewer/kgraphviewerui.rc -share/apps/kgraphviewerpart/kgraphviewer_part.rc -share/apps/kgraphviewerpart/pics/kgraphviewer-bev.png -share/apps/kgraphviewerpart/pics/kgraphviewer-newedge.png -share/apps/kgraphviewerpart/pics/kgraphviewer-newnode.png -share/config.kcfg/kgrapheditorsettings.kcfg +etc/xdg/kgraphviewer.categories +include/kgraphviewer/kgraphviewer_interface.h +lib/cmake/KGraphViewerPart/KGraphViewerPartConfig.cmake +lib/cmake/KGraphViewerPart/KGraphViewerPartConfigVersion.cmake +lib/libkgraphviewer.so +lib/libkgraphviewer.so.2.4.2 +lib/libkgraphviewer.so.3 +%%QT_PLUGINDIR%%/kgraphviewerpart.so +share/applications/org.kde.kgraphviewer.desktop share/config.kcfg/kgraphviewer_partsettings.kcfg share/config.kcfg/kgraphviewersettings.kcfg -share/doc/HTML/de/kgraphviewer/common share/doc/HTML/de/kgraphviewer/index.cache.bz2 share/doc/HTML/de/kgraphviewer/index.docbook -share/doc/HTML/en/kgraphviewer/common +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ask2.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ask3.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-config1.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-config2.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-config3.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-init.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-main.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-pagesmarges.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ppview1.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ppview2.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ppview3.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-psetup1.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-zmax.png +share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-zmin.png share/doc/HTML/en/kgraphviewer/index.cache.bz2 share/doc/HTML/en/kgraphviewer/index.docbook share/doc/HTML/en/kgraphviewer/kgraphviewer-but-layout.png @@ -43,19 +53,16 @@ share/doc/HTML/en/kgraphviewer/kgraphviewer-snap-psetup1.png share/doc/HTML/en/kgraphviewer/kgraphviewer-snap-zmax.png share/doc/HTML/en/kgraphviewer/kgraphviewer-snap-zmin.png -share/doc/HTML/et/kgraphviewer/common share/doc/HTML/et/kgraphviewer/index.cache.bz2 share/doc/HTML/et/kgraphviewer/index.docbook -share/doc/HTML/it/kgraphviewer/common share/doc/HTML/it/kgraphviewer/index.cache.bz2 share/doc/HTML/it/kgraphviewer/index.docbook -share/doc/HTML/pt/kgraphviewer/common +share/doc/HTML/nl/kgraphviewer/index.cache.bz2 +share/doc/HTML/nl/kgraphviewer/index.docbook share/doc/HTML/pt/kgraphviewer/index.cache.bz2 share/doc/HTML/pt/kgraphviewer/index.docbook -share/doc/HTML/pt_BR/kgraphviewer/common share/doc/HTML/pt_BR/kgraphviewer/index.cache.bz2 share/doc/HTML/pt_BR/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 @@ -73,15 +80,23 @@ 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 share/icons/hicolor/16x16/apps/kgraphviewer.png share/icons/hicolor/32x32/apps/kgraphviewer.png -share/kde4/services/kgraphviewer_part.desktop +share/kgraphviewerpart/pics/chain-broken.png +share/kgraphviewerpart/pics/chain.png +share/kgraphviewerpart/pics/kgraphviewer-bev.png +share/kgraphviewerpart/pics/kgraphviewer-newedge.png +share/kgraphviewerpart/pics/kgraphviewer-newnode.png +share/kservices5/kgraphviewer_part.desktop +share/kxmlgui5/kgraphviewer/kgraphviewer_part.rc +share/kxmlgui5/kgraphviewer/kgraphviewerui.rc share/locale/ar/LC_MESSAGES/kgraphviewer.mo +share/locale/ast/LC_MESSAGES/kgraphviewer.mo share/locale/be/LC_MESSAGES/kgraphviewer.mo share/locale/bg/LC_MESSAGES/kgraphviewer.mo +share/locale/bs/LC_MESSAGES/kgraphviewer.mo share/locale/ca/LC_MESSAGES/kgraphviewer.mo share/locale/ca@valencia/LC_MESSAGES/kgraphviewer.mo share/locale/cs/LC_MESSAGES/kgraphviewer.mo @@ -92,12 +107,15 @@ share/locale/eo/LC_MESSAGES/kgraphviewer.mo share/locale/es/LC_MESSAGES/kgraphviewer.mo share/locale/et/LC_MESSAGES/kgraphviewer.mo +share/locale/eu/LC_MESSAGES/kgraphviewer.mo +share/locale/fi/LC_MESSAGES/kgraphviewer.mo share/locale/fr/LC_MESSAGES/kgraphviewer.mo 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/hr/LC_MESSAGES/kgraphviewer.mo +share/locale/hu/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 @@ -105,6 +123,7 @@ share/locale/ku/LC_MESSAGES/kgraphviewer.mo share/locale/lt/LC_MESSAGES/kgraphviewer.mo share/locale/mai/LC_MESSAGES/kgraphviewer.mo +share/locale/mr/LC_MESSAGES/kgraphviewer.mo share/locale/nb/LC_MESSAGES/kgraphviewer.mo share/locale/nds/LC_MESSAGES/kgraphviewer.mo share/locale/nl/LC_MESSAGES/kgraphviewer.mo @@ -114,24 +133,16 @@ share/locale/pt/LC_MESSAGES/kgraphviewer.mo share/locale/pt_BR/LC_MESSAGES/kgraphviewer.mo share/locale/ro/LC_MESSAGES/kgraphviewer.mo +share/locale/ru/LC_MESSAGES/kgraphviewer.mo share/locale/se/LC_MESSAGES/kgraphviewer.mo share/locale/sk/LC_MESSAGES/kgraphviewer.mo share/locale/sv/LC_MESSAGES/kgraphviewer.mo share/locale/th/LC_MESSAGES/kgraphviewer.mo share/locale/tr/LC_MESSAGES/kgraphviewer.mo +share/locale/ug/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 -@dirrm share/doc/HTML/uk/kgraphviewer -@dirrm share/doc/HTML/sv/kgraphviewer -@dirrm share/doc/HTML/pt_BR/kgraphviewer -@dirrm share/doc/HTML/pt/kgraphviewer -@dirrm share/doc/HTML/it/kgraphviewer -@dirrm share/doc/HTML/et/kgraphviewer -@dirrm share/doc/HTML/en/kgraphviewer -@dirrm share/doc/HTML/de/kgraphviewer -@dirrm share/apps/kgraphviewerpart/pics -@dirrm share/apps/kgraphviewerpart -@dirrm share/apps/kgraphviewer -@dirrm share/apps/kgrapheditor +share/metainfo/org.kde.kgraphviewer.appdata.xml +share/metainfo/org.kde.libkgraphviewer.metainfo.xml