Some cleanups:

- explicitely set some configure_args
- store @sample under share/examples/dbus-glib/
- get dbus-bus-introspect.xml directly from dbus-daemon output
This commit is contained in:
ajacoutot 2009-03-23 10:05:36 +00:00
parent cb16bf5d1a
commit 43afe0f584
4 changed files with 22 additions and 86 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2009/02/08 15:51:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.13 2009/03/23 10:05:36 ajacoutot Exp $
COMMENT= glib bindings for dbus message system
DISTNAME= dbus-glib-0.80
PKGNAME= ${DISTNAME}p0
SHARED_LIBS+= dbus-glib-1 4.1
CATEGORIES= x11
@ -25,13 +26,15 @@ LIB_DEPENDS= dbus-1.>=7::x11/dbus \
SEPARATE_BUILD= simple
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--enable-bash-completion
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-bash-completion \
--enable-gtk-doc=no \
--with-test-socket-dir=${WRKDIR}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS+= completiondir="${PREFIX}/share/dbus-glib"
pre-build:
@cp ${FILESDIR}/dbus-bus-introspect.xml ${WRKBUILD}/tools
FAKE_FLAGS+= completiondir="${PREFIX}/share/examples/dbus-glib"
.include <bsd.port.mk>

View File

@ -1,78 +0,0 @@
<!-- $OpenBSD: dbus-bus-introspect.xml,v 1.1.1.1 2006/11/10 18:46:10 alek Exp $ -->
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.freedesktop.DBus.Introspectable">
<method name="Introspect">
<arg name="data" direction="out" type="s"/>
</method>
</interface>
<interface name="org.freedesktop.DBus">
<method name="RequestName">
<arg direction="in" type="s"/>
<arg direction="in" type="u"/>
<arg direction="out" type="u"/>
</method>
<method name="ReleaseName">
<arg direction="in" type="s"/>
<arg direction="out" type="u"/>
</method>
<method name="StartServiceByName">
<arg direction="in" type="s"/>
<arg direction="in" type="u"/>
<arg direction="out" type="u"/>
</method>
<method name="Hello">
<arg direction="out" type="s"/>
</method>
<method name="NameHasOwner">
<arg direction="in" type="s"/>
<arg direction="out" type="b"/>
</method>
<method name="ListNames">
<arg direction="out" type="as"/>
</method>
<method name="ListActivatableNames">
<arg direction="out" type="as"/>
</method>
<method name="AddMatch">
<arg direction="in" type="s"/>
</method>
<method name="RemoveMatch">
<arg direction="in" type="s"/>
</method>
<method name="GetNameOwner">
<arg direction="in" type="s"/>
<arg direction="out" type="s"/>
</method>
<method name="ListQueuedOwners">
<arg direction="in" type="s"/>
<arg direction="out" type="as"/>
</method>
<method name="GetConnectionUnixUser">
<arg direction="in" type="s"/>
<arg direction="out" type="u"/>
</method>
<method name="GetConnectionUnixProcessID">
<arg direction="in" type="s"/>
<arg direction="out" type="u"/>
</method>
<method name="GetConnectionSELinuxSecurityContext">
<arg direction="in" type="s"/>
<arg direction="out" type="ay"/>
</method>
<method name="ReloadConfig">
</method>
<signal name="NameOwnerChanged">
<arg type="s"/>
<arg type="s"/>
<arg type="s"/>
</signal>
<signal name="NameLost">
<arg type="s"/>
</signal>
<signal name="NameAcquired">
<arg type="s"/>
</signal>
</interface>
</node>

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-configure,v 1.1 2009/03/23 10:05:36 ajacoutot Exp $
--- configure.orig Mon Mar 23 10:57:27 2009
+++ configure Mon Mar 23 10:57:42 2009
@@ -29496,7 +29496,6 @@ echo "
Building Gtk-doc docs: ${enable_gtk_doc}
Bash Completion: ${enable_bash_completion}
Gettext libs (empty OK): ${INTLLIBS}
- Using XML parser: ${with_xml}
'make check' socket dir: ${TEST_SOCKET_DIR}
"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2009/02/08 15:51:45 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.7 2009/03/23 10:05:36 ajacoutot Exp $
%%SHARED%%
@bin bin/dbus-binding-tool
include/dbus-1.0/
@ -13,9 +13,9 @@ lib/libdbus-glib-1.la
lib/pkgconfig/
lib/pkgconfig/dbus-glib-1.pc
@bin libexec/dbus-bash-completion-helper
share/dbus-glib/
share/examples/dbus-glib/
@sample ${SYSCONFDIR}/bash_completion.d/
share/dbus-glib/dbus-bash-completion.sh
share/examples/dbus-glib/dbus-bash-completion.sh
@sample ${SYSCONFDIR}/bash_completion.d/dbus-bash-completion.sh
share/gtk-doc/
share/gtk-doc/html/