8 files changed, 116 insertions, 261 deletions

diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index 441392e434a0..c3234e371c6f 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -8,18 +8,24 @@ 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
+COMMENT?=	Qt4 implementation of the DBusMenu protocol
 
 LICENSE=	LGPL20
 
 MAJOR_VER=	0.9.3
-SNAPSHOT_VER=	15.10.20150604
+SNAPSHOT_VER=	16.04.20160218
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${MAJOR_VER}+${SNAPSHOT_VER}
 
+.if empty(PKGNAMESUFFIX)
 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
+.else
+USE_QT5=	buildtools_build core dbus gui qmake_build widgets
+CMAKE_ARGS=	-DUSE_QT4:BOOL=FALSE -DUSE_QT5:BOOL=TRUE
+.endif
+
+USES=		compiler:c++11-lib cmake:outsource
 
 USE_LDCONFIG=	yes
 
@@ -34,6 +40,8 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 OPTIONS_DEFAULT+=	DOXYGEN
 .endif
 
+PLIST_SUB=	QTVER_SUFFIX="${PKGNAMESUFFIX}"
+
 post-patch:
 	@${REINPLACE_CMD} -e '/add_subdirectory(tests)/ d' \
 			  -e '/add_subdirectory(tools)/ d' \
diff --git a/devel/libdbusmenu-qt/distinfo b/devel/libdbusmenu-qt/distinfo
index 58e8e8e09ecd..e0fc925e78ee 100644
--- a/devel/libdbusmenu-qt/distinfo
+++ b/devel/libdbusmenu-qt/distinfo
@@ -1,2 +1,3 @@
-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
+TIMESTAMP = 1473885294
+SHA256 (libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz) = a8e6358a31c44ccdf1bfc46c95a77a6bfc7fc1f536aadb913ed4f4405c570cf6
+SIZE (libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz) = 46438
diff --git a/devel/libdbusmenu-qt/pkg-plist b/devel/libdbusmenu-qt/pkg-plist
index c7dfc5830536..0a0a4293aac6 100644
--- a/devel/libdbusmenu-qt/pkg-plist
+++ b/devel/libdbusmenu-qt/pkg-plist
@@ -1,97 +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
-%%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
+include/dbusmenu-qt%%QTVER_SUFFIX%%/dbusmenu_export.h
+include/dbusmenu-qt%%QTVER_SUFFIX%%/dbusmenu_version.h
+include/dbusmenu-qt%%QTVER_SUFFIX%%/dbusmenuexporter.h
+include/dbusmenu-qt%%QTVER_SUFFIX%%/dbusmenuimporter.h
+lib/cmake/dbusmenu-qt%%QTVER_SUFFIX%%/dbusmenu-qt%%QTVER_SUFFIX%%-config-version.cmake
+lib/cmake/dbusmenu-qt%%QTVER_SUFFIX%%/dbusmenu-qt%%QTVER_SUFFIX%%-config.cmake
+lib/cmake/dbusmenu-qt%%QTVER_SUFFIX%%/dbusmenu-qt%%QTVER_SUFFIX%%-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/dbusmenu-qt%%QTVER_SUFFIX%%/dbusmenu-qt%%QTVER_SUFFIX%%-targets.cmake
+lib/libdbusmenu-qt%%QTVER_SUFFIX%%.so
+lib/libdbusmenu-qt%%QTVER_SUFFIX%%.so.2
+lib/libdbusmenu-qt%%QTVER_SUFFIX%%.so.2.6.0
+libdata/pkgconfig/dbusmenu-qt%%QTVER_SUFFIX%%.pc
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/annotated.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/arrowdown.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/arrowright.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/bc_s.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/bdwn.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/classDBusMenuExporter-members.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/classDBusMenuExporter.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/classDBusMenuExporter.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/classDBusMenuImporter-members.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/classDBusMenuImporter.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/classDBusMenuImporter.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/classes.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/closed.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/dbusmenu__export_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/dbusmenuexporter_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/dbusmenuimporter_8h_source.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/deprecated.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/dir_b0e0fe5e5e2275614170d652b607865a.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/dir_bfdfdb37b8860f4c12feb9409a2ed5dd.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/doc.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/doxygen.css
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/doxygen.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/dynsections.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/files.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/folderclosed.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/folderopen.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/functions.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/functions_func.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/hierarchy.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/index.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/jquery.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/nav_f.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/nav_g.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/nav_h.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/open.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/pages.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_0.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_0.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_1.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_1.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_2.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_2.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_3.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_3.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_4.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_4.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_5.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_5.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_6.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/all_6.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/classes_0.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/classes_0.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/close.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_0.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_0.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_1.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_1.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_2.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_2.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_3.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_3.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_4.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_4.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_5.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_5.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_6.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/functions_6.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/mag_sel.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/nomatches.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/pages_0.html
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/pages_0.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/search.css
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/search.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/search_l.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/search_m.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/search_r.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/search/searchdata.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/splitbar.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/sync_off.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/sync_on.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/tab_a.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/tab_b.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/tab_h.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/tab_s.png
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/tabs.css
diff --git a/devel/libdbusmenu-qt5/Makefile b/devel/libdbusmenu-qt5/Makefile
index 4c525688db8b..24ba1d86a241 100644
--- a/devel/libdbusmenu-qt5/Makefile
+++ b/devel/libdbusmenu-qt5/Makefile
@@ -1,42 +1,12 @@
 # Created by: Tobias Berner <tcberner@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	libdbusmenu-qt5
-PORTVERSION=	${MAJOR_VER}.${SNAPSHOT_VER:S/.//g}
-CATEGORIES=	devel
-MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/main/libd/${PORTNAME:C/5//}/
-DISTNAME=	${PORTNAME:C/5//}_${MAJOR_VER}+${SNAPSHOT_VER}.orig
+PORTNAME=	libdbusmenu-qt
+PORTREVISION=	0
+PKGNAMESUFFIX=	5
 
-MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt5 implementation of the DBusMenu protocol
 
-LICENSE=	LGPL20
+MASTERDIR=	${.CURDIR:H}/libdbusmenu-qt
 
-MAJOR_VER=	0.9.3
-SNAPSHOT_VER=	15.10.20150604
-
-WRKSRC=		${WRKDIR}/${PORTNAME:C/5//}-${MAJOR_VER}+${SNAPSHOT_VER}
-
-USE_QT5=	buildtools_build core dbus qmake_build widgets
-USES=		compiler:c++11-lib cmake:outsource
-CMAKE_ARGS=	-DUSE_QT4:BOOL=FALSE -DUSE_QT5:BOOL=TRUE
-
-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:devel/doxygen
-
-.if defined(PACKAGE_BUILDING)
-OPTIONS_DEFAULT+=	DOXYGEN
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/add_subdirectory(tests)/ d' \
-			  -e '/add_subdirectory(tools)/ d' \
-		${WRKSRC}/CMakeLists.txt
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/libdbusmenu-qt5/distinfo b/devel/libdbusmenu-qt5/distinfo
deleted file mode 100644
index 58e8e8e09ecd..000000000000
--- a/devel/libdbusmenu-qt5/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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
diff --git a/devel/libdbusmenu-qt5/files/patch-CMakeLists.txt b/devel/libdbusmenu-qt5/files/patch-CMakeLists.txt
deleted file mode 100644
index 878a24e76e65..000000000000
--- a/devel/libdbusmenu-qt5/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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)
- 
- install(FILES ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}.pc
--        DESTINATION ${LIB_DESTINATION}/pkgconfig
-+        DESTINATION libdata/pkgconfig
-     )
- 
- add_subdirectory(src)
-@@ -103,7 +106,7 @@ if(WITH_DOC)
-         )
- 
-     install(DIRECTORY ${CMAKE_BINARY_DIR}/html/
--        DESTINATION share/doc/libdbusmenu-${QT_SUFFIX}-doc
-+        DESTINATION share/doc/libdbusmenu-${QT_SUFFIX}
-         )
- endif(WITH_DOC)
- 
diff --git a/devel/libdbusmenu-qt5/pkg-descr b/devel/libdbusmenu-qt5/pkg-descr
deleted file mode 100644
index 7cdde806c037..000000000000
--- a/devel/libdbusmenu-qt5/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A library that provides Qt5 implementation of the DBusMenu protocol.
-The DBusMenu protocol makes it possible for applications to export
-and import their menus over DBus.
-
-WWW: https://launchpad.net/libdbusmenu-qt
diff --git a/devel/libdbusmenu-qt5/pkg-plist b/devel/libdbusmenu-qt5/pkg-plist
deleted file mode 100644
index 28cbe1e80c13..000000000000
--- a/devel/libdbusmenu-qt5/pkg-plist
+++ /dev/null
@@ -1,97 +0,0 @@
-include/dbusmenu-qt5/dbusmenu_export.h
-include/dbusmenu-qt5/dbusmenu_version.h
-include/dbusmenu-qt5/dbusmenuexporter.h
-include/dbusmenu-qt5/dbusmenuimporter.h
-lib/cmake/dbusmenu-qt5/dbusmenu-qt5-config-version.cmake
-lib/cmake/dbusmenu-qt5/dbusmenu-qt5-config.cmake
-lib/cmake/dbusmenu-qt5/dbusmenu-qt5-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/dbusmenu-qt5/dbusmenu-qt5-targets.cmake
-lib/libdbusmenu-qt5.so
-lib/libdbusmenu-qt5.so.2
-lib/libdbusmenu-qt5.so.2.6.0
-libdata/pkgconfig/dbusmenu-qt5.pc
-%%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