On Wed, 21 Mar 2007 20:57:26 -0400
Ian Darwin <[EMAIL PROTECTED]> wrote:
> You guys did test this, right?
I had been issuing commands to a gaim process already running.
Indeed if I issued a command without gaim already running it would fail to
automatically start gaim.
I removed the pre-build target and simplified the path substitution in
gaim.service.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/gaim/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile 13 Feb 2007 00:14:42 -0000 1.101
+++ Makefile 22 Mar 2007 03:39:44 -0000
@@ -5,7 +5,7 @@ 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 Xrend
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>
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 22 Mar 2007 03:39:29 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- 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
[EMAIL PROTECTED]@/gaim
++Name=net.sf.gaim.GaimService
[EMAIL PROTECTED]@/bin/gaim
Index: patches/patch-libgaim_gaim-notifications-example
===================================================================
RCS file: patches/patch-libgaim_gaim-notifications-example
diff -N patches/patch-libgaim_gaim-notifications-example
--- patches/patch-libgaim_gaim-notifications-example 7 Feb 2007 01:07:18
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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.
