Index: head/devel/libdbusmenu-qt/Makefile =================================================================== --- head/devel/libdbusmenu-qt/Makefile (revision 390563) +++ head/devel/libdbusmenu-qt/Makefile (revision 390564) @@ -1,42 +1,38 @@ # Created by: Dima Panov # $FreeBSD$ PORTNAME= libdbusmenu-qt -PORTVERSION= 0.9.2 -PORTREVISION= 4 +PORTVERSION= ${MAJOR_VER}.${SNAPSHOT_VER:S/.//g} CATEGORIES= devel -MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ +MASTER_SITES= http://archive.ubuntu.com/ubuntu/pool/main/libd/${PORTNAME}/ +DISTNAME= ${PORTNAME}_${MAJOR_VER}+${SNAPSHOT_VER}.orig MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 implementation of the DBusMenu protocol LICENSE= LGPL20 -USE_QT4= corelib dbus gui \ - moc_build qmake_build rcc_build uic_build -USES= cmake:outsource tar:bzip2 -USE_LDCONFIG= yes +MAJOR_VER= 0.9.3 +SNAPSHOT_VER= 15.10.20150604 -OPTIONS_DEFINE= GENDOCS -GENDOCS_DESC= Build documentation (requires doxygen) -.if defined(PACKAGE_BUILDING) -OPTIONS_DEFAULT+= GENDOCS -.endif +WRKSRC= ${WRKDIR}/${PORTNAME}-${MAJOR_VER}+${SNAPSHOT_VER} -.include +USE_QT4= corelib dbus gui moc_build qmake_build rcc_build uic_build +USES= compiler:c++11-lib cmake:outsource +CMAKE_ARGS= -DUSE_QT4:BOOL=TRUE -DUSE_QT5:BOOL=FALSE -.if ${PORT_OPTIONS:MGENDOCS} -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen -CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH="${DOCSDIR_REL}" -PLIST_SUB+= GENDOCS="" -.else -CMAKE_ARGS+= -DWITH_DOC:BOOL=OFF -PLIST_SUB+= GENDOCS="@comment " -.endif +USE_LDCONFIG= yes +OPTIONS_DEFINE= DOXYGEN +OPTIONS_SUB= YES +DOXYGEN_DESC= Build documentation (requires doxygen) +DOXYGEN_CMAKE_ON= -DWITH_DOC:BOOL=TRUE +DOXYGEN_CMAKE_OFF= -DWITH_DOC:BOOL=FALSE +DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen + post-patch: - @${REINPLACE_CMD} -e '/pkgconfig/ s/$${LIB_SUFFIX}/data/' \ - -e '/tests/ d' -e '/tools/ d' \ + @${REINPLACE_CMD} -e '/add_subdirectory(tests)/ d' \ + -e '/add_subdirectory(tools)/ d' \ ${WRKSRC}/CMakeLists.txt .include Index: head/devel/libdbusmenu-qt/distinfo =================================================================== --- head/devel/libdbusmenu-qt/distinfo (revision 390563) +++ head/devel/libdbusmenu-qt/distinfo (revision 390564) @@ -1,2 +1,2 @@ -SHA256 (libdbusmenu-qt-0.9.2.tar.bz2) = ae6c1cb6da3c683aefed39df3e859537a31d80caa04f3023315ff09e5e8919ec -SIZE (libdbusmenu-qt-0.9.2.tar.bz2) = 37882 +SHA256 (libdbusmenu-qt_0.9.3+15.10.20150604.orig.tar.gz) = dd87926003be6455420a077dd8edb29f5dac428b9b299b2bd73a1c29c2126328 +SIZE (libdbusmenu-qt_0.9.3+15.10.20150604.orig.tar.gz) = 46318 Index: head/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt =================================================================== --- head/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt (revision 390563) +++ head/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt (nonexistent) @@ -1,14 +0,0 @@ ---- ./src/CMakeLists.txt.orig 2011-02-25 03:13:16.133359336 +0000 -+++ ./src/CMakeLists.txt 2011-02-25 03:13:53.113370403 +0000 -@@ -73,7 +73,10 @@ - ) - - install(TARGETS dbusmenu-qt -- LIBRARY DESTINATION lib${LIB_SUFFIX}) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION bin -+) - - install(DIRECTORY . - DESTINATION include/dbusmenu-qt Property changes on: head/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libdbusmenu-qt/files/patch-CMakeLists.txt =================================================================== --- head/devel/libdbusmenu-qt/files/patch-CMakeLists.txt (revision 390563) +++ head/devel/libdbusmenu-qt/files/patch-CMakeLists.txt (revision 390564) @@ -1,19 +1,20 @@ ---- CMakeLists.txt~ 2011-09-01 14:05:32.000000000 -0300 -+++ CMakeLists.txt 2011-09-01 14:08:06.000000000 -0300 -@@ -64,6 +64,8 @@ - add_subdirectory(tools) +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -86,7 +86,7 @@ add_dependencies(distcheck dist) + configure_file(dbusmenu-qt.pc.in ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}.pc @ONLY) - if(WITH_DOC) -+ set(DOC_INSTALL_DIR "share/doc/dbusmenu-qt" CACHE PATH "Directory where to install the documentation") -+ - configure_file(Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}.pc +- DESTINATION ${LIB_DESTINATION}/pkgconfig ++ DESTINATION libdata/pkgconfig + ) - add_custom_target(doc ALL doxygen -@@ -71,6 +73,6 @@ + add_subdirectory(src) +@@ -103,7 +106,7 @@ if(WITH_DOC) ) install(DIRECTORY ${CMAKE_BINARY_DIR}/html/ -- DESTINATION share/doc/dbusmenu-qt -+ DESTINATION ${DOC_INSTALL_DIR} +- DESTINATION share/doc/libdbusmenu-${QT_SUFFIX}-doc ++ DESTINATION share/doc/libdbusmenu-${QT_SUFFIX} ) endif(WITH_DOC) + Index: head/devel/libdbusmenu-qt/pkg-descr =================================================================== --- head/devel/libdbusmenu-qt/pkg-descr (revision 390563) +++ head/devel/libdbusmenu-qt/pkg-descr (revision 390564) @@ -1,5 +1,5 @@ A library that provides Qt4 implementation of the DBusMenu protocol. The DBusMenu protocol makes it possible for applications to export and import their menus over DBus. -WWW: http://people.canonical.com/~agateau/dbusmenu/ +WWW: https://launchpad.net/libdbusmenu-qt Index: head/devel/libdbusmenu-qt/pkg-plist =================================================================== --- head/devel/libdbusmenu-qt/pkg-plist (revision 390563) +++ head/devel/libdbusmenu-qt/pkg-plist (revision 390564) @@ -1,93 +1,97 @@ include/dbusmenu-qt/dbusmenu_export.h include/dbusmenu-qt/dbusmenu_version.h include/dbusmenu-qt/dbusmenuexporter.h include/dbusmenu-qt/dbusmenuimporter.h +lib/cmake/dbusmenu-qt/dbusmenu-qt-config-version.cmake +lib/cmake/dbusmenu-qt/dbusmenu-qt-config.cmake +lib/cmake/dbusmenu-qt/dbusmenu-qt-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/dbusmenu-qt/dbusmenu-qt-targets.cmake lib/libdbusmenu-qt.so lib/libdbusmenu-qt.so.2 lib/libdbusmenu-qt.so.2.6.0 libdata/pkgconfig/dbusmenu-qt.pc -%%GENDOCS%%%%DOCSDIR%%/annotated.html -%%GENDOCS%%%%DOCSDIR%%/arrowdown.png -%%GENDOCS%%%%DOCSDIR%%/arrowright.png -%%GENDOCS%%%%DOCSDIR%%/bc_s.png -%%GENDOCS%%%%DOCSDIR%%/bdwn.png -%%GENDOCS%%%%DOCSDIR%%/classDBusMenuExporter-members.html -%%GENDOCS%%%%DOCSDIR%%/classDBusMenuExporter.html -%%GENDOCS%%%%DOCSDIR%%/classDBusMenuExporter.png -%%GENDOCS%%%%DOCSDIR%%/classDBusMenuImporter-members.html -%%GENDOCS%%%%DOCSDIR%%/classDBusMenuImporter.html -%%GENDOCS%%%%DOCSDIR%%/classDBusMenuImporter.png -%%GENDOCS%%%%DOCSDIR%%/classes.html -%%GENDOCS%%%%DOCSDIR%%/closed.png -%%GENDOCS%%%%DOCSDIR%%/dbusmenu__export_8h_source.html -%%GENDOCS%%%%DOCSDIR%%/dbusmenuexporter_8h_source.html -%%GENDOCS%%%%DOCSDIR%%/dbusmenuimporter_8h_source.html -%%GENDOCS%%%%DOCSDIR%%/deprecated.html -%%GENDOCS%%%%DOCSDIR%%/dir_8a61fb69d88b5c30b96e92db617e178e.html -%%GENDOCS%%%%DOCSDIR%%/dir_f8e7cf548488f82ed4e572e38398555b.html -%%GENDOCS%%%%DOCSDIR%%/doc.png -%%GENDOCS%%%%DOCSDIR%%/doxygen.css -%%GENDOCS%%%%DOCSDIR%%/doxygen.png -%%GENDOCS%%%%DOCSDIR%%/dynsections.js -%%GENDOCS%%%%DOCSDIR%%/files.html -%%GENDOCS%%%%DOCSDIR%%/folderclosed.png -%%GENDOCS%%%%DOCSDIR%%/folderopen.png -%%GENDOCS%%%%DOCSDIR%%/functions.html -%%GENDOCS%%%%DOCSDIR%%/functions_func.html -%%GENDOCS%%%%DOCSDIR%%/hierarchy.html -%%GENDOCS%%%%DOCSDIR%%/index.html -%%GENDOCS%%%%DOCSDIR%%/jquery.js -%%GENDOCS%%%%DOCSDIR%%/nav_f.png -%%GENDOCS%%%%DOCSDIR%%/nav_g.png -%%GENDOCS%%%%DOCSDIR%%/nav_h.png -%%GENDOCS%%%%DOCSDIR%%/open.png -%%GENDOCS%%%%DOCSDIR%%/pages.html -%%GENDOCS%%%%DOCSDIR%%/search/all_0.html -%%GENDOCS%%%%DOCSDIR%%/search/all_0.js -%%GENDOCS%%%%DOCSDIR%%/search/all_1.html -%%GENDOCS%%%%DOCSDIR%%/search/all_1.js -%%GENDOCS%%%%DOCSDIR%%/search/all_2.html -%%GENDOCS%%%%DOCSDIR%%/search/all_2.js -%%GENDOCS%%%%DOCSDIR%%/search/all_3.html -%%GENDOCS%%%%DOCSDIR%%/search/all_3.js -%%GENDOCS%%%%DOCSDIR%%/search/all_4.html -%%GENDOCS%%%%DOCSDIR%%/search/all_4.js -%%GENDOCS%%%%DOCSDIR%%/search/all_5.html -%%GENDOCS%%%%DOCSDIR%%/search/all_5.js -%%GENDOCS%%%%DOCSDIR%%/search/all_6.html -%%GENDOCS%%%%DOCSDIR%%/search/all_6.js -%%GENDOCS%%%%DOCSDIR%%/search/classes_0.html -%%GENDOCS%%%%DOCSDIR%%/search/classes_0.js -%%GENDOCS%%%%DOCSDIR%%/search/close.png -%%GENDOCS%%%%DOCSDIR%%/search/functions_0.html -%%GENDOCS%%%%DOCSDIR%%/search/functions_0.js -%%GENDOCS%%%%DOCSDIR%%/search/functions_1.html -%%GENDOCS%%%%DOCSDIR%%/search/functions_1.js -%%GENDOCS%%%%DOCSDIR%%/search/functions_2.html -%%GENDOCS%%%%DOCSDIR%%/search/functions_2.js -%%GENDOCS%%%%DOCSDIR%%/search/functions_3.html -%%GENDOCS%%%%DOCSDIR%%/search/functions_3.js -%%GENDOCS%%%%DOCSDIR%%/search/functions_4.html -%%GENDOCS%%%%DOCSDIR%%/search/functions_4.js -%%GENDOCS%%%%DOCSDIR%%/search/functions_5.html -%%GENDOCS%%%%DOCSDIR%%/search/functions_5.js -%%GENDOCS%%%%DOCSDIR%%/search/functions_6.html -%%GENDOCS%%%%DOCSDIR%%/search/functions_6.js -%%GENDOCS%%%%DOCSDIR%%/search/mag_sel.png -%%GENDOCS%%%%DOCSDIR%%/search/nomatches.html -%%GENDOCS%%%%DOCSDIR%%/search/pages_0.html -%%GENDOCS%%%%DOCSDIR%%/search/pages_0.js -%%GENDOCS%%%%DOCSDIR%%/search/search.css -%%GENDOCS%%%%DOCSDIR%%/search/search.js -%%GENDOCS%%%%DOCSDIR%%/search/search_l.png -%%GENDOCS%%%%DOCSDIR%%/search/search_m.png -%%GENDOCS%%%%DOCSDIR%%/search/search_r.png -%%GENDOCS%%%%DOCSDIR%%/search/searchdata.js -%%GENDOCS%%%%DOCSDIR%%/splitbar.png -%%GENDOCS%%%%DOCSDIR%%/sync_off.png -%%GENDOCS%%%%DOCSDIR%%/sync_on.png -%%GENDOCS%%%%DOCSDIR%%/tab_a.png -%%GENDOCS%%%%DOCSDIR%%/tab_b.png -%%GENDOCS%%%%DOCSDIR%%/tab_h.png -%%GENDOCS%%%%DOCSDIR%%/tab_s.png -%%GENDOCS%%%%DOCSDIR%%/tabs.css +%%DOXYGEN%%%%DOCSDIR%%/annotated.html +%%DOXYGEN%%%%DOCSDIR%%/arrowdown.png +%%DOXYGEN%%%%DOCSDIR%%/arrowright.png +%%DOXYGEN%%%%DOCSDIR%%/bc_s.png +%%DOXYGEN%%%%DOCSDIR%%/bdwn.png +%%DOXYGEN%%%%DOCSDIR%%/classDBusMenuExporter-members.html +%%DOXYGEN%%%%DOCSDIR%%/classDBusMenuExporter.html +%%DOXYGEN%%%%DOCSDIR%%/classDBusMenuExporter.png +%%DOXYGEN%%%%DOCSDIR%%/classDBusMenuImporter-members.html +%%DOXYGEN%%%%DOCSDIR%%/classDBusMenuImporter.html +%%DOXYGEN%%%%DOCSDIR%%/classDBusMenuImporter.png +%%DOXYGEN%%%%DOCSDIR%%/classes.html +%%DOXYGEN%%%%DOCSDIR%%/closed.png +%%DOXYGEN%%%%DOCSDIR%%/dbusmenu__export_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/dbusmenuexporter_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/dbusmenuimporter_8h_source.html +%%DOXYGEN%%%%DOCSDIR%%/deprecated.html +%%DOXYGEN%%%%DOCSDIR%%/dir_ed734dd83c75a5bf0f40de74f2cf1710.html +%%DOXYGEN%%%%DOCSDIR%%/dir_f9aacaab10bdb962cb8a14d49fe5b06f.html +%%DOXYGEN%%%%DOCSDIR%%/doc.png +%%DOXYGEN%%%%DOCSDIR%%/doxygen.css +%%DOXYGEN%%%%DOCSDIR%%/doxygen.png +%%DOXYGEN%%%%DOCSDIR%%/dynsections.js +%%DOXYGEN%%%%DOCSDIR%%/files.html +%%DOXYGEN%%%%DOCSDIR%%/folderclosed.png +%%DOXYGEN%%%%DOCSDIR%%/folderopen.png +%%DOXYGEN%%%%DOCSDIR%%/functions.html +%%DOXYGEN%%%%DOCSDIR%%/functions_func.html +%%DOXYGEN%%%%DOCSDIR%%/hierarchy.html +%%DOXYGEN%%%%DOCSDIR%%/index.html +%%DOXYGEN%%%%DOCSDIR%%/jquery.js +%%DOXYGEN%%%%DOCSDIR%%/nav_f.png +%%DOXYGEN%%%%DOCSDIR%%/nav_g.png +%%DOXYGEN%%%%DOCSDIR%%/nav_h.png +%%DOXYGEN%%%%DOCSDIR%%/open.png +%%DOXYGEN%%%%DOCSDIR%%/pages.html +%%DOXYGEN%%%%DOCSDIR%%/search/all_0.html +%%DOXYGEN%%%%DOCSDIR%%/search/all_0.js +%%DOXYGEN%%%%DOCSDIR%%/search/all_1.html +%%DOXYGEN%%%%DOCSDIR%%/search/all_1.js +%%DOXYGEN%%%%DOCSDIR%%/search/all_2.html +%%DOXYGEN%%%%DOCSDIR%%/search/all_2.js +%%DOXYGEN%%%%DOCSDIR%%/search/all_3.html +%%DOXYGEN%%%%DOCSDIR%%/search/all_3.js +%%DOXYGEN%%%%DOCSDIR%%/search/all_4.html +%%DOXYGEN%%%%DOCSDIR%%/search/all_4.js +%%DOXYGEN%%%%DOCSDIR%%/search/all_5.html +%%DOXYGEN%%%%DOCSDIR%%/search/all_5.js +%%DOXYGEN%%%%DOCSDIR%%/search/all_6.html +%%DOXYGEN%%%%DOCSDIR%%/search/all_6.js +%%DOXYGEN%%%%DOCSDIR%%/search/classes_0.html +%%DOXYGEN%%%%DOCSDIR%%/search/classes_0.js +%%DOXYGEN%%%%DOCSDIR%%/search/close.png +%%DOXYGEN%%%%DOCSDIR%%/search/functions_0.html +%%DOXYGEN%%%%DOCSDIR%%/search/functions_0.js +%%DOXYGEN%%%%DOCSDIR%%/search/functions_1.html +%%DOXYGEN%%%%DOCSDIR%%/search/functions_1.js +%%DOXYGEN%%%%DOCSDIR%%/search/functions_2.html +%%DOXYGEN%%%%DOCSDIR%%/search/functions_2.js +%%DOXYGEN%%%%DOCSDIR%%/search/functions_3.html +%%DOXYGEN%%%%DOCSDIR%%/search/functions_3.js +%%DOXYGEN%%%%DOCSDIR%%/search/functions_4.html +%%DOXYGEN%%%%DOCSDIR%%/search/functions_4.js +%%DOXYGEN%%%%DOCSDIR%%/search/functions_5.html +%%DOXYGEN%%%%DOCSDIR%%/search/functions_5.js +%%DOXYGEN%%%%DOCSDIR%%/search/functions_6.html +%%DOXYGEN%%%%DOCSDIR%%/search/functions_6.js +%%DOXYGEN%%%%DOCSDIR%%/search/mag_sel.png +%%DOXYGEN%%%%DOCSDIR%%/search/nomatches.html +%%DOXYGEN%%%%DOCSDIR%%/search/pages_0.html +%%DOXYGEN%%%%DOCSDIR%%/search/pages_0.js +%%DOXYGEN%%%%DOCSDIR%%/search/search.css +%%DOXYGEN%%%%DOCSDIR%%/search/search.js +%%DOXYGEN%%%%DOCSDIR%%/search/search_l.png +%%DOXYGEN%%%%DOCSDIR%%/search/search_m.png +%%DOXYGEN%%%%DOCSDIR%%/search/search_r.png +%%DOXYGEN%%%%DOCSDIR%%/search/searchdata.js +%%DOXYGEN%%%%DOCSDIR%%/splitbar.png +%%DOXYGEN%%%%DOCSDIR%%/sync_off.png +%%DOXYGEN%%%%DOCSDIR%%/sync_on.png +%%DOXYGEN%%%%DOCSDIR%%/tab_a.png +%%DOXYGEN%%%%DOCSDIR%%/tab_b.png +%%DOXYGEN%%%%DOCSDIR%%/tab_h.png +%%DOXYGEN%%%%DOCSDIR%%/tab_s.png +%%DOXYGEN%%%%DOCSDIR%%/tabs.css