Re: {pkgsrc-users} Re: problem when building chat/finch

[Brian de Alwis <bsd%cs.ubc.ca@localhost>]

On 2007.12.01 17:46:57 +0100, Roland Illig wrote:
> It is the perfect patch, and therefore I committed it immediately. Thanks 
> for it.

I sent the same patch in October, though only to the list and not
as a PR.  But I discovered yesterday that two of libpurple's dbus
scripts (some of which are written in Python) now require the python
dbus module from sysutils/py-dbus.  (Patch below)

The second patch causes the two bash shell scripts to have their
#! lines rewritten too.

Brian.

RCS file: /cvsroot/pkgsrc/chat/libpurple/buildlink3.mk,v
retrieving revision 1.5
diff -w -b -u -r1.5 buildlink3.mk
--- buildlink3.mk       1 Dec 2007 16:46:07 -0000       1.5
+++ buildlink3.mk       1 Dec 2007 20:53:23 -0000
@@ -20,8 +20,7 @@
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.libpurple:Mdbus)
-.  include "../../sysutils/dbus/buildlink3.mk"
-.  include "../../sysutils/dbus-glib/buildlink3.mk"
+.  include "../../sysutils/py-dbus/buildlink3.mk"
 .endif
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}

Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/libpurple/options.mk,v
retrieving revision 1.5
diff -w -b -u -r1.5 options.mk
--- options.mk  5 Sep 2007 14:31:52 -0000       1.5
+++ options.mk  1 Dec 2007 20:53:23 -0000
@@ -40,10 +40,11 @@
 CONFIGURE_ARGS+=       --enable-dbus
 CONFIGURE_ARGS+=       --with-python=${PYTHONBIN}
 PLIST_SUBST+=          DBUS=
+REPLACE_SH+=           libpurple/purple-send
+REPLACE_SH+=           libpurple/purple-send-async
 REPLACE_PYTHON+=       libpurple/purple-remote
 REPLACE_PYTHON+=       libpurple/purple-url-handler
-.  include "../../sysutils/dbus/buildlink3.mk"
-.  include "../../sysutils/dbus-glib/buildlink3.mk"
+.  include "../../sysutils/py-dbus/buildlink3.mk"
 .  include "../../lang/python/application.mk"
 .else
 CONFIGURE_ARGS+=       --disable-dbus

-- 
  Brian de Alwis | Software Practices Lab | UBC | http://www.cs.ubc.ca/~bsd/
      "Amusement to an observing mind is study." - Benjamin Disraeli