Update libdbusmenu to 0.9.3.15.10.20150604

package supports optionally building with Qt5.

4 files changed, 42 insertions, 24 deletions

diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index c65efe70095..fd0104d20f6 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -1,24 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2015/04/25 14:20:36 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2016/01/31 06:42:28 markd Exp $
 
-DISTNAME=	libdbusmenu-qt-0.9.2
-PKGREVISION=	12
-CATEGORIES=	devel
-MASTER_SITES=	http://launchpad.net/libdbusmenu-qt/trunk/0.9.2/+download/
-EXTRACT_SUFX=	.tar.bz2
+.include "../../devel/libdbusmenu-qt/Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://people.canonical.com/~agateau/dbusmenu/index.html
-COMMENT=	Dbusmenu library for Qt
-LICENSE=	gnu-lgpl-v2.1
+DISTNAME=	libdbusmenu-qt_${_VER}
+PKGNAME=	${DISTNAME:S/_/-/:S/+/./}
 
-USE_LANGUAGES=  c c++
-USE_CMAKE=      yes
-CMAKE_ARGS+=	-DWITH_DOC=OFF
+COMMENT=	Dbusmenu library for Qt4
 
-pre-configure:
-	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
-
-PKGCONFIG_OVERRIDE+=	dbusmenu-qt.pc.in
+CMAKE_ARGS+=	-DUSE_QT4=ON
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
diff --git a/devel/libdbusmenu-qt/Makefile.common b/devel/libdbusmenu-qt/Makefile.common
new file mode 100644
index 00000000000..e2240d121bb
--- /dev/null
+++ b/devel/libdbusmenu-qt/Makefile.common
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile.common,v 1.1 2016/01/31 06:42:28 markd Exp $
+# used by devel/libdbusmenu-qt/Makefile
+# used by devel/libdbusmenu-qt5/Makefile
+
+_VER=		0.9.3+15.10.20150604
+CATEGORIES=	devel
+MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu-qt/
+EXTRACT_SUFX=	.orig.tar.gz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://launchpad.net/libdbusmenu-qt
+LICENSE=	gnu-lgpl-v2.1
+
+PATCHDIR=	${.CURDIR}/../../devel/libdbusmenu-qt/patches
+DISTINFO_FILE=	${.CURDIR}/../../devel/libdbusmenu-qt/distinfo
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
+
+USE_LANGUAGES=  c c++
+USE_CMAKE=      yes
+CMAKE_ARGS+=	-DWITH_DOC=OFF
+
+pre-configure:
+	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
+
+PKGCONFIG_OVERRIDE+=	dbusmenu-qt.pc.in
diff --git a/devel/libdbusmenu-qt/PLIST b/devel/libdbusmenu-qt/PLIST
index 269a9a3a8d2..3e93d53ab7d 100644
--- a/devel/libdbusmenu-qt/PLIST
+++ b/devel/libdbusmenu-qt/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2012/03/10 20:33:14 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/01/31 06:42:28 markd Exp $
 include/dbusmenu-qt/dbusmenu_config.h
 include/dbusmenu-qt/dbusmenu_export.h
 include/dbusmenu-qt/dbusmenu_version.h
 include/dbusmenu-qt/dbusmenuadaptor.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-noconfig.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
 lib/pkgconfig/dbusmenu-qt.pc
-@pkgdir include/dbusmenu-qt/CMakeFiles/dbusmenu-qt.dir
diff --git a/devel/libdbusmenu-qt/distinfo b/devel/libdbusmenu-qt/distinfo
index f8d83f12361..8c59469176d 100644
--- a/devel/libdbusmenu-qt/distinfo
+++ b/devel/libdbusmenu-qt/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:39 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/01/31 06:42:28 markd Exp $
 
-SHA1 (libdbusmenu-qt-0.9.2.tar.bz2) = 308cc53a4a1f2db40f8ffbcfc71e987a4839ec45
-RMD160 (libdbusmenu-qt-0.9.2.tar.bz2) = e50cbffbf57329a26742ddf32d0f54248fe672cc
-SHA512 (libdbusmenu-qt-0.9.2.tar.bz2) = 07f5ea2a7ce32f82dbd11ca3fa5f5b7c10d3cca8dcd2e942d46452f978cbb5bc312d6b10058554330b0b983047e61a4b84cf3a6ae53ba43e89e1e0b81edba126
-Size (libdbusmenu-qt-0.9.2.tar.bz2) = 37882 bytes
+SHA1 (libdbusmenu-qt_0.9.3+15.10.20150604.orig.tar.gz) = b24d7a063de3344d4f2dfc3560c840d3fc0051b4
+RMD160 (libdbusmenu-qt_0.9.3+15.10.20150604.orig.tar.gz) = 93fc6c4ce7a2338a82d813f8bb0d1bc732bb7acf
+SHA512 (libdbusmenu-qt_0.9.3+15.10.20150604.orig.tar.gz) = efb596c18088ab498c2534e2d10e72b542af7b8a572ccb603f3c3517318daa4d2bf118c980e46971ce44333c63130c8967388fc0c8359470cb96f9ea526c6fb3
+Size (libdbusmenu-qt_0.9.3+15.10.20150604.orig.tar.gz) = 46318 bytes
 SHA1 (patch-tools_CMakeLists.txt) = 1e270795ee3ee1d6a0a3a75b1c7e7c8806129aa5