From 351fe8b5c85a0154a6d1af8cb2ace176d6207204 Mon Sep 17 00:00:00 2001
From: alek <alek@openbsd.org>
Date: Sun, 25 Mar 2007 10:04:17 +0000
Subject: [PATCH] - fix dbus support - use python module

joint work with and ok brad@ ian@
---
 net/gaim/Makefile                             | 22 ++++++++-----------
 net/gaim/patches/patch-gaim_service_in        |  9 ++++++++
 .../patch-libgaim_gaim-notifications-example  |  9 --------
 3 files changed, 18 insertions(+), 22 deletions(-)
 create mode 100644 net/gaim/patches/patch-gaim_service_in
 delete mode 100644 net/gaim/patches/patch-libgaim_gaim-notifications-example

diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 6543d22fe3c..9eba1b7c19d 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.101 2007/02/13 00:14:42 todd Exp $
+# $OpenBSD: Makefile,v 1.102 2007/03/25 10:04:17 alek Exp $
 
 SHARED_ONLY=	Yes
 
 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 @@ WANTLIB=		glib-2.0 ICE SM X11 Xext Xrender Xss \
 
 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 @@ CONFIGURE_ARGS+= --disable-gevolution \
 		 --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"
@@ -93,15 +89,15 @@ WANTLIB+=	aspell
 CONFIGURE_ARGS+=--disable-gtkspell
 .endif
 
-PYTHON_SCRIPTS=	gaim-notifications-example gaim-remote gaim-url-handler
+PYTHON_SCRIPTS=	gaim-remote gaim-url-handler
 
 post-extract:
 	@cp -f ${FILESDIR}/ssl-openssl.c ${WRKSRC}/libgaim/plugins/ssl
 
 post-install:
+	perl -pi -e 's,/bin/bash,/bin/sh,g' ${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>
diff --git a/net/gaim/patches/patch-gaim_service_in b/net/gaim/patches/patch-gaim_service_in
new file mode 100644
index 00000000000..22cba180af2
--- /dev/null
+++ b/net/gaim/patches/patch-gaim_service_in
@@ -0,0 +1,9 @@
+$OpenBSD: patch-gaim_service_in,v 1.1 2007/03/25 10:04:17 alek Exp $
+--- gaim.service.in.orig	Thu Jan 18 23:28:24 2007
++++ gaim.service.in	Wed Mar 21 23:39:11 2007
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+-Name=org.gaim.GaimService
+-Exec=@bindir@/gaim
++Name=net.sf.gaim.GaimService
++Exec=@prefix@/bin/gaim
diff --git a/net/gaim/patches/patch-libgaim_gaim-notifications-example b/net/gaim/patches/patch-libgaim_gaim-notifications-example
deleted file mode 100644
index 75994252dd5..00000000000
--- a/net/gaim/patches/patch-libgaim_gaim-notifications-example
+++ /dev/null
@@ -1,9 +0,0 @@
-$OpenBSD: patch-libgaim_gaim-notifications-example,v 1.1 2007/02/07 01:07:18 todd Exp $
---- libgaim/gaim-notifications-example.orig	Fri Feb  2 17:19:53 2007
-+++ libgaim/gaim-notifications-example	Fri Feb  2 17:23:16 2007
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!%python%
- 
- # This is a simple gaim notification server.
- # It shows notifications when your buddy signs on or you get an IM message.