Thu May 1 12:50:39 2014 UTC ()
This is an ugly hack:

qdbuscpp2xml and qdbusxml2cpp should be built and installed, because
they are referenced from Qt5DBusConfigExtras.cmake, and cmake
fails to find qtdbus if they are not installed.
I didn't manage to build them though, and the only customers so far
didn't need their functionality - so install scripts that call 'false'.

Bump PKGREVISION.

Please fix properly :)


(wiz)
diff -r1.7 -r1.8 pkgsrc/x11/qt5-dbus/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/qt5-dbus/PLIST
cvs diff -r1.7 -r1.8 pkgsrc/x11/qt5-dbus/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-dbus/Attic/Makefile 2014/04/23 07:05:31 1.7
+++ pkgsrc/x11/qt5-dbus/Attic/Makefile 2014/05/01 12:50:39 1.8
@@ -1,32 +1,45 @@ @@ -1,32 +1,45 @@
1# $NetBSD: Makefile,v 1.7 2014/04/23 07:05:31 adam Exp $ 1# $NetBSD: Makefile,v 1.8 2014/05/01 12:50:39 wiz Exp $
2 2
3PKGNAME= qt5-dbus-${QTVERSION} 3PKGNAME= qt5-dbus-${QTVERSION}
 4PKGREVISION= 1
4COMMENT= Qt5 DBus support plugin 5COMMENT= Qt5 DBus support plugin
5 6
6.include "../../x11/qt5-qtbase/Makefile.common" 7.include "../../x11/qt5-qtbase/Makefile.common"
7 8
8BUILD_DIRS= qtbase/src/dbus 9BUILD_DIRS= qtbase/src/dbus
9 10
10CFLAGS+= -I${BUILDLINK_PREFIX.dbus}/include/dbus-1.0 11CFLAGS+= -I${BUILDLINK_PREFIX.dbus}/include/dbus-1.0
11CFLAGS+= -I${BUILDLINK_PREFIX.dbus}/lib/dbus-1.0/include/dbus 12CFLAGS+= -I${BUILDLINK_PREFIX.dbus}/lib/dbus-1.0/include/dbus
12CFLAGS+= -I${BUILDLINK_PREFIX.qt5-qtbase}/qt5/include 13CFLAGS+= -I${BUILDLINK_PREFIX.qt5-qtbase}/qt5/include
13 14
14INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 15INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
15 16
16INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig 17INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig
17 18
18PC_FILES= Qt5DBus.pc 19PC_FILES= Qt5DBus.pc
19 20
 21# XXX: this is an ugly hack
 22# qdbuscpp2xml and qdbusxml2cpp should be built and installed, because
 23# they are referenced from Qt5DBusConfigExtras.cmake, and cmake
 24# fails to find qtdbus if they are not installed
 25# I didn't manage to build them though, and the only customers so far
 26# didn't need their functionality -- wiz 20140501
 27post-build:
 28 ${ECHO} '#!/bin/sh' > ${WRKSRC}/dummy
 29 ${ECHO} 'false' >> ${WRKSRC}/dummy
 30
20post-install: 31post-install:
21.for i in ${PC_FILES} 32.for i in ${PC_FILES}
22 ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ 33 ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
23 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 34 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
24 ${LN} -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 35 ${LN} -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
25.endfor 36.endfor
 37 ${INSTALL_SCRIPT} ${WRKSRC}/dummy ${DESTDIR}${PREFIX}/qt5/bin/qdbuscpp2xml
 38 ${INSTALL_SCRIPT} ${WRKSRC}/dummy ${DESTDIR}${PREFIX}/qt5/bin/qdbusxml2cpp
26 39
27.include "../../devel/gettext-lib/buildlink3.mk" 40.include "../../devel/gettext-lib/buildlink3.mk"
28# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus 41# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
29USE_DBUS-ARCH-DEPS_H= yes 42USE_DBUS-ARCH-DEPS_H= yes
30.include "../../sysutils/dbus/buildlink3.mk" 43.include "../../sysutils/dbus/buildlink3.mk"
31.include "../../x11/qt5-qtbase/buildlink3.mk" 44.include "../../x11/qt5-qtbase/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/x11/qt5-dbus/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt5-dbus/Attic/PLIST 2014/04/23 07:05:31 1.2
+++ pkgsrc/x11/qt5-dbus/Attic/PLIST 2014/05/01 12:50:39 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1@comment $NetBSD: PLIST,v 1.2 2014/04/23 07:05:31 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2014/05/01 12:50:39 wiz Exp $
 2qt5/bin/qdbuscpp2xml
 3qt5/bin/qdbusxml2cpp
2lib/pkgconfig/Qt5DBus.pc 4lib/pkgconfig/Qt5DBus.pc
3qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbus_symbols_p.h 5qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbus_symbols_p.h
4qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractadaptor_p.h 6qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractadaptor_p.h
5qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractinterface_p.h 7qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractinterface_p.h
6qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusargument_p.h 8qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusargument_p.h
7qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusconnection_p.h 9qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusconnection_p.h
8qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusconnectionmanager_p.h 10qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusconnectionmanager_p.h
9qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbuscontext_p.h 11qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbuscontext_p.h
10qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusintegrator_p.h 12qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusintegrator_p.h
11qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusinterface_p.h 13qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusinterface_p.h
12qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusintrospection_p.h 14qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusintrospection_p.h
13qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmessage_p.h 15qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmessage_p.h
14qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmetaobject_p.h 16qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmetaobject_p.h