The following patch is needed to actually use dbus support in gaim.
Thanks to it I was able to start up and then kill gaim only by using
gaim-send command.

Also, thanks to changes made by Bernd to python module, we can use it
here too.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/gaim/Makefile,v
retrieving revision 1.101
diff -u -r1.101 Makefile
--- Makefile    13 Feb 2007 00:14:42 -0000      1.101
+++ Makefile    20 Mar 2007 21:46:03 -0000
@@ -5,7 +5,7 @@
 COMMENT=       "Gtk AIM, ICQ, IRC, Jabber, MSN, Yahoo, SILC and Zephyr client"
 
 DISTNAME=      gaim-2.0.0beta6
-PKGNAME=       ${DISTNAME}p2
+PKGNAME=       ${DISTNAME}p3
 SHARED_LIBS=   gaim 0.0 \
                gaim-client 0.0 \
                gnt 0.0 \
@@ -29,14 +29,10 @@
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gaim/}
 
-MODULES=       devel/gettext
+MODULES=       devel/gettext lang/python
 
-PYTHON_VER=    2.4
-
-BUILD_DEPENDS+=        :python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \
-               :p5-XML-Parser-*:textproc/p5-XML-Parser
-RUN_DEPENDS+=  :python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \
-               :dbus-python-*:x11/dbus-python \
+BUILD_DEPENDS+=        :p5-XML-Parser-*:textproc/p5-XML-Parser
+RUN_DEPENDS+=  :dbus-python-*:x11/dbus-python \
                :py-gtk2-*:x11/py-gtk2
 LIB_DEPENDS+=  gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
                startup-notification-1::devel/startup-notification \
@@ -63,7 +59,7 @@
                 --disable-schemas-install \
                 --enable-openssl \
                 --enable-consoleui \
-                --with-python=${LOCALBASE}/bin/python${PYTHON_VER}
+                --with-python=${MODPY_BIN}
 
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
                LDFLAGS="-L${LOCALBASE}/lib"
@@ -98,10 +94,13 @@
 post-extract:
        @cp -f ${FILESDIR}/ssl-openssl.c ${WRKSRC}/libgaim/plugins/ssl
 
+pre-build:
+       perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE}," ${WRKSRC}/gaim.service.in
+
 post-install:
+       perl -pi -e 's,/bin/bash,/bin/sh,' ${PREFIX}/bin/gaim-send*
 .for f in ${PYTHON_SCRIPTS}
-       @perl -pi -e 's#%python%#${LOCALBASE}/bin/python${PYTHON_VER}#g' \
-           ${PREFIX}/bin/${f}
+       perl -pi -e 's#%python%#${MODPY_BIN}#g' ${PREFIX}/bin/${f}
 .endfor
 
 .include <bsd.port.mk>
Index: patches/patch-gaim_service_in
===================================================================
RCS file: patches/patch-gaim_service_in
diff -N patches/patch-gaim_service_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-gaim_service_in       20 Mar 2007 21:46:03 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- gaim.service.in.orig       Tue Mar 20 22:36:53 2007
++++ gaim.service.in    Tue Mar 20 22:37:03 2007
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+-Name=org.gaim.GaimService
[EMAIL PROTECTED]@/gaim
++Name=net.sf.gaim.GaimService
++Exec=!!LOCALBASE!!/gaim

Reply via email to